refactor: typescript WIP

Author: mikuso

dist/cjs/package.json

@@ -6,10 +6,11 @@
         "test": "mocha",
         "coverage": "nyc --reporter=lcov --reporter=text mocha",
         "clean": "rm -rf ./dist",
-        "build": "npm run clean && npm run build:types && npm run build:esm && npm run build:cjs",
+        "build": "npm run clean && npm run schemas2ts && npm run build:types && npm run build:esm && npm run build:cjs",
         "build:types": "tsc -p ./tsconfig/types.json",
         "build:esm": "tsc -p ./tsconfig/node-esm.json && mv dist/esm/src/index.js dist/esm/src/index.mjs",
         "build:cjs": "tsc -p ./tsconfig/node-cjs.json",
+        "schemas2ts": "node scripts/gen-schema-types.mjs src/lib/schemas",
         "prepack": "npm run build"
     },
     "engines": {
@@ -53,6 +54,7 @@
         "@types/mocha": "^10.0.1",
         "@types/node": "^18.14.1",
         "@types/ws": "^8.5.4",
+        "json-schema-to-typescript": "^12.0.0",
         "mocha": "^10.2.0",
         "nyc": "^15.1.0",
         "ts-node": "^10.9.1",

dist/cjs/src/lib/baseclient.js

@@ -41,7 +41,7 @@ class RPCBaseClient extends node_events_1.EventEmitter {
         this._lastPingTime = 0;
         this._closePromise = undefined;
         this._protocolOptions = [];
-        this._protocol = undefined;
+        this._protocol = '';
         this._strictProtocols = [];
         this._strictValidators = new Map();
         this._pendingCalls = new Map();
@@ -77,6 +77,9 @@ class RPCBaseClient extends node_events_1.EventEmitter {
     get state() {
         return this._state;
     }
+    isProtocol(protocol) {
+        return this._protocol === protocol;
+    }
     reconfigure(options) {
         var _a;
         const newOpts = Object.assign(this._options, options);
@@ -192,7 +195,7 @@ class RPCBaseClient extends node_events_1.EventEmitter {
         this._wildcardHandler = undefined;
         this._handlers.clear();
     }
-    async call(method, params = {}, options = {}) {
+    async call(method, params, options = {}) {
         return await this._callQueue.push(this._call.bind(this, method, params, options));
     }
     async _call(method, params, options = {}) {
@@ -201,18 +204,20 @@ class RPCBaseClient extends node_events_1.EventEmitter {
         if ([StateEnum.CLOSED, StateEnum.CLOSING].includes(this._state)) {
             throw Error(`Cannot make call while socket not open`);
         }
+        const methodName = method;
+        const paramsObj = params;
         const msgId = (0, node_crypto_1.randomUUID)();
-        const payload = [MsgType.CALL, msgId, method, params];
+        const payload = [MsgType.CALL, msgId, methodName, paramsObj];
         if (typeof this._protocol === 'string' && this._strictProtocols.includes(this._protocol)) {
             const validator = this._strictValidators.get(this._protocol);
             try {
-                validator.validate(`urn:${method}.req`, params);
+                validator.validate(`urn:${methodName}.req`, paramsObj);
             }
             catch (error) {
                 this.emit('strictValidationFailure', {
                     messageId: msgId,
-                    method,
-                    params,
+                    method: methodName,
+                    params: paramsObj,
                     result: null,
                     error,
                     outbound: true,
@@ -223,8 +228,8 @@ class RPCBaseClient extends node_events_1.EventEmitter {
         }
         const pendingCall = {
             msgId,
-            method,
-            params
+            method: methodName,
+            params: paramsObj
         };
         if (!options.noReply) {
             const timeoutAc = new AbortController();
@@ -275,8 +280,8 @@ class RPCBaseClient extends node_events_1.EventEmitter {
             this.emit('callResult', {
                 outbound: true,
                 messageId: msgId,
-                method,
-                params,
+                method: methodName,
+                params: paramsObj,
                 result,
             });
             return result;
@@ -285,8 +290,8 @@ class RPCBaseClient extends node_events_1.EventEmitter {
             this.emit('callError', {
                 outbound: true,
                 messageId: msgId,
-                method,
-                params,
+                method: methodName,
+                params: paramsObj,
                 error: err,
             });
             throw err;

dist/cjs/src/lib/client.js

@@ -21,7 +21,7 @@ class RPCClient extends baseclient_1.RPCBaseClient {
         this._identity = options.identity;
         this._state = StateEnum.CLOSED;
         this._ws = undefined;
-        this._protocol = undefined;
+        this._protocol = '';
         this._options = {
             identity: '',
             endpoint: 'ws://localhost',
@@ -55,7 +55,7 @@ class RPCClient extends baseclient_1.RPCBaseClient {
     async connect() {
         var _a;
         this._protocolOptions = (_a = this._options.protocols) !== null && _a !== void 0 ? _a : [];
-        this._protocol = undefined;
+        this._protocol = '';
         this._identity = this._options.identity;
         let connUrl = this._options.endpoint + '/' + encodeURIComponent(this._options.identity);
         if (this._options.query) {

dist/cjs/src/lib/protocols.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

dist/cjs/src/lib/schemas/ocpp1_6.json

@@ -2373,4 +2373,4 @@
         "properties": {},
         "type": "object"
     }
-]
+]