@atproto/bsync 0.0.2 → 0.0.3

package/dist/routes/index.js

@@ -0,0 +1,21 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const kysely_1 = require("kysely");
+const bsync_connect_1 = require("../proto/bsync_connect");
+const add_mute_operation_1 = __importDefault(require("./add-mute-operation"));
+const scan_mute_operations_1 = __importDefault(require("./scan-mute-operations"));
+exports.default = (ctx) => (router) => {
+    return router.service(bsync_connect_1.Service, {
+        ...(0, add_mute_operation_1.default)(ctx),
+        ...(0, scan_mute_operations_1.default)(ctx),
+        async ping() {
+            const { db } = ctx;
+            await (0, kysely_1.sql) `select 1`.execute(db.db);
+            return {};
+        },
+    });
+};
+//# sourceMappingURL=index.js.map

package/dist/routes/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/routes/index.ts"],"names":[],"mappings":";;;;;AAAA,mCAA4B;AAE5B,0DAAgD;AAEhD,8EAAmD;AACnD,kFAAuD;AAEvD,kBAAe,CAAC,GAAe,EAAE,EAAE,CAAC,CAAC,MAAqB,EAAE,EAAE;IAC5D,OAAO,MAAM,CAAC,OAAO,CAAC,uBAAO,EAAE;QAC7B,GAAG,IAAA,4BAAgB,EAAC,GAAG,CAAC;QACxB,GAAG,IAAA,8BAAkB,EAAC,GAAG,CAAC;QAC1B,KAAK,CAAC,IAAI;YACR,MAAM,EAAE,EAAE,EAAE,GAAG,GAAG,CAAA;YAClB,MAAM,IAAA,YAAG,EAAA,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;YAClC,OAAO,EAAE,CAAA;QACX,CAAC;KACF,CAAC,CAAA;AACJ,CAAC,CAAA"}

package/dist/routes/scan-mute-operations.d.ts

@@ -3,3 +3,4 @@ import { Service } from '../proto/bsync_connect';
 import AppContext from '../context';
 declare const _default: (ctx: AppContext) => Partial<ServiceImpl<typeof Service>>;
 export default _default;
+//# sourceMappingURL=scan-mute-operations.d.ts.map

package/dist/routes/scan-mute-operations.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"scan-mute-operations.d.ts","sourceRoot":"","sources":["../../src/routes/scan-mute-operations.ts"],"names":[],"mappings":"AACA,OAAO,EAAsB,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACrE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAEhD,OAAO,UAAU,MAAM,YAAY,CAAA;8BAId,UAAU,KAAG,QAAQ,YAAY,cAAc,CAAC,CAAC;AAAtE,wBAuDE"}

package/dist/routes/scan-mute-operations.js

@@ -0,0 +1,80 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_events_1 = require("node:events");
+const connect_1 = require("@connectrpc/connect");
+const bsync_pb_1 = require("../proto/bsync_pb");
+const mute_op_1 = require("../db/schema/mute_op");
+const auth_1 = require("./auth");
+exports.default = (ctx) => ({
+    async scanMuteOperations(req, handlerCtx) {
+        (0, auth_1.authWithApiKey)(ctx, handlerCtx);
+        const { db, events } = ctx;
+        const limit = req.limit || 1000;
+        const cursor = validCursor(req.cursor);
+        const nextMuteOpPromise = (0, node_events_1.once)(events, mute_op_1.createMuteOpChannel, {
+            signal: combineSignals(ctx.shutdown, AbortSignal.timeout(ctx.cfg.service.longPollTimeoutMs)),
+        });
+        nextMuteOpPromise.catch(() => null); // ensure timeout is always handled
+        const nextMuteOpPageQb = db.db
+            .selectFrom('mute_op')
+            .selectAll()
+            .where('id', '>', cursor ?? -1)
+            .orderBy('id', 'asc')
+            .limit(limit);
+        let ops = await nextMuteOpPageQb.execute();
+        if (!ops.length) {
+            // if there were no ops on the page, wait for an event then try again.
+            try {
+                await nextMuteOpPromise;
+            }
+            catch (err) {
+                ctx.shutdown.throwIfAborted();
+                return new bsync_pb_1.ScanMuteOperationsResponse({
+                    operations: [],
+                    cursor: req.cursor,
+                });
+            }
+            ops = await nextMuteOpPageQb.execute();
+            if (!ops.length) {
+                return new bsync_pb_1.ScanMuteOperationsResponse({
+                    operations: [],
+                    cursor: req.cursor,
+                });
+            }
+        }
+        const lastOp = ops[ops.length - 1];
+        return new bsync_pb_1.ScanMuteOperationsResponse({
+            operations: ops.map((op) => ({
+                id: op.id.toString(),
+                type: op.type,
+                actorDid: op.actorDid,
+                subject: op.subject,
+            })),
+            cursor: lastOp.id.toString(),
+        });
+    },
+});
+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);
+    }
+    return int;
+};
+const combineSignals = (a, b) => {
+    const controller = new AbortController();
+    for (const signal of [a, b]) {
+        if (signal.aborted) {
+            controller.abort();
+            return signal;
+        }
+        signal.addEventListener('abort', () => controller.abort(signal.reason), {
+            // @ts-ignore https://github.com/DefinitelyTyped/DefinitelyTyped/pull/68625
+            signal: controller.signal,
+        });
+    }
+    return controller.signal;
+};
+//# sourceMappingURL=scan-mute-operations.js.map

package/dist/routes/scan-mute-operations.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scan-mute-operations.js","sourceRoot":"","sources":["../../src/routes/scan-mute-operations.ts"],"names":[],"mappings":"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"}

package/jest.config.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsync",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "license": "MIT",
   "description": "Sychronizing service for app.bsky App View (Bluesky API)",
   "keywords": [
@@ -14,36 +14,34 @@
     "directory": "packages/bsync"
   },
   "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "dependencies": {
     "@bufbuild/protobuf": "^1.5.0",
     "@connectrpc/connect": "^1.1.4",
-    "@connectrpc/connect-express": "^1.1.4",
     "@connectrpc/connect-node": "^1.1.4",
     "http-terminator": "^3.2.0",
     "kysely": "^0.22.0",
     "pg": "^8.10.0",
-    "pino": "^8.15.0",
     "pino-http": "^8.2.1",
     "typed-emitter": "^2.1.0",
-    "@atproto/common": "^0.3.4",
-    "@atproto/syntax": "^0.2.1"
+    "@atproto/common": "^0.4.0",
+    "@atproto/syntax": "^0.3.0"
   },
   "devDependencies": {
     "@bufbuild/buf": "^1.28.1",
     "@bufbuild/protoc-gen-es": "^1.5.0",
     "@connectrpc/protoc-gen-connect-es": "^1.1.4",
-    "@types/pg": "^8.6.6"
+    "@types/pg": "^8.6.6",
+    "jest": "^28.1.2",
+    "ts-node": "^10.8.2"
   },
   "scripts": {
-    "build": "node ./build.js",
-    "postbuild": "tsc --build tsconfig.build.json",
-    "update-main-to-dist": "node ../../update-main-to-dist.js packages/bsync",
+    "build": "tsc --build tsconfig.build.json",
     "start": "node --enable-source-maps dist/bin.js",
     "test": "../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",
     "buf:gen": "buf generate proto"
-  },
-  "types": "dist/index.d.ts"
+  }
 }

package/src/context.ts

@@ -7,21 +7,25 @@ import { EventEmitter } from 'stream'
 export type AppContextOptions = {
   db: Database
   cfg: ServerConfig
+  shutdown: AbortSignal
 }
 
 export class AppContext {
   db: Database
   cfg: ServerConfig
+  shutdown: AbortSignal
   events: TypedEventEmitter<AppEvents>
 
   constructor(opts: AppContextOptions) {
     this.db = opts.db
     this.cfg = opts.cfg
+    this.shutdown = opts.shutdown
     this.events = new EventEmitter() as TypedEventEmitter<AppEvents>
   }
 
   static async fromConfig(
     cfg: ServerConfig,
+    shutdown: AbortSignal,
     overrides?: Partial<AppContextOptions>,
   ): Promise<AppContext> {
     const db = new Database({
@@ -31,7 +35,7 @@ export class AppContext {
       poolMaxUses: cfg.db.poolMaxUses,
       poolIdleTimeoutMs: cfg.db.poolIdleTimeoutMs,
     })
-    return new AppContext({ db, cfg, ...overrides })
+    return new AppContext({ db, cfg, shutdown, ...overrides })
   }
 }
 

package/src/db/index.ts

@@ -34,41 +34,43 @@ export class Database {
     if (instances) {
       this.db = instances.db
       this.pool = instances.pool
-      return
-    }
+    } else {
+      // else create a pool & connect
+      const { schema, url } = opts
+      const pool =
+        opts.pool ??
+        new PgPool({
+          connectionString: url,
+          max: opts.poolSize,
+          maxUses: opts.poolMaxUses,
+          idleTimeoutMillis: opts.poolIdleTimeoutMs,
+        })
 
-    // else create a pool & connect
-    const { schema, url } = opts
-    const pool =
-      opts.pool ??
-      new PgPool({
-        connectionString: url,
-        max: opts.poolSize,
-        maxUses: opts.poolMaxUses,
-        idleTimeoutMillis: opts.poolIdleTimeoutMs,
-      })
+      // Select count(*) and other pg bigints as js integer
+      pgTypes.setTypeParser(pgTypes.builtins.INT8, (n) => parseInt(n, 10))
 
-    // Select count(*) and other pg bigints as js integer
-    pgTypes.setTypeParser(pgTypes.builtins.INT8, (n) => parseInt(n, 10))
+      // Setup schema usage, primarily for test parallelism (each test suite runs in its own pg schema)
+      if (schema && !/^[a-z_]+$/i.test(schema)) {
+        throw new Error(
+          `Postgres schema must only contain [A-Za-z_]: ${schema}`,
+        )
+      }
 
-    // Setup schema usage, primarily for test parallelism (each test suite runs in its own pg schema)
-    if (schema && !/^[a-z_]+$/i.test(schema)) {
-      throw new Error(`Postgres schema must only contain [A-Za-z_]: ${schema}`)
-    }
+      pool.on('error', onPoolError)
+      pool.on('connect', (client) => {
+        client.on('error', onClientError)
+        if (schema) {
+          // Shared objects such as extensions will go in the public schema
+          client.query(`SET search_path TO "${schema}",public;`)
+        }
+      })
 
-    pool.on('error', onPoolError)
-    pool.on('connect', (client) => {
-      client.on('error', onClientError)
-      if (schema) {
-        // Shared objects such as extensions will go in the public schema
-        client.query(`SET search_path TO "${schema}",public;`)
-      }
-    })
+      this.pool = pool
+      this.db = new Kysely<DatabaseSchemaType>({
+        dialect: new PostgresDialect({ pool }),
+      })
+    }
 
-    this.pool = pool
-    this.db = new Kysely<DatabaseSchemaType>({
-      dialect: new PostgresDialect({ pool }),
-    })
     this.migrator = new Migrator({
       db: this.db,
       migrationTableSchema: opts.schema,
@@ -165,7 +167,7 @@ const onClientError = (err: Error) => dbLogger.error({ err }, 'db client error')
 // -------
 
 class LeakyTxPlugin implements KyselyPlugin {
-  private txOver: boolean
+  private txOver = false
 
   endTx() {
     this.txOver = true

package/src/index.ts

@@ -19,7 +19,7 @@ export class BsyncService {
   public server: http.Server
   private ac: AbortController
   private terminator: HttpTerminator
-  private dbStatsInterval: NodeJS.Timer
+  private dbStatsInterval?: NodeJS.Timeout
 
   constructor(opts: {
     ctx: AppContext
@@ -36,8 +36,8 @@ export class BsyncService {
     cfg: ServerConfig,
     overrides?: Partial<AppContextOptions>,
   ): Promise<BsyncService> {
-    const ctx = await AppContext.fromConfig(cfg, overrides)
     const ac = new AbortController()
+    const ctx = await AppContext.fromConfig(cfg, ac.signal, overrides)
     const handler = connectNodeAdapter({
       routes: routes(ctx),
       shutdownSignal: ac.signal,
@@ -55,6 +55,9 @@ export class BsyncService {
   }
 
   async start(): Promise<http.Server> {
+    if (this.dbStatsInterval) {
+      throw new Error(`${this.constructor.name} already started`)
+    }
     this.dbStatsInterval = setInterval(() => {
       dbLogger.info(
         {
@@ -77,6 +80,7 @@ export class BsyncService {
     await this.terminator.terminate()
     await this.ctx.db.close()
     clearInterval(this.dbStatsInterval)
+    this.dbStatsInterval = undefined
   }
 
   async setupAppEvents() {

package/src/proto/bsync_connect.ts

@@ -10,7 +10,7 @@ import {
   PingResponse,
   ScanMuteOperationsRequest,
   ScanMuteOperationsResponse,
-} from './bsync_pb.ts'
+} from './bsync_pb'
 import { MethodKind } from '@bufbuild/protobuf'
 
 /**

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

@@ -13,7 +13,10 @@ export default (ctx: AppContext): Partial<ServiceImpl<typeof Service>> => ({
     const limit = req.limit || 1000
     const cursor = validCursor(req.cursor)
     const nextMuteOpPromise = once(events, createMuteOpChannel, {
-      signal: AbortSignal.timeout(ctx.cfg.service.longPollTimeoutMs),
+      signal: combineSignals(
+        ctx.shutdown,
+        AbortSignal.timeout(ctx.cfg.service.longPollTimeoutMs),
+      ),
     })
     nextMuteOpPromise.catch(() => null) // ensure timeout is always handled
 
@@ -31,6 +34,7 @@ export default (ctx: AppContext): Partial<ServiceImpl<typeof Service>> => ({
       try {
         await nextMuteOpPromise
       } catch (err) {
+        ctx.shutdown.throwIfAborted()
         return new ScanMuteOperationsResponse({
           operations: [],
           cursor: req.cursor,
@@ -67,3 +71,18 @@ const validCursor = (cursor: string): number | null => {
   }
   return int
 }
+
+const combineSignals = (a: AbortSignal, b: AbortSignal) => {
+  const controller = new AbortController()
+  for (const signal of [a, b]) {
+    if (signal.aborted) {
+      controller.abort()
+      return signal
+    }
+    signal.addEventListener('abort', () => controller.abort(signal.reason), {
+      // @ts-ignore https://github.com/DefinitelyTyped/DefinitelyTyped/pull/68625
+      signal: controller.signal,
+    })
+  }
+  return controller.signal
+}

package/tsconfig.build.json

@@ -1,4 +1,8 @@
 {
-  "extends": "./tsconfig.json",
-  "exclude": ["**/*.spec.ts", "**/*.test.ts"]
+  "extends": "../../tsconfig/node.json",
+  "compilerOptions": {
+    "rootDir": "./src",
+    "outDir": "./dist"
+  },
+  "include": ["./src"]
 }

package/tsconfig.json

@@ -1,14 +1,7 @@
 {
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "rootDir": "./src",
-    "outDir": "./dist",
-    "emitDeclarationOnly": true
-  },
-  "module": "nodenext",
-  "include": ["./src", "__tests__/**/**.ts"],
+  "include": [],
   "references": [
-    { "path": "../common/tsconfig.build.json" },
-    { "path": "../common-web/tsconfig.build.json" }
+    { "path": "./tsconfig.build.json" },
+    { "path": "./tsconfig.tests.json" }
   ]
 }

package/tsconfig.tests.json

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

package/babel.config.js

@@ -1,3 +0,0 @@
-module.exports = {
-  presets: [['@babel/preset-env']],
-}

package/build.js

@@ -1,18 +0,0 @@
-const { nodeExternalsPlugin } = require('esbuild-node-externals')
-
-const buildShallow =
-  process.argv.includes('--shallow') || process.env.ATP_BUILD_SHALLOW === 'true'
-
-require('esbuild').build({
-  logLevel: 'info',
-  entryPoints: ['src/index.ts'],
-  bundle: true,
-  sourcemap: true,
-  outdir: 'dist',
-  platform: 'node',
-  external: [
-    // Referenced in pg driver, but optional and we don't use it
-    'pg-native',
-  ],
-  plugins: buildShallow ? [nodeExternalsPlugin()] : [],
-})