@signageos/cli 1.1.4 → 1.2.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 (83) hide show
  1. package/.env +0 -3
  2. package/CHANGELOG.md +19 -0
  3. package/README.md +32 -6
  4. package/dist/Applet/Build/appletBuildCommand.d.ts +33 -0
  5. package/dist/Applet/Build/appletBuildCommand.js +99 -0
  6. package/dist/Applet/Build/appletBuildCommand.js.map +1 -0
  7. package/dist/Applet/Generate/appletGenerateCommand.js +4 -3
  8. package/dist/Applet/Generate/appletGenerateCommand.js.map +1 -1
  9. package/dist/Applet/Start/appletStartCommand.d.ts +34 -8
  10. package/dist/Applet/Start/appletStartCommand.js +90 -24
  11. package/dist/Applet/Start/appletStartCommand.js.map +1 -1
  12. package/dist/Applet/Start/appletStartCommandHelper.js +2 -1
  13. package/dist/Applet/Start/appletStartCommandHelper.js.map +1 -1
  14. package/dist/Applet/Test/Upload/appletTestRunCommand.js +8 -7
  15. package/dist/Applet/Test/Upload/appletTestRunCommand.js.map +1 -1
  16. package/dist/Applet/Test/Upload/appletTestUploadCommand.js +12 -11
  17. package/dist/Applet/Test/Upload/appletTestUploadCommand.js.map +1 -1
  18. package/dist/Applet/Upload/appletUploadCommand.js +84 -90
  19. package/dist/Applet/Upload/appletUploadCommand.js.map +1 -1
  20. package/dist/Applet/Upload/appletUploadCommandHelper.d.ts +0 -3
  21. package/dist/Applet/Upload/appletUploadCommandHelper.js +22 -13
  22. package/dist/Applet/Upload/appletUploadCommandHelper.js.map +1 -1
  23. package/dist/Applet/Upload/appletUploadFacade.js +4 -3
  24. package/dist/Applet/Upload/appletUploadFacade.js.map +1 -1
  25. package/dist/Applet/appletCommand.d.ts +64 -8
  26. package/dist/Applet/appletCommand.js +2 -0
  27. package/dist/Applet/appletCommand.js.map +1 -1
  28. package/dist/Applet/appletFacade.js +7 -6
  29. package/dist/Applet/appletFacade.js.map +1 -1
  30. package/dist/Applet/appletServerHelper.d.ts +18 -0
  31. package/dist/Applet/appletServerHelper.js +83 -0
  32. package/dist/Applet/appletServerHelper.js.map +1 -0
  33. package/dist/Auth/loginCommand.js +8 -6
  34. package/dist/Auth/loginCommand.js.map +1 -1
  35. package/dist/Cli/helper.d.ts +2 -2
  36. package/dist/Cli/helper.js +3 -3
  37. package/dist/Cli/helper.js.map +1 -1
  38. package/dist/Cli/packageVersion.js +4 -3
  39. package/dist/Cli/packageVersion.js.map +1 -1
  40. package/dist/Command/commandProcessor.js +8 -9
  41. package/dist/Command/commandProcessor.js.map +1 -1
  42. package/dist/Command/globalArgs.d.ts +1 -1
  43. package/dist/Device/Connect/connectCommand.d.ts +28 -12
  44. package/dist/Device/Connect/connectCommand.js +55 -29
  45. package/dist/Device/Connect/connectCommand.js.map +1 -1
  46. package/dist/Device/Connect/connectHelper.js +5 -4
  47. package/dist/Device/Connect/connectHelper.js.map +1 -1
  48. package/dist/Device/Content/setContentCommand.js +2 -1
  49. package/dist/Device/Content/setContentCommand.js.map +1 -1
  50. package/dist/Device/PowerAction/powerActionCommand.js +2 -1
  51. package/dist/Device/PowerAction/powerActionCommand.js.map +1 -1
  52. package/dist/Device/deviceCommand.d.ts +28 -12
  53. package/dist/Device/deviceFacade.d.ts +0 -2
  54. package/dist/Device/deviceFacade.js +1 -40
  55. package/dist/Device/deviceFacade.js.map +1 -1
  56. package/dist/Emulator/IEmulator.d.ts +1 -1
  57. package/dist/Emulator/emulatorFacade.js +6 -5
  58. package/dist/Emulator/emulatorFacade.js.map +1 -1
  59. package/dist/Emulator/emulatorFactory.d.ts +4 -2
  60. package/dist/Emulator/emulatorFactory.js +85 -73
  61. package/dist/Emulator/emulatorFactory.js.map +1 -1
  62. package/dist/FileSystem/helper.d.ts +5 -10
  63. package/dist/FileSystem/helper.js +26 -146
  64. package/dist/FileSystem/helper.js.map +1 -1
  65. package/dist/Firmware/Upload/firmwareUploadCommand.js +35 -9
  66. package/dist/Firmware/Upload/firmwareUploadCommand.js.map +1 -1
  67. package/dist/Organization/SetDefault/organizationSetDefaultCommand.js +2 -1
  68. package/dist/Organization/SetDefault/organizationSetDefaultCommand.js.map +1 -1
  69. package/dist/RunControl/runControlHelper.d.ts +5 -9
  70. package/dist/RunControl/runControlHelper.js +24 -103
  71. package/dist/RunControl/runControlHelper.js.map +1 -1
  72. package/dist/generalCommand.js +3 -3
  73. package/dist/generalCommand.js.map +1 -1
  74. package/dist/helper.d.ts +2 -2
  75. package/dist/helper.js +7 -3
  76. package/dist/helper.js.map +1 -1
  77. package/dist/parameters.d.ts +13 -0
  78. package/dist/parameters.js +68 -0
  79. package/dist/parameters.js.map +1 -0
  80. package/package.json +8 -17
  81. package/config/parameters.d.ts +0 -27
  82. package/config/parameters.js +0 -50
  83. package/package-lock.json +0 -8067
@@ -1,11 +1,7 @@
1
- export interface IConfig {
2
- apiUrl?: string;
3
- identification?: string;
4
- apiSecurityToken?: string;
5
- defaultOrganizationUid?: string;
6
- emulatorUid?: string;
7
- }
1
+ import { IConfig } from '@signageos/sdk/dist/SosHelper/sosControlHelper';
2
+ /** The same as loadConfig in SDK, but respect CLI --profile argument */
3
+ export declare function loadConfig(): Promise<IConfig & Required<Pick<IConfig, "apiUrl">>>;
4
+ /** The same as saveConfig in SDK, but respect CLI --profile argument */
8
5
  export declare function saveConfig(newConfig: IConfig): Promise<void>;
6
+ /** The same as updateConfig in SDK, but respect CLI --profile argument */
9
7
  export declare function updateConfig(partialConfig: Partial<IConfig>): Promise<void>;
10
- export declare function loadConfig(): Promise<IConfig>;
11
- export declare function getConfigFilePath(): string;
@@ -1,15 +1,4 @@
1
1
  "use strict";
2
- var __assign = (this && this.__assign) || function () {
3
- __assign = Object.assign || function(t) {
4
- for (var s, i = 1, n = arguments.length; i < n; i++) {
5
- s = arguments[i];
6
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
7
- t[p] = s[p];
8
- }
9
- return t;
10
- };
11
- return __assign.apply(this, arguments);
12
- };
13
2
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
14
3
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
15
4
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -47,120 +36,52 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
47
36
  }
48
37
  };
49
38
  Object.defineProperty(exports, "__esModule", { value: true });
50
- exports.getConfigFilePath = exports.loadConfig = exports.updateConfig = exports.saveConfig = void 0;
51
- var fs = require("fs-extra");
52
- var ini = require("ini");
53
- var path = require("path");
54
- var os = require("os");
55
- var _ = require("lodash");
56
- var chalk_1 = require("chalk");
57
- var parameters = require("../../config/parameters");
39
+ exports.updateConfig = exports.saveConfig = exports.loadConfig = void 0;
40
+ var sosControlHelper_1 = require("@signageos/sdk/dist/SosHelper/sosControlHelper");
58
41
  var globalArgs_1 = require("../Command/globalArgs");
59
- var RUN_CONTROL_FILENAME = '.sosrc';
60
- function saveConfig(newConfig) {
42
+ /** The same as loadConfig in SDK, but respect CLI --profile argument */
43
+ function loadConfig() {
61
44
  return __awaiter(this, void 0, void 0, function () {
62
- var runControlFilePath, configFile, originalRCFileContent, profile, newRCFileContent;
45
+ var profile;
63
46
  return __generator(this, function (_a) {
64
47
  switch (_a.label) {
65
48
  case 0:
66
- newConfig = _.omitBy(newConfig, _.isNil);
67
- runControlFilePath = getConfigFilePath();
68
- configFile = {};
69
- return [4 /*yield*/, fs.pathExists(runControlFilePath)];
70
- case 1:
71
- if (!_a.sent()) return [3 /*break*/, 3];
72
- return [4 /*yield*/, fs.readFile(runControlFilePath)];
73
- case 2:
74
- originalRCFileContent = _a.sent();
75
- configFile = ini.decode(originalRCFileContent.toString());
76
- _a.label = 3;
77
- case 3:
78
49
  profile = (0, globalArgs_1.getGlobalProfile)();
79
- if (profile) {
80
- configFile["profile ".concat(profile)] = newConfig;
81
- }
82
- else {
83
- configFile = _.omitBy(configFile, function (_val, key) { return !key.startsWith('profile '); });
84
- Object.assign(configFile, newConfig);
85
- }
86
- newRCFileContent = ini.encode(configFile);
87
- return [4 /*yield*/, fs.writeFile(runControlFilePath, newRCFileContent, {
88
- mode: 384,
89
- })];
90
- case 4:
91
- _a.sent();
92
- return [2 /*return*/];
50
+ return [4 /*yield*/, (0, sosControlHelper_1.loadConfig)({ profile: profile })];
51
+ case 1: return [2 /*return*/, _a.sent()];
93
52
  }
94
53
  });
95
54
  });
96
55
  }
97
- exports.saveConfig = saveConfig;
98
- function updateConfig(partialConfig) {
56
+ exports.loadConfig = loadConfig;
57
+ /** The same as saveConfig in SDK, but respect CLI --profile argument */
58
+ function saveConfig(newConfig) {
99
59
  return __awaiter(this, void 0, void 0, function () {
100
- var currentConfig, newConfig;
60
+ var profile;
101
61
  return __generator(this, function (_a) {
102
62
  switch (_a.label) {
103
- case 0: return [4 /*yield*/, loadConfig()];
104
- case 1:
105
- currentConfig = _a.sent();
106
- newConfig = __assign(__assign({}, currentConfig), partialConfig);
107
- return [4 /*yield*/, saveConfig(newConfig)];
108
- case 2:
109
- _a.sent();
110
- return [2 /*return*/];
63
+ case 0:
64
+ profile = (0, globalArgs_1.getGlobalProfile)();
65
+ return [4 /*yield*/, (0, sosControlHelper_1.saveConfig)(newConfig, { profile: profile })];
66
+ case 1: return [2 /*return*/, _a.sent()];
111
67
  }
112
68
  });
113
69
  });
114
70
  }
115
- exports.updateConfig = updateConfig;
116
- function loadConfig() {
117
- var _a;
71
+ exports.saveConfig = saveConfig;
72
+ /** The same as updateConfig in SDK, but respect CLI --profile argument */
73
+ function updateConfig(partialConfig) {
118
74
  return __awaiter(this, void 0, void 0, function () {
119
- var runControlFilePath, configFile, runControlFileContent, profile, config;
120
- return __generator(this, function (_b) {
121
- switch (_b.label) {
75
+ var profile;
76
+ return __generator(this, function (_a) {
77
+ switch (_a.label) {
122
78
  case 0:
123
- runControlFilePath = getConfigFilePath();
124
- configFile = {};
125
- return [4 /*yield*/, fs.pathExists(runControlFilePath)];
126
- case 1:
127
- if (!_b.sent()) return [3 /*break*/, 3];
128
- return [4 /*yield*/, fs.readFile(runControlFilePath)];
129
- case 2:
130
- runControlFileContent = _b.sent();
131
- configFile = ini.decode(runControlFileContent.toString());
132
- _b.label = 3;
133
- case 3:
134
79
  profile = (0, globalArgs_1.getGlobalProfile)();
135
- config = profile ? (_a = configFile["profile ".concat(profile)]) !== null && _a !== void 0 ? _a : {} : configFile;
136
- // Overriding from env vars if available
137
- if (parameters.accountAuth.tokenId) {
138
- config.identification = parameters.accountAuth.tokenId;
139
- }
140
- if (parameters.accountAuth.token) {
141
- config.apiSecurityToken = parameters.accountAuth.token;
142
- }
143
- if (parameters.defaultOrganizationUid) {
144
- config.defaultOrganizationUid = parameters.defaultOrganizationUid;
145
- }
146
- if (!config.apiUrl) {
147
- config.apiUrl = parameters.apiUrl;
148
- }
149
- // Temporary suggestion to login getting faster token
150
- if (config.identification && !config.identification.match(/[0-9a-f]{20,20}/)) {
151
- console.warn(chalk_1.default.bold.yellow("Your authentication token is outdated. Please do the ".concat(chalk_1.default.green('sos login'), " again.")));
152
- console.warn('After the log in, commands are becoming almost 10x faster.');
153
- }
154
- return [2 /*return*/, config];
80
+ return [4 /*yield*/, (0, sosControlHelper_1.updateConfig)(partialConfig, { profile: profile })];
81
+ case 1: return [2 /*return*/, _a.sent()];
155
82
  }
156
83
  });
157
84
  });
158
85
  }
159
- exports.loadConfig = loadConfig;
160
- function getConfigFilePath() {
161
- var homeDirectoryPath = os.homedir();
162
- var runControlFilePath = path.join(homeDirectoryPath, RUN_CONTROL_FILENAME);
163
- return runControlFilePath;
164
- }
165
- exports.getConfigFilePath = getConfigFilePath;
86
+ exports.updateConfig = updateConfig;
166
87
  //# sourceMappingURL=runControlHelper.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"runControlHelper.js","sourceRoot":"","sources":["../../src/RunControl/runControlHelper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"runControlHelper.js","sourceRoot":"","sources":["../../src/RunControl/runControlHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mFAKwD;AACxD,oDAAyD;AAEzD,wEAAwE;AACxE,SAAsB,UAAU;;;;;;oBACzB,OAAO,GAAG,IAAA,6BAAgB,GAAE,CAAC;oBAC5B,qBAAM,IAAA,6BAAc,EAAC,EAAE,OAAO,SAAA,EAAE,CAAC,EAAA;wBAAxC,sBAAO,SAAiC,EAAC;;;;CACzC;AAHD,gCAGC;AAED,wEAAwE;AACxE,SAAsB,UAAU,CAAC,SAAkB;;;;;;oBAC5C,OAAO,GAAG,IAAA,6BAAgB,GAAE,CAAC;oBAC5B,qBAAM,IAAA,6BAAc,EAAC,SAAS,EAAE,EAAE,OAAO,SAAA,EAAE,CAAC,EAAA;wBAAnD,sBAAO,SAA4C,EAAC;;;;CACpD;AAHD,gCAGC;AAED,0EAA0E;AAC1E,SAAsB,YAAY,CAAC,aAA+B;;;;;;oBAC3D,OAAO,GAAG,IAAA,6BAAgB,GAAE,CAAC;oBAC5B,qBAAM,IAAA,+BAAgB,EAAC,aAAa,EAAE,EAAE,OAAO,SAAA,EAAE,CAAC,EAAA;wBAAzD,sBAAO,SAAkD,EAAC;;;;CAC1D;AAHD,oCAGC"}
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.GENERAL_OPTION_LIST = exports.PROFILE_OPTION = exports.HELP_OPTION = exports.COMMAND_OPTION = exports.API_URL_OPTION = exports.VERSION_OPTION = void 0;
4
- var parameters = require("../config/parameters");
4
+ var parameters_1 = require("./parameters");
5
5
  exports.VERSION_OPTION = {
6
6
  name: 'version',
7
7
  alias: 'v',
@@ -12,7 +12,7 @@ exports.API_URL_OPTION = {
12
12
  name: 'api-url',
13
13
  alias: 'u',
14
14
  type: String,
15
- defaultValue: parameters.apiUrl,
15
+ defaultValue: parameters_1.parameters.apiUrl,
16
16
  description: 'API URL to be used for REST requests',
17
17
  };
18
18
  exports.COMMAND_OPTION = {
@@ -34,7 +34,7 @@ exports.PROFILE_OPTION = {
34
34
  name: 'profile',
35
35
  type: String,
36
36
  description: 'signageOS Profile to be used for authentication and other values from ~/.sosrc config file.',
37
- defaultValue: parameters.profile,
37
+ defaultValue: parameters_1.parameters.profile,
38
38
  };
39
39
  exports.GENERAL_OPTION_LIST = [
40
40
  exports.COMMAND_OPTION,
@@ -1 +1 @@
1
- {"version":3,"file":"generalCommand.js","sourceRoot":"","sources":["../src/generalCommand.ts"],"names":[],"mappings":";;;AAAA,iDAAmD;AAEtC,QAAA,cAAc,GAAG;IAC7B,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,uCAAuC;CAC3C,CAAC;AACE,QAAA,cAAc,GAAG;IAC7B,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,MAAM;IACZ,YAAY,EAAE,UAAU,CAAC,MAAM;IAC/B,WAAW,EAAE,sCAAsC;CAC1C,CAAC;AACE,QAAA,cAAc,GAAG;IAC7B,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,MAAM;IACZ,QAAQ,EAAE,IAAI;IACd,aAAa,EAAE,IAAI;IACnB,YAAY,EAAE,EAAE;IAChB,WAAW,EAAE,wBAAwB;CAC5B,CAAC;AACE,QAAA,WAAW,GAAG;IAC1B,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,2BAA2B;CAC/B,CAAC;AACE,QAAA,cAAc,GAAG;IAC7B,IAAI,EAAE,SAAS;IACf,IAAI,EAAE,MAAM;IACZ,WAAW,EAAE,6FAA6F;IAC1G,YAAY,EAAE,UAAU,CAAC,OAAO;CACvB,CAAC;AAEE,QAAA,mBAAmB,GAAG;IAClC,sBAAc;IACd,mBAAW;IACX,sBAAc;IACd,sBAAc;IACd,sBAAc;CACL,CAAC"}
1
+ {"version":3,"file":"generalCommand.js","sourceRoot":"","sources":["../src/generalCommand.ts"],"names":[],"mappings":";;;AAAA,2CAA0C;AAE7B,QAAA,cAAc,GAAG;IAC7B,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,uCAAuC;CAC3C,CAAC;AACE,QAAA,cAAc,GAAG;IAC7B,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,MAAM;IACZ,YAAY,EAAE,uBAAU,CAAC,MAAM;IAC/B,WAAW,EAAE,sCAAsC;CAC1C,CAAC;AACE,QAAA,cAAc,GAAG;IAC7B,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,MAAM;IACZ,QAAQ,EAAE,IAAI;IACd,aAAa,EAAE,IAAI;IACnB,YAAY,EAAE,EAAE;IAChB,WAAW,EAAE,wBAAwB;CAC5B,CAAC;AACE,QAAA,WAAW,GAAG;IAC1B,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,2BAA2B;CAC/B,CAAC;AACE,QAAA,cAAc,GAAG;IAC7B,IAAI,EAAE,SAAS;IACf,IAAI,EAAE,MAAM;IACZ,WAAW,EAAE,6FAA6F;IAC1G,YAAY,EAAE,uBAAU,CAAC,OAAO;CACvB,CAAC;AAEE,QAAA,mBAAmB,GAAG;IAClC,sBAAc;IACd,mBAAW;IACX,sBAAc;IACd,sBAAc;IACd,sBAAc;CACL,CAAC"}
package/dist/helper.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import { RequestInit } from "node-fetch";
2
2
  import RestApi from '@signageos/sdk/dist/RestApi/RestApi';
3
- import { IConfig } from './RunControl/runControlHelper';
4
3
  import { ApiVersions } from '@signageos/sdk/dist/RestApi/apiVersions';
4
+ import { IConfig } from '@signageos/sdk/dist/SosHelper/sosControlHelper';
5
5
  interface ICredentials {
6
6
  oauthClientId: string;
7
7
  oauthClientSecret: string;
@@ -9,7 +9,7 @@ interface ICredentials {
9
9
  export declare function loadApiUrl(): Promise<string>;
10
10
  export declare function getApiUrl(config: IConfig): string;
11
11
  export declare function createClientVersions(): {
12
- signageOS_CLI: string;
12
+ signageOS_CLI: any;
13
13
  };
14
14
  export declare function createOrganizationRestApi(credentials: ICredentials): Promise<RestApi>;
15
15
  export declare function createFirmwareVersionRestApi(): Promise<RestApi>;
package/dist/helper.js CHANGED
@@ -53,7 +53,7 @@ var querystring_1 = require("querystring");
53
53
  var RestApi_1 = require("@signageos/sdk/dist/RestApi/RestApi");
54
54
  var runControlHelper_1 = require("./RunControl/runControlHelper");
55
55
  var apiVersions_1 = require("@signageos/sdk/dist/RestApi/apiVersions");
56
- var parameters = require("../config/parameters");
56
+ var parameters_1 = require("./parameters");
57
57
  var globalArgs_1 = require("./Command/globalArgs");
58
58
  function loadApiUrl() {
59
59
  return __awaiter(this, void 0, void 0, function () {
@@ -70,13 +70,17 @@ function loadApiUrl() {
70
70
  }
71
71
  exports.loadApiUrl = loadApiUrl;
72
72
  function getApiUrl(config) {
73
- return config.apiUrl || (0, globalArgs_1.getGlobalApiUrl)();
73
+ var apiUrl = (0, globalArgs_1.getGlobalApiUrl)() || config.apiUrl;
74
+ if (!apiUrl) {
75
+ throw new Error("No API URL is defined. Please use --api-url or set SOS_API_URL environment variable.");
76
+ }
77
+ return apiUrl;
74
78
  }
75
79
  exports.getApiUrl = getApiUrl;
76
80
  function createClientVersions() {
77
81
  var _a;
78
82
  return _a = {},
79
- _a['signageOS_CLI'] = parameters.version,
83
+ _a['signageOS_CLI'] = parameters_1.parameters.version,
80
84
  _a;
81
85
  }
82
86
  exports.createClientVersions = createClientVersions;
@@ -1 +1 @@
1
- {"version":3,"file":"helper.js","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"helper.js","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,13 @@
1
+ export declare const parameters: {
2
+ environment: string;
3
+ name: any;
4
+ version: any;
5
+ profile: string | undefined;
6
+ apiUrl: string;
7
+ boxHost: string;
8
+ applet: {
9
+ uid: string | undefined;
10
+ version: string | undefined;
11
+ name: string | undefined;
12
+ };
13
+ };
@@ -0,0 +1,68 @@
1
+ "use strict";
2
+ var __values = (this && this.__values) || function(o) {
3
+ var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
4
+ if (m) return m.call(o);
5
+ if (o && typeof o.length === "number") return {
6
+ next: function () {
7
+ if (o && i >= o.length) o = void 0;
8
+ return { value: o && o[i++], done: !o };
9
+ }
10
+ };
11
+ throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
12
+ };
13
+ var e_1, _a;
14
+ Object.defineProperty(exports, "__esModule", { value: true });
15
+ exports.parameters = void 0;
16
+ var log_1 = require("@signageos/sdk/dist/Console/log");
17
+ var path = require('path');
18
+ var dotenv = require('dotenv');
19
+ var packageConfig = require('../package.json');
20
+ var environment = process.env.NODE_ENV || 'dev';
21
+ var rootPath = path.normalize(__dirname + '/..');
22
+ dotenv.config({ path: path.join(rootPath, '.env') });
23
+ var configurableEnvVars = [
24
+ 'SOS_PROFILE',
25
+ 'SOS_API_IDENTIFICATION',
26
+ 'SOS_API_SECURITY_TOKEN',
27
+ 'SOS_ORGANIZATION_UID',
28
+ 'SOS_APPLET_UID',
29
+ 'SOS_APPLET_VERSION',
30
+ 'SOS_APPLET_NAME',
31
+ ];
32
+ try {
33
+ for (var configurableEnvVars_1 = __values(configurableEnvVars), configurableEnvVars_1_1 = configurableEnvVars_1.next(); !configurableEnvVars_1_1.done; configurableEnvVars_1_1 = configurableEnvVars_1.next()) {
34
+ var envVar = configurableEnvVars_1_1.value;
35
+ if (process.env[envVar]) {
36
+ (0, log_1.log)('warning', "Environment variable ".concat(envVar, " found. Will override default values from ~/.sosrc"));
37
+ }
38
+ }
39
+ }
40
+ catch (e_1_1) { e_1 = { error: e_1_1 }; }
41
+ finally {
42
+ try {
43
+ if (configurableEnvVars_1_1 && !configurableEnvVars_1_1.done && (_a = configurableEnvVars_1.return)) _a.call(configurableEnvVars_1);
44
+ }
45
+ finally { if (e_1) throw e_1.error; }
46
+ }
47
+ var apiUrl = process.env.SOS_API_URL;
48
+ var boxHost = process.env.SOS_BOX_HOST;
49
+ if (!apiUrl) {
50
+ throw new Error("Environment variable SOS_API_URL is required");
51
+ }
52
+ if (!boxHost) {
53
+ throw new Error("Environment variable SOS_BOX_HOST is required");
54
+ }
55
+ exports.parameters = {
56
+ environment: environment,
57
+ name: packageConfig.name,
58
+ version: packageConfig.version,
59
+ profile: process.env.SOS_PROFILE,
60
+ apiUrl: apiUrl,
61
+ boxHost: boxHost,
62
+ applet: {
63
+ uid: process.env.SOS_APPLET_UID,
64
+ version: process.env.SOS_APPLET_VERSION,
65
+ name: process.env.SOS_APPLET_NAME,
66
+ },
67
+ };
68
+ //# sourceMappingURL=parameters.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"parameters.js","sourceRoot":"","sources":["../src/parameters.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uDAAsD;AAEtD,IAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC7B,IAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AACjC,IAAM,aAAa,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AACjD,IAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,KAAK,CAAC;AAClD,IAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,GAAG,KAAK,CAAC,CAAC;AAEnD,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;AAErD,IAAM,mBAAmB,GAAG;IAC3B,aAAa;IACb,wBAAwB;IACxB,wBAAwB;IACxB,sBAAsB;IACtB,gBAAgB;IAChB,oBAAoB;IACpB,iBAAiB;CACR,CAAC;;IAEX,KAAqB,IAAA,wBAAA,SAAA,mBAAmB,CAAA,wDAAA,yFAAE;QAArC,IAAM,MAAM,gCAAA;QAChB,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YACxB,IAAA,SAAG,EAAC,SAAS,EAAE,+BAAwB,MAAM,uDAAoD,CAAC,CAAC;SACnG;KACD;;;;;;;;;AAED,IAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;AACvC,IAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC;AAEzC,IAAI,CAAC,MAAM,EAAE;IACZ,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;CAChE;AACD,IAAI,CAAC,OAAO,EAAE;IACb,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;CACjE;AAEY,QAAA,UAAU,GAAG;IACzB,WAAW,aAAA;IACX,IAAI,EAAE,aAAa,CAAC,IAAI;IACxB,OAAO,EAAE,aAAa,CAAC,OAAO;IAC9B,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW;IAChC,MAAM,QAAA;IACN,OAAO,SAAA;IACP,MAAM,EAAE;QACP,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;QAC/B,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB;QACvC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe;KACjC;CACD,CAAC"}
package/package.json CHANGED
@@ -1,14 +1,12 @@
1
1
  {
2
2
  "name": "@signageos/cli",
3
- "version": "1.1.4",
3
+ "version": "1.2.0",
4
4
  "main": "./dist/index.js",
5
5
  "files": [
6
6
  ".env",
7
7
  "dist",
8
- "config",
9
8
  "README.md",
10
- "package.json",
11
- "package-lock.json"
9
+ "package.json"
12
10
  ],
13
11
  "repository": {
14
12
  "url": "https://github.com/signageos/cli",
@@ -16,14 +14,15 @@
16
14
  },
17
15
  "scripts": {
18
16
  "build": "tsc",
19
- "lint": "tslint --config node_modules/@signageos/codestyle/tslint.json {src,tests}/**/*.{ts,tsx}",
17
+ "lint": "tslint --config node_modules/@signageos/codestyle/tslint.json {src,tests}/**/*.ts",
20
18
  "prebuild": "rm -rf dist/*",
21
19
  "prepare": "npm run prebuild && npm run build && chmod +x dist/index.js",
22
- "test": "env NODE_ENV=test mocha --file .mocharc.json",
20
+ "test": "env NODE_ENV=test mocha --config .mocharc.unit.json",
21
+ "test-integration": "env NODE_ENV=test mocha --config .mocharc.integration.json",
23
22
  "watch": "tsc --watch",
24
23
  "check": "npm run depcheck && npx --userconfig ./.npmrc @signageos/lib check-deps && npm run check-circular-deps",
25
- "check-circular-deps": "npx madge --circular --extensions ts ./src/",
26
- "depcheck": "depcheck --specials=tslint,webpack,mocha --parsers='**/*.ts:typescript,**/*.js:es6' --detectors='requireCallExpression,importDeclaration' --ignore-dirs='dist' --ignores='@types/*,@signageos/codestyle,mocha,depcheck,webpack'"
24
+ "check-circular-deps": "npx madge@5 --circular --extensions ts ./src/",
25
+ "depcheck": "depcheck --config .depcheckrc.json"
27
26
  },
28
27
  "license": "MIT",
29
28
  "engines": {
@@ -48,10 +47,7 @@
48
47
  "@types/debug": "4.1.4",
49
48
  "@types/express": "4.17.1",
50
49
  "@types/fs-extra": "8.0.0",
51
- "@types/globby": "9.1.0",
52
- "@types/ini": "1.3.30",
53
50
  "@types/internal-ip": "4.1.0",
54
- "@types/lodash": "4.14.176",
55
51
  "@types/mime": "2.0.1",
56
52
  "@types/mocha": "5.2.7",
57
53
  "@types/node": "12.6.9",
@@ -73,8 +69,7 @@
73
69
  },
74
70
  "dependencies": {
75
71
  "@signageos/file": "0.1.1",
76
- "@signageos/sdk": "1.15.0",
77
- "archiver": "5.0.2",
72
+ "@signageos/sdk": "1.19.0",
78
73
  "chalk": "2.4.2",
79
74
  "child-process-promise": "2.2.1",
80
75
  "cli-progress": "3.8.2",
@@ -85,13 +80,9 @@
85
80
  "dotenv": "8.0.0",
86
81
  "express": "4.17.1",
87
82
  "fs-extra": "8.1.0",
88
- "globby": "11.1.0",
89
- "ini": "2.0.0",
90
83
  "internal-ip": "5.0.0",
91
- "lodash": "4.17.21",
92
84
  "mime": "2.4.4",
93
85
  "node-fetch": "2.6.7",
94
- "parse-gitignore": "1.0.1",
95
86
  "prompts": "2.1.0",
96
87
  "semver": "7.1.3",
97
88
  "serve-static": "1.14.1"
@@ -1,27 +0,0 @@
1
-
2
- declare const parameters: {
3
- environment: 'dev' | 'production';
4
- name: string;
5
- version: string;
6
- configPath: string;
7
- paths: {
8
- rootPath: string;
9
- testsPath: string;
10
- distPath: string;
11
- },
12
- profile: string | undefined;
13
- apiUrl: string;
14
- boxHost: string;
15
- applet: {
16
- uid: string | undefined;
17
- version: string | undefined;
18
- name: string | undefined;
19
- };
20
- accountAuth: {
21
- tokenId: string | undefined;
22
- token: string | undefined;
23
- };
24
- defaultOrganizationUid: string | undefined;
25
- };
26
-
27
- export = parameters;
@@ -1,50 +0,0 @@
1
-
2
- const path = require('path');
3
- const dotenv = require('dotenv');
4
- const packageConfig = require('../package.json');
5
- const environment = process.env.NODE_ENV || 'dev';
6
- const rootPath = path.normalize(__dirname + '/..');
7
- const testsPath = rootPath + '/tests';
8
- const distPath = rootPath + '/dist';
9
-
10
- dotenv.config({ path: path.join(rootPath, '.env') });
11
-
12
- if (process.env.SOS_PROFILE) {
13
- console.warn(`Environment variable SOS_PROFILE found. Will use non default profile from ~/.sosrc`);
14
- }
15
- if (process.env.SOS_API_IDENTIFICATION) {
16
- console.warn(`Environment variable SOS_API_IDENTIFICATION found. Will override default credentials from ~/.sosrc`);
17
- }
18
-
19
- if (process.env.SOS_API_SECURITY_TOKEN) {
20
- console.warn(`Environment variable SOS_API_SECURITY_TOKEN found. Will override default credentials from ~/.sosrc`);
21
- }
22
-
23
- if (process.env.SOS_ORGANIZATION_UID) {
24
- console.warn(`Environment variable SOS_ORGANIZATION_UID found. Will override default credentials from ~/.sosrc`);
25
- }
26
-
27
- module.exports = {
28
- environment,
29
- name: packageConfig.name,
30
- version: packageConfig.version,
31
- configPath: __dirname,
32
- paths: {
33
- rootPath,
34
- testsPath,
35
- distPath,
36
- },
37
- profile: process.env.SOS_PROFILE,
38
- apiUrl: process.env.SOS_API_URL,
39
- boxHost: process.env.SOS_BOX_HOST,
40
- applet: {
41
- uid: process.env.SOS_APPLET_UID,
42
- version: process.env.SOS_APPLET_VERSION,
43
- name: process.env.SOS_APPLET_NAME,
44
- },
45
- accountAuth: {
46
- tokenId: process.env.SOS_API_IDENTIFICATION,
47
- token: process.env.SOS_API_SECURITY_TOKEN,
48
- },
49
- defaultOrganizationUid: process.env.SOS_ORGANIZATION_UID,
50
- };