@signageos/cli 1.1.4 → 1.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.env +0 -3
- package/CHANGELOG.md +19 -0
- package/README.md +32 -6
- package/dist/Applet/Build/appletBuildCommand.d.ts +33 -0
- package/dist/Applet/Build/appletBuildCommand.js +99 -0
- package/dist/Applet/Build/appletBuildCommand.js.map +1 -0
- package/dist/Applet/Generate/appletGenerateCommand.js +4 -3
- package/dist/Applet/Generate/appletGenerateCommand.js.map +1 -1
- package/dist/Applet/Start/appletStartCommand.d.ts +34 -8
- package/dist/Applet/Start/appletStartCommand.js +90 -24
- package/dist/Applet/Start/appletStartCommand.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 +12 -11
- package/dist/Applet/Test/Upload/appletTestUploadCommand.js.map +1 -1
- package/dist/Applet/Upload/appletUploadCommand.js +84 -90
- package/dist/Applet/Upload/appletUploadCommand.js.map +1 -1
- package/dist/Applet/Upload/appletUploadCommandHelper.d.ts +0 -3
- package/dist/Applet/Upload/appletUploadCommandHelper.js +22 -13
- 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/appletCommand.d.ts +64 -8
- package/dist/Applet/appletCommand.js +2 -0
- package/dist/Applet/appletCommand.js.map +1 -1
- package/dist/Applet/appletFacade.js +7 -6
- package/dist/Applet/appletFacade.js.map +1 -1
- package/dist/Applet/appletServerHelper.d.ts +18 -0
- package/dist/Applet/appletServerHelper.js +83 -0
- package/dist/Applet/appletServerHelper.js.map +1 -0
- package/dist/Auth/loginCommand.js +8 -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/connectCommand.d.ts +28 -12
- package/dist/Device/Connect/connectCommand.js +55 -29
- package/dist/Device/Connect/connectCommand.js.map +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/Device/deviceCommand.d.ts +28 -12
- package/dist/Device/deviceFacade.d.ts +0 -2
- package/dist/Device/deviceFacade.js +1 -40
- package/dist/Device/deviceFacade.js.map +1 -1
- package/dist/Emulator/IEmulator.d.ts +1 -1
- package/dist/Emulator/emulatorFacade.js +6 -5
- package/dist/Emulator/emulatorFacade.js.map +1 -1
- package/dist/Emulator/emulatorFactory.d.ts +4 -2
- package/dist/Emulator/emulatorFactory.js +85 -73
- package/dist/Emulator/emulatorFactory.js.map +1 -1
- package/dist/FileSystem/helper.d.ts +5 -10
- package/dist/FileSystem/helper.js +26 -146
- 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.d.ts +5 -9
- package/dist/RunControl/runControlHelper.js +24 -103
- 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 +2 -2
- package/dist/helper.js +7 -3
- package/dist/helper.js.map +1 -1
- package/dist/parameters.d.ts +13 -0
- package/dist/parameters.js +68 -0
- package/dist/parameters.js.map +1 -0
- package/package.json +8 -17
- package/config/parameters.d.ts +0 -27
- package/config/parameters.js +0 -50
- package/package-lock.json +0 -8067
|
@@ -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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"}
|
|
@@ -132,14 +132,27 @@ export declare const applet: {
|
|
|
132
132
|
readonly name: "applet-path";
|
|
133
133
|
readonly type: StringConstructor;
|
|
134
134
|
readonly description: "Path to the applet file or the project folder depending on the entry file. Relative to the command or absolute.";
|
|
135
|
-
}, {
|
|
136
|
-
readonly name: "project-dir";
|
|
137
|
-
readonly type: StringConstructor;
|
|
138
|
-
readonly description: "Directory of the applet project";
|
|
139
135
|
}, {
|
|
140
136
|
readonly name: "entry-file-path";
|
|
141
137
|
readonly type: StringConstructor;
|
|
142
138
|
readonly description: "Path to the applet entry file. Relative to the command or absolute.";
|
|
139
|
+
}, {
|
|
140
|
+
readonly name: "hot-reload";
|
|
141
|
+
readonly type: BooleanConstructor;
|
|
142
|
+
readonly description: "Enable hot reload and build of applet";
|
|
143
|
+
readonly defaultValue: false;
|
|
144
|
+
}, {
|
|
145
|
+
readonly name: "server-port";
|
|
146
|
+
readonly type: NumberConstructor;
|
|
147
|
+
readonly description: "The custom server port for local machine server. Default is detected from currently running applet server.";
|
|
148
|
+
}, {
|
|
149
|
+
readonly name: "server-public-url";
|
|
150
|
+
readonly type: StringConstructor;
|
|
151
|
+
readonly description: "Public url of local machine server. Is useful when the local machine is behind a reverse proxy.";
|
|
152
|
+
}, {
|
|
153
|
+
readonly name: "force";
|
|
154
|
+
readonly type: BooleanConstructor;
|
|
155
|
+
readonly description: "Force start applet server even if it is already running on a different port. Kill the running server first.";
|
|
143
156
|
}];
|
|
144
157
|
commands: never[];
|
|
145
158
|
run(options: import("../Command/commandDefinition").CommandLineOptions<readonly [{
|
|
@@ -159,14 +172,27 @@ export declare const applet: {
|
|
|
159
172
|
readonly name: "applet-path";
|
|
160
173
|
readonly type: StringConstructor;
|
|
161
174
|
readonly description: "Path to the applet file or the project folder depending on the entry file. Relative to the command or absolute.";
|
|
162
|
-
}, {
|
|
163
|
-
readonly name: "project-dir";
|
|
164
|
-
readonly type: StringConstructor;
|
|
165
|
-
readonly description: "Directory of the applet project";
|
|
166
175
|
}, {
|
|
167
176
|
readonly name: "entry-file-path";
|
|
168
177
|
readonly type: StringConstructor;
|
|
169
178
|
readonly description: "Path to the applet entry file. Relative to the command or absolute.";
|
|
179
|
+
}, {
|
|
180
|
+
readonly name: "hot-reload";
|
|
181
|
+
readonly type: BooleanConstructor;
|
|
182
|
+
readonly description: "Enable hot reload and build of applet";
|
|
183
|
+
readonly defaultValue: false;
|
|
184
|
+
}, {
|
|
185
|
+
readonly name: "server-port";
|
|
186
|
+
readonly type: NumberConstructor;
|
|
187
|
+
readonly description: "The custom server port for local machine server. Default is detected from currently running applet server.";
|
|
188
|
+
}, {
|
|
189
|
+
readonly name: "server-public-url";
|
|
190
|
+
readonly type: StringConstructor;
|
|
191
|
+
readonly description: "Public url of local machine server. Is useful when the local machine is behind a reverse proxy.";
|
|
192
|
+
}, {
|
|
193
|
+
readonly name: "force";
|
|
194
|
+
readonly type: BooleanConstructor;
|
|
195
|
+
readonly description: "Force start applet server even if it is already running on a different port. Kill the running server first.";
|
|
170
196
|
}]>): Promise<void>;
|
|
171
197
|
} | {
|
|
172
198
|
name: "test";
|
|
@@ -276,6 +302,36 @@ export declare const applet: {
|
|
|
276
302
|
}]>): Promise<void>;
|
|
277
303
|
})[];
|
|
278
304
|
run(): Promise<never>;
|
|
305
|
+
} | {
|
|
306
|
+
name: "build";
|
|
307
|
+
description: string;
|
|
308
|
+
optionList: readonly [{
|
|
309
|
+
readonly name: "no-default-organization";
|
|
310
|
+
readonly type: BooleanConstructor;
|
|
311
|
+
readonly description: "Prevent using the defaultOrganizationUid from ~/.sosrc which were set using command sos organization set-default";
|
|
312
|
+
}, {
|
|
313
|
+
readonly name: "organization-uid";
|
|
314
|
+
readonly type: StringConstructor;
|
|
315
|
+
readonly description: "Organization UID";
|
|
316
|
+
}, {
|
|
317
|
+
readonly name: "applet-uid";
|
|
318
|
+
readonly type: StringConstructor;
|
|
319
|
+
readonly description: "Applet UID";
|
|
320
|
+
}];
|
|
321
|
+
commands: never[];
|
|
322
|
+
run(options: import("../Command/commandDefinition").CommandLineOptions<readonly [{
|
|
323
|
+
readonly name: "no-default-organization";
|
|
324
|
+
readonly type: BooleanConstructor;
|
|
325
|
+
readonly description: "Prevent using the defaultOrganizationUid from ~/.sosrc which were set using command sos organization set-default";
|
|
326
|
+
}, {
|
|
327
|
+
readonly name: "organization-uid";
|
|
328
|
+
readonly type: StringConstructor;
|
|
329
|
+
readonly description: "Organization UID";
|
|
330
|
+
}, {
|
|
331
|
+
readonly name: "applet-uid";
|
|
332
|
+
readonly type: StringConstructor;
|
|
333
|
+
readonly description: "Applet UID";
|
|
334
|
+
}]>): Promise<void>;
|
|
279
335
|
})[];
|
|
280
336
|
run(): Promise<never>;
|
|
281
337
|
};
|
|
@@ -42,6 +42,7 @@ var appletUploadCommand_1 = require("./Upload/appletUploadCommand");
|
|
|
42
42
|
var appletStartCommand_1 = require("./Start/appletStartCommand");
|
|
43
43
|
var appletTestCommand_1 = require("./Test/appletTestCommand");
|
|
44
44
|
var commandDefinition_1 = require("../Command/commandDefinition");
|
|
45
|
+
var appletBuildCommand_1 = require("./Build/appletBuildCommand");
|
|
45
46
|
exports.applet = (0, commandDefinition_1.createCommandDefinition)({
|
|
46
47
|
name: 'applet',
|
|
47
48
|
description: 'Applet management',
|
|
@@ -51,6 +52,7 @@ exports.applet = (0, commandDefinition_1.createCommandDefinition)({
|
|
|
51
52
|
appletUploadCommand_1.appletUpload,
|
|
52
53
|
appletStartCommand_1.appletStart,
|
|
53
54
|
appletTestCommand_1.appletTest,
|
|
55
|
+
appletBuildCommand_1.appletBuild,
|
|
54
56
|
],
|
|
55
57
|
run: function () {
|
|
56
58
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appletCommand.js","sourceRoot":"","sources":["../../src/Applet/appletCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0EAAkE;AAClE,oEAA4D;AAC5D,iEAAyD;AACzD,8DAAsD;AACtD,kEAAuE;
|
|
1
|
+
{"version":3,"file":"appletCommand.js","sourceRoot":"","sources":["../../src/Applet/appletCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0EAAkE;AAClE,oEAA4D;AAC5D,iEAAyD;AACzD,8DAAsD;AACtD,kEAAuE;AACvE,iEAAyD;AAE5C,QAAA,MAAM,GAAG,IAAA,2CAAuB,EAAC;IAC7C,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,mBAAmB;IAChC,UAAU,EAAE,EAAE;IACd,QAAQ,EAAE;QACT,sCAAc;QACd,kCAAY;QACZ,gCAAW;QACX,8BAAU;QACV,gCAAW;KACX;IACK,GAAG;;;gBACR,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;;;KACnC;CACD,CAAC,CAAC"}
|
|
@@ -39,8 +39,9 @@ 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
|
|
43
|
-
var
|
|
42
|
+
var chalk_1 = require("chalk");
|
|
43
|
+
var parameters_1 = require("../parameters");
|
|
44
|
+
var packageConfig_1 = require("@signageos/sdk/dist/FileSystem/packageConfig");
|
|
44
45
|
var appletErrors_1 = require("./appletErrors");
|
|
45
46
|
exports.APPLET_UID_OPTION = { name: 'applet-uid', type: String, description: 'Applet UID' };
|
|
46
47
|
function getApplet(directoryPath) {
|
|
@@ -57,9 +58,9 @@ function getApplet(directoryPath) {
|
|
|
57
58
|
if (!packageJSONObject) {
|
|
58
59
|
throw new Error("No package.json found in: ".concat(packageJSONPath));
|
|
59
60
|
}
|
|
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;
|
|
61
|
+
appletUid = (_a = parameters_1.parameters.applet.uid) !== null && _a !== void 0 ? _a : (_b = packageJSONObject.sos) === null || _b === void 0 ? void 0 : _b.appletUid;
|
|
62
|
+
appletVersion = (_c = parameters_1.parameters.applet.version) !== null && _c !== void 0 ? _c : packageJSONObject.version;
|
|
63
|
+
appletName = (_d = parameters_1.parameters.applet.name) !== null && _d !== void 0 ? _d : packageJSONObject.name;
|
|
63
64
|
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
65
|
if (!appletVersion) {
|
|
65
66
|
throw new Error("No \"version\" key found in: ".concat(packageJSONPath, " nor SOS_APPLET_VERSION environment variable specified"));
|
|
@@ -131,7 +132,7 @@ function getAppletUid(restApi, options) {
|
|
|
131
132
|
_a.label = 6;
|
|
132
133
|
case 6:
|
|
133
134
|
if (!appletUid) {
|
|
134
|
-
throw new appletErrors_1.AppletDoesNotExistError(
|
|
135
|
+
throw new appletErrors_1.AppletDoesNotExistError("Applet does not exist. Please use ".concat(chalk_1.default.green('sos applet upload'), " first or specify --applet-uid argument."));
|
|
135
136
|
}
|
|
136
137
|
return [2 /*return*/, appletUid];
|
|
137
138
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appletFacade.js","sourceRoot":"","sources":["../../src/Applet/appletFacade.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2BAA6B;AAC7B,iCAAmC;
|
|
1
|
+
{"version":3,"file":"appletFacade.js","sourceRoot":"","sources":["../../src/Applet/appletFacade.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { Development } from "@signageos/sdk/dist/Development/Development";
|
|
2
|
+
import { CommandLineOptions } from "../Command/commandDefinition";
|
|
3
|
+
export declare const SERVER_PUBLIC_URL_OPTION: {
|
|
4
|
+
readonly name: "server-public-url";
|
|
5
|
+
readonly type: StringConstructor;
|
|
6
|
+
readonly description: "Public url of local machine server. Is useful when the local machine is behind a reverse proxy.";
|
|
7
|
+
};
|
|
8
|
+
export declare const SERVER_PORT_OPTION: {
|
|
9
|
+
readonly name: "server-port";
|
|
10
|
+
readonly type: NumberConstructor;
|
|
11
|
+
readonly description: "The custom server port for local machine server. Default is detected from currently running applet server.";
|
|
12
|
+
};
|
|
13
|
+
export declare const SERVER_FORCE_OPTION: {
|
|
14
|
+
readonly name: "force";
|
|
15
|
+
readonly type: BooleanConstructor;
|
|
16
|
+
readonly description: "Force start applet server even if it is already running on a different port. Kill the running server first.";
|
|
17
|
+
};
|
|
18
|
+
export declare function killAppletServerIfRunningAndForceOption(dev: Development, options: CommandLineOptions<[typeof SERVER_FORCE_OPTION]>, appletUid: string | undefined, appletVersion: string | undefined, appletPort: number | undefined): Promise<void>;
|
|
@@ -0,0 +1,83 @@
|
|
|
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
|
+
exports.killAppletServerIfRunningAndForceOption = exports.SERVER_FORCE_OPTION = exports.SERVER_PORT_OPTION = exports.SERVER_PUBLIC_URL_OPTION = void 0;
|
|
40
|
+
var log_1 = require("@signageos/sdk/dist/Console/log");
|
|
41
|
+
exports.SERVER_PUBLIC_URL_OPTION = {
|
|
42
|
+
name: 'server-public-url',
|
|
43
|
+
type: String,
|
|
44
|
+
description: 'Public url of local machine server. Is useful when the local machine is behind a reverse proxy.',
|
|
45
|
+
};
|
|
46
|
+
exports.SERVER_PORT_OPTION = {
|
|
47
|
+
name: 'server-port',
|
|
48
|
+
type: Number,
|
|
49
|
+
description: 'The custom server port for local machine server. Default is detected from currently running applet server.',
|
|
50
|
+
};
|
|
51
|
+
exports.SERVER_FORCE_OPTION = {
|
|
52
|
+
name: 'force',
|
|
53
|
+
type: Boolean,
|
|
54
|
+
description: 'Force start applet server even if it is already running on a different port. Kill the running server first.',
|
|
55
|
+
};
|
|
56
|
+
function killAppletServerIfRunningAndForceOption(dev, options, appletUid, appletVersion, appletPort) {
|
|
57
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
58
|
+
var force, runningAppletPort;
|
|
59
|
+
return __generator(this, function (_a) {
|
|
60
|
+
switch (_a.label) {
|
|
61
|
+
case 0:
|
|
62
|
+
if (!appletUid || !appletVersion) {
|
|
63
|
+
return [2 /*return*/];
|
|
64
|
+
}
|
|
65
|
+
force = options[exports.SERVER_FORCE_OPTION.name];
|
|
66
|
+
return [4 /*yield*/, dev.applet.serve.getRunningPort(appletUid, appletVersion)];
|
|
67
|
+
case 1:
|
|
68
|
+
runningAppletPort = _a.sent();
|
|
69
|
+
if (!(runningAppletPort && runningAppletPort !== appletPort)) return [3 /*break*/, 4];
|
|
70
|
+
if (!!force) return [3 /*break*/, 2];
|
|
71
|
+
(0, log_1.log)('warning', "Applet server is already running on port ".concat(runningAppletPort, ". Use --force to kill the running server and start a new one."));
|
|
72
|
+
return [3 /*break*/, 4];
|
|
73
|
+
case 2: return [4 /*yield*/, dev.applet.serve.killRunningServer(appletUid, appletVersion)];
|
|
74
|
+
case 3:
|
|
75
|
+
_a.sent();
|
|
76
|
+
_a.label = 4;
|
|
77
|
+
case 4: return [2 /*return*/];
|
|
78
|
+
}
|
|
79
|
+
});
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
exports.killAppletServerIfRunningAndForceOption = killAppletServerIfRunningAndForceOption;
|
|
83
|
+
//# sourceMappingURL=appletServerHelper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"appletServerHelper.js","sourceRoot":"","sources":["../../src/Applet/appletServerHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAsD;AAIzC,QAAA,wBAAwB,GAAG;IACvC,IAAI,EAAE,mBAAmB;IACzB,IAAI,EAAE,MAAM;IACZ,WAAW,EAAE,iGAAiG;CACrG,CAAC;AAEE,QAAA,kBAAkB,GAAG;IACjC,IAAI,EAAE,aAAa;IACnB,IAAI,EAAE,MAAM;IACZ,WAAW,EAAE,4GAA4G;CAChH,CAAC;AAEE,QAAA,mBAAmB,GAAG;IAClC,IAAI,EAAE,OAAO;IACb,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,6GAA6G;CACjH,CAAC;AAEX,SAAsB,uCAAuC,CAC5D,GAAgB,EAChB,OAAyD,EACzD,SAA6B,EAC7B,aAAiC,EACjC,UAA8B;;;;;;oBAE9B,IAAI,CAAC,SAAS,IAAI,CAAC,aAAa,EAAE;wBACjC,sBAAO;qBACP;oBAEK,KAAK,GAAG,OAAO,CAAC,2BAAmB,CAAC,IAAI,CAAC,CAAC;oBAEtB,qBAAM,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,SAAS,EAAE,aAAa,CAAC,EAAA;;oBAAnF,iBAAiB,GAAG,SAA+D;yBACrF,CAAA,iBAAiB,IAAI,iBAAiB,KAAK,UAAU,CAAA,EAArD,wBAAqD;yBACpD,CAAC,KAAK,EAAN,wBAAM;oBACT,IAAA,SAAG,EAAC,SAAS,EAAE,mDAA4C,iBAAiB,kEAA+D,CAAC,CAAC;;wBAE7I,qBAAM,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,SAAS,EAAE,aAAa,CAAC,EAAA;;oBAAlE,SAAkE,CAAC;;;;;;CAIrE;AAtBD,0FAsBC"}
|
|
@@ -43,12 +43,14 @@ 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");
|
|
50
|
+
var sosControlHelper_1 = require("@signageos/sdk/dist/SosHelper/sosControlHelper");
|
|
49
51
|
var debug = Debug('@signageos/cli:Auth:login');
|
|
50
52
|
var OPTION_LIST = [
|
|
51
|
-
{ name: 'username', type: String, description: "Username or e-mail used for ".concat(parameters.boxHost) },
|
|
53
|
+
{ name: 'username', type: String, description: "Username or e-mail used for ".concat(parameters_1.parameters.boxHost) },
|
|
52
54
|
];
|
|
53
55
|
exports.login = (0, commandDefinition_1.createCommandDefinition)({
|
|
54
56
|
name: 'login',
|
|
@@ -66,7 +68,7 @@ exports.login = (0, commandDefinition_1.createCommandDefinition)({
|
|
|
66
68
|
return [4 /*yield*/, prompts({
|
|
67
69
|
type: 'text',
|
|
68
70
|
name: 'username',
|
|
69
|
-
message: "Type your username or e-mail used for ".concat(parameters.boxHost),
|
|
71
|
+
message: "Type your username or e-mail used for ".concat(parameters_1.parameters.boxHost),
|
|
70
72
|
})];
|
|
71
73
|
case 1:
|
|
72
74
|
response = _b.sent();
|
|
@@ -79,7 +81,7 @@ exports.login = (0, commandDefinition_1.createCommandDefinition)({
|
|
|
79
81
|
return [4 /*yield*/, prompts({
|
|
80
82
|
type: 'password',
|
|
81
83
|
name: 'password',
|
|
82
|
-
message: "Type your password used for ".concat(parameters.boxHost),
|
|
84
|
+
message: "Type your password used for ".concat(parameters_1.parameters.boxHost),
|
|
83
85
|
})];
|
|
84
86
|
case 3:
|
|
85
87
|
password = (_b.sent()).password;
|
|
@@ -91,13 +93,13 @@ exports.login = (0, commandDefinition_1.createCommandDefinition)({
|
|
|
91
93
|
case 5:
|
|
92
94
|
_a = _b.sent(), tokenId = _a.id, apiSecurityToken = _a.securityToken, name = _a.name;
|
|
93
95
|
return [4 /*yield*/, (0, runControlHelper_1.saveConfig)({
|
|
94
|
-
apiUrl: apiUrl !== parameters.apiUrl ? apiUrl : undefined,
|
|
96
|
+
apiUrl: apiUrl !== parameters_1.parameters.apiUrl ? apiUrl : undefined,
|
|
95
97
|
identification: tokenId,
|
|
96
98
|
apiSecurityToken: apiSecurityToken,
|
|
97
99
|
})];
|
|
98
100
|
case 6:
|
|
99
101
|
_b.sent();
|
|
100
|
-
|
|
102
|
+
(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, sosControlHelper_1.getConfigFilePath)())));
|
|
101
103
|
return [2 /*return*/];
|
|
102
104
|
}
|
|
103
105
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loginCommand.js","sourceRoot":"","sources":["../../src/Auth/loginCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA0B;AAC1B,iCAAmC;AACnC,6BAA+B;AAC/B,uBAAyB;AACzB,oCAAqE;AACrE,
|
|
1
|
+
{"version":3,"file":"loginCommand.js","sourceRoot":"","sources":["../../src/Auth/loginCommand.ts"],"names":[],"mappings":"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"}
|
package/dist/Cli/helper.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare function getPackageName():
|
|
2
|
-
export declare function getPackageVersion():
|
|
1
|
+
export declare function getPackageName(): any;
|
|
2
|
+
export declare function getPackageVersion(): any;
|
package/dist/Cli/helper.js
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getPackageVersion = exports.getPackageName = void 0;
|
|
4
|
-
var
|
|
4
|
+
var parameters_1 = require("../parameters");
|
|
5
5
|
function getPackageName() {
|
|
6
|
-
return parameters.name;
|
|
6
|
+
return parameters_1.parameters.name;
|
|
7
7
|
}
|
|
8
8
|
exports.getPackageName = getPackageName;
|
|
9
9
|
function getPackageVersion() {
|
|
10
|
-
return parameters.version;
|
|
10
|
+
return parameters_1.parameters.version;
|
|
11
11
|
}
|
|
12
12
|
exports.getPackageVersion = getPackageVersion;
|
|
13
13
|
//# sourceMappingURL=helper.js.map
|
package/dist/Cli/helper.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../src/Cli/helper.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../src/Cli/helper.ts"],"names":[],"mappings":";;;AAAA,4CAA2C;AAE3C,SAAgB,cAAc;IAC7B,OAAO,uBAAU,CAAC,IAAI,CAAC;AACxB,CAAC;AAFD,wCAEC;AAED,SAAgB,iBAAiB;IAChC,OAAO,uBAAU,CAAC,OAAO,CAAC;AAC3B,CAAC;AAFD,8CAEC"}
|
|
@@ -42,12 +42,13 @@ var semver = require("semver");
|
|
|
42
42
|
var child_process_promise_1 = require("child-process-promise");
|
|
43
43
|
var helper_1 = require("./helper");
|
|
44
44
|
var tmpCache_1 = require("../Cache/tmpCache");
|
|
45
|
+
var log_1 = require("@signageos/sdk/dist/Console/log");
|
|
45
46
|
function printVersion() {
|
|
46
47
|
return __awaiter(this, void 0, void 0, function () {
|
|
47
48
|
return __generator(this, function (_a) {
|
|
48
49
|
switch (_a.label) {
|
|
49
50
|
case 0:
|
|
50
|
-
|
|
51
|
+
(0, log_1.log)('info', (0, helper_1.getPackageVersion)());
|
|
51
52
|
return [4 /*yield*/, printUpdateMessage()];
|
|
52
53
|
case 1:
|
|
53
54
|
_a.sent();
|
|
@@ -65,7 +66,7 @@ function printUpdateMessage() {
|
|
|
65
66
|
case 0:
|
|
66
67
|
packageName = (0, helper_1.getPackageName)();
|
|
67
68
|
installedVersion = (0, helper_1.getPackageVersion)();
|
|
68
|
-
|
|
69
|
+
(0, log_1.log)('info', 'Checking updates...');
|
|
69
70
|
return [4 /*yield*/, getLatestVersion(packageName)];
|
|
70
71
|
case 1:
|
|
71
72
|
latestVersion = _a.sent();
|
|
@@ -73,7 +74,7 @@ function printUpdateMessage() {
|
|
|
73
74
|
case 2:
|
|
74
75
|
updateMessage = _a.sent();
|
|
75
76
|
if (updateMessage) {
|
|
76
|
-
|
|
77
|
+
(0, log_1.log)('info', updateMessage);
|
|
77
78
|
}
|
|
78
79
|
return [2 /*return*/];
|
|
79
80
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../../src/Cli/packageVersion.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA0B;AAC1B,+BAAiC;AACjC,+DAA6C;AAC7C,mCAA6D;AAC7D,8CAAqE;
|
|
1
|
+
{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../../src/Cli/packageVersion.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA0B;AAC1B,+BAAiC;AACjC,+DAA6C;AAC7C,mCAA6D;AAC7D,8CAAqE;AACrE,uDAAsD;AAEtD,SAAsB,YAAY;;;;;oBACjC,IAAA,SAAG,EAAC,MAAM,EAAE,IAAA,0BAAiB,GAAE,CAAC,CAAC;oBACjC,qBAAM,kBAAkB,EAAE,EAAA;;oBAA1B,SAA0B,CAAC;;;;;CAC3B;AAHD,oCAGC;AAED,SAAsB,kBAAkB;;;;;;oBACjC,WAAW,GAAG,IAAA,uBAAc,GAAE,CAAC;oBAC/B,gBAAgB,GAAG,IAAA,0BAAiB,GAAE,CAAC;oBAE7C,IAAA,SAAG,EAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;oBAEb,qBAAM,gBAAgB,CAAC,WAAW,CAAC,EAAA;;oBAAnD,aAAa,GAAG,SAAmC;oBACnC,qBAAM,gBAAgB,CAAC,WAAW,EAAE,gBAAgB,EAAE,aAAa,CAAC,EAAA;;oBAApF,aAAa,GAAG,SAAoE;oBAE1F,IAAI,aAAa,EAAE;wBAClB,IAAA,SAAG,EAAC,MAAM,EAAE,aAAa,CAAC,CAAC;qBAC3B;;;;;CACD;AAZD,gDAYC;AAED,SAAsB,gBAAgB,CAAC,WAAmB;;;;;;;oBAEjC,qBAAM,IAAA,4BAAI,EAAC,mBAAY,WAAW,aAAU,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EAAA;;oBAAlF,cAAc,GAAG,SAAiE;oBAClF,aAAa,GAAG,cAAc,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;oBAEnD,sBAAO,aAAa,EAAC;;;oBAErB,sBAAO,SAAS,EAAC;;;;;CAElB;AATD,4CASC;AAED,SAAsB,gBAAgB,CAAC,WAAmB,EAAE,gBAAwB,EAAE,aAAsB;;;;YACrG,6BAA6B,GAAG,EAAE;kBACrC,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC,mDAAmD,CAAC;kBACtE,UAAG,eAAK,CAAC,IAAI,CAAC,wBAAwB,CAAC,oBAAU,WAAW,eAAY,CAAC;YACtE,4BAA4B,GAAG,eAAK,CAAC,IAAI,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;YAE5E,qBAAqB,GAAG,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YAC3F,mBAAmB,GAAG,gBAAgB,KAAK,aAAa,CAAC;YAE/D,IAAI,qBAAqB,EAAE;gBAC1B,sBAAO,6BAA6B,EAAC;aACrC;iBACD,IAAI,mBAAmB,EAAE;gBACxB,sBAAO,4BAA4B,EAAC;aACpC;iBAAM;gBACN,sBAAO,SAAS,EAAC;aACjB;;;;CACD;AAjBD,4CAiBC;AAED,IAAM,wBAAwB,GAAG,uBAAuB,CAAC;AACzD,IAAM,iCAAiC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,SAAS;AAE9D,SAAsB,mBAAmB;;;;;;;oBAClC,WAAW,GAAW,IAAA,uBAAc,GAAE,CAAC;oBACvC,gBAAgB,GAAW,IAAA,0BAAiB,GAAE,CAAC;oBAEjD,aAAa,GAAuB,MAAA,IAAA,yBAAc,EAAC,wBAAwB,CAAC,mCAAI,SAAS,CAAC;yBAE1F,CAAC,aAAa,EAAd,wBAAc;oBACD,qBAAM,gBAAgB,CAAC,WAAW,CAAC,EAAA;;oBAAnD,aAAa,GAAG,SAAmC,CAAC;oBACpD,IAAI,aAAa,EAAE;wBAClB,IAAA,2BAAgB,EAAC,wBAAwB,EAAE,aAAa,EAAE,EAAE,UAAU,EAAE,iCAAiC,EAAE,CAAC,CAAC;qBAC7G;;wBAGF,sBAAO,aAAa;wBACnB,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,aAAa,EAAE,gBAAgB,CAAC;wBAC5C,CAAC,CAAC,KAAK,EAAC;;;;CACT;AAhBD,kDAgBC;AAED,SAAgB,uBAAuB;IACtC,IAAM,oBAAoB,GAAG,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC,iDAAiD,CAAC,CAAC;IAClG,OAAO,oBAAoB,CAAC;AAC7B,CAAC;AAHD,0DAGC"}
|
|
@@ -78,6 +78,7 @@ var chalk_1 = require("chalk");
|
|
|
78
78
|
var cliUsage = require("command-line-usage");
|
|
79
79
|
var cliArgs = require("command-line-args");
|
|
80
80
|
var packageVersion_1 = require("../Cli/packageVersion");
|
|
81
|
+
var log_1 = require("@signageos/sdk/dist/Console/log");
|
|
81
82
|
var debug = Debug('@signageos/cli:Command:processor');
|
|
82
83
|
function processCommand(currentCommand, parentOptionList, commandIndex) {
|
|
83
84
|
if (parentOptionList === void 0) { parentOptionList = []; }
|
|
@@ -113,7 +114,7 @@ function processCommand(currentCommand, parentOptionList, commandIndex) {
|
|
|
113
114
|
case 6:
|
|
114
115
|
newVer = _a.sent();
|
|
115
116
|
if (newVer) {
|
|
116
|
-
|
|
117
|
+
(0, log_1.log)('info', (0, packageVersion_1.getUpdateVersionMessage)());
|
|
117
118
|
}
|
|
118
119
|
return [4 /*yield*/, currentCommand.run(currentOptions)];
|
|
119
120
|
case 7:
|
|
@@ -121,7 +122,7 @@ function processCommand(currentCommand, parentOptionList, commandIndex) {
|
|
|
121
122
|
return [3 /*break*/, 9];
|
|
122
123
|
case 8:
|
|
123
124
|
error_1 = _a.sent();
|
|
124
|
-
|
|
125
|
+
(0, log_1.log)('error', error_1.message);
|
|
125
126
|
printUsage(currentCommand, nestedOptionList);
|
|
126
127
|
process.exit(1);
|
|
127
128
|
return [3 /*break*/, 9];
|
|
@@ -133,15 +134,13 @@ function processCommand(currentCommand, parentOptionList, commandIndex) {
|
|
|
133
134
|
exports.processCommand = processCommand;
|
|
134
135
|
function printUsage(currentCommand, optionList) {
|
|
135
136
|
var e_1, _a;
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
console.log();
|
|
137
|
+
(0, log_1.log)('info', chalk_1.default.bold(currentCommand.name));
|
|
138
|
+
(0, log_1.log)('info', ' - ' + chalk_1.default.italic(currentCommand.description), '');
|
|
139
139
|
try {
|
|
140
140
|
for (var _b = __values(currentCommand.commands), _c = _b.next(); !_c.done; _c = _b.next()) {
|
|
141
141
|
var command = _c.value;
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
console.log();
|
|
142
|
+
(0, log_1.log)('info', ' ' + chalk_1.default.bold(command.name));
|
|
143
|
+
(0, log_1.log)('info', ' - ' + chalk_1.default.italic(command.description), '');
|
|
145
144
|
}
|
|
146
145
|
}
|
|
147
146
|
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
@@ -154,6 +153,6 @@ function printUsage(currentCommand, optionList) {
|
|
|
154
153
|
var usage = cliUsage({
|
|
155
154
|
optionList: optionList,
|
|
156
155
|
});
|
|
157
|
-
|
|
156
|
+
(0, log_1.log)('info', usage);
|
|
158
157
|
}
|
|
159
158
|
//# sourceMappingURL=commandProcessor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandProcessor.js","sourceRoot":"","sources":["../../src/Command/commandProcessor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA+B;AAC/B,+BAA0B;AAC1B,6CAA+C;AAC/C,2CAA6C;AAC7C,wDAI+B;AAE/B,IAAM,KAAK,GAAG,KAAK,CAAC,kCAAkC,CAAC,CAAC;AAExD,SAAsB,cAAc,CACnC,cAA4C,EAC5C,gBAAuC,EACvC,YAAwB;IADxB,iCAAA,EAAA,qBAAuC;IACvC,6BAAA,EAAA,gBAAwB;;;;;;oBAElB,gBAAgB,0CAAO,gBAAgB,kBAAK,cAAc,CAAC,UAAU,SAAC,CAAC;oBACvE,cAAc,GAAG,OAAO,CAAC,gBAAgB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;oBACpE,KAAK,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;oBAE3B,cAAc,GAAG,cAAc,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;oBACtD,UAAU,GAAG,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAC,OAAqC,IAAK,OAAA,OAAO,CAAC,IAAI,KAAK,cAAc,EAA/B,CAA+B,CAAC,CAAC;yBAExH,UAAU,EAAV,wBAAU;oBACb,qBAAM,cAAc,CAAC,UAAU,EAAE,gBAAgB,EAAE,YAAY,GAAG,CAAC,CAAC,EAAA;;oBAApE,SAAoE,CAAC;;;yBAGjE,cAAc,CAAC,IAAI,EAAnB,wBAAmB;oBACtB,UAAU,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;;;yBAE1C,cAAc,CAAC,OAAO,EAAtB,wBAAsB;oBACzB,qBAAM,IAAA,6BAAY,GAAE,EAAA;;oBAApB,SAAoB,CAAC;;;;oBAII,qBAAM,IAAA,oCAAmB,GAAE,EAAA;;oBAA7C,MAAM,GAAY,SAA2B;oBAEnD,IAAI,MAAM,EAAE;wBACX,
|
|
1
|
+
{"version":3,"file":"commandProcessor.js","sourceRoot":"","sources":["../../src/Command/commandProcessor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA+B;AAC/B,+BAA0B;AAC1B,6CAA+C;AAC/C,2CAA6C;AAC7C,wDAI+B;AAE/B,uDAAsD;AACtD,IAAM,KAAK,GAAG,KAAK,CAAC,kCAAkC,CAAC,CAAC;AAExD,SAAsB,cAAc,CACnC,cAA4C,EAC5C,gBAAuC,EACvC,YAAwB;IADxB,iCAAA,EAAA,qBAAuC;IACvC,6BAAA,EAAA,gBAAwB;;;;;;oBAElB,gBAAgB,0CAAO,gBAAgB,kBAAK,cAAc,CAAC,UAAU,SAAC,CAAC;oBACvE,cAAc,GAAG,OAAO,CAAC,gBAAgB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;oBACpE,KAAK,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;oBAE3B,cAAc,GAAG,cAAc,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;oBACtD,UAAU,GAAG,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAC,OAAqC,IAAK,OAAA,OAAO,CAAC,IAAI,KAAK,cAAc,EAA/B,CAA+B,CAAC,CAAC;yBAExH,UAAU,EAAV,wBAAU;oBACb,qBAAM,cAAc,CAAC,UAAU,EAAE,gBAAgB,EAAE,YAAY,GAAG,CAAC,CAAC,EAAA;;oBAApE,SAAoE,CAAC;;;yBAGjE,cAAc,CAAC,IAAI,EAAnB,wBAAmB;oBACtB,UAAU,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;;;yBAE1C,cAAc,CAAC,OAAO,EAAtB,wBAAsB;oBACzB,qBAAM,IAAA,6BAAY,GAAE,EAAA;;oBAApB,SAAoB,CAAC;;;;oBAII,qBAAM,IAAA,oCAAmB,GAAE,EAAA;;oBAA7C,MAAM,GAAY,SAA2B;oBAEnD,IAAI,MAAM,EAAE;wBACX,IAAA,SAAG,EAAC,MAAM,EAAE,IAAA,wCAAuB,GAAE,CAAC,CAAC;qBACvC;oBACD,qBAAM,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,EAAA;;oBAAxC,SAAwC,CAAC;;;;oBAEzC,IAAA,SAAG,EAAC,OAAO,EAAE,OAAK,CAAC,OAAO,CAAC,CAAC;oBAC5B,UAAU,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;oBAC7C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;;;;;;CAInB;AArCD,wCAqCC;AAED,SAAS,UAAU,CAClB,cAA4C,EAC5C,UAA4B;;IAE5B,IAAA,SAAG,EAAC,MAAM,EAAE,eAAK,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7C,IAAA,SAAG,EAAC,MAAM,EAAE,MAAM,GAAG,eAAK,CAAC,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC;;QACnE,KAAsB,IAAA,KAAA,SAAA,cAAc,CAAC,QAAQ,CAAA,gBAAA,4BAAE;YAA1C,IAAM,OAAO,WAAA;YACjB,IAAA,SAAG,EAAC,MAAM,EAAE,IAAI,GAAG,eAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;YAC7C,IAAA,SAAG,EAAC,MAAM,EAAE,QAAQ,GAAG,eAAK,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC;SAC9D;;;;;;;;;IACD,IAAM,KAAK,GAAG,QAAQ,CAAC;QACtB,UAAU,YAAA;KACV,CAAC,CAAC;IACH,IAAA,SAAG,EAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AACpB,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare function getGlobalApiUrl(): string;
|
|
1
|
+
export declare function getGlobalApiUrl(): string | undefined;
|
|
2
2
|
export declare function getGlobalProfile(): string;
|