smolmachines 1.22.0 → 1.22.1

package/dist/assets.js

@@ -20,6 +20,7 @@ exports.wireBundledAssets = wireBundledAssets;
 exports.wireDefaultHardening = wireDefaultHardening;
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
+const runtime_require_1 = require("./runtime-require");
 /** The per-platform npm package that carries the native addon, boot helper,
  *  hypervisor libraries and guest rootfs for each supported
  *  `${process.platform}-${process.arch}`. npm installs only the one matching
@@ -34,12 +35,12 @@ exports.PLATFORM_PACKAGES = {
 /** `native/` inside the installed platform package, or undefined when it is not
  *  installed (unsupported platform, `--omit=optional`, or a lockfile written on
  *  another platform that dropped it). */
-function platformPackageNativeDir(platformArch) {
+function platformPackageNativeDir(platformArch, dir) {
     const pkg = exports.PLATFORM_PACKAGES[platformArch];
     if (!pkg)
         return undefined;
     try {
-        return (0, node_path_1.join)((0, node_path_1.dirname)(require.resolve(`${pkg}/package.json`)), 'native');
+        return (0, node_path_1.join)((0, node_path_1.dirname)((0, runtime_require_1.requireFrom)(dir).resolve(`${pkg}/package.json`)), 'native');
     }
     catch {
         return undefined;
@@ -59,15 +60,19 @@ function wireBundledAssets() {
     }
     const platformArch = `${process.platform}-${process.arch}`;
     const helperName = process.platform === 'win32' ? 'smol-vmm.exe' : 'smol-vmm';
-    // A source checkout / CI build keeps the assets next to the package
-    // (`__dirname` is the package root from source (tsx) and `dist/` when built —
+    // A source checkout / CI build keeps the assets next to the package (the SDK
+    // directory is the package root from source (tsx) and `dist/` when built —
     // check both layouts); a published install gets them from the per-platform
-    // package.
-    const candidates = [
-        (0, node_path_1.join)(__dirname, 'native', platformArch),
-        (0, node_path_1.join)(__dirname, '..', 'native', platformArch),
-        platformPackageNativeDir(platformArch),
-    ].filter((dir) => dir !== undefined);
+    // package. `sdkDir()` finds the package on disk even when the SDK's
+    // JavaScript was bundled, where `__dirname` is the bundler's output.
+    const dir = (0, runtime_require_1.sdkDir)();
+    const candidates = dir
+        ? [
+            (0, node_path_1.join)(dir, 'native', platformArch),
+            (0, node_path_1.join)(dir, '..', 'native', platformArch),
+            platformPackageNativeDir(platformArch, dir),
+        ].filter((d) => d !== undefined)
+        : [];
     for (const nativeDir of candidates) {
         if (!(0, node_fs_1.existsSync)(nativeDir))
             continue;

package/dist/binding.d.ts

@@ -219,7 +219,7 @@ export declare class NapiMachine {
    */
   static connect(name: string, interceptorAddress?: string | undefined | null, interceptorToken?: string | undefined | null): NapiMachine
   /** Create a stopped machine from a portable live checkpoint on disk. */
-  static restoreCheckpoint(name: string, artifact: string): NapiMachine
+  static restoreCheckpoint(name: string, artifact: string, keepIdentity?: boolean | undefined | null): NapiMachine
   /** Export a stored checkpoint directory as one portable checkpoint file. */
   static exportCheckpoint(source: string, output: string): number
   /** Remove objects that no retained checkpoint in a local store references. */

package/dist/native.d.ts

@@ -144,7 +144,7 @@ export interface NapiMachineCtor {
     new (config: NativeMachineConfig): NapiMachine;
     connect(name: string, interceptorAddress?: string, interceptorToken?: string): NapiMachine;
     list(): Promise<NativeMachineSummary[]>;
-    restoreCheckpoint(name: string, artifact: string): NapiMachine;
+    restoreCheckpoint(name: string, artifact: string, keepIdentity?: boolean): NapiMachine;
     exportCheckpoint(source: string, output: string): number;
     pruneCheckpointStore(store: string): number;
     checkHost(): NativeHostAvailability;

package/dist/native.js

@@ -11,6 +11,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNapiMachine = getNapiMachine;
 const assets_1 = require("./assets");
+const runtime_require_1 = require("./runtime-require");
 /** Explain a failed addon load in terms of the per-platform package that
  *  carries it. The usual causes are an unsupported platform, an install with
  *  `--omit=optional`, or a lockfile written on another OS/arch that recorded no
@@ -45,8 +46,12 @@ function getNapiMachine() {
         const assets = (0, assets_1.wireBundledAssets)();
         let binding;
         try {
-            // eslint-disable-next-line @typescript-eslint/no-var-requires
-            binding = require("./binding.js");
+            // Loaded through Node's own loader so a bundler never follows it into
+            // the `.node` addon (see runtime-require.ts).
+            const dir = (0, runtime_require_1.sdkDir)();
+            if (!dir)
+                throw new Error("the smolmachines package was not found on disk");
+            binding = (0, runtime_require_1.requireFrom)(dir)("./binding.js");
         }
         catch (error) {
             throw missingPlatformPackageError(error);

package/dist/runtime-require.d.ts

@@ -0,0 +1,23 @@
+/** Load the native half of the SDK through Node's own module loader.
+ *
+ *  Bundlers (webpack, Turbopack, esbuild, Vite SSR) follow every `require(...)`
+ *  and `require.resolve(...)` they can see. Following `./binding.js` leads them
+ *  into the platform `.node` addon, which they then try to parse as JavaScript
+ *  ("Module parse failed: Unexpected character"), so `import 'smolmachines'` in
+ *  a Next.js route failed to build unless the app listed the package in
+ *  `serverExternalPackages`. Bundling also moves `__dirname` to the bundler's
+ *  output directory, so the bundled boot helper and libraries could no longer
+ *  be found next to this file.
+ *
+ *  Everything here reaches Node's `module` builtin without a call a bundler can
+ *  trace, and locates the installed package on disk, so the native addon and
+ *  its assets load from `node_modules` whether or not the SDK's JavaScript was
+ *  bundled. The pure-JavaScript cloud path never touches this file.
+ */
+/** A `require` that resolves relative to `dir`, invisible to bundlers. */
+export declare function requireFrom(dir: string): NodeRequire;
+/** The directory holding `binding.js` and the source-layout `native/` assets:
+ *  this file's own directory when the SDK runs unbundled (the package root from
+ *  source, `dist/` when built), otherwise the installed package's `dist/`,
+ *  resolved from the app's working directory. Undefined when neither exists. */
+export declare function sdkDir(): string | undefined;

package/dist/runtime-require.js

@@ -0,0 +1,75 @@
+"use strict";
+/** Load the native half of the SDK through Node's own module loader.
+ *
+ *  Bundlers (webpack, Turbopack, esbuild, Vite SSR) follow every `require(...)`
+ *  and `require.resolve(...)` they can see. Following `./binding.js` leads them
+ *  into the platform `.node` addon, which they then try to parse as JavaScript
+ *  ("Module parse failed: Unexpected character"), so `import 'smolmachines'` in
+ *  a Next.js route failed to build unless the app listed the package in
+ *  `serverExternalPackages`. Bundling also moves `__dirname` to the bundler's
+ *  output directory, so the bundled boot helper and libraries could no longer
+ *  be found next to this file.
+ *
+ *  Everything here reaches Node's `module` builtin without a call a bundler can
+ *  trace, and locates the installed package on disk, so the native addon and
+ *  its assets load from `node_modules` whether or not the SDK's JavaScript was
+ *  bundled. The pure-JavaScript cloud path never touches this file.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.requireFrom = requireFrom;
+exports.sdkDir = sdkDir;
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
+function moduleApi() {
+    const getBuiltinModule = process
+        .getBuiltinModule;
+    if (typeof getBuiltinModule === 'function') {
+        return getBuiltinModule('node:module');
+    }
+    // Node older than 20.16 / 22.3 has no getBuiltinModule. A direct eval keeps
+    // the CommonJS `require` in scope while hiding the call from static analysis.
+    // eslint-disable-next-line no-eval
+    return eval('require')('node:module');
+}
+/** A `require` that resolves relative to `dir`, invisible to bundlers. */
+function requireFrom(dir) {
+    return moduleApi().createRequire((0, node_path_1.join)(dir, 'noop.js'));
+}
+function isSdkPackage(dir) {
+    const manifest = (0, node_path_1.join)(dir, 'package.json');
+    if (!(0, node_fs_1.existsSync)(manifest))
+        return false;
+    try {
+        return JSON.parse((0, node_fs_1.readFileSync)(manifest, 'utf8')).name === 'smolmachines';
+    }
+    catch {
+        return false;
+    }
+}
+let cachedSdkDir;
+/** The directory holding `binding.js` and the source-layout `native/` assets:
+ *  this file's own directory when the SDK runs unbundled (the package root from
+ *  source, `dist/` when built), otherwise the installed package's `dist/`,
+ *  resolved from the app's working directory. Undefined when neither exists. */
+function sdkDir() {
+    if (cachedSdkDir !== undefined)
+        return cachedSdkDir ?? undefined;
+    let found;
+    if ((0, node_fs_1.existsSync)((0, node_path_1.join)(__dirname, 'binding.js')) && [__dirname, (0, node_path_1.join)(__dirname, '..')].some(isSdkPackage)) {
+        found = __dirname;
+    }
+    else {
+        try {
+            // The package's `exports` map only exposes ".", so resolve its entry
+            // (`dist/index.js`) rather than `smolmachines/package.json`.
+            const dist = (0, node_path_1.dirname)(requireFrom(process.cwd()).resolve('smolmachines'));
+            if ((0, node_fs_1.existsSync)((0, node_path_1.join)(dist, 'binding.js')))
+                found = dist;
+        }
+        catch {
+            found = undefined;
+        }
+    }
+    cachedSdkDir = found ?? null;
+    return found;
+}

package/dist/transport.js

@@ -1588,7 +1588,7 @@ async function restoreCheckpointTransport(checkpointId, name, conn, options) {
         let restored;
         try {
             const handleSignals = conn.handleSignals ?? true;
-            restored = new LocalTransport((0, native_1.getNapiMachine)().restoreCheckpoint(name, path), handleSignals, undefined, handleSignals);
+            restored = new LocalTransport((0, native_1.getNapiMachine)().restoreCheckpoint(name, path, options?.keepIdentity), handleSignals, undefined, handleSignals);
             // Between install and first boot: the one moment a restored machine's
             // policy can be its own rather than the checkpoint's.
             if (options?.networkPolicy !== undefined)
@@ -1602,6 +1602,9 @@ async function restoreCheckpointTransport(checkpointId, name, conn, options) {
             throw (0, errors_1.wrapNativeError)(error);
         }
     }
+    if (options?.keepIdentity) {
+        throw new errors_1.InvalidConfigError("keepIdentity is local-only: a cloud restore always gives the new machine its own identity.");
+    }
     const explicitKey = conn.apiKey ?? process.env.SMOL_CLOUD_TOKEN;
     const { apiKey: cliKey, endpoint: cliUrl } = cliSession(conn.target);
     const key = explicitKey ?? cliKey ?? cliConfigApiKey();

package/dist/types.d.ts

@@ -267,6 +267,12 @@ export interface RestoreCheckpointOptions {
      *  The checkpoint must have been taken on the `"virtio-net"` backend for an
      *  allow list or `deny-all`. Local target only. */
     networkPolicy?: NetworkPolicy;
+    /** Restore the machine as itself going back in time rather than as a clone:
+     *  it keeps the hostname and machine ID it was saved with, which skips about
+     *  a second of identity reset on its first start. For rewinding a machine to
+     *  an earlier save point; do not run two machines from one checkpoint with
+     *  it. Local target only. */
+    keepIdentity?: boolean;
 }
 /** Per-call execution options. */
 export interface ExecOptions {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "smolmachines",
-  "version": "1.22.0",
+  "version": "1.22.1",
   "description": "Embed isolated microVM sandboxes directly in your code — no server to run.",
   "license": "Apache-2.0",
   "author": "smol-machines",
@@ -62,8 +62,8 @@
     "typescript": "^5.6.0"
   },
   "optionalDependencies": {
-    "smolmachines-darwin-arm64": "1.22.0",
-    "smolmachines-linux-x64-gnu": "1.22.0",
-    "smolmachines-linux-arm64-gnu": "1.22.0"
+    "smolmachines-darwin-arm64": "1.22.1",
+    "smolmachines-linux-x64-gnu": "1.22.1",
+    "smolmachines-linux-arm64-gnu": "1.22.1"
   }
 }