sap-labs-france · ClaudeROSSI · Dec 22, 2022 · Dec 22, 2022 · Dec 22, 2022 · Dec 22, 2022
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -22,6 +22,12 @@
     "@typescript-eslint/explicit-member-accessibility": "off",
     "jsdoc/require-jsdoc": "off",
     "indent": "off",
+    "@typescript-eslint/unbound-method": [
+      "error",
+      {
+        "ignoreStatic": true
+      }
+    ],
     "@typescript-eslint/indent": [
       "error",
       2,
@@ -138,7 +144,7 @@
     "max-len": [
       "warn",
       {
-        "code": 180,
+        "code": 220,
         "ignoreComments": true,
         "ignoreUrls": true,
         "ignoreStrings": true,

diff --git a/ecosystem.config.js b/ecosystem.config.js
@@ -0,0 +1,17 @@
+module.exports = {
+  apps: [{
+    env: {
+      NODE_ENV: "development",
+      SERVER_ROLE: "ocppj"
+    },
+    name: "pm2 - ocppj - server",
+    script: "./dist/start.js"
+  }, {
+    env: {
+      NODE_ENV: "development",
+      SERVER_ROLE: "rest"
+    },
+    name: "pm2 - rest server",
+    script: "./dist/start.js"
+  }]
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -30,8 +30,8 @@
     "start": "npm version && npm run start:prod",
     "start:dev": "npm version && cross-env NODE_OPTIONS=\"--max-old-space-size=4096\" NODE_ENV=development-build node -r source-map-support/register dist/start.js",
     "start:dev:debug": "npm version && cross-env NODE_ENV=development ts-node-dev --inspect --files --max-old-space-size=4096 -- src/start.ts",
-    "start:dev:debug:ocppj": "npm version && cross-env SERVER_ROLE=ocppj NODE_ENV=development ts-node-dev --inspect --files --max-old-space-size=4096 -- src/start.ts",
-    "start:dev:debug:rest": "npm version && cross-env SERVER_ROLE=rest NODE_ENV=development ts-node-dev --inspect --files --max-old-space-size=4096 -- src/start.ts",
+    "start:dev:debug:ocppj": "npm version && cross-env SERVER_ROLE=ocppj NODE_ENV=development ts-node-dev --inspect --files -- src/start.ts",
+    "start:dev:debug:rest": "npm version && cross-env SERVER_ROLE=rest NODE_ENV=development ts-node-dev --files -- src/start.ts",
     "start:dev:debug:nodemon": "npm version && nodemon --exec \"ts-node --files\" src/start.ts 9229",
     "start:dev:nodemon": "npm version && nodemon --exec \"ts-node --files\" src/start.ts",
     "start:dev:prof": "npm version && cross-env NODE_OPTIONS=\"--max-old-space-size=4096\" NODE_ENV=development node -r source-map-support/register --prof -- dist/start.js",
@@ -157,7 +157,7 @@
     "tslib": "^2.4.0",
     "tz-lookup": "^6.1.25",
     "urlencode": "^1.1.0",
-    "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.10.0",
+    "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.15.0",
     "validator": "^13.7.0",
     "ws": "^8.10.0"
   },

diff --git a/src/async-task/AsyncTaskBuilder.ts b/src/async-task/AsyncTaskBuilder.ts
@@ -25,7 +25,7 @@ export default class AsyncTaskBuilder {
     // Save
     await AsyncTaskStorage.saveAsyncTask(asyncTask as AsyncTask);
     // Log
-    await Logging.logInfo({
+    Logging.beInfo()?.log({
       tenantID: Constants.DEFAULT_TENANT_ID,
       action: ServerAction.ASYNC_TASK,
       module: MODULE_NAME, method: 'createAndSaveAsyncTasks',

diff --git a/src/async-task/AsyncTaskManager.ts b/src/async-task/AsyncTaskManager.ts
@@ -54,7 +54,7 @@ export default class AsyncTaskManager {
 
   public static async handleAsyncTasks(): Promise<void> {
     let failedToAcquireLock = false;
-    await Logging.logDebug({
+    Logging.beDebug()?.log({
       tenantID: Constants.DEFAULT_TENANT_ID,
       action: ServerAction.ASYNC_TASK,
       module: MODULE_NAME, method: 'handleAsyncTasks',
@@ -75,7 +75,7 @@ export default class AsyncTaskManager {
       { status: AsyncTaskStatus.PENDING }, Constants.DB_PARAMS_MAX_LIMIT);
     // Process them
     if (!Utils.isEmptyArray(asyncTasks.result)) {
-      await Logging.logInfo({
+      Logging.beInfo()?.log({
         tenantID: Constants.DEFAULT_TENANT_ID,
         action: ServerAction.ASYNC_TASK,
         module: MODULE_NAME, method: 'handleAsyncTasks',
@@ -98,7 +98,7 @@ export default class AsyncTaskManager {
                 asyncTask.lastChangedOn = asyncTask.execTimestamp;
                 await AsyncTaskStorage.saveAsyncTask(asyncTask);
                 // Log
-                await Logging.logInfo({
+                Logging.beInfo()?.log({
                   tenantID: Constants.DEFAULT_TENANT_ID,
                   action: ServerAction.ASYNC_TASK,
                   module: MODULE_NAME, method: 'handleAsyncTasks',
@@ -115,7 +115,7 @@ export default class AsyncTaskManager {
                 await AsyncTaskStorage.saveAsyncTask(asyncTask);
                 processedTask.inSuccess++;
                 // Log
-                await Logging.logInfo({
+                Logging.beInfo()?.log({
                   tenantID: Constants.DEFAULT_TENANT_ID,
                   action: ServerAction.ASYNC_TASK,
                   module: MODULE_NAME, method: 'handleAsyncTasks',
@@ -130,7 +130,7 @@ export default class AsyncTaskManager {
                 asyncTask.lastChangedOn = new Date();
                 await AsyncTaskStorage.saveAsyncTask(asyncTask);
                 // Log error
-                await Logging.logError({
+                Logging.beError()?.log({
                   tenantID: Constants.DEFAULT_TENANT_ID,
                   module: MODULE_NAME, method: 'handleAsyncTasks',
                   action: ServerAction.ASYNC_TASK,
@@ -162,7 +162,7 @@ export default class AsyncTaskManager {
         void AsyncTaskManager.handleAsyncTasks();
       }
     } else {
-      await Logging.logDebug({
+      Logging.beDebug()?.log({
         tenantID: Constants.DEFAULT_TENANT_ID,
         action: ServerAction.ASYNC_TASK,
         module: MODULE_NAME, method: 'handleAsyncTasks',
@@ -201,7 +201,7 @@ export default class AsyncTaskManager {
       case AsyncTasks.OCPI_PUSH_EVSE_STATUSES:
         return new OCPIPushEVSEStatusesAsyncTask(asyncTask, correlationID);
       default:
-        await Logging.logError({
+        Logging.beError()?.log({
           tenantID: Constants.DEFAULT_TENANT_ID,
           action: ServerAction.ASYNC_TASK,
           module: MODULE_NAME, method: 'handleAsyncTasks',

diff --git a/src/async-task/TenantAsyncTask.ts b/src/async-task/TenantAsyncTask.ts
@@ -23,7 +23,7 @@ export default abstract class TenantAsyncTask extends AbstractAsyncTask {
        (taskSettings.task.disableAllTasks || !Utils.isEmptyArray(taskSettings.task.disableTasksInEnv) && taskSettings.task.disableTasksInEnv.includes(currentTaskEnv))) {
       // Tasks are disabled for this environment
       isTaskExecutionDisabled = true;
-      await Logging.logInfo({
+      Logging.beInfo()?.log({
         tenantID: Constants.DEFAULT_TENANT_ID,
         action: ServerAction.ASYNC_TASK,
         module: MODULE_NAME, method: 'executeAsyncTask',
@@ -43,7 +43,7 @@ export default abstract class TenantAsyncTask extends AbstractAsyncTask {
         }
         // Check if tenant task needs to run on a specific env
         if (tenant.taskExecutionEnv && tenant.taskExecutionEnv !== currentTaskEnv) {
-          await Logging.logInfo({
+          Logging.beInfo()?.log({
             tenantID: Constants.DEFAULT_TENANT_ID,
             action: ServerAction.ASYNC_TASK,
             module: MODULE_NAME, method: 'executeAsyncTask',
@@ -54,13 +54,13 @@ export default abstract class TenantAsyncTask extends AbstractAsyncTask {
         }
         const tenantCorrelationID = Utils.generateShortNonUniqueID();
         const startTimeInTenant = moment();
-        await Logging.logDebug({
+        Logging.beDebug()?.log({
           tenantID: Constants.DEFAULT_TENANT_ID,
           action: ServerAction.ASYNC_TASK,
           module: MODULE_NAME, method: 'executeAsyncTask',
           message: `The Task '${this.getAsyncTask().name}~${this.getCorrelationID()}~${tenantCorrelationID}' is running for Tenant ${Utils.buildTenantName(tenant)}...`
         });
-        await Logging.logDebug({
+        Logging.beDebug()?.log({
           tenantID: tenant.id,
           action: ServerAction.ASYNC_TASK,
           module: MODULE_NAME, method: 'executeAsyncTask',
@@ -74,14 +74,14 @@ export default abstract class TenantAsyncTask extends AbstractAsyncTask {
           // Hook
           await this.afterExecuteTenantAsyncTask(tenant);
         } catch (error) {
-          await Logging.logError({
+          Logging.beError()?.log({
             tenantID: Constants.DEFAULT_TENANT_ID,
             action: ServerAction.ASYNC_TASK,
             module: MODULE_NAME, method: 'executeAsyncTask',
             message: `Error while running the Task '${this.getAsyncTask().name}~${this.getCorrelationID()}~${tenantCorrelationID}' for Tenant ${Utils.buildTenantName(tenant)}: ${error.message as string}`,
             detailedMessages: { error: error.stack }
           });
-          await Logging.logError({
+          Logging.beError()?.log({
             tenantID: tenant.id,
             action: ServerAction.ASYNC_TASK,
             module: MODULE_NAME, method: 'executeAsyncTask',
@@ -91,13 +91,13 @@ export default abstract class TenantAsyncTask extends AbstractAsyncTask {
         }
         // Log Total Processing Time in Tenant
         const totalTimeSecsInTenant = moment.duration(moment().diff(startTimeInTenant)).asSeconds();
-        await Logging.logDebug({
+        Logging.beDebug()?.log({
           tenantID: Constants.DEFAULT_TENANT_ID,
           action: ServerAction.ASYNC_TASK,
           module: MODULE_NAME, method: 'executeAsyncTask',
           message: `The Task '${this.getAsyncTask().name}~${this.getCorrelationID()}~${tenantCorrelationID}' has been run successfully in ${totalTimeSecsInTenant} secs for Tenant ${Utils.buildTenantName(tenant)}`
         });
-        await Logging.logDebug({
+        Logging.beDebug()?.log({
           tenantID: tenant.id,
           action: ServerAction.ASYNC_TASK,
           module: MODULE_NAME, method: 'executeAsyncTask',

diff --git a/src/async-task/tasks/BillTransactionAsyncTask.ts b/src/async-task/tasks/BillTransactionAsyncTask.ts
@@ -53,7 +53,7 @@ export default class BillTransactionAsyncTask extends AbstractAsyncTask {
           }
         }
       } catch (error) {
-        await Logging.logActionExceptionMessage(tenant.id, ServerAction.BILLING_TRANSACTION, error);
+        Logging.logActionExceptionMessage(tenant.id, ServerAction.BILLING_TRANSACTION, error);
       }
     }
   }

diff --git a/src/async-task/tasks/ImportHelper.ts b/src/async-task/tasks/ImportHelper.ts
@@ -140,7 +140,7 @@ export default class ImportHelper {
         await UserStorage.addSiteToUser(tenant, user.id, importedSiteID);
       } else {
         // Site does not exist
-        await Logging.logError({
+        Logging.beError()?.log({
           tenantID: tenant.id,
           action: ServerAction.USERS_IMPORT,
           module: MODULE_NAME, method: 'executeAsyncTask',

diff --git a/src/async-task/tasks/SynchronizeCarCatalogsAsyncTask.ts b/src/async-task/tasks/SynchronizeCarCatalogsAsyncTask.ts
@@ -24,7 +24,7 @@ export default class SynchronizeCarCatalogsAsyncTask extends AbstractAsyncTask {
         await carDatabaseImpl.synchronizeCarCatalogs();
       } catch (error) {
         // Log error
-        await Logging.logActionExceptionMessage(Constants.DEFAULT_TENANT_ID, ServerAction.SYNCHRONIZE_CAR_CATALOGS, error);
+        Logging.logActionExceptionMessage(Constants.DEFAULT_TENANT_ID, ServerAction.SYNCHRONIZE_CAR_CATALOGS, error);
       } finally {
         // Release the lock
         await LockingManager.release(syncCarCatalogsLock);

diff --git a/src/async-task/tasks/TagsImportAsyncTask.ts b/src/async-task/tasks/TagsImportAsyncTask.ts
@@ -43,7 +43,7 @@ export default class TagsImportAsyncTask extends AbstractAsyncTask {
         // Get total number of Tags to import
         const totalTagsToImport = await TagStorage.getImportedTagsCount(tenant);
         if (totalTagsToImport > 0) {
-          await Logging.logInfo({
+          Logging.beInfo()?.log({
             tenantID: tenant.id,
             action: ServerAction.TAGS_IMPORT,
             module: MODULE_NAME, method: 'processTenant',
@@ -66,7 +66,7 @@ export default class TagsImportAsyncTask extends AbstractAsyncTask {
               importedTag.errorDescription = error.message;
               result.inError++;
               await TagStorage.saveImportedTag(tenant, importedTag);
-              await Logging.logError({
+              Logging.beError()?.log({
                 tenantID: tenant.id,
                 action: ServerAction.TAGS_IMPORT,
                 module: MODULE_NAME, method: 'processTenant',
@@ -77,7 +77,7 @@ export default class TagsImportAsyncTask extends AbstractAsyncTask {
           }
           if (!Utils.isEmptyArray(importedTags.result) && (result.inError + result.inSuccess) > 0) {
             const intermediateDurationSecs = Math.round((new Date().getTime() - startTime) / 1000);
-            await Logging.logDebug({
+            Logging.beDebug()?.log({
               tenantID: tenant.id,
               action: ServerAction.TAGS_IMPORT,
               module: MODULE_NAME, method: 'processTenant',
@@ -95,7 +95,7 @@ export default class TagsImportAsyncTask extends AbstractAsyncTask {
         );
       } catch (error) {
         // Log error
-        await Logging.logActionExceptionMessage(tenant.id, ServerAction.TAGS_IMPORT, error);
+        Logging.logActionExceptionMessage(tenant.id, ServerAction.TAGS_IMPORT, error);
       } finally {
         // Release the lock
         await LockingManager.release(importTagsLock);

diff --git a/src/async-task/tasks/UsersImportAsyncTask.ts b/src/async-task/tasks/UsersImportAsyncTask.ts
@@ -42,7 +42,7 @@ export default class UsersImportAsyncTask extends AbstractAsyncTask {
         // Get total number of Users to import
         const totalUsersToImport = await UserStorage.getImportedUsersCount(tenant);
         if (totalUsersToImport > 0) {
-          await Logging.logInfo({
+          Logging.beInfo()?.log({
             tenantID: tenant.id,
             action: ServerAction.USERS_IMPORT,
             module: MODULE_NAME, method: 'processTenant',
@@ -66,7 +66,7 @@ export default class UsersImportAsyncTask extends AbstractAsyncTask {
               result.inError++;
               // Update it
               await UserStorage.saveImportedUser(tenant, importedUser);
-              await Logging.logError({
+              Logging.beError()?.log({
                 tenantID: tenant.id,
                 action: ServerAction.USERS_IMPORT,
                 module: MODULE_NAME, method: 'executeAsyncTask',
@@ -77,7 +77,7 @@ export default class UsersImportAsyncTask extends AbstractAsyncTask {
           }
           if (importedUsers.result.length > 0 && (result.inError + result.inSuccess) > 0) {
             const intermediateDurationSecs = Math.round((new Date().getTime() - startTime) / 1000);
-            await Logging.logDebug({
+            Logging.beDebug()?.log({
               tenantID: tenant.id,
               action: ServerAction.USERS_IMPORT,
               module: MODULE_NAME, method: 'processTenant',
@@ -95,7 +95,7 @@ export default class UsersImportAsyncTask extends AbstractAsyncTask {
         );
       } catch (error) {
         // Log error
-        await Logging.logActionExceptionMessage(tenant.id, ServerAction.USERS_IMPORT, error);
+        Logging.logActionExceptionMessage(tenant.id, ServerAction.USERS_IMPORT, error);
       } finally {
         // Release the lock
         await LockingManager.release(importUsersLock);

diff --git a/src/async-task/tasks/ocpi/OCPICheckCdrsAsyncTask.ts b/src/async-task/tasks/ocpi/OCPICheckCdrsAsyncTask.ts
@@ -35,7 +35,7 @@ export default class OCPICheckCdrsAsyncTask extends AbstractAsyncTask {
           }
         }
       } catch (error) {
-        await Logging.logActionExceptionMessage(tenant.id, ServerAction.OCPI_CPO_CHECK_CDRS, error);
+        Logging.logActionExceptionMessage(tenant.id, ServerAction.OCPI_CPO_CHECK_CDRS, error);
       }
     }
   }

diff --git a/src/async-task/tasks/ocpi/OCPICheckLocationsAsyncTask.ts b/src/async-task/tasks/ocpi/OCPICheckLocationsAsyncTask.ts
@@ -35,7 +35,7 @@ export default class OCPICheckLocationsAsyncTask extends AbstractAsyncTask {
           }
         }
       } catch (error) {
-        await Logging.logActionExceptionMessage(tenant.id, ServerAction.OCPI_CPO_CHECK_LOCATIONS, error);
+        Logging.logActionExceptionMessage(tenant.id, ServerAction.OCPI_CPO_CHECK_LOCATIONS, error);
       }
     }
   }

diff --git a/src/async-task/tasks/ocpi/OCPICheckSessionsAsyncTask.ts b/src/async-task/tasks/ocpi/OCPICheckSessionsAsyncTask.ts
@@ -35,7 +35,7 @@ export default class OCPICheckSessionsAsyncTask extends AbstractAsyncTask {
           }
         }
       } catch (error) {
-        await Logging.logActionExceptionMessage(tenant.id, ServerAction.OCPI_CPO_CHECK_SESSIONS, error);
+        Logging.logActionExceptionMessage(tenant.id, ServerAction.OCPI_CPO_CHECK_SESSIONS, error);
       }
     }
   }

diff --git a/src/async-task/tasks/ocpi/OCPIPullCdrsAsyncTask.ts b/src/async-task/tasks/ocpi/OCPIPullCdrsAsyncTask.ts
@@ -35,7 +35,7 @@ export default class OCPIPullCdrsAsyncTask extends AbstractAsyncTask {
           }
         }
       } catch (error) {
-        await Logging.logActionExceptionMessage(tenant.id, ServerAction.OCPI_EMSP_GET_CDR, error);
+        Logging.logActionExceptionMessage(tenant.id, ServerAction.OCPI_EMSP_GET_CDR, error);
       }
     }
   }

diff --git a/src/async-task/tasks/ocpi/OCPIPullLocationsAsyncTask.ts b/src/async-task/tasks/ocpi/OCPIPullLocationsAsyncTask.ts
@@ -35,7 +35,7 @@ export default class OCPIPullLocationsAsyncTask extends AbstractAsyncTask {
           }
         }
       } catch (error) {
-        await Logging.logActionExceptionMessage(tenant.id, ServerAction.OCPI_EMSP_GET_LOCATIONS, error);
+        Logging.logActionExceptionMessage(tenant.id, ServerAction.OCPI_EMSP_GET_LOCATIONS, error);
       }
     }
   }

diff --git a/src/async-task/tasks/ocpi/OCPIPullSessionsAsyncTask.ts b/src/async-task/tasks/ocpi/OCPIPullSessionsAsyncTask.ts
@@ -35,7 +35,7 @@ export default class OCPIPullSessionsAsyncTask extends AbstractAsyncTask {
           }
         }
       } catch (error) {
-        await Logging.logActionExceptionMessage(tenant.id, ServerAction.OCPI_EMSP_GET_SESSION, error);
+        Logging.logActionExceptionMessage(tenant.id, ServerAction.OCPI_EMSP_GET_SESSION, error);
       }
     }
   }

diff --git a/src/async-task/tasks/ocpi/OCPIPullTokensAsyncTask.ts b/src/async-task/tasks/ocpi/OCPIPullTokensAsyncTask.ts
@@ -35,7 +35,7 @@ export default class OCPIPullTokensAsyncTask extends AbstractAsyncTask {
           }
         }
       } catch (error) {
-        await Logging.logActionExceptionMessage(tenant.id, ServerAction.OCPI_CPO_GET_TOKENS, error);
+        Logging.logActionExceptionMessage(tenant.id, ServerAction.OCPI_CPO_GET_TOKENS, error);
       }
     }
   }

diff --git a/src/async-task/tasks/ocpi/OCPIPushEVSEStatusesAsyncTask.ts b/src/async-task/tasks/ocpi/OCPIPushEVSEStatusesAsyncTask.ts
@@ -35,7 +35,7 @@ export default class OCPIPushEVSEStatusesAsyncTask extends AbstractAsyncTask {
           }
         }
       } catch (error) {
-        await Logging.logActionExceptionMessage(tenant.id, ServerAction.OCPI_CPO_UPDATE_STATUS, error);
+        Logging.logActionExceptionMessage(tenant.id, ServerAction.OCPI_CPO_UPDATE_STATUS, error);
       }
     }
   }

diff --git a/src/async-task/tasks/ocpi/OCPIPushTokensAsyncTask.ts b/src/async-task/tasks/ocpi/OCPIPushTokensAsyncTask.ts
@@ -36,7 +36,7 @@ export default class OCPIPushTokensAsyncTask extends AbstractAsyncTask {
           }
         }
       } catch (error) {
-        await Logging.logActionExceptionMessage(tenant.id, ServerAction.OCPI_EMSP_UPDATE_TOKENS, error);
+        Logging.logActionExceptionMessage(tenant.id, ServerAction.OCPI_EMSP_UPDATE_TOKENS, error);
       }
     }
   }