@alwaysai/device-agent 0.0.13 → 0.0.15
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.
- package/lib/application-control/backup.js +3 -3
- package/lib/application-control/backup.js.map +1 -1
- package/lib/application-control/index.d.ts +4 -4
- package/lib/application-control/index.d.ts.map +1 -1
- package/lib/application-control/index.js +1 -4
- package/lib/application-control/index.js.map +1 -1
- package/lib/application-control/install.d.ts +1 -1
- package/lib/application-control/install.d.ts.map +1 -1
- package/lib/application-control/install.js +41 -54
- package/lib/application-control/install.js.map +1 -1
- package/lib/application-control/models.d.ts +0 -4
- package/lib/application-control/models.d.ts.map +1 -1
- package/lib/application-control/models.js +13 -22
- package/lib/application-control/models.js.map +1 -1
- package/lib/application-control/status.d.ts +0 -6
- package/lib/application-control/status.d.ts.map +1 -1
- package/lib/application-control/status.js +3 -19
- package/lib/application-control/status.js.map +1 -1
- package/lib/application-control/utils.d.ts +3 -0
- package/lib/application-control/utils.d.ts.map +1 -1
- package/lib/application-control/utils.js +50 -21
- package/lib/application-control/utils.js.map +1 -1
- package/lib/cloud-connection/bootstrap-provision.d.ts +1 -1
- package/lib/cloud-connection/bootstrap-provision.d.ts.map +1 -1
- package/lib/cloud-connection/bootstrap-provision.js +9 -9
- package/lib/cloud-connection/bootstrap-provision.js.map +1 -1
- package/lib/cloud-connection/cmd-status.d.ts +8 -0
- package/lib/cloud-connection/cmd-status.d.ts.map +1 -0
- package/lib/cloud-connection/cmd-status.js +62 -0
- package/lib/cloud-connection/cmd-status.js.map +1 -0
- package/lib/cloud-connection/device-agent-cloud-connection.d.ts +10 -2
- package/lib/cloud-connection/device-agent-cloud-connection.d.ts.map +1 -1
- package/lib/cloud-connection/device-agent-cloud-connection.js +156 -66
- package/lib/cloud-connection/device-agent-cloud-connection.js.map +1 -1
- package/lib/cloud-connection/device-agent.d.ts.map +1 -1
- package/lib/cloud-connection/device-agent.js +4 -3
- package/lib/cloud-connection/device-agent.js.map +1 -1
- package/lib/cloud-connection/live-updates-handler.d.ts +10 -18
- package/lib/cloud-connection/live-updates-handler.d.ts.map +1 -1
- package/lib/cloud-connection/live-updates-handler.js +50 -50
- package/lib/cloud-connection/live-updates-handler.js.map +1 -1
- package/lib/cloud-connection/messages.d.ts +3 -1
- package/lib/cloud-connection/messages.d.ts.map +1 -1
- package/lib/cloud-connection/messages.js +13 -1
- package/lib/cloud-connection/messages.js.map +1 -1
- package/lib/cloud-connection/passthrough-handler.d.ts +11 -0
- package/lib/cloud-connection/passthrough-handler.d.ts.map +1 -0
- package/lib/cloud-connection/passthrough-handler.js +59 -0
- package/lib/cloud-connection/passthrough-handler.js.map +1 -0
- package/lib/cloud-connection/publisher.d.ts +1 -0
- package/lib/cloud-connection/publisher.d.ts.map +1 -1
- package/lib/cloud-connection/publisher.js +14 -0
- package/lib/cloud-connection/publisher.js.map +1 -1
- package/lib/cloud-connection/shadow-handler.d.ts +2 -3
- package/lib/cloud-connection/shadow-handler.d.ts.map +1 -1
- package/lib/cloud-connection/shadow-handler.js +18 -4
- package/lib/cloud-connection/shadow-handler.js.map +1 -1
- package/lib/cloud-connection/shadow-handler.test.d.ts +2 -0
- package/lib/cloud-connection/shadow-handler.test.d.ts.map +1 -0
- package/lib/cloud-connection/shadow-handler.test.js +321 -0
- package/lib/cloud-connection/shadow-handler.test.js.map +1 -0
- package/lib/environment.d.ts +1 -0
- package/lib/environment.d.ts.map +1 -1
- package/lib/environment.js +3 -2
- package/lib/environment.js.map +1 -1
- package/lib/index.js +2 -2
- package/lib/index.js.map +1 -1
- package/lib/infrastructure/agent-config.d.ts +15 -48
- package/lib/infrastructure/agent-config.d.ts.map +1 -1
- package/lib/infrastructure/agent-config.js.map +1 -1
- package/lib/infrastructure/agent-config.test.js +0 -6
- package/lib/infrastructure/agent-config.test.js.map +1 -1
- package/lib/infrastructure/system-id.js +2 -2
- package/lib/infrastructure/system-id.js.map +1 -1
- package/lib/infrastructure/tokens-and-device-cfg.d.ts.map +1 -1
- package/lib/infrastructure/tokens-and-device-cfg.js +5 -9
- package/lib/infrastructure/tokens-and-device-cfg.js.map +1 -1
- package/lib/local-connection/rabbitmq-connection.d.ts +4 -0
- package/lib/local-connection/rabbitmq-connection.d.ts.map +1 -0
- package/lib/local-connection/rabbitmq-connection.js +58 -0
- package/lib/local-connection/rabbitmq-connection.js.map +1 -0
- package/lib/subcommands/app/app.d.ts +4 -3
- package/lib/subcommands/app/app.d.ts.map +1 -1
- package/lib/subcommands/app/app.js +78 -27
- package/lib/subcommands/app/app.js.map +1 -1
- package/lib/subcommands/app/index.js +2 -2
- package/lib/subcommands/device/clean.js +4 -4
- package/lib/subcommands/device/clean.js.map +1 -1
- package/lib/subcommands/device/device.d.ts +1 -1
- package/lib/subcommands/device/device.d.ts.map +1 -1
- package/lib/subcommands/device/device.js +9 -10
- package/lib/subcommands/device/device.js.map +1 -1
- package/lib/subcommands/index.d.ts +0 -1
- package/lib/subcommands/index.d.ts.map +1 -1
- package/lib/subcommands/login.d.ts +0 -1
- package/lib/subcommands/login.d.ts.map +1 -1
- package/lib/subcommands/login.js +1 -9
- package/lib/subcommands/login.js.map +1 -1
- package/lib/util/directories.d.ts +11 -12
- package/lib/util/directories.d.ts.map +1 -1
- package/lib/util/directories.js +24 -29
- package/lib/util/directories.js.map +1 -1
- package/lib/util/fetch-with-timeout.d.ts +4 -0
- package/lib/util/fetch-with-timeout.d.ts.map +1 -0
- package/lib/util/fetch-with-timeout.js +15 -0
- package/lib/util/fetch-with-timeout.js.map +1 -0
- package/lib/util/logger.js +1 -0
- package/lib/util/logger.js.map +1 -1
- package/lib/util/require-logged-in-and-paid-plan.d.ts +2 -0
- package/lib/util/require-logged-in-and-paid-plan.d.ts.map +1 -0
- package/lib/util/require-logged-in-and-paid-plan.js +18 -0
- package/lib/util/require-logged-in-and-paid-plan.js.map +1 -0
- package/package.json +20 -32
- package/readme.md +100 -89
- package/src/application-control/backup.ts +3 -3
- package/src/application-control/index.ts +0 -6
- package/src/application-control/install.ts +53 -73
- package/src/application-control/models.ts +7 -19
- package/src/application-control/status.ts +3 -19
- package/src/application-control/utils.ts +61 -22
- package/src/cloud-connection/bootstrap-provision.ts +13 -10
- package/src/cloud-connection/cmd-status.ts +71 -0
- package/src/cloud-connection/device-agent-cloud-connection.ts +211 -102
- package/src/cloud-connection/device-agent.ts +7 -4
- package/src/cloud-connection/live-updates-handler.ts +79 -86
- package/src/cloud-connection/messages.ts +22 -1
- package/src/cloud-connection/passthrough-handler.ts +67 -0
- package/src/cloud-connection/publisher.ts +21 -0
- package/src/cloud-connection/shadow-handler.test.ts +361 -0
- package/src/cloud-connection/shadow-handler.ts +28 -7
- package/src/environment.ts +4 -1
- package/src/index.ts +2 -2
- package/src/infrastructure/agent-config.test.ts +0 -7
- package/src/infrastructure/agent-config.ts +24 -2
- package/src/infrastructure/system-id.ts +1 -1
- package/src/infrastructure/tokens-and-device-cfg.ts +8 -13
- package/src/local-connection/rabbitmq-connection.ts +53 -0
- package/src/subcommands/app/app.ts +82 -31
- package/src/subcommands/app/index.ts +4 -4
- package/src/subcommands/device/clean.ts +4 -4
- package/src/subcommands/device/device.ts +13 -13
- package/src/subcommands/login.ts +1 -9
- package/src/util/directories.ts +31 -29
- package/src/util/fetch-with-timeout.ts +18 -0
- package/src/util/logger.ts +2 -0
- package/src/util/require-logged-in-and-paid-plan.ts +16 -0
- package/lib/cloud-connection/app-install-status.d.ts +0 -16
- package/lib/cloud-connection/app-install-status.d.ts.map +0 -1
- package/lib/cloud-connection/app-install-status.js +0 -53
- package/lib/cloud-connection/app-install-status.js.map +0 -1
- package/src/cloud-connection/app-install-status.ts +0 -62
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"live-updates-handler.js","sourceRoot":"","sources":["../../src/cloud-connection/live-updates-handler.ts"],"names":[],"mappings":";;;AAAA,yEAKwC;AACxC,gEAAoD;AACpD,2CAAwC;AACxC,yCAAkC;AAElC,
|
|
1
|
+
{"version":3,"file":"live-updates-handler.js","sourceRoot":"","sources":["../../src/cloud-connection/live-updates-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
-
import { AppStatePacket } from '@alwaysai/device-agent-schemas';
|
|
1
|
+
import { AppInstallStatusMessage, AppStatePacket } from '@alwaysai/device-agent-schemas';
|
|
2
|
+
import { AppInstallStatusValue } from '@alwaysai/device-agent-schemas/lib/constants';
|
|
2
3
|
export declare function getAppStateMessage(): Promise<{
|
|
3
4
|
messageType: "app_state";
|
|
4
5
|
appState: AppStatePacket[];
|
|
5
6
|
}>;
|
|
7
|
+
export declare function getAppInstallStatusMessage(status: AppInstallStatusValue, message: string, appReleaseHash: string): Promise<AppInstallStatusMessage>;
|
|
6
8
|
export declare function getDeviceStatsMessage(): Promise<{
|
|
7
9
|
messageType: "device_stats";
|
|
8
10
|
deviceStats: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../src/cloud-connection/messages.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../src/cloud-connection/messages.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,cAAc,EAEf,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,qBAAqB,EAAE,MAAM,8CAA8C,CAAC;AASrF,wBAAsB,kBAAkB;;;GAavC;AAED,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,qBAAqB,EAC7B,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,uBAAuB,CAAC,CAUlC;AAED,wBAAsB,qBAAqB;;;;;;;GAc1C"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getDeviceStatsMessage = exports.getAppStateMessage = void 0;
|
|
3
|
+
exports.getDeviceStatsMessage = exports.getAppInstallStatusMessage = exports.getAppStateMessage = void 0;
|
|
4
4
|
const device_agent_schemas_1 = require("@alwaysai/device-agent-schemas");
|
|
5
5
|
const application_control_1 = require("../application-control");
|
|
6
6
|
const device_control_1 = require("../device-control/device-control");
|
|
@@ -20,6 +20,18 @@ async function getAppStateMessage() {
|
|
|
20
20
|
return appStatePackage;
|
|
21
21
|
}
|
|
22
22
|
exports.getAppStateMessage = getAppStateMessage;
|
|
23
|
+
async function getAppInstallStatusMessage(status, message, appReleaseHash) {
|
|
24
|
+
const appInstallStatusMessage = {
|
|
25
|
+
messageType: device_agent_schemas_1.keyMirrors.agentMessageType.app_install_status,
|
|
26
|
+
appInstallStatus: {
|
|
27
|
+
status,
|
|
28
|
+
message,
|
|
29
|
+
appReleaseHash
|
|
30
|
+
}
|
|
31
|
+
};
|
|
32
|
+
return appInstallStatusMessage;
|
|
33
|
+
}
|
|
34
|
+
exports.getAppInstallStatusMessage = getAppInstallStatusMessage;
|
|
23
35
|
async function getDeviceStatsMessage() {
|
|
24
36
|
const cpuUsage = await (0, device_control_1.getCpuUtil)();
|
|
25
37
|
const diskUtil = await (0, device_control_1.getDiskUtil)();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../src/cloud-connection/messages.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../src/cloud-connection/messages.ts"],"names":[],"mappings":";;;AAAA,yEAIwC;AAExC,gEAAsD;AACtD,qEAI0C;AAC1C,iEAAiE;AAE1D,KAAK,UAAU,kBAAkB;IACtC,MAAM,eAAe,GAAqB,EAAE,CAAC;IAC7C,MAAM,IAAI,GAAG,MAAM,IAAA,8BAAe,GAAE,CAAC,YAAY,EAAE,CAAC;IACpD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC;QAChC,MAAM,MAAM,GAAG,MAAM,IAAA,kCAAY,EAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QACjD,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;KAC9B;IACD,MAAM,eAAe,GAAG;QACtB,WAAW,EAAE,iCAAU,CAAC,gBAAgB,CAAC,SAAS;QAClD,QAAQ,EAAE,eAAe;KAC1B,CAAC;IACF,OAAO,eAAe,CAAC;AACzB,CAAC;AAbD,gDAaC;AAEM,KAAK,UAAU,0BAA0B,CAC9C,MAA6B,EAC7B,OAAe,EACf,cAAsB;IAEtB,MAAM,uBAAuB,GAA4B;QACvD,WAAW,EAAE,iCAAU,CAAC,gBAAgB,CAAC,kBAAkB;QAC3D,gBAAgB,EAAE;YAChB,MAAM;YACN,OAAO;YACP,cAAc;SACf;KACF,CAAC;IACF,OAAO,uBAAuB,CAAC;AACjC,CAAC;AAdD,gEAcC;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,GAAG;QACzB,WAAW,EAAE,iCAAU,CAAC,gBAAgB,CAAC,YAAY;QACrD,WAAW,EAAE;YACX,QAAQ;YACR,QAAQ;YACR,oBAAoB,EAAE,OAAO;SAC9B;KACF,CAAC;IACF,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAdD,sDAcC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { Publisher } from './publisher';
|
|
2
|
+
export declare class PassthroughHandler {
|
|
3
|
+
publisher: Publisher;
|
|
4
|
+
connection: any;
|
|
5
|
+
channel: any;
|
|
6
|
+
packetQueue: any;
|
|
7
|
+
constructor(publisher: Publisher);
|
|
8
|
+
setup(): Promise<void>;
|
|
9
|
+
}
|
|
10
|
+
export declare function runChannel(passthroughHandler: PassthroughHandler): Promise<void>;
|
|
11
|
+
//# sourceMappingURL=passthrough-handler.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"passthrough-handler.d.ts","sourceRoot":"","sources":["../../src/cloud-connection/passthrough-handler.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAKxC,qBAAa,kBAAkB;IACtB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,MAAC;IACX,OAAO,MAAC;IACR,WAAW,MAAC;gBAEP,SAAS,EAAE,SAAS;IAInB,KAAK;CAUnB;AAsBD,wBAAsB,UAAU,CAAC,kBAAkB,EAAE,kBAAkB,iBAetE"}
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.runChannel = exports.PassthroughHandler = void 0;
|
|
4
|
+
// eslint-disable-next-line
|
|
5
|
+
const amqp = require('amqplib');
|
|
6
|
+
const rabbitmq_connection_1 = require("../local-connection/rabbitmq-connection");
|
|
7
|
+
const logger_1 = require("../util/logger");
|
|
8
|
+
const messageQueue = [];
|
|
9
|
+
const ackQueue = [];
|
|
10
|
+
class PassthroughHandler {
|
|
11
|
+
constructor(publisher) {
|
|
12
|
+
this.publisher = publisher;
|
|
13
|
+
}
|
|
14
|
+
async setup() {
|
|
15
|
+
await (0, rabbitmq_connection_1.setupRabbitMQContainer)();
|
|
16
|
+
this.connection = await amqp.connect('amqp://localhost');
|
|
17
|
+
this.channel = await this.connection.createChannel();
|
|
18
|
+
this.channel.prefetch(1); // This ensures we only get one packet at a time! This appears to have prevented throttling
|
|
19
|
+
this.packetQueue = 'edgeiq-analytics-publish';
|
|
20
|
+
await this.channel.assertQueue(this.packetQueue, {
|
|
21
|
+
durable: true
|
|
22
|
+
});
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
exports.PassthroughHandler = PassthroughHandler;
|
|
26
|
+
function processPublish(passthroughHandler) {
|
|
27
|
+
while (messageQueue.length > 0) {
|
|
28
|
+
const entry = messageQueue.shift();
|
|
29
|
+
const { packet, msg } = entry;
|
|
30
|
+
ackQueue.push(msg);
|
|
31
|
+
// FIXME: put real topic here
|
|
32
|
+
passthroughHandler.publisher.publishToCloudWithAck(packet, (errOrResp) => {
|
|
33
|
+
logger_1.logger.debug('packet published to cloud?', errOrResp);
|
|
34
|
+
while (ackQueue.length > 0) {
|
|
35
|
+
const msg = ackQueue.shift();
|
|
36
|
+
if (errOrResp === true) {
|
|
37
|
+
passthroughHandler.channel.ack(msg); // acknowledge, allow queue to discard
|
|
38
|
+
}
|
|
39
|
+
else if (errOrResp === false) {
|
|
40
|
+
passthroughHandler.channel.reject(msg, true); // reject and requeue
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
async function runChannel(passthroughHandler) {
|
|
47
|
+
logger_1.logger.debug('Beginning to consume packets');
|
|
48
|
+
passthroughHandler.channel.consume(passthroughHandler.packetQueue, function (msg) {
|
|
49
|
+
if (msg.content !== undefined) {
|
|
50
|
+
const packet = JSON.parse(msg.content.toString());
|
|
51
|
+
messageQueue.push({ packet, msg });
|
|
52
|
+
processPublish(passthroughHandler);
|
|
53
|
+
}
|
|
54
|
+
}, {
|
|
55
|
+
noAck: false // When true, RabbitMQ deletes message as soon as it is consumed
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
exports.runChannel = runChannel;
|
|
59
|
+
//# sourceMappingURL=passthrough-handler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"passthrough-handler.js","sourceRoot":"","sources":["../../src/cloud-connection/passthrough-handler.ts"],"names":[],"mappings":";;;AAAA,2BAA2B;AAC3B,MAAM,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAChC,iFAAiF;AACjF,2CAAwC;AAGxC,MAAM,YAAY,GAAU,EAAE,CAAC;AAC/B,MAAM,QAAQ,GAAU,EAAE,CAAC;AAE3B,MAAa,kBAAkB;IAM7B,YAAY,SAAoB;QAC9B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,MAAM,IAAA,4CAAsB,GAAE,CAAC;QAC/B,IAAI,CAAC,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;QACzD,IAAI,CAAC,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC;QACrD,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,2FAA2F;QACrH,IAAI,CAAC,WAAW,GAAG,0BAA0B,CAAC;QAC9C,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,EAAE;YAC/C,OAAO,EAAE,IAAI;SACd,CAAC,CAAC;IACL,CAAC;CACF;AApBD,gDAoBC;AAED,SAAS,cAAc,CAAC,kBAAsC;IAC5D,OAAO,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;QAC9B,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC;QACnC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC;QAC9B,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnB,6BAA6B;QAC7B,kBAAkB,CAAC,SAAS,CAAC,qBAAqB,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,EAAE;YACvE,eAAM,CAAC,KAAK,CAAC,4BAA4B,EAAE,SAAS,CAAC,CAAC;YACtD,OAAO,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC1B,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAC;gBAC7B,IAAI,SAAS,KAAK,IAAI,EAAE;oBACtB,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,sCAAsC;iBAC5E;qBAAM,IAAI,SAAS,KAAK,KAAK,EAAE;oBAC9B,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,qBAAqB;iBACpE;aACF;QACH,CAAC,CAAC,CAAC;KACJ;AACH,CAAC;AAEM,KAAK,UAAU,UAAU,CAAC,kBAAsC;IACrE,eAAM,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAC7C,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAChC,kBAAkB,CAAC,WAAW,EAC9B,UAAU,GAAG;QACX,IAAI,GAAG,CAAC,OAAO,KAAK,SAAS,EAAE;YAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;YAClD,YAAY,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;YACnC,cAAc,CAAC,kBAAkB,CAAC,CAAC;SACpC;IACH,CAAC,EACD;QACE,KAAK,EAAE,KAAK,CAAC,gEAAgE;KAC9E,CACF,CAAC;AACJ,CAAC;AAfD,gCAeC"}
|
|
@@ -7,6 +7,7 @@ export declare class Publisher {
|
|
|
7
7
|
constructor(client: any, clientId: string);
|
|
8
8
|
private buildMessagePacket;
|
|
9
9
|
publish(topic: string, payload: string): void;
|
|
10
|
+
publishToCloudWithAck(payload: string, ackNackCallback: CallableFunction): void;
|
|
10
11
|
publishDeviceAgentPayload(topic: string, payload: DeviceAgentMessagePayload): void;
|
|
11
12
|
publishToClient(payload: DeviceAgentMessagePayload): void;
|
|
12
13
|
publishToCloud(payload: DeviceAgentMessagePayload): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publisher.d.ts","sourceRoot":"","sources":["../../src/cloud-connection/publisher.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,yBAAyB,EAG1B,MAAM,gCAAgC,CAAC;AAGxC,qBAAa,SAAS;IACpB,OAAO,CAAC,MAAM,CAAM;IACpB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;gBAE1B,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM;IAOzC,OAAO,CAAC,kBAAkB;IAanB,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAWtC,yBAAyB,CAC9B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,yBAAyB;IAU7B,eAAe,CAAC,OAAO,EAAE,yBAAyB;IAIlD,cAAc,CAAC,OAAO,EAAE,yBAAyB;CAGzD"}
|
|
1
|
+
{"version":3,"file":"publisher.d.ts","sourceRoot":"","sources":["../../src/cloud-connection/publisher.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,yBAAyB,EAG1B,MAAM,gCAAgC,CAAC;AAGxC,qBAAa,SAAS;IACpB,OAAO,CAAC,MAAM,CAAM;IACpB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;gBAE1B,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM;IAOzC,OAAO,CAAC,kBAAkB;IAanB,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAWtC,qBAAqB,CAC1B,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,gBAAgB;IAmB5B,yBAAyB,CAC9B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,yBAAyB;IAU7B,eAAe,CAAC,OAAO,EAAE,yBAAyB;IAIlD,cAAc,CAAC,OAAO,EAAE,yBAAyB;CAGzD"}
|
|
@@ -27,6 +27,20 @@ class Publisher {
|
|
|
27
27
|
}
|
|
28
28
|
});
|
|
29
29
|
}
|
|
30
|
+
publishToCloudWithAck(payload, ackNackCallback) {
|
|
31
|
+
const topic = this.toCloudTopic;
|
|
32
|
+
logger_1.logger.debug('payload received to publishWithAck', payload);
|
|
33
|
+
this.client.publish(topic, payload, { qos: 1 }, (err, resp) => {
|
|
34
|
+
if (err) {
|
|
35
|
+
logger_1.logger.error(`Error publishing message: \nTopic: ${topic}\nMessage: ${payload}\nError: ${err}`);
|
|
36
|
+
ackNackCallback(false);
|
|
37
|
+
}
|
|
38
|
+
else if (resp) {
|
|
39
|
+
logger_1.logger.debug(`Successfully published message: \nTopic: ${topic}\nMessage: ${payload}`);
|
|
40
|
+
ackNackCallback(true);
|
|
41
|
+
}
|
|
42
|
+
});
|
|
43
|
+
}
|
|
30
44
|
publishDeviceAgentPayload(topic, payload) {
|
|
31
45
|
const packet = this.buildMessagePacket(topic, payload);
|
|
32
46
|
const packetStr = JSON.stringify(packet);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publisher.js","sourceRoot":"","sources":["../../src/cloud-connection/publisher.ts"],"names":[],"mappings":";;;AAAA,yEAKwC;AACxC,2CAAwC;AAExC,MAAa,SAAS;IAMpB,YAAY,MAAW,EAAE,QAAgB;QACvC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,IAAA,qCAAc,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACnD,IAAI,CAAC,YAAY,GAAG,IAAA,oCAAa,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACnD,CAAC;IAEO,kBAAkB,CACxB,KAAa,EACb,OAAkC;QAElC,MAAM,MAAM,GAAG;YACb,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACnC,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,KAAK;YACL,OAAO;SACR,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,OAAO,CAAC,KAAa,EAAE,OAAe;QAC3C,yBAAyB;QACzB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,GAAQ,EAAE,EAAE;YAC/C,IAAI,GAAG,EAAE;gBACP,eAAM,CAAC,KAAK,CACV,sCAAsC,KAAK,cAAc,OAAO,YAAY,GAAG,EAAE,CAClF,CAAC;aACH;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,yBAAyB,CAC9B,KAAa,EACb,OAAkC;QAElC,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACvD,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACzC,eAAM,CAAC,KAAK,CACV,wBAAwB,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CACrE,CAAC;QACF,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IACjC,CAAC;IAEM,eAAe,CAAC,OAAkC;QACvD,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IAC9D,CAAC;IAEM,cAAc,CAAC,OAAkC;QACtD,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAC7D,CAAC;CACF;
|
|
1
|
+
{"version":3,"file":"publisher.js","sourceRoot":"","sources":["../../src/cloud-connection/publisher.ts"],"names":[],"mappings":";;;AAAA,yEAKwC;AACxC,2CAAwC;AAExC,MAAa,SAAS;IAMpB,YAAY,MAAW,EAAE,QAAgB;QACvC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,IAAA,qCAAc,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACnD,IAAI,CAAC,YAAY,GAAG,IAAA,oCAAa,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACnD,CAAC;IAEO,kBAAkB,CACxB,KAAa,EACb,OAAkC;QAElC,MAAM,MAAM,GAAG;YACb,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACnC,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,KAAK;YACL,OAAO;SACR,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,OAAO,CAAC,KAAa,EAAE,OAAe;QAC3C,yBAAyB;QACzB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,GAAQ,EAAE,EAAE;YAC/C,IAAI,GAAG,EAAE;gBACP,eAAM,CAAC,KAAK,CACV,sCAAsC,KAAK,cAAc,OAAO,YAAY,GAAG,EAAE,CAClF,CAAC;aACH;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,qBAAqB,CAC1B,OAAe,EACf,eAAiC;QAEjC,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC;QAChC,eAAM,CAAC,KAAK,CAAC,oCAAoC,EAAE,OAAO,CAAC,CAAC;QAC5D,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAQ,EAAE,IAAS,EAAE,EAAE;YACtE,IAAI,GAAG,EAAE;gBACP,eAAM,CAAC,KAAK,CACV,sCAAsC,KAAK,cAAc,OAAO,YAAY,GAAG,EAAE,CAClF,CAAC;gBACF,eAAe,CAAC,KAAK,CAAC,CAAC;aACxB;iBAAM,IAAI,IAAI,EAAE;gBACf,eAAM,CAAC,KAAK,CACV,4CAA4C,KAAK,cAAc,OAAO,EAAE,CACzE,CAAC;gBACF,eAAe,CAAC,IAAI,CAAC,CAAC;aACvB;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,yBAAyB,CAC9B,KAAa,EACb,OAAkC;QAElC,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACvD,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACzC,eAAM,CAAC,KAAK,CACV,wBAAwB,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CACrE,CAAC;QACF,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IACjC,CAAC;IAEM,eAAe,CAAC,OAAkC;QACvD,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IAC9D,CAAC;IAEM,cAAc,CAAC,OAAkC;QACtD,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAC7D,CAAC;CACF;AA7ED,8BA6EC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { AppConfig } from '@alwaysai/app-configuration-schemas';
|
|
2
2
|
import { Publisher } from './publisher';
|
|
3
3
|
import { AppConfigModels } from './shadow';
|
|
4
|
-
interface ShadowTopics {
|
|
4
|
+
export interface ShadowTopics {
|
|
5
5
|
projects: {
|
|
6
6
|
update: string;
|
|
7
7
|
get: string;
|
|
@@ -28,7 +28,6 @@ export declare class ShadowHandler {
|
|
|
28
28
|
}): Promise<AppConfigUpdate[]>;
|
|
29
29
|
publishAppState(projectId: string): Promise<void>;
|
|
30
30
|
getShadowUpdates(): void;
|
|
31
|
-
deleteProjectShadow(): void;
|
|
31
|
+
deleteProjectShadow(projectId: string): void;
|
|
32
32
|
}
|
|
33
|
-
export {};
|
|
34
33
|
//# sourceMappingURL=shadow-handler.d.ts.map
|
|
@@ -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;AAG7C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,eAAe,EAAuB,MAAM,UAAU,CAAC;AAEhE,
|
|
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;AAG7C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,eAAe,EAAuB,MAAM,UAAU,CAAC;AAEhE,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE;QACR,MAAM,EAAE,MAAM,CAAC;QACf,GAAG,EAAE,MAAM,CAAC;QACZ,WAAW,EAAE,MAAM,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH;AAED,oBAAY,eAAe,GAAG;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,SAAS,CAAC;IACrB,aAAa,CAAC,EAAE,eAAe,CAAC;CACjC,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;YAepC,uBAAuB;IA8CxB,iBAAiB,CAAC,EAC7B,KAAK,EACL,OAAO,EACR,EAAE;QACD,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,GAAG,CAAC;KACd,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAqCjB,eAAe,CAAC,SAAS,EAAE,MAAM;IAgBvC,gBAAgB;IAShB,mBAAmB,CAAC,SAAS,EAAE,MAAM;CAc7C"}
|
|
@@ -28,7 +28,8 @@ class ShadowHandler {
|
|
|
28
28
|
if (projectShadow.appConfig) {
|
|
29
29
|
const newAppCfg = JSON.parse(projectShadow.appConfig);
|
|
30
30
|
if (!(0, app_configuration_schemas_1.validateAppConfig)(newAppCfg)) {
|
|
31
|
-
|
|
31
|
+
// FIXME: Raise an exception to be handled at higher layer
|
|
32
|
+
logger_1.logger.error(`Received invalid app config for ${projectId}!\n${JSON.stringify(app_configuration_schemas_1.validateAppConfig.errors, null, 2)}`);
|
|
32
33
|
continue;
|
|
33
34
|
}
|
|
34
35
|
const { updatedModels } = await (0, shadow_1.getAppCfgModelsDiff)({
|
|
@@ -42,6 +43,9 @@ class ShadowHandler {
|
|
|
42
43
|
appConfigUpdates.push({ projectId, newAppCfg });
|
|
43
44
|
}
|
|
44
45
|
}
|
|
46
|
+
else {
|
|
47
|
+
logger_1.logger.warn(`Ignoring shadow update for ${projectId} due to no app config`);
|
|
48
|
+
}
|
|
45
49
|
}
|
|
46
50
|
return appConfigUpdates;
|
|
47
51
|
}
|
|
@@ -51,6 +55,10 @@ class ShadowHandler {
|
|
|
51
55
|
const shadowName = topic.split('/')[5];
|
|
52
56
|
switch (topic) {
|
|
53
57
|
case this.shadowTopics.projects.updateDelta:
|
|
58
|
+
if (payload.clientToken === this.clientId) {
|
|
59
|
+
logger_1.logger.debug(`Ignoring message sent from self: ${JSON.stringify({ topic, payload }, null, 2)}`);
|
|
60
|
+
break;
|
|
61
|
+
}
|
|
54
62
|
return await this.handleNamedShadowUpdate({ delta: payload });
|
|
55
63
|
case this.shadowTopics.projects.getAccepted:
|
|
56
64
|
if (payload['delta']) {
|
|
@@ -84,10 +92,16 @@ class ShadowHandler {
|
|
|
84
92
|
clientToken: this.clientId
|
|
85
93
|
}));
|
|
86
94
|
}
|
|
87
|
-
deleteProjectShadow() {
|
|
88
|
-
|
|
95
|
+
deleteProjectShadow(projectId) {
|
|
96
|
+
const packet = {
|
|
97
|
+
state: {
|
|
98
|
+
reported: {
|
|
99
|
+
[projectId]: null
|
|
100
|
+
}
|
|
101
|
+
},
|
|
89
102
|
clientToken: this.clientId
|
|
90
|
-
}
|
|
103
|
+
};
|
|
104
|
+
this.publisher.publish(this.shadowTopics.projects.update, JSON.stringify(packet));
|
|
91
105
|
}
|
|
92
106
|
}
|
|
93
107
|
exports.ShadowHandler = ShadowHandler;
|
|
@@ -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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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"shadow-handler.test.d.ts","sourceRoot":"","sources":["../../src/cloud-connection/shadow-handler.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,321 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const application_control_1 = require("../application-control");
|
|
4
|
+
const publisher_1 = require("./publisher");
|
|
5
|
+
const shadow_handler_1 = require("./shadow-handler");
|
|
6
|
+
jest.mock('../application-control');
|
|
7
|
+
jest.mock('./publisher');
|
|
8
|
+
const mockClient = jest.fn();
|
|
9
|
+
const clientId = 'test-client';
|
|
10
|
+
const projectId1 = 'test-project';
|
|
11
|
+
const projectId2 = 'test-project-2';
|
|
12
|
+
describe('Test Shadow Handler', () => {
|
|
13
|
+
let publisher;
|
|
14
|
+
let shadowHandler;
|
|
15
|
+
beforeEach(() => {
|
|
16
|
+
publisher = new publisher_1.Publisher(mockClient, clientId);
|
|
17
|
+
shadowHandler = new shadow_handler_1.ShadowHandler(clientId, publisher);
|
|
18
|
+
});
|
|
19
|
+
test.skip('reject buffer payload', async () => {
|
|
20
|
+
//FIXME: Invalid input is silently ignored, need input validation
|
|
21
|
+
expect(async () => {
|
|
22
|
+
await shadowHandler.handleShadowTopic({
|
|
23
|
+
topic: shadowHandler.shadowTopics.projects.updateDelta,
|
|
24
|
+
payload: Buffer.from('test-payload')
|
|
25
|
+
});
|
|
26
|
+
}).toThrow(Error);
|
|
27
|
+
});
|
|
28
|
+
test('ignore message from self', async () => {
|
|
29
|
+
const ogAppCfg1 = {
|
|
30
|
+
scripts: {
|
|
31
|
+
start: 'python app.py'
|
|
32
|
+
},
|
|
33
|
+
models: {
|
|
34
|
+
'alwaysai/mobilenet_ssd': 2
|
|
35
|
+
}
|
|
36
|
+
};
|
|
37
|
+
jest.mocked(application_control_1.readAppCfgFile).mockResolvedValue(ogAppCfg1);
|
|
38
|
+
const appCfg1 = {
|
|
39
|
+
scripts: {
|
|
40
|
+
start: 'python app.py'
|
|
41
|
+
},
|
|
42
|
+
models: {
|
|
43
|
+
'alwaysai/yolo_v3': 4
|
|
44
|
+
}
|
|
45
|
+
};
|
|
46
|
+
const payload = {
|
|
47
|
+
[projectId1]: {
|
|
48
|
+
appConfig: JSON.stringify(appCfg1)
|
|
49
|
+
},
|
|
50
|
+
clientToken: clientId
|
|
51
|
+
};
|
|
52
|
+
const appCfgUpdates = await shadowHandler.handleShadowTopic({
|
|
53
|
+
topic: shadowHandler.shadowTopics.projects.updateDelta,
|
|
54
|
+
payload
|
|
55
|
+
});
|
|
56
|
+
expect(appCfgUpdates.length).toBe(0);
|
|
57
|
+
});
|
|
58
|
+
test('handle shadow get response with updated models', async () => {
|
|
59
|
+
const ogAppCfg1 = {
|
|
60
|
+
scripts: {
|
|
61
|
+
start: 'python app.py'
|
|
62
|
+
},
|
|
63
|
+
models: {
|
|
64
|
+
'alwaysai/mobilenet_ssd': 3
|
|
65
|
+
}
|
|
66
|
+
};
|
|
67
|
+
jest.mocked(application_control_1.readAppCfgFile).mockResolvedValue(ogAppCfg1);
|
|
68
|
+
const appCfg1 = {
|
|
69
|
+
scripts: {
|
|
70
|
+
start: 'python app.py'
|
|
71
|
+
},
|
|
72
|
+
models: {
|
|
73
|
+
'alwaysai/yolo_v3': 4
|
|
74
|
+
}
|
|
75
|
+
};
|
|
76
|
+
const payload = {
|
|
77
|
+
delta: {
|
|
78
|
+
[projectId1]: {
|
|
79
|
+
appConfig: JSON.stringify(appCfg1)
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
};
|
|
83
|
+
const appCfgUpdates = await shadowHandler.handleShadowTopic({
|
|
84
|
+
topic: shadowHandler.shadowTopics.projects.getAccepted,
|
|
85
|
+
payload
|
|
86
|
+
});
|
|
87
|
+
expect(appCfgUpdates.length).toBe(1);
|
|
88
|
+
expect(appCfgUpdates[0]).toEqual({
|
|
89
|
+
projectId: projectId1,
|
|
90
|
+
newAppCfg: appCfg1,
|
|
91
|
+
updatedModels: {
|
|
92
|
+
'alwaysai/yolo_v3': 4
|
|
93
|
+
}
|
|
94
|
+
});
|
|
95
|
+
});
|
|
96
|
+
test('handle shadow delta without app config', async () => {
|
|
97
|
+
const ogAppCfg1 = {
|
|
98
|
+
scripts: {
|
|
99
|
+
start: 'python app.py'
|
|
100
|
+
},
|
|
101
|
+
models: {
|
|
102
|
+
'alwaysai/mobilenet_ssd': 2
|
|
103
|
+
}
|
|
104
|
+
};
|
|
105
|
+
jest.mocked(application_control_1.readAppCfgFile).mockResolvedValue(ogAppCfg1);
|
|
106
|
+
const payload = {
|
|
107
|
+
[projectId1]: {}
|
|
108
|
+
};
|
|
109
|
+
const appCfgUpdates = await shadowHandler.handleShadowTopic({
|
|
110
|
+
topic: shadowHandler.shadowTopics.projects.updateDelta,
|
|
111
|
+
payload
|
|
112
|
+
});
|
|
113
|
+
expect(appCfgUpdates.length).toBe(0);
|
|
114
|
+
});
|
|
115
|
+
test('handle shadow delta with updated models', async () => {
|
|
116
|
+
const ogAppCfg1 = {
|
|
117
|
+
scripts: {
|
|
118
|
+
start: 'python app.py'
|
|
119
|
+
},
|
|
120
|
+
models: {
|
|
121
|
+
'alwaysai/mobilenet_ssd': 2
|
|
122
|
+
}
|
|
123
|
+
};
|
|
124
|
+
jest.mocked(application_control_1.readAppCfgFile).mockResolvedValue(ogAppCfg1);
|
|
125
|
+
const appCfg1 = {
|
|
126
|
+
scripts: {
|
|
127
|
+
start: 'python app.py'
|
|
128
|
+
},
|
|
129
|
+
models: {
|
|
130
|
+
'alwaysai/mobilenet_ssd': 3,
|
|
131
|
+
'alwaysai/yolo_v4': 5
|
|
132
|
+
}
|
|
133
|
+
};
|
|
134
|
+
const payload = {
|
|
135
|
+
[projectId1]: {
|
|
136
|
+
appConfig: JSON.stringify(appCfg1)
|
|
137
|
+
}
|
|
138
|
+
};
|
|
139
|
+
const appCfgUpdates = await shadowHandler.handleShadowTopic({
|
|
140
|
+
topic: shadowHandler.shadowTopics.projects.updateDelta,
|
|
141
|
+
payload
|
|
142
|
+
});
|
|
143
|
+
expect(appCfgUpdates.length).toBe(1);
|
|
144
|
+
expect(appCfgUpdates[0]).toEqual({
|
|
145
|
+
projectId: projectId1,
|
|
146
|
+
newAppCfg: appCfg1,
|
|
147
|
+
updatedModels: {
|
|
148
|
+
'alwaysai/mobilenet_ssd': 3,
|
|
149
|
+
'alwaysai/yolo_v4': 5
|
|
150
|
+
}
|
|
151
|
+
});
|
|
152
|
+
});
|
|
153
|
+
test('handle shadow delta with updated models for two apps', async () => {
|
|
154
|
+
const ogAppCfg1 = {
|
|
155
|
+
scripts: {
|
|
156
|
+
start: 'python app.py'
|
|
157
|
+
},
|
|
158
|
+
models: {
|
|
159
|
+
'alwaysai/mobilenet_ssd': 2
|
|
160
|
+
}
|
|
161
|
+
};
|
|
162
|
+
jest.mocked(application_control_1.readAppCfgFile).mockResolvedValueOnce(ogAppCfg1);
|
|
163
|
+
const ogAppCfg2 = {
|
|
164
|
+
scripts: {
|
|
165
|
+
start: 'python app.py'
|
|
166
|
+
},
|
|
167
|
+
models: {
|
|
168
|
+
'alwaysai/yolo_v4': 5
|
|
169
|
+
}
|
|
170
|
+
};
|
|
171
|
+
jest.mocked(application_control_1.readAppCfgFile).mockResolvedValueOnce(ogAppCfg2);
|
|
172
|
+
const appCfg1 = {
|
|
173
|
+
scripts: {
|
|
174
|
+
start: 'python app.py'
|
|
175
|
+
},
|
|
176
|
+
models: {
|
|
177
|
+
'alwaysai/mobilenet_ssd': 3,
|
|
178
|
+
'alwaysai/yolo_v4': 5
|
|
179
|
+
}
|
|
180
|
+
};
|
|
181
|
+
const appCfg2 = {
|
|
182
|
+
scripts: {
|
|
183
|
+
start: 'python app.py'
|
|
184
|
+
},
|
|
185
|
+
models: {
|
|
186
|
+
'alwaysai/yolo_v4': 5,
|
|
187
|
+
'alwaysai/human_pose': 7
|
|
188
|
+
}
|
|
189
|
+
};
|
|
190
|
+
const payload = {
|
|
191
|
+
[projectId1]: {
|
|
192
|
+
appConfig: JSON.stringify(appCfg1)
|
|
193
|
+
},
|
|
194
|
+
[projectId2]: {
|
|
195
|
+
appConfig: JSON.stringify(appCfg2)
|
|
196
|
+
}
|
|
197
|
+
};
|
|
198
|
+
const appCfgUpdates = await shadowHandler.handleShadowTopic({
|
|
199
|
+
topic: shadowHandler.shadowTopics.projects.updateDelta,
|
|
200
|
+
payload
|
|
201
|
+
});
|
|
202
|
+
expect(appCfgUpdates.length).toBe(2);
|
|
203
|
+
expect(appCfgUpdates[0]).toEqual({
|
|
204
|
+
projectId: projectId1,
|
|
205
|
+
newAppCfg: appCfg1,
|
|
206
|
+
updatedModels: {
|
|
207
|
+
'alwaysai/mobilenet_ssd': 3,
|
|
208
|
+
'alwaysai/yolo_v4': 5
|
|
209
|
+
}
|
|
210
|
+
});
|
|
211
|
+
expect(appCfgUpdates[1]).toEqual({
|
|
212
|
+
projectId: projectId2,
|
|
213
|
+
newAppCfg: appCfg2,
|
|
214
|
+
updatedModels: {
|
|
215
|
+
'alwaysai/human_pose': 7
|
|
216
|
+
}
|
|
217
|
+
});
|
|
218
|
+
});
|
|
219
|
+
test('handle shadow delta with updated analytics', async () => {
|
|
220
|
+
const ogAppCfg1 = {
|
|
221
|
+
scripts: {
|
|
222
|
+
start: 'python app.py'
|
|
223
|
+
},
|
|
224
|
+
models: {}
|
|
225
|
+
};
|
|
226
|
+
jest.mocked(application_control_1.readAppCfgFile).mockResolvedValue(ogAppCfg1);
|
|
227
|
+
const appCfg1 = {
|
|
228
|
+
scripts: {
|
|
229
|
+
start: 'python app.py'
|
|
230
|
+
},
|
|
231
|
+
models: {},
|
|
232
|
+
analytics: {
|
|
233
|
+
enable_cloud_publish: true
|
|
234
|
+
}
|
|
235
|
+
};
|
|
236
|
+
const payload = {
|
|
237
|
+
[projectId1]: {
|
|
238
|
+
appConfig: JSON.stringify(appCfg1)
|
|
239
|
+
}
|
|
240
|
+
};
|
|
241
|
+
const appCfgUpdates = await shadowHandler.handleShadowTopic({
|
|
242
|
+
topic: shadowHandler.shadowTopics.projects.updateDelta,
|
|
243
|
+
payload
|
|
244
|
+
});
|
|
245
|
+
expect(appCfgUpdates.length).toBe(1);
|
|
246
|
+
expect(appCfgUpdates[0]).toEqual({
|
|
247
|
+
projectId: projectId1,
|
|
248
|
+
newAppCfg: appCfg1
|
|
249
|
+
});
|
|
250
|
+
});
|
|
251
|
+
test('handle shadow delta with invalid app config', async () => {
|
|
252
|
+
const ogAppCfg1 = {
|
|
253
|
+
scripts: {
|
|
254
|
+
start: 'python app.py'
|
|
255
|
+
},
|
|
256
|
+
models: {
|
|
257
|
+
'alwaysai/mobilenet_ssd': 2
|
|
258
|
+
}
|
|
259
|
+
};
|
|
260
|
+
jest.mocked(application_control_1.readAppCfgFile).mockResolvedValue(ogAppCfg1);
|
|
261
|
+
const appCfg1 = {
|
|
262
|
+
scripts: {
|
|
263
|
+
start: 'python app.py'
|
|
264
|
+
},
|
|
265
|
+
models: {
|
|
266
|
+
'alwaysai/mobilenet_ssd': '3',
|
|
267
|
+
'alwaysai/yolo_v4': '5'
|
|
268
|
+
}
|
|
269
|
+
};
|
|
270
|
+
const payload = {
|
|
271
|
+
[projectId1]: {
|
|
272
|
+
appConfig: JSON.stringify(appCfg1)
|
|
273
|
+
}
|
|
274
|
+
};
|
|
275
|
+
const appCfgUpdates = await shadowHandler.handleShadowTopic({
|
|
276
|
+
topic: shadowHandler.shadowTopics.projects.updateDelta,
|
|
277
|
+
payload
|
|
278
|
+
});
|
|
279
|
+
expect(appCfgUpdates.length).toBe(0);
|
|
280
|
+
});
|
|
281
|
+
test.skip('publish app state', async () => {
|
|
282
|
+
// FIXME: For some reason publisher is not being called...
|
|
283
|
+
const testAppCfg = {
|
|
284
|
+
scripts: {
|
|
285
|
+
start: ''
|
|
286
|
+
},
|
|
287
|
+
models: {}
|
|
288
|
+
};
|
|
289
|
+
jest.mocked(application_control_1.readAppCfgFile).mockResolvedValue(testAppCfg);
|
|
290
|
+
await shadowHandler.publishAppState(projectId1);
|
|
291
|
+
expect(jest.mocked(application_control_1.readAppCfgFile)).toBeCalledWith({ projectId1 });
|
|
292
|
+
const packet = {
|
|
293
|
+
state: {
|
|
294
|
+
reported: {
|
|
295
|
+
[projectId1]: { appConfig: JSON.stringify(testAppCfg) }
|
|
296
|
+
}
|
|
297
|
+
},
|
|
298
|
+
clientToken: clientId
|
|
299
|
+
};
|
|
300
|
+
expect(jest.mocked(publisher.publish)).toBeCalledWith(shadowHandler.shadowTopics.projects.update, JSON.stringify(packet));
|
|
301
|
+
});
|
|
302
|
+
test('get shadow updates', async () => {
|
|
303
|
+
shadowHandler.getShadowUpdates();
|
|
304
|
+
expect(jest.mocked(publisher.publish)).toBeCalledWith(shadowHandler.shadowTopics.projects.get, JSON.stringify({
|
|
305
|
+
clientToken: clientId
|
|
306
|
+
}));
|
|
307
|
+
});
|
|
308
|
+
test('delete project shadow', async () => {
|
|
309
|
+
shadowHandler.deleteProjectShadow(projectId1);
|
|
310
|
+
const packet = {
|
|
311
|
+
state: {
|
|
312
|
+
reported: {
|
|
313
|
+
[projectId1]: null
|
|
314
|
+
}
|
|
315
|
+
},
|
|
316
|
+
clientToken: clientId
|
|
317
|
+
};
|
|
318
|
+
expect(jest.mocked(publisher.publish)).toBeCalledWith(shadowHandler.shadowTopics.projects.update, JSON.stringify(packet));
|
|
319
|
+
});
|
|
320
|
+
});
|
|
321
|
+
//# sourceMappingURL=shadow-handler.test.js.map
|