@molecule/api-code-sandbox-flyio 1.0.11 → 1.0.12

package/dist/provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,OAAO,KAAK,EAUV,eAAe,EAEhB,MAAM,4BAA4B,CAAA;AAGnC,OAAO,EAAE,YAAY,EAAgC,MAAM,UAAU,CAAA;AAsBrE,OAAO,EAAmD,KAAK,WAAW,EAAE,MAAM,cAAc,CAAA;AAEhG,OAAO,KAAK,EAEV,WAAW,EAUZ,MAAM,YAAY,CAAA;AAmzDnB;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC5B,MAAM,CAAC,EAAE,WAAW,EACpB,MAAM,CAAC,EAAE,YAAY,EACrB,KAAK,CAAC,EAAE,WAAW,GAAG,IAAI,GACzB,eAAe,CAEjB"}
+{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,OAAO,KAAK,EAUV,eAAe,EAEhB,MAAM,4BAA4B,CAAA;AAGnC,OAAO,EAAE,YAAY,EAAgC,MAAM,UAAU,CAAA;AAsBrE,OAAO,EAAmD,KAAK,WAAW,EAAE,MAAM,cAAc,CAAA;AAEhG,OAAO,KAAK,EAEV,WAAW,EAUZ,MAAM,YAAY,CAAA;AAs2DnB;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC5B,MAAM,CAAC,EAAE,WAAW,EACpB,MAAM,CAAC,EAAE,YAAY,EACrB,KAAK,CAAC,EAAE,WAAW,GAAG,IAAI,GACzB,eAAe,CAEjB"}

package/dist/provider.js

@@ -90,6 +90,12 @@ const IMPORT_EXTRACT_TIMEOUT_MS = 55_000;
  * the gzip pass before transfer is what keeps that count reasonable.
  */
 const IMPORT_WRITE_CHUNK_BASE64 = 12_000;
+/**
+ * Expiry for the presigned URLs {@link Sandbox.importFiles} uses to hand an
+ * archive to the object store and back to the Machine. Short — the upload and
+ * the single download happen back-to-back.
+ */
+const IMPORT_PRESIGN_EXPIRY_SECONDS = 3600;
 /** Extra seconds allowed for the probe exec beyond its connection budget. */
 const PROBE_EXEC_HEADROOM_SECONDS = 10;
 /**
@@ -1495,25 +1501,63 @@ class FlyioSandboxProvider {
                 const parts = [];
                 for await (const chunk of archive)
                     parts.push(Buffer.from(chunk));
-                const base64 = gzipSync(Buffer.concat(parts)).toString('base64');
-                // The temp tar lives on the WORKSPACE VOLUME, not /tmp. The chunked
-                // write and the extract are separate exec calls, and a Machine with
-                // autostop=suspend can cold-start between them — which recreates the
-                // rootfs from the image (wiping /tmp) while the ext4 volume at
-                // /workspace persists. A /tmp temp file vanished mid-import; the volume
-                // one survives.
-                const tmp = `${WORKSPACE_PATH}/.mol-import-${machineId}.tgz`;
-                const quotedTmp = shellQuote(tmp);
+                const gz = gzipSync(Buffer.concat(parts));
                 const quotedPath = shellQuote(path);
                 const failIfError = (result, step) => {
                     if (result.exitCode !== 0) {
                         throw new Error(t('codeSandbox.flyio.error.importFailed', { path, step, error: result.stderr }, {
-                            defaultValue: `Failed to import files into ${path} (${step}): ${result.stderr}`,
+                            defaultValue: `Failed to import files into ${path} (${step}): ${result.stderr || result.stdout}`,
                         }));
                     }
                 };
-                // First chunk truncates the temp file; the rest append. Each chunk is a
-                // multiple of 4 base64 chars so it decodes standalone (see writeFile).
+                // PREFERRED: upload the archive to the object store and have the Machine
+                // PULL it with a single curl. Fly's exec endpoint is rate-limited (~5/s)
+                // and caps each command near 15 KB, so streaming a multi-MB tar through
+                // it as base64 chunks triggers a 429 storm that never finishes. A
+                // presigned download is ONE request — the same pull pattern templates use
+                // (see buildRestoreCommand). Falls back to chunked exec when no store is
+                // configured (e.g. unit tests).
+                const store = provider.templateContext().store;
+                if (store) {
+                    const key = `${store.prefix}/.imports/${machineId}-${Date.now().toString(36)}${Math.floor(Math.random() * 1e9).toString(36)}.tar.gz`;
+                    try {
+                        const putUrl = await store.presignPut(key, IMPORT_PRESIGN_EXPIRY_SECONDS);
+                        const putRes = await fetch(putUrl, { method: 'PUT', body: gz });
+                        if (!putRes.ok) {
+                            throw new Error(`presigned PUT to the object store failed: ${putRes.status}`);
+                        }
+                        const getUrl = await store.presignGet(key, IMPORT_PRESIGN_EXPIRY_SECONDS);
+                        const result = await this.exec([
+                            'set -e',
+                            `mkdir -p ${quotedPath}`,
+                            'archive=$(mktemp /tmp/mol-import-XXXXXX.tar.gz)',
+                            `curl --fail-with-body -sS --retry 3 --retry-connrefused -o "$archive" ${shellQuote(getUrl)}`,
+                            `tar -C ${quotedPath} --no-same-owner --no-same-permissions -xzf "$archive"`,
+                            'rm -f "$archive"',
+                        ].join('\n'), { timeout: IMPORT_EXTRACT_TIMEOUT_MS });
+                        // Best-effort: the temp object expires anyway, but delete it promptly.
+                        store.remove([key]).catch((error) => {
+                            logger.debug('importFiles temp object cleanup failed', { key, error });
+                        });
+                        failIfError(result, 'download');
+                        return;
+                    }
+                    catch (error) {
+                        // The store path is unavailable or failed — fall through to the
+                        // chunked-exec transport rather than failing the whole import.
+                        logger.warn('importFiles via object store failed; falling back to chunked exec', {
+                            error,
+                        });
+                    }
+                }
+                // FALLBACK: chunked base64 over exec. Only used when no object store is
+                // configured. The temp tar lives on the WORKSPACE VOLUME, not /tmp — the
+                // chunked write and the extract are separate exec calls and a Machine
+                // with autostop can cold-start between them, wiping /tmp (rootfs) while
+                // the ext4 volume at /workspace persists.
+                const base64 = gz.toString('base64');
+                const tmp = `${WORKSPACE_PATH}/.mol-import-${machineId}.tgz`;
+                const quotedTmp = shellQuote(tmp);
                 failIfError(await this.exec(`printf %s ${shellQuote(base64.slice(0, IMPORT_WRITE_CHUNK_BASE64))} | base64 -d > ${quotedTmp}`, { timeout: FILE_OP_TIMEOUT_MS }), 'write');
                 for (let i = IMPORT_WRITE_CHUNK_BASE64; i < base64.length; i += IMPORT_WRITE_CHUNK_BASE64) {
                     failIfError(await this.exec(`printf %s ${shellQuote(base64.slice(i, i + IMPORT_WRITE_CHUNK_BASE64))} | base64 -d >> ${quotedTmp}`, { timeout: FILE_OP_TIMEOUT_MS }), 'write');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@molecule/api-code-sandbox-flyio",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "Fly.io Machines (Firecracker microVM) code sandbox provider",
   "type": "module",
   "main": "dist/index.js",