@signageos/cli 0.10.2 → 1.0.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/CHANGELOG.md +16 -0
- package/README.md +16 -1
- package/config/parameters.d.ts +1 -0
- package/config/parameters.js +4 -0
- package/dist/Applet/Generate/appletGenerateCommand.d.ts +44 -2
- package/dist/Applet/Generate/appletGenerateCommand.js +44 -35
- package/dist/Applet/Generate/appletGenerateCommand.js.map +1 -1
- package/dist/Applet/Start/appletStartCommand.d.ts +59 -2
- package/dist/Applet/Start/appletStartCommand.js +31 -22
- package/dist/Applet/Start/appletStartCommand.js.map +1 -1
- package/dist/Applet/Start/appletStartCommandHelper.d.ts +3 -2
- package/dist/Applet/Start/appletStartCommandHelper.js +5 -4
- package/dist/Applet/Start/appletStartCommandHelper.js.map +1 -1
- package/dist/Applet/Test/Upload/appletTestRunCommand.d.ts +52 -2
- package/dist/Applet/Test/Upload/appletTestRunCommand.js +44 -36
- package/dist/Applet/Test/Upload/appletTestRunCommand.js.map +1 -1
- package/dist/Applet/Test/Upload/appletTestRunFacade.js +2 -1
- package/dist/Applet/Test/Upload/appletTestRunFacade.js.map +1 -1
- package/dist/Applet/Test/Upload/appletTestUploadCommand.d.ts +42 -2
- package/dist/Applet/Test/Upload/appletTestUploadCommand.js +45 -37
- package/dist/Applet/Test/Upload/appletTestUploadCommand.js.map +1 -1
- package/dist/Applet/Test/Upload/appletTestUploadFacade.js +2 -1
- package/dist/Applet/Test/Upload/appletTestUploadFacade.js.map +1 -1
- package/dist/Applet/Test/appletTestCommand.d.ts +93 -2
- package/dist/Applet/Test/appletTestCommand.js +4 -2
- package/dist/Applet/Test/appletTestCommand.js.map +1 -1
- package/dist/Applet/Upload/appletUploadCommand.d.ts +63 -5
- package/dist/Applet/Upload/appletUploadCommand.js +142 -150
- package/dist/Applet/Upload/appletUploadCommand.js.map +1 -1
- package/dist/Applet/Upload/appletUploadCommandHelper.d.ts +17 -5
- package/dist/Applet/Upload/appletUploadCommandHelper.js +30 -47
- package/dist/Applet/Upload/appletUploadCommandHelper.js.map +1 -1
- package/dist/Applet/Upload/appletUploadFacade.d.ts +0 -7
- package/dist/Applet/Upload/appletUploadFacade.js +21 -23
- package/dist/Applet/Upload/appletUploadFacade.js.map +1 -1
- package/dist/Applet/Upload/appletUploadFacadeHelper.js +5 -4
- package/dist/Applet/Upload/appletUploadFacadeHelper.js.map +1 -1
- package/dist/Applet/appletCommand.d.ts +257 -2
- package/dist/Applet/appletCommand.js +4 -2
- package/dist/Applet/appletCommand.js.map +1 -1
- package/dist/Applet/appletFacade.d.ts +1 -3
- package/dist/Applet/appletFacade.js +28 -53
- package/dist/Applet/appletFacade.js.map +1 -1
- package/dist/Auth/loginCommand.d.ts +18 -2
- package/dist/Auth/loginCommand.js +16 -13
- package/dist/Auth/loginCommand.js.map +1 -1
- package/dist/Cache/tmpCache.js +1 -0
- package/dist/Cache/tmpCache.js.map +1 -1
- package/dist/Cli/helper.js +1 -0
- package/dist/Cli/helper.js.map +1 -1
- package/dist/Cli/packageVersion.d.ts +0 -6
- package/dist/Cli/packageVersion.js +10 -15
- package/dist/Cli/packageVersion.js.map +1 -1
- package/dist/Command/commandDefinition.d.ts +28 -0
- package/dist/Command/commandDefinition.js +8 -0
- package/dist/Command/commandDefinition.js.map +1 -0
- package/dist/Command/commandProcessor.d.ts +2 -10
- package/dist/Command/commandProcessor.js +13 -20
- package/dist/Command/commandProcessor.js.map +1 -1
- package/dist/Command/globalArgs.d.ts +2 -0
- package/dist/Command/globalArgs.js +16 -0
- package/dist/Command/globalArgs.js.map +1 -0
- package/dist/CommandLine/progressBarFactory.js +1 -0
- package/dist/CommandLine/progressBarFactory.js.map +1 -1
- package/dist/Device/Connect/connectCommand.d.ts +50 -2
- package/dist/Device/Connect/connectCommand.js +23 -18
- package/dist/Device/Connect/connectCommand.js.map +1 -1
- package/dist/Device/Connect/connectHelper.d.ts +0 -1
- package/dist/Device/Connect/connectHelper.js +39 -75
- package/dist/Device/Connect/connectHelper.js.map +1 -1
- package/dist/Device/Content/setContentCommand.d.ts +42 -2
- package/dist/Device/Content/setContentCommand.js +21 -13
- package/dist/Device/Content/setContentCommand.js.map +1 -1
- package/dist/Device/PowerAction/powerActionCommand.d.ts +42 -2
- package/dist/Device/PowerAction/powerActionCommand.js +17 -13
- package/dist/Device/PowerAction/powerActionCommand.js.map +1 -1
- package/dist/Device/deviceCommand.d.ts +129 -2
- package/dist/Device/deviceCommand.js +4 -2
- package/dist/Device/deviceCommand.js.map +1 -1
- package/dist/Device/deviceFacade.d.ts +11 -10
- package/dist/Device/deviceFacade.js +20 -15
- package/dist/Device/deviceFacade.js.map +1 -1
- package/dist/Emulator/createDomain.js +3 -2
- package/dist/Emulator/createDomain.js.map +1 -1
- package/dist/Emulator/emulatorFacade.d.ts +3 -1
- package/dist/Emulator/emulatorFacade.js +29 -27
- package/dist/Emulator/emulatorFacade.js.map +1 -1
- package/dist/Emulator/emulatorFactory.d.ts +3 -1
- package/dist/Emulator/emulatorFactory.js +19 -17
- package/dist/Emulator/emulatorFactory.js.map +1 -1
- package/dist/FileSystem/helper.js +21 -15
- package/dist/FileSystem/helper.js.map +1 -1
- package/dist/FileSystem/packageConfig.js +1 -0
- package/dist/FileSystem/packageConfig.js.map +1 -1
- package/dist/Firmware/Upload/firmwareUploadCommand.d.ts +48 -2
- package/dist/Firmware/Upload/firmwareUploadCommand.js +33 -20
- package/dist/Firmware/Upload/firmwareUploadCommand.js.map +1 -1
- package/dist/Firmware/Upload/firmwareUploadFacade.js +5 -4
- package/dist/Firmware/Upload/firmwareUploadFacade.js.map +1 -1
- package/dist/Firmware/Upload/firmwareUploadHelper.js +2 -2
- package/dist/Firmware/Upload/firmwareUploadHelper.js.map +1 -1
- package/dist/Firmware/firmwareCommand.d.ts +51 -2
- package/dist/Firmware/firmwareCommand.js +5 -8
- package/dist/Firmware/firmwareCommand.js.map +1 -1
- package/dist/Helper/localMachineHelper.d.ts +1 -0
- package/dist/Helper/localMachineHelper.js +94 -0
- package/dist/Helper/localMachineHelper.js.map +1 -0
- package/dist/Organization/Get/organizationGetCommand.d.ts +26 -2
- package/dist/Organization/Get/organizationGetCommand.js +11 -7
- package/dist/Organization/Get/organizationGetCommand.js.map +1 -1
- package/dist/Organization/List/organizationListCommand.d.ts +7 -2
- package/dist/Organization/List/organizationListCommand.js +6 -4
- package/dist/Organization/List/organizationListCommand.js.map +1 -1
- package/dist/Organization/SetDefault/organizationSetDefaultCommand.d.ts +18 -2
- package/dist/Organization/SetDefault/organizationSetDefaultCommand.js +12 -9
- package/dist/Organization/SetDefault/organizationSetDefaultCommand.js.map +1 -1
- package/dist/Organization/organizationCommand.d.ts +49 -2
- package/dist/Organization/organizationCommand.js +4 -2
- package/dist/Organization/organizationCommand.js.map +1 -1
- package/dist/Organization/organizationFacade.d.ts +20 -5
- package/dist/Organization/organizationFacade.js +60 -12
- package/dist/Organization/organizationFacade.js.map +1 -1
- package/dist/RunControl/runControlHelper.d.ts +1 -1
- package/dist/RunControl/runControlHelper.js +38 -14
- package/dist/RunControl/runControlHelper.js.map +1 -1
- package/dist/Stream/helper.js +1 -0
- package/dist/Stream/helper.js.map +1 -1
- package/dist/Timing/List/timingListCommand.d.ts +34 -2
- package/dist/Timing/List/timingListCommand.js +14 -10
- package/dist/Timing/List/timingListCommand.js.map +1 -1
- package/dist/Timing/timingCommand.d.ts +37 -2
- package/dist/Timing/timingCommand.js +4 -2
- package/dist/Timing/timingCommand.js.map +1 -1
- package/dist/generalCommand.d.ts +64 -0
- package/dist/generalCommand.js +46 -0
- package/dist/generalCommand.js.map +1 -0
- package/dist/helper.d.ts +6 -2
- package/dist/helper.js +13 -12
- package/dist/helper.js.map +1 -1
- package/dist/index.js +6 -18
- package/dist/index.js.map +1 -1
- package/package-lock.json +1094 -870
- package/package.json +14 -13
- package/dist/Command/ICommand.d.ts +0 -10
- package/dist/Command/ICommand.js +0 -3
- package/dist/Command/ICommand.js.map +0 -1
|
@@ -1,23 +1,24 @@
|
|
|
1
|
-
import { CommandLineOptions } from "command-line-args";
|
|
2
1
|
import { IOrganization } from '../Organization/organizationFacade';
|
|
3
2
|
import { DevicePowerAction } from '@signageos/sdk/dist/RestApi/Device/PowerAction/IPowerAction';
|
|
4
3
|
import RestApi from "@signageos/sdk/dist/RestApi/RestApi";
|
|
5
4
|
import { IApplet } from "../Applet/appletFacade";
|
|
6
|
-
|
|
7
|
-
uid: string;
|
|
8
|
-
name: string;
|
|
9
|
-
}
|
|
5
|
+
import { CommandLineOptions } from '../Command/commandDefinition';
|
|
10
6
|
export interface ActionData {
|
|
11
7
|
name: string;
|
|
12
8
|
action: DevicePowerAction;
|
|
13
9
|
}
|
|
14
10
|
export declare const typeMap: Map<string, ActionData>;
|
|
15
11
|
export declare const DEVICE_UID_OPTION: {
|
|
16
|
-
name:
|
|
17
|
-
type: StringConstructor;
|
|
18
|
-
description:
|
|
12
|
+
readonly name: "device-uid";
|
|
13
|
+
readonly type: StringConstructor;
|
|
14
|
+
readonly description: "Device UID";
|
|
15
|
+
};
|
|
16
|
+
export declare const POWER_ACTION_TYPE_OPTION: {
|
|
17
|
+
readonly name: "type";
|
|
18
|
+
readonly type: StringConstructor;
|
|
19
|
+
readonly description: "Type of device power action";
|
|
19
20
|
};
|
|
20
|
-
export declare function getDeviceUid(restApi: RestApi, options: CommandLineOptions): Promise<string>;
|
|
21
|
-
export declare function getActionType(options: CommandLineOptions): Promise<string>;
|
|
21
|
+
export declare function getDeviceUid(restApi: RestApi, options: CommandLineOptions<[typeof DEVICE_UID_OPTION]>): Promise<string>;
|
|
22
|
+
export declare function getActionType(options: CommandLineOptions<[typeof POWER_ACTION_TYPE_OPTION]>): Promise<string>;
|
|
22
23
|
export declare function connectDevice(organization: IOrganization, deviceUid: String, applet: Partial<IApplet>, serverPort: string): Promise<any>;
|
|
23
24
|
export declare function disconnectDevice(organization: IOrganization, deviceUid: String): Promise<any>;
|
|
@@ -36,12 +36,13 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
36
36
|
}
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
+
exports.disconnectDevice = exports.connectDevice = exports.getActionType = exports.getDeviceUid = exports.POWER_ACTION_TYPE_OPTION = exports.DEVICE_UID_OPTION = exports.typeMap = void 0;
|
|
39
40
|
var Debug = require("debug");
|
|
40
41
|
var prompts = require("prompts");
|
|
41
42
|
var helper_1 = require("../helper");
|
|
42
|
-
var commandProcessor_1 = require("../Command/commandProcessor");
|
|
43
43
|
var IPowerAction_1 = require("@signageos/sdk/dist/RestApi/Device/PowerAction/IPowerAction");
|
|
44
|
-
var
|
|
44
|
+
var globalArgs_1 = require("../Command/globalArgs");
|
|
45
|
+
var localMachineHelper_1 = require("../Helper/localMachineHelper");
|
|
45
46
|
var debug = Debug('@signageos/cli:Device:facade');
|
|
46
47
|
exports.typeMap = new Map([
|
|
47
48
|
['reboot', { name: 'Reboot Device', action: IPowerAction_1.DevicePowerAction.SystemReboot }],
|
|
@@ -54,6 +55,7 @@ exports.typeMap = new Map([
|
|
|
54
55
|
['refresh', { name: 'Applet Refresh', action: IPowerAction_1.DevicePowerAction.AppletRefresh }],
|
|
55
56
|
]);
|
|
56
57
|
exports.DEVICE_UID_OPTION = { name: 'device-uid', type: String, description: 'Device UID' };
|
|
58
|
+
exports.POWER_ACTION_TYPE_OPTION = { name: 'type', type: String, description: "Type of device power action" };
|
|
57
59
|
function getDeviceUid(restApi, options) {
|
|
58
60
|
return __awaiter(this, void 0, void 0, function () {
|
|
59
61
|
var deviceUid, devices, response;
|
|
@@ -69,10 +71,13 @@ function getDeviceUid(restApi, options) {
|
|
|
69
71
|
type: 'autocomplete',
|
|
70
72
|
name: 'deviceUid',
|
|
71
73
|
message: "Select device to use",
|
|
72
|
-
choices: devices.map(function (dev) {
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
74
|
+
choices: devices.map(function (dev) {
|
|
75
|
+
var _a;
|
|
76
|
+
return ({
|
|
77
|
+
title: "".concat((_a = dev.name) !== null && _a !== void 0 ? _a : "Unnamed device, created ".concat(dev.createdAt.toString()), " (").concat(dev.uid, ")"),
|
|
78
|
+
value: dev.uid,
|
|
79
|
+
});
|
|
80
|
+
}),
|
|
76
81
|
})];
|
|
77
82
|
case 2:
|
|
78
83
|
response = _a.sent();
|
|
@@ -115,7 +120,7 @@ function getActionType(options) {
|
|
|
115
120
|
throw new Error('Missing argument --type <string>');
|
|
116
121
|
}
|
|
117
122
|
if (!exports.typeMap.get(action)) {
|
|
118
|
-
throw new Error("Wrong power action type argument --type. Action "
|
|
123
|
+
throw new Error("Wrong power action type argument --type. Action ".concat(options.type, " is not defined"));
|
|
119
124
|
}
|
|
120
125
|
return [2 /*return*/, action];
|
|
121
126
|
}
|
|
@@ -129,26 +134,26 @@ function connectDevice(organization, deviceUid, applet, serverPort) {
|
|
|
129
134
|
return __generator(this, function (_c) {
|
|
130
135
|
switch (_c.label) {
|
|
131
136
|
case 0:
|
|
132
|
-
DEVICE_RESOURCE = "/device/"
|
|
137
|
+
DEVICE_RESOURCE = "/device/".concat(deviceUid, "/connect");
|
|
133
138
|
options = {
|
|
134
|
-
url:
|
|
139
|
+
url: (0, globalArgs_1.getGlobalApiUrl)(),
|
|
135
140
|
auth: {
|
|
136
141
|
clientId: organization.oauthClientId,
|
|
137
142
|
secret: organization.oauthClientSecret,
|
|
138
143
|
},
|
|
139
144
|
version: 'v1',
|
|
140
145
|
};
|
|
141
|
-
return [4 /*yield*/,
|
|
146
|
+
return [4 /*yield*/, (0, localMachineHelper_1.getMachineIp)()];
|
|
142
147
|
case 1:
|
|
143
148
|
computerIp = _c.sent();
|
|
144
149
|
protocol = "http://";
|
|
145
150
|
body = {
|
|
146
151
|
deviceUid: deviceUid,
|
|
147
152
|
appletUid: applet.uid,
|
|
148
|
-
remoteIp: protocol.concat(computerIp +
|
|
153
|
+
remoteIp: protocol.concat(computerIp + ":".concat(serverPort)),
|
|
149
154
|
appletVersion: applet.version,
|
|
150
155
|
};
|
|
151
|
-
return [4 /*yield*/, helper_1.postResource(options, DEVICE_RESOURCE, null, body)];
|
|
156
|
+
return [4 /*yield*/, (0, helper_1.postResource)(options, DEVICE_RESOURCE, null, body)];
|
|
152
157
|
case 2:
|
|
153
158
|
responseOfPost = _c.sent();
|
|
154
159
|
_b = (_a = JSON).parse;
|
|
@@ -165,16 +170,16 @@ function disconnectDevice(organization, deviceUid) {
|
|
|
165
170
|
return __generator(this, function (_c) {
|
|
166
171
|
switch (_c.label) {
|
|
167
172
|
case 0:
|
|
168
|
-
DEVICE_RESOURCE = "/device/"
|
|
173
|
+
DEVICE_RESOURCE = "/device/".concat(deviceUid, "/disconnect");
|
|
169
174
|
options = {
|
|
170
|
-
url:
|
|
175
|
+
url: (0, globalArgs_1.getGlobalApiUrl)(),
|
|
171
176
|
auth: {
|
|
172
177
|
clientId: organization.oauthClientId,
|
|
173
178
|
secret: organization.oauthClientSecret,
|
|
174
179
|
},
|
|
175
180
|
version: 'v1',
|
|
176
181
|
};
|
|
177
|
-
return [4 /*yield*/, helper_1.postResource(options, DEVICE_RESOURCE, null, { "deviceUid": ""
|
|
182
|
+
return [4 /*yield*/, (0, helper_1.postResource)(options, DEVICE_RESOURCE, null, { "deviceUid": "".concat(deviceUid) })];
|
|
178
183
|
case 1:
|
|
179
184
|
responseOfPost = _c.sent();
|
|
180
185
|
_b = (_a = JSON).parse;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deviceFacade.js","sourceRoot":"","sources":["../../src/Device/deviceFacade.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"deviceFacade.js","sourceRoot":"","sources":["../../src/Device/deviceFacade.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createDomain = void 0;
|
|
3
4
|
var url = require("url");
|
|
4
5
|
var ip = require("internal-ip");
|
|
5
6
|
function createDomain(options, server) {
|
|
@@ -14,8 +15,8 @@ function createDomain(options, server) {
|
|
|
14
15
|
// (prefix with protocol if not explicitly given)
|
|
15
16
|
if (options.public) {
|
|
16
17
|
return /^[a-zA-Z]+:\/\//.test(options.public)
|
|
17
|
-
? ""
|
|
18
|
-
: protocol
|
|
18
|
+
? "".concat(options.public)
|
|
19
|
+
: "".concat(protocol, "://").concat(options.public);
|
|
19
20
|
}
|
|
20
21
|
// the formatted domain (url without path) of the webpack server
|
|
21
22
|
return url.format({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createDomain.js","sourceRoot":"","sources":["../../src/Emulator/createDomain.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createDomain.js","sourceRoot":"","sources":["../../src/Emulator/createDomain.ts"],"names":[],"mappings":";;;AAEA,yBAA2B;AAC3B,gCAAkC;AAalC,SAAgB,YAAY,CAAC,OAAiB,EAAE,MAAoB;IACnE,IAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;IAClD,IAAM,QAAQ,GAAG,OAAO,CAAC,UAAU;QAClC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,WAAW;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,IAAI,WAAW,CAAC;IAE/B,IAAM,aAAa,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,EAAE,CAAC;IACxC,6CAA6C;IAC7C,IAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,aAAa,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,KAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAClH,oCAAoC;IACpC,iDAAiD;IACjD,IAAI,OAAO,CAAC,MAAM,EAAE;QACnB,OAAO,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;YAC5C,CAAC,CAAC,UAAG,OAAO,CAAC,MAAM,CAAE;YACrB,CAAC,CAAC,UAAG,QAAQ,gBAAM,OAAO,CAAC,MAAM,CAAE,CAAC;KACrC;IACD,gEAAgE;IAChE,OAAO,GAAG,CAAC,MAAM,CAAC;QACjB,QAAQ,UAAA;QACR,QAAQ,UAAA;QACR,IAAI,MAAA;KACJ,CAAC,CAAC;AACJ,CAAC;AAtBD,oCAsBC"}
|
|
@@ -1 +1,3 @@
|
|
|
1
|
-
|
|
1
|
+
import { NO_DEFAULT_ORGANIZATION_OPTION, ORGANIZATION_UID_OPTION } from '../Organization/organizationFacade';
|
|
2
|
+
import { CommandLineOptions } from '../Command/commandDefinition';
|
|
3
|
+
export declare function loadEmulatorOrCreateNewAndReturnUid(options: CommandLineOptions<[typeof ORGANIZATION_UID_OPTION, typeof NO_DEFAULT_ORGANIZATION_OPTION]>): Promise<string>;
|
|
@@ -36,16 +36,18 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
36
36
|
}
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
+
exports.loadEmulatorOrCreateNewAndReturnUid = void 0;
|
|
39
40
|
var chalk_1 = require("chalk");
|
|
40
41
|
var prompts = require("prompts");
|
|
41
42
|
var runControlHelper_1 = require("../RunControl/runControlHelper");
|
|
42
|
-
var commandProcessor_1 = require("../Command/commandProcessor");
|
|
43
43
|
var RestApi_1 = require("@signageos/sdk/dist/RestApi/RestApi");
|
|
44
44
|
var AuthenticationError_1 = require("@signageos/sdk/dist/RestApi/Error/AuthenticationError");
|
|
45
|
+
var organizationFacade_1 = require("../Organization/organizationFacade");
|
|
46
|
+
var globalArgs_1 = require("../Command/globalArgs");
|
|
45
47
|
var createRestApi = function (config) {
|
|
46
48
|
var _a, _b;
|
|
47
49
|
var options = {
|
|
48
|
-
url:
|
|
50
|
+
url: (0, globalArgs_1.getGlobalApiUrl)(),
|
|
49
51
|
auth: {
|
|
50
52
|
clientId: (_a = config.identification) !== null && _a !== void 0 ? _a : '',
|
|
51
53
|
secret: (_b = config.apiSecurityToken) !== null && _b !== void 0 ? _b : '',
|
|
@@ -66,7 +68,7 @@ function getListOfEmulators(restApi) {
|
|
|
66
68
|
case 2:
|
|
67
69
|
e_1 = _a.sent();
|
|
68
70
|
if (e_1 instanceof AuthenticationError_1.default) {
|
|
69
|
-
throw new Error("Authentication error. Try to login using "
|
|
71
|
+
throw new Error("Authentication error. Try to login using ".concat(chalk_1.default.green('sos login')));
|
|
70
72
|
}
|
|
71
73
|
else {
|
|
72
74
|
throw new Error('Unknown error: ' + e_1.message);
|
|
@@ -94,23 +96,23 @@ function createNewEmulator(restApi, organizationUid) {
|
|
|
94
96
|
});
|
|
95
97
|
});
|
|
96
98
|
}
|
|
97
|
-
function loadEmulatorOrCreateNewAndReturnUid() {
|
|
99
|
+
function loadEmulatorOrCreateNewAndReturnUid(options) {
|
|
98
100
|
return __awaiter(this, void 0, void 0, function () {
|
|
99
|
-
var config, restApi, listOfEmulatorsResponse, isSavedValidEmulator, emulatorUid, emulatorName, selectedEmulator, newEmulatorList, emulatorName;
|
|
101
|
+
var config, organizationUid, restApi, listOfEmulatorsResponse, isSavedValidEmulator, emulatorUid, emulatorName, selectedEmulator, newEmulatorList, emulatorName;
|
|
100
102
|
return __generator(this, function (_a) {
|
|
101
103
|
switch (_a.label) {
|
|
102
|
-
case 0: return [4 /*yield*/, runControlHelper_1.loadConfig()];
|
|
104
|
+
case 0: return [4 /*yield*/, (0, runControlHelper_1.loadConfig)()];
|
|
103
105
|
case 1:
|
|
104
106
|
config = _a.sent();
|
|
105
107
|
if (!config.identification || !config.apiSecurityToken) {
|
|
106
|
-
throw new Error("No authenticized account found. Try to login using "
|
|
107
|
-
}
|
|
108
|
-
if (!config.defaultOrganizationUid) {
|
|
109
|
-
throw new Error("No default organization selected. Use " + chalk_1.default.green('sos organization set-default') + " first.");
|
|
108
|
+
throw new Error("No authenticized account found. Try to login using ".concat(chalk_1.default.green('sos login')));
|
|
110
109
|
}
|
|
110
|
+
return [4 /*yield*/, (0, organizationFacade_1.getOrganizationUidOrDefaultOrSelect)(options)];
|
|
111
|
+
case 2:
|
|
112
|
+
organizationUid = _a.sent();
|
|
111
113
|
restApi = createRestApi(config);
|
|
112
114
|
return [4 /*yield*/, getListOfEmulators(restApi)];
|
|
113
|
-
case
|
|
115
|
+
case 3:
|
|
114
116
|
listOfEmulatorsResponse = _a.sent();
|
|
115
117
|
isSavedValidEmulator = config.emulatorUid && listOfEmulatorsResponse.some(function (emu) { return emu.duid === config.emulatorUid; });
|
|
116
118
|
if (isSavedValidEmulator) {
|
|
@@ -121,40 +123,40 @@ function loadEmulatorOrCreateNewAndReturnUid() {
|
|
|
121
123
|
}
|
|
122
124
|
emulatorUid = '';
|
|
123
125
|
console.log('Looking for valid emulator assigned to your account via API...');
|
|
124
|
-
if (!(listOfEmulatorsResponse.length === 1)) return [3 /*break*/,
|
|
126
|
+
if (!(listOfEmulatorsResponse.length === 1)) return [3 /*break*/, 4];
|
|
125
127
|
emulatorName = listOfEmulatorsResponse[0].name;
|
|
126
128
|
emulatorUid = listOfEmulatorsResponse[0].duid;
|
|
127
|
-
console.log("One valid emulator "
|
|
128
|
-
return [3 /*break*/,
|
|
129
|
-
case
|
|
130
|
-
if (!(listOfEmulatorsResponse.length > 1)) return [3 /*break*/,
|
|
129
|
+
console.log("One valid emulator ".concat(chalk_1.default.green(emulatorName), " fetched and saved into .sosrc"));
|
|
130
|
+
return [3 /*break*/, 9];
|
|
131
|
+
case 4:
|
|
132
|
+
if (!(listOfEmulatorsResponse.length > 1)) return [3 /*break*/, 6];
|
|
131
133
|
return [4 /*yield*/, prompts({
|
|
132
134
|
type: 'select',
|
|
133
135
|
name: 'duid',
|
|
134
136
|
message: 'Select emulator to use',
|
|
135
137
|
choices: listOfEmulatorsResponse.map(function (emu) { return ({
|
|
136
|
-
title: emu.name
|
|
138
|
+
title: "".concat(emu.name, " (").concat(emu.duid, ")"),
|
|
137
139
|
value: emu.duid,
|
|
138
140
|
}); }),
|
|
139
141
|
})];
|
|
140
|
-
case
|
|
142
|
+
case 5:
|
|
141
143
|
selectedEmulator = _a.sent();
|
|
142
144
|
emulatorUid = selectedEmulator.duid;
|
|
143
|
-
return [3 /*break*/,
|
|
144
|
-
case 5:
|
|
145
|
-
console.log('No valid emulator assigned to your account found via API thus newone will be created');
|
|
146
|
-
return [4 /*yield*/, createNewEmulator(restApi, config.defaultOrganizationUid)];
|
|
145
|
+
return [3 /*break*/, 9];
|
|
147
146
|
case 6:
|
|
147
|
+
console.log('No valid emulator assigned to your account found via API thus newone will be created');
|
|
148
|
+
return [4 /*yield*/, createNewEmulator(restApi, organizationUid)];
|
|
149
|
+
case 7:
|
|
148
150
|
_a.sent();
|
|
149
151
|
return [4 /*yield*/, getListOfEmulators(restApi)];
|
|
150
|
-
case
|
|
152
|
+
case 8:
|
|
151
153
|
newEmulatorList = _a.sent();
|
|
152
154
|
emulatorName = newEmulatorList[0].name;
|
|
153
155
|
emulatorUid = newEmulatorList[0].duid;
|
|
154
|
-
console.log("New emulator "
|
|
155
|
-
_a.label =
|
|
156
|
-
case
|
|
157
|
-
case
|
|
156
|
+
console.log("New emulator ".concat(chalk_1.default.green(emulatorName), " created and saved into .sosrc"));
|
|
157
|
+
_a.label = 9;
|
|
158
|
+
case 9: return [4 /*yield*/, (0, runControlHelper_1.updateConfig)({ emulatorUid: emulatorUid })];
|
|
159
|
+
case 10:
|
|
158
160
|
_a.sent();
|
|
159
161
|
return [2 /*return*/, emulatorUid];
|
|
160
162
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emulatorFacade.js","sourceRoot":"","sources":["../../src/Emulator/emulatorFacade.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"emulatorFacade.js","sourceRoot":"","sources":["../../src/Emulator/emulatorFacade.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { IEmulator } from './IEmulator';
|
|
2
|
+
import { NO_DEFAULT_ORGANIZATION_OPTION, ORGANIZATION_UID_OPTION } from '../Organization/organizationFacade';
|
|
3
|
+
import { CommandLineOptions } from '../Command/commandDefinition';
|
|
2
4
|
export interface ICreateEmulatorParams {
|
|
3
5
|
projectPath: string;
|
|
4
6
|
appletPath: string;
|
|
@@ -6,4 +8,4 @@ export interface ICreateEmulatorParams {
|
|
|
6
8
|
emulatorServerPort: number;
|
|
7
9
|
emulatorUid: string;
|
|
8
10
|
}
|
|
9
|
-
export declare function createEmulator(params: ICreateEmulatorParams): Promise<IEmulator>;
|
|
11
|
+
export declare function createEmulator(params: ICreateEmulatorParams, options: CommandLineOptions<[typeof ORGANIZATION_UID_OPTION, typeof NO_DEFAULT_ORGANIZATION_OPTION]>): Promise<IEmulator>;
|
|
@@ -36,6 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
36
36
|
}
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
+
exports.createEmulator = void 0;
|
|
39
40
|
var path = require("path");
|
|
40
41
|
var http = require("http");
|
|
41
42
|
var url = require("url");
|
|
@@ -46,15 +47,16 @@ var mime = require("mime");
|
|
|
46
47
|
var fsExtra = require("fs-extra");
|
|
47
48
|
var glob = require("globby");
|
|
48
49
|
var chalk_1 = require("chalk");
|
|
49
|
-
var runControlHelper_1 = require("../RunControl/runControlHelper");
|
|
50
50
|
var createDomain_1 = require("./createDomain");
|
|
51
|
+
var organizationFacade_1 = require("../Organization/organizationFacade");
|
|
51
52
|
var DUMMY_CHECKSUM = '0000000000ffffffffff';
|
|
52
53
|
var APPLET_DIRECTORY_PATH = '/applet';
|
|
53
|
-
function createEmulator(params) {
|
|
54
|
+
function createEmulator(params, options) {
|
|
55
|
+
var _a;
|
|
54
56
|
return __awaiter(this, void 0, void 0, function () {
|
|
55
|
-
var projectPath, emulatorServerPort, appletPath, entryFileRelativePath, entryFileAbsolutePath, serverDomainOptions, frontDisplayPath, frontDisplayDistPath, packageConfig,
|
|
56
|
-
return __generator(this, function (
|
|
57
|
-
switch (
|
|
57
|
+
var projectPath, emulatorServerPort, appletPath, entryFileRelativePath, entryFileAbsolutePath, serverDomainOptions, frontDisplayPath, frontDisplayDistPath, packageConfig, organizationUid, envVars, app, server, appletAssets, entryFileExists;
|
|
58
|
+
return __generator(this, function (_b) {
|
|
59
|
+
switch (_b.label) {
|
|
58
60
|
case 0:
|
|
59
61
|
projectPath = params.projectPath, emulatorServerPort = params.emulatorServerPort, appletPath = params.appletPath, entryFileRelativePath = params.entryFileRelativePath;
|
|
60
62
|
entryFileAbsolutePath = path.join(appletPath, entryFileRelativePath);
|
|
@@ -62,20 +64,20 @@ function createEmulator(params) {
|
|
|
62
64
|
frontDisplayPath = path.dirname(require.resolve('@signageos/front-display/package.json', { paths: [projectPath] }));
|
|
63
65
|
frontDisplayDistPath = path.join(frontDisplayPath, 'dist');
|
|
64
66
|
packageConfig = JSON.parse(fsExtra.readFileSync(path.join(projectPath, 'package.json')).toString());
|
|
65
|
-
return [4 /*yield*/,
|
|
67
|
+
return [4 /*yield*/, (0, organizationFacade_1.getOrganizationUidOrDefaultOrSelect)(options)];
|
|
66
68
|
case 1:
|
|
67
|
-
|
|
68
|
-
organizationUid = sosGlobalConfig.defaultOrganizationUid;
|
|
69
|
+
organizationUid = _b.sent();
|
|
69
70
|
if (!organizationUid) {
|
|
70
|
-
throw new Error("No default organization selected. Use "
|
|
71
|
+
throw new Error("No default organization selected. Use ".concat(chalk_1.default.green('sos organization set-default'), " first."));
|
|
71
72
|
}
|
|
72
73
|
envVars = {
|
|
74
|
+
uid: ((_a = packageConfig.sos) === null || _a === void 0 ? void 0 : _a.appletUid) || '__default_timing__',
|
|
73
75
|
version: packageConfig.version,
|
|
74
76
|
organizationUid: organizationUid,
|
|
75
|
-
binaryFilePath: APPLET_DIRECTORY_PATH
|
|
77
|
+
binaryFilePath: "".concat(APPLET_DIRECTORY_PATH, "/").concat(entryFileRelativePath),
|
|
76
78
|
checksum: DUMMY_CHECKSUM,
|
|
77
79
|
frontAppletVersion: '',
|
|
78
|
-
frontAppletBinaryFile: '',
|
|
80
|
+
frontAppletBinaryFile: '', // has bundled front applet
|
|
79
81
|
};
|
|
80
82
|
app = express();
|
|
81
83
|
app.use(cors());
|
|
@@ -83,21 +85,21 @@ function createEmulator(params) {
|
|
|
83
85
|
var currentDate = new Date();
|
|
84
86
|
res.header('Last-Modified', currentDate.toString());
|
|
85
87
|
res.header('Content-type', 'text/cache-manifest; charset=UTF-8');
|
|
86
|
-
res.send("CACHE MANIFEST\n# v1 - "
|
|
88
|
+
res.send("CACHE MANIFEST\n# v1 - ".concat(currentDate.toISOString(), "\n/tmp\nNETWORK:\n*\n"));
|
|
87
89
|
});
|
|
88
90
|
app.get('/', function (req, res) {
|
|
89
91
|
if (!req.query.duid) {
|
|
90
|
-
res.redirect(""
|
|
92
|
+
res.redirect("".concat(req.originalUrl).concat(req.originalUrl.includes('?') ? '&' : '?', "duid=").concat(params.emulatorUid));
|
|
91
93
|
}
|
|
92
94
|
else {
|
|
93
|
-
res.send("<script>\n\t\t\t\t\twindow.__SOS_BUNDLED_APPLET = {};\n\t\t\t\t\twindow.__SOS_BUNDLED_APPLET.binaryFile = location.origin + "
|
|
95
|
+
res.send("<script>\n\t\t\t\t\twindow.__SOS_BUNDLED_APPLET = {};\n\t\t\t\t\twindow.__SOS_BUNDLED_APPLET.binaryFile = location.origin + ".concat(JSON.stringify(envVars.binaryFilePath), ";\n\t\t\t\t\twindow.__SOS_BUNDLED_APPLET.uid = ").concat(JSON.stringify(envVars.uid), ";\n\t\t\t\t\twindow.__SOS_BUNDLED_APPLET.version = ").concat(JSON.stringify(envVars.version), ";\n\t\t\t\t\twindow.__SOS_BUNDLED_APPLET.checksum = ").concat(JSON.stringify(envVars.checksum), ";\n\t\t\t\t\twindow.__SOS_BUNDLED_APPLET.frontAppletVersion = ").concat(JSON.stringify(envVars.frontAppletVersion), ";\n\t\t\t\t\twindow.__SOS_BUNDLED_APPLET.frontAppletBinaryFile = ").concat(JSON.stringify(envVars.frontAppletBinaryFile), ";\n\t\t\t\t\twindow.__SOS_AUTO_VERIFICATION = {};\n\t\t\t\t\twindow.__SOS_AUTO_VERIFICATION.organizationUid = ").concat(JSON.stringify(envVars.organizationUid), ";\n\t\t\t\t</script>")
|
|
94
96
|
+ fsExtra.readFileSync(path.join(frontDisplayDistPath, 'index.html')).toString());
|
|
95
97
|
}
|
|
96
98
|
});
|
|
97
99
|
app.use(serveStatic(frontDisplayDistPath));
|
|
98
100
|
server = http.createServer(app);
|
|
99
101
|
server.listen(emulatorServerPort, function () {
|
|
100
|
-
console.log("Emulator is running at "
|
|
102
|
+
console.log("Emulator is running at ".concat(chalk_1.default.blue(chalk_1.default.bold((0, createDomain_1.createDomain)(serverDomainOptions, server)))));
|
|
101
103
|
});
|
|
102
104
|
return [4 /*yield*/, glob(['**/*'], {
|
|
103
105
|
cwd: appletPath,
|
|
@@ -105,10 +107,10 @@ function createEmulator(params) {
|
|
|
105
107
|
dot: true,
|
|
106
108
|
})];
|
|
107
109
|
case 2:
|
|
108
|
-
appletAssets =
|
|
110
|
+
appletAssets = _b.sent();
|
|
109
111
|
entryFileExists = appletAssets.includes(entryFileAbsolutePath.replace(/\\/g, '/'));
|
|
110
112
|
if (!entryFileExists) {
|
|
111
|
-
throw new Error("Applet has to have "
|
|
113
|
+
throw new Error("Applet has to have ".concat(chalk_1.default.green(entryFileRelativePath), " in applet directory."));
|
|
112
114
|
}
|
|
113
115
|
app.use(APPLET_DIRECTORY_PATH, function (req, res, next) {
|
|
114
116
|
var fileUrl = url.parse(req.url);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emulatorFactory.js","sourceRoot":"","sources":["../../src/Emulator/emulatorFactory.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"emulatorFactory.js","sourceRoot":"","sources":["../../src/Emulator/emulatorFactory.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,11 +51,17 @@ var __read = (this && this.__read) || function (o, n) {
|
|
|
51
51
|
}
|
|
52
52
|
return ar;
|
|
53
53
|
};
|
|
54
|
-
var
|
|
55
|
-
for (var
|
|
56
|
-
|
|
54
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
55
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
56
|
+
if (ar || !(i in from)) {
|
|
57
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
58
|
+
ar[i] = from[i];
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
57
62
|
};
|
|
58
63
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
64
|
+
exports.getAllPaths = exports.validateAllFormalities = exports.listDirectoryContentRecursively = exports.getFileType = exports.computeFileMD5 = void 0;
|
|
59
65
|
var fs = require("fs-extra");
|
|
60
66
|
var path = require("path");
|
|
61
67
|
var file_1 = require("@signageos/file");
|
|
@@ -76,7 +82,7 @@ function computeFileMD5(filePath) {
|
|
|
76
82
|
switch (_a.label) {
|
|
77
83
|
case 0:
|
|
78
84
|
fileStream = fs.createReadStream(filePath);
|
|
79
|
-
return [4 /*yield*/, helper_1.computeMD5(fileStream)];
|
|
85
|
+
return [4 /*yield*/, (0, helper_1.computeMD5)(fileStream)];
|
|
80
86
|
case 1: return [2 /*return*/, _a.sent()];
|
|
81
87
|
}
|
|
82
88
|
});
|
|
@@ -88,7 +94,7 @@ function getFileType(filePath) {
|
|
|
88
94
|
var fileResult;
|
|
89
95
|
return __generator(this, function (_a) {
|
|
90
96
|
switch (_a.label) {
|
|
91
|
-
case 0: return [4 /*yield*/, file_1.default(filePath, { mimeType: true })];
|
|
97
|
+
case 0: return [4 /*yield*/, (0, file_1.default)(filePath, { mimeType: true })];
|
|
92
98
|
case 1:
|
|
93
99
|
fileResult = _a.sent();
|
|
94
100
|
debug('file type', filePath, fileResult);
|
|
@@ -107,7 +113,7 @@ function listDirectoryContentRecursively(appletDirPath, ignoreFileDirPath) {
|
|
|
107
113
|
var pkgJson, files, filesSet_1, paths, ignorePatterns_1, usedIgnoreFilePath, index, ignoreFileName, ignoreFilePath, ignoreFileExists, usedIgnoreFileBuffer, ignoreFilePatterns;
|
|
108
114
|
return __generator(this, function (_b) {
|
|
109
115
|
switch (_b.label) {
|
|
110
|
-
case 0: return [4 /*yield*/, packageConfig_1.loadPackage(appletDirPath)];
|
|
116
|
+
case 0: return [4 /*yield*/, (0, packageConfig_1.loadPackage)(appletDirPath)];
|
|
111
117
|
case 1:
|
|
112
118
|
pkgJson = (_a = _b.sent()) !== null && _a !== void 0 ? _a : {};
|
|
113
119
|
files = [];
|
|
@@ -117,7 +123,7 @@ function listDirectoryContentRecursively(appletDirPath, ignoreFileDirPath) {
|
|
|
117
123
|
case 2:
|
|
118
124
|
paths = _b.sent();
|
|
119
125
|
paths.forEach(function (p) { return filesSet_1.add(p); });
|
|
120
|
-
files =
|
|
126
|
+
files = __spreadArray([], __read(filesSet_1), false).map(function (f) { return path.join(appletDirPath, f); });
|
|
121
127
|
return [3 /*break*/, 11];
|
|
122
128
|
case 3:
|
|
123
129
|
ignorePatterns_1 = [];
|
|
@@ -141,19 +147,19 @@ function listDirectoryContentRecursively(appletDirPath, ignoreFileDirPath) {
|
|
|
141
147
|
return [3 /*break*/, 4];
|
|
142
148
|
case 7:
|
|
143
149
|
if (usedIgnoreFilePath) {
|
|
144
|
-
console.log("Use ignore file: "
|
|
150
|
+
console.log("Use ignore file: ".concat(chalk_1.default.green.bold(usedIgnoreFilePath), "."));
|
|
145
151
|
}
|
|
146
152
|
else {
|
|
147
|
-
console.log("No ignore file found in "
|
|
153
|
+
console.log("No ignore file found in ".concat(chalk_1.default.yellow.bold(ignoreFileDirPath), "."));
|
|
148
154
|
}
|
|
149
155
|
if (!usedIgnoreFilePath) return [3 /*break*/, 9];
|
|
150
156
|
return [4 /*yield*/, fs.readFile(usedIgnoreFilePath)];
|
|
151
157
|
case 8:
|
|
152
158
|
usedIgnoreFileBuffer = _b.sent();
|
|
153
159
|
ignoreFilePatterns = parseIgnoreFile(usedIgnoreFileBuffer);
|
|
154
|
-
ignoreFilePatterns.forEach(function (pattern) { return ignorePatterns_1.push("!"
|
|
160
|
+
ignoreFilePatterns.forEach(function (pattern) { return ignorePatterns_1.push("!".concat(pattern)); });
|
|
155
161
|
_b.label = 9;
|
|
156
|
-
case 9: return [4 /*yield*/, glob(
|
|
162
|
+
case 9: return [4 /*yield*/, glob(__spreadArray(['**/*'], __read(ignorePatterns_1), false), {
|
|
157
163
|
cwd: appletDirPath,
|
|
158
164
|
absolute: true,
|
|
159
165
|
dot: true,
|
|
@@ -180,22 +186,22 @@ function validateAllFormalities(appletDir, entryFile) {
|
|
|
180
186
|
var pkgJson, absolutePkgPath, paths;
|
|
181
187
|
return __generator(this, function (_a) {
|
|
182
188
|
switch (_a.label) {
|
|
183
|
-
case 0: return [4 /*yield*/, packageConfig_1.loadPackage(appletDir)];
|
|
189
|
+
case 0: return [4 /*yield*/, (0, packageConfig_1.loadPackage)(appletDir)];
|
|
184
190
|
case 1:
|
|
185
191
|
pkgJson = _a.sent();
|
|
186
192
|
if (!pkgJson) {
|
|
187
193
|
absolutePkgPath = path.join(appletDir, 'package.json');
|
|
188
|
-
throw new Error("Cannot find package.json file on path "
|
|
194
|
+
throw new Error("Cannot find package.json file on path ".concat(absolutePkgPath));
|
|
189
195
|
}
|
|
190
196
|
if (pkgJson.main !== entryFile) {
|
|
191
|
-
throw new Error(pkgJson.main
|
|
197
|
+
throw new Error("".concat(pkgJson.main, " from package.json file doesn't match with entry file: ").concat(entryFile));
|
|
192
198
|
}
|
|
193
199
|
if (!Array.isArray(pkgJson.files)) return [3 /*break*/, 3];
|
|
194
200
|
return [4 /*yield*/, getAllPaths(appletDir, pkgJson.files)];
|
|
195
201
|
case 2:
|
|
196
202
|
paths = _a.sent();
|
|
197
203
|
if (!paths.includes(pkgJson.main)) {
|
|
198
|
-
throw new Error(pkgJson.main
|
|
204
|
+
throw new Error("".concat(pkgJson.main, " is not a part of tracking files"));
|
|
199
205
|
}
|
|
200
206
|
_a.label = 3;
|
|
201
207
|
case 3: return [2 /*return*/];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../src/FileSystem/helper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../src/FileSystem/helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,6 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
36
36
|
}
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
+
exports.loadPackage = exports.saveToPackage = void 0;
|
|
39
40
|
var fs = require("fs-extra");
|
|
40
41
|
var path = require("path");
|
|
41
42
|
var helper_1 = require("../helper");
|