From 69db4566ecf4381fcc58628e67e9d0eca64f125d Mon Sep 17 00:00:00 2001
From: David Ludwig <davidludwigii@gmail.com>
Date: Thu, 24 Jun 2021 15:51:43 -0500
Subject: [PATCH] Fix error types in IPC package

---
 packages/ipc/src/IpcClientService.ts |  8 ++++----
 packages/ipc/src/IpcError.ts         | 10 ++--------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/packages/ipc/src/IpcClientService.ts b/packages/ipc/src/IpcClientService.ts
index 935812e..7a3975d 100644
--- a/packages/ipc/src/IpcClientService.ts
+++ b/packages/ipc/src/IpcClientService.ts
@@ -123,8 +123,8 @@ export abstract class IpcClientService<M extends Microservice = Microservice> ex
     /**
      * Perform a general request and wait for a response
      */
-    protected async request<T = any>(method: string, data?: T, timeout: number|null = null) {
-        return new Promise<IIpcResponse<T>>((resolve, reject) => {
+    protected async request<T = any>(method: string, data?: any, timeout: number|null = null) {
+        return new Promise<T>((resolve, reject) => {
             // If the client is not connected to a server, reject immediately
             if (!this.__isConnected || this.__socket === null) {
                 reject(new IpcConnectionError("Not connected"));
@@ -146,10 +146,10 @@ export abstract class IpcClientService<M extends Microservice = Microservice> ex
             let respond = (response: IIpcResponse<T>) => {
                 cleanUp();
                 if (response.error !== undefined) {
-                    reject(new IpcResponseError<T>(response.error, response.data));
+                    reject(new IpcResponseError<T>(response.error));
                     return;
                 }
-                resolve(response);
+                resolve(response.data);
             };
             // Abort the request
             let abort = (error: IpcError) => {
diff --git a/packages/ipc/src/IpcError.ts b/packages/ipc/src/IpcError.ts
index d955436..8437ef3 100644
--- a/packages/ipc/src/IpcError.ts
+++ b/packages/ipc/src/IpcError.ts
@@ -32,14 +32,8 @@ export class IpcTimeoutError extends IpcError {
  * IPC response error type
  */
 export class IpcResponseError<T> extends IpcError {
-	/**
-	 * Store the response data
-	 */
-	public readonly data: T;
-
-	constructor(message: string, data: T) {
-		super(message);
-		this.data = data;
+	constructor(...args: any[]) {
+		super(...args);
 		Object.setPrototypeOf(this, IpcResponseError.prototype);
 	}
 }