@signageos/cli 1.0.1 → 1.0.4
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 +14 -0
- package/dist/Applet/Generate/appletGenerateCommand.js +8 -8
- package/dist/Applet/Generate/appletGenerateCommand.js.map +1 -1
- package/dist/Applet/Upload/appletUploadCommand.js +85 -86
- package/dist/Applet/Upload/appletUploadCommand.js.map +1 -1
- package/dist/Applet/Upload/appletUploadFacade.d.ts +4 -0
- package/dist/Applet/Upload/appletUploadFacade.js +58 -50
- package/dist/Applet/Upload/appletUploadFacade.js.map +1 -1
- package/dist/Applet/appletFacade.d.ts +2 -1
- package/dist/Applet/appletFacade.js +8 -20
- package/dist/Applet/appletFacade.js.map +1 -1
- package/dist/Auth/loginCommand.js +2 -1
- package/dist/Auth/loginCommand.js.map +1 -1
- package/dist/Device/deviceFacade.js +3 -2
- package/dist/Device/deviceFacade.js.map +1 -1
- package/dist/Emulator/emulatorFacade.js +4 -1
- package/dist/Emulator/emulatorFacade.js.map +1 -1
- package/dist/FileSystem/packageConfig.d.ts +9 -0
- package/dist/FileSystem/packageConfig.js.map +1 -1
- package/dist/Organization/organizationFacade.js +3 -2
- package/dist/Organization/organizationFacade.js.map +1 -1
- package/dist/helper.d.ts +5 -1
- package/dist/helper.js +14 -3
- package/dist/helper.js.map +1 -1
- package/package-lock.json +67 -297
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,20 @@ 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.0.4] - 2022-07-18
|
|
8
|
+
### Fixed
|
|
9
|
+
- Uploading single file applet with front-applet version
|
|
10
|
+
- Uploading applet files will invoke building applet only once at the end
|
|
11
|
+
- CLI version in User-Agent header (e.g.: `signageOS_CLI/1.0.4`)
|
|
12
|
+
|
|
13
|
+
## [1.0.3] - 2022-06-14
|
|
14
|
+
### Fixed
|
|
15
|
+
- Applet generate using Webpack 5
|
|
16
|
+
|
|
17
|
+
## [1.0.2] - 2022-05-06
|
|
18
|
+
### Fixed
|
|
19
|
+
- Usage of @signageos/lib dependency
|
|
20
|
+
|
|
7
21
|
## [1.0.1] - 2022-05-06
|
|
8
22
|
### Fixed
|
|
9
23
|
- Upgrade underlying SDK
|
|
@@ -128,12 +128,12 @@ exports.appletGenerate = (0, commandDefinition_1.createCommandDefinition)({
|
|
|
128
128
|
'@babel/core@7',
|
|
129
129
|
'@babel/preset-env@7',
|
|
130
130
|
'babel-loader@8',
|
|
131
|
-
'css-loader@
|
|
132
|
-
'html-webpack-plugin@
|
|
133
|
-
'style-loader@
|
|
134
|
-
'webpack@
|
|
135
|
-
'webpack-dev-server@
|
|
136
|
-
'webpack-cli@
|
|
131
|
+
'css-loader@6',
|
|
132
|
+
'html-webpack-plugin@5',
|
|
133
|
+
'style-loader@3',
|
|
134
|
+
'webpack@5',
|
|
135
|
+
'webpack-dev-server@4',
|
|
136
|
+
'webpack-cli@4',
|
|
137
137
|
];
|
|
138
138
|
fileExtensions = ['.js'];
|
|
139
139
|
imports = [
|
|
@@ -249,7 +249,7 @@ function createPackageConfig(name, version) {
|
|
|
249
249
|
version: version,
|
|
250
250
|
main: 'dist/index.html',
|
|
251
251
|
scripts: {
|
|
252
|
-
start: "webpack
|
|
252
|
+
start: "webpack serve --mode development",
|
|
253
253
|
prepare: "npm run clean && npm run build",
|
|
254
254
|
upload: "sos applet upload",
|
|
255
255
|
clean: "npx rimraf dist",
|
|
@@ -266,7 +266,7 @@ function createPackageConfig(name, version) {
|
|
|
266
266
|
});
|
|
267
267
|
});
|
|
268
268
|
}
|
|
269
|
-
var createWebpackConfig = function (entryFileName, fileExtensions, imports, rules, plugins) { return "\n".concat(imports.join(';\n'), "\n\nexports = module.exports = {\n\tentry: ").concat(JSON.stringify('./src/' + entryFileName), ",\n\toutput: {\n\t\tfilename: 'index.js',\n\t},\n\tresolve: {\n\t\textensions: ").concat(JSON.stringify(fileExtensions), ",\n\t},\n\tmodule: {\n\t\trules: [\n").concat(rules.join(',\n'), "\n\t\t],\n\t},\n\tplugins: [\n").concat(plugins.join(',\n'), "\n\t],\n};\n"); };
|
|
269
|
+
var createWebpackConfig = function (entryFileName, fileExtensions, imports, rules, plugins) { return "\n".concat(imports.join(';\n'), "\n\nexports = module.exports = {\n\tentry: ").concat(JSON.stringify('./src/' + entryFileName), ",\n\ttarget: ").concat(JSON.stringify(['web', 'es5']), ",\n\toutput: {\n\t\tfilename: 'index.js',\n\t},\n\tresolve: {\n\t\textensions: ").concat(JSON.stringify(fileExtensions), ",\n\t},\n\tmodule: {\n\t\trules: [\n").concat(rules.join(',\n'), "\n\t\t],\n\t},\n\tplugins: [\n").concat(plugins.join(',\n'), "\n\t],\n};\n"); };
|
|
270
270
|
var createIndexHtml = function (title) { return "<!DOCTYPE html>\n<html lang=\"en\">\n<head>\n\t<meta charset=\"utf-8\" />\n\t<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, shrink-to-fit=no\" />\n\t<meta name=\"theme-color\" content=\"#000000\" />\n\t<title>".concat(title, "</title>\n</head>\n<body>\n\t<h1>Hello ").concat(title, "</h1>\n\t<div id=\"root\"></div>\n</body>\n</html>\n"); };
|
|
271
271
|
var createIndexJs = function () { return "\nrequire('./index.css');\n\nimport sos from '@signageos/front-applet';\n\n// Wait on sos data are ready (https://docs.signageos.io/api/js/content/latest/js-applet-basics#onready)\nsos.onReady().then(async function () {\n\tconst contentElement = document.getElementById('root');\n\tconsole.log('sOS is ready');\n\tcontentElement.innerHTML = 'sOS is ready';\n});\n"; };
|
|
272
272
|
var createIndexCss = function () { return "\nbody {\n\tbackground-color: wheat;\n\ttext-align: center;\n}\n"; };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appletGenerateCommand.js","sourceRoot":"","sources":["../../../src/Applet/Generate/appletGenerateCommand.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"appletGenerateCommand.js","sourceRoot":"","sources":["../../../src/Applet/Generate/appletGenerateCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -103,24 +103,21 @@ exports.appletUpload = (0, commandDefinition_1.createCommandDefinition)({
|
|
|
103
103
|
commands: [],
|
|
104
104
|
run: function (options) {
|
|
105
105
|
return __awaiter(this, void 0, void 0, function () {
|
|
106
|
-
var currentDirectory, organizationUid, organization, restApi, appletName, appletVersion, appletPathOption, appletEntryOption, updatePackageConfig, appletBinaryFilePath, appletDirectoryPath, appletEntryFilePath, isSingleFileApplet, appletVersionExists, overrideAppletVersionConfirmed, createNewAppletVersionConfirmed, appletUid, createdApplet, applet, verbose, allowVerbose, appletFiles, error_1,
|
|
107
|
-
return __generator(this, function (
|
|
108
|
-
switch (
|
|
106
|
+
var currentDirectory, organizationUid, organization, restApi, _a, appletName, appletVersion, frontAppletVersion, appletPathOption, appletEntryOption, updatePackageConfig, appletBinaryFilePath, appletDirectoryPath, appletEntryFilePath, isSingleFileApplet, appletVersionExists, overrideAppletVersionConfirmed, createNewAppletVersionConfirmed, appletUid, createdApplet, applet, verbose, allowVerbose, appletFiles, error_1, _b, _c, _d, _e, yes, skipConfirmation, response, response, appletEntryFileRelativePath, progressBar, appletEntryFileRelativePath, progressBar;
|
|
107
|
+
return __generator(this, function (_f) {
|
|
108
|
+
switch (_f.label) {
|
|
109
109
|
case 0:
|
|
110
110
|
currentDirectory = process.cwd();
|
|
111
111
|
return [4 /*yield*/, (0, organizationFacade_1.getOrganizationUidOrDefaultOrSelect)(options)];
|
|
112
112
|
case 1:
|
|
113
|
-
organizationUid =
|
|
113
|
+
organizationUid = _f.sent();
|
|
114
114
|
return [4 /*yield*/, (0, organizationFacade_1.getOrganization)(organizationUid)];
|
|
115
115
|
case 2:
|
|
116
|
-
organization =
|
|
116
|
+
organization = _f.sent();
|
|
117
117
|
restApi = (0, helper_1.createOrganizationRestApi)(organization);
|
|
118
|
-
return [4 /*yield*/, (0, appletFacade_1.
|
|
118
|
+
return [4 /*yield*/, (0, appletFacade_1.getApplet)(currentDirectory)];
|
|
119
119
|
case 3:
|
|
120
|
-
|
|
121
|
-
return [4 /*yield*/, (0, appletFacade_1.getAppletVersion)(currentDirectory)];
|
|
122
|
-
case 4:
|
|
123
|
-
appletVersion = _e.sent();
|
|
120
|
+
_a = _f.sent(), appletName = _a.name, appletVersion = _a.version, frontAppletVersion = _a.frontAppletVersion;
|
|
124
121
|
appletPathOption = options['applet-path'];
|
|
125
122
|
appletEntryOption = options['entry-file-path'];
|
|
126
123
|
updatePackageConfig = options['update-package-config'];
|
|
@@ -128,115 +125,116 @@ exports.appletUpload = (0, commandDefinition_1.createCommandDefinition)({
|
|
|
128
125
|
appletDirectoryPath = undefined;
|
|
129
126
|
appletEntryFilePath = undefined;
|
|
130
127
|
isSingleFileApplet = !!(appletPathOption && !appletEntryOption);
|
|
131
|
-
if (!isSingleFileApplet) return [3 /*break*/,
|
|
128
|
+
if (!isSingleFileApplet) return [3 /*break*/, 5];
|
|
132
129
|
displaySingleFileAppletDeprecationNote();
|
|
133
130
|
return [4 /*yield*/, (0, appletUploadCommandHelper_1.getAppletBinaryFileAbsolutePath)(currentDirectory, options)];
|
|
134
|
-
case
|
|
135
|
-
appletBinaryFilePath =
|
|
136
|
-
return [3 /*break*/,
|
|
137
|
-
case
|
|
138
|
-
case
|
|
139
|
-
appletDirectoryPath =
|
|
131
|
+
case 4:
|
|
132
|
+
appletBinaryFilePath = _f.sent();
|
|
133
|
+
return [3 /*break*/, 8];
|
|
134
|
+
case 5: return [4 /*yield*/, (0, appletUploadCommandHelper_1.getAppletDirectoryAbsolutePath)(currentDirectory, options)];
|
|
135
|
+
case 6:
|
|
136
|
+
appletDirectoryPath = _f.sent();
|
|
140
137
|
return [4 /*yield*/, (0, appletUploadCommandHelper_1.getAppletEntryFileAbsolutePath)(currentDirectory, options)];
|
|
138
|
+
case 7:
|
|
139
|
+
appletEntryFilePath = _f.sent();
|
|
140
|
+
_f.label = 8;
|
|
141
141
|
case 8:
|
|
142
|
-
appletEntryFilePath = _e.sent();
|
|
143
|
-
_e.label = 9;
|
|
144
|
-
case 9:
|
|
145
142
|
appletVersionExists = true;
|
|
146
143
|
overrideAppletVersionConfirmed = false;
|
|
147
144
|
createNewAppletVersionConfirmed = false;
|
|
148
145
|
return [4 /*yield*/, (0, appletFacade_1.getAppletUid)(restApi)];
|
|
149
|
-
case
|
|
150
|
-
appletUid =
|
|
151
|
-
if (!!appletUid) return [3 /*break*/,
|
|
146
|
+
case 9:
|
|
147
|
+
appletUid = _f.sent();
|
|
148
|
+
if (!!appletUid) return [3 /*break*/, 12];
|
|
152
149
|
console.log(chalk_1.default.yellow("applet uid is not present in package file, adding one."));
|
|
153
150
|
return [4 /*yield*/, restApi.applet.create({ name: appletName })];
|
|
154
|
-
case
|
|
155
|
-
createdApplet =
|
|
151
|
+
case 10:
|
|
152
|
+
createdApplet = _f.sent();
|
|
156
153
|
appletUid = createdApplet.uid;
|
|
157
|
-
if (!updatePackageConfig) return [3 /*break*/,
|
|
154
|
+
if (!updatePackageConfig) return [3 /*break*/, 12];
|
|
158
155
|
return [4 /*yield*/, (0, packageConfig_1.saveToPackage)(currentDirectory, { sos: { appletUid: appletUid } })];
|
|
159
|
-
case
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
case
|
|
163
|
-
case
|
|
164
|
-
applet =
|
|
156
|
+
case 11:
|
|
157
|
+
_f.sent();
|
|
158
|
+
_f.label = 12;
|
|
159
|
+
case 12: return [4 /*yield*/, restApi.applet.get(appletUid)];
|
|
160
|
+
case 13:
|
|
161
|
+
applet = _f.sent();
|
|
165
162
|
return [4 /*yield*/, restApi.applet.version.get(appletUid, appletVersion).catch(function () { return appletVersionExists = false; })];
|
|
166
|
-
case
|
|
167
|
-
|
|
163
|
+
case 14:
|
|
164
|
+
_f.sent();
|
|
168
165
|
verbose = 'verbose';
|
|
169
166
|
allowVerbose = options[verbose];
|
|
170
167
|
appletFiles = [];
|
|
171
|
-
if (!!isSingleFileApplet) return [3 /*break*/,
|
|
172
|
-
|
|
173
|
-
case
|
|
174
|
-
|
|
168
|
+
if (!!isSingleFileApplet) return [3 /*break*/, 20];
|
|
169
|
+
_f.label = 15;
|
|
170
|
+
case 15:
|
|
171
|
+
_f.trys.push([15, 17, , 18]);
|
|
175
172
|
return [4 /*yield*/, (0, helper_2.validateAllFormalities)(appletDirectoryPath, options[appletUploadCommandHelper_1.ENTRY_FILE_PATH_OPTION.name] || appletUploadCommandHelper_1.DEFAULT_APPLET_ENTRY_FILE_PATH)];
|
|
173
|
+
case 16:
|
|
174
|
+
_f.sent();
|
|
175
|
+
return [3 /*break*/, 18];
|
|
176
176
|
case 17:
|
|
177
|
-
|
|
178
|
-
return [3 /*break*/, 19];
|
|
179
|
-
case 18:
|
|
180
|
-
error_1 = _e.sent();
|
|
177
|
+
error_1 = _f.sent();
|
|
181
178
|
throw error_1;
|
|
182
|
-
case
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
179
|
+
case 18:
|
|
180
|
+
_c = (_b = appletFiles.push).apply;
|
|
181
|
+
_d = [appletFiles];
|
|
182
|
+
_e = [[]];
|
|
186
183
|
return [4 /*yield*/, (0, helper_2.listDirectoryContentRecursively)(appletDirectoryPath, currentDirectory)];
|
|
184
|
+
case 19:
|
|
185
|
+
_c.apply(_b, _d.concat([__spreadArray.apply(void 0, _e.concat([__read.apply(void 0, [(_f.sent())]), false]))]));
|
|
186
|
+
_f.label = 20;
|
|
187
187
|
case 20:
|
|
188
|
-
_b.apply(_a, _c.concat([__spreadArray.apply(void 0, _d.concat([__read.apply(void 0, [(_e.sent())]), false]))]));
|
|
189
|
-
_e.label = 21;
|
|
190
|
-
case 21:
|
|
191
188
|
if (allowVerbose) {
|
|
192
189
|
printUploadFiles(appletFiles);
|
|
193
190
|
}
|
|
194
191
|
yes = 'yes';
|
|
195
192
|
skipConfirmation = options[yes];
|
|
196
|
-
if (!appletVersionExists) return [3 /*break*/,
|
|
197
|
-
if (!skipConfirmation) return [3 /*break*/,
|
|
193
|
+
if (!appletVersionExists) return [3 /*break*/, 24];
|
|
194
|
+
if (!skipConfirmation) return [3 /*break*/, 21];
|
|
198
195
|
console.log(chalk_1.default.yellow("Will override existing version ".concat(appletVersion)));
|
|
199
196
|
overrideAppletVersionConfirmed = true;
|
|
200
|
-
return [3 /*break*/,
|
|
201
|
-
case
|
|
197
|
+
return [3 /*break*/, 23];
|
|
198
|
+
case 21: return [4 /*yield*/, prompts({
|
|
202
199
|
type: 'confirm',
|
|
203
200
|
name: 'override',
|
|
204
201
|
message: "Do you want to override applet version ".concat(appletVersion, "?"),
|
|
205
202
|
})];
|
|
206
|
-
case
|
|
207
|
-
response =
|
|
203
|
+
case 22:
|
|
204
|
+
response = _f.sent();
|
|
208
205
|
overrideAppletVersionConfirmed = response.override;
|
|
209
|
-
|
|
210
|
-
case
|
|
211
|
-
case
|
|
212
|
-
if (!skipConfirmation) return [3 /*break*/,
|
|
206
|
+
_f.label = 23;
|
|
207
|
+
case 23: return [3 /*break*/, 27];
|
|
208
|
+
case 24:
|
|
209
|
+
if (!skipConfirmation) return [3 /*break*/, 25];
|
|
213
210
|
console.log(chalk_1.default.yellow("Will create new version ".concat(appletVersion)));
|
|
214
211
|
createNewAppletVersionConfirmed = true;
|
|
215
|
-
return [3 /*break*/,
|
|
216
|
-
case
|
|
212
|
+
return [3 /*break*/, 27];
|
|
213
|
+
case 25: return [4 /*yield*/, prompts({
|
|
217
214
|
type: 'confirm',
|
|
218
215
|
name: 'newVersion',
|
|
219
216
|
message: "Do you want to create new applet version ".concat(appletVersion, "?"),
|
|
220
217
|
})];
|
|
221
|
-
case
|
|
222
|
-
response =
|
|
218
|
+
case 26:
|
|
219
|
+
response = _f.sent();
|
|
223
220
|
createNewAppletVersionConfirmed = response.newVersion;
|
|
224
|
-
|
|
225
|
-
case
|
|
226
|
-
if (!overrideAppletVersionConfirmed) return [3 /*break*/,
|
|
227
|
-
if (!isSingleFileApplet) return [3 /*break*/,
|
|
221
|
+
_f.label = 27;
|
|
222
|
+
case 27:
|
|
223
|
+
if (!overrideAppletVersionConfirmed) return [3 /*break*/, 32];
|
|
224
|
+
if (!isSingleFileApplet) return [3 /*break*/, 29];
|
|
228
225
|
return [4 /*yield*/, (0, appletUploadFacade_1.updateSingleFileApplet)({
|
|
229
226
|
restApi: restApi,
|
|
230
227
|
applet: {
|
|
231
228
|
uid: appletUid,
|
|
232
229
|
version: appletVersion,
|
|
233
230
|
binaryFilePath: appletBinaryFilePath,
|
|
231
|
+
frontAppletVersion: frontAppletVersion,
|
|
234
232
|
},
|
|
235
233
|
})];
|
|
234
|
+
case 28:
|
|
235
|
+
_f.sent();
|
|
236
|
+
return [3 /*break*/, 31];
|
|
236
237
|
case 29:
|
|
237
|
-
_e.sent();
|
|
238
|
-
return [3 /*break*/, 32];
|
|
239
|
-
case 30:
|
|
240
238
|
appletEntryFileRelativePath = (0, appletUploadCommandHelper_1.getAppletEntryFileRelativePath)(appletEntryFilePath, appletDirectoryPath);
|
|
241
239
|
progressBar = (0, progressBarFactory_1.createProgressBar)();
|
|
242
240
|
return [4 /*yield*/, (0, appletUploadFacade_1.updateMultiFileApplet)({
|
|
@@ -250,27 +248,28 @@ exports.appletUpload = (0, commandDefinition_1.createCommandDefinition)({
|
|
|
250
248
|
},
|
|
251
249
|
progressBar: progressBar,
|
|
252
250
|
})];
|
|
251
|
+
case 30:
|
|
252
|
+
_f.sent();
|
|
253
|
+
_f.label = 31;
|
|
253
254
|
case 31:
|
|
254
|
-
_e.sent();
|
|
255
|
-
_e.label = 32;
|
|
256
|
-
case 32:
|
|
257
255
|
displaySuccessMessage(applet.uid, applet.name, appletVersion, parameters.boxHost);
|
|
258
|
-
return [3 /*break*/,
|
|
259
|
-
case
|
|
260
|
-
if (!createNewAppletVersionConfirmed) return [3 /*break*/,
|
|
261
|
-
if (!isSingleFileApplet) return [3 /*break*/,
|
|
256
|
+
return [3 /*break*/, 38];
|
|
257
|
+
case 32:
|
|
258
|
+
if (!createNewAppletVersionConfirmed) return [3 /*break*/, 37];
|
|
259
|
+
if (!isSingleFileApplet) return [3 /*break*/, 34];
|
|
262
260
|
return [4 /*yield*/, (0, appletUploadFacade_1.createSingleFileApplet)({
|
|
263
261
|
restApi: restApi,
|
|
264
262
|
applet: {
|
|
265
263
|
uid: appletUid,
|
|
266
264
|
version: appletVersion,
|
|
267
265
|
binaryFilePath: appletBinaryFilePath,
|
|
266
|
+
frontAppletVersion: frontAppletVersion,
|
|
268
267
|
},
|
|
269
268
|
})];
|
|
269
|
+
case 33:
|
|
270
|
+
_f.sent();
|
|
271
|
+
return [3 /*break*/, 36];
|
|
270
272
|
case 34:
|
|
271
|
-
_e.sent();
|
|
272
|
-
return [3 /*break*/, 37];
|
|
273
|
-
case 35:
|
|
274
273
|
appletEntryFileRelativePath = (0, appletUploadCommandHelper_1.getAppletEntryFileRelativePath)(appletEntryFilePath, appletDirectoryPath);
|
|
275
274
|
progressBar = (0, progressBarFactory_1.createProgressBar)();
|
|
276
275
|
return [4 /*yield*/, (0, appletUploadFacade_1.createMultiFileFileApplet)({
|
|
@@ -284,14 +283,14 @@ exports.appletUpload = (0, commandDefinition_1.createCommandDefinition)({
|
|
|
284
283
|
},
|
|
285
284
|
progressBar: progressBar,
|
|
286
285
|
})];
|
|
286
|
+
case 35:
|
|
287
|
+
_f.sent();
|
|
288
|
+
_f.label = 36;
|
|
287
289
|
case 36:
|
|
288
|
-
_e.sent();
|
|
289
|
-
_e.label = 37;
|
|
290
|
-
case 37:
|
|
291
290
|
displaySuccessMessage(applet.uid, applet.name, appletVersion, parameters.boxHost);
|
|
292
|
-
return [3 /*break*/,
|
|
293
|
-
case
|
|
294
|
-
case
|
|
291
|
+
return [3 /*break*/, 38];
|
|
292
|
+
case 37: throw new Error('Applet version upload was canceled.');
|
|
293
|
+
case 38: return [2 /*return*/];
|
|
295
294
|
}
|
|
296
295
|
});
|
|
297
296
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appletUploadCommand.js","sourceRoot":"","sources":["../../../src/Applet/Upload/appletUploadCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA0B;AAC1B,iCAAmC;AACnC,uCAA0D;AAC1D,uDAAyD;AACzD,4EAAsK;AACtK,
|
|
1
|
+
{"version":3,"file":"appletUploadCommand.js","sourceRoot":"","sources":["../../../src/Applet/Upload/appletUploadCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,8 @@ export declare function updateSingleFileApplet(parameters: {
|
|
|
6
6
|
uid: string;
|
|
7
7
|
version: string;
|
|
8
8
|
binaryFilePath: string;
|
|
9
|
+
/** @deprecated Optional value for set current version of front-applet package */
|
|
10
|
+
frontAppletVersion?: string;
|
|
9
11
|
};
|
|
10
12
|
}): Promise<void>;
|
|
11
13
|
export declare const updateMultiFileApplet: (parameters: {
|
|
@@ -25,6 +27,8 @@ export declare const createSingleFileApplet: (parameters: {
|
|
|
25
27
|
uid: string;
|
|
26
28
|
version: string;
|
|
27
29
|
binaryFilePath: string;
|
|
30
|
+
/** @deprecated Optional value for set current version of front-applet package */
|
|
31
|
+
frontAppletVersion?: string;
|
|
28
32
|
};
|
|
29
33
|
}) => Promise<void>;
|
|
30
34
|
export declare const createMultiFileFileApplet: (parameters: {
|
|
@@ -55,6 +55,7 @@ function updateSingleFileApplet(parameters) {
|
|
|
55
55
|
appletBinary = fs.createReadStream(applet.binaryFilePath, { encoding: 'utf8' });
|
|
56
56
|
return [4 /*yield*/, restApi.applet.version.update(applet.uid, applet.version, {
|
|
57
57
|
binary: appletBinary,
|
|
58
|
+
frontAppletVersion: applet.frontAppletVersion,
|
|
58
59
|
})];
|
|
59
60
|
case 1:
|
|
60
61
|
_a.sent();
|
|
@@ -65,7 +66,7 @@ function updateSingleFileApplet(parameters) {
|
|
|
65
66
|
}
|
|
66
67
|
exports.updateSingleFileApplet = updateSingleFileApplet;
|
|
67
68
|
var updateMultiFileApplet = function (parameters) { return __awaiter(void 0, void 0, void 0, function () {
|
|
68
|
-
var restApi, applet, progressBar, currentAppletFiles, changedFilesCounter,
|
|
69
|
+
var restApi, applet, progressBar, currentAppletFiles, changedFilesCounter, index, fileAbsolutePath, fileRelativePath, fileRelativePosixPath, fileSize, fileHash, fileType, currentFileHash, currentFileType, fileStream, error_1, _a, _b, _i, fileRelativePath, error_2, appletEntryFilePosixPath;
|
|
69
70
|
return __generator(this, function (_c) {
|
|
70
71
|
switch (_c.label) {
|
|
71
72
|
case 0:
|
|
@@ -74,34 +75,28 @@ var updateMultiFileApplet = function (parameters) { return __awaiter(void 0, voi
|
|
|
74
75
|
case 1:
|
|
75
76
|
currentAppletFiles = _c.sent();
|
|
76
77
|
changedFilesCounter = 0;
|
|
77
|
-
appletEntryFilePosixPath = path.posix.normalize(applet.entryFilePath.replace(/\\/g, '/'));
|
|
78
|
-
return [4 /*yield*/, restApi.applet.version.update(applet.uid, applet.version, {
|
|
79
|
-
entryFile: appletEntryFilePosixPath,
|
|
80
|
-
})];
|
|
81
|
-
case 2:
|
|
82
|
-
_c.sent();
|
|
83
78
|
index = 0;
|
|
84
|
-
_c.label =
|
|
85
|
-
case
|
|
86
|
-
if (!(index < applet.files.length)) return [3 /*break*/,
|
|
79
|
+
_c.label = 2;
|
|
80
|
+
case 2:
|
|
81
|
+
if (!(index < applet.files.length)) return [3 /*break*/, 10];
|
|
87
82
|
fileAbsolutePath = applet.files[index];
|
|
88
83
|
fileRelativePath = (0, appletUploadFacadeHelper_1.getAppletFileRelativePath)(fileAbsolutePath, applet.directoryPath);
|
|
89
84
|
fileRelativePosixPath = path.posix.normalize(fileRelativePath.replace(/\\/g, '/'));
|
|
90
85
|
return [4 /*yield*/, fs.stat(fileAbsolutePath)];
|
|
91
|
-
case
|
|
86
|
+
case 3:
|
|
92
87
|
fileSize = (_c.sent()).size;
|
|
93
88
|
return [4 /*yield*/, (0, helper_1.computeFileMD5)(fileAbsolutePath)];
|
|
94
|
-
case
|
|
89
|
+
case 4:
|
|
95
90
|
fileHash = _c.sent();
|
|
96
91
|
return [4 /*yield*/, (0, helper_1.getFileType)(fileAbsolutePath)];
|
|
97
|
-
case
|
|
92
|
+
case 5:
|
|
98
93
|
fileType = _c.sent();
|
|
99
94
|
currentFileHash = currentAppletFiles[fileRelativePosixPath] ? currentAppletFiles[fileRelativePosixPath].hash : undefined;
|
|
100
95
|
currentFileType = currentAppletFiles[fileRelativePosixPath] ? currentAppletFiles[fileRelativePosixPath].type : undefined;
|
|
101
96
|
delete currentAppletFiles[fileRelativePosixPath];
|
|
102
97
|
debug('check file changed', fileHash, currentFileHash, fileType, currentFileType);
|
|
103
98
|
if (fileHash === currentFileHash && fileType === currentFileType) {
|
|
104
|
-
return [3 /*break*/,
|
|
99
|
+
return [3 /*break*/, 9];
|
|
105
100
|
}
|
|
106
101
|
else {
|
|
107
102
|
changedFilesCounter++;
|
|
@@ -110,57 +105,54 @@ var updateMultiFileApplet = function (parameters) { return __awaiter(void 0, voi
|
|
|
110
105
|
if (progressBar) {
|
|
111
106
|
progressBar.init({ size: fileSize, name: fileRelativePath });
|
|
112
107
|
}
|
|
113
|
-
|
|
114
|
-
case 7:
|
|
115
|
-
fileStream = _c.sent();
|
|
108
|
+
fileStream = fs.createReadStream(fileAbsolutePath);
|
|
116
109
|
fileStream.pause();
|
|
117
110
|
fileStream.on('data', function (chunk) {
|
|
118
111
|
if (progressBar) {
|
|
119
112
|
progressBar.update({ add: chunk.length });
|
|
120
113
|
}
|
|
121
114
|
});
|
|
122
|
-
_c.label =
|
|
123
|
-
case
|
|
124
|
-
_c.trys.push([
|
|
115
|
+
_c.label = 6;
|
|
116
|
+
case 6:
|
|
117
|
+
_c.trys.push([6, 8, , 9]);
|
|
118
|
+
// update file is just alias to create file (both are idempotent)
|
|
125
119
|
return [4 /*yield*/, restApi.applet.version.file.update(applet.uid, applet.version, fileRelativePosixPath, {
|
|
126
120
|
content: fileStream,
|
|
127
121
|
hash: fileHash,
|
|
128
122
|
size: fileSize,
|
|
129
123
|
type: fileType,
|
|
130
|
-
})];
|
|
131
|
-
case
|
|
124
|
+
}, { build: false })];
|
|
125
|
+
case 7:
|
|
126
|
+
// update file is just alias to create file (both are idempotent)
|
|
132
127
|
_c.sent();
|
|
133
|
-
return [3 /*break*/,
|
|
134
|
-
case
|
|
128
|
+
return [3 /*break*/, 9];
|
|
129
|
+
case 8:
|
|
135
130
|
error_1 = _c.sent();
|
|
136
131
|
if (fileSize === 0) {
|
|
137
132
|
throw new Error("Empty files are temporarily disallowed ".concat(fileAbsolutePath));
|
|
138
133
|
}
|
|
139
134
|
throw error_1;
|
|
140
|
-
case
|
|
135
|
+
case 9:
|
|
141
136
|
index++;
|
|
142
|
-
return [3 /*break*/,
|
|
143
|
-
case
|
|
144
|
-
if (progressBar) {
|
|
145
|
-
progressBar.end();
|
|
146
|
-
}
|
|
137
|
+
return [3 /*break*/, 2];
|
|
138
|
+
case 10:
|
|
147
139
|
_a = [];
|
|
148
140
|
for (_b in currentAppletFiles)
|
|
149
141
|
_a.push(_b);
|
|
150
142
|
_i = 0;
|
|
151
|
-
_c.label =
|
|
152
|
-
case
|
|
153
|
-
if (!(_i < _a.length)) return [3 /*break*/,
|
|
143
|
+
_c.label = 11;
|
|
144
|
+
case 11:
|
|
145
|
+
if (!(_i < _a.length)) return [3 /*break*/, 17];
|
|
154
146
|
fileRelativePath = _a[_i];
|
|
155
|
-
if (!currentAppletFiles.hasOwnProperty(fileRelativePath)) return [3 /*break*/,
|
|
156
|
-
_c.label =
|
|
157
|
-
case
|
|
158
|
-
_c.trys.push([
|
|
159
|
-
return [4 /*yield*/, restApi.applet.version.file.remove(applet.uid, applet.version, fileRelativePath)];
|
|
160
|
-
case
|
|
147
|
+
if (!currentAppletFiles.hasOwnProperty(fileRelativePath)) return [3 /*break*/, 16];
|
|
148
|
+
_c.label = 12;
|
|
149
|
+
case 12:
|
|
150
|
+
_c.trys.push([12, 14, , 15]);
|
|
151
|
+
return [4 /*yield*/, restApi.applet.version.file.remove(applet.uid, applet.version, fileRelativePath, { build: false })];
|
|
152
|
+
case 13:
|
|
161
153
|
_c.sent();
|
|
162
|
-
return [3 /*break*/,
|
|
163
|
-
case
|
|
154
|
+
return [3 /*break*/, 15];
|
|
155
|
+
case 14:
|
|
164
156
|
error_2 = _c.sent();
|
|
165
157
|
if (error_2 instanceof NotFoundError_1.default) {
|
|
166
158
|
/*
|
|
@@ -173,14 +165,23 @@ var updateMultiFileApplet = function (parameters) { return __awaiter(void 0, voi
|
|
|
173
165
|
else {
|
|
174
166
|
throw error_2;
|
|
175
167
|
}
|
|
176
|
-
return [3 /*break*/,
|
|
177
|
-
case
|
|
168
|
+
return [3 /*break*/, 15];
|
|
169
|
+
case 15:
|
|
178
170
|
changedFilesCounter++;
|
|
179
|
-
_c.label =
|
|
180
|
-
case
|
|
171
|
+
_c.label = 16;
|
|
172
|
+
case 16:
|
|
181
173
|
_i++;
|
|
182
|
-
return [3 /*break*/,
|
|
183
|
-
case
|
|
174
|
+
return [3 /*break*/, 11];
|
|
175
|
+
case 17:
|
|
176
|
+
appletEntryFilePosixPath = path.posix.normalize(applet.entryFilePath.replace(/\\/g, '/'));
|
|
177
|
+
return [4 /*yield*/, restApi.applet.version.update(applet.uid, applet.version, {
|
|
178
|
+
entryFile: appletEntryFilePosixPath,
|
|
179
|
+
})];
|
|
180
|
+
case 18:
|
|
181
|
+
_c.sent();
|
|
182
|
+
if (progressBar) {
|
|
183
|
+
progressBar.end();
|
|
184
|
+
}
|
|
184
185
|
if (changedFilesCounter === 0) {
|
|
185
186
|
console.log("No files changed in ".concat(chalk_1.default.yellow.bold(applet.directoryPath)));
|
|
186
187
|
}
|
|
@@ -199,7 +200,7 @@ var createSingleFileApplet = function (parameters) { return __awaiter(void 0, vo
|
|
|
199
200
|
return [4 /*yield*/, restApi.applet.version.create(applet.uid, {
|
|
200
201
|
binary: appletBinary,
|
|
201
202
|
version: applet.version,
|
|
202
|
-
frontAppletVersion:
|
|
203
|
+
frontAppletVersion: applet.frontAppletVersion,
|
|
203
204
|
})];
|
|
204
205
|
case 1:
|
|
205
206
|
_a.sent();
|
|
@@ -258,7 +259,7 @@ var createMultiFileFileApplet = function (parameters) { return __awaiter(void 0,
|
|
|
258
259
|
hash: fileHash,
|
|
259
260
|
content: fileStream,
|
|
260
261
|
size: fileSize,
|
|
261
|
-
})];
|
|
262
|
+
}, { build: false })];
|
|
262
263
|
case 7:
|
|
263
264
|
_a.sent();
|
|
264
265
|
return [3 /*break*/, 9];
|
|
@@ -271,7 +272,14 @@ var createMultiFileFileApplet = function (parameters) { return __awaiter(void 0,
|
|
|
271
272
|
case 9:
|
|
272
273
|
index++;
|
|
273
274
|
return [3 /*break*/, 2];
|
|
274
|
-
case 10:
|
|
275
|
+
case 10:
|
|
276
|
+
// The extra update applet version which has to be after upload all files to trigger applet version build
|
|
277
|
+
return [4 /*yield*/, restApi.applet.version.update(applet.uid, applet.version, {
|
|
278
|
+
entryFile: appletEntryFilePosixPath,
|
|
279
|
+
})];
|
|
280
|
+
case 11:
|
|
281
|
+
// The extra update applet version which has to be after upload all files to trigger applet version build
|
|
282
|
+
_a.sent();
|
|
275
283
|
if (progressBar) {
|
|
276
284
|
progressBar.end();
|
|
277
285
|
}
|