@signageos/cli 1.0.2 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (53) hide show
  1. package/CHANGELOG.md +18 -0
  2. package/dist/Applet/Generate/appletGenerateCommand.js +8 -8
  3. package/dist/Applet/Generate/appletGenerateCommand.js.map +1 -1
  4. package/dist/Applet/Test/Upload/appletTestRunCommand.d.ts +8 -0
  5. package/dist/Applet/Test/Upload/appletTestRunCommand.js +30 -30
  6. package/dist/Applet/Test/Upload/appletTestRunCommand.js.map +1 -1
  7. package/dist/Applet/Test/Upload/appletTestUploadCommand.d.ts +8 -0
  8. package/dist/Applet/Test/Upload/appletTestUploadCommand.js +23 -23
  9. package/dist/Applet/Test/Upload/appletTestUploadCommand.js.map +1 -1
  10. package/dist/Applet/Test/appletTestCommand.d.ts +16 -0
  11. package/dist/Applet/Upload/appletUploadCommand.d.ts +8 -0
  12. package/dist/Applet/Upload/appletUploadCommand.js +97 -85
  13. package/dist/Applet/Upload/appletUploadCommand.js.map +1 -1
  14. package/dist/Applet/Upload/appletUploadFacade.d.ts +4 -0
  15. package/dist/Applet/Upload/appletUploadFacade.js +58 -50
  16. package/dist/Applet/Upload/appletUploadFacade.js.map +1 -1
  17. package/dist/Applet/appletCommand.d.ts +24 -0
  18. package/dist/Applet/appletErrors.d.ts +3 -0
  19. package/dist/Applet/appletErrors.js +29 -0
  20. package/dist/Applet/appletErrors.js.map +1 -0
  21. package/dist/Applet/appletFacade.d.ts +9 -2
  22. package/dist/Applet/appletFacade.js +17 -23
  23. package/dist/Applet/appletFacade.js.map +1 -1
  24. package/dist/Auth/loginCommand.js +12 -7
  25. package/dist/Auth/loginCommand.js.map +1 -1
  26. package/dist/Device/Connect/connectCommand.js +8 -6
  27. package/dist/Device/Connect/connectCommand.js.map +1 -1
  28. package/dist/Device/Content/setContentCommand.d.ts +4 -4
  29. package/dist/Device/Content/setContentCommand.js +9 -10
  30. package/dist/Device/Content/setContentCommand.js.map +1 -1
  31. package/dist/Device/PowerAction/powerActionCommand.js +6 -4
  32. package/dist/Device/PowerAction/powerActionCommand.js.map +1 -1
  33. package/dist/Device/deviceCommand.d.ts +4 -4
  34. package/dist/Device/deviceFacade.js +19 -14
  35. package/dist/Device/deviceFacade.js.map +1 -1
  36. package/dist/Emulator/emulatorFacade.js +5 -3
  37. package/dist/Emulator/emulatorFacade.js.map +1 -1
  38. package/dist/FileSystem/helper.js +1 -1
  39. package/dist/FileSystem/helper.js.map +1 -1
  40. package/dist/FileSystem/packageConfig.d.ts +9 -0
  41. package/dist/FileSystem/packageConfig.js.map +1 -1
  42. package/dist/Organization/organizationFacade.js +5 -5
  43. package/dist/Organization/organizationFacade.js.map +1 -1
  44. package/dist/RunControl/runControlHelper.d.ts +1 -0
  45. package/dist/RunControl/runControlHelper.js +4 -0
  46. package/dist/RunControl/runControlHelper.js.map +1 -1
  47. package/dist/Timing/List/timingListCommand.js +6 -4
  48. package/dist/Timing/List/timingListCommand.js.map +1 -1
  49. package/dist/helper.d.ts +9 -2
  50. package/dist/helper.js +53 -13
  51. package/dist/helper.js.map +1 -1
  52. package/package-lock.json +31 -17
  53. package/package.json +2 -2
@@ -61,6 +61,10 @@ export declare const applet: {
61
61
  readonly name: "organization-uid";
62
62
  readonly type: StringConstructor;
63
63
  readonly description: "Organization UID";
64
+ }, {
65
+ readonly name: "applet-uid";
66
+ readonly type: StringConstructor;
67
+ readonly description: "Applet UID";
64
68
  }, {
65
69
  readonly name: "update-package-config";
66
70
  readonly type: BooleanConstructor;
@@ -91,6 +95,10 @@ export declare const applet: {
91
95
  readonly name: "organization-uid";
92
96
  readonly type: StringConstructor;
93
97
  readonly description: "Organization UID";
98
+ }, {
99
+ readonly name: "applet-uid";
100
+ readonly type: StringConstructor;
101
+ readonly description: "Applet UID";
94
102
  }, {
95
103
  readonly name: "update-package-config";
96
104
  readonly type: BooleanConstructor;
@@ -179,6 +187,10 @@ export declare const applet: {
179
187
  readonly name: "organization-uid";
180
188
  readonly type: StringConstructor;
181
189
  readonly description: "Organization UID";
190
+ }, {
191
+ readonly name: "applet-uid";
192
+ readonly type: StringConstructor;
193
+ readonly description: "Applet UID";
182
194
  }, {
183
195
  readonly name: "test";
184
196
  readonly type: StringConstructor;
@@ -202,6 +214,10 @@ export declare const applet: {
202
214
  readonly name: "organization-uid";
203
215
  readonly type: StringConstructor;
204
216
  readonly description: "Organization UID";
217
+ }, {
218
+ readonly name: "applet-uid";
219
+ readonly type: StringConstructor;
220
+ readonly description: "Applet UID";
205
221
  }, {
206
222
  readonly name: "test";
207
223
  readonly type: StringConstructor;
@@ -223,6 +239,10 @@ export declare const applet: {
223
239
  readonly name: "organization-uid";
224
240
  readonly type: StringConstructor;
225
241
  readonly description: "Organization UID";
242
+ }, {
243
+ readonly name: "applet-uid";
244
+ readonly type: StringConstructor;
245
+ readonly description: "Applet UID";
226
246
  }, {
227
247
  readonly name: "yes";
228
248
  readonly type: BooleanConstructor;
@@ -241,6 +261,10 @@ export declare const applet: {
241
261
  readonly name: "organization-uid";
242
262
  readonly type: StringConstructor;
243
263
  readonly description: "Organization UID";
264
+ }, {
265
+ readonly name: "applet-uid";
266
+ readonly type: StringConstructor;
267
+ readonly description: "Applet UID";
244
268
  }, {
245
269
  readonly name: "yes";
246
270
  readonly type: BooleanConstructor;
@@ -0,0 +1,3 @@
1
+ export declare class AppletDoesNotExistError extends Error {
2
+ constructor(message: string);
3
+ }
@@ -0,0 +1,29 @@
1
+ "use strict";
2
+ var __extends = (this && this.__extends) || (function () {
3
+ var extendStatics = function (d, b) {
4
+ extendStatics = Object.setPrototypeOf ||
5
+ ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
6
+ function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
7
+ return extendStatics(d, b);
8
+ };
9
+ return function (d, b) {
10
+ if (typeof b !== "function" && b !== null)
11
+ throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
12
+ extendStatics(d, b);
13
+ function __() { this.constructor = d; }
14
+ d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
15
+ };
16
+ })();
17
+ Object.defineProperty(exports, "__esModule", { value: true });
18
+ exports.AppletDoesNotExistError = void 0;
19
+ var AppletDoesNotExistError = /** @class */ (function (_super) {
20
+ __extends(AppletDoesNotExistError, _super);
21
+ function AppletDoesNotExistError(message) {
22
+ var _this = _super.call(this, message) || this;
23
+ Object.setPrototypeOf(_this, AppletDoesNotExistError.prototype);
24
+ return _this;
25
+ }
26
+ return AppletDoesNotExistError;
27
+ }(Error));
28
+ exports.AppletDoesNotExistError = AppletDoesNotExistError;
29
+ //# sourceMappingURL=appletErrors.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"appletErrors.js","sourceRoot":"","sources":["../../src/Applet/appletErrors.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA;IAA6C,2CAAK;IACjD,iCAAY,OAAe;QAA3B,YACC,kBAAM,OAAO,CAAC,SAEd;QADA,MAAM,CAAC,cAAc,CAAC,KAAI,EAAE,uBAAuB,CAAC,SAAS,CAAC,CAAC;;IAChE,CAAC;IACF,8BAAC;AAAD,CAAC,AALD,CAA6C,KAAK,GAKjD;AALY,0DAAuB"}
@@ -1,11 +1,18 @@
1
1
  import RestApi from "@signageos/sdk/dist/RestApi/RestApi";
2
+ import { CommandLineOptions } from '../Command/commandDefinition';
2
3
  export interface IApplet {
3
4
  uid?: string;
4
5
  name: string;
5
6
  version: string;
7
+ /** @deprecated Used only for single-file applets as backward compatibility. */
8
+ frontAppletVersion?: string;
6
9
  }
10
+ export declare const APPLET_UID_OPTION: {
11
+ readonly name: "applet-uid";
12
+ readonly type: StringConstructor;
13
+ readonly description: "Applet UID";
14
+ };
7
15
  export declare function getApplet(directoryPath: string): Promise<IApplet>;
8
- export declare function getAppletName(directoryPath: string): Promise<string>;
9
16
  export declare function getAppletVersion(directoryPath: string): Promise<string>;
10
- export declare function getAppletUid(restApi: RestApi): Promise<string | undefined>;
17
+ export declare function getAppletUid(restApi: RestApi, options: CommandLineOptions<[typeof APPLET_UID_OPTION]>): Promise<string>;
11
18
  export declare function getAppletVersionFromApi(restApi: RestApi, appletUid: string): Promise<string>;
@@ -36,28 +36,31 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
36
36
  }
37
37
  };
38
38
  Object.defineProperty(exports, "__esModule", { value: true });
39
- exports.getAppletVersionFromApi = exports.getAppletUid = exports.getAppletVersion = exports.getAppletName = exports.getApplet = void 0;
39
+ exports.getAppletVersionFromApi = exports.getAppletUid = exports.getAppletVersion = exports.getApplet = exports.APPLET_UID_OPTION = void 0;
40
40
  var path = require("path");
41
41
  var prompts = require("prompts");
42
42
  var parameters = require("../../config/parameters");
43
43
  var packageConfig_1 = require("../FileSystem/packageConfig");
44
+ var appletErrors_1 = require("./appletErrors");
45
+ exports.APPLET_UID_OPTION = { name: 'applet-uid', type: String, description: 'Applet UID' };
44
46
  function getApplet(directoryPath) {
45
- var _a, _b, _c, _d;
47
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
46
48
  return __awaiter(this, void 0, void 0, function () {
47
- var packageJSONPath, packageJSONObject, appletUid, appletVersion, appletName;
48
- return __generator(this, function (_e) {
49
- switch (_e.label) {
49
+ var packageJSONPath, packageJSONObject, appletUid, appletVersion, appletName, frontAppletVersion;
50
+ return __generator(this, function (_m) {
51
+ switch (_m.label) {
50
52
  case 0:
51
53
  packageJSONPath = path.join(directoryPath, 'package.json');
52
54
  return [4 /*yield*/, (0, packageConfig_1.loadPackage)(directoryPath)];
53
55
  case 1:
54
- packageJSONObject = _e.sent();
56
+ packageJSONObject = _m.sent();
55
57
  if (!packageJSONObject) {
56
58
  throw new Error("No package.json found in: ".concat(packageJSONPath));
57
59
  }
58
60
  appletUid = (_a = parameters.applet.uid) !== null && _a !== void 0 ? _a : (_b = packageJSONObject.sos) === null || _b === void 0 ? void 0 : _b.appletUid;
59
61
  appletVersion = (_c = parameters.applet.version) !== null && _c !== void 0 ? _c : packageJSONObject.version;
60
62
  appletName = (_d = parameters.applet.name) !== null && _d !== void 0 ? _d : packageJSONObject.name;
63
+ frontAppletVersion = (_l = (_j = (_g = (_f = (_e = packageJSONObject.sos) === null || _e === void 0 ? void 0 : _e.dependencies) === null || _f === void 0 ? void 0 : _f['@signageos/front-applet']) !== null && _g !== void 0 ? _g : (_h = packageJSONObject.dependencies) === null || _h === void 0 ? void 0 : _h['@signageos/front-applet']) !== null && _j !== void 0 ? _j : (_k = packageJSONObject.devDependencies) === null || _k === void 0 ? void 0 : _k['@signageos/front-applet']) !== null && _l !== void 0 ? _l : '';
61
64
  if (!appletVersion) {
62
65
  throw new Error("No \"version\" key found in: ".concat(packageJSONPath, " nor SOS_APPLET_VERSION environment variable specified"));
63
66
  }
@@ -68,26 +71,13 @@ function getApplet(directoryPath) {
68
71
  uid: appletUid,
69
72
  name: appletName,
70
73
  version: appletVersion,
74
+ frontAppletVersion: frontAppletVersion,
71
75
  }];
72
76
  }
73
77
  });
74
78
  });
75
79
  }
76
80
  exports.getApplet = getApplet;
77
- function getAppletName(directoryPath) {
78
- return __awaiter(this, void 0, void 0, function () {
79
- var applet;
80
- return __generator(this, function (_a) {
81
- switch (_a.label) {
82
- case 0: return [4 /*yield*/, getApplet(directoryPath)];
83
- case 1:
84
- applet = _a.sent();
85
- return [2 /*return*/, applet.name];
86
- }
87
- });
88
- });
89
- }
90
- exports.getAppletName = getAppletName;
91
81
  function getAppletVersion(directoryPath) {
92
82
  return __awaiter(this, void 0, void 0, function () {
93
83
  var applet;
@@ -102,7 +92,7 @@ function getAppletVersion(directoryPath) {
102
92
  });
103
93
  }
104
94
  exports.getAppletVersion = getAppletVersion;
105
- function getAppletUid(restApi) {
95
+ function getAppletUid(restApi, options) {
106
96
  return __awaiter(this, void 0, void 0, function () {
107
97
  var currentDirectory, currentApplet, appletUid, applets, candidatesOfApplets, response;
108
98
  return __generator(this, function (_a) {
@@ -112,7 +102,7 @@ function getAppletUid(restApi) {
112
102
  return [4 /*yield*/, getApplet(currentDirectory)];
113
103
  case 1:
114
104
  currentApplet = _a.sent();
115
- appletUid = currentApplet.uid;
105
+ appletUid = options['applet-uid'] || currentApplet.uid;
116
106
  if (!!appletUid) return [3 /*break*/, 6];
117
107
  return [4 /*yield*/, restApi.applet.list()];
118
108
  case 2:
@@ -139,7 +129,11 @@ function getAppletUid(restApi) {
139
129
  case 5:
140
130
  appletUid = candidatesOfApplets[0].uid;
141
131
  _a.label = 6;
142
- case 6: return [2 /*return*/, appletUid];
132
+ case 6:
133
+ if (!appletUid) {
134
+ throw new appletErrors_1.AppletDoesNotExistError('Not selected Applet or sos.appletUid is not present in package.json or --applet-uid argument.');
135
+ }
136
+ return [2 /*return*/, appletUid];
143
137
  }
144
138
  });
145
139
  });
@@ -1 +1 @@
1
- {"version":3,"file":"appletFacade.js","sourceRoot":"","sources":["../../src/Applet/appletFacade.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"appletFacade.js","sourceRoot":"","sources":["../../src/Applet/appletFacade.ts"],"names":[],"mappings":"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"}
@@ -45,7 +45,7 @@ var helper_1 = require("../helper");
45
45
  var runControlHelper_1 = require("../RunControl/runControlHelper");
46
46
  var parameters = require("../../config/parameters");
47
47
  var commandDefinition_1 = require("../Command/commandDefinition");
48
- var globalArgs_1 = require("../Command/globalArgs");
48
+ var apiVersions_1 = require("@signageos/sdk/dist/RestApi/apiVersions");
49
49
  var debug = Debug('@signageos/cli:Auth:login');
50
50
  var OPTION_LIST = [
51
51
  { name: 'username', type: String, description: "Username or e-mail used for ".concat(parameters.boxHost) },
@@ -57,7 +57,7 @@ exports.login = (0, commandDefinition_1.createCommandDefinition)({
57
57
  commands: [],
58
58
  run: function (options) {
59
59
  return __awaiter(this, void 0, void 0, function () {
60
- var identification, response, password, _a, tokenId, apiSecurityToken, name;
60
+ var identification, response, password, config, apiUrl, _a, tokenId, apiSecurityToken, name;
61
61
  return __generator(this, function (_b) {
62
62
  switch (_b.label) {
63
63
  case 0:
@@ -83,14 +83,19 @@ exports.login = (0, commandDefinition_1.createCommandDefinition)({
83
83
  })];
84
84
  case 3:
85
85
  password = (_b.sent()).password;
86
- return [4 /*yield*/, getOrCreateApiSecurityToken(identification, password)];
86
+ return [4 /*yield*/, (0, runControlHelper_1.loadConfig)()];
87
87
  case 4:
88
+ config = _b.sent();
89
+ apiUrl = (0, helper_1.getApiUrl)(config);
90
+ return [4 /*yield*/, getOrCreateApiSecurityToken(identification, password, apiUrl)];
91
+ case 5:
88
92
  _a = _b.sent(), tokenId = _a.id, apiSecurityToken = _a.securityToken, name = _a.name;
89
93
  return [4 /*yield*/, (0, runControlHelper_1.saveConfig)({
94
+ apiUrl: apiUrl !== parameters.apiUrl ? apiUrl : undefined,
90
95
  identification: tokenId,
91
96
  apiSecurityToken: apiSecurityToken,
92
97
  })];
93
- case 5:
98
+ case 6:
94
99
  _b.sent();
95
100
  console.log("User ".concat(chalk_1.default.green(identification), " has been logged in with token \"").concat(name, "\". Credentials are stored in ").concat(chalk_1.default.blue((0, runControlHelper_1.getConfigFilePath)())));
96
101
  return [2 /*return*/];
@@ -99,7 +104,7 @@ exports.login = (0, commandDefinition_1.createCommandDefinition)({
99
104
  });
100
105
  },
101
106
  });
102
- function getOrCreateApiSecurityToken(identification, password) {
107
+ function getOrCreateApiSecurityToken(identification, password, apiUrl) {
103
108
  return __awaiter(this, void 0, void 0, function () {
104
109
  var ACCOUNT_SECURITY_TOKEN_RESOURCE, options, tokenName, query, responseOfPost, bodyOfPost, _a, _b;
105
110
  return __generator(this, function (_c) {
@@ -107,9 +112,9 @@ function getOrCreateApiSecurityToken(identification, password) {
107
112
  case 0:
108
113
  ACCOUNT_SECURITY_TOKEN_RESOURCE = 'account/security-token';
109
114
  options = {
110
- url: (0, globalArgs_1.getGlobalApiUrl)(),
115
+ url: apiUrl,
111
116
  auth: { clientId: undefined, secret: undefined },
112
- version: 'v1',
117
+ version: apiVersions_1.ApiVersions.V1,
113
118
  };
114
119
  tokenName = generateTokenName();
115
120
  query = {
@@ -1 +1 @@
1
- {"version":3,"file":"loginCommand.js","sourceRoot":"","sources":["../../src/Auth/loginCommand.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"loginCommand.js","sourceRoot":"","sources":["../../src/Auth/loginCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA0B;AAC1B,iCAAmC;AACnC,6BAA+B;AAC/B,uBAAyB;AACzB,oCAAqE;AACrE,mEAA2F;AAC3F,oDAAsD;AACtD,kEAA2F;AAC3F,uEAAsE;AACtE,IAAM,KAAK,GAAG,KAAK,CAAC,2BAA2B,CAAC,CAAC;AAEjD,IAAM,WAAW,GAAG;IACnB,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,sCAA+B,UAAU,CAAC,OAAO,CAAE,EAAE;CAC3F,CAAC;AACE,QAAA,KAAK,GAAG,IAAA,2CAAuB,EAAC;IAC5C,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,yCAAyC;IACtD,UAAU,EAAE,WAAW;IACvB,QAAQ,EAAE,EAAE;IACN,GAAG,EAAT,UAAU,OAA+C;;;;;;wBACpD,cAAc,GAAuB,OAAO,CAAC,QAAQ,CAAC;6BACtD,CAAC,cAAc,EAAf,wBAAe;wBACD,qBAAM,OAAO,CAAC;gCAC9B,IAAI,EAAE,MAAM;gCACZ,IAAI,EAAE,UAAU;gCAChB,OAAO,EAAE,gDAAyC,UAAU,CAAC,OAAO,CAAE;6BACtE,CAAC,EAAA;;wBAJI,QAAQ,GAAG,SAIf;wBACF,cAAc,GAAG,QAAQ,CAAC,QAAQ,CAAC;;;wBAEpC,IAAI,CAAC,cAAc,EAAE;4BACpB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;yBACxD;wBACoB,qBAAM,OAAO,CAAC;gCAClC,IAAI,EAAE,UAAU;gCAChB,IAAI,EAAE,UAAU;gCAChB,OAAO,EAAE,sCAA+B,UAAU,CAAC,OAAO,CAAE;6BAC5D,CAAC,EAAA;;wBAJM,QAAQ,GAAK,CAAA,SAInB,CAAA,SAJc;wBAMD,qBAAM,IAAA,6BAAU,GAAE,EAAA;;wBAA3B,MAAM,GAAG,SAAkB;wBAE3B,MAAM,GAAG,IAAA,kBAAS,EAAC,MAAM,CAAC,CAAC;wBAG8B,qBAAM,2BAA2B,CAAC,cAAc,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAA;;wBAA5H,KAAyD,SAAmE,EAAtH,OAAO,QAAA,EAAiB,gBAAgB,mBAAA,EAAE,IAAI,UAAA;wBAE1D,qBAAM,IAAA,6BAAU,EAAC;gCAChB,MAAM,EAAE,MAAM,KAAK,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;gCACzD,cAAc,EAAE,OAAO;gCACvB,gBAAgB,kBAAA;6BAChB,CAAC,EAAA;;wBAJF,SAIE,CAAC;wBAEH,OAAO,CAAC,GAAG,CAAC,eAAQ,eAAK,CAAC,KAAK,CAAC,cAAe,CAAC,8CAAmC,IAAI,2CAAgC,eAAK,CAAC,IAAI,CAAC,IAAA,oCAAiB,GAAE,CAAC,CAAE,CAAC,CAAC;;;;;KAC1J;CACD,CAAC,CAAC;AAQH,SAAe,2BAA2B,CAAC,cAAsB,EAAE,QAAgB,EAAE,MAAc;;;;;;oBAC5F,+BAA+B,GAAG,wBAAwB,CAAC;oBAC3D,OAAO,GAAG;wBACf,GAAG,EAAE,MAAM;wBACX,IAAI,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE;wBAChD,OAAO,EAAE,yBAAW,CAAC,EAAE;qBACvB,CAAC;oBACI,SAAS,GAAG,iBAAiB,EAAE,CAAC;oBAChC,KAAK,GAAG;wBACb,cAAc,gBAAA;wBACd,QAAQ,UAAA;wBACR,IAAI,EAAE,SAAS;qBACf,CAAC;oBACqB,qBAAM,IAAA,qBAAY,EAAC,OAAO,EAAE,+BAA+B,EAAE,KAAK,CAAC,EAAA;;oBAApF,cAAc,GAAG,SAAmE;oBACvE,KAAA,CAAA,KAAA,IAAI,CAAA,CAAC,KAAK,CAAA;oBAAC,qBAAM,cAAc,CAAC,IAAI,EAAE,EAAA;;oBAAnD,UAAU,GAAG,cAAW,SAA2B,EAAE,wBAAe,EAAC;oBAC3E,KAAK,CAAC,8BAA8B,EAAE,UAAU,CAAC,CAAC;oBAClD,IAAI,cAAc,CAAC,MAAM,KAAK,GAAG,EAAE;wBAClC,sBAAO,UAAU,EAAC;qBAClB;yBAAM,IAAI,cAAc,CAAC,MAAM,KAAK,GAAG,EAAE;wBACzC,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;qBAClD;yBAAM;wBACN,MAAM,IAAI,KAAK,CAAC,iBAAiB,GAAG,CAAC,UAAU,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;qBACrH;;;;;CACD;AAED,SAAS,iBAAiB;IACzB,IAAM,QAAQ,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;IAC/B,IAAM,aAAa,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7C,IAAM,QAAQ,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;IAE/B,OAAO,UAAG,QAAQ,CAAC,QAAQ,cAAI,aAAa,CAAE,CAAC;AAChD,CAAC"}
@@ -75,21 +75,23 @@ exports.connect = (0, commandDefinition_1.createCommandDefinition)({
75
75
  return [4 /*yield*/, (0, organizationFacade_1.getOrganization)(organizationUid)];
76
76
  case 4:
77
77
  organization = _a.sent();
78
- restApi = (0, helper_1.createOrganizationRestApi)(organization);
79
- return [4 /*yield*/, (0, deviceFacade_1.getDeviceUid)(restApi, options)];
78
+ return [4 /*yield*/, (0, helper_1.createOrganizationRestApi)(organization)];
80
79
  case 5:
80
+ restApi = _a.sent();
81
+ return [4 /*yield*/, (0, deviceFacade_1.getDeviceUid)(restApi, options)];
82
+ case 6:
81
83
  deviceUid = _a.sent();
82
84
  return [4 /*yield*/, restApi.device.get(deviceUid)];
83
- case 6:
85
+ case 7:
84
86
  deviceData = _a.sent();
85
87
  return [4 /*yield*/, (0, connectHelper_1.createConnectFile)(deviceData.uid)];
86
- case 7:
88
+ case 8:
87
89
  _a.sent();
88
90
  return [4 /*yield*/, (0, connectHelper_1.serveApplet)(projectDirAbsolutePath, appletData, deviceData)];
89
- case 8:
91
+ case 9:
90
92
  serverData = _a.sent();
91
93
  return [4 /*yield*/, (0, deviceFacade_1.connectDevice)(organization, deviceData.uid, appletData, serverData.serverPort)];
92
- case 9:
94
+ case 10:
93
95
  _a.sent();
94
96
  process.on('SIGINT', function () {
95
97
  (0, connectHelper_1.stopApplication)(organization, deviceData.uid);
@@ -1 +1 @@
1
- {"version":3,"file":"connectCommand.js","sourceRoot":"","sources":["../../../src/Device/Connect/connectCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA8D;AAC9D,4EAAsK;AACtK,iDAAkF;AAClF,2FAAgJ;AAChJ,0DAAsD;AACtD,uCAAyD;AACzD,qEAA8F;AAE9F,IAAM,WAAW,GAAG;IACnB,mDAA8B;IAC9B,4CAAuB;IACvB,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,yCAAyC,EAAE;IACpF,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,wBAAwB,EAAE;IAC3E,8CAAkB;CACT,CAAC;AAEE,QAAA,OAAO,GAAG,IAAA,2CAAuB,EAAC;IAC9C,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,mBAAmB;IAChC,UAAU,EAAE,WAAW;IACvB,QAAQ,EAAE,EAAE;IACZ,GAAG,EAAE,UAAgB,OAA+C;;;;;;wBAC7D,gBAAgB,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;wBACR,qBAAM,IAAA,0DAAyB,EAAC,gBAAgB,EAAE,OAAO,CAAC,EAAA;;wBAAnF,sBAAsB,GAAG,SAA0D;wBACtE,qBAAM,IAAA,wBAAS,EAAC,sBAAsB,CAAC,EAAA;;wBAApD,UAAU,GAAG,SAAuC;wBAClC,qBAAM,IAAA,wDAAmC,EAAC,OAAO,CAAC,EAAA;;wBAApE,eAAe,GAAG,SAAkD;wBACrD,qBAAM,IAAA,oCAAe,EAAC,eAAe,CAAC,EAAA;;wBAArD,YAAY,GAAG,SAAsC;wBACrD,OAAO,GAAG,IAAA,kCAAyB,EAAC,YAAY,CAAC,CAAC;wBACtC,qBAAM,IAAA,2BAAY,EAAC,OAAO,EAAE,OAAO,CAAC,EAAA;;wBAAhD,SAAS,GAAG,SAAoC;wBACnC,qBAAM,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,EAAA;;wBAAhD,UAAU,GAAG,SAAmC;wBACtD,qBAAM,IAAA,iCAAiB,EAAC,UAAU,CAAC,GAAG,CAAC,EAAA;;wBAAvC,SAAuC,CAAC;wBACpB,qBAAM,IAAA,2BAAW,EAAC,sBAAsB,EAAE,UAAU,EAAE,UAAU,CAAC,EAAA;;wBAA/E,UAAU,GAAI,SAAiE;wBACrF,qBAAM,IAAA,4BAAa,EAAC,YAAY,EAAE,UAAU,CAAC,GAAG,EAAE,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,EAAA;;wBAApF,SAAoF,CAAC;wBAErF,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE;4BACpB,IAAA,+BAAe,EAAC,YAAY,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;wBAC/C,CAAC,CAAC,CAAC;wBACH,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE;4BACrB,IAAA,+BAAe,EAAC,YAAY,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;wBAC/C,CAAC,CAAC,CAAC;;;;;KACH;CACD,CAAC,CAAC"}
1
+ {"version":3,"file":"connectCommand.js","sourceRoot":"","sources":["../../../src/Device/Connect/connectCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA8D;AAC9D,4EAAsK;AACtK,iDAAkF;AAClF,2FAAgJ;AAChJ,0DAAsD;AACtD,uCAAyD;AACzD,qEAA8F;AAE9F,IAAM,WAAW,GAAG;IACnB,mDAA8B;IAC9B,4CAAuB;IACvB,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,yCAAyC,EAAE;IACpF,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,wBAAwB,EAAE;IAC3E,8CAAkB;CACT,CAAC;AAEE,QAAA,OAAO,GAAG,IAAA,2CAAuB,EAAC;IAC9C,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,mBAAmB;IAChC,UAAU,EAAE,WAAW;IACvB,QAAQ,EAAE,EAAE;IACZ,GAAG,EAAE,UAAgB,OAA+C;;;;;;wBAC7D,gBAAgB,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;wBACR,qBAAM,IAAA,0DAAyB,EAAC,gBAAgB,EAAE,OAAO,CAAC,EAAA;;wBAAnF,sBAAsB,GAAG,SAA0D;wBACtE,qBAAM,IAAA,wBAAS,EAAC,sBAAsB,CAAC,EAAA;;wBAApD,UAAU,GAAG,SAAuC;wBAClC,qBAAM,IAAA,wDAAmC,EAAC,OAAO,CAAC,EAAA;;wBAApE,eAAe,GAAG,SAAkD;wBACrD,qBAAM,IAAA,oCAAe,EAAC,eAAe,CAAC,EAAA;;wBAArD,YAAY,GAAG,SAAsC;wBAC3C,qBAAM,IAAA,kCAAyB,EAAC,YAAY,CAAC,EAAA;;wBAAvD,OAAO,GAAG,SAA6C;wBAC3C,qBAAM,IAAA,2BAAY,EAAC,OAAO,EAAE,OAAO,CAAC,EAAA;;wBAAhD,SAAS,GAAG,SAAoC;wBACnC,qBAAM,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,EAAA;;wBAAhD,UAAU,GAAG,SAAmC;wBACtD,qBAAM,IAAA,iCAAiB,EAAC,UAAU,CAAC,GAAG,CAAC,EAAA;;wBAAvC,SAAuC,CAAC;wBACpB,qBAAM,IAAA,2BAAW,EAAC,sBAAsB,EAAE,UAAU,EAAE,UAAU,CAAC,EAAA;;wBAA/E,UAAU,GAAI,SAAiE;wBACrF,qBAAM,IAAA,4BAAa,EAAC,YAAY,EAAE,UAAU,CAAC,GAAG,EAAE,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,EAAA;;wBAApF,SAAoF,CAAC;wBAErF,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE;4BACpB,IAAA,+BAAe,EAAC,YAAY,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;wBAC/C,CAAC,CAAC,CAAC;wBACH,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE;4BACrB,IAAA,+BAAe,EAAC,YAAY,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;wBAC/C,CAAC,CAAC,CAAC;;;;;KACH;CACD,CAAC,CAAC"}
@@ -10,11 +10,11 @@ declare const OPTION_LIST: readonly [{
10
10
  }, {
11
11
  readonly name: "applet-uid";
12
12
  readonly type: StringConstructor;
13
- readonly description: "Uid of applet form box";
13
+ readonly description: "Applet UID";
14
14
  }, {
15
15
  readonly name: "device-uid";
16
16
  readonly type: StringConstructor;
17
- readonly description: "Uid of device from box";
17
+ readonly description: "Device UID";
18
18
  }];
19
19
  export declare const setContent: {
20
20
  name: "set-content";
@@ -30,11 +30,11 @@ export declare const setContent: {
30
30
  }, {
31
31
  readonly name: "applet-uid";
32
32
  readonly type: StringConstructor;
33
- readonly description: "Uid of applet form box";
33
+ readonly description: "Applet UID";
34
34
  }, {
35
35
  readonly name: "device-uid";
36
36
  readonly type: StringConstructor;
37
- readonly description: "Uid of device from box";
37
+ readonly description: "Device UID";
38
38
  }];
39
39
  commands: never[];
40
40
  run(options: CommandLineOptions<typeof OPTION_LIST>): Promise<void>;
@@ -46,8 +46,8 @@ var deviceFacade_1 = require("../deviceFacade");
46
46
  var OPTION_LIST = [
47
47
  organizationFacade_1.NO_DEFAULT_ORGANIZATION_OPTION,
48
48
  organizationFacade_1.ORGANIZATION_UID_OPTION,
49
- { name: 'applet-uid', type: String, description: 'Uid of applet form box' },
50
- { name: 'device-uid', type: String, description: 'Uid of device from box' },
49
+ appletFacade_1.APPLET_UID_OPTION,
50
+ deviceFacade_1.DEVICE_UID_OPTION,
51
51
  ];
52
52
  exports.setContent = (0, commandDefinition_1.createCommandDefinition)({
53
53
  name: 'set-content',
@@ -65,18 +65,17 @@ exports.setContent = (0, commandDefinition_1.createCommandDefinition)({
65
65
  return [4 /*yield*/, (0, organizationFacade_1.getOrganization)(organizationUid)];
66
66
  case 2:
67
67
  organization = _a.sent();
68
- restApi = (0, helper_1.createOrganizationRestApi)(organization);
69
- return [4 /*yield*/, (0, appletFacade_1.getAppletUid)(restApi)];
68
+ return [4 /*yield*/, (0, helper_1.createOrganizationRestApi)(organization)];
70
69
  case 3:
70
+ restApi = _a.sent();
71
+ return [4 /*yield*/, (0, appletFacade_1.getAppletUid)(restApi, options)];
72
+ case 4:
71
73
  appletUid = _a.sent();
72
- if (!appletUid) {
73
- throw new Error('Missing argument --applet-uid <string>');
74
- }
75
74
  return [4 /*yield*/, (0, appletFacade_1.getAppletVersionFromApi)(restApi, appletUid)];
76
- case 4:
75
+ case 5:
77
76
  appletVersion = _a.sent();
78
77
  return [4 /*yield*/, (0, deviceFacade_1.getDeviceUid)(restApi, options)];
79
- case 5:
78
+ case 6:
80
79
  deviceUid = _a.sent();
81
80
  return [4 /*yield*/, restApi.timing.create({
82
81
  deviceUid: deviceUid,
@@ -93,7 +92,7 @@ exports.setContent = (0, commandDefinition_1.createCommandDefinition)({
93
92
  data: "1000",
94
93
  },
95
94
  })];
96
- case 6:
95
+ case 7:
97
96
  _a.sent();
98
97
  console.log(chalk_1.default.green("Applet ".concat(appletUid, " was set on device ").concat(deviceUid)));
99
98
  return [2 /*return*/];
@@ -1 +1 @@
1
- {"version":3,"file":"setContentCommand.js","sourceRoot":"","sources":["../../../src/Device/Content/setContentCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA0B;AAC1B,0DAAkF;AAClF,qEAA8F;AAC9F,uCAAyD;AACzD,4EAAsK;AACtK,gDAA+C;AAE/C,IAAM,WAAW,GAAG;IACnB,mDAA8B;IAC9B,4CAAuB;IACvB,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,wBAAwB,EAAE;IAC3E,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,wBAAwB,EAAE;CAClE,CAAC;AAEE,QAAA,UAAU,GAAG,IAAA,2CAAuB,EAAC;IACjD,IAAI,EAAE,aAAa;IACnB,WAAW,EAAE,wBAAwB;IACrC,UAAU,EAAE,WAAW;IACvB,QAAQ,EAAE,EAAE;IACN,GAAG,EAAT,UAAU,OAA+C;;;;;4BAChC,qBAAM,IAAA,wDAAmC,EAAC,OAAO,CAAC,EAAA;;wBAApE,eAAe,GAAG,SAAkD;wBACrD,qBAAM,IAAA,oCAAe,EAAC,eAAe,CAAC,EAAA;;wBAArD,YAAY,GAAG,SAAsC;wBACrD,OAAO,GAAG,IAAA,kCAAyB,EAAC,YAAY,CAAC,CAAC;wBACtC,qBAAM,IAAA,2BAAY,EAAC,OAAO,CAAC,EAAA;;wBAAvC,SAAS,GAAG,SAA2B;wBAC7C,IAAI,CAAC,SAAS,EAAE;4BACf,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;yBAC1D;wBACsB,qBAAM,IAAA,sCAAuB,EAAC,OAAO,EAAE,SAAS,CAAC,EAAA;;wBAAlE,aAAa,GAAI,SAAiD;wBACtD,qBAAM,IAAA,2BAAY,EAAC,OAAO,EAAE,OAAO,CAAC,EAAA;;wBAAhD,SAAS,GAAG,SAAoC;wBACtD,qBAAM,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;gCAC3B,SAAS,EAAG,SAAS;gCACrB,SAAS,EAAE,SAAS;gCACpB,aAAa,EAAE,aAAa;gCAC5B,QAAQ,EAAE,IAAI,IAAI,EAAE;gCACpB,MAAM,EAAE,IAAI,IAAI,EAAE;gCAClB,QAAQ,EAAE,CAAC;gCACX,aAAa,EAAE;oCACd,cAAc,EAAE,kBAAkB;iCAClC;gCACD,WAAW,EAAE;oCACZ,IAAI,EAAE,UAAU;oCAChB,IAAI,EAAE,MAAM;iCACZ;6BACD,CAAC,EAAA;;wBAdF,SAcE,CAAC;wBACH,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,iBAAU,SAAS,gCAAsB,SAAS,CAAE,CAAC,CAAC,CAAC;;;;;KAC/E;CACD,CAAC,CAAC"}
1
+ {"version":3,"file":"setContentCommand.js","sourceRoot":"","sources":["../../../src/Device/Content/setContentCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA0B;AAC1B,0DAAqG;AACrG,qEAA8F;AAC9F,uCAAyD;AACzD,4EAK+C;AAC/C,gDAAkE;AAElE,IAAM,WAAW,GAAG;IACnB,mDAA8B;IAC9B,4CAAuB;IACvB,gCAAiB;IACjB,gCAAiB;CACR,CAAC;AAEE,QAAA,UAAU,GAAG,IAAA,2CAAuB,EAAC;IACjD,IAAI,EAAE,aAAa;IACnB,WAAW,EAAE,wBAAwB;IACrC,UAAU,EAAE,WAAW;IACvB,QAAQ,EAAE,EAAE;IACN,GAAG,EAAT,UAAU,OAA+C;;;;;4BAChC,qBAAM,IAAA,wDAAmC,EAAC,OAAO,CAAC,EAAA;;wBAApE,eAAe,GAAG,SAAkD;wBACrD,qBAAM,IAAA,oCAAe,EAAC,eAAe,CAAC,EAAA;;wBAArD,YAAY,GAAG,SAAsC;wBAC3C,qBAAM,IAAA,kCAAyB,EAAC,YAAY,CAAC,EAAA;;wBAAvD,OAAO,GAAG,SAA6C;wBAC3C,qBAAM,IAAA,2BAAY,EAAC,OAAO,EAAE,OAAO,CAAC,EAAA;;wBAAhD,SAAS,GAAG,SAAoC;wBAC/B,qBAAM,IAAA,sCAAuB,EAAC,OAAO,EAAE,SAAS,CAAC,EAAA;;wBAAlE,aAAa,GAAI,SAAiD;wBACtD,qBAAM,IAAA,2BAAY,EAAC,OAAO,EAAE,OAAO,CAAC,EAAA;;wBAAhD,SAAS,GAAG,SAAoC;wBACtD,qBAAM,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;gCAC3B,SAAS,EAAG,SAAS;gCACrB,SAAS,EAAE,SAAS;gCACpB,aAAa,EAAE,aAAa;gCAC5B,QAAQ,EAAE,IAAI,IAAI,EAAE;gCACpB,MAAM,EAAE,IAAI,IAAI,EAAE;gCAClB,QAAQ,EAAE,CAAC;gCACX,aAAa,EAAE;oCACd,cAAc,EAAE,kBAAkB;iCAClC;gCACD,WAAW,EAAE;oCACZ,IAAI,EAAE,UAAU;oCAChB,IAAI,EAAE,MAAM;iCACZ;6BACD,CAAC,EAAA;;wBAdF,SAcE,CAAC;wBACH,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,iBAAU,SAAS,gCAAsB,SAAS,CAAE,CAAC,CAAC,CAAC;;;;;KAC/E;CACD,CAAC,CAAC"}
@@ -65,19 +65,21 @@ exports.powerAction = (0, commandDefinition_1.createCommandDefinition)({
65
65
  return [4 /*yield*/, (0, organizationFacade_1.getOrganization)(organizationUid)];
66
66
  case 2:
67
67
  organization = _a.sent();
68
- restApi = (0, helper_1.createOrganizationRestApi)(organization);
69
- return [4 /*yield*/, (0, deviceFacade_1.getDeviceUid)(restApi, options)];
68
+ return [4 /*yield*/, (0, helper_1.createOrganizationRestApi)(organization)];
70
69
  case 3:
70
+ restApi = _a.sent();
71
+ return [4 /*yield*/, (0, deviceFacade_1.getDeviceUid)(restApi, options)];
72
+ case 4:
71
73
  deviceUid = _a.sent();
72
74
  return [4 /*yield*/, (0, deviceFacade_2.getActionType)(options)];
73
- case 4:
75
+ case 5:
74
76
  actionType = _a.sent();
75
77
  return [4 /*yield*/, restApi.device.powerAction.set(deviceUid, {
76
78
  devicePowerAction: deviceFacade_1.typeMap.get(actionType).action,
77
79
  }).finally(function () {
78
80
  console.log(chalk_1.default.green("Action ".concat(deviceFacade_1.typeMap.get(actionType).name, " was successful on device ").concat(deviceUid)));
79
81
  })];
80
- case 5:
82
+ case 6:
81
83
  _a.sent();
82
84
  return [2 /*return*/];
83
85
  }
@@ -1 +1 @@
1
- {"version":3,"file":"powerActionCommand.js","sourceRoot":"","sources":["../../../src/Device/PowerAction/powerActionCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4EAAsK;AACtK,gDAAqG;AACrG,uCAAyD;AACzD,+BAA0B;AAC1B,gDAAgD;AAChD,qEAA8F;AAE9F,IAAM,WAAW,GAAG;IACnB,mDAA8B;IAC9B,4CAAuB;IACvB,gCAAiB;IACjB,uCAAwB;CACf,CAAC;AAEE,QAAA,WAAW,GAAG,IAAA,2CAAuB,EAAC;IAClD,IAAI,EAAE,cAAc;IACpB,WAAW,EAAE,gCAAgC;IAC7C,UAAU,EAAE,WAAW;IACvB,QAAQ,EAAE,EAAE;IACN,GAAG,EAAT,UAAU,OAA+C;;;;;4BAChC,qBAAM,IAAA,wDAAmC,EAAC,OAAO,CAAC,EAAA;;wBAApE,eAAe,GAAG,SAAkD;wBACrD,qBAAM,IAAA,oCAAe,EAAC,eAAe,CAAC,EAAA;;wBAArD,YAAY,GAAG,SAAsC;wBACrD,OAAO,GAAG,IAAA,kCAAyB,EAAC,YAAY,CAAC,CAAC;wBACtC,qBAAM,IAAA,2BAAY,EAAC,OAAO,EAAE,OAAO,CAAC,EAAA;;wBAAhD,SAAS,GAAG,SAAoC;wBACnC,qBAAM,IAAA,4BAAa,EAAC,OAAO,CAAC,EAAA;;wBAAzC,UAAU,GAAG,SAA4B;wBAC/C,qBAAM,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,EAAE;gCAC/C,iBAAiB,EAAG,sBAAO,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC,MAAM;6BACnD,CAAC,CAAC,OAAO,CAAC;gCACV,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,iBAAU,sBAAO,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC,IAAI,uCAA6B,SAAS,CAAE,CAAC,CAAC,CAAC;4BAC3G,CAAC,CAAC,EAAA;;wBAJF,SAIE,CAAC;;;;;KACH;CACD,CAAC,CAAC"}
1
+ {"version":3,"file":"powerActionCommand.js","sourceRoot":"","sources":["../../../src/Device/PowerAction/powerActionCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4EAAsK;AACtK,gDAAqG;AACrG,uCAAyD;AACzD,+BAA0B;AAC1B,gDAAgD;AAChD,qEAA8F;AAE9F,IAAM,WAAW,GAAG;IACnB,mDAA8B;IAC9B,4CAAuB;IACvB,gCAAiB;IACjB,uCAAwB;CACf,CAAC;AAEE,QAAA,WAAW,GAAG,IAAA,2CAAuB,EAAC;IAClD,IAAI,EAAE,cAAc;IACpB,WAAW,EAAE,gCAAgC;IAC7C,UAAU,EAAE,WAAW;IACvB,QAAQ,EAAE,EAAE;IACN,GAAG,EAAT,UAAU,OAA+C;;;;;4BAChC,qBAAM,IAAA,wDAAmC,EAAC,OAAO,CAAC,EAAA;;wBAApE,eAAe,GAAG,SAAkD;wBACrD,qBAAM,IAAA,oCAAe,EAAC,eAAe,CAAC,EAAA;;wBAArD,YAAY,GAAG,SAAsC;wBAC3C,qBAAM,IAAA,kCAAyB,EAAC,YAAY,CAAC,EAAA;;wBAAvD,OAAO,GAAG,SAA6C;wBAC3C,qBAAM,IAAA,2BAAY,EAAC,OAAO,EAAE,OAAO,CAAC,EAAA;;wBAAhD,SAAS,GAAG,SAAoC;wBACnC,qBAAM,IAAA,4BAAa,EAAC,OAAO,CAAC,EAAA;;wBAAzC,UAAU,GAAG,SAA4B;wBAC/C,qBAAM,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,EAAE;gCAC/C,iBAAiB,EAAG,sBAAO,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC,MAAM;6BACnD,CAAC,CAAC,OAAO,CAAC;gCACV,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,iBAAU,sBAAO,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC,IAAI,uCAA6B,SAAS,CAAE,CAAC,CAAC,CAAC;4BAC3G,CAAC,CAAC,EAAA;;wBAJF,SAIE,CAAC;;;;;KACH;CACD,CAAC,CAAC"}
@@ -16,11 +16,11 @@ export declare const device: {
16
16
  }, {
17
17
  readonly name: "applet-uid";
18
18
  readonly type: StringConstructor;
19
- readonly description: "Uid of applet form box";
19
+ readonly description: "Applet UID";
20
20
  }, {
21
21
  readonly name: "device-uid";
22
22
  readonly type: StringConstructor;
23
- readonly description: "Uid of device from box";
23
+ readonly description: "Device UID";
24
24
  }];
25
25
  commands: never[];
26
26
  run(options: import("../Command/commandDefinition").CommandLineOptions<readonly [{
@@ -34,11 +34,11 @@ export declare const device: {
34
34
  }, {
35
35
  readonly name: "applet-uid";
36
36
  readonly type: StringConstructor;
37
- readonly description: "Uid of applet form box";
37
+ readonly description: "Applet UID";
38
38
  }, {
39
39
  readonly name: "device-uid";
40
40
  readonly type: StringConstructor;
41
- readonly description: "Uid of device from box";
41
+ readonly description: "Device UID";
42
42
  }]>): Promise<void>;
43
43
  } | {
44
44
  name: "power-action";
@@ -41,8 +41,9 @@ var Debug = require("debug");
41
41
  var prompts = require("prompts");
42
42
  var helper_1 = require("../helper");
43
43
  var IPowerAction_1 = require("@signageos/sdk/dist/RestApi/Device/PowerAction/IPowerAction");
44
- var globalArgs_1 = require("../Command/globalArgs");
45
44
  var localMachineHelper_1 = require("../Helper/localMachineHelper");
45
+ var apiVersions_1 = require("@signageos/sdk/dist/RestApi/apiVersions");
46
+ var runControlHelper_1 = require("../RunControl/runControlHelper");
46
47
  var debug = Debug('@signageos/cli:Device:facade');
47
48
  exports.typeMap = new Map([
48
49
  ['reboot', { name: 'Reboot Device', action: IPowerAction_1.DevicePowerAction.SystemReboot }],
@@ -130,21 +131,23 @@ function getActionType(options) {
130
131
  exports.getActionType = getActionType;
131
132
  function connectDevice(organization, deviceUid, applet, serverPort) {
132
133
  return __awaiter(this, void 0, void 0, function () {
133
- var DEVICE_RESOURCE, options, computerIp, protocol, body, responseOfPost, _a, _b;
134
+ var config, DEVICE_RESOURCE, options, computerIp, protocol, body, responseOfPost, _a, _b;
134
135
  return __generator(this, function (_c) {
135
136
  switch (_c.label) {
136
- case 0:
137
+ case 0: return [4 /*yield*/, (0, runControlHelper_1.loadConfig)()];
138
+ case 1:
139
+ config = _c.sent();
137
140
  DEVICE_RESOURCE = "/device/".concat(deviceUid, "/connect");
138
141
  options = {
139
- url: (0, globalArgs_1.getGlobalApiUrl)(),
142
+ url: (0, helper_1.getApiUrl)(config),
140
143
  auth: {
141
144
  clientId: organization.oauthClientId,
142
145
  secret: organization.oauthClientSecret,
143
146
  },
144
- version: 'v1',
147
+ version: apiVersions_1.ApiVersions.V1,
145
148
  };
146
149
  return [4 /*yield*/, (0, localMachineHelper_1.getMachineIp)()];
147
- case 1:
150
+ case 2:
148
151
  computerIp = _c.sent();
149
152
  protocol = "http://";
150
153
  body = {
@@ -154,11 +157,11 @@ function connectDevice(organization, deviceUid, applet, serverPort) {
154
157
  appletVersion: applet.version,
155
158
  };
156
159
  return [4 /*yield*/, (0, helper_1.postResource)(options, DEVICE_RESOURCE, null, body)];
157
- case 2:
160
+ case 3:
158
161
  responseOfPost = _c.sent();
159
162
  _b = (_a = JSON).parse;
160
163
  return [4 /*yield*/, responseOfPost.text()];
161
- case 3: return [2 /*return*/, _b.apply(_a, [_c.sent(), helper_1.deserializeJSON])];
164
+ case 4: return [2 /*return*/, _b.apply(_a, [_c.sent(), helper_1.deserializeJSON])];
162
165
  }
163
166
  });
164
167
  });
@@ -166,25 +169,27 @@ function connectDevice(organization, deviceUid, applet, serverPort) {
166
169
  exports.connectDevice = connectDevice;
167
170
  function disconnectDevice(organization, deviceUid) {
168
171
  return __awaiter(this, void 0, void 0, function () {
169
- var DEVICE_RESOURCE, options, responseOfPost, _a, _b;
172
+ var config, DEVICE_RESOURCE, options, responseOfPost, _a, _b;
170
173
  return __generator(this, function (_c) {
171
174
  switch (_c.label) {
172
- case 0:
175
+ case 0: return [4 /*yield*/, (0, runControlHelper_1.loadConfig)()];
176
+ case 1:
177
+ config = _c.sent();
173
178
  DEVICE_RESOURCE = "/device/".concat(deviceUid, "/disconnect");
174
179
  options = {
175
- url: (0, globalArgs_1.getGlobalApiUrl)(),
180
+ url: (0, helper_1.getApiUrl)(config),
176
181
  auth: {
177
182
  clientId: organization.oauthClientId,
178
183
  secret: organization.oauthClientSecret,
179
184
  },
180
- version: 'v1',
185
+ version: apiVersions_1.ApiVersions.V1,
181
186
  };
182
187
  return [4 /*yield*/, (0, helper_1.postResource)(options, DEVICE_RESOURCE, null, { "deviceUid": "".concat(deviceUid) })];
183
- case 1:
188
+ case 2:
184
189
  responseOfPost = _c.sent();
185
190
  _b = (_a = JSON).parse;
186
191
  return [4 /*yield*/, responseOfPost.text()];
187
- case 2: return [2 /*return*/, _b.apply(_a, [_c.sent(), helper_1.deserializeJSON])];
192
+ case 3: return [2 /*return*/, _b.apply(_a, [_c.sent(), helper_1.deserializeJSON])];
188
193
  }
189
194
  });
190
195
  });
@@ -1 +1 @@
1
- {"version":3,"file":"deviceFacade.js","sourceRoot":"","sources":["../../src/Device/deviceFacade.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"deviceFacade.js","sourceRoot":"","sources":["../../src/Device/deviceFacade.ts"],"names":[],"mappings":"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"}