@atproto/bsync 0.0.23 → 0.0.25

package/dist/routes/delete-operations.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const connect_1 = require("@connectrpc/connect");
+const bsync_pb_1 = require("../proto/bsync_pb");
+const auth_1 = require("./auth");
+const util_1 = require("./util");
+exports.default = (ctx) => ({
+    /**
+     * This method is responsible for deleting log rows from the bsync db, it has
+     * no other downstream effects. This method is called from the dataplane in
+     * response to a data deletion request initiated by a moderator in Ozone.
+     * It's the final step of the deletion process, basically cleaning up the
+     * breadcrumbs that resulted in the state we store in the dataplane.
+     */
+    async deleteOperationsByActorAndNamespace(req, handlerCtx) {
+        (0, auth_1.authWithApiKey)(ctx, handlerCtx);
+        const { db } = ctx;
+        try {
+            (0, util_1.validateNamespace)(req.namespace);
+        }
+        catch (error) {
+            throw new connect_1.ConnectError('requested namespace for deletion is invalid NSID', connect_1.Code.InvalidArgument);
+        }
+        if (!(0, util_1.isValidDid)(req.actorDid)) {
+            throw new connect_1.ConnectError('requested actor_did for deletion is invalid DID', connect_1.Code.InvalidArgument);
+        }
+        const deletedRows = await db.db
+            .deleteFrom('operation')
+            .where('actorDid', '=', req.actorDid)
+            .where('namespace', '=', req.namespace)
+            .returning('id')
+            .execute();
+        return new bsync_pb_1.DeleteOperationsByActorAndNamespaceResponse({
+            deletedCount: deletedRows.length,
+        });
+    },
+});
+//# sourceMappingURL=delete-operations.js.map

package/dist/routes/delete-operations.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"delete-operations.js","sourceRoot":"","sources":["../../src/routes/delete-operations.ts"],"names":[],"mappings":";;AAAA,iDAAqE;AAGrE,gDAA+E;AAC/E,iCAAuC;AACvC,iCAAsD;AAEtD,kBAAe,CAAC,GAAe,EAAwC,EAAE,CAAC,CAAC;IACzE;;;;;;OAMG;IACH,KAAK,CAAC,mCAAmC,CAAC,GAAG,EAAE,UAAU;QACvD,IAAA,qBAAc,EAAC,GAAG,EAAE,UAAU,CAAC,CAAA;QAC/B,MAAM,EAAE,EAAE,EAAE,GAAG,GAAG,CAAA;QAElB,IAAI,CAAC;YACH,IAAA,wBAAiB,EAAC,GAAG,CAAC,SAAS,CAAC,CAAA;QAClC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,sBAAY,CACpB,kDAAkD,EAClD,cAAI,CAAC,eAAe,CACrB,CAAA;QACH,CAAC;QACD,IAAI,CAAC,IAAA,iBAAU,EAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC9B,MAAM,IAAI,sBAAY,CACpB,iDAAiD,EACjD,cAAI,CAAC,eAAe,CACrB,CAAA;QACH,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC,EAAE;aAC5B,UAAU,CAAC,WAAW,CAAC;aACvB,KAAK,CAAC,UAAU,EAAE,GAAG,EAAE,GAAG,CAAC,QAAQ,CAAC;aACpC,KAAK,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,CAAC,SAAS,CAAC;aACtC,SAAS,CAAC,IAAI,CAAC;aACf,OAAO,EAAE,CAAA;QACZ,OAAO,IAAI,sDAA2C,CAAC;YACrD,YAAY,EAAE,WAAW,CAAC,MAAM;SACjC,CAAC,CAAA;IACJ,CAAC;CACF,CAAC,CAAA","sourcesContent":["import { Code, ConnectError, ServiceImpl } from '@connectrpc/connect'\nimport { AppContext } from '../context'\nimport { Service } from '../proto/bsync_connect'\nimport { DeleteOperationsByActorAndNamespaceResponse } from '../proto/bsync_pb'\nimport { authWithApiKey } from './auth'\nimport { isValidDid, validateNamespace } from './util'\n\nexport default (ctx: AppContext): Partial<ServiceImpl<typeof Service>> => ({\n  /**\n   * This method is responsible for deleting log rows from the bsync db, it has\n   * no other downstream effects. This method is called from the dataplane in\n   * response to a data deletion request initiated by a moderator in Ozone.\n   * It's the final step of the deletion process, basically cleaning up the\n   * breadcrumbs that resulted in the state we store in the dataplane.\n   */\n  async deleteOperationsByActorAndNamespace(req, handlerCtx) {\n    authWithApiKey(ctx, handlerCtx)\n    const { db } = ctx\n\n    try {\n      validateNamespace(req.namespace)\n    } catch (error) {\n      throw new ConnectError(\n        'requested namespace for deletion is invalid NSID',\n        Code.InvalidArgument,\n      )\n    }\n    if (!isValidDid(req.actorDid)) {\n      throw new ConnectError(\n        'requested actor_did for deletion is invalid DID',\n        Code.InvalidArgument,\n      )\n    }\n\n    const deletedRows = await db.db\n      .deleteFrom('operation')\n      .where('actorDid', '=', req.actorDid)\n      .where('namespace', '=', req.namespace)\n      .returning('id')\n      .execute()\n    return new DeleteOperationsByActorAndNamespaceResponse({\n      deletedCount: deletedRows.length,\n    })\n  },\n})\n"]}

package/dist/routes/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/routes/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAEnD,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;yBASvB,KAAK,UAAU,MAAM,QAAQ,aAAa;AAA1D,wBAcC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/routes/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAEnD,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;yBAUvB,KAAK,UAAU,MAAM,QAAQ,aAAa;AAA1D,wBAeC"}

package/dist/routes/index.js

@@ -7,6 +7,7 @@ const kysely_1 = require("kysely");
 const bsync_connect_1 = require("../proto/bsync_connect");
 const add_mute_operation_1 = __importDefault(require("./add-mute-operation"));
 const add_notif_operation_1 = __importDefault(require("./add-notif-operation"));
+const delete_operations_1 = __importDefault(require("./delete-operations"));
 const put_operation_1 = __importDefault(require("./put-operation"));
 const scan_mute_operations_1 = __importDefault(require("./scan-mute-operations"));
 const scan_notif_operations_1 = __importDefault(require("./scan-notif-operations"));
@@ -19,6 +20,7 @@ exports.default = (ctx) => (router) => {
         ...(0, scan_notif_operations_1.default)(ctx),
         ...(0, put_operation_1.default)(ctx),
         ...(0, scan_operations_1.default)(ctx),
+        ...(0, delete_operations_1.default)(ctx),
         async ping() {
             const { db } = ctx;
             await (0, kysely_1.sql) `select 1`.execute(db.db);

package/dist/routes/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/routes/index.ts"],"names":[],"mappings":";;;;;AACA,mCAA4B;AAE5B,0DAAgD;AAChD,8EAAmD;AACnD,gFAAqD;AACrD,oEAA0C;AAC1C,kFAAuD;AACvD,oFAAyD;AACzD,wEAA8C;AAE9C,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,GAAG,IAAA,6BAAiB,EAAC,GAAG,CAAC;QACzB,GAAG,IAAA,+BAAmB,EAAC,GAAG,CAAC;QAC3B,GAAG,IAAA,uBAAY,EAAC,GAAG,CAAC;QACpB,GAAG,IAAA,yBAAc,EAAC,GAAG,CAAC;QACtB,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","sourcesContent":["import { ConnectRouter } from '@connectrpc/connect'\nimport { sql } from 'kysely'\nimport { AppContext } from '../context'\nimport { Service } from '../proto/bsync_connect'\nimport addMuteOperation from './add-mute-operation'\nimport addNotifOperation from './add-notif-operation'\nimport putOperation from './put-operation'\nimport scanMuteOperations from './scan-mute-operations'\nimport scanNotifOperations from './scan-notif-operations'\nimport scanOperations from './scan-operations'\n\nexport default (ctx: AppContext) => (router: ConnectRouter) => {\n  return router.service(Service, {\n    ...addMuteOperation(ctx),\n    ...scanMuteOperations(ctx),\n    ...addNotifOperation(ctx),\n    ...scanNotifOperations(ctx),\n    ...putOperation(ctx),\n    ...scanOperations(ctx),\n    async ping() {\n      const { db } = ctx\n      await sql`select 1`.execute(db.db)\n      return {}\n    },\n  })\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/routes/index.ts"],"names":[],"mappings":";;;;;AACA,mCAA4B;AAE5B,0DAAgD;AAChD,8EAAmD;AACnD,gFAAqD;AACrD,4EAAkD;AAClD,oEAA0C;AAC1C,kFAAuD;AACvD,oFAAyD;AACzD,wEAA8C;AAE9C,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,GAAG,IAAA,6BAAiB,EAAC,GAAG,CAAC;QACzB,GAAG,IAAA,+BAAmB,EAAC,GAAG,CAAC;QAC3B,GAAG,IAAA,uBAAY,EAAC,GAAG,CAAC;QACpB,GAAG,IAAA,yBAAc,EAAC,GAAG,CAAC;QACtB,GAAG,IAAA,2BAAgB,EAAC,GAAG,CAAC;QACxB,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","sourcesContent":["import { ConnectRouter } from '@connectrpc/connect'\nimport { sql } from 'kysely'\nimport { AppContext } from '../context'\nimport { Service } from '../proto/bsync_connect'\nimport addMuteOperation from './add-mute-operation'\nimport addNotifOperation from './add-notif-operation'\nimport deleteOperations from './delete-operations'\nimport putOperation from './put-operation'\nimport scanMuteOperations from './scan-mute-operations'\nimport scanNotifOperations from './scan-notif-operations'\nimport scanOperations from './scan-operations'\n\nexport default (ctx: AppContext) => (router: ConnectRouter) => {\n  return router.service(Service, {\n    ...addMuteOperation(ctx),\n    ...scanMuteOperations(ctx),\n    ...addNotifOperation(ctx),\n    ...scanNotifOperations(ctx),\n    ...putOperation(ctx),\n    ...scanOperations(ctx),\n    ...deleteOperations(ctx),\n    async ping() {\n      const { db } = ctx\n      await sql`select 1`.execute(db.db)\n      return {}\n    },\n  })\n}\n"]}

package/dist/routes/put-operation.js

@@ -45,7 +45,7 @@ const putOp = async (db, op) => {
 };
 const validateOp = (req) => {
     try {
-        validateNamespace(req.namespace);
+        (0, util_1.validateNamespace)(req.namespace);
     }
     catch (error) {
         throw new connect_1.ConnectError('operation namespace is invalid NSID', connect_1.Code.InvalidArgument);
@@ -77,15 +77,4 @@ const validateOp = (req) => {
     }
     return req;
 };
-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);
-    if (fragment && !/^[a-zA-Z][a-zA-Z0-9]*$/.test(fragment)) {
-        throw new Error('namespace fragment must be a valid identifier');
-    }
-};
 //# sourceMappingURL=put-operation.js.map

package/dist/routes/put-operation.js.map

@@ -1 +1 @@
-{"version":3,"file":"put-operation.js","sourceRoot":"","sources":["../../src/routes/put-operation.ts"],"names":[],"mappings":"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","sourcesContent":["import { Code, ConnectError, ServiceImpl } from '@connectrpc/connect'\nimport { sql } from 'kysely'\nimport { ensureValidNsid, ensureValidRecordKey } from '@atproto/syntax'\nimport { AppContext } from '../context'\nimport { Database } from '../db'\nimport { OperationMethod, createOperationChannel } from '../db/schema/operation'\nimport { Service } from '../proto/bsync_connect'\nimport {\n  Method,\n  PutOperationRequest,\n  PutOperationResponse,\n} from '../proto/bsync_pb'\nimport { authWithApiKey } from './auth'\nimport { isValidDid } from './util'\n\nexport default (ctx: AppContext): Partial<ServiceImpl<typeof Service>> => ({\n  async putOperation(req, handlerCtx) {\n    authWithApiKey(ctx, handlerCtx)\n    const { db } = ctx\n    const op = validateOp(req)\n    const id = await db.transaction(async (txn) => {\n      return putOp(txn, op)\n    })\n    return new PutOperationResponse({\n      operation: {\n        id: String(id),\n        actorDid: op.actorDid,\n        namespace: op.namespace,\n        key: op.key,\n        method: op.method,\n        payload: op.payload,\n      },\n    })\n  },\n})\n\nconst putOp = async (db: Database, op: Operation) => {\n  const { ref } = db.db.dynamic\n  const { id } = await db.db\n    .insertInto('operation')\n    .values({\n      actorDid: op.actorDid,\n      namespace: op.namespace,\n      key: op.key,\n      method: op.method,\n      payload: op.payload,\n    })\n    .returning('id')\n    .executeTakeFirstOrThrow()\n  await sql`notify ${ref(createOperationChannel)}`.execute(db.db) // emitted transactionally\n  return id\n}\n\nconst validateOp = (req: PutOperationRequest): Operation => {\n  try {\n    validateNamespace(req.namespace)\n  } catch (error) {\n    throw new ConnectError(\n      'operation namespace is invalid NSID',\n      Code.InvalidArgument,\n    )\n  }\n\n  if (!isValidDid(req.actorDid)) {\n    throw new ConnectError(\n      'operation actor_did is invalid DID',\n      Code.InvalidArgument,\n    )\n  }\n\n  try {\n    ensureValidRecordKey(req.key)\n  } catch (error) {\n    throw new ConnectError('operation key is required', Code.InvalidArgument)\n  }\n\n  if (\n    req.method !== Method.CREATE &&\n    req.method !== Method.UPDATE &&\n    req.method !== Method.DELETE\n  ) {\n    throw new ConnectError('operation method is invalid', Code.InvalidArgument)\n  }\n\n  if (req.method === Method.CREATE || req.method === Method.UPDATE) {\n    try {\n      JSON.parse(new TextDecoder().decode(req.payload))\n    } catch (error) {\n      throw new ConnectError(\n        'payload must be a valid JSON when method is CREATE or UPDATE',\n        Code.InvalidArgument,\n      )\n    }\n  }\n\n  if (req.method === Method.DELETE && req.payload.length > 0) {\n    throw new ConnectError(\n      'cannot specify a payload when method is DELETE',\n      Code.InvalidArgument,\n    )\n  }\n\n  return req as Operation\n}\n\nconst 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\ntype Operation = {\n  actorDid: string\n  namespace: string\n  key: string\n  payload: Uint8Array\n  method: OperationMethod\n}\n"]}
+{"version":3,"file":"put-operation.js","sourceRoot":"","sources":["../../src/routes/put-operation.ts"],"names":[],"mappings":"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","sourcesContent":["import { Code, ConnectError, ServiceImpl } from '@connectrpc/connect'\nimport { sql } from 'kysely'\nimport { ensureValidRecordKey } from '@atproto/syntax'\nimport { AppContext } from '../context'\nimport { Database } from '../db'\nimport { OperationMethod, createOperationChannel } from '../db/schema/operation'\nimport { Service } from '../proto/bsync_connect'\nimport {\n  Method,\n  PutOperationRequest,\n  PutOperationResponse,\n} from '../proto/bsync_pb'\nimport { authWithApiKey } from './auth'\nimport { isValidDid, validateNamespace } from './util'\n\nexport default (ctx: AppContext): Partial<ServiceImpl<typeof Service>> => ({\n  async putOperation(req, handlerCtx) {\n    authWithApiKey(ctx, handlerCtx)\n    const { db } = ctx\n    const op = validateOp(req)\n    const id = await db.transaction(async (txn) => {\n      return putOp(txn, op)\n    })\n    return new PutOperationResponse({\n      operation: {\n        id: String(id),\n        actorDid: op.actorDid,\n        namespace: op.namespace,\n        key: op.key,\n        method: op.method,\n        payload: op.payload,\n      },\n    })\n  },\n})\n\nconst putOp = async (db: Database, op: Operation) => {\n  const { ref } = db.db.dynamic\n  const { id } = await db.db\n    .insertInto('operation')\n    .values({\n      actorDid: op.actorDid,\n      namespace: op.namespace,\n      key: op.key,\n      method: op.method,\n      payload: op.payload,\n    })\n    .returning('id')\n    .executeTakeFirstOrThrow()\n  await sql`notify ${ref(createOperationChannel)}`.execute(db.db) // emitted transactionally\n  return id\n}\n\nconst validateOp = (req: PutOperationRequest): Operation => {\n  try {\n    validateNamespace(req.namespace)\n  } catch (error) {\n    throw new ConnectError(\n      'operation namespace is invalid NSID',\n      Code.InvalidArgument,\n    )\n  }\n\n  if (!isValidDid(req.actorDid)) {\n    throw new ConnectError(\n      'operation actor_did is invalid DID',\n      Code.InvalidArgument,\n    )\n  }\n\n  try {\n    ensureValidRecordKey(req.key)\n  } catch (error) {\n    throw new ConnectError('operation key is required', Code.InvalidArgument)\n  }\n\n  if (\n    req.method !== Method.CREATE &&\n    req.method !== Method.UPDATE &&\n    req.method !== Method.DELETE\n  ) {\n    throw new ConnectError('operation method is invalid', Code.InvalidArgument)\n  }\n\n  if (req.method === Method.CREATE || req.method === Method.UPDATE) {\n    try {\n      JSON.parse(new TextDecoder().decode(req.payload))\n    } catch (error) {\n      throw new ConnectError(\n        'payload must be a valid JSON when method is CREATE or UPDATE',\n        Code.InvalidArgument,\n      )\n    }\n  }\n\n  if (req.method === Method.DELETE && req.payload.length > 0) {\n    throw new ConnectError(\n      'cannot specify a payload when method is DELETE',\n      Code.InvalidArgument,\n    )\n  }\n\n  return req as Operation\n}\n\ntype Operation = {\n  actorDid: string\n  namespace: string\n  key: string\n  payload: Uint8Array\n  method: OperationMethod\n}\n"]}

package/dist/routes/util.d.ts

@@ -2,4 +2,5 @@ export declare const validCursor: (cursor: string) => number | null;
 export declare const combineSignals: (a: AbortSignal, b: AbortSignal) => AbortSignal;
 export declare const isValidDid: (did: string) => boolean;
 export declare const isValidAtUri: (uri: string) => boolean;
+export declare const validateNamespace: (namespace: string) => void;
 //# sourceMappingURL=util.d.ts.map

package/dist/routes/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/routes/util.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,WAAW,GAAI,QAAQ,MAAM,KAAG,MAAM,GAAG,IAOrD,CAAA;AAED,eAAO,MAAM,cAAc,GAAI,GAAG,WAAW,EAAE,GAAG,WAAW,gBAa5D,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,KAAK,MAAM,YAUrC,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,KAAK,MAAM,YAOvC,CAAA"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/routes/util.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,WAAW,GAAI,QAAQ,MAAM,KAAG,MAAM,GAAG,IAOrD,CAAA;AAED,eAAO,MAAM,cAAc,GAAI,GAAG,WAAW,EAAE,GAAG,WAAW,gBAa5D,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,KAAK,MAAM,YAUrC,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,KAAK,MAAM,YAOvC,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAI,WAAW,MAAM,KAAG,IAarD,CAAA"}

package/dist/routes/util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isValidAtUri = exports.isValidDid = exports.combineSignals = exports.validCursor = void 0;
+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) => {
@@ -51,4 +51,16 @@ const isValidAtUri = (uri) => {
     }
 };
 exports.isValidAtUri = isValidAtUri;
+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);
+    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,4CAIwB;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","sourcesContent":["import { Code, ConnectError } from '@connectrpc/connect'\nimport {\n  InvalidDidError,\n  ensureValidAtUri,\n  ensureValidDid,\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"]}
+{"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"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsync",
-  "version": "0.0.23",
+  "version": "0.0.25",
   "license": "MIT",
   "description": "Sychronizing service for app.bsky App View (Bluesky API)",
   "keywords": [
@@ -27,8 +27,8 @@
     "pg": "^8.10.0",
     "pino-http": "^8.2.1",
     "typed-emitter": "^2.1.0",
-    "@atproto/common": "^0.5.0",
-    "@atproto/syntax": "^0.4.1"
+    "@atproto/common": "^0.5.14",
+    "@atproto/syntax": "^0.5.1"
   },
   "devDependencies": {
     "@bufbuild/buf": "^1.28.1",

package/proto/bsync.proto

@@ -105,6 +105,15 @@ message ScanOperationsResponse {
   string cursor = 2;
 }
 
+message DeleteOperationsByActorAndNamespaceRequest {
+  string actor_did = 1;
+  string namespace = 2;
+}
+
+message DeleteOperationsByActorAndNamespaceResponse {
+  int32 deleted_count = 1;
+}
+
 
 // Ping
 message PingRequest {}
@@ -119,6 +128,7 @@ service Service {
   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/proto/bsync_connect.ts

@@ -3,7 +3,7 @@
 /* eslint-disable */
 // @ts-nocheck
 
-import { AddMuteOperationRequest, AddMuteOperationResponse, AddNotifOperationRequest, AddNotifOperationResponse, 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";
 import { MethodKind } from "@bufbuild/protobuf";
 
 /**
@@ -68,6 +68,15 @@ export const Service = {
       O: ScanOperationsResponse,
       kind: MethodKind.Unary,
     },
+    /**
+     * @generated from rpc bsync.Service.DeleteOperationsByActorAndNamespace
+     */
+    deleteOperationsByActorAndNamespace: {
+      name: "DeleteOperationsByActorAndNamespace",
+      I: DeleteOperationsByActorAndNamespaceRequest,
+      O: DeleteOperationsByActorAndNamespaceResponse,
+      kind: MethodKind.Unary,
+    },
     /**
      * Ping
      *

package/src/proto/bsync_pb.ts

@@ -763,6 +763,86 @@ export class ScanOperationsResponse extends Message<ScanOperationsResponse> {
   }
 }
 
+/**
+ * @generated from message bsync.DeleteOperationsByActorAndNamespaceRequest
+ */
+export class DeleteOperationsByActorAndNamespaceRequest extends Message<DeleteOperationsByActorAndNamespaceRequest> {
+  /**
+   * @generated from field: string actor_did = 1;
+   */
+  actorDid = "";
+
+  /**
+   * @generated from field: string namespace = 2;
+   */
+  namespace = "";
+
+  constructor(data?: PartialMessage<DeleteOperationsByActorAndNamespaceRequest>) {
+    super();
+    proto3.util.initPartial(data, this);
+  }
+
+  static readonly runtime: typeof proto3 = proto3;
+  static readonly typeName = "bsync.DeleteOperationsByActorAndNamespaceRequest";
+  static readonly fields: FieldList = proto3.util.newFieldList(() => [
+    { no: 1, name: "actor_did", kind: "scalar", T: 9 /* ScalarType.STRING */ },
+    { no: 2, name: "namespace", kind: "scalar", T: 9 /* ScalarType.STRING */ },
+  ]);
+
+  static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): DeleteOperationsByActorAndNamespaceRequest {
+    return new DeleteOperationsByActorAndNamespaceRequest().fromBinary(bytes, options);
+  }
+
+  static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): DeleteOperationsByActorAndNamespaceRequest {
+    return new DeleteOperationsByActorAndNamespaceRequest().fromJson(jsonValue, options);
+  }
+
+  static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): DeleteOperationsByActorAndNamespaceRequest {
+    return new DeleteOperationsByActorAndNamespaceRequest().fromJsonString(jsonString, options);
+  }
+
+  static equals(a: DeleteOperationsByActorAndNamespaceRequest | PlainMessage<DeleteOperationsByActorAndNamespaceRequest> | undefined, b: DeleteOperationsByActorAndNamespaceRequest | PlainMessage<DeleteOperationsByActorAndNamespaceRequest> | undefined): boolean {
+    return proto3.util.equals(DeleteOperationsByActorAndNamespaceRequest, a, b);
+  }
+}
+
+/**
+ * @generated from message bsync.DeleteOperationsByActorAndNamespaceResponse
+ */
+export class DeleteOperationsByActorAndNamespaceResponse extends Message<DeleteOperationsByActorAndNamespaceResponse> {
+  /**
+   * @generated from field: int32 deleted_count = 1;
+   */
+  deletedCount = 0;
+
+  constructor(data?: PartialMessage<DeleteOperationsByActorAndNamespaceResponse>) {
+    super();
+    proto3.util.initPartial(data, this);
+  }
+
+  static readonly runtime: typeof proto3 = proto3;
+  static readonly typeName = "bsync.DeleteOperationsByActorAndNamespaceResponse";
+  static readonly fields: FieldList = proto3.util.newFieldList(() => [
+    { no: 1, name: "deleted_count", kind: "scalar", T: 5 /* ScalarType.INT32 */ },
+  ]);
+
+  static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): DeleteOperationsByActorAndNamespaceResponse {
+    return new DeleteOperationsByActorAndNamespaceResponse().fromBinary(bytes, options);
+  }
+
+  static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): DeleteOperationsByActorAndNamespaceResponse {
+    return new DeleteOperationsByActorAndNamespaceResponse().fromJson(jsonValue, options);
+  }
+
+  static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): DeleteOperationsByActorAndNamespaceResponse {
+    return new DeleteOperationsByActorAndNamespaceResponse().fromJsonString(jsonString, options);
+  }
+
+  static equals(a: DeleteOperationsByActorAndNamespaceResponse | PlainMessage<DeleteOperationsByActorAndNamespaceResponse> | undefined, b: DeleteOperationsByActorAndNamespaceResponse | PlainMessage<DeleteOperationsByActorAndNamespaceResponse> | undefined): boolean {
+    return proto3.util.equals(DeleteOperationsByActorAndNamespaceResponse, a, b);
+  }
+}
+
 /**
  * Ping
  *

package/src/routes/delete-operations.ts

@@ -0,0 +1,45 @@
+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'
+
+export default (ctx: AppContext): Partial<ServiceImpl<typeof Service>> => ({
+  /**
+   * This method is responsible for deleting log rows from the bsync db, it has
+   * no other downstream effects. This method is called from the dataplane in
+   * response to a data deletion request initiated by a moderator in Ozone.
+   * It's the final step of the deletion process, basically cleaning up the
+   * breadcrumbs that resulted in the state we store in the dataplane.
+   */
+  async deleteOperationsByActorAndNamespace(req, handlerCtx) {
+    authWithApiKey(ctx, handlerCtx)
+    const { db } = ctx
+
+    try {
+      validateNamespace(req.namespace)
+    } catch (error) {
+      throw new ConnectError(
+        'requested namespace for deletion is invalid NSID',
+        Code.InvalidArgument,
+      )
+    }
+    if (!isValidDid(req.actorDid)) {
+      throw new ConnectError(
+        'requested actor_did for deletion is invalid DID',
+        Code.InvalidArgument,
+      )
+    }
+
+    const deletedRows = await db.db
+      .deleteFrom('operation')
+      .where('actorDid', '=', req.actorDid)
+      .where('namespace', '=', req.namespace)
+      .returning('id')
+      .execute()
+    return new DeleteOperationsByActorAndNamespaceResponse({
+      deletedCount: deletedRows.length,
+    })
+  },
+})

package/src/routes/index.ts

@@ -4,6 +4,7 @@ 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'
@@ -17,6 +18,7 @@ export default (ctx: AppContext) => (router: ConnectRouter) => {
     ...scanNotifOperations(ctx),
     ...putOperation(ctx),
     ...scanOperations(ctx),
+    ...deleteOperations(ctx),
     async ping() {
       const { db } = ctx
       await sql`select 1`.execute(db.db)

package/src/routes/put-operation.ts

@@ -1,6 +1,6 @@
 import { Code, ConnectError, ServiceImpl } from '@connectrpc/connect'
 import { sql } from 'kysely'
-import { ensureValidNsid, ensureValidRecordKey } from '@atproto/syntax'
+import { ensureValidRecordKey } from '@atproto/syntax'
 import { AppContext } from '../context'
 import { Database } from '../db'
 import { OperationMethod, createOperationChannel } from '../db/schema/operation'
@@ -11,7 +11,7 @@ import {
   PutOperationResponse,
 } from '../proto/bsync_pb'
 import { authWithApiKey } from './auth'
-import { isValidDid } from './util'
+import { isValidDid, validateNamespace } from './util'
 
 export default (ctx: AppContext): Partial<ServiceImpl<typeof Service>> => ({
   async putOperation(req, handlerCtx) {
@@ -103,21 +103,6 @@ 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

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'
+import { Method } from '../src/proto/bsync_pb'
+
+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/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"],"version":"5.8.2"}

package/tsconfig.tests.tsbuildinfo

@@ -1 +0,0 @@
-{"root":["./tests/mutes.test.ts","./tests/notifications.test.ts","./tests/operations.test.ts"],"version":"5.8.3"}