@alwaysai/device-agent 1.5.0 → 2.0.1
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/config.d.ts.map +1 -1
- package/lib/application-control/config.js +8 -3
- package/lib/application-control/config.js.map +1 -1
- package/lib/application-control/environment-variables.d.ts +5 -5
- package/lib/application-control/environment-variables.d.ts.map +1 -1
- package/lib/application-control/environment-variables.js +25 -38
- package/lib/application-control/environment-variables.js.map +1 -1
- package/lib/application-control/environment-variables.test.js +27 -7
- package/lib/application-control/environment-variables.test.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 +4 -1
- package/lib/application-control/install.d.ts.map +1 -1
- package/lib/application-control/install.js +24 -8
- package/lib/application-control/install.js.map +1 -1
- package/lib/application-control/models.d.ts +0 -11
- package/lib/application-control/models.d.ts.map +1 -1
- package/lib/application-control/models.js +5 -54
- package/lib/application-control/models.js.map +1 -1
- package/lib/application-control/utils.d.ts +0 -4
- package/lib/application-control/utils.d.ts.map +1 -1
- package/lib/application-control/utils.js +12 -22
- package/lib/application-control/utils.js.map +1 -1
- package/lib/cloud-connection/base-message-handler.d.ts +27 -0
- package/lib/cloud-connection/base-message-handler.d.ts.map +1 -0
- package/lib/cloud-connection/base-message-handler.js +72 -0
- package/lib/cloud-connection/base-message-handler.js.map +1 -0
- package/lib/cloud-connection/bootstrap-provision.js +3 -2
- package/lib/cloud-connection/bootstrap-provision.js.map +1 -1
- package/lib/cloud-connection/connection-manager.d.ts +21 -0
- package/lib/cloud-connection/connection-manager.d.ts.map +1 -0
- package/lib/cloud-connection/connection-manager.js +158 -0
- package/lib/cloud-connection/connection-manager.js.map +1 -0
- package/lib/cloud-connection/device-agent-cloud-connection.d.ts +9 -30
- package/lib/cloud-connection/device-agent-cloud-connection.d.ts.map +1 -1
- package/lib/cloud-connection/device-agent-cloud-connection.js +69 -508
- package/lib/cloud-connection/device-agent-cloud-connection.js.map +1 -1
- package/lib/cloud-connection/device-agent-message-handler.d.ts +22 -0
- package/lib/cloud-connection/device-agent-message-handler.d.ts.map +1 -0
- package/lib/cloud-connection/device-agent-message-handler.js +357 -0
- package/lib/cloud-connection/device-agent-message-handler.js.map +1 -0
- package/lib/cloud-connection/device-agent.d.ts.map +1 -1
- package/lib/cloud-connection/device-agent.js +11 -9
- package/lib/cloud-connection/device-agent.js.map +1 -1
- package/lib/cloud-connection/live-updates-handler.d.ts +19 -28
- package/lib/cloud-connection/live-updates-handler.d.ts.map +1 -1
- package/lib/cloud-connection/live-updates-handler.js +60 -172
- package/lib/cloud-connection/live-updates-handler.js.map +1 -1
- package/lib/cloud-connection/live-updates-handler.test.js +71 -165
- package/lib/cloud-connection/live-updates-handler.test.js.map +1 -1
- package/lib/cloud-connection/message-dispatcher.d.ts +10 -0
- package/lib/cloud-connection/message-dispatcher.d.ts.map +1 -0
- package/lib/cloud-connection/message-dispatcher.js +27 -0
- package/lib/cloud-connection/message-dispatcher.js.map +1 -0
- package/lib/cloud-connection/passthrough-handler.d.ts +4 -1
- package/lib/cloud-connection/passthrough-handler.d.ts.map +1 -1
- package/lib/cloud-connection/passthrough-handler.js +30 -11
- package/lib/cloud-connection/passthrough-handler.js.map +1 -1
- package/lib/cloud-connection/shadow-handler.d.ts +11 -3
- package/lib/cloud-connection/shadow-handler.d.ts.map +1 -1
- package/lib/cloud-connection/shadow-handler.js +133 -28
- package/lib/cloud-connection/shadow-handler.js.map +1 -1
- package/lib/cloud-connection/shadow-handler.test.js +45 -57
- package/lib/cloud-connection/shadow-handler.test.js.map +1 -1
- package/lib/cloud-connection/shadow.d.ts.map +1 -1
- package/lib/cloud-connection/shadow.js +2 -1
- package/lib/cloud-connection/shadow.js.map +1 -1
- package/lib/cloud-connection/transaction-manager.d.ts +12 -3
- package/lib/cloud-connection/transaction-manager.d.ts.map +1 -1
- package/lib/cloud-connection/transaction-manager.js +29 -28
- package/lib/cloud-connection/transaction-manager.js.map +1 -1
- package/lib/cloud-connection/transaction-manager.test.js +46 -5
- package/lib/cloud-connection/transaction-manager.test.js.map +1 -1
- package/lib/device-control/device-control.d.ts +8 -8
- package/lib/device-control/device-control.d.ts.map +1 -1
- package/lib/device-control/device-control.js +95 -71
- package/lib/device-control/device-control.js.map +1 -1
- package/lib/docker/docker-compose.d.ts.map +1 -1
- package/lib/docker/docker-compose.js +2 -1
- package/lib/docker/docker-compose.js.map +1 -1
- package/lib/infrastructure/agent-config.d.ts +2 -1
- package/lib/infrastructure/agent-config.d.ts.map +1 -1
- package/lib/infrastructure/agent-config.js +7 -7
- package/lib/infrastructure/agent-config.js.map +1 -1
- package/lib/infrastructure/agent-config.test.js +3 -1
- package/lib/infrastructure/agent-config.test.js.map +1 -1
- package/lib/infrastructure/config-check-utility.d.ts +6 -0
- package/lib/infrastructure/config-check-utility.d.ts.map +1 -0
- package/lib/infrastructure/config-check-utility.js +67 -0
- package/lib/infrastructure/config-check-utility.js.map +1 -0
- package/lib/infrastructure/config-check-utility.test.d.ts +2 -0
- package/lib/infrastructure/config-check-utility.test.d.ts.map +1 -0
- package/lib/infrastructure/config-check-utility.test.js +109 -0
- package/lib/infrastructure/config-check-utility.test.js.map +1 -0
- package/lib/infrastructure/device-certificate.d.ts +10 -0
- package/lib/infrastructure/device-certificate.d.ts.map +1 -0
- package/lib/infrastructure/device-certificate.js +47 -0
- package/lib/infrastructure/device-certificate.js.map +1 -0
- package/lib/infrastructure/device-certificate.test.d.ts +2 -0
- package/lib/infrastructure/device-certificate.test.d.ts.map +1 -0
- package/lib/infrastructure/device-certificate.test.js +24 -0
- package/lib/infrastructure/device-certificate.test.js.map +1 -0
- package/lib/infrastructure/legacy-migration/legacy-file.test.d.ts +2 -0
- package/lib/infrastructure/legacy-migration/legacy-file.test.d.ts.map +1 -0
- package/lib/infrastructure/legacy-migration/legacy-file.test.js +61 -0
- package/lib/infrastructure/legacy-migration/legacy-file.test.js.map +1 -0
- package/lib/infrastructure/legacy-migration/legacy-files.d.ts +75 -0
- package/lib/infrastructure/legacy-migration/legacy-files.d.ts.map +1 -0
- package/lib/infrastructure/legacy-migration/legacy-files.js +75 -0
- package/lib/infrastructure/legacy-migration/legacy-files.js.map +1 -0
- package/lib/infrastructure/legacy-migration/legacy-migration.d.ts +6 -0
- package/lib/infrastructure/legacy-migration/legacy-migration.d.ts.map +1 -0
- package/lib/infrastructure/legacy-migration/legacy-migration.js +149 -0
- package/lib/infrastructure/legacy-migration/legacy-migration.js.map +1 -0
- package/lib/infrastructure/legacy-migration/legacy-migration.test.d.ts +2 -0
- package/lib/infrastructure/legacy-migration/legacy-migration.test.d.ts.map +1 -0
- package/lib/infrastructure/legacy-migration/legacy-migration.test.js +226 -0
- package/lib/infrastructure/legacy-migration/legacy-migration.test.js.map +1 -0
- package/lib/infrastructure/require-files-present-ready.test.d.ts +2 -0
- package/lib/infrastructure/require-files-present-ready.test.d.ts.map +1 -0
- package/lib/infrastructure/require-files-present-ready.test.js +44 -0
- package/lib/infrastructure/require-files-present-ready.test.js.map +1 -0
- package/lib/infrastructure/required-config-checks.d.ts +2 -0
- package/lib/infrastructure/required-config-checks.d.ts.map +1 -0
- package/lib/infrastructure/required-config-checks.js +30 -0
- package/lib/infrastructure/required-config-checks.js.map +1 -0
- package/lib/infrastructure/tokens-and-device-cfg.d.ts.map +1 -1
- package/lib/infrastructure/tokens-and-device-cfg.js +11 -8
- package/lib/infrastructure/tokens-and-device-cfg.js.map +1 -1
- package/lib/jobs/job-handler.d.ts +23 -0
- package/lib/jobs/job-handler.d.ts.map +1 -0
- package/lib/jobs/job-handler.js +131 -0
- package/lib/jobs/job-handler.js.map +1 -0
- package/lib/local-connection/rabbitmq-connection.d.ts.map +1 -1
- package/lib/local-connection/rabbitmq-connection.js +14 -14
- package/lib/local-connection/rabbitmq-connection.js.map +1 -1
- package/lib/secure-tunneling/secure-tunnel-message-handler.d.ts +8 -0
- package/lib/secure-tunneling/secure-tunnel-message-handler.d.ts.map +1 -0
- package/lib/secure-tunneling/secure-tunnel-message-handler.js +42 -0
- package/lib/secure-tunneling/secure-tunnel-message-handler.js.map +1 -0
- package/lib/secure-tunneling/secure-tunneling.d.ts +9 -9
- package/lib/secure-tunneling/secure-tunneling.d.ts.map +1 -1
- package/lib/secure-tunneling/secure-tunneling.js +21 -16
- package/lib/secure-tunneling/secure-tunneling.js.map +1 -1
- package/lib/secure-tunneling/secure-tunneling.test.js +11 -13
- package/lib/secure-tunneling/secure-tunneling.test.js.map +1 -1
- package/lib/subcommands/app/analytics.d.ts.map +1 -1
- package/lib/subcommands/app/analytics.js +1 -2
- package/lib/subcommands/app/analytics.js.map +1 -1
- package/lib/subcommands/app/env-vars.d.ts +4 -0
- package/lib/subcommands/app/env-vars.d.ts.map +1 -1
- package/lib/subcommands/app/env-vars.js +52 -6
- package/lib/subcommands/app/env-vars.js.map +1 -1
- package/lib/subcommands/app/index.d.ts.map +1 -1
- package/lib/subcommands/app/index.js +1 -3
- package/lib/subcommands/app/index.js.map +1 -1
- package/lib/subcommands/app/models.d.ts +0 -11
- package/lib/subcommands/app/models.d.ts.map +1 -1
- package/lib/subcommands/app/models.js +2 -58
- package/lib/subcommands/app/models.js.map +1 -1
- package/lib/subcommands/app/shadow.d.ts.map +1 -1
- package/lib/subcommands/app/shadow.js +6 -5
- package/lib/subcommands/app/shadow.js.map +1 -1
- package/lib/subcommands/app/version.d.ts +2 -0
- package/lib/subcommands/app/version.d.ts.map +1 -1
- package/lib/subcommands/app/version.js +16 -6
- package/lib/subcommands/app/version.js.map +1 -1
- package/lib/subcommands/config.d.ts +2 -0
- package/lib/subcommands/config.d.ts.map +1 -0
- package/lib/subcommands/config.js +39 -0
- package/lib/subcommands/config.js.map +1 -0
- package/lib/subcommands/device/clean.d.ts +1 -1
- package/lib/subcommands/device/clean.d.ts.map +1 -1
- package/lib/subcommands/device/clean.js +23 -13
- package/lib/subcommands/device/clean.js.map +1 -1
- package/lib/subcommands/device/index.d.ts.map +1 -1
- package/lib/subcommands/device/index.js +3 -1
- package/lib/subcommands/device/index.js.map +1 -1
- package/lib/subcommands/device/init.js +8 -8
- package/lib/subcommands/device/init.js.map +1 -1
- package/lib/subcommands/device/migrate.d.ts +2 -0
- package/lib/subcommands/device/migrate.d.ts.map +1 -0
- package/lib/subcommands/device/migrate.js +24 -0
- package/lib/subcommands/device/migrate.js.map +1 -0
- package/lib/subcommands/device/refresh.d.ts.map +1 -1
- package/lib/subcommands/device/refresh.js +1 -0
- package/lib/subcommands/device/refresh.js.map +1 -1
- package/lib/subcommands/index.d.ts +1 -1
- package/lib/subcommands/index.d.ts.map +1 -1
- package/lib/subcommands/index.js +3 -1
- package/lib/subcommands/index.js.map +1 -1
- package/lib/subcommands/rabbitmq-connection.d.ts +1 -1
- package/lib/subcommands/rabbitmq-connection.d.ts.map +1 -1
- package/lib/util/aai-error.d.ts +12 -0
- package/lib/util/aai-error.d.ts.map +1 -0
- package/lib/util/aai-error.js +11 -0
- package/lib/util/aai-error.js.map +1 -0
- package/lib/util/aws-regions.d.ts +2 -0
- package/lib/util/aws-regions.d.ts.map +1 -0
- package/lib/util/{cloud-mode-ready.js → aws-regions.js} +2 -20
- package/lib/util/aws-regions.js.map +1 -0
- package/lib/util/check-for-updates.d.ts.map +1 -1
- package/lib/util/check-for-updates.js +5 -28
- package/lib/util/check-for-updates.js.map +1 -1
- package/lib/util/clean-certs.d.ts.map +1 -1
- package/lib/util/clean-certs.js +5 -4
- package/lib/util/clean-certs.js.map +1 -1
- package/lib/util/directories.d.ts +4 -18
- package/lib/util/directories.d.ts.map +1 -1
- package/lib/util/directories.js +18 -32
- package/lib/util/directories.js.map +1 -1
- package/lib/util/file.d.ts +4 -0
- package/lib/util/file.d.ts.map +1 -1
- package/lib/util/file.js +65 -4
- package/lib/util/file.js.map +1 -1
- package/lib/util/get-device-id.d.ts.map +1 -1
- package/lib/util/get-device-id.js +7 -1
- package/lib/util/get-device-id.js.map +1 -1
- package/lib/util/http-client.js +3 -3
- package/lib/util/http-client.js.map +1 -1
- package/package.json +19 -17
- package/readme.md +12 -32
- package/src/application-control/config.ts +9 -12
- package/src/application-control/environment-variables.test.ts +28 -7
- package/src/application-control/environment-variables.ts +42 -59
- package/src/application-control/index.ts +3 -16
- package/src/application-control/install.ts +39 -13
- package/src/application-control/models.ts +6 -87
- package/src/application-control/utils.ts +10 -25
- package/src/cloud-connection/base-message-handler.ts +118 -0
- package/src/cloud-connection/bootstrap-provision.ts +7 -7
- package/src/cloud-connection/connection-manager.ts +187 -0
- package/src/cloud-connection/device-agent-cloud-connection.ts +130 -723
- package/src/cloud-connection/device-agent-message-handler.ts +642 -0
- package/src/cloud-connection/device-agent.ts +16 -7
- package/src/cloud-connection/live-updates-handler.test.ts +121 -189
- package/src/cloud-connection/live-updates-handler.ts +105 -232
- package/src/cloud-connection/message-dispatcher.ts +33 -0
- package/src/cloud-connection/passthrough-handler.ts +55 -18
- package/src/cloud-connection/shadow-handler.test.ts +45 -57
- package/src/cloud-connection/shadow-handler.ts +224 -54
- package/src/cloud-connection/shadow.ts +4 -1
- package/src/cloud-connection/transaction-manager.test.ts +68 -6
- package/src/cloud-connection/transaction-manager.ts +69 -41
- package/src/device-control/device-control.ts +102 -70
- package/src/docker/docker-compose.ts +3 -2
- package/src/infrastructure/agent-config.test.ts +6 -2
- package/src/infrastructure/agent-config.ts +8 -7
- package/src/infrastructure/config-check-utility.test.ts +154 -0
- package/src/infrastructure/config-check-utility.ts +77 -0
- package/src/infrastructure/device-certificate.test.ts +40 -0
- package/src/infrastructure/device-certificate.ts +58 -0
- package/src/infrastructure/legacy-migration/legacy-file.test.ts +88 -0
- package/src/infrastructure/legacy-migration/legacy-files.ts +101 -0
- package/src/infrastructure/legacy-migration/legacy-migration.test.ts +396 -0
- package/src/infrastructure/legacy-migration/legacy-migration.ts +229 -0
- package/src/infrastructure/require-files-present-ready.test.ts +53 -0
- package/src/infrastructure/required-config-checks.ts +33 -0
- package/src/infrastructure/tokens-and-device-cfg.ts +12 -10
- package/src/jobs/job-handler.ts +146 -0
- package/src/local-connection/rabbitmq-connection.ts +22 -17
- package/src/secure-tunneling/secure-tunnel-message-handler.ts +56 -0
- package/src/secure-tunneling/secure-tunneling.test.ts +20 -22
- package/src/secure-tunneling/secure-tunneling.ts +41 -29
- package/src/subcommands/app/analytics.ts +2 -4
- package/src/subcommands/app/env-vars.ts +72 -9
- package/src/subcommands/app/index.ts +3 -11
- package/src/subcommands/app/models.ts +5 -81
- package/src/subcommands/app/shadow.ts +6 -5
- package/src/subcommands/app/version.ts +23 -6
- package/src/subcommands/config.ts +42 -0
- package/src/subcommands/device/clean.ts +31 -17
- package/src/subcommands/device/index.ts +3 -1
- package/src/subcommands/device/init.ts +11 -11
- package/src/subcommands/device/migrate.ts +20 -0
- package/src/subcommands/device/refresh.ts +1 -0
- package/src/subcommands/index.ts +3 -1
- package/src/util/aai-error.ts +20 -0
- package/src/util/{cloud-mode-ready.ts → aws-regions.ts} +0 -24
- package/src/util/check-for-updates.ts +14 -30
- package/src/util/clean-certs.ts +8 -4
- package/src/util/directories.ts +23 -67
- package/src/util/file.ts +83 -3
- package/src/util/get-device-id.ts +7 -7
- package/src/util/http-client.ts +2 -2
- package/lib/util/cloud-mode-ready.d.ts +0 -3
- package/lib/util/cloud-mode-ready.d.ts.map +0 -1
- package/lib/util/cloud-mode-ready.js.map +0 -1
- package/lib/util/download-file.d.ts +0 -6
- package/lib/util/download-file.d.ts.map +0 -1
- package/lib/util/download-file.js +0 -25
- package/lib/util/download-file.js.map +0 -1
- package/lib/util/fetch-with-timeout.d.ts +0 -4
- package/lib/util/fetch-with-timeout.d.ts.map +0 -1
- package/lib/util/fetch-with-timeout.js +0 -30
- package/lib/util/fetch-with-timeout.js.map +0 -1
- package/lib/util/parsing.d.ts +0 -2
- package/lib/util/parsing.d.ts.map +0 -1
- package/lib/util/parsing.js +0 -17
- package/lib/util/parsing.js.map +0 -1
- package/src/util/download-file.ts +0 -25
- package/src/util/fetch-with-timeout.ts +0 -35
- package/src/util/parsing.ts +0 -11
|
@@ -0,0 +1,131 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.JobHandler = void 0;
|
|
4
|
+
const logger_1 = require("../util/logger");
|
|
5
|
+
const base_message_handler_1 = require("../cloud-connection/base-message-handler");
|
|
6
|
+
const device_agent_message_handler_1 = require("../cloud-connection/device-agent-message-handler");
|
|
7
|
+
class JobState {
|
|
8
|
+
// Singleton pattern
|
|
9
|
+
constructor() {
|
|
10
|
+
this.jobInProgress = false;
|
|
11
|
+
} // eslint-disable-line
|
|
12
|
+
static getInstance() {
|
|
13
|
+
if (!JobState.instance) {
|
|
14
|
+
JobState.instance = new JobState();
|
|
15
|
+
}
|
|
16
|
+
return JobState.instance;
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
class JobHandler extends base_message_handler_1.BaseHandler {
|
|
20
|
+
constructor(handlerContext) {
|
|
21
|
+
super(handlerContext);
|
|
22
|
+
this.state = JobState.getInstance();
|
|
23
|
+
this.jobId = '';
|
|
24
|
+
this.handleJobSuccess = (txId) => {
|
|
25
|
+
this.updateJobStatus('SUCCEEDED');
|
|
26
|
+
};
|
|
27
|
+
this.handleJobError = (_txId, msg) => {
|
|
28
|
+
logger_1.logger.error(`Unexpected error type: ${msg}`);
|
|
29
|
+
this.updateJobStatus('FAILED', `Unexpected error: ${msg}`);
|
|
30
|
+
};
|
|
31
|
+
this.msgHandler = new device_agent_message_handler_1.DeviceAgentMessageHandler(handlerContext, this.handleJobError, this.handleJobSuccess);
|
|
32
|
+
}
|
|
33
|
+
async handle(message, topic) {
|
|
34
|
+
const TOPICS = this.getJobTopic();
|
|
35
|
+
try {
|
|
36
|
+
switch (topic) {
|
|
37
|
+
case TOPICS.NOTIFY_NEXT:
|
|
38
|
+
await this.notifyNext(message);
|
|
39
|
+
break;
|
|
40
|
+
case TOPICS.START_NEXT_ACCEPTED:
|
|
41
|
+
this.startNextAccepted(message);
|
|
42
|
+
break;
|
|
43
|
+
default:
|
|
44
|
+
logger_1.logger.info(`No handler for topic: ${topic}`);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
catch (error) {
|
|
48
|
+
logger_1.logger.error(`Error handling job for topic: ${topic}`, error);
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
getJobTopic() {
|
|
52
|
+
const TOPICS = {
|
|
53
|
+
NOTIFY_NEXT: `$aws/things/${this.clientId}/jobs/notify-next`,
|
|
54
|
+
START_NEXT: `$aws/things/${this.clientId}/jobs/start-next`,
|
|
55
|
+
START_NEXT_ACCEPTED: `$aws/things/${this.clientId}/jobs/start-next/accepted`,
|
|
56
|
+
UPDATE: `$aws/things/${this.clientId}/jobs/${this.jobId}/update`
|
|
57
|
+
};
|
|
58
|
+
return TOPICS;
|
|
59
|
+
}
|
|
60
|
+
async notifyNext(message) {
|
|
61
|
+
// Triggers when a job is completed and we need to notify the next job
|
|
62
|
+
logger_1.logger.info('Invoking NOTIFY_NEXT handler');
|
|
63
|
+
const TOPICS = this.getJobTopic();
|
|
64
|
+
this.publisher.publish(TOPICS.START_NEXT, JSON.stringify({}));
|
|
65
|
+
}
|
|
66
|
+
startNextAccepted(message) {
|
|
67
|
+
if (this.state.jobInProgress) {
|
|
68
|
+
logger_1.logger.info('Job already in progress');
|
|
69
|
+
return;
|
|
70
|
+
}
|
|
71
|
+
this.state.jobInProgress = true;
|
|
72
|
+
try {
|
|
73
|
+
if (message.execution) {
|
|
74
|
+
this.processJobExecution(message.execution);
|
|
75
|
+
}
|
|
76
|
+
else {
|
|
77
|
+
this.state.jobInProgress = false;
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
catch (error) {
|
|
81
|
+
this.handleError(error);
|
|
82
|
+
}
|
|
83
|
+
this.state.jobInProgress = false;
|
|
84
|
+
}
|
|
85
|
+
processJobExecution(execution) {
|
|
86
|
+
logger_1.logger.info('Job in progress...');
|
|
87
|
+
const { jobDocument, jobId } = execution;
|
|
88
|
+
this.jobId = jobId;
|
|
89
|
+
this.msgHandler.handle(jobDocument);
|
|
90
|
+
}
|
|
91
|
+
handleError(error) {
|
|
92
|
+
if (error instanceof Error) {
|
|
93
|
+
logger_1.logger.error(`Error starting next job`, error);
|
|
94
|
+
this.handleJobError('', error.message);
|
|
95
|
+
}
|
|
96
|
+
else {
|
|
97
|
+
let errorMessage;
|
|
98
|
+
if (typeof error === 'string') {
|
|
99
|
+
errorMessage = error;
|
|
100
|
+
}
|
|
101
|
+
else if (typeof error === 'object' && error !== null) {
|
|
102
|
+
try {
|
|
103
|
+
errorMessage = JSON.stringify(error);
|
|
104
|
+
}
|
|
105
|
+
catch (jsonError) {
|
|
106
|
+
errorMessage = 'Unknown error (failed to stringify)';
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
else {
|
|
110
|
+
errorMessage = 'Unknown error';
|
|
111
|
+
}
|
|
112
|
+
logger_1.logger.error(`Unexpected error: ${errorMessage}`);
|
|
113
|
+
this.handleJobError('', errorMessage);
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
updateJobStatus(status, message) {
|
|
117
|
+
const { UPDATE } = this.getJobTopic();
|
|
118
|
+
const payload = {
|
|
119
|
+
status,
|
|
120
|
+
statusDetails: {
|
|
121
|
+
message
|
|
122
|
+
}
|
|
123
|
+
};
|
|
124
|
+
this.publisher.publish(UPDATE, JSON.stringify(payload));
|
|
125
|
+
logger_1.logger.info(`Marked job ${this.jobId} as ${status}`);
|
|
126
|
+
// Reset the job state
|
|
127
|
+
this.state.jobInProgress = false;
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
exports.JobHandler = JobHandler;
|
|
131
|
+
//# sourceMappingURL=job-handler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"job-handler.js","sourceRoot":"","sources":["../../src/jobs/job-handler.ts"],"names":[],"mappings":";;;AACA,2CAAwC;AACxC,mFAGkD;AAClD,mGAA6F;AAE7F,MAAM,QAAQ;IAIZ,oBAAoB;IACpB;QAHO,kBAAa,GAAG,KAAK,CAAC;IAGL,CAAC,CAAC,sBAAsB;IAEhD,MAAM,CAAC,WAAW;QAChB,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE;YACtB,QAAQ,CAAC,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;SACpC;QACD,OAAO,QAAQ,CAAC,QAAQ,CAAC;IAC3B,CAAC;CACF;AAED,MAAa,UAAW,SAAQ,kCAAW;IAGzC,YAAY,cAA8B;QACxC,KAAK,CAAC,cAAc,CAAC,CAAC;QAOP,UAAK,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;QACxC,UAAK,GAAG,EAAE,CAAC;QAsGF,qBAAgB,GAAG,CAAC,IAAY,EAAQ,EAAE;YACzD,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QACpC,CAAC,CAAC;QAEe,mBAAc,GAAG,CAAC,KAAa,EAAE,GAAW,EAAQ,EAAE;YACrE,eAAM,CAAC,KAAK,CAAC,0BAA0B,GAAG,EAAE,CAAC,CAAC;YAC9C,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,qBAAqB,GAAG,EAAE,CAAC,CAAC;QAC7D,CAAC,CAAC;QApHA,IAAI,CAAC,UAAU,GAAG,IAAI,wDAAyB,CAC7C,cAAc,EACd,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,gBAAgB,CACtB,CAAC;IACJ,CAAC;IAIM,KAAK,CAAC,MAAM,CAAC,OAAY,EAAE,KAAa;QAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAElC,IAAI;YACF,QAAQ,KAAK,EAAE;gBACb,KAAK,MAAM,CAAC,WAAW;oBACrB,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;oBAC/B,MAAM;gBACR,KAAK,MAAM,CAAC,mBAAmB;oBAC7B,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;oBAChC,MAAM;gBACR;oBACE,eAAM,CAAC,IAAI,CAAC,yBAAyB,KAAK,EAAE,CAAC,CAAC;aACjD;SACF;QAAC,OAAO,KAAK,EAAE;YACd,eAAM,CAAC,KAAK,CAAC,iCAAiC,KAAK,EAAE,EAAE,KAAK,CAAC,CAAC;SAC/D;IACH,CAAC;IAED,WAAW;QACT,MAAM,MAAM,GAAG;YACb,WAAW,EAAE,eAAe,IAAI,CAAC,QAAQ,mBAAmB;YAC5D,UAAU,EAAE,eAAe,IAAI,CAAC,QAAQ,kBAAkB;YAC1D,mBAAmB,EAAE,eAAe,IAAI,CAAC,QAAQ,2BAA2B;YAC5E,MAAM,EAAE,eAAe,IAAI,CAAC,QAAQ,SAAS,IAAI,CAAC,KAAK,SAAS;SACjE,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,OAAY;QACnC,sEAAsE;QACtE,eAAM,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;QAC5C,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAClC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC;IAChE,CAAC;IAEO,iBAAiB,CAAC,OAAY;QACpC,IAAI,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE;YAC5B,eAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;YACvC,OAAO;SACR;QAED,IAAI,CAAC,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC;QAEhC,IAAI;YACF,IAAI,OAAO,CAAC,SAAS,EAAE;gBACrB,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;aAC7C;iBAAM;gBACL,IAAI,CAAC,KAAK,CAAC,aAAa,GAAG,KAAK,CAAC;aAClC;SACF;QAAC,OAAO,KAAc,EAAE;YACvB,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;SACzB;QACD,IAAI,CAAC,KAAK,CAAC,aAAa,GAAG,KAAK,CAAC;IACnC,CAAC;IAEO,mBAAmB,CAAC,SAAc;QACxC,eAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAClC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC;QACzC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACtC,CAAC;IAEO,WAAW,CAAC,KAAc;QAChC,IAAI,KAAK,YAAY,KAAK,EAAE;YAC1B,eAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAC;YAC/C,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;SACxC;aAAM;YACL,IAAI,YAAoB,CAAC;YACzB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;gBAC7B,YAAY,GAAG,KAAK,CAAC;aACtB;iBAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE;gBACtD,IAAI;oBACF,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;iBACtC;gBAAC,OAAO,SAAS,EAAE;oBAClB,YAAY,GAAG,qCAAqC,CAAC;iBACtD;aACF;iBAAM;gBACL,YAAY,GAAG,eAAe,CAAC;aAChC;YACD,eAAM,CAAC,KAAK,CAAC,qBAAqB,YAAY,EAAE,CAAC,CAAC;YAClD,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC;SACvC;IACH,CAAC;IAEO,eAAe,CAAC,MAAc,EAAE,OAAgB;QACtD,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QACtC,MAAM,OAAO,GAAG;YACd,MAAM;YACN,aAAa,EAAE;gBACb,OAAO;aACR;SACF,CAAC;QAEF,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;QACxD,eAAM,CAAC,IAAI,CAAC,cAAc,IAAI,CAAC,KAAK,OAAO,MAAM,EAAE,CAAC,CAAC;QACrD,sBAAsB;QACtB,IAAI,CAAC,KAAK,CAAC,aAAa,GAAG,KAAK,CAAC;IACnC,CAAC;CAUF;AA1HD,gCA0HC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rabbitmq-connection.d.ts","sourceRoot":"","sources":["../../src/local-connection/rabbitmq-connection.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"rabbitmq-connection.d.ts","sourceRoot":"","sources":["../../src/local-connection/rabbitmq-connection.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,mBAAmB,qBAAqB,CAAC;AACtD,eAAO,MAAM,qBAAqB,8BAA8B,CAAC;AAEjE,wBAAsB,6BAA6B,qBAwBlD;AAED,wBAAsB,8BAA8B,kBAgCnD;AAED,wBAAsB,sBAAsB,kBA+B3C;AAED,wBAAsB,qBAAqB,kBAgB1C"}
|
|
@@ -1,23 +1,23 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.stopRabbitMQContainer = exports.setupRabbitMQContainer = exports.writeRabbitMQDockerComposeFile = exports.checkRabbitMQContainerRunning = exports.rabbitMQContainerName = exports.rabbitMQServiceName = void 0;
|
|
4
|
-
const
|
|
5
|
-
const sleep_1 = require("../util/sleep");
|
|
6
|
-
const docker_compose_1 = require("../docker/docker-compose");
|
|
4
|
+
const util_1 = require("alwaysai/lib/util");
|
|
7
5
|
const YAML = require("yaml");
|
|
6
|
+
const docker_compose_1 = require("../docker/docker-compose");
|
|
8
7
|
const directories_1 = require("../util/directories");
|
|
9
|
-
const
|
|
8
|
+
const logger_1 = require("../util/logger");
|
|
9
|
+
const sleep_1 = require("../util/sleep");
|
|
10
10
|
const constants_1 = require("./constants");
|
|
11
11
|
exports.rabbitMQServiceName = 'alwaysAIRabbitMQ';
|
|
12
12
|
exports.rabbitMQContainerName = 'alwaysAIRabbitMQContainer';
|
|
13
13
|
async function checkRabbitMQContainerRunning() {
|
|
14
14
|
logger_1.logger.debug('Checking alwaysAI Local Connection Container status');
|
|
15
15
|
const spawner = (0, util_1.JsSpawner)();
|
|
16
|
-
if (!(await spawner.exists(directories_1.
|
|
16
|
+
if (!(await spawner.exists((0, directories_1.getDeviceAgentDockerComposePath)()))) {
|
|
17
17
|
logger_1.logger.warn('alwaysAI Location Connection configuration file is not present');
|
|
18
18
|
return false;
|
|
19
19
|
}
|
|
20
|
-
const containerData = await docker_compose_1.compose.ps({ cwd: directories_1.
|
|
20
|
+
const containerData = await docker_compose_1.compose.ps({ cwd: (0, directories_1.getDeviceAgentConfigPath)() });
|
|
21
21
|
if (containerData !== undefined) {
|
|
22
22
|
const rabbitmqService = containerData.data.services[0];
|
|
23
23
|
if ((rabbitmqService === null || rabbitmqService === void 0 ? void 0 : rabbitmqService.name) === exports.rabbitMQContainerName &&
|
|
@@ -34,8 +34,8 @@ async function checkRabbitMQContainerRunning() {
|
|
|
34
34
|
exports.checkRabbitMQContainerRunning = checkRabbitMQContainerRunning;
|
|
35
35
|
async function writeRabbitMQDockerComposeFile() {
|
|
36
36
|
const spawner = (0, util_1.JsSpawner)();
|
|
37
|
-
if (!(await spawner.exists(directories_1.
|
|
38
|
-
await (0, util_1.JsSpawner)().mkdirp(directories_1.
|
|
37
|
+
if (!(await spawner.exists((0, directories_1.getDeviceAgentConfigPath)()))) {
|
|
38
|
+
await (0, util_1.JsSpawner)().mkdirp((0, directories_1.getDeviceAgentConfigPath)());
|
|
39
39
|
}
|
|
40
40
|
logger_1.logger.debug(`Writing Local Connection Docker compose files with Local Connection port: ${constants_1.LOCAL_CONNECTION_PORT}`);
|
|
41
41
|
const rabbitmqDockerComposeCmd = {
|
|
@@ -55,7 +55,7 @@ async function writeRabbitMQDockerComposeFile() {
|
|
|
55
55
|
}
|
|
56
56
|
};
|
|
57
57
|
const RabbitMQDockerComposeYaml = YAML.stringify(rabbitmqDockerComposeCmd);
|
|
58
|
-
await spawner.writeFile(directories_1.
|
|
58
|
+
await spawner.writeFile((0, directories_1.getDeviceAgentDockerComposePath)(), RabbitMQDockerComposeYaml);
|
|
59
59
|
}
|
|
60
60
|
exports.writeRabbitMQDockerComposeFile = writeRabbitMQDockerComposeFile;
|
|
61
61
|
async function setupRabbitMQContainer() {
|
|
@@ -64,11 +64,11 @@ async function setupRabbitMQContainer() {
|
|
|
64
64
|
await writeRabbitMQDockerComposeFile();
|
|
65
65
|
}
|
|
66
66
|
catch (e) {
|
|
67
|
-
logger_1.logger.error(`An error occurred setting up docker-compose.yaml for Device Agent pass through
|
|
67
|
+
logger_1.logger.error(`An error occurred setting up docker-compose.yaml for Device Agent pass through!\n${(0, util_1.stringifyError)(e)}`);
|
|
68
68
|
}
|
|
69
69
|
try {
|
|
70
70
|
const upOut = await docker_compose_1.compose.upAll({
|
|
71
|
-
cwd: directories_1.
|
|
71
|
+
cwd: (0, directories_1.getDeviceAgentConfigPath)()
|
|
72
72
|
});
|
|
73
73
|
logger_1.logger.debug(`Docker compose up for alwaysAI Local Connection:\n${JSON.stringify(upOut)}`);
|
|
74
74
|
// check if the container is up
|
|
@@ -77,18 +77,18 @@ async function setupRabbitMQContainer() {
|
|
|
77
77
|
}
|
|
78
78
|
}
|
|
79
79
|
catch (e) {
|
|
80
|
-
logger_1.logger.error(`Unable to start alwaysAI Device Agent Local Connection Container
|
|
80
|
+
logger_1.logger.error(`Unable to start alwaysAI Device Agent Local Connection Container!\n${(0, util_1.stringifyError)(e)}`);
|
|
81
81
|
}
|
|
82
82
|
}
|
|
83
83
|
exports.setupRabbitMQContainer = setupRabbitMQContainer;
|
|
84
84
|
async function stopRabbitMQContainer() {
|
|
85
85
|
try {
|
|
86
|
-
const downOut = await docker_compose_1.compose.down({ cwd: directories_1.
|
|
86
|
+
const downOut = await docker_compose_1.compose.down({ cwd: (0, directories_1.getDeviceAgentConfigPath)() });
|
|
87
87
|
logger_1.logger.debug(`Stopping alwaysAI Local Connection container`);
|
|
88
88
|
logger_1.logger.debug(`Docker compose down for alwaysAI Local Connection:\n${JSON.stringify(downOut)}`);
|
|
89
89
|
}
|
|
90
90
|
catch (e) {
|
|
91
|
-
logger_1.logger.error(`Unable to stop alwaysAI Device Agent Local Connection Container
|
|
91
|
+
logger_1.logger.error(`Unable to stop alwaysAI Device Agent Local Connection Container!\n${(0, util_1.stringifyError)(e)}`);
|
|
92
92
|
}
|
|
93
93
|
}
|
|
94
94
|
exports.stopRabbitMQContainer = stopRabbitMQContainer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rabbitmq-connection.js","sourceRoot":"","sources":["../../src/local-connection/rabbitmq-connection.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"rabbitmq-connection.js","sourceRoot":"","sources":["../../src/local-connection/rabbitmq-connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { MessageHandler } from '../cloud-connection/message-dispatcher';
|
|
2
|
+
import { BaseHandler } from '../cloud-connection/base-message-handler';
|
|
3
|
+
export declare class SecureTunnelMessageHandler extends BaseHandler implements MessageHandler<any> {
|
|
4
|
+
getNotifyTopic(): string;
|
|
5
|
+
handle(message: any, topic: string): Promise<void>;
|
|
6
|
+
handleSecureTunnelMessage(payload: any): Promise<void>;
|
|
7
|
+
}
|
|
8
|
+
//# sourceMappingURL=secure-tunnel-message-handler.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"secure-tunnel-message-handler.d.ts","sourceRoot":"","sources":["../../src/secure-tunneling/secure-tunnel-message-handler.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAExE,OAAO,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AAEvE,qBAAa,0BACX,SAAQ,WACR,YAAW,cAAc,CAAC,GAAG,CAAC;IAEvB,cAAc,IAAI,MAAM;IAIlB,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBlD,yBAAyB,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;CAsBpE"}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.SecureTunnelMessageHandler = void 0;
|
|
4
|
+
const device_agent_schemas_1 = require("@alwaysai/device-agent-schemas");
|
|
5
|
+
const logger_1 = require("../util/logger");
|
|
6
|
+
const base_message_handler_1 = require("../cloud-connection/base-message-handler");
|
|
7
|
+
class SecureTunnelMessageHandler extends base_message_handler_1.BaseHandler {
|
|
8
|
+
getNotifyTopic() {
|
|
9
|
+
return `$aws/things/${this.clientId}/tunnels/notify`;
|
|
10
|
+
}
|
|
11
|
+
async handle(message, topic) {
|
|
12
|
+
const secureTunnelNotifyTopic = this.getNotifyTopic();
|
|
13
|
+
if (topic === secureTunnelNotifyTopic) {
|
|
14
|
+
await this.secureTunnelHandler.secureTunnelNotifyHandler(message);
|
|
15
|
+
}
|
|
16
|
+
else if (topic === this.shadowHandler.shadowTopics.secureTunnel.updateDelta) {
|
|
17
|
+
logger_1.logger.info(`Received secure tunnel update: ${JSON.stringify(message)}`);
|
|
18
|
+
await this.handleSecureTunnelMessage(message);
|
|
19
|
+
}
|
|
20
|
+
else if (topic === this.shadowHandler.shadowTopics.secureTunnel.deleteAccepted) {
|
|
21
|
+
logger_1.logger.info(`Received secure tunnel deleteAccepted: ${message}`);
|
|
22
|
+
await this.secureTunnelHandler.destroy();
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
async handleSecureTunnelMessage(payload) {
|
|
26
|
+
logger_1.logger.info(`Received secure tunnel update: ${JSON.stringify(payload)}`);
|
|
27
|
+
const state = (0, device_agent_schemas_1.getUpdateDeltaStateFromMessage)(payload);
|
|
28
|
+
if (!state) {
|
|
29
|
+
logger_1.logger.debug(`No state found in message: ${JSON.stringify(payload)}`);
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
const valid = (0, device_agent_schemas_1.validateSecureTunnelShadowUpdate)(state);
|
|
33
|
+
if (!valid) {
|
|
34
|
+
logger_1.logger.error(`Error validating message: ${JSON.stringify({ payload, errors: device_agent_schemas_1.validateSecureTunnelShadowUpdate.errors }, null, 2)}`);
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
37
|
+
const secureTunnelUpdate = await this.secureTunnelHandler.syncShadowToDeviceState(payload);
|
|
38
|
+
await this.shadowHandler.updateSecureTunnelShadow(secureTunnelUpdate);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
exports.SecureTunnelMessageHandler = SecureTunnelMessageHandler;
|
|
42
|
+
//# sourceMappingURL=secure-tunnel-message-handler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"secure-tunnel-message-handler.js","sourceRoot":"","sources":["../../src/secure-tunneling/secure-tunnel-message-handler.ts"],"names":[],"mappings":";;;AAAA,yEAGwC;AAExC,2CAAwC;AACxC,mFAAuE;AAEvE,MAAa,0BACX,SAAQ,kCAAW;IAGZ,cAAc;QACnB,OAAO,eAAe,IAAI,CAAC,QAAQ,iBAAiB,CAAC;IACvD,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,OAAY,EAAE,KAAa;QAC7C,MAAM,uBAAuB,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACtD,IAAI,KAAK,KAAK,uBAAuB,EAAE;YACrC,MAAM,IAAI,CAAC,mBAAmB,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC;SACnE;aAAM,IACL,KAAK,KAAK,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,YAAY,CAAC,WAAW,EAClE;YACA,eAAM,CAAC,IAAI,CAAC,kCAAkC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACzE,MAAM,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC;SAC/C;aAAM,IACL,KAAK,KAAK,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,YAAY,CAAC,cAAc,EACrE;YACA,eAAM,CAAC,IAAI,CAAC,0CAA0C,OAAO,EAAE,CAAC,CAAC;YACjE,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC;SAC1C;IACH,CAAC;IAEM,KAAK,CAAC,yBAAyB,CAAC,OAAY;QACjD,eAAM,CAAC,IAAI,CAAC,kCAAkC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACzE,MAAM,KAAK,GAAG,IAAA,qDAA8B,EAAC,OAAO,CAAC,CAAC;QACtD,IAAI,CAAC,KAAK,EAAE;YACV,eAAM,CAAC,KAAK,CAAC,8BAA8B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACtE,OAAO;SACR;QACD,MAAM,KAAK,GAAG,IAAA,uDAAgC,EAAC,KAAK,CAAC,CAAC;QACtD,IAAI,CAAC,KAAK,EAAE;YACV,eAAM,CAAC,KAAK,CACV,6BAA6B,IAAI,CAAC,SAAS,CACzC,EAAE,OAAO,EAAE,MAAM,EAAE,uDAAgC,CAAC,MAAM,EAAE,EAC5D,IAAI,EACJ,CAAC,CACF,EAAE,CACJ,CAAC;YACF,OAAO;SACR;QACD,MAAM,kBAAkB,GACtB,MAAM,IAAI,CAAC,mBAAmB,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;QAClE,MAAM,IAAI,CAAC,aAAa,CAAC,wBAAwB,CAAC,kBAAkB,CAAC,CAAC;IACxE,CAAC;CACF;AA/CD,gEA+CC"}
|
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { SecureTunnelShadowUpdate } from '@alwaysai/device-agent-schemas';
|
|
2
2
|
export declare type SecureTunnelShadowState = {
|
|
3
|
-
reported?:
|
|
4
|
-
desired?:
|
|
3
|
+
reported?: SecureTunnelShadowUpdate;
|
|
4
|
+
desired?: SecureTunnelShadowUpdate;
|
|
5
5
|
};
|
|
6
6
|
export declare type SecureTunnelShadowUpdateDelta = {
|
|
7
7
|
version: number;
|
|
8
8
|
timestamp: number;
|
|
9
|
-
state:
|
|
9
|
+
state: SecureTunnelShadowUpdate;
|
|
10
10
|
metadata?: any;
|
|
11
11
|
};
|
|
12
|
-
export declare type
|
|
12
|
+
export declare type SecureTunnelShadow = {
|
|
13
13
|
version: number;
|
|
14
14
|
state: SecureTunnelShadowState;
|
|
15
15
|
};
|
|
@@ -41,15 +41,15 @@ export declare class SecureTunnelHandlerSingleton {
|
|
|
41
41
|
destroy(): Promise<void>;
|
|
42
42
|
/**
|
|
43
43
|
* Returns current state of SecureTunnel shadow
|
|
44
|
-
* @returns {
|
|
44
|
+
* @returns {SecureTunnelShadowUpdate} - reported state of the SecureTunnel shadow
|
|
45
45
|
*/
|
|
46
|
-
getSecureTunnelShadow():
|
|
46
|
+
getSecureTunnelShadow(): SecureTunnelShadowUpdate;
|
|
47
47
|
/**
|
|
48
48
|
* Updates current state of SecureTunnel shadow
|
|
49
49
|
* @param {SecureTunnelShadowUpdateDelta} deltaMsg - delta message, which includes desired state of the SecureTunnel shadow
|
|
50
|
-
* @return {
|
|
50
|
+
* @return {SecureTunnelShadowUpdate} update reported message to send back to AWS IoT device shadow
|
|
51
51
|
*/
|
|
52
|
-
syncShadowToDeviceState(deltaMsg: SecureTunnelShadowUpdateDelta): Promise<
|
|
52
|
+
syncShadowToDeviceState(deltaMsg: SecureTunnelShadowUpdateDelta): Promise<SecureTunnelShadowUpdate>;
|
|
53
53
|
/**
|
|
54
54
|
* Starts SecureTunnel
|
|
55
55
|
* @param {SecureTunnelNotificationType} message - AWS notification received
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"secure-tunneling.d.ts","sourceRoot":"","sources":["../../src/secure-tunneling/secure-tunneling.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"secure-tunneling.d.ts","sourceRoot":"","sources":["../../src/secure-tunneling/secure-tunneling.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,wBAAwB,EACzB,MAAM,gCAAgC,CAAC;AAuBxC,oBAAY,uBAAuB,GAAG;IACpC,QAAQ,CAAC,EAAE,wBAAwB,CAAC;IACpC,OAAO,CAAC,EAAE,wBAAwB,CAAC;CACpC,CAAC;AAEF,oBAAY,6BAA6B,GAAG;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,wBAAwB,CAAC;IAChC,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,CAAC;AAEF,oBAAY,kBAAkB,GAAG;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,uBAAuB,CAAC;CAChC,CAAC;AAsBF,aAAK,4BAA4B,GAAG;IAClC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAMF;;GAEG;AACH,qBAAa,4BAA4B;IACvC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAA+B;IACtD,OAAO,CAAC,QAAQ,CAA2B;IAC3C,OAAO,CAAC,YAAY,CAAyB;IAC7C,OAAO,CAAC,cAAc,CAA6B;IAEnD;;;OAGG;IACH,OAAO;IAqBP;;OAEG;WACW,WAAW,IAAI,4BAA4B;IAUzD;;OAEG;IACU,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBrC;;;OAGG;IACI,qBAAqB,IAAI,wBAAwB;IAOxD;;;;OAIG;IACU,uBAAuB,CAClC,QAAQ,EAAE,6BAA6B,GACtC,OAAO,CAAC,wBAAwB,CAAC;IA0DpC;;;OAGG;IACU,yBAAyB,CACpC,OAAO,EAAE,4BAA4B,GACpC,OAAO,CAAC,IAAI,CAAC;IAmBhB;;;OAGG;YACW,oBAAoB;IAkClC;;;OAGG;YACW,iBAAiB;IAiD/B;;;OAGG;YACW,gBAAgB;IA2C9B;;OAEG;YACW,eAAe;IAuB7B;;OAEG;YACW,cAAc;IA4B5B;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAmF5B;;OAEG;YACW,oBAAoB;IAwClC;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAgB5B,OAAO,CAAC,SAAS;CAmBlB"}
|
|
@@ -5,12 +5,12 @@ const paths_1 = require("alwaysai/lib/paths");
|
|
|
5
5
|
const util_1 = require("alwaysai/lib/util");
|
|
6
6
|
const path_1 = require("path");
|
|
7
7
|
const urls_1 = require("../urls");
|
|
8
|
-
const
|
|
8
|
+
const aws_regions_1 = require("../util/aws-regions");
|
|
9
9
|
const directories_1 = require("../util/directories");
|
|
10
|
-
const download_file_1 = require("../util/download-file");
|
|
11
10
|
const logger_1 = require("../util/logger");
|
|
12
11
|
const system_info_1 = require("../util/system-info");
|
|
13
12
|
const spawner_detached_1 = require("./spawner-detached");
|
|
13
|
+
const file_1 = require("../util/file");
|
|
14
14
|
var SecureTunnelServiceType;
|
|
15
15
|
(function (SecureTunnelServiceType) {
|
|
16
16
|
SecureTunnelServiceType["SSH"] = "SSH";
|
|
@@ -88,7 +88,7 @@ class SecureTunnelHandlerSingleton {
|
|
|
88
88
|
}
|
|
89
89
|
/**
|
|
90
90
|
* Returns current state of SecureTunnel shadow
|
|
91
|
-
* @returns {
|
|
91
|
+
* @returns {SecureTunnelShadowUpdate} - reported state of the SecureTunnel shadow
|
|
92
92
|
*/
|
|
93
93
|
getSecureTunnelShadow() {
|
|
94
94
|
logger_1.logger.debug('-> SecureTunnelHandlerSingleton.getSecureTunnelShadow');
|
|
@@ -99,7 +99,7 @@ class SecureTunnelHandlerSingleton {
|
|
|
99
99
|
/**
|
|
100
100
|
* Updates current state of SecureTunnel shadow
|
|
101
101
|
* @param {SecureTunnelShadowUpdateDelta} deltaMsg - delta message, which includes desired state of the SecureTunnel shadow
|
|
102
|
-
* @return {
|
|
102
|
+
* @return {SecureTunnelShadowUpdate} update reported message to send back to AWS IoT device shadow
|
|
103
103
|
*/
|
|
104
104
|
async syncShadowToDeviceState(deltaMsg) {
|
|
105
105
|
logger_1.logger.debug('-> SecureTunnelHandlerSingleton.syncShadowToDeviceState');
|
|
@@ -160,8 +160,8 @@ class SecureTunnelHandlerSingleton {
|
|
|
160
160
|
await this.downloadSecureTunnel();
|
|
161
161
|
await this.startLocalProxy();
|
|
162
162
|
}
|
|
163
|
-
catch (
|
|
164
|
-
logger_1.logger.error(
|
|
163
|
+
catch (e) {
|
|
164
|
+
logger_1.logger.error((0, util_1.stringifyError)(e));
|
|
165
165
|
}
|
|
166
166
|
logger_1.logger.info(`Local Proxy Started: ${JSON.stringify(this.localProxyInfo)}`);
|
|
167
167
|
logger_1.logger.debug('<- SecureTunnelHandlerSingleton.secureTunnelNotifyHandler');
|
|
@@ -229,8 +229,8 @@ class SecureTunnelHandlerSingleton {
|
|
|
229
229
|
});
|
|
230
230
|
logger_1.logger.info(`Started Port Proxy Mapping for: ${JSON.stringify(this.httpProxyMap[this.httpProxyMap.length - 1])}`);
|
|
231
231
|
}
|
|
232
|
-
catch (
|
|
233
|
-
logger_1.logger.error(`ERROR: starting socat for: ${portInfo.ip}:${portInfo.port} on localhost port: ${localPort},
|
|
232
|
+
catch (e) {
|
|
233
|
+
logger_1.logger.error(`ERROR: starting socat for: ${portInfo.ip}:${portInfo.port} on localhost port: ${localPort}\nerror:\n${(0, util_1.stringifyError)(e)}`);
|
|
234
234
|
const lastHttpProxyMap = this.httpProxyMap.pop();
|
|
235
235
|
logger_1.logger.info(`removed last proxyMap: ${JSON.stringify(lastHttpProxyMap)}`);
|
|
236
236
|
}
|
|
@@ -259,7 +259,7 @@ class SecureTunnelHandlerSingleton {
|
|
|
259
259
|
logger_1.logger.debug(`Remaining map: ${JSON.stringify(this.httpProxyMap)}`);
|
|
260
260
|
}
|
|
261
261
|
catch (e) {
|
|
262
|
-
logger_1.logger.error(
|
|
262
|
+
logger_1.logger.error(`ERROR: killing socat process:\n${(0, util_1.stringifyError)(e)}`);
|
|
263
263
|
}
|
|
264
264
|
logger_1.logger.debug(`Removing map: ${JSON.stringify(this.httpProxyMap[itemIndex])}`);
|
|
265
265
|
this.httpProxyMap.splice(itemIndex, 1);
|
|
@@ -304,7 +304,7 @@ class SecureTunnelHandlerSingleton {
|
|
|
304
304
|
logger_1.logger.debug('SUCCESS: killing local proxy process');
|
|
305
305
|
}
|
|
306
306
|
catch (e) {
|
|
307
|
-
logger_1.logger.error(
|
|
307
|
+
logger_1.logger.error(`ERROR: killing local proxy process:\n${(0, util_1.stringifyError)(e)}`);
|
|
308
308
|
}
|
|
309
309
|
this.localProxyInfo = {
|
|
310
310
|
lpDstAccessKey: '',
|
|
@@ -325,7 +325,7 @@ class SecureTunnelHandlerSingleton {
|
|
|
325
325
|
if (clientAccessToken === '') {
|
|
326
326
|
throw new Error('ERROR: invalid destination access token');
|
|
327
327
|
}
|
|
328
|
-
if (!(0,
|
|
328
|
+
if (!(0, aws_regions_1.isValidAwsRegion)(region)) {
|
|
329
329
|
throw new Error(`ERROR: invalid/unsupported region: ${region}`);
|
|
330
330
|
}
|
|
331
331
|
if (services.length === 0) {
|
|
@@ -390,11 +390,16 @@ class SecureTunnelHandlerSingleton {
|
|
|
390
390
|
logger_1.logger.info('Downloading SecureTunnel local proxy ...');
|
|
391
391
|
const url = `${urls_1.aaiArtifactsBucketUrl}/securetunnel/${linuxDistro}/${osVersion}/${arch}/${directories_1.SECURE_TUNNEL_BIN_NAME}`;
|
|
392
392
|
await (0, util_1.JsSpawner)().mkdirp((0, path_1.join)(paths_1.AAI_DIR, directories_1.SECURE_TUNNEL_BIN_DIR));
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
393
|
+
try {
|
|
394
|
+
await (0, file_1.downloadToFile)({
|
|
395
|
+
url,
|
|
396
|
+
path: directories_1.SECURE_TUNNEL_BIN_PATH
|
|
397
|
+
});
|
|
398
|
+
}
|
|
399
|
+
catch (error) {
|
|
400
|
+
logger_1.logger.error(`Secure Tunnel bin for ${linuxDistro} ${osVersion} ${arch} not found}: ${(0, util_1.stringifyError)(error)}`);
|
|
401
|
+
throw new Error(`Secure Tunnel bin for ${linuxDistro} ${osVersion} ${arch} not found}`);
|
|
402
|
+
}
|
|
398
403
|
await (0, util_1.JsSpawner)().run({
|
|
399
404
|
exe: 'chmod',
|
|
400
405
|
args: ['+x', directories_1.SECURE_TUNNEL_BIN_PATH]
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"secure-tunneling.js","sourceRoot":"","sources":["../../src/secure-tunneling/secure-tunneling.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"secure-tunneling.js","sourceRoot":"","sources":["../../src/secure-tunneling/secure-tunneling.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const paths_1 = require("alwaysai/lib/paths");
|
|
4
|
+
const file_1 = require("../util/file");
|
|
4
5
|
const path_1 = require("path");
|
|
5
6
|
const urls_1 = require("../urls");
|
|
6
7
|
const directories_1 = require("../util/directories");
|
|
7
|
-
const download_file_1 = require("../util/download-file");
|
|
8
8
|
const system_info_1 = require("../util/system-info");
|
|
9
9
|
const secure_tunneling_1 = require("./secure-tunneling");
|
|
10
10
|
const spawner_detached_1 = require("./spawner-detached");
|
|
@@ -33,9 +33,8 @@ jest.mock('../util/system-info', () => ({
|
|
|
33
33
|
getOsVersion: jest.fn(),
|
|
34
34
|
getDistribution: jest.fn()
|
|
35
35
|
}));
|
|
36
|
-
jest.mock('../util/
|
|
37
|
-
|
|
38
|
-
}));
|
|
36
|
+
jest.mock('../util/file');
|
|
37
|
+
const mockDownloadToFile = jest.mocked(file_1.downloadToFile);
|
|
39
38
|
jest.mock('./spawner-detached', () => ({
|
|
40
39
|
runDetachedProcess: jest.fn(),
|
|
41
40
|
killDetachedProcess: jest.fn()
|
|
@@ -586,7 +585,7 @@ describe('SecureTunnelHandlerSingleton', () => {
|
|
|
586
585
|
expect(system_info_1.getDistribution).not.toHaveBeenCalled();
|
|
587
586
|
expect(mockJsSpawner.mkdirp).not.toHaveBeenCalled();
|
|
588
587
|
expect(mockJsSpawner.run).not.toHaveBeenCalled();
|
|
589
|
-
expect(
|
|
588
|
+
expect(mockDownloadToFile).not.toHaveBeenCalled();
|
|
590
589
|
expect(spawner_detached_1.runDetachedProcess).toHaveBeenCalledTimes(1);
|
|
591
590
|
expect(spawner_detached_1.runDetachedProcess).toHaveBeenCalledWith(directories_1.SECURE_TUNNEL_BIN_PATH, expectedLocalProxyArgs);
|
|
592
591
|
expect(spawner_detached_1.killDetachedProcess).not.toHaveBeenCalled();
|
|
@@ -653,11 +652,10 @@ describe('SecureTunnelHandlerSingleton', () => {
|
|
|
653
652
|
exe: 'chmod',
|
|
654
653
|
args: ['+x', directories_1.SECURE_TUNNEL_BIN_PATH]
|
|
655
654
|
});
|
|
656
|
-
expect(
|
|
657
|
-
expect(
|
|
655
|
+
expect(mockDownloadToFile).toHaveBeenCalledTimes(1);
|
|
656
|
+
expect(mockDownloadToFile).toHaveBeenCalledWith({
|
|
658
657
|
url: expectedUrl,
|
|
659
|
-
path: directories_1.SECURE_TUNNEL_BIN_PATH
|
|
660
|
-
errorMessage: `Secure Tunnel bin for ${linuxDistro} ${osVersion} ${arch} not found}`
|
|
658
|
+
path: directories_1.SECURE_TUNNEL_BIN_PATH
|
|
661
659
|
});
|
|
662
660
|
expect(spawner_detached_1.runDetachedProcess).toHaveBeenCalledTimes(1);
|
|
663
661
|
expect(spawner_detached_1.runDetachedProcess).toHaveBeenCalledWith(directories_1.SECURE_TUNNEL_BIN_PATH, expectedLocalProxyArgs);
|
|
@@ -776,7 +774,7 @@ describe('SecureTunnelHandlerSingleton', () => {
|
|
|
776
774
|
expect(system_info_1.getOsVersion).not.toHaveBeenCalled();
|
|
777
775
|
expect(system_info_1.getDistribution).not.toHaveBeenCalled();
|
|
778
776
|
expect(mockJsSpawner.mkdirp).not.toHaveBeenCalled();
|
|
779
|
-
expect(
|
|
777
|
+
expect(mockDownloadToFile).not.toHaveBeenCalled();
|
|
780
778
|
expect(mockJsSpawner.run).not.toHaveBeenCalled();
|
|
781
779
|
expect(spawner_detached_1.runDetachedProcess).not.toHaveBeenCalled();
|
|
782
780
|
expect(spawner_detached_1.killDetachedProcess).not.toHaveBeenCalled();
|
|
@@ -878,7 +876,7 @@ describe('SecureTunnelHandlerSingleton', () => {
|
|
|
878
876
|
expect(system_info_1.getOsVersion).not.toHaveBeenCalled();
|
|
879
877
|
expect(system_info_1.getDistribution).not.toHaveBeenCalled();
|
|
880
878
|
expect(mockJsSpawner.mkdirp).not.toHaveBeenCalled();
|
|
881
|
-
expect(
|
|
879
|
+
expect(mockDownloadToFile).not.toHaveBeenCalled();
|
|
882
880
|
expect(spawner_detached_1.runDetachedProcess).not.toHaveBeenCalled();
|
|
883
881
|
expect(spawner_detached_1.killDetachedProcess).not.toHaveBeenCalled();
|
|
884
882
|
});
|
|
@@ -992,7 +990,7 @@ describe('SecureTunnelHandlerSingleton', () => {
|
|
|
992
990
|
expect(system_info_1.getOsVersion).not.toHaveBeenCalled();
|
|
993
991
|
expect(system_info_1.getDistribution).not.toHaveBeenCalled();
|
|
994
992
|
expect(mockJsSpawner.mkdirp).not.toHaveBeenCalled();
|
|
995
|
-
expect(
|
|
993
|
+
expect(mockDownloadToFile).not.toHaveBeenCalled();
|
|
996
994
|
expect(mockJsSpawner.run).not.toHaveBeenCalled();
|
|
997
995
|
expect(spawner_detached_1.runDetachedProcess).toHaveBeenCalledTimes(1);
|
|
998
996
|
expect(spawner_detached_1.runDetachedProcess).toHaveBeenCalledWith(directories_1.SECURE_TUNNEL_BIN_PATH, expectedLocalProxyArgs);
|
|
@@ -1058,7 +1056,7 @@ describe('SecureTunnelHandlerSingleton', () => {
|
|
|
1058
1056
|
expect(system_info_1.getOsVersion).not.toHaveBeenCalled();
|
|
1059
1057
|
expect(system_info_1.getDistribution).not.toHaveBeenCalled();
|
|
1060
1058
|
expect(mockJsSpawner.mkdirp).not.toHaveBeenCalled();
|
|
1061
|
-
expect(
|
|
1059
|
+
expect(mockDownloadToFile).not.toHaveBeenCalled();
|
|
1062
1060
|
expect(mockJsSpawner.run).not.toHaveBeenCalled();
|
|
1063
1061
|
expect(spawner_detached_1.runDetachedProcess).toHaveBeenCalledTimes(0);
|
|
1064
1062
|
expect(spawner_detached_1.killDetachedProcess).toHaveBeenCalledTimes(2);
|