@alwaysai/device-agent 1.4.0 → 1.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/application-control/config.js +2 -2
- package/lib/application-control/config.js.map +1 -1
- package/lib/application-control/install.d.ts.map +1 -1
- package/lib/application-control/install.js +1 -0
- package/lib/application-control/install.js.map +1 -1
- package/lib/application-control/models.d.ts +5 -0
- package/lib/application-control/models.d.ts.map +1 -1
- package/lib/application-control/models.js +24 -12
- package/lib/application-control/models.js.map +1 -1
- package/lib/application-control/status.d.ts.map +1 -1
- package/lib/application-control/status.js +10 -12
- package/lib/application-control/status.js.map +1 -1
- package/lib/application-control/utils.js +2 -2
- package/lib/application-control/utils.js.map +1 -1
- package/lib/cloud-connection/device-agent-cloud-connection.d.ts +2 -2
- package/lib/cloud-connection/device-agent-cloud-connection.d.ts.map +1 -1
- package/lib/cloud-connection/device-agent-cloud-connection.js +35 -15
- package/lib/cloud-connection/device-agent-cloud-connection.js.map +1 -1
- package/lib/cloud-connection/live-updates-handler.d.ts +3 -2
- package/lib/cloud-connection/live-updates-handler.d.ts.map +1 -1
- package/lib/cloud-connection/live-updates-handler.js +24 -21
- package/lib/cloud-connection/live-updates-handler.js.map +1 -1
- package/lib/cloud-connection/live-updates-handler.test.js +132 -16
- package/lib/cloud-connection/live-updates-handler.test.js.map +1 -1
- package/lib/cloud-connection/passthrough-handler.d.ts +5 -3
- package/lib/cloud-connection/passthrough-handler.d.ts.map +1 -1
- package/lib/cloud-connection/passthrough-handler.js +76 -62
- package/lib/cloud-connection/passthrough-handler.js.map +1 -1
- package/lib/cloud-connection/shadow-handler.d.ts +2 -0
- package/lib/cloud-connection/shadow-handler.d.ts.map +1 -1
- package/lib/cloud-connection/shadow-handler.js +5 -5
- package/lib/cloud-connection/shadow-handler.js.map +1 -1
- package/lib/cloud-connection/transaction-manager.d.ts +3 -0
- package/lib/cloud-connection/transaction-manager.d.ts.map +1 -1
- package/lib/cloud-connection/transaction-manager.js +11 -0
- package/lib/cloud-connection/transaction-manager.js.map +1 -1
- package/lib/cloud-connection/transaction-manager.test.js +102 -0
- package/lib/cloud-connection/transaction-manager.test.js.map +1 -1
- package/lib/device-control/device-control.d.ts +10 -2
- package/lib/device-control/device-control.d.ts.map +1 -1
- package/lib/device-control/device-control.js +86 -10
- package/lib/device-control/device-control.js.map +1 -1
- package/lib/docker/docker-compose.d.ts +14 -0
- package/lib/docker/docker-compose.d.ts.map +1 -0
- package/lib/docker/docker-compose.js +56 -0
- package/lib/docker/docker-compose.js.map +1 -0
- package/lib/index.js +2 -5
- package/lib/index.js.map +1 -1
- package/lib/infrastructure/agent-config.d.ts +45 -14
- package/lib/infrastructure/agent-config.d.ts.map +1 -1
- package/lib/infrastructure/agent-config.js +30 -15
- package/lib/infrastructure/agent-config.js.map +1 -1
- package/lib/infrastructure/agent-config.test.js +3 -0
- package/lib/infrastructure/agent-config.test.js.map +1 -1
- package/lib/local-connection/rabbitmq-connection.js +11 -11
- package/lib/local-connection/rabbitmq-connection.js.map +1 -1
- package/lib/secure-tunneling/secure-tunneling.d.ts +14 -22
- package/lib/secure-tunneling/secure-tunneling.d.ts.map +1 -1
- package/lib/secure-tunneling/secure-tunneling.js +34 -34
- package/lib/secure-tunneling/secure-tunneling.js.map +1 -1
- package/lib/secure-tunneling/secure-tunneling.test.js +18 -18
- package/lib/secure-tunneling/secure-tunneling.test.js.map +1 -1
- package/lib/subcommands/device/clean.js +5 -5
- package/lib/subcommands/device/clean.js.map +1 -1
- package/lib/subcommands/device/get-info.d.ts +2 -0
- package/lib/subcommands/device/get-info.d.ts.map +1 -0
- package/lib/subcommands/device/get-info.js +36 -0
- package/lib/subcommands/device/get-info.js.map +1 -0
- package/lib/subcommands/device/index.d.ts.map +1 -1
- package/lib/subcommands/device/index.js +11 -2
- package/lib/subcommands/device/index.js.map +1 -1
- package/lib/subcommands/device/init.d.ts +5 -0
- package/lib/subcommands/device/init.d.ts.map +1 -0
- package/lib/subcommands/device/{device.js → init.js} +2 -41
- package/lib/subcommands/device/init.js.map +1 -0
- package/lib/subcommands/device/refresh.d.ts +2 -0
- package/lib/subcommands/device/refresh.d.ts.map +1 -0
- package/lib/subcommands/device/refresh.js +24 -0
- package/lib/subcommands/device/refresh.js.map +1 -0
- package/lib/subcommands/device/restart.d.ts +2 -0
- package/lib/subcommands/device/restart.d.ts.map +1 -0
- package/lib/subcommands/device/restart.js +14 -0
- package/lib/subcommands/device/restart.js.map +1 -0
- package/lib/util/check-for-updates.d.ts +3 -0
- package/lib/util/check-for-updates.d.ts.map +1 -0
- package/lib/util/check-for-updates.js +69 -0
- package/lib/util/check-for-updates.js.map +1 -0
- package/lib/util/file.d.ts +7 -0
- package/lib/util/file.d.ts.map +1 -0
- package/lib/util/file.js +66 -0
- package/lib/util/file.js.map +1 -0
- package/lib/util/file.test.d.ts +2 -0
- package/lib/util/file.test.d.ts.map +1 -0
- package/lib/util/file.test.js +87 -0
- package/lib/util/file.test.js.map +1 -0
- package/package.json +8 -7
- package/readme.md +3 -3
- package/src/application-control/config.ts +1 -1
- package/src/application-control/install.ts +1 -0
- package/src/application-control/models.ts +36 -13
- package/src/application-control/status.ts +9 -7
- package/src/application-control/utils.ts +1 -1
- package/src/cloud-connection/device-agent-cloud-connection.ts +54 -30
- package/src/cloud-connection/live-updates-handler.test.ts +161 -20
- package/src/cloud-connection/live-updates-handler.ts +30 -26
- package/src/cloud-connection/passthrough-handler.ts +98 -76
- package/src/cloud-connection/shadow-handler.ts +19 -7
- package/src/cloud-connection/transaction-manager.test.ts +124 -0
- package/src/cloud-connection/transaction-manager.ts +15 -0
- package/src/device-control/device-control.ts +86 -11
- package/src/docker/docker-compose.ts +60 -0
- package/src/index.ts +2 -6
- package/src/infrastructure/agent-config.test.ts +3 -0
- package/src/infrastructure/agent-config.ts +38 -40
- package/src/local-connection/rabbitmq-connection.ts +8 -8
- package/src/secure-tunneling/secure-tunneling.test.ts +26 -26
- package/src/secure-tunneling/secure-tunneling.ts +48 -55
- package/src/subcommands/device/clean.ts +1 -1
- package/src/subcommands/device/get-info.ts +49 -0
- package/src/subcommands/device/index.ts +11 -2
- package/src/subcommands/device/{device.ts → init.ts} +0 -58
- package/src/subcommands/device/refresh.ts +22 -0
- package/src/subcommands/device/restart.ts +11 -0
- package/src/util/check-for-updates.ts +69 -0
- package/src/util/file.test.ts +90 -0
- package/src/util/file.ts +76 -0
- package/lib/docker/docker-compose-cmd.d.ts +0 -5
- package/lib/docker/docker-compose-cmd.d.ts.map +0 -1
- package/lib/docker/docker-compose-cmd.js +0 -16
- package/lib/docker/docker-compose-cmd.js.map +0 -1
- package/lib/subcommands/device/device.d.ts +0 -7
- package/lib/subcommands/device/device.d.ts.map +0 -1
- package/lib/subcommands/device/device.js.map +0 -1
- package/lib/util/safe-rimraf.d.ts +0 -2
- package/lib/util/safe-rimraf.d.ts.map +0 -1
- package/lib/util/safe-rimraf.js +0 -16
- package/lib/util/safe-rimraf.js.map +0 -1
- package/src/docker/docker-compose-cmd.ts +0 -15
- package/src/util/safe-rimraf.ts +0 -14
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { ConfigFileSchemaReturnType } from '@alwaysai/config-nodejs';
|
|
2
1
|
export interface AppBackupConfig {
|
|
3
2
|
version: string;
|
|
4
3
|
}
|
|
@@ -11,22 +10,54 @@ export interface InstalledAppConfig {
|
|
|
11
10
|
export interface AgentConfig {
|
|
12
11
|
applications: InstalledAppConfig[];
|
|
13
12
|
}
|
|
14
|
-
export
|
|
13
|
+
export declare function AgentConfigFile(dir?: string): {
|
|
15
14
|
name: string;
|
|
16
15
|
getApps: () => Promise<InstalledAppConfig[]>;
|
|
17
|
-
getReadyApps:
|
|
18
|
-
getApp:
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
16
|
+
getReadyApps: () => Promise<InstalledAppConfig[]>;
|
|
17
|
+
getApp: (props: {
|
|
18
|
+
projectId: string;
|
|
19
|
+
}) => Promise<InstalledAppConfig | null>;
|
|
20
|
+
isAppPresent: (props: {
|
|
21
|
+
projectId: string;
|
|
22
|
+
}) => Promise<boolean>;
|
|
23
|
+
isAppReady: (props: {
|
|
24
|
+
projectId: string;
|
|
25
|
+
}) => Promise<boolean>;
|
|
26
|
+
setAppInstalling: (props: {
|
|
27
|
+
projectId: string;
|
|
28
|
+
version: string;
|
|
29
|
+
}) => Promise<void>;
|
|
30
|
+
setAppInstalled: (props: {
|
|
31
|
+
projectId: string;
|
|
32
|
+
version: string;
|
|
33
|
+
}) => Promise<void>;
|
|
34
|
+
setAppUninstalling: (props: {
|
|
35
|
+
projectId: string;
|
|
36
|
+
}) => Promise<void>;
|
|
37
|
+
setAppUninstalled: (props: {
|
|
38
|
+
projectId: string;
|
|
39
|
+
}) => Promise<void>;
|
|
25
40
|
getAppVersion: (props: {
|
|
26
41
|
projectId: string;
|
|
27
42
|
}) => Promise<string>;
|
|
28
|
-
setAppBackup:
|
|
29
|
-
|
|
30
|
-
}
|
|
31
|
-
|
|
43
|
+
setAppBackup: (props: {
|
|
44
|
+
projectId: string;
|
|
45
|
+
}) => Promise<void>;
|
|
46
|
+
getAppBackup: (props: {
|
|
47
|
+
projectId: string;
|
|
48
|
+
}) => Promise<AppBackupConfig | null>;
|
|
49
|
+
path: string;
|
|
50
|
+
read: () => AgentConfig;
|
|
51
|
+
readIfExists: () => AgentConfig | undefined;
|
|
52
|
+
readRaw: () => string;
|
|
53
|
+
readParsed: () => any;
|
|
54
|
+
write: (config: AgentConfig) => import("@alwaysai/config-nodejs/lib/config-file-schema").SerializedInfoType;
|
|
55
|
+
writeRaw: (serialized: string) => import("@alwaysai/config-nodejs/lib/config-file-schema").InfoType;
|
|
56
|
+
remove: () => import("@alwaysai/config-nodejs/lib/config-file-schema").InfoType;
|
|
57
|
+
update: (updater: (config: AgentConfig) => void) => import("@alwaysai/config-nodejs/lib/config-file-schema").InfoType;
|
|
58
|
+
exists: () => boolean;
|
|
59
|
+
initialize: () => void;
|
|
60
|
+
validate: import("ajv").ValidateFunction<AgentConfig>;
|
|
61
|
+
getErrors: () => import("ajv").ErrorObject<string, Record<string, any>, unknown>[] | null | undefined;
|
|
62
|
+
};
|
|
32
63
|
//# sourceMappingURL=agent-config.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-config.d.ts","sourceRoot":"","sources":["../../src/infrastructure/agent-config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"agent-config.d.ts","sourceRoot":"","sources":["../../src/infrastructure/agent-config.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,eAAe,CAAC;CAC1B;AAED,MAAM,WAAW,WAAW;IAC1B,YAAY,EAAE,kBAAkB,EAAE,CAAC;CACpC;AAuCD,wBAAgB,eAAe,CAAC,GAAG,SAAsB;;;;oBAyB1B;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE;0BAWf;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,KAAG,QAAQ,OAAO,CAAC;wBAS1C;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,KAAG,QAAQ,OAAO,CAAC;8BAqBlC;QACrC,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;KACjB;6BAsBqC;QACpC,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;KACjB;gCAiBwC;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE;+BAiBtB;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE;2BAKzB;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE;0BAStB;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE;0BAarB;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE;;;;;;;;;;;;;;EAyBzD"}
|
|
@@ -48,25 +48,13 @@ function AgentConfigFile(dir = ALWAYSAI_CONFIG_DIR) {
|
|
|
48
48
|
validateFunction,
|
|
49
49
|
initialValue
|
|
50
50
|
});
|
|
51
|
-
return Object.assign(Object.assign({}, configFile), { name: AGENT_CONFIG_FILE_NAME, getApps,
|
|
52
|
-
getReadyApps,
|
|
53
|
-
getApp,
|
|
54
|
-
isAppPresent,
|
|
55
|
-
isAppReady,
|
|
56
|
-
removeApp,
|
|
57
|
-
setAppInstalling,
|
|
58
|
-
setAppInstalled,
|
|
59
|
-
setAppUninstalled,
|
|
60
|
-
getAppVersion,
|
|
61
|
-
setAppBackup,
|
|
62
|
-
getAppBackup });
|
|
63
51
|
async function getApps() {
|
|
64
52
|
const config = configFile.read();
|
|
65
|
-
return config
|
|
53
|
+
return (config === null || config === void 0 ? void 0 : config.applications) ? config.applications : [];
|
|
66
54
|
}
|
|
67
55
|
async function getReadyApps() {
|
|
68
56
|
const config = configFile.read();
|
|
69
|
-
return config
|
|
57
|
+
return (config === null || config === void 0 ? void 0 : config.applications)
|
|
70
58
|
? config.applications.filter((app) => {
|
|
71
59
|
return app.ready;
|
|
72
60
|
})
|
|
@@ -145,6 +133,21 @@ function AgentConfigFile(dir = ALWAYSAI_CONFIG_DIR) {
|
|
|
145
133
|
throw new Error(`App ${projectId} was not previously configured and could not be set to installed!`);
|
|
146
134
|
}
|
|
147
135
|
}
|
|
136
|
+
async function setAppUninstalling(props) {
|
|
137
|
+
const { projectId } = props;
|
|
138
|
+
const app = await getApp({ projectId });
|
|
139
|
+
if (app) {
|
|
140
|
+
await removeApp({ projectId });
|
|
141
|
+
const config = configFile.read();
|
|
142
|
+
config.applications.push(Object.assign(Object.assign({}, app), { ready: false }));
|
|
143
|
+
configFile.write(config);
|
|
144
|
+
}
|
|
145
|
+
else {
|
|
146
|
+
// NOTE: we should never be setting an app as installed
|
|
147
|
+
// if it doesn't exist (setAppInstalling was never called)
|
|
148
|
+
throw new Error(`App ${projectId} was not previously configured and could not be set to installed!`);
|
|
149
|
+
}
|
|
150
|
+
}
|
|
148
151
|
async function setAppUninstalled(props) {
|
|
149
152
|
const { projectId } = props;
|
|
150
153
|
await removeApp({ projectId });
|
|
@@ -172,11 +175,23 @@ function AgentConfigFile(dir = ALWAYSAI_CONFIG_DIR) {
|
|
|
172
175
|
async function getAppBackup(props) {
|
|
173
176
|
const { projectId } = props;
|
|
174
177
|
const app = await getApp({ projectId });
|
|
175
|
-
if (app
|
|
178
|
+
if (app === null || app === void 0 ? void 0 : app.backup) {
|
|
176
179
|
return app.backup;
|
|
177
180
|
}
|
|
178
181
|
return null;
|
|
179
182
|
}
|
|
183
|
+
return Object.assign(Object.assign({}, configFile), { name: AGENT_CONFIG_FILE_NAME, getApps,
|
|
184
|
+
getReadyApps,
|
|
185
|
+
getApp,
|
|
186
|
+
isAppPresent,
|
|
187
|
+
isAppReady,
|
|
188
|
+
setAppInstalling,
|
|
189
|
+
setAppInstalled,
|
|
190
|
+
setAppUninstalling,
|
|
191
|
+
setAppUninstalled,
|
|
192
|
+
getAppVersion,
|
|
193
|
+
setAppBackup,
|
|
194
|
+
getAppBackup });
|
|
180
195
|
}
|
|
181
196
|
exports.AgentConfigFile = AgentConfigFile;
|
|
182
197
|
//# sourceMappingURL=agent-config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-config.js","sourceRoot":"","sources":["../../src/infrastructure/agent-config.ts"],"names":[],"mappings":";;;AAAA,2DAGiC;AACjC,6BAA0C;AAC1C,2BAA6B;AAC7B,+BAA4B;AAiB5B,MAAM,MAAM,GAAgC;IAC1C,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,YAAY,EAAE;YACZ,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACL,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACV,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;oBAC7B,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;oBAC3B,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;oBAC1B,MAAM,EAAE;wBACN,IAAI,EAAE,QAAQ;wBACd,QAAQ,EAAE,IAAI;wBACd,UAAU,EAAE;4BACV,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;yBAC5B;wBACD,QAAQ,EAAE,CAAC,SAAS,CAAC;wBACrB,oBAAoB,EAAE,IAAI;qBAC3B;iBACF;gBACD,QAAQ,EAAE,CAAC,WAAW,EAAE,SAAS,EAAE,OAAO,CAAC;gBAC3C,oBAAoB,EAAE,IAAI;aAC3B;SACF;KACF;IACD,QAAQ,EAAE,CAAC,cAAc,CAAC;IAC1B,oBAAoB,EAAE,IAAI;CAC3B,CAAC;AAEF,MAAM,GAAG,GAAG,IAAI,aAAG,EAAE,CAAC;AACtB,MAAM,gBAAgB,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;AAE7C,MAAM,mBAAmB,GAAG,IAAA,WAAI,EAAC,IAAA,YAAO,GAAE,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AAEnE,MAAM,sBAAsB,GAAG,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"agent-config.js","sourceRoot":"","sources":["../../src/infrastructure/agent-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -89,6 +89,9 @@ describe('Test Agent Config', () => {
|
|
|
89
89
|
expect(await configFile.getAppVersion({ projectId })).toEqual(version);
|
|
90
90
|
await configFile.setAppInstalled({ projectId, version });
|
|
91
91
|
expect(await configFile.getAppVersion({ projectId })).toEqual(version);
|
|
92
|
+
expect(await configFile.isAppReady({ projectId })).toEqual(true);
|
|
93
|
+
await configFile.setAppUninstalling({ projectId });
|
|
94
|
+
expect(await configFile.isAppReady({ projectId })).toEqual(false);
|
|
92
95
|
await configFile.setAppUninstalled({ projectId });
|
|
93
96
|
const apps = await configFile.getApps();
|
|
94
97
|
expect(apps).toEqual([]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-config.test.js","sourceRoot":"","sources":["../../src/infrastructure/agent-config.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"agent-config.test.js","sourceRoot":"","sources":["../../src/infrastructure/agent-config.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.stopRabbitMQContainer = exports.setupRabbitMQContainer = exports.writeRabbitMQDockerComposeFile = exports.checkRabbitMQContainerRunning = exports.rabbitMQContainerName = exports.rabbitMQServiceName = void 0;
|
|
4
4
|
const logger_1 = require("../util/logger");
|
|
5
5
|
const sleep_1 = require("../util/sleep");
|
|
6
|
-
const docker_compose_1 = require("docker-compose");
|
|
6
|
+
const docker_compose_1 = require("../docker/docker-compose");
|
|
7
7
|
const YAML = require("yaml");
|
|
8
8
|
const directories_1 = require("../util/directories");
|
|
9
9
|
const util_1 = require("alwaysai/lib/util");
|
|
@@ -17,18 +17,18 @@ async function checkRabbitMQContainerRunning() {
|
|
|
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.
|
|
21
|
-
if (
|
|
20
|
+
const containerData = await docker_compose_1.compose.ps({ cwd: directories_1.DEVICE_AGENT_CFG_PATH });
|
|
21
|
+
if (containerData !== undefined) {
|
|
22
22
|
const rabbitmqService = containerData.data.services[0];
|
|
23
|
-
if (rabbitmqService.name === exports.rabbitMQContainerName &&
|
|
24
|
-
rabbitmqService.state
|
|
25
|
-
logger_1.logger.debug('alwaysAI Local Connection is
|
|
23
|
+
if ((rabbitmqService === null || rabbitmqService === void 0 ? void 0 : rabbitmqService.name) === exports.rabbitMQContainerName &&
|
|
24
|
+
rabbitmqService.state.includes('Up')) {
|
|
25
|
+
logger_1.logger.debug('alwaysAI Local Connection Container is up');
|
|
26
26
|
return true;
|
|
27
27
|
}
|
|
28
|
-
logger_1.logger.debug('alwaysAI Local Connection is not
|
|
28
|
+
logger_1.logger.debug('alwaysAI Local Connection Container is not up');
|
|
29
29
|
return false;
|
|
30
30
|
}
|
|
31
|
-
logger_1.logger.warn('alwaysAI Local Connection
|
|
31
|
+
logger_1.logger.warn('alwaysAI Local Connection Container is undefined');
|
|
32
32
|
return false;
|
|
33
33
|
}
|
|
34
34
|
exports.checkRabbitMQContainerRunning = checkRabbitMQContainerRunning;
|
|
@@ -67,7 +67,7 @@ async function setupRabbitMQContainer() {
|
|
|
67
67
|
logger_1.logger.error(`An error occurred setting up docker-compose.yaml for Device Agent pass through:\n{e.message}`);
|
|
68
68
|
}
|
|
69
69
|
try {
|
|
70
|
-
const upOut = await docker_compose_1.
|
|
70
|
+
const upOut = await docker_compose_1.compose.upAll({
|
|
71
71
|
cwd: directories_1.DEVICE_AGENT_CFG_PATH
|
|
72
72
|
});
|
|
73
73
|
logger_1.logger.debug(`Docker compose up for alwaysAI Local Connection:\n${JSON.stringify(upOut)}`);
|
|
@@ -77,13 +77,13 @@ 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:\n${e
|
|
80
|
+
logger_1.logger.error(`Unable to start alwaysAI Device Agent Local Connection Container:\n${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.
|
|
86
|
+
const downOut = await docker_compose_1.compose.down({ cwd: directories_1.DEVICE_AGENT_CFG_PATH });
|
|
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
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rabbitmq-connection.js","sourceRoot":"","sources":["../../src/local-connection/rabbitmq-connection.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AACxC,yCAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"rabbitmq-connection.js","sourceRoot":"","sources":["../../src/local-connection/rabbitmq-connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,20 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
enabled: boolean;
|
|
3
|
-
type: string;
|
|
4
|
-
ip: string;
|
|
5
|
-
port: number;
|
|
6
|
-
};
|
|
7
|
-
export declare type SecureTunnelShadowDesRep = {
|
|
8
|
-
st_ports: SecureTunnelPortInfo[];
|
|
9
|
-
};
|
|
1
|
+
import { SecureTunnelShadowDescriptionReported } from '@alwaysai/device-agent-schemas';
|
|
10
2
|
export declare type SecureTunnelShadowState = {
|
|
11
|
-
reported?:
|
|
12
|
-
desired?:
|
|
3
|
+
reported?: SecureTunnelShadowDescriptionReported;
|
|
4
|
+
desired?: SecureTunnelShadowDescriptionReported;
|
|
13
5
|
};
|
|
14
6
|
export declare type SecureTunnelShadowUpdateDelta = {
|
|
15
7
|
version: number;
|
|
16
8
|
timestamp: number;
|
|
17
|
-
state:
|
|
9
|
+
state: SecureTunnelShadowDescriptionReported;
|
|
18
10
|
metadata?: any;
|
|
19
11
|
};
|
|
20
12
|
export declare type SecureTunnelShadowUpdate = {
|
|
@@ -33,7 +25,7 @@ export declare class SecureTunnelHandlerSingleton {
|
|
|
33
25
|
private static instance;
|
|
34
26
|
private reported;
|
|
35
27
|
private httpProxyMap;
|
|
36
|
-
private
|
|
28
|
+
private localProxyInfo;
|
|
37
29
|
/**
|
|
38
30
|
* Initializes private variables of SecureTunnel handler.
|
|
39
31
|
* private constructor to prevent instantiation from outside
|
|
@@ -49,15 +41,15 @@ export declare class SecureTunnelHandlerSingleton {
|
|
|
49
41
|
destroy(): Promise<void>;
|
|
50
42
|
/**
|
|
51
43
|
* Returns current state of SecureTunnel shadow
|
|
52
|
-
* @returns {
|
|
44
|
+
* @returns {SecureTunnelShadowDescriptionReported} - reported state of the SecureTunnel shadow
|
|
53
45
|
*/
|
|
54
|
-
getSecureTunnelShadow():
|
|
46
|
+
getSecureTunnelShadow(): SecureTunnelShadowDescriptionReported;
|
|
55
47
|
/**
|
|
56
48
|
* Updates current state of SecureTunnel shadow
|
|
57
49
|
* @param {SecureTunnelShadowUpdateDelta} deltaMsg - delta message, which includes desired state of the SecureTunnel shadow
|
|
58
|
-
* @return {
|
|
50
|
+
* @return {SecureTunnelShadowDescriptionReported} update reported message to send back to AWS IoT device shadow
|
|
59
51
|
*/
|
|
60
|
-
syncShadowToDeviceState(deltaMsg: SecureTunnelShadowUpdateDelta): Promise<
|
|
52
|
+
syncShadowToDeviceState(deltaMsg: SecureTunnelShadowUpdateDelta): Promise<SecureTunnelShadowDescriptionReported>;
|
|
61
53
|
/**
|
|
62
54
|
* Starts SecureTunnel
|
|
63
55
|
* @param {SecureTunnelNotificationType} message - AWS notification received
|
|
@@ -79,20 +71,20 @@ export declare class SecureTunnelHandlerSingleton {
|
|
|
79
71
|
*/
|
|
80
72
|
private stopProxyMapping;
|
|
81
73
|
/**
|
|
82
|
-
* Starts SecureTunnel
|
|
74
|
+
* Starts SecureTunnel localProxy process
|
|
83
75
|
*/
|
|
84
|
-
private
|
|
76
|
+
private startLocalProxy;
|
|
85
77
|
/**
|
|
86
|
-
* Stops SecureTunnel
|
|
78
|
+
* Stops SecureTunnel local proxy process
|
|
87
79
|
*/
|
|
88
|
-
private
|
|
80
|
+
private stopLocalProxy;
|
|
89
81
|
/**
|
|
90
82
|
* processes and validate notify message
|
|
91
83
|
* @param {string[]} message - message, which contains: clientAccessToken, region, services
|
|
92
84
|
*/
|
|
93
85
|
private processNotifyMessage;
|
|
94
86
|
/**
|
|
95
|
-
* Downloads SecureTunnel
|
|
87
|
+
* Downloads SecureTunnel local proxy, if it was not downloaded before
|
|
96
88
|
*/
|
|
97
89
|
private downloadSecureTunnel;
|
|
98
90
|
/**
|
|
@@ -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":"AAgBA,OAAO,EAEL,qCAAqC,EACtC,MAAM,gCAAgC,CAAC;AAOxC,oBAAY,uBAAuB,GAAG;IACpC,QAAQ,CAAC,EAAE,qCAAqC,CAAC;IACjD,OAAO,CAAC,EAAE,qCAAqC,CAAC;CACjD,CAAC;AAEF,oBAAY,6BAA6B,GAAG;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,qCAAqC,CAAC;IAC7C,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,CAAC;AAEF,oBAAY,wBAAwB,GAAG;IACrC,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,CAAwC;IACxD,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,qCAAqC;IAOrE;;;;OAIG;IACU,uBAAuB,CAClC,QAAQ,EAAE,6BAA6B,GACtC,OAAO,CAAC,qCAAqC,CAAC;IA0DjD;;;OAGG;IACU,yBAAyB,CACpC,OAAO,EAAE,4BAA4B,GACpC,OAAO,CAAC,IAAI,CAAC;IAmBhB;;;OAGG;YACW,oBAAoB;IAkClC;;;OAGG;YACW,iBAAiB;IA+C/B;;;OAGG;YACW,gBAAgB;IA2C9B;;OAEG;YACW,eAAe;IAuB7B;;OAEG;YACW,cAAc;IA4B5B;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAmF5B;;OAEG;YACW,oBAAoB;IA8BlC;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAgB5B,OAAO,CAAC,SAAS;CAmBlB"}
|
|
@@ -39,7 +39,7 @@ class SecureTunnelHandlerSingleton {
|
|
|
39
39
|
st_ports: [JSON.parse(JSON.stringify(defaultSecureTunnelPortInfo))]
|
|
40
40
|
};
|
|
41
41
|
this.httpProxyMap = [];
|
|
42
|
-
this.
|
|
42
|
+
this.localProxyInfo = {
|
|
43
43
|
lpDstAccessKey: '',
|
|
44
44
|
lpRegion: '',
|
|
45
45
|
lpServices: '',
|
|
@@ -83,12 +83,12 @@ class SecureTunnelHandlerSingleton {
|
|
|
83
83
|
};
|
|
84
84
|
logger_1.logger.debug(`httpProxyMap after : ${JSON.stringify(this.httpProxyMap)}`);
|
|
85
85
|
logger_1.logger.debug(`reported after : ${JSON.stringify(this.reported)}`);
|
|
86
|
-
await this.
|
|
86
|
+
await this.stopLocalProxy();
|
|
87
87
|
logger_1.logger.debug('<- SecureTunnelHandlerSingleton.destroy');
|
|
88
88
|
}
|
|
89
89
|
/**
|
|
90
90
|
* Returns current state of SecureTunnel shadow
|
|
91
|
-
* @returns {
|
|
91
|
+
* @returns {SecureTunnelShadowDescriptionReported} - 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 {SecureTunnelShadowDescriptionReported} 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');
|
|
@@ -140,7 +140,7 @@ class SecureTunnelHandlerSingleton {
|
|
|
140
140
|
}
|
|
141
141
|
// if all entries are disabled, we need also to kill local proxy
|
|
142
142
|
if (this.reported.st_ports.every((portInfo) => !portInfo.enabled)) {
|
|
143
|
-
await this.
|
|
143
|
+
await this.stopLocalProxy();
|
|
144
144
|
}
|
|
145
145
|
// need to order list in the same order as desired before sending back
|
|
146
146
|
const sortedPorts = this.sortPorts(state);
|
|
@@ -155,15 +155,15 @@ class SecureTunnelHandlerSingleton {
|
|
|
155
155
|
async secureTunnelNotifyHandler(message) {
|
|
156
156
|
logger_1.logger.debug('-> SecureTunnelHandlerSingleton.secureTunnelNotifyHandler');
|
|
157
157
|
try {
|
|
158
|
-
await this.
|
|
158
|
+
await this.stopLocalProxy();
|
|
159
159
|
this.processNotifyMessage(message);
|
|
160
160
|
await this.downloadSecureTunnel();
|
|
161
|
-
await this.
|
|
161
|
+
await this.startLocalProxy();
|
|
162
162
|
}
|
|
163
163
|
catch (error) {
|
|
164
164
|
logger_1.logger.error(error);
|
|
165
165
|
}
|
|
166
|
-
logger_1.logger.info(`Local Proxy Started: ${JSON.stringify(this.
|
|
166
|
+
logger_1.logger.info(`Local Proxy Started: ${JSON.stringify(this.localProxyInfo)}`);
|
|
167
167
|
logger_1.logger.debug('<- SecureTunnelHandlerSingleton.secureTunnelNotifyHandler');
|
|
168
168
|
}
|
|
169
169
|
//---------------------------------------------------------------------------
|
|
@@ -267,52 +267,52 @@ class SecureTunnelHandlerSingleton {
|
|
|
267
267
|
logger_1.logger.debug('<- SecureTunnelHandlerSingleton.stopProxyMapping');
|
|
268
268
|
}
|
|
269
269
|
/**
|
|
270
|
-
* Starts SecureTunnel
|
|
270
|
+
* Starts SecureTunnel localProxy process
|
|
271
271
|
*/
|
|
272
|
-
async
|
|
273
|
-
logger_1.logger.debug('-> SecureTunnelHandlerSingleton.
|
|
272
|
+
async startLocalProxy() {
|
|
273
|
+
logger_1.logger.debug('-> SecureTunnelHandlerSingleton.startLocalProxy');
|
|
274
274
|
const args = [
|
|
275
275
|
'--destination-app',
|
|
276
|
-
this.
|
|
276
|
+
this.localProxyInfo.lpServices,
|
|
277
277
|
'--region',
|
|
278
|
-
this.
|
|
278
|
+
this.localProxyInfo.lpRegion,
|
|
279
279
|
'--capath',
|
|
280
280
|
directories_1.AWS_ROOT_CERTIFICATE_FILE_PATH,
|
|
281
281
|
'--local-bind-address',
|
|
282
282
|
'0.0.0.0',
|
|
283
283
|
'-t',
|
|
284
|
-
this.
|
|
284
|
+
this.localProxyInfo.lpDstAccessKey
|
|
285
285
|
];
|
|
286
|
-
this.
|
|
287
|
-
logger_1.logger.debug('<- SecureTunnelHandlerSingleton.
|
|
286
|
+
this.localProxyInfo.lpProcess = await (0, spawner_detached_1.runDetachedProcess)(directories_1.SECURE_TUNNEL_BIN_PATH, args);
|
|
287
|
+
logger_1.logger.debug('<- SecureTunnelHandlerSingleton.startLocalProxy');
|
|
288
288
|
}
|
|
289
289
|
/**
|
|
290
|
-
* Stops SecureTunnel
|
|
290
|
+
* Stops SecureTunnel local proxy process
|
|
291
291
|
*/
|
|
292
|
-
async
|
|
293
|
-
logger_1.logger.debug('-> SecureTunnelHandlerSingleton.
|
|
294
|
-
if (!this.
|
|
295
|
-
logger_1.logger.debug('No
|
|
296
|
-
logger_1.logger.debug('<- SecureTunnelHandlerSingleton.
|
|
292
|
+
async stopLocalProxy() {
|
|
293
|
+
logger_1.logger.debug('-> SecureTunnelHandlerSingleton.stopLocalProxy');
|
|
294
|
+
if (!this.localProxyInfo.lpProcess) {
|
|
295
|
+
logger_1.logger.debug('No local proxy process running');
|
|
296
|
+
logger_1.logger.debug('<- SecureTunnelHandlerSingleton.stopLocalProxy');
|
|
297
297
|
return;
|
|
298
298
|
}
|
|
299
299
|
try {
|
|
300
|
-
logger_1.logger.debug(`About to kill
|
|
301
|
-
await (0, spawner_detached_1.killDetachedProcess)(this.
|
|
300
|
+
logger_1.logger.debug(`About to kill local proxy: ${this.localProxyInfo.lpDstAccessKey}`);
|
|
301
|
+
await (0, spawner_detached_1.killDetachedProcess)(this.localProxyInfo.lpProcess, [
|
|
302
302
|
directories_1.SECURE_TUNNEL_BIN_PATH
|
|
303
303
|
]);
|
|
304
|
-
logger_1.logger.debug('SUCCESS: killing
|
|
304
|
+
logger_1.logger.debug('SUCCESS: killing local proxy process');
|
|
305
305
|
}
|
|
306
306
|
catch (e) {
|
|
307
|
-
logger_1.logger.error('ERROR: killing
|
|
307
|
+
logger_1.logger.error('ERROR: killing local proxy process:', e);
|
|
308
308
|
}
|
|
309
|
-
this.
|
|
309
|
+
this.localProxyInfo = {
|
|
310
310
|
lpDstAccessKey: '',
|
|
311
311
|
lpRegion: '',
|
|
312
312
|
lpServices: '',
|
|
313
313
|
lpProcess: null
|
|
314
314
|
};
|
|
315
|
-
logger_1.logger.debug('<- SecureTunnelHandlerSingleton.
|
|
315
|
+
logger_1.logger.debug('<- SecureTunnelHandlerSingleton.stopLocalProxy');
|
|
316
316
|
}
|
|
317
317
|
/**
|
|
318
318
|
* processes and validate notify message
|
|
@@ -366,15 +366,15 @@ class SecureTunnelHandlerSingleton {
|
|
|
366
366
|
portMappingList.push(`${port}=${this.httpProxyMap[index].localhostPort}`);
|
|
367
367
|
});
|
|
368
368
|
}
|
|
369
|
-
this.
|
|
370
|
-
this.
|
|
371
|
-
this.
|
|
369
|
+
this.localProxyInfo.lpDstAccessKey = clientAccessToken;
|
|
370
|
+
this.localProxyInfo.lpRegion = region;
|
|
371
|
+
this.localProxyInfo.lpServices = portMappingList.join(',');
|
|
372
372
|
logger_1.logger.debug(`reported = ${JSON.stringify(this.reported.st_ports)}`);
|
|
373
|
-
logger_1.logger.debug(`
|
|
373
|
+
logger_1.logger.debug(`localProxyInfo = ${JSON.stringify(this.localProxyInfo)}`);
|
|
374
374
|
logger_1.logger.debug('<- SecureTunnelHandlerSingleton.processNotifyMessage');
|
|
375
375
|
}
|
|
376
376
|
/**
|
|
377
|
-
* Downloads SecureTunnel
|
|
377
|
+
* Downloads SecureTunnel local proxy, if it was not downloaded before
|
|
378
378
|
*/
|
|
379
379
|
async downloadSecureTunnel() {
|
|
380
380
|
logger_1.logger.debug('-> SecureTunnelHandlerSingleton.downloadSecureTunnel');
|
|
@@ -387,7 +387,7 @@ class SecureTunnelHandlerSingleton {
|
|
|
387
387
|
(0, system_info_1.getDistribution)(),
|
|
388
388
|
(0, system_info_1.getOsVersion)()
|
|
389
389
|
]);
|
|
390
|
-
logger_1.logger.info('Downloading SecureTunnel
|
|
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
393
|
await (0, download_file_1.downloadFile)({
|