@hocuspocus/provider 2.3.0 → 2.3.1

package/dist/packages/provider/src/HocuspocusProviderWebsocket.d.ts

@@ -105,6 +105,7 @@ export declare class HocuspocusProviderWebsocket extends EventEmitter {
     resolveConnectionAttempt(): void;
     stopConnectionAttempt(): void;
     rejectConnectionAttempt(): void;
+    closeTries: number;
     checkConnection(): void;
     registerEventListeners(): void;
     get serverUrl(): string;

package/dist/packages/provider/src/types.d.ts

@@ -1,7 +1,8 @@
 import { Encoder } from 'lib0/encoding';
-import type { CloseEvent, Event, MessageEvent } from 'ws';
+import type { Event, MessageEvent } from 'ws';
 import { Awareness } from 'y-protocols/awareness';
 import * as Y from 'yjs';
+import { CloseEvent } from '@hocuspocus/common';
 import { IncomingMessage } from './IncomingMessage.js';
 import { OutgoingMessage } from './OutgoingMessage.js';
 import { AuthenticationMessage } from './OutgoingMessages/AuthenticationMessage.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hocuspocus/provider",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "hocuspocus provider",
   "homepage": "https://hocuspocus.dev",
   "keywords": [
@@ -29,7 +29,7 @@
     "dist"
   ],
   "dependencies": {
-    "@hocuspocus/common": "^2.3.0",
+    "@hocuspocus/common": "^2.3.1",
     "@lifeomic/attempt": "^3.0.2",
     "lib0": "^0.2.47",
     "ws": "^7.5.9"

package/src/HocuspocusProviderWebsocket.ts

@@ -350,6 +350,8 @@ export class HocuspocusProviderWebsocket extends EventEmitter {
     this.connectionAttempt = null
   }
 
+  closeTries = 0
+
   checkConnection() {
     // Don’t check the connection when it’s not even established
     if (this.status !== WebSocketStatus.Connected) {
@@ -368,8 +370,21 @@ export class HocuspocusProviderWebsocket extends EventEmitter {
 
     // No message received in a long time, not even your own
     // Awareness updates, which are updated every 15 seconds.
-    this.webSocket?.close()
-    this.messageQueue = []
+    this.closeTries += 1
+    // https://bugs.webkit.org/show_bug.cgi?id=247943
+    if (this.closeTries > 2) {
+      this.onClose({
+        event: {
+          code: 4408,
+          reason: 'forced',
+        },
+      })
+      this.closeTries = 0
+    } else {
+      this.webSocket?.close()
+      this.messageQueue = []
+    }
+
   }
 
   registerEventListeners() {
@@ -419,6 +434,7 @@ export class HocuspocusProviderWebsocket extends EventEmitter {
   }
 
   onClose({ event }: onCloseParameters) {
+    this.closeTries = 0
     this.webSocket = null
 
     if (this.status === WebSocketStatus.Connected) {

package/src/types.ts

@@ -1,7 +1,8 @@
 import { Encoder } from 'lib0/encoding'
-import type { CloseEvent, Event, MessageEvent } from 'ws'
+import type { Event, MessageEvent } from 'ws'
 import { Awareness } from 'y-protocols/awareness'
 import * as Y from 'yjs'
+import { CloseEvent } from '@hocuspocus/common'
 import { IncomingMessage } from './IncomingMessage.js'
 import { OutgoingMessage } from './OutgoingMessage.js'
 import { AuthenticationMessage } from './OutgoingMessages/AuthenticationMessage.js'