fix(rpc): make sure Error is chained and ValidationError correctly ha…

…ndled
deepkit · May 27, 2024 · 5c49778 · 5c49778
1 parent 3b2c6cc
commit 5c49778
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/packages/framework/src/worker.ts b/packages/framework/src/worker.ts
@@ -123,8 +123,8 @@ export class RpcServer implements RpcServerInterface {
 
         server.on('connection', (ws, req: HttpRequest) => {
             const connection = createRpcConnection({
-                write(b) {
-                    ws.send(b);
+                writeBinary(message) {
+                    ws.send(message);
                 },
                 close() {
                     ws.close();

diff --git a/packages/rpc/src/client/client.ts b/packages/rpc/src/client/client.ts
@@ -9,7 +9,7 @@
  */
 
 import { asyncOperation, ClassType, formatError, sleep } from '@deepkit/core';
-import { ReceiveType, resolveReceiveType } from '@deepkit/type';
+import { ReceiveType, resolveReceiveType, ValidationError } from '@deepkit/type';
 import { BehaviorSubject, Observable, Subject } from 'rxjs';
 import {
     ControllerDefinition,
@@ -42,9 +42,6 @@ import {
 } from '../transport.js';
 
 export class OfflineError extends Error {
-    constructor(message: string = 'Offline') {
-        super(message);
-    }
 }
 
 type PromisifyFn<T extends ((...args: any[]) => any)> = (...args: Parameters<T>) => ReturnType<T> extends Promise<any> ? ReturnType<T> : Promise<ReturnType<T>>;
@@ -265,7 +262,7 @@ export class RpcClientTransporter {
 
                     onError: (error: Error) => {
                         this.onError(error);
-                        reject(new OfflineError(`Could not connect: ${formatError(error)}`));
+                        reject(new OfflineError(`Could not connect: ${formatError(error)}`, {cause: error}));
                     },
 
                     read: (message: RpcMessage) => {
@@ -312,7 +309,8 @@ export class RpcClientTransporter {
         try {
             this.writer(message, this.writerOptions, progress);
         } catch (error: any) {
-            throw new OfflineError(error);
+            if (error instanceof ValidationError) throw error;
+            throw new OfflineError(error, {cause: error});
         }
     }
 }
@@ -446,7 +444,6 @@ export class RpcBaseClient implements WritableClient {
         } else {
             const callback = this.replies.get(message.id);
             if (!callback) {
-                console.log(message.debug());
                 throw new Error('No callback for ' + message.id);
             }
             if (callback) callback(message);

diff --git a/packages/rpc/src/server/kernel.ts b/packages/rpc/src/server/kernel.ts
@@ -150,7 +150,7 @@ export class RpcMessageBuilder {
             if (this.logValidationErrors) {
                 this.logger.warn(this.errorLabel, error);
             }
-            throw new Error(this.errorLabel + ': ' + error.message);
+            throw new Error(this.errorLabel + ': ' + error.message, {cause: error});
         }
     }
 

diff --git a/packages/rpc/tsconfig.json b/packages/rpc/tsconfig.json
@@ -14,6 +14,11 @@
     "outDir": "./dist/cjs",
     "declaration": true,
     "composite": true,
+    "lib": [
+      "es2021",
+      "es2022.error",
+      "dom"
+    ],
     "types": [
       "dot-prop",
       "fs-extra",