libshv-js 3.3.3 → 3.3.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libshv-js",
-  "version": "3.3.3",
+  "version": "3.3.5",
   "description": "Typescript implementation of libshv",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -17,7 +17,7 @@
   },
   "homepage": "https://github.com/silicon-heaven/libshv-js",
   "exports": {
-    "./bint.ts": "./src/bint.ts",
+    "./access.ts": "./src/access.ts",
     "./chainpack.ts": "./src/chainpack.ts",
     "./cpcontext.ts": "./src/cpcontext.ts",
     "./cpon.ts": "./src/cpon.ts",

package/src/access.ts

@@ -0,0 +1,103 @@
+enum Role {
+    Browse = 'bws',
+    Read = 'rd',
+    Write = 'wr',
+    Command = 'cmd',
+    Config = 'cfg',
+    Service = 'srv',
+    SuperService = 'ssrv',
+    Devel = 'dev',
+    Admin = 'su',
+}
+
+enum AccessLevel {
+    None = 0,
+
+    Browse = 1,
+    Browse1,
+    Browse2,
+    Browse3,
+    Browse4,
+    Browse5,
+    Browse6,
+
+    Read = 8,
+    Read1,
+    Read2,
+    Read3,
+    Read4,
+    Read5,
+    Read6,
+    Read7,
+
+    Write = 16,
+    Write1,
+    Write2,
+    Write3,
+    Write4,
+    Write5,
+    Write6,
+    Write7,
+
+    Command = 24,
+    Command1,
+    Command2,
+    Command3,
+    Command4,
+    Command5,
+    Command6,
+    Command7,
+
+    Config = 32,
+    Config1,
+    Config2,
+    Config3,
+    Config4,
+    Config5,
+    Config6,
+    Config7,
+
+    Service = 40,
+    Service1,
+    Service2,
+    Service3,
+    Service4,
+    Service5,
+    Service6,
+    Service7,
+
+    SuperService = 48,
+    SuperService1,
+    SuperService2,
+    SuperService3,
+    SuperService4,
+    SuperService5,
+    SuperService6,
+    SuperService7,
+
+    Devel = 56,
+    Devel1,
+    Devel2,
+    Devel3,
+    Devel4,
+    Devel5,
+    Devel6,
+    Devel7,
+
+    Admin = 63,
+}
+
+export const accessLevelFromAccessString = (s: string): AccessLevel => {
+    switch (s as unknown) {
+        case Role.Browse: return AccessLevel.Browse;
+        case Role.Read: return AccessLevel.Read;
+        case Role.Write: return AccessLevel.Write;
+        case Role.Command: return AccessLevel.Command;
+        case Role.Config: return AccessLevel.Config;
+        case Role.Service: return AccessLevel.Service;
+        case Role.SuperService: return AccessLevel.SuperService;
+        case Role.Devel: return AccessLevel.Devel;
+        case Role.Admin: return AccessLevel.Admin;
+        default: throw new Error(`unknown access grant string: ${s}`);
+    }
+};

package/src/ws-client.ts

@@ -41,6 +41,7 @@ type WsClientOptions = {
     timeout?: number;
     wsUri: string;
     onConnected: () => void;
+    onConnectionFailure: (error: Error) => void;
     onDisconnected: () => void;
     onRequest: (rpc_msg: RpcMessage) => void;
 };
@@ -87,6 +88,7 @@ class WsClient {
     password: WsClientOptions['password'];
     loginType: WsClientOptions['loginType'];
     onConnected: WsClientOptions['onConnected'];
+    onConnectionFailure: WsClientOptions['onConnectionFailure'];
     onDisconnected: WsClientOptions['onDisconnected'];
     onRequest: WsClientOptions['onRequest'];
     timeout: WsClientOptions['timeout'];
@@ -107,6 +109,7 @@ class WsClient {
         this.websocket.binaryType = 'arraybuffer';
 
         this.onConnected = options.onConnected ?? (() => {/* nothing */});
+        this.onConnectionFailure = options.onConnectionFailure ?? (() => {/* nothing */});
         this.onDisconnected = options.onDisconnected ?? (() => {/* nothing */});
         this.onRequest = options.onRequest ?? (() => {/* nothing */});
 
@@ -114,7 +117,15 @@ class WsClient {
 
         this.websocket.addEventListener('open', () => {
             this.logDebug('CONNECTED');
-            this.callRpcMethod(undefined, 'hello').then(() => {
+            const handleConnectionError = (error: Error) => {
+                this.logDebug('FAILURE: couldn\'t perform initial handshake', error.message);
+                this.onConnectionFailure(error);
+            };
+            this.callRpcMethod(undefined, 'hello').then(response => {
+                if (response instanceof Error) {
+                    handleConnectionError(response);
+                    return;
+                }
                 const params = makeMap({
                     login: makeMap({
                         password: this.password,
@@ -126,7 +137,11 @@ class WsClient {
                     }),
                 });
                 return this.callRpcMethod(undefined, 'login', params);
-            }).then(() => {
+            }).then(response => {
+                if (response instanceof Error) {
+                    handleConnectionError(response);
+                    return;
+                }
                 this.logDebug('SUCCESS: connected to shv broker');
                 this.onConnected();
             }).catch(() => {