on-zero 0.6.18 → 0.6.19

package/dist/cjs/createZeroServerCore.cjs

@@ -140,7 +140,16 @@ function withTransactionLifecycle(database, lifecycle) {
         const value = await database.transaction(async (tx, hooks) => {
           lifecycle.beginAttempt();
           try {
-            const result = await callback(tx, hooks);
+            const result = await callback(tx, {
+              ...hooks,
+              async updateClientMutationID() {
+                const result2 = await hooks.updateClientMutationID();
+                if (input && input.mutationID < result2.lastMutationID) {
+                  throw new ExpectedDuplicateMutation(input.clientID, input.mutationID, result2.lastMutationID);
+                }
+                return result2;
+              }
+            });
             lifecycle.completeAttempt();
             return result;
           } catch (error) {
@@ -152,11 +161,30 @@ function withTransactionLifecycle(database, lifecycle) {
         return value;
       } catch (error) {
         lifecycle.rollbackTransaction();
+        if (error instanceof ExpectedDuplicateMutation) {
+          return {
+            id: {
+              clientID: error.clientID,
+              id: error.mutationID
+            },
+            result: {
+              error: "alreadyProcessed",
+              details: error.message
+            }
+          };
+        }
         throw error;
       }
     }
   };
 }
+class ExpectedDuplicateMutation extends Error {
+  constructor(clientID, mutationID, expectedMutationID) {
+    super(`Ignoring mutation from ${clientID} with ID ${mutationID} as it was already processed. Expected: ${expectedMutationID}`);
+    this.clientID = clientID;
+    this.mutationID = mutationID;
+  }
+}
 async function parseAlreadyProcessed(request, response) {
   const mutations = alreadyProcessedMutations(response);
   if (mutations.length === 0) return;

package/dist/cjs/createZeroServerCore.native.js

@@ -33,11 +33,130 @@ var import_createZeroDirectServer = require("./createZeroDirectServer.native.js"
 var import_createMutators = require("./helpers/createMutators.native.js");
 var import_mutatorContext = require("./helpers/mutatorContext.native.js");
 var import_queryContext = require("./helpers/queryContext.native.js");
+function _assert_this_initialized(self) {
+  if (self === void 0) {
+    throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+  }
+  return self;
+}
+function _call_super(_this, derived, args) {
+  derived = _get_prototype_of(derived);
+  return _possible_constructor_return(_this, _is_native_reflect_construct() ? Reflect.construct(derived, args || [], _get_prototype_of(_this).constructor) : derived.apply(_this, args));
+}
+function _class_call_check(instance, Constructor) {
+  if (!(instance instanceof Constructor)) {
+    throw new TypeError("Cannot call a class as a function");
+  }
+}
+function _construct(Parent, args, Class) {
+  if (_is_native_reflect_construct()) {
+    _construct = Reflect.construct;
+  } else {
+    _construct = function construct(Parent2, args2, Class2) {
+      var a = [null];
+      a.push.apply(a, args2);
+      var Constructor = Function.bind.apply(Parent2, a);
+      var instance = new Constructor();
+      if (Class2) _set_prototype_of(instance, Class2.prototype);
+      return instance;
+    };
+  }
+  return _construct.apply(null, arguments);
+}
+function _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
+function _get_prototype_of(o) {
+  _get_prototype_of = Object.setPrototypeOf ? Object.getPrototypeOf : function getPrototypeOf(o2) {
+    return o2.__proto__ || Object.getPrototypeOf(o2);
+  };
+  return _get_prototype_of(o);
+}
+function _inherits(subClass, superClass) {
+  if (typeof superClass !== "function" && superClass !== null) {
+    throw new TypeError("Super expression must either be null or a function");
+  }
+  subClass.prototype = Object.create(superClass && superClass.prototype, {
+    constructor: {
+      value: subClass,
+      writable: true,
+      configurable: true
+    }
+  });
+  if (superClass) _set_prototype_of(subClass, superClass);
+}
+function _instanceof(left, right) {
+  if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+    return !!right[Symbol.hasInstance](left);
+  } else {
+    return left instanceof right;
+  }
+}
+function _is_native_function(fn) {
+  return Function.toString.call(fn).indexOf("[native code]") !== -1;
+}
+function _possible_constructor_return(self, call) {
+  if (call && (_type_of(call) === "object" || typeof call === "function")) {
+    return call;
+  }
+  return _assert_this_initialized(self);
+}
+function _set_prototype_of(o, p) {
+  _set_prototype_of = Object.setPrototypeOf || function setPrototypeOf(o2, p2) {
+    o2.__proto__ = p2;
+    return o2;
+  };
+  return _set_prototype_of(o, p);
+}
 function _type_of(obj) {
   "@swc/helpers - typeof";
 
   return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
 }
+function _wrap_native_super(Class) {
+  var _cache = typeof Map === "function" ? /* @__PURE__ */new Map() : void 0;
+  _wrap_native_super = function wrapNativeSuper(Class2) {
+    if (Class2 === null || !_is_native_function(Class2)) return Class2;
+    if (typeof Class2 !== "function") {
+      throw new TypeError("Super expression must either be null or a function");
+    }
+    if (typeof _cache !== "undefined") {
+      if (_cache.has(Class2)) return _cache.get(Class2);
+      _cache.set(Class2, Wrapper);
+    }
+    function Wrapper() {
+      return _construct(Class2, arguments, _get_prototype_of(this).constructor);
+    }
+    Wrapper.prototype = Object.create(Class2.prototype, {
+      constructor: {
+        value: Wrapper,
+        enumerable: false,
+        writable: true,
+        configurable: true
+      }
+    });
+    return _set_prototype_of(Wrapper, Class2);
+  };
+  return _wrap_native_super(Class);
+}
+function _is_native_reflect_construct() {
+  try {
+    var result = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));
+  } catch (_) {}
+  return (_is_native_reflect_construct = function () {
+    return !!result;
+  })();
+}
 function createZeroServerCore(param) {
   var {
     createDatabase,
@@ -159,7 +278,16 @@ function withTransactionLifecycle(database, lifecycle) {
         var value = await database.transaction(async function (tx, hooks) {
           lifecycle.beginAttempt();
           try {
-            var result = await callback(tx, hooks);
+            var result = await callback(tx, {
+              ...hooks,
+              async updateClientMutationID() {
+                var result2 = await hooks.updateClientMutationID();
+                if (input && input.mutationID < result2.lastMutationID) {
+                  throw new ExpectedDuplicateMutation(input.clientID, input.mutationID, result2.lastMutationID);
+                }
+                return result2;
+              }
+            });
             lifecycle.completeAttempt();
             return result;
           } catch (error) {
@@ -171,11 +299,35 @@ function withTransactionLifecycle(database, lifecycle) {
         return value;
       } catch (error) {
         lifecycle.rollbackTransaction();
+        if (_instanceof(error, ExpectedDuplicateMutation)) {
+          return {
+            id: {
+              clientID: error.clientID,
+              id: error.mutationID
+            },
+            result: {
+              error: "alreadyProcessed",
+              details: error.message
+            }
+          };
+        }
         throw error;
       }
     }
   };
 }
+var ExpectedDuplicateMutation = /* @__PURE__ */function (Error1) {
+  "use strict";
+
+  _inherits(ExpectedDuplicateMutation2, Error1);
+  function ExpectedDuplicateMutation2(clientID, mutationID, expectedMutationID) {
+    _class_call_check(this, ExpectedDuplicateMutation2);
+    var _this;
+    _this = _call_super(this, ExpectedDuplicateMutation2, [`Ignoring mutation from ${clientID} with ID ${mutationID} as it was already processed. Expected: ${expectedMutationID}`]), _define_property(_this, "clientID", void 0), _define_property(_this, "mutationID", void 0), _this.clientID = clientID, _this.mutationID = mutationID;
+    return _this;
+  }
+  return ExpectedDuplicateMutation2;
+}(_wrap_native_super(Error));
 async function parseAlreadyProcessed(request, response) {
   var mutations = alreadyProcessedMutations(response);
   if (mutations.length === 0) return;

package/dist/cjs/createZeroServerCore.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","createZeroServerCore_exports","__export","createZeroServerCore","module","exports","import_server","require","import_asyncTasks","import_createZeroDirectServer","import_createMutators","import_mutatorContext","import_queryContext","_type_of","obj","Symbol","constructor","param","createDatabase","createServerActions","defaultAllowAdminRole","defaultMutateAuthData","models","mutations","mutationValidators","persistAlreadyProcessed","queries","schema","validateMutation","validateQuery","permissions","server","createZeroDirectServerRuntime","handleMutationRequest","param2","authData","request","scheduleBackgroundTask","skipAsyncTasks","tasks","createAsyncTaskCollector","recoveryRequest","clone","mutators","createMutators","enqueueTask","can","environment","processor","PushProcessor","withTransactionLifecycle","lifecycle","response","process","parsed","parseAlreadyProcessed","committed","length","entries","map","entry","task","runWithAuthScope","runAsyncTaskEntries","background","asyncTasks","handleQueryRequest","Error","handler","name","args","resolveServerQuery","userID","id","runWithQueryContext","database","transaction","callback","input","tx","hooks","beginAttempt","result","completeAttempt","error","rollbackAttempt","commitTransaction","rollbackTransaction","alreadyProcessedMutations","upstreamSchema","URL","url","searchParams","get","body","json","clientGroupID","Array","isArray","filter","mutation","clientID"],"sources":["../../src/createZeroServerCore.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","createZeroServerCore_exports","__export","createZeroServerCore","module","exports","import_server","require","import_asyncTasks","import_createZeroDirectServer","import_createMutators","import_mutatorContext","import_queryContext","_assert_this_initialized","self","ReferenceError","_call_super","_this","derived","args","_get_prototype_of","_possible_constructor_return","_is_native_reflect_construct","Reflect","construct","constructor","apply","_class_call_check","instance","Constructor","TypeError","_construct","Parent","Class","Parent2","args2","Class2","a","push","Function","bind","_set_prototype_of","prototype","arguments","_define_property","obj","key","Object","defineProperty","enumerable","configurable","writable","o","setPrototypeOf","getPrototypeOf","o2","__proto__","_inherits","subClass","superClass","create","_instanceof","left","right","Symbol","hasInstance","_is_native_function","fn","toString","call","indexOf","_type_of","p","p2","_wrap_native_super","_cache","Map","wrapNativeSuper","has","get","set","Wrapper","result","Boolean","valueOf","_","param","createDatabase","createServerActions","defaultAllowAdminRole","defaultMutateAuthData","models","mutations","mutationValidators","persistAlreadyProcessed","queries","schema","validateMutation","validateQuery","permissions","server","createZeroDirectServerRuntime","handleMutationRequest","param2","authData","request","scheduleBackgroundTask","skipAsyncTasks","tasks","createAsyncTaskCollector","recoveryRequest","clone","mutators","createMutators","enqueueTask","can","environment","processor","PushProcessor","withTransactionLifecycle","lifecycle","response","process","parsed","parseAlreadyProcessed","committed","length","entries","map","entry","task","runWithAuthScope","runAsyncTaskEntries","background","asyncTasks"],"sources":["../../src/createZeroServerCore.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/httpPull/transport.test.cjs

@@ -434,22 +434,132 @@ let storageID = 0;
     cleanup();
     view.destroy();
   });
-  (0, import_vitest.test)("transient pull failures back off reconnect attempts", async () => {
-    const requests = [];
+  (0, import_vitest.test)("pull and push 500 reconnects keep socket opens on their current Zero attempt", async () => {
+    const lifecycle = [];
+    const zeroLogs = [];
+    let failPull = false;
+    let failPush = false;
     const fetch = import_vitest.vi.fn(async (input, init) => {
       const request = recordRequest(input, init);
-      requests.push(request);
-      (0, import_vitest.expect)(request.path).toBe("/pull");
-      throw new TypeError("Failed to fetch");
+      if (request.path === "/pull") {
+        if (failPull) {
+          failPull = false;
+          return jsonResponse({
+            error: "injected pull outage"
+          }, {
+            status: 500
+          });
+        }
+        return jsonResponse({
+          cookie: request.body.cookie,
+          unchanged: true
+        });
+      }
+      if (failPush) {
+        failPush = false;
+        return jsonResponse({
+          error: "injected push outage"
+        }, {
+          status: 500
+        });
+      }
+      const mutation2 = request.body.mutations[0];
+      return jsonResponse({
+        pushResponse: {
+          mutations: [{
+            id: {
+              clientID: mutation2.clientID,
+              id: mutation2.id
+            },
+            result: {}
+          }]
+        }
+      });
     });
-    install(fetch);
-    createZero();
-    await eventually(() => (0, import_vitest.expect)(requests.length).toBe(1));
-    await sleep(150);
-    (0, import_vitest.expect)(requests.length).toBe(1);
-    await eventually(() => (0, import_vitest.expect)(requests.length).toBe(2), 1500);
-    await sleep(150);
-    (0, import_vitest.expect)(requests.length).toBe(2);
+    const transport = (0, import_httpPullTransport.installHttpPullTransport)({
+      origin: ORIGIN,
+      fetch,
+      lifecycle: event => lifecycle.push(event)
+    });
+    transports.push(transport);
+    const zero = createZero({
+      logSink: {
+        log: (_level, context, ...args) => {
+          zeroLogs.push({
+            context: context ?? {},
+            args
+          });
+        }
+      }
+    });
+    await eventually(() => (0, import_vitest.expect)(zero.connection.state.current.name).toBe("connected"));
+    failPull = true;
+    await transport.pull().catch(() => {});
+    await eventually(() => (0, import_vitest.expect)(lifecycle.filter(event => event.type === "open")).toHaveLength(2), 5e3);
+    failPush = true;
+    const mutation = zero.mutate.project.create({
+      id: "p1",
+      ownerId: "u1",
+      name: "after reconnect"
+    });
+    await mutation.client;
+    await mutation.server.catch(() => {});
+    await eventually(() => (0, import_vitest.expect)(lifecycle.filter(event => event.type === "open")).toHaveLength(3), 5e3);
+    await eventually(() => (0, import_vitest.expect)(zero.connection.state.current.name).toBe("connected"), 5e3);
+    const opens = lifecycle.filter(event => event.type === "open");
+    (0, import_vitest.expect)(opens.map(({
+      generation,
+      activeGeneration
+    }) => [generation, activeGeneration])).toEqual([[1, 1], [2, 2], [3, 3]]);
+    (0, import_vitest.expect)(zeroLogs.some(({
+      args
+    }) => args.some(arg => String(arg).includes("connect start time is undefined")))).toBe(false);
+  });
+  (0, import_vitest.test)("a replacement socket supersedes stale open and connected events for the same client", async () => {
+    import_vitest.vi.useFakeTimers();
+    const lifecycle = [];
+    const transport = (0, import_httpPullTransport.installHttpPullTransport)({
+      origin: ORIGIN,
+      fetch: import_vitest.vi.fn(async () => jsonResponse({
+        cookie: null,
+        unchanged: true
+      })),
+      lifecycle: event => lifecycle.push(event)
+    });
+    transports.push(transport);
+    let connectStart = Date.now();
+    const errors = [];
+    const attachStockLifecycle = socket => {
+      socket.addEventListener("open", () => {
+        if (connectStart === void 0) {
+          errors.push("Got open event but connect start time is undefined.");
+        }
+      });
+      socket.addEventListener("message", event => {
+        const message = JSON.parse(String(event.data));
+        if (message[0] === "connected") connectStart = void 0;
+      });
+    };
+    const stale = openRawSocketWithMessages({
+      wsid: "stale"
+    }).socket;
+    attachStockLifecycle(stale);
+    const current = openRawSocketWithMessages({
+      wsid: "current"
+    }).socket;
+    attachStockLifecycle(current);
+    await import_vitest.vi.advanceTimersByTimeAsync(1);
+    (0, import_vitest.expect)(lifecycle.filter(event => event.type === "open").map(({
+      generation,
+      activeGeneration,
+      wsid
+    }) => [generation, activeGeneration, wsid])).toEqual([[2, 2, "current"]]);
+    (0, import_vitest.expect)(lifecycle).toContainEqual(import_vitest.expect.objectContaining({
+      type: "superseded",
+      generation: 1,
+      wsid: "stale"
+    }));
+    (0, import_vitest.expect)(errors).toEqual([]);
   });
   (0, import_vitest.test)("non-origin WebSockets pass through to the native implementation", () => {
     const previous = globalThis.WebSocket;
@@ -565,7 +675,9 @@ function createZero(options = {}) {
     storageKey: `zero-http-test-${++storageID}`,
     mutators: import_fixtureSchema.zeroHttpFixtureMutators,
     pingTimeoutMs: options.pingTimeoutMs,
-    onClientStateNotFound: options.onClientStateNotFound
+    onClientStateNotFound: options.onClientStateNotFound,
+    logLevel: options.logSink ? "debug" : void 0,
+    logSink: options.logSink
   });
   zeros.push(zero);
   return zero;
@@ -630,7 +742,7 @@ function openRawSocketWithMessages(opts) {
   url.searchParams.set("userID", "u1");
   url.searchParams.set("baseCookie", "");
   url.searchParams.set("lmid", "0");
-  url.searchParams.set("wsid", "ws-test");
+  url.searchParams.set("wsid", opts?.wsid ?? "ws-test");
   const messages = [];
   const socket = new WebSocket(url, encodeSecProtocol(["initConnection", {
     desiredQueriesPatch: opts?.desiredQueriesPatch ?? []

package/dist/cjs/httpPull/transport.test.native.js

@@ -512,26 +512,168 @@ var storageID = 0;
     cleanup();
     view.destroy();
   });
-  (0, import_vitest.test)("transient pull failures back off reconnect attempts", async function () {
-    var requests = [];
+  (0, import_vitest.test)("pull and push 500 reconnects keep socket opens on their current Zero attempt", async function () {
+    var lifecycle = [];
+    var zeroLogs = [];
+    var failPull = false;
+    var failPush = false;
     var fetch = import_vitest.vi.fn(async function (input, init) {
       var request = recordRequest(input, init);
-      requests.push(request);
-      (0, import_vitest.expect)(request.path).toBe("/pull");
-      throw new TypeError("Failed to fetch");
+      if (request.path === "/pull") {
+        if (failPull) {
+          failPull = false;
+          return jsonResponse({
+            error: "injected pull outage"
+          }, {
+            status: 500
+          });
+        }
+        return jsonResponse({
+          cookie: request.body.cookie,
+          unchanged: true
+        });
+      }
+      if (failPush) {
+        failPush = false;
+        return jsonResponse({
+          error: "injected push outage"
+        }, {
+          status: 500
+        });
+      }
+      var mutation2 = request.body.mutations[0];
+      return jsonResponse({
+        pushResponse: {
+          mutations: [{
+            id: {
+              clientID: mutation2.clientID,
+              id: mutation2.id
+            },
+            result: {}
+          }]
+        }
+      });
+    });
+    var transport = (0, import_httpPullTransport.installHttpPullTransport)({
+      origin: ORIGIN,
+      fetch,
+      lifecycle: function (event) {
+        return lifecycle.push(event);
+      }
+    });
+    transports.push(transport);
+    var zero = createZero({
+      logSink: {
+        log: function (_level, context) {
+          for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
+            args[_key - 2] = arguments[_key];
+          }
+          zeroLogs.push({
+            context: context !== null && context !== void 0 ? context : {},
+            args
+          });
+        }
+      }
     });
-    install(fetch);
-    createZero();
     await eventually(function () {
-      return (0, import_vitest.expect)(requests.length).toBe(1);
+      return (0, import_vitest.expect)(zero.connection.state.current.name).toBe("connected");
     });
-    await sleep(150);
-    (0, import_vitest.expect)(requests.length).toBe(1);
+    failPull = true;
+    await transport.pull().catch(function () {});
     await eventually(function () {
-      return (0, import_vitest.expect)(requests.length).toBe(2);
-    }, 1500);
-    await sleep(150);
-    (0, import_vitest.expect)(requests.length).toBe(2);
+      return (0, import_vitest.expect)(lifecycle.filter(function (event) {
+        return event.type === "open";
+      })).toHaveLength(2);
+    }, 5e3);
+    failPush = true;
+    var mutation = zero.mutate.project.create({
+      id: "p1",
+      ownerId: "u1",
+      name: "after reconnect"
+    });
+    await mutation.client;
+    await mutation.server.catch(function () {});
+    await eventually(function () {
+      return (0, import_vitest.expect)(lifecycle.filter(function (event) {
+        return event.type === "open";
+      })).toHaveLength(3);
+    }, 5e3);
+    await eventually(function () {
+      return (0, import_vitest.expect)(zero.connection.state.current.name).toBe("connected");
+    }, 5e3);
+    var opens = lifecycle.filter(function (event) {
+      return event.type === "open";
+    });
+    (0, import_vitest.expect)(opens.map(function (param) {
+      var {
+        generation,
+        activeGeneration
+      } = param;
+      return [generation, activeGeneration];
+    })).toEqual([[1, 1], [2, 2], [3, 3]]);
+    (0, import_vitest.expect)(zeroLogs.some(function (param) {
+      var {
+        args
+      } = param;
+      return args.some(function (arg) {
+        return String(arg).includes("connect start time is undefined");
+      });
+    })).toBe(false);
+  });
+  (0, import_vitest.test)("a replacement socket supersedes stale open and connected events for the same client", async function () {
+    import_vitest.vi.useFakeTimers();
+    var lifecycle = [];
+    var transport = (0, import_httpPullTransport.installHttpPullTransport)({
+      origin: ORIGIN,
+      fetch: import_vitest.vi.fn(async function () {
+        return jsonResponse({
+          cookie: null,
+          unchanged: true
+        });
+      }),
+      lifecycle: function (event) {
+        return lifecycle.push(event);
+      }
+    });
+    transports.push(transport);
+    var connectStart = Date.now();
+    var errors = [];
+    var attachStockLifecycle = function (socket) {
+      socket.addEventListener("open", function () {
+        if (connectStart === void 0) {
+          errors.push("Got open event but connect start time is undefined.");
+        }
+      });
+      socket.addEventListener("message", function (event) {
+        var message = JSON.parse(String(event.data));
+        if (message[0] === "connected") connectStart = void 0;
+      });
+    };
+    var stale = openRawSocketWithMessages({
+      wsid: "stale"
+    }).socket;
+    attachStockLifecycle(stale);
+    var current = openRawSocketWithMessages({
+      wsid: "current"
+    }).socket;
+    attachStockLifecycle(current);
+    await import_vitest.vi.advanceTimersByTimeAsync(1);
+    (0, import_vitest.expect)(lifecycle.filter(function (event) {
+      return event.type === "open";
+    }).map(function (param) {
+      var {
+        generation,
+        activeGeneration,
+        wsid
+      } = param;
+      return [generation, activeGeneration, wsid];
+    })).toEqual([[2, 2, "current"]]);
+    (0, import_vitest.expect)(lifecycle).toContainEqual(import_vitest.expect.objectContaining({
+      type: "superseded",
+      generation: 1,
+      wsid: "stale"
+    }));
+    (0, import_vitest.expect)(errors).toEqual([]);
   });
   (0, import_vitest.test)("non-origin WebSockets pass through to the native implementation", function () {
     var previous = globalThis.WebSocket;
@@ -653,7 +795,9 @@ function createZero() {
     storageKey: `zero-http-test-${++storageID}`,
     mutators: import_fixtureSchema.zeroHttpFixtureMutators,
     pingTimeoutMs: options.pingTimeoutMs,
-    onClientStateNotFound: options.onClientStateNotFound
+    onClientStateNotFound: options.onClientStateNotFound,
+    logLevel: options.logSink ? "debug" : void 0,
+    logSink: options.logSink
   });
   zeros.push(zero);
   return zero;
@@ -728,7 +872,8 @@ function openRawSocketWithMessages(opts) {
   url.searchParams.set("userID", "u1");
   url.searchParams.set("baseCookie", "");
   url.searchParams.set("lmid", "0");
-  url.searchParams.set("wsid", "ws-test");
+  var _opts_wsid;
+  url.searchParams.set("wsid", (_opts_wsid = opts === null || opts === void 0 ? void 0 : opts.wsid) !== null && _opts_wsid !== void 0 ? _opts_wsid : "ws-test");
   var messages = [];
   var _opts_desiredQueriesPatch, _opts_authToken;
   var socket = new WebSocket(url, encodeSecProtocol(["initConnection", {