chore(rpc): better error reporting when action call args is wrong

deepkit · Apr 8, 2024 · 9687e52 · 9687e52
1 parent da4cf82
commit 9687e52
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/packages/core/src/core.ts b/packages/core/src/core.ts
@@ -260,9 +260,7 @@ export function isObjectLiteral(obj: any): obj is { [key: string]: any } {
 /**
  * @public
  */
-export function isArray(obj: any): obj is any[] {
-    return Array.isArray(obj);
-}
+export const isArray: (obj: any) => obj is any[] = Array.isArray;
 
 /**
  * @public

diff --git a/packages/rpc/src/server/action.ts b/packages/rpc/src/server/action.ts
@@ -12,6 +12,7 @@ import {
     ClassType,
     collectForMicrotask,
     getClassName,
+    isArray,
     isPlainObject,
     isPrototypeOfBase,
     toFastProperties,
@@ -461,10 +462,16 @@ export class RpcServerAction {
             return response.error(`Validation error for arguments of ${getClassName(classType.controller)}.${body.method}: ${error.message}`);
         }
 
-        const controllerClassType = this.injector.get(classType.controller, classType.module);
-        if (!controllerClassType) {
+        const controllerInstance = this.injector.get(classType.controller, classType.module);
+        if (!controllerInstance) {
             response.error(new Error(`No instance of ${getClassName(classType.controller)} found.`));
         }
+
+        if (!isArray(value.args)) {
+            this.logger.error(`Invalid arguments for ${getClassName(classType.controller)}.${body.method} - expected array but got`, value.args);
+            return response.error(`Invalid arguments for ${getClassName(classType.controller)}.${body.method} - expected array.`);
+        }
+
         // const converted = types.parametersDeserialize(value.args);
         const errors: ValidationErrorItem[] = [];
         types.parametersValidate(value.args, { errors });
@@ -482,7 +489,8 @@ export class RpcServerAction {
         response.errorLabel = `Action ${getClassName(classType.controller)}.${body.method} return type serialization error`;
 
         try {
-            const result = await controllerClassType[body.method](...value.args);
+            const method = controllerInstance[body.method] as Function;
+            const result = await method.apply(controllerInstance, value.args);
 
             if (isEntitySubject(result)) {
                 response.reply(RpcTypes.ResponseEntity, { v: result.value }, types.resultSchema);