fix: resolve node in cli and fix rollup build (#51)

Author: wesleytodd

package-lock.json

@@ -1,6 +1,6 @@
 import { normalize, join, dirname } from 'node:path';
 import { writeFile, mkdir } from 'node:fs/promises';
-import { inspect } from 'node:util';
+import nv from '@pkgjs/nv';
 
 export function help (opts = {}) {
   return `$ expf load [flags]
@@ -69,11 +69,15 @@ export default function main (_opts = {}) {
     const runner = (await import(opts.runner)).default;
 
     try {
+      const vers = await nv(opts.node, {
+        latestOfMajorOnly: true
+      });
+
       const results = await runner({
         cwd: opts.cwd,
         repo: opts.repo,
         test: opts.test,
-        node: opts.node,
+        node: vers?.[0]?.version,
         overrides: opts.overrides,
         signal: ac.signal
       });

packages/cli/load.mjs

@@ -3,14 +3,9 @@ import { join } from 'node:path';
 import { readFile } from 'node:fs/promises';
 import ac from '@expressjs/perf-autocannon';
 import { collectMetadata } from '@expressjs/perf-metadata';
-import nv from '@pkgjs/nv';
 
 export function buildContainer (opts = {}) {
   return new Promise(async (resolve, reject) => {
-    const vers = await nv(opts.node, {
-      latestOfMajorOnly: true
-    });
-    const nodeVer = vers?.[0]?.version || 'lts';
     // TODO: bookworm hardcoded until we figure out
     // https://github.com/nodejs/docker-node/issues/2101#issuecomment-3024653783
     const os = 'bookworm';
@@ -19,15 +14,15 @@ export function buildContainer (opts = {}) {
     const cp = execFile(
       join(import.meta.dirname, 'scripts', 'build.sh'),
       [
-        nodeVer,
+        opts.node || 'lts',
         os
       ],
       { cwd: import.meta.dirname }
     );
     cp.on('exit', () => {
       resolve({
-        tag: `expf-runner:${nodeVer}-${os}`,
-        node: nodeVer
+        tag: `expf-runner:${opts.node}-${os}`,
+        node: opts.node
       });
     });
     cp.on('error', reject);

packages/runner-docker/index.mjs

@@ -5,6 +5,7 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "./scripts/build.sh 22.18.0 bookworm --force",
+    "prepare": "rollup metadata.mjs --file metadata-bundle.mjs --plugin @rollup/plugin-node-resolve",
     "run": "./scripts/run.sh",
     "tag": "docker tag perf-runner:latest registry.digitalocean.com/real-expressjs/perf-runner"
   },
@@ -13,11 +14,10 @@
   "license": "ISC",
   "description": "A set of utilities for Express to work with DigitalOcean",
   "dependencies": {
-    "@expressjs/perf-autocannon": "^1.0.0",
-    "@expressjs/perf-metadata": "^1.0.0",
-    "@pkgjs/nv": "^0.2.2"
+    "@expressjs/perf-autocannon": "^1.0.0"
   },
   "devDependencies": {
+    "@expressjs/perf-metadata": "^1.0.0",
     "@rollup/plugin-node-resolve": "^16.0.1",
     "rollup": "^4.46.2"
   }

packages/runner-docker/package.json

@@ -10,8 +10,6 @@ if [ -z "$2" ]; then
   exit 1;
 fi;
 
-rollup metadata.mjs --file metadata-bundle.mjs --plugin @rollup/plugin-node-resolve
-
 # Start docker daemon if not running
 if (! docker stats --no-stream >/dev/null 2>&1 ); then
   # On Mac OS this would be the terminal command to launch Docker

packages/runner-docker/scripts/build.sh

@@ -119,7 +119,7 @@ trap on_sigint SIGINT
 
 echo "Starting server (server ${SERVER_PID}, perf ${PERF_PID})"
 while true; do
-  # Server process ehelloworldxited
+  # Server process exited
   if ! [ -d "/proc/${SERVER_PID}" ]; then
     echo "Exited prematurely (pid ${SERVER_PID}, code ${EXIT_CODE-unknown})"
     wait $SERVER_PID || true