@atproto/xrpc-server 0.10.20 → 0.11.0-next.0

package/dist/stream/frames.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"frames.d.ts","sourceRoot":"","sources":["../../src/stream/frames.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAiB,MAAM,mBAAmB,CAAA;AAE3D,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,WAAW,EACX,SAAS,EACT,kBAAkB,EAGnB,MAAM,SAAS,CAAA;AAEhB,8BAAsB,KAAK,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ;IACvD,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAA;IAC5B,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;IAEhB,IAAI,EAAE,IAAI,SAAS,CAElB;IACD,OAAO,IAAI,UAAU;IAGrB,SAAS,IAAI,IAAI,IAAI,YAAY;IAGjC,OAAO,IAAI,IAAI,IAAI,UAAU;IAG7B,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,UAAU;CA8BnC;AAED,qBAAa,YAAY,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ,CAAE,SAAQ,KAAK,CAAC,CAAC,CAAC;IACvE,MAAM,EAAE,kBAAkB,CAAA;IAC1B,IAAI,EAAE,CAAC,CAAA;gBAEK,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE;IAQ7C,IAAI,IAAI,uBAEP;IAED,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM;;;CAsBjD;AAED,qBAAa,UAAU,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,KAAK,CAC9D,cAAc,CAAC,CAAC,CAAC,CAClB;IACC,MAAM,EAAE,gBAAgB,CAAA;IACxB,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,CAAA;gBAEX,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;IAKnC,IAAI,IAAI,MAEP;IACD,IAAI,OAAO,uBAEV;IAED,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,OAAO,GAAG,UAAU;CAK3C"}
+{"version":3,"file":"frames.d.ts","sourceRoot":"","sources":["../../src/stream/frames.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAiB,MAAM,mBAAmB,CAAA;AAE3D,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,WAAW,EACX,SAAS,EACT,kBAAkB,EAGnB,MAAM,YAAY,CAAA;AAEnB,8BAAsB,KAAK,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ;IACvD,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAA;IAC5B,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;IAEhB,IAAI,EAAE,IAAI,SAAS,CAElB;IACD,OAAO,IAAI,UAAU;IAGrB,SAAS,IAAI,IAAI,IAAI,YAAY;IAGjC,OAAO,IAAI,IAAI,IAAI,UAAU;IAG7B,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,UAAU;CA8BnC;AAED,qBAAa,YAAY,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ,CAAE,SAAQ,KAAK,CAAC,CAAC,CAAC;IACvE,MAAM,EAAE,kBAAkB,CAAA;IAC1B,IAAI,EAAE,CAAC,CAAA;gBAEK,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE;IAQ7C,IAAI,IAAI,uBAEP;IAED,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM;;;CAsBjD;AAED,qBAAa,UAAU,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,KAAK,CAC9D,cAAc,CAAC,CAAC,CAAC,CAClB;IACC,MAAM,EAAE,gBAAgB,CAAA;IACxB,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,CAAA;gBAEX,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;IAKnC,IAAI,IAAI,MAEP;IACD,IAAI,OAAO,uBAEV;IAED,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,OAAO,GAAG,UAAU;CAK3C"}

package/dist/stream/frames.js

@@ -1,43 +1,40 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ErrorFrame = exports.MessageFrame = exports.Frame = void 0;
-const lex_cbor_1 = require("@atproto/lex-cbor");
-const lex_data_1 = require("@atproto/lex-data");
-const errors_1 = require("../errors");
-const types_1 = require("./types");
-class Frame {
+import { decodeAll, encode } from '@atproto/lex-cbor';
+import { isPlainObject } from '@atproto/lex-data';
+import { XRPCError } from '../errors.js';
+import { FrameType, errorFrameBody, frameHeader, } from './types.js';
+export class Frame {
     get op() {
         return this.header.op;
     }
     toBytes() {
-        return Buffer.concat([(0, lex_cbor_1.encode)(this.header), (0, lex_cbor_1.encode)(this.body)]);
+        return Buffer.concat([encode(this.header), encode(this.body)]);
     }
     isMessage() {
-        return this.op === types_1.FrameType.Message;
+        return this.op === FrameType.Message;
     }
     isError() {
-        return this.op === types_1.FrameType.Error;
+        return this.op === FrameType.Error;
     }
     static fromBytes(bytes) {
-        const [header, body, ...rest] = (0, lex_cbor_1.decodeAll)(bytes);
+        const [header, body, ...rest] = decodeAll(bytes);
         if (rest.length) {
             throw new Error('Too many CBOR data items in frame');
         }
         else if (body === undefined) {
             throw new Error('Missing frame body');
         }
-        const parsedHeader = types_1.frameHeader.safeParse(header);
+        const parsedHeader = frameHeader.safeParse(header);
         if (!parsedHeader.success) {
             throw new Error(`Invalid frame header: ${parsedHeader.reason.message}`);
         }
         const frameOp = parsedHeader.value.op;
-        if (frameOp === types_1.FrameType.Message) {
+        if (frameOp === FrameType.Message) {
             return new MessageFrame(body, {
                 type: parsedHeader.value.t,
             });
         }
-        else if (frameOp === types_1.FrameType.Error) {
-            const parsedBody = types_1.errorFrameBody.safeParse(body);
+        else if (frameOp === FrameType.Error) {
+            const parsedBody = errorFrameBody.safeParse(body);
             if (!parsedBody.success) {
                 throw new Error(`Invalid error frame body: ${parsedBody.reason.message}`);
             }
@@ -49,33 +46,20 @@ class Frame {
         }
     }
 }
-exports.Frame = Frame;
-class MessageFrame extends Frame {
+export class MessageFrame extends Frame {
     constructor(body, opts) {
         super();
-        Object.defineProperty(this, "header", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "body", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         this.header =
             opts?.type !== undefined
-                ? { op: types_1.FrameType.Message, t: opts?.type }
-                : { op: types_1.FrameType.Message };
+                ? { op: FrameType.Message, t: opts?.type }
+                : { op: FrameType.Message };
         this.body = body;
     }
     get type() {
         return this.header.t;
     }
     static fromLexValue(data, nsid) {
-        if (!(0, lex_data_1.isPlainObject)(data)) {
+        if (!isPlainObject(data)) {
             return new MessageFrame(data);
         }
         const $type = data?.['$type'];
@@ -94,23 +78,10 @@ class MessageFrame extends Frame {
         return new MessageFrame(clone, { type });
     }
 }
-exports.MessageFrame = MessageFrame;
-class ErrorFrame extends Frame {
+export class ErrorFrame extends Frame {
     constructor(body) {
         super();
-        Object.defineProperty(this, "header", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "body", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.header = { op: types_1.FrameType.Error };
+        this.header = { op: FrameType.Error };
         this.body = body;
     }
     get code() {
@@ -122,9 +93,8 @@ class ErrorFrame extends Frame {
     static fromError(err) {
         if (err instanceof ErrorFrame)
             return err;
-        const { error = 'Unknown', message } = errors_1.XRPCError.fromError(err).payload;
+        const { error = 'Unknown', message } = XRPCError.fromError(err).payload;
         return new ErrorFrame({ error, message });
     }
 }
-exports.ErrorFrame = ErrorFrame;
 //# sourceMappingURL=frames.js.map

package/dist/stream/frames.js.map

@@ -1 +1 @@
-{"version":3,"file":"frames.js","sourceRoot":"","sources":["../../src/stream/frames.ts"],"names":[],"mappings":"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","sourcesContent":["import { decodeAll, encode } from '@atproto/lex-cbor'\nimport { LexValue, isPlainObject } from '@atproto/lex-data'\nimport { XRPCError } from '../errors'\nimport {\n  ErrorFrameBody,\n  ErrorFrameHeader,\n  FrameHeader,\n  FrameType,\n  MessageFrameHeader,\n  errorFrameBody,\n  frameHeader,\n} from './types'\n\nexport abstract class Frame<T extends LexValue = LexValue> {\n  abstract header: FrameHeader\n  abstract body: T\n\n  get op(): FrameType {\n    return this.header.op\n  }\n  toBytes(): Uint8Array {\n    return Buffer.concat([encode(this.header), encode(this.body)])\n  }\n  isMessage(): this is MessageFrame {\n    return this.op === FrameType.Message\n  }\n  isError(): this is ErrorFrame {\n    return this.op === FrameType.Error\n  }\n  static fromBytes(bytes: Uint8Array) {\n    const [header, body, ...rest] = decodeAll(bytes)\n    if (rest.length) {\n      throw new Error('Too many CBOR data items in frame')\n    } else if (body === undefined) {\n      throw new Error('Missing frame body')\n    }\n\n    const parsedHeader = frameHeader.safeParse(header)\n    if (!parsedHeader.success) {\n      throw new Error(`Invalid frame header: ${parsedHeader.reason.message}`)\n    }\n    const frameOp = parsedHeader.value.op\n    if (frameOp === FrameType.Message) {\n      return new MessageFrame(body, {\n        type: parsedHeader.value.t,\n      })\n    } else if (frameOp === FrameType.Error) {\n      const parsedBody = errorFrameBody.safeParse(body)\n      if (!parsedBody.success) {\n        throw new Error(\n          `Invalid error frame body: ${parsedBody.reason.message}`,\n        )\n      }\n      return new ErrorFrame(parsedBody.value)\n    } else {\n      const exhaustiveCheck: never = frameOp\n      throw new Error(`Unknown frame op: ${exhaustiveCheck}`)\n    }\n  }\n}\n\nexport class MessageFrame<T extends LexValue = LexValue> extends Frame<T> {\n  header: MessageFrameHeader\n  body: T\n\n  constructor(body: T, opts?: { type?: string }) {\n    super()\n    this.header =\n      opts?.type !== undefined\n        ? { op: FrameType.Message, t: opts?.type }\n        : { op: FrameType.Message }\n    this.body = body\n  }\n  get type() {\n    return this.header.t\n  }\n\n  static fromLexValue(data: LexValue, nsid: string) {\n    if (!isPlainObject(data)) {\n      return new MessageFrame(data)\n    }\n\n    const $type = data?.['$type']\n    if (typeof $type !== 'string') {\n      return new MessageFrame(data)\n    }\n\n    let type: string\n\n    const split = $type.split('#')\n    if (split.length === 2 && (split[0] === '' || split[0] === nsid)) {\n      type = `#${split[1]}`\n    } else {\n      type = $type\n    }\n\n    const { $type: _, ...clone } = data\n    return new MessageFrame(clone, { type })\n  }\n}\n\nexport class ErrorFrame<T extends string = string> extends Frame<\n  ErrorFrameBody<T>\n> {\n  header: ErrorFrameHeader\n  body: ErrorFrameBody<T>\n\n  constructor(body: ErrorFrameBody<T>) {\n    super()\n    this.header = { op: FrameType.Error }\n    this.body = body\n  }\n  get code() {\n    return this.body.error\n  }\n  get message() {\n    return this.body.message\n  }\n\n  static fromError(err: unknown): ErrorFrame {\n    if (err instanceof ErrorFrame) return err\n    const { error = 'Unknown', message } = XRPCError.fromError(err).payload\n    return new ErrorFrame({ error, message })\n  }\n}\n"]}
+{"version":3,"file":"frames.js","sourceRoot":"","sources":["../../src/stream/frames.ts"],"names":[],"mappings":"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","sourcesContent":["import { decodeAll, encode } from '@atproto/lex-cbor'\nimport { LexValue, isPlainObject } from '@atproto/lex-data'\nimport { XRPCError } from '../errors.js'\nimport {\n  ErrorFrameBody,\n  ErrorFrameHeader,\n  FrameHeader,\n  FrameType,\n  MessageFrameHeader,\n  errorFrameBody,\n  frameHeader,\n} from './types.js'\n\nexport abstract class Frame<T extends LexValue = LexValue> {\n  abstract header: FrameHeader\n  abstract body: T\n\n  get op(): FrameType {\n    return this.header.op\n  }\n  toBytes(): Uint8Array {\n    return Buffer.concat([encode(this.header), encode(this.body)])\n  }\n  isMessage(): this is MessageFrame {\n    return this.op === FrameType.Message\n  }\n  isError(): this is ErrorFrame {\n    return this.op === FrameType.Error\n  }\n  static fromBytes(bytes: Uint8Array) {\n    const [header, body, ...rest] = decodeAll(bytes)\n    if (rest.length) {\n      throw new Error('Too many CBOR data items in frame')\n    } else if (body === undefined) {\n      throw new Error('Missing frame body')\n    }\n\n    const parsedHeader = frameHeader.safeParse(header)\n    if (!parsedHeader.success) {\n      throw new Error(`Invalid frame header: ${parsedHeader.reason.message}`)\n    }\n    const frameOp = parsedHeader.value.op\n    if (frameOp === FrameType.Message) {\n      return new MessageFrame(body, {\n        type: parsedHeader.value.t,\n      })\n    } else if (frameOp === FrameType.Error) {\n      const parsedBody = errorFrameBody.safeParse(body)\n      if (!parsedBody.success) {\n        throw new Error(\n          `Invalid error frame body: ${parsedBody.reason.message}`,\n        )\n      }\n      return new ErrorFrame(parsedBody.value)\n    } else {\n      const exhaustiveCheck: never = frameOp\n      throw new Error(`Unknown frame op: ${exhaustiveCheck}`)\n    }\n  }\n}\n\nexport class MessageFrame<T extends LexValue = LexValue> extends Frame<T> {\n  header: MessageFrameHeader\n  body: T\n\n  constructor(body: T, opts?: { type?: string }) {\n    super()\n    this.header =\n      opts?.type !== undefined\n        ? { op: FrameType.Message, t: opts?.type }\n        : { op: FrameType.Message }\n    this.body = body\n  }\n  get type() {\n    return this.header.t\n  }\n\n  static fromLexValue(data: LexValue, nsid: string) {\n    if (!isPlainObject(data)) {\n      return new MessageFrame(data)\n    }\n\n    const $type = data?.['$type']\n    if (typeof $type !== 'string') {\n      return new MessageFrame(data)\n    }\n\n    let type: string\n\n    const split = $type.split('#')\n    if (split.length === 2 && (split[0] === '' || split[0] === nsid)) {\n      type = `#${split[1]}`\n    } else {\n      type = $type\n    }\n\n    const { $type: _, ...clone } = data\n    return new MessageFrame(clone, { type })\n  }\n}\n\nexport class ErrorFrame<T extends string = string> extends Frame<\n  ErrorFrameBody<T>\n> {\n  header: ErrorFrameHeader\n  body: ErrorFrameBody<T>\n\n  constructor(body: ErrorFrameBody<T>) {\n    super()\n    this.header = { op: FrameType.Error }\n    this.body = body\n  }\n  get code() {\n    return this.body.error\n  }\n  get message() {\n    return this.body.message\n  }\n\n  static fromError(err: unknown): ErrorFrame {\n    if (err instanceof ErrorFrame) return err\n    const { error = 'Unknown', message } = XRPCError.fromError(err).payload\n    return new ErrorFrame({ error, message })\n  }\n}\n"]}

package/dist/stream/index.d.ts

@@ -1,6 +1,6 @@
-export * from './types';
-export * from './frames';
-export * from './stream';
-export * from './subscription';
-export * from './server';
+export * from './types.js';
+export * from './frames.js';
+export * from './stream.js';
+export * from './subscription.js';
+export * from './server.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/stream/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAA;AACvB,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,cAAc,gBAAgB,CAAA;AAC9B,cAAc,UAAU,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/stream/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,cAAc,mBAAmB,CAAA;AACjC,cAAc,aAAa,CAAA"}

package/dist/stream/index.js

@@ -1,22 +1,6 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./types"), exports);
-__exportStar(require("./frames"), exports);
-__exportStar(require("./stream"), exports);
-__exportStar(require("./subscription"), exports);
-__exportStar(require("./server"), exports);
+export * from './types.js';
+export * from './frames.js';
+export * from './stream.js';
+export * from './subscription.js';
+export * from './server.js';
 //# sourceMappingURL=index.js.map

package/dist/stream/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/stream/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAuB;AACvB,2CAAwB;AACxB,2CAAwB;AACxB,iDAA8B;AAC9B,2CAAwB","sourcesContent":["export * from './types'\nexport * from './frames'\nexport * from './stream'\nexport * from './subscription'\nexport * from './server'\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/stream/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,cAAc,mBAAmB,CAAA;AACjC,cAAc,aAAa,CAAA","sourcesContent":["export * from './types.js'\nexport * from './frames.js'\nexport * from './stream.js'\nexport * from './subscription.js'\nexport * from './server.js'\n"]}

package/dist/stream/logger.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.logger = void 0;
-const common_1 = require("@atproto/common");
-exports.logger = (0, common_1.subsystemLogger)('xrpc-stream');
-exports.default = exports.logger;
+import { subsystemLogger } from '@atproto/common';
+export const logger = subsystemLogger('xrpc-stream');
+export default logger;
 //# sourceMappingURL=logger.js.map

package/dist/stream/logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/stream/logger.ts"],"names":[],"mappings":";;;AAAA,4CAAiD;AAEpC,QAAA,MAAM,GACjB,IAAA,wBAAe,EAAC,aAAa,CAAC,CAAA;AAEhC,kBAAe,cAAM,CAAA","sourcesContent":["import { subsystemLogger } from '@atproto/common'\n\nexport const logger: ReturnType<typeof subsystemLogger> =\n  subsystemLogger('xrpc-stream')\n\nexport default logger\n"]}
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/stream/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEjD,MAAM,CAAC,MAAM,MAAM,GACjB,eAAe,CAAC,aAAa,CAAC,CAAA;AAEhC,eAAe,MAAM,CAAA","sourcesContent":["import { subsystemLogger } from '@atproto/common'\n\nexport const logger: ReturnType<typeof subsystemLogger> =\n  subsystemLogger('xrpc-stream')\n\nexport default logger\n"]}

package/dist/stream/server.d.ts

@@ -1,6 +1,7 @@
 import { IncomingMessage } from 'node:http';
-import { ServerOptions, WebSocket, WebSocketServer } from 'ws';
-import { Frame } from './frames';
+import type { ServerOptions } from 'ws';
+import { WebSocket, WebSocketServer } from 'ws';
+import { Frame } from './frames.js';
 export declare class XrpcStreamServer {
     wss: WebSocketServer;
     constructor(opts: ServerOptions & {

package/dist/stream/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/stream/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,IAAI,CAAA;AAE9D,OAAO,EAAc,KAAK,EAAE,MAAM,UAAU,CAAA;AAG5C,qBAAa,gBAAgB;IAC3B,GAAG,EAAE,eAAe,CAAA;gBACR,IAAI,EAAE,aAAa,GAAG;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE;CAqCvD;AAED,MAAM,MAAM,OAAO,GAAG,CACpB,GAAG,EAAE,eAAe,EACpB,MAAM,EAAE,WAAW,EACnB,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,gBAAgB,KACrB,aAAa,CAAC,KAAK,CAAC,CAAA"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/stream/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAC3C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,IAAI,CAAA;AACvC,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,IAAI,CAAA;AAE/C,OAAO,EAAc,KAAK,EAAE,MAAM,aAAa,CAAA;AAG/C,qBAAa,gBAAgB;IAC3B,GAAG,EAAE,eAAe,CAAA;gBACR,IAAI,EAAE,aAAa,GAAG;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE;CAqCvD;AAED,MAAM,MAAM,OAAO,GAAG,CACpB,GAAG,EAAE,eAAe,EACpB,MAAM,EAAE,WAAW,EACnB,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,gBAAgB,KACrB,aAAa,CAAC,KAAK,CAAC,CAAA"}

package/dist/stream/server.js

@@ -1,22 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.XrpcStreamServer = void 0;
-const ws_1 = require("ws");
-const ws_client_1 = require("@atproto/ws-client");
-const frames_1 = require("./frames");
-const logger_1 = require("./logger");
-class XrpcStreamServer {
+import { WebSocketServer } from 'ws';
+import { CloseCode, DisconnectError } from '@atproto/ws-client';
+import { ErrorFrame } from './frames.js';
+import { logger } from './logger.js';
+export class XrpcStreamServer {
     constructor(opts) {
-        Object.defineProperty(this, "wss", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         const { handler, ...serverOpts } = opts;
-        this.wss = new ws_1.WebSocketServer(serverOpts);
+        this.wss = new WebSocketServer(serverOpts);
         this.wss.on('connection', async (socket, req) => {
-            socket.on('error', (err) => logger_1.logger.error(err, 'websocket error'));
+            socket.on('error', (err) => logger.error(err, 'websocket error'));
             try {
                 const ac = new AbortController();
                 const iterator = unwrapIterator(handler(req, ac.signal, socket, this));
@@ -35,25 +26,24 @@ class XrpcStreamServer {
                             res(undefined);
                         });
                     });
-                    if (frame instanceof frames_1.ErrorFrame) {
-                        throw new ws_client_1.DisconnectError(ws_client_1.CloseCode.Policy, frame.body.error);
+                    if (frame instanceof ErrorFrame) {
+                        throw new DisconnectError(CloseCode.Policy, frame.body.error);
                     }
                 }
             }
             catch (err) {
-                if (err instanceof ws_client_1.DisconnectError) {
+                if (err instanceof DisconnectError) {
                     return socket.close(err.wsCode, err.xrpcCode);
                 }
                 else {
-                    logger_1.logger.error({ err }, 'websocket server error');
+                    logger.error({ err }, 'websocket server error');
                     return socket.terminate();
                 }
             }
-            socket.close(ws_client_1.CloseCode.Normal);
+            socket.close(CloseCode.Normal);
         });
     }
 }
-exports.XrpcStreamServer = XrpcStreamServer;
 function unwrapIterator(iterable) {
     return iterable[Symbol.asyncIterator]();
 }

package/dist/stream/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/stream/server.ts"],"names":[],"mappings":";;;AACA,2BAA8D;AAC9D,kDAA+D;AAC/D,qCAA4C;AAC5C,qCAAiC;AAEjC,MAAa,gBAAgB;IAE3B,YAAY,IAA0C;QADtD;;;;;WAAoB;QAElB,MAAM,EAAE,OAAO,EAAE,GAAG,UAAU,EAAE,GAAG,IAAI,CAAA;QACvC,IAAI,CAAC,GAAG,GAAG,IAAI,oBAAe,CAAC,UAAU,CAAC,CAAA;QAC1C,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE;YAC9C,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,eAAM,CAAC,KAAK,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC,CAAA;YACjE,IAAI,CAAC;gBACH,MAAM,EAAE,GAAG,IAAI,eAAe,EAAE,CAAA;gBAChC,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAA;gBACtE,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;oBACxB,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAA;oBACnB,EAAE,CAAC,KAAK,EAAE,CAAA;gBACZ,CAAC,CAAC,CAAA;gBACF,MAAM,UAAU,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAA;gBACzC,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,UAAU,EAAE,CAAC;oBACrC,MAAM,IAAI,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;wBAC7B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,EAAE,EAAE;4BACrD,oEAAoE;4BACpE,4DAA4D;4BAC5D,IAAI,GAAG;gCAAE,OAAO,GAAG,CAAC,GAAG,CAAC,CAAA;4BACxB,GAAG,CAAC,SAAS,CAAC,CAAA;wBAChB,CAAC,CAAC,CAAA;oBACJ,CAAC,CAAC,CAAA;oBACF,IAAI,KAAK,YAAY,mBAAU,EAAE,CAAC;wBAChC,MAAM,IAAI,2BAAe,CAAC,qBAAS,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;oBAC/D,CAAC;gBACH,CAAC;YACH,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,GAAG,YAAY,2BAAe,EAAE,CAAC;oBACnC,OAAO,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAA;gBAC/C,CAAC;qBAAM,CAAC;oBACN,eAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,wBAAwB,CAAC,CAAA;oBAC/C,OAAO,MAAM,CAAC,SAAS,EAAE,CAAA;gBAC3B,CAAC;YACH,CAAC;YACD,MAAM,CAAC,KAAK,CAAC,qBAAS,CAAC,MAAM,CAAC,CAAA;QAChC,CAAC,CAAC,CAAA;IACJ,CAAC;CACF;AAvCD,4CAuCC;AASD,SAAS,cAAc,CAAI,QAA0B;IACnD,OAAO,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAA;AACzC,CAAC;AAED,SAAS,YAAY,CAAI,QAA0B;IACjD,OAAO;QACL,CAAC,MAAM,CAAC,aAAa,CAAC;YACpB,OAAO,QAAQ,CAAA;QACjB,CAAC;KACF,CAAA;AACH,CAAC","sourcesContent":["import { IncomingMessage } from 'node:http'\nimport { ServerOptions, WebSocket, WebSocketServer } from 'ws'\nimport { CloseCode, DisconnectError } from '@atproto/ws-client'\nimport { ErrorFrame, Frame } from './frames'\nimport { logger } from './logger'\n\nexport class XrpcStreamServer {\n  wss: WebSocketServer\n  constructor(opts: ServerOptions & { handler: Handler }) {\n    const { handler, ...serverOpts } = opts\n    this.wss = new WebSocketServer(serverOpts)\n    this.wss.on('connection', async (socket, req) => {\n      socket.on('error', (err) => logger.error(err, 'websocket error'))\n      try {\n        const ac = new AbortController()\n        const iterator = unwrapIterator(handler(req, ac.signal, socket, this))\n        socket.once('close', () => {\n          iterator.return?.()\n          ac.abort()\n        })\n        const safeFrames = wrapIterator(iterator)\n        for await (const frame of safeFrames) {\n          await new Promise((res, rej) => {\n            socket.send(frame.toBytes(), { binary: true }, (err) => {\n              // @TODO this callback may give more aggressive on backpressure than\n              // we ultimately want, but trying it out for the time being.\n              if (err) return rej(err)\n              res(undefined)\n            })\n          })\n          if (frame instanceof ErrorFrame) {\n            throw new DisconnectError(CloseCode.Policy, frame.body.error)\n          }\n        }\n      } catch (err) {\n        if (err instanceof DisconnectError) {\n          return socket.close(err.wsCode, err.xrpcCode)\n        } else {\n          logger.error({ err }, 'websocket server error')\n          return socket.terminate()\n        }\n      }\n      socket.close(CloseCode.Normal)\n    })\n  }\n}\n\nexport type Handler = (\n  req: IncomingMessage,\n  signal: AbortSignal,\n  socket: WebSocket,\n  server: XrpcStreamServer,\n) => AsyncIterable<Frame>\n\nfunction unwrapIterator<T>(iterable: AsyncIterable<T>): AsyncIterator<T> {\n  return iterable[Symbol.asyncIterator]()\n}\n\nfunction wrapIterator<T>(iterator: AsyncIterator<T>): AsyncIterable<T> {\n  return {\n    [Symbol.asyncIterator]() {\n      return iterator\n    },\n  }\n}\n"]}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/stream/server.ts"],"names":[],"mappings":"AAEA,OAAO,EAAa,eAAe,EAAE,MAAM,IAAI,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAC/D,OAAO,EAAE,UAAU,EAAS,MAAM,aAAa,CAAA;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEpC,MAAM,OAAO,gBAAgB;IAE3B,YAAY,IAA0C;QACpD,MAAM,EAAE,OAAO,EAAE,GAAG,UAAU,EAAE,GAAG,IAAI,CAAA;QACvC,IAAI,CAAC,GAAG,GAAG,IAAI,eAAe,CAAC,UAAU,CAAC,CAAA;QAC1C,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE;YAC9C,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC,CAAA;YACjE,IAAI,CAAC;gBACH,MAAM,EAAE,GAAG,IAAI,eAAe,EAAE,CAAA;gBAChC,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAA;gBACtE,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;oBACxB,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAA;oBACnB,EAAE,CAAC,KAAK,EAAE,CAAA;gBACZ,CAAC,CAAC,CAAA;gBACF,MAAM,UAAU,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAA;gBACzC,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,UAAU,EAAE,CAAC;oBACrC,MAAM,IAAI,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;wBAC7B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,EAAE,EAAE;4BACrD,oEAAoE;4BACpE,4DAA4D;4BAC5D,IAAI,GAAG;gCAAE,OAAO,GAAG,CAAC,GAAG,CAAC,CAAA;4BACxB,GAAG,CAAC,SAAS,CAAC,CAAA;wBAChB,CAAC,CAAC,CAAA;oBACJ,CAAC,CAAC,CAAA;oBACF,IAAI,KAAK,YAAY,UAAU,EAAE,CAAC;wBAChC,MAAM,IAAI,eAAe,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;oBAC/D,CAAC;gBACH,CAAC;YACH,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,GAAG,YAAY,eAAe,EAAE,CAAC;oBACnC,OAAO,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAA;gBAC/C,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,wBAAwB,CAAC,CAAA;oBAC/C,OAAO,MAAM,CAAC,SAAS,EAAE,CAAA;gBAC3B,CAAC;YACH,CAAC;YACD,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;QAChC,CAAC,CAAC,CAAA;IACJ,CAAC;CACF;AASD,SAAS,cAAc,CAAI,QAA0B;IACnD,OAAO,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAA;AACzC,CAAC;AAED,SAAS,YAAY,CAAI,QAA0B;IACjD,OAAO;QACL,CAAC,MAAM,CAAC,aAAa,CAAC;YACpB,OAAO,QAAQ,CAAA;QACjB,CAAC;KACF,CAAA;AACH,CAAC","sourcesContent":["import { IncomingMessage } from 'node:http'\nimport type { ServerOptions } from 'ws'\nimport { WebSocket, WebSocketServer } from 'ws'\nimport { CloseCode, DisconnectError } from '@atproto/ws-client'\nimport { ErrorFrame, Frame } from './frames.js'\nimport { logger } from './logger.js'\n\nexport class XrpcStreamServer {\n  wss: WebSocketServer\n  constructor(opts: ServerOptions & { handler: Handler }) {\n    const { handler, ...serverOpts } = opts\n    this.wss = new WebSocketServer(serverOpts)\n    this.wss.on('connection', async (socket, req) => {\n      socket.on('error', (err) => logger.error(err, 'websocket error'))\n      try {\n        const ac = new AbortController()\n        const iterator = unwrapIterator(handler(req, ac.signal, socket, this))\n        socket.once('close', () => {\n          iterator.return?.()\n          ac.abort()\n        })\n        const safeFrames = wrapIterator(iterator)\n        for await (const frame of safeFrames) {\n          await new Promise((res, rej) => {\n            socket.send(frame.toBytes(), { binary: true }, (err) => {\n              // @TODO this callback may give more aggressive on backpressure than\n              // we ultimately want, but trying it out for the time being.\n              if (err) return rej(err)\n              res(undefined)\n            })\n          })\n          if (frame instanceof ErrorFrame) {\n            throw new DisconnectError(CloseCode.Policy, frame.body.error)\n          }\n        }\n      } catch (err) {\n        if (err instanceof DisconnectError) {\n          return socket.close(err.wsCode, err.xrpcCode)\n        } else {\n          logger.error({ err }, 'websocket server error')\n          return socket.terminate()\n        }\n      }\n      socket.close(CloseCode.Normal)\n    })\n  }\n}\n\nexport type Handler = (\n  req: IncomingMessage,\n  signal: AbortSignal,\n  socket: WebSocket,\n  server: XrpcStreamServer,\n) => AsyncIterable<Frame>\n\nfunction unwrapIterator<T>(iterable: AsyncIterable<T>): AsyncIterator<T> {\n  return iterable[Symbol.asyncIterator]()\n}\n\nfunction wrapIterator<T>(iterator: AsyncIterator<T>): AsyncIterable<T> {\n  return {\n    [Symbol.asyncIterator]() {\n      return iterator\n    },\n  }\n}\n"]}

package/dist/stream/stream.d.ts

@@ -1,8 +1,8 @@
 import { DuplexOptions } from 'node:stream';
 import { WebSocket } from 'ws';
-import { MessageFrame } from './frames';
+import { MessageFrame } from './frames.js';
 export declare function streamByteChunks(ws: WebSocket, options?: DuplexOptions): import("stream").Duplex;
-export declare function byFrame(ws: WebSocket, options?: DuplexOptions): AsyncGenerator<MessageFrame<import("@atproto/lex-data").LexValue> | import("./frames").ErrorFrame<string>, void, unknown>;
+export declare function byFrame(ws: WebSocket, options?: DuplexOptions): AsyncGenerator<MessageFrame<import("@atproto/lex-data").LexValue> | import("./frames.js").ErrorFrame<string>, void, unknown>;
 export declare function byMessage(ws: WebSocket, options?: DuplexOptions): AsyncGenerator<MessageFrame<import("@atproto/lex-data").LexValue>, void, unknown>;
 export declare function ensureChunkIsMessage(chunk: Uint8Array): MessageFrame;
 //# sourceMappingURL=stream.d.ts.map

package/dist/stream/stream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../src/stream/stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,SAAS,EAAyB,MAAM,IAAI,CAAA;AAErD,OAAO,EAAS,YAAY,EAAE,MAAM,UAAU,CAAA;AAE9C,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,aAAa,2BAKtE;AAED,wBAAuB,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,aAAa,6HAKpE;AAED,wBAAuB,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,aAAa,qFAMtE;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,UAAU,GAAG,YAAY,CAWpE"}
+{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../src/stream/stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,SAAS,EAAyB,MAAM,IAAI,CAAA;AAErD,OAAO,EAAS,YAAY,EAAE,MAAM,aAAa,CAAA;AAEjD,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,aAAa,2BAKtE;AAED,wBAAuB,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,aAAa,gIAKpE;AAED,wBAAuB,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,aAAa,qFAMtE;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,UAAU,GAAG,YAAY,CAWpE"}

package/dist/stream/stream.js

@@ -1,43 +1,37 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.streamByteChunks = streamByteChunks;
-exports.byFrame = byFrame;
-exports.byMessage = byMessage;
-exports.ensureChunkIsMessage = ensureChunkIsMessage;
-const ws_1 = require("ws");
-const xrpc_1 = require("@atproto/xrpc");
-const frames_1 = require("./frames");
-function streamByteChunks(ws, options) {
-    return (0, ws_1.createWebSocketStream)(ws, {
+import { createWebSocketStream } from 'ws';
+import { ResponseType, XRPCError } from '@atproto/xrpc';
+import { Frame } from './frames.js';
+export function streamByteChunks(ws, options) {
+    return createWebSocketStream(ws, {
         ...options,
         readableObjectMode: true, // Ensures frame bytes don't get buffered/combined together
     });
 }
-async function* byFrame(ws, options) {
+export async function* byFrame(ws, options) {
     const wsStream = streamByteChunks(ws, options);
     for await (const chunk of wsStream) {
-        yield frames_1.Frame.fromBytes(chunk);
+        yield Frame.fromBytes(chunk);
     }
 }
-async function* byMessage(ws, options) {
+export async function* byMessage(ws, options) {
     const wsStream = streamByteChunks(ws, options);
     for await (const chunk of wsStream) {
         const msg = ensureChunkIsMessage(chunk);
         yield msg;
     }
 }
-function ensureChunkIsMessage(chunk) {
-    const frame = frames_1.Frame.fromBytes(chunk);
+export function ensureChunkIsMessage(chunk) {
+    const frame = Frame.fromBytes(chunk);
     if (frame.isMessage()) {
         return frame;
     }
     else if (frame.isError()) {
         // @TODO work -1 error code into XRPCError
         // @ts-ignore
-        throw new xrpc_1.XRPCError(-1, frame.code, frame.message);
+        throw new XRPCError(-1, frame.code, frame.message);
     }
     else {
-        throw new xrpc_1.XRPCError(xrpc_1.ResponseType.Unknown, undefined, 'Unknown frame type');
+        throw new XRPCError(ResponseType.Unknown, undefined, 'Unknown frame type');
     }
 }
 //# sourceMappingURL=stream.js.map

package/dist/stream/stream.js.map

@@ -1 +1 @@
-{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../src/stream/stream.ts"],"names":[],"mappings":";;AAKA,4CAKC;AAED,0BAKC;AAED,8BAMC;AAED,oDAWC;AArCD,2BAAqD;AACrD,wCAAuD;AACvD,qCAA8C;AAE9C,SAAgB,gBAAgB,CAAC,EAAa,EAAE,OAAuB;IACrE,OAAO,IAAA,0BAAqB,EAAC,EAAE,EAAE;QAC/B,GAAG,OAAO;QACV,kBAAkB,EAAE,IAAI,EAAE,2DAA2D;KACtF,CAAC,CAAA;AACJ,CAAC;AAEM,KAAK,SAAS,CAAC,CAAC,OAAO,CAAC,EAAa,EAAE,OAAuB;IACnE,MAAM,QAAQ,GAAG,gBAAgB,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;IAC9C,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;QACnC,MAAM,cAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC;AACH,CAAC;AAEM,KAAK,SAAS,CAAC,CAAC,SAAS,CAAC,EAAa,EAAE,OAAuB;IACrE,MAAM,QAAQ,GAAG,gBAAgB,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;IAC9C,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;QACnC,MAAM,GAAG,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAA;QACvC,MAAM,GAAG,CAAA;IACX,CAAC;AACH,CAAC;AAED,SAAgB,oBAAoB,CAAC,KAAiB;IACpD,MAAM,KAAK,GAAG,cAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;IACpC,IAAI,KAAK,CAAC,SAAS,EAAE,EAAE,CAAC;QACtB,OAAO,KAAK,CAAA;IACd,CAAC;SAAM,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;QAC3B,0CAA0C;QAC1C,aAAa;QACb,MAAM,IAAI,gBAAS,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;IACpD,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,gBAAS,CAAC,mBAAY,CAAC,OAAO,EAAE,SAAS,EAAE,oBAAoB,CAAC,CAAA;IAC5E,CAAC;AACH,CAAC","sourcesContent":["import { DuplexOptions } from 'node:stream'\nimport { WebSocket, createWebSocketStream } from 'ws'\nimport { ResponseType, XRPCError } from '@atproto/xrpc'\nimport { Frame, MessageFrame } from './frames'\n\nexport function streamByteChunks(ws: WebSocket, options?: DuplexOptions) {\n  return createWebSocketStream(ws, {\n    ...options,\n    readableObjectMode: true, // Ensures frame bytes don't get buffered/combined together\n  })\n}\n\nexport async function* byFrame(ws: WebSocket, options?: DuplexOptions) {\n  const wsStream = streamByteChunks(ws, options)\n  for await (const chunk of wsStream) {\n    yield Frame.fromBytes(chunk)\n  }\n}\n\nexport async function* byMessage(ws: WebSocket, options?: DuplexOptions) {\n  const wsStream = streamByteChunks(ws, options)\n  for await (const chunk of wsStream) {\n    const msg = ensureChunkIsMessage(chunk)\n    yield msg\n  }\n}\n\nexport function ensureChunkIsMessage(chunk: Uint8Array): MessageFrame {\n  const frame = Frame.fromBytes(chunk)\n  if (frame.isMessage()) {\n    return frame\n  } else if (frame.isError()) {\n    // @TODO work -1 error code into XRPCError\n    // @ts-ignore\n    throw new XRPCError(-1, frame.code, frame.message)\n  } else {\n    throw new XRPCError(ResponseType.Unknown, undefined, 'Unknown frame type')\n  }\n}\n"]}
+{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../src/stream/stream.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,qBAAqB,EAAE,MAAM,IAAI,CAAA;AACrD,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AACvD,OAAO,EAAE,KAAK,EAAgB,MAAM,aAAa,CAAA;AAEjD,MAAM,UAAU,gBAAgB,CAAC,EAAa,EAAE,OAAuB;IACrE,OAAO,qBAAqB,CAAC,EAAE,EAAE;QAC/B,GAAG,OAAO;QACV,kBAAkB,EAAE,IAAI,EAAE,2DAA2D;KACtF,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,OAAO,CAAC,EAAa,EAAE,OAAuB;IACnE,MAAM,QAAQ,GAAG,gBAAgB,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;IAC9C,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;QACnC,MAAM,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,SAAS,CAAC,EAAa,EAAE,OAAuB;IACrE,MAAM,QAAQ,GAAG,gBAAgB,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;IAC9C,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;QACnC,MAAM,GAAG,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAA;QACvC,MAAM,GAAG,CAAA;IACX,CAAC;AACH,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,KAAiB;IACpD,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;IACpC,IAAI,KAAK,CAAC,SAAS,EAAE,EAAE,CAAC;QACtB,OAAO,KAAK,CAAA;IACd,CAAC;SAAM,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;QAC3B,0CAA0C;QAC1C,aAAa;QACb,MAAM,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;IACpD,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,SAAS,CAAC,YAAY,CAAC,OAAO,EAAE,SAAS,EAAE,oBAAoB,CAAC,CAAA;IAC5E,CAAC;AACH,CAAC","sourcesContent":["import { DuplexOptions } from 'node:stream'\nimport { WebSocket, createWebSocketStream } from 'ws'\nimport { ResponseType, XRPCError } from '@atproto/xrpc'\nimport { Frame, MessageFrame } from './frames.js'\n\nexport function streamByteChunks(ws: WebSocket, options?: DuplexOptions) {\n  return createWebSocketStream(ws, {\n    ...options,\n    readableObjectMode: true, // Ensures frame bytes don't get buffered/combined together\n  })\n}\n\nexport async function* byFrame(ws: WebSocket, options?: DuplexOptions) {\n  const wsStream = streamByteChunks(ws, options)\n  for await (const chunk of wsStream) {\n    yield Frame.fromBytes(chunk)\n  }\n}\n\nexport async function* byMessage(ws: WebSocket, options?: DuplexOptions) {\n  const wsStream = streamByteChunks(ws, options)\n  for await (const chunk of wsStream) {\n    const msg = ensureChunkIsMessage(chunk)\n    yield msg\n  }\n}\n\nexport function ensureChunkIsMessage(chunk: Uint8Array): MessageFrame {\n  const frame = Frame.fromBytes(chunk)\n  if (frame.isMessage()) {\n    return frame\n  } else if (frame.isError()) {\n    // @TODO work -1 error code into XRPCError\n    // @ts-ignore\n    throw new XRPCError(-1, frame.code, frame.message)\n  } else {\n    throw new XRPCError(ResponseType.Unknown, undefined, 'Unknown frame type')\n  }\n}\n"]}

package/dist/stream/subscription.d.ts

@@ -1,4 +1,4 @@
-import { ClientOptions } from 'ws';
+import type { ClientOptions } from 'ws';
 export declare class Subscription<T = unknown> {
     opts: ClientOptions & {
         service: string;

package/dist/stream/subscription.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subscription.d.ts","sourceRoot":"","sources":["../../src/stream/subscription.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,IAAI,CAAA;AAKlC,qBAAa,YAAY,CAAC,CAAC,GAAG,OAAO;IAE1B,IAAI,EAAE,aAAa,GAAG;QAC3B,OAAO,EAAE,MAAM,CAAA;QACf,MAAM,EAAE,MAAM,CAAA;QACd,mBAAmB,CAAC,EAAE,MAAM,CAAA;QAC5B,mBAAmB,CAAC,EAAE,MAAM,CAAA;QAC5B,MAAM,CAAC,EAAE,WAAW,CAAA;QACpB,QAAQ,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,CAAC,GAAG,SAAS,CAAA;QACzC,gBAAgB,CAAC,EAAE,CACjB,KAAK,EAAE,OAAO,EACd,CAAC,EAAE,MAAM,EACT,YAAY,EAAE,OAAO,KAClB,IAAI,CAAA;QACT,SAAS,CAAC,EAAE,MACR,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC,GAC5C,SAAS,CAAA;KACd;gBAhBM,IAAI,EAAE,aAAa,GAAG;QAC3B,OAAO,EAAE,MAAM,CAAA;QACf,MAAM,EAAE,MAAM,CAAA;QACd,mBAAmB,CAAC,EAAE,MAAM,CAAA;QAC5B,mBAAmB,CAAC,EAAE,MAAM,CAAA;QAC5B,MAAM,CAAC,EAAE,WAAW,CAAA;QACpB,QAAQ,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,CAAC,GAAG,SAAS,CAAA;QACzC,gBAAgB,CAAC,EAAE,CACjB,KAAK,EAAE,OAAO,EACd,CAAC,EAAE,MAAM,EACT,YAAY,EAAE,OAAO,KAClB,IAAI,CAAA;QACT,SAAS,CAAC,EAAE,MACR,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC,GAC5C,SAAS,CAAA;KACd;IAGI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,cAAc,CAAC,CAAC,CAAC;CA4BnD;AAED,eAAe,YAAY,CAAA"}
+{"version":3,"file":"subscription.d.ts","sourceRoot":"","sources":["../../src/stream/subscription.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,IAAI,CAAA;AAKvC,qBAAa,YAAY,CAAC,CAAC,GAAG,OAAO;IAE1B,IAAI,EAAE,aAAa,GAAG;QAC3B,OAAO,EAAE,MAAM,CAAA;QACf,MAAM,EAAE,MAAM,CAAA;QACd,mBAAmB,CAAC,EAAE,MAAM,CAAA;QAC5B,mBAAmB,CAAC,EAAE,MAAM,CAAA;QAC5B,MAAM,CAAC,EAAE,WAAW,CAAA;QACpB,QAAQ,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,CAAC,GAAG,SAAS,CAAA;QACzC,gBAAgB,CAAC,EAAE,CACjB,KAAK,EAAE,OAAO,EACd,CAAC,EAAE,MAAM,EACT,YAAY,EAAE,OAAO,KAClB,IAAI,CAAA;QACT,SAAS,CAAC,EAAE,MACR,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC,GAC5C,SAAS,CAAA;KACd;gBAhBM,IAAI,EAAE,aAAa,GAAG;QAC3B,OAAO,EAAE,MAAM,CAAA;QACf,MAAM,EAAE,MAAM,CAAA;QACd,mBAAmB,CAAC,EAAE,MAAM,CAAA;QAC5B,mBAAmB,CAAC,EAAE,MAAM,CAAA;QAC5B,MAAM,CAAC,EAAE,WAAW,CAAA;QACpB,QAAQ,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,CAAC,GAAG,SAAS,CAAA;QACzC,gBAAgB,CAAC,EAAE,CACjB,KAAK,EAAE,OAAO,EACd,CAAC,EAAE,MAAM,EACT,YAAY,EAAE,OAAO,KAClB,IAAI,CAAA;QACT,SAAS,CAAC,EAAE,MACR,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC,GAC5C,SAAS,CAAA;KACd;IAGI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,cAAc,CAAC,CAAC,CAAC;CA4BnD;AAED,eAAe,YAAY,CAAA"}

package/dist/stream/subscription.js

@@ -1,20 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Subscription = void 0;
-const lex_data_1 = require("@atproto/lex-data");
-const ws_client_1 = require("@atproto/ws-client");
-const stream_1 = require("./stream");
-class Subscription {
+import { isPlainObject } from '@atproto/lex-data';
+import { WebSocketKeepAlive } from '@atproto/ws-client';
+import { ensureChunkIsMessage } from './stream.js';
+export class Subscription {
     constructor(opts) {
-        Object.defineProperty(this, "opts", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: opts
-        });
+        this.opts = opts;
     }
     async *[Symbol.asyncIterator]() {
-        const ws = new ws_client_1.WebSocketKeepAlive({
+        const ws = new WebSocketKeepAlive({
             ...this.opts,
             getUrl: async () => {
                 const params = (await this.opts.getParams?.()) ?? {};
@@ -23,9 +15,9 @@ class Subscription {
             },
         });
         for await (const chunk of ws) {
-            const message = (0, stream_1.ensureChunkIsMessage)(chunk);
+            const message = ensureChunkIsMessage(chunk);
             const t = message.header.t;
-            const typedBody = (0, lex_data_1.isPlainObject)(message.body)
+            const typedBody = isPlainObject(message.body)
                 ? t !== undefined
                     ? {
                         ...message.body,
@@ -40,8 +32,7 @@ class Subscription {
         }
     }
 }
-exports.Subscription = Subscription;
-exports.default = Subscription;
+export default Subscription;
 function encodeQueryParams(obj) {
     const params = new URLSearchParams();
     Object.entries(obj).forEach(([key, value]) => {

package/dist/stream/subscription.js.map

@@ -1 +1 @@
-{"version":3,"file":"subscription.js","sourceRoot":"","sources":["../../src/stream/subscription.ts"],"names":[],"mappings":"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","sourcesContent":["import { ClientOptions } from 'ws'\nimport { isPlainObject } from '@atproto/lex-data'\nimport { WebSocketKeepAlive } from '@atproto/ws-client'\nimport { ensureChunkIsMessage } from './stream'\n\nexport class Subscription<T = unknown> {\n  constructor(\n    public opts: ClientOptions & {\n      service: string\n      method: string\n      maxReconnectSeconds?: number\n      heartbeatIntervalMs?: number\n      signal?: AbortSignal\n      validate: (obj: unknown) => T | undefined\n      onReconnectError?: (\n        error: unknown,\n        n: number,\n        initialSetup: boolean,\n      ) => void\n      getParams?: () =>\n        | Record<string, unknown>\n        | Promise<Record<string, unknown> | undefined>\n        | undefined\n    },\n  ) {}\n\n  async *[Symbol.asyncIterator](): AsyncGenerator<T> {\n    const ws = new WebSocketKeepAlive({\n      ...this.opts,\n      getUrl: async () => {\n        const params = (await this.opts.getParams?.()) ?? {}\n        const query = encodeQueryParams(params)\n        return `${this.opts.service}/xrpc/${this.opts.method}?${query}`\n      },\n    })\n    for await (const chunk of ws) {\n      const message = ensureChunkIsMessage(chunk)\n      const t = message.header.t\n\n      const typedBody = isPlainObject(message.body)\n        ? t !== undefined\n          ? {\n              ...message.body,\n              $type: t.startsWith('#') ? this.opts.method + t : t,\n            }\n          : message.body\n        : undefined\n\n      const result = this.opts.validate(typedBody)\n      if (result !== undefined) {\n        yield result\n      }\n    }\n  }\n}\n\nexport default Subscription\n\nfunction encodeQueryParams(obj: Record<string, unknown>): string {\n  const params = new URLSearchParams()\n  Object.entries(obj).forEach(([key, value]) => {\n    const encoded = encodeQueryParam(value)\n    if (Array.isArray(encoded)) {\n      encoded.forEach((enc) => params.append(key, enc))\n    } else {\n      params.set(key, encoded)\n    }\n  })\n  return params.toString()\n}\n\n// Adapted from xrpc, but without any lex-specific knowledge\nfunction encodeQueryParam(value: unknown): string | string[] {\n  if (typeof value === 'string') {\n    return value\n  }\n  if (typeof value === 'number') {\n    return value.toString()\n  }\n  if (typeof value === 'boolean') {\n    return value ? 'true' : 'false'\n  }\n  if (typeof value === 'undefined') {\n    return ''\n  }\n  if (typeof value === 'object') {\n    if (value instanceof Date) {\n      return value.toISOString()\n    } else if (Array.isArray(value)) {\n      return value.flatMap(encodeQueryParam)\n    } else if (!value) {\n      return ''\n    }\n  }\n  throw new Error(`Cannot encode ${typeof value}s into query params`)\n}\n"]}
+{"version":3,"file":"subscription.js","sourceRoot":"","sources":["../../src/stream/subscription.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ClientOptions } from 'ws'\nimport { isPlainObject } from '@atproto/lex-data'\nimport { WebSocketKeepAlive } from '@atproto/ws-client'\nimport { ensureChunkIsMessage } from './stream.js'\n\nexport class Subscription<T = unknown> {\n  constructor(\n    public opts: ClientOptions & {\n      service: string\n      method: string\n      maxReconnectSeconds?: number\n      heartbeatIntervalMs?: number\n      signal?: AbortSignal\n      validate: (obj: unknown) => T | undefined\n      onReconnectError?: (\n        error: unknown,\n        n: number,\n        initialSetup: boolean,\n      ) => void\n      getParams?: () =>\n        | Record<string, unknown>\n        | Promise<Record<string, unknown> | undefined>\n        | undefined\n    },\n  ) {}\n\n  async *[Symbol.asyncIterator](): AsyncGenerator<T> {\n    const ws = new WebSocketKeepAlive({\n      ...this.opts,\n      getUrl: async () => {\n        const params = (await this.opts.getParams?.()) ?? {}\n        const query = encodeQueryParams(params)\n        return `${this.opts.service}/xrpc/${this.opts.method}?${query}`\n      },\n    })\n    for await (const chunk of ws) {\n      const message = ensureChunkIsMessage(chunk)\n      const t = message.header.t\n\n      const typedBody = isPlainObject(message.body)\n        ? t !== undefined\n          ? {\n              ...message.body,\n              $type: t.startsWith('#') ? this.opts.method + t : t,\n            }\n          : message.body\n        : undefined\n\n      const result = this.opts.validate(typedBody)\n      if (result !== undefined) {\n        yield result\n      }\n    }\n  }\n}\n\nexport default Subscription\n\nfunction encodeQueryParams(obj: Record<string, unknown>): string {\n  const params = new URLSearchParams()\n  Object.entries(obj).forEach(([key, value]) => {\n    const encoded = encodeQueryParam(value)\n    if (Array.isArray(encoded)) {\n      encoded.forEach((enc) => params.append(key, enc))\n    } else {\n      params.set(key, encoded)\n    }\n  })\n  return params.toString()\n}\n\n// Adapted from xrpc, but without any lex-specific knowledge\nfunction encodeQueryParam(value: unknown): string | string[] {\n  if (typeof value === 'string') {\n    return value\n  }\n  if (typeof value === 'number') {\n    return value.toString()\n  }\n  if (typeof value === 'boolean') {\n    return value ? 'true' : 'false'\n  }\n  if (typeof value === 'undefined') {\n    return ''\n  }\n  if (typeof value === 'object') {\n    if (value instanceof Date) {\n      return value.toISOString()\n    } else if (Array.isArray(value)) {\n      return value.flatMap(encodeQueryParam)\n    } else if (!value) {\n      return ''\n    }\n  }\n  throw new Error(`Cannot encode ${typeof value}s into query params`)\n}\n"]}

package/dist/stream/types.js

@@ -1,22 +1,19 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.frameHeader = exports.errorFrameBody = exports.errorFrameHeader = exports.messageFrameHeader = exports.FrameType = void 0;
-const lex_schema_1 = require("@atproto/lex-schema");
-var FrameType;
+import { l } from '@atproto/lex-schema';
+export var FrameType;
 (function (FrameType) {
     FrameType[FrameType["Message"] = 1] = "Message";
     FrameType[FrameType["Error"] = -1] = "Error";
-})(FrameType || (exports.FrameType = FrameType = {}));
-exports.messageFrameHeader = lex_schema_1.l.object({
-    op: lex_schema_1.l.literal(FrameType.Message), // Frame op
-    t: lex_schema_1.l.optional(lex_schema_1.l.string()), // Message body type discriminator
+})(FrameType || (FrameType = {}));
+export const messageFrameHeader = l.object({
+    op: l.literal(FrameType.Message), // Frame op
+    t: l.optional(l.string()), // Message body type discriminator
 });
-exports.errorFrameHeader = lex_schema_1.l.object({
-    op: lex_schema_1.l.literal(FrameType.Error),
+export const errorFrameHeader = l.object({
+    op: l.literal(FrameType.Error),
 });
-exports.errorFrameBody = lex_schema_1.l.object({
-    error: lex_schema_1.l.string(), // Error code
-    message: lex_schema_1.l.optional(lex_schema_1.l.string()), // Error message
+export const errorFrameBody = l.object({
+    error: l.string(), // Error code
+    message: l.optional(l.string()), // Error message
 });
-exports.frameHeader = lex_schema_1.l.union([exports.messageFrameHeader, exports.errorFrameHeader]);
+export const frameHeader = l.union([messageFrameHeader, errorFrameHeader]);
 //# sourceMappingURL=types.js.map

package/dist/stream/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/stream/types.ts"],"names":[],"mappings":";;;AAAA,oDAAuC;AAEvC,IAAY,SAGX;AAHD,WAAY,SAAS;IACnB,+CAAW,CAAA;IACX,4CAAU,CAAA;AACZ,CAAC,EAHW,SAAS,yBAAT,SAAS,QAGpB;AAEY,QAAA,kBAAkB,GAAG,cAAC,CAAC,MAAM,CAAC;IACzC,EAAE,EAAE,cAAC,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,WAAW;IAC7C,CAAC,EAAE,cAAC,CAAC,QAAQ,CAAC,cAAC,CAAC,MAAM,EAAE,CAAC,EAAE,kCAAkC;CAC9D,CAAC,CAAA;AAGW,QAAA,gBAAgB,GAAG,cAAC,CAAC,MAAM,CAAC;IACvC,EAAE,EAAE,cAAC,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC;CAC/B,CAAC,CAAA;AACW,QAAA,cAAc,GAAG,cAAC,CAAC,MAAM,CAAC;IACrC,KAAK,EAAE,cAAC,CAAC,MAAM,EAAE,EAAE,aAAa;IAChC,OAAO,EAAE,cAAC,CAAC,QAAQ,CAAC,cAAC,CAAC,MAAM,EAAE,CAAC,EAAE,gBAAgB;CAClD,CAAC,CAAA;AAMW,QAAA,WAAW,GAAG,cAAC,CAAC,KAAK,CAAC,CAAC,0BAAkB,EAAE,wBAAgB,CAAC,CAAC,CAAA","sourcesContent":["import { l } from '@atproto/lex-schema'\n\nexport enum FrameType {\n  Message = 1,\n  Error = -1,\n}\n\nexport const messageFrameHeader = l.object({\n  op: l.literal(FrameType.Message), // Frame op\n  t: l.optional(l.string()), // Message body type discriminator\n})\nexport type MessageFrameHeader = l.Infer<typeof messageFrameHeader>\n\nexport const errorFrameHeader = l.object({\n  op: l.literal(FrameType.Error),\n})\nexport const errorFrameBody = l.object({\n  error: l.string(), // Error code\n  message: l.optional(l.string()), // Error message\n})\nexport type ErrorFrameHeader = l.Infer<typeof errorFrameHeader>\nexport type ErrorFrameBody<T extends string = string> = { error: T } & l.Infer<\n  typeof errorFrameBody\n>\n\nexport const frameHeader = l.union([messageFrameHeader, errorFrameHeader])\nexport type FrameHeader = l.Infer<typeof frameHeader>\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/stream/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,qBAAqB,CAAA;AAEvC,MAAM,CAAN,IAAY,SAGX;AAHD,WAAY,SAAS;IACnB,+CAAW,CAAA;IACX,4CAAU,CAAA;AACZ,CAAC,EAHW,SAAS,KAAT,SAAS,QAGpB;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC;IACzC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,WAAW;IAC7C,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,kCAAkC;CAC9D,CAAC,CAAA;AAGF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC;IACvC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC;CAC/B,CAAC,CAAA;AACF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC;IACrC,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,aAAa;IAChC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,gBAAgB;CAClD,CAAC,CAAA;AAMF,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,kBAAkB,EAAE,gBAAgB,CAAC,CAAC,CAAA","sourcesContent":["import { l } from '@atproto/lex-schema'\n\nexport enum FrameType {\n  Message = 1,\n  Error = -1,\n}\n\nexport const messageFrameHeader = l.object({\n  op: l.literal(FrameType.Message), // Frame op\n  t: l.optional(l.string()), // Message body type discriminator\n})\nexport type MessageFrameHeader = l.Infer<typeof messageFrameHeader>\n\nexport const errorFrameHeader = l.object({\n  op: l.literal(FrameType.Error),\n})\nexport const errorFrameBody = l.object({\n  error: l.string(), // Error code\n  message: l.optional(l.string()), // Error message\n})\nexport type ErrorFrameHeader = l.Infer<typeof errorFrameHeader>\nexport type ErrorFrameBody<T extends string = string> = { error: T } & l.Infer<\n  typeof errorFrameBody\n>\n\nexport const frameHeader = l.union([messageFrameHeader, errorFrameHeader])\nexport type FrameHeader = l.Infer<typeof frameHeader>\n"]}

package/dist/types.d.ts

@@ -2,8 +2,8 @@ import { IncomingMessage } from 'node:http';
 import { Readable } from 'node:stream';
 import { NextFunction, Request, Response } from 'express';
 import { l } from '@atproto/lex-schema';
-import { ErrorResult, XRPCError } from './errors';
-import { CalcKeyFn, CalcPointsFn, RateLimiterI } from './rate-limiter';
+import { ErrorResult, XRPCError } from './errors.js';
+import { CalcKeyFn, CalcPointsFn, RateLimiterI } from './rate-limiter.js';
 export type Awaitable<T> = T | Promise<T>;
 export type CatchallHandler = (req: Request, res: Response, next: NextFunction) => unknown;
 export type Options = {