@opra/socketio 1.22.7 → 1.22.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/socketio",
-  "version": "1.22.7",
+  "version": "1.22.9",
   "description": "Opra Socket.IO adapter",
   "author": "Panates",
   "license": "MIT",
@@ -14,8 +14,8 @@
     "valgen": "^5.19.4"
   },
   "peerDependencies": {
-    "@opra/common": "^1.22.7",
-    "@opra/core": "^1.22.7",
+    "@opra/common": "^1.22.9",
+    "@opra/core": "^1.22.9",
     "socket.io": ">=4.0.0"
   },
   "type": "module",

package/socketio-adapter.js

@@ -41,6 +41,8 @@ export class SocketioAdapter extends PlatformAdapter {
         return this._scope;
     }
     async close() {
+        if (!this.server.engine)
+            return;
         return this.server.close().finally(() => {
             this._controllerInstances.clear();
             this._eventsRegByName.clear();
@@ -109,12 +111,13 @@ export class SocketioAdapter extends PlatformAdapter {
             this.emit('error', error, socket, this);
         });
         socket.onAny((event, ...args) => {
-            const callback = args.length > 0 ? args[args.length - 1] : null;
+            const callback = args.length > 0 && typeof args[args.length - 1] === 'function'
+                ? args[args.length - 1]
+                : null;
             const reg = this._eventsRegByName.get(event) ||
                 this._eventsRegByPattern.find(r => r.event.test(event));
             if (!reg) {
-                if (callback)
-                    callback(new OpraException(`Unknown event "${event}"`));
+                callback?.(new OpraException(`Unknown event "${event}"`));
                 return;
             }
             Promise.resolve().then(async () => {
@@ -148,13 +151,17 @@ export class SocketioAdapter extends PlatformAdapter {
                         i++;
                     }
                     let x = await reg.handler.apply(reg.contDef.instance, callArgs);
-                    if (reg.encoder)
-                        x = reg.encoder(x);
-                    callback(x);
+                    if (callback) {
+                        if (reg.encoder)
+                            x = reg.encoder(x);
+                        callback(x);
+                    }
                 }
                 catch (err) {
-                    const error = err instanceof OpraException ? err : new OpraException(err);
-                    callback({ errors: [error] });
+                    if (callback) {
+                        const error = err instanceof OpraException ? err : new OpraException(err);
+                        callback({ errors: [error] });
+                    }
                 }
             });
         });