wapi-client 0.9.5 → 0.9.6

package/dist/lib/errors.js

@@ -16,6 +16,7 @@ var __spreadValues = (a, b) => {
 };
 
 // src/lib/errors.ts
+import { debugLog } from "./debug";
 var ERROR_GROUPS = {
   JSONRPC: {
     min: -32700,
@@ -466,9 +467,9 @@ var WAPIError = class extends Error {
     var _a;
     super(message);
     const errorType = (_a = ERRORS[type]) != null ? _a : ERRORS.INTERNAL_SERVER_ERROR;
-    this.type = ERRORS[type] ? type : ERROR_TYPES.INTERNAL_SERVER_ERROR;
-    this.code = code || errorType.code;
-    this.message = message || errorType.message;
+    this.type = type != null ? type : ERROR_TYPES.INTERNAL_SERVER_ERROR;
+    this.code = code != null ? code : errorType.code;
+    this.message = message != null ? message : errorType.message;
     this.data = __spreadValues({
       description: errorType.description
     }, data && typeof data === "object" ? data : { error: data });
@@ -482,11 +483,12 @@ var WAPIError = class extends Error {
   }
 };
 var JSONRPCError = class extends WAPIError {
-  constructor(type, data, message) {
+  constructor(type, data, message, code) {
     super({
       type,
       message,
-      data
+      data,
+      code
     });
   }
   static get group() {
@@ -497,11 +499,12 @@ var JSONRPCError = class extends WAPIError {
   }
 };
 var StreamError = class extends WAPIError {
-  constructor(type, data, message) {
+  constructor(type, data, message, code) {
     super({
       type,
       message,
-      data
+      data,
+      code
     });
   }
   static get group() {
@@ -512,11 +515,12 @@ var StreamError = class extends WAPIError {
   }
 };
 var InputError = class extends WAPIError {
-  constructor(type, data, message) {
+  constructor(type, data, message, code) {
     super({
       type,
       message,
-      data
+      data,
+      code
     });
   }
   static get group() {
@@ -527,11 +531,12 @@ var InputError = class extends WAPIError {
   }
 };
 var ConfigError = class extends WAPIError {
-  constructor(type, data, message) {
+  constructor(type, data, message, code) {
     super({
       type,
       message,
-      data
+      data,
+      code
     });
   }
   static get group() {
@@ -542,11 +547,12 @@ var ConfigError = class extends WAPIError {
   }
 };
 var AuthError = class extends WAPIError {
-  constructor(type, data, message) {
+  constructor(type, data, message, code) {
     super({
       type,
       message,
-      data
+      data,
+      code
     });
   }
   static get group() {
@@ -557,11 +563,12 @@ var AuthError = class extends WAPIError {
   }
 };
 var ConstraintError = class extends WAPIError {
-  constructor(type, data, message) {
+  constructor(type, data, message, code) {
     super({
       type,
       message,
-      data
+      data,
+      code
     });
   }
   static get group() {
@@ -633,8 +640,11 @@ var ERROR_CODE_TO_TYPE = Object.fromEntries(
 function categorizeErrorCode(code) {
   const type = ERROR_CODE_TO_TYPE[code];
   if (!type) {
+    const group2 = Object.entries(ERROR_GROUPS).find(
+      ([key, group3]) => code >= group3.min && code <= group3.max
+    );
     return {
-      group: void 0,
+      group: group2 == null ? void 0 : group2[0],
       type: void 0
     };
   }
@@ -654,8 +664,15 @@ function categorizeErrorCode(code) {
   };
 }
 function getError({ code, message, data }) {
-  const { group, type } = categorizeErrorCode(code);
+  let { group, type } = categorizeErrorCode(code);
   message = message && message !== type ? message : ERRORS[type].description;
+  let novelCode = void 0;
+  if (group && group !== "JSONRPC" && type === void 0) {
+    debugLog("Novel error from server", code, message, data);
+    type = message;
+    novelCode = code;
+    message = typeof data === "object" && "description" in data && typeof data.description === "string" ? data.description : message;
+  }
   switch (group) {
     case "JSONRPC":
       return new JSONRPCError(
@@ -667,31 +684,36 @@ function getError({ code, message, data }) {
       return new AuthError(
         type,
         data,
-        message
+        message,
+        novelCode
       );
     case "CONFIG":
       return new ConfigError(
         type,
         data,
-        message
+        message,
+        novelCode
       );
     case "CONSTRAINT":
       return new ConstraintError(
         type,
         data,
-        message
+        message,
+        novelCode
       );
     case "INPUT":
       return new InputError(
         type,
         data,
-        message
+        message,
+        novelCode
       );
     case "STREAM":
       return new StreamError(
         type,
         data,
-        message
+        message,
+        novelCode
       );
     default:
       return new WAPIError({

package/dist/types/index.d.ts

@@ -1023,7 +1023,7 @@ declare module 'wapi-client/lib/errors' {
     }
     export type JSONRPCErrorData = unknown;
     export class JSONRPCError extends WAPIError {
-        constructor(type: keyof typeof ERROR_GROUPS.JSONRPC.ERRORS, data?: JSONRPCErrorData, message?: string);
+        constructor(type: keyof typeof ERROR_GROUPS.JSONRPC.ERRORS, data?: JSONRPCErrorData, message?: string, code?: number);
         static get group(): {
             PARSE_ERROR: {
                 code: number;
@@ -1070,7 +1070,7 @@ declare module 'wapi-client/lib/errors' {
         value: unknown;
     };
     export class StreamError extends WAPIError {
-        constructor(type: keyof typeof ERROR_GROUPS.STREAM.ERRORS, data: StreamErrorData, message?: string);
+        constructor(type: keyof typeof ERROR_GROUPS.STREAM.ERRORS, data: StreamErrorData, message?: string, code?: number);
         static get group(): {
             CONNECTION_LOST: {
                 code: number;
@@ -1120,7 +1120,7 @@ declare module 'wapi-client/lib/errors' {
     }
     export type InputErrorData = unknown;
     export class InputError extends WAPIError {
-        constructor(type: keyof typeof ERROR_GROUPS.INPUT.ERRORS, data?: InputErrorData, message?: string);
+        constructor(type: keyof typeof ERROR_GROUPS.INPUT.ERRORS, data?: InputErrorData, message?: string, code?: number);
         static get group(): {
             HTTP_BODY_SIZE: {
                 code: number;
@@ -1354,7 +1354,7 @@ declare module 'wapi-client/lib/errors' {
         timeout: number;
     };
     export class ConfigError extends WAPIError {
-        constructor(type: keyof typeof ERROR_GROUPS.CONFIG.ERRORS, data: ConfigErrorData, message?: string);
+        constructor(type: keyof typeof ERROR_GROUPS.CONFIG.ERRORS, data: ConfigErrorData, message?: string, code?: number);
         static get group(): {
             METHOD_DISABLED: {
                 code: number;
@@ -1386,7 +1386,7 @@ declare module 'wapi-client/lib/errors' {
     }
     export type AuthErrorData = unknown;
     export class AuthError extends WAPIError {
-        constructor(type: keyof typeof ERROR_GROUPS.AUTH.ERRORS, data?: AuthErrorData, message?: string);
+        constructor(type: keyof typeof ERROR_GROUPS.AUTH.ERRORS, data?: AuthErrorData, message?: string, code?: number);
         static get group(): {
             AUTHENTICATION_ERROR: {
                 code: number;
@@ -1406,7 +1406,7 @@ declare module 'wapi-client/lib/errors' {
     }
     export type ConstraintErrorData = unknown;
     export class ConstraintError extends WAPIError {
-        constructor(type: keyof typeof ERROR_GROUPS.CONSTRAINT.ERRORS, data?: ConstraintErrorData, message?: string);
+        constructor(type: keyof typeof ERROR_GROUPS.CONSTRAINT.ERRORS, data?: ConstraintErrorData, message?: string, code?: number);
         static get group(): {
             INVALID_LATEST_HASH: {
                 code: number;