@atproto/sync 0.2.4 → 0.3.0

package/dist/runner/memory-runner.js

@@ -1,46 +1,13 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MemoryRunner = void 0;
-const p_queue_1 = __importDefault(require("p-queue"));
-const consecutive_list_1 = require("./consecutive-list");
+import PQueue from 'p-queue';
+import { ConsecutiveList } from './consecutive-list.js';
 // A queue with arbitrarily many partitions, each processing work sequentially.
 // Partitions are created lazily and taken out of memory when they go idle.
-class MemoryRunner {
+export class MemoryRunner {
     constructor(opts = {}) {
-        Object.defineProperty(this, "opts", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: opts
-        });
-        Object.defineProperty(this, "consecutive", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: new consecutive_list_1.ConsecutiveList()
-        });
-        Object.defineProperty(this, "mainQueue", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "partitions", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: new Map()
-        });
-        Object.defineProperty(this, "cursor", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.mainQueue = new p_queue_1.default({ concurrency: opts.concurrency ?? Infinity });
+        this.opts = opts;
+        this.consecutive = new ConsecutiveList();
+        this.partitions = new Map();
+        this.mainQueue = new PQueue({ concurrency: opts.concurrency ?? Infinity });
         this.cursor = opts.startCursor;
     }
     getCursor() {
@@ -56,7 +23,7 @@ class MemoryRunner {
     getPartition(partitionId) {
         let partition = this.partitions.get(partitionId);
         if (!partition) {
-            partition = new p_queue_1.default({ concurrency: 1 });
+            partition = new PQueue({ concurrency: 1 });
             partition.once('idle', () => this.partitions.delete(partitionId));
             this.partitions.set(partitionId, partition);
         }
@@ -87,5 +54,4 @@ class MemoryRunner {
         await this.mainQueue.onIdle();
     }
 }
-exports.MemoryRunner = MemoryRunner;
 //# sourceMappingURL=memory-runner.js.map

package/dist/runner/memory-runner.js.map

@@ -1 +1 @@
-{"version":3,"file":"memory-runner.js","sourceRoot":"","sources":["../../src/runner/memory-runner.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA4B;AAC5B,yDAAoD;AASpD,+EAA+E;AAC/E,2EAA2E;AAC3E,MAAa,YAAY;IAMvB,YAAmB,OAA4B,EAAE;QAArC;;;;mBAAO,IAAI;WAA0B;QALjD;;;;mBAAc,IAAI,kCAAe,EAAU;WAAA;QAC3C;;;;;WAAiB;QACjB;;;;mBAAa,IAAI,GAAG,EAAkB;WAAA;QACtC;;;;;WAA0B;QAGxB,IAAI,CAAC,SAAS,GAAG,IAAI,iBAAM,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,QAAQ,EAAE,CAAC,CAAA;QAC1E,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,WAAW,CAAA;IAChC,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,MAAM,CAAA;IACpB,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,WAAmB,EAAE,IAAyB;QAC1D,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ;YAAE,OAAM;QACnC,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE;YAC7B,OAAO,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACjD,CAAC,CAAC,CAAA;IACJ,CAAC;IAEO,YAAY,CAAC,WAAmB;QACtC,IAAI,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;QAChD,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,SAAS,GAAG,IAAI,iBAAM,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,CAAA;YAC1C,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAA;YACjE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,WAAW,EAAE,SAAS,CAAC,CAAA;QAC7C,CAAC;QACD,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAW,EAAE,GAAW,EAAE,OAA4B;QACrE,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ;YAAE,OAAM;QACnC,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACvC,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,IAAI,EAAE;YACjC,MAAM,OAAO,EAAE,CAAA;YACf,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;YACrC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;gBACpB,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;oBACxB,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;gBACxC,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAA;IAC/B,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAA;QACtB,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAA;QACtB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;QACzC,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAA;IAC/B,CAAC;CACF;AAzDD,oCAyDC","sourcesContent":["import PQueue from 'p-queue'\nimport { ConsecutiveList } from './consecutive-list'\nimport { EventRunner } from './types'\n\nexport type MemoryRunnerOptions = {\n  setCursor?: (cursor: number) => Promise<void>\n  concurrency?: number\n  startCursor?: number\n}\n\n// A queue with arbitrarily many partitions, each processing work sequentially.\n// Partitions are created lazily and taken out of memory when they go idle.\nexport class MemoryRunner implements EventRunner {\n  consecutive = new ConsecutiveList<number>()\n  mainQueue: PQueue\n  partitions = new Map<string, PQueue>()\n  cursor: number | undefined\n\n  constructor(public opts: MemoryRunnerOptions = {}) {\n    this.mainQueue = new PQueue({ concurrency: opts.concurrency ?? Infinity })\n    this.cursor = opts.startCursor\n  }\n\n  getCursor() {\n    return this.cursor\n  }\n\n  async addTask(partitionId: string, task: () => Promise<void>) {\n    if (this.mainQueue.isPaused) return\n    return this.mainQueue.add(() => {\n      return this.getPartition(partitionId).add(task)\n    })\n  }\n\n  private getPartition(partitionId: string) {\n    let partition = this.partitions.get(partitionId)\n    if (!partition) {\n      partition = new PQueue({ concurrency: 1 })\n      partition.once('idle', () => this.partitions.delete(partitionId))\n      this.partitions.set(partitionId, partition)\n    }\n    return partition\n  }\n\n  async trackEvent(did: string, seq: number, handler: () => Promise<void>) {\n    if (this.mainQueue.isPaused) return\n    const item = this.consecutive.push(seq)\n    await this.addTask(did, async () => {\n      await handler()\n      const latest = item.complete().at(-1)\n      if (latest !== undefined) {\n        this.cursor = latest\n        if (this.opts.setCursor) {\n          await this.opts.setCursor(this.cursor)\n        }\n      }\n    })\n  }\n\n  async processAll() {\n    await this.mainQueue.onIdle()\n  }\n\n  async destroy() {\n    this.mainQueue.pause()\n    this.mainQueue.clear()\n    this.partitions.forEach((p) => p.clear())\n    await this.mainQueue.onIdle()\n  }\n}\n"]}
+{"version":3,"file":"memory-runner.js","sourceRoot":"","sources":["../../src/runner/memory-runner.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,SAAS,CAAA;AAC5B,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAWvD,+EAA+E;AAC/E,2EAA2E;AAC3E,MAAM,OAAO,YAAY;IAMvB,YAAmB,OAA4B,EAAE;QAA9B,SAAI,GAAJ,IAAI,CAA0B;QALjD,gBAAW,GAAG,IAAI,eAAe,EAAU,CAAA;QAE3C,eAAU,GAAuB,IAAI,GAAG,EAAE,CAAA;QAIxC,IAAI,CAAC,SAAS,GAAG,IAAI,MAAM,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,QAAQ,EAAE,CAAC,CAAA;QAC1E,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,WAAW,CAAA;IAChC,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,MAAM,CAAA;IACpB,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,WAAmB,EAAE,IAAyB;QAC1D,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ;YAAE,OAAM;QACnC,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE;YAC7B,OAAO,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACjD,CAAC,CAAC,CAAA;IACJ,CAAC;IAEO,YAAY,CAAC,WAAmB;QACtC,IAAI,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;QAChD,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,SAAS,GAAG,IAAI,MAAM,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,CAAA;YAC1C,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAA;YACjE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,WAAW,EAAE,SAAS,CAAC,CAAA;QAC7C,CAAC;QACD,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAW,EAAE,GAAW,EAAE,OAA4B;QACrE,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ;YAAE,OAAM;QACnC,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACvC,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,IAAI,EAAE;YACjC,MAAM,OAAO,EAAE,CAAA;YACf,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;YACrC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;gBACpB,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;oBACxB,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;gBACxC,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAA;IAC/B,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAA;QACtB,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAA;QACtB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;QACzC,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAA;IAC/B,CAAC;CACF","sourcesContent":["import PQueue from 'p-queue'\nimport { ConsecutiveList } from './consecutive-list.js'\nimport { EventRunner } from './types.js'\n\nexport type MemoryRunnerOptions = {\n  setCursor?: (cursor: number) => Promise<void>\n  concurrency?: number\n  startCursor?: number\n}\n\ntype Queue = InstanceType<typeof PQueue>\n\n// A queue with arbitrarily many partitions, each processing work sequentially.\n// Partitions are created lazily and taken out of memory when they go idle.\nexport class MemoryRunner implements EventRunner {\n  consecutive = new ConsecutiveList<number>()\n  mainQueue: Queue\n  partitions: Map<string, Queue> = new Map()\n  cursor: number | undefined\n\n  constructor(public opts: MemoryRunnerOptions = {}) {\n    this.mainQueue = new PQueue({ concurrency: opts.concurrency ?? Infinity })\n    this.cursor = opts.startCursor\n  }\n\n  getCursor() {\n    return this.cursor\n  }\n\n  async addTask(partitionId: string, task: () => Promise<void>) {\n    if (this.mainQueue.isPaused) return\n    return this.mainQueue.add(() => {\n      return this.getPartition(partitionId).add(task)\n    })\n  }\n\n  private getPartition(partitionId: string) {\n    let partition = this.partitions.get(partitionId)\n    if (!partition) {\n      partition = new PQueue({ concurrency: 1 })\n      partition.once('idle', () => this.partitions.delete(partitionId))\n      this.partitions.set(partitionId, partition)\n    }\n    return partition\n  }\n\n  async trackEvent(did: string, seq: number, handler: () => Promise<void>) {\n    if (this.mainQueue.isPaused) return\n    const item = this.consecutive.push(seq)\n    await this.addTask(did, async () => {\n      await handler()\n      const latest = item.complete().at(-1)\n      if (latest !== undefined) {\n        this.cursor = latest\n        if (this.opts.setCursor) {\n          await this.opts.setCursor(this.cursor)\n        }\n      }\n    })\n  }\n\n  async processAll() {\n    await this.mainQueue.onIdle()\n  }\n\n  async destroy() {\n    this.mainQueue.pause()\n    this.mainQueue.clear()\n    this.partitions.forEach((p) => p.clear())\n    await this.mainQueue.onIdle()\n  }\n}\n"]}

package/dist/runner/types.js

@@ -1,3 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};
 //# sourceMappingURL=types.js.map

package/dist/util.js

@@ -1,17 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.didAndSeqForEvt = void 0;
-const index_js_1 = require("./lexicons/index.js");
-const didAndSeqForEvt = (evt) => {
-    if (index_js_1.com.atproto.sync.subscribeRepos.commit.$isTypeOf(evt)) {
+import { com } from './lexicons/index.js';
+export const didAndSeqForEvt = (evt) => {
+    if (com.atproto.sync.subscribeRepos.commit.$isTypeOf(evt)) {
         return { seq: evt.seq, did: evt.repo };
     }
-    else if (index_js_1.com.atproto.sync.subscribeRepos.account.$isTypeOf(evt) ||
-        index_js_1.com.atproto.sync.subscribeRepos.identity.$isTypeOf(evt) ||
-        index_js_1.com.atproto.sync.subscribeRepos.sync.$isTypeOf(evt)) {
+    else if (com.atproto.sync.subscribeRepos.account.$isTypeOf(evt) ||
+        com.atproto.sync.subscribeRepos.identity.$isTypeOf(evt) ||
+        com.atproto.sync.subscribeRepos.sync.$isTypeOf(evt)) {
         return { seq: evt.seq, did: evt.did };
     }
     return undefined;
 };
-exports.didAndSeqForEvt = didAndSeqForEvt;
 //# sourceMappingURL=util.js.map

package/dist/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":";;;AAAA,kDAAyC;AAElC,MAAM,eAAe,GAAG,CAC7B,GAA6C,EACH,EAAE;IAC5C,IAAI,cAAG,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;QAC1D,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,CAAA;IACxC,CAAC;SAAM,IACL,cAAG,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC;QACtD,cAAG,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC;QACvD,cAAG,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EACnD,CAAC;QACD,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,CAAA;IACvC,CAAC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AAbY,QAAA,eAAe,mBAa3B","sourcesContent":["import { com } from './lexicons/index.js'\n\nexport const didAndSeqForEvt = (\n  evt: com.atproto.sync.subscribeRepos.$Message,\n): { did: string; seq: number } | undefined => {\n  if (com.atproto.sync.subscribeRepos.commit.$isTypeOf(evt)) {\n    return { seq: evt.seq, did: evt.repo }\n  } else if (\n    com.atproto.sync.subscribeRepos.account.$isTypeOf(evt) ||\n    com.atproto.sync.subscribeRepos.identity.$isTypeOf(evt) ||\n    com.atproto.sync.subscribeRepos.sync.$isTypeOf(evt)\n  ) {\n    return { seq: evt.seq, did: evt.did }\n  }\n  return undefined\n}\n"]}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAA;AAEzC,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,GAA6C,EACH,EAAE;IAC5C,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;QAC1D,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,CAAA;IACxC,CAAC;SAAM,IACL,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC;QACtD,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC;QACvD,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EACnD,CAAC;QACD,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,CAAA;IACvC,CAAC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA","sourcesContent":["import { com } from './lexicons/index.js'\n\nexport const didAndSeqForEvt = (\n  evt: com.atproto.sync.subscribeRepos.$Message,\n): { did: string; seq: number } | undefined => {\n  if (com.atproto.sync.subscribeRepos.commit.$isTypeOf(evt)) {\n    return { seq: evt.seq, did: evt.repo }\n  } else if (\n    com.atproto.sync.subscribeRepos.account.$isTypeOf(evt) ||\n    com.atproto.sync.subscribeRepos.identity.$isTypeOf(evt) ||\n    com.atproto.sync.subscribeRepos.sync.$isTypeOf(evt)\n  ) {\n    return { seq: evt.seq, did: evt.did }\n  }\n  return undefined\n}\n"]}

package/jest.config.cjs

@@ -0,0 +1,22 @@
+/** @type {import('jest').Config} */
+module.exports = {
+  displayName: 'Sync',
+  transform: {
+    '^.+\\.(t|j)s$': [
+      '@swc/jest',
+      {
+        jsc: {
+          parser: { syntax: 'typescript', importAttributes: true },
+          experimental: { keepImportAttributes: true },
+          transform: {},
+        },
+        module: { type: 'es6' },
+      },
+    ],
+  },
+  extensionsToTreatAsEsm: ['.ts'],
+  transformIgnorePatterns: [],
+  testTimeout: 60000,
+  setupFiles: ['<rootDir>/../../test.setup.ts'],
+  moduleNameMapper: { '^(\\.\\.?\\/.+)\\.js$': ['$1.ts', '$1.js'] },
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/sync",
-  "version": "0.2.4",
+  "version": "0.3.0",
   "license": "MIT",
   "description": "atproto sync library",
   "keywords": [
@@ -16,29 +16,34 @@
     "directory": "packages/sync"
   },
   "engines": {
-    "node": ">=18.7.0"
+    "node": ">=22"
   },
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
   "dependencies": {
-    "p-queue": "^6.6.2",
+    "p-queue": "^8.0.0",
     "ws": "^8.12.0",
-    "@atproto/common": "^0.5.16",
-    "@atproto/identity": "^0.4.12",
-    "@atproto/lex": "^0.0.27",
-    "@atproto/repo": "^0.9.1",
-    "@atproto/syntax": "^0.5.4",
-    "@atproto/xrpc-server": "^0.10.22"
+    "@atproto/common": "^0.6.0",
+    "@atproto/identity": "^0.5.0",
+    "@atproto/lex": "^0.1.0",
+    "@atproto/repo": "^0.10.0",
+    "@atproto/syntax": "^0.6.0",
+    "@atproto/xrpc-server": "^0.11.0"
   },
   "devDependencies": {
     "@types/ws": "^8.5.4",
-    "jest": "^28.1.2",
-    "typescript": "^5.6.3"
+    "jest": "^30.0.0",
+    "typescript": "^6.0.3"
+  },
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    }
   },
   "scripts": {
     "codegen": "lex build --clear --indexFile --lexicons ../../lexicons --include com.atproto.sync.subscribeRepos",
     "prebuild": "pnpm run codegen",
     "build": "tsc --build tsconfig.build.json",
-    "test": "../dev-infra/with-test-redis-and-db.sh jest"
+    "test": "NODE_OPTIONS=--experimental-vm-modules ../dev-infra/with-test-redis-and-db.sh jest"
   }
 }

package/src/firehose/index.ts

@@ -25,10 +25,10 @@ import {
   Event,
   IdentityEvt,
   SyncEvt,
-} from '../events'
+} from '../events.js'
 import { com } from '../lexicons/index.js'
-import { EventRunner } from '../runner'
-import { didAndSeqForEvt } from '../util'
+import { EventRunner } from '../runner/index.js'
+import { didAndSeqForEvt } from '../util.js'
 
 export type FirehoseOptions = ClientOptions & {
   idResolver: IdResolver

package/src/index.ts

@@ -1,3 +1,3 @@
-export * from './runner'
-export * from './firehose'
-export * from './events'
+export * from './runner/index.js'
+export * from './firehose/index.js'
+export * from './events.js'

package/src/runner/index.ts

@@ -1,3 +1,3 @@
-export * from './consecutive-list'
-export * from './memory-runner'
-export * from './types'
+export * from './consecutive-list.js'
+export * from './memory-runner.js'
+export * from './types.js'

package/src/runner/memory-runner.ts

@@ -1,6 +1,6 @@
 import PQueue from 'p-queue'
-import { ConsecutiveList } from './consecutive-list'
-import { EventRunner } from './types'
+import { ConsecutiveList } from './consecutive-list.js'
+import { EventRunner } from './types.js'
 
 export type MemoryRunnerOptions = {
   setCursor?: (cursor: number) => Promise<void>
@@ -8,12 +8,14 @@ export type MemoryRunnerOptions = {
   startCursor?: number
 }
 
+type Queue = InstanceType<typeof PQueue>
+
 // A queue with arbitrarily many partitions, each processing work sequentially.
 // Partitions are created lazily and taken out of memory when they go idle.
 export class MemoryRunner implements EventRunner {
   consecutive = new ConsecutiveList<number>()
-  mainQueue: PQueue
-  partitions = new Map<string, PQueue>()
+  mainQueue: Queue
+  partitions: Map<string, Queue> = new Map()
   cursor: number | undefined
 
   constructor(public opts: MemoryRunnerOptions = {}) {

package/tests/firehose.test.ts

@@ -6,7 +6,13 @@ import {
 } from '@atproto/dev-env'
 import { IdResolver } from '@atproto/identity'
 import { DidString } from '@atproto/syntax'
-import { Create, Event, Firehose, FirehoseOptions, MemoryRunner } from '..'
+import {
+  Create,
+  Event,
+  Firehose,
+  FirehoseOptions,
+  MemoryRunner,
+} from '../src/index.js'
 
 describe('firehose', () => {
   let network: TestNetworkNoAppView

package/tests/runner.test.ts

@@ -1,5 +1,5 @@
 import { wait } from '@atproto/common'
-import { ConsecutiveList, MemoryRunner } from '..'
+import { ConsecutiveList, MemoryRunner } from '../src/index.js'
 
 describe('EventRunner utils', () => {
   describe('ConsecutiveList', () => {

package/tsconfig.build.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/events.ts","./src/index.ts","./src/util.ts","./src/firehose/index.ts","./src/lexicons/com.ts","./src/lexicons/index.ts","./src/lexicons/com/atproto.ts","./src/lexicons/com/atproto/sync.ts","./src/lexicons/com/atproto/sync/subscribeRepos.defs.ts","./src/lexicons/com/atproto/sync/subscribeRepos.ts","./src/runner/consecutive-list.ts","./src/runner/index.ts","./src/runner/memory-runner.ts","./src/runner/types.ts"],"version":"5.8.2"}
+{"root":["./src/events.ts","./src/index.ts","./src/util.ts","./src/firehose/index.ts","./src/lexicons/com.ts","./src/lexicons/index.ts","./src/lexicons/com/atproto.ts","./src/lexicons/com/atproto/sync.ts","./src/lexicons/com/atproto/sync/subscribeRepos.defs.ts","./src/lexicons/com/atproto/sync/subscribeRepos.ts","./src/runner/consecutive-list.ts","./src/runner/index.ts","./src/runner/memory-runner.ts","./src/runner/types.ts"],"version":"6.0.3"}

package/tsconfig.tests.json

@@ -1,7 +1,7 @@
 {
   "extends": "../../tsconfig/tests.json",
   "compilerOptions": {
-    "rootDir": "./tests",
+    "rootDir": ".",
     "noUnusedLocals": false
   },
   "include": ["./tests"]

package/jest.config.js

@@ -1,8 +0,0 @@
-/** @type {import('jest').Config} */
-module.exports = {
-  displayName: 'Sync',
-  transform: { '^.+\\.ts$': '@swc/jest' },
-  testTimeout: 60000,
-  setupFiles: ['<rootDir>/../../jest.setup.ts'],
-  moduleNameMapper: { '^(\\.\\.?\\/.+)\\.js$': ['$1.ts', '$1.js'] },
-}