@atproto/bsync 0.0.25 → 0.0.26

package/dist/routes/util.js

@@ -1,19 +1,15 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateNamespace = exports.isValidAtUri = exports.isValidDid = exports.combineSignals = exports.validCursor = void 0;
-const connect_1 = require("@connectrpc/connect");
-const syntax_1 = require("@atproto/syntax");
-const validCursor = (cursor) => {
+import { Code, ConnectError } from '@connectrpc/connect';
+import { InvalidDidError, ensureValidAtUri, ensureValidDid, ensureValidNsid, } from '@atproto/syntax';
+export const validCursor = (cursor) => {
     if (cursor === '')
         return null;
     const int = parseInt(cursor, 10);
     if (isNaN(int) || int < 0) {
-        throw new connect_1.ConnectError('invalid cursor', connect_1.Code.InvalidArgument);
+        throw new ConnectError('invalid cursor', Code.InvalidArgument);
     }
     return int;
 };
-exports.validCursor = validCursor;
-const combineSignals = (a, b) => {
+export const combineSignals = (a, b) => {
     const controller = new AbortController();
     for (const signal of [a, b]) {
         if (signal.aborted) {
@@ -27,40 +23,36 @@ const combineSignals = (a, b) => {
     }
     return controller.signal;
 };
-exports.combineSignals = combineSignals;
-const isValidDid = (did) => {
+export const isValidDid = (did) => {
     try {
-        (0, syntax_1.ensureValidDid)(did);
+        ensureValidDid(did);
         return true;
     }
     catch (err) {
-        if (err instanceof syntax_1.InvalidDidError) {
+        if (err instanceof InvalidDidError) {
             return false;
         }
         throw err;
     }
 };
-exports.isValidDid = isValidDid;
-const isValidAtUri = (uri) => {
+export const isValidAtUri = (uri) => {
     try {
-        (0, syntax_1.ensureValidAtUri)(uri);
+        ensureValidAtUri(uri);
         return true;
     }
     catch {
         return false;
     }
 };
-exports.isValidAtUri = isValidAtUri;
-const validateNamespace = (namespace) => {
+export const validateNamespace = (namespace) => {
     const parts = namespace.split('#');
     if (parts.length !== 1 && parts.length !== 2) {
         throw new Error('namespace must be in the format "nsid[#fragment]"');
     }
     const [nsid, fragment] = parts;
-    (0, syntax_1.ensureValidNsid)(nsid);
+    ensureValidNsid(nsid);
     if (fragment && !/^[a-zA-Z][a-zA-Z0-9]*$/.test(fragment)) {
         throw new Error('namespace fragment must be a valid identifier');
     }
 };
-exports.validateNamespace = validateNamespace;
 //# sourceMappingURL=util.js.map

package/dist/routes/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/routes/util.ts"],"names":[],"mappings":";;;AAAA,iDAAwD;AACxD,4CAKwB;AAEjB,MAAM,WAAW,GAAG,CAAC,MAAc,EAAiB,EAAE;IAC3D,IAAI,MAAM,KAAK,EAAE;QAAE,OAAO,IAAI,CAAA;IAC9B,MAAM,GAAG,GAAG,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAChC,IAAI,KAAK,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,sBAAY,CAAC,gBAAgB,EAAE,cAAI,CAAC,eAAe,CAAC,CAAA;IAChE,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAPY,QAAA,WAAW,eAOvB;AAEM,MAAM,cAAc,GAAG,CAAC,CAAc,EAAE,CAAc,EAAE,EAAE;IAC/D,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;IACxC,KAAK,MAAM,MAAM,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QAC5B,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,UAAU,CAAC,KAAK,EAAE,CAAA;YAClB,OAAO,MAAM,CAAA;QACf,CAAC;QACD,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;YACtE,2EAA2E;YAC3E,MAAM,EAAE,UAAU,CAAC,MAAM;SAC1B,CAAC,CAAA;IACJ,CAAC;IACD,OAAO,UAAU,CAAC,MAAM,CAAA;AAC1B,CAAC,CAAA;AAbY,QAAA,cAAc,kBAa1B;AAEM,MAAM,UAAU,GAAG,CAAC,GAAW,EAAE,EAAE;IACxC,IAAI,CAAC;QACH,IAAA,uBAAc,EAAC,GAAG,CAAC,CAAA;QACnB,OAAO,IAAI,CAAA;IACb,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,GAAG,YAAY,wBAAe,EAAE,CAAC;YACnC,OAAO,KAAK,CAAA;QACd,CAAC;QACD,MAAM,GAAG,CAAA;IACX,CAAC;AACH,CAAC,CAAA;AAVY,QAAA,UAAU,cAUtB;AAEM,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,EAAE;IAC1C,IAAI,CAAC;QACH,IAAA,yBAAgB,EAAC,GAAG,CAAC,CAAA;QACrB,OAAO,IAAI,CAAA;IACb,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC,CAAA;AAPY,QAAA,YAAY,gBAOxB;AAEM,MAAM,iBAAiB,GAAG,CAAC,SAAiB,EAAQ,EAAE;IAC3D,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAElC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7C,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAA;IACtE,CAAC;IAED,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAA;IAE9B,IAAA,wBAAe,EAAC,IAAI,CAAC,CAAA;IACrB,IAAI,QAAQ,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzD,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAA;IAClE,CAAC;AACH,CAAC,CAAA;AAbY,QAAA,iBAAiB,qBAa7B","sourcesContent":["import { Code, ConnectError } from '@connectrpc/connect'\nimport {\n  InvalidDidError,\n  ensureValidAtUri,\n  ensureValidDid,\n  ensureValidNsid,\n} from '@atproto/syntax'\n\nexport const validCursor = (cursor: string): number | null => {\n  if (cursor === '') return null\n  const int = parseInt(cursor, 10)\n  if (isNaN(int) || int < 0) {\n    throw new ConnectError('invalid cursor', Code.InvalidArgument)\n  }\n  return int\n}\n\nexport const combineSignals = (a: AbortSignal, b: AbortSignal) => {\n  const controller = new AbortController()\n  for (const signal of [a, b]) {\n    if (signal.aborted) {\n      controller.abort()\n      return signal\n    }\n    signal.addEventListener('abort', () => controller.abort(signal.reason), {\n      // @ts-ignore https://github.com/DefinitelyTyped/DefinitelyTyped/pull/68625\n      signal: controller.signal,\n    })\n  }\n  return controller.signal\n}\n\nexport const isValidDid = (did: string) => {\n  try {\n    ensureValidDid(did)\n    return true\n  } catch (err) {\n    if (err instanceof InvalidDidError) {\n      return false\n    }\n    throw err\n  }\n}\n\nexport const isValidAtUri = (uri: string) => {\n  try {\n    ensureValidAtUri(uri)\n    return true\n  } catch {\n    return false\n  }\n}\n\nexport const validateNamespace = (namespace: string): void => {\n  const parts = namespace.split('#')\n\n  if (parts.length !== 1 && parts.length !== 2) {\n    throw new Error('namespace must be in the format \"nsid[#fragment]\"')\n  }\n\n  const [nsid, fragment] = parts\n\n  ensureValidNsid(nsid)\n  if (fragment && !/^[a-zA-Z][a-zA-Z0-9]*$/.test(fragment)) {\n    throw new Error('namespace fragment must be a valid identifier')\n  }\n}\n"]}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/routes/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,EACL,eAAe,EACf,gBAAgB,EAChB,cAAc,EACd,eAAe,GAChB,MAAM,iBAAiB,CAAA;AAExB,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,MAAc,EAAiB,EAAE;IAC3D,IAAI,MAAM,KAAK,EAAE;QAAE,OAAO,IAAI,CAAA;IAC9B,MAAM,GAAG,GAAG,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAChC,IAAI,KAAK,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,YAAY,CAAC,gBAAgB,EAAE,IAAI,CAAC,eAAe,CAAC,CAAA;IAChE,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAc,EAAE,CAAc,EAAE,EAAE;IAC/D,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;IACxC,KAAK,MAAM,MAAM,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QAC5B,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,UAAU,CAAC,KAAK,EAAE,CAAA;YAClB,OAAO,MAAM,CAAA;QACf,CAAC;QACD,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;YACtE,2EAA2E;YAC3E,MAAM,EAAE,UAAU,CAAC,MAAM;SAC1B,CAAC,CAAA;IACJ,CAAC;IACD,OAAO,UAAU,CAAC,MAAM,CAAA;AAC1B,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,GAAW,EAAE,EAAE;IACxC,IAAI,CAAC;QACH,cAAc,CAAC,GAAG,CAAC,CAAA;QACnB,OAAO,IAAI,CAAA;IACb,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,GAAG,YAAY,eAAe,EAAE,CAAC;YACnC,OAAO,KAAK,CAAA;QACd,CAAC;QACD,MAAM,GAAG,CAAA;IACX,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,EAAE;IAC1C,IAAI,CAAC;QACH,gBAAgB,CAAC,GAAG,CAAC,CAAA;QACrB,OAAO,IAAI,CAAA;IACb,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,SAAiB,EAAQ,EAAE;IAC3D,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAElC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7C,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAA;IACtE,CAAC;IAED,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAA;IAE9B,eAAe,CAAC,IAAI,CAAC,CAAA;IACrB,IAAI,QAAQ,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzD,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAA;IAClE,CAAC;AACH,CAAC,CAAA","sourcesContent":["import { Code, ConnectError } from '@connectrpc/connect'\nimport {\n  InvalidDidError,\n  ensureValidAtUri,\n  ensureValidDid,\n  ensureValidNsid,\n} from '@atproto/syntax'\n\nexport const validCursor = (cursor: string): number | null => {\n  if (cursor === '') return null\n  const int = parseInt(cursor, 10)\n  if (isNaN(int) || int < 0) {\n    throw new ConnectError('invalid cursor', Code.InvalidArgument)\n  }\n  return int\n}\n\nexport const combineSignals = (a: AbortSignal, b: AbortSignal) => {\n  const controller = new AbortController()\n  for (const signal of [a, b]) {\n    if (signal.aborted) {\n      controller.abort()\n      return signal\n    }\n    signal.addEventListener('abort', () => controller.abort(signal.reason), {\n      // @ts-ignore https://github.com/DefinitelyTyped/DefinitelyTyped/pull/68625\n      signal: controller.signal,\n    })\n  }\n  return controller.signal\n}\n\nexport const isValidDid = (did: string) => {\n  try {\n    ensureValidDid(did)\n    return true\n  } catch (err) {\n    if (err instanceof InvalidDidError) {\n      return false\n    }\n    throw err\n  }\n}\n\nexport const isValidAtUri = (uri: string) => {\n  try {\n    ensureValidAtUri(uri)\n    return true\n  } catch {\n    return false\n  }\n}\n\nexport const validateNamespace = (namespace: string): void => {\n  const parts = namespace.split('#')\n\n  if (parts.length !== 1 && parts.length !== 2) {\n    throw new Error('namespace must be in the format \"nsid[#fragment]\"')\n  }\n\n  const [nsid, fragment] = parts\n\n  ensureValidNsid(nsid)\n  if (fragment && !/^[a-zA-Z][a-zA-Z0-9]*$/.test(fragment)) {\n    throw new Error('namespace fragment must be a valid identifier')\n  }\n}\n"]}

package/jest.config.cjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsync",
-  "version": "0.0.25",
+  "version": "0.0.26",
   "license": "MIT",
   "description": "Sychronizing service for app.bsky App View (Bluesky API)",
   "keywords": [
@@ -13,10 +13,8 @@
     "url": "https://github.com/bluesky-social/atproto",
     "directory": "packages/bsync"
   },
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
   "engines": {
-    "node": ">=18.7.0"
+    "node": ">=22"
   },
   "dependencies": {
     "@bufbuild/protobuf": "^1.5.0",
@@ -27,8 +25,8 @@
     "pg": "^8.10.0",
     "pino-http": "^8.2.1",
     "typed-emitter": "^2.1.0",
-    "@atproto/common": "^0.5.14",
-    "@atproto/syntax": "^0.5.1"
+    "@atproto/syntax": "^0.6.0",
+    "@atproto/common": "^0.6.0"
   },
   "devDependencies": {
     "@bufbuild/buf": "^1.28.1",
@@ -36,14 +34,21 @@
     "@connectrpc/protoc-gen-connect-es": "^1.1.4",
     "@types/pg": "^8.6.6",
     "get-port": "^5.1.1",
-    "jest": "^28.1.2",
+    "jest": "^30.0.0",
     "ts-node": "^10.8.2",
-    "typescript": "^5.6.3"
+    "typescript": "^6.0.3"
+  },
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    }
   },
   "scripts": {
     "build": "tsc --build tsconfig.build.json",
     "start": "node --enable-source-maps dist/bin.js",
-    "test": "../dev-infra/with-test-db.sh jest",
+    "test": "NODE_OPTIONS=--experimental-vm-modules ../dev-infra/with-test-db.sh jest",
     "test:log": "tail -50 test.log | pino-pretty",
     "test:updateSnapshot": "jest --updateSnapshot",
     "migration:create": "ts-node ./bin/migration-create.ts",

package/src/client.ts

@@ -7,7 +7,7 @@ import {
   ConnectTransportOptions,
   createConnectTransport,
 } from '@connectrpc/connect-node'
-import { Service } from './proto/bsync_connect'
+import { Service } from './proto/bsync_connect.js'
 
 export type BsyncClient = PromiseClient<typeof Service>
 

package/src/context.ts

@@ -1,10 +1,10 @@
-import { EventEmitter } from 'node:stream'
-import TypedEventEmitter from 'typed-emitter'
-import { ServerConfig } from './config'
-import { Database } from './db'
-import { createMuteOpChannel } from './db/schema/mute_op'
-import { createNotifOpChannel } from './db/schema/notif_op'
-import { createOperationChannel } from './db/schema/operation'
+import { EventEmitter } from 'node:events'
+import type TypedEmitter from 'typed-emitter'
+import { ServerConfig } from './config.js'
+import { Database } from './db/index.js'
+import { createMuteOpChannel } from './db/schema/mute_op.js'
+import { createNotifOpChannel } from './db/schema/notif_op.js'
+import { createOperationChannel } from './db/schema/operation.js'
 
 export type AppContextOptions = {
   db: Database
@@ -16,13 +16,13 @@ export class AppContext {
   db: Database
   cfg: ServerConfig
   shutdown: AbortSignal
-  events: TypedEventEmitter<AppEvents>
+  events: TypedEmitter.default<AppEvents>
 
   constructor(opts: AppContextOptions) {
     this.db = opts.db
     this.cfg = opts.cfg
     this.shutdown = opts.shutdown
-    this.events = new EventEmitter() as TypedEventEmitter<AppEvents>
+    this.events = new EventEmitter() as TypedEmitter.default<AppEvents>
   }
 
   static async fromConfig(

package/src/db/index.ts

@@ -1,5 +1,5 @@
 import assert from 'node:assert'
-import { EventEmitter } from 'node:stream'
+import { EventEmitter } from 'node:events'
 import {
   Kysely,
   KyselyPlugin,
@@ -11,13 +11,17 @@ import {
   RootOperationNode,
   UnknownRow,
 } from 'kysely'
-import { Pool as PgPool, types as pgTypes } from 'pg'
-import TypedEmitter from 'typed-emitter'
-import { dbLogger } from '../logger'
-import * as migrations from './migrations'
-import { DbMigrationProvider } from './migrations/provider'
-import { DatabaseSchema, DatabaseSchemaType } from './schema'
-import { PgOptions } from './types'
+// eslint-disable-next-line import/default
+import pg from 'pg'
+// eslint-disable-next-line import/no-named-as-default-member
+const { Pool: PgPool, types: pgTypes } = pg
+type PgPool = InstanceType<typeof PgPool>
+import type TypedEmitter from 'typed-emitter'
+import { dbLogger } from '../logger.js'
+import * as migrations from './migrations/index.js'
+import { DbMigrationProvider } from './migrations/provider.js'
+import { DatabaseSchema, DatabaseSchemaType } from './schema/index.js'
+import { PgOptions } from './types.js'
 
 export class Database {
   pool: PgPool
@@ -187,7 +191,7 @@ class LeakyTxPlugin implements KyselyPlugin {
   }
 }
 
-type TxnEmitter = TypedEmitter<TxnEvents>
+type TxnEmitter = TypedEmitter.default<TxnEvents>
 
 type TxnEvents = {
   commit: () => void

package/src/db/migrations/index.ts

@@ -2,7 +2,7 @@
 // It's important that every migration is exported from here with the proper name. We'd simplify
 // this with kysely's FileMigrationProvider, but it doesn't play nicely with the build process.
 
-export * as _20240108T220751294Z from './20240108T220751294Z-init'
-export * as _20240717T224303472Z from './20240717T224303472Z-notif-ops'
-export * as _20250527T022203400Z from './20250527T022203400Z-add-operation'
-export * as _20250603T163446567Z from './20250603T163446567Z-alter-operation'
+export * as _20240108T220751294Z from './20240108T220751294Z-init.js'
+export * as _20240717T224303472Z from './20240717T224303472Z-notif-ops.js'
+export * as _20250527T022203400Z from './20250527T022203400Z-add-operation.js'
+export * as _20250603T163446567Z from './20250603T163446567Z-alter-operation.js'

package/src/db/schema/index.ts

@@ -1,9 +1,9 @@
 import { Kysely } from 'kysely'
-import * as muteItem from './mute_item'
-import * as muteOp from './mute_op'
-import * as notifItem from './notif_item'
-import * as notifOp from './notif_op'
-import * as op from './operation'
+import * as muteItem from './mute_item.js'
+import * as muteOp from './mute_op.js'
+import * as notifItem from './notif_item.js'
+import * as notifOp from './notif_op.js'
+import * as op from './operation.js'
 
 export type DatabaseSchemaType = muteItem.PartialDB &
   muteOp.PartialDB &

package/src/db/schema/mute_op.ts

@@ -1,5 +1,5 @@
 import { GeneratedAlways, Selectable } from 'kysely'
-import { MuteOperation_Type } from '../../proto/bsync_pb'
+import { MuteOperation_Type } from '../../proto/bsync_pb.js'
 
 export interface MuteOp {
   id: GeneratedAlways<number>

package/src/db/schema/operation.ts

@@ -1,5 +1,5 @@
 import { GeneratedAlways } from 'kysely'
-import { Method } from '../../proto/bsync_pb'
+import { Method } from '../../proto/bsync_pb.js'
 
 export type OperationMethod = Method.CREATE | Method.UPDATE | Method.DELETE
 
@@ -9,7 +9,7 @@ export interface Operation {
   namespace: string
   key: string
   method: OperationMethod
-  payload: Uint8Array
+  payload: Uint8Array<ArrayBuffer>
   createdAt: GeneratedAlways<Date>
 }
 

package/src/db/types.ts

@@ -1,5 +1,7 @@
 import { DynamicModule, RawBuilder, SelectQueryBuilder } from 'kysely'
-import { Pool as PgPool } from 'pg'
+// eslint-disable-next-line import/default
+import pg from 'pg'
+type PgPool = pg.Pool
 
 export type DbRef = RawBuilder | ReturnType<DynamicModule['ref']>
 

package/src/index.ts

@@ -1,20 +1,24 @@
 import events from 'node:events'
 import http from 'node:http'
 import { connectNodeAdapter } from '@connectrpc/connect-node'
-import { HttpTerminator, createHttpTerminator } from 'http-terminator'
-import { ServerConfig } from './config'
-import { AppContext, AppContextOptions } from './context'
-import { createMuteOpChannel } from './db/schema/mute_op'
-import { createNotifOpChannel } from './db/schema/notif_op'
-import { createOperationChannel } from './db/schema/operation'
-import { dbLogger, loggerMiddleware } from './logger'
-import routes from './routes'
+// eslint-disable-next-line import/default, import/no-named-as-default-member
+import httpTerminator from 'http-terminator'
+// eslint-disable-next-line import/no-named-as-default-member
+const { createHttpTerminator } = httpTerminator
+type HttpTerminator = ReturnType<typeof createHttpTerminator>
+import { ServerConfig } from './config.js'
+import { AppContext, AppContextOptions } from './context.js'
+import { createMuteOpChannel } from './db/schema/mute_op.js'
+import { createNotifOpChannel } from './db/schema/notif_op.js'
+import { createOperationChannel } from './db/schema/operation.js'
+import { dbLogger, loggerMiddleware } from './logger.js'
+import routes from './routes/index.js'
 
-export * from './config'
-export * from './client'
-export { Database } from './db'
-export { AppContext } from './context'
-export { httpLogger } from './logger'
+export * from './config.js'
+export * from './client.js'
+export { Database } from './db/index.js'
+export { AppContext } from './context.js'
+export { httpLogger } from './logger.js'
 
 export class BsyncService {
   public ctx: AppContext

package/src/proto/bsync_connect.ts

@@ -3,7 +3,7 @@
 /* eslint-disable */
 // @ts-nocheck
 
-import { AddMuteOperationRequest, AddMuteOperationResponse, AddNotifOperationRequest, AddNotifOperationResponse, DeleteOperationsByActorAndNamespaceRequest, DeleteOperationsByActorAndNamespaceResponse, PingRequest, PingResponse, PutOperationRequest, PutOperationResponse, ScanMuteOperationsRequest, ScanMuteOperationsResponse, ScanNotifOperationsRequest, ScanNotifOperationsResponse, ScanOperationsRequest, ScanOperationsResponse } from "./bsync_pb";
+import { AddMuteOperationRequest, AddMuteOperationResponse, AddNotifOperationRequest, AddNotifOperationResponse, DeleteOperationsByActorAndNamespaceRequest, DeleteOperationsByActorAndNamespaceResponse, PingRequest, PingResponse, PutOperationRequest, PutOperationResponse, ScanMuteOperationsRequest, ScanMuteOperationsResponse, ScanNotifOperationsRequest, ScanNotifOperationsResponse, ScanOperationsRequest, ScanOperationsResponse } from "./bsync_pb.js";
 import { MethodKind } from "@bufbuild/protobuf";
 
 /**

package/src/routes/add-mute-operation.ts

@@ -1,13 +1,16 @@
 import { Code, ConnectError, ServiceImpl } from '@connectrpc/connect'
 import { sql } from 'kysely'
 import { AtUri } from '@atproto/syntax'
-import { AppContext } from '../context'
-import { Database } from '../db'
-import { createMuteOpChannel } from '../db/schema/mute_op'
-import { Service } from '../proto/bsync_connect'
-import { AddMuteOperationResponse, MuteOperation_Type } from '../proto/bsync_pb'
-import { authWithApiKey } from './auth'
-import { isValidAtUri, isValidDid } from './util'
+import { AppContext } from '../context.js'
+import { Database } from '../db/index.js'
+import { createMuteOpChannel } from '../db/schema/mute_op.js'
+import { Service } from '../proto/bsync_connect.js'
+import {
+  AddMuteOperationResponse,
+  MuteOperation_Type,
+} from '../proto/bsync_pb.js'
+import { authWithApiKey } from './auth.js'
+import { isValidAtUri, isValidDid } from './util.js'
 
 export default (ctx: AppContext): Partial<ServiceImpl<typeof Service>> => ({
   async addMuteOperation(req, handlerCtx) {

package/src/routes/add-notif-operation.ts

@@ -1,12 +1,12 @@
 import { Code, ConnectError, ServiceImpl } from '@connectrpc/connect'
 import { sql } from 'kysely'
-import { AppContext } from '../context'
-import { Database } from '../db'
-import { createNotifOpChannel } from '../db/schema/notif_op'
-import { Service } from '../proto/bsync_connect'
-import { AddNotifOperationResponse } from '../proto/bsync_pb'
-import { authWithApiKey } from './auth'
-import { isValidDid } from './util'
+import { AppContext } from '../context.js'
+import { Database } from '../db/index.js'
+import { createNotifOpChannel } from '../db/schema/notif_op.js'
+import { Service } from '../proto/bsync_connect.js'
+import { AddNotifOperationResponse } from '../proto/bsync_pb.js'
+import { authWithApiKey } from './auth.js'
+import { isValidDid } from './util.js'
 
 export default (ctx: AppContext): Partial<ServiceImpl<typeof Service>> => ({
   async addNotifOperation(req, handlerCtx) {

package/src/routes/auth.ts

@@ -1,5 +1,5 @@
 import { Code, ConnectError, HandlerContext } from '@connectrpc/connect'
-import { AppContext } from '../context'
+import { AppContext } from '../context.js'
 
 const BEARER = 'Bearer '
 

package/src/routes/delete-operations.ts

@@ -1,9 +1,9 @@
 import { Code, ConnectError, ServiceImpl } from '@connectrpc/connect'
-import { AppContext } from '../context'
-import { Service } from '../proto/bsync_connect'
-import { DeleteOperationsByActorAndNamespaceResponse } from '../proto/bsync_pb'
-import { authWithApiKey } from './auth'
-import { isValidDid, validateNamespace } from './util'
+import { AppContext } from '../context.js'
+import { Service } from '../proto/bsync_connect.js'
+import { DeleteOperationsByActorAndNamespaceResponse } from '../proto/bsync_pb.js'
+import { authWithApiKey } from './auth.js'
+import { isValidDid, validateNamespace } from './util.js'
 
 export default (ctx: AppContext): Partial<ServiceImpl<typeof Service>> => ({
   /**

package/src/routes/index.ts

@@ -1,14 +1,14 @@
 import { ConnectRouter } from '@connectrpc/connect'
 import { sql } from 'kysely'
-import { AppContext } from '../context'
-import { Service } from '../proto/bsync_connect'
-import addMuteOperation from './add-mute-operation'
-import addNotifOperation from './add-notif-operation'
-import deleteOperations from './delete-operations'
-import putOperation from './put-operation'
-import scanMuteOperations from './scan-mute-operations'
-import scanNotifOperations from './scan-notif-operations'
-import scanOperations from './scan-operations'
+import { AppContext } from '../context.js'
+import { Service } from '../proto/bsync_connect.js'
+import addMuteOperation from './add-mute-operation.js'
+import addNotifOperation from './add-notif-operation.js'
+import deleteOperations from './delete-operations.js'
+import putOperation from './put-operation.js'
+import scanMuteOperations from './scan-mute-operations.js'
+import scanNotifOperations from './scan-notif-operations.js'
+import scanOperations from './scan-operations.js'
 
 export default (ctx: AppContext) => (router: ConnectRouter) => {
   return router.service(Service, {

package/src/routes/put-operation.ts

@@ -1,17 +1,20 @@
 import { Code, ConnectError, ServiceImpl } from '@connectrpc/connect'
 import { sql } from 'kysely'
 import { ensureValidRecordKey } from '@atproto/syntax'
-import { AppContext } from '../context'
-import { Database } from '../db'
-import { OperationMethod, createOperationChannel } from '../db/schema/operation'
-import { Service } from '../proto/bsync_connect'
+import { AppContext } from '../context.js'
+import { Database } from '../db/index.js'
+import {
+  OperationMethod,
+  createOperationChannel,
+} from '../db/schema/operation.js'
+import { Service } from '../proto/bsync_connect.js'
 import {
   Method,
   PutOperationRequest,
   PutOperationResponse,
-} from '../proto/bsync_pb'
-import { authWithApiKey } from './auth'
-import { isValidDid, validateNamespace } from './util'
+} from '../proto/bsync_pb.js'
+import { authWithApiKey } from './auth.js'
+import { isValidDid, validateNamespace } from './util.js'
 
 export default (ctx: AppContext): Partial<ServiceImpl<typeof Service>> => ({
   async putOperation(req, handlerCtx) {
@@ -107,6 +110,6 @@ type Operation = {
   actorDid: string
   namespace: string
   key: string
-  payload: Uint8Array
+  payload: Uint8Array<ArrayBuffer>
   method: OperationMethod
 }

package/src/routes/scan-mute-operations.ts

@@ -1,11 +1,11 @@
 import { once } from 'node:events'
 import { ServiceImpl } from '@connectrpc/connect'
-import { AppContext } from '../context'
-import { createMuteOpChannel } from '../db/schema/mute_op'
-import { Service } from '../proto/bsync_connect'
-import { ScanMuteOperationsResponse } from '../proto/bsync_pb'
-import { authWithApiKey } from './auth'
-import { combineSignals, validCursor } from './util'
+import { AppContext } from '../context.js'
+import { createMuteOpChannel } from '../db/schema/mute_op.js'
+import { Service } from '../proto/bsync_connect.js'
+import { ScanMuteOperationsResponse } from '../proto/bsync_pb.js'
+import { authWithApiKey } from './auth.js'
+import { combineSignals, validCursor } from './util.js'
 
 export default (ctx: AppContext): Partial<ServiceImpl<typeof Service>> => ({
   async scanMuteOperations(req, handlerCtx) {

package/src/routes/scan-notif-operations.ts

@@ -1,11 +1,11 @@
 import { once } from 'node:events'
 import { ServiceImpl } from '@connectrpc/connect'
-import { AppContext } from '../context'
-import { createNotifOpChannel } from '../db/schema/notif_op'
-import { Service } from '../proto/bsync_connect'
-import { ScanNotifOperationsResponse } from '../proto/bsync_pb'
-import { authWithApiKey } from './auth'
-import { combineSignals, validCursor } from './util'
+import { AppContext } from '../context.js'
+import { createNotifOpChannel } from '../db/schema/notif_op.js'
+import { Service } from '../proto/bsync_connect.js'
+import { ScanNotifOperationsResponse } from '../proto/bsync_pb.js'
+import { authWithApiKey } from './auth.js'
+import { combineSignals, validCursor } from './util.js'
 
 export default (ctx: AppContext): Partial<ServiceImpl<typeof Service>> => ({
   async scanNotifOperations(req, handlerCtx) {

package/src/routes/scan-operations.ts

@@ -1,11 +1,11 @@
 import { once } from 'node:events'
 import { ServiceImpl } from '@connectrpc/connect'
-import { AppContext } from '../context'
-import { createOperationChannel } from '../db/schema/operation'
-import { Service } from '../proto/bsync_connect'
-import { ScanOperationsResponse } from '../proto/bsync_pb'
-import { authWithApiKey } from './auth'
-import { combineSignals, validCursor } from './util'
+import { AppContext } from '../context.js'
+import { createOperationChannel } from '../db/schema/operation.js'
+import { Service } from '../proto/bsync_connect.js'
+import { ScanOperationsResponse } from '../proto/bsync_pb.js'
+import { authWithApiKey } from './auth.js'
+import { combineSignals, validCursor } from './util.js'
 
 export default (ctx: AppContext): Partial<ServiceImpl<typeof Service>> => ({
   async scanOperations(req, handlerCtx) {

package/tests/delete-operations.test.ts

@@ -6,8 +6,8 @@ import {
   authWithApiKey,
   createClient,
   envToCfg,
-} from '../src'
-import { Method } from '../src/proto/bsync_pb'
+} from '../src/index.js'
+import { Method } from '../src/proto/bsync_pb.js'
 
 describe('operations', () => {
   let bsync: BsyncService

package/tests/mutes.test.ts

@@ -8,8 +8,8 @@ import {
   authWithApiKey,
   createClient,
   envToCfg,
-} from '../src'
-import { MuteOperation, MuteOperation_Type } from '../src/proto/bsync_pb'
+} from '../src/index.js'
+import { MuteOperation, MuteOperation_Type } from '../src/proto/bsync_pb.js'
 
 describe('mutes', () => {
   let bsync: BsyncService

package/tests/notifications.test.ts

@@ -8,8 +8,8 @@ import {
   authWithApiKey,
   createClient,
   envToCfg,
-} from '../src'
-import { NotifOperation } from '../src/proto/bsync_pb'
+} from '../src/index.js'
+import { NotifOperation } from '../src/proto/bsync_pb.js'
 
 describe('notifications', () => {
   let bsync: BsyncService

package/tests/operations.test.ts

@@ -9,8 +9,8 @@ import {
   authWithApiKey,
   createClient,
   envToCfg,
-} from '../src'
-import { Method, Operation } from '../src/proto/bsync_pb'
+} from '../src/index.js'
+import { Method, Operation } from '../src/proto/bsync_pb.js'
 
 describe('operations', () => {
   let bsync: BsyncService

package/tsconfig.build.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/client.ts","./src/config.ts","./src/context.ts","./src/index.ts","./src/logger.ts","./src/db/index.ts","./src/db/types.ts","./src/db/migrations/20240108T220751294Z-init.ts","./src/db/migrations/20240717T224303472Z-notif-ops.ts","./src/db/migrations/20250527T022203400Z-add-operation.ts","./src/db/migrations/20250603T163446567Z-alter-operation.ts","./src/db/migrations/index.ts","./src/db/migrations/provider.ts","./src/db/schema/index.ts","./src/db/schema/mute_item.ts","./src/db/schema/mute_op.ts","./src/db/schema/notif_item.ts","./src/db/schema/notif_op.ts","./src/db/schema/operation.ts","./src/proto/bsync_connect.ts","./src/proto/bsync_pb.ts","./src/routes/add-mute-operation.ts","./src/routes/add-notif-operation.ts","./src/routes/auth.ts","./src/routes/delete-operations.ts","./src/routes/index.ts","./src/routes/put-operation.ts","./src/routes/scan-mute-operations.ts","./src/routes/scan-notif-operations.ts","./src/routes/scan-operations.ts","./src/routes/util.ts"],"version":"5.8.2"}
+{"root":["./src/client.ts","./src/config.ts","./src/context.ts","./src/index.ts","./src/logger.ts","./src/db/index.ts","./src/db/types.ts","./src/db/migrations/20240108T220751294Z-init.ts","./src/db/migrations/20240717T224303472Z-notif-ops.ts","./src/db/migrations/20250527T022203400Z-add-operation.ts","./src/db/migrations/20250603T163446567Z-alter-operation.ts","./src/db/migrations/index.ts","./src/db/migrations/provider.ts","./src/db/schema/index.ts","./src/db/schema/mute_item.ts","./src/db/schema/mute_op.ts","./src/db/schema/notif_item.ts","./src/db/schema/notif_op.ts","./src/db/schema/operation.ts","./src/proto/bsync_connect.ts","./src/proto/bsync_pb.ts","./src/routes/add-mute-operation.ts","./src/routes/add-notif-operation.ts","./src/routes/auth.ts","./src/routes/delete-operations.ts","./src/routes/index.ts","./src/routes/put-operation.ts","./src/routes/scan-mute-operations.ts","./src/routes/scan-notif-operations.ts","./src/routes/scan-operations.ts","./src/routes/util.ts"],"version":"6.0.3"}

package/jest.config.js

@@ -1,7 +0,0 @@
-/** @type {import('jest').Config} */
-module.exports = {
-  displayName: 'Bsync',
-  transform: { '^.+\\.(t|j)s$': '@swc/jest' },
-  setupFiles: ['<rootDir>/../../jest.setup.ts'],
-  moduleNameMapper: { '^(\\.\\.?\\/.+)\\.js$': ['$1.ts', '$1.js'] },
-}