libshv-js 3.0.0 → 3.1.0

package/.github/workflows/test.yml

@@ -17,9 +17,9 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
-      - uses: denoland/setup-deno@v1
-        with:
-          deno-version: vx.x.x
+
+      - name: Compile
+        run: npx tsc
 
       - name: Run tests
-        run: deno run test.ts
+        run: node test.js

package/.xo-config.json

@@ -23,6 +23,7 @@
         "n/file-extension-in-import": "off",
         "promise-function-async": "off",
         "default-case": "off",
+        "import/extensions": "off",
         "prefer-promise-reject-errors": "off",
         "eslint-disable-next-line prefer-promise-reject-errors": "off",
         "unicorn/explicit-length-check": "off",

package/package.json

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

package/src/chainpack.ts

@@ -1,6 +1,6 @@
-import {utf8ToString} from './cpon.ts';
-import {type RpcValue, type RpcValueType, type DateTime, Decimal, Double, IMap, Int, MetaMap, RpcValueWithMetaData, ShvMap, UInt, withOffset} from './rpcvalue.ts';
-import {UnpackContext, PackContext} from './cpcontext.ts';
+import {utf8ToString} from './cpon';
+import {type RpcValue, type RpcValueType, type DateTime, Decimal, Double, IMap, Int, MetaMap, RpcValueWithMetaData, ShvMap, UInt, withOffset} from './rpcvalue';
+import {UnpackContext, PackContext} from './cpcontext';
 
 enum PackingSchema {
     IntThreshold = 64,

package/src/cpon.ts

@@ -1,5 +1,5 @@
-import {type RpcValue, type RpcValueType, type DateTime, type List, Decimal, Double, IMap, Int, MetaMap, RpcValueWithMetaData, ShvMap, UInt, withOffset} from './rpcvalue.ts';
-import {PackContext, UnpackContext} from './cpcontext.ts';
+import {type RpcValue, type RpcValueType, type DateTime, type List, Decimal, Double, IMap, Int, MetaMap, RpcValueWithMetaData, ShvMap, UInt, withOffset} from './rpcvalue';
+import {PackContext, UnpackContext} from './cpcontext';
 
 const hexify = (byte: number) => {
     if (byte < 10) {

package/src/rpcmessage.ts

@@ -1,6 +1,6 @@
-import {IMap, Int, MetaMap, type RpcValue, RpcValueWithMetaData} from './rpcvalue.ts';
-import {toCpon} from './cpon.ts';
-import {toChainPack} from './chainpack.ts';
+import {IMap, Int, MetaMap, type RpcValue, RpcValueWithMetaData} from './rpcvalue';
+import {toCpon} from './cpon';
+import {toChainPack} from './chainpack';
 
 const TagRequestId = 8;
 const TagShvPath = 9;

package/src/ws-client.ts

@@ -1,7 +1,7 @@
-import {ChainPackReader, ChainpackProtocolType, ChainPackWriter} from './chainpack.ts';
-import {type CponReader, CponProtocolType, toCpon} from './cpon.ts';
-import {ERROR_MESSAGE, ErrorCode, ERROR_CODE, RpcError, RpcMessage, type RpcResponse, MethodCallTimeout} from './rpcmessage.ts';
-import {type RpcValue, type Null, Int, IMap, ShvMap} from './rpcvalue.ts';
+import {ChainPackReader, ChainpackProtocolType, ChainPackWriter} from './chainpack';
+import {type CponReader, CponProtocolType} from './cpon';
+import {ERROR_MESSAGE, ErrorCode, ERROR_CODE, RpcMessage, type RpcResponse, MethodCallTimeout} from './rpcmessage';
+import {type RpcValue, type Null, Int, IMap, ShvMap} from './rpcvalue';
 
 const DEFAULT_TIMEOUT = 5000;
 
@@ -40,6 +40,7 @@ type WsClientOptions = {
     timeout?: number;
     wsUri: string;
     onConnected: () => void;
+    onDisconnected: () => void;
     onRequest: (rpc_msg: RpcMessage) => void;
 };
 
@@ -85,6 +86,7 @@ class WsClient {
     password: WsClientOptions['password'];
     loginType: WsClientOptions['loginType'];
     onConnected: WsClientOptions['onConnected'];
+    onDisconnected: WsClientOptions['onDisconnected'];
     onRequest: WsClientOptions['onRequest'];
     timeout: WsClientOptions['timeout'];
 
@@ -104,6 +106,7 @@ class WsClient {
         this.websocket.binaryType = 'arraybuffer';
 
         this.onConnected = options.onConnected ?? (() => {/* nothing */});
+        this.onDisconnected = options.onDisconnected ?? (() => {/* nothing */});
         this.onRequest = options.onRequest ?? (() => {/* nothing */});
 
         this.timeout = options.timeout ?? DEFAULT_TIMEOUT;
@@ -132,6 +135,7 @@ class WsClient {
 
         this.websocket.addEventListener('close', () => {
             this.logDebug('DISCONNECTED');
+            this.onDisconnected();
         });
 
         this.websocket.addEventListener('message', evt => {
@@ -170,10 +174,6 @@ class WsClient {
             console.log('WebSocket ERROR', evt);
             this.logDebug('WebSocket ERROR');
         });
-
-        this.websocket.addEventListener('close', evt => {
-            this.logDebug(`socket close code: ${evt.code}`);
-        });
     }
 
     callRpcMethod(shv_path: string | undefined, method: 'dir', params?: RpcValue): Promise<RpcResponse<DirResult>>;

package/test.ts

@@ -1,6 +1,6 @@
-import {toChainPack, fromChainPack} from './src/chainpack.ts';
-import {toCpon, fromCpon} from './src/cpon.ts';
-import {type DateTime} from './src/rpcvalue.ts';
+import {toChainPack, fromChainPack} from './src/chainpack';
+import {toCpon, fromCpon} from './src/cpon';
+import {type DateTime} from './src/rpcvalue';
 
 const checkEq = (e1: string | number, e2: string | number) => {
     if (e1 !== e2) {

package/tsconfig.json

@@ -35,7 +35,6 @@
     // "types": [],                                      /* Specify type package names to be included without being referenced in a source file. */
     // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
     // "moduleSuffixes": [],                             /* List of file name suffixes to search when resolving a module. */
-    "allowImportingTsExtensions": true,               /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */
     // "resolvePackageJsonExports": true,                /* Use the package.json 'exports' field when resolving package imports. */
     // "resolvePackageJsonImports": true,                /* Use the package.json 'imports' field when resolving imports. */
     // "customConditions": [],                           /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */
@@ -91,8 +90,8 @@
     // "noImplicitThis": true,                           /* Enable error reporting when 'this' is given the type 'any'. */
     // "useUnknownInCatchVariables": true,               /* Default catch clause variables as 'unknown' instead of 'any'. */
     // "alwaysStrict": true,                             /* Ensure 'use strict' is always emitted. */
-    // "noUnusedLocals": true,                           /* Enable error reporting when local variables aren't read. */
-    // "noUnusedParameters": true,                       /* Raise an error when a function parameter isn't read. */
+    "noUnusedLocals": true,                           /* Enable error reporting when local variables aren't read. */
+    "noUnusedParameters": true,                       /* Raise an error when a function parameter isn't read. */
     // "exactOptionalPropertyTypes": true,               /* Interpret optional property types as written, rather than adding 'undefined'. */
     // "noImplicitReturns": true,                        /* Enable error reporting for codepaths that do not explicitly return in a function. */
     // "noFallthroughCasesInSwitch": true,               /* Enable error reporting for fallthrough cases in switch statements. */