@signageos/cli 1.1.4 → 1.1.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.env +0 -3
- package/CHANGELOG.md +5 -0
- package/README.md +9 -0
- package/dist/Applet/Generate/appletGenerateCommand.js +3 -2
- package/dist/Applet/Generate/appletGenerateCommand.js.map +1 -1
- package/dist/Applet/Start/appletStartCommandHelper.js +2 -1
- package/dist/Applet/Start/appletStartCommandHelper.js.map +1 -1
- package/dist/Applet/Test/Upload/appletTestRunCommand.js +8 -7
- package/dist/Applet/Test/Upload/appletTestRunCommand.js.map +1 -1
- package/dist/Applet/Test/Upload/appletTestUploadCommand.js +11 -10
- package/dist/Applet/Test/Upload/appletTestUploadCommand.js.map +1 -1
- package/dist/Applet/Upload/appletUploadCommand.js +12 -11
- package/dist/Applet/Upload/appletUploadCommand.js.map +1 -1
- package/dist/Applet/Upload/appletUploadCommandHelper.js +4 -3
- package/dist/Applet/Upload/appletUploadCommandHelper.js.map +1 -1
- package/dist/Applet/Upload/appletUploadFacade.js +4 -3
- package/dist/Applet/Upload/appletUploadFacade.js.map +1 -1
- package/dist/Applet/appletFacade.js +4 -4
- package/dist/Applet/appletFacade.js.map +1 -1
- package/dist/Auth/loginCommand.js +7 -6
- package/dist/Auth/loginCommand.js.map +1 -1
- package/dist/Cli/helper.d.ts +2 -2
- package/dist/Cli/helper.js +3 -3
- package/dist/Cli/helper.js.map +1 -1
- package/dist/Cli/packageVersion.js +4 -3
- package/dist/Cli/packageVersion.js.map +1 -1
- package/dist/Command/commandProcessor.js +8 -9
- package/dist/Command/commandProcessor.js.map +1 -1
- package/dist/Command/globalArgs.d.ts +1 -1
- package/dist/Device/Connect/connectHelper.js +5 -4
- package/dist/Device/Connect/connectHelper.js.map +1 -1
- package/dist/Device/Content/setContentCommand.js +2 -1
- package/dist/Device/Content/setContentCommand.js.map +1 -1
- package/dist/Device/PowerAction/powerActionCommand.js +2 -1
- package/dist/Device/PowerAction/powerActionCommand.js.map +1 -1
- package/dist/Emulator/emulatorFacade.js +6 -5
- package/dist/Emulator/emulatorFacade.js.map +1 -1
- package/dist/Emulator/emulatorFactory.js +2 -1
- package/dist/Emulator/emulatorFactory.js.map +1 -1
- package/dist/FileSystem/helper.js +3 -2
- package/dist/FileSystem/helper.js.map +1 -1
- package/dist/Firmware/Upload/firmwareUploadCommand.js +35 -9
- package/dist/Firmware/Upload/firmwareUploadCommand.js.map +1 -1
- package/dist/Organization/SetDefault/organizationSetDefaultCommand.js +2 -1
- package/dist/Organization/SetDefault/organizationSetDefaultCommand.js.map +1 -1
- package/dist/RunControl/runControlHelper.js +11 -10
- package/dist/RunControl/runControlHelper.js.map +1 -1
- package/dist/generalCommand.js +3 -3
- package/dist/generalCommand.js.map +1 -1
- package/dist/helper.d.ts +1 -1
- package/dist/helper.js +7 -3
- package/dist/helper.js.map +1 -1
- package/dist/parameters.d.ts +24 -0
- package/dist/parameters.js +81 -0
- package/dist/parameters.js.map +1 -0
- package/package.json +7 -8
- package/config/parameters.d.ts +0 -27
- package/config/parameters.js +0 -50
- package/package-lock.json +0 -8067
package/.env
CHANGED
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
|
|
|
4
4
|
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
|
|
5
5
|
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
|
|
6
6
|
|
|
7
|
+
## [1.1.5] - 2023-01-02
|
|
8
|
+
### Fixed
|
|
9
|
+
- Respect argument `--api-url` as priority over `SOS_API_URL` environment variable and default value
|
|
10
|
+
- Log info/warning output into stderr instead of stdout
|
|
11
|
+
|
|
7
12
|
## [1.1.4] - 2022-11-25
|
|
8
13
|
### Fixed
|
|
9
14
|
- Removed unused `display.appcache` file from Emulator (replaced with `serviceWorker.js`)
|
package/README.md
CHANGED
|
@@ -12,6 +12,15 @@ sos --help
|
|
|
12
12
|
cli tool allows you to run commands interactively for best user experience, please use standard bash terminal on *nix systems
|
|
13
13
|
and [gitbash](https://gitforwindows.org/), run it in [windows terminal](https://www.microsoft.com/en-us/p/windows-terminal/9n0dx20hk701?activetab=pivot:overviewtab).
|
|
14
14
|
|
|
15
|
+
## Test
|
|
16
|
+
```bash
|
|
17
|
+
cp .env.amy .env
|
|
18
|
+
# Unit tests
|
|
19
|
+
npm test
|
|
20
|
+
# Integration tests (against AMY environment)
|
|
21
|
+
npm run test-integration
|
|
22
|
+
```
|
|
23
|
+
|
|
15
24
|
## API reference
|
|
16
25
|
### General
|
|
17
26
|
| Argument | Description | Default value |
|
|
@@ -79,6 +79,7 @@ var chalk_1 = require("chalk");
|
|
|
79
79
|
var path = require("path");
|
|
80
80
|
var prompts = require("prompts");
|
|
81
81
|
var commandDefinition_1 = require("../../Command/commandDefinition");
|
|
82
|
+
var log_1 = require("@signageos/sdk/dist/Console/log");
|
|
82
83
|
var NAME_REGEXP = /^\w(\w|\d|-)*\w$/;
|
|
83
84
|
var NPM_EXECUTABLE = 'npm';
|
|
84
85
|
var OPTION_LIST = [
|
|
@@ -232,8 +233,8 @@ exports.appletGenerate = (0, commandDefinition_1.createCommandDefinition)({
|
|
|
232
233
|
shell: true,
|
|
233
234
|
});
|
|
234
235
|
child.on('close', function () {
|
|
235
|
-
|
|
236
|
-
|
|
236
|
+
(0, log_1.log)('info', "\nApplet ".concat(chalk_1.default.green(appletName), " created!"));
|
|
237
|
+
(0, log_1.log)('info', "use: cd ".concat(chalk_1.default.green(appletRootDirectoryName), " and ").concat(chalk_1.default.green('npm start'), "\n"));
|
|
237
238
|
});
|
|
238
239
|
return [2 /*return*/];
|
|
239
240
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appletGenerateCommand.js","sourceRoot":"","sources":["../../../src/Applet/Generate/appletGenerateCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA+B;AAC/B,6CAA+C;AAC/C,+BAA0B;AAC1B,2BAA6B;AAC7B,iCAAmC;AACnC,qEAA8F;
|
|
1
|
+
{"version":3,"file":"appletGenerateCommand.js","sourceRoot":"","sources":["../../../src/Applet/Generate/appletGenerateCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,6 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
exports.getAppletDirAbsolutePath = exports.DEFAULT_APPLET_DIR_PATH = void 0;
|
|
40
|
+
var log_1 = require("@signageos/sdk/dist/Console/log");
|
|
40
41
|
var fs = require("fs-extra");
|
|
41
42
|
var path = require("path");
|
|
42
43
|
exports.DEFAULT_APPLET_DIR_PATH = 'dist';
|
|
@@ -56,7 +57,7 @@ function getAppletDirAbsolutePath(currentDirectory, options) {
|
|
|
56
57
|
if (appletDirectoryPath.length > 1 && appletDirectoryPath[appletDirectoryPath.length - 1] === '/') {
|
|
57
58
|
appletDirectoryPath = appletDirectoryPath.substring(0, appletDirectoryPath.length - 1);
|
|
58
59
|
}
|
|
59
|
-
|
|
60
|
+
(0, log_1.log)('info', "\nUse applet directory path: ".concat(appletDirectoryPath));
|
|
60
61
|
return [4 /*yield*/, fs.pathExists(appletDirectoryPath)];
|
|
61
62
|
case 1:
|
|
62
63
|
appletDirectoryPathExists = _a.sent();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appletStartCommandHelper.js","sourceRoot":"","sources":["../../../src/Applet/Start/appletStartCommandHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA+B;AAC/B,2BAA6B;AAIhB,QAAA,uBAAuB,GAAG,MAAM,CAAC;AAE9C,SAAsB,wBAAwB,CAC7C,gBAAwB,EACxB,OAAwD;;;;;;oBAEpD,mBAAmB,GAAuB,OAAO,CAAC,aAAa,CAAC,CAAC;oBAErE,IAAI,CAAC,mBAAmB,EAAE;wBACzB,mBAAmB,GAAG,+BAAuB,CAAC;qBAC9C;oBACD,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE;wBAC1C,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,CAAC;qBACvE;oBACD,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,IAAI,mBAAmB,CAAC,mBAAmB,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE;wBAClG,mBAAmB,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC,EAAE,mBAAmB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;qBACvF;oBACD,
|
|
1
|
+
{"version":3,"file":"appletStartCommandHelper.js","sourceRoot":"","sources":["../../../src/Applet/Start/appletStartCommandHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAsD;AACtD,6BAA+B;AAC/B,2BAA6B;AAIhB,QAAA,uBAAuB,GAAG,MAAM,CAAC;AAE9C,SAAsB,wBAAwB,CAC7C,gBAAwB,EACxB,OAAwD;;;;;;oBAEpD,mBAAmB,GAAuB,OAAO,CAAC,aAAa,CAAC,CAAC;oBAErE,IAAI,CAAC,mBAAmB,EAAE;wBACzB,mBAAmB,GAAG,+BAAuB,CAAC;qBAC9C;oBACD,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE;wBAC1C,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,CAAC;qBACvE;oBACD,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,IAAI,mBAAmB,CAAC,mBAAmB,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE;wBAClG,mBAAmB,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC,EAAE,mBAAmB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;qBACvF;oBACD,IAAA,SAAG,EAAC,MAAM,EAAE,uCAAgC,mBAAmB,CAAE,CAAC,CAAC;oBAEjC,qBAAM,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAA;;oBAApE,yBAAyB,GAAG,SAAwC;oBAC1E,IAAI,CAAC,yBAAyB,EAAE;wBAC/B,MAAM,IAAI,KAAK,CAAC,sCAA+B,mBAAmB,CAAE,CAAC,CAAC;qBACtE;oBAEoB,qBAAM,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAA;;oBAAjD,WAAW,GAAG,CAAC,SAAkC,CAAC,CAAC,WAAW,EAAE;oBACtE,IAAI,CAAC,WAAW,EAAE;wBACjB,MAAM,IAAI,KAAK,CAAC,0CAAmC,mBAAmB,CAAE,CAAC,CAAC;qBAC1E;oBAED,sBAAO,mBAAmB,EAAC;;;;CAC3B;AA5BD,4DA4BC"}
|
|
@@ -72,6 +72,7 @@ var deviceFacade_1 = require("../../../Device/deviceFacade");
|
|
|
72
72
|
var appletTestRunFacade_1 = require("./appletTestRunFacade");
|
|
73
73
|
var wait_1 = require("../../../Timer/wait");
|
|
74
74
|
var commandDefinition_1 = require("../../../Command/commandDefinition");
|
|
75
|
+
var log_1 = require("@signageos/sdk/dist/Console/log");
|
|
75
76
|
var OPTION_LIST = [
|
|
76
77
|
organizationFacade_1.NO_DEFAULT_ORGANIZATION_OPTION,
|
|
77
78
|
deviceFacade_1.DEVICE_UID_OPTION,
|
|
@@ -203,18 +204,18 @@ exports.appletTestRun = (0, commandDefinition_1.createCommandDefinition)({
|
|
|
203
204
|
},
|
|
204
205
|
});
|
|
205
206
|
function displaySuccessMessage(appletName, appletVersion, deviceAppletTest) {
|
|
206
|
-
|
|
207
|
-
deviceAppletTest.successfulTests.forEach(function (file) { return
|
|
207
|
+
(0, log_1.log)('info', "Applet ".concat(chalk_1.default.green(appletName), " version ").concat(chalk_1.default.green(appletVersion), " tests ").concat(chalk_1.default.green('succeeded'), "."));
|
|
208
|
+
deviceAppletTest.successfulTests.forEach(function (file) { return (0, log_1.log)('info', chalk_1.default.green('✓ ' + file)); });
|
|
208
209
|
}
|
|
209
210
|
function displayFailureMessage(appletName, appletVersion, deviceAppletTest) {
|
|
210
|
-
|
|
211
|
-
deviceAppletTest.failedTests.forEach(function (file) { return
|
|
212
|
-
deviceAppletTest.successfulTests.forEach(function (file) { return
|
|
211
|
+
(0, log_1.log)('info', "Applet ".concat(chalk_1.default.green(appletName), " version ").concat(chalk_1.default.green(appletVersion), " tests ").concat(chalk_1.default.red('failed'), "."));
|
|
212
|
+
deviceAppletTest.failedTests.forEach(function (file) { return (0, log_1.log)('info', chalk_1.default.red('× ' + file)); });
|
|
213
|
+
deviceAppletTest.successfulTests.forEach(function (file) { return (0, log_1.log)('info', chalk_1.default.green('✓ ' + file)); });
|
|
213
214
|
}
|
|
214
215
|
function printRunTests(identifiers) {
|
|
215
216
|
if (identifiers.length > 0) {
|
|
216
|
-
|
|
217
|
+
(0, log_1.log)('info', chalk_1.default.yellow("Next test files are going to be run..."));
|
|
217
218
|
}
|
|
218
|
-
identifiers.forEach(function (file) { return
|
|
219
|
+
identifiers.forEach(function (file) { return (0, log_1.log)('info', file); });
|
|
219
220
|
}
|
|
220
221
|
//# sourceMappingURL=appletTestRunCommand.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appletTestRunCommand.js","sourceRoot":"","sources":["../../../../src/Applet/Test/Upload/appletTestRunCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA0B;AAC1B,iCAAmC;AACnC,0CAA6D;AAC7D,+EAKkD;AAClD,mDAI4B;AAC5B,8EAA4E;AAC5E,6DAA+E;AAC/E,6DAAgE;AAChE,4CAAuC;AAEvC,wEAAiG;
|
|
1
|
+
{"version":3,"file":"appletTestRunCommand.js","sourceRoot":"","sources":["../../../../src/Applet/Test/Upload/appletTestRunCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -82,6 +82,7 @@ var appletFacade_1 = require("../../appletFacade");
|
|
|
82
82
|
var progressBarFactory_1 = require("../../../CommandLine/progressBarFactory");
|
|
83
83
|
var packageConfig_1 = require("../../../FileSystem/packageConfig");
|
|
84
84
|
var commandDefinition_1 = require("../../../Command/commandDefinition");
|
|
85
|
+
var log_1 = require("@signageos/sdk/dist/Console/log");
|
|
85
86
|
var OPTION_LIST = [
|
|
86
87
|
organizationFacade_1.NO_DEFAULT_ORGANIZATION_OPTION,
|
|
87
88
|
organizationFacade_1.ORGANIZATION_UID_OPTION,
|
|
@@ -245,28 +246,28 @@ exports.appletTestUpload = (0, commandDefinition_1.createCommandDefinition)({
|
|
|
245
246
|
},
|
|
246
247
|
});
|
|
247
248
|
function displaySuccessMessage(appletName, appletVersion) {
|
|
248
|
-
|
|
249
|
-
|
|
249
|
+
(0, log_1.log)('info', "Applet ".concat(chalk_1.default.green(appletName), " version ").concat(chalk_1.default.green(appletVersion), " tests has been uploaded."));
|
|
250
|
+
(0, log_1.log)('info', "To run the tests, use command ".concat(chalk_1.default.blue("sos applet test run")));
|
|
250
251
|
}
|
|
251
252
|
function printMatchedFiles(testFiles) {
|
|
252
253
|
if (testFiles.length > 0) {
|
|
253
|
-
|
|
254
|
+
(0, log_1.log)('info', chalk_1.default.yellow("Next files are going to be checked for upload..."));
|
|
254
255
|
}
|
|
255
|
-
testFiles.forEach(function (file) { return
|
|
256
|
+
testFiles.forEach(function (file) { return (0, log_1.log)('info', file); });
|
|
256
257
|
}
|
|
257
258
|
function printChangesFiles(_a) {
|
|
258
259
|
var identifiersToCreate = _a.identifiersToCreate, identifiersToUpdate = _a.identifiersToUpdate, identifiersToDelete = _a.identifiersToDelete;
|
|
259
260
|
if (identifiersToCreate.length > 0) {
|
|
260
|
-
|
|
261
|
-
identifiersToCreate.forEach(function (file) { return
|
|
261
|
+
(0, log_1.log)('info', chalk_1.default.yellow("Next files is being created..."));
|
|
262
|
+
identifiersToCreate.forEach(function (file) { return (0, log_1.log)('info', file); });
|
|
262
263
|
}
|
|
263
264
|
if (identifiersToUpdate.length > 0) {
|
|
264
|
-
|
|
265
|
-
identifiersToUpdate.forEach(function (file) { return
|
|
265
|
+
(0, log_1.log)('info', chalk_1.default.yellow("Next files is being updated..."));
|
|
266
|
+
identifiersToUpdate.forEach(function (file) { return (0, log_1.log)('info', file); });
|
|
266
267
|
}
|
|
267
268
|
if (identifiersToDelete.length > 0) {
|
|
268
|
-
|
|
269
|
-
identifiersToDelete.forEach(function (file) { return
|
|
269
|
+
(0, log_1.log)('info', chalk_1.default.yellow("Next files is being deleted..."));
|
|
270
|
+
identifiersToDelete.forEach(function (file) { return (0, log_1.log)('info', file); });
|
|
270
271
|
}
|
|
271
272
|
}
|
|
272
273
|
//# sourceMappingURL=appletTestUploadCommand.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appletTestUploadCommand.js","sourceRoot":"","sources":["../../../../src/Applet/Test/Upload/appletTestUploadCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA0B;AAC1B,iCAAmC;AACnC,0CAA6D;AAC7D,+EAAyK;AACzK,mEAAoF;AACpF,mDAI4B;AAC5B,8EAA4E;AAC5E,mEAAgE;AAEhE,wEAAiG;
|
|
1
|
+
{"version":3,"file":"appletTestUploadCommand.js","sourceRoot":"","sources":["../../../../src/Applet/Test/Upload/appletTestUploadCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,7 +65,7 @@ exports.appletUpload = exports.OPTION_LIST = void 0;
|
|
|
65
65
|
var chalk_1 = require("chalk");
|
|
66
66
|
var prompts = require("prompts");
|
|
67
67
|
var helper_1 = require("../../helper");
|
|
68
|
-
var
|
|
68
|
+
var parameters_1 = require("../../parameters");
|
|
69
69
|
var organizationFacade_1 = require("../../Organization/organizationFacade");
|
|
70
70
|
var appletFacade_1 = require("../appletFacade");
|
|
71
71
|
var appletUploadFacade_1 = require("./appletUploadFacade");
|
|
@@ -75,6 +75,7 @@ var progressBarFactory_1 = require("../../CommandLine/progressBarFactory");
|
|
|
75
75
|
var packageConfig_1 = require("../../FileSystem/packageConfig");
|
|
76
76
|
var commandDefinition_1 = require("../../Command/commandDefinition");
|
|
77
77
|
var appletErrors_1 = require("../appletErrors");
|
|
78
|
+
var log_1 = require("@signageos/sdk/dist/Console/log");
|
|
78
79
|
exports.OPTION_LIST = [
|
|
79
80
|
appletUploadCommandHelper_1.APPLET_PATH_OPTION,
|
|
80
81
|
appletUploadCommandHelper_1.ENTRY_FILE_PATH_OPTION,
|
|
@@ -158,7 +159,7 @@ exports.appletUpload = (0, commandDefinition_1.createCommandDefinition)({
|
|
|
158
159
|
if (!(error_1 instanceof appletErrors_1.AppletDoesNotExistError)) {
|
|
159
160
|
throw error_1;
|
|
160
161
|
}
|
|
161
|
-
|
|
162
|
+
(0, log_1.log)('info', chalk_1.default.yellow("applet uid is not present in package file, adding one."));
|
|
162
163
|
return [4 /*yield*/, restApi.applet.create({ name: appletName })];
|
|
163
164
|
case 13:
|
|
164
165
|
createdApplet = _f.sent();
|
|
@@ -205,7 +206,7 @@ exports.appletUpload = (0, commandDefinition_1.createCommandDefinition)({
|
|
|
205
206
|
skipConfirmation = options[yes];
|
|
206
207
|
if (!appletVersionExists) return [3 /*break*/, 28];
|
|
207
208
|
if (!skipConfirmation) return [3 /*break*/, 25];
|
|
208
|
-
|
|
209
|
+
(0, log_1.log)('info', chalk_1.default.yellow("Will override existing version ".concat(appletVersion)));
|
|
209
210
|
overrideAppletVersionConfirmed = true;
|
|
210
211
|
return [3 /*break*/, 27];
|
|
211
212
|
case 25: return [4 /*yield*/, prompts({
|
|
@@ -220,7 +221,7 @@ exports.appletUpload = (0, commandDefinition_1.createCommandDefinition)({
|
|
|
220
221
|
case 27: return [3 /*break*/, 31];
|
|
221
222
|
case 28:
|
|
222
223
|
if (!skipConfirmation) return [3 /*break*/, 29];
|
|
223
|
-
|
|
224
|
+
(0, log_1.log)('info', chalk_1.default.yellow("Will create new version ".concat(appletVersion)));
|
|
224
225
|
createNewAppletVersionConfirmed = true;
|
|
225
226
|
return [3 /*break*/, 31];
|
|
226
227
|
case 29: return [4 /*yield*/, prompts({
|
|
@@ -265,7 +266,7 @@ exports.appletUpload = (0, commandDefinition_1.createCommandDefinition)({
|
|
|
265
266
|
_f.sent();
|
|
266
267
|
_f.label = 35;
|
|
267
268
|
case 35:
|
|
268
|
-
displaySuccessMessage(applet.uid, applet.name, appletVersion, parameters.boxHost);
|
|
269
|
+
displaySuccessMessage(applet.uid, applet.name, appletVersion, parameters_1.parameters.boxHost);
|
|
269
270
|
return [3 /*break*/, 42];
|
|
270
271
|
case 36:
|
|
271
272
|
if (!createNewAppletVersionConfirmed) return [3 /*break*/, 41];
|
|
@@ -300,7 +301,7 @@ exports.appletUpload = (0, commandDefinition_1.createCommandDefinition)({
|
|
|
300
301
|
_f.sent();
|
|
301
302
|
_f.label = 40;
|
|
302
303
|
case 40:
|
|
303
|
-
displaySuccessMessage(applet.uid, applet.name, appletVersion, parameters.boxHost);
|
|
304
|
+
displaySuccessMessage(applet.uid, applet.name, appletVersion, parameters_1.parameters.boxHost);
|
|
304
305
|
return [3 /*break*/, 42];
|
|
305
306
|
case 41: throw new Error('Applet version upload was canceled.');
|
|
306
307
|
case 42: return [2 /*return*/];
|
|
@@ -310,12 +311,12 @@ exports.appletUpload = (0, commandDefinition_1.createCommandDefinition)({
|
|
|
310
311
|
},
|
|
311
312
|
});
|
|
312
313
|
function displaySuccessMessage(appletUid, appletName, appletVersion, boxHost) {
|
|
313
|
-
|
|
314
|
+
(0, log_1.log)('info', "Applet ".concat(chalk_1.default.green(appletName), " version ").concat(chalk_1.default.green(appletVersion), " has been uploaded."));
|
|
314
315
|
var appletBoxUri = "https://".concat(boxHost, "/applet/").concat(appletUid, "/").concat(appletVersion, "/build");
|
|
315
|
-
|
|
316
|
+
(0, log_1.log)('info', "To build specific applications (Tizen, WebOS, SSSP, BrightSign, RPi, Android etc.) go to ".concat(chalk_1.default.blue(appletBoxUri)));
|
|
316
317
|
}
|
|
317
318
|
function displaySingleFileAppletDeprecationNote() {
|
|
318
|
-
|
|
319
|
+
(0, log_1.log)('warning', "".concat(chalk_1.default.red("Applets with only applet-path file are ".concat(chalk_1.default.bold("deprecated"), ".")), " Please find more information at our website."));
|
|
319
320
|
}
|
|
320
321
|
/**
|
|
321
322
|
*
|
|
@@ -323,8 +324,8 @@ function displaySingleFileAppletDeprecationNote() {
|
|
|
323
324
|
*/
|
|
324
325
|
function printUploadFiles(appletFiles) {
|
|
325
326
|
if (appletFiles.length > 0) {
|
|
326
|
-
|
|
327
|
+
(0, log_1.log)('info', chalk_1.default.yellow("Next files will be uploaded ..."));
|
|
327
328
|
}
|
|
328
|
-
appletFiles.forEach(function (file) { return
|
|
329
|
+
appletFiles.forEach(function (file) { return (0, log_1.log)('info', file); });
|
|
329
330
|
}
|
|
330
331
|
//# sourceMappingURL=appletUploadCommand.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appletUploadCommand.js","sourceRoot":"","sources":["../../../src/Applet/Upload/appletUploadCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA0B;AAC1B,iCAAmC;AACnC,uCAA0D;AAC1D
|
|
1
|
+
{"version":3,"file":"appletUploadCommand.js","sourceRoot":"","sources":["../../../src/Applet/Upload/appletUploadCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,6 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
exports.getAppletEntryFileRelativePath = exports.getAppletEntryFileAbsolutePath = exports.getAppletBinaryFileAbsolutePath = exports.getAppletDirectoryAbsolutePath = exports.DEFAULT_APPLET_BINARY_FILE_PATH = exports.DEFAULT_APPLET_ENTRY_FILE_PATH = exports.DEFAULT_APPLET_DIR_PATH = exports.APPLET_PATH_OPTION = exports.ENTRY_FILE_PATH_OPTION = void 0;
|
|
40
|
+
var log_1 = require("@signageos/sdk/dist/Console/log");
|
|
40
41
|
var fs = require("fs-extra");
|
|
41
42
|
var path = require("path");
|
|
42
43
|
exports.ENTRY_FILE_PATH_OPTION = {
|
|
@@ -68,7 +69,7 @@ function getAppletDirectoryAbsolutePath(currentDirectory, options) {
|
|
|
68
69
|
if (appletDirectoryPath.length > 1 && appletDirectoryPath[appletDirectoryPath.length - 1] === '/') {
|
|
69
70
|
appletDirectoryPath = appletDirectoryPath.substring(0, appletDirectoryPath.length - 1);
|
|
70
71
|
}
|
|
71
|
-
|
|
72
|
+
(0, log_1.log)('info', "\nUse applet project directory path: ".concat(appletDirectoryPath));
|
|
72
73
|
return [4 /*yield*/, fs.pathExists(appletDirectoryPath)];
|
|
73
74
|
case 1:
|
|
74
75
|
appletDirectoryPathExists = _a.sent();
|
|
@@ -100,7 +101,7 @@ function getAppletBinaryFileAbsolutePath(currentDirectory, options) {
|
|
|
100
101
|
if (!path.isAbsolute(appletBinaryFilePath)) {
|
|
101
102
|
appletBinaryFilePath = path.join(currentDirectory, appletBinaryFilePath);
|
|
102
103
|
}
|
|
103
|
-
|
|
104
|
+
(0, log_1.log)('info', "\nUse applet binary file: ".concat(appletBinaryFilePath));
|
|
104
105
|
return [4 /*yield*/, fs.pathExists(appletBinaryFilePath)];
|
|
105
106
|
case 1:
|
|
106
107
|
appletBinaryFilePathExists = _a.sent();
|
|
@@ -132,7 +133,7 @@ function getAppletEntryFileAbsolutePath(currentDirectory, options) {
|
|
|
132
133
|
if (!path.isAbsolute(appletEntryFilePath)) {
|
|
133
134
|
appletEntryFilePath = path.join(currentDirectory, appletEntryFilePath);
|
|
134
135
|
}
|
|
135
|
-
|
|
136
|
+
(0, log_1.log)('info', "\nUse applet entry file: ".concat(appletEntryFilePath));
|
|
136
137
|
return [4 /*yield*/, fs.pathExists(appletEntryFilePath)];
|
|
137
138
|
case 1:
|
|
138
139
|
appletEntryFilePathExists = _a.sent();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appletUploadCommandHelper.js","sourceRoot":"","sources":["../../../src/Applet/Upload/appletUploadCommandHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA+B;AAC/B,2BAA6B;AAGhB,QAAA,sBAAsB,GAAG;IACrC,IAAI,EAAE,iBAAiB;IACvB,IAAI,EAAE,MAAM;IACZ,WAAW,EAAE,qEAAqE;CACzE,CAAC;AAEE,QAAA,kBAAkB,GAAG;IACjC,IAAI,EAAE,aAAa;IACnB,IAAI,EAAE,MAAM;IACZ,WAAW,EAAE,iHAAiH;CACrH,CAAC;AAEE,QAAA,uBAAuB,GAAG,GAAG,CAAC;AAC9B,QAAA,8BAA8B,GAAG,iBAAiB,CAAC;AACnD,QAAA,+BAA+B,GAAG,iBAAiB,CAAC;AAEjE,SAAsB,8BAA8B,CACnD,gBAAwB,EACxB,OAAwD;;;;;;oBAEpD,mBAAmB,GAAuB,OAAO,CAAC,aAAa,CAAC,CAAC;oBAErE,IAAI,CAAC,mBAAmB,EAAE;wBACzB,mBAAmB,GAAG,+BAAuB,CAAC;qBAC9C;oBACD,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE;wBAC1C,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,CAAC;qBACvE;oBACD,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,IAAI,mBAAmB,CAAC,mBAAmB,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE;wBAClG,mBAAmB,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC,EAAE,mBAAmB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;qBACvF;oBACD,
|
|
1
|
+
{"version":3,"file":"appletUploadCommandHelper.js","sourceRoot":"","sources":["../../../src/Applet/Upload/appletUploadCommandHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,6 +44,7 @@ var Debug = require("debug");
|
|
|
44
44
|
var NotFoundError_1 = require("@signageos/sdk/dist/RestApi/Error/NotFoundError");
|
|
45
45
|
var appletUploadFacadeHelper_1 = require("./appletUploadFacadeHelper");
|
|
46
46
|
var helper_1 = require("../../FileSystem/helper");
|
|
47
|
+
var log_1 = require("@signageos/sdk/dist/Console/log");
|
|
47
48
|
var debug = Debug('@signageos/cli:Applet:Upload:appletUploadFacade');
|
|
48
49
|
function updateSingleFileApplet(parameters) {
|
|
49
50
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -100,7 +101,7 @@ var updateMultiFileApplet = function (parameters) { return __awaiter(void 0, voi
|
|
|
100
101
|
}
|
|
101
102
|
else {
|
|
102
103
|
changedFilesCounter++;
|
|
103
|
-
|
|
104
|
+
(0, log_1.log)('info', chalk_1.default.yellow(" Uploading ".concat(fileAbsolutePath)));
|
|
104
105
|
}
|
|
105
106
|
if (progressBar) {
|
|
106
107
|
progressBar.init({ size: fileSize, name: fileRelativePath });
|
|
@@ -190,7 +191,7 @@ var updateMultiFileApplet = function (parameters) { return __awaiter(void 0, voi
|
|
|
190
191
|
progressBar.end();
|
|
191
192
|
}
|
|
192
193
|
if (changedFilesCounter === 0) {
|
|
193
|
-
|
|
194
|
+
(0, log_1.log)('info', "No files changed in ".concat(chalk_1.default.yellow.bold(applet.directoryPath)));
|
|
194
195
|
}
|
|
195
196
|
return [2 /*return*/];
|
|
196
197
|
}
|
|
@@ -258,7 +259,7 @@ var createMultiFileFileApplet = function (parameters) { return __awaiter(void 0,
|
|
|
258
259
|
_a.label = 6;
|
|
259
260
|
case 6:
|
|
260
261
|
_a.trys.push([6, 8, , 9]);
|
|
261
|
-
|
|
262
|
+
(0, log_1.log)('info', chalk_1.default.yellow(" Uploading ".concat(fileAbsolutePath)));
|
|
262
263
|
return [4 /*yield*/, restApi.applet.version.file.create(applet.uid, applet.version, {
|
|
263
264
|
name: path.basename(filePosixPath),
|
|
264
265
|
path: filePosixPath,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appletUploadFacade.js","sourceRoot":"","sources":["../../../src/Applet/Upload/appletUploadFacade.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2BAA6B;AAC7B,6BAA+B;AAC/B,+BAA0B;AAC1B,6BAA+B;AAE/B,iFAA4E;AAC5E,uEAAiG;AACjG,kDAAsE;
|
|
1
|
+
{"version":3,"file":"appletUploadFacade.js","sourceRoot":"","sources":["../../../src/Applet/Upload/appletUploadFacade.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,7 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
39
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
|
-
var
|
|
42
|
+
var parameters_1 = require("../parameters");
|
|
43
43
|
var packageConfig_1 = require("../FileSystem/packageConfig");
|
|
44
44
|
var appletErrors_1 = require("./appletErrors");
|
|
45
45
|
exports.APPLET_UID_OPTION = { name: 'applet-uid', type: String, description: 'Applet UID' };
|
|
@@ -57,9 +57,9 @@ function getApplet(directoryPath) {
|
|
|
57
57
|
if (!packageJSONObject) {
|
|
58
58
|
throw new Error("No package.json found in: ".concat(packageJSONPath));
|
|
59
59
|
}
|
|
60
|
-
appletUid = (_a = parameters.applet.uid) !== null && _a !== void 0 ? _a : (_b = packageJSONObject.sos) === null || _b === void 0 ? void 0 : _b.appletUid;
|
|
61
|
-
appletVersion = (_c = parameters.applet.version) !== null && _c !== void 0 ? _c : packageJSONObject.version;
|
|
62
|
-
appletName = (_d = parameters.applet.name) !== null && _d !== void 0 ? _d : packageJSONObject.name;
|
|
60
|
+
appletUid = (_a = parameters_1.parameters.applet.uid) !== null && _a !== void 0 ? _a : (_b = packageJSONObject.sos) === null || _b === void 0 ? void 0 : _b.appletUid;
|
|
61
|
+
appletVersion = (_c = parameters_1.parameters.applet.version) !== null && _c !== void 0 ? _c : packageJSONObject.version;
|
|
62
|
+
appletName = (_d = parameters_1.parameters.applet.name) !== null && _d !== void 0 ? _d : packageJSONObject.name;
|
|
63
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 : '';
|
|
64
64
|
if (!appletVersion) {
|
|
65
65
|
throw new Error("No \"version\" key found in: ".concat(packageJSONPath, " nor SOS_APPLET_VERSION environment variable specified"));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appletFacade.js","sourceRoot":"","sources":["../../src/Applet/appletFacade.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2BAA6B;AAC7B,iCAAmC;AAGnC,
|
|
1
|
+
{"version":3,"file":"appletFacade.js","sourceRoot":"","sources":["../../src/Applet/appletFacade.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,12 +43,13 @@ var Debug = require("debug");
|
|
|
43
43
|
var os = require("os");
|
|
44
44
|
var helper_1 = require("../helper");
|
|
45
45
|
var runControlHelper_1 = require("../RunControl/runControlHelper");
|
|
46
|
-
var
|
|
46
|
+
var parameters_1 = require("../parameters");
|
|
47
47
|
var commandDefinition_1 = require("../Command/commandDefinition");
|
|
48
48
|
var apiVersions_1 = require("@signageos/sdk/dist/RestApi/apiVersions");
|
|
49
|
+
var log_1 = require("@signageos/sdk/dist/Console/log");
|
|
49
50
|
var debug = Debug('@signageos/cli:Auth:login');
|
|
50
51
|
var OPTION_LIST = [
|
|
51
|
-
{ name: 'username', type: String, description: "Username or e-mail used for ".concat(parameters.boxHost) },
|
|
52
|
+
{ name: 'username', type: String, description: "Username or e-mail used for ".concat(parameters_1.parameters.boxHost) },
|
|
52
53
|
];
|
|
53
54
|
exports.login = (0, commandDefinition_1.createCommandDefinition)({
|
|
54
55
|
name: 'login',
|
|
@@ -66,7 +67,7 @@ exports.login = (0, commandDefinition_1.createCommandDefinition)({
|
|
|
66
67
|
return [4 /*yield*/, prompts({
|
|
67
68
|
type: 'text',
|
|
68
69
|
name: 'username',
|
|
69
|
-
message: "Type your username or e-mail used for ".concat(parameters.boxHost),
|
|
70
|
+
message: "Type your username or e-mail used for ".concat(parameters_1.parameters.boxHost),
|
|
70
71
|
})];
|
|
71
72
|
case 1:
|
|
72
73
|
response = _b.sent();
|
|
@@ -79,7 +80,7 @@ exports.login = (0, commandDefinition_1.createCommandDefinition)({
|
|
|
79
80
|
return [4 /*yield*/, prompts({
|
|
80
81
|
type: 'password',
|
|
81
82
|
name: 'password',
|
|
82
|
-
message: "Type your password used for ".concat(parameters.boxHost),
|
|
83
|
+
message: "Type your password used for ".concat(parameters_1.parameters.boxHost),
|
|
83
84
|
})];
|
|
84
85
|
case 3:
|
|
85
86
|
password = (_b.sent()).password;
|
|
@@ -91,13 +92,13 @@ exports.login = (0, commandDefinition_1.createCommandDefinition)({
|
|
|
91
92
|
case 5:
|
|
92
93
|
_a = _b.sent(), tokenId = _a.id, apiSecurityToken = _a.securityToken, name = _a.name;
|
|
93
94
|
return [4 /*yield*/, (0, runControlHelper_1.saveConfig)({
|
|
94
|
-
apiUrl: apiUrl !== parameters.apiUrl ? apiUrl : undefined,
|
|
95
|
+
apiUrl: apiUrl !== parameters_1.parameters.apiUrl ? apiUrl : undefined,
|
|
95
96
|
identification: tokenId,
|
|
96
97
|
apiSecurityToken: apiSecurityToken,
|
|
97
98
|
})];
|
|
98
99
|
case 6:
|
|
99
100
|
_b.sent();
|
|
100
|
-
|
|
101
|
+
(0, log_1.log)('info', "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)())));
|
|
101
102
|
return [2 /*return*/];
|
|
102
103
|
}
|
|
103
104
|
});
|