@spunto/build 0.10.0 → 0.11.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spunto/build",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "Spunto's shared Build engine — the devcontainer image protocol and VS Code extension registry clients, with no database, no HTTP framework and no UI.",
   "type": "module",
   "license": "MIT",

package/src/script/index.ts

@@ -21,6 +21,7 @@ export {
   buildSetupScript,
   buildStartScript,
   buildWorkerScript,
+  DEFAULT_IDE_PORT,
   defaultVscodeUserSettings,
   IMAGE_RECIPE_VERSION,
   resolveRepoBranch,

package/src/script/setup-script.ts

@@ -1215,10 +1215,25 @@ export type StartScriptParams = {
    * the image build used. Absent/unusable = Open VSX.
    */
   extensionsGallery?: string | null
+  /**
+   * The port code-server listens on, 8080 by default (what every worker and the proxy's `code` host
+   * assume). For a box where 8080 is taken by the host itself — a Blaxel sandbox's own API.
+   */
+  idePort?: number
+}
+
+/** code-server's port when the caller doesn't say otherwise. */
+export const DEFAULT_IDE_PORT = 8080
+
+function idePortOf(port: number | undefined): number {
+  if (port === undefined) return DEFAULT_IDE_PORT
+  if (!Number.isInteger(port) || port < 1 || port > 65535) throw new Error(`idePort must be a TCP port, got ${port}`)
+  return port
 }
 
 export function buildStartScript(params: StartScriptParams): { script: string; hasDinD: boolean } {
   const { project, sshGatewayPublicKey, colorTabsByProject, extensionsGallery } = params
+  const idePort = idePortOf(params.idePort)
   const homeDir = "/home/vscode"
   const username = "vscode"
 
@@ -1338,7 +1353,7 @@ export function buildStartScript(params: StartScriptParams): { script: string; h
   // ── 4c. Restore the user's PORT secret for code-server's own terminal panel ─
   // code-server reads $PORT to override --bind-addr (see § 5 below), so its
   // whole process tree — including the integrated terminal it spawns — inherits
-  // PORT=8080 unless corrected. `terminal.integrated.env.linux` lets VS Code
+  // PORT=<idePort> unless corrected. `terminal.integrated.env.linux` lets VS Code
   // inject env overrides into terminals it spawns without touching the server
   // process itself, so a `PORT` project secret still reaches the user's shell.
   // Uses code-server's own bundled node (guaranteed present regardless of the
@@ -1387,12 +1402,12 @@ export function buildStartScript(params: StartScriptParams): { script: string; h
     "while true; do",
     '  VSCODE_PROXY_URI="${PUBLIC_PROTOCOL}://${WORKER_SLUG}-{{port}}.${BASE_DOMAIN}" \\',
     // PORT is overridden here (not unset globally) so a project secret named
-    // PORT can't make code-server bind elsewhere. This also leaks PORT=8080
+    // PORT can't make code-server bind elsewhere. This also leaks PORT=<idePort>
     // into code-server's own process tree (its integrated terminal included) —
     // § 4c above restores the original value for that terminal specifically.
     // apps/agent/src/terminal.ts (dashboard's separate terminal feature) is a
     // different process tree entirely and was never affected.
-    "    PORT=8080 code-server --bind-addr 0.0.0.0:8080 --auth none /workspace 2>&1",
+    `    PORT=${idePort} code-server --bind-addr 0.0.0.0:${idePort} --auth none /workspace 2>&1`,
     '  echo "[start] code-server exited ($?), restarting in 3s..."',
     "  sleep 3",
     "done",
@@ -1491,6 +1506,7 @@ export type SetupPhase = {
 // deleted once WORKER_SETUP_ORCHESTRATOR=agent becomes the default. See RFC 0017 §2.1.
 export function buildContainerScript(params: StartScriptParams): { script: string; hasDinD: boolean } {
   const { project, sshGatewayPublicKey, colorTabsByProject, extensionsGallery } = params
+  const idePort = idePortOf(params.idePort)
   const homeDir = "/home/vscode"
   const username = "vscode"
 
@@ -1621,7 +1637,7 @@ export function buildContainerScript(params: StartScriptParams): { script: strin
     ...galleryExport(extensionsGallery),
     "while true; do",
     '  VSCODE_PROXY_URI="${PUBLIC_PROTOCOL}://${WORKER_SLUG}-{{port}}.${BASE_DOMAIN}" \\',
-    "    PORT=8080 code-server --bind-addr 0.0.0.0:8080 --auth none /workspace 2>&1",
+    `    PORT=${idePort} code-server --bind-addr 0.0.0.0:${idePort} --auth none /workspace 2>&1`,
     '  echo "[start] code-server exited ($?), restarting in 3s..."',
     "  sleep 3",
     "done",