use stop command to shutdown server + bump version to 0.0.26 (#58)

aptos-labs · Feb 7, 2025 · 5f7c192 · 5f7c192
1 parent 0f12393
commit 5f7c192
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 18 deletions.
diff --git a/workspace/package-lock.json b/workspace/package-lock.json
diff --git a/workspace/package.json b/workspace/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aptos-labs/workspace",
-  "version": "0.0.25",
+  "version": "0.0.26",
   "license": "Apache-2.0",
   "bin": {
     "aptos-workspace": "./dist/internal/cli.js",

diff --git a/workspace/src/internal/node.ts b/workspace/src/internal/node.ts
@@ -34,7 +34,7 @@ export class TestNode {
     const cliCommand = "npx";
     const cliArgs: string[] = ["aptos", "workspace", "run"];
 
-    const childProcess = spawn(cliCommand, cliArgs, { detached: false, stdio: ['ignore', 'pipe', 'ignore'], shell: true });
+    const childProcess = spawn(cliCommand, cliArgs, { detached: false, stdio: ['pipe', 'pipe', 'ignore'], shell: true });
 
     const rl = readline.createInterface({
       input: childProcess.stdout,
@@ -122,21 +122,23 @@ export class TestNode {
 
   public async stop() {
     await new Promise((resolve, reject) => {
-      if (!this.info?.process?.pid) return;
+      if (this.info == null) return;
 
       const process = this.info.process;
-      kill(this.info.process.pid, 'SIGINT', (err) => {
-        if (err) {
-          reject(err);
-          return;
-        }
 
-        process.on('exit', (code, signal) => {
-          resolve(true)
-        });
+      const timeout = setTimeout(() => {
+        reject(new Error("workspace server process failed to exit within given timeout (90s)"));
+      }, 90000);
 
-        // TODO: timeout?
-      });
+      try {
+        process.stdin.write("stop\n");
+
+        process.on("exit", (code, signal) => {
+          resolve(true);
+        });
+      } catch (err) {
+        reject(err);
+      }
     });
   }
 }
diff --git a/workspace/src/internal/utils/types.ts b/workspace/src/internal/utils/types.ts
@@ -1,8 +1,8 @@
 import { ChildProcessByStdio, ChildProcessWithoutNullStreams } from "child_process";
-import { Readable } from "stream";
+import { Writable, Readable } from "stream";
 
 export type NodeInfo = {
-  process: ChildProcessByStdio<null, Readable, null>;
+  process: ChildProcessByStdio<Writable, Readable, null>;
   rest_api_port: number;
   faucet_port: number;
   indexer_port: number;

diff --git a/workspace/src/tasks/init.ts b/workspace/src/tasks/init.ts
@@ -26,6 +26,7 @@ const getDevDependenciesToInstallCommand = async (
   result: PromptResult
 ): Promise<string[]> => {
   if (result.language === "ts") {
+    REQUIRED_DEV_DEPENDENCIES["@aptos-labs/aptos-cli"] = "^1.0.2";
     REQUIRED_DEV_DEPENDENCIES["@types/chai"] = "4";
     REQUIRED_DEV_DEPENDENCIES["@types/mocha"] = "^10.0.7";
     REQUIRED_DEV_DEPENDENCIES["typescript"] = "^5.7.3";

diff --git a/workspace/src/tasks/test.ts b/workspace/src/tasks/test.ts
@@ -45,7 +45,7 @@ async function checkAptosVersion(): Promise<void> {
       }
 
       const version = versionMatch[1];
-      const minimumVersion = "6.0.2";
+      const minimumVersion = "6.1.1";
 
       if (semver.lt(version, minimumVersion)) {
         return reject(