@effectstream/db 0.103.3 → 0.104.0

package/migrations/system-version.ts

@@ -4,11 +4,10 @@ import { until } from "effection";
 import * as migrationFiles from "./assets.ts";
 import {
   acquireDBMutex,
-  getLatestProcessedBlockHeight,
-  getLatestVersion,
   releaseDBMutex,
-  tableExists,
-} from "@effectstream/db";
+} from "../src/pg-connection.ts";
+import { getLatestProcessedBlockHeight } from "../src/sql/block-heights.queries.ts";
+import { getLatestVersion, tableExists } from "../src/sql/system.queries.ts";
 type VERSION = `${number}.${number}.${number}`;
 type VERSION_NUMBER = [number, number, number];
 // NOTE Hardcoded on purpose: the engine cannot read a package manifest at

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effectstream/db",
-  "version": "0.103.3",
+  "version": "0.104.0",
   "license": "(MIT OR Apache-2.0)",
   "homepage": "https://effectstream.github.io/docs/",
   "repository": {
@@ -21,11 +21,11 @@
     "./version": "./migrations/system-version.ts"
   },
   "dependencies": {
-    "@effectstream/coroutine": "0.103.3",
-    "@effectstream/log": "0.103.3",
-    "@effectstream/runtime": "0.103.3",
-    "@effectstream/sync": "0.103.3",
-    "@effectstream/utils": "0.103.3",
+    "@effectstream/coroutine": "0.104.0",
+    "@effectstream/log": "0.104.0",
+    "@effectstream/runtime": "0.104.0",
+    "@effectstream/sync": "0.104.0",
+    "@effectstream/utils": "0.104.0",
     "@electric-sql/pglite": "^0.3.14",
     "@pgtyped/runtime": "2.4.2",
     "@pgtyped/parser": "2.4.2",

package/scripts/apply-migrations.ts

@@ -1,7 +1,7 @@
 import { getConnection } from "../src/pg-connection.ts";
 import { getMigrations } from "../migrations/system-version.ts";
 import type { Client } from "pg";
-import { insertPaimaEngineMigration } from "@effectstream/db";
+import { insertPaimaEngineMigration } from "../src/sql/system.queries.ts";
 
 export async function applyMigrations(
   db: Client,

package/scripts/start-pglite.ts

@@ -10,6 +10,7 @@ import { args, cwd } from "@effectstream/utils/runtime";
 export interface PgliteHandle {
   server: net.Server;
   db: PGlite;
+  port: number;
   close: () => Promise<void>;
 }
 
@@ -67,18 +68,43 @@ export async function startPglite(port = 5432): Promise<PgliteHandle> {
     });
   });
 
-  await new Promise<void>((resolve) => {
-    server.listen(port, () => {
-      console.info(`database: server listening on port ${port}`);
+  const sockets = new Set<net.Socket>();
+  server.on("connection", (socket) => {
+    sockets.add(socket);
+    socket.once("close", () => sockets.delete(socket));
+  });
+
+  await new Promise<void>((resolve, reject) => {
+    server.once("error", reject);
+    server.listen(port, "127.0.0.1", () => {
+      server.off("error", reject);
       resolve();
     });
   });
 
+  const address = server.address();
+  if (!address || typeof address === "string") {
+    await db.close();
+    throw new Error("Unable to determine the PGlite gateway port.");
+  }
+  const actualPort = address.port;
+  console.info(`database: server listening on port ${actualPort}`);
+
+  let closed = false;
+
   return {
     server,
     db,
+    port: actualPort,
     close: async () => {
-      server.close();
+      if (closed) return;
+      closed = true;
+      for (const socket of sockets) socket.destroy();
+      if (server.listening) {
+        await new Promise<void>((resolve, reject) => {
+          server.close((error) => error ? reject(error) : resolve());
+        });
+      }
       await db.close();
     },
   };