Cleanups and dependency update.

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>

diff --git a/package-lock.json b/package-lock.json
index e1baf334a59ff210a2c00620d36712afcc1093be..71a8848526442f75a1285a89b063e62da4f6b64f 100644 (file)
--- a/package-lock.json
+++ b/package-lock.json
@@ -299,10 +299,15 @@
       }
     },
     "@es-joy/jsdoccomment": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.1.1.tgz",
-      "integrity": "sha512-6lIx5Pjc50D7VJU9lfRZ1twfIrIwQk+aeT9Ink2C07IUu/y9pxkIpDqmhY/VN3jAW42dA5z6ioOdyhOZZU1isw==",
-      "dev": true
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.4.3.tgz",
+      "integrity": "sha512-t0JWZfQiG+Qkr6+tl05dlGcgE/MMPqs7QfNlFkTsbpcCu2Zfukcan/fIiHKTc0iOs4Yh3cnfklMayJnlmKaOwQ==",
+      "dev": true,
+      "requires": {
+        "comment-parser": "^1.1.5",
+        "esquery": "^1.4.0",
+        "jsdoctypeparser": "^9.0.0"
+      }
     },
     "@eslint/eslintrc": {
       "version": "0.4.0",
@@ -705,9 +710,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "14.14.43",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.43.tgz",
-      "integrity": "sha512-3pwDJjp1PWacPTpH0LcfhgjvurQvrZFBrC6xxjaUEZ7ifUtT32jtjPxEMMblpqd2Mvx+k8haqQJLQxolyGN/cQ==",
+      "version": "14.14.44",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.44.tgz",
+      "integrity": "sha512-+gaugz6Oce6ZInfI/tK4Pq5wIIkJMEJUu92RB3Eu93mtj4wjjjz9EB5mLp5s1pSsLXdC/CPut/xF20ZzAQJbTA==",
       "dev": true
     },
     "@types/offscreencanvas": {
@@ -4486,14 +4491,15 @@
       }
     },
     "eslint-plugin-jsdoc": {
-      "version": "33.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-33.0.0.tgz",
-      "integrity": "sha512-bkopnnuDdT04abKWPfDdD6XcAp2yX6UDpDViyvIdYmxbZYbpHXCRzQzLqCTo+SzWSTS0KFWz/V3shmmMr+x4EA==",
+      "version": "33.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-33.1.0.tgz",
+      "integrity": "sha512-nyH1qAj5f4uDnDpg4aiAS65wJSfxfBDf0lIgNfxtew31z3VRaM8WsVmpe4UhI2u27oOD/ChRuye6KAzzuHn6Jw==",
       "dev": true,
       "requires": {
-        "@es-joy/jsdoccomment": "^0.1.1",
+        "@es-joy/jsdoccomment": "^0.4.3",
         "comment-parser": "1.1.5",
         "debug": "^4.3.1",
+        "esquery": "^1.4.0",
         "jsdoctypeparser": "^9.0.0",
         "lodash": "^4.17.21",
         "regextras": "^0.7.1",

diff --git a/package.json b/package.json
index 01534425f7a9ebc3ac825c896b732e2b9c6bafb1..fd8d11703ad4d5bd6b94fa893d5791768bf1c97a 100644 (file)
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "utf-8-validate": "^5.0.4"
   },
   "devDependencies": {
-    "@types/node": "^14.14.43",
+    "@types/node": "^14.14.44",
     "@types/uuid": "^8.3.0",
     "@types/ws": "^7.4.2",
     "@typescript-eslint/eslint-plugin": "^4.22.1",
@@ -70,7 +70,7 @@
     "cross-env": "^7.0.3",
     "eslint": "^7.25.0",
     "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jsdoc": "^33.0.0",
+    "eslint-plugin-jsdoc": "^33.1.0",
     "mbt": "^1.1.1",
     "npm-check": "^5.9.2",
     "rollup": "^2.47.0",

diff --git a/src/charging-station/ocpp/1.6/OCPP16RequestService.ts b/src/charging-station/ocpp/1.6/OCPP16RequestService.ts
index e9f7ee6dbb6dfe3df4a74542f83605cb967cbe6e..96502b3cc9b81b9a7082fabd63cee87478ae0727 100644 (file)
--- a/src/charging-station/ocpp/1.6/OCPP16RequestService.ts
+++ b/src/charging-station/ocpp/1.6/OCPP16RequestService.ts
@@ -314,9 +314,9 @@ export default class OCPP16RequestService extends OCPPRequestService {
         transactionId,
         meterValue,
       };
-      await self.sendMessage(Utils.generateUUID(), payload, MessageType.CALL_MESSAGE, OCPP16RequestCommand.METERVALUES);
+      await self.sendMessage(Utils.generateUUID(), payload, MessageType.CALL_MESSAGE, OCPP16RequestCommand.METER_VALUES);
     } catch (error) {
-      self.handleRequestError(OCPP16RequestCommand.METERVALUES, error);
+      self.handleRequestError(OCPP16RequestCommand.METER_VALUES, error);
     }
   }
 

diff --git a/src/types/ocpp/1.6/Requests.ts b/src/types/ocpp/1.6/Requests.ts
index 8af407c0ac3789fceb6ca52fb54c3cbec133398f..9ed48049a52cb70915cf8c1955f914d42a236453 100644 (file)
--- a/src/types/ocpp/1.6/Requests.ts
+++ b/src/types/ocpp/1.6/Requests.ts
@@ -12,7 +12,7 @@ export enum OCPP16RequestCommand {
   AUTHORIZE = 'Authorize',
   START_TRANSACTION = 'StartTransaction',
   STOP_TRANSACTION = 'StopTransaction',
-  METERVALUES = 'MeterValues'
+  METER_VALUES = 'MeterValues'
 }
 
 export enum OCPP16IncomingRequestCommand {

diff --git a/src/utils/PerformanceStatistics.ts b/src/utils/PerformanceStatistics.ts
index 515467a6078a12b9bac150dd0d5d0ce1b6ab8906..9594fb3f24f1e1d989f0694c550c7b1ecd2db75a 100644 (file)
--- a/src/utils/PerformanceStatistics.ts
+++ b/src/utils/PerformanceStatistics.ts
@@ -113,7 +113,7 @@ export default class PerformanceStatistics {
   private addPerformanceTimer(command: RequestCommand | IncomingRequestCommand, duration: number): void {
     // Map to proper command name
     const MAPCOMMAND = {
-      sendMeterValues: RequestCommand.METERVALUES,
+      sendMeterValues: RequestCommand.METER_VALUES,
       startTransaction: RequestCommand.START_TRANSACTION,
       stopTransaction: RequestCommand.STOP_TRANSACTION,
     };