@atproto/bsync 0.0.32 → 0.0.33

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @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

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.32",
+  "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
-}

package/src/db/index.ts

@@ -1,200 +0,0 @@
-import assert from 'node:assert'
-import { EventEmitter } from 'node:events'
-import {
-  Kysely,
-  KyselyPlugin,
-  PluginTransformQueryArgs,
-  PluginTransformResultArgs,
-  PostgresDialect,
-  QueryResult,
-  RootOperationNode,
-  UnknownRow,
-} from 'kysely'
-import { Migrator } from 'kysely/migration'
-// 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
-  db: DatabaseSchema
-  migrator: Migrator
-  txEvt = new EventEmitter() as TxnEmitter
-  destroyed = false
-
-  constructor(
-    public opts: PgOptions,
-    instances?: { db: DatabaseSchema; pool: PgPool },
-  ) {
-    // if instances are provided, use those
-    if (instances) {
-      this.db = instances.db
-      this.pool = instances.pool
-    } 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,
-        })
-
-      // 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}`,
-        )
-      }
-
-      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.migrator = new Migrator({
-      db: this.db,
-      migrationTableSchema: opts.schema,
-      provider: new DbMigrationProvider(migrations),
-    })
-  }
-
-  get schema(): string | undefined {
-    return this.opts.schema
-  }
-
-  get isTransaction() {
-    return this.db.isTransaction
-  }
-
-  assertTransaction() {
-    assert(this.isTransaction, 'Transaction required')
-  }
-
-  assertNotTransaction() {
-    assert(!this.isTransaction, 'Cannot be in a transaction')
-  }
-
-  async transaction<T>(fn: (db: Database) => Promise<T>): Promise<T> {
-    const leakyTxPlugin = new LeakyTxPlugin()
-    const { dbTxn, txRes } = await this.db
-      .withPlugin(leakyTxPlugin)
-      .transaction()
-      .execute(async (txn) => {
-        const dbTxn = new Database(this.opts, {
-          db: txn,
-          pool: this.pool,
-        })
-        const txRes = await fn(dbTxn)
-          .catch(async (err) => {
-            leakyTxPlugin.endTx()
-            // ensure that all in-flight queries are flushed & the connection is open
-            await dbTxn.db.getExecutor().provideConnection(noopAsync)
-            throw err
-          })
-          .finally(() => leakyTxPlugin.endTx())
-        return { dbTxn, txRes }
-      })
-    dbTxn?.txEvt.emit('commit')
-    return txRes
-  }
-
-  onCommit(fn: () => void) {
-    this.assertTransaction()
-    this.txEvt.once('commit', fn)
-  }
-
-  async close(): Promise<void> {
-    if (this.destroyed) return
-    await this.db.destroy()
-    this.destroyed = true
-  }
-
-  async migrateToOrThrow(migration: string) {
-    if (this.schema) {
-      await this.db.schema.createSchema(this.schema).ifNotExists().execute()
-    }
-    const { error, results } = await this.migrator.migrateTo(migration)
-    if (error) {
-      throw error
-    }
-    if (!results) {
-      throw new Error('An unknown failure occurred while migrating')
-    }
-    return results
-  }
-
-  async migrateToLatestOrThrow() {
-    if (this.schema) {
-      await this.db.schema.createSchema(this.schema).ifNotExists().execute()
-    }
-    const { error, results } = await this.migrator.migrateToLatest()
-    if (error) {
-      throw error
-    }
-    if (!results) {
-      throw new Error('An unknown failure occurred while migrating')
-    }
-    return results
-  }
-}
-
-export default Database
-
-const onPoolError = (err: Error) => dbLogger.error({ err }, 'db pool error')
-const onClientError = (err: Error) => dbLogger.error({ err }, 'db client error')
-
-// utils
-// -------
-
-class LeakyTxPlugin implements KyselyPlugin {
-  private txOver = false
-
-  endTx() {
-    this.txOver = true
-  }
-
-  transformQuery(args: PluginTransformQueryArgs): RootOperationNode {
-    if (this.txOver) {
-      throw new Error('tx already failed')
-    }
-    return args.node
-  }
-
-  async transformResult(
-    args: PluginTransformResultArgs,
-  ): Promise<QueryResult<UnknownRow>> {
-    return args.result
-  }
-}
-
-type TxnEmitter = TypedEmitter.default<TxnEvents>
-
-type TxnEvents = {
-  commit: () => void
-}
-
-const noopAsync = async () => {}