Merge branch 'yjs:master' into master

Author: scenaristeur

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "y-websocket",
-  "version": "1.5.0",
+  "version": "1.5.3",
   "description": "Websockets provider for Yjs",
   "main": "./dist/y-websocket.cjs",
   "module": "./src/y-websocket.js",
@@ -33,7 +33,8 @@
     ".": {
       "module": "./src/y-websocket.js",
       "import": "./src/y-websocket.js",
-      "require": "./dist/y-websocket.cjs"
+      "require": "./dist/y-websocket.cjs",
+      "types": "./dist/src/y-websocket.d.ts"
     }
   },
   "repository": {
@@ -73,5 +74,9 @@
   "optionalDependencies": {
     "ws": "^6.2.1",
     "y-leveldb": "^0.1.0"
+  },
+  "engines": {
+    "npm": ">=8.0.0",
+    "node": ">=16.0.0"
   }
 }

package.json

@@ -15,6 +15,7 @@ import * as awarenessProtocol from 'y-protocols/awareness'
 import { Observable } from 'lib0/observable'
 import * as math from 'lib0/math'
 import * as url from 'lib0/url'
+import * as env from 'lib0/environment'
 
 export const messageSync = 0
 export const messageQueryAwareness = 3
@@ -350,17 +351,15 @@ export class WebsocketProvider extends Observable {
       )
       broadcastMessage(this, encoding.toUint8Array(encoder))
     }
-    this._unloadHandler = () => {
+    this._exitHandler = () => {
       awarenessProtocol.removeAwarenessStates(
         this.awareness,
         [doc.clientID],
-        'window unload'
+        'app closed'
       )
     }
-    if (typeof window !== 'undefined') {
-      window.addEventListener('unload', this._unloadHandler)
-    } else if (typeof process !== 'undefined') {
-      process.on('exit', this._unloadHandler)
+    if (env.isNode && typeof process !== 'undefined') {
+      process.on('exit', this._exitHandler)
     }
     awareness.on('update', this._awarenessUpdateHandler)
     this._checkInterval = /** @type {any} */ (setInterval(() => {
@@ -400,10 +399,8 @@ export class WebsocketProvider extends Observable {
     }
     clearInterval(this._checkInterval)
     this.disconnect()
-    if (typeof window !== 'undefined') {
-      window.removeEventListener('unload', this._unloadHandler)
-    } else if (typeof process !== 'undefined') {
-      process.off('exit', this._unloadHandler)
+    if (typeof process !== 'undefined') {
+      process.off('exit', this._exitHandler)
     }
     this.awareness.off('update', this._awarenessUpdateHandler)
     this.doc.off('update', this._updateHandler)