@fedify/postgres 0.4.0-dev.31 → 1.8.0-dev.933

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright 2024 Hong Minhee
+Copyright 2024–2025 Hong Minhee
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

package/deno.json

@@ -1,34 +1,22 @@
 {
   "name": "@fedify/postgres",
-  "version": "0.4.0-dev.31+c73d0d82",
+  "version": "1.8.0-dev.933+d27d22f2",
   "license": "MIT",
   "exports": {
     ".": "./mod.ts",
-    "./kv": "./src/kv.ts",
-    "./mq": "./src/mq.ts"
-  },
-  "imports": {
-    "@deno/dnt": "jsr:@deno/dnt@^0.41.3",
-    "@fedify/fedify": "jsr:@fedify/fedify@1.7.2",
-    "@logtape/logtape": "jsr:@logtape/logtape@^1.0.0",
-    "@std/assert": "jsr:@std/assert@^1.0.4",
-    "@std/async": "jsr:@std/async@^1.0.5",
-    "postgres": "npm:postgres@^3.4.7",
-    "tsdown": "npm:tsdown@^0.12.9"
+    "./kv": "./kv.ts",
+    "./mq": "./mq.ts"
   },
   "nodeModulesDir": "none",
   "unstable": [
     "temporal"
   ],
   "exclude": [
-    ".github",
-    ".test-report.xml",
-    "npm",
-    "pnpm-lock.yaml"
+    "dist",
+    "node_modules"
   ],
   "tasks": {
-    "check": "deno fmt --check && deno lint && deno check */*.ts",
-    "test": "deno test --allow-net --allow-env",
-    "dnt": "deno run -A dnt.ts"
+    "check": "deno fmt --check && deno lint && deno check *.ts",
+    "test": "deno test --allow-net --allow-env"
   }
-}
+}

package/dist/kv.d.ts

@@ -0,0 +1,60 @@
+import { Temporal } from "@js-temporal/polyfill";
+import { Sql } from "postgres";
+import { KvKey, KvStore, KvStoreSetOptions } from "@fedify/fedify";
+
+//#region kv.d.ts
+/**
+ * Options for the PostgreSQL key-value store.
+ */
+interface PostgresKvStoreOptions {
+  /**
+   * The table name to use for the key-value store.
+   * `"fedify_kv_v2"` by default.
+   * @default `"fedify_kv_v2"`
+   */
+  tableName?: string;
+  /**
+   * Whether the table has been initialized.  `false` by default.
+   * @default `false`
+   */
+  initialized?: boolean;
+}
+/**
+ * A key-value store that uses PostgreSQL as the underlying storage.
+ *
+ * @example
+ * ```ts
+ * import { createFederation } from "@fedify/fedify";
+ * import { PostgresKvStore } from "@fedify/postgres";
+ * import postgres from "postgres";
+ *
+ * const federation = createFederation({
+ *   // ...
+ *   kv: new PostgresKvStore(postgres("postgres://user:pass@localhost/db")),
+ * });
+ * ```
+ */
+declare class PostgresKvStore implements KvStore {
+  #private;
+  /**
+   * Creates a new PostgreSQL key-value store.
+   * @param sql The PostgreSQL client to use.
+   * @param options The options for the key-value store.
+   */
+  constructor(sql: Sql<{}>, options?: PostgresKvStoreOptions);
+  get<T = unknown>(key: KvKey): Promise<T | undefined>;
+  set(key: KvKey, value: unknown, options?: KvStoreSetOptions | undefined): Promise<void>;
+  delete(key: KvKey): Promise<void>;
+  /**
+   * Creates the table used by the key-value store if it does not already exist.
+   * Does nothing if the table already exists.
+   */
+  initialize(): Promise<void>;
+  /**
+   * Drops the table used by the key-value store.  Does nothing if the table
+   * does not exist.
+   */
+  drop(): Promise<void>;
+}
+//#endregion
+export { PostgresKvStore, PostgresKvStoreOptions };

package/dist/kv.js

@@ -0,0 +1,115 @@
+
+      import { Temporal } from "@js-temporal/polyfill";
+    
+import { driverSerializesJson } from "./utils.js";
+import { getLogger } from "@logtape/logtape";
+
+//#region kv.ts
+const logger = getLogger([
+	"fedify",
+	"postgres",
+	"kv"
+]);
+/**
+* A key-value store that uses PostgreSQL as the underlying storage.
+*
+* @example
+* ```ts
+* import { createFederation } from "@fedify/fedify";
+* import { PostgresKvStore } from "@fedify/postgres";
+* import postgres from "postgres";
+*
+* const federation = createFederation({
+*   // ...
+*   kv: new PostgresKvStore(postgres("postgres://user:pass@localhost/db")),
+* });
+* ```
+*/
+var PostgresKvStore = class {
+	#sql;
+	#tableName;
+	#initialized;
+	#driverSerializesJson = false;
+	/**
+	* Creates a new PostgreSQL key-value store.
+	* @param sql The PostgreSQL client to use.
+	* @param options The options for the key-value store.
+	*/
+	constructor(sql, options = {}) {
+		this.#sql = sql;
+		this.#tableName = options.tableName ?? "fedify_kv_v2";
+		this.#initialized = options.initialized ?? false;
+	}
+	async #expire() {
+		await this.#sql`
+      DELETE FROM ${this.#sql(this.#tableName)}
+      WHERE ttl IS NOT NULL AND created + ttl < CURRENT_TIMESTAMP;
+    `;
+	}
+	async get(key) {
+		await this.initialize();
+		const result = await this.#sql`
+      SELECT value
+      FROM ${this.#sql(this.#tableName)}
+      WHERE key = ${key} AND (ttl IS NULL OR created + ttl > CURRENT_TIMESTAMP);
+    `;
+		if (result.length < 1) return void 0;
+		return result[0].value;
+	}
+	async set(key, value, options) {
+		await this.initialize();
+		const ttl = options?.ttl == null ? null : options.ttl.toString();
+		await this.#sql`
+      INSERT INTO ${this.#sql(this.#tableName)} (key, value, ttl)
+      VALUES (
+        ${key},
+        ${this.#json(value)},
+        ${ttl}
+      )
+      ON CONFLICT (key)
+        DO UPDATE SET value = EXCLUDED.value, ttl = EXCLUDED.ttl;
+    `;
+		await this.#expire();
+	}
+	async delete(key) {
+		await this.initialize();
+		await this.#sql`
+      DELETE FROM ${this.#sql(this.#tableName)}
+      WHERE key = ${key};
+    `;
+		await this.#expire();
+	}
+	/**
+	* Creates the table used by the key-value store if it does not already exist.
+	* Does nothing if the table already exists.
+	*/
+	async initialize() {
+		if (this.#initialized) return;
+		logger.debug("Initializing the key-value store table {tableName}...", { tableName: this.#tableName });
+		await this.#sql`
+      CREATE UNLOGGED TABLE IF NOT EXISTS ${this.#sql(this.#tableName)} (
+        key text[] PRIMARY KEY,
+        value jsonb NOT NULL,
+        created timestamp with time zone DEFAULT CURRENT_TIMESTAMP,
+        ttl interval
+      );
+    `;
+		this.#driverSerializesJson = await driverSerializesJson(this.#sql);
+		this.#initialized = true;
+		logger.debug("Initialized the key-value store table {tableName}.", { tableName: this.#tableName });
+	}
+	/**
+	* Drops the table used by the key-value store.  Does nothing if the table
+	* does not exist.
+	*/
+	async drop() {
+		await this.#sql`DROP TABLE IF EXISTS ${this.#sql(this.#tableName)};`;
+	}
+	#json(value) {
+		if (this.#driverSerializesJson) return this.#sql.json(value);
+		return this.#sql.json(JSON.stringify(value));
+	}
+};
+
+//#endregion
+export { PostgresKvStore };

package/dist/mod.d.ts

@@ -0,0 +1,4 @@
+import { Temporal } from "@js-temporal/polyfill";
+import { PostgresKvStore, PostgresKvStoreOptions } from "./kv.js";
+import { PostgresMessageQueue, PostgresMessageQueueOptions } from "./mq.js";
+export { PostgresKvStore, PostgresKvStoreOptions, PostgresMessageQueue, PostgresMessageQueueOptions };

package/dist/mod.js

@@ -0,0 +1,7 @@
+
+      import { Temporal } from "@js-temporal/polyfill";
+    
+import { PostgresKvStore } from "./kv.js";
+import { PostgresMessageQueue } from "./mq.js";
+
+export { PostgresKvStore, PostgresMessageQueue };

package/dist/mq.d.ts

@@ -0,0 +1,66 @@
+import { Temporal } from "@js-temporal/polyfill";
+import { Sql } from "postgres";
+import { MessageQueue, MessageQueueEnqueueOptions, MessageQueueListenOptions } from "@fedify/fedify";
+
+//#region mq.d.ts
+/**
+ * Options for the PostgreSQL message queue.
+ */
+interface PostgresMessageQueueOptions {
+  /**
+   * The table name to use for the message queue.
+   * `"fedify_message_v2"` by default.
+   * @default `"fedify_message_v2"`
+   */
+  tableName?: string;
+  /**
+   * The channel name to use for the message queue.
+   * `"fedify_channel"` by default.
+   * @default `"fedify_channel"`
+   */
+  channelName?: string;
+  /**
+   * Whether the table has been initialized.  `false` by default.
+   * @default `false`
+   */
+  initialized?: boolean;
+  /**
+   * The poll interval for the message queue.  5 seconds by default.
+   * @default `{ seconds: 5 }`
+   */
+  pollInterval?: Temporal.Duration | Temporal.DurationLike;
+}
+/**
+ * A message queue that uses PostgreSQL as the underlying storage.
+ *
+ * @example
+ * ```ts
+ * import { createFederation } from "@fedify/fedify";
+ * import { PostgresKvStore, PostgresMessageQueue } from "@fedify/postgres";
+ * import postgres from "postgres";
+ *
+ * const sql = postgres("postgres://user:pass@localhost/db");
+ *
+ * const federation = createFederation({
+ *   kv: new PostgresKvStore(sql),
+ *   queue: new PostgresMessageQueue(sql),
+ * });
+ * ```
+ */
+declare class PostgresMessageQueue implements MessageQueue {
+  #private;
+  constructor(sql: Sql<{}>, options?: PostgresMessageQueueOptions);
+  enqueue(message: any, options?: MessageQueueEnqueueOptions): Promise<void>;
+  enqueueMany(messages: any[], options?: MessageQueueEnqueueOptions): Promise<void>;
+  listen(handler: (message: any) => void | Promise<void>, options?: MessageQueueListenOptions): Promise<void>;
+  /**
+   * Initializes the message queue table if it does not already exist.
+   */
+  initialize(): Promise<void>;
+  /**
+   * Drops the message queue table if it exists.
+   */
+  drop(): Promise<void>;
+}
+//#endregion
+export { PostgresMessageQueue, PostgresMessageQueueOptions };

package/dist/mq.js

@@ -0,0 +1,185 @@
+
+      import { Temporal } from "@js-temporal/polyfill";
+    
+import { driverSerializesJson } from "./utils.js";
+import { getLogger } from "@logtape/logtape";
+import postgres from "postgres";
+
+//#region mq.ts
+const logger = getLogger([
+	"fedify",
+	"postgres",
+	"mq"
+]);
+/**
+* A message queue that uses PostgreSQL as the underlying storage.
+*
+* @example
+* ```ts
+* import { createFederation } from "@fedify/fedify";
+* import { PostgresKvStore, PostgresMessageQueue } from "@fedify/postgres";
+* import postgres from "postgres";
+*
+* const sql = postgres("postgres://user:pass@localhost/db");
+*
+* const federation = createFederation({
+*   kv: new PostgresKvStore(sql),
+*   queue: new PostgresMessageQueue(sql),
+* });
+* ```
+*/
+var PostgresMessageQueue = class {
+	#sql;
+	#tableName;
+	#channelName;
+	#pollIntervalMs;
+	#initialized;
+	#driverSerializesJson = false;
+	constructor(sql, options = {}) {
+		this.#sql = sql;
+		this.#tableName = options?.tableName ?? "fedify_message_v2";
+		this.#channelName = options?.channelName ?? "fedify_channel";
+		this.#pollIntervalMs = Temporal.Duration.from(options?.pollInterval ?? { seconds: 5 }).total("millisecond");
+		this.#initialized = options?.initialized ?? false;
+	}
+	async enqueue(message, options) {
+		await this.initialize();
+		const delay = options?.delay ?? Temporal.Duration.from({ seconds: 0 });
+		if (options?.delay) logger.debug("Enqueuing a message with a delay of {delay}...", {
+			delay,
+			message
+		});
+		else logger.debug("Enqueuing a message...", { message });
+		await this.#sql`
+      INSERT INTO ${this.#sql(this.#tableName)} (message, delay)
+      VALUES (
+        ${this.#json(message)},
+        ${delay.toString()}
+      );
+    `;
+		logger.debug("Enqueued a message.", { message });
+		await this.#sql.notify(this.#channelName, delay.toString());
+		logger.debug("Notified the message queue channel {channelName}.", {
+			channelName: this.#channelName,
+			message
+		});
+	}
+	async enqueueMany(messages, options) {
+		if (messages.length === 0) return;
+		await this.initialize();
+		const delay = options?.delay ?? Temporal.Duration.from({ seconds: 0 });
+		if (options?.delay) logger.debug("Enqueuing messages with a delay of {delay}...", {
+			delay,
+			messages
+		});
+		else logger.debug("Enqueuing messages...", { messages });
+		for (const message of messages) await this.#sql`
+        INSERT INTO ${this.#sql(this.#tableName)} (message, delay)
+        VALUES (
+          ${this.#json(message)},
+          ${delay.toString()}
+        );
+      `;
+		logger.debug("Enqueued messages.", { messages });
+		await this.#sql.notify(this.#channelName, delay.toString());
+		logger.debug("Notified the message queue channel {channelName}.", {
+			channelName: this.#channelName,
+			messages
+		});
+	}
+	async listen(handler, options = {}) {
+		await this.initialize();
+		const { signal } = options;
+		const poll = async () => {
+			while (!signal?.aborted) {
+				const query = this.#sql`
+          DELETE FROM ${this.#sql(this.#tableName)}
+          WHERE id = (
+            SELECT id
+            FROM ${this.#sql(this.#tableName)}
+            WHERE created + delay < CURRENT_TIMESTAMP
+            ORDER BY created
+            LIMIT 1
+          )
+          RETURNING message;
+        `.execute();
+				const cancel = query.cancel.bind(query);
+				signal?.addEventListener("abort", cancel);
+				let i = 0;
+				for (const message of await query) {
+					if (signal?.aborted) return;
+					await handler(message.message);
+					i++;
+				}
+				signal?.removeEventListener("abort", cancel);
+				if (i < 1) break;
+			}
+		};
+		const timeouts = /* @__PURE__ */ new Set();
+		const listen = await this.#sql.listen(this.#channelName, async (delay) => {
+			const duration = Temporal.Duration.from(delay);
+			const durationMs = duration.total("millisecond");
+			if (durationMs < 1) await poll();
+			else timeouts.add(setTimeout(poll, durationMs));
+		}, poll);
+		signal?.addEventListener("abort", () => {
+			listen.unlisten();
+			for (const timeout of timeouts) clearTimeout(timeout);
+		});
+		while (!signal?.aborted) {
+			let timeout;
+			await new Promise((resolve) => {
+				signal?.addEventListener("abort", resolve);
+				timeout = setTimeout(() => {
+					signal?.removeEventListener("abort", resolve);
+					resolve(0);
+				}, this.#pollIntervalMs);
+				timeouts.add(timeout);
+			});
+			if (timeout != null) timeouts.delete(timeout);
+			await poll();
+		}
+		await new Promise((resolve) => {
+			signal?.addEventListener("abort", () => resolve());
+			if (signal?.aborted) return resolve();
+		});
+	}
+	/**
+	* Initializes the message queue table if it does not already exist.
+	*/
+	async initialize() {
+		if (this.#initialized) return;
+		logger.debug("Initializing the message queue table {tableName}...", { tableName: this.#tableName });
+		try {
+			await this.#sql`
+      CREATE TABLE IF NOT EXISTS ${this.#sql(this.#tableName)} (
+        id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        message jsonb NOT NULL,
+        delay interval DEFAULT '0 seconds',
+        created timestamp with time zone DEFAULT CURRENT_TIMESTAMP
+      );
+    `;
+		} catch (error) {
+			if (!(error instanceof postgres.PostgresError && error.constraint_name === "pg_type_typname_nsp_index")) {
+				logger.error("Failed to initialize the message queue table: {error}", { error });
+				throw error;
+			}
+		}
+		this.#driverSerializesJson = await driverSerializesJson(this.#sql);
+		this.#initialized = true;
+		logger.debug("Initialized the message queue table {tableName}.", { tableName: this.#tableName });
+	}
+	/**
+	* Drops the message queue table if it exists.
+	*/
+	async drop() {
+		await this.#sql`DROP TABLE IF EXISTS ${this.#sql(this.#tableName)};`;
+	}
+	#json(value) {
+		if (this.#driverSerializesJson) return this.#sql.json(value);
+		return this.#sql.json(JSON.stringify(value));
+	}
+};
+
+//#endregion
+export { PostgresMessageQueue };

package/dist/utils.js

@@ -0,0 +1,11 @@
+
+      import { Temporal } from "@js-temporal/polyfill";
+    
+//#region utils.ts
+async function driverSerializesJson(sql) {
+	const result = await sql`SELECT ${sql.json("{\"foo\":1}")}::jsonb AS test;`;
+	return result[0].test === "{\"foo\":1}";
+}
+
+//#endregion
+export { driverSerializesJson };

package/{src/kv.test.ts → kv.test.ts}

@@ -31,6 +31,7 @@ function getStore(): {
 }
 
 test("PostgresKvStore.initialize()", { skip: dbUrl == null }, async () => {
+  if (dbUrl == null) return; // Bun does not support skip option
   const { sql, tableName, store } = getStore();
   try {
     await store.initialize();
@@ -45,6 +46,7 @@ test("PostgresKvStore.initialize()", { skip: dbUrl == null }, async () => {
 });
 
 test("PostgresKvStore.get()", { skip: dbUrl == null }, async () => {
+  if (dbUrl == null) return; // Bun does not support skip option
   const { sql, tableName, store } = getStore();
   try {
     await store.initialize();
@@ -67,6 +69,7 @@ test("PostgresKvStore.get()", { skip: dbUrl == null }, async () => {
 });
 
 test("PostgresKvStore.set()", { skip: dbUrl == null }, async () => {
+  if (dbUrl == null) return; // Bun does not support skip option
   const { sql, tableName, store } = getStore();
   try {
     await store.set(["foo", "baz"], "baz");
@@ -107,6 +110,7 @@ test("PostgresKvStore.set()", { skip: dbUrl == null }, async () => {
 });
 
 test("PostgresKvStore.delete()", { skip: dbUrl == null }, async () => {
+  if (dbUrl == null) return; // Bun does not support skip option
   const { sql, tableName, store } = getStore();
   try {
     await store.delete(["foo", "bar"]);
@@ -122,6 +126,7 @@ test("PostgresKvStore.delete()", { skip: dbUrl == null }, async () => {
 });
 
 test("PostgresKvStore.drop()", { skip: dbUrl == null }, async () => {
+  if (dbUrl == null) return; // Bun does not support skip option
   const { sql, tableName, store } = getStore();
   try {
     await store.drop();

package/mod.ts

@@ -1 +1,2 @@
-export * from "./src/mod.ts";
+export * from "./kv.ts";
+export * from "./mq.ts";

package/{src/mq.test.ts → mq.test.ts}

@@ -16,6 +16,7 @@ if ("Temporal" in globalThis) {
 const dbUrl = process.env.DATABASE_URL;
 
 test("PostgresMessageQueue", { skip: dbUrl == null }, async () => {
+  if (dbUrl == null) return; // Bun does not support skip option
   const sql = postgres(dbUrl!);
   const sql2 = postgres(dbUrl!);
   const tableName = `fedify_message_test_${

package/{src/mq.ts → mq.ts}

@@ -47,14 +47,14 @@ export interface PostgresMessageQueueOptions {
  * @example
  * ```ts
  * import { createFederation } from "@fedify/fedify";
- * import { PostgresMessageQueue } from "@fedify/postgres";
+ * import { PostgresKvStore, PostgresMessageQueue } from "@fedify/postgres";
  * import postgres from "postgres";
  *
+ * const sql = postgres("postgres://user:pass@localhost/db");
+ *
  * const federation = createFederation({
- *   // ...
- *   queue: new PostgresMessageQueue(
- *     postgres("postgres://user:pass@localhost/db")
- *   ),
+ *   kv: new PostgresKvStore(sql),
+ *   queue: new PostgresMessageQueue(sql),
  * });
  * ```
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/postgres",
-  "version": "0.4.0-dev.31",
+  "version": "1.8.0-dev.933+d27d22f2",
   "description": "PostgreSQL drivers for Fedify",
   "keywords": [
     "fedify",
@@ -13,31 +13,35 @@
     "email": "hong@minhee.org",
     "url": "https://hongminhee.org/"
   },
-  "homepage": "https://github.com/fedify-dev/postgres",
+  "homepage": "https://fedify.dev/",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/fedify-dev/postgres.git"
+    "url": "git+https://github.com/fedify-dev/fedify.git",
+    "directory": "postgres"
   },
   "bugs": {
-    "url": "https://github.com/fedify-dev/postgres/issues"
+    "url": "https://github.com/fedify-dev/fedify/issues"
   },
   "funding": [
     "https://opencollective.com/fedify",
     "https://github.com/sponsors/dahlia"
   ],
   "type": "module",
+  "main": "./dist/mod.js",
+  "module": "./dist/mod.js",
+  "types": "./dist/mod.d.ts",
   "exports": {
-    "./mod": {
+    ".": {
       "types": "./dist/mod.d.ts",
       "import": "./dist/mod.js"
     },
     "./kv": {
-      "types": "./dist/src/kv.d.ts",
-      "import": "./dist/src/kv.js"
+      "types": "./dist/kv.d.ts",
+      "import": "./dist/kv.js"
     },
     "./mq": {
-      "types": "./dist/src/mq.d.ts",
-      "import": "./dist/src/mq.js"
+      "types": "./dist/mq.d.ts",
+      "import": "./dist/mq.js"
     },
     "./package.json": "./package.json"
   },
@@ -46,11 +50,11 @@
     "@logtape/logtape": "^1.0.0"
   },
   "peerDependencies": {
-    "@fedify/fedify": "^1.7.2",
-    "postgres": "^3.4.7"
+    "postgres": "^3.4.7",
+    "@fedify/fedify": "1.8.0-dev.933+d27d22f2"
   },
   "devDependencies": {
-    "@std/async": "npm:@jsr/std__async@^1.0.5",
+    "@std/async": "npm:@jsr/std__async@^1.0.13",
     "tsdown": "^0.12.9",
     "typescript": "^5.8.3"
   },

package/tsdown.config.ts

@@ -1,8 +1,9 @@
 import { defineConfig } from "tsdown";
 
 export default defineConfig({
-  entry: ["mod.ts", "src/kv.ts", "src/mq.ts"],
+  entry: ["mod.ts", "kv.ts", "mq.ts"],
   dts: true,
+  unbundle: true,
   platform: "node",
   outputOptions: {
     intro: `

package/.github/FUNDING.yaml

@@ -1,2 +0,0 @@
-open_collective: fedify
-github: dahlia