@alwaysai/device-agent 1.0.0 → 1.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (26) hide show
  1. package/lib/cloud-connection/device-agent-cloud-connection.d.ts.map +1 -1
  2. package/lib/cloud-connection/device-agent-cloud-connection.js +1 -0
  3. package/lib/cloud-connection/device-agent-cloud-connection.js.map +1 -1
  4. package/lib/cloud-connection/messages.js +6 -6
  5. package/lib/cloud-connection/messages.js.map +1 -1
  6. package/lib/cloud-connection/passthrough-handler.d.ts.map +1 -1
  7. package/lib/cloud-connection/passthrough-handler.js +40 -11
  8. package/lib/cloud-connection/passthrough-handler.js.map +1 -1
  9. package/lib/cloud-connection/shadow-handler.d.ts +4 -0
  10. package/lib/cloud-connection/shadow-handler.d.ts.map +1 -1
  11. package/lib/cloud-connection/shadow-handler.js +16 -0
  12. package/lib/cloud-connection/shadow-handler.js.map +1 -1
  13. package/lib/device-control/device-control.d.ts +47 -3
  14. package/lib/device-control/device-control.d.ts.map +1 -1
  15. package/lib/device-control/device-control.js +103 -11
  16. package/lib/device-control/device-control.js.map +1 -1
  17. package/lib/subcommands/device/device.d.ts.map +1 -1
  18. package/lib/subcommands/device/device.js +15 -3
  19. package/lib/subcommands/device/device.js.map +1 -1
  20. package/package.json +3 -2
  21. package/src/cloud-connection/device-agent-cloud-connection.ts +1 -0
  22. package/src/cloud-connection/messages.ts +9 -9
  23. package/src/cloud-connection/passthrough-handler.ts +42 -10
  24. package/src/cloud-connection/shadow-handler.ts +22 -0
  25. package/src/device-control/device-control.ts +102 -7
  26. package/src/subcommands/device/device.ts +22 -6
package/lib/cloud-connection/device-agent-cloud-connection.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"device-agent-cloud-connection.d.ts","sourceRoot":"","sources":["../../src/cloud-connection/device-agent-cloud-connection.ts"],"names":[],"mappings":"AAWA,OAAO,EAOL,oBAAoB,EAMrB,MAAM,gCAAgC,CAAC;AAexC,OAAO,EAAiB,YAAY,EAAgB,MAAM,kBAAkB,CAAC;AAE7E,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAiBxC,qBAAa,0BAA0B;IACrC,OAAO,CAAC,aAAa,CAAgB;IAC9B,SAAS,EAAE,SAAS,CAAC;IAC5B,OAAO,CAAC,YAAY,CAAmB;IACvC,OAAO,CAAC,kBAAkB,CAAqB;IAC/C,OAAO,CAAC,QAAQ,CAAmB;IACnC,OAAO,CAAC,MAAM,CAAiB;IAE/B,OAAO,CAAC,QAAQ,CAAmB;IACnC,OAAO,CAAC,IAAI,CAA2B;IACvC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAmC;IACjE,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAiD;IAEzF,OAAO,CAAC,iBAAiB,CAAsB;IAE/C,OAAO,CAAC,qBAAqB,CAgB3B;IAEF,OAAO,CAAC,uBAAuB,CAsC7B;IAEF,OAAO,CAAC,oCAAoC,CAmB1C;IAEF,OAAO,CAAC,uCAAuC,CAiC7C;YAEY,mBAAmB;IAIjC,OAAO,CAAC,SAAS;YAKH,0BAA0B;YAW1B,uBAAuB;YAmDvB,SAAS;IAuDvB,OAAO,CAAC,sBAAsB,CA0D5B;;IAkCK,WAAW,IAAI,MAAM;IAIrB,gBAAgB;IAIhB,eAAe,IAAI,YAAY;IAI/B,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAIrC,mBAAmB,CAAC,SAAS,EAAE,MAAM;IAIrC,wBAAwB,CAAC,EACpC,KAAK,EACL,OAAO,EACR,EAAE;QACD,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,oBAAoB,CAAC;KAC/B;IA2HY,aAAa,CACxB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,oBAAoB,GAAG,GAAG;IA2DxB,aAAa;IAqCb,IAAI;CAOlB;AAED,wBAAsB,4BAA4B,kBAqBjD"}
1
+ {"version":3,"file":"device-agent-cloud-connection.d.ts","sourceRoot":"","sources":["../../src/cloud-connection/device-agent-cloud-connection.ts"],"names":[],"mappings":"AAWA,OAAO,EAOL,oBAAoB,EAMrB,MAAM,gCAAgC,CAAC;AAexC,OAAO,EAAiB,YAAY,EAAgB,MAAM,kBAAkB,CAAC;AAE7E,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAiBxC,qBAAa,0BAA0B;IACrC,OAAO,CAAC,aAAa,CAAgB;IAC9B,SAAS,EAAE,SAAS,CAAC;IAC5B,OAAO,CAAC,YAAY,CAAmB;IACvC,OAAO,CAAC,kBAAkB,CAAqB;IAC/C,OAAO,CAAC,QAAQ,CAAmB;IACnC,OAAO,CAAC,MAAM,CAAiB;IAE/B,OAAO,CAAC,QAAQ,CAAmB;IACnC,OAAO,CAAC,IAAI,CAA2B;IACvC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAmC;IACjE,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAiD;IAEzF,OAAO,CAAC,iBAAiB,CAAsB;IAE/C,OAAO,CAAC,qBAAqB,CAgB3B;IAEF,OAAO,CAAC,uBAAuB,CAsC7B;IAEF,OAAO,CAAC,oCAAoC,CAmB1C;IAEF,OAAO,CAAC,uCAAuC,CAiC7C;YAEY,mBAAmB;IAIjC,OAAO,CAAC,SAAS;YAKH,0BAA0B;YAW1B,uBAAuB;YAmDvB,SAAS;IAuDvB,OAAO,CAAC,sBAAsB,CA0D5B;;IAkCK,WAAW,IAAI,MAAM;IAIrB,gBAAgB;IAIhB,eAAe,IAAI,YAAY;IAI/B,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAIrC,mBAAmB,CAAC,SAAS,EAAE,MAAM;IAIrC,wBAAwB,CAAC,EACpC,KAAK,EACL,OAAO,EACR,EAAE;QACD,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,oBAAoB,CAAC;KAC/B;IA2HY,aAAa,CACxB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,oBAAoB,GAAG,GAAG;IA2DxB,aAAa;IAsCb,IAAI;CAOlB;AAED,wBAAsB,4BAA4B,kBAqBjD"}
package/lib/cloud-connection/device-agent-cloud-connection.js CHANGED
@@ -430,6 +430,7 @@ class DeviceAgentCloudConnection {
430
430
  // FIXME: EI-709 Skip this request for now to prevent kicking off another
431
431
  // shadow update process if IoT Core disconnect occurs during app config update
432
432
  //this.shadowHandler.getShadowUpdates();
433
+ void this.shadowHandler.updateSystemInfoShadow();
433
434
  });
434
435
  this.device.on('disconnect', () => {
435
436
  logger_1.logger.warn('Device Agent has been disconnected from the cloud');
package/lib/cloud-connection/device-agent-cloud-connection.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"device-agent-cloud-connection.js","sourceRoot":"","sources":["../../src/cloud-connection/device-agent-cloud-connection.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"device-agent-cloud-connection.js","sourceRoot":"","sources":["../../src/cloud-connection/device-agent-cloud-connection.ts"],"names":[],"mappings":"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"}
package/lib/cloud-connection/messages.js CHANGED
@@ -27,13 +27,13 @@ async function getStatusResponsePayload(status, message) {
27
27
  }
28
28
  exports.getStatusResponsePayload = getStatusResponsePayload;
29
29
  async function getDeviceStatsPayload() {
30
- const cpuUsage = await (0, device_control_1.getCpuUtil)();
31
- const diskUtil = await (0, device_control_1.getDiskUtil)();
32
- const memUtil = await (0, device_control_1.getMemUtil)();
30
+ const cpuDetails = await (0, device_control_1.getCpuDetails)();
31
+ const diskDetails = await (0, device_control_1.getDiskDetails)();
32
+ const memDetails = await (0, device_control_1.getMemDetails)();
33
33
  const deviceStatsPayload = {
34
- cpuUsage,
35
- diskUtil,
36
- usedMemoryPercentage: memUtil
34
+ cpuDetails,
35
+ diskDetails,
36
+ memDetails
37
37
  };
38
38
  return deviceStatsPayload;
39
39
  }
package/lib/cloud-connection/messages.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"messages.js","sourceRoot":"","sources":["../../src/cloud-connection/messages.ts"],"names":[],"mappings":";;;AAOA,gEAAqD;AACrD,qEAI0C;AAC1C,iEAAiE;AAE1D,KAAK,UAAU,kBAAkB;IACtC,MAAM,QAAQ,GAAe,EAAE,CAAC;IAChC,MAAM,IAAI,GAAG,MAAM,IAAA,8BAAe,GAAE,CAAC,OAAO,EAAE,CAAC;IAC/C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC;QAChC,MAAM,MAAM,GAAG,MAAM,IAAA,iCAAW,EAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QAChD,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;KACvB;IACD,MAAM,eAAe,GAAG;QACtB,QAAQ,EAAE,QAAQ;KACnB,CAAC;IACF,OAAO,eAAe,CAAC;AACzB,CAAC;AAZD,gDAYC;AAEM,KAAK,UAAU,wBAAwB,CAC5C,MAA2B,EAC3B,OAAe;IAEf,MAAM,qBAAqB,GAA0B;QACnD,MAAM;QACN,OAAO;KACR,CAAC;IACF,OAAO,qBAAqB,CAAC;AAC/B,CAAC;AATD,4DASC;AAEM,KAAK,UAAU,qBAAqB;IACzC,MAAM,QAAQ,GAAG,MAAM,IAAA,2BAAU,GAAE,CAAC;IACpC,MAAM,QAAQ,GAAG,MAAM,IAAA,4BAAW,GAAE,CAAC;IACrC,MAAM,OAAO,GAAG,MAAM,IAAA,2BAAU,GAAE,CAAC;IAEnC,MAAM,kBAAkB,GAAuB;QAC7C,QAAQ;QACR,QAAQ;QACR,oBAAoB,EAAE,OAAO;KAC9B,CAAC;IACF,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAXD,sDAWC"}
1
+ {"version":3,"file":"messages.js","sourceRoot":"","sources":["../../src/cloud-connection/messages.ts"],"names":[],"mappings":";;;AAOA,gEAAqD;AACrD,qEAI0C;AAC1C,iEAAiE;AAE1D,KAAK,UAAU,kBAAkB;IACtC,MAAM,QAAQ,GAAe,EAAE,CAAC;IAChC,MAAM,IAAI,GAAG,MAAM,IAAA,8BAAe,GAAE,CAAC,OAAO,EAAE,CAAC;IAC/C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC;QAChC,MAAM,MAAM,GAAG,MAAM,IAAA,iCAAW,EAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QAChD,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;KACvB;IACD,MAAM,eAAe,GAAG;QACtB,QAAQ,EAAE,QAAQ;KACnB,CAAC;IACF,OAAO,eAAe,CAAC;AACzB,CAAC;AAZD,gDAYC;AAEM,KAAK,UAAU,wBAAwB,CAC5C,MAA2B,EAC3B,OAAe;IAEf,MAAM,qBAAqB,GAA0B;QACnD,MAAM;QACN,OAAO;KACR,CAAC;IACF,OAAO,qBAAqB,CAAC;AAC/B,CAAC;AATD,4DASC;AAEM,KAAK,UAAU,qBAAqB;IACzC,MAAM,UAAU,GAAG,MAAM,IAAA,8BAAa,GAAE,CAAC;IACzC,MAAM,WAAW,GAAG,MAAM,IAAA,+BAAc,GAAE,CAAC;IAC3C,MAAM,UAAU,GAAG,MAAM,IAAA,8BAAa,GAAE,CAAC;IAEzC,MAAM,kBAAkB,GAAuB;QAC7C,UAAU;QACV,WAAW;QACX,UAAU;KACX,CAAC;IACF,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAXD,sDAWC"}
package/lib/cloud-connection/passthrough-handler.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"passthrough-handler.d.ts","sourceRoot":"","sources":["../../src/cloud-connection/passthrough-handler.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAMxC,qBAAa,kBAAkB;IACtB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,MAAC;IACX,OAAO,MAAC;IACR,WAAW,MAAC;gBAEP,SAAS,EAAE,SAAS;IAInB,KAAK;CAwCnB;AAqBD,wBAAsB,UAAU,CAAC,kBAAkB,EAAE,kBAAkB,iBAetE"}
1
+ {"version":3,"file":"passthrough-handler.d.ts","sourceRoot":"","sources":["../../src/cloud-connection/passthrough-handler.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAMxC,qBAAa,kBAAkB;IACtB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,MAAC;IACX,OAAO,MAAC;IACR,WAAW,MAAC;gBAEP,SAAS,EAAE,SAAS;IAInB,KAAK;CAwCnB;AAqDD,wBAAsB,UAAU,CAAC,kBAAkB,EAAE,kBAAkB,iBAetE"}
package/lib/cloud-connection/passthrough-handler.js CHANGED
@@ -50,19 +50,48 @@ function processPublish(passthroughHandler) {
50
50
  while (messageQueue.length > 0) {
51
51
  const entry = messageQueue.shift();
52
52
  const { packet, msg } = entry;
53
- ackQueue.push(msg);
54
- // FIXME: put real topic here
55
- passthroughHandler.publisher.publishToCloudWithAck(packet, (errOrResp) => {
56
- while (ackQueue.length > 0) {
57
- const msg = ackQueue.shift();
58
- if (errOrResp === true) {
59
- passthroughHandler.channel.ack(msg); // acknowledge, allow queue to discard
60
- }
61
- else if (errOrResp === false) {
62
- passthroughHandler.channel.reject(msg, true); // reject and requeue
53
+ try {
54
+ const parsedPacket = JSON.parse(packet);
55
+ if (parsedPacket && parsedPacket['action']) {
56
+ switch (parsedPacket['action']) {
57
+ case 'analytics':
58
+ ackQueue.push(msg);
59
+ // FIXME: put real topic here
60
+ passthroughHandler.publisher.publishToCloudWithAck(packet, (errOrResp) => {
61
+ while (ackQueue.length > 0) {
62
+ const msg = ackQueue.shift();
63
+ if (errOrResp === true) {
64
+ passthroughHandler.channel.ack(msg); // acknowledge, allow queue to discard
65
+ }
66
+ else if (errOrResp === false) {
67
+ passthroughHandler.channel.reject(msg, true); // reject and requeue
68
+ }
69
+ }
70
+ });
71
+ break;
72
+ case 'heartbeat':
73
+ logger_1.logger.debug(`Recieved heartbeat packet: ${packet}`);
74
+ passthroughHandler.channel.ack(msg);
75
+ logger_1.logger.debug(`Heartbeat package acknowledged`);
76
+ break;
77
+ default:
78
+ logger_1.logger.debug(`Recieved unknown 'action' packet: ${packet}`);
79
+ passthroughHandler.channel.ack(msg);
80
+ logger_1.logger.debug(`Unknown 'action' package acknowledged`);
81
+ break;
63
82
  }
64
83
  }
65
- });
84
+ else {
85
+ logger_1.logger.debug(`Received a RabbitMQ packet that did not have an 'action' field ${parsedPacket}`);
86
+ passthroughHandler.channel.ack(msg);
87
+ logger_1.logger.debug(`Package of unknown structure acknowledged`);
88
+ }
89
+ }
90
+ catch (e) {
91
+ logger_1.logger.error(`There was a problem parsing RabbitMQ packet ${e}`);
92
+ passthroughHandler.channel.ack(msg);
93
+ logger_1.logger.debug(`Problematic packet was acknowledged`);
94
+ }
66
95
  }
67
96
  }
68
97
  async function runChannel(passthroughHandler) {
package/lib/cloud-connection/passthrough-handler.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"passthrough-handler.js","sourceRoot":"","sources":["../../src/cloud-connection/passthrough-handler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"passthrough-handler.js","sourceRoot":"","sources":["../../src/cloud-connection/passthrough-handler.ts"],"names":[],"mappings":"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"}
package/lib/cloud-connection/shadow-handler.d.ts CHANGED
@@ -13,6 +13,9 @@ export interface ShadowTopics {
13
13
  updateRejected: string;
14
14
  delete: string;
15
15
  };
16
+ systemInfo: {
17
+ update: string;
18
+ };
16
19
  }
17
20
  export declare type AppConfigUpdate = {
18
21
  newAppCfg: AppConfig;
@@ -38,6 +41,7 @@ export declare class ShadowHandler {
38
41
  payload: any;
39
42
  clientToken: string;
40
43
  }): Promise<ShadowUpdate[]>;
44
+ updateSystemInfoShadow(): Promise<void>;
41
45
  updateProjectShadow(projectId: string): Promise<void>;
42
46
  getShadowUpdates(): void;
43
47
  clearAppConfig(projectId: string): void;
package/lib/cloud-connection/shadow-handler.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"shadow-handler.d.ts","sourceRoot":"","sources":["../../src/cloud-connection/shadow-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAEV,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,OAAO,EAA8B,MAAM,wBAAwB,CAAC;AAE7E,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,eAAe,EAAuB,MAAM,UAAU,CAAC;AAEhE,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE;QACR,GAAG,EAAE,MAAM,CAAC;QACZ,WAAW,EAAE,MAAM,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,EAAE,MAAM,CAAC;QACpB,cAAc,EAAE,MAAM,CAAC;QACvB,cAAc,EAAE,MAAM,CAAC;QACvB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH;AAED,oBAAY,eAAe,GAAG;IAC5B,SAAS,EAAE,SAAS,CAAC;IACrB,aAAa,CAAC,EAAE,eAAe,CAAC;CACjC,CAAC;AAEF,oBAAY,YAAY,GAAG;IACzB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,oBAAY,YAAY,GAAG;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,eAAe,CAAC;IAC/B,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,CAAC;AAEF,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,SAAS,CAAY;IAC7B,SAAgB,YAAY,EAAE,MAAM,CAAC;IACrC,SAAgB,YAAY,EAAE,YAAY,CAAC;gBAE/B,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS;YAkBpC,uBAAuB;IA2DxB,iBAAiB,CAAC,EAC7B,KAAK,EACL,OAAO,EACP,WAAW,EACZ,EAAE;QACD,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,GAAG,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;KACrB,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAqCd,mBAAmB,CAAC,SAAS,EAAE,MAAM;IAqB3C,gBAAgB;IAWhB,cAAc,CAAC,SAAS,EAAE,MAAM;CAoBxC"}
1
+ {"version":3,"file":"shadow-handler.d.ts","sourceRoot":"","sources":["../../src/cloud-connection/shadow-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAEV,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,OAAO,EAA8B,MAAM,wBAAwB,CAAC;AAE7E,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,eAAe,EAAuB,MAAM,UAAU,CAAC;AAGhE,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE;QACR,GAAG,EAAE,MAAM,CAAC;QACZ,WAAW,EAAE,MAAM,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,EAAE,MAAM,CAAC;QACpB,cAAc,EAAE,MAAM,CAAC;QACvB,cAAc,EAAE,MAAM,CAAC;QACvB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,UAAU,EAAE;QACV,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH;AAED,oBAAY,eAAe,GAAG;IAC5B,SAAS,EAAE,SAAS,CAAC;IACrB,aAAa,CAAC,EAAE,eAAe,CAAC;CACjC,CAAC;AAEF,oBAAY,YAAY,GAAG;IACzB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,oBAAY,YAAY,GAAG;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,eAAe,CAAC;IAC/B,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,CAAC;AAEF,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,SAAS,CAAY;IAC7B,SAAgB,YAAY,EAAE,MAAM,CAAC;IACrC,SAAgB,YAAY,EAAE,YAAY,CAAC;gBAE/B,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS;YAqBpC,uBAAuB;IA2DxB,iBAAiB,CAAC,EAC7B,KAAK,EACL,OAAO,EACP,WAAW,EACZ,EAAE;QACD,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,GAAG,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;KACrB,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAqCd,sBAAsB;IAetB,mBAAmB,CAAC,SAAS,EAAE,MAAM;IAqB3C,gBAAgB;IAWhB,cAAc,CAAC,SAAS,EAAE,MAAM;CAoBxC"}
package/lib/cloud-connection/shadow-handler.js CHANGED
@@ -5,6 +5,7 @@ const app_configuration_schemas_1 = require("@alwaysai/app-configuration-schemas
5
5
  const application_control_1 = require("../application-control");
6
6
  const logger_1 = require("../util/logger");
7
7
  const shadow_1 = require("./shadow");
8
+ const device_control_1 = require("../device-control/device-control");
8
9
  class ShadowHandler {
9
10
  constructor(clientId, publisher) {
10
11
  this.clientId = clientId;
@@ -20,6 +21,9 @@ class ShadowHandler {
20
21
  updateAccepted: `${this.shadowPrefix}projects/update/accepted`,
21
22
  updateRejected: `${this.shadowPrefix}projects/update/rejected`,
22
23
  delete: `${this.shadowPrefix}projects/delete`
24
+ },
25
+ systemInfo: {
26
+ update: `${this.shadowPrefix}system-info/update`
23
27
  }
24
28
  };
25
29
  }
@@ -89,6 +93,18 @@ class ShadowHandler {
89
93
  }
90
94
  return [];
91
95
  }
96
+ async updateSystemInfoShadow() {
97
+ const systemInfo = await (0, device_control_1.getSystemInformation)();
98
+ const packet = {
99
+ state: {
100
+ reported: systemInfo
101
+ },
102
+ clientToken: this.clientId
103
+ };
104
+ const topic = this.shadowTopics.systemInfo.update;
105
+ logger_1.logger.debug(`Publishing message:\n${JSON.stringify({ topic, packet }, null, 2)}`);
106
+ this.publisher.publish(topic, JSON.stringify(packet));
107
+ }
92
108
  async updateProjectShadow(projectId) {
93
109
  const appCfg = await (0, application_control_1.readAppCfgFile)({ projectId });
94
110
  const envVars = await (0, application_control_1.getAllEnvs)({ projectId });
package/lib/cloud-connection/shadow-handler.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"shadow-handler.js","sourceRoot":"","sources":["../../src/cloud-connection/shadow-handler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"shadow-handler.js","sourceRoot":"","sources":["../../src/cloud-connection/shadow-handler.ts"],"names":[],"mappings":"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"}
package/lib/device-control/device-control.d.ts CHANGED
@@ -1,4 +1,48 @@
1
- export declare function getCpuUtil(): Promise<number>;
2
- export declare function getDiskUtil(): Promise<number>;
3
- export declare function getMemUtil(): Promise<number>;
1
+ import { SystemInformationPayload } from '@alwaysai/device-agent-schemas';
2
+ export declare function getCpuDetails(): Promise<{
3
+ usedPerc: number;
4
+ temperature: any;
5
+ }>;
6
+ export declare function getDiskDetails(): Promise<{
7
+ usedGb: number;
8
+ freeGb: number;
9
+ }>;
10
+ export declare function getMemDetails(): Promise<{
11
+ usedMb: number;
12
+ freeMb: number;
13
+ }>;
14
+ export declare function getOsInfo(): Promise<{
15
+ platform: any;
16
+ distro: any;
17
+ release: any;
18
+ kernel: any;
19
+ architecture: any;
20
+ hostname: any;
21
+ }>;
22
+ export declare function getCpuInfo(): Promise<{
23
+ manufacturer: any;
24
+ brand: any;
25
+ vendor: any;
26
+ model: any;
27
+ cores: any;
28
+ physicalCores: any;
29
+ efficiencyCores: any;
30
+ processors: any;
31
+ }>;
32
+ export declare function getDiskInfo(): Promise<{
33
+ drives: any;
34
+ }>;
35
+ export declare function getDeviceInfo(): Promise<{
36
+ manufacturer: any;
37
+ model: any;
38
+ version: any;
39
+ serial: any;
40
+ virtual: any;
41
+ }>;
42
+ export declare function getNetworkInfo(): Promise<{
43
+ ipv4Address: any;
44
+ ipv6Address: any;
45
+ macAddress: any;
46
+ }>;
47
+ export declare function getSystemInformation(): Promise<SystemInformationPayload>;
4
48
  //# sourceMappingURL=device-control.d.ts.map
package/lib/device-control/device-control.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"device-control.d.ts","sourceRoot":"","sources":["../../src/device-control/device-control.ts"],"names":[],"mappings":"AAGA,wBAAsB,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,CAGlD;AAED,wBAAsB,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC,CAGnD;AAED,wBAAsB,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,CAGlD"}
1
+ {"version":3,"file":"device-control.d.ts","sourceRoot":"","sources":["../../src/device-control/device-control.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAQ1E,wBAAsB,aAAa;;;GAOlC;AAED,wBAAsB,cAAc;;;GAMnC;AAED,wBAAsB,aAAa;;;GAMlC;AAGD,wBAAsB,SAAS;;;;;;;GAU9B;AAED,wBAAsB,UAAU;;;;;;;;;GAY/B;AAED,wBAAsB,WAAW;;GAWhC;AAED,wBAAsB,aAAa;;;;;;GAUlC;AAED,wBAAsB,cAAc;;;;GAUnC;AAED,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,wBAAwB,CAAC,CAc9E"}
package/lib/device-control/device-control.js CHANGED
@@ -1,21 +1,113 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getMemUtil = exports.getDiskUtil = exports.getCpuUtil = void 0;
3
+ exports.getSystemInformation = exports.getNetworkInfo = exports.getDeviceInfo = exports.getDiskInfo = exports.getCpuInfo = exports.getOsInfo = exports.getMemDetails = exports.getDiskDetails = exports.getCpuDetails = void 0;
4
+ const logger_1 = require("../util/logger");
4
5
  // eslint-disable-next-line
5
6
  const osu = require('node-os-utils');
6
- async function getCpuUtil() {
7
- const cpuUsage = await osu.cpu.usage();
8
- return cpuUsage;
7
+ // eslint-disable-next-line
8
+ const si = require('systeminformation');
9
+ // Device Stats
10
+ async function getCpuDetails() {
11
+ const cpuFree = await osu.cpu.free();
12
+ const cpuTemp = await si.cpuTemperature();
13
+ return {
14
+ usedPerc: 100.0 - cpuFree,
15
+ temperature: cpuTemp.main
16
+ };
9
17
  }
10
- exports.getCpuUtil = getCpuUtil;
11
- async function getDiskUtil() {
18
+ exports.getCpuDetails = getCpuDetails;
19
+ async function getDiskDetails() {
12
20
  const driveInfo = await osu.drive.info();
13
- return parseFloat(driveInfo.usedPercentage);
21
+ return {
22
+ usedGb: parseFloat(driveInfo.usedGb),
23
+ freeGb: parseFloat(driveInfo.freeGb)
24
+ };
14
25
  }
15
- exports.getDiskUtil = getDiskUtil;
16
- async function getMemUtil() {
26
+ exports.getDiskDetails = getDiskDetails;
27
+ async function getMemDetails() {
17
28
  const memInfo = await osu.mem.info();
18
- return 100.0 - memInfo.freeMemPercentage;
29
+ return {
30
+ usedMb: parseFloat(memInfo.usedMemMb),
31
+ freeMb: parseFloat(memInfo.freeMemMb)
32
+ };
33
+ }
34
+ exports.getMemDetails = getMemDetails;
35
+ // System information
36
+ async function getOsInfo() {
37
+ const osInfo = await si.osInfo();
38
+ return {
39
+ platform: osInfo.platform,
40
+ distro: osInfo.distro,
41
+ release: osInfo.release,
42
+ kernel: osInfo.kernel,
43
+ architecture: osInfo.arch,
44
+ hostname: osInfo.hostname
45
+ };
46
+ }
47
+ exports.getOsInfo = getOsInfo;
48
+ async function getCpuInfo() {
49
+ const cpuInfo = await si.cpu();
50
+ return {
51
+ manufacturer: cpuInfo.manufacturer,
52
+ brand: cpuInfo.brand,
53
+ vendor: cpuInfo.vendor,
54
+ model: cpuInfo.model,
55
+ cores: cpuInfo.cores,
56
+ physicalCores: cpuInfo.phsyicalCores,
57
+ efficiencyCores: cpuInfo.efficiencyCores,
58
+ processors: cpuInfo.processors
59
+ };
60
+ }
61
+ exports.getCpuInfo = getCpuInfo;
62
+ async function getDiskInfo() {
63
+ const diskInfo = await si.diskLayout();
64
+ return {
65
+ drives: diskInfo.map((drive) => ({
66
+ device: drive.device,
67
+ type: drive.type,
68
+ name: drive.name,
69
+ vendor: drive.vendor,
70
+ size: drive.size
71
+ }))
72
+ };
73
+ }
74
+ exports.getDiskInfo = getDiskInfo;
75
+ async function getDeviceInfo() {
76
+ const deviceInfo = await si.system();
77
+ return {
78
+ manufacturer: deviceInfo.manufacturer,
79
+ model: deviceInfo.model,
80
+ version: deviceInfo.version,
81
+ serial: deviceInfo.serial && deviceInfo.serial !== '-' ? deviceInfo.serial : null,
82
+ virtual: deviceInfo.virtual
83
+ };
84
+ }
85
+ exports.getDeviceInfo = getDeviceInfo;
86
+ async function getNetworkInfo() {
87
+ const networkInterfaces = await si.networkInterfaces();
88
+ const defaultNetworkInterface = networkInterfaces.filter((iface) => iface.ip4 !== '127.0.0.1')[0];
89
+ return {
90
+ ipv4Address: defaultNetworkInterface.ip4,
91
+ ipv6Address: defaultNetworkInterface.ip6,
92
+ macAddress: defaultNetworkInterface.mac
93
+ };
94
+ }
95
+ exports.getNetworkInfo = getNetworkInfo;
96
+ async function getSystemInformation() {
97
+ try {
98
+ const systemInfo = {
99
+ os: await getOsInfo(),
100
+ cpu: await getCpuInfo(),
101
+ disk: await getDiskInfo(),
102
+ device: await getDeviceInfo(),
103
+ network: await getNetworkInfo()
104
+ };
105
+ return systemInfo;
106
+ }
107
+ catch (e) {
108
+ logger_1.logger.error('There was a problem getting system information: ', e);
109
+ }
110
+ return {};
19
111
  }
20
- exports.getMemUtil = getMemUtil;
112
+ exports.getSystemInformation = getSystemInformation;
21
113
  //# sourceMappingURL=device-control.js.map
package/lib/device-control/device-control.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"device-control.js","sourceRoot":"","sources":["../../src/device-control/device-control.ts"],"names":[],"mappings":";;;AAAA,2BAA2B;AAC3B,MAAM,GAAG,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AAE9B,KAAK,UAAU,UAAU;IAC9B,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;IACvC,OAAO,QAAQ,CAAC;AAClB,CAAC;AAHD,gCAGC;AAEM,KAAK,UAAU,WAAW;IAC/B,MAAM,SAAS,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IACzC,OAAO,UAAU,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;AAC9C,CAAC;AAHD,kCAGC;AAEM,KAAK,UAAU,UAAU;IAC9B,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;IACrC,OAAO,KAAK,GAAG,OAAO,CAAC,iBAAiB,CAAC;AAC3C,CAAC;AAHD,gCAGC"}
1
+ {"version":3,"file":"device-control.js","sourceRoot":"","sources":["../../src/device-control/device-control.ts"],"names":[],"mappings":"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"}
package/lib/subcommands/device/device.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"device.d.ts","sourceRoot":"","sources":["../../../src/subcommands/device/device.ts"],"names":[],"mappings":"AAwBA,eAAO,MAAM,WAAW;;;4DA6EtB,CAAC;AAEH,eAAO,MAAM,cAAc,yKAYzB,CAAC"}
1
+ {"version":3,"file":"device.d.ts","sourceRoot":"","sources":["../../../src/subcommands/device/device.ts"],"names":[],"mappings":"AAwBA,eAAO,MAAM,WAAW;;;4DA6EtB,CAAC;AAEH,eAAO,MAAM,cAAc,yKA4BzB,CAAC"}
package/lib/subcommands/device/device.js CHANGED
@@ -72,10 +72,22 @@ exports.getInfoCliLeaf = (0, alwayscli_1.CliLeaf)({
72
72
  description: 'Get device info',
73
73
  namedInputs: {},
74
74
  async action(_, opts) {
75
+ const cpuDetails = await (0, device_control_1.getCpuDetails)();
76
+ const diskDetails = await (0, device_control_1.getDiskDetails)();
77
+ const memDetails = await (0, device_control_1.getMemDetails)();
75
78
  const deviceInfo = [
76
- ['CPU Utilization', `${String(await (0, device_control_1.getCpuUtil)())} %`],
77
- ['Disk Utilization', `${String(await (0, device_control_1.getDiskUtil)())} %`],
78
- ['Memory Utilization', `${String(await (0, device_control_1.getMemUtil)())} %`]
79
+ [
80
+ 'CPU Utilization',
81
+ `Used ${cpuDetails.usedPerc.toFixed(2)}%, Temperature: ${cpuDetails.temperature} °C`
82
+ ],
83
+ [
84
+ 'Disk Utilization',
85
+ `${diskDetails.usedGb} GB / ${diskDetails.usedGb + diskDetails.freeGb} GB`
86
+ ],
87
+ [
88
+ 'Memory Utilization',
89
+ `${memDetails.usedMb} MB / ${memDetails.usedMb + memDetails.freeMb} MB`
90
+ ]
79
91
  ];
80
92
  console.table(deviceInfo);
81
93
  }
package/lib/subcommands/device/device.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"device.js","sourceRoot":"","sources":["../../../src/subcommands/device/device.ts"],"names":[],"mappings":";;;AAAA,mDAA8D;AAC9D,+CAA8D;AAC9D,+BAAoC;AACpC,gEAAsE;AACtE,2BAAgC;AAChC,wDAA4E;AAC5E,wDAIgC;AAEhC,4CAA8C;AAC9C,wEAI6C;AAC7C,sFAAoF;AACpF,8CAA2C;AAC3C,qDAA4D;AAC5D,gGAAwF;AACxF,8CAA4D;AAE/C,QAAA,WAAW,GAAG,IAAA,mBAAO,EAAC;IACjC,IAAI,EAAE,MAAM;IACZ,WAAW,EAAE,mBAAmB;IAChC,WAAW,EAAE;QACX,IAAI,EAAE,IAAA,0BAAc,EAAC;YACnB,WAAW,EAAE,aAAa;YAC1B,QAAQ,EAAE,KAAK;SAChB,CAAC;QACF,WAAW,EAAE,IAAA,0BAAc,EAAC;YAC1B,WAAW,EAAE,oBAAoB;YACjC,QAAQ,EAAE,KAAK;SAChB,CAAC;KACH;IACD,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI;QAClB,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;QACpB,IAAI,GAAG,IAAI,IAAI,IAAA,SAAM,GAAE,CAAC;QAExB,IACE,IAAA,yBAAgB,GAAE,CAAC,MAAM,EAAE;YAC3B,IAAA,eAAU,EAAC,0CAA4B,CAAC,EACxC;YACA,MAAM,IAAI,KAAK,CACb,sFAAsF,CACvF,CAAC;SACH;QACD,eAAM,CAAC,IAAI,CAAC,uBAAuB,IAAI,EAAE,CAAC,CAAC;QAC3C,MAAM,IAAA,4DAA0B,GAAE,CAAC;QACnC,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,wCAAuB,GAAE,CAAC,OAAO,EAAE,CAAC;QAC/D,MAAM,UAAU,GAAG,MAAM,IAAA,2BAAqB,EAAC,IAAA,gBAAS,GAAE,CAAC,CAAC;QAC5D,MAAM,MAAM,GAAG;YACb,UAAU,EAAE,YAAY;YACxB,UAAU;YACV,IAAI,EAAE,IAAA,SAAM,GAAE;YACd,QAAQ,EAAE,QAAQ;YAClB,YAAY,EAAE,IAAI;SACnB,CAAC;QAEF,2CAA2C;QAC3C,MAAM,QAAQ,GACZ,MAAM,IAAA,oCAAsB,EAC1B,iBAAiB,EACjB,WAAW,EACX,MAAM,EACN,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CACvB,CAAC;QACJ,eAAM,CAAC,KAAK,CAAC,uBAAuB,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QAEzE,IAAI,CAAC,CAAC,kBAAkB,IAAI,QAAQ,CAAC,EAAE;YACrC,MAAM,IAAI,KAAK,CACb,uEAAuE,CACxE,CAAC;SACH;QACD,MAAM,aAAa,GAAG,MAAM,IAAA,wBAAU,EACpC,0DAA0D,EAC1D,KAAK,EACL,EAAE,CACH,CAAC;QAEF,MAAM,IAAA,8CAAsB,EAAC;YAC3B,UAAU,EAAE,QAAQ,CAAC,UAAU;SAChC,CAAC,CAAC;QAEH,MAAM,IAAA,gBAAS,GAAE,CAAC,MAAM,CAAC,IAAA,6CAA+B,GAAE,CAAC,CAAC;QAE5D,MAAM,IAAA,gBAAS,EAAC,EAAE,IAAI,EAAE,8BAAsB,EAAE,CAAC,CAAC,SAAS,CACzD,4CAA8B,EAC9B,aAAa,CACd,CAAC;QACF,MAAM,WAAW,GAAG,IAAA,gBAAS,EAAC;YAC5B,IAAI,EAAE,IAAA,6CAA+B,GAAE;SACxC,CAAC,CAAC;QACH,KAAK,MAAM,GAAG,IAAI,QAAQ,CAAC,gBAAgB,EAAE;YAC3C,MAAM,WAAW,CAAC,SAAS,CAAC,GAAG,EAAE,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC;SAClE;QAED,eAAM,CAAC,IAAI,CAAC,sBAAsB,IAAI,UAAU,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;IACzE,CAAC;CACF,CAAC,CAAC;AAEU,QAAA,cAAc,GAAG,IAAA,mBAAO,EAAC;IACpC,IAAI,EAAE,UAAU;IAChB,WAAW,EAAE,iBAAiB;IAC9B,WAAW,EAAE,EAAE;IACf,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI;QAClB,MAAM,UAAU,GAAG;YACjB,CAAC,iBAAiB,EAAE,GAAG,MAAM,CAAC,MAAM,IAAA,2BAAU,GAAE,CAAC,IAAI,CAAC;YACtD,CAAC,kBAAkB,EAAE,GAAG,MAAM,CAAC,MAAM,IAAA,4BAAW,GAAE,CAAC,IAAI,CAAC;YACxD,CAAC,oBAAoB,EAAE,GAAG,MAAM,CAAC,MAAM,IAAA,2BAAU,GAAE,CAAC,IAAI,CAAC;SAC1D,CAAC;QACF,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAC5B,CAAC;CACF,CAAC,CAAC"}
1
+ {"version":3,"file":"device.js","sourceRoot":"","sources":["../../../src/subcommands/device/device.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@alwaysai/device-agent",
3
3
  "description": "The alwaysAI Device Agent",
4
- "version": "1.0.0",
4
+ "version": "1.2.0",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",
7
7
  "publishConfig": {
@@ -37,7 +37,7 @@
37
37
  "@alwaysai/alwayscli": "0.3.2",
38
38
  "@alwaysai/app-configuration-schemas": "0.1.0",
39
39
  "@alwaysai/config-nodejs": "0.3.0",
40
- "@alwaysai/device-agent-schemas": "2.1.2",
40
+ "@alwaysai/device-agent-schemas": "2.1.4",
41
41
  "ajv": "8.11.0",
42
42
  "alwaysai": "2.2.0",
43
43
  "amqplib": "0.10.3",
@@ -47,6 +47,7 @@
47
47
  "node-fetch": "2.6.1",
48
48
  "node-os-utils": "1.3.7",
49
49
  "rimraf": "4.4.0",
50
+ "systeminformation": "5.21.13",
50
51
  "uuid": "9.0.0",
51
52
  "winston": "3.8.2",
52
53
  "winston-daily-rotate-file": "4.7.1",
package/src/cloud-connection/device-agent-cloud-connection.ts CHANGED
@@ -619,6 +619,7 @@ export class DeviceAgentCloudConnection {
619
619
  // FIXME: EI-709 Skip this request for now to prevent kicking off another
620
620
  // shadow update process if IoT Core disconnect occurs during app config update
621
621
  //this.shadowHandler.getShadowUpdates();
622
+ void this.shadowHandler.updateSystemInfoShadow();
622
623
  });
623
624
 
624
625
  this.device.on('disconnect', () => {
package/src/cloud-connection/messages.ts CHANGED
@@ -7,9 +7,9 @@ import {
7
7
  import { StatusResponseValue } from '@alwaysai/device-agent-schemas/lib/constants';
8
8
  import { getAppState } from '../application-control';
9
9
  import {
10
- getCpuUtil,
11
- getDiskUtil,
12
- getMemUtil
10
+ getCpuDetails,
11
+ getDiskDetails,
12
+ getMemDetails
13
13
  } from '../device-control/device-control';
14
14
  import { AgentConfigFile } from '../infrastructure/agent-config';
15
15
 
@@ -39,14 +39,14 @@ export async function getStatusResponsePayload(
39
39
  }
40
40
 
41
41
  export async function getDeviceStatsPayload(): Promise<DeviceStatsPayload> {
42
- const cpuUsage = await getCpuUtil();
43
- const diskUtil = await getDiskUtil();
44
- const memUtil = await getMemUtil();
42
+ const cpuDetails = await getCpuDetails();
43
+ const diskDetails = await getDiskDetails();
44
+ const memDetails = await getMemDetails();
45
45
 
46
46
  const deviceStatsPayload: DeviceStatsPayload = {
47
- cpuUsage,
48
- diskUtil,
49
- usedMemoryPercentage: memUtil
47
+ cpuDetails,
48
+ diskDetails,
49
+ memDetails
50
50
  };
51
51
  return deviceStatsPayload;
52
52
  }
package/src/cloud-connection/passthrough-handler.ts CHANGED
@@ -70,18 +70,50 @@ function processPublish(passthroughHandler: PassthroughHandler) {
70
70
  while (messageQueue.length > 0) {
71
71
  const entry = messageQueue.shift();
72
72
  const { packet, msg } = entry;
73
- ackQueue.push(msg);
74
- // FIXME: put real topic here
75
- passthroughHandler.publisher.publishToCloudWithAck(packet, (errOrResp) => {
76
- while (ackQueue.length > 0) {
77
- const msg = ackQueue.shift();
78
- if (errOrResp === true) {
79
- passthroughHandler.channel.ack(msg); // acknowledge, allow queue to discard
80
- } else if (errOrResp === false) {
81
- passthroughHandler.channel.reject(msg, true); // reject and requeue
73
+ try {
74
+ const parsedPacket = JSON.parse(packet);
75
+ if (parsedPacket && parsedPacket['action']) {
76
+ switch (parsedPacket['action']) {
77
+ case 'analytics':
78
+ ackQueue.push(msg);
79
+ // FIXME: put real topic here
80
+ passthroughHandler.publisher.publishToCloudWithAck(
81
+ packet,
82
+ (errOrResp) => {
83
+ while (ackQueue.length > 0) {
84
+ const msg = ackQueue.shift();
85
+ if (errOrResp === true) {
86
+ passthroughHandler.channel.ack(msg); // acknowledge, allow queue to discard
87
+ } else if (errOrResp === false) {
88
+ passthroughHandler.channel.reject(msg, true); // reject and requeue
89
+ }
90
+ }
91
+ }
92
+ );
93
+ break;
94
+ case 'heartbeat':
95
+ logger.debug(`Recieved heartbeat packet: ${packet}`);
96
+ passthroughHandler.channel.ack(msg);
97
+ logger.debug(`Heartbeat package acknowledged`);
98
+ break;
99
+ default:
100
+ logger.debug(`Recieved unknown 'action' packet: ${packet}`);
101
+ passthroughHandler.channel.ack(msg);
102
+ logger.debug(`Unknown 'action' package acknowledged`);
103
+ break;
82
104
  }
105
+ } else {
106
+ logger.debug(
107
+ `Received a RabbitMQ packet that did not have an 'action' field ${parsedPacket}`
108
+ );
109
+ passthroughHandler.channel.ack(msg);
110
+ logger.debug(`Package of unknown structure acknowledged`);
83
111
  }
84
- });
112
+ } catch (e) {
113
+ logger.error(`There was a problem parsing RabbitMQ packet ${e}`);
114
+ passthroughHandler.channel.ack(msg);
115
+ logger.debug(`Problematic packet was acknowledged`);
116
+ }
85
117
  }
86
118
  }
87
119
 
package/src/cloud-connection/shadow-handler.ts CHANGED
@@ -6,6 +6,7 @@ import { EnvVars, getAllEnvs, readAppCfgFile } from '../application-control';
6
6
  import { logger } from '../util/logger';
7
7
  import { Publisher } from './publisher';
8
8
  import { AppConfigModels, getAppCfgModelsDiff } from './shadow';
9
+ import { getSystemInformation } from '../device-control/device-control';
9
10
 
10
11
  export interface ShadowTopics {
11
12
  projects: {
@@ -18,6 +19,9 @@ export interface ShadowTopics {
18
19
  updateRejected: string;
19
20
  delete: string;
20
21
  };
22
+ systemInfo: {
23
+ update: string;
24
+ };
21
25
  }
22
26
 
23
27
  export type AppConfigUpdate = {
@@ -55,6 +59,9 @@ export class ShadowHandler {
55
59
  updateAccepted: `${this.shadowPrefix}projects/update/accepted`,
56
60
  updateRejected: `${this.shadowPrefix}projects/update/rejected`,
57
61
  delete: `${this.shadowPrefix}projects/delete`
62
+ },
63
+ systemInfo: {
64
+ update: `${this.shadowPrefix}system-info/update`
58
65
  }
59
66
  };
60
67
  }
@@ -163,6 +170,21 @@ export class ShadowHandler {
163
170
  return [];
164
171
  }
165
172
 
173
+ public async updateSystemInfoShadow() {
174
+ const systemInfo = await getSystemInformation();
175
+ const packet = {
176
+ state: {
177
+ reported: systemInfo
178
+ },
179
+ clientToken: this.clientId
180
+ };
181
+ const topic = this.shadowTopics.systemInfo.update;
182
+ logger.debug(
183
+ `Publishing message:\n${JSON.stringify({ topic, packet }, null, 2)}`
184
+ );
185
+ this.publisher.publish(topic, JSON.stringify(packet));
186
+ }
187
+
166
188
  public async updateProjectShadow(projectId: string) {
167
189
  const appCfg = await readAppCfgFile({ projectId });
168
190
  const envVars = await getAllEnvs({ projectId });
package/src/device-control/device-control.ts CHANGED
@@ -1,17 +1,112 @@
1
+ import { SystemInformationPayload } from '@alwaysai/device-agent-schemas';
2
+ import { logger } from '../util/logger';
1
3
  // eslint-disable-next-line
2
4
  const osu = require('node-os-utils');
5
+ // eslint-disable-next-line
6
+ const si = require('systeminformation');
3
7
 
4
- export async function getCpuUtil(): Promise<number> {
5
- const cpuUsage = await osu.cpu.usage();
6
- return cpuUsage;
8
+ // Device Stats
9
+ export async function getCpuDetails() {
10
+ const cpuFree = await osu.cpu.free();
11
+ const cpuTemp = await si.cpuTemperature();
12
+ return {
13
+ usedPerc: 100.0 - cpuFree,
14
+ temperature: cpuTemp.main
15
+ };
7
16
  }
8
17
 
9
- export async function getDiskUtil(): Promise<number> {
18
+ export async function getDiskDetails() {
10
19
  const driveInfo = await osu.drive.info();
11
- return parseFloat(driveInfo.usedPercentage);
20
+ return {
21
+ usedGb: parseFloat(driveInfo.usedGb),
22
+ freeGb: parseFloat(driveInfo.freeGb)
23
+ };
12
24
  }
13
25
 
14
- export async function getMemUtil(): Promise<number> {
26
+ export async function getMemDetails() {
15
27
  const memInfo = await osu.mem.info();
16
- return 100.0 - memInfo.freeMemPercentage;
28
+ return {
29
+ usedMb: parseFloat(memInfo.usedMemMb),
30
+ freeMb: parseFloat(memInfo.freeMemMb)
31
+ };
32
+ }
33
+
34
+ // System information
35
+ export async function getOsInfo() {
36
+ const osInfo = await si.osInfo();
37
+ return {
38
+ platform: osInfo.platform,
39
+ distro: osInfo.distro,
40
+ release: osInfo.release,
41
+ kernel: osInfo.kernel,
42
+ architecture: osInfo.arch,
43
+ hostname: osInfo.hostname
44
+ };
45
+ }
46
+
47
+ export async function getCpuInfo() {
48
+ const cpuInfo = await si.cpu();
49
+ return {
50
+ manufacturer: cpuInfo.manufacturer,
51
+ brand: cpuInfo.brand,
52
+ vendor: cpuInfo.vendor,
53
+ model: cpuInfo.model,
54
+ cores: cpuInfo.cores,
55
+ physicalCores: cpuInfo.phsyicalCores,
56
+ efficiencyCores: cpuInfo.efficiencyCores,
57
+ processors: cpuInfo.processors
58
+ };
59
+ }
60
+
61
+ export async function getDiskInfo() {
62
+ const diskInfo = await si.diskLayout();
63
+ return {
64
+ drives: diskInfo.map((drive) => ({
65
+ device: drive.device,
66
+ type: drive.type,
67
+ name: drive.name,
68
+ vendor: drive.vendor,
69
+ size: drive.size
70
+ }))
71
+ };
72
+ }
73
+
74
+ export async function getDeviceInfo() {
75
+ const deviceInfo = await si.system();
76
+ return {
77
+ manufacturer: deviceInfo.manufacturer,
78
+ model: deviceInfo.model,
79
+ version: deviceInfo.version,
80
+ serial:
81
+ deviceInfo.serial && deviceInfo.serial !== '-' ? deviceInfo.serial : null,
82
+ virtual: deviceInfo.virtual
83
+ };
84
+ }
85
+
86
+ export async function getNetworkInfo() {
87
+ const networkInterfaces = await si.networkInterfaces();
88
+ const defaultNetworkInterface = networkInterfaces.filter(
89
+ (iface: any) => iface.ip4 !== '127.0.0.1'
90
+ )[0];
91
+ return {
92
+ ipv4Address: defaultNetworkInterface.ip4,
93
+ ipv6Address: defaultNetworkInterface.ip6,
94
+ macAddress: defaultNetworkInterface.mac
95
+ };
96
+ }
97
+
98
+ export async function getSystemInformation(): Promise<SystemInformationPayload> {
99
+ try {
100
+ const systemInfo: SystemInformationPayload = {
101
+ os: await getOsInfo(),
102
+ cpu: await getCpuInfo(),
103
+ disk: await getDiskInfo(),
104
+ device: await getDeviceInfo(),
105
+ network: await getNetworkInfo()
106
+ };
107
+ return systemInfo;
108
+ } catch (e) {
109
+ logger.error('There was a problem getting system information: ', e);
110
+ }
111
+ return {};
17
112
  }
package/src/subcommands/device/device.ts CHANGED
@@ -12,9 +12,9 @@ import {
12
12
 
13
13
  import { JsSpawner } from 'alwaysai/lib/util';
14
14
  import {
15
- getCpuUtil,
16
- getDiskUtil,
17
- getMemUtil
15
+ getCpuDetails,
16
+ getDiskDetails,
17
+ getMemDetails
18
18
  } from '../../device-control/device-control';
19
19
  import { writeTokenAndDeviceCfg } from '../../infrastructure/tokens-and-device-cfg';
20
20
  import { logger } from '../../util/logger';
@@ -106,10 +106,26 @@ export const getInfoCliLeaf = CliLeaf({
106
106
  description: 'Get device info',
107
107
  namedInputs: {},
108
108
  async action(_, opts) {
109
+ const cpuDetails = await getCpuDetails();
110
+ const diskDetails = await getDiskDetails();
111
+ const memDetails = await getMemDetails();
109
112
  const deviceInfo = [
110
- ['CPU Utilization', `${String(await getCpuUtil())} %`],
111
- ['Disk Utilization', `${String(await getDiskUtil())} %`],
112
- ['Memory Utilization', `${String(await getMemUtil())} %`]
113
+ [
114
+ 'CPU Utilization',
115
+ `Used ${cpuDetails.usedPerc.toFixed(2)}%, Temperature: ${
116
+ cpuDetails.temperature
117
+ } °C`
118
+ ],
119
+ [
120
+ 'Disk Utilization',
121
+ `${diskDetails.usedGb} GB / ${
122
+ diskDetails.usedGb + diskDetails.freeGb
123
+ } GB`
124
+ ],
125
+ [
126
+ 'Memory Utilization',
127
+ `${memDetails.usedMb} MB / ${memDetails.usedMb + memDetails.freeMb} MB`
128
+ ]
113
129
  ];
114
130
  console.table(deviceInfo);
115
131
  }