@pasko70/pibo 2.3.0 → 2.4.0

package/dist/compute/pool/store.js

@@ -0,0 +1,239 @@
+import { mkdirSync } from "node:fs";
+import { chmodSync } from "node:fs";
+import { dirname, resolve } from "node:path";
+import { DatabaseSync } from "node:sqlite";
+function slotFromRow(row) {
+    return {
+        id: row.id,
+        ordinal: row.ordinal,
+        webPort: row.web_port,
+        gatewayPort: row.gateway_port,
+        publicUrl: row.public_url ?? undefined,
+        state: row.state,
+        activeLeaseId: row.active_lease_id ?? undefined,
+        dirtyReason: row.dirty_reason ?? undefined,
+        updatedAt: row.updated_at,
+    };
+}
+function leaseFromRow(row) {
+    return {
+        id: row.id,
+        slotId: row.slot_id,
+        holder: row.holder,
+        seedMode: row.seed_mode,
+        artifactSha256: row.artifact_sha256,
+        artifactRuntimePath: row.artifact_runtime_path,
+        packageVersion: row.package_version ?? undefined,
+        commit: row.commit_sha ?? undefined,
+        containerName: row.container_name,
+        publicUrl: row.public_url ?? undefined,
+        status: row.status,
+        createdAt: row.created_at,
+        expiresAt: row.expires_at,
+        renewedAt: row.renewed_at ?? undefined,
+        releasedAt: row.released_at ?? undefined,
+        failedAt: row.failed_at ?? undefined,
+        failureSnapshotPath: row.failure_snapshot_path ?? undefined,
+        lastError: row.last_error ?? undefined,
+    };
+}
+export class DeploymentPoolStore {
+    path;
+    db;
+    constructor(path, slots) {
+        this.path = path === ":memory:" ? path : resolve(path);
+        if (this.path !== ":memory:")
+            mkdirSync(dirname(this.path), { recursive: true, mode: 0o700 });
+        this.db = new DatabaseSync(this.path);
+        this.db.exec("PRAGMA busy_timeout = 10000");
+        if (this.path !== ":memory:")
+            this.db.exec("PRAGMA journal_mode = WAL");
+        this.applySchema();
+        this.ensureSlots(slots);
+        if (this.path !== ":memory:")
+            chmodSync(this.path, 0o600);
+    }
+    applySchema() {
+        this.db.exec(`
+			CREATE TABLE IF NOT EXISTS deployment_pool_slots (
+				id TEXT PRIMARY KEY,
+				ordinal INTEGER NOT NULL UNIQUE,
+				web_port INTEGER NOT NULL UNIQUE,
+				gateway_port INTEGER NOT NULL UNIQUE,
+				public_url TEXT,
+				state TEXT NOT NULL,
+				active_lease_id TEXT,
+				dirty_reason TEXT,
+				updated_at TEXT NOT NULL
+			);
+			CREATE TABLE IF NOT EXISTS deployment_pool_leases (
+				id TEXT PRIMARY KEY,
+				slot_id TEXT NOT NULL,
+				holder TEXT NOT NULL,
+				seed_mode TEXT NOT NULL,
+				artifact_sha256 TEXT NOT NULL,
+				artifact_runtime_path TEXT NOT NULL,
+				package_version TEXT,
+				commit_sha TEXT,
+				container_name TEXT NOT NULL,
+				public_url TEXT,
+				status TEXT NOT NULL,
+				created_at TEXT NOT NULL,
+				expires_at TEXT NOT NULL,
+				renewed_at TEXT,
+				released_at TEXT,
+				failed_at TEXT,
+				failure_snapshot_path TEXT,
+				last_error TEXT
+			);
+			CREATE INDEX IF NOT EXISTS deployment_pool_leases_status_idx
+				ON deployment_pool_leases (status, expires_at);
+			CREATE INDEX IF NOT EXISTS deployment_pool_leases_slot_idx
+				ON deployment_pool_leases (slot_id, created_at DESC);
+		`);
+    }
+    ensureSlots(slots) {
+        const now = new Date().toISOString();
+        const insert = this.db.prepare(`
+			INSERT INTO deployment_pool_slots (id, ordinal, web_port, gateway_port, public_url, state, updated_at)
+			VALUES (?, ?, ?, ?, ?, 'free', ?)
+			ON CONFLICT(id) DO UPDATE SET
+				ordinal=excluded.ordinal,
+				web_port=excluded.web_port,
+				gateway_port=excluded.gateway_port,
+				public_url=excluded.public_url
+		`);
+        for (const slot of slots)
+            insert.run(slot.id, slot.ordinal, slot.webPort, slot.gatewayPort, slot.publicUrl ?? null, now);
+    }
+    listSlots() {
+        return this.db.prepare("SELECT * FROM deployment_pool_slots ORDER BY ordinal").all().map(slotFromRow);
+    }
+    getSlot(id) {
+        const row = this.db.prepare("SELECT * FROM deployment_pool_slots WHERE id = ?").get(id);
+        return row ? slotFromRow(row) : undefined;
+    }
+    listLeases(options = {}) {
+        const where = options.includeInactive ? "" : "WHERE status IN ('provisioning', 'ready', 'releasing')";
+        return this.db.prepare(`SELECT * FROM deployment_pool_leases ${where} ORDER BY created_at DESC`).all().map(leaseFromRow);
+    }
+    getLease(id) {
+        const row = this.db.prepare("SELECT * FROM deployment_pool_leases WHERE id = ?").get(id);
+        return row ? leaseFromRow(row) : undefined;
+    }
+    reserveLease(input) {
+        this.db.exec("BEGIN IMMEDIATE");
+        try {
+            const active = this.db.prepare("SELECT COUNT(*) AS count FROM deployment_pool_slots WHERE state IN ('provisioning', 'ready', 'releasing')").get();
+            if (Number(active.count) >= input.maxActive) {
+                const nearest = this.db.prepare(`
+					SELECT MIN(l.expires_at) AS nearest_expiry
+					FROM deployment_pool_slots s
+					JOIN deployment_pool_leases l ON l.id = s.active_lease_id
+					WHERE s.state IN ('provisioning', 'ready', 'releasing')
+				`).get();
+                throw new Error(`Deployment pool capacity reached (${input.maxActive} active)${nearest.nearest_expiry ? `; nearest expiry ${nearest.nearest_expiry}` : ""}`);
+            }
+            const row = this.db.prepare("SELECT * FROM deployment_pool_slots WHERE state = 'free' ORDER BY ordinal LIMIT 1").get();
+            if (!row)
+                throw new Error("No free deployment pool slot is available");
+            const slot = slotFromRow(row);
+            const containerName = `pibo-pool-${slot.id}`;
+            this.db.prepare(`
+				INSERT INTO deployment_pool_leases (
+					id, slot_id, holder, seed_mode, artifact_sha256, artifact_runtime_path,
+					package_version, commit_sha, container_name, public_url, status, created_at, expires_at
+				) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'provisioning', ?, ?)
+			`).run(input.id, slot.id, input.holder, input.seedMode, input.artifactSha256, input.artifactRuntimePath, input.packageVersion ?? null, input.commit ?? null, containerName, slot.publicUrl ?? null, input.createdAt, input.expiresAt);
+            this.db.prepare("UPDATE deployment_pool_slots SET state='provisioning', active_lease_id=?, dirty_reason=NULL, updated_at=? WHERE id=?")
+                .run(input.id, input.createdAt, slot.id);
+            this.db.exec("COMMIT");
+            return { slot: this.getSlot(slot.id), lease: this.getLease(input.id) };
+        }
+        catch (error) {
+            this.db.exec("ROLLBACK");
+            throw error;
+        }
+    }
+    markReady(leaseId, now = new Date().toISOString()) {
+        const lease = this.requireLease(leaseId);
+        this.db.exec("BEGIN IMMEDIATE");
+        try {
+            this.db.prepare("UPDATE deployment_pool_leases SET status='ready', last_error=NULL WHERE id=?").run(leaseId);
+            this.db.prepare("UPDATE deployment_pool_slots SET state='ready', dirty_reason=NULL, updated_at=? WHERE id=? AND active_lease_id=?")
+                .run(now, lease.slotId, leaseId);
+            this.db.exec("COMMIT");
+            return this.requireLease(leaseId);
+        }
+        catch (error) {
+            this.db.exec("ROLLBACK");
+            throw error;
+        }
+    }
+    markReleasing(leaseId, now = new Date().toISOString()) {
+        const lease = this.requireLease(leaseId);
+        this.db.prepare("UPDATE deployment_pool_leases SET status='releasing' WHERE id=? AND status IN ('provisioning','ready','releasing')").run(leaseId);
+        this.db.prepare("UPDATE deployment_pool_slots SET state='releasing', updated_at=? WHERE id=? AND active_lease_id=?").run(now, lease.slotId, leaseId);
+        return this.requireLease(leaseId);
+    }
+    markReleased(leaseId, status, now = new Date().toISOString()) {
+        const lease = this.requireLease(leaseId);
+        this.db.exec("BEGIN IMMEDIATE");
+        try {
+            this.db.prepare("UPDATE deployment_pool_leases SET status=?, released_at=?, last_error=NULL WHERE id=?").run(status, now, leaseId);
+            this.db.prepare("UPDATE deployment_pool_slots SET state='free', active_lease_id=NULL, dirty_reason=NULL, updated_at=? WHERE id=? AND active_lease_id=?")
+                .run(now, lease.slotId, leaseId);
+            this.db.exec("COMMIT");
+            return this.requireLease(leaseId);
+        }
+        catch (error) {
+            this.db.exec("ROLLBACK");
+            throw error;
+        }
+    }
+    markFailed(leaseId, error, snapshotPath, options = { slotClean: false }) {
+        const lease = this.requireLease(leaseId);
+        const now = options.now ?? new Date().toISOString();
+        this.db.exec("BEGIN IMMEDIATE");
+        try {
+            this.db.prepare("UPDATE deployment_pool_leases SET status='failed', failed_at=?, failure_snapshot_path=?, last_error=? WHERE id=?")
+                .run(now, snapshotPath ?? null, error, leaseId);
+            if (options.slotClean) {
+                this.db.prepare("UPDATE deployment_pool_slots SET state='free', active_lease_id=NULL, dirty_reason=NULL, updated_at=? WHERE id=? AND active_lease_id=?")
+                    .run(now, lease.slotId, leaseId);
+            }
+            else {
+                this.db.prepare("UPDATE deployment_pool_slots SET state='dirty', dirty_reason=?, updated_at=? WHERE id=? AND active_lease_id=?")
+                    .run(error, now, lease.slotId, leaseId);
+            }
+            this.db.exec("COMMIT");
+            return this.requireLease(leaseId);
+        }
+        catch (caught) {
+            this.db.exec("ROLLBACK");
+            throw caught;
+        }
+    }
+    renewLease(leaseId, holder, expiresAt, now = new Date().toISOString()) {
+        const result = this.db.prepare(`
+			UPDATE deployment_pool_leases SET expires_at=?, renewed_at=?
+			WHERE id=? AND holder=? AND status='ready'
+		`).run(expiresAt, now, leaseId, holder);
+        if (Number(result.changes ?? 0) !== 1)
+            throw new Error(`Active deployment lease "${leaseId}" for holder "${holder}" was not found`);
+        return this.requireLease(leaseId);
+    }
+    freeDirtySlot(slotId, now = new Date().toISOString()) {
+        this.db.prepare("UPDATE deployment_pool_slots SET state='free', active_lease_id=NULL, dirty_reason=NULL, updated_at=? WHERE id=?")
+            .run(now, slotId);
+    }
+    requireLease(id) {
+        const lease = this.getLease(id);
+        if (!lease)
+            throw new Error(`Deployment lease "${id}" was not found`);
+        return lease;
+    }
+    close() {
+        this.db.close();
+    }
+}

package/dist/compute/pool/types.js

@@ -0,0 +1 @@
+export {};

package/dist/resources/lifecycle.js

@@ -6,6 +6,8 @@ import { promisify } from "node:util";
 import { applyComputeWorkerReapPlan, buildComputeWorkerReapPlan, planReapWorkers, } from "../compute/docker.js";
 import { defaultBrowserPoolRoot, defaultBrowserUseHome, getComputeResourceHealth, parseProcessList, } from "../compute/resource-health.js";
 import { loadBrowserPoolState, reapIdleBrowserPool, } from "../tools/browser-pool.js";
+import { resolveDeploymentPoolConfig } from "../compute/pool/config.js";
+import { applyDeploymentPoolReapPlan, planDeploymentPoolReap } from "../compute/pool/service.js";
 const execFileAsync = promisify(execFile);
 export async function collectManagedBrowserPools(rootDir) {
     const records = [];
@@ -56,7 +58,7 @@ export async function getActiveResourceLeases(browserPoolRoot = defaultBrowserPo
 export async function planResourceReap(options = {}) {
     const now = options.now ?? new Date();
     const resolved = resolveReapOptions(options);
-    const [records, staleFiles, compute, health] = await Promise.all([
+    const [records, staleFiles, compute, health, deploymentPool] = await Promise.all([
         collectManagedBrowserPools(resolved.browserPoolRoot),
         planStaleCdpFiles(resolved.browserUseHome),
         planComputeReapSafely({ includeDev: resolved.includeDev, maxAgeMinutes: resolved.maxAgeMinutes, now }),
@@ -66,9 +68,10 @@ export async function planResourceReap(options = {}) {
             browserUseHome: resolved.browserUseHome,
             exemptBrowserUserDataDirs: [],
         }),
+        planDeploymentPoolReapSafely(now),
     ]);
     const unmanagedBrowsers = buildUnmanagedBrowserPlanItems(health.browserProcesses.unassignedMainProcessDetails, resolved.unmanagedBrowserGraceMinutes, new Set(resolved.exemptBrowserPids), new Set(resolved.exemptBrowserUserDataDirs), resolved.browserUseHome);
-    return buildResourceReapPlan({ now, options: resolved, records, staleFiles, unmanagedBrowsers, compute });
+    return buildResourceReapPlan({ now, options: resolved, records, staleFiles, unmanagedBrowsers, compute, deploymentPool });
 }
 export function buildResourceReapPlan(input) {
     const browserItems = input.records.map((record) => buildBrowserReapPlanItem(record, input.now, input.options.idleTimeoutMinutes));
@@ -89,6 +92,7 @@ export function buildResourceReapPlan(input) {
             skipped: unmanagedBrowsers.filter((item) => item.action === "skip").length,
         },
         compute: input.compute,
+        deploymentPool: input.deploymentPool,
         worktreesPreserved: true,
     };
 }
@@ -112,6 +116,9 @@ export async function applyResourceReapPlan(plan, dependencies = {}) {
     }
     const removedStaleFiles = await applyStaleCdpFilePlan(confirmed.staleFiles.items, dependencies.isPidAlive);
     const removedComputeWorkers = await (dependencies.applyCompute ?? applyComputeWorkerReapPlan)(confirmed.compute);
+    const deploymentPoolResult = confirmed.deploymentPool
+        ? await (dependencies.applyDeploymentPool ?? applyDeploymentPoolReapPlan)(confirmed.deploymentPool)
+        : undefined;
     return {
         applied: true,
         plan: confirmed,
@@ -119,6 +126,8 @@ export async function applyResourceReapPlan(plan, dependencies = {}) {
         terminatedUnmanagedBrowsers,
         removedStaleFiles,
         removedComputeWorkers,
+        deploymentPoolResult,
+        removedDeploymentLeases: deploymentPoolResult?.releasedLeases ?? [],
         worktreesPreserved: true,
     };
 }
@@ -287,6 +296,17 @@ export async function planComputeReapSafely(options, planCompute = planReapWorke
         return plan;
     }
 }
+async function planDeploymentPoolReapSafely(now) {
+    const config = resolveDeploymentPoolConfig();
+    if (!existsSync(config.databasePath))
+        return undefined;
+    try {
+        return await planDeploymentPoolReap({ config, now });
+    }
+    catch {
+        return undefined;
+    }
+}
 async function planStaleCdpFiles(browserUseHome, isPidAlive = defaultIsPidAlive) {
     const stateDir = join(browserUseHome, "pibo-cdp");
     let files;

package/dist/resources/reaper.js

@@ -95,6 +95,7 @@ export class ResourceReaperService {
                     unmanagedBrowsers: result.terminatedUnmanagedBrowsers.length,
                     staleFiles: result.removedStaleFiles.length,
                     computeWorkers: result.removedComputeWorkers.length,
+                    ...(result.deploymentPoolResult ? { deploymentLeases: result.removedDeploymentLeases?.length ?? 0 } : {}),
                 },
                 lastError: undefined,
             };

package/dist/web/channel.js

@@ -78,7 +78,13 @@ export function stripSocketPeerHeaderFromResponse(response) {
         headers,
     });
 }
-function createRequestBaseURL(nodeRequest, host, port) {
+function createRequestBaseURL(nodeRequest, host, port, canonicalBaseURL) {
+    const requestHost = firstHeaderValue(nodeRequest.headers.host);
+    if (canonicalBaseURL && requestHost) {
+        const canonical = new URL(canonicalBaseURL);
+        if (requestHost.toLowerCase() === canonical.host.toLowerCase())
+            return canonical.origin;
+    }
     if (isLoopbackAddress(nodeRequest.socket.remoteAddress)) {
         const forwardedHost = firstHeaderValue(nodeRequest.headers["x-forwarded-host"]);
         const forwardedProto = firstHeaderValue(nodeRequest.headers["x-forwarded-proto"]);
@@ -86,7 +92,7 @@ function createRequestBaseURL(nodeRequest, host, port) {
             return `${forwardedProto}://${forwardedHost}`;
         }
     }
-    return `http://${nodeRequest.headers.host ?? `${host}:${port}`}`;
+    return `http://${requestHost ?? `${host}:${port}`}`;
 }
 function isActiveRunStatus(status) {
     return typeof status === "string" && ["queued", "starting", "running", "streaming", "waiting", "blocked", "retrying", "compacting", "pausing"].includes(status);
@@ -235,7 +241,7 @@ export function createWebHostChannel(options = {}) {
     };
     const handleRequest = async (nodeRequest, nodeResponse) => {
         try {
-            const baseURL = createRequestBaseURL(nodeRequest, host, port);
+            const baseURL = createRequestBaseURL(nodeRequest, host, port, options.canonicalBaseURL);
             const baseRequest = await nodeRequestToWebRequest(nodeRequest, baseURL);
             // Inject the TCP socket peer into every request so the local auth
             // plugin can apply the same loopback predicate from `getSession`

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@pasko70/pibo",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@pasko70/pibo",
-      "version": "2.3.0",
+      "version": "2.4.0",
       "workspaces": [
         "packages/workflows"
       ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pasko70/pibo",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "type": "module",
   "workspaces": [
     "packages/workflows"