libshv-js 11.0.1 → 11.0.2

package/dist/ws-client.js

@@ -390,8 +390,8 @@ class WsClient {
             await Promise.all(pendingHandlers);
         });
         this.websocket.addEventListener('error', evt => {
-            console.log('WebSocket ERROR', evt);
-            this.logDebug('WebSocket ERROR');
+            console.log('Websocket ERROR', evt);
+            this.logDebug('Websocket ERROR');
         });
         if ('onWorkflows' in this.options) {
             this.workflowsProcedure(this.options);
@@ -429,7 +429,7 @@ class WsClient {
     workflowsProcedure(options) {
         let workflowsObtained = false;
         this.websocket.addEventListener('open', () => {
-            this.options.logDebug('CONNECTED');
+            this.options.logDebug('Websocket CONNECTED');
             const handleConnectionError = (error) => {
                 this.logDebug('FAILURE: couldn\'t retrieve workflows', error.message);
                 options.onWorkflowsFailed();
@@ -447,7 +447,7 @@ class WsClient {
             });
         });
         this.websocket.addEventListener('close', () => {
-            this.logDebug('DISCONNECTED');
+            this.logDebug('Websocket DISCONNECTED');
             if (!workflowsObtained) {
                 options.onWorkflowsFailed();
             }
@@ -455,22 +455,7 @@ class WsClient {
     }
     loginProcedure(options) {
         this.websocket.addEventListener('open', () => {
-            this.options.logDebug('CONNECTED');
-            const handleConnectionError = (error) => {
-                this.logDebug('FAILURE: couldn\'t perform initial handshake', error.message);
-                options.onConnectionFailure(error);
-            };
-            const handleLoginResponse = (response) => {
-                if (response instanceof Error) {
-                    handleConnectionError(response);
-                    return;
-                }
-                this.logDebug('SUCCESS: connected to shv broker');
-                options.onConnected();
-                this.pingTimerId = setInterval(() => {
-                    this.sendPing();
-                }, options.pingInterval ?? DEFAULT_PING_INTERVAL);
-            };
+            this.options.logDebug('Websocket CONNECTED');
             const makeLoginParams = (loginMap) => makeMap({
                 login: loginMap,
                 options: makeMap({
@@ -479,8 +464,7 @@ class WsClient {
             });
             this.callRpcMethod(undefined, 'hello').then(response => {
                 if (response instanceof Error) {
-                    handleConnectionError(response);
-                    return;
+                    return response;
                 }
                 const makeLoginMap = () => {
                     switch (options.login.type) {
@@ -498,12 +482,23 @@ class WsClient {
                     }
                 };
                 return this.callRpcMethod(undefined, 'login', makeLoginParams(makeLoginMap()));
-            }).then(handleLoginResponse).catch(() => {
+            }).then(response => {
+                if (response instanceof Error) {
+                    this.logDebug('FAILURE: couldn\'t perform initial handshake:', response.message);
+                    options.onConnectionFailure(response);
+                    return;
+                }
+                this.logDebug('SUCCESS: connected to shv broker');
+                options.onConnected();
+                this.pingTimerId = setInterval(() => {
+                    this.sendPing();
+                }, options.pingInterval ?? DEFAULT_PING_INTERVAL);
+            }).catch(() => {
                 this.logDebug('FAILURE: couldn\' connected to shv broker');
             });
         });
         this.websocket.addEventListener('close', () => {
-            this.logDebug('DISCONNECTED');
+            this.logDebug('Websocket DISCONNECTED');
             this.subscriptions.length = 0;
             options.onDisconnected();
             clearInterval(this.pingTimerId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libshv-js",
-  "version": "11.0.1",
+  "version": "11.0.2",
   "description": "Typescript implementation of libshv",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",