feat: v0.4.0

Author: ZhiXiao-Lin

README.md

@@ -17,10 +17,16 @@ const IMAGE_NAME = "hello-world";
 const CONTAINER_NAME = "hello";
 
 const vm = factory();
-if (!(await vm.checkVM())) {
-  await vm.initVM();
-}
 
+vm.on(events.VM_INIT_START, () => {
+  console.log("VM_INIT_START");
+});
+vm.on(events.VM_INIT_OUTPUT, (data) => {
+  console.log(data);
+});
+vm.on(events.VM_INIT_END, () => {
+  console.log("VM_INIT_END");
+});
 vm.on(events.IMAGE_PULL_START, () => {});
 vm.on(events.IMAGE_PULL_OUTPUT, (data) => {
   console.log(data);
@@ -32,6 +38,10 @@ vm.on(events.CONTAINER_RUN_OUTPUT, (data) => {
   console.log(data);
 });
 
+if (!(await vm.checkVM())) {
+  await vm.initVM();
+}
+
 await vm.pullImage(IMAGE_NAME);
 
 const images = await vm.getImages();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nerdctl",
-  "version": "0.3.7",
+  "version": "0.4.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Node wrapper for nerdctl",

src/index.ts

@@ -27,12 +27,15 @@ export function factory(path: string = process.cwd()): BaseBackend {
 
 //     const vm = factory();
 
-//     console.log(await vm.checkVM());
-
-//     if (!(await vm.checkVM())) {
-//       await vm.initVM();
-//     }
-
+//     vm.on(events.VM_INIT_START, () => {
+//       console.log("VM_INIT_START");
+//     });
+//     vm.on(events.VM_INIT_OUTPUT, (data) => {
+//       console.log(data);
+//     });
+//     vm.on(events.VM_INIT_END, () => {
+//       console.log("VM_INIT_END");
+//     });
 //     vm.on(events.IMAGE_PULL_START, () => {});
 //     vm.on(events.IMAGE_PULL_OUTPUT, (data) => {
 //       console.log(data);
@@ -44,6 +47,10 @@ export function factory(path: string = process.cwd()): BaseBackend {
 //       console.log(data);
 //     });
 
+//     if (!(await vm.checkVM())) {
+//       await vm.initVM();
+//     }
+
 //     await vm.pullImage(IMAGE_NAME);
 
 //     const images = await vm.getImages();

src/utils/logging.ts

@@ -45,6 +45,7 @@ export class Log extends EventEmitter {
     this.fdPromise = new Promise((resolve) => {
       this.stream.on("open", resolve);
     });
+
     this.console =
       process.env.NODE_ENV === "test"
         ? globalThis.console
@@ -109,8 +110,11 @@ export class Log extends EventEmitter {
     message: any,
     optionalParameters: any[]
   ) {
-    this.emit("log", message, method);
-    this.console[method](`%s: ${message}`, new Date(), ...optionalParameters);
+    this.console[method](
+      `%s: ----> ${message}`,
+      new Date(),
+      ...optionalParameters
+    );
   }
 
   /**

src/vms/base.ts

@@ -1,5 +1,3 @@
-import * as events from "@/constants/events";
-
 import { ImageResult, RemoveImageCommandFlags } from "@/types/images";
 import {
   RemoveCommandFlags,
@@ -25,9 +23,6 @@ export default abstract class BaseBackend extends EventEmitter {
     super();
     this.path = path;
     this.log = new Log(APP_NAME, join(this.resourcePath, "logs"));
-    this.log.on("log", (message: string, type: string) => {
-      this.emit(events.VM_INIT_OUTPUT, message, type);
-    });
   }
 
   protected get resourcePath() {

src/vms/lima.ts

@@ -104,11 +104,56 @@ export default class LimaBackend extends BaseBackend {
     })();
   }
 
-  protected async lima(...args: string[]): Promise<void> {
+  protected async lima(
+    command: string,
+    ...args: string[]
+  ): Promise<ChildResultType> {
     try {
-      await childProcess.spawnFile(this.limactl, args, {
+      const child = await childProcess.spawn(this.limactl, [command, ...args], {
         env: this.limaEnv,
-        stdio: this.log,
+      });
+
+      const result = { code: 0, stdout: "", stderr: "" };
+
+      return await new Promise((resolve, reject) => {
+        child.stdout?.on("data", (data: Buffer) => {
+          const dataString = data.toString();
+          result.stdout += dataString;
+          this.emit(events.VM_INIT_OUTPUT, dataString);
+        });
+        child.stderr?.on("data", (data: Buffer) => {
+          let dataString = data.toString();
+          result.stderr += dataString;
+          this.emit(events.VM_INIT_OUTPUT, dataString);
+        });
+        child.on("exit", (code, signal) => {
+          if (result.stderr) {
+          }
+          if (code === 0) {
+            resolve({ ...result, code });
+          } else if (signal) {
+            reject(
+              Object.create(result, {
+                code: { value: -1 },
+                signal: { value: signal },
+                [childProcess.ErrorCommand]: {
+                  enumerable: false,
+                  value: child.spawnargs,
+                },
+              })
+            );
+          } else {
+            reject(
+              Object.create(result, {
+                code: { value: code },
+                [childProcess.ErrorCommand]: {
+                  enumerable: false,
+                  value: child.spawnargs,
+                },
+              })
+            );
+          }
+        });
       });
     } catch (ex) {
       console.error(`+ limactl ${args.join(" ")}`);