@atproto/tap 0.1.3 → 0.2.0

package/dist/types.js

@@ -1,22 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.repoInfoSchema = exports.parseTapEvent = exports.tapEventSchema = exports.identityEventSchema = exports.recordEventSchema = exports.identityEventDataSchema = exports.recordEventDataSchema = void 0;
-const zod_1 = require("zod");
-exports.recordEventDataSchema = zod_1.z.object({
-    did: zod_1.z.string(),
-    rev: zod_1.z.string(),
-    collection: zod_1.z.string(),
-    rkey: zod_1.z.string(),
-    action: zod_1.z.enum(['create', 'update', 'delete']),
-    record: zod_1.z.record(zod_1.z.string(), zod_1.z.unknown()).optional(),
-    cid: zod_1.z.string().optional(),
-    live: zod_1.z.boolean(),
+const lex_1 = require("@atproto/lex");
+exports.recordEventDataSchema = lex_1.l.object({
+    did: lex_1.l.string({ format: 'did' }),
+    rev: lex_1.l.string(),
+    collection: lex_1.l.string({ format: 'nsid' }),
+    rkey: lex_1.l.string({ format: 'record-key' }),
+    action: lex_1.l.enum(['create', 'update', 'delete']),
+    record: lex_1.l.optional(lex_1.l.unknownObject()),
+    cid: lex_1.l.optional(lex_1.l.string({ format: 'cid' })),
+    live: lex_1.l.boolean(),
 });
-exports.identityEventDataSchema = zod_1.z.object({
-    did: zod_1.z.string(),
-    handle: zod_1.z.string(),
-    is_active: zod_1.z.boolean(),
-    status: zod_1.z.enum([
+exports.identityEventDataSchema = lex_1.l.object({
+    did: lex_1.l.string({ format: 'did' }),
+    handle: lex_1.l.string({ format: 'handle' }),
+    is_active: lex_1.l.boolean(),
+    status: lex_1.l.enum([
         'active',
         'takendown',
         'suspended',
@@ -24,17 +24,20 @@ exports.identityEventDataSchema = zod_1.z.object({
         'deleted',
     ]),
 });
-exports.recordEventSchema = zod_1.z.object({
-    id: zod_1.z.number(),
-    type: zod_1.z.literal('record'),
+exports.recordEventSchema = lex_1.l.object({
+    id: lex_1.l.integer(),
+    type: lex_1.l.literal('record'),
     record: exports.recordEventDataSchema,
 });
-exports.identityEventSchema = zod_1.z.object({
-    id: zod_1.z.number(),
-    type: zod_1.z.literal('identity'),
+exports.identityEventSchema = lex_1.l.object({
+    id: lex_1.l.integer(),
+    type: lex_1.l.literal('identity'),
     identity: exports.identityEventDataSchema,
 });
-exports.tapEventSchema = zod_1.z.union([exports.recordEventSchema, exports.identityEventSchema]);
+exports.tapEventSchema = lex_1.l.discriminatedUnion('type', [
+    exports.recordEventSchema,
+    exports.identityEventSchema,
+]);
 const parseTapEvent = (data) => {
     const parsed = exports.tapEventSchema.parse(data);
     if (parsed.type === 'identity') {
@@ -63,13 +66,13 @@ const parseTapEvent = (data) => {
     }
 };
 exports.parseTapEvent = parseTapEvent;
-exports.repoInfoSchema = zod_1.z.object({
-    did: zod_1.z.string(),
-    handle: zod_1.z.string(),
-    state: zod_1.z.string(),
-    rev: zod_1.z.string(),
-    records: zod_1.z.number(),
-    error: zod_1.z.string().optional(),
-    retries: zod_1.z.number().optional(),
+exports.repoInfoSchema = lex_1.l.object({
+    did: lex_1.l.string(),
+    handle: lex_1.l.string(),
+    state: lex_1.l.string(),
+    rev: lex_1.l.string(),
+    records: lex_1.l.integer(),
+    error: lex_1.l.optional(lex_1.l.string()),
+    retries: lex_1.l.optional(lex_1.l.integer()),
 });
 //# sourceMappingURL=types.js.map

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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","sourcesContent":["import { z } from 'zod'\n\nexport const recordEventDataSchema = z.object({\n  did: z.string(),\n  rev: z.string(),\n  collection: z.string(),\n  rkey: z.string(),\n  action: z.enum(['create', 'update', 'delete']),\n  record: z.record(z.string(), z.unknown()).optional(),\n  cid: z.string().optional(),\n  live: z.boolean(),\n})\n\nexport const identityEventDataSchema = z.object({\n  did: z.string(),\n  handle: z.string(),\n  is_active: z.boolean(),\n  status: z.enum([\n    'active',\n    'takendown',\n    'suspended',\n    'deactivated',\n    'deleted',\n  ]),\n})\n\nexport const recordEventSchema = z.object({\n  id: z.number(),\n  type: z.literal('record'),\n  record: recordEventDataSchema,\n})\n\nexport const identityEventSchema = z.object({\n  id: z.number(),\n  type: z.literal('identity'),\n  identity: identityEventDataSchema,\n})\n\nexport const tapEventSchema = z.union([recordEventSchema, identityEventSchema])\n\nexport type RecordEvent = {\n  id: number\n  type: 'record'\n  action: 'create' | 'update' | 'delete'\n  did: string\n  rev: string\n  collection: string\n  rkey: string\n  record?: Record<string, unknown>\n  cid?: string\n  live: boolean\n}\n\nexport type IdentityEvent = {\n  id: number\n  type: 'identity'\n  did: string\n  handle: string\n  isActive: boolean\n  status: RepoStatus\n}\n\nexport type RepoStatus =\n  | 'active'\n  | 'takendown'\n  | 'suspended'\n  | 'deactivated'\n  | 'deleted'\n\nexport type TapEvent = IdentityEvent | RecordEvent\n\nexport const parseTapEvent = (data: unknown): TapEvent => {\n  const parsed = tapEventSchema.parse(data)\n  if (parsed.type === 'identity') {\n    return {\n      id: parsed.id,\n      type: parsed.type,\n      did: parsed.identity.did,\n      handle: parsed.identity.handle,\n      isActive: parsed.identity.is_active,\n      status: parsed.identity.status,\n    }\n  } else {\n    return {\n      id: parsed.id,\n      type: parsed.type,\n      action: parsed.record.action,\n      did: parsed.record.did,\n      rev: parsed.record.rev,\n      collection: parsed.record.collection,\n      rkey: parsed.record.rkey,\n      record: parsed.record.record,\n      cid: parsed.record.cid,\n      live: parsed.record.live,\n    }\n  }\n}\n\nexport const repoInfoSchema = z.object({\n  did: z.string(),\n  handle: z.string(),\n  state: z.string(),\n  rev: z.string(),\n  records: z.number(),\n  error: z.string().optional(),\n  retries: z.number().optional(),\n})\n\nexport type RepoInfo = z.infer<typeof repoInfoSchema>\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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","sourcesContent":["import { LexMap, LexValue, l } from '@atproto/lex'\nimport { DidString, HandleString, NsidString } from '@atproto/syntax'\n\nexport const recordEventDataSchema = l.object({\n  did: l.string({ format: 'did' }),\n  rev: l.string(),\n  collection: l.string({ format: 'nsid' }),\n  rkey: l.string({ format: 'record-key' }),\n  action: l.enum(['create', 'update', 'delete']),\n  record: l.optional(l.unknownObject()),\n  cid: l.optional(l.string({ format: 'cid' })),\n  live: l.boolean(),\n})\n\nexport const identityEventDataSchema = l.object({\n  did: l.string({ format: 'did' }),\n  handle: l.string({ format: 'handle' }),\n  is_active: l.boolean(),\n  status: l.enum([\n    'active',\n    'takendown',\n    'suspended',\n    'deactivated',\n    'deleted',\n  ]),\n})\n\nexport const recordEventSchema = l.object({\n  id: l.integer(),\n  type: l.literal('record'),\n  record: recordEventDataSchema,\n})\n\nexport const identityEventSchema = l.object({\n  id: l.integer(),\n  type: l.literal('identity'),\n  identity: identityEventDataSchema,\n})\n\nexport const tapEventSchema = l.discriminatedUnion('type', [\n  recordEventSchema,\n  identityEventSchema,\n])\n\nexport type RecordEvent = {\n  id: number\n  type: 'record'\n  action: 'create' | 'update' | 'delete'\n  did: DidString\n  rev: string\n  collection: NsidString\n  rkey: string\n  record?: LexMap\n  cid?: string\n  live: boolean\n}\n\nexport type IdentityEvent = {\n  id: number\n  type: 'identity'\n  did: DidString\n  handle: HandleString\n  isActive: boolean\n  status: RepoStatus\n}\n\nexport type RepoStatus =\n  | 'active'\n  | 'takendown'\n  | 'suspended'\n  | 'deactivated'\n  | 'deleted'\n\nexport type TapEvent = IdentityEvent | RecordEvent\n\nexport const parseTapEvent = (data: LexValue): TapEvent => {\n  const parsed = tapEventSchema.parse(data)\n  if (parsed.type === 'identity') {\n    return {\n      id: parsed.id,\n      type: parsed.type,\n      did: parsed.identity.did,\n      handle: parsed.identity.handle,\n      isActive: parsed.identity.is_active,\n      status: parsed.identity.status,\n    }\n  } else {\n    return {\n      id: parsed.id,\n      type: parsed.type,\n      action: parsed.record.action,\n      did: parsed.record.did,\n      rev: parsed.record.rev,\n      collection: parsed.record.collection,\n      rkey: parsed.record.rkey,\n      record: parsed.record.record,\n      cid: parsed.record.cid,\n      live: parsed.record.live,\n    }\n  }\n}\n\nexport const repoInfoSchema = l.object({\n  did: l.string(),\n  handle: l.string(),\n  state: l.string(),\n  rev: l.string(),\n  records: l.integer(),\n  error: l.optional(l.string()),\n  retries: l.optional(l.integer()),\n})\n\nexport type RepoInfo = l.Infer<typeof repoInfoSchema>\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/tap",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "license": "MIT",
   "description": "atproto tap client",
   "keywords": [
@@ -23,22 +23,21 @@
   "types": "dist/index.d.ts",
   "dependencies": {
     "ws": "^8.12.0",
-    "zod": "^3.23.8",
-    "@atproto/common": "^0.5.8",
-    "@atproto/lex": "^0.0.11",
-    "@atproto/syntax": "^0.4.2",
+    "@atproto/common": "^0.5.9",
+    "@atproto/lex": "^0.0.12",
+    "@atproto/syntax": "^0.4.3",
     "@atproto/ws-client": "^0.0.4"
   },
   "devDependencies": {
     "@types/express": "^4.17.17",
     "@types/ws": "^8.5.4",
     "express": "^4.18.2",
-    "get-port": "^6.1.2",
-    "jest": "^28.1.2",
-    "typescript": "^5.6.3"
+    "typescript": "^5.6.3",
+    "@vitest/coverage-v8": "4.0.16",
+    "vitest": "^4.0.16"
   },
   "scripts": {
     "build": "tsc --build tsconfig.build.json",
-    "test": "jest"
+    "test": "vitest run"
   }
 }

package/src/channel.ts

@@ -1,5 +1,6 @@
 import { ClientOptions } from 'ws'
 import { Deferrable, createDeferrable } from '@atproto/common'
+import { lexParse } from '@atproto/lex'
 import { WebSocketKeepAlive } from '@atproto/ws-client'
 import { TapEvent, parseTapEvent } from './types'
 import { formatAdminAuthHeader, isCausedBySignal } from './util'
@@ -94,12 +95,12 @@ export class TapChannel implements AsyncDisposable {
         await this.sendAck(ack.id)
         ack.defer.resolve()
         this.bufferedAcks = this.bufferedAcks.slice(1)
-      } catch (err) {
-        this.handler.onError(
-          new Error(`failed to send ack for event ${this.bufferedAcks[0]}`, {
-            cause: err,
-          }),
+      } catch (cause) {
+        const error = new Error(
+          `failed to send ack for event ${this.bufferedAcks[0]}`,
+          { cause },
         )
+        this.handler.onError(error)
         return
       }
     }
@@ -123,10 +124,14 @@ export class TapChannel implements AsyncDisposable {
   private async processWsEvent(chunk: Uint8Array) {
     let evt: TapEvent
     try {
-      const data = chunk.toString()
-      evt = parseTapEvent(JSON.parse(data))
-    } catch (err) {
-      this.handler.onError(new Error('Failed to parse message', { cause: err }))
+      const data = lexParse(chunk.toString(), {
+        // Reject invalid CIDs and blobs
+        strict: true,
+      })
+      evt = parseTapEvent(data)
+    } catch (cause) {
+      const error = new Error(`Failed to parse message`, { cause })
+      this.handler.onError(error)
       return
     }
 
@@ -137,11 +142,10 @@ export class TapChannel implements AsyncDisposable {
           await this.ackEvent(evt.id)
         },
       })
-    } catch (err) {
+    } catch (cause) {
       // Don't ack on error - let Tap retry
-      this.handler.onError(
-        new Error(`Failed to process event ${evt.id}`, { cause: err }),
-      )
+      const error = new Error(`Failed to process event ${evt.id}`, { cause })
+      this.handler.onError(error)
       return
     }
   }

package/src/lex-indexer.ts

@@ -1,5 +1,5 @@
 import { Infer, Main, RecordSchema, getMain } from '@atproto/lex'
-import { AtUri } from '@atproto/syntax'
+import { AtUriString, NsidString } from '@atproto/syntax'
 import { HandlerOpts, TapHandler } from './channel'
 import { IdentityEvent, RecordEvent, TapEvent } from './types'
 
@@ -73,12 +73,15 @@ export class LexIndexer implements TapHandler {
   private identityHandler: IdentityHandler | undefined
   private errorHandler: ErrorHandler | undefined
 
-  private handlerKey(collection: string, action: string): string {
+  private handlerKey(
+    collection: NsidString,
+    action: RecordEvent['action'],
+  ): string {
     return `${collection}:${action}`
   }
 
   private register<const T extends RecordSchema>(
-    action: string,
+    action: RecordEvent['action'],
     ns: Main<T>,
     handler: RecordHandler<Infer<T>>,
   ): this {
@@ -117,7 +120,8 @@ export class LexIndexer implements TapHandler {
     handler: PutHandler<Infer<T>>,
   ): this {
     this.register('create', ns, handler)
-    return this.register('update', ns, handler)
+    this.register('update', ns, handler)
+    return this
   }
 
   other(fn: UntypedHandler): this {
@@ -167,10 +171,12 @@ export class LexIndexer implements TapHandler {
     }
 
     if (action === 'create' || action === 'update') {
-      const match = registered.schema.matches(evt.record)
-      if (!match) {
-        const uriStr = AtUri.make(evt.did, evt.collection, evt.rkey).toString()
-        throw new Error(`Record validation failed for ${uriStr}`)
+      const match = registered.schema.safeValidate(evt.record)
+      if (!match.success) {
+        const uriStr: AtUriString = `at://${evt.did}/${evt.collection}/${evt.rkey}`
+        throw new Error(`Record validation failed for ${uriStr}`, {
+          cause: match.reason,
+        })
       }
     }
 

package/src/types.ts

@@ -1,21 +1,22 @@
-import { z } from 'zod'
+import { LexMap, LexValue, l } from '@atproto/lex'
+import { DidString, HandleString, NsidString } from '@atproto/syntax'
 
-export const recordEventDataSchema = z.object({
-  did: z.string(),
-  rev: z.string(),
-  collection: z.string(),
-  rkey: z.string(),
-  action: z.enum(['create', 'update', 'delete']),
-  record: z.record(z.string(), z.unknown()).optional(),
-  cid: z.string().optional(),
-  live: z.boolean(),
+export const recordEventDataSchema = l.object({
+  did: l.string({ format: 'did' }),
+  rev: l.string(),
+  collection: l.string({ format: 'nsid' }),
+  rkey: l.string({ format: 'record-key' }),
+  action: l.enum(['create', 'update', 'delete']),
+  record: l.optional(l.unknownObject()),
+  cid: l.optional(l.string({ format: 'cid' })),
+  live: l.boolean(),
 })
 
-export const identityEventDataSchema = z.object({
-  did: z.string(),
-  handle: z.string(),
-  is_active: z.boolean(),
-  status: z.enum([
+export const identityEventDataSchema = l.object({
+  did: l.string({ format: 'did' }),
+  handle: l.string({ format: 'handle' }),
+  is_active: l.boolean(),
+  status: l.enum([
     'active',
     'takendown',
     'suspended',
@@ -24,29 +25,32 @@ export const identityEventDataSchema = z.object({
   ]),
 })
 
-export const recordEventSchema = z.object({
-  id: z.number(),
-  type: z.literal('record'),
+export const recordEventSchema = l.object({
+  id: l.integer(),
+  type: l.literal('record'),
   record: recordEventDataSchema,
 })
 
-export const identityEventSchema = z.object({
-  id: z.number(),
-  type: z.literal('identity'),
+export const identityEventSchema = l.object({
+  id: l.integer(),
+  type: l.literal('identity'),
   identity: identityEventDataSchema,
 })
 
-export const tapEventSchema = z.union([recordEventSchema, identityEventSchema])
+export const tapEventSchema = l.discriminatedUnion('type', [
+  recordEventSchema,
+  identityEventSchema,
+])
 
 export type RecordEvent = {
   id: number
   type: 'record'
   action: 'create' | 'update' | 'delete'
-  did: string
+  did: DidString
   rev: string
-  collection: string
+  collection: NsidString
   rkey: string
-  record?: Record<string, unknown>
+  record?: LexMap
   cid?: string
   live: boolean
 }
@@ -54,8 +58,8 @@ export type RecordEvent = {
 export type IdentityEvent = {
   id: number
   type: 'identity'
-  did: string
-  handle: string
+  did: DidString
+  handle: HandleString
   isActive: boolean
   status: RepoStatus
 }
@@ -69,7 +73,7 @@ export type RepoStatus =
 
 export type TapEvent = IdentityEvent | RecordEvent
 
-export const parseTapEvent = (data: unknown): TapEvent => {
+export const parseTapEvent = (data: LexValue): TapEvent => {
   const parsed = tapEventSchema.parse(data)
   if (parsed.type === 'identity') {
     return {
@@ -96,14 +100,14 @@ export const parseTapEvent = (data: unknown): TapEvent => {
   }
 }
 
-export const repoInfoSchema = z.object({
-  did: z.string(),
-  handle: z.string(),
-  state: z.string(),
-  rev: z.string(),
-  records: z.number(),
-  error: z.string().optional(),
-  retries: z.number().optional(),
+export const repoInfoSchema = l.object({
+  did: l.string(),
+  handle: l.string(),
+  state: l.string(),
+  rev: l.string(),
+  records: l.integer(),
+  error: l.optional(l.string()),
+  retries: l.optional(l.integer()),
 })
 
-export type RepoInfo = z.infer<typeof repoInfoSchema>
+export type RepoInfo = l.Infer<typeof repoInfoSchema>

package/tests/_util.ts

@@ -1,3 +1,4 @@
+import { WebSocketServer } from 'ws'
 import { HandlerOpts } from '../src/channel'
 import { IdentityEvent, RecordEvent } from '../src/types'
 
@@ -25,7 +26,7 @@ export const createRecordEvent = (
   rkey: 'abc123',
   action: 'create',
   record: { text: 'hello' },
-  cid: 'bafyabc',
+  cid: 'bafyreiclp443lavogvhj3d2ob2cxbfuscni2k5jk7bebjzg7khl3esabwq',
   live: true,
   ...overrides,
 })
@@ -38,3 +39,25 @@ export const createIdentityEvent = (): IdentityEvent => ({
   isActive: true,
   status: 'active',
 })
+
+export async function createWebSocketServer() {
+  return new Promise<WebSocketServer & AsyncDisposable>((resolve, reject) => {
+    const server = new WebSocketServer({ port: 0 }, () => {
+      server.off('error', reject)
+      resolve(
+        Object.defineProperty(server, Symbol.asyncDispose, {
+          value: disposeWebSocketServer,
+        }) as WebSocketServer & AsyncDisposable,
+      )
+    }).once('error', reject)
+  })
+}
+
+async function disposeWebSocketServer(this: WebSocketServer) {
+  return new Promise<void>((resolve, reject) => {
+    this.close((err) => {
+      if (err) reject(err)
+      else resolve()
+    })
+  })
+}