Merge pull request #121 from citrineos/rc-1.2.3

Rc 1.2.3

00_Base/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@citrineos/base",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "The base module for OCPP v2.0.1 including all interfaces. This module is not intended to be used directly, but rather as a dependency for other modules.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

01_Data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@citrineos/data",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "The OCPP data module which includes all persistence layer implementation.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -27,7 +27,7 @@
     "typescript": "^5.0.4"
   },
   "dependencies": {
-    "@citrineos/base": "1.2.2",
+    "@citrineos/base": "1.2.3",
     "@types/sequelize": "^4.28.20",
     "bcrypt": "^5.1.1",
     "pg": "^8.11.3",

01_Data/src/layers/sequelize/repository/TransactionEvent.ts

@@ -28,9 +28,9 @@ export class SequelizeTransactionEventRepository extends SequelizeRepository<Tra
     meterValue?: CrudRepository<MeterValue>,
   ) {
     super(config, namespace, logger, sequelizeInstance);
-    this.transaction = transaction ? transaction : new SequelizeRepository<Transaction>(config, namespace, logger, sequelizeInstance);
-    this.evse = evse ? evse : new SequelizeRepository<Evse>(config, namespace, logger, sequelizeInstance);
-    this.meterValue = meterValue ? meterValue : new SequelizeRepository<MeterValue>(config, namespace, logger, sequelizeInstance);
+    this.transaction = transaction ? transaction : new SequelizeRepository<Transaction>(config, Transaction.MODEL_NAME, logger, sequelizeInstance);
+    this.evse = evse ? evse : new SequelizeRepository<Evse>(config, Evse.MODEL_NAME, logger, sequelizeInstance);
+    this.meterValue = meterValue ? meterValue : new SequelizeRepository<MeterValue>(config, MeterValue.MODEL_NAME, logger, sequelizeInstance);
   }
 
   /**
@@ -90,24 +90,24 @@ export class SequelizeTransactionEventRepository extends SequelizeRepository<Tra
         },
         { transaction: sequelizeTransaction },
       );
-      if (event.meterValue && event.meterValue.length > 0) {
+      if (value.meterValue && value.meterValue.length > 0) {
         await Promise.all(
-          event.meterValue.map(async (meterValue) => {
-            await MeterValue.create(
+          value.meterValue.map(async (meterValue) => {
+            const savedMeterValue = await MeterValue.create(
               {
                 transactionEventId: event.get('id'),
                 transactionDatabaseId: transactionDatabaseId,
                 ...meterValue,
               },
               { transaction: sequelizeTransaction },
             );
-            this.meterValue.emit('created', [meterValue]);
+            this.meterValue.emit('created', [savedMeterValue]);
           }),
         );
       }
-      await event.reload({ include: [MeterValue] });
+      await event.reload({ include: [MeterValue], transaction: sequelizeTransaction });
       this.emit('created', [event]);
-      await transaction.reload({ include: [TransactionEvent, MeterValue] });
+      await transaction.reload({ include: [TransactionEvent, MeterValue], transaction: sequelizeTransaction });
 
       if (created) {
         this.transaction.emit('created', [transaction]);

02_Util/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@citrineos/util",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "The OCPP util module which supplies helpful utilities like cache and queue connectors, etc.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -35,8 +35,8 @@
     "typescript": "^5.0.4"
   },
   "dependencies": {
-    "@citrineos/base": "1.2.2",
-    "@citrineos/data": "1.2.2",
+    "@citrineos/base": "1.2.3",
+    "@citrineos/data": "1.2.3",
     "@directus/sdk": "^15.0.3",
     "@fastify/swagger": "^8.10.1",
     "@fastify/swagger-ui": "^1.9.3",

02_Util/src/util/swagger.ts

@@ -85,7 +85,7 @@ export function initSwagger(
       info: {
         title: 'CitrineOS Central System API',
         description: 'Central System API for OCPP 2.0.1 messaging.',
-        version: '1.2.2',
+        version: '1.2.3',
       },
     },
     transformObject: OcppTransformObject,

03_Modules/Certificates/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@citrineos/certificates",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "The certificates module for OCPP v2.0.1. This module is not intended to be used directly, but rather as a dependency for other modules.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -26,9 +26,9 @@
     "typescript": "^5.0.4"
   },
   "dependencies": {
-    "@citrineos/base": "1.2.2",
-    "@citrineos/data": "1.2.2",
-    "@citrineos/util": "1.2.2",
+    "@citrineos/base": "1.2.3",
+    "@citrineos/data": "1.2.3",
+    "@citrineos/util": "1.2.3",
     "fastify": "^4.22.2"
   }
 }

03_Modules/Configuration/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@citrineos/configuration",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "The configuration module for OCPP v2.0.1. This module is not intended to be used directly, but rather as a dependency for other modules.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -32,9 +32,9 @@
     "typescript": "5.0.4"
   },
   "dependencies": {
-    "@citrineos/base": "1.2.2",
-    "@citrineos/data": "1.2.2",
-    "@citrineos/util": "1.2.2",
+    "@citrineos/base": "1.2.3",
+    "@citrineos/data": "1.2.3",
+    "@citrineos/util": "1.2.3",
     "uuid": "^9.0.1"
   }
 }

03_Modules/EVDriver/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@citrineos/evdriver",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "The EVDriver module for OCPP v2.0.1. This module is not intended to be used directly, but rather as a dependency for other modules.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,9 +25,9 @@
     "typescript": "^5.0.4"
   },
   "dependencies": {
-    "@citrineos/base": "1.2.2",
-    "@citrineos/data": "1.2.2",
-    "@citrineos/util": "1.2.2",
+    "@citrineos/base": "1.2.3",
+    "@citrineos/data": "1.2.3",
+    "@citrineos/util": "1.2.3",
     "fastify": "^4.22.2"
   }
 }

03_Modules/Monitoring/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@citrineos/monitoring",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "The monitoring module for OCPP v2.0.1. This module is not intended to be used directly, but rather as a dependency for other modules.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,9 +25,9 @@
     "typescript": "^5.0.4"
   },
   "dependencies": {
-    "@citrineos/base": "1.2.2",
-    "@citrineos/data": "1.2.2",
-    "@citrineos/util": "1.2.2",
+    "@citrineos/base": "1.2.3",
+    "@citrineos/data": "1.2.3",
+    "@citrineos/util": "1.2.3",
     "fastify": "^4.22.2"
   }
 }

03_Modules/OcppRouter/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@citrineos/ocpprouter",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "The ocpprouter module for OCPP v2.0.1. This module is not intended to be used directly, but rather as a dependency for other modules.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -27,9 +27,9 @@
     "typescript": "^5.0.4"
   },
   "dependencies": {
-    "@citrineos/base": "1.2.2",
-    "@citrineos/data": "1.2.2",
-    "@citrineos/util": "1.2.2",
+    "@citrineos/base": "1.2.3",
+    "@citrineos/data": "1.2.3",
+    "@citrineos/util": "1.2.3",
     "fastify": "^4.22.2",
     "node-forge": "^1.3.1",
     "uuid": "^9.0.0"

03_Modules/Reporting/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@citrineos/reporting",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "The reporting module for OCPP v2.0.1. This module is not intended to be used directly, but rather as a dependency for other modules.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,9 +25,9 @@
     "typescript": "^5.0.4"
   },
   "dependencies": {
-    "@citrineos/base": "1.2.2",
-    "@citrineos/data": "1.2.2",
-    "@citrineos/util": "1.2.2",
+    "@citrineos/base": "1.2.3",
+    "@citrineos/data": "1.2.3",
+    "@citrineos/util": "1.2.3",
     "fastify": "^4.22.2"
   }
 }

03_Modules/SmartCharging/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@citrineos/smartcharging",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "The smartcharging module for OCPP v2.0.1. This module is not intended to be used directly, but rather as a dependency for other modules.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,9 +25,9 @@
     "typescript": "^5.0.4"
   },
   "dependencies": {
-    "@citrineos/base": "1.2.2",
-    "@citrineos/data": "1.2.2",
-    "@citrineos/util": "1.2.2",
+    "@citrineos/base": "1.2.3",
+    "@citrineos/data": "1.2.3",
+    "@citrineos/util": "1.2.3",
     "fastify": "^4.22.2"
   }
 }

03_Modules/Transactions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@citrineos/transactions",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "The transactions module for OCPP v2.0.1. This module is not intended to be used directly, but rather as a dependency for other modules.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,9 +25,9 @@
     "typescript": "^5.0.4"
   },
   "dependencies": {
-    "@citrineos/base": "1.2.2",
-    "@citrineos/data": "1.2.2",
-    "@citrineos/util": "1.2.2",
+    "@citrineos/base": "1.2.3",
+    "@citrineos/data": "1.2.3",
+    "@citrineos/util": "1.2.3",
     "fastify": "^4.22.2"
   }
 }

Server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@citrineos/server",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "The OCPP server implementation which acts right on top of an asynchronous WebSocket.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -34,16 +34,16 @@
     "typescript": "^5.0.4"
   },
   "dependencies": {
-    "@citrineos/base": "1.2.2",
-    "@citrineos/certificates": "1.2.2",
-    "@citrineos/configuration": "1.2.2",
-    "@citrineos/data": "1.2.2",
-    "@citrineos/evdriver": "1.2.2",
-    "@citrineos/monitoring": "1.2.2",
-    "@citrineos/reporting": "1.2.2",
-    "@citrineos/smartcharging": "1.2.2",
-    "@citrineos/transactions": "1.2.2",
-    "@citrineos/util": "1.2.2",
+    "@citrineos/base": "1.2.3",
+    "@citrineos/certificates": "1.2.3",
+    "@citrineos/configuration": "1.2.3",
+    "@citrineos/data": "1.2.3",
+    "@citrineos/evdriver": "1.2.3",
+    "@citrineos/monitoring": "1.2.3",
+    "@citrineos/reporting": "1.2.3",
+    "@citrineos/smartcharging": "1.2.3",
+    "@citrineos/transactions": "1.2.3",
+    "@citrineos/util": "1.2.3",
     "@directus/extensions": "^1.0.2",
     "@fastify/type-provider-json-schema-to-ts": "^2.2.2",
     "ajv": "^8.12.0",

Server/src/config/envs/local.ts

@@ -111,8 +111,10 @@ export function createLocalConfig() {
           name: 'acme',
           acme: {
             env: 'staging',
-            accountKeyFilePath:
-              '/usr/local/apps/citrineos/Server/src/assets/certificates/acme_account_key.pem',
+            accountKeyFilePath: path.resolve(
+              __dirname,
+              '../../assets/certificates/acme_account_key.pem',
+            ),
             email: '[email protected]',
           },
         },

Swarm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@citrineos/swarm",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "The OCPP swarm implementation which acts right on top of an asynchronous WebSocket with separate servers for each module.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@citrineos/workspace",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "private": false,
   "devDependencies": {
     "@eslint/js": "^9.0.0",