@rocicorp/zero 0.25.0 → 0.26.0-canary.0

package/out/zero-cache/src/types/websocket-handoff.d.ts

@@ -1,9 +1,10 @@
 import type { LogContext } from '@rocicorp/logger';
 import { Server } from 'node:http';
-import { Socket } from 'node:net';
-import { WebSocketServer, type WebSocket, type ServerOptions } from 'ws';
+import type { Socket } from 'node:net';
+import { WebSocketServer, type ServerOptions, type WebSocket } from 'ws';
 import { type IncomingMessageSubset } from './http.ts';
-import { MESSAGE_TYPES, type Receiver, type Sender, type Worker } from './processes.ts';
+import type { MESSAGE_TYPES } from './processes.ts';
+import { type Receiver, type Sender, type Worker } from './processes.ts';
 export type HandoffSpec<P> = {
     payload: P;
     sender: Sender;
@@ -18,7 +19,7 @@ export type HandoffSpec<P> = {
  */
 export type WebSocketHandoff<P> = (message: IncomingMessageSubset, callback: (h: HandoffSpec<P>) => void, onerror: (reason: unknown) => void) => HandoffSpec<P> | void;
 export type WebSocketReceiver<P> = (ws: WebSocket, payload: P, msg: IncomingMessageSubset) => void;
-export type WebSocketHandoffHandler = (message: IncomingMessageSubset, socket: Socket, head: Buffer) => void;
+export type WebSocketHandoffHandler = (message: IncomingMessageSubset, socket: Socket, head: ArrayBuffer) => void;
 /**
  * Installs websocket handoff logic from either an http.Server
  * receiving requests, or a parent Worker process

package/out/zero-cache/src/types/websocket-handoff.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"websocket-handoff.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/types/websocket-handoff.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAkB,MAAM,EAAC,MAAM,WAAW,CAAC;AAClD,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAChC,OAAO,EAAC,eAAe,EAAE,KAAK,SAAS,EAAE,KAAK,aAAa,EAAC,MAAM,IAAI,CAAC;AAEvE,OAAO,EAAqB,KAAK,qBAAqB,EAAC,MAAM,WAAW,CAAC;AACzE,OAAO,EACL,aAAa,EACb,KAAK,QAAQ,EACb,KAAK,MAAM,EACX,KAAK,MAAM,EACZ,MAAM,gBAAgB,CAAC;AAGxB,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IAC3B,OAAO,EAAE,CAAC,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI,CAChC,OAAO,EAAE,qBAAqB,EAC9B,QAAQ,EAAE,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,KAAK,IAAI,EACrC,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,KAC/B,WAAW,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;AAE3B,MAAM,MAAM,iBAAiB,CAAC,CAAC,IAAI,CACjC,EAAE,EAAE,SAAS,EACb,OAAO,EAAE,CAAC,EACV,GAAG,EAAE,qBAAqB,KACvB,IAAI,CAAC;AAEV,MAAM,MAAM,uBAAuB,GAAG,CACpC,OAAO,EAAE,qBAAqB,EAC9B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,KACT,IAAI,CAAC;AAEV;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,CAAC,EAC7C,EAAE,EAAE,UAAU,EACd,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAC5B,aAAa,CAAC,EAAE,aAAa,GAC5B,uBAAuB,CA6CzB;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,CAAC,EACvC,EAAE,EAAE,UAAU,EACd,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAC5B,MAAM,EAAE,MAAM,GAAG,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,QAc9B;AAED,wBAAgB,wBAAwB,CAAC,CAAC,EACxC,EAAE,EAAE,UAAU,EACd,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,iBAAiB,CAAC,CAAC,CAAC,EAC7B,QAAQ,EAAE,QAAQ,QAoBnB;AAED,MAAM,MAAM,OAAO,CAAC,CAAC,IAAI;IACvB,OAAO,aAAa,CAAC,OAAO;IAC5B;QACE,OAAO,EAAE,qBAAqB,CAAC;QAC/B,IAAI,EAAE,WAAW,CAAC;QAClB,OAAO,EAAE,CAAC,CAAC;KACZ;CACF,CAAC"}
+{"version":3,"file":"websocket-handoff.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/types/websocket-handoff.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAC,MAAM,EAAC,MAAM,WAAW,CAAC;AACjC,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AACrC,OAAO,EAAC,eAAe,EAAE,KAAK,aAAa,EAAE,KAAK,SAAS,EAAC,MAAM,IAAI,CAAC;AAEvE,OAAO,EAAqB,KAAK,qBAAqB,EAAC,MAAM,WAAW,CAAC;AACzE,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAC,KAAK,QAAQ,EAAE,KAAK,MAAM,EAAE,KAAK,MAAM,EAAC,MAAM,gBAAgB,CAAC;AAGvE,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IAC3B,OAAO,EAAE,CAAC,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI,CAChC,OAAO,EAAE,qBAAqB,EAC9B,QAAQ,EAAE,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,KAAK,IAAI,EACrC,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,KAC/B,WAAW,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;AAE3B,MAAM,MAAM,iBAAiB,CAAC,CAAC,IAAI,CACjC,EAAE,EAAE,SAAS,EACb,OAAO,EAAE,CAAC,EACV,GAAG,EAAE,qBAAqB,KACvB,IAAI,CAAC;AAEV,MAAM,MAAM,uBAAuB,GAAG,CACpC,OAAO,EAAE,qBAAqB,EAC9B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,WAAW,KACd,IAAI,CAAC;AAEV;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,CAAC,EAC7C,EAAE,EAAE,UAAU,EACd,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAC5B,aAAa,CAAC,EAAE,aAAa,GAC5B,uBAAuB,CAoDzB;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,CAAC,EACvC,EAAE,EAAE,UAAU,EACd,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAC5B,MAAM,EAAE,MAAM,GAAG,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,QAc9B;AAED,wBAAgB,wBAAwB,CAAC,CAAC,EACxC,EAAE,EAAE,UAAU,EACd,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,iBAAiB,CAAC,CAAC,CAAC,EAC7B,QAAQ,EAAE,QAAQ,QAoBnB;AAED,MAAM,MAAM,OAAO,CAAC,CAAC,IAAI;IACvB,OAAO,aAAa,CAAC,OAAO;IAC5B;QACE,OAAO,EAAE,qBAAqB,CAAC;QAC/B,IAAI,EAAE,WAAW,CAAC;QAClB,OAAO,EAAE,CAAC,CAAC;KACZ;CACF,CAAC"}

package/out/zero-cache/src/types/websocket-handoff.js

@@ -1,85 +1,77 @@
-import { IncomingMessage, Server } from 'node:http';
-import { Socket } from 'node:net';
-import { WebSocketServer } from 'ws';
+import { Server } from "node:http";
+import { WebSocketServer } from "ws";
 import { assert } from "../../../shared/src/asserts.js";
 import { serializableSubset } from "./http.js";
-import { MESSAGE_TYPES, } from "./processes.js";
+import "./processes.js";
 import { closeWithError, PROTOCOL_ERROR } from "./ws.js";
-/**
- * Installs websocket handoff logic from either an http.Server
- * receiving requests, or a parent Worker process
- * that is handing off requests to this process.
- */
-export function createWebSocketHandoffHandler(lc, handoff, serverOptions) {
-    const wss = new WebSocketServer(serverOptions ?? {
-        noServer: true,
-    });
-    return (message, socket, head) => {
-        let sent = false;
-        function send({ payload, sender }) {
-            assert(!sent, 'Handoff callback already invoked');
-            sent = true;
-            const data = [
-                'handoff',
-                {
-                    message: serializableSubset(message),
-                    head,
-                    payload,
-                },
-            ];
-            // "This event is guaranteed to be passed an instance of the <net.Socket> class"
-            // https://nodejs.org/api/http.html#event-upgrade
-            sender.send(data, socket);
-        }
-        function onError(error) {
-            // Returning an error on the HTTP handshake looks like a hanging connection
-            // (at least from Chrome) and doesn't report any meaningful error in the browser.
-            // Instead, finish the upgrade to a websocket and then close it with an error.
-            wss.handleUpgrade(message, socket, head, ws => closeWithError(lc, ws, error, PROTOCOL_ERROR));
-        }
-        try {
-            const spec = handoff(message, send, onError);
-            if (spec) {
-                send(spec);
-            }
-        }
-        catch (error) {
-            onError(error);
+function createWebSocketHandoffHandler(lc, handoff, serverOptions) {
+  const wss = new WebSocketServer(
+    {
+      noServer: true
+    }
+  );
+  return (message, socket, head) => {
+    let sent = false;
+    function send({ payload, sender }) {
+      assert(!sent, "Handoff callback already invoked");
+      sent = true;
+      const data = [
+        "handoff",
+        {
+          message: serializableSubset(message),
+          head,
+          payload
         }
-    };
-}
-/**
- * Installs websocket handoff logic from either an http.Server
- * receiving requests, or a parent Worker process
- * that is handing off requests to this process.
- */
-export function installWebSocketHandoff(lc, handoff, source, serverOptions) {
-    const handle = createWebSocketHandoffHandler(lc, handoff, serverOptions);
-    if (source instanceof Server) {
-        // handoff messages from an HTTP server
-        source.on('upgrade', handle);
+      ];
+      sender.send(data, socket);
+    }
+    function onError(error) {
+      wss.handleUpgrade(
+        message,
+        socket,
+        Buffer.from(head),
+        (ws) => closeWithError(lc, ws, error, PROTOCOL_ERROR)
+      );
     }
-    else {
-        // handoff messages from this worker's parent.
-        source.onMessageType('handoff', (msg, socket) => {
-            const { message, head } = msg;
-            handle(message, socket, Buffer.from(head));
-        });
+    try {
+      const spec = handoff(message, send, onError);
+      if (spec) {
+        send(spec);
+      }
+    } catch (error) {
+      onError(error);
     }
+  };
 }
-export function installWebSocketReceiver(lc, server, receive, receiver) {
-    receiver.onMessageType('handoff', (msg, socket) => {
-        // Per https://nodejs.org/api/child_process.html#subprocesssendmessage-sendhandle-options-callback
-        //
-        // > Any 'message' handlers in the subprocess should verify that socket
-        // > exists, as the connection may have been closed during the time it
-        // > takes to send the connection to the child.
-        if (!socket) {
-            lc.warn?.('websocket closed during handoff');
-            return;
-        }
-        const { message, head, payload } = msg;
-        server.handleUpgrade(message, socket, Buffer.from(head), ws => receive(ws, payload, message));
+function installWebSocketHandoff(lc, handoff, source, serverOptions) {
+  const handle = createWebSocketHandoffHandler(lc, handoff);
+  if (source instanceof Server) {
+    source.on("upgrade", handle);
+  } else {
+    source.onMessageType("handoff", (msg, socket) => {
+      const { message, head } = msg;
+      handle(message, socket, head);
     });
+  }
+}
+function installWebSocketReceiver(lc, server, receive, receiver) {
+  receiver.onMessageType("handoff", (msg, socket) => {
+    if (!socket) {
+      lc.warn?.("websocket closed during handoff");
+      return;
+    }
+    const { message, head, payload } = msg;
+    server.handleUpgrade(
+      message,
+      socket,
+      Buffer.from(head),
+      (ws) => receive(ws, payload, message)
+    );
+  });
 }
-//# sourceMappingURL=websocket-handoff.js.map
+export {
+  createWebSocketHandoffHandler,
+  installWebSocketHandoff,
+  installWebSocketReceiver
+};
+//# sourceMappingURL=websocket-handoff.js.map

package/out/zero-cache/src/types/websocket-handoff.js.map

@@ -1 +1 @@
-{"version":3,"file":"websocket-handoff.js","sourceRoot":"","sources":["../../../../../zero-cache/src/types/websocket-handoff.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"websocket-handoff.js","sources":["../../../../../zero-cache/src/types/websocket-handoff.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport type {IncomingMessage} from 'node:http';\nimport {Server} from 'node:http';\nimport type {Socket} from 'node:net';\nimport {WebSocketServer, type ServerOptions, type WebSocket} from 'ws';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport {serializableSubset, type IncomingMessageSubset} from './http.ts';\nimport type {MESSAGE_TYPES} from './processes.ts';\nimport {type Receiver, type Sender, type Worker} from './processes.ts';\nimport {closeWithError, PROTOCOL_ERROR} from './ws.ts';\n\nexport type HandoffSpec<P> = {\n  payload: P;\n  sender: Sender;\n};\n\n/**\n * The WebSocketHandoff is a function that either returns the payload and\n * receiver, or invokes the specified `callback` with the payload and\n * receiver. It must not do both.\n *\n * Similarly, an error can be handled by throwing synchronously from the\n * function, or invoking the `onerror` callback.\n */\nexport type WebSocketHandoff<P> = (\n  message: IncomingMessageSubset,\n  callback: (h: HandoffSpec<P>) => void,\n  onerror: (reason: unknown) => void,\n) => HandoffSpec<P> | void;\n\nexport type WebSocketReceiver<P> = (\n  ws: WebSocket,\n  payload: P,\n  msg: IncomingMessageSubset,\n) => void;\n\nexport type WebSocketHandoffHandler = (\n  message: IncomingMessageSubset,\n  socket: Socket,\n  head: ArrayBuffer,\n) => void;\n\n/**\n * Installs websocket handoff logic from either an http.Server\n * receiving requests, or a parent Worker process\n * that is handing off requests to this process.\n */\nexport function createWebSocketHandoffHandler<P>(\n  lc: LogContext,\n  handoff: WebSocketHandoff<P>,\n  serverOptions?: ServerOptions,\n): WebSocketHandoffHandler {\n  const wss = new WebSocketServer(\n    serverOptions ?? {\n      noServer: true,\n    },\n  );\n  return (\n    message: IncomingMessageSubset,\n    socket: Socket,\n    head: ArrayBuffer,\n  ) => {\n    let sent = false;\n\n    function send({payload, sender}: HandoffSpec<P>) {\n      assert(!sent, 'Handoff callback already invoked');\n      sent = true;\n\n      const data = [\n        'handoff',\n        {\n          message: serializableSubset(message),\n          head,\n          payload,\n        },\n      ] satisfies Handoff<P>;\n\n      // \"This event is guaranteed to be passed an instance of the <net.Socket> class\"\n      // https://nodejs.org/api/http.html#event-upgrade\n      sender.send(data, socket);\n    }\n\n    function onError(error: unknown) {\n      // Returning an error on the HTTP handshake looks like a hanging connection\n      // (at least from Chrome) and doesn't report any meaningful error in the browser.\n      // Instead, finish the upgrade to a websocket and then close it with an error.\n      wss.handleUpgrade(\n        message as IncomingMessage,\n        socket,\n        Buffer.from(head),\n        ws => closeWithError(lc, ws, error, PROTOCOL_ERROR),\n      );\n    }\n\n    try {\n      const spec = handoff(message, send, onError);\n      if (spec) {\n        send(spec);\n      }\n    } catch (error) {\n      onError(error);\n    }\n  };\n}\n\n/**\n * Installs websocket handoff logic from either an http.Server\n * receiving requests, or a parent Worker process\n * that is handing off requests to this process.\n */\nexport function installWebSocketHandoff<P>(\n  lc: LogContext,\n  handoff: WebSocketHandoff<P>,\n  source: Server | Worker,\n  serverOptions?: ServerOptions,\n) {\n  const handle = createWebSocketHandoffHandler(lc, handoff, serverOptions);\n\n  if (source instanceof Server) {\n    // handoff messages from an HTTP server\n    source.on('upgrade', handle);\n  } else {\n    // handoff messages from this worker's parent.\n    source.onMessageType<Handoff<P>>('handoff', (msg, socket) => {\n      const {message, head} = msg;\n      handle(message, socket as Socket, head);\n    });\n  }\n}\n\nexport function installWebSocketReceiver<P>(\n  lc: LogContext,\n  server: WebSocketServer,\n  receive: WebSocketReceiver<P>,\n  receiver: Receiver,\n) {\n  receiver.onMessageType<Handoff<P>>('handoff', (msg, socket) => {\n    // Per https://nodejs.org/api/child_process.html#subprocesssendmessage-sendhandle-options-callback\n    //\n    // > Any 'message' handlers in the subprocess should verify that socket\n    // > exists, as the connection may have been closed during the time it\n    // > takes to send the connection to the child.\n    if (!socket) {\n      lc.warn?.('websocket closed during handoff');\n      return;\n    }\n    const {message, head, payload} = msg;\n    server.handleUpgrade(\n      message as IncomingMessage,\n      socket as Socket,\n      Buffer.from(head),\n      ws => receive(ws, payload, message),\n    );\n  });\n}\n\nexport type Handoff<P> = [\n  typeof MESSAGE_TYPES.handoff,\n  {\n    message: IncomingMessageSubset;\n    head: ArrayBuffer;\n    payload: P;\n  },\n];\n"],"names":[],"mappings":";;;;;;AA+CO,SAAS,8BACd,IACA,SACA,eACyB;AACzB,QAAM,MAAM,IAAI;AAAA,IACG;AAAA,MACf,UAAU;AAAA,IAAA;AAAA,EACZ;AAEF,SAAO,CACL,SACA,QACA,SACG;AACH,QAAI,OAAO;AAEX,aAAS,KAAK,EAAC,SAAS,UAAyB;AAC/C,aAAO,CAAC,MAAM,kCAAkC;AAChD,aAAO;AAEP,YAAM,OAAO;AAAA,QACX;AAAA,QACA;AAAA,UACE,SAAS,mBAAmB,OAAO;AAAA,UACnC;AAAA,UACA;AAAA,QAAA;AAAA,MACF;AAKF,aAAO,KAAK,MAAM,MAAM;AAAA,IAC1B;AAEA,aAAS,QAAQ,OAAgB;AAI/B,UAAI;AAAA,QACF;AAAA,QACA;AAAA,QACA,OAAO,KAAK,IAAI;AAAA,QAChB,CAAA,OAAM,eAAe,IAAI,IAAI,OAAO,cAAc;AAAA,MAAA;AAAA,IAEtD;AAEA,QAAI;AACF,YAAM,OAAO,QAAQ,SAAS,MAAM,OAAO;AAC3C,UAAI,MAAM;AACR,aAAK,IAAI;AAAA,MACX;AAAA,IACF,SAAS,OAAO;AACd,cAAQ,KAAK;AAAA,IACf;AAAA,EACF;AACF;AAOO,SAAS,wBACd,IACA,SACA,QACA,eACA;AACA,QAAM,SAAS,8BAA8B,IAAI,OAAsB;AAEvE,MAAI,kBAAkB,QAAQ;AAE5B,WAAO,GAAG,WAAW,MAAM;AAAA,EAC7B,OAAO;AAEL,WAAO,cAA0B,WAAW,CAAC,KAAK,WAAW;AAC3D,YAAM,EAAC,SAAS,KAAA,IAAQ;AACxB,aAAO,SAAS,QAAkB,IAAI;AAAA,IACxC,CAAC;AAAA,EACH;AACF;AAEO,SAAS,yBACd,IACA,QACA,SACA,UACA;AACA,WAAS,cAA0B,WAAW,CAAC,KAAK,WAAW;AAM7D,QAAI,CAAC,QAAQ;AACX,SAAG,OAAO,iCAAiC;AAC3C;AAAA,IACF;AACA,UAAM,EAAC,SAAS,MAAM,QAAA,IAAW;AACjC,WAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA,OAAO,KAAK,IAAI;AAAA,MAChB,CAAA,OAAM,QAAQ,IAAI,SAAS,OAAO;AAAA,IAAA;AAAA,EAEtC,CAAC;AACH;"}

package/out/zero-cache/src/types/ws.js

@@ -1,63 +1,60 @@
 import { elide } from "./strings.js";
-// https://github.com/Luka967/websocket-close-codes
-export const PROTOCOL_ERROR = 1002;
-export const INTERNAL_ERROR = 1011;
-export function closeWithError(lc, ws, err, code = INTERNAL_ERROR) {
-    const endpoint = ws.url ?? 'client';
-    const errMsg = String(err);
-    lc.warn?.(`closing connection to ${endpoint} with error`, errMsg);
-    // close messages must be less than or equal to 123 bytes:
-    // https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#reason
-    ws.close(code, elide(errMsg, 123));
+const PROTOCOL_ERROR = 1002;
+const INTERNAL_ERROR = 1011;
+function closeWithError(lc, ws, err, code = INTERNAL_ERROR) {
+  const endpoint = ws.url ?? "client";
+  const errMsg = String(err);
+  lc.warn?.(`closing connection to ${endpoint} with error`, errMsg);
+  ws.close(code, elide(errMsg, 123));
 }
-export function sendPingsForLiveness(lc, ws, intervalMs) {
-    let gotLivenessSignal = true;
-    let livenessTimer;
-    function startHeartBeats() {
-        livenessTimer = setInterval(() => {
-            if (!gotLivenessSignal) {
-                lc.warn?.(`socket@${ws.url} did not respond to heartbeat. Terminating...`);
-                ws.terminate();
-                return;
-            }
-            // Reset gotLivenessSignal and expect another pong or message to arrive
-            // before the next interval elapses.
-            gotLivenessSignal = false;
-            ws.ping();
-        }, intervalMs);
-    }
-    if (ws.readyState === ws.CONNECTING) {
-        ws.once('open', () => startHeartBeats());
-    }
-    else if (ws.readyState === ws.OPEN) {
-        startHeartBeats();
-    }
-    // Both pongs and messages are accepted as signs of liveness.
-    // Checking for pongs only risks false positives as pongs may be backed
-    // up behind a large stream of messages.
-    const signalAlive = () => (gotLivenessSignal = true);
-    ws.on('pong', signalAlive);
-    ws.on('message', signalAlive);
-    ws.once('close', () => clearInterval(livenessTimer));
+function sendPingsForLiveness(lc, ws, intervalMs) {
+  let gotLivenessSignal = true;
+  let livenessTimer;
+  function startHeartBeats() {
+    livenessTimer = setInterval(() => {
+      if (!gotLivenessSignal) {
+        lc.warn?.(
+          `socket@${ws.url} did not respond to heartbeat. Terminating...`
+        );
+        ws.terminate();
+        return;
+      }
+      gotLivenessSignal = false;
+      ws.ping();
+    }, intervalMs);
+  }
+  if (ws.readyState === ws.CONNECTING) {
+    ws.once("open", () => startHeartBeats());
+  } else if (ws.readyState === ws.OPEN) {
+    startHeartBeats();
+  }
+  const signalAlive = () => gotLivenessSignal = true;
+  ws.on("pong", signalAlive);
+  ws.on("message", signalAlive);
+  ws.once("close", () => clearInterval(livenessTimer));
 }
-export function expectPingsForLiveness(lc, ws, intervalMs, timeoutBufferMs = 3_000) {
-    let gotLivenessSignal = false;
-    const livenessTimer = setInterval(() => {
-        if (!gotLivenessSignal) {
-            lc.warn?.(`socket@${ws.url} did not send heartbeat or messages. Terminating...`);
-            ws.terminate();
-            return;
-        }
-        // Reset gotLivenessSignal and expect another ping or message to arrive
-        // before the next interval elapses.
-        gotLivenessSignal = false;
-    }, intervalMs + timeoutBufferMs);
-    // Both pings and messages are accepted as signs of liveness.
-    // Checking for pings only risks false positives as pings may be backed
-    // up behind a large stream of messages.
-    const signalAlive = () => (gotLivenessSignal = true);
-    ws.on('ping', signalAlive);
-    ws.on('message', signalAlive);
-    ws.once('close', () => clearTimeout(livenessTimer));
+function expectPingsForLiveness(lc, ws, intervalMs, timeoutBufferMs = 3e3) {
+  let gotLivenessSignal = false;
+  const livenessTimer = setInterval(() => {
+    if (!gotLivenessSignal) {
+      lc.warn?.(
+        `socket@${ws.url} did not send heartbeat or messages. Terminating...`
+      );
+      ws.terminate();
+      return;
+    }
+    gotLivenessSignal = false;
+  }, intervalMs + timeoutBufferMs);
+  const signalAlive = () => gotLivenessSignal = true;
+  ws.on("ping", signalAlive);
+  ws.on("message", signalAlive);
+  ws.once("close", () => clearTimeout(livenessTimer));
 }
-//# sourceMappingURL=ws.js.map
+export {
+  INTERNAL_ERROR,
+  PROTOCOL_ERROR,
+  closeWithError,
+  expectPingsForLiveness,
+  sendPingsForLiveness
+};
+//# sourceMappingURL=ws.js.map

package/out/zero-cache/src/types/ws.js.map

@@ -1 +1 @@
-{"version":3,"file":"ws.js","sourceRoot":"","sources":["../../../../../zero-cache/src/types/ws.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ws.js","sources":["../../../../../zero-cache/src/types/ws.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport type {WebSocket} from 'ws';\nimport {elide} from './strings.ts';\n\n// https://github.com/Luka967/websocket-close-codes\nexport const PROTOCOL_ERROR = 1002;\nexport const INTERNAL_ERROR = 1011;\n\nexport type ErrorCode = typeof PROTOCOL_ERROR | typeof INTERNAL_ERROR;\n\nexport function closeWithError(\n  lc: LogContext,\n  ws: WebSocket,\n  err: unknown,\n  code: ErrorCode = INTERNAL_ERROR,\n) {\n  const endpoint = ws.url ?? 'client';\n  const errMsg = String(err);\n  lc.warn?.(`closing connection to ${endpoint} with error`, errMsg);\n\n  // close messages must be less than or equal to 123 bytes:\n  // https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#reason\n  ws.close(code, elide(errMsg, 123));\n}\n\nexport function sendPingsForLiveness(\n  lc: LogContext,\n  ws: WebSocket,\n  intervalMs: number,\n) {\n  let gotLivenessSignal = true;\n\n  let livenessTimer: NodeJS.Timeout | undefined;\n  function startHeartBeats() {\n    livenessTimer = setInterval(() => {\n      if (!gotLivenessSignal) {\n        lc.warn?.(\n          `socket@${ws.url} did not respond to heartbeat. Terminating...`,\n        );\n        ws.terminate();\n        return;\n      }\n      // Reset gotLivenessSignal and expect another pong or message to arrive\n      // before the next interval elapses.\n      gotLivenessSignal = false;\n      ws.ping();\n    }, intervalMs);\n  }\n\n  if (ws.readyState === ws.CONNECTING) {\n    ws.once('open', () => startHeartBeats());\n  } else if (ws.readyState === ws.OPEN) {\n    startHeartBeats();\n  }\n\n  // Both pongs and messages are accepted as signs of liveness.\n  // Checking for pongs only risks false positives as pongs may be backed\n  // up behind a large stream of messages.\n  const signalAlive = () => (gotLivenessSignal = true);\n  ws.on('pong', signalAlive);\n  ws.on('message', signalAlive);\n  ws.once('close', () => clearInterval(livenessTimer));\n}\n\nexport function expectPingsForLiveness(\n  lc: LogContext,\n  ws: WebSocket,\n  intervalMs: number,\n  timeoutBufferMs = 3_000,\n) {\n  let gotLivenessSignal = false;\n\n  const livenessTimer = setInterval(() => {\n    if (!gotLivenessSignal) {\n      lc.warn?.(\n        `socket@${ws.url} did not send heartbeat or messages. Terminating...`,\n      );\n      ws.terminate();\n      return;\n    }\n    // Reset gotLivenessSignal and expect another ping or message to arrive\n    // before the next interval elapses.\n    gotLivenessSignal = false;\n  }, intervalMs + timeoutBufferMs);\n\n  // Both pings and messages are accepted as signs of liveness.\n  // Checking for pings only risks false positives as pings may be backed\n  // up behind a large stream of messages.\n  const signalAlive = () => (gotLivenessSignal = true);\n  ws.on('ping', signalAlive);\n  ws.on('message', signalAlive);\n  ws.once('close', () => clearTimeout(livenessTimer));\n}\n"],"names":[],"mappings":";AAKO,MAAM,iBAAiB;AACvB,MAAM,iBAAiB;AAIvB,SAAS,eACd,IACA,IACA,KACA,OAAkB,gBAClB;AACA,QAAM,WAAW,GAAG,OAAO;AAC3B,QAAM,SAAS,OAAO,GAAG;AACzB,KAAG,OAAO,yBAAyB,QAAQ,eAAe,MAAM;AAIhE,KAAG,MAAM,MAAM,MAAM,QAAQ,GAAG,CAAC;AACnC;AAEO,SAAS,qBACd,IACA,IACA,YACA;AACA,MAAI,oBAAoB;AAExB,MAAI;AACJ,WAAS,kBAAkB;AACzB,oBAAgB,YAAY,MAAM;AAChC,UAAI,CAAC,mBAAmB;AACtB,WAAG;AAAA,UACD,UAAU,GAAG,GAAG;AAAA,QAAA;AAElB,WAAG,UAAA;AACH;AAAA,MACF;AAGA,0BAAoB;AACpB,SAAG,KAAA;AAAA,IACL,GAAG,UAAU;AAAA,EACf;AAEA,MAAI,GAAG,eAAe,GAAG,YAAY;AACnC,OAAG,KAAK,QAAQ,MAAM,gBAAA,CAAiB;AAAA,EACzC,WAAW,GAAG,eAAe,GAAG,MAAM;AACpC,oBAAA;AAAA,EACF;AAKA,QAAM,cAAc,MAAO,oBAAoB;AAC/C,KAAG,GAAG,QAAQ,WAAW;AACzB,KAAG,GAAG,WAAW,WAAW;AAC5B,KAAG,KAAK,SAAS,MAAM,cAAc,aAAa,CAAC;AACrD;AAEO,SAAS,uBACd,IACA,IACA,YACA,kBAAkB,KAClB;AACA,MAAI,oBAAoB;AAExB,QAAM,gBAAgB,YAAY,MAAM;AACtC,QAAI,CAAC,mBAAmB;AACtB,SAAG;AAAA,QACD,UAAU,GAAG,GAAG;AAAA,MAAA;AAElB,SAAG,UAAA;AACH;AAAA,IACF;AAGA,wBAAoB;AAAA,EACtB,GAAG,aAAa,eAAe;AAK/B,QAAM,cAAc,MAAO,oBAAoB;AAC/C,KAAG,GAAG,QAAQ,WAAW;AACzB,KAAG,GAAG,WAAW,WAAW;AAC5B,KAAG,KAAK,SAAS,MAAM,aAAa,aAAa,CAAC;AACpD;"}

package/out/zero-cache/src/workers/connect-params.d.ts

@@ -4,6 +4,7 @@ export type ConnectParams = {
     readonly protocolVersion: number;
     readonly clientID: string;
     readonly clientGroupID: string;
+    readonly profileID: string | null;
     readonly schemaVersion: number | null;
     readonly baseCookie: string | null;
     readonly timestamp: number;

package/out/zero-cache/src/workers/connect-params.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connect-params.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/workers/connect-params.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,YAAY,CAAC;AAEpD,OAAO,EAEL,KAAK,qBAAqB,EAC3B,MAAM,uCAAuC,CAAC;AAG/C,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAE/B,QAAQ,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,iBAAiB,EAAE,qBAAqB,GAAG,SAAS,CAAC;IAC9D,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;CACzC,CAAC;AAEF,wBAAgB,gBAAgB,CAC9B,eAAe,EAAE,MAAM,EACvB,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,mBAAmB,GAE1B;IACE,MAAM,EAAE,aAAa,CAAC;IACtB,KAAK,EAAE,IAAI,CAAC;CACb,GACD;IACE,MAAM,EAAE,IAAI,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf,CAyCJ"}
+{"version":3,"file":"connect-params.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/workers/connect-params.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,YAAY,CAAC;AAEpD,OAAO,EAEL,KAAK,qBAAqB,EAC3B,MAAM,uCAAuC,CAAC;AAG/C,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAElC,QAAQ,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,iBAAiB,EAAE,qBAAqB,GAAG,SAAS,CAAC;IAC9D,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;CACzC,CAAC;AAEF,wBAAgB,gBAAgB,CAC9B,eAAe,EAAE,MAAM,EACvB,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,mBAAmB,GAE1B;IACE,MAAM,EAAE,aAAa,CAAC;IACtB,KAAK,EAAE,IAAI,CAAC;CACb,GACD;IACE,MAAM,EAAE,IAAI,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf,CA2CJ"}

package/out/zero-cache/src/workers/connect-params.js

@@ -1,43 +1,49 @@
 import { must } from "../../../shared/src/must.js";
-import { decodeSecProtocols, } from "../../../zero-protocol/src/connect.js";
+import { decodeSecProtocols } from "../../../zero-protocol/src/connect.js";
 import { URLParams } from "../types/url-params.js";
-export function getConnectParams(protocolVersion, url, headers) {
-    const params = new URLParams(url);
-    try {
-        const clientID = params.get('clientID', true);
-        const clientGroupID = params.get('clientGroupID', true);
-        const schemaVersion = params.getInteger('schemaVersion', false);
-        const baseCookie = params.get('baseCookie', false);
-        const timestamp = params.getInteger('ts', true);
-        const lmID = params.getInteger('lmid', true);
-        const wsID = params.get('wsid', false) ?? '';
-        const userID = params.get('userID', false) ?? '';
-        const debugPerf = params.getBoolean('debugPerf');
-        const { initConnectionMessage, authToken } = decodeSecProtocols(must(headers['sec-websocket-protocol']));
-        return {
-            params: {
-                protocolVersion,
-                clientID,
-                clientGroupID,
-                schemaVersion,
-                baseCookie,
-                timestamp,
-                lmID,
-                wsID,
-                debugPerf,
-                initConnectionMsg: initConnectionMessage,
-                auth: authToken,
-                userID,
-                httpCookie: headers.cookie,
-            },
-            error: null,
-        };
-    }
-    catch (e) {
-        return {
-            params: null,
-            error: e instanceof Error ? e.message : String(e),
-        };
-    }
+function getConnectParams(protocolVersion, url, headers) {
+  const params = new URLParams(url);
+  try {
+    const clientID = params.get("clientID", true);
+    const clientGroupID = params.get("clientGroupID", true);
+    const profileID = params.get("profileID", false);
+    const schemaVersion = params.getInteger("schemaVersion", false);
+    const baseCookie = params.get("baseCookie", false);
+    const timestamp = params.getInteger("ts", true);
+    const lmID = params.getInteger("lmid", true);
+    const wsID = params.get("wsid", false) ?? "";
+    const userID = params.get("userID", false) ?? "";
+    const debugPerf = params.getBoolean("debugPerf");
+    const { initConnectionMessage, authToken } = decodeSecProtocols(
+      must(headers["sec-websocket-protocol"])
+    );
+    return {
+      params: {
+        protocolVersion,
+        clientID,
+        clientGroupID,
+        profileID,
+        schemaVersion,
+        baseCookie,
+        timestamp,
+        lmID,
+        wsID,
+        debugPerf,
+        initConnectionMsg: initConnectionMessage,
+        auth: authToken,
+        userID,
+        httpCookie: headers.cookie
+      },
+      error: null
+    };
+  } catch (e) {
+    return {
+      params: null,
+      error: e instanceof Error ? e.message : String(e)
+    };
+  }
 }
-//# sourceMappingURL=connect-params.js.map
+export {
+  getConnectParams
+};
+//# sourceMappingURL=connect-params.js.map

package/out/zero-cache/src/workers/connect-params.js.map

@@ -1 +1 @@
-{"version":3,"file":"connect-params.js","sourceRoot":"","sources":["../../../../../zero-cache/src/workers/connect-params.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,6BAA6B,CAAC;AACjD,OAAO,EACL,kBAAkB,GAEnB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAC,SAAS,EAAC,MAAM,wBAAwB,CAAC;AAmBjD,MAAM,UAAU,gBAAgB,CAC9B,eAAuB,EACvB,GAAQ,EACR,OAA4B;IAU5B,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC;IAElC,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAC9C,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QACxD,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;QAChE,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;QACnD,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAChD,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC7C,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;QAC7C,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;QACjD,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QACjD,MAAM,EAAC,qBAAqB,EAAE,SAAS,EAAC,GAAG,kBAAkB,CAC3D,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC,CACxC,CAAC;QAEF,OAAO;YACL,MAAM,EAAE;gBACN,eAAe;gBACf,QAAQ;gBACR,aAAa;gBACb,aAAa;gBACb,UAAU;gBACV,SAAS;gBACT,IAAI;gBACJ,IAAI;gBACJ,SAAS;gBACT,iBAAiB,EAAE,qBAAqB;gBACxC,IAAI,EAAE,SAAS;gBACf,MAAM;gBACN,UAAU,EAAE,OAAO,CAAC,MAAM;aAC3B;YACD,KAAK,EAAE,IAAI;SACZ,CAAC;IACJ,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO;YACL,MAAM,EAAE,IAAI;YACZ,KAAK,EAAE,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;SAClD,CAAC;IACJ,CAAC;AACH,CAAC"}
+{"version":3,"file":"connect-params.js","sources":["../../../../../zero-cache/src/workers/connect-params.ts"],"sourcesContent":["import type {IncomingHttpHeaders} from 'node:http2';\nimport {must} from '../../../shared/src/must.ts';\nimport {\n  decodeSecProtocols,\n  type InitConnectionMessage,\n} from '../../../zero-protocol/src/connect.ts';\nimport {URLParams} from '../types/url-params.ts';\n\nexport type ConnectParams = {\n  readonly protocolVersion: number;\n  readonly clientID: string;\n  readonly clientGroupID: string;\n  readonly profileID: string | null;\n  // TODO: Remove when fully migrated to clientSchemas\n  readonly schemaVersion: number | null;\n  readonly baseCookie: string | null;\n  readonly timestamp: number;\n  readonly lmID: number;\n  readonly wsID: string;\n  readonly debugPerf: boolean;\n  readonly auth: string | undefined;\n  readonly userID: string;\n  readonly initConnectionMsg: InitConnectionMessage | undefined;\n  readonly httpCookie: string | undefined;\n};\n\nexport function getConnectParams(\n  protocolVersion: number,\n  url: URL,\n  headers: IncomingHttpHeaders,\n):\n  | {\n      params: ConnectParams;\n      error: null;\n    }\n  | {\n      params: null;\n      error: string;\n    } {\n  const params = new URLParams(url);\n\n  try {\n    const clientID = params.get('clientID', true);\n    const clientGroupID = params.get('clientGroupID', true);\n    const profileID = params.get('profileID', false);\n    const schemaVersion = params.getInteger('schemaVersion', false);\n    const baseCookie = params.get('baseCookie', false);\n    const timestamp = params.getInteger('ts', true);\n    const lmID = params.getInteger('lmid', true);\n    const wsID = params.get('wsid', false) ?? '';\n    const userID = params.get('userID', false) ?? '';\n    const debugPerf = params.getBoolean('debugPerf');\n    const {initConnectionMessage, authToken} = decodeSecProtocols(\n      must(headers['sec-websocket-protocol']),\n    );\n\n    return {\n      params: {\n        protocolVersion,\n        clientID,\n        clientGroupID,\n        profileID,\n        schemaVersion,\n        baseCookie,\n        timestamp,\n        lmID,\n        wsID,\n        debugPerf,\n        initConnectionMsg: initConnectionMessage,\n        auth: authToken,\n        userID,\n        httpCookie: headers.cookie,\n      },\n      error: null,\n    };\n  } catch (e) {\n    return {\n      params: null,\n      error: e instanceof Error ? e.message : String(e),\n    };\n  }\n}\n"],"names":[],"mappings":";;;AA0BO,SAAS,iBACd,iBACA,KACA,SASI;AACJ,QAAM,SAAS,IAAI,UAAU,GAAG;AAEhC,MAAI;AACF,UAAM,WAAW,OAAO,IAAI,YAAY,IAAI;AAC5C,UAAM,gBAAgB,OAAO,IAAI,iBAAiB,IAAI;AACtD,UAAM,YAAY,OAAO,IAAI,aAAa,KAAK;AAC/C,UAAM,gBAAgB,OAAO,WAAW,iBAAiB,KAAK;AAC9D,UAAM,aAAa,OAAO,IAAI,cAAc,KAAK;AACjD,UAAM,YAAY,OAAO,WAAW,MAAM,IAAI;AAC9C,UAAM,OAAO,OAAO,WAAW,QAAQ,IAAI;AAC3C,UAAM,OAAO,OAAO,IAAI,QAAQ,KAAK,KAAK;AAC1C,UAAM,SAAS,OAAO,IAAI,UAAU,KAAK,KAAK;AAC9C,UAAM,YAAY,OAAO,WAAW,WAAW;AAC/C,UAAM,EAAC,uBAAuB,UAAA,IAAa;AAAA,MACzC,KAAK,QAAQ,wBAAwB,CAAC;AAAA,IAAA;AAGxC,WAAO;AAAA,MACL,QAAQ;AAAA,QACN;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,mBAAmB;AAAA,QACnB,MAAM;AAAA,QACN;AAAA,QACA,YAAY,QAAQ;AAAA,MAAA;AAAA,MAEtB,OAAO;AAAA,IAAA;AAAA,EAEX,SAAS,GAAG;AACV,WAAO;AAAA,MACL,QAAQ;AAAA,MACR,OAAO,aAAa,QAAQ,EAAE,UAAU,OAAO,CAAC;AAAA,IAAA;AAAA,EAEpD;AACF;"}

package/out/zero-cache/src/workers/connection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/workers/connection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAGjD,OAAO,SAAkC,MAAM,IAAI,CAAC;AAIpD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,oCAAoC,CAAC;AAEnE,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,qCAAqC,CAAC;AAKnE,OAAO,EAAiB,KAAK,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAM/E,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,qBAAqB,CAAC;AAChD,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAEL,KAAK,aAAa,EACnB,MAAM,qCAAqC,CAAC;AAG7C,MAAM,MAAM,aAAa,GACrB;IACE,IAAI,EAAE,IAAI,CAAC;CACZ,GACD;IACE,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,SAAS,CAAC;CAClB,GACD;IACE,IAAI,EAAE,WAAW,CAAC;IAClB,MAAM,EAAE,SAAS,EAAE,CAAC;CACrB,GACD,YAAY,CAAC;AAEjB,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,YAAY,GAAG,QAAQ,CAAC;IAChC,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;CAC5B,CAAC;AAEF,MAAM,WAAW,cAAc;IAC7B,aAAa,CAAC,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;CACxD;AAeD;;;;;;;GAOG;AACH,qBAAa,UAAU;;gBAcnB,EAAE,EAAE,UAAU,EACd,aAAa,EAAE,aAAa,EAC5B,EAAE,EAAE,SAAS,EACb,cAAc,EAAE,cAAc,EAC9B,OAAO,EAAE,MAAM,IAAI;IA2BrB;;;;;;OAMG;IACH,IAAI,IAAI,OAAO;IAyBf,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE;IAsBxC,oBAAoB,CAAC,iBAAiB,EAAE,MAAM;IAmJ9C,IAAI,CACF,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI,KAAK,IAAI,CAAC,GAAG,qBAAqB;IAMlE,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,OAAO;CAGjD;AAED,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG;IAC1D,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI,CAAC;CACtD,CAAC;AAGF,wBAAgB,IAAI,CAClB,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,aAAa,EACjB,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI,KAAK,IAAI,CAAC,GAAG,qBAAqB,QAwBjE;AAED,wBAAgB,SAAS,CACvB,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,SAAS,EACb,SAAS,EAAE,SAAS,EACpB,MAAM,CAAC,EAAE,OAAO,QAMjB;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,aAAa,GAAG,SAAS,CAQ3E"}
+{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/workers/connection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAW,MAAM,kBAAkB,CAAC;AAG3D,OAAO,SAAkC,MAAM,IAAI,CAAC;AAIpD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,oCAAoC,CAAC;AAEnE,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,qCAAqC,CAAC;AAKnE,OAAO,EAAiB,KAAK,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAM/E,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,qBAAqB,CAAC;AAChD,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAEL,KAAK,aAAa,EACnB,MAAM,qCAAqC,CAAC;AAG7C,MAAM,MAAM,aAAa,GACrB;IACE,IAAI,EAAE,IAAI,CAAC;CACZ,GACD;IACE,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,SAAS,CAAC;CAClB,GACD;IACE,IAAI,EAAE,WAAW,CAAC;IAClB,MAAM,EAAE,SAAS,EAAE,CAAC;CACrB,GACD,YAAY,CAAC;AAEjB,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,YAAY,GAAG,QAAQ,CAAC;IAChC,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;CAC5B,CAAC;AAEF,MAAM,WAAW,cAAc;IAC7B,aAAa,CAAC,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;CACxD;AAeD;;;;;;;GAOG;AACH,qBAAa,UAAU;;gBAcnB,EAAE,EAAE,UAAU,EACd,aAAa,EAAE,aAAa,EAC5B,EAAE,EAAE,SAAS,EACb,cAAc,EAAE,cAAc,EAC9B,OAAO,EAAE,MAAM,IAAI;IA2BrB;;;;;;OAMG;IACH,IAAI,IAAI,OAAO;IAyBf,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE;IAsBxC,oBAAoB,CAAC,iBAAiB,EAAE,MAAM;IAmJ9C,IAAI,CACF,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI,KAAK,IAAI,CAAC,GAAG,qBAAqB;IAMlE,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,OAAO;CAGjD;AAED,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG;IAC1D,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI,CAAC;CACtD,CAAC;AAGF,wBAAgB,IAAI,CAClB,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,aAAa,EACjB,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI,KAAK,IAAI,CAAC,GAAG,qBAAqB,QAwBjE;AAED,wBAAgB,SAAS,CACvB,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,SAAS,EACb,SAAS,EAAE,SAAS,EACpB,MAAM,CAAC,EAAE,OAAO,QA+BjB;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,aAAa,GAAG,SAAS,CAQ3E"}