adding config.js to directus to provide more complex values to enviro…

…nment.

Signed-off-by: thanaParis <thana.paris@s44.team>

Server/directus-env-config.js

@@ -0,0 +1,17 @@
+// Copyright Contributors to the CitrineOS Project
+//
+// SPDX-License-Identifier: Apache 2.0
+
+export default function (env) {
+
+    const config = {
+        // API Paths
+        CITRINEOS_SUBSCRIPTION_API_PATH: '/data/ocpprouter/subscription',
+        DIRECTUS_CHARGING_STATION_UPDATE_STATUS_PATH: '/charging-stations/update-station-status',
+        // Environment-specific urls
+        CITRINEOS_URL: "http://citrine:8080",
+        DIRECTUS_URL: "http://directus:8055"
+    }
+
+    return config;
+}

Server/docker-compose.yml

@@ -61,6 +61,7 @@ services:
       - 8055:8055
     volumes:
       - ./data/directus/uploads:/directus/uploads
+      - ./directus-env-config.js:/directus/config.js
       - ../directus-extension-charging-stations-bundle:/directus/extensions/directus-extension-charging-stations-bundle
     depends_on:
       ocpp-db:
@@ -70,6 +71,7 @@ services:
       SECRET: '0987654321'
       ADMIN_EMAIL: 'admin@citrineos.com'
       ADMIN_PASSWORD: 'CitrineOS!'
+      CONFIG_PATH: '/directus/config.js'
       DB_CLIENT: 'pg'
       DB_HOST: ocpp-db
       DB_PORT: 5432

Swarm/directus-env-config.js

@@ -0,0 +1,17 @@
+// Copyright Contributors to the CitrineOS Project
+//
+// SPDX-License-Identifier: Apache 2.0
+
+export default function (env) {
+
+    const config = {
+        // API Paths
+        CITRINEOS_SUBSCRIPTION_API_PATH: '/data/ocpprouter/subscription',
+        DIRECTUS_CHARGING_STATION_UPDATE_STATUS_PATH: '/charging-stations/update-station-status',
+        // Environment-specific urls
+        CITRINEOS_URL: "http://citrine:8080",
+        DIRECTUS_URL: "http://directus:8055"
+    }
+
+    return config;
+}

Swarm/docker-compose.yml

@@ -16,7 +16,7 @@ services:
       timeout: 10s
       retries: 3
   ocpp-db:
-    image: citrineos/postgres:preseeded
+    image: postgis/postgis:latest
     ports:
       - 5432:5432
     volumes:
@@ -42,12 +42,14 @@ services:
       - 8055:8055
     volumes:
       - ./data/directus/uploads:/directus/uploads
-      - ./data/directus/extensions:/directus/extensions
+      - ./directus-env-config.js:/directus/config.js
+      - ../directus-extension-charging-stations-bundle:/directus/extensions/directus-extension-charging-stations-bundle
     environment:
       KEY: '1234567890'
       SECRET: '0987654321'
       ADMIN_EMAIL: 'admin@citrineos.com'
       ADMIN_PASSWORD: 'CitrineOS!'
+      CONFIG_PATH: '/directus/config.js'
       DB_CLIENT: 'pg'
       DB_HOST: ocpp-db
       DB_PORT: 5432

directus-extension-charging-stations-bundle/src/hook-on-create-charging-station/index.ts

@@ -8,16 +8,18 @@ export default defineHook(({ action }, { env }) => {
 
     action('ChargingStations.items.create', (input) => {
         console.log("Subscribing " + input.key + " to connect and close events");
+
         const stationId = input.key;
-        const subscriptionUrl = `http://citrine:8080/data/ocpprouter/subscription`;
-        const updateStationStatusUrl = "http://directus:8055/charging-stations/update-station-status";
+        const subscriptionUrl = `${env.CITRINEOS_URL}${env.CITRINEOS_SUBSCRIPTION_API_PATH}`;
+        const updateStationStatusUrl = `${env.DIRECTUS_URL}${env.DIRECTUS_CHARGING_STATION_UPDATE_STATUS_PATH}`;
         const requestBody = {
             stationId: stationId,
             onConnect: true,
             onClose: true,
             url: updateStationStatusUrl
         }
 
+        console.log("Subscribing to " + subscriptionUrl + " with request body " + JSON.stringify(requestBody));
         fetch(subscriptionUrl, {
             method: 'PUT',
             headers: {