@atproto/bsync 0.0.24 → 0.0.26-next.0

package/src/routes/put-operation.ts

@@ -1,17 +1,20 @@
 import { Code, ConnectError, ServiceImpl } from '@connectrpc/connect'
 import { sql } from 'kysely'
-import { ensureValidNsid, 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 { ensureValidRecordKey } from '@atproto/syntax'
+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 } 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) {
@@ -103,25 +106,10 @@ const validateOp = (req: PutOperationRequest): Operation => {
   return req as Operation
 }
 
-const validateNamespace = (namespace: string): void => {
-  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
-
-  ensureValidNsid(nsid)
-  if (fragment && !/^[a-zA-Z][a-zA-Z0-9]*$/.test(fragment)) {
-    throw new Error('namespace fragment must be a valid identifier')
-  }
-}
-
 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/src/routes/util.ts

@@ -3,6 +3,7 @@ import {
   InvalidDidError,
   ensureValidAtUri,
   ensureValidDid,
+  ensureValidNsid,
 } from '@atproto/syntax'
 
 export const validCursor = (cursor: string): number | null => {
@@ -49,3 +50,18 @@ export const isValidAtUri = (uri: string) => {
     return false
   }
 }
+
+export const validateNamespace = (namespace: string): void => {
+  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
+
+  ensureValidNsid(nsid)
+  if (fragment && !/^[a-zA-Z][a-zA-Z0-9]*$/.test(fragment)) {
+    throw new Error('namespace fragment must be a valid identifier')
+  }
+}

package/tests/delete-operations.test.ts

@@ -0,0 +1,108 @@
+import getPort from 'get-port'
+import {
+  BsyncClient,
+  BsyncService,
+  Database,
+  authWithApiKey,
+  createClient,
+  envToCfg,
+} from '../src/index.js'
+import { Method } from '../src/proto/bsync_pb.js'
+
+describe('operations', () => {
+  let bsync: BsyncService
+  let client: BsyncClient
+
+  const validPayload0 = Buffer.from(JSON.stringify({ value: 0 }))
+  const validPayload1 = Buffer.from(JSON.stringify({ value: 1 }))
+
+  beforeAll(async () => {
+    bsync = await BsyncService.create(
+      envToCfg({
+        port: await getPort(),
+        dbUrl: process.env.DB_POSTGRES_URL,
+        dbSchema: 'bsync_delete_operations',
+        apiKeys: ['key-1'],
+        longPollTimeoutMs: 500,
+      }),
+    )
+    await bsync.ctx.db.migrateToLatestOrThrow()
+    await bsync.start()
+    client = createClient({
+      httpVersion: '1.1',
+      baseUrl: `http://localhost:${bsync.ctx.cfg.service.port}`,
+      interceptors: [authWithApiKey('key-1')],
+    })
+  })
+
+  afterAll(async () => {
+    await bsync.destroy()
+  })
+
+  beforeEach(async () => {
+    await clearOps(bsync.ctx.db)
+  })
+
+  it('deletes', async () => {
+    const res1 = await client.putOperation({
+      actorDid: 'did:example:a',
+      namespace: 'app.bsky.some.col',
+      key: 'key1',
+      method: Method.CREATE,
+      payload: validPayload0,
+    })
+    const res2 = await client.putOperation({
+      actorDid: 'did:example:a',
+      namespace: 'app.bsky.other.col#id',
+      key: 'key1',
+      method: Method.UPDATE,
+      payload: validPayload1,
+    })
+
+    expect(res1.operation?.id).toBe('1')
+    expect(res2.operation?.id).toBe('2')
+    expect(await dumpOps(bsync.ctx.db)).toStrictEqual([
+      {
+        id: 1,
+        actorDid: 'did:example:a',
+        namespace: 'app.bsky.some.col',
+        key: 'key1',
+        method: Method.CREATE,
+        payload: validPayload0,
+        createdAt: expect.any(Date),
+      },
+      {
+        id: 2,
+        actorDid: 'did:example:a',
+        namespace: 'app.bsky.other.col#id',
+        key: 'key1',
+        method: Method.UPDATE,
+        payload: validPayload1,
+        createdAt: expect.any(Date),
+      },
+    ])
+
+    await client.deleteOperationsByActorAndNamespace({
+      actorDid: 'did:example:a',
+      namespace: 'app.bsky.some.col',
+    })
+    await client.deleteOperationsByActorAndNamespace({
+      actorDid: 'did:example:a',
+      namespace: 'app.bsky.other.col#id',
+    })
+
+    expect(await dumpOps(bsync.ctx.db)).toStrictEqual([])
+  })
+})
+
+const dumpOps = async (db: Database) => {
+  return db.db
+    .selectFrom('operation')
+    .selectAll()
+    .orderBy('id', 'asc')
+    .execute()
+}
+
+const clearOps = async (db: Database) => {
+  await db.db.deleteFrom('operation').execute()
+}

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.json

@@ -4,5 +4,5 @@
     "rootDir": "./src",
     "outDir": "./dist"
   },
-  "include": ["./src"]
+  "include": ["./src", "../../tsconfig/cjs-default-exports.d.ts"]
 }

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/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","../../tsconfig/cjs-default-exports.d.ts"],"version":"6.0.3"}

package/tsconfig.tests.json

@@ -3,5 +3,5 @@
   "compilerOptions": {
     "rootDir": "."
   },
-  "include": ["./tests"]
+  "include": ["./tests", "../../tsconfig/cjs-default-exports.d.ts"]
 }