@supacloud/admin 0.24.1 → 0.24.2

package/dist/index.js

@@ -29364,14 +29364,13 @@ function quoteShell(shellText) {
 }
 
 // src/shared/releases/local-upgrade-bundle.ts
-import { spawn } from "node:child_process";
 import { createHash as createHash2, randomUUID as randomUUID2 } from "node:crypto";
 import { accessSync, chmodSync as chmodSync2, constants as fsConstants, copyFileSync, createWriteStream, lstatSync, mkdirSync, mkdtempSync as mkdtempSync2, readFileSync as readFileSync3, readdirSync, rmSync as rmSync2, statSync, writeFileSync as writeFileSync2 } from "node:fs";
 import { get } from "node:https";
 import { tmpdir as tmpdir2 } from "node:os";
 import { basename, delimiter, isAbsolute, join } from "node:path";
 import { pipeline as pipeline3 } from "node:stream/promises";
-import { Transform } from "node:stream";
+import { Readable, Transform } from "node:stream";
 
 // ../management-api/src/release-manifest.ts
 var RELEASE_MANIFEST_NAME = "SUPACLOUD-RELEASE.json";
@@ -30015,70 +30014,81 @@ function spawnGithubCli(arguments_, download = false) {
         environment[key] = process.env[key];
     }
   }
-  return spawn(githubCliExecutable(environment), arguments_, {
+  return Bun.spawn([githubCliExecutable(environment), ...arguments_], {
     env: environment,
     stdio: ["ignore", "pipe", "pipe"]
   });
 }
-function githubCliExitCode(child, timeoutMs) {
-  return new Promise((resolve, reject) => {
-    let timedOut = false;
-    let settled = false;
-    let forceKillTimer;
-    const timeout = setTimeout(() => {
-      timedOut = true;
-      child.kill("SIGTERM");
-      forceKillTimer = setTimeout(() => child.kill("SIGKILL"), GH_TERMINATION_GRACE_MS);
-    }, timeoutMs);
-    const settleExecution = (error, exitCode) => {
-      if (settled)
-        return;
-      settled = true;
-      clearTimeout(timeout);
-      if (forceKillTimer)
-        clearTimeout(forceKillTimer);
-      if (error)
-        reject(error);
-      else
-        resolve(timedOut ? 124 : exitCode);
-    };
-    child.once("error", (error) => settleExecution(error, 127));
-    child.once("close", (code) => settleExecution(undefined, code ?? 1));
-  });
-}
 async function runGithubCli(arguments_, timeoutMs) {
   const child = spawnGithubCli(arguments_);
-  let stdout = "";
-  let stderr = "";
-  child.stdout.on("data", (chunk) => {
-    stdout = `${stdout}${chunk.toString()}`.slice(-8000);
-  });
-  child.stderr.on("data", (chunk) => {
-    stderr = `${stderr}${chunk.toString()}`.slice(-8000);
-  });
-  const exitCode = await githubCliExitCode(child, timeoutMs);
-  return { exitCode, stdout, stderr };
+  let timedOut = false;
+  let forceKillTimer;
+  const timeout = setTimeout(() => {
+    timedOut = true;
+    child.kill("SIGTERM");
+    forceKillTimer = setTimeout(() => child.kill("SIGKILL"), GH_TERMINATION_GRACE_MS);
+  }, timeoutMs);
+  try {
+    const [rawStdout, rawStderr, exitCode] = await Promise.all([
+      child.stdout ? new Response(child.stdout).text() : Promise.resolve(""),
+      child.stderr ? new Response(child.stderr).text() : Promise.resolve(""),
+      child.exited
+    ]);
+    clearTimeout(timeout);
+    if (forceKillTimer)
+      clearTimeout(forceKillTimer);
+    const stdout = rawStdout.slice(-8000);
+    const stderr = rawStderr.slice(-8000);
+    return { exitCode: timedOut ? 124 : exitCode ?? 1, stdout, stderr };
+  } catch (error) {
+    clearTimeout(timeout);
+    if (forceKillTimer)
+      clearTimeout(forceKillTimer);
+    child.kill("SIGKILL");
+    throw error;
+  }
 }
 async function runGithubCliDownload(arguments_, destination, maxBytes, timeoutMs) {
   const child = spawnGithubCli(arguments_, true);
-  let stderr = "";
-  child.stderr.on("data", (chunk) => {
-    stderr = `${stderr}${chunk.toString()}`.slice(-8000);
-  });
-  const write = pipeline3(child.stdout, boundedWriter(maxBytes), createWriteStream(destination, { flags: "wx", mode: 384 })).catch((error) => {
+  let timedOut = false;
+  let forceKillTimer;
+  const timeout = setTimeout(() => {
+    timedOut = true;
+    child.kill("SIGTERM");
+    forceKillTimer = setTimeout(() => child.kill("SIGKILL"), GH_TERMINATION_GRACE_MS);
+  }, timeoutMs);
+  const stderrPromise = (async () => {
+    try {
+      return child.stderr ? (await new Response(child.stderr).text()).slice(-8000) : "";
+    } catch {
+      return "";
+    }
+  })();
+  const write = pipeline3(Readable.fromWeb(child.stdout), boundedWriter(maxBytes), createWriteStream(destination, { flags: "wx", mode: 384 })).catch((error) => {
     child.kill("SIGKILL");
     throw error;
   });
-  const [writeState, exitState] = await Promise.allSettled([write, githubCliExitCode(child, timeoutMs)]);
-  if (writeState.status === "rejected") {
-    rmSync2(destination, { force: true });
-    throw writeState.reason;
-  }
-  if (exitState.status === "rejected") {
+  try {
+    const [writeState, exitState, stderrState] = await Promise.allSettled([
+      write,
+      child.exited,
+      stderrPromise
+    ]);
+    if (writeState.status === "rejected")
+      throw writeState.reason;
+    if (exitState.status === "rejected")
+      throw exitState.reason;
+    if (stderrState.status === "rejected")
+      throw stderrState.reason;
+    return { exitCode: timedOut ? 124 : exitState.value, stdout: "", stderr: stderrState.value };
+  } catch (error) {
     rmSync2(destination, { force: true });
-    throw exitState.reason;
+    throw error;
+  } finally {
+    clearTimeout(timeout);
+    if (forceKillTimer)
+      clearTimeout(forceKillTimer);
   }
-  return { exitCode: exitState.value, stdout: "", stderr };
 }
 function supportsStrictGithubVerification(execution) {
   const tokens = `${execution.stdout}
@@ -33137,18 +33147,25 @@ Actions: list, deploy, deploy_bundle, source, delete, check`, {
     };
     let text;
     const checkSyntax = async (sourceCode) => {
-      const fs = __require("fs");
       const os = __require("os");
-      const { promisify } = __require("util");
-      const execAsync = promisify(__require("child_process").exec);
+      const fs = __require("fs");
       const tmpFile = `${os.tmpdir()}/supacloud_edge_${Date.now()}.ts`;
-      fs.writeFileSync(tmpFile, sourceCode);
+      await Bun.write(tmpFile, sourceCode);
       try {
-        await execAsync(`bun build ${tmpFile} --external='*'`);
-        return { ok: true };
+        const proc = Bun.spawn(["bun", "build", tmpFile, "--external=*"], {
+          stdout: "pipe",
+          stderr: "pipe"
+        });
+        const exitCode = await proc.exited;
+        if (exitCode === 0) {
+          return { ok: true };
+        }
+        const stdout = await new Response(proc.stdout).text();
+        const stderr = await new Response(proc.stderr).text();
+        return { ok: false, err: stdout + `
+` + (stderr || `exit code ${exitCode}`) };
       } catch (e) {
-        return { ok: false, err: e.stdout + `
-` + (e.stderr || e.message) };
+        return { ok: false, err: e.message || String(e) };
       } finally {
         try {
           fs.unlinkSync(tmpFile);
@@ -33159,8 +33176,6 @@ Actions: list, deploy, deploy_bundle, source, delete, check`, {
       try {
         const fs = __require("fs");
         const os = __require("os");
-        const { promisify } = __require("util");
-        const execAsync = promisify(__require("child_process").exec);
         const stat = fs.statSync(pathArg);
         let entrypoint = pathArg;
         if (stat.isDirectory()) {
@@ -33171,10 +33186,17 @@ Actions: list, deploy, deploy_bundle, source, delete, check`, {
         }
         const tmpOut = `${os.tmpdir()}/supacloud_bundled_${Date.now()}.js`;
         try {
-          const { stderr } = await execAsync(`bun build ${entrypoint} --target bun --outfile ${tmpOut}`);
-          if (!fs.existsSync(tmpOut))
-            throw new Error(`Bundle failed: ${stderr}`);
-          code = fs.readFileSync(tmpOut, "utf-8");
+          const proc = Bun.spawn(["bun", "build", entrypoint, "--target", "bun", "--outfile", tmpOut], {
+            stdout: "pipe",
+            stderr: "pipe"
+          });
+          const exitCode = await proc.exited;
+          const stderr = await new Response(proc.stderr).text();
+          const fileHandle = Bun.file(tmpOut);
+          if (exitCode !== 0 || !await fileHandle.exists()) {
+            throw new Error(`Bundle failed: ${stderr || `exit code ${exitCode}`}`);
+          }
+          code = await fileHandle.text();
         } finally {
           try {
             fs.unlinkSync(tmpOut);
@@ -35610,7 +35632,7 @@ Actions: list_releases, get_release, upload_release, activate_release`, {
 // package.json
 var package_default = {
   name: "@supacloud/admin",
-  version: "0.24.1",
+  version: "0.24.2",
   description: "Platform administration CLI for SupaCloud operators",
   type: "module",
   main: "./dist/index.js",
@@ -35643,13 +35665,16 @@ var package_default = {
   },
   dependencies: {
     typebox: "1.3.34",
-    "@supacloud/cli": "0.67.0",
+    "@supacloud/cli": "0.68.1",
     ssh2: "^1.17.0"
   },
   devDependencies: {
     "@types/bun": "^1.4.2",
     "@types/ssh2": "^1.15.6",
     typescript: "^7.0.2"
+  },
+  overrides: {
+    "@graphql-tools/utils": "^12.0.3"
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@supacloud/admin",
-  "version": "0.24.1",
+  "version": "0.24.2",
   "description": "Platform administration CLI for SupaCloud operators",
   "type": "module",
   "main": "./dist/index.js",
@@ -33,12 +33,15 @@
   },
   "dependencies": {
     "typebox": "1.3.34",
-    "@supacloud/cli": "0.67.0",
+    "@supacloud/cli": "0.68.1",
     "ssh2": "^1.17.0"
   },
   "devDependencies": {
     "@types/bun": "^1.4.2",
     "@types/ssh2": "^1.15.6",
     "typescript": "^7.0.2"
+  },
+  "overrides": {
+    "@graphql-tools/utils": "^12.0.3"
   }
 }