Fix deploy-cli.sh: bundle was completely broken on a real host

Caught live, deployed to the actual target -- the previous version
failed on the real host with "Cannot use import statement outside a
module" (Node 18, no ancestor package.json to signal ESM for an
extensionless file). That surfaced two stacked bugs my own testing had
missed by running the bundle from inside this repo's own directory
tree, which coincidentally supplied both things the standalone
artifact was silently depending on:

1. Module-format ambiguity: an extensionless file with no controlling
   package.json defaults to CommonJS on older Node (no auto-detection
   heuristic before recent versions). Fixed by naming the bundle
   output keep.mjs -- unconditionally ESM on any Node version,
   regardless of extension-less-file heuristics or nearby package.json.

2. The bigger one: crypto.ts's createRequire(import.meta.url) trick
   (needed because libsodium-wrappers' published ESM build follows a
   broken relative import) is opaque to esbuild's static bundler --
   it's a runtime-obtained require reference, not the literal `require`
   token esbuild's bundling recognizes. The previous "18kb bundle"
   never actually contained libsodium-wrappers at all; it silently
   relied on real node_modules being nearby on disk, which was only
   ever true by accident when testing from within this repo. On a
   clean host it threw "Cannot find module 'libsodium-wrappers'".

   Tried forcing static inlining via a literal require() call (esbuild
   does special-case that even in ESM-format output, unlike `import`,
   which is permanently pinned to the "import" resolution condition
   and can't be routed to the package's working CJS build no matter
   what --conditions/--main-fields/--alias combination is tried this
   was tried and confirmed exhaustively). That got real resolution and
   a real 1.7MB bundle, but broke at runtime with "No secure random
   number generator found" -- inlining the WASM engine breaks its own
   Node-crypto feature detection.

   Landed on: ship libsodium-wrappers (and its own dependency,
   libsodium) as real, unmodified package files alongside the ~18kb
   bundle, via a new copy-cli-deps.mjs step, rather than fighting
   further to force single-file inlining. ~1.6MB total, still one tar
   stream over SSH, still the entire deploy step.

deploy-cli.sh now tars dist-bundle/ (bundle + node_modules) instead of
catting a single file, extracts to ~/.keep-cli/ on the target, and
symlinks ~/bin/keep to the entry point inside it.

Verified this time in conditions that actually match the failure: full
isolation (mktemp'd HOME and install dir, no ancestor package.json, no
adjacent node_modules from this repo) for both `node keep.mjs` and
direct shebang execution, plus the exact tar/extract cycle
deploy-cli.sh performs.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
Fredrik Johansson
2026-07-15 15:59:44 +02:00
parent 74bee56c54
commit 1b4cd9b826
4 changed files with 76 additions and 18 deletions

32
scripts/copy-cli-deps.mjs Normal file
View File

@@ -0,0 +1,32 @@
// Copies the one real runtime dependency the CLI bundle can't statically
// inline (libsodium-wrappers, and its own dependency libsodium) next to
// the bundle, so dist-bundle/ is a small, complete, self-contained
// directory -- no npm install needed wherever it ends up.
//
// Why not just bundle it: libsodium-wrappers' published ESM build follows
// a relative import ("./libsodium.mjs") that's broken in that package's
// own dist layout -- the exact bug crypto.ts's own comment documents.
// Forcing static inlining via a literal require() (the only way to route
// esbuild's resolver to the *working* CJS build instead) was tried and
// technically resolved, but produced "No secure random number generator
// found" at runtime -- inlining the WASM engine breaks its own Node
// crypto feature-detection. Shipping the real, unmodified package files
// is more reliable than fighting that.
import { cpSync, mkdirSync, existsSync } from 'node:fs';
import { join, dirname } from 'node:path';
import { fileURLToPath } from 'node:url';
const root = join(dirname(fileURLToPath(import.meta.url)), '..');
const outDir = join(root, 'dist-bundle', 'node_modules');
mkdirSync(outDir, { recursive: true });
for (const pkg of ['libsodium-wrappers', 'libsodium']) {
const src = join(root, 'node_modules', pkg);
if (!existsSync(src)) {
console.error(`missing node_modules/${pkg} -- run npm install first`);
process.exit(1);
}
cpSync(src, join(outDir, pkg), { recursive: true });
}
console.log('dist-bundle/node_modules populated (libsodium-wrappers, libsodium)');