@signageos/cli 0.9.2 → 0.10.2
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/CHANGELOG.md +25 -0
- package/README.md +31 -0
- package/config/parameters.d.ts +10 -0
- package/config/parameters.js +22 -0
- package/dist/Applet/Generate/appletGenerateCommand.js +2 -2
- package/dist/Applet/Generate/appletGenerateCommand.js.map +1 -1
- package/dist/Applet/Test/Upload/appletTestRunCommand.d.ts +2 -0
- package/dist/Applet/Test/Upload/appletTestRunCommand.js +212 -0
- package/dist/Applet/Test/Upload/appletTestRunCommand.js.map +1 -0
- package/dist/Applet/Test/Upload/appletTestRunFacade.d.ts +2 -0
- package/dist/Applet/Test/Upload/appletTestRunFacade.js +34 -0
- package/dist/Applet/Test/Upload/appletTestRunFacade.js.map +1 -0
- package/dist/Applet/Test/Upload/appletTestUploadCommand.d.ts +2 -0
- package/dist/Applet/Test/Upload/appletTestUploadCommand.js +264 -0
- package/dist/Applet/Test/Upload/appletTestUploadCommand.js.map +1 -0
- package/dist/Applet/Test/Upload/appletTestUploadFacade.d.ts +4 -0
- package/dist/Applet/Test/Upload/appletTestUploadFacade.js +122 -0
- package/dist/Applet/Test/Upload/appletTestUploadFacade.js.map +1 -0
- package/dist/Applet/Test/appletTestCommand.d.ts +2 -0
- package/dist/Applet/Test/appletTestCommand.js +57 -0
- package/dist/Applet/Test/appletTestCommand.js.map +1 -0
- package/dist/Applet/Upload/appletUploadCommand.js +11 -2
- package/dist/Applet/Upload/appletUploadCommand.js.map +1 -1
- package/dist/Applet/Upload/appletUploadCommandHelper.d.ts +0 -1
- package/dist/Applet/Upload/appletUploadCommandHelper.js +0 -39
- package/dist/Applet/Upload/appletUploadCommandHelper.js.map +1 -1
- package/dist/Applet/appletCommand.js +2 -0
- package/dist/Applet/appletCommand.js.map +1 -1
- package/dist/Applet/appletFacade.d.ts +1 -1
- package/dist/Applet/appletFacade.js +26 -25
- package/dist/Applet/appletFacade.js.map +1 -1
- package/dist/Device/Connect/connectHelper.js +2 -1
- package/dist/Device/Connect/connectHelper.js.map +1 -1
- package/dist/FileSystem/helper.js +29 -37
- package/dist/FileSystem/helper.js.map +1 -1
- package/dist/FileSystem/packageConfig.d.ts +13 -0
- package/dist/FileSystem/packageConfig.js +85 -0
- package/dist/FileSystem/packageConfig.js.map +1 -0
- package/dist/Organization/organizationFacade.d.ts +2 -2
- package/dist/RunControl/runControlHelper.js +16 -4
- package/dist/RunControl/runControlHelper.js.map +1 -1
- package/dist/Timer/wait.d.ts +1 -0
- package/dist/Timer/wait.js +7 -0
- package/dist/Timer/wait.js.map +1 -0
- package/dist/Timing/List/timingListCommand.js +3 -3
- package/dist/Timing/List/timingListCommand.js.map +1 -1
- package/package-lock.json +238 -447
- package/package.json +6 -4
|
@@ -39,6 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
39
39
|
var appletGenerateCommand_1 = require("./Generate/appletGenerateCommand");
|
|
40
40
|
var appletUploadCommand_1 = require("./Upload/appletUploadCommand");
|
|
41
41
|
var appletStartCommand_1 = require("./Start/appletStartCommand");
|
|
42
|
+
var appletTestCommand_1 = require("./Test/appletTestCommand");
|
|
42
43
|
exports.applet = {
|
|
43
44
|
name: 'applet',
|
|
44
45
|
description: 'Applet management',
|
|
@@ -47,6 +48,7 @@ exports.applet = {
|
|
|
47
48
|
appletGenerateCommand_1.appletGenerate,
|
|
48
49
|
appletUploadCommand_1.appletUpload,
|
|
49
50
|
appletStartCommand_1.appletStart,
|
|
51
|
+
appletTestCommand_1.appletTest,
|
|
50
52
|
],
|
|
51
53
|
run: function () {
|
|
52
54
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appletCommand.js","sourceRoot":"","sources":["../../src/Applet/appletCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0EAAkE;AAClE,oEAA4D;AAC5D,iEAAyD;
|
|
1
|
+
{"version":3,"file":"appletCommand.js","sourceRoot":"","sources":["../../src/Applet/appletCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0EAAkE;AAClE,oEAA4D;AAC5D,iEAAyD;AACzD,8DAAsD;AAEzC,QAAA,MAAM,GAAa;IAC/B,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,mBAAmB;IAChC,UAAU,EAAE,EAAE;IACd,QAAQ,EAAE;QACT,sCAAc;QACd,kCAAY;QACZ,gCAAW;QACX,8BAAU;KACV;IACK,GAAG;;;gBACR,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;;;KACnC;CACD,CAAC"}
|
|
@@ -36,35 +36,37 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
36
36
|
}
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
-
var fs = require("fs-extra");
|
|
40
39
|
var path = require("path");
|
|
41
|
-
var helper_1 = require("../helper");
|
|
42
40
|
var prompts = require("prompts");
|
|
41
|
+
var parameters = require("../../config/parameters");
|
|
42
|
+
var packageConfig_1 = require("../FileSystem/packageConfig");
|
|
43
43
|
function getApplet(directoryPath) {
|
|
44
|
+
var _a, _b, _c, _d;
|
|
44
45
|
return __awaiter(this, void 0, void 0, function () {
|
|
45
|
-
var packageJSONPath,
|
|
46
|
-
return __generator(this, function (
|
|
47
|
-
switch (
|
|
46
|
+
var packageJSONPath, packageJSONObject, appletUid, appletVersion, appletName;
|
|
47
|
+
return __generator(this, function (_e) {
|
|
48
|
+
switch (_e.label) {
|
|
48
49
|
case 0:
|
|
49
50
|
packageJSONPath = path.join(directoryPath, 'package.json');
|
|
50
|
-
return [4 /*yield*/,
|
|
51
|
+
return [4 /*yield*/, packageConfig_1.loadPackage(directoryPath)];
|
|
51
52
|
case 1:
|
|
52
|
-
|
|
53
|
-
if (!
|
|
53
|
+
packageJSONObject = _e.sent();
|
|
54
|
+
if (!packageJSONObject) {
|
|
54
55
|
throw new Error("No package.json found in: " + packageJSONPath);
|
|
55
56
|
}
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
57
|
+
appletUid = (_a = parameters.applet.uid) !== null && _a !== void 0 ? _a : (_b = packageJSONObject.sos) === null || _b === void 0 ? void 0 : _b.appletUid;
|
|
58
|
+
appletVersion = (_c = parameters.applet.version) !== null && _c !== void 0 ? _c : packageJSONObject.version;
|
|
59
|
+
appletName = (_d = parameters.applet.name) !== null && _d !== void 0 ? _d : packageJSONObject.name;
|
|
60
|
+
if (!appletVersion) {
|
|
61
|
+
throw new Error("No \"version\" key found in: " + packageJSONPath + " nor SOS_APPLET_VERSION environment variable specified");
|
|
62
|
+
}
|
|
63
|
+
if (!appletName) {
|
|
64
|
+
throw new Error("No \"name\" key found in: " + packageJSONPath + " nor SOS_APPLET_NAME environment variable specified");
|
|
63
65
|
}
|
|
64
66
|
return [2 /*return*/, {
|
|
65
67
|
uid: appletUid,
|
|
66
|
-
name:
|
|
67
|
-
version:
|
|
68
|
+
name: appletName,
|
|
69
|
+
version: appletVersion,
|
|
68
70
|
}];
|
|
69
71
|
}
|
|
70
72
|
});
|
|
@@ -91,17 +93,16 @@ function getAppletName(directoryPath) {
|
|
|
91
93
|
}
|
|
92
94
|
exports.getAppletName = getAppletName;
|
|
93
95
|
function getAppletVersion(directoryPath) {
|
|
96
|
+
var _a;
|
|
94
97
|
return __awaiter(this, void 0, void 0, function () {
|
|
95
|
-
var
|
|
96
|
-
return __generator(this, function (
|
|
97
|
-
switch (
|
|
98
|
-
case 0:
|
|
99
|
-
packageJSONPath = path.join(directoryPath, 'package.json');
|
|
100
|
-
return [4 /*yield*/, fs.readFile(packageJSONPath, { encoding: 'utf8' })];
|
|
98
|
+
var packageJSONObject, packageJSONPath;
|
|
99
|
+
return __generator(this, function (_b) {
|
|
100
|
+
switch (_b.label) {
|
|
101
|
+
case 0: return [4 /*yield*/, packageConfig_1.loadPackage(directoryPath)];
|
|
101
102
|
case 1:
|
|
102
|
-
|
|
103
|
-
packageJSONObject = JSON.parse(packageJSONRaw, helper_1.deserializeJSON);
|
|
103
|
+
packageJSONObject = (_a = _b.sent()) !== null && _a !== void 0 ? _a : {};
|
|
104
104
|
if (!packageJSONObject.version) {
|
|
105
|
+
packageJSONPath = path.join(directoryPath, 'package.json');
|
|
105
106
|
throw new Error("No \"version\" key found in: " + packageJSONPath);
|
|
106
107
|
}
|
|
107
108
|
return [2 /*return*/, packageJSONObject.version];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appletFacade.js","sourceRoot":"","sources":["../../src/Applet/appletFacade.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"appletFacade.js","sourceRoot":"","sources":["../../src/Applet/appletFacade.ts"],"names":[],"mappings":"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"}
|
|
@@ -80,6 +80,7 @@ var helper_1 = require("../../FileSystem/helper");
|
|
|
80
80
|
var appletUploadFacadeHelper_1 = require("../../Applet/Upload/appletUploadFacadeHelper");
|
|
81
81
|
var os_1 = require("os");
|
|
82
82
|
var deviceFacade_1 = require("../deviceFacade");
|
|
83
|
+
var parameters = require("../../../config/parameters");
|
|
83
84
|
var archiver = require('archiver');
|
|
84
85
|
var CONNECT_DIRECTORY = 'signageos';
|
|
85
86
|
var connectRuntimeDirPath = path.join(os.tmpdir(), CONNECT_DIRECTORY);
|
|
@@ -103,7 +104,7 @@ function serveApplet(projectDirectory, appletData, device) {
|
|
|
103
104
|
});
|
|
104
105
|
app.use(zipAddress, express.static(path.join(connectRuntimeDirPath, device.uid, 'package.zip' + ("" + device.uid))));
|
|
105
106
|
server = http.createServer(app);
|
|
106
|
-
deviceUlrInBox = "https://" +
|
|
107
|
+
deviceUlrInBox = "https://" + parameters.boxHost + "/device/" + device.uid;
|
|
107
108
|
server.listen(function () {
|
|
108
109
|
console.log("Serving applet from " + chalk_1.default.blue(chalk_1.default.bold(createDomain_1.createDomain({ useLocalIp: true, port: 8080 }, server))) + " on " + chalk_1.default.magenta(chalk_1.default.bold(device.name)) + " (" + chalk_1.default.blue(chalk_1.default.bold(deviceUlrInBox)) + ")");
|
|
109
110
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connectHelper.js","sourceRoot":"","sources":["../../../src/Device/Connect/connectHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uBAAyB;AACzB,6BAA+B;AAC/B,2BAA6B;AAC7B,iCAAmC;AACnC,2BAA6B;AAC7B,yBAA2B;AAC3B,2BAA6B;AAC7B,+BAA0B;AAC1B,4DAA2D;AAC3D,kDAA0E;AAC1E,yFAAyF;AAEzF,yBAAuC;AACvC,gDAAmD;AAEnD,IAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAErC,IAAM,iBAAiB,GAAG,WAAW,CAAC;AACtC,IAAM,qBAAqB,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,iBAAiB,CAAC,CAAC;AAWxE,SAAsB,WAAW,CAC/B,gBAAwB,EACxB,UAA4B,EAC5B,MAAkB;;;;;wBAEnB,qBAAM,eAAe,CAAC,gBAAgB,EAAE,MAAM,CAAC,GAAG,CAAC,EAAA;;oBAAnD,SAAmD,CAAC;oBAC9C,GAAG,GAAG,OAAO,EAAE,CAAC;oBACtB,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE;wBACpB,MAAM,IAAI,KAAK,CAAC,wFAAsF,eAAK,CAAC,IAAI,CAAC,eAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAG,CAAC,CAAC;qBACrJ;oBACK,UAAU,GAAG,aAAW,UAAU,CAAC,GAAG,SAAI,UAAU,CAAC,OAAO,wCAAqC,CAAC;oBACxG,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;oBAChB,GAAG,CAAC,GAAG,CAAC,UAAC,IAAI,EAAE,GAAG,EAAE,IAAI;wBACvB,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;wBACxC,IAAI,EAAE,CAAC;oBACR,CAAC,CAAC,CAAC;oBACH,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,MAAM,CAAC,GAAG,EAAE,aAAa,IAAG,KAAG,MAAM,CAAC,GAAK,CAAA,CAAC,CAAC,CAAC,CAAC;oBAC7G,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;oBAChC,cAAc,GAAG,aAAW,
|
|
1
|
+
{"version":3,"file":"connectHelper.js","sourceRoot":"","sources":["../../../src/Device/Connect/connectHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -63,6 +63,7 @@ var glob = require("globby");
|
|
|
63
63
|
var chalk_1 = require("chalk");
|
|
64
64
|
var Debug = require("debug");
|
|
65
65
|
var helper_1 = require("../Stream/helper");
|
|
66
|
+
var packageConfig_1 = require("./packageConfig");
|
|
66
67
|
var debug = Debug('@signageos/cli:FileSystem:helper');
|
|
67
68
|
var parseIgnoreFile = require('parse-gitignore');
|
|
68
69
|
var DEFAULT_IGNORE_FILE = '.sosignore';
|
|
@@ -101,22 +102,20 @@ exports.getFileType = getFileType;
|
|
|
101
102
|
* @note file existence is validated the very beginning of upload
|
|
102
103
|
*/
|
|
103
104
|
function listDirectoryContentRecursively(appletDirPath, ignoreFileDirPath) {
|
|
105
|
+
var _a;
|
|
104
106
|
return __awaiter(this, void 0, void 0, function () {
|
|
105
|
-
var
|
|
106
|
-
return __generator(this, function (
|
|
107
|
-
switch (
|
|
108
|
-
case 0:
|
|
109
|
-
absolutePkgPath = path.join(appletDirPath, 'package.json');
|
|
110
|
-
_b = (_a = JSON).parse;
|
|
111
|
-
return [4 /*yield*/, fs.readFile(absolutePkgPath, 'utf-8')];
|
|
107
|
+
var pkgJson, files, filesSet_1, paths, ignorePatterns_1, usedIgnoreFilePath, index, ignoreFileName, ignoreFilePath, ignoreFileExists, usedIgnoreFileBuffer, ignoreFilePatterns;
|
|
108
|
+
return __generator(this, function (_b) {
|
|
109
|
+
switch (_b.label) {
|
|
110
|
+
case 0: return [4 /*yield*/, packageConfig_1.loadPackage(appletDirPath)];
|
|
112
111
|
case 1:
|
|
113
|
-
pkgJson =
|
|
112
|
+
pkgJson = (_a = _b.sent()) !== null && _a !== void 0 ? _a : {};
|
|
114
113
|
files = [];
|
|
115
114
|
if (!(pkgJson.files && Array.isArray(pkgJson.files))) return [3 /*break*/, 3];
|
|
116
115
|
filesSet_1 = prepareFilesToInclude();
|
|
117
116
|
return [4 /*yield*/, getAllPaths(appletDirPath, pkgJson.files)];
|
|
118
117
|
case 2:
|
|
119
|
-
paths =
|
|
118
|
+
paths = _b.sent();
|
|
120
119
|
paths.forEach(function (p) { return filesSet_1.add(p); });
|
|
121
120
|
files = __spread(filesSet_1).map(function (f) { return path.join(appletDirPath, f); });
|
|
122
121
|
return [3 /*break*/, 11];
|
|
@@ -124,19 +123,19 @@ function listDirectoryContentRecursively(appletDirPath, ignoreFileDirPath) {
|
|
|
124
123
|
ignorePatterns_1 = [];
|
|
125
124
|
usedIgnoreFilePath = undefined;
|
|
126
125
|
index = 0;
|
|
127
|
-
|
|
126
|
+
_b.label = 4;
|
|
128
127
|
case 4:
|
|
129
128
|
if (!(index < IGNORE_FILES.length)) return [3 /*break*/, 7];
|
|
130
129
|
ignoreFileName = IGNORE_FILES[index];
|
|
131
130
|
ignoreFilePath = path.join(ignoreFileDirPath, ignoreFileName);
|
|
132
131
|
return [4 /*yield*/, fs.pathExists(ignoreFilePath)];
|
|
133
132
|
case 5:
|
|
134
|
-
ignoreFileExists =
|
|
133
|
+
ignoreFileExists = _b.sent();
|
|
135
134
|
if (ignoreFileExists) {
|
|
136
135
|
usedIgnoreFilePath = ignoreFilePath;
|
|
137
136
|
return [3 /*break*/, 7];
|
|
138
137
|
}
|
|
139
|
-
|
|
138
|
+
_b.label = 6;
|
|
140
139
|
case 6:
|
|
141
140
|
index++;
|
|
142
141
|
return [3 /*break*/, 4];
|
|
@@ -150,18 +149,18 @@ function listDirectoryContentRecursively(appletDirPath, ignoreFileDirPath) {
|
|
|
150
149
|
if (!usedIgnoreFilePath) return [3 /*break*/, 9];
|
|
151
150
|
return [4 /*yield*/, fs.readFile(usedIgnoreFilePath)];
|
|
152
151
|
case 8:
|
|
153
|
-
usedIgnoreFileBuffer =
|
|
152
|
+
usedIgnoreFileBuffer = _b.sent();
|
|
154
153
|
ignoreFilePatterns = parseIgnoreFile(usedIgnoreFileBuffer);
|
|
155
154
|
ignoreFilePatterns.forEach(function (pattern) { return ignorePatterns_1.push("!" + pattern); });
|
|
156
|
-
|
|
155
|
+
_b.label = 9;
|
|
157
156
|
case 9: return [4 /*yield*/, glob(__spread(['**/*'], ignorePatterns_1), {
|
|
158
157
|
cwd: appletDirPath,
|
|
159
158
|
absolute: true,
|
|
160
159
|
dot: true,
|
|
161
160
|
})];
|
|
162
161
|
case 10:
|
|
163
|
-
files =
|
|
164
|
-
|
|
162
|
+
files = _b.sent();
|
|
163
|
+
_b.label = 11;
|
|
165
164
|
case 11:
|
|
166
165
|
debug('listed files', files);
|
|
167
166
|
return [2 /*return*/, files];
|
|
@@ -178,35 +177,28 @@ function prepareFilesToInclude() {
|
|
|
178
177
|
}
|
|
179
178
|
function validateAllFormalities(appletDir, entryFile) {
|
|
180
179
|
return __awaiter(this, void 0, void 0, function () {
|
|
181
|
-
var pkgJson, absolutePkgPath,
|
|
182
|
-
return __generator(this, function (
|
|
183
|
-
switch (
|
|
184
|
-
case 0:
|
|
185
|
-
absolutePkgPath = path.join(appletDir, 'package.json');
|
|
186
|
-
_d.label = 1;
|
|
180
|
+
var pkgJson, absolutePkgPath, paths;
|
|
181
|
+
return __generator(this, function (_a) {
|
|
182
|
+
switch (_a.label) {
|
|
183
|
+
case 0: return [4 /*yield*/, packageConfig_1.loadPackage(appletDir)];
|
|
187
184
|
case 1:
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
return [3 /*break*/, 4];
|
|
194
|
-
case 3:
|
|
195
|
-
_c = _d.sent();
|
|
196
|
-
throw new Error("Cannot find package.json file on path " + absolutePkgPath);
|
|
197
|
-
case 4:
|
|
185
|
+
pkgJson = _a.sent();
|
|
186
|
+
if (!pkgJson) {
|
|
187
|
+
absolutePkgPath = path.join(appletDir, 'package.json');
|
|
188
|
+
throw new Error("Cannot find package.json file on path " + absolutePkgPath);
|
|
189
|
+
}
|
|
198
190
|
if (pkgJson.main !== entryFile) {
|
|
199
191
|
throw new Error(pkgJson.main + " from package.json file doesn't match with entry file: " + entryFile);
|
|
200
192
|
}
|
|
201
|
-
if (!Array.isArray(pkgJson.files)) return [3 /*break*/,
|
|
193
|
+
if (!Array.isArray(pkgJson.files)) return [3 /*break*/, 3];
|
|
202
194
|
return [4 /*yield*/, getAllPaths(appletDir, pkgJson.files)];
|
|
203
|
-
case
|
|
204
|
-
paths =
|
|
195
|
+
case 2:
|
|
196
|
+
paths = _a.sent();
|
|
205
197
|
if (!paths.includes(pkgJson.main)) {
|
|
206
198
|
throw new Error(pkgJson.main + " is not a part of tracking files");
|
|
207
199
|
}
|
|
208
|
-
|
|
209
|
-
case
|
|
200
|
+
_a.label = 3;
|
|
201
|
+
case 3: return [2 /*return*/];
|
|
210
202
|
}
|
|
211
203
|
});
|
|
212
204
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../src/FileSystem/helper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA+B;AAC/B,2BAA6B;AAC7B,wCAAmC;AACnC,6BAA+B;AAC/B,+BAA0B;AAC1B,6BAA+B;AAC/B,2CAA8C;AAC9C,IAAM,KAAK,GAAG,KAAK,CAAC,kCAAkC,CAAC,CAAC;AAExD,IAAM,eAAe,GAAgC,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAEhF,IAAM,mBAAmB,GAAG,YAAY,CAAC;AACzC,IAAM,YAAY,GAAG,CAAC,mBAAmB,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;AACvE,IAAM,iBAAiB,GAAG,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../src/FileSystem/helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
export interface ISosPackageConfig {
|
|
2
|
+
appletUid?: string;
|
|
3
|
+
tests?: string[];
|
|
4
|
+
}
|
|
5
|
+
export interface IPackageConfig {
|
|
6
|
+
name: string;
|
|
7
|
+
version: string;
|
|
8
|
+
sos?: ISosPackageConfig;
|
|
9
|
+
main: string;
|
|
10
|
+
files?: string[];
|
|
11
|
+
}
|
|
12
|
+
export declare function saveToPackage(currentDirectory: string, data: Partial<IPackageConfig>): Promise<void>;
|
|
13
|
+
export declare function loadPackage(currentDirectory: string): Promise<Partial<IPackageConfig> | null>;
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
12
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
13
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
14
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
|
+
function step(op) {
|
|
16
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
+
while (_) try {
|
|
18
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
|
+
switch (op[0]) {
|
|
21
|
+
case 0: case 1: t = op; break;
|
|
22
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
23
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
24
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
25
|
+
default:
|
|
26
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
27
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
28
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
29
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
30
|
+
if (t[2]) _.ops.pop();
|
|
31
|
+
_.trys.pop(); continue;
|
|
32
|
+
}
|
|
33
|
+
op = body.call(thisArg, _);
|
|
34
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
35
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
|
+
}
|
|
37
|
+
};
|
|
38
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
+
var fs = require("fs-extra");
|
|
40
|
+
var path = require("path");
|
|
41
|
+
var helper_1 = require("../helper");
|
|
42
|
+
var _ = require("lodash");
|
|
43
|
+
function saveToPackage(currentDirectory, data) {
|
|
44
|
+
var _a;
|
|
45
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
46
|
+
var previousContent, packageJSONPath, newContent;
|
|
47
|
+
return __generator(this, function (_b) {
|
|
48
|
+
switch (_b.label) {
|
|
49
|
+
case 0: return [4 /*yield*/, loadPackage(currentDirectory)];
|
|
50
|
+
case 1:
|
|
51
|
+
previousContent = (_a = _b.sent()) !== null && _a !== void 0 ? _a : {};
|
|
52
|
+
packageJSONPath = path.join(currentDirectory, 'package.json');
|
|
53
|
+
newContent = _.merge({}, previousContent, data);
|
|
54
|
+
return [4 /*yield*/, fs.writeFile(packageJSONPath, JSON.stringify(newContent, undefined, 2) + '\n')];
|
|
55
|
+
case 2:
|
|
56
|
+
_b.sent();
|
|
57
|
+
return [2 /*return*/];
|
|
58
|
+
}
|
|
59
|
+
});
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
exports.saveToPackage = saveToPackage;
|
|
63
|
+
function loadPackage(currentDirectory) {
|
|
64
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
65
|
+
var packageJSONPath, packageJSONPathExists, packageRaw;
|
|
66
|
+
return __generator(this, function (_a) {
|
|
67
|
+
switch (_a.label) {
|
|
68
|
+
case 0:
|
|
69
|
+
packageJSONPath = path.join(currentDirectory, 'package.json');
|
|
70
|
+
return [4 /*yield*/, fs.pathExists(packageJSONPath)];
|
|
71
|
+
case 1:
|
|
72
|
+
packageJSONPathExists = _a.sent();
|
|
73
|
+
if (!packageJSONPathExists) {
|
|
74
|
+
return [2 /*return*/, null];
|
|
75
|
+
}
|
|
76
|
+
return [4 /*yield*/, fs.readFile(packageJSONPath, { encoding: 'utf8' })];
|
|
77
|
+
case 2:
|
|
78
|
+
packageRaw = _a.sent();
|
|
79
|
+
return [2 /*return*/, JSON.parse(packageRaw, helper_1.deserializeJSON)];
|
|
80
|
+
}
|
|
81
|
+
});
|
|
82
|
+
});
|
|
83
|
+
}
|
|
84
|
+
exports.loadPackage = loadPackage;
|
|
85
|
+
//# sourceMappingURL=packageConfig.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"packageConfig.js","sourceRoot":"","sources":["../../src/FileSystem/packageConfig.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA+B;AAC/B,2BAA6B;AAC7B,oCAA4C;AAC5C,0BAA4B;AAe5B,SAAsB,aAAa,CAAC,gBAAwB,EAAE,IAA6B;;;;;;wBAClE,qBAAM,WAAW,CAAC,gBAAgB,CAAC,EAAA;;oBAArD,eAAe,SAAG,SAAmC,mCAAI,EAAE;oBAC3D,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;oBAC9D,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,eAAe,EAAE,IAAI,CAAC,CAAC;oBACtD,qBAAM,EAAE,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,SAAS,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,EAAA;;oBAApF,SAAoF,CAAC;;;;;CACrF;AALD,sCAKC;AAED,SAAsB,WAAW,CAAC,gBAAwB;;;;;;oBACnD,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;oBACtC,qBAAM,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAA;;oBAA5D,qBAAqB,GAAG,SAAoC;oBAElE,IAAI,CAAC,qBAAqB,EAAE;wBAC3B,sBAAO,IAAI,EAAC;qBACZ;oBAEkB,qBAAM,EAAE,CAAC,QAAQ,CAAC,eAAe,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAA;;oBAArE,UAAU,GAAG,SAAwD;oBAC3E,sBAAO,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,wBAAe,CAAC,EAAC;;;;CAC/C;AAVD,kCAUC"}
|
|
@@ -13,5 +13,5 @@ export declare const ORGANIZATION_UID_OPTION: {
|
|
|
13
13
|
description: string;
|
|
14
14
|
};
|
|
15
15
|
export declare function getOrganizationUid(options: CommandLineOptions): Promise<string>;
|
|
16
|
-
export declare function getOrganizations(): Promise<
|
|
17
|
-
export declare function getOrganization(organizationUid: string): Promise<
|
|
16
|
+
export declare function getOrganizations(): Promise<IOrganization[]>;
|
|
17
|
+
export declare function getOrganization(organizationUid: string): Promise<IOrganization>;
|
|
@@ -52,6 +52,7 @@ var ini = require("ini");
|
|
|
52
52
|
var path = require("path");
|
|
53
53
|
var os = require("os");
|
|
54
54
|
var chalk_1 = require("chalk");
|
|
55
|
+
var parameters = require("../../config/parameters");
|
|
55
56
|
var RUN_CONTROL_FILENAME = '.sosrc';
|
|
56
57
|
function saveConfig(config) {
|
|
57
58
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -92,20 +93,31 @@ function updateConfig(partialConfig) {
|
|
|
92
93
|
exports.updateConfig = updateConfig;
|
|
93
94
|
function loadConfig() {
|
|
94
95
|
return __awaiter(this, void 0, void 0, function () {
|
|
95
|
-
var runControlFilePath,
|
|
96
|
+
var runControlFilePath, config, runControlFileContent;
|
|
96
97
|
return __generator(this, function (_a) {
|
|
97
98
|
switch (_a.label) {
|
|
98
99
|
case 0:
|
|
99
100
|
runControlFilePath = getConfigFilePath();
|
|
101
|
+
config = {};
|
|
100
102
|
return [4 /*yield*/, fs.pathExists(runControlFilePath)];
|
|
101
103
|
case 1:
|
|
102
|
-
if (!
|
|
103
|
-
return [2 /*return*/, {}];
|
|
104
|
-
}
|
|
104
|
+
if (!_a.sent()) return [3 /*break*/, 3];
|
|
105
105
|
return [4 /*yield*/, fs.readFile(runControlFilePath)];
|
|
106
106
|
case 2:
|
|
107
107
|
runControlFileContent = _a.sent();
|
|
108
108
|
config = ini.decode(runControlFileContent.toString());
|
|
109
|
+
_a.label = 3;
|
|
110
|
+
case 3:
|
|
111
|
+
// Overriding from env vars if available
|
|
112
|
+
if (parameters.accountAuth.tokenId) {
|
|
113
|
+
config.identification = parameters.accountAuth.tokenId;
|
|
114
|
+
}
|
|
115
|
+
if (parameters.accountAuth.token) {
|
|
116
|
+
config.apiSecurityToken = parameters.accountAuth.token;
|
|
117
|
+
}
|
|
118
|
+
if (parameters.defaultOrganizationUid) {
|
|
119
|
+
config.defaultOrganizationUid = parameters.defaultOrganizationUid;
|
|
120
|
+
}
|
|
109
121
|
// Temporary suggestion to login getting faster token
|
|
110
122
|
if (config.identification && !config.identification.match(/[0-9a-f]{20,20}/)) {
|
|
111
123
|
console.warn(chalk_1.default.bold.yellow("Your authentication token is outdated. Please do the " + chalk_1.default.green('sos login') + " again."));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runControlHelper.js","sourceRoot":"","sources":["../../src/RunControl/runControlHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA+B;AAC/B,yBAA2B;AAC3B,2BAA6B;AAC7B,uBAAyB;AACzB,+BAA0B;
|
|
1
|
+
{"version":3,"file":"runControlHelper.js","sourceRoot":"","sources":["../../src/RunControl/runControlHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA+B;AAC/B,yBAA2B;AAC3B,2BAA6B;AAC7B,uBAAyB;AACzB,+BAA0B;AAC1B,oDAAsD;AAEtD,IAAM,oBAAoB,GAAG,QAAQ,CAAC;AAStC,SAAsB,UAAU,CAAC,MAAe;;;;;;oBACzC,kBAAkB,GAAG,iBAAiB,EAAE,CAAC;oBACzC,qBAAqB,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;oBACjD,qBAAM,EAAE,CAAC,SAAS,CAAC,kBAAkB,EAAE,qBAAqB,EAAE;4BAC7D,IAAI,EAAE,GAAK;yBACX,CAAC,EAAA;;oBAFF,SAEE,CAAC;;;;;CACH;AAND,gCAMC;AAED,SAAsB,YAAY,CAAC,aAA+B;;;;;wBAC3C,qBAAM,UAAU,EAAE,EAAA;;oBAAlC,aAAa,GAAG,SAAkB;oBAClC,SAAS,yBACX,aAAa,GACb,aAAa,CAChB,CAAC;oBACF,qBAAM,UAAU,CAAC,SAAS,CAAC,EAAA;;oBAA3B,SAA2B,CAAC;;;;;CAC5B;AAPD,oCAOC;AAED,SAAsB,UAAU;;;;;;oBACzB,kBAAkB,GAAG,iBAAiB,EAAE,CAAC;oBAC3C,MAAM,GAAY,EAAE,CAAC;oBACrB,qBAAM,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAA;;yBAAvC,SAAuC,EAAvC,wBAAuC;oBACZ,qBAAM,EAAE,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAA;;oBAA7D,qBAAqB,GAAG,SAAqC;oBACnE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,qBAAqB,CAAC,QAAQ,EAAE,CAAY,CAAC;;;oBAGlE,wCAAwC;oBACxC,IAAI,UAAU,CAAC,WAAW,CAAC,OAAO,EAAE;wBACnC,MAAM,CAAC,cAAc,GAAG,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC;qBACvD;oBACD,IAAI,UAAU,CAAC,WAAW,CAAC,KAAK,EAAE;wBACjC,MAAM,CAAC,gBAAgB,GAAG,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC;qBACvD;oBACD,IAAI,UAAU,CAAC,sBAAsB,EAAE;wBACtC,MAAM,CAAC,sBAAsB,GAAG,UAAU,CAAC,sBAAsB,CAAC;qBAClE;oBAED,qDAAqD;oBACrD,IAAI,MAAM,CAAC,cAAc,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE;wBAC7E,OAAO,CAAC,IAAI,CACX,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC,0DAAwD,eAAK,CAAC,KAAK,CAAC,WAAW,CAAC,YAAS,CAAC,CAC5G,CAAC;wBACF,OAAO,CAAC,IAAI,CAAC,4DAA4D,CAAC,CAAC;qBAC3E;oBAED,sBAAO,MAAM,EAAC;;;;CACd;AA5BD,gCA4BC;AAED,SAAgB,iBAAiB;IAChC,IAAM,iBAAiB,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IACvC,IAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,CAAC;IAC9E,OAAO,kBAAkB,CAAC;AAC3B,CAAC;AAJD,8CAIC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export default function wait(timeout: number): Promise<void>;
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
function wait(timeout) {
|
|
4
|
+
return new Promise(function (resolve) { return setTimeout(function () { return resolve(); }, timeout); });
|
|
5
|
+
}
|
|
6
|
+
exports.default = wait;
|
|
7
|
+
//# sourceMappingURL=wait.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"wait.js","sourceRoot":"","sources":["../../src/Timer/wait.ts"],"names":[],"mappings":";;AACA,SAAwB,IAAI,CAAC,OAAe;IAC3C,OAAO,IAAI,OAAO,CAAO,UAAC,OAAmB,IAAK,OAAA,UAAU,CAAC,cAAM,OAAA,OAAO,EAAE,EAAT,CAAS,EAAE,OAAO,CAAC,EAApC,CAAoC,CAAC,CAAC;AACzF,CAAC;AAFD,uBAEC"}
|
|
@@ -52,7 +52,7 @@ exports.timingList = {
|
|
|
52
52
|
commands: [],
|
|
53
53
|
run: function (options) {
|
|
54
54
|
return __awaiter(this, void 0, void 0, function () {
|
|
55
|
-
var organizationUid, organization,
|
|
55
|
+
var organizationUid, organization, restApi, deviceUid, timings;
|
|
56
56
|
return __generator(this, function (_a) {
|
|
57
57
|
switch (_a.label) {
|
|
58
58
|
case 0:
|
|
@@ -63,10 +63,10 @@ exports.timingList = {
|
|
|
63
63
|
return [4 /*yield*/, organizationFacade_1.getOrganization(organizationUid)];
|
|
64
64
|
case 2:
|
|
65
65
|
organization = _a.sent();
|
|
66
|
-
|
|
66
|
+
restApi = helper_1.createOrganizationRestApi(organization);
|
|
67
|
+
return [4 /*yield*/, deviceFacade_1.getDeviceUid(restApi, options)];
|
|
67
68
|
case 3:
|
|
68
69
|
deviceUid = _a.sent();
|
|
69
|
-
restApi = helper_1.createOrganizationRestApi(organization);
|
|
70
70
|
return [4 /*yield*/, restApi.timing.getList({
|
|
71
71
|
deviceUid: deviceUid,
|
|
72
72
|
})];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timingListCommand.js","sourceRoot":"","sources":["../../../src/Timing/List/timingListCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA0B;AAC1B,6BAA+B;AAE/B,4EAAqH;AACrH,0DAA4E;AAC5E,uCAAyD;AAEzD,IAAM,KAAK,GAAG,KAAK,CAAC,4BAA4B,CAAC,CAAC;AAErC,QAAA,UAAU,GAAa;IACnC,IAAI,EAAE,MAAM;IACZ,WAAW,EAAE,iCAAiC;IAC9C,UAAU,EAAE;QACX,4CAAuB;QACvB,gCAAiB;KACjB;IACD,QAAQ,EAAE,EAAE;IACN,GAAG,EAAT,UAAU,OAA2B;;;;;;wBACpC,KAAK,CAAC,eAAe,CAAC,CAAC;wBACC,qBAAM,uCAAkB,CAAC,OAAO,CAAC,EAAA;;wBAAnD,eAAe,GAAG,SAAiC;wBACpC,qBAAM,oCAAe,CAAC,eAAe,CAAC,EAAA;;wBAArD,YAAY,GAAG,SAAsC;
|
|
1
|
+
{"version":3,"file":"timingListCommand.js","sourceRoot":"","sources":["../../../src/Timing/List/timingListCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA0B;AAC1B,6BAA+B;AAE/B,4EAAqH;AACrH,0DAA4E;AAC5E,uCAAyD;AAEzD,IAAM,KAAK,GAAG,KAAK,CAAC,4BAA4B,CAAC,CAAC;AAErC,QAAA,UAAU,GAAa;IACnC,IAAI,EAAE,MAAM;IACZ,WAAW,EAAE,iCAAiC;IAC9C,UAAU,EAAE;QACX,4CAAuB;QACvB,gCAAiB;KACjB;IACD,QAAQ,EAAE,EAAE;IACN,GAAG,EAAT,UAAU,OAA2B;;;;;;wBACpC,KAAK,CAAC,eAAe,CAAC,CAAC;wBACC,qBAAM,uCAAkB,CAAC,OAAO,CAAC,EAAA;;wBAAnD,eAAe,GAAG,SAAiC;wBACpC,qBAAM,oCAAe,CAAC,eAAe,CAAC,EAAA;;wBAArD,YAAY,GAAG,SAAsC;wBACrD,OAAO,GAAG,kCAAyB,CAAC,YAAY,CAAC,CAAC;wBACtC,qBAAM,2BAAY,CAAC,OAAO,EAAE,OAAO,CAAC,EAAA;;wBAAhD,SAAS,GAAG,SAAoC;wBACtC,qBAAM,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC;gCAC5C,SAAS,WAAA;6BACT,CAAC,EAAA;;wBAFI,OAAO,GAAG,SAEd;wBACF,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;;;;;KACjE;CACD,CAAC"}
|