libshv-js 3.12.0 → 3.12.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libshv-js",
-  "version": "3.12.0",
+  "version": "3.12.2",
   "description": "Typescript implementation of libshv",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

package/src/ws-client.ts

@@ -106,7 +106,25 @@ type DirResult = Array<IMap<{
 
 class RpcError extends Error {
     constructor(readonly err_info: ErrorMap) {
-        super(err_info[ERROR_MESSAGE] ?? 'Unknown RpcError');
+        const errorCodeToMessage = (code: ErrorMap[typeof ERROR_CODE]) => {
+            switch (code) {
+                case ErrorCode.InvalidRequest: return 'InvalidRequest';
+                case ErrorCode.MethodNotFound: return 'MethodNotFound';
+                case ErrorCode.InvalidParams: return 'InvalidParams';
+                case ErrorCode.InternalError: return 'InternalError';
+                case ErrorCode.ParseError: return 'ParseError';
+                case ErrorCode.MethodCallTimeout: return 'MethodCallTimeout';
+                case ErrorCode.MethodCallCancelled: return 'MethodCallCancelled';
+                case ErrorCode.MethodCallException: return 'MethodCallException';
+                case ErrorCode.Unknown: return 'Unknown';
+                case ErrorCode.LoginRequired: return 'LoginRequired';
+                case ErrorCode.UserIDRequired: return 'UserIDRequired';
+                case ErrorCode.NotImplemented: return 'NotImplemented';
+                default: return 'Unknown RpcError';
+            }
+        };
+
+        super(err_info[ERROR_MESSAGE] ?? `${errorCodeToMessage(err_info[ERROR_CODE])} (${err_info[ERROR_CODE]})`);
     }
 
     data() {
@@ -169,7 +187,7 @@ class WsClient {
         delayCallback?: (progress: number) => void;
         timeout_handle: ReturnType<typeof globalThis.setTimeout>;
     }> = [];
-    private requestHandlers: RequestHandler[] = [];
+    private requestHandlers = new Map<number, RequestHandler>();
     private abortedRequests = new Set<number>();
     private readonly subscriptions: Subscription[] = [];
     private readonly websocket: WebSocket;
@@ -218,7 +236,7 @@ class WsClient {
                 };
 
                 if (RPC_MESSAGE_ABORT in request.value) {
-                    const requestHandler = this.requestHandlers[requestId];
+                    const requestHandler = this.requestHandlers.get(requestId);
 
                     if (request.value[RPC_MESSAGE_ABORT] === true && requestHandler?.options.onAbort !== undefined) {
                         this.abortedRequests.add(requestId);
@@ -236,7 +254,7 @@ class WsClient {
                 try {
                     let result = this.options.onRequest(request.meta[RPC_MESSAGE_SHV_PATH], request.meta[RPC_MESSAGE_METHOD], request.value[RPC_MESSAGE_PARAMS], sendDelay);
                     if (result instanceof RequestHandler) {
-                        this.requestHandlers[requestId] = result;
+                        this.requestHandlers.set(requestId, result);
                         result = result.options.result;
                     }
 
@@ -251,8 +269,7 @@ class WsClient {
                     }
 
                     if (requestId in this.requestHandlers) {
-                        // eslint-disable-next-line @typescript-eslint/no-array-delete
-                        delete this.requestHandlers[requestId];
+                        this.requestHandlers.delete(requestId);
                     }
                 } catch (error: unknown) {
                     const sendError = (error: RpcError) => {