@betterportal/tunnels 1.0.6 → 1.0.8

package/lib/prisma.js

@@ -1,7 +1,20 @@
 import { PrismaPg } from "@prisma/adapter-pg";
 import { PrismaClient } from "./generated/prisma/index.js";
+import { createHash, randomUUID } from "node:crypto";
+import { existsSync } from "node:fs";
+import { readdir, readFile } from "node:fs/promises";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+import { Client } from "pg";
 let prismaClient;
 let configuredConnectionString;
+let migrationConnectionString;
+let migrationPromise;
+const MIGRATION_LOCK_ID = 836466020763084328n;
+export async function initializePrisma(connectionString, obs) {
+    await runPrismaMigrations(connectionString, obs);
+    return configurePrisma(connectionString);
+}
 export function configurePrisma(connectionString) {
     if (!connectionString) {
         throw new Error("Prisma connection string is required");
@@ -18,6 +31,108 @@ export function configurePrisma(connectionString) {
     });
     return prismaClient;
 }
+async function runPrismaMigrations(connectionString, obs) {
+    if (!connectionString) {
+        throw new Error("Prisma connection string is required");
+    }
+    if (migrationPromise) {
+        if (migrationConnectionString !== connectionString) {
+            throw new Error("Prisma migrations have already been configured with a different connection string");
+        }
+        return migrationPromise;
+    }
+    migrationConnectionString = connectionString;
+    migrationPromise = applyPrismaMigrations(connectionString, obs);
+    return migrationPromise;
+}
+async function applyPrismaMigrations(connectionString, obs) {
+    const migrationsDir = findMigrationsDir();
+    const migrationNames = (await readdir(migrationsDir, { withFileTypes: true }))
+        .filter((entry) => entry.isDirectory())
+        .map((entry) => entry.name)
+        .sort();
+    const client = new Client({ connectionString });
+    await client.connect();
+    try {
+        await client.query("SELECT pg_advisory_lock($1)", [MIGRATION_LOCK_ID.toString()]);
+        await ensurePrismaMigrationsTable(client);
+        const applied = await loadAppliedMigrations(client);
+        for (const migrationName of migrationNames) {
+            const sql = await readFile(join(migrationsDir, migrationName, "migration.sql"), "utf8");
+            const checksum = createHash("sha256").update(sql).digest("hex");
+            const existing = applied.get(migrationName);
+            if (existing) {
+                if (!existing.finishedAt && !existing.rolledBackAt) {
+                    throw new Error(`Prisma migration ${migrationName} was started but not completed`);
+                }
+                if (existing.checksum !== checksum) {
+                    throw new Error(`Prisma migration ${migrationName} checksum does not match the applied migration`);
+                }
+                continue;
+            }
+            obs?.log?.info?.("Applying Prisma migration {migration}", { migration: migrationName });
+            await client.query("BEGIN");
+            try {
+                const id = randomUUID();
+                await client.query(`INSERT INTO "_prisma_migrations"
+             (id, checksum, migration_name, started_at, applied_steps_count)
+           VALUES ($1, $2, $3, now(), 0)`, [id, checksum, migrationName]);
+                if (sql.trim()) {
+                    await client.query(sql);
+                }
+                await client.query(`UPDATE "_prisma_migrations"
+           SET finished_at = now(), applied_steps_count = 1
+           WHERE migration_name = $1`, [migrationName]);
+                await client.query("COMMIT");
+            }
+            catch (error) {
+                await client.query("ROLLBACK");
+                throw error;
+            }
+        }
+    }
+    finally {
+        await client.query("SELECT pg_advisory_unlock($1)", [MIGRATION_LOCK_ID.toString()]).catch(() => undefined);
+        await client.end();
+    }
+}
+function findMigrationsDir() {
+    const start = dirname(fileURLToPath(import.meta.url));
+    const candidates = [
+        join(start, "..", "prisma", "migrations"),
+        join(start, "..", "..", "prisma", "migrations")
+    ];
+    const migrationsDir = candidates.find((candidate) => existsSync(candidate));
+    if (!migrationsDir) {
+        throw new Error(`Prisma migrations directory was not found from ${start}`);
+    }
+    return migrationsDir;
+}
+async function ensurePrismaMigrationsTable(client) {
+    await client.query(`
+    CREATE TABLE IF NOT EXISTS "_prisma_migrations" (
+      id VARCHAR(36) PRIMARY KEY NOT NULL,
+      checksum VARCHAR(64) NOT NULL,
+      finished_at TIMESTAMPTZ,
+      migration_name VARCHAR(255) NOT NULL,
+      logs TEXT,
+      rolled_back_at TIMESTAMPTZ,
+      started_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+      applied_steps_count INTEGER NOT NULL DEFAULT 0
+    )
+  `);
+}
+async function loadAppliedMigrations(client) {
+    const result = await client.query(`SELECT migration_name, checksum, finished_at, rolled_back_at FROM "_prisma_migrations"`);
+    return new Map(result.rows.map((row) => [
+        row.migration_name,
+        {
+            checksum: row.checksum,
+            finishedAt: row.finished_at,
+            rolledBackAt: row.rolled_back_at
+        }
+    ]));
+}
 export function getPrisma() {
     if (!prismaClient) {
         throw new Error("Prisma is not configured. Configure it from BSB service config before use.");

package/lib/prisma.js.map

@@ -1 +1 @@
-{"version":3,"file":"prisma.js","sourceRoot":"","sources":["../src/prisma.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,IAAI,YAAsC,CAAC;AAC3C,IAAI,0BAA8C,CAAC;AAEnD,MAAM,UAAU,eAAe,CAAC,gBAAwB;IACtD,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAC1D,CAAC;IACD,IAAI,YAAY,EAAE,CAAC;QACjB,IAAI,0BAA0B,KAAK,gBAAgB,EAAE,CAAC;YACpD,MAAM,IAAI,KAAK,CAAC,uEAAuE,CAAC,CAAC;QAC3F,CAAC;QACD,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,0BAA0B,GAAG,gBAAgB,CAAC;IAC9C,YAAY,GAAG,IAAI,YAAY,CAAC;QAC9B,OAAO,EAAE,IAAI,QAAQ,CAAC,EAAE,gBAAgB,EAAE,CAAC;KAC5C,CAAC,CAAC;IACH,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,MAAM,UAAU,SAAS;IACvB,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,4EAA4E,CAAC,CAAC;IAChG,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG,IAAI,KAAK,CAAC,EAAkB,EAAE;IAClD,GAAG,CAAC,OAAO,EAAE,QAAQ;QACnB,MAAM,MAAM,GAAG,SAAS,EAA6C,CAAC;QACtE,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC/B,OAAO,OAAO,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAClE,CAAC;CACF,CAAC,CAAC"}
+{"version":3,"file":"prisma.js","sourceRoot":"","sources":["../src/prisma.ts"],"names":[],"mappings":"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"}

package/lib/schemas/service-tunnels-admin.json

@@ -1,7 +1,7 @@
 {
   "pluginName": "service-tunnels-admin",
   "events": {},
-  "version": "1.0.6",
+  "version": "1.0.8",
   "configSchema": {
     "anyvaliVersion": "1.0",
     "schemaVersion": "1.1",

package/lib/schemas/service-tunnels-admin.plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "service-tunnels-admin",
   "name": "service-tunnels-admin",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "BetterPortal public and management UI for BetterTunnels",
   "category": "service",
   "tags": [

package/lib/schemas/service-tunnels-client.json

@@ -232,7 +232,7 @@
       }
     }
   },
-  "version": "1.0.6",
+  "version": "1.0.8",
   "configSchema": {
     "anyvaliVersion": "1.0",
     "schemaVersion": "1.1",
@@ -314,7 +314,7 @@
   "dependencies": [
     {
       "id": "betterportal/service-tunnels-proxy.js",
-      "version": "1.0.6"
+      "version": "1.0.8"
     }
   ]
 }

package/lib/schemas/service-tunnels-client.plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "service-tunnels-client",
   "name": "service-tunnels-client",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "Client websocket/API service",
   "category": "service",
   "tags": [
@@ -13,7 +13,7 @@
   "dependencies": [
     {
       "id": "betterportal/service-tunnels-proxy.js",
-      "version": "1.0.6"
+      "version": "1.0.8"
     }
   ],
   "license": "(AGPL-3.0-only OR Commercial)",

package/lib/schemas/service-tunnels-proxy.json

@@ -46,7 +46,7 @@
       "outputSchema": null
     }
   },
-  "version": "1.0.6",
+  "version": "1.0.8",
   "configSchema": {
     "anyvaliVersion": "1.0",
     "schemaVersion": "1.1",
@@ -154,7 +154,7 @@
   "dependencies": [
     {
       "id": "betterportal/service-tunnels-client.js",
-      "version": "1.0.6"
+      "version": "1.0.8"
     }
   ]
 }

package/lib/schemas/service-tunnels-proxy.plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "service-tunnels-proxy",
   "name": "service-tunnels-proxy",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "Front-facing H3 tunnel service",
   "category": "service",
   "tags": [
@@ -13,7 +13,7 @@
   "dependencies": [
     {
       "id": "betterportal/service-tunnels-client.js",
-      "version": "1.0.6"
+      "version": "1.0.8"
     }
   ],
   "license": "(AGPL-3.0-only OR Commercial)",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@betterportal/tunnels",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "type": "module",
   "license": "(AGPL-3.0-only OR Commercial)",
   "repository": {
@@ -37,8 +37,8 @@
     "check": "npm run build && npm test"
   },
   "dependencies": {
-    "@betterportal/framework": "^10.0.0",
-    "@betterportal/plugin-bsb": "^10.0.0",
+    "@betterportal/framework": "^10.0.29",
+    "@betterportal/plugin-bsb": "^10.0.29",
     "@bsb/base": "^9.6.41",
     "@bsb/config-vault": "^9.6.47",
     "@prisma/adapter-pg": "^7.8.0",