fix: changes to ObjectEmpty type to be in line with polykey

MatrixAI · Oct 30, 2023 · 92e5919 · 92e5919
1 parent fe7af00
commit 92e5919
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/middleware.ts b/src/middleware.ts
@@ -278,9 +278,9 @@ const defaultClientMiddlewareWrapper = (
 export {
   binaryToJsonMessageStream,
   jsonMessageToBinaryStream,
+  timeoutMiddlewareClient,
+  timeoutMiddlewareServer,
   defaultMiddleware,
   defaultServerMiddlewareWrapper,
   defaultClientMiddlewareWrapper,
-  timeoutMiddlewareClient,
-  timeoutMiddlewareServer,
 };
diff --git a/src/types.ts b/src/types.ts
@@ -110,7 +110,12 @@ type JSONRPCResponseError = {
   id: string | number | null;
 };
 
-type ObjectEmpty = NonNullable<unknown>;
+/**
+ * Used when an empty object is needed.
+ * Defined here with a linter override to avoid a false positive.
+ */
+// eslint-disable-next-line
+type ObjectEmpty = {};
 
 // Prevent overwriting the metadata type with `Omit<>`
 type JSONRPCRequestMetadata<T extends Record<string, JSONValue> = ObjectEmpty> =

diff --git a/src/utils.ts b/src/utils.ts
@@ -343,6 +343,7 @@ function toError(
         let e: Error;
         switch (eClass) {
           case AbstractError:
+          case errors.ErrorRPCTimedOut:
             e = eClass.fromJSON(errorData);
             break;
           case AggregateError: