Merge pull request #1 from Autodesk-Forge/synthetic-gateway

Updating Synthetic Gateway and upgrading package dependencies

Author: hbandlamudi

README.md

@@ -33,7 +33,7 @@ const { Y } = require("forge-dataviz-iot-data-modules/server");
 
 This package contains client-side and server-side modules. Server-side modules (or gateways) interact with the corresponding data provider. For example, AzureGateway interacts with Azure Time Series Insights API in order to retrieve specific sensor data.
 
-Client-side modules convert the data obtained from the corresponding DataGateway object into a consistent data format. For more details on how the client-side and server-side IoT data modules interact, see [Creating a Custom Data Adapter]( https://forge.autodesk.com/en/docs/dataviz/v1/developers_guide/advanced_topics/custom_data_adapter/)
+Client-side modules convert the data obtained from the corresponding DataGateway object into a consistent data format. For more details on how the client-side and server-side IoT data modules interact, see [Creating a Custom Data Adapter](https://forge.autodesk.com/en/docs/dataviz/v1/developers_guide/advanced_topics/custom_data_adapter/)
 
 ### Client-side modules:
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "forge-dataviz-iot-data-modules",
-    "version": "0.1.5",
+    "version": "0.1.6",
     "description": "IoT data modules used by https://github.com/Autodesk-Forge/forge-dataviz-iot-reference-app",
     "author": "Autodesk Inc",
     "license": "Apache-2.0",
@@ -9,33 +9,33 @@
         "url": "https://github.com/Autodesk-Forge/forge-dataviz-iot-data-modules"
     },
     "dependencies": {
-      "@azure/arm-iothub": "^4.0.0",
-      "@azure/digital-twins-core": "^1.0.3",
-      "@azure/event-hubs": "^5.3.1",
-      "@azure/identity": "^1.2.3",
-      "@azure/ms-rest-nodeauth": "^3.0.6",
-      "aws-sdk": "^2.708.0",
-      "azure-iothub": "^1.13.0",
-      "body-parser": "^1.19.0",
-      "bufferutil": "^4.0.1",
-      "dotenv": "^8.2.0",
-      "event-stream": "^4.0.1",
-      "express": "4.16.2",
-      "forge-apis": "^0.7.3",
-      "mime": "^2.4.6",
-      "node-rsa": "^1.1.1",
-      "q": "^1.5.1",
-      "timestring": "^6.0.0",
-      "tween-functions": "^1.2.0",
-      "utf-8-validate": "^5.0.2",
-      "uuid": "^8.3.1"
+        "@azure/arm-iothub": "^4.0.0",
+        "@azure/digital-twins-core": "^1.0.3",
+        "@azure/event-hubs": "^5.3.1",
+        "@azure/identity": "^1.2.3",
+        "@azure/ms-rest-nodeauth": "^3.0.6",
+        "aws-sdk": "^2.708.0",
+        "azure-iothub": "^1.13.0",
+        "body-parser": "^1.19.0",
+        "bufferutil": "^4.0.1",
+        "dotenv": "^8.2.0",
+        "event-stream": "^4.0.1",
+        "express": "4.16.2",
+        "forge-apis": "^0.8.4",
+        "mime": "^2.4.6",
+        "node-rsa": "^1.1.1",
+        "q": "^1.5.1",
+        "timestring": "^6.0.0",
+        "tween-functions": "^1.2.0",
+        "utf-8-validate": "^5.0.2",
+        "uuid": "^8.3.1"
     },
     "devDependencies": {
-      "@babel/core": "^7.0.0-beta.41",
-      "@babel/plugin-transform-spread": "^7.13.0",
-      "@babel/preset-env": "7.12.11",
-      "babel-loader": "^8.1.0",
-      "webpack": "^5.11.0",
-      "webpack-cli": "^4.5.0"
+        "@babel/core": "^7.0.0-beta.41",
+        "babel-loader": "^8.1.0",
+        "@babel/preset-env": "7.12.11",
+        "@babel/plugin-transform-spread": "^7.13.0",
+        "webpack": "^5.11.0",
+        "webpack-cli": "^4.5.0"
     }
-}
+}

server/gateways/Hyperion.Server.SyntheticGateway.js

@@ -38,7 +38,7 @@ class Synthetic {
      * @param {string} configFile File path to config file defining the data stops and range values used to generate synthetic data. For an example, refer to https://github.com/Autodesk-Forge/forge-dataviz-iot-reference-app/blob/main/server/gateways/synthetic-data/config.js
      */
     constructor(configFile) {
-        this.config = require(configFile);
+        this.configFile = configFile;
     }
 
     nextStop(stops, index, direction) {
@@ -68,7 +68,8 @@ class Synthetic {
         return sensorConfig[day][week];
     }
 
-    value(sensorType, currentTime, interval) {
+    async value(sensorType, currentTime, interval) {
+        if (!this.config) this.config = await loadJSONFile(this.configFile);
         let hour = this._timeToDecimal(currentTime);
         let self = this;
         let stops = this._getStops(sensorType, currentTime);
@@ -128,7 +129,7 @@ class SyntheticGateway extends DataGateway {
     }
 
     async getDeviceModels() {
-        return loadJSONFile(this.deviceModelFile);
+        return await loadJSONFile(this.deviceModelFile);
     }
 
     async getDevicesInModel(deviceModelId) {
@@ -180,7 +181,7 @@ class SyntheticGateway extends DataGateway {
             let intervalToHour = gapSeconds / 60 / 60;
             for (let i = 0; i < 32; i++) {
                 let time = new Date(Math.round((currSecond + step * i) * 1000));
-                let v = synthetic.value(propertyId, time, intervalToHour);
+                let v = await synthetic.value(propertyId, time, intervalToHour);
                 values.push(v);
             }