@opra/socketio 1.22.9 → 1.23.2

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@opra/socketio",
-  "version": "1.22.9",
+  "version": "1.23.2",
   "description": "Opra Socket.IO adapter",
   "author": "Panates",
   "license": "MIT",
   "dependencies": {
-    "@jsopen/objects": "^2.0.2",
+    "@jsopen/objects": "^2.1.1",
     "@browsery/type-is": "^2.0.1",
     "content-type": "^1.0.5",
     "iconv-lite": "^0.7.2",
@@ -14,8 +14,8 @@
     "valgen": "^5.19.4"
   },
   "peerDependencies": {
-    "@opra/common": "^1.22.9",
-    "@opra/core": "^1.22.9",
+    "@opra/common": "^1.23.2",
+    "@opra/core": "^1.23.2",
     "socket.io": ">=4.0.0"
   },
   "type": "module",

package/socketio-adapter.d.ts

@@ -4,6 +4,7 @@ import type * as http from 'http';
 import type * as http2 from 'http2';
 import type * as https from 'https';
 import * as socketio from 'socket.io';
+import { type Validator } from 'valgen';
 import { SocketioContext } from './socketio-context.js';
 type TServerInstance = http.Server | https.Server | http2.Http2SecureServer | http2.Http2Server;
 /**
@@ -12,6 +13,7 @@ type TServerInstance = http.Server | https.Server | http2.Http2SecureServer | ht
  */
 export declare class SocketioAdapter extends PlatformAdapter<SocketioAdapter.Events> {
     static readonly PlatformName = "socketio";
+    protected _operationResultEncoder: Validator;
     protected _controllerInstances: Map<WSController, any>;
     protected _eventsRegByName: Map<string, MessageHandlerReg>;
     protected _eventsRegByPattern: MessageHandlerReg[];

package/socketio-adapter.js

@@ -1,4 +1,5 @@
-import { OpraException, WSApi, } from '@opra/common';
+import { updateErrorMessage } from '@jsopen/objects';
+import { OperationResult, OpraException, WSApi, } from '@opra/common';
 import { PlatformAdapter } from '@opra/core';
 import * as socketio from 'socket.io';
 import { vg } from 'valgen';
@@ -9,6 +10,7 @@ import { SocketioContext } from './socketio-context.js';
  */
 export class SocketioAdapter extends PlatformAdapter {
     static PlatformName = 'socketio';
+    _operationResultEncoder;
     _controllerInstances = new Map();
     _eventsRegByName = new Map();
     _eventsRegByPattern = [];
@@ -33,6 +35,11 @@ export class SocketioAdapter extends PlatformAdapter {
             this._initSocket(socket);
             this.emit('connection', socket, this);
         });
+        const operationResultType = document.node.getDataType(OperationResult);
+        this._operationResultEncoder = operationResultType.generateCodec('encode', {
+            scope: this.scope,
+            ignoreWriteonlyFields: true,
+        });
     }
     get api() {
         return this.document.getWsApi();
@@ -114,14 +121,13 @@ export class SocketioAdapter extends PlatformAdapter {
             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) {
-                callback?.(new OpraException(`Unknown event "${event}"`));
-                return;
-            }
             Promise.resolve().then(async () => {
                 try {
+                    const reg = this._eventsRegByName.get(event) ||
+                        this._eventsRegByPattern.find(r => r.event.test(event));
+                    if (!reg) {
+                        throw new OpraException(`Unknown event "${event}"`);
+                    }
                     const inputParameters = callback ? args.slice(0, -1) : args;
                     const ctx = new SocketioContext({
                         __adapter: this,
@@ -145,22 +151,30 @@ export class SocketioAdapter extends PlatformAdapter {
                                 callArgs.push(v);
                         }
                         catch (err) {
-                            err.message = `Failed to decode parameter ${i} of event "${event}": ${err.message}`;
+                            updateErrorMessage(err, `Failed to decode parameter ${i} of event "${event}": ${err.message}`);
                             throw err;
                         }
                         i++;
                     }
-                    let x = await reg.handler.apply(reg.contDef.instance, callArgs);
+                    const resp = await reg.handler.apply(reg.contDef.instance, callArgs);
                     if (callback) {
+                        let out;
                         if (reg.encoder)
-                            x = reg.encoder(x);
-                        callback(x);
+                            out = reg.encoder(resp);
+                        if (!(resp instanceof OperationResult))
+                            out = this._operationResultEncoder({
+                                payload: out,
+                            });
+                        callback(out);
                     }
                 }
                 catch (err) {
                     if (callback) {
                         const error = err instanceof OpraException ? err : new OpraException(err);
-                        callback({ errors: [error] });
+                        const out = this._operationResultEncoder({
+                            errors: [error],
+                        });
+                        callback(out);
                     }
                 }
             });