@atproto/bsync 0.0.31 → 0.0.33

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atproto/bsync
 
+## 0.0.33
+
+### Patch Changes
+
+- [#5099](https://github.com/bluesky-social/atproto/pull/5099) [`b43ec31`](https://github.com/bluesky-social/atproto/commit/b43ec31f247f4461725b01226885f88bd430ca07) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Update TypeScript build to rely on references to composite internal projects
+
+- [#5099](https://github.com/bluesky-social/atproto/pull/5099) [`b43ec31`](https://github.com/bluesky-social/atproto/commit/b43ec31f247f4461725b01226885f88bd430ca07) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Bundle only necessary files in the NPM tarball, including the `CHANGELOG.md` and `README.md` files (if present).
+
+- [#5099](https://github.com/bluesky-social/atproto/pull/5099) [`b43ec31`](https://github.com/bluesky-social/atproto/commit/b43ec31f247f4461725b01226885f88bd430ca07) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Build with `noImplicitAny` enabled
+
+- Updated dependencies [[`28a0b58`](https://github.com/bluesky-social/atproto/commit/28a0b588147863eaef948cd2bb8fc0f19d08cda9), [`b43ec31`](https://github.com/bluesky-social/atproto/commit/b43ec31f247f4461725b01226885f88bd430ca07), [`b43ec31`](https://github.com/bluesky-social/atproto/commit/b43ec31f247f4461725b01226885f88bd430ca07), [`b43ec31`](https://github.com/bluesky-social/atproto/commit/b43ec31f247f4461725b01226885f88bd430ca07), [`b43ec31`](https://github.com/bluesky-social/atproto/commit/b43ec31f247f4461725b01226885f88bd430ca07)]:
+  - @atproto/syntax@0.6.4
+  - @atproto/common@0.6.5
+
+## 0.0.32
+
+### Patch Changes
+
+- [#4179](https://github.com/bluesky-social/atproto/pull/4179) [`85c25ef`](https://github.com/bluesky-social/atproto/commit/85c25efde14c1d0383f32bba21b21bdad2ae2619) Thanks [@rafaeleyng](https://github.com/rafaeleyng)! - Subscribe to the real bsync service in dev-env instead of using a mock, with a `BsyncSubscription` on the bsky dataplane that consumes the mute, notif, and operation streams. Supports immediate shutdown (aborting in-flight long-polls) and cursor-based draining so tests stay fast.
+
 ## 0.0.31
 
 ### Patch Changes

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,WAAW,CAAA;AAI5B,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAO5D,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAIxC,qBAAa,YAAY;IAChB,GAAG,EAAE,UAAU,CAAA;IACf,MAAM,EAAE,IAAI,CAAC,MAAM,CAAA;IAC1B,OAAO,CAAC,UAAU,CAA+B;IACjD,OAAO,CAAC,EAAE,CAAiB;IAC3B,OAAO,CAAC,KAAK,CAAmC;IAEhD,YAAY,IAAI,EAAE;QAChB,GAAG,EAAE,UAAU,CAAA;QACf,MAAM,EAAE,IAAI,CAAC,MAAM,CAAA;QACnB,EAAE,EAAE,eAAe,CAAA;KACpB,EAKA;IAED,OAAa,MAAM,CACjB,GAAG,EAAE,YAAY,EACjB,SAAS,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,GACrC,OAAO,CAAC,YAAY,CAAC,CAiBvB;IAEK,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CA0BlC;IAEK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAS7B;IAEK,cAAc,kBAoBnB;CACF;eAEc,YAAY"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,WAAW,CAAA;AAI5B,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAO5D,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAIxC,qBAAa,YAAY;IAChB,GAAG,EAAE,UAAU,CAAA;IACf,MAAM,EAAE,IAAI,CAAC,MAAM,CAAA;IAC1B,OAAO,CAAC,UAAU,CAA+B;IACjD,OAAO,CAAC,EAAE,CAAiB;IAC3B,OAAO,CAAC,KAAK,CAAmC;IAEhD,YAAY,IAAI,EAAE;QAChB,GAAG,EAAE,UAAU,CAAA;QACf,MAAM,EAAE,IAAI,CAAC,MAAM,CAAA;QACnB,EAAE,EAAE,eAAe,CAAA;KACpB,EAKA;IAED,OAAa,MAAM,CACjB,GAAG,EAAE,YAAY,EACjB,SAAS,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,GACrC,OAAO,CAAC,YAAY,CAAC,CAmBvB;IAEK,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CA0BlC;IAEK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAS7B;IAEK,cAAc,kBAoBnB;CACF;eAEc,YAAY"}

package/dist/index.js

@@ -1,4 +1,4 @@
-import events from 'node:events';
+import events, { setMaxListeners } from 'node:events';
 import http from 'node:http';
 import { connectNodeAdapter } from '@connectrpc/connect-node';
 // eslint-disable-next-line import/default
@@ -24,6 +24,8 @@ export class BsyncService {
     }
     static async create(cfg, overrides) {
         const ac = new AbortController();
+        // Prevents unhelpful warnings.
+        setMaxListeners(100, ac.signal);
         const ctx = await AppContext.fromConfig(cfg, ac.signal, overrides);
         const handler = connectNodeAdapter({
             routes: routes(ctx),

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["import events from 'node:events'\nimport http from 'node:http'\nimport { connectNodeAdapter } from '@connectrpc/connect-node'\n// eslint-disable-next-line import/default\nimport httpTerminator from 'http-terminator'\nimport { ServerConfig } from './config.js'\nimport { AppContext, AppContextOptions } from './context.js'\nimport { createMuteOpChannel } from './db/schema/mute_op.js'\nimport { createNotifOpChannel } from './db/schema/notif_op.js'\nimport { createOperationChannel } from './db/schema/operation.js'\nimport { dbLogger, loggerMiddleware } from './logger.js'\nimport routes from './routes/index.js'\n\nexport * from './config.js'\nexport * from './client.js'\nexport { Database } from './db/index.js'\nexport { AppContext } from './context.js'\nexport { httpLogger } from './logger.js'\n\ntype BsyncServiceState = 'initialized' | 'started' | 'destroyed'\n\nexport class BsyncService {\n  public ctx: AppContext\n  public server: http.Server\n  private terminator: httpTerminator.HttpTerminator\n  private ac: AbortController\n  private state: BsyncServiceState = 'initialized'\n\n  constructor(opts: {\n    ctx: AppContext\n    server: http.Server\n    ac: AbortController\n  }) {\n    this.ctx = opts.ctx\n    this.server = opts.server\n    this.ac = opts.ac\n    this.terminator = httpTerminator.createHttpTerminator(opts)\n  }\n\n  static async create(\n    cfg: ServerConfig,\n    overrides?: Partial<AppContextOptions>,\n  ): Promise<BsyncService> {\n    const ac = new AbortController()\n    const ctx = await AppContext.fromConfig(cfg, ac.signal, overrides)\n    const handler = connectNodeAdapter({\n      routes: routes(ctx),\n      shutdownSignal: ac.signal,\n    })\n    const server = http.createServer((req, res) => {\n      loggerMiddleware(req, res)\n      if (isHealth(req.url)) {\n        res.statusCode = 200\n        res.setHeader('content-type', 'application/json')\n        return res.end(JSON.stringify({ version: cfg.service.version }))\n      }\n      handler(req, res)\n    })\n    return new BsyncService({ ctx, server, ac })\n  }\n\n  async start(): Promise<http.Server> {\n    if (this.state !== 'initialized') {\n      throw new Error(`${this.constructor.name} already started`)\n    }\n    this.state = 'started'\n\n    const dbStatsInterval = setInterval(() => {\n      dbLogger.info(\n        {\n          idleCount: this.ctx.db.pool.idleCount,\n          totalCount: this.ctx.db.pool.totalCount,\n          waitingCount: this.ctx.db.pool.waitingCount,\n        },\n        'db pool stats',\n      )\n    }, 10000)\n\n    this.ac.signal.addEventListener('abort', () => {\n      clearInterval(dbStatsInterval)\n    })\n\n    await this.setupAppEvents()\n    this.server.listen(this.ctx.cfg.service.port)\n    this.server.keepAliveTimeout = 90000\n    await events.once(this.server, 'listening')\n    return this.server\n  }\n\n  async destroy(): Promise<void> {\n    if (this.state === 'destroyed') return\n    this.state = 'destroyed'\n    this.ac.abort()\n    try {\n      await this.terminator.terminate()\n    } finally {\n      await this.ctx.db.close()\n    }\n  }\n\n  async setupAppEvents() {\n    const conn = await this.ctx.db.pool.connect()\n    this.ac.signal.addEventListener('abort', () => conn.release(), {\n      once: true,\n    })\n    // if these error, unhandled rejection should cause process to exit\n    conn.query(`listen ${createMuteOpChannel}`)\n    conn.query(`listen ${createNotifOpChannel}`)\n    conn.query(`listen ${createOperationChannel}`)\n    conn.on('notification', (notif) => {\n      if (notif.channel === createMuteOpChannel) {\n        this.ctx.events.emit(createMuteOpChannel)\n      }\n      if (notif.channel === createNotifOpChannel) {\n        this.ctx.events.emit(createNotifOpChannel)\n      }\n      if (notif.channel === createOperationChannel) {\n        this.ctx.events.emit(createOperationChannel)\n      }\n    })\n  }\n}\n\nexport default BsyncService\n\nconst isHealth = (urlStr: string | undefined) => {\n  if (!urlStr) return false\n  const url = new URL(urlStr, 'http://host')\n  return url.pathname === '/_health'\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["import events, { setMaxListeners } from 'node:events'\nimport http from 'node:http'\nimport { connectNodeAdapter } from '@connectrpc/connect-node'\n// eslint-disable-next-line import/default\nimport httpTerminator from 'http-terminator'\nimport { ServerConfig } from './config.js'\nimport { AppContext, AppContextOptions } from './context.js'\nimport { createMuteOpChannel } from './db/schema/mute_op.js'\nimport { createNotifOpChannel } from './db/schema/notif_op.js'\nimport { createOperationChannel } from './db/schema/operation.js'\nimport { dbLogger, loggerMiddleware } from './logger.js'\nimport routes from './routes/index.js'\n\nexport * from './config.js'\nexport * from './client.js'\nexport { Database } from './db/index.js'\nexport { AppContext } from './context.js'\nexport { httpLogger } from './logger.js'\n\ntype BsyncServiceState = 'initialized' | 'started' | 'destroyed'\n\nexport class BsyncService {\n  public ctx: AppContext\n  public server: http.Server\n  private terminator: httpTerminator.HttpTerminator\n  private ac: AbortController\n  private state: BsyncServiceState = 'initialized'\n\n  constructor(opts: {\n    ctx: AppContext\n    server: http.Server\n    ac: AbortController\n  }) {\n    this.ctx = opts.ctx\n    this.server = opts.server\n    this.ac = opts.ac\n    this.terminator = httpTerminator.createHttpTerminator(opts)\n  }\n\n  static async create(\n    cfg: ServerConfig,\n    overrides?: Partial<AppContextOptions>,\n  ): Promise<BsyncService> {\n    const ac = new AbortController()\n    // Prevents unhelpful warnings.\n    setMaxListeners(100, ac.signal)\n    const ctx = await AppContext.fromConfig(cfg, ac.signal, overrides)\n    const handler = connectNodeAdapter({\n      routes: routes(ctx),\n      shutdownSignal: ac.signal,\n    })\n    const server = http.createServer((req, res) => {\n      loggerMiddleware(req, res)\n      if (isHealth(req.url)) {\n        res.statusCode = 200\n        res.setHeader('content-type', 'application/json')\n        return res.end(JSON.stringify({ version: cfg.service.version }))\n      }\n      handler(req, res)\n    })\n    return new BsyncService({ ctx, server, ac })\n  }\n\n  async start(): Promise<http.Server> {\n    if (this.state !== 'initialized') {\n      throw new Error(`${this.constructor.name} already started`)\n    }\n    this.state = 'started'\n\n    const dbStatsInterval = setInterval(() => {\n      dbLogger.info(\n        {\n          idleCount: this.ctx.db.pool.idleCount,\n          totalCount: this.ctx.db.pool.totalCount,\n          waitingCount: this.ctx.db.pool.waitingCount,\n        },\n        'db pool stats',\n      )\n    }, 10000)\n\n    this.ac.signal.addEventListener('abort', () => {\n      clearInterval(dbStatsInterval)\n    })\n\n    await this.setupAppEvents()\n    this.server.listen(this.ctx.cfg.service.port)\n    this.server.keepAliveTimeout = 90000\n    await events.once(this.server, 'listening')\n    return this.server\n  }\n\n  async destroy(): Promise<void> {\n    if (this.state === 'destroyed') return\n    this.state = 'destroyed'\n    this.ac.abort()\n    try {\n      await this.terminator.terminate()\n    } finally {\n      await this.ctx.db.close()\n    }\n  }\n\n  async setupAppEvents() {\n    const conn = await this.ctx.db.pool.connect()\n    this.ac.signal.addEventListener('abort', () => conn.release(), {\n      once: true,\n    })\n    // if these error, unhandled rejection should cause process to exit\n    conn.query(`listen ${createMuteOpChannel}`)\n    conn.query(`listen ${createNotifOpChannel}`)\n    conn.query(`listen ${createOperationChannel}`)\n    conn.on('notification', (notif) => {\n      if (notif.channel === createMuteOpChannel) {\n        this.ctx.events.emit(createMuteOpChannel)\n      }\n      if (notif.channel === createNotifOpChannel) {\n        this.ctx.events.emit(createNotifOpChannel)\n      }\n      if (notif.channel === createOperationChannel) {\n        this.ctx.events.emit(createOperationChannel)\n      }\n    })\n  }\n}\n\nexport default BsyncService\n\nconst isHealth = (urlStr: string | undefined) => {\n  if (!urlStr) return false\n  const url = new URL(urlStr, 'http://host')\n  return url.pathname === '/_health'\n}\n"]}

package/dist/logger.js

@@ -9,8 +9,8 @@ export const loggerMiddleware = pinoHttp({
     },
     serializers: {
         err: (err) => ({
-            code: err?.['code'],
-            message: err?.['message'],
+            code: err?.code,
+            message: err?.message,
         }),
         req: (req) => {
             const serialized = stdSerializers.req(req);

package/dist/logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AACpD,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEnE,MAAM,CAAC,MAAM,QAAQ,GACnB,eAAe,CAAC,UAAU,CAAC,CAAA;AAC7B,MAAM,CAAC,MAAM,UAAU,GACrB,eAAe,CAAC,OAAO,CAAC,CAAA;AAE1B,MAAM,CAAC,MAAM,gBAAgB,GAAG,QAAQ,CAAC;IACvC,MAAM,EAAE,UAAU;IAClB,MAAM,EAAE;QACN,KAAK,EAAE,CAAC,2BAA2B,CAAC;KACrC;IACD,WAAW,EAAE;QACX,GAAG,EAAE,CAAC,GAAY,EAAE,EAAE,CAAC,CAAC;YACtB,IAAI,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC;YACnB,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC;SAC1B,CAAC;QACF,GAAG,EAAE,CAAC,GAAoB,EAAE,EAAE;YAC5B,MAAM,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAC1C,MAAM,OAAO,GAAG,gBAAgB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;YACpD,OAAO,EAAE,GAAG,UAAU,EAAE,OAAO,EAAE,CAAA;QACnC,CAAC;KACF;CACF,CAAC,CAAA","sourcesContent":["import { type IncomingMessage } from 'node:http'\nimport { pinoHttp, stdSerializers } from 'pino-http'\nimport { obfuscateHeaders, subsystemLogger } from '@atproto/common'\n\nexport const dbLogger: ReturnType<typeof subsystemLogger> =\n  subsystemLogger('bsync:db')\nexport const httpLogger: ReturnType<typeof subsystemLogger> =\n  subsystemLogger('bsync')\n\nexport const loggerMiddleware = pinoHttp({\n  logger: httpLogger,\n  redact: {\n    paths: ['req.headers.authorization'],\n  },\n  serializers: {\n    err: (err: unknown) => ({\n      code: err?.['code'],\n      message: err?.['message'],\n    }),\n    req: (req: IncomingMessage) => {\n      const serialized = stdSerializers.req(req)\n      const headers = obfuscateHeaders(serialized.headers)\n      return { ...serialized, headers }\n    },\n  },\n})\n"]}
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AACpD,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEnE,MAAM,CAAC,MAAM,QAAQ,GACnB,eAAe,CAAC,UAAU,CAAC,CAAA;AAC7B,MAAM,CAAC,MAAM,UAAU,GACrB,eAAe,CAAC,OAAO,CAAC,CAAA;AAE1B,MAAM,CAAC,MAAM,gBAAgB,GAAG,QAAQ,CAAC;IACvC,MAAM,EAAE,UAAU;IAClB,MAAM,EAAE;QACN,KAAK,EAAE,CAAC,2BAA2B,CAAC;KACrC;IACD,WAAW,EAAE;QACX,GAAG,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,CAAC;YAClB,IAAI,EAAE,GAAG,EAAE,IAAI;YACf,OAAO,EAAE,GAAG,EAAE,OAAO;SACtB,CAAC;QACF,GAAG,EAAE,CAAC,GAAoB,EAAE,EAAE;YAC5B,MAAM,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAC1C,MAAM,OAAO,GAAG,gBAAgB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;YACpD,OAAO,EAAE,GAAG,UAAU,EAAE,OAAO,EAAE,CAAA;QACnC,CAAC;KACF;CACF,CAAC,CAAA","sourcesContent":["import { type IncomingMessage } from 'node:http'\nimport { pinoHttp, stdSerializers } from 'pino-http'\nimport { obfuscateHeaders, subsystemLogger } from '@atproto/common'\n\nexport const dbLogger: ReturnType<typeof subsystemLogger> =\n  subsystemLogger('bsync:db')\nexport const httpLogger: ReturnType<typeof subsystemLogger> =\n  subsystemLogger('bsync')\n\nexport const loggerMiddleware = pinoHttp({\n  logger: httpLogger,\n  redact: {\n    paths: ['req.headers.authorization'],\n  },\n  serializers: {\n    err: (err: any) => ({\n      code: err?.code,\n      message: err?.message,\n    }),\n    req: (req: IncomingMessage) => {\n      const serialized = stdSerializers.req(req)\n      const headers = obfuscateHeaders(serialized.headers)\n      return { ...serialized, headers }\n    },\n  },\n})\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsync",
-  "version": "0.0.31",
+  "version": "0.0.33",
   "license": "MIT",
   "description": "Sychronizing service for app.bsky App View (Bluesky API)",
   "keywords": [
@@ -13,6 +13,18 @@
     "url": "https://github.com/bluesky-social/atproto",
     "directory": "packages/bsync"
   },
+  "files": [
+    "./dist",
+    "./README.md",
+    "./CHANGELOG.md"
+  ],
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    }
+  },
   "engines": {
     "node": ">=22"
   },
@@ -25,8 +37,8 @@
     "pg": "^8.10.0",
     "pino-http": "^11.0.0",
     "typed-emitter": "^2.1.0",
-    "@atproto/common": "^0.6.4",
-    "@atproto/syntax": "^0.6.3"
+    "@atproto/common": "^0.6.5",
+    "@atproto/syntax": "^0.6.4"
   },
   "devDependencies": {
     "@bufbuild/buf": "^1.28.1",
@@ -34,15 +46,7 @@
     "@connectrpc/protoc-gen-connect-es": "^1.1.4",
     "@types/pg": "^8.15.5",
     "get-port": "^5.1.1",
-    "jest": "^30.0.0",
-    "ts-node": "^10.8.2"
-  },
-  "type": "module",
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "default": "./dist/index.js"
-    }
+    "jest": "^30.0.0"
   },
   "scripts": {
     "codegen:buf": "buf generate proto",
@@ -52,7 +56,7 @@
     "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",
+    "migration:create": "node ./bin/migration-create.ts",
     "buf:gen": ">&2 echo 'DEPRECATED: run `pnpm run codegen:buf` instead ' && pnpm run codegen:buf"
   }
 }

package/bin/migration-create.ts

@@ -1,38 +0,0 @@
-#!/usr/bin/env ts-node
-
-import * as fs from 'node:fs/promises'
-import * as path from 'node:path'
-
-export async function main() {
-  const now = new Date()
-  const prefix = now.toISOString().replace(/[^a-z0-9]/gi, '') // Order of migrations matches alphabetical order of their names
-  const name = process.argv[2]
-  if (!name || !name.match(/^[a-z0-9-]+$/)) {
-    process.exitCode = 1
-    return console.error(
-      'Must pass a migration name consisting of lowercase digits, numbers, and dashes.',
-    )
-  }
-  const filename = `${prefix}-${name}`
-  const dir = path.join(__dirname, '..', 'src', 'db', 'migrations')
-
-  await fs.writeFile(path.join(dir, `${filename}.ts`), template, { flag: 'wx' })
-  await fs.writeFile(
-    path.join(dir, 'index.ts'),
-    `export * as _${prefix} from './${filename}.js'\n`,
-    { flag: 'a' },
-  )
-}
-
-const template = `import { Kysely } from 'kysely'
-
-export async function up(db: Kysely<unknown>): Promise<void> {
-  // Migration code
-}
-
-export async function down(db: Kysely<unknown>): Promise<void> {
-  // Migration code
-}
-`
-
-main()

package/buf.gen.yaml

@@ -1,12 +0,0 @@
-version: v1
-plugins:
-  - plugin: es
-    opt:
-      - target=ts
-      - import_extension=
-    out: src/proto
-  - plugin: connect-es
-    opt:
-      - target=ts
-      - import_extension=.js
-    out: src/proto

package/jest.config.cjs

@@ -1,21 +0,0 @@
-/** @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/proto/bsync.proto

@@ -1,134 +0,0 @@
-syntax = "proto3";
-
-package bsync;
-option go_package = "./;bsync";
-
-//
-// Sync
-//
-
-
-message MuteOperation {
-  enum Type {
-    TYPE_UNSPECIFIED = 0;
-    TYPE_ADD = 1;
-    TYPE_REMOVE = 2;
-    TYPE_CLEAR = 3;
-  }
-  string id = 1;
-  Type type = 2;
-  string actor_did = 3;
-  string subject = 4;
-}
-
-message AddMuteOperationRequest {
-  MuteOperation.Type type = 1;
-  string actor_did = 2;
-  string subject = 3;
-}
-
-message AddMuteOperationResponse {
-  MuteOperation operation = 1;
-}
-
-message ScanMuteOperationsRequest {
-  string cursor = 1;
-  int32 limit = 2;
-}
-
-message ScanMuteOperationsResponse {
-  repeated MuteOperation operations = 1;
-  string cursor = 2;
-}
-
-message NotifOperation {
-  string id = 1;
-  string actor_did = 2;
-  optional bool priority = 3;
-}
-
-message AddNotifOperationRequest {
-  string actor_did = 1;
-  optional bool priority = 2;
-}
-
-message AddNotifOperationResponse {
-  NotifOperation operation = 1;
-}
-
-message ScanNotifOperationsRequest {
-  string cursor = 1;
-  int32 limit = 2;
-}
-
-message ScanNotifOperationsResponse {
-  repeated NotifOperation operations = 1;
-  string cursor = 2;
-}
-
-
-enum Method {
-  METHOD_UNSPECIFIED = 0;
-  METHOD_CREATE = 1;
-  METHOD_UPDATE = 2;
-  METHOD_DELETE = 3;
-}
-
-message Operation {
-  string id = 1;
-  string actor_did = 2;
-  string namespace = 3;
-  string key = 4;
-  Method method = 5;
-  bytes payload = 6;
-}
-
-message PutOperationRequest {
-  string actor_did = 1;
-  string namespace = 2;
-  string key = 3;
-  Method method = 4;
-  bytes payload = 5;
-}
-
-message PutOperationResponse {
-  Operation operation = 1;
-}
-
-message ScanOperationsRequest {
-  string cursor = 1;
-  int32 limit = 2;
-}
-
-message ScanOperationsResponse {
-  repeated Operation operations = 1;
-  string cursor = 2;
-}
-
-message DeleteOperationsByActorAndNamespaceRequest {
-  string actor_did = 1;
-  string namespace = 2;
-}
-
-message DeleteOperationsByActorAndNamespaceResponse {
-  int32 deleted_count = 1;
-}
-
-
-// Ping
-message PingRequest {}
-message PingResponse {}
-
-
-service Service {
-  // Sync
-  rpc AddMuteOperation(AddMuteOperationRequest) returns (AddMuteOperationResponse);
-  rpc ScanMuteOperations(ScanMuteOperationsRequest) returns (ScanMuteOperationsResponse);
-  rpc AddNotifOperation(AddNotifOperationRequest) returns (AddNotifOperationResponse);
-  rpc ScanNotifOperations(ScanNotifOperationsRequest) returns (ScanNotifOperationsResponse);
-  rpc PutOperation(PutOperationRequest) returns (PutOperationResponse);
-  rpc ScanOperations(ScanOperationsRequest) returns (ScanOperationsResponse);
-  rpc DeleteOperationsByActorAndNamespace(DeleteOperationsByActorAndNamespaceRequest) returns (DeleteOperationsByActorAndNamespaceResponse);
-  // Ping
-  rpc Ping(PingRequest) returns (PingResponse);
-}

package/src/client.ts

@@ -1,25 +0,0 @@
-import {
-  Interceptor,
-  PromiseClient,
-  createPromiseClient,
-} from '@connectrpc/connect'
-import {
-  ConnectTransportOptions,
-  createConnectTransport,
-} from '@connectrpc/connect-node'
-import { Service } from './proto/bsync_connect.js'
-
-export type BsyncClient = PromiseClient<typeof Service>
-
-export const createClient = (opts: ConnectTransportOptions): BsyncClient => {
-  const transport = createConnectTransport(opts)
-  return createPromiseClient(Service, transport)
-}
-
-export const authWithApiKey =
-  (apiKey: string): Interceptor =>
-  (next) =>
-  (req) => {
-    req.header.set('authorization', `Bearer ${apiKey}`)
-    return next(req)
-  }

package/src/config.ts

@@ -1,90 +0,0 @@
-import assert from 'node:assert'
-import { envBool, envInt, envList, envStr } from '@atproto/common'
-
-export const envToCfg = (env: ServerEnvironment): ServerConfig => {
-  const serviceCfg: ServerConfig['service'] = {
-    port: env.port ?? 2585,
-    version: env.version ?? 'unknown',
-    longPollTimeoutMs: env.longPollTimeoutMs ?? 10000,
-  }
-
-  assert(env.dbUrl, 'missing postgres url')
-  const dbCfg: ServerConfig['db'] = {
-    url: env.dbUrl,
-    schema: env.dbSchema,
-    poolSize: env.dbPoolSize,
-    poolMaxUses: env.dbPoolMaxUses,
-    poolIdleTimeoutMs: env.dbPoolIdleTimeoutMs,
-    migrate: env.dbMigrate,
-  }
-
-  assert(env.apiKeys.length > 0, 'missing api keys')
-  const authCfg: ServerConfig['auth'] = {
-    apiKeys: new Set(env.apiKeys),
-  }
-
-  return {
-    service: serviceCfg,
-    db: dbCfg,
-    auth: authCfg,
-  }
-}
-
-export type ServerConfig = {
-  service: ServiceConfig
-  db: DatabaseConfig
-  auth: AuthConfig
-}
-
-type ServiceConfig = {
-  port: number
-  version?: string
-  longPollTimeoutMs: number
-}
-
-type DatabaseConfig = {
-  url: string
-  schema?: string
-  poolSize?: number
-  poolMaxUses?: number
-  poolIdleTimeoutMs?: number
-  migrate?: boolean
-}
-
-type AuthConfig = {
-  apiKeys: Set<string>
-}
-
-export const readEnv = (): ServerEnvironment => {
-  return {
-    // service
-    port: envInt('BSYNC_PORT'),
-    version: envStr('BSYNC_VERSION'),
-    longPollTimeoutMs: envInt('BSYNC_LONG_POLL_TIMEOUT_MS'),
-    // database
-    dbUrl: envStr('BSYNC_DB_POSTGRES_URL'),
-    dbSchema: envStr('BSYNC_DB_POSTGRES_SCHEMA'),
-    dbPoolSize: envInt('BSYNC_DB_POOL_SIZE'),
-    dbPoolMaxUses: envInt('BSYNC_DB_POOL_MAX_USES'),
-    dbPoolIdleTimeoutMs: envInt('BSYNC_DB_POOL_IDLE_TIMEOUT_MS'),
-    dbMigrate: envBool('BSYNC_DB_MIGRATE'),
-    // secrets
-    apiKeys: envList('BSYNC_API_KEYS'),
-  }
-}
-
-export type ServerEnvironment = {
-  // service
-  port?: number
-  version?: string
-  longPollTimeoutMs?: number
-  // database
-  dbUrl?: string
-  dbSchema?: string
-  dbPoolSize?: number
-  dbPoolMaxUses?: number
-  dbPoolIdleTimeoutMs?: number
-  dbMigrate?: boolean
-  // secrets
-  apiKeys: string[]
-}

package/src/context.ts

@@ -1,48 +0,0 @@
-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
-  cfg: ServerConfig
-  shutdown: AbortSignal
-}
-
-export class AppContext {
-  db: Database
-  cfg: ServerConfig
-  shutdown: AbortSignal
-  events: TypedEmitter.default<AppEvents>
-
-  constructor(opts: AppContextOptions) {
-    this.db = opts.db
-    this.cfg = opts.cfg
-    this.shutdown = opts.shutdown
-    this.events = new EventEmitter() as TypedEmitter.default<AppEvents>
-  }
-
-  static async fromConfig(
-    cfg: ServerConfig,
-    shutdown: AbortSignal,
-    overrides?: Partial<AppContextOptions>,
-  ): Promise<AppContext> {
-    const db = new Database({
-      url: cfg.db.url,
-      schema: cfg.db.schema,
-      poolSize: cfg.db.poolSize,
-      poolMaxUses: cfg.db.poolMaxUses,
-      poolIdleTimeoutMs: cfg.db.poolIdleTimeoutMs,
-    })
-    return new AppContext({ db, cfg, shutdown, ...overrides })
-  }
-}
-
-export type AppEvents = {
-  [createMuteOpChannel]: () => void
-  [createNotifOpChannel]: () => void
-  [createOperationChannel]: () => void
-}