@agoric/solo 0.10.4-dev-488dec7.0.488dec7 → 0.10.4-dev-b85a94d.0.b85a94d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/solo",
-  "version": "0.10.4-dev-488dec7.0.488dec7",
+  "version": "0.10.4-dev-b85a94d.0.b85a94d",
   "description": "Agoric's Solo vat runner",
   "type": "module",
   "bin": {
@@ -22,20 +22,20 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/access-token": "0.4.22-dev-488dec7.0.488dec7",
-    "@agoric/cache": "0.3.3-dev-488dec7.0.488dec7",
-    "@agoric/cosmic-proto": "0.4.1-dev-488dec7.0.488dec7",
-    "@agoric/cosmic-swingset": "0.41.4-dev-488dec7.0.488dec7",
-    "@agoric/internal": "0.3.3-dev-488dec7.0.488dec7",
-    "@agoric/notifier": "0.6.3-dev-488dec7.0.488dec7",
-    "@agoric/spawner": "0.6.9-dev-488dec7.0.488dec7",
-    "@agoric/store": "0.9.3-dev-488dec7.0.488dec7",
-    "@agoric/swing-store": "0.9.2-dev-488dec7.0.488dec7",
-    "@agoric/swingset-vat": "0.32.3-dev-488dec7.0.488dec7",
-    "@agoric/telemetry": "0.6.3-dev-488dec7.0.488dec7",
-    "@agoric/time": "0.3.3-dev-488dec7.0.488dec7",
-    "@agoric/vats": "0.15.2-dev-488dec7.0.488dec7",
-    "@agoric/wallet": "0.18.4-dev-488dec7.0.488dec7",
+    "@agoric/access-token": "0.4.22-dev-b85a94d.0.b85a94d",
+    "@agoric/cache": "0.3.3-dev-b85a94d.0.b85a94d",
+    "@agoric/cosmic-proto": "0.4.1-dev-b85a94d.0.b85a94d",
+    "@agoric/cosmic-swingset": "0.41.4-dev-b85a94d.0.b85a94d",
+    "@agoric/internal": "0.3.3-dev-b85a94d.0.b85a94d",
+    "@agoric/notifier": "0.6.3-dev-b85a94d.0.b85a94d",
+    "@agoric/spawner": "0.6.9-dev-b85a94d.0.b85a94d",
+    "@agoric/store": "0.9.3-dev-b85a94d.0.b85a94d",
+    "@agoric/swing-store": "0.9.2-dev-b85a94d.0.b85a94d",
+    "@agoric/swingset-vat": "0.32.3-dev-b85a94d.0.b85a94d",
+    "@agoric/telemetry": "0.6.3-dev-b85a94d.0.b85a94d",
+    "@agoric/time": "0.3.3-dev-b85a94d.0.b85a94d",
+    "@agoric/vats": "0.15.2-dev-b85a94d.0.b85a94d",
+    "@agoric/wallet": "0.18.4-dev-b85a94d.0.b85a94d",
     "@endo/base64": "^1.0.12",
     "@endo/captp": "^4.4.8",
     "@endo/errors": "^1.2.13",
@@ -48,14 +48,12 @@
     "express": "^5.0.1",
     "http-proxy-middleware": "^2.0.6",
     "import-meta-resolve": "^4.1.0",
-    "minimist": "^1.2.0",
     "morgan": "^1.10.0",
-    "temp": "^0.9.1",
     "tmp": "^0.2.1",
     "ws": "^7.2.0"
   },
   "devDependencies": {
-    "@agoric/ertp": "0.16.3-dev-488dec7.0.488dec7",
+    "@agoric/ertp": "0.16.3-dev-b85a94d.0.b85a94d",
     "@endo/bundle-source": "^4.1.2",
     "ava": "^7.0.0",
     "c8": "^10.1.3"
@@ -78,5 +76,5 @@
   "typeCoverage": {
     "atLeast": 74.43
   },
-  "gitHead": "488dec73a49f5a4fd66eea6521638ce5ba11dd2f"
+  "gitHead": "b85a94d36a78e1fac36766d1cb9649c5db9e869c"
 }

package/src/chain-cosmos-sdk.js

@@ -2,9 +2,10 @@
 /* global clearTimeout setTimeout */
 import path from 'node:path';
 import fs from 'node:fs';
+import { mkdtemp, writeFile, unlink } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
 import url from 'node:url';
 import { execFile } from 'node:child_process';
-import { open as tempOpen } from 'temp';
 
 import WebSocket from 'ws';
 
@@ -71,35 +72,28 @@ const randomizeDelay = delay =>
   Math.ceil(delay + delay * RANDOM_SCALE * Math.random());
 
 const makeTempFile = async (prefix, contents) => {
-  const tmpInfo = await new Promise((resolve, reject) => {
-    tempOpen({ prefix }, (err, info) => {
-      if (err) {
-        return reject(err);
-      }
-      return resolve(info);
-    });
-  });
+  await null;
 
-  try {
-    await new Promise((resolve, reject) => {
-      fs.write(tmpInfo.fd, contents, err => {
-        if (err) {
-          return reject(err);
-        }
-        return resolve();
-      });
-    });
-  } finally {
-    await new Promise((resolve, reject) => {
-      fs.close(tmpInfo.fd, e => {
-        if (e) {
-          return reject(e);
-        }
-        return resolve();
-      });
-    });
-  }
-  return tmpInfo;
+  // Create temporary directory with Node native fs.mkdtemp
+  const tempDir = await mkdtemp(path.join(tmpdir(), prefix));
+  const tempPath = path.join(tempDir, 'tempfile');
+
+  // Write contents to file
+  await writeFile(tempPath, contents);
+
+  return {
+    path: tempPath,
+    async cleanup() {
+      await null;
+
+      try {
+        await unlink(tempPath);
+        await fs.promises.rmdir(tempDir);
+      } catch (err) {
+        // Ignore cleanup errors
+      }
+    },
+  };
 };
 
 export async function connectToChain(
@@ -717,7 +711,7 @@ ${chainID} chain does not yet know of address ${clientAddr}${adviseEgress(
       }
     };
 
-    await tryBody().finally(() => tmpInfo && fs.promises.unlink(tmpInfo.path));
+    await tryBody().finally(() => tmpInfo && tmpInfo.cleanup());
   };
 
   /**

package/src/main.js

@@ -1,6 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import parseArgs from 'minimist';
+import { parseArgs } from 'node:util';
 import process from 'node:process';
 import { spawnSync } from 'node:child_process';
 import { assert } from '@endo/errors';
@@ -23,6 +23,41 @@ const DEFAULT_EGRESSES = 'cosmos';
 const AG_SOLO_BASEDIR =
   process.env.AG_SOLO_BASEDIR && path.resolve(process.env.AG_SOLO_BASEDIR);
 
+/**
+ * @param {string | boolean | (string | boolean)[] | undefined} value
+ * @param {string} defaultValue
+ */
+const stringOption = (value, defaultValue) =>
+  typeof value === 'string' ? value : defaultValue;
+
+/** @param {string | boolean | (string | boolean)[] | undefined} value */
+const optionalStringOption = value =>
+  typeof value === 'string' ? value : undefined;
+
+/**
+ * @param {string | boolean | (string | boolean)[] | undefined} value
+ * @param {boolean} defaultValue
+ */
+const booleanOption = (value, defaultValue) =>
+  typeof value === 'boolean' ? value : defaultValue;
+
+const parseTopLevelArgs = rawArgv => {
+  const commandIndex = rawArgv.findIndex(arg => !arg.startsWith('-'));
+  const optionArgs =
+    commandIndex < 0 ? rawArgv : rawArgv.slice(0, commandIndex);
+  const commandArgs = commandIndex < 0 ? [] : rawArgv.slice(commandIndex);
+  const { values: opts } = parseArgs({
+    args: optionArgs,
+    options: {
+      help: { type: 'boolean' },
+      version: { type: 'boolean' },
+    },
+    allowPositionals: false,
+    strict: false,
+  });
+  return { opts, argv: commandArgs };
+};
+
 function insistIsBasedir() {
   if (AG_SOLO_BASEDIR) {
     process.chdir(AG_SOLO_BASEDIR);
@@ -39,10 +74,7 @@ function insistIsBasedir() {
 
 export default async function solo(progname, rawArgv) {
   log.debug('solo', rawArgv);
-  const { _: argv, ...opts } = parseArgs(rawArgv, {
-    stopEarly: true,
-    boolean: ['help', 'version'],
-  });
+  const { opts, argv } = parseTopLevelArgs(rawArgv);
 
   if (opts.help) {
     process.stdout.write(`\
@@ -57,7 +89,15 @@ start
   await null;
   switch (argv[0]) {
     case 'setup': {
-      const { netconfig } = parseArgs(argv.slice(1));
+      const { values: setupOpts } = parseArgs({
+        args: argv.slice(1),
+        options: {
+          netconfig: { type: 'string' },
+        },
+        allowPositionals: true,
+        strict: false,
+      });
+      const netconfig = optionalStringOption(setupOpts.netconfig);
       if (!AG_SOLO_BASEDIR) {
         console.error(`setup: you must set $AG_SOLO_BASEDIR`);
         return 1;
@@ -71,16 +111,23 @@ start
       break;
     }
     case 'init': {
-      const { _: subArgs, ...subOpts } = parseArgs(argv.slice(1), {
-        default: {
-          webport: '8000',
-          webhost: '127.0.0.1',
-          egresses: DEFAULT_EGRESSES,
-          defaultManagerType: process.env.SWINGSET_WORKER_TYPE || 'xs-worker',
+      const { values: subOpts, positionals: subArgs } = parseArgs({
+        args: argv.slice(1),
+        options: {
+          webport: { type: 'string', default: '8000' },
+          webhost: { type: 'string', default: '127.0.0.1' },
+          egresses: { type: 'string', default: DEFAULT_EGRESSES },
+          defaultManagerType: {
+            type: 'string',
+            default: process.env.SWINGSET_WORKER_TYPE || 'xs-worker',
+          },
         },
+        allowPositionals: true,
+        strict: false,
       });
-      const webport = Number(subOpts.webport);
-      const { webhost, egresses } = subOpts;
+      const webport = Number(stringOption(subOpts.webport, '8000'));
+      const webhost = stringOption(subOpts.webhost, '127.0.0.1');
+      const egresses = stringOption(subOpts.egresses, DEFAULT_EGRESSES);
       const basedir = subArgs[0] || AG_SOLO_BASEDIR;
       const subdir = subArgs[1];
       assert(basedir !== undefined, 'you must provide a BASEDIR');
@@ -103,18 +150,30 @@ start
     }
     case 'add-chain': {
       const basedir = insistIsBasedir();
-      const { _: subArgs, ...subOpts } = parseArgs(argv.slice(1), {
-        boolean: ['reset'],
+      const { values: subOpts, positionals: subArgs } = parseArgs({
+        args: argv.slice(1),
+        options: {
+          reset: { type: 'boolean' },
+        },
+        allowPositionals: true,
+        strict: false,
       });
       const [chainConfig] = subArgs;
-      await addChain(basedir, chainConfig, subOpts.reset);
+      await addChain(basedir, chainConfig, booleanOption(subOpts.reset, false));
       break;
     }
     case 'set-gci-ingress': {
       const basedir = insistIsBasedir();
-      const { _: subArgs, ...subOpts } = parseArgs(argv.slice(1), {});
+      const { values: subOpts, positionals: subArgs } = parseArgs({
+        args: argv.slice(1),
+        options: {
+          chainID: { type: 'string' },
+        },
+        allowPositionals: true,
+        strict: false,
+      });
       const GCI = subArgs[0];
-      const chainID = subOpts.chainID || 'agoric';
+      const chainID = stringOption(subOpts.chainID, 'agoric');
       const rpcAddresses = subArgs.slice(1);
       setGCIIngress(basedir, GCI, rpcAddresses, chainID);
       break;

package/src/start.js

@@ -3,7 +3,7 @@
 import fs from 'node:fs';
 import url from 'node:url';
 import path from 'node:path';
-import temp from 'temp';
+import { mkdtemp, writeFile, unlink } from 'node:fs/promises';
 import { fork } from 'node:child_process';
 import { promisify } from 'node:util';
 import { resolve as importMetaResolve } from 'import-meta-resolve';
@@ -53,41 +53,33 @@ const log = anylogger('start');
 
 let swingSetRunning = false;
 
-const fsWrite = promisify(fs.write);
-const fsClose = promisify(fs.close);
 const rename = promisify(fs.rename);
-const unlink = promisify(fs.unlink);
 
 const atomicReplaceFile = async (filename, contents) => {
-  const info = await new Promise((resolve, reject) => {
-    temp.open(
-      {
-        dir: path.dirname(filename),
-        prefix: `${path.basename(filename)}.`,
-      },
-      (err, inf) => {
-        if (err) {
-          reject(err);
-          return;
-        }
-        resolve(inf);
-      },
-    );
-  });
+  const basename = path.basename(filename);
+  const tempDir = await mkdtemp(
+    path.join(path.dirname(filename), `${basename}.`),
+  );
+  const tempPath = path.join(tempDir, basename);
+
   try {
-    // Write the contents, close, and rename.
-    await fsWrite(info.fd, contents);
-    await fsClose(info.fd);
-    await rename(info.path, filename);
+    await writeFile(tempPath, contents);
+    await rename(tempPath, filename);
   } catch (e) {
-    // Unlink on error.
     try {
-      await unlink(info.path);
+      await unlink(tempPath);
+      await fs.promises.rmdir(tempDir);
     } catch (e2) {
       // do nothing, we're already failing
     }
     throw e;
   }
+
+  try {
+    await fs.promises.rmdir(tempDir);
+  } catch (e) {
+    // Ignore cleanup errors
+  }
 };
 
 const neverStop = () => {