@fedify/sqlite 2.3.0-dev.994 → 2.3.0-pr.809.36

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/sqlite",
-  "version": "2.3.0-dev.994+9071ca0a",
+  "version": "2.3.0-pr.809.36+c592d116",
   "license": "MIT",
   "exports": {
     ".": "./src/mod.ts",

package/dist/adapter.d.cts

@@ -1,3 +1,4 @@
+/// <reference lib="esnext.temporal" />
 //#region src/adapter.d.ts
 /**
 * SQLite database adapter.

package/dist/adapter.d.ts

@@ -1,5 +1,4 @@
-import { Temporal } from "@js-temporal/polyfill";
-
+/// <reference lib="esnext.temporal" />
 //#region src/adapter.d.ts
 /**
 * SQLite database adapter.

package/dist/kv.cjs

@@ -26,6 +26,8 @@ const logger = (0, _logtape_logtape.getLogger)([
 * ```
 */
 var SqliteKvStore = class SqliteKvStore {
+	db;
+	options;
 	static #defaultTableName = "fedify_kv";
 	static #tableNameRegex = /^[A-Za-z_][A-Za-z0-9_]{0,63}$/;
 	#db;

package/dist/kv.d.cts

@@ -1,3 +1,4 @@
+/// <reference lib="esnext.temporal" />
 import { PlatformDatabase } from "#sqlite";
 import { KvKey, KvStore, KvStoreListEntry, KvStoreSetOptions } from "@fedify/fedify";
 

package/dist/kv.d.ts

@@ -1,4 +1,4 @@
-import { Temporal } from "@js-temporal/polyfill";
+/// <reference lib="esnext.temporal" />
 import { PlatformDatabase } from "#sqlite";
 import { KvKey, KvStore, KvStoreListEntry, KvStoreSetOptions } from "@fedify/fedify";
 

package/dist/kv.js

@@ -25,6 +25,8 @@ const logger = getLogger([
 * ```
 */
 var SqliteKvStore = class SqliteKvStore {
+	db;
+	options;
 	static #defaultTableName = "fedify_kv";
 	static #tableNameRegex = /^[A-Za-z_][A-Za-z0-9_]{0,63}$/;
 	#db;

package/dist/mod.d.cts

@@ -1,3 +1,4 @@
+/// <reference lib="esnext.temporal" />
 import { SqliteKvStore } from "./kv.cjs";
 import { SqliteMessageQueue } from "./mq.cjs";
 export { SqliteKvStore, SqliteMessageQueue };

package/dist/mod.d.ts

@@ -1,4 +1,4 @@
-import { Temporal } from "@js-temporal/polyfill";
+/// <reference lib="esnext.temporal" />
 import { SqliteKvStore } from "./kv.js";
 import { SqliteMessageQueue } from "./mq.js";
 export { SqliteKvStore, SqliteMessageQueue };

package/dist/mod.js

@@ -1,4 +1,4 @@
-import "@js-temporal/polyfill";
+import { Temporal } from "@js-temporal/polyfill";
 import { SqliteKvStore } from "./kv.js";
 import { SqliteMessageQueue } from "./mq.js";
 export { SqliteKvStore, SqliteMessageQueue };

package/dist/mq.cjs

@@ -35,6 +35,8 @@ var EnqueueEvent = class extends Event {
 * ```
 */
 var SqliteMessageQueue = class SqliteMessageQueue {
+	db;
+	options;
 	static #defaultTableName = "fedify_message";
 	static #tableNameRegex = /^[A-Za-z_][A-Za-z0-9_]{0,63}$/;
 	static #notifyChannels = /* @__PURE__ */ new Map();
@@ -150,6 +152,24 @@ var SqliteMessageQueue = class SqliteMessageQueue {
 		});
 	}
 	/**
+	* {@inheritDoc MessageQueue.getDepth}
+	*/
+	async getDepth() {
+		this.initialize();
+		const row = await this.#retryOnBusy(() => {
+			const now = Temporal.Now.instant().epochMilliseconds;
+			return this.#db.prepare(`SELECT
+            COUNT(*) AS queued,
+            COALESCE(SUM(CASE WHEN scheduled <= ? THEN 1 ELSE 0 END), 0) AS ready
+          FROM "${this.#tableName}"`).get(now);
+		});
+		return {
+			queued: row.queued,
+			ready: row.ready,
+			delayed: Math.max(0, row.queued - row.ready)
+		};
+	}
+	/**
 	* {@inheritDoc MessageQueue.listen}
 	*/
 	async listen(handler, options) {

package/dist/mq.d.cts

@@ -1,5 +1,6 @@
+/// <reference lib="esnext.temporal" />
 import { PlatformDatabase } from "#sqlite";
-import { MessageQueue, MessageQueueEnqueueOptions, MessageQueueListenOptions } from "@fedify/fedify";
+import { MessageQueue, MessageQueueDepth, MessageQueueEnqueueOptions, MessageQueueListenOptions } from "@fedify/fedify";
 
 //#region src/mq.d.ts
 /**
@@ -86,6 +87,10 @@ declare class SqliteMessageQueue implements MessageQueue, Disposable {
   */
   enqueueMany(messages: readonly any[], options?: MessageQueueEnqueueOptions): Promise<void>;
   /**
+  * {@inheritDoc MessageQueue.getDepth}
+  */
+  getDepth(): Promise<MessageQueueDepth>;
+  /**
   * {@inheritDoc MessageQueue.listen}
   */
   listen(handler: (message: any) => Promise<void> | void, options?: MessageQueueListenOptions): Promise<void>;

package/dist/mq.d.ts

@@ -1,6 +1,6 @@
-import { Temporal } from "@js-temporal/polyfill";
+/// <reference lib="esnext.temporal" />
 import { PlatformDatabase } from "#sqlite";
-import { MessageQueue, MessageQueueEnqueueOptions, MessageQueueListenOptions } from "@fedify/fedify";
+import { MessageQueue, MessageQueueDepth, MessageQueueEnqueueOptions, MessageQueueListenOptions } from "@fedify/fedify";
 
 //#region src/mq.d.ts
 /**
@@ -87,6 +87,10 @@ declare class SqliteMessageQueue implements MessageQueue, Disposable {
   */
   enqueueMany(messages: readonly any[], options?: MessageQueueEnqueueOptions): Promise<void>;
   /**
+  * {@inheritDoc MessageQueue.getDepth}
+  */
+  getDepth(): Promise<MessageQueueDepth>;
+  /**
   * {@inheritDoc MessageQueue.listen}
   */
   listen(handler: (message: any) => Promise<void> | void, options?: MessageQueueListenOptions): Promise<void>;

package/dist/mq.js

@@ -35,6 +35,8 @@ var EnqueueEvent = class extends Event {
 * ```
 */
 var SqliteMessageQueue = class SqliteMessageQueue {
+	db;
+	options;
 	static #defaultTableName = "fedify_message";
 	static #tableNameRegex = /^[A-Za-z_][A-Za-z0-9_]{0,63}$/;
 	static #notifyChannels = /* @__PURE__ */ new Map();
@@ -150,6 +152,24 @@ var SqliteMessageQueue = class SqliteMessageQueue {
 		});
 	}
 	/**
+	* {@inheritDoc MessageQueue.getDepth}
+	*/
+	async getDepth() {
+		this.initialize();
+		const row = await this.#retryOnBusy(() => {
+			const now = Temporal.Now.instant().epochMilliseconds;
+			return this.#db.prepare(`SELECT
+            COUNT(*) AS queued,
+            COALESCE(SUM(CASE WHEN scheduled <= ? THEN 1 ELSE 0 END), 0) AS ready
+          FROM "${this.#tableName}"`).get(now);
+		});
+		return {
+			queued: row.queued,
+			ready: row.ready,
+			delayed: Math.max(0, row.queued - row.ready)
+		};
+	}
+	/**
 	* {@inheritDoc MessageQueue.listen}
 	*/
 	async listen(handler, options) {

package/dist/sqlite.bun.cjs

@@ -3,6 +3,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 let bun_sqlite = require("bun:sqlite");
 //#region src/sqlite.bun.ts
 var SqliteDatabase = class {
+	db;
 	constructor(db) {
 		this.db = db;
 	}
@@ -17,6 +18,7 @@ var SqliteDatabase = class {
 	}
 };
 var SqliteStatement = class {
+	stmt;
 	constructor(stmt) {
 		this.stmt = stmt;
 	}

package/dist/sqlite.bun.d.cts

@@ -1,3 +1,4 @@
+/// <reference lib="esnext.temporal" />
 import { SqliteDatabaseAdapter, SqliteStatementAdapter } from "./adapter.cjs";
 import { Database, Statement } from "bun:sqlite";
 

package/dist/sqlite.bun.d.ts

@@ -1,4 +1,4 @@
-import { Temporal } from "@js-temporal/polyfill";
+/// <reference lib="esnext.temporal" />
 import { SqliteDatabaseAdapter, SqliteStatementAdapter } from "./adapter.js";
 import { Database, Statement } from "bun:sqlite";
 

package/dist/sqlite.bun.js

@@ -1,7 +1,8 @@
-import "@js-temporal/polyfill";
+import { Temporal } from "@js-temporal/polyfill";
 import { Database } from "bun:sqlite";
 //#region src/sqlite.bun.ts
 var SqliteDatabase = class {
+	db;
 	constructor(db) {
 		this.db = db;
 	}
@@ -16,6 +17,7 @@ var SqliteDatabase = class {
 	}
 };
 var SqliteStatement = class {
+	stmt;
 	constructor(stmt) {
 		this.stmt = stmt;
 	}

package/dist/sqlite.node.cjs

@@ -3,6 +3,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 let node_sqlite = require("node:sqlite");
 //#region src/sqlite.node.ts
 var SqliteDatabase = class {
+	db;
 	constructor(db) {
 		this.db = db;
 	}
@@ -17,6 +18,7 @@ var SqliteDatabase = class {
 	}
 };
 var SqliteStatement = class {
+	stmt;
 	constructor(stmt) {
 		this.stmt = stmt;
 	}

package/dist/sqlite.node.d.cts

@@ -1,3 +1,4 @@
+/// <reference lib="esnext.temporal" />
 import { SqliteDatabaseAdapter, SqliteStatementAdapter } from "./adapter.cjs";
 import { DatabaseSync, StatementSync } from "node:sqlite";
 

package/dist/sqlite.node.d.ts

@@ -1,4 +1,4 @@
-import { Temporal } from "@js-temporal/polyfill";
+/// <reference lib="esnext.temporal" />
 import { SqliteDatabaseAdapter, SqliteStatementAdapter } from "./adapter.js";
 import { DatabaseSync, StatementSync } from "node:sqlite";
 

package/dist/sqlite.node.js

@@ -1,7 +1,8 @@
-import "@js-temporal/polyfill";
+import { Temporal } from "@js-temporal/polyfill";
 import { DatabaseSync } from "node:sqlite";
 //#region src/sqlite.node.ts
 var SqliteDatabase = class {
+	db;
 	constructor(db) {
 		this.db = db;
 	}
@@ -16,6 +17,7 @@ var SqliteDatabase = class {
 	}
 };
 var SqliteStatement = class {
+	stmt;
 	constructor(stmt) {
 		this.stmt = stmt;
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/sqlite",
-  "version": "2.3.0-dev.994+9071ca0a",
+  "version": "2.3.0-pr.809.36+c592d116",
   "description": "SQLite drivers for Fedify",
   "keywords": [
     "fedify",
@@ -68,17 +68,17 @@
   },
   "dependencies": {
     "@js-temporal/polyfill": "^0.5.1",
-    "@logtape/logtape": "^2.0.5",
-    "es-toolkit": "^1.31.0"
+    "@logtape/logtape": "^2.1.0",
+    "es-toolkit": "^1.46.1"
   },
   "peerDependencies": {
-    "@fedify/fedify": "^2.3.0-dev.994+9071ca0a"
+    "@fedify/fedify": "^2.3.0-pr.809.36+c592d116"
   },
   "devDependencies": {
     "@std/async": "npm:@jsr/std__async@^1.0.13",
-    "tsdown": "^0.21.6",
-    "typescript": "^5.9.2",
-    "@fedify/testing": "^2.3.0-dev.994+9071ca0a"
+    "tsdown": "^0.22.0",
+    "typescript": "^6.0.0",
+    "@fedify/testing": "^2.3.0-pr.809.36+c592d116"
   },
   "scripts": {
     "build:self": "tsdown",

package/src/mq.test.ts

@@ -2,10 +2,14 @@ import { PlatformDatabase } from "#sqlite";
 import { test } from "@fedify/fixture";
 import { SqliteMessageQueue } from "@fedify/sqlite/mq";
 import { getRandomKey, testMessageQueue } from "@fedify/testing";
+import * as temporal from "@js-temporal/polyfill";
+import assert from "node:assert/strict";
 import { mkdtemp } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 
+const Temporal = globalThis.Temporal ?? temporal.Temporal;
+
 const dbDir = await mkdtemp(join(tmpdir(), "fedify-sqlite-"));
 const dbPath = join(dbDir, `${getRandomKey("sqlite")}.db`);
 const db = new PlatformDatabase(dbPath);
@@ -22,3 +26,29 @@ test("SqliteMessageQueue", () =>
     },
     { testOrderingKey: true },
   ));
+
+test("SqliteMessageQueue.getDepth()", async () => {
+  const dbPath = join(dbDir, `${getRandomKey("sqlite_depth")}.db`);
+  const db = new PlatformDatabase(dbPath);
+  const tableName = getRandomKey("message_depth").replaceAll("-", "_");
+  const mq = new SqliteMessageQueue(db, { tableName });
+  try {
+    assert.deepStrictEqual(await mq.getDepth(), {
+      queued: 0,
+      ready: 0,
+      delayed: 0,
+    });
+    await mq.enqueue("ready");
+    await mq.enqueue("delayed", {
+      delay: Temporal.Duration.from({ hours: 1 }),
+    });
+    assert.deepStrictEqual(await mq.getDepth(), {
+      queued: 2,
+      ready: 1,
+      delayed: 1,
+    });
+  } finally {
+    mq.drop();
+    mq[Symbol.dispose]();
+  }
+});

package/src/mq.ts

@@ -1,6 +1,7 @@
 import { type PlatformDatabase, SqliteDatabase } from "#sqlite";
 import type {
   MessageQueue,
+  MessageQueueDepth,
   MessageQueueEnqueueOptions,
   MessageQueueListenOptions,
 } from "@fedify/fedify";
@@ -260,6 +261,29 @@ export class SqliteMessageQueue implements MessageQueue, Disposable {
     });
   }
 
+  /**
+   * {@inheritDoc MessageQueue.getDepth}
+   */
+  async getDepth(): Promise<MessageQueueDepth> {
+    this.initialize();
+    const row = await this.#retryOnBusy(() => {
+      const now = Temporal.Now.instant().epochMilliseconds;
+      return this.#db
+        .prepare(
+          `SELECT
+            COUNT(*) AS queued,
+            COALESCE(SUM(CASE WHEN scheduled <= ? THEN 1 ELSE 0 END), 0) AS ready
+          FROM "${this.#tableName}"`,
+        )
+        .get(now) as { queued: number; ready: number };
+    });
+    return {
+      queued: row.queued,
+      ready: row.ready,
+      delayed: Math.max(0, row.queued - row.ready),
+    };
+  }
+
   /**
    * {@inheritDoc MessageQueue.listen}
    */

package/tsdown.config.ts

@@ -29,16 +29,13 @@ export default defineConfig({
       defaultHandler(warning);
     },
   },
-  outputOptions(outputOptions, format) {
-    if (format === "cjs") {
-      outputOptions.intro = `
-        const { Temporal } = require("@js-temporal/polyfill");
-      `;
-    } else {
-      outputOptions.intro = `
-        import { Temporal } from "@js-temporal/polyfill";
-      `;
-    }
-    return outputOptions;
+  banner({ format }) {
+    const js = format === "cjs"
+      ? `const { Temporal } = require("@js-temporal/polyfill");`
+      : `import { Temporal } from "@js-temporal/polyfill";`;
+    return {
+      js,
+      dts: `/// <reference lib="esnext.temporal" />`,
+    };
   },
 });