@atproto/xrpc-server 0.9.5 → 0.10.0

package/src/stream/types.ts

@@ -25,19 +25,3 @@ export type ErrorFrameBody<T extends string = string> = { error: T } & z.infer<
 
 export const frameHeader = z.union([messageFrameHeader, errorFrameHeader])
 export type FrameHeader = z.infer<typeof frameHeader>
-
-export class DisconnectError extends Error {
-  constructor(
-    public wsCode: CloseCode = CloseCode.Policy,
-    public xrpcCode?: string,
-  ) {
-    super()
-  }
-}
-
-// https://www.rfc-editor.org/rfc/rfc6455#section-7.4.1
-export enum CloseCode {
-  Normal = 1000,
-  Abnormal = 1006,
-  Policy = 1008,
-}

package/tests/auth.test.ts

@@ -3,7 +3,6 @@ import * as http from 'node:http'
 import { AddressInfo } from 'node:net'
 import * as jose from 'jose'
 import KeyEncoder from 'key-encoder'
-import * as ui8 from 'uint8arrays'
 import { MINUTE } from '@atproto/common'
 import { Secp256k1Keypair } from '@atproto/crypto'
 import { LexiconDoc } from '@atproto/lexicon'
@@ -322,6 +321,10 @@ const createPrivateKeyObject = async (
 ): Promise<KeyObject> => {
   const raw = await privateKey.export()
   const encoder = new KeyEncoder('secp256k1')
-  const key = encoder.encodePrivate(ui8.toString(raw, 'hex'), 'raw', 'pem')
+  const key = encoder.encodePrivate(
+    Buffer.from(raw).toString('hex'),
+    'raw',
+    'pem',
+  )
   return createPrivateKey({ format: 'pem', key })
 }

package/tests/bodies.test.ts

@@ -1,3 +1,5 @@
+/* eslint-disable import/no-deprecated */
+
 import assert from 'node:assert'
 import * as http from 'node:http'
 import { AddressInfo } from 'node:net'

package/tests/frames.test.ts

@@ -1,5 +1,5 @@
-import * as cborx from 'cbor-x'
-import * as uint8arrays from 'uint8arrays'
+import { encode } from '@atproto/lex-cbor'
+import { ui8Equals } from '@atproto/lex-data'
 import { ErrorFrame, Frame, FrameType, MessageFrame } from '../src'
 
 describe('Frames', () => {
@@ -19,7 +19,7 @@ describe('Frames', () => {
 
     const bytes = messageFrame.toBytes()
     expect(
-      uint8arrays.equals(
+      ui8Equals(
         bytes,
         new Uint8Array([
           /*header*/ 162, 97, 116, 98, 35, 100, 98, 111, 112, 1, /*body*/ 162,
@@ -56,7 +56,7 @@ describe('Frames', () => {
 
     const bytes = errorFrame.toBytes()
     expect(
-      uint8arrays.equals(
+      ui8Equals(
         bytes,
         new Uint8Array([
           /*header*/ 161, 98, 111, 112, 32, /*body*/ 162, 101, 101, 114, 114,
@@ -81,17 +81,15 @@ describe('Frames', () => {
 
   it('parsing fails when frame is not CBOR.', async () => {
     const bytes = Buffer.from('some utf8 bytes')
-    const emptyBytes = Buffer.from('')
-    expect(() => Frame.fromBytes(bytes)).toThrow('Unexpected end of CBOR data')
-    expect(() => Frame.fromBytes(emptyBytes)).toThrow(
-      'Unexpected end of CBOR data',
-    )
+    const emptyBytes = Buffer.alloc(0)
+    expect(() => Frame.fromBytes(bytes)).toThrow()
+    expect(() => Frame.fromBytes(emptyBytes)).toThrow()
   })
 
   it('parsing fails when frame header is malformed.', async () => {
-    const bytes = uint8arrays.concat([
-      cborx.encode({ op: -2 }), // Unknown op
-      cborx.encode({ a: 'b', c: [1, 2, 3] }),
+    const bytes = Buffer.concat([
+      encode({ op: -2 }), // Unknown op
+      encode({ a: 'b', c: [1, 2, 3] }),
     ])
 
     expect(() => Frame.fromBytes(bytes)).toThrow('Invalid frame header:')
@@ -103,7 +101,7 @@ describe('Frames', () => {
       { type: '#d' },
     )
 
-    const headerBytes = cborx.encode(messageFrame.header)
+    const headerBytes = encode(messageFrame.header)
 
     expect(() => Frame.fromBytes(headerBytes)).toThrow('Missing frame body')
   })
@@ -114,9 +112,9 @@ describe('Frames', () => {
       { type: '#d' },
     )
 
-    const bytes = uint8arrays.concat([
+    const bytes = Buffer.concat([
       messageFrame.toBytes(),
-      cborx.encode({ d: 'e', f: [4, 5, 6] }),
+      encode({ d: 'e', f: [4, 5, 6] }),
     ])
 
     expect(() => Frame.fromBytes(bytes)).toThrow(
@@ -127,9 +125,9 @@ describe('Frames', () => {
   it('parsing fails when error frame has invalid body.', async () => {
     const errorFrame = new ErrorFrame({ error: 'BadOops' })
 
-    const bytes = uint8arrays.concat([
-      cborx.encode(errorFrame.header),
-      cborx.encode({ blah: 1 }),
+    const bytes = Buffer.concat([
+      encode(errorFrame.header),
+      encode({ blah: 1 }),
     ])
 
     expect(() => Frame.fromBytes(bytes)).toThrow('Invalid error frame body:')

package/tests/subscriptions.test.ts

@@ -1,7 +1,6 @@
 import * as http from 'node:http'
 import { AddressInfo } from 'node:net'
-import getPort from 'get-port'
-import { WebSocket, WebSocketServer, createWebSocketStream } from 'ws'
+import { WebSocket, createWebSocketStream } from 'ws'
 import { wait } from '@atproto/common'
 import { LexiconDoc } from '@atproto/lexicon'
 import { ErrorFrame, Frame, MessageFrame, Subscription, byFrame } from '../src'
@@ -347,59 +346,4 @@ describe('Subscriptions', () => {
       ])
     })
   })
-
-  it('uses a heartbeat to reconnect if a connection is dropped', async () => {
-    // we run a server that, on first connection, pauses for longer than the heartbeat interval (doesn't return "pong"s)
-    // on second connection, it returns a message frame and then closes
-    const port = await getPort()
-    const server = new WebSocketServer({ port })
-    let firstConnection = true
-    let firstWasClosed = false
-    server.on('connection', async (socket) => {
-      if (firstConnection === true) {
-        firstConnection = false
-        socket.pause()
-        await wait(600)
-        // shouldn't send this message because the socket would be closed
-        const frame = new ErrorFrame({
-          error: 'AuthenticationRequired',
-          message: 'Authentication Required',
-        })
-        socket.send(frame.toBytes(), { binary: true }, (err) => {
-          if (err) throw err
-          socket.close(xrpcServer.CloseCode.Normal)
-        })
-        socket.on('close', () => {
-          firstWasClosed = true
-        })
-      } else {
-        const frame = new MessageFrame({ count: 1 })
-        socket.send(frame.toBytes(), { binary: true }, (err) => {
-          if (err) throw err
-          socket.close(xrpcServer.CloseCode.Normal)
-        })
-      }
-    })
-
-    const subscription = new Subscription({
-      service: `ws://localhost:${port}`,
-      method: '',
-      heartbeatIntervalMs: 500,
-      validate: (obj) => {
-        return lex.assertValidXrpcMessage<{ count: number }>(
-          'io.example.streamOne',
-          obj,
-        )
-      },
-    })
-
-    const messages: { count: number }[] = []
-    for await (const msg of subscription) {
-      messages.push(msg)
-    }
-
-    expect(messages).toEqual([{ count: 1 }])
-    expect(firstWasClosed).toBe(true)
-    server.close()
-  })
 })

package/tsconfig.build.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/auth.ts","./src/errors.ts","./src/index.ts","./src/logger.ts","./src/rate-limiter.ts","./src/server.ts","./src/types.ts","./src/util.ts","./src/stream/frames.ts","./src/stream/index.ts","./src/stream/logger.ts","./src/stream/server.ts","./src/stream/stream.ts","./src/stream/subscription.ts","./src/stream/types.ts","./src/stream/websocket-keepalive.ts"],"version":"5.8.2"}
+{"root":["./src/auth.ts","./src/errors.ts","./src/index.ts","./src/logger.ts","./src/rate-limiter.ts","./src/server.ts","./src/types.ts","./src/util.ts","./src/stream/frames.ts","./src/stream/index.ts","./src/stream/logger.ts","./src/stream/server.ts","./src/stream/stream.ts","./src/stream/subscription.ts","./src/stream/types.ts"],"version":"5.8.2"}

package/dist/stream/websocket-keepalive.d.ts

@@ -1,24 +0,0 @@
-import { ClientOptions, WebSocket } from 'ws';
-export declare class WebSocketKeepAlive {
-    opts: ClientOptions & {
-        getUrl: () => Promise<string>;
-        maxReconnectSeconds?: number;
-        signal?: AbortSignal;
-        heartbeatIntervalMs?: number;
-        onReconnectError?: (error: unknown, n: number, initialSetup: boolean) => void;
-    };
-    ws: WebSocket | null;
-    initialSetup: boolean;
-    reconnects: number | null;
-    constructor(opts: ClientOptions & {
-        getUrl: () => Promise<string>;
-        maxReconnectSeconds?: number;
-        signal?: AbortSignal;
-        heartbeatIntervalMs?: number;
-        onReconnectError?: (error: unknown, n: number, initialSetup: boolean) => void;
-    });
-    [Symbol.asyncIterator](): AsyncGenerator<Uint8Array>;
-    startHeartbeat(ws: WebSocket): void;
-}
-export default WebSocketKeepAlive;
-//# sourceMappingURL=websocket-keepalive.d.ts.map

package/dist/stream/websocket-keepalive.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"websocket-keepalive.d.ts","sourceRoot":"","sources":["../../src/stream/websocket-keepalive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,IAAI,CAAA;AAK7C,qBAAa,kBAAkB;IAMpB,IAAI,EAAE,aAAa,GAAG;QAC3B,MAAM,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAA;QAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAA;QAC5B,MAAM,CAAC,EAAE,WAAW,CAAA;QACpB,mBAAmB,CAAC,EAAE,MAAM,CAAA;QAC5B,gBAAgB,CAAC,EAAE,CACjB,KAAK,EAAE,OAAO,EACd,CAAC,EAAE,MAAM,EACT,YAAY,EAAE,OAAO,KAClB,IAAI,CAAA;KACV;IAfI,EAAE,EAAE,SAAS,GAAG,IAAI,CAAO;IAC3B,YAAY,UAAO;IACnB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAO;gBAG9B,IAAI,EAAE,aAAa,GAAG;QAC3B,MAAM,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAA;QAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAA;QAC5B,MAAM,CAAC,EAAE,WAAW,CAAA;QACpB,mBAAmB,CAAC,EAAE,MAAM,CAAA;QAC5B,gBAAgB,CAAC,EAAE,CACjB,KAAK,EAAE,OAAO,EACd,CAAC,EAAE,MAAM,EACT,YAAY,EAAE,OAAO,KAClB,IAAI,CAAA;KACV;IAGI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,cAAc,CAAC,UAAU,CAAC;IAwD3D,cAAc,CAAC,EAAE,EAAE,SAAS;CA4B7B;AAED,eAAe,kBAAkB,CAAA"}

package/dist/stream/websocket-keepalive.js

@@ -1,160 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebSocketKeepAlive = void 0;
-const ws_1 = require("ws");
-const common_1 = require("@atproto/common");
-const stream_1 = require("./stream");
-const types_1 = require("./types");
-class WebSocketKeepAlive {
-    constructor(opts) {
-        Object.defineProperty(this, "opts", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: opts
-        });
-        Object.defineProperty(this, "ws", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: null
-        });
-        Object.defineProperty(this, "initialSetup", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: true
-        });
-        Object.defineProperty(this, "reconnects", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: null
-        });
-    }
-    async *[Symbol.asyncIterator]() {
-        const maxReconnectMs = 1000 * (this.opts.maxReconnectSeconds ?? 64);
-        while (true) {
-            if (this.reconnects !== null) {
-                const duration = this.initialSetup
-                    ? Math.min(1000, maxReconnectMs)
-                    : backoffMs(this.reconnects++, maxReconnectMs);
-                await (0, common_1.wait)(duration);
-            }
-            const url = await this.opts.getUrl();
-            this.ws = new ws_1.WebSocket(url, this.opts);
-            const ac = new AbortController();
-            if (this.opts.signal) {
-                forwardSignal(this.opts.signal, ac);
-            }
-            this.ws.once('open', () => {
-                this.initialSetup = false;
-                this.reconnects = 0;
-                if (this.ws) {
-                    this.startHeartbeat(this.ws);
-                }
-            });
-            this.ws.once('close', (code, reason) => {
-                if (code === types_1.CloseCode.Abnormal) {
-                    // Forward into an error to distinguish from a clean close
-                    ac.abort(new AbnormalCloseError(`Abnormal ws close: ${reason.toString()}`));
-                }
-            });
-            try {
-                const wsStream = (0, stream_1.streamByteChunks)(this.ws, { signal: ac.signal });
-                for await (const chunk of wsStream) {
-                    yield chunk;
-                }
-            }
-            catch (_err) {
-                const err = _err?.['code'] === 'ABORT_ERR' ? _err['cause'] : _err;
-                if (err instanceof types_1.DisconnectError) {
-                    // We cleanly end the connection
-                    this.ws?.close(err.wsCode);
-                    break;
-                }
-                this.ws?.close(); // No-ops if already closed or closing
-                if (isReconnectable(err)) {
-                    this.reconnects ?? (this.reconnects = 0); // Never reconnect with a null
-                    this.opts.onReconnectError?.(err, this.reconnects, this.initialSetup);
-                    continue;
-                }
-                else {
-                    throw err;
-                }
-            }
-            break; // Other side cleanly ended stream and disconnected
-        }
-    }
-    startHeartbeat(ws) {
-        let isAlive = true;
-        let heartbeatInterval = null;
-        const checkAlive = () => {
-            if (!isAlive) {
-                return ws.terminate();
-            }
-            isAlive = false; // expect websocket to no longer be alive unless we receive a "pong" within the interval
-            ws.ping();
-        };
-        checkAlive();
-        heartbeatInterval = setInterval(checkAlive, this.opts.heartbeatIntervalMs ?? 10 * common_1.SECOND);
-        ws.on('pong', () => {
-            isAlive = true;
-        });
-        ws.once('close', () => {
-            if (heartbeatInterval) {
-                clearInterval(heartbeatInterval);
-                heartbeatInterval = null;
-            }
-        });
-    }
-}
-exports.WebSocketKeepAlive = WebSocketKeepAlive;
-exports.default = WebSocketKeepAlive;
-class AbnormalCloseError extends Error {
-    constructor() {
-        super(...arguments);
-        Object.defineProperty(this, "code", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: 'EWSABNORMALCLOSE'
-        });
-    }
-}
-function isReconnectable(err) {
-    // Network errors are reconnectable.
-    // AuthenticationRequired and InvalidRequest XRPCErrors are not reconnectable.
-    // @TODO method-specific XRPCErrors may be reconnectable, need to consider. Receiving
-    // an invalid message is not current reconnectable, but the user can decide to skip them.
-    if (!err || typeof err['code'] !== 'string')
-        return false;
-    return networkErrorCodes.includes(err['code']);
-}
-const networkErrorCodes = [
-    'EWSABNORMALCLOSE',
-    'ECONNRESET',
-    'ECONNREFUSED',
-    'ECONNABORTED',
-    'EPIPE',
-    'ETIMEDOUT',
-    'ECANCELED',
-];
-function backoffMs(n, maxMs) {
-    const baseSec = Math.pow(2, n); // 1, 2, 4, ...
-    const randSec = Math.random() - 0.5; // Random jitter between -.5 and .5 seconds
-    const ms = 1000 * (baseSec + randSec);
-    return Math.min(ms, maxMs);
-}
-function forwardSignal(signal, ac) {
-    if (signal.aborted) {
-        return ac.abort(signal.reason);
-    }
-    else {
-        signal.addEventListener('abort', () => ac.abort(signal.reason), {
-            // @ts-ignore https://github.com/DefinitelyTyped/DefinitelyTyped/pull/68625
-            signal: ac.signal,
-        });
-    }
-}
-//# sourceMappingURL=websocket-keepalive.js.map

package/dist/stream/websocket-keepalive.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"websocket-keepalive.js","sourceRoot":"","sources":["../../src/stream/websocket-keepalive.ts"],"names":[],"mappings":";;;AAAA,2BAA6C;AAC7C,4CAA8C;AAC9C,qCAA2C;AAC3C,mCAAoD;AAEpD,MAAa,kBAAkB;IAK7B,YACS,IAUN;QAVD;;;;mBAAO,IAAI;WAUV;QAfI;;;;mBAAuB,IAAI;WAAA;QAC3B;;;;mBAAe,IAAI;WAAA;QACnB;;;;mBAA4B,IAAI;WAAA;IAcpC,CAAC;IAEJ,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC;QAC3B,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,IAAI,EAAE,CAAC,CAAA;QACnE,OAAO,IAAI,EAAE,CAAC;YACZ,IAAI,IAAI,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;gBAC7B,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY;oBAChC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,cAAc,CAAC;oBAChC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,cAAc,CAAC,CAAA;gBAChD,MAAM,IAAA,aAAI,EAAC,QAAQ,CAAC,CAAA;YACtB,CAAC;YACD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAA;YACpC,IAAI,CAAC,EAAE,GAAG,IAAI,cAAS,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;YACvC,MAAM,EAAE,GAAG,IAAI,eAAe,EAAE,CAAA;YAChC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACrB,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;YACrC,CAAC;YACD,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE;gBACxB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAA;gBACzB,IAAI,CAAC,UAAU,GAAG,CAAC,CAAA;gBACnB,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;oBACZ,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;gBAC9B,CAAC;YACH,CAAC,CAAC,CAAA;YACF,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;gBACrC,IAAI,IAAI,KAAK,iBAAS,CAAC,QAAQ,EAAE,CAAC;oBAChC,0DAA0D;oBAC1D,EAAE,CAAC,KAAK,CACN,IAAI,kBAAkB,CAAC,sBAAsB,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,CAClE,CAAA;gBACH,CAAC;YACH,CAAC,CAAC,CAAA;YAEF,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,IAAA,yBAAgB,EAAC,IAAI,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,CAAA;gBACjE,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;oBACnC,MAAM,KAAK,CAAA;gBACb,CAAC;YACH,CAAC;YAAC,OAAO,IAAI,EAAE,CAAC;gBACd,MAAM,GAAG,GAAG,IAAI,EAAE,CAAC,MAAM,CAAC,KAAK,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;gBACjE,IAAI,GAAG,YAAY,uBAAe,EAAE,CAAC;oBACnC,gCAAgC;oBAChC,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;oBAC1B,MAAK;gBACP,CAAC;gBACD,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,CAAA,CAAC,sCAAsC;gBACvD,IAAI,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC;oBACzB,IAAI,CAAC,UAAU,KAAf,IAAI,CAAC,UAAU,GAAK,CAAC,EAAA,CAAC,8BAA8B;oBACpD,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,YAAY,CAAC,CAAA;oBACrE,SAAQ;gBACV,CAAC;qBAAM,CAAC;oBACN,MAAM,GAAG,CAAA;gBACX,CAAC;YACH,CAAC;YACD,MAAK,CAAC,mDAAmD;QAC3D,CAAC;IACH,CAAC;IAED,cAAc,CAAC,EAAa;QAC1B,IAAI,OAAO,GAAG,IAAI,CAAA;QAClB,IAAI,iBAAiB,GAA0B,IAAI,CAAA;QAEnD,MAAM,UAAU,GAAG,GAAG,EAAE;YACtB,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,OAAO,EAAE,CAAC,SAAS,EAAE,CAAA;YACvB,CAAC;YACD,OAAO,GAAG,KAAK,CAAA,CAAC,wFAAwF;YACxG,EAAE,CAAC,IAAI,EAAE,CAAA;QACX,CAAC,CAAA;QAED,UAAU,EAAE,CAAA;QACZ,iBAAiB,GAAG,WAAW,CAC7B,UAAU,EACV,IAAI,CAAC,IAAI,CAAC,mBAAmB,IAAI,EAAE,GAAG,eAAM,CAC7C,CAAA;QAED,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;YACjB,OAAO,GAAG,IAAI,CAAA;QAChB,CAAC,CAAC,CAAA;QACF,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;YACpB,IAAI,iBAAiB,EAAE,CAAC;gBACtB,aAAa,CAAC,iBAAiB,CAAC,CAAA;gBAChC,iBAAiB,GAAG,IAAI,CAAA;YAC1B,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;CACF;AAvGD,gDAuGC;AAED,kBAAe,kBAAkB,CAAA;AAEjC,MAAM,kBAAmB,SAAQ,KAAK;IAAtC;;QACE;;;;mBAAO,kBAAkB;WAAA;IAC3B,CAAC;CAAA;AAED,SAAS,eAAe,CAAC,GAAY;IACnC,oCAAoC;IACpC,8EAA8E;IAC9E,qFAAqF;IACrF,yFAAyF;IACzF,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,CAAC,MAAM,CAAC,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAA;IACzD,OAAO,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;AAChD,CAAC;AAED,MAAM,iBAAiB,GAAG;IACxB,kBAAkB;IAClB,YAAY;IACZ,cAAc;IACd,cAAc;IACd,OAAO;IACP,WAAW;IACX,WAAW;CACZ,CAAA;AAED,SAAS,SAAS,CAAC,CAAS,EAAE,KAAa;IACzC,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA,CAAC,eAAe;IAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAA,CAAC,2CAA2C;IAC/E,MAAM,EAAE,GAAG,IAAI,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC,CAAA;IACrC,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;AAC5B,CAAC;AAED,SAAS,aAAa,CAAC,MAAmB,EAAE,EAAmB;IAC7D,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,OAAO,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IAChC,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;YAC9D,2EAA2E;YAC3E,MAAM,EAAE,EAAE,CAAC,MAAM;SAClB,CAAC,CAAA;IACJ,CAAC;AACH,CAAC"}

package/src/stream/websocket-keepalive.ts

@@ -1,152 +0,0 @@
-import { ClientOptions, WebSocket } from 'ws'
-import { SECOND, wait } from '@atproto/common'
-import { streamByteChunks } from './stream'
-import { CloseCode, DisconnectError } from './types'
-
-export class WebSocketKeepAlive {
-  public ws: WebSocket | null = null
-  public initialSetup = true
-  public reconnects: number | null = null
-
-  constructor(
-    public opts: ClientOptions & {
-      getUrl: () => Promise<string>
-      maxReconnectSeconds?: number
-      signal?: AbortSignal
-      heartbeatIntervalMs?: number
-      onReconnectError?: (
-        error: unknown,
-        n: number,
-        initialSetup: boolean,
-      ) => void
-    },
-  ) {}
-
-  async *[Symbol.asyncIterator](): AsyncGenerator<Uint8Array> {
-    const maxReconnectMs = 1000 * (this.opts.maxReconnectSeconds ?? 64)
-    while (true) {
-      if (this.reconnects !== null) {
-        const duration = this.initialSetup
-          ? Math.min(1000, maxReconnectMs)
-          : backoffMs(this.reconnects++, maxReconnectMs)
-        await wait(duration)
-      }
-      const url = await this.opts.getUrl()
-      this.ws = new WebSocket(url, this.opts)
-      const ac = new AbortController()
-      if (this.opts.signal) {
-        forwardSignal(this.opts.signal, ac)
-      }
-      this.ws.once('open', () => {
-        this.initialSetup = false
-        this.reconnects = 0
-        if (this.ws) {
-          this.startHeartbeat(this.ws)
-        }
-      })
-      this.ws.once('close', (code, reason) => {
-        if (code === CloseCode.Abnormal) {
-          // Forward into an error to distinguish from a clean close
-          ac.abort(
-            new AbnormalCloseError(`Abnormal ws close: ${reason.toString()}`),
-          )
-        }
-      })
-
-      try {
-        const wsStream = streamByteChunks(this.ws, { signal: ac.signal })
-        for await (const chunk of wsStream) {
-          yield chunk
-        }
-      } catch (_err) {
-        const err = _err?.['code'] === 'ABORT_ERR' ? _err['cause'] : _err
-        if (err instanceof DisconnectError) {
-          // We cleanly end the connection
-          this.ws?.close(err.wsCode)
-          break
-        }
-        this.ws?.close() // No-ops if already closed or closing
-        if (isReconnectable(err)) {
-          this.reconnects ??= 0 // Never reconnect with a null
-          this.opts.onReconnectError?.(err, this.reconnects, this.initialSetup)
-          continue
-        } else {
-          throw err
-        }
-      }
-      break // Other side cleanly ended stream and disconnected
-    }
-  }
-
-  startHeartbeat(ws: WebSocket) {
-    let isAlive = true
-    let heartbeatInterval: NodeJS.Timeout | null = null
-
-    const checkAlive = () => {
-      if (!isAlive) {
-        return ws.terminate()
-      }
-      isAlive = false // expect websocket to no longer be alive unless we receive a "pong" within the interval
-      ws.ping()
-    }
-
-    checkAlive()
-    heartbeatInterval = setInterval(
-      checkAlive,
-      this.opts.heartbeatIntervalMs ?? 10 * SECOND,
-    )
-
-    ws.on('pong', () => {
-      isAlive = true
-    })
-    ws.once('close', () => {
-      if (heartbeatInterval) {
-        clearInterval(heartbeatInterval)
-        heartbeatInterval = null
-      }
-    })
-  }
-}
-
-export default WebSocketKeepAlive
-
-class AbnormalCloseError extends Error {
-  code = 'EWSABNORMALCLOSE'
-}
-
-function isReconnectable(err: unknown): boolean {
-  // Network errors are reconnectable.
-  // AuthenticationRequired and InvalidRequest XRPCErrors are not reconnectable.
-  // @TODO method-specific XRPCErrors may be reconnectable, need to consider. Receiving
-  // an invalid message is not current reconnectable, but the user can decide to skip them.
-  if (!err || typeof err['code'] !== 'string') return false
-  return networkErrorCodes.includes(err['code'])
-}
-
-const networkErrorCodes = [
-  'EWSABNORMALCLOSE',
-  'ECONNRESET',
-  'ECONNREFUSED',
-  'ECONNABORTED',
-  'EPIPE',
-  'ETIMEDOUT',
-  'ECANCELED',
-]
-
-function backoffMs(n: number, maxMs: number) {
-  const baseSec = Math.pow(2, n) // 1, 2, 4, ...
-  const randSec = Math.random() - 0.5 // Random jitter between -.5 and .5 seconds
-  const ms = 1000 * (baseSec + randSec)
-  return Math.min(ms, maxMs)
-}
-
-function forwardSignal(signal: AbortSignal, ac: AbortController) {
-  if (signal.aborted) {
-    return ac.abort(signal.reason)
-  } else {
-    signal.addEventListener('abort', () => ac.abort(signal.reason), {
-      // @ts-ignore https://github.com/DefinitelyTyped/DefinitelyTyped/pull/68625
-      signal: ac.signal,
-    })
-  }
-}