@corvina/device-example 1.0.23 → 1.1.1

package/.env

@@ -1,4 +1,4 @@
-APP_ID=app
+\APP_ID=app
 PORT=3000
 LOG_LEVEL=trace
 REQUEST_LIMIT=100kb
@@ -9,15 +9,15 @@ SESSION_SECRET=mySecret
 # PAIRING_ENDPOINT=https://pairing.corvina.fog:10443/api/v1/
 
 # my pc
-ACTIVATION_KEY=653PO-2Y9FQ-O7HZK-GTI4B
+ACTIVATION_KEY=4D05-4037-974E-9482
 PAIRING_ENDPOINT=https://pairing.corvina.fog:10443/api/v1/
 
 # abb ac500
 # ACTIVATION_KEY=B2A0-45AC-ABFE-D25F
 # PAIRING_ENDPOINT=https://pairing.dev.corvina.cloud/api/v1/
 
-#AVAILABLE_TAGS=[{"name":"Tag1","type":"integer"},{"name":"Tag2","type":"integer"},{"name":"Tag3","type":"integer"}]
-#AVAILABLE_ALARMS=[{"name": "Alarm1", "severity" : 1, "source" : "Tag1", "desc" : { "en" : "Tag above normal : [Tag1]"} , "ack_required": true, "reset_required" : true, "simulation" : { "f" : "{ console.log('current tag value is ', $('Tag1')); return $('Tag1') > 100 }" } }, {"name" : "Alarm2"} ]
+AVAILABLE_TAGS=[{"name":"Tag1","type":"integer"},{"name":"Tag2","type":"integer"},{"name":"Tag3","type":"integer"}]
+AVAILABLE_ALARMS=[{"name": "Alarm1", "severity" : 1, "source" : "Tag1", "desc" : { "en" : "Tag above normal : [Tag1]"} , "ack_required": true, "reset_required" : true, "simulation" : { "f" : "{ console.log('current tag value is ', $('Tag1')); return $('Tag1') > 100 }" } }, {"name" : "Alarm2"} ]
 SIMULATE_TAGS=1
 SIMULATE_ALARMS=0
 SIMULATION_MS=1000
@@ -51,11 +51,15 @@ SWAGGER_API_SPEC=/spec
 
 ### LAST-ENV ###
 # don't write below this line!!
-ACTIVATION_KEY=AY6U2-ZQGL2-ZV3HH-KO2YX
-PAIRING_ENDPOINT=https://pairing.corvina.fog:10443/api/v1/
-#AVAILABLE_TAGS_FILE=
-#AVAILABLE_TAGS=[{"name":"Tag1","type":"integer"},{"name":"Tag2","type":"integer"},{"name":"Tag3","type":"integer"},{"name":"PositionNow","type":"integer"},{"name":"InputTag","type":"integer"}]
-#SIMULATE_TAGS=1
-#AVAILABLE_ALARMS=[{"name":"Alarm10","severity":1,"source":"Tag1","desc":{"en":"Tag above normal : [Tag1]"},"ack_required":true,"reset_required":true,"simulation":{"f":"{ console.log('current tag value is ', $('Tag1'));  $('Tag1') > 0; return Math.random() > 0.5 }"}},{"name":"Alarm2"}]
-#SIMULATE_ALARMS=1
+#ACTIVATION_KEY=A591-40AA-94D6-02CA
+#PAIRING_ENDPOINT=https://pairing.corvina.cloud/api/v1/
+ACTIVATION_KEY=A591-40AA-94D6-02CA
+PAIRING_ENDPOINT=https://pairing.corvina.io/api/v1/
+
+AVAILABLE_TAGS_FILE=
+AVAILABLE_TAGS=[{"name":"Tag1","type":"integer"},{"name":"Tag2","type":"integer"},{"name":"Tag3","type":"integer"},{"name":"PositionNow","type":"integer"},{"name":"InputTag","type":"integer"}]
+#AVAILABLE_TAGS=[{"name":"M1/Tag1","type":"integer"},{"name":"M1/Tag2","type":"integer"},{"name":"M2/Tag1","type":"integer"},{"name":"M2/Tag2","type":"integer"},{"name":"M3/Tag1","type":"integer"},{"name":"M3/Tag2","type":"integer"},{"name":"M4/Tag1","type":"integer"},{"name":"M4/Tag2","type":"integer"},{"name":"M5/Tag1","type":"integer"},{"name":"M5/Tag2","type":"integer"},{"name":"M6/Tag1","type":"integer"},{"name":"M6/Tag2","type":"integer"},{"name":"M7/Tag1","type":"integer"},{"name":"M7/Tag2","type":"integer"},{"name":"M8/Tag1","type":"integer"},{"name":"M8/Tag2","type":"integer"},{"name":"M9/Tag1","type":"integer"},{"name":"M9/Tag2","type":"integer"},{"name":"M10/Tag1","type":"integer"},{"name":"M10/Tag2","type":"integer"},{"name":"PositionNow","type":"integer"},{"name":"zzz","type":"integer"},{"name":"InputTag","type":"integer"}]
+SIMULATE_TAGS=1
+AVAILABLE_ALARMS=[{"name":"Alarm10","severity":1,"source":"Tag1","desc":{"en":"Tag above normal : [Tag1]"},"ack_required":true,"reset_required":true,"simulation":{"f":"{ console.log('current tag value is ', $('Tag1'));  $('Tag1') > 0; return Math.random() > 0.5 }"}},{"name":"Alarm2"}]
+SIMULATE_ALARMS=1
 PACKET_FORMAT=bson

package/README.md

@@ -20,16 +20,16 @@ The device can be started:
 
 * via package manager:
 
-```
+```shell
 npm install @corvina/device-example
 
-npm @corvina/device-example
+npx @corvina/device-example
 ```
 
 * via `npx` (version >= 8)
 
 ```shell
-npx @corvina/device-example
+npx @corvina/device-example@latest
 ```
 
 * from sources:

package/dist/controllers/device/config.controller.d.ts

@@ -5,7 +5,7 @@ export declare class Config {
     private readonly deviceService;
     private readonly l;
     constructor(deviceService: DeviceService);
-    config(newConfig: DeviceConfigDTO): DeviceConfigDTO;
+    config(newConfig: DeviceConfig): DeviceConfigDTO;
     get(): DeviceConfig;
     getLicenseData(): LicenseDataDTO;
 }

package/dist/controllers/device/config.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.controller.d.ts","sourceRoot":"","sources":["../../../src/controllers/device/config.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAErE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGvD,qBAGa,MAAM;IAGH,OAAO,CAAC,QAAQ,CAAC,aAAa;IAF1C,OAAO,CAAC,QAAQ,CAAC,CAAC,CAA2B;gBAEhB,aAAa,EAAE,aAAa;IAMzD,MAAM,CAAoB,SAAS,EAAE,eAAe,GAAG,eAAe;IAUtE,GAAG,IAAI,YAAY;IASnB,cAAc,IAAI,cAAc;CAGnC"}
+{"version":3,"file":"config.controller.d.ts","sourceRoot":"","sources":["../../../src/controllers/device/config.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAErE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGvD,qBAGa,MAAM;IAGH,OAAO,CAAC,QAAQ,CAAC,aAAa;IAF1C,OAAO,CAAC,QAAQ,CAAC,CAAC,CAA2B;gBAEhB,aAAa,EAAE,aAAa;IAMzD,MAAM,CAAoB,SAAS,EAAE,YAAY,GAAG,eAAe;IAWnE,GAAG,IAAI,YAAY;IASnB,cAAc,IAAI,cAAc;CAGnC"}

package/dist/controllers/device/config.controller.js

@@ -27,6 +27,7 @@ let Config = Config_1 = class Config {
     }
     config(newConfig) {
         this.l.log("apply new config");
+        this.deviceService.reinit(newConfig);
         return new deviceconfig_dto_1.DeviceConfigDTO(this.deviceService.getDeviceConfig());
     }
     get() {
@@ -44,7 +45,7 @@ __decorate([
     (0, common_1.Post)("/config"),
     __param(0, (0, common_1.Body)("newConfig")),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [deviceconfig_dto_1.DeviceConfigDTO]),
+    __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", deviceconfig_dto_1.DeviceConfigDTO)
 ], Config.prototype, "config", null);
 __decorate([

package/dist/controllers/device/config.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.controller.js","sourceRoot":"","sources":["../../../src/controllers/device/config.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAiF;AACjF,0DAAqE;AACrE,6CAAwD;AACxD,6DAAyD;AACzD,2DAAuD;AAMvD,IAAa,MAAM,cAAnB,MAAa,MAAM;IAGc;IAFZ,CAAC,GAAG,IAAI,eAAM,CAAC,QAAM,CAAC,IAAI,CAAC,CAAC;IAE7C,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAM7D,MAAM,CAAoB,SAA0B;QAChD,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;QAE/B,OAAO,IAAI,kCAAe,CAAC,IAAI,CAAC,aAAa,CAAC,eAAe,EAAE,CAAC,CAAC;IACrE,CAAC;IAMD,GAAG;QACC,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,gBAAgB,EAAE,CAAC;QACrD,OAAO,MAAM,CAAC;IAClB,CAAC;IAMD,cAAc;QACV,OAAO,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,CAAC;IAC/C,CAAC;CACJ,CAAA;AAtBG;IAJC,IAAA,sBAAY,EAAC;QACV,OAAO,EAAE,oCAAoC;KAChD,CAAC;IACD,IAAA,aAAI,EAAC,SAAS,CAAC;IACR,WAAA,IAAA,aAAI,EAAC,WAAW,CAAC,CAAA;;qCAAY,kCAAe;oCAAG,kCAAe;oCAIrE;AAMD;IAJC,IAAA,sBAAY,EAAC;QACV,OAAO,EAAE,0CAA0C;KACtD,CAAC;IACD,IAAA,YAAG,EAAC,SAAS,CAAC;;;;iCAId;AAMD;IAJC,IAAA,sBAAY,EAAC;QACV,OAAO,EAAE,iCAAiC;KAC7C,CAAC;IACD,IAAA,YAAG,EAAC,cAAc,CAAC;;;oCACF,gCAAc;4CAE/B;AA9BQ,MAAM;IAHlB,IAAA,iBAAO,EAAC,QAAQ,CAAC;IACjB,IAAA,mBAAU,EAAC,SAAS,CAAC;IACrB,IAAA,mBAAU,GAAE;qCAImC,6BAAa;GAHhD,MAAM,CA+BlB;AA/BY,wBAAM"}
+{"version":3,"file":"config.controller.js","sourceRoot":"","sources":["../../../src/controllers/device/config.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAiF;AACjF,0DAAqE;AACrE,6CAAwD;AACxD,6DAAyD;AACzD,2DAAuD;AAMvD,IAAa,MAAM,cAAnB,MAAa,MAAM;IAGc;IAFZ,CAAC,GAAG,IAAI,eAAM,CAAC,QAAM,CAAC,IAAI,CAAC,CAAC;IAE7C,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAM7D,MAAM,CAAoB,SAAuB;QAC7C,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;QAE/B,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACrC,OAAO,IAAI,kCAAe,CAAC,IAAI,CAAC,aAAa,CAAC,eAAe,EAAE,CAAC,CAAC;IACrE,CAAC;IAMD,GAAG;QACC,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,gBAAgB,EAAE,CAAC;QACrD,OAAO,MAAM,CAAC;IAClB,CAAC;IAMD,cAAc;QACV,OAAO,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,CAAC;IAC/C,CAAC;CACJ,CAAA;AAvBG;IAJC,IAAA,sBAAY,EAAC;QACV,OAAO,EAAE,oCAAoC;KAChD,CAAC;IACD,IAAA,aAAI,EAAC,SAAS,CAAC;IACR,WAAA,IAAA,aAAI,EAAC,WAAW,CAAC,CAAA;;;oCAA2B,kCAAe;oCAKlE;AAMD;IAJC,IAAA,sBAAY,EAAC;QACV,OAAO,EAAE,0CAA0C;KACtD,CAAC;IACD,IAAA,YAAG,EAAC,SAAS,CAAC;;;;iCAId;AAMD;IAJC,IAAA,sBAAY,EAAC;QACV,OAAO,EAAE,iCAAiC;KAC7C,CAAC;IACD,IAAA,YAAG,EAAC,cAAc,CAAC;;;oCACF,gCAAc;4CAE/B;AA/BQ,MAAM;IAHlB,IAAA,iBAAO,EAAC,QAAQ,CAAC;IACjB,IAAA,mBAAU,EAAC,SAAS,CAAC;IACrB,IAAA,mBAAU,GAAE;qCAImC,6BAAa;GAHhD,MAAM,CAgClB;AAhCY,wBAAM"}

package/dist/main.js

@@ -31,7 +31,7 @@ async function bootstrap() {
         l.error("Error caught: ");
         l.error(e);
     }
-    await app.listen(3000);
+    await app.listen(process.env.PORT || 3000);
     app.get(device_client_1.DeviceRunnerService).run();
     const device = app.get(device_client_1.DeviceService);
     device.on("ready", (event) => {
@@ -41,10 +41,23 @@ async function bootstrap() {
         l.log("Device is not ready to transmit data");
     });
     device.on("write", (event) => {
-        l.log("Write event received", event);
-        if (process.env["WRITE_CALLBACK"]) {
-            axios_1.default.post(process.env["WRITE_CALLBACK"], event).catch((err) => "Error executing write callback");
-        }
+        l.log(`Write event received ${JSON.stringify(event)}`);
+        const t = Date.now();
+        const dataPoints = new Array();
+        const dp = {
+            tagName: event.tagName,
+            value: event.v,
+            timestamp: t,
+        };
+        dataPoints.push(dp);
+        device.post(dataPoints, {
+            qos: 0,
+            cb: process.env["WRITE_CALLBACK"]
+                ? (error, tagName, modelPath) => {
+                    axios_1.default.post(process.env["WRITE_CALLBACK"], event).catch((err) => "Error executing write callback");
+                }
+                : undefined,
+        });
     });
 }
 bootstrap();

package/dist/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";;;;;AAAA,uCAA2C;AAC3C,6CAAiE;AACjE,kDAA0B;AAC1B,6CAAyC;AACzC,2CAAuD;AACvD,6CAAuD;AACvD,0DAA4E;AAE5E,KAAK,UAAU,SAAS;IACpB,MAAM,GAAG,GAAG,MAAM,kBAAW,CAAC,MAAM,CAAC,sBAAS,EAAE;QAC5C,UAAU,EAAE,KAAK;KACpB,CAAC,CAAC;IACH,MAAM,UAAU,GAAkB,GAAG,CAAC,GAAG,CAAC,oBAAc,CAAC,CAAC;IAC1D,GAAG,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAE1B,MAAM,CAAC,GAAG,IAAI,eAAM,CAAC,SAAS,CAAC,CAAC;IAEhC,IAAI;QACA,MAAM,MAAM,GAAG,IAAI,yBAAe,EAAE;aAC/B,QAAQ,CAAC,2BAA2B,CAAC;aACrC,cAAc,CAAC,EAAE,CAAC;aAClB,UAAU,CAAC,KAAK,CAAC;aACjB,MAAM,CAAC,QAAQ,CAAC;aAChB,KAAK,EAAE,CAAC;QACb,MAAM,QAAQ,GAAG,uBAAa,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC3D,uBAAa,CAAC,KAAK,CAAC,YAAY,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;KACpD;IAAC,OAAO,CAAC,EAAE;QACR,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QAC1B,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KACd;IAED,MAAM,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAEvB,GAAG,CAAC,GAAG,CAAC,mCAAmB,CAAC,CAAC,GAAG,EAAE,CAAC;IAEnC,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,6BAAa,CAAC,CAAC;IAEtC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;QACzB,CAAC,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,EAAE;QAC7B,CAAC,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;QACzB,CAAC,CAAC,GAAG,CAAC,sBAAsB,EAAE,KAAK,CAAC,CAAC;QACrC,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE;YAC/B,eAAK,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,gCAAgC,CAAC,CAAC;SACrG;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AACD,SAAS,EAAE,CAAC"}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";;;;;AAAA,uCAA2C;AAC3C,6CAAiE;AACjE,kDAA0B;AAC1B,6CAAyC;AACzC,2CAAuD;AACvD,6CAAuD;AACvD,0DAAuF;AAEvF,KAAK,UAAU,SAAS;IACpB,MAAM,GAAG,GAAG,MAAM,kBAAW,CAAC,MAAM,CAAC,sBAAS,EAAE;QAC5C,UAAU,EAAE,KAAK;KACpB,CAAC,CAAC;IACH,MAAM,UAAU,GAAkB,GAAG,CAAC,GAAG,CAAC,oBAAc,CAAC,CAAC;IAC1D,GAAG,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAE1B,MAAM,CAAC,GAAG,IAAI,eAAM,CAAC,SAAS,CAAC,CAAC;IAEhC,IAAI;QACA,MAAM,MAAM,GAAG,IAAI,yBAAe,EAAE;aAC/B,QAAQ,CAAC,2BAA2B,CAAC;aACrC,cAAc,CAAC,EAAE,CAAC;aAClB,UAAU,CAAC,KAAK,CAAC;aACjB,MAAM,CAAC,QAAQ,CAAC;aAChB,KAAK,EAAE,CAAC;QACb,MAAM,QAAQ,GAAG,uBAAa,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC3D,uBAAa,CAAC,KAAK,CAAC,YAAY,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;KACpD;IAAC,OAAO,CAAC,EAAE;QACR,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QAC1B,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KACd;IAED,MAAM,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC;IAE3C,GAAG,CAAC,GAAG,CAAC,mCAAmB,CAAC,CAAC,GAAG,EAAE,CAAC;IAEnC,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,6BAAa,CAAC,CAAC;IAEtC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;QACzB,CAAC,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,EAAE;QAC7B,CAAC,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;QACzB,CAAC,CAAC,GAAG,CAAC,wBAAwB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAEvD,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACrB,MAAM,UAAU,GAAG,IAAI,KAAK,EAAa,CAAC;QAC1C,MAAM,EAAE,GAAc;YAClB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,KAAK,EAAE,KAAK,CAAC,CAAC;YACd,SAAS,EAAE,CAAC;SACf,CAAC;QACF,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACpB,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,GAAG,EAAE,CAAC;YACN,EAAE,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;gBAC7B,CAAC,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE;oBAC5B,eAAK,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,gCAAgC,CAAC,CAAC;gBACtG,CAAC;gBACD,CAAC,CAAC,SAAS;SAClB,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AACD,SAAS,EAAE,CAAC"}