pptx-react-viewer 2.19.3 → 2.19.5

package/dist/{y-websocket-DCTJ76B7.mjs → y-websocket-HUEA7LH7.mjs}

@@ -14,7 +14,7 @@ var readAuthMessage = (decoder, y, permissionDeniedHandler2) => {
 // ../../node_modules/.bun/lib0@0.2.117/node_modules/lib0/url.js
 var encodeQueryParams = (params) => map(params, (val, key) => `${encodeURIComponent(key)}=${encodeURIComponent(val)}`).join("&");
 
-// ../../node_modules/.bun/y-websocket@3.0.0+48ebd0cf55a3d4ab/node_modules/y-websocket/src/y-websocket.js
+// ../../node_modules/.bun/y-websocket@3.1.0+48ebd0cf55a3d4ab/node_modules/y-websocket/src/y-websocket.js
 var messageSync = 0;
 var messageQueryAwareness = 3;
 var messageAwareness = 1;
@@ -74,10 +74,16 @@ var readMessage = (provider, buf, emitSynced) => {
   }
   return encoder;
 };
+var defaultShouldReconnect = (event) => !(event.code >= 4400 && event.code < 4500);
 var closeWebsocketConnection = (provider, ws, event) => {
-  if (ws === provider.ws) {
+  if (ws !== null && ws === provider.ws) {
     provider.emit("connection-close", [event, provider]);
     provider.ws = null;
+    ws.onmessage = null;
+    ws.onopen = null;
+    ws.onclose = null;
+    ws.onerror = () => {
+    };
     ws.close();
     provider.wsconnecting = false;
     if (provider.wsconnected) {
@@ -93,8 +99,12 @@ var closeWebsocketConnection = (provider, ws, event) => {
       provider.emit("status", [{
         status: "disconnected"
       }]);
-    } else {
-      provider.wsUnsuccessfulReconnects++;
+    }
+    provider.wsUnsuccessfulReconnects++;
+    let terminalClose = null;
+    if (event != null && !provider.shouldReconnect(event, provider)) {
+      provider.shouldConnect = false;
+      terminalClose = { code: event.code, reason: event.reason };
     }
     setTimeout(
       setupWS,
@@ -104,6 +114,9 @@ var closeWebsocketConnection = (provider, ws, event) => {
       ),
       provider
     );
+    if (terminalClose !== null) {
+      provider.emit("closed", [terminalClose, provider]);
+    }
   }
 };
 var setupWS = (provider) => {
@@ -115,6 +128,7 @@ var setupWS = (provider) => {
     provider.wsconnected = false;
     provider.synced = false;
     websocket.onmessage = (event) => {
+      if (provider.ws !== websocket) return;
       provider.wsLastMessageReceived = getUnixTime();
       const encoder = readMessage(provider, new Uint8Array(event.data), true);
       if (length(encoder) > 1) {
@@ -122,16 +136,17 @@ var setupWS = (provider) => {
       }
     };
     websocket.onerror = (event) => {
+      if (provider.ws !== websocket) return;
       provider.emit("connection-error", [event, provider]);
     };
     websocket.onclose = (event) => {
       closeWebsocketConnection(provider, websocket, event);
     };
     websocket.onopen = () => {
+      if (provider.ws !== websocket) return;
       provider.wsLastMessageReceived = getUnixTime();
       provider.wsconnecting = false;
       provider.wsconnected = true;
-      provider.wsUnsuccessfulReconnects = 0;
       provider.emit("status", [{
         status: "connected"
       }]);
@@ -179,6 +194,7 @@ var WebsocketProvider = class extends ObservableV2 {
    * @param {number} [opts.resyncInterval] Request server state every `resyncInterval` milliseconds
    * @param {number} [opts.maxBackoffTime] Maximum amount of time to wait before trying to reconnect (we try to reconnect using exponential backoff)
    * @param {boolean} [opts.disableBc] Disable cross-tab BroadcastChannel communication
+   * @param {(event: CloseEvent, provider: WebsocketProvider) => boolean} [opts.shouldReconnect] Decide whether to reconnect after the server closed the connection. By default, close codes in the 4400-4499 range are permanent - we stop reconnecting and emit a `closed` event. This is never called for connections that were closed locally (e.g. via `provider.disconnect()`).
    */
   constructor(serverUrl, roomname, doc, {
     connect = true,
@@ -188,7 +204,8 @@ var WebsocketProvider = class extends ObservableV2 {
     WebSocketPolyfill = WebSocket,
     resyncInterval = -1,
     maxBackoffTime = 2500,
-    disableBc = false
+    disableBc = false,
+    shouldReconnect = defaultShouldReconnect
   } = {}) {
     super();
     while (serverUrl[serverUrl.length - 1] === "/") {
@@ -197,6 +214,7 @@ var WebsocketProvider = class extends ObservableV2 {
     this.serverUrl = serverUrl;
     this.bcChannel = serverUrl + "/" + roomname;
     this.maxBackoffTime = maxBackoffTime;
+    this.shouldReconnect = shouldReconnect;
     this.params = params;
     this.protocols = protocols;
     this.roomname = roomname;
@@ -291,6 +309,9 @@ var WebsocketProvider = class extends ObservableV2 {
   set synced(state) {
     if (this._synced !== state) {
       this._synced = state;
+      if (state) {
+        this.wsUnsuccessfulReconnects = 0;
+      }
       this.emit("synced", [state]);
       this.emit("sync", [state]);
     }

package/dist/{y-websocket-DQLOWGV6.js → y-websocket-YRPS7AFF.js}

@@ -16,7 +16,7 @@ var readAuthMessage = (decoder, y, permissionDeniedHandler2) => {
 // ../../node_modules/.bun/lib0@0.2.117/node_modules/lib0/url.js
 var encodeQueryParams = (params) => chunkZYQT7I5C_js.map(params, (val, key) => `${encodeURIComponent(key)}=${encodeURIComponent(val)}`).join("&");
 
-// ../../node_modules/.bun/y-websocket@3.0.0+48ebd0cf55a3d4ab/node_modules/y-websocket/src/y-websocket.js
+// ../../node_modules/.bun/y-websocket@3.1.0+48ebd0cf55a3d4ab/node_modules/y-websocket/src/y-websocket.js
 var messageSync = 0;
 var messageQueryAwareness = 3;
 var messageAwareness = 1;
@@ -76,10 +76,16 @@ var readMessage = (provider, buf, emitSynced) => {
   }
   return encoder;
 };
+var defaultShouldReconnect = (event) => !(event.code >= 4400 && event.code < 4500);
 var closeWebsocketConnection = (provider, ws, event) => {
-  if (ws === provider.ws) {
+  if (ws !== null && ws === provider.ws) {
     provider.emit("connection-close", [event, provider]);
     provider.ws = null;
+    ws.onmessage = null;
+    ws.onopen = null;
+    ws.onclose = null;
+    ws.onerror = () => {
+    };
     ws.close();
     provider.wsconnecting = false;
     if (provider.wsconnected) {
@@ -95,8 +101,12 @@ var closeWebsocketConnection = (provider, ws, event) => {
       provider.emit("status", [{
         status: "disconnected"
       }]);
-    } else {
-      provider.wsUnsuccessfulReconnects++;
+    }
+    provider.wsUnsuccessfulReconnects++;
+    let terminalClose = null;
+    if (event != null && !provider.shouldReconnect(event, provider)) {
+      provider.shouldConnect = false;
+      terminalClose = { code: event.code, reason: event.reason };
     }
     setTimeout(
       setupWS,
@@ -106,6 +116,9 @@ var closeWebsocketConnection = (provider, ws, event) => {
       ),
       provider
     );
+    if (terminalClose !== null) {
+      provider.emit("closed", [terminalClose, provider]);
+    }
   }
 };
 var setupWS = (provider) => {
@@ -117,6 +130,7 @@ var setupWS = (provider) => {
     provider.wsconnected = false;
     provider.synced = false;
     websocket.onmessage = (event) => {
+      if (provider.ws !== websocket) return;
       provider.wsLastMessageReceived = chunkZYQT7I5C_js.getUnixTime();
       const encoder = readMessage(provider, new Uint8Array(event.data), true);
       if (chunkZYQT7I5C_js.length(encoder) > 1) {
@@ -124,16 +138,17 @@ var setupWS = (provider) => {
       }
     };
     websocket.onerror = (event) => {
+      if (provider.ws !== websocket) return;
       provider.emit("connection-error", [event, provider]);
     };
     websocket.onclose = (event) => {
       closeWebsocketConnection(provider, websocket, event);
     };
     websocket.onopen = () => {
+      if (provider.ws !== websocket) return;
       provider.wsLastMessageReceived = chunkZYQT7I5C_js.getUnixTime();
       provider.wsconnecting = false;
       provider.wsconnected = true;
-      provider.wsUnsuccessfulReconnects = 0;
       provider.emit("status", [{
         status: "connected"
       }]);
@@ -181,6 +196,7 @@ var WebsocketProvider = class extends chunkZYQT7I5C_js.ObservableV2 {
    * @param {number} [opts.resyncInterval] Request server state every `resyncInterval` milliseconds
    * @param {number} [opts.maxBackoffTime] Maximum amount of time to wait before trying to reconnect (we try to reconnect using exponential backoff)
    * @param {boolean} [opts.disableBc] Disable cross-tab BroadcastChannel communication
+   * @param {(event: CloseEvent, provider: WebsocketProvider) => boolean} [opts.shouldReconnect] Decide whether to reconnect after the server closed the connection. By default, close codes in the 4400-4499 range are permanent - we stop reconnecting and emit a `closed` event. This is never called for connections that were closed locally (e.g. via `provider.disconnect()`).
    */
   constructor(serverUrl, roomname, doc, {
     connect = true,
@@ -190,7 +206,8 @@ var WebsocketProvider = class extends chunkZYQT7I5C_js.ObservableV2 {
     WebSocketPolyfill = WebSocket,
     resyncInterval = -1,
     maxBackoffTime = 2500,
-    disableBc = false
+    disableBc = false,
+    shouldReconnect = defaultShouldReconnect
   } = {}) {
     super();
     while (serverUrl[serverUrl.length - 1] === "/") {
@@ -199,6 +216,7 @@ var WebsocketProvider = class extends chunkZYQT7I5C_js.ObservableV2 {
     this.serverUrl = serverUrl;
     this.bcChannel = serverUrl + "/" + roomname;
     this.maxBackoffTime = maxBackoffTime;
+    this.shouldReconnect = shouldReconnect;
     this.params = params;
     this.protocols = protocols;
     this.roomname = roomname;
@@ -293,6 +311,9 @@ var WebsocketProvider = class extends chunkZYQT7I5C_js.ObservableV2 {
   set synced(state) {
     if (this._synced !== state) {
       this._synced = state;
+      if (state) {
+        this.wsUnsuccessfulReconnects = 0;
+      }
       this.emit("synced", [state]);
       this.emit("sync", [state]);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pptx-react-viewer",
-	"version": "2.19.3",
+	"version": "2.19.5",
 	"description": "React PowerPoint viewer and editor component: render, edit, and export PPTX slides in the browser.",
 	"keywords": [
 		"editor",
@@ -93,7 +93,7 @@
 		"typescript": "^7.0.2",
 		"vitest": "^4.1.10",
 		"y-webrtc": "^10.3.0",
-		"y-websocket": "^3.0.0",
+		"y-websocket": "^3.1.0",
 		"yjs": "^13.6.32"
 	},
 	"peerDependencies": {
@@ -121,7 +121,7 @@
 	"optionalDependencies": {
 		"three": "^0.185.1",
 		"y-webrtc": "^10.3.0",
-		"y-websocket": "^3.0.0",
+		"y-websocket": "^3.1.0",
 		"yjs": "^13.6.32"
 	}
 }