@getpaseo/server 0.1.88 → 0.1.89

package/dist/server/server/script-proxy.js

@@ -1,245 +1,2 @@
-import http from "node:http";
-import net from "node:net";
-// ---------------------------------------------------------------------------
-// Hop-by-hop headers that must not be forwarded
-// ---------------------------------------------------------------------------
-const HOP_BY_HOP_HEADERS = new Set([
-    "connection",
-    "transfer-encoding",
-    "keep-alive",
-    "upgrade",
-    "proxy-connection",
-    "proxy-authenticate",
-    "proxy-authorization",
-    "te",
-    "trailer",
-]);
-export class ScriptRouteStore {
-    constructor() {
-        this.routes = new Map();
-        this.workspaceHostnames = new Map();
-    }
-    registerRoute(entry) {
-        const previous = this.routes.get(entry.hostname);
-        if (previous) {
-            this.removeHostnameFromWorkspaceIndex(previous.workspaceId, previous.hostname);
-        }
-        const storedEntry = { ...entry };
-        this.routes.set(storedEntry.hostname, storedEntry);
-        this.addHostnameToWorkspaceIndex(storedEntry.workspaceId, storedEntry.hostname);
-    }
-    removeRoute(hostname) {
-        const entry = this.routes.get(hostname);
-        if (!entry) {
-            return;
-        }
-        this.routes.delete(hostname);
-        this.removeHostnameFromWorkspaceIndex(entry.workspaceId, hostname);
-    }
-    removeRouteForWorkspaceScript(params) {
-        const routes = this.listRoutesForWorkspace(params.workspaceId);
-        const route = routes.find((entry) => entry.scriptName === params.scriptName);
-        if (!route) {
-            return;
-        }
-        this.removeRoute(route.hostname);
-    }
-    removeRoutesForPort(port) {
-        for (const [hostname, entry] of this.routes) {
-            if (entry.port === port) {
-                this.routes.delete(hostname);
-                this.removeHostnameFromWorkspaceIndex(entry.workspaceId, hostname);
-            }
-        }
-    }
-    findRoute(host) {
-        // Strip port suffix from the Host header value
-        const hostname = host.replace(/:\d+$/, "");
-        // 1. Exact match
-        const exactRoute = this.routes.get(hostname);
-        if (exactRoute !== undefined) {
-            return { hostname: exactRoute.hostname, port: exactRoute.port };
-        }
-        // 2. Subdomain match — walk up the labels looking for a registered parent
-        const parts = hostname.split(".");
-        for (let i = 1; i < parts.length; i++) {
-            const candidate = parts.slice(i).join(".");
-            const candidateRoute = this.routes.get(candidate);
-            if (candidateRoute !== undefined) {
-                return { hostname: candidateRoute.hostname, port: candidateRoute.port };
-            }
-        }
-        return null;
-    }
-    getRouteEntry(hostname) {
-        const entry = this.routes.get(hostname);
-        return entry ? { ...entry } : null;
-    }
-    listRoutes() {
-        return Array.from(this.routes.values()).map((entry) => Object.assign({}, entry));
-    }
-    listRoutesForWorkspace(workspaceId) {
-        const hostnames = this.workspaceHostnames.get(workspaceId);
-        if (!hostnames) {
-            return [];
-        }
-        const routes = [];
-        for (const hostname of hostnames) {
-            const entry = this.routes.get(hostname);
-            if (entry) {
-                routes.push({ ...entry });
-            }
-        }
-        return routes;
-    }
-    addHostnameToWorkspaceIndex(workspaceId, hostname) {
-        const hostnames = this.workspaceHostnames.get(workspaceId) ?? new Set();
-        hostnames.add(hostname);
-        this.workspaceHostnames.set(workspaceId, hostnames);
-    }
-    removeHostnameFromWorkspaceIndex(workspaceId, hostname) {
-        const hostnames = this.workspaceHostnames.get(workspaceId);
-        if (!hostnames) {
-            return;
-        }
-        hostnames.delete(hostname);
-        if (hostnames.size === 0) {
-            this.workspaceHostnames.delete(workspaceId);
-        }
-    }
-}
-// ---------------------------------------------------------------------------
-// Helpers
-// ---------------------------------------------------------------------------
-function stripHopByHopHeaders(rawHeaders) {
-    const out = {};
-    for (const [key, value] of Object.entries(rawHeaders)) {
-        if (value === undefined)
-            continue;
-        if (HOP_BY_HOP_HEADERS.has(key.toLowerCase()))
-            continue;
-        out[key] = value;
-    }
-    return out;
-}
-// ---------------------------------------------------------------------------
-// createScriptProxyMiddleware
-// ---------------------------------------------------------------------------
-export function createScriptProxyMiddleware({ routeStore, logger, }) {
-    return (req, res, next) => {
-        const hostHeader = req.headers.host;
-        if (!hostHeader) {
-            next();
-            return;
-        }
-        const route = routeStore.findRoute(hostHeader);
-        if (!route) {
-            next();
-            return;
-        }
-        const forwardedHeaders = stripHopByHopHeaders(req.headers);
-        forwardedHeaders["x-forwarded-for"] = req.socket.remoteAddress ?? "127.0.0.1";
-        forwardedHeaders["x-forwarded-host"] = hostHeader.replace(/:\d+$/, "");
-        forwardedHeaders["x-forwarded-proto"] = req.protocol;
-        const proxyReq = http.request({
-            hostname: "127.0.0.1",
-            port: route.port,
-            path: req.originalUrl,
-            method: req.method,
-            headers: forwardedHeaders,
-        }, (proxyRes) => {
-            const responseHeaders = stripHopByHopHeaders(proxyRes.headers);
-            res.writeHead(proxyRes.statusCode ?? 502, responseHeaders);
-            proxyRes.pipe(res, { end: true });
-        });
-        proxyReq.on("error", (err) => {
-            logger.warn({ err, hostname: route.hostname, port: route.port }, "Script proxy: upstream unreachable");
-            if (!res.headersSent) {
-                res.writeHead(502, { "content-type": "text/plain" });
-                res.end("502 Bad Gateway");
-            }
-        });
-        req.pipe(proxyReq, { end: true });
-    };
-}
-// ---------------------------------------------------------------------------
-// createScriptProxyUpgradeHandler
-// ---------------------------------------------------------------------------
-export function createScriptProxyUpgradeHandler({ routeStore, logger, }) {
-    return (req, socket, head) => {
-        const hostHeader = req.headers.host;
-        if (!hostHeader) {
-            return;
-        }
-        const route = routeStore.findRoute(hostHeader);
-        if (!route) {
-            return;
-        }
-        const targetSocket = net.connect({ host: "127.0.0.1", port: route.port }, () => {
-            // Reconstruct the raw HTTP upgrade request to send to the target
-            const forwardedHeaders = stripHopByHopHeaders(req.headers);
-            forwardedHeaders["x-forwarded-for"] = req.socket.remoteAddress ?? "127.0.0.1";
-            forwardedHeaders["x-forwarded-host"] = hostHeader.replace(/:\d+$/, "");
-            forwardedHeaders["x-forwarded-proto"] = "http";
-            // Re-include upgrade and connection headers — they are required for
-            // WebSocket handshake even though they are hop-by-hop.
-            forwardedHeaders["connection"] = "Upgrade";
-            forwardedHeaders["upgrade"] = req.headers.upgrade ?? "websocket";
-            const headerLines = [];
-            headerLines.push(`${req.method ?? "GET"} ${req.url ?? "/"} HTTP/${req.httpVersion}`);
-            for (const [key, value] of Object.entries(forwardedHeaders)) {
-                if (Array.isArray(value)) {
-                    for (const v of value) {
-                        headerLines.push(`${key}: ${v}`);
-                    }
-                }
-                else {
-                    headerLines.push(`${key}: ${value}`);
-                }
-            }
-            headerLines.push("\r\n");
-            targetSocket.write(headerLines.join("\r\n"));
-            if (head.length > 0) {
-                targetSocket.write(head);
-            }
-            // Pipe in both directions
-            targetSocket.pipe(socket);
-            socket.pipe(targetSocket);
-        });
-        targetSocket.on("error", (err) => {
-            logger.warn({ err, hostname: route.hostname, port: route.port }, "Script proxy: WebSocket upstream unreachable");
-            socket.end();
-        });
-        socket.on("error", () => {
-            targetSocket.destroy();
-        });
-    };
-}
-// ---------------------------------------------------------------------------
-// findFreePort
-// ---------------------------------------------------------------------------
-export function findFreePort() {
-    return new Promise((resolve, reject) => {
-        const server = net.createServer();
-        server.unref();
-        server.listen(0, "127.0.0.1", () => {
-            const address = server.address();
-            if (!address || typeof address === "string") {
-                server.close();
-                reject(new Error("Failed to get assigned port"));
-                return;
-            }
-            const { port } = address;
-            server.close((err) => {
-                if (err) {
-                    reject(err);
-                }
-                else {
-                    resolve(port);
-                }
-            });
-        });
-        server.on("error", reject);
-    });
-}
+export { createScriptProxyMiddleware, createScriptProxyUpgradeHandler, findFreePort, ScriptRouteStore, } from "./service-proxy.js";
 //# sourceMappingURL=script-proxy.js.map

package/dist/server/server/script-route-branch-handler.d.ts

@@ -1,7 +1,7 @@
 import type { Logger } from "pino";
-import type { ScriptRouteStore } from "./script-proxy.js";
+import type { ServiceProxySubsystem } from "./service-proxy.js";
 interface BranchChangeRouteHandlerOptions {
-    routeStore: ScriptRouteStore;
+    serviceProxy: ServiceProxySubsystem;
     onRoutesChanged: (workspaceId: string) => void;
     logger?: Logger;
 }

package/dist/server/server/script-route-branch-handler.js

@@ -1,44 +1,10 @@
-import { buildScriptHostname } from "../utils/script-hostname.js";
 export function createBranchChangeRouteHandler(options) {
     return (workspaceId, _oldBranch, newBranch) => {
-        // Only service scripts register routes, so branch renames only touch services.
-        const routes = options.routeStore.listRoutesForWorkspace(workspaceId);
-        if (routes.length === 0) {
+        const changed = options.serviceProxy.replaceWorkspaceBranchRoutes({ workspaceId, newBranch });
+        if (!changed) {
             return;
         }
-        const updates = [];
-        for (const route of routes) {
-            const newHostname = buildScriptHostname({
-                projectSlug: route.projectSlug,
-                branchName: newBranch,
-                scriptName: route.scriptName,
-            });
-            if (newHostname !== route.hostname) {
-                updates.push({
-                    oldHostname: route.hostname,
-                    newHostname,
-                    route,
-                });
-            }
-        }
-        if (updates.length === 0) {
-            return;
-        }
-        for (const { oldHostname, newHostname, route } of updates) {
-            options.routeStore.removeRoute(oldHostname);
-            options.routeStore.registerRoute({
-                hostname: newHostname,
-                port: route.port,
-                workspaceId: route.workspaceId,
-                projectSlug: route.projectSlug,
-                scriptName: route.scriptName,
-            });
-            options.logger?.info({
-                oldHostname,
-                newHostname,
-                scriptName: route.scriptName,
-            }, "Updated script route for branch rename");
-        }
+        options.logger?.info({ workspaceId, newBranch }, "Updated service proxy routes for branch rename");
         options.onRoutesChanged(workspaceId);
     };
 }

package/dist/server/server/script-status-projection.d.ts

@@ -2,7 +2,7 @@ import type { Logger } from "pino";
 import type { SessionOutboundMessage, WorkspaceScriptPayload } from "@getpaseo/protocol/messages";
 import type { PaseoConfig } from "@getpaseo/protocol/paseo-config-schema";
 import type { ScriptHealthEntry, ScriptHealthState } from "./script-health-monitor.js";
-import type { ScriptRouteStore } from "./script-proxy.js";
+import type { ServiceProxySubsystem } from "./service-proxy.js";
 import type { WorkspaceScriptRuntimeStore } from "./workspace-script-runtime-store.js";
 interface SessionEmitter {
     emit(message: SessionOutboundMessage): void;
@@ -11,9 +11,10 @@ interface BuildWorkspaceScriptPayloadsOptions {
     workspaceId: string;
     workspaceDirectory: string;
     paseoConfig: PaseoConfig | null;
-    routeStore: ScriptRouteStore;
+    serviceProxy: ServiceProxySubsystem;
     runtimeStore: WorkspaceScriptRuntimeStore;
     daemonPort: number | null;
+    serviceProxyPublicBaseUrl?: string | null;
     gitMetadata?: {
         projectSlug: string;
         currentBranch: string | null;
@@ -22,11 +23,12 @@ interface BuildWorkspaceScriptPayloadsOptions {
 }
 export declare function readPaseoConfigForProjection(workspaceDirectory: string, logger: Logger): PaseoConfig | null;
 export declare function buildWorkspaceScriptPayloads(options: BuildWorkspaceScriptPayloadsOptions): WorkspaceScriptPayload[];
-export declare function createScriptStatusEmitter({ sessions, routeStore, runtimeStore, daemonPort, resolveWorkspaceDirectory, logger, }: {
+export declare function createScriptStatusEmitter({ sessions, serviceProxy, runtimeStore, daemonPort, serviceProxyPublicBaseUrl, resolveWorkspaceDirectory, logger, }: {
     sessions: () => SessionEmitter[];
-    routeStore: ScriptRouteStore;
+    serviceProxy: ServiceProxySubsystem;
     runtimeStore: WorkspaceScriptRuntimeStore;
     daemonPort: number | null | (() => number | null);
+    serviceProxyPublicBaseUrl?: string | null;
     resolveWorkspaceDirectory: (workspaceId: string) => string | null | Promise<string | null>;
     logger: Logger;
 }): (workspaceId: string, scripts: ScriptHealthEntry[]) => void;

package/dist/server/server/script-status-projection.js

@@ -1,4 +1,3 @@
-import { buildScriptHostname } from "../utils/script-hostname.js";
 import { getScriptConfigs, isServiceScript, readPaseoConfig } from "../utils/worktree.js";
 import { deriveProjectSlug } from "./workspace-git-metadata.js";
 export function readPaseoConfigForProjection(workspaceDirectory, logger) {
@@ -15,12 +14,6 @@ function resolveDaemonPort(daemonPort) {
     }
     return daemonPort;
 }
-function toServiceProxyUrl(hostname, daemonPort) {
-    if (daemonPort === null) {
-        return null;
-    }
-    return `http://${hostname}:${daemonPort}`;
-}
 function toWireHealth(health) {
     if (health === "pending" || health === null) {
         return null;
@@ -33,48 +26,99 @@ function sortPayloads(payloads) {
         sensitivity: "base",
     }));
 }
-function buildConfiguredScriptPayload(scriptName, config, runtimeEntry, routeEntry, ctx) {
+function projectWorkspaceServiceState(params) {
+    return params.ctx.serviceProxy.projectWorkspaceServiceState({
+        workspaceId: params.workspaceId,
+        projectSlug: params.ctx.projectSlug,
+        branchName: params.ctx.branchName,
+        scriptName: params.scriptName,
+        daemonPort: params.ctx.daemonPort,
+        publicBaseUrl: params.ctx.serviceProxyPublicBaseUrl,
+    });
+}
+function buildConfiguredPlainScriptPayload(scriptName, runtimeEntry) {
+    return {
+        scriptName,
+        type: "script",
+        hostname: scriptName,
+        port: null,
+        proxyUrl: null,
+        lifecycle: runtimeEntry?.lifecycle ?? "stopped",
+        health: null,
+        exitCode: runtimeEntry?.exitCode ?? null,
+        terminalId: runtimeEntry?.terminalId ?? null,
+    };
+}
+function buildConfiguredScriptPayload(scriptName, config, runtimeEntry, serviceState, ctx) {
     const configIsService = isServiceScript(config);
-    const type = configIsService ? "service" : "script";
-    const configuredPort = configIsService ? (config.port ?? null) : null;
-    const hostname = type === "service"
-        ? (routeEntry?.hostname ??
-            buildScriptHostname({
-                projectSlug: ctx.projectSlug,
-                branchName: ctx.branchName,
-                scriptName,
-            }))
-        : scriptName;
+    if (!configIsService) {
+        return buildConfiguredPlainScriptPayload(scriptName, runtimeEntry);
+    }
+    const type = "service";
+    const configuredPort = config.port ?? null;
+    const hostname = (serviceState ??
+        ctx.serviceProxy.projectWorkspaceService({
+            projectSlug: ctx.projectSlug,
+            branchName: ctx.branchName,
+            scriptName,
+            daemonPort: ctx.daemonPort,
+            publicBaseUrl: ctx.serviceProxyPublicBaseUrl,
+        })).hostname;
+    const urls = serviceState ??
+        ctx.serviceProxy.projectUrls({
+            projectSlug: ctx.projectSlug,
+            branchName: ctx.branchName,
+            scriptName,
+            daemonPort: ctx.daemonPort,
+            publicBaseUrl: ctx.serviceProxyPublicBaseUrl,
+        });
     return {
         scriptName,
         type,
         hostname,
-        port: type === "service" ? (routeEntry?.port ?? configuredPort) : null,
-        proxyUrl: type === "service" ? toServiceProxyUrl(hostname, ctx.daemonPort) : null,
+        port: serviceState?.port ?? configuredPort,
+        localProxyUrl: urls.localProxyUrl,
+        publicProxyUrl: urls.publicProxyUrl,
+        proxyUrl: urls.proxyUrl,
         lifecycle: runtimeEntry?.lifecycle ?? "stopped",
-        health: type === "service" ? toWireHealth(ctx.resolveHealth?.(hostname) ?? null) : null,
+        health: toWireHealth(ctx.resolveHealth?.(hostname) ?? null),
         exitCode: runtimeEntry?.exitCode ?? null,
         terminalId: runtimeEntry?.terminalId ?? null,
     };
 }
-function buildOrphanRuntimePayload(runtimeEntry, routeEntry, ctx) {
+function buildOrphanRuntimePayload(runtimeEntry, serviceState, ctx) {
     const type = runtimeEntry.type;
     const hostname = type === "service"
-        ? (routeEntry?.hostname ??
-            buildScriptHostname({
+        ? (serviceState ??
+            ctx.serviceProxy.projectWorkspaceService({
                 projectSlug: ctx.projectSlug,
                 branchName: ctx.branchName,
                 scriptName: runtimeEntry.scriptName,
-            }))
+                daemonPort: ctx.daemonPort,
+                publicBaseUrl: ctx.serviceProxyPublicBaseUrl,
+            })).hostname
         : runtimeEntry.scriptName;
+    const urls = serviceState ??
+        ctx.serviceProxy.projectUrls({
+            projectSlug: ctx.projectSlug,
+            branchName: ctx.branchName,
+            scriptName: runtimeEntry.scriptName,
+            daemonPort: ctx.daemonPort,
+            publicBaseUrl: ctx.serviceProxyPublicBaseUrl,
+        });
     return {
         scriptName: runtimeEntry.scriptName,
         type,
         hostname,
-        port: type === "service" ? (routeEntry?.port ?? null) : null,
-        proxyUrl: type === "service" ? toServiceProxyUrl(hostname, ctx.daemonPort) : null,
+        port: type === "service" ? (serviceState?.port ?? null) : null,
+        ...(type === "service"
+            ? { localProxyUrl: urls.localProxyUrl, publicProxyUrl: urls.publicProxyUrl }
+            : {}),
+        proxyUrl: type === "service" ? urls.proxyUrl : null,
         lifecycle: runtimeEntry.lifecycle,
-        health: type === "service" && routeEntry ? toWireHealth(ctx.resolveHealth?.(hostname) ?? null) : null,
+        health: type === "service" && serviceState?.port !== null
+            ? toWireHealth(ctx.resolveHealth?.(hostname) ?? null)
+            : null,
         exitCode: runtimeEntry.exitCode,
         terminalId: runtimeEntry.terminalId,
     };
@@ -88,27 +132,30 @@ export function buildWorkspaceScriptPayloads(options) {
     const runtimeEntries = new Map(options.runtimeStore
         .listForWorkspace(workspaceId)
         .map((entry) => [entry.scriptName, entry]));
-    const routesByScriptName = new Map(options.routeStore
-        .listRoutesForWorkspace(workspaceId)
-        .map((entry) => [entry.scriptName, entry]));
     const ctx = {
         projectSlug,
         branchName,
         daemonPort: options.daemonPort,
+        serviceProxyPublicBaseUrl: options.serviceProxyPublicBaseUrl,
+        serviceProxy: options.serviceProxy,
         resolveHealth: options.resolveHealth,
     };
     const payloads = [];
     for (const [scriptName, config] of scriptConfigs.entries()) {
         const runtimeEntry = runtimeEntries.get(scriptName) ?? null;
-        const routeEntry = routesByScriptName.get(scriptName) ?? null;
-        payloads.push(buildConfiguredScriptPayload(scriptName, config, runtimeEntry, routeEntry, ctx));
+        const serviceState = isServiceScript(config)
+            ? projectWorkspaceServiceState({ workspaceId, scriptName, ctx })
+            : null;
+        payloads.push(buildConfiguredScriptPayload(scriptName, config, runtimeEntry, serviceState, ctx));
     }
     for (const runtimeEntry of runtimeEntries.values()) {
         if (scriptConfigs.has(runtimeEntry.scriptName) || runtimeEntry.lifecycle !== "running") {
             continue;
         }
-        const routeEntry = routesByScriptName.get(runtimeEntry.scriptName) ?? null;
-        payloads.push(buildOrphanRuntimePayload(runtimeEntry, routeEntry, ctx));
+        const serviceState = runtimeEntry.type === "service"
+            ? projectWorkspaceServiceState({ workspaceId, scriptName: runtimeEntry.scriptName, ctx })
+            : null;
+        payloads.push(buildOrphanRuntimePayload(runtimeEntry, serviceState, ctx));
     }
     return sortPayloads(payloads);
 }
@@ -121,7 +168,7 @@ function buildScriptStatusUpdateMessage(params) {
         },
     };
 }
-export function createScriptStatusEmitter({ sessions, routeStore, runtimeStore, daemonPort, resolveWorkspaceDirectory, logger, }) {
+export function createScriptStatusEmitter({ sessions, serviceProxy, runtimeStore, daemonPort, serviceProxyPublicBaseUrl, resolveWorkspaceDirectory, logger, }) {
     return (workspaceId, scripts) => {
         void (async () => {
             const workspaceDirectory = await resolveWorkspaceDirectory(workspaceId);
@@ -134,9 +181,10 @@ export function createScriptStatusEmitter({ sessions, routeStore, runtimeStore,
                 workspaceId,
                 workspaceDirectory,
                 paseoConfig: readPaseoConfigForProjection(workspaceDirectory, logger),
-                routeStore,
+                serviceProxy,
                 runtimeStore,
                 daemonPort: resolvedDaemonPort,
+                serviceProxyPublicBaseUrl,
                 resolveHealth: (hostname) => scriptHealthByHostname.get(hostname) ?? null,
             });
             const message = buildScriptStatusUpdateMessage({