@xnetjs/runtime 0.3.0 → 0.3.2

package/dist/index.d.ts

@@ -605,10 +605,7 @@ declare class WebSocketSyncProvider {
     readonly url: string;
     readonly awareness: Awareness;
     private ws;
-    private reconnectDelay;
-    private maxReconnectAttempts;
-    private reconnectAttempts;
-    private reconnectTimer;
+    private reconnectScheduler;
     private destroyed;
     private connected;
     private synced;

package/dist/index.js

@@ -147,6 +147,43 @@ function createBlobSyncProvider(config) {
   };
 }
 
+// src/sync/connection-manager.ts
+import { capped, exponential, fixed, jittered, limitAttempts } from "@xnetjs/core";
+
+// src/sync/reconnect-scheduler.ts
+function createReconnectScheduler(options) {
+  let attempts = 0;
+  let timer = null;
+  return {
+    get attempts() {
+      return attempts;
+    },
+    get pending() {
+      return timer !== null;
+    },
+    schedule() {
+      if (timer) return false;
+      const delay = options.policy().delayFor(attempts + 1);
+      if (delay === null) return false;
+      attempts++;
+      timer = setTimeout(() => {
+        timer = null;
+        options.onRetry();
+      }, delay);
+      return true;
+    },
+    reset() {
+      attempts = 0;
+    },
+    cancel() {
+      if (timer) {
+        clearTimeout(timer);
+        timer = null;
+      }
+    }
+  };
+}
+
 // src/sync/connection-manager.ts
 function log(...args) {
   if (typeof localStorage !== "undefined" && localStorage.getItem("xnet:sync:debug") === "true") {
@@ -156,8 +193,6 @@ function log(...args) {
 function createConnectionManager(config) {
   let ws = null;
   let status = "disconnected";
-  let reconnectAttempts = 0;
-  let reconnectTimer = null;
   let connectTimer = null;
   let destroyed = false;
   let connectInProgress = false;
@@ -168,6 +203,15 @@ function createConnectionManager(config) {
   const maxReconnects = config.maxReconnects ?? Infinity;
   const connectTimeout = config.connectTimeout ?? 1e4;
   const initialConnectTimeout = config.initialConnectTimeout ?? (connectTimeout > 0 ? Math.min(connectTimeout, 6e3) : 0);
+  const reconnectPolicy = limitAttempts(
+    capped(exponential(reconnectDelay), maxReconnectDelay),
+    maxReconnects
+  );
+  const rateLimitPolicy = limitAttempts(jittered(fixed(rateLimitBackoffMs)), maxReconnects);
+  const reconnectScheduler = createReconnectScheduler({
+    policy: () => policyViolation ? rateLimitPolicy : reconnectPolicy,
+    onRetry: () => void doConnect()
+  });
   function clearConnectTimer() {
     if (connectTimer) {
       clearTimeout(connectTimer);
@@ -197,7 +241,7 @@ function createConnectionManager(config) {
     scheduleReconnect();
   }
   function armConnectTimeout() {
-    const timeout = reconnectAttempts === 0 ? initialConnectTimeout : connectTimeout;
+    const timeout = reconnectScheduler.attempts === 0 ? initialConnectTimeout : connectTimeout;
     if (timeout <= 0 || !Number.isFinite(timeout)) return;
     connectTimer = setTimeout(onConnectTimeout, timeout);
   }
@@ -317,7 +361,7 @@ function createConnectionManager(config) {
         connectInProgress = false;
         log("WebSocket connected");
         setStatus("connected");
-        reconnectAttempts = 0;
+        reconnectScheduler.reset();
         policyViolation = false;
         if (rooms.size > 0) {
           const roomList = Array.from(rooms.keys());
@@ -350,20 +394,10 @@ function createConnectionManager(config) {
     }
   }
   function scheduleReconnect() {
-    if (destroyed || reconnectAttempts >= maxReconnects) return;
-    if (reconnectTimer) return;
-    reconnectAttempts++;
-    let backoff;
-    if (policyViolation) {
+    if (destroyed) return;
+    if (reconnectScheduler.schedule()) {
       policyViolation = false;
-      backoff = rateLimitBackoffMs + Math.floor(Math.random() * rateLimitBackoffMs * 0.5);
-    } else {
-      backoff = Math.min(reconnectDelay * 2 ** (reconnectAttempts - 1), maxReconnectDelay);
     }
-    reconnectTimer = setTimeout(() => {
-      reconnectTimer = null;
-      void doConnect();
-    }, backoff);
   }
   return {
     get status() {
@@ -379,10 +413,7 @@ function createConnectionManager(config) {
     disconnect() {
       destroyed = true;
       clearConnectTimer();
-      if (reconnectTimer) {
-        clearTimeout(reconnectTimer);
-        reconnectTimer = null;
-      }
+      reconnectScheduler.cancel();
       if (ws) {
         if (rooms.size > 0) {
           send({ type: "unsubscribe", topics: Array.from(rooms.keys()) });
@@ -2283,7 +2314,7 @@ function createSyncManager(config) {
       log2("Connecting to signaling server...");
       connection.connect();
       nodeSyncProvider?.attach(connection);
-      for (const provider of shareRoomProviders.values()) provider.attach(connection);
+      for (const entry of shareRoomProviders.values()) entry.provider.attach(connection);
       blobSync?.start();
       const tracked = registry.getTracked();
       log2("Joining rooms for", tracked.length, "tracked nodes");
@@ -2301,7 +2332,7 @@ function createSyncManager(config) {
       });
       blobSync?.stop();
       nodeSyncProvider?.detach();
-      for (const provider of shareRoomProviders.values()) provider.detach();
+      for (const entry of shareRoomProviders.values()) entry.provider.detach();
       shareRoomProviders.clear();
       for (const nodeId of Array.from(roomCleanups.keys())) {
         leaveNodeRoom(nodeId);
@@ -2332,15 +2363,21 @@ function createSyncManager(config) {
       leaveNodeRoom(nodeId);
     },
     subscribeShareRoom(room) {
-      if (shareRoomProviders.has(room)) return;
+      const existing = shareRoomProviders.get(room);
+      if (existing) {
+        existing.refs += 1;
+        return;
+      }
       const provider = new NodeStoreSyncProvider(config.nodeStore, room, true);
-      shareRoomProviders.set(room, provider);
+      shareRoomProviders.set(room, { provider, refs: 1 });
       provider.attach(connection);
     },
     unsubscribeShareRoom(room) {
-      const provider = shareRoomProviders.get(room);
-      if (!provider) return;
-      provider.detach();
+      const entry = shareRoomProviders.get(room);
+      if (!entry) return;
+      entry.refs -= 1;
+      if (entry.refs > 0) return;
+      entry.provider.detach();
       shareRoomProviders.delete(room);
     },
     async acquire(nodeId) {
@@ -2859,6 +2896,7 @@ async function runAdapterConformance(makeClient) {
 }
 
 // src/sync/WebSocketSyncProvider.ts
+import { fixed as fixed2, limitAttempts as limitAttempts2 } from "@xnetjs/core";
 import { resolveSyncReplicationPolicy as resolveSyncReplicationPolicy2, signYjsUpdate as signYjsUpdate2, verifyYjsEnvelopeV1 as verifyYjsEnvelopeV12 } from "@xnetjs/sync";
 import {
   Awareness as Awareness2,
@@ -2924,10 +2962,7 @@ var WebSocketSyncProvider = class {
   url;
   awareness;
   ws = null;
-  reconnectDelay;
-  maxReconnectAttempts;
-  reconnectAttempts = 0;
-  reconnectTimer = null;
+  reconnectScheduler;
   destroyed = false;
   connected = false;
   synced = false;
@@ -2941,8 +2976,14 @@ var WebSocketSyncProvider = class {
     this.room = options.room;
     this.url = options.url;
     this.options = options;
-    this.reconnectDelay = options.reconnectDelay ?? 2e3;
-    this.maxReconnectAttempts = options.maxReconnectAttempts ?? Infinity;
+    const reconnectPolicy = limitAttempts2(
+      fixed2(options.reconnectDelay ?? 2e3),
+      options.maxReconnectAttempts ?? Infinity
+    );
+    this.reconnectScheduler = createReconnectScheduler({
+      policy: () => reconnectPolicy,
+      onRetry: () => this._connect()
+    });
     this.replicationPolicy = resolveSyncReplicationPolicy2(options.replication);
     this.peerId = Math.random().toString(36).slice(2, 10);
     this.awareness = new Awareness2(doc);
@@ -2982,10 +3023,7 @@ var WebSocketSyncProvider = class {
     this.doc.off("update", this._onDocUpdate);
     this.awareness.off("update", this._onAwarenessUpdate);
     removeAwarenessStates2(this.awareness, [this.doc.clientID], this);
-    if (this.reconnectTimer) {
-      clearTimeout(this.reconnectTimer);
-      this.reconnectTimer = null;
-    }
+    this.reconnectScheduler.cancel();
     if (this.ws) {
       this._send({ type: "unsubscribe", topics: [this.room] });
       this.ws.close();
@@ -3002,7 +3040,7 @@ var WebSocketSyncProvider = class {
       this.ws.onopen = () => {
         log3(this, "WebSocket connected to", this.url);
         this.connected = true;
-        this.reconnectAttempts = 0;
+        this.reconnectScheduler.reset();
         this.emit("status", { connected: true });
         log3(this, "Subscribing to room:", this.room);
         this._send({ type: "subscribe", topics: [this.room] });
@@ -3049,11 +3087,7 @@ var WebSocketSyncProvider = class {
   }
   _scheduleReconnect() {
     if (this.destroyed) return;
-    if (this.reconnectAttempts >= this.maxReconnectAttempts) return;
-    this.reconnectAttempts++;
-    this.reconnectTimer = setTimeout(() => {
-      this._connect();
-    }, this.reconnectDelay);
+    this.reconnectScheduler.schedule();
   }
   _send(msg) {
     if (this.ws?.readyState === WebSocket.OPEN) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xnetjs/runtime",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Framework-agnostic xNet runtime: createXNetClient() and sync orchestration, usable from any framework, a CLI, a worker, or a Node service",
   "license": "MIT",
   "repository": {
@@ -28,15 +28,15 @@
   "dependencies": {
     "y-protocols": "^1.0.6",
     "yjs": "^13.6.24",
-    "@xnetjs/core": "0.11.0",
-    "@xnetjs/data": "0.11.0",
-    "@xnetjs/crypto": "0.11.0",
-    "@xnetjs/data-bridge": "0.11.0",
-    "@xnetjs/history": "0.11.0",
-    "@xnetjs/identity": "0.11.0",
-    "@xnetjs/plugins": "0.11.0",
-    "@xnetjs/storage": "0.11.0",
-    "@xnetjs/sync": "0.11.0"
+    "@xnetjs/core": "0.12.0",
+    "@xnetjs/crypto": "0.12.0",
+    "@xnetjs/data": "0.12.0",
+    "@xnetjs/data-bridge": "0.12.0",
+    "@xnetjs/history": "0.12.0",
+    "@xnetjs/identity": "0.12.0",
+    "@xnetjs/plugins": "0.12.0",
+    "@xnetjs/storage": "0.12.0",
+    "@xnetjs/sync": "0.12.0"
   },
   "devDependencies": {
     "jsdom": "^26.0.0",