@alwaysai/device-agent 0.0.12 → 0.0.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (181) hide show
  1. package/lib/application-control/backup.d.ts.map +1 -1
  2. package/lib/application-control/backup.js +8 -2
  3. package/lib/application-control/backup.js.map +1 -1
  4. package/lib/application-control/config.d.ts +12 -4
  5. package/lib/application-control/config.d.ts.map +1 -1
  6. package/lib/application-control/config.js +59 -16
  7. package/lib/application-control/config.js.map +1 -1
  8. package/lib/application-control/environment-variables.d.ts.map +1 -1
  9. package/lib/application-control/environment-variables.js.map +1 -1
  10. package/lib/application-control/index.d.ts +4 -4
  11. package/lib/application-control/index.d.ts.map +1 -1
  12. package/lib/application-control/index.js +4 -3
  13. package/lib/application-control/index.js.map +1 -1
  14. package/lib/application-control/install.d.ts.map +1 -1
  15. package/lib/application-control/install.js +28 -14
  16. package/lib/application-control/install.js.map +1 -1
  17. package/lib/application-control/models.d.ts +7 -1
  18. package/lib/application-control/models.d.ts.map +1 -1
  19. package/lib/application-control/models.js +69 -39
  20. package/lib/application-control/models.js.map +1 -1
  21. package/lib/application-control/status.d.ts.map +1 -1
  22. package/lib/application-control/status.js +18 -14
  23. package/lib/application-control/status.js.map +1 -1
  24. package/lib/application-control/utils.d.ts +0 -2
  25. package/lib/application-control/utils.d.ts.map +1 -1
  26. package/lib/application-control/utils.js +7 -16
  27. package/lib/application-control/utils.js.map +1 -1
  28. package/lib/cloud-connection/app-install-status.d.ts +16 -0
  29. package/lib/cloud-connection/app-install-status.d.ts.map +1 -0
  30. package/lib/cloud-connection/app-install-status.js +53 -0
  31. package/lib/cloud-connection/app-install-status.js.map +1 -0
  32. package/lib/cloud-connection/bootstrap-provision.d.ts +2 -0
  33. package/lib/cloud-connection/bootstrap-provision.d.ts.map +1 -0
  34. package/lib/cloud-connection/bootstrap-provision.js +34 -0
  35. package/lib/cloud-connection/bootstrap-provision.js.map +1 -0
  36. package/lib/cloud-connection/device-agent-cloud-connection.d.ts +12 -34
  37. package/lib/cloud-connection/device-agent-cloud-connection.d.ts.map +1 -1
  38. package/lib/cloud-connection/device-agent-cloud-connection.js +169 -385
  39. package/lib/cloud-connection/device-agent-cloud-connection.js.map +1 -1
  40. package/lib/cloud-connection/device-agent.d.ts.map +1 -1
  41. package/lib/cloud-connection/device-agent.js +22 -26
  42. package/lib/cloud-connection/device-agent.js.map +1 -1
  43. package/lib/cloud-connection/live-updates-handler.d.ts +34 -0
  44. package/lib/cloud-connection/live-updates-handler.d.ts.map +1 -0
  45. package/lib/cloud-connection/live-updates-handler.js +167 -0
  46. package/lib/cloud-connection/live-updates-handler.js.map +1 -0
  47. package/lib/cloud-connection/messages.d.ts +14 -0
  48. package/lib/cloud-connection/messages.d.ts.map +1 -0
  49. package/lib/cloud-connection/messages.js +38 -0
  50. package/lib/cloud-connection/messages.js.map +1 -0
  51. package/lib/cloud-connection/publisher.d.ts +14 -0
  52. package/lib/cloud-connection/publisher.d.ts.map +1 -0
  53. package/lib/cloud-connection/publisher.js +44 -0
  54. package/lib/cloud-connection/publisher.js.map +1 -0
  55. package/lib/cloud-connection/shadow-handler.d.ts +34 -0
  56. package/lib/cloud-connection/shadow-handler.d.ts.map +1 -0
  57. package/lib/cloud-connection/shadow-handler.js +94 -0
  58. package/lib/cloud-connection/shadow-handler.js.map +1 -0
  59. package/lib/cloud-connection/shadow.d.ts +16 -0
  60. package/lib/cloud-connection/shadow.d.ts.map +1 -0
  61. package/lib/cloud-connection/shadow.js +36 -0
  62. package/lib/cloud-connection/shadow.js.map +1 -0
  63. package/lib/device-control/device-control.d.ts.map +1 -1
  64. package/lib/device-control/device-control.js +1 -0
  65. package/lib/device-control/device-control.js.map +1 -1
  66. package/lib/docker/docker-cmd.js +1 -1
  67. package/lib/docker/docker-compose-cmd.d.ts.map +1 -1
  68. package/lib/docker/docker-compose-cmd.js +1 -1
  69. package/lib/docker/docker-compose-cmd.js.map +1 -1
  70. package/lib/endpoints.js +10 -10
  71. package/lib/endpoints.js.map +1 -1
  72. package/lib/environment.d.ts.map +1 -1
  73. package/lib/environment.js.map +1 -1
  74. package/lib/infrastructure/agent-config.d.ts +4 -14
  75. package/lib/infrastructure/agent-config.d.ts.map +1 -1
  76. package/lib/infrastructure/agent-config.js +22 -15
  77. package/lib/infrastructure/agent-config.js.map +1 -1
  78. package/lib/infrastructure/agent-config.test.js +26 -18
  79. package/lib/infrastructure/agent-config.test.js.map +1 -1
  80. package/lib/infrastructure/system-id.d.ts +2 -0
  81. package/lib/infrastructure/system-id.d.ts.map +1 -0
  82. package/lib/infrastructure/system-id.js +21 -0
  83. package/lib/infrastructure/system-id.js.map +1 -0
  84. package/lib/infrastructure/tokens-and-device-cfg.d.ts +4 -0
  85. package/lib/infrastructure/tokens-and-device-cfg.d.ts.map +1 -0
  86. package/lib/infrastructure/tokens-and-device-cfg.js +31 -0
  87. package/lib/infrastructure/tokens-and-device-cfg.js.map +1 -0
  88. package/lib/infrastructure/urls.d.ts.map +1 -1
  89. package/lib/infrastructure/urls.js +3 -3
  90. package/lib/infrastructure/urls.js.map +1 -1
  91. package/lib/root.d.ts.map +1 -1
  92. package/lib/root.js +2 -7
  93. package/lib/root.js.map +1 -1
  94. package/lib/subcommands/app/app.d.ts.map +1 -1
  95. package/lib/subcommands/app/app.js +62 -60
  96. package/lib/subcommands/app/app.js.map +1 -1
  97. package/lib/subcommands/app/index.js +2 -2
  98. package/lib/subcommands/device/clean.d.ts +2 -0
  99. package/lib/subcommands/device/clean.d.ts.map +1 -0
  100. package/lib/subcommands/device/clean.js +29 -0
  101. package/lib/subcommands/device/clean.js.map +1 -0
  102. package/lib/subcommands/device/device.d.ts.map +1 -1
  103. package/lib/subcommands/device/device.js +40 -27
  104. package/lib/subcommands/device/device.js.map +1 -1
  105. package/lib/subcommands/device/index.d.ts.map +1 -1
  106. package/lib/subcommands/device/index.js +2 -1
  107. package/lib/subcommands/device/index.js.map +1 -1
  108. package/lib/subcommands/get-model-package.js +5 -5
  109. package/lib/subcommands/index.js +1 -1
  110. package/lib/subcommands/login.js +8 -8
  111. package/lib/subcommands/login.js.map +1 -1
  112. package/lib/util/clean-certs.d.ts +2 -0
  113. package/lib/util/clean-certs.d.ts.map +1 -0
  114. package/lib/util/clean-certs.js +16 -0
  115. package/lib/util/clean-certs.js.map +1 -0
  116. package/lib/util/directories.d.ts +16 -15
  117. package/lib/util/directories.d.ts.map +1 -1
  118. package/lib/util/directories.js +45 -26
  119. package/lib/util/directories.js.map +1 -1
  120. package/lib/util/get-device-id.d.ts +1 -1
  121. package/lib/util/get-device-id.d.ts.map +1 -1
  122. package/lib/util/get-device-id.js +14 -19
  123. package/lib/util/get-device-id.js.map +1 -1
  124. package/lib/util/http-client.d.ts +1 -1
  125. package/lib/util/http-client.d.ts.map +1 -1
  126. package/lib/util/http-client.js +10 -8
  127. package/lib/util/http-client.js.map +1 -1
  128. package/lib/util/logger.d.ts.map +1 -1
  129. package/lib/util/logger.js +4 -5
  130. package/lib/util/logger.js.map +1 -1
  131. package/lib/util/run-in-dir.d.ts.map +1 -1
  132. package/lib/util/run-in-dir.js +1 -0
  133. package/lib/util/run-in-dir.js.map +1 -1
  134. package/package.json +17 -8
  135. package/src/application-control/backup.ts +8 -3
  136. package/src/application-control/config.ts +75 -13
  137. package/src/application-control/environment-variables.ts +3 -3
  138. package/src/application-control/index.ts +19 -6
  139. package/src/application-control/install.ts +52 -28
  140. package/src/application-control/models.ts +100 -56
  141. package/src/application-control/status.ts +26 -21
  142. package/src/application-control/utils.ts +9 -20
  143. package/src/cloud-connection/app-install-status.ts +62 -0
  144. package/src/cloud-connection/bootstrap-provision.ts +40 -0
  145. package/src/cloud-connection/device-agent-cloud-connection.ts +257 -528
  146. package/src/cloud-connection/device-agent.ts +31 -38
  147. package/src/cloud-connection/live-updates-handler.ts +226 -0
  148. package/src/cloud-connection/messages.ts +39 -0
  149. package/src/cloud-connection/publisher.ts +65 -0
  150. package/src/cloud-connection/shadow-handler.ts +154 -0
  151. package/src/cloud-connection/shadow.ts +50 -0
  152. package/src/device-control/device-control.ts +1 -0
  153. package/src/docker/docker-cmd.ts +1 -1
  154. package/src/docker/docker-compose-cmd.ts +5 -2
  155. package/src/endpoints.ts +9 -9
  156. package/src/environment.ts +8 -3
  157. package/src/infrastructure/agent-config.test.ts +34 -23
  158. package/src/infrastructure/agent-config.ts +33 -20
  159. package/src/infrastructure/system-id.ts +18 -0
  160. package/src/infrastructure/tokens-and-device-cfg.ts +39 -0
  161. package/src/infrastructure/urls.ts +4 -2
  162. package/src/root.ts +2 -8
  163. package/src/subcommands/app/app.ts +64 -62
  164. package/src/subcommands/app/index.ts +3 -3
  165. package/src/subcommands/device/clean.ts +26 -0
  166. package/src/subcommands/device/device.ts +66 -50
  167. package/src/subcommands/device/index.ts +2 -1
  168. package/src/subcommands/get-model-package.ts +5 -5
  169. package/src/subcommands/index.ts +1 -1
  170. package/src/subcommands/login.ts +8 -8
  171. package/src/util/clean-certs.ts +12 -0
  172. package/src/util/directories.ts +68 -52
  173. package/src/util/get-device-id.ts +16 -18
  174. package/src/util/http-client.ts +18 -13
  175. package/src/util/logger.ts +6 -6
  176. package/src/util/run-in-dir.ts +2 -1
  177. package/lib/infrastructure/certificates-and-tokens.d.ts +0 -6
  178. package/lib/infrastructure/certificates-and-tokens.d.ts.map +0 -1
  179. package/lib/infrastructure/certificates-and-tokens.js +0 -43
  180. package/lib/infrastructure/certificates-and-tokens.js.map +0 -1
  181. package/src/infrastructure/certificates-and-tokens.ts +0 -53
@@ -3,69 +3,82 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getInfoCliLeaf = exports.initCliLeaf = void 0;
4
4
  const alwayscli_1 = require("@alwaysai/alwayscli");
5
5
  const user_1 = require("alwaysai/lib/components/user");
6
+ const app_1 = require("alwaysai/lib/core/app");
6
7
  const project_1 = require("alwaysai/lib/core/project");
7
8
  const uuid_1 = require("uuid");
8
9
  const infrastructure_1 = require("alwaysai/lib/infrastructure");
10
+ const fs_1 = require("fs");
9
11
  const http_client_1 = require("../../util/http-client");
10
12
  const directories_1 = require("../../util/directories");
11
13
  const constants_1 = require("alwaysai/lib/constants");
12
14
  const util_1 = require("alwaysai/lib/util");
13
15
  const device_control_1 = require("../../device-control/device-control");
14
- const certificates_and_tokens_1 = require("../../infrastructure/certificates-and-tokens");
16
+ const tokens_and_device_cfg_1 = require("../../infrastructure/tokens-and-device-cfg");
15
17
  const logger_1 = require("../../util/logger");
18
+ const device_1 = require("alwaysai/lib/core/device");
16
19
  exports.initCliLeaf = (0, alwayscli_1.CliLeaf)({
17
- name: "init",
18
- description: "Initialize device",
20
+ name: 'init',
21
+ description: 'Initialize device',
19
22
  namedInputs: {
20
23
  name: (0, alwayscli_1.CliStringInput)({
21
- description: "Device name",
22
- required: true,
24
+ description: 'Device name',
25
+ required: true
23
26
  }),
24
27
  description: (0, alwayscli_1.CliStringInput)({
25
- description: "Device description",
26
- required: false,
27
- }),
28
+ description: 'Device description',
29
+ required: false
30
+ })
28
31
  },
29
32
  async action(_, opts) {
30
33
  const { name, description } = opts;
31
- logger_1.logger.info("Initializing device");
34
+ if ((0, device_1.DeviceConfigFile)().exists() || (0, fs_1.existsSync)((0, directories_1.getPrivateKeyFilePath)())) {
35
+ throw new Error("Device has been previously provisioned. Run 'aai-agent device clean' to re-provision");
36
+ }
37
+ logger_1.logger.info(`Initializing device ${name}`);
32
38
  await (0, user_1.checkUserIsLoggedInComponent)({ yes: true });
33
39
  if (!(await (0, project_1.checkPaidPlan)())) {
34
40
  throw new Error(`This action only supported for Enterprise alwaysAI accounts!`);
35
41
  }
36
42
  const { username } = await (0, infrastructure_1.CliAuthenticationClient)().getInfo();
37
- const spawner = (0, util_1.JsSpawner)();
38
- const hardwareId = await (0, certificates_and_tokens_1.getTargetHardwareUuid)(spawner);
43
+ const hardwareId = await (0, app_1.getTargetHardwareUuid)((0, util_1.JsSpawner)());
39
44
  const device = {
40
- deviceMode: "production",
45
+ deviceMode: 'production',
41
46
  hardwareId,
42
47
  txId: (0, uuid_1.v4)(),
43
48
  userName: username,
44
- friendlyName: name,
49
+ friendlyName: name
45
50
  };
46
- const response = await (0, http_client_1.microServiceHttpClient)("fleet-provision", "addDevice", "POST", JSON.stringify(device));
47
- const ROOT_CERT_AWS = await (0, http_client_1.httpClient)("https://www.amazontrust.com/repository/AmazonRootCA1.pem", "GET");
48
- await (0, certificates_and_tokens_1.writeCertificateAndToken)({ deviceUuid: response.deviceUuid });
49
- await (0, util_1.JsSpawner)().mkdirp(directories_1.BOOTSTRAP_CERTIFICATES_DIR_PATH);
50
- (0, util_1.JsSpawner)({ path: constants_1.LOCAL_CERT_AND_KEY_DIR }).writeFile(directories_1.AWS_ROOT_CERTIFICATE_FILE_NAME, ROOT_CERT_AWS);
51
- const certSpawner = (0, util_1.JsSpawner)({ path: directories_1.BOOTSTRAP_CERTIFICATES_DIR_PATH });
51
+ const response = await (0, http_client_1.microServiceHttpClient)('fleet-provision', 'addDevice', 'POST', JSON.stringify(device));
52
+ logger_1.logger.debug(`addDevice Response: ${JSON.stringify(response, null, 2)}`);
53
+ if (!Object.hasOwn(response, 'claimCertificate')) {
54
+ throw new Error("Device cannot be provisioned. Run 'aai-agent device clean' and retry.");
55
+ }
56
+ const ROOT_CERT_AWS = await (0, http_client_1.httpClient)('https://www.amazontrust.com/repository/AmazonRootCA1.pem', 'GET', {});
57
+ await (0, tokens_and_device_cfg_1.writeTokenAndDeviceCfg)({
58
+ deviceUuid: response.deviceUuid
59
+ });
60
+ await (0, util_1.JsSpawner)().mkdirp((0, directories_1.BOOTSTRAP_CERTIFICATES_DIR_PATH)());
61
+ await (0, util_1.JsSpawner)({ path: constants_1.LOCAL_CERT_AND_KEY_DIR }).writeFile(directories_1.AWS_ROOT_CERTIFICATE_FILE_NAME, ROOT_CERT_AWS);
62
+ const certSpawner = (0, util_1.JsSpawner)({
63
+ path: (0, directories_1.BOOTSTRAP_CERTIFICATES_DIR_PATH)()
64
+ });
52
65
  for (const key in response.claimCertificate) {
53
66
  await certSpawner.writeFile(key, response.claimCertificate[key]);
54
67
  }
55
- logger_1.logger.info(`Initialized device as ${response.deviceUuid}`);
56
- },
68
+ logger_1.logger.info(`Initialized device ${name}: UUID=${response.deviceUuid}`);
69
+ }
57
70
  });
58
71
  exports.getInfoCliLeaf = (0, alwayscli_1.CliLeaf)({
59
- name: "get-info",
60
- description: "Get device info",
72
+ name: 'get-info',
73
+ description: 'Get device info',
61
74
  namedInputs: {},
62
75
  async action(_, opts) {
63
76
  const deviceInfo = [
64
- ["CPU Utilization", `${String(await (0, device_control_1.getCpuUtil)())} %`],
65
- ["Disk Utilization", `${String(await (0, device_control_1.getDiskUtil)())} %`],
66
- ["Memory Utilization", `${String(await (0, device_control_1.getMemUtil)())} %`],
77
+ ['CPU Utilization', `${String(await (0, device_control_1.getCpuUtil)())} %`],
78
+ ['Disk Utilization', `${String(await (0, device_control_1.getDiskUtil)())} %`],
79
+ ['Memory Utilization', `${String(await (0, device_control_1.getMemUtil)())} %`]
67
80
  ];
68
81
  console.table(deviceInfo);
69
- },
82
+ }
70
83
  });
71
84
  //# sourceMappingURL=device.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"device.js","sourceRoot":"","sources":["../../../src/subcommands/device/device.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"device.js","sourceRoot":"","sources":["../../../src/subcommands/device/device.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/subcommands/device/index.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,eAAe,mDAI1B,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/subcommands/device/index.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,eAAe,mDAI1B,CAAC"}
@@ -3,9 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.deviceCliBranch = void 0;
4
4
  const alwayscli_1 = require("@alwaysai/alwayscli");
5
5
  const device_1 = require("./device");
6
+ const clean_1 = require("./clean");
6
7
  exports.deviceCliBranch = (0, alwayscli_1.CliBranch)({
7
8
  name: 'device',
8
9
  description: 'Manage current device',
9
- subcommands: [device_1.initCliLeaf, device_1.getInfoCliLeaf],
10
+ subcommands: [device_1.initCliLeaf, device_1.getInfoCliLeaf, clean_1.cleanCliLeaf]
10
11
  });
11
12
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/subcommands/device/index.ts"],"names":[],"mappings":";;;AAAA,mDAAgD;AAChD,qCAAuD;AAE1C,QAAA,eAAe,GAAG,IAAA,qBAAS,EAAC;IACvC,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,uBAAuB;IACpC,WAAW,EAAE,CAAC,oBAAW,EAAE,uBAAc,CAAC;CAC3C,CAAC,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/subcommands/device/index.ts"],"names":[],"mappings":";;;AAAA,mDAAgD;AAChD,qCAAuD;AACvD,mCAAuC;AAE1B,QAAA,eAAe,GAAG,IAAA,qBAAS,EAAC;IACvC,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,uBAAuB;IACpC,WAAW,EAAE,CAAC,oBAAW,EAAE,uBAAc,EAAE,oBAAY,CAAC;CACzD,CAAC,CAAC"}
@@ -12,17 +12,17 @@ exports.getModelPackageCliLeaf = (0, alwayscli_1.CliLeaf)({
12
12
  positionalInput: (0, alwayscli_1.CliStringInput)({
13
13
  description: 'For example, "alwaysai/mobilenet_ssd"',
14
14
  required: true,
15
- placeholder: '<id>',
15
+ placeholder: '<id>'
16
16
  }),
17
17
  namedInputs: {
18
18
  version: (0, alwayscli_1.CliNumberInput)({
19
19
  description: 'The version number of the model',
20
- required: false,
20
+ required: false
21
21
  }),
22
22
  path: (0, alwayscli_1.CliStringInput)({
23
23
  description: 'The output path to write model package to',
24
- required: false,
25
- }),
24
+ required: false
25
+ })
26
26
  },
27
27
  async action(id, opts) {
28
28
  const path = opts.path || process.cwd();
@@ -30,6 +30,6 @@ exports.getModelPackageCliLeaf = (0, alwayscli_1.CliLeaf)({
30
30
  const version = opts.version || (await (0, infrastructure_1.CliRpcClient)().getModelVersion({ id })).version;
31
31
  await (0, app_1.appInstallModel)(spawner, id, version);
32
32
  logger_1.logger.info(`Completed downloading ${id} to ${path}`);
33
- },
33
+ }
34
34
  });
35
35
  //# sourceMappingURL=get-model-package.js.map
@@ -9,6 +9,6 @@ exports.subcommands = [
9
9
  login_1.loginCliLeaf,
10
10
  app_1.appCliBranch,
11
11
  device_1.deviceCliBranch,
12
- get_model_package_1.getModelPackageCliLeaf,
12
+ get_model_package_1.getModelPackageCliLeaf
13
13
  ];
14
14
  //# sourceMappingURL=index.js.map
@@ -3,33 +3,33 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.loginCliLeaf = void 0;
4
4
  const alwayscli_1 = require("@alwaysai/alwayscli");
5
5
  const user_1 = require("alwaysai/lib/components/user");
6
- const certificates_and_tokens_1 = require("../infrastructure/certificates-and-tokens");
6
+ const tokens_and_device_cfg_1 = require("../infrastructure/tokens-and-device-cfg");
7
7
  exports.loginCliLeaf = (0, alwayscli_1.CliLeaf)({
8
8
  name: 'login',
9
9
  description: 'Login to alwaysAI (this is meant for scripted environments)',
10
10
  namedInputs: {
11
11
  email: (0, alwayscli_1.CliStringInput)({
12
12
  description: 'alwaysAI email',
13
- required: true,
13
+ required: true
14
14
  }),
15
15
  password: (0, alwayscli_1.CliStringInput)({
16
16
  description: 'Account password',
17
- required: true,
17
+ required: true
18
18
  }),
19
19
  device: (0, alwayscli_1.CliStringInput)({
20
20
  description: 'The device UUID',
21
- required: false,
22
- }),
21
+ required: false
22
+ })
23
23
  },
24
24
  async action(_, opts) {
25
25
  const { email, password, device } = opts;
26
26
  await (0, user_1.alwaysaiUserLoginYesComponent)({
27
27
  alwaysaiUserEmail: email,
28
- alwaysaiUserPassword: password,
28
+ alwaysaiUserPassword: password
29
29
  });
30
30
  if (device) {
31
- await (0, certificates_and_tokens_1.writeCertificateAndToken)({ deviceUuid: device });
31
+ await (0, tokens_and_device_cfg_1.writeTokenAndDeviceCfg)({ deviceUuid: device });
32
32
  }
33
- },
33
+ }
34
34
  });
35
35
  //# sourceMappingURL=login.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/subcommands/login.ts"],"names":[],"mappings":";;;AAAA,mDAA8D;AAC9D,uDAA6E;AAC7E,uFAAqF;AAExE,QAAA,YAAY,GAAG,IAAA,mBAAO,EAAC;IAClC,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,6DAA6D;IAC1E,WAAW,EAAE;QACX,KAAK,EAAE,IAAA,0BAAc,EAAC;YACpB,WAAW,EAAE,gBAAgB;YAC7B,QAAQ,EAAE,IAAI;SACf,CAAC;QACF,QAAQ,EAAE,IAAA,0BAAc,EAAC;YACvB,WAAW,EAAE,kBAAkB;YAC/B,QAAQ,EAAE,IAAI;SACf,CAAC;QACF,MAAM,EAAE,IAAA,0BAAc,EAAC;YACrB,WAAW,EAAE,iBAAiB;YAC9B,QAAQ,EAAE,KAAK;SAChB,CAAC;KACH;IACD,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI;QAClB,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QAEzC,MAAM,IAAA,oCAA6B,EAAC;YAClC,iBAAiB,EAAE,KAAK;YACxB,oBAAoB,EAAE,QAAQ;SAC/B,CAAC,CAAC;QACH,IAAI,MAAM,EAAE;YACV,MAAM,IAAA,kDAAwB,EAAC,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;SACxD;IACH,CAAC;CACF,CAAC,CAAC"}
1
+ {"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/subcommands/login.ts"],"names":[],"mappings":";;;AAAA,mDAA8D;AAC9D,uDAA6E;AAC7E,mFAAiF;AAEpE,QAAA,YAAY,GAAG,IAAA,mBAAO,EAAC;IAClC,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,6DAA6D;IAC1E,WAAW,EAAE;QACX,KAAK,EAAE,IAAA,0BAAc,EAAC;YACpB,WAAW,EAAE,gBAAgB;YAC7B,QAAQ,EAAE,IAAI;SACf,CAAC;QACF,QAAQ,EAAE,IAAA,0BAAc,EAAC;YACvB,WAAW,EAAE,kBAAkB;YAC/B,QAAQ,EAAE,IAAI;SACf,CAAC;QACF,MAAM,EAAE,IAAA,0BAAc,EAAC;YACrB,WAAW,EAAE,iBAAiB;YAC9B,QAAQ,EAAE,KAAK;SAChB,CAAC;KACH;IACD,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI;QAClB,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QAEzC,MAAM,IAAA,oCAA6B,EAAC;YAClC,iBAAiB,EAAE,KAAK;YACxB,oBAAoB,EAAE,QAAQ;SAC/B,CAAC,CAAC;QACH,IAAI,MAAM,EAAE;YACV,MAAM,IAAA,8CAAsB,EAAC,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;SACtD;IACH,CAAC;CACF,CAAC,CAAC"}
@@ -0,0 +1,2 @@
1
+ export declare const rmBootstrapCertsAndClose: () => Promise<never>;
2
+ //# sourceMappingURL=clean-certs.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"clean-certs.d.ts","sourceRoot":"","sources":["../../src/util/clean-certs.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,wBAAwB,sBAMpC,CAAC"}
@@ -0,0 +1,16 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.rmBootstrapCertsAndClose = void 0;
4
+ const util_1 = require("alwaysai/lib/util");
5
+ const logger_1 = require("../util/logger");
6
+ const constants_1 = require("alwaysai/lib/constants");
7
+ const directories_1 = require("../util/directories");
8
+ const rmBootstrapCertsAndClose = async () => {
9
+ const spawner = (0, util_1.JsSpawner)();
10
+ await spawner.rimraf((0, directories_1.BOOTSTRAP_CERTIFICATES_DIR_PATH)());
11
+ await spawner.rimraf(constants_1.LOCAL_CERT_AND_KEY_DIR);
12
+ logger_1.logger.error('Could not provision device. Try again.');
13
+ process.exit(1);
14
+ };
15
+ exports.rmBootstrapCertsAndClose = rmBootstrapCertsAndClose;
16
+ //# sourceMappingURL=clean-certs.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"clean-certs.js","sourceRoot":"","sources":["../../src/util/clean-certs.ts"],"names":[],"mappings":";;;AAAA,4CAA8C;AAC9C,2CAAwC;AACxC,sDAAgE;AAChE,qDAAsE;AAE/D,MAAM,wBAAwB,GAAG,KAAK,IAAI,EAAE;IACjD,MAAM,OAAO,GAAG,IAAA,gBAAS,GAAE,CAAC;IAC5B,MAAM,OAAO,CAAC,MAAM,CAAC,IAAA,6CAA+B,GAAE,CAAC,CAAC;IACxD,MAAM,OAAO,CAAC,MAAM,CAAC,kCAAsB,CAAC,CAAC;IAC7C,eAAM,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;IACvD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC;AANW,QAAA,wBAAwB,4BAMnC"}
@@ -1,20 +1,21 @@
1
- export declare const BOOTSTRAP_DIR_NAME = "bootstrap-certificates";
2
- export declare const BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_NAME = "aai-claim-private-key_qa.pem.key";
3
- export declare const BOOTSTRAP_DEVICE_CERTIFICATE_FILE_NAME = "aai-claim-cert_qa.pem.crt";
4
- export declare const BOOTSTRAP_CLAIM_ID_FILE_NAME = "aai-claim-cert-id_qa.txt";
1
+ export declare const APP_ROOT: string;
2
+ export declare const CREDENTIALS_FILE_PATH: string;
5
3
  export declare const AWS_ROOT_CERTIFICATE_FILE_NAME = "AmazonRootCA1.pem";
4
+ export declare const AWS_ROOT_CERTIFICATE_FILE_PATH: string;
5
+ export declare const shortenSystemId: () => "qa" | "dev" | "prod" | undefined;
6
+ export declare const BOOTSTRAP_DIR_NAME = "bootstrap-certificates";
7
+ export declare const BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_NAME: () => string;
8
+ export declare const BOOTSTRAP_DEVICE_CERTIFICATE_FILE_NAME: () => string;
9
+ export declare const BOOTSTRAP_CLAIM_ID_FILE_NAME: () => string;
6
10
  export declare const CERTIFICATE_OWNERSHIP_TOKEN_FILE_NAME = "certificate-ownership-token.txt";
7
- export declare const DEVICE_PRIVATE_KEY_FILE_NAME = "aai-claim-private-key_qa.pem.key";
8
- export declare const DEVICE_CERTIFICATE_FILE_NAME = "aai-claim-cert_qa.pem.crt";
9
- export declare const DEVICE_CLAIM_ID_FILE_NAME = "aai-claim-cert-id_qa.txt";
11
+ export declare const DEVICE_PRIVATE_KEY_FILE_NAME: () => string;
12
+ export declare const DEVICE_CERTIFICATE_FILE_NAME: () => string;
13
+ export declare const DEVICE_CLAIM_ID_FILE_NAME: () => string;
10
14
  export declare function getPrivateKeyFilePath(): string;
11
15
  export declare function getCertificateFilePath(): string;
12
- export declare function getRootCertificateFilePath(): string;
13
- export declare function getCredentialsFilePath(): string;
14
- export declare const BOOTSTRAP_CERTIFICATES_DIR_PATH: string;
15
- export declare const DEVICE_CLAIM_ID_FILE_PATH: string;
16
- export declare const BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_PATH: string;
17
- export declare const BOOTSTRAP_DEVICE_CERTIFICATE_FILE_PATH: string;
18
- export declare const BOOTSTRAP_CLAIM_ID_FILE_PATH: string;
19
- export declare const AWS_ROOT_CERTIFICATE_FILE_PATH: string;
16
+ export declare const BOOTSTRAP_CERTIFICATES_DIR_PATH: () => string;
17
+ export declare const DEVICE_CLAIM_ID_FILE_PATH: () => string;
18
+ export declare const BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_PATH: () => string;
19
+ export declare const BOOTSTRAP_DEVICE_CERTIFICATE_FILE_PATH: () => string;
20
+ export declare const BOOTSTRAP_CLAIM_ID_FILE_PATH: () => string;
20
21
  //# sourceMappingURL=directories.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"directories.d.ts","sourceRoot":"","sources":["../../src/util/directories.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,kBAAkB,2BAA2B,CAAC;AAC3D,eAAO,MAAM,sCAAsC,qCACf,CAAC;AACrC,eAAO,MAAM,sCAAsC,8BACtB,CAAC;AAC9B,eAAO,MAAM,4BAA4B,6BAA6B,CAAC;AACvE,eAAO,MAAM,8BAA8B,sBAAsB,CAAC;AAClE,eAAO,MAAM,qCAAqC,oCACf,CAAC;AAEpC,eAAO,MAAM,4BAA4B,qCAAqC,CAAC;AAC/E,eAAO,MAAM,4BAA4B,8BAA8B,CAAC;AACxE,eAAO,MAAM,yBAAyB,6BAA6B,CAAC;AAEpE,wBAAgB,qBAAqB,WAEpC;AAED,wBAAgB,sBAAsB,WAErC;AAED,wBAAgB,0BAA0B,WAEzC;AAED,wBAAgB,sBAAsB,WAErC;AAED,eAAO,MAAM,+BAA+B,QAG3C,CAAC;AACF,eAAO,MAAM,yBAAyB,QAGrC,CAAC;AAEF,eAAO,MAAM,sCAAsC,QAIlD,CAAC;AAEF,eAAO,MAAM,sCAAsC,QAIlD,CAAC;AAEF,eAAO,MAAM,4BAA4B,QAIxC,CAAC;AAEF,eAAO,MAAM,8BAA8B,QAG1C,CAAC"}
1
+ {"version":3,"file":"directories.d.ts","sourceRoot":"","sources":["../../src/util/directories.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,QAAQ,QAAqC,CAAC;AAE3D,eAAO,MAAM,qBAAqB,QAGjC,CAAC;AAEF,eAAO,MAAM,8BAA8B,sBAAsB,CAAC;AAClE,eAAO,MAAM,8BAA8B,QAG1C,CAAC;AAEF,eAAO,MAAM,eAAe,yCAU3B,CAAC;AAEF,eAAO,MAAM,kBAAkB,2BAA2B,CAAC;AAC3D,eAAO,MAAM,sCAAsC,cACG,CAAC;AACvD,eAAO,MAAM,sCAAsC,cACJ,CAAC;AAChD,eAAO,MAAM,4BAA4B,cACK,CAAC;AAC/C,eAAO,MAAM,qCAAqC,oCACf,CAAC;AACpC,eAAO,MAAM,4BAA4B,cACa,CAAC;AACvD,eAAO,MAAM,4BAA4B,cACM,CAAC;AAChD,eAAO,MAAM,yBAAyB,cACQ,CAAC;AAE/C,wBAAgB,qBAAqB,WAEpC;AAED,wBAAgB,sBAAsB,WAErC;AAED,eAAO,MAAM,+BAA+B,cACM,CAAC;AACnD,eAAO,MAAM,yBAAyB,cACgB,CAAC;AAEvD,eAAO,MAAM,sCAAsC,cAKhD,CAAC;AAEJ,eAAO,MAAM,sCAAsC,cAKhD,CAAC;AAEJ,eAAO,MAAM,4BAA4B,cAKtC,CAAC"}
@@ -1,37 +1,56 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.AWS_ROOT_CERTIFICATE_FILE_PATH = exports.BOOTSTRAP_CLAIM_ID_FILE_PATH = exports.BOOTSTRAP_DEVICE_CERTIFICATE_FILE_PATH = exports.BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_PATH = exports.DEVICE_CLAIM_ID_FILE_PATH = exports.BOOTSTRAP_CERTIFICATES_DIR_PATH = exports.getCredentialsFilePath = exports.getRootCertificateFilePath = exports.getCertificateFilePath = exports.getPrivateKeyFilePath = exports.DEVICE_CLAIM_ID_FILE_NAME = exports.DEVICE_CERTIFICATE_FILE_NAME = exports.DEVICE_PRIVATE_KEY_FILE_NAME = exports.CERTIFICATE_OWNERSHIP_TOKEN_FILE_NAME = exports.AWS_ROOT_CERTIFICATE_FILE_NAME = exports.BOOTSTRAP_CLAIM_ID_FILE_NAME = exports.BOOTSTRAP_DEVICE_CERTIFICATE_FILE_NAME = exports.BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_NAME = exports.BOOTSTRAP_DIR_NAME = void 0;
3
+ exports.BOOTSTRAP_CLAIM_ID_FILE_PATH = exports.BOOTSTRAP_DEVICE_CERTIFICATE_FILE_PATH = exports.BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_PATH = exports.DEVICE_CLAIM_ID_FILE_PATH = exports.BOOTSTRAP_CERTIFICATES_DIR_PATH = exports.getCertificateFilePath = exports.getPrivateKeyFilePath = exports.DEVICE_CLAIM_ID_FILE_NAME = exports.DEVICE_CERTIFICATE_FILE_NAME = exports.DEVICE_PRIVATE_KEY_FILE_NAME = exports.CERTIFICATE_OWNERSHIP_TOKEN_FILE_NAME = exports.BOOTSTRAP_CLAIM_ID_FILE_NAME = exports.BOOTSTRAP_DEVICE_CERTIFICATE_FILE_NAME = exports.BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_NAME = exports.BOOTSTRAP_DIR_NAME = exports.shortenSystemId = exports.AWS_ROOT_CERTIFICATE_FILE_PATH = exports.AWS_ROOT_CERTIFICATE_FILE_NAME = exports.CREDENTIALS_FILE_PATH = exports.APP_ROOT = void 0;
4
4
  const constants_1 = require("alwaysai/lib/constants");
5
5
  const path_1 = require("path");
6
- exports.BOOTSTRAP_DIR_NAME = "bootstrap-certificates";
7
- exports.BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_NAME = "aai-claim-private-key_qa.pem.key";
8
- exports.BOOTSTRAP_DEVICE_CERTIFICATE_FILE_NAME = "aai-claim-cert_qa.pem.crt";
9
- exports.BOOTSTRAP_CLAIM_ID_FILE_NAME = "aai-claim-cert-id_qa.txt";
10
- exports.AWS_ROOT_CERTIFICATE_FILE_NAME = "AmazonRootCA1.pem";
11
- exports.CERTIFICATE_OWNERSHIP_TOKEN_FILE_NAME = "certificate-ownership-token.txt";
12
- exports.DEVICE_PRIVATE_KEY_FILE_NAME = "aai-claim-private-key_qa.pem.key";
13
- exports.DEVICE_CERTIFICATE_FILE_NAME = "aai-claim-cert_qa.pem.crt";
14
- exports.DEVICE_CLAIM_ID_FILE_NAME = "aai-claim-cert-id_qa.txt";
6
+ const system_id_1 = require("../infrastructure/system-id");
7
+ const path = require("path");
8
+ exports.APP_ROOT = path.join(constants_1.AAI_DIR, 'applications');
9
+ exports.CREDENTIALS_FILE_PATH = (0, path_1.join)(constants_1.LOCAL_AAI_CFG_DIR, constants_1.DEVICE_TOKEN_FILE_NAME);
10
+ exports.AWS_ROOT_CERTIFICATE_FILE_NAME = 'AmazonRootCA1.pem';
11
+ exports.AWS_ROOT_CERTIFICATE_FILE_PATH = (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, exports.AWS_ROOT_CERTIFICATE_FILE_NAME);
12
+ const shortenSystemId = () => {
13
+ const id = (0, system_id_1.getSystemId)();
14
+ switch (id) {
15
+ case 'development':
16
+ return 'dev';
17
+ case 'qa':
18
+ return 'qa';
19
+ case 'production':
20
+ return 'prod';
21
+ }
22
+ };
23
+ exports.shortenSystemId = shortenSystemId;
24
+ exports.BOOTSTRAP_DIR_NAME = 'bootstrap-certificates';
25
+ const BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_NAME = () => `aai-claim-private-key_${(0, exports.shortenSystemId)()}.pem.key`;
26
+ exports.BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_NAME = BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_NAME;
27
+ const BOOTSTRAP_DEVICE_CERTIFICATE_FILE_NAME = () => `aai-claim-cert_${(0, exports.shortenSystemId)()}.pem.crt`;
28
+ exports.BOOTSTRAP_DEVICE_CERTIFICATE_FILE_NAME = BOOTSTRAP_DEVICE_CERTIFICATE_FILE_NAME;
29
+ const BOOTSTRAP_CLAIM_ID_FILE_NAME = () => `aai-claim-cert-id_${(0, exports.shortenSystemId)()}.txt`;
30
+ exports.BOOTSTRAP_CLAIM_ID_FILE_NAME = BOOTSTRAP_CLAIM_ID_FILE_NAME;
31
+ exports.CERTIFICATE_OWNERSHIP_TOKEN_FILE_NAME = 'certificate-ownership-token.txt';
32
+ const DEVICE_PRIVATE_KEY_FILE_NAME = () => `aai-claim-private-key_${(0, exports.shortenSystemId)()}.pem.key`;
33
+ exports.DEVICE_PRIVATE_KEY_FILE_NAME = DEVICE_PRIVATE_KEY_FILE_NAME;
34
+ const DEVICE_CERTIFICATE_FILE_NAME = () => `aai-claim-cert_${(0, exports.shortenSystemId)()}.pem.crt`;
35
+ exports.DEVICE_CERTIFICATE_FILE_NAME = DEVICE_CERTIFICATE_FILE_NAME;
36
+ const DEVICE_CLAIM_ID_FILE_NAME = () => `aai-claim-cert-id_${(0, exports.shortenSystemId)()}.txt`;
37
+ exports.DEVICE_CLAIM_ID_FILE_NAME = DEVICE_CLAIM_ID_FILE_NAME;
15
38
  function getPrivateKeyFilePath() {
16
- return (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, exports.DEVICE_PRIVATE_KEY_FILE_NAME);
39
+ return (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, (0, exports.DEVICE_PRIVATE_KEY_FILE_NAME)());
17
40
  }
18
41
  exports.getPrivateKeyFilePath = getPrivateKeyFilePath;
19
42
  function getCertificateFilePath() {
20
- return (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, exports.DEVICE_CERTIFICATE_FILE_NAME);
43
+ return (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, (0, exports.DEVICE_CERTIFICATE_FILE_NAME)());
21
44
  }
22
45
  exports.getCertificateFilePath = getCertificateFilePath;
23
- function getRootCertificateFilePath() {
24
- return (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, exports.AWS_ROOT_CERTIFICATE_FILE_NAME);
25
- }
26
- exports.getRootCertificateFilePath = getRootCertificateFilePath;
27
- function getCredentialsFilePath() {
28
- return (0, path_1.join)(constants_1.LOCAL_AAI_CFG_DIR, constants_1.DEVICE_TOKEN_FILE_NAME);
29
- }
30
- exports.getCredentialsFilePath = getCredentialsFilePath;
31
- exports.BOOTSTRAP_CERTIFICATES_DIR_PATH = (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, exports.BOOTSTRAP_DIR_NAME);
32
- exports.DEVICE_CLAIM_ID_FILE_PATH = (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, constants_1.DEVICE_TOKEN_FILE_NAME);
33
- exports.BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_PATH = (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, exports.BOOTSTRAP_DIR_NAME, exports.BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_NAME);
34
- exports.BOOTSTRAP_DEVICE_CERTIFICATE_FILE_PATH = (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, exports.BOOTSTRAP_DIR_NAME, exports.BOOTSTRAP_DEVICE_CERTIFICATE_FILE_NAME);
35
- exports.BOOTSTRAP_CLAIM_ID_FILE_PATH = (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, exports.BOOTSTRAP_DIR_NAME, exports.BOOTSTRAP_CLAIM_ID_FILE_NAME);
36
- exports.AWS_ROOT_CERTIFICATE_FILE_PATH = (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, exports.AWS_ROOT_CERTIFICATE_FILE_NAME);
46
+ const BOOTSTRAP_CERTIFICATES_DIR_PATH = () => (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, exports.BOOTSTRAP_DIR_NAME);
47
+ exports.BOOTSTRAP_CERTIFICATES_DIR_PATH = BOOTSTRAP_CERTIFICATES_DIR_PATH;
48
+ const DEVICE_CLAIM_ID_FILE_PATH = () => (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, constants_1.DEVICE_TOKEN_FILE_NAME);
49
+ exports.DEVICE_CLAIM_ID_FILE_PATH = DEVICE_CLAIM_ID_FILE_PATH;
50
+ const BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_PATH = () => (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, exports.BOOTSTRAP_DIR_NAME, (0, exports.BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_NAME)());
51
+ exports.BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_PATH = BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_PATH;
52
+ const BOOTSTRAP_DEVICE_CERTIFICATE_FILE_PATH = () => (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, exports.BOOTSTRAP_DIR_NAME, (0, exports.BOOTSTRAP_DEVICE_CERTIFICATE_FILE_NAME)());
53
+ exports.BOOTSTRAP_DEVICE_CERTIFICATE_FILE_PATH = BOOTSTRAP_DEVICE_CERTIFICATE_FILE_PATH;
54
+ const BOOTSTRAP_CLAIM_ID_FILE_PATH = () => (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, exports.BOOTSTRAP_DIR_NAME, (0, exports.BOOTSTRAP_CLAIM_ID_FILE_NAME)());
55
+ exports.BOOTSTRAP_CLAIM_ID_FILE_PATH = BOOTSTRAP_CLAIM_ID_FILE_PATH;
37
56
  //# sourceMappingURL=directories.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"directories.js","sourceRoot":"","sources":["../../src/util/directories.ts"],"names":[],"mappings":";;;AAAA,sDAIgC;AAChC,+BAA4B;AAEf,QAAA,kBAAkB,GAAG,wBAAwB,CAAC;AAC9C,QAAA,sCAAsC,GACjD,kCAAkC,CAAC;AACxB,QAAA,sCAAsC,GACjD,2BAA2B,CAAC;AACjB,QAAA,4BAA4B,GAAG,0BAA0B,CAAC;AAC1D,QAAA,8BAA8B,GAAG,mBAAmB,CAAC;AACrD,QAAA,qCAAqC,GAChD,iCAAiC,CAAC;AAEvB,QAAA,4BAA4B,GAAG,kCAAkC,CAAC;AAClE,QAAA,4BAA4B,GAAG,2BAA2B,CAAC;AAC3D,QAAA,yBAAyB,GAAG,0BAA0B,CAAC;AAEpE,SAAgB,qBAAqB;IACnC,OAAO,IAAA,WAAI,EAAC,kCAAsB,EAAE,oCAA4B,CAAC,CAAC;AACpE,CAAC;AAFD,sDAEC;AAED,SAAgB,sBAAsB;IACpC,OAAO,IAAA,WAAI,EAAC,kCAAsB,EAAE,oCAA4B,CAAC,CAAC;AACpE,CAAC;AAFD,wDAEC;AAED,SAAgB,0BAA0B;IACxC,OAAO,IAAA,WAAI,EAAC,kCAAsB,EAAE,sCAA8B,CAAC,CAAC;AACtE,CAAC;AAFD,gEAEC;AAED,SAAgB,sBAAsB;IACpC,OAAO,IAAA,WAAI,EAAC,6BAAiB,EAAE,kCAAsB,CAAC,CAAC;AACzD,CAAC;AAFD,wDAEC;AAEY,QAAA,+BAA+B,GAAG,IAAA,WAAI,EACjD,kCAAsB,EACtB,0BAAkB,CACnB,CAAC;AACW,QAAA,yBAAyB,GAAG,IAAA,WAAI,EAC3C,kCAAsB,EACtB,kCAAsB,CACvB,CAAC;AAEW,QAAA,sCAAsC,GAAG,IAAA,WAAI,EACxD,kCAAsB,EACtB,0BAAkB,EAClB,8CAAsC,CACvC,CAAC;AAEW,QAAA,sCAAsC,GAAG,IAAA,WAAI,EACxD,kCAAsB,EACtB,0BAAkB,EAClB,8CAAsC,CACvC,CAAC;AAEW,QAAA,4BAA4B,GAAG,IAAA,WAAI,EAC9C,kCAAsB,EACtB,0BAAkB,EAClB,oCAA4B,CAC7B,CAAC;AAEW,QAAA,8BAA8B,GAAG,IAAA,WAAI,EAChD,kCAAsB,EACtB,sCAA8B,CAC/B,CAAC"}
1
+ {"version":3,"file":"directories.js","sourceRoot":"","sources":["../../src/util/directories.ts"],"names":[],"mappings":"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"}
@@ -1,2 +1,2 @@
1
- export declare function getDeviceId(): string;
1
+ export declare function getDeviceUuid(): string;
2
2
  //# sourceMappingURL=get-device-id.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"get-device-id.d.ts","sourceRoot":"","sources":["../../src/util/get-device-id.ts"],"names":[],"mappings":"AAKA,wBAAgB,WAAW,WAgB1B"}
1
+ {"version":3,"file":"get-device-id.d.ts","sourceRoot":"","sources":["../../src/util/get-device-id.ts"],"names":[],"mappings":"AAEA,wBAAgB,aAAa,WAiB5B"}
@@ -1,24 +1,19 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getDeviceId = void 0;
4
- const directories_1 = require("../util/directories");
5
- const alwayscli_1 = require("@alwaysai/alwayscli");
6
- const config_nodejs_1 = require("@alwaysai/config-nodejs");
7
- const t = require("io-ts");
8
- function getDeviceId() {
9
- const path = (0, directories_1.getCredentialsFilePath)();
10
- const codec = t.type({
11
- deviceId: t.union([t.string, t.undefined]),
12
- });
13
- const credentialsJsonFile = (0, config_nodejs_1.ConfigFile)({
14
- path,
15
- codec,
16
- });
17
- const config = credentialsJsonFile.readIfExists();
18
- if (!config || !config.deviceId) {
19
- throw new alwayscli_1.CliTerseError('Invalid device credentials! Please ensure you are using the device agent on a valid device.');
3
+ exports.getDeviceUuid = void 0;
4
+ const device_1 = require("alwaysai/lib/core/device");
5
+ function getDeviceUuid() {
6
+ const deviceCfgFile = (0, device_1.DeviceConfigFile)();
7
+ if (!deviceCfgFile.exists()) {
8
+ throw new Error('Device configuration not found!');
9
+ }
10
+ try {
11
+ const cfg = deviceCfgFile.read();
12
+ return cfg.deviceUuid;
13
+ }
14
+ catch (err) {
15
+ throw new Error(`Failed to read device configuration: ${JSON.stringify(deviceCfgFile.getErrors(), null, 2)}`);
20
16
  }
21
- return config.deviceId;
22
17
  }
23
- exports.getDeviceId = getDeviceId;
18
+ exports.getDeviceUuid = getDeviceUuid;
24
19
  //# sourceMappingURL=get-device-id.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"get-device-id.js","sourceRoot":"","sources":["../../src/util/get-device-id.ts"],"names":[],"mappings":";;;AAAA,qDAA6D;AAC7D,mDAAoD;AACpD,2DAAqD;AACrD,2BAA2B;AAE3B,SAAgB,WAAW;IACzB,MAAM,IAAI,GAAG,IAAA,oCAAsB,GAAE,CAAC;IACtC,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC;QACnB,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC;KAC3C,CAAC,CAAC;IACH,MAAM,mBAAmB,GAAG,IAAA,0BAAU,EAAC;QACrC,IAAI;QACJ,KAAK;KACN,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,mBAAmB,CAAC,YAAY,EAAE,CAAC;IAClD,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;QAC/B,MAAM,IAAI,yBAAa,CACrB,6FAA6F,CAC9F,CAAC;KACH;IACD,OAAO,MAAM,CAAC,QAAQ,CAAC;AACzB,CAAC;AAhBD,kCAgBC"}
1
+ {"version":3,"file":"get-device-id.js","sourceRoot":"","sources":["../../src/util/get-device-id.ts"],"names":[],"mappings":";;;AAAA,qDAA4D;AAE5D,SAAgB,aAAa;IAC3B,MAAM,aAAa,GAAG,IAAA,yBAAgB,GAAE,CAAC;IACzC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE;QAC3B,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;KACpD;IACD,IAAI;QACF,MAAM,GAAG,GAAG,aAAa,CAAC,IAAI,EAAE,CAAC;QACjC,OAAO,GAAG,CAAC,UAAU,CAAC;KACvB;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAI,KAAK,CACb,wCAAwC,IAAI,CAAC,SAAS,CACpD,aAAa,CAAC,SAAS,EAAE,EACzB,IAAI,EACJ,CAAC,CACF,EAAE,CACJ,CAAC;KACH;AACH,CAAC;AAjBD,sCAiBC"}
@@ -1,3 +1,3 @@
1
- export declare function httpClient(url: string, method: string, data?: string, headers?: object): Promise<any>;
1
+ export declare function httpClient(url: string, method: string, headers: any, data?: string): Promise<any>;
2
2
  export declare function microServiceHttpClient(service: string, path: string, method: string, data?: string): Promise<any>;
3
3
  //# sourceMappingURL=http-client.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"http-client.d.ts","sourceRoot":"","sources":["../../src/util/http-client.ts"],"names":[],"mappings":"AAIA,wBAAsB,UAAU,CAC9B,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,MAAM,gBAcjB;AAED,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,MAAM,gBAMd"}
1
+ {"version":3,"file":"http-client.d.ts","sourceRoot":"","sources":["../../src/util/http-client.ts"],"names":[],"mappings":"AAKA,wBAAsB,UAAU,CAC9B,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,GAAG,EACZ,IAAI,CAAC,EAAE,MAAM,gBAkBd;AAED,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,MAAM,gBAMd"}
@@ -4,27 +4,29 @@ exports.microServiceHttpClient = exports.httpClient = void 0;
4
4
  const node_fetch_1 = require("node-fetch");
5
5
  const endpoints_1 = require("../endpoints");
6
6
  const infrastructure_1 = require("alwaysai/lib/infrastructure");
7
- async function httpClient(url, method, data, headers) {
8
- const options = Object.assign({ method }, (data ? { body: data } : {}));
7
+ const logger_1 = require("../util/logger");
8
+ async function httpClient(url, method, headers, data) {
9
+ const options = Object.assign({ method }, (data ? { body: data, headers } : { headers }));
9
10
  try {
10
11
  const response = await (0, node_fetch_1.default)(url, options);
11
- const code = response.status;
12
- const contentType = response.headers.get("content-type");
13
- if (contentType === "application/json") {
12
+ const contentType = response.headers.get('content-type');
13
+ if (contentType === 'application/json') {
14
14
  return await response.json();
15
15
  }
16
- else if (contentType.includes("text/plain")) {
16
+ if (contentType.includes('text/plain')) {
17
17
  return await response.text();
18
18
  }
19
19
  }
20
- catch (e) { }
20
+ catch (e) {
21
+ logger_1.logger.error(`HTTP Client error for ${url}: ${e}`);
22
+ }
21
23
  }
22
24
  exports.httpClient = httpClient;
23
25
  async function microServiceHttpClient(service, path, method, data) {
24
26
  const endpoint = (0, endpoints_1.serviceEndpointBuilder)(service, path);
25
27
  const { getIdAuthorizationHeader } = (0, infrastructure_1.CliAuthenticationClient)();
26
28
  const authorizationHeader = await getIdAuthorizationHeader();
27
- return await httpClient(endpoint, method, data);
29
+ return await httpClient(endpoint, method, authorizationHeader, data);
28
30
  }
29
31
  exports.microServiceHttpClient = microServiceHttpClient;
30
32
  //# sourceMappingURL=http-client.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"http-client.js","sourceRoot":"","sources":["../../src/util/http-client.ts"],"names":[],"mappings":";;;AAAA,2CAA+B;AAC/B,4CAAsD;AACtD,gEAAsE;AAE/D,KAAK,UAAU,UAAU,CAC9B,GAAW,EACX,MAAc,EACd,IAAa,EACb,OAAgB;IAEhB,MAAM,OAAO,mBAAK,MAAM,IAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAE,CAAC;IAC5D,IAAI;QACF,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAK,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC3C,MAAM,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC;QAE7B,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACzD,IAAI,WAAW,KAAK,kBAAkB,EAAE;YACtC,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;SAC9B;aAAM,IAAI,WAAY,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YAC9C,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;SAC9B;KACF;IAAC,OAAO,CAAC,EAAE,GAAE;AAChB,CAAC;AAlBD,gCAkBC;AAEM,KAAK,UAAU,sBAAsB,CAC1C,OAAe,EACf,IAAY,EACZ,MAAc,EACd,IAAa;IAEb,MAAM,QAAQ,GAAG,IAAA,kCAAsB,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACvD,MAAM,EAAE,wBAAwB,EAAE,GAAG,IAAA,wCAAuB,GAAE,CAAC;IAC/D,MAAM,mBAAmB,GAAG,MAAM,wBAAwB,EAAE,CAAC;IAC7D,OAAO,MAAM,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;AAClD,CAAC;AAVD,wDAUC"}
1
+ {"version":3,"file":"http-client.js","sourceRoot":"","sources":["../../src/util/http-client.ts"],"names":[],"mappings":";;;AAAA,2CAA+B;AAC/B,4CAAsD;AACtD,gEAAsE;AACtE,2CAAwC;AAEjC,KAAK,UAAU,UAAU,CAC9B,GAAW,EACX,MAAc,EACd,OAAY,EACZ,IAAa;IAEb,MAAM,OAAO,mBACX,MAAM,IACH,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAClD,CAAC;IACF,IAAI;QACF,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAK,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC3C,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACzD,IAAI,WAAW,KAAK,kBAAkB,EAAE;YACtC,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;SAC9B;QACD,IAAI,WAAY,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YACvC,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;SAC9B;KACF;IAAC,OAAO,CAAC,EAAE;QACV,eAAM,CAAC,KAAK,CAAC,yBAAyB,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC;KACpD;AACH,CAAC;AAtBD,gCAsBC;AAEM,KAAK,UAAU,sBAAsB,CAC1C,OAAe,EACf,IAAY,EACZ,MAAc,EACd,IAAa;IAEb,MAAM,QAAQ,GAAG,IAAA,kCAAsB,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACvD,MAAM,EAAE,wBAAwB,EAAE,GAAG,IAAA,wCAAuB,GAAE,CAAC;IAC/D,MAAM,mBAAmB,GAAG,MAAM,wBAAwB,EAAE,CAAC;IAC7D,OAAO,MAAM,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,mBAAmB,EAAE,IAAI,CAAC,CAAC;AACvE,CAAC;AAVD,wDAUC"}
@@ -1 +1 @@
1
- {"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/util/logger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AACnC,OAAO,2BAA2B,CAAC;AAgBnC,eAAO,MAAM,MAAM,gBAQjB,CAAC"}
1
+ {"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/util/logger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AACnC,OAAO,2BAA2B,CAAC;AAiBnC,eAAO,MAAM,MAAM,gBASjB,CAAC"}
@@ -13,13 +13,12 @@ const transports = environment_1.ALWAYSAI_LOG_TO_CONSOLE
13
13
  new winston.transports.DailyRotateFile({
14
14
  filename: path.join(constants_1.AAI_DIR, 'agent-logs', 'agent-logs.txt'),
15
15
  maxSize: '5m',
16
- maxFiles: '2d',
17
- }),
16
+ maxFiles: '2d'
17
+ })
18
18
  ];
19
19
  exports.logger = winston.createLogger({
20
20
  level: LOG_LEVEL,
21
- format: winston.format.combine(winston.format.errors({ stack: true }), winston.format.splat(), winston.format.simple()),
22
- transports,
21
+ format: winston.format.combine(winston.format.colorize(), winston.format.errors({ stack: true }), winston.format.splat(), winston.format.simple()),
22
+ transports
23
23
  });
24
- exports.logger.info(`Initialized logger with log level: ${LOG_LEVEL}`);
25
24
  //# sourceMappingURL=logger.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/util/logger.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AACnC,qCAAmC;AACnC,6BAA6B;AAC7B,sDAAiD;AACjD,gDAA6E;AAE7E,MAAM,SAAS,GAAG,gCAAkB,IAAI,MAAM,CAAC;AAC/C,MAAM,UAAU,GAAG,qCAAuB;IACxC,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IACxD,CAAC,CAAC;QACE,IAAI,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC;YACrC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,mBAAO,EAAE,YAAY,EAAE,gBAAgB,CAAC;YAC5D,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAC;AAEO,QAAA,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IACzC,KAAK,EAAE,SAAS;IAChB,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,CAC5B,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EACtC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,EACtB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CACxB;IACD,UAAU;CACX,CAAC,CAAC;AAEH,cAAM,CAAC,IAAI,CAAC,sCAAsC,SAAS,EAAE,CAAC,CAAC"}
1
+ {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/util/logger.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AACnC,qCAAmC;AACnC,6BAA6B;AAC7B,sDAAiD;AACjD,gDAA6E;AAE7E,MAAM,SAAS,GAAG,gCAAkB,IAAI,MAAM,CAAC;AAE/C,MAAM,UAAU,GAAG,qCAAuB;IACxC,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IACxD,CAAC,CAAC;QACE,IAAI,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC;YACrC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,mBAAO,EAAE,YAAY,EAAE,gBAAgB,CAAC;YAC5D,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAC;AAEO,QAAA,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IACzC,KAAK,EAAE,SAAS;IAChB,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,CAC5B,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EACzB,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EACtC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,EACtB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CACxB;IACD,UAAU;CACX,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"run-in-dir.d.ts","sourceRoot":"","sources":["../../src/util/run-in-dir.ts"],"names":[],"mappings":"AAAA,wBAAsB,QAAQ,CAAC,CAAC,SAAS,GAAG,EAAE,EAAE,CAAC,SAAS,GAAG,EAC3D,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,KAAK,CAAC,EACvB,IAAI,EAAE,CAAC,EACP,GAAG,EAAE,MAAM,cAWZ"}
1
+ {"version":3,"file":"run-in-dir.d.ts","sourceRoot":"","sources":["../../src/util/run-in-dir.ts"],"names":[],"mappings":"AACA,wBAAsB,QAAQ,CAAC,CAAC,SAAS,GAAG,EAAE,EAAE,CAAC,SAAS,GAAG,EAC3D,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,KAAK,CAAC,EACvB,IAAI,EAAE,CAAC,EACP,GAAG,EAAE,MAAM,cAWZ"}
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.runInDir = void 0;
4
+ // eslint-disable-next-line
4
5
  async function runInDir(func, args, dir) {
5
6
  const origCwd = process.cwd();
6
7
  let out;
@@ -1 +1 @@
1
- {"version":3,"file":"run-in-dir.js","sourceRoot":"","sources":["../../src/util/run-in-dir.ts"],"names":[],"mappings":";;;AAAO,KAAK,UAAU,QAAQ,CAC5B,IAAuB,EACvB,IAAO,EACP,GAAW;IAEX,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC9B,IAAI,GAAM,CAAC;IACX,IAAI;QACF,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,GAAG,GAAG,MAAM,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;KAC3B;YAAS;QACR,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;KACxB;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAdD,4BAcC"}
1
+ {"version":3,"file":"run-in-dir.js","sourceRoot":"","sources":["../../src/util/run-in-dir.ts"],"names":[],"mappings":";;;AAAA,2BAA2B;AACpB,KAAK,UAAU,QAAQ,CAC5B,IAAuB,EACvB,IAAO,EACP,GAAW;IAEX,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC9B,IAAI,GAAM,CAAC;IACX,IAAI;QACF,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,GAAG,GAAG,MAAM,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;KAC3B;YAAS;QACR,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;KACxB;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAdD,4BAcC"}