@signageos/cli 1.1.4 → 1.2.0

package/dist/Device/Connect/connectCommand.d.ts

@@ -8,17 +8,25 @@ declare const OPTION_LIST: readonly [{
     readonly type: StringConstructor;
     readonly description: "Organization UID";
 }, {
-    readonly name: "ip";
+    readonly name: "device-uid";
     readonly type: StringConstructor;
-    readonly description: "Ip address of computer in local network";
+    readonly description: "Device UID";
 }, {
-    readonly name: "device-uid";
+    readonly name: "applet-uid";
     readonly type: StringConstructor;
-    readonly description: "Uid of device from box";
+    readonly description: "Applet UID";
 }, {
-    readonly name: "applet-path";
+    readonly name: "server-public-url";
     readonly type: StringConstructor;
-    readonly description: "Path to the applet file or the project folder depending on the entry file. Relative to the command or absolute.";
+    readonly description: "Public url of local machine server. Is useful when the local machine is behind a reverse proxy.";
+}, {
+    readonly name: "server-port";
+    readonly type: NumberConstructor;
+    readonly description: "The custom server port for local machine server. Default is detected from currently running applet server.";
+}, {
+    readonly name: "force";
+    readonly type: BooleanConstructor;
+    readonly description: "Force start applet server even if it is already running on a different port. Kill the running server first.";
 }];
 export declare const connect: {
     name: "connect";
@@ -32,17 +40,25 @@ export declare const connect: {
         readonly type: StringConstructor;
         readonly description: "Organization UID";
     }, {
-        readonly name: "ip";
+        readonly name: "device-uid";
         readonly type: StringConstructor;
-        readonly description: "Ip address of computer in local network";
+        readonly description: "Device UID";
     }, {
-        readonly name: "device-uid";
+        readonly name: "applet-uid";
         readonly type: StringConstructor;
-        readonly description: "Uid of device from box";
+        readonly description: "Applet UID";
     }, {
-        readonly name: "applet-path";
+        readonly name: "server-public-url";
         readonly type: StringConstructor;
-        readonly description: "Path to the applet file or the project folder depending on the entry file. Relative to the command or absolute.";
+        readonly description: "Public url of local machine server. Is useful when the local machine is behind a reverse proxy.";
+    }, {
+        readonly name: "server-port";
+        readonly type: NumberConstructor;
+        readonly description: "The custom server port for local machine server. Default is detected from currently running applet server.";
+    }, {
+        readonly name: "force";
+        readonly type: BooleanConstructor;
+        readonly description: "Force start applet server even if it is already running on a different port. Kill the running server first.";
     }];
     commands: never[];
     run: (options: CommandLineOptions<typeof OPTION_LIST>) => Promise<void>;

package/dist/Device/Connect/connectCommand.js

@@ -39,17 +39,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.connect = void 0;
 var deviceFacade_1 = require("../deviceFacade");
 var organizationFacade_1 = require("../../Organization/organizationFacade");
-var connectHelper_1 = require("./connectHelper");
-var appletUploadCommandHelper_1 = require("../../Applet/Upload/appletUploadCommandHelper");
 var appletFacade_1 = require("../../Applet/appletFacade");
 var helper_1 = require("../../helper");
 var commandDefinition_1 = require("../../Command/commandDefinition");
+var sdk_1 = require("@signageos/sdk");
+var wait_1 = require("../../Timer/wait");
+var appletServerHelper_1 = require("../../Applet/appletServerHelper");
 var OPTION_LIST = [
     organizationFacade_1.NO_DEFAULT_ORGANIZATION_OPTION,
     organizationFacade_1.ORGANIZATION_UID_OPTION,
-    { name: 'ip', type: String, description: 'Ip address of computer in local network' },
-    { name: 'device-uid', type: String, description: 'Uid of device from box' },
-    appletUploadCommandHelper_1.APPLET_PATH_OPTION,
+    deviceFacade_1.DEVICE_UID_OPTION,
+    appletFacade_1.APPLET_UID_OPTION,
+    appletServerHelper_1.SERVER_PUBLIC_URL_OPTION,
+    appletServerHelper_1.SERVER_PORT_OPTION,
+    appletServerHelper_1.SERVER_FORCE_OPTION,
 ];
 exports.connect = (0, commandDefinition_1.createCommandDefinition)({
     name: 'connect',
@@ -58,47 +61,70 @@ exports.connect = (0, commandDefinition_1.createCommandDefinition)({
     commands: [],
     run: function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var currentDirectory, projectDirAbsolutePath, appletData, organizationUid, organization, restApi, deviceUid, deviceData, serverData;
+            var currentDirectory, organizationUid, organization, restApi, dev, appletUid, appletVersion, deviceUid, appletPort, appletPublicUrl, server, connection, stopServer;
+            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         currentDirectory = process.cwd();
-                        return [4 /*yield*/, (0, appletUploadCommandHelper_1.getAppletDirectoryAbsolutePath)(currentDirectory, options)];
-                    case 1:
-                        projectDirAbsolutePath = _a.sent();
-                        return [4 /*yield*/, (0, appletFacade_1.getApplet)(projectDirAbsolutePath)];
-                    case 2:
-                        appletData = _a.sent();
                         return [4 /*yield*/, (0, organizationFacade_1.getOrganizationUidOrDefaultOrSelect)(options)];
-                    case 3:
+                    case 1:
                         organizationUid = _a.sent();
                         return [4 /*yield*/, (0, organizationFacade_1.getOrganization)(organizationUid)];
-                    case 4:
+                    case 2:
                         organization = _a.sent();
                         return [4 /*yield*/, (0, helper_1.createOrganizationRestApi)(organization)];
-                    case 5:
+                    case 3:
                         restApi = _a.sent();
+                        dev = (0, sdk_1.createDevelopment)({
+                            organizationUid: organization.uid,
+                        });
+                        return [4 /*yield*/, (0, appletFacade_1.getAppletUid)(restApi, options)];
+                    case 4:
+                        appletUid = _a.sent();
+                        return [4 /*yield*/, (0, appletFacade_1.getAppletVersion)(currentDirectory)];
+                    case 5:
+                        appletVersion = _a.sent();
                         return [4 /*yield*/, (0, deviceFacade_1.getDeviceUid)(restApi, options)];
                     case 6:
                         deviceUid = _a.sent();
-                        return [4 /*yield*/, restApi.device.get(deviceUid)];
+                        appletPort = options[appletServerHelper_1.SERVER_PORT_OPTION.name];
+                        appletPublicUrl = options[appletServerHelper_1.SERVER_PUBLIC_URL_OPTION.name];
+                        return [4 /*yield*/, (0, appletServerHelper_1.killAppletServerIfRunningAndForceOption)(dev, options, appletUid, appletVersion, appletPort)];
                     case 7:
-                        deviceData = _a.sent();
-                        return [4 /*yield*/, (0, connectHelper_1.createConnectFile)(deviceData.uid)];
-                    case 8:
                         _a.sent();
-                        return [4 /*yield*/, (0, connectHelper_1.serveApplet)(projectDirAbsolutePath, appletData, deviceData)];
+                        return [4 /*yield*/, dev.applet.serve.serve({
+                                appletUid: appletUid,
+                                appletVersion: appletVersion,
+                                port: appletPort,
+                                publicUrl: appletPublicUrl,
+                            })];
+                    case 8:
+                        server = _a.sent();
+                        return [4 /*yield*/, dev.deviceConnect.connect(deviceUid, {
+                                appletUid: appletUid,
+                                appletVersion: appletVersion,
+                                appletPublicUrl: server.publicUrl,
+                            })];
                     case 9:
-                        serverData = _a.sent();
-                        return [4 /*yield*/, (0, deviceFacade_1.connectDevice)(organization, deviceData.uid, appletData, serverData.serverPort)];
+                        connection = _a.sent();
+                        stopServer = function () { return __awaiter(_this, void 0, void 0, function () {
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, connection.disconnect()];
+                                    case 1:
+                                        _a.sent();
+                                        process.exit();
+                                        return [2 /*return*/];
+                                }
+                            });
+                        }); };
+                        process.on('SIGINT', stopServer);
+                        process.on('SIGTERM', stopServer);
+                        console.info('Press Ctrl+C to disconnect');
+                        return [4 /*yield*/, (0, wait_1.default)(1e9)];
                     case 10:
-                        _a.sent();
-                        process.on('SIGINT', function () {
-                            (0, connectHelper_1.stopApplication)(organization, deviceData.uid);
-                        });
-                        process.on('SIGTERM', function () {
-                            (0, connectHelper_1.stopApplication)(organization, deviceData.uid);
-                        });
+                        _a.sent(); // Wait forever
                         return [2 /*return*/];
                 }
             });

package/dist/Device/Connect/connectCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"connectCommand.js","sourceRoot":"","sources":["../../../src/Device/Connect/connectCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA8D;AAC9D,4EAAsK;AACtK,iDAAkF;AAClF,2FAAgJ;AAChJ,0DAAsD;AACtD,uCAAyD;AACzD,qEAA8F;AAE9F,IAAM,WAAW,GAAG;IACnB,mDAA8B;IAC9B,4CAAuB;IACvB,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,yCAAyC,EAAE;IACpF,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,wBAAwB,EAAE;IAC3E,8CAAkB;CACT,CAAC;AAEE,QAAA,OAAO,GAAG,IAAA,2CAAuB,EAAC;IAC9C,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,mBAAmB;IAChC,UAAU,EAAE,WAAW;IACvB,QAAQ,EAAE,EAAE;IACZ,GAAG,EAAE,UAAgB,OAA+C;;;;;;wBAC7D,gBAAgB,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;wBACR,qBAAM,IAAA,0DAAyB,EAAC,gBAAgB,EAAE,OAAO,CAAC,EAAA;;wBAAnF,sBAAsB,GAAG,SAA0D;wBACtE,qBAAM,IAAA,wBAAS,EAAC,sBAAsB,CAAC,EAAA;;wBAApD,UAAU,GAAG,SAAuC;wBAClC,qBAAM,IAAA,wDAAmC,EAAC,OAAO,CAAC,EAAA;;wBAApE,eAAe,GAAG,SAAkD;wBACrD,qBAAM,IAAA,oCAAe,EAAC,eAAe,CAAC,EAAA;;wBAArD,YAAY,GAAG,SAAsC;wBAC3C,qBAAM,IAAA,kCAAyB,EAAC,YAAY,CAAC,EAAA;;wBAAvD,OAAO,GAAG,SAA6C;wBAC3C,qBAAM,IAAA,2BAAY,EAAC,OAAO,EAAE,OAAO,CAAC,EAAA;;wBAAhD,SAAS,GAAG,SAAoC;wBACnC,qBAAM,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,EAAA;;wBAAhD,UAAU,GAAG,SAAmC;wBACtD,qBAAM,IAAA,iCAAiB,EAAC,UAAU,CAAC,GAAG,CAAC,EAAA;;wBAAvC,SAAuC,CAAC;wBACpB,qBAAM,IAAA,2BAAW,EAAC,sBAAsB,EAAE,UAAU,EAAE,UAAU,CAAC,EAAA;;wBAA/E,UAAU,GAAI,SAAiE;wBACrF,qBAAM,IAAA,4BAAa,EAAC,YAAY,EAAE,UAAU,CAAC,GAAG,EAAE,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,EAAA;;wBAApF,SAAoF,CAAC;wBAErF,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE;4BACpB,IAAA,+BAAe,EAAC,YAAY,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;wBAC/C,CAAC,CAAC,CAAC;wBACH,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE;4BACrB,IAAA,+BAAe,EAAC,YAAY,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;wBAC/C,CAAC,CAAC,CAAC;;;;;KACH;CACD,CAAC,CAAC"}
+{"version":3,"file":"connectCommand.js","sourceRoot":"","sources":["../../../src/Device/Connect/connectCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAkE;AAClE,4EAAsK;AACtK,0DAA8F;AAC9F,uCAAyD;AACzD,qEAA8F;AAC9F,sCAAmD;AACnD,yCAAoC;AACpC,sEAA6J;AAE7J,IAAM,WAAW,GAAG;IACnB,mDAA8B;IAC9B,4CAAuB;IACvB,gCAAiB;IACjB,gCAAiB;IACjB,6CAAwB;IACxB,uCAAkB;IAClB,wCAAmB;CACV,CAAC;AAEE,QAAA,OAAO,GAAG,IAAA,2CAAuB,EAAC;IAC9C,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,mBAAmB;IAChC,UAAU,EAAE,WAAW;IACvB,QAAQ,EAAE,EAAE;IACZ,GAAG,EAAE,UAAgB,OAA+C;;;;;;;wBAC7D,gBAAgB,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;wBACf,qBAAM,IAAA,wDAAmC,EAAC,OAAO,CAAC,EAAA;;wBAApE,eAAe,GAAG,SAAkD;wBACrD,qBAAM,IAAA,oCAAe,EAAC,eAAe,CAAC,EAAA;;wBAArD,YAAY,GAAG,SAAsC;wBAC3C,qBAAM,IAAA,kCAAyB,EAAC,YAAY,CAAC,EAAA;;wBAAvD,OAAO,GAAG,SAA6C;wBACvD,GAAG,GAAG,IAAA,uBAAiB,EAAC;4BAC7B,eAAe,EAAE,YAAY,CAAC,GAAG;yBACjC,CAAC,CAAC;wBAEe,qBAAM,IAAA,2BAAY,EAAC,OAAO,EAAE,OAAO,CAAC,EAAA;;wBAAhD,SAAS,GAAG,SAAoC;wBAChC,qBAAM,IAAA,+BAAgB,EAAC,gBAAgB,CAAC,EAAA;;wBAAxD,aAAa,GAAG,SAAwC;wBAC5C,qBAAM,IAAA,2BAAY,EAAC,OAAO,EAAE,OAAO,CAAC,EAAA;;wBAAhD,SAAS,GAAG,SAAoC;wBAEhD,UAAU,GAAG,OAAO,CAAC,uCAAkB,CAAC,IAAI,CAAC,CAAC;wBAC9C,eAAe,GAAG,OAAO,CAAC,6CAAwB,CAAC,IAAI,CAAC,CAAC;wBAE/D,qBAAM,IAAA,4DAAuC,EAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,UAAU,CAAC,EAAA;;wBAAjG,SAAiG,CAAC;wBAEnF,qBAAM,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC;gCAC3C,SAAS,WAAA;gCACT,aAAa,eAAA;gCACb,IAAI,EAAE,UAAU;gCAChB,SAAS,EAAE,eAAe;6BAC1B,CAAC,EAAA;;wBALI,MAAM,GAAG,SAKb;wBACiB,qBAAM,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,EAAE;gCAC7D,SAAS,WAAA;gCACT,aAAa,eAAA;gCACb,eAAe,EAAE,MAAM,CAAC,SAAS;6BACjC,CAAC,EAAA;;wBAJI,UAAU,GAAG,SAIjB;wBAEI,UAAU,GAAG;;;4CAClB,qBAAM,UAAU,CAAC,UAAU,EAAE,EAAA;;wCAA7B,SAA6B,CAAC;wCAC9B,OAAO,CAAC,IAAI,EAAE,CAAC;;;;6BACf,CAAC;wBACF,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;wBACjC,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;wBAElC,OAAO,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;wBAC3C,qBAAM,IAAA,cAAI,EAAC,GAAG,CAAC,EAAA;;wBAAf,SAAe,CAAC,CAAC,eAAe;;;;;KAChC;CACD,CAAC,CAAC"}

package/dist/Device/Connect/connectHelper.js

@@ -85,7 +85,8 @@ var createDomain_1 = require("../../Emulator/createDomain");
 var helper_1 = require("../../FileSystem/helper");
 var appletUploadFacadeHelper_1 = require("../../Applet/Upload/appletUploadFacadeHelper");
 var deviceFacade_1 = require("../deviceFacade");
-var parameters = require("../../../config/parameters");
+var parameters_1 = require("../../parameters");
+var log_1 = require("@signageos/sdk/dist/Console/log");
 var archiver = require('archiver');
 var CONNECT_DIRECTORY = 'signageos';
 var connectRuntimeDirPath = path.join(os.tmpdir(), CONNECT_DIRECTORY);
@@ -109,9 +110,9 @@ function serveApplet(projectDirectory, appletData, device) {
                     });
                     app.use(zipAddress, express.static(path.join(connectRuntimeDirPath, device.uid, 'package.zip' + "".concat(device.uid))));
                     server = http.createServer(app);
-                    deviceUlrInBox = "https://".concat(parameters.boxHost, "/device/").concat(device.uid);
+                    deviceUlrInBox = "https://".concat(parameters_1.parameters.boxHost, "/device/").concat(device.uid);
                     server.listen(function () {
-                        console.log("Serving applet from ".concat(chalk_1.default.blue(chalk_1.default.bold((0, createDomain_1.createDomain)({ useLocalIp: true, port: 8080 }, server))), " on ").concat(chalk_1.default.magenta(chalk_1.default.bold(device.name)), " (").concat(chalk_1.default.blue(chalk_1.default.bold(deviceUlrInBox)), ")"));
+                        (0, log_1.log)('info', "Serving applet from ".concat(chalk_1.default.blue(chalk_1.default.bold((0, createDomain_1.createDomain)({ useLocalIp: true, port: 8080 }, server))), " on ").concat(chalk_1.default.magenta(chalk_1.default.bold(device.name)), " (").concat(chalk_1.default.blue(chalk_1.default.bold(deviceUlrInBox)), ")"));
                     });
                     serverData = JSON.stringify(server.address());
                     serverPort = JSON.parse(serverData).port;
@@ -197,7 +198,7 @@ function stopApplication(organization, deviceUid) {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, (0, deviceFacade_1.disconnectDevice)(organization, deviceUid).finally(function () {
-                        console.log(" ".concat(chalk_1.default.blue(chalk_1.default.bold("Device was disconnected"))));
+                        (0, log_1.log)('info', " ".concat(chalk_1.default.blue(chalk_1.default.bold("Device was disconnected"))));
                     })];
                 case 1:
                     _a.sent();

package/dist/Device/Connect/connectHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"connectHelper.js","sourceRoot":"","sources":["../../../src/Device/Connect/connectHelper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"connectHelper.js","sourceRoot":"","sources":["../../../src/Device/Connect/connectHelper.ts"],"names":[],"mappings":"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"}

package/dist/Device/Content/setContentCommand.js

@@ -37,6 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setContent = void 0;
+var log_1 = require("@signageos/sdk/dist/Console/log");
 var chalk_1 = require("chalk");
 var appletFacade_1 = require("../../Applet/appletFacade");
 var commandDefinition_1 = require("../../Command/commandDefinition");
@@ -94,7 +95,7 @@ exports.setContent = (0, commandDefinition_1.createCommandDefinition)({
                             })];
                     case 7:
                         _a.sent();
-                        console.log(chalk_1.default.green("Applet ".concat(appletUid, " was set on device ").concat(deviceUid)));
+                        (0, log_1.log)('info', chalk_1.default.green("Applet ".concat(appletUid, " was set on device ").concat(deviceUid)));
                         return [2 /*return*/];
                 }
             });

package/dist/Device/Content/setContentCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"setContentCommand.js","sourceRoot":"","sources":["../../../src/Device/Content/setContentCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA0B;AAC1B,0DAAqG;AACrG,qEAA8F;AAC9F,uCAAyD;AACzD,4EAK+C;AAC/C,gDAAkE;AAElE,IAAM,WAAW,GAAG;IACnB,mDAA8B;IAC9B,4CAAuB;IACvB,gCAAiB;IACjB,gCAAiB;CACR,CAAC;AAEE,QAAA,UAAU,GAAG,IAAA,2CAAuB,EAAC;IACjD,IAAI,EAAE,aAAa;IACnB,WAAW,EAAE,wBAAwB;IACrC,UAAU,EAAE,WAAW;IACvB,QAAQ,EAAE,EAAE;IACN,GAAG,EAAT,UAAU,OAA+C;;;;;4BAChC,qBAAM,IAAA,wDAAmC,EAAC,OAAO,CAAC,EAAA;;wBAApE,eAAe,GAAG,SAAkD;wBACrD,qBAAM,IAAA,oCAAe,EAAC,eAAe,CAAC,EAAA;;wBAArD,YAAY,GAAG,SAAsC;wBAC3C,qBAAM,IAAA,kCAAyB,EAAC,YAAY,CAAC,EAAA;;wBAAvD,OAAO,GAAG,SAA6C;wBAC3C,qBAAM,IAAA,2BAAY,EAAC,OAAO,EAAE,OAAO,CAAC,EAAA;;wBAAhD,SAAS,GAAG,SAAoC;wBAC/B,qBAAM,IAAA,sCAAuB,EAAC,OAAO,EAAE,SAAS,CAAC,EAAA;;wBAAlE,aAAa,GAAI,SAAiD;wBACtD,qBAAM,IAAA,2BAAY,EAAC,OAAO,EAAE,OAAO,CAAC,EAAA;;wBAAhD,SAAS,GAAG,SAAoC;wBACtD,qBAAM,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;gCAC3B,SAAS,EAAG,SAAS;gCACrB,SAAS,EAAE,SAAS;gCACpB,aAAa,EAAE,aAAa;gCAC5B,QAAQ,EAAE,IAAI,IAAI,EAAE;gCACpB,MAAM,EAAE,IAAI,IAAI,EAAE;gCAClB,QAAQ,EAAE,CAAC;gCACX,aAAa,EAAE;oCACd,cAAc,EAAE,kBAAkB;iCAClC;gCACD,WAAW,EAAE;oCACZ,IAAI,EAAE,UAAU;oCAChB,IAAI,EAAE,MAAM;iCACZ;6BACD,CAAC,EAAA;;wBAdF,SAcE,CAAC;wBACH,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,iBAAU,SAAS,gCAAsB,SAAS,CAAE,CAAC,CAAC,CAAC;;;;;KAC/E;CACD,CAAC,CAAC"}
+{"version":3,"file":"setContentCommand.js","sourceRoot":"","sources":["../../../src/Device/Content/setContentCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAsD;AACtD,+BAA0B;AAC1B,0DAAqG;AACrG,qEAA8F;AAC9F,uCAAyD;AACzD,4EAK+C;AAC/C,gDAAkE;AAElE,IAAM,WAAW,GAAG;IACnB,mDAA8B;IAC9B,4CAAuB;IACvB,gCAAiB;IACjB,gCAAiB;CACR,CAAC;AAEE,QAAA,UAAU,GAAG,IAAA,2CAAuB,EAAC;IACjD,IAAI,EAAE,aAAa;IACnB,WAAW,EAAE,wBAAwB;IACrC,UAAU,EAAE,WAAW;IACvB,QAAQ,EAAE,EAAE;IACN,GAAG,EAAT,UAAU,OAA+C;;;;;4BAChC,qBAAM,IAAA,wDAAmC,EAAC,OAAO,CAAC,EAAA;;wBAApE,eAAe,GAAG,SAAkD;wBACrD,qBAAM,IAAA,oCAAe,EAAC,eAAe,CAAC,EAAA;;wBAArD,YAAY,GAAG,SAAsC;wBAC3C,qBAAM,IAAA,kCAAyB,EAAC,YAAY,CAAC,EAAA;;wBAAvD,OAAO,GAAG,SAA6C;wBAC3C,qBAAM,IAAA,2BAAY,EAAC,OAAO,EAAE,OAAO,CAAC,EAAA;;wBAAhD,SAAS,GAAG,SAAoC;wBAC/B,qBAAM,IAAA,sCAAuB,EAAC,OAAO,EAAE,SAAS,CAAC,EAAA;;wBAAlE,aAAa,GAAI,SAAiD;wBACtD,qBAAM,IAAA,2BAAY,EAAC,OAAO,EAAE,OAAO,CAAC,EAAA;;wBAAhD,SAAS,GAAG,SAAoC;wBACtD,qBAAM,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;gCAC3B,SAAS,EAAG,SAAS;gCACrB,SAAS,EAAE,SAAS;gCACpB,aAAa,EAAE,aAAa;gCAC5B,QAAQ,EAAE,IAAI,IAAI,EAAE;gCACpB,MAAM,EAAE,IAAI,IAAI,EAAE;gCAClB,QAAQ,EAAE,CAAC;gCACX,aAAa,EAAE;oCACd,cAAc,EAAE,kBAAkB;iCAClC;gCACD,WAAW,EAAE;oCACZ,IAAI,EAAE,UAAU;oCAChB,IAAI,EAAE,MAAM;iCACZ;6BACD,CAAC,EAAA;;wBAdF,SAcE,CAAC;wBACH,IAAA,SAAG,EAAC,MAAM,EAAE,eAAK,CAAC,KAAK,CAAC,iBAAU,SAAS,gCAAsB,SAAS,CAAE,CAAC,CAAC,CAAC;;;;;KAC/E;CACD,CAAC,CAAC"}

package/dist/Device/PowerAction/powerActionCommand.js

@@ -43,6 +43,7 @@ var helper_1 = require("../../helper");
 var chalk_1 = require("chalk");
 var deviceFacade_2 = require("../deviceFacade");
 var commandDefinition_1 = require("../../Command/commandDefinition");
+var log_1 = require("@signageos/sdk/dist/Console/log");
 var OPTION_LIST = [
     organizationFacade_1.NO_DEFAULT_ORGANIZATION_OPTION,
     organizationFacade_1.ORGANIZATION_UID_OPTION,
@@ -77,7 +78,7 @@ exports.powerAction = (0, commandDefinition_1.createCommandDefinition)({
                         return [4 /*yield*/, restApi.device.powerAction.set(deviceUid, {
                                 devicePowerAction: deviceFacade_1.typeMap.get(actionType).action,
                             }).finally(function () {
-                                console.log(chalk_1.default.green("Action ".concat(deviceFacade_1.typeMap.get(actionType).name, " was successful on device ").concat(deviceUid)));
+                                (0, log_1.log)('info', chalk_1.default.green("Action ".concat(deviceFacade_1.typeMap.get(actionType).name, " was successful on device ").concat(deviceUid)));
                             })];
                     case 6:
                         _a.sent();

package/dist/Device/PowerAction/powerActionCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"powerActionCommand.js","sourceRoot":"","sources":["../../../src/Device/PowerAction/powerActionCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4EAAsK;AACtK,gDAAqG;AACrG,uCAAyD;AACzD,+BAA0B;AAC1B,gDAAgD;AAChD,qEAA8F;AAE9F,IAAM,WAAW,GAAG;IACnB,mDAA8B;IAC9B,4CAAuB;IACvB,gCAAiB;IACjB,uCAAwB;CACf,CAAC;AAEE,QAAA,WAAW,GAAG,IAAA,2CAAuB,EAAC;IAClD,IAAI,EAAE,cAAc;IACpB,WAAW,EAAE,gCAAgC;IAC7C,UAAU,EAAE,WAAW;IACvB,QAAQ,EAAE,EAAE;IACN,GAAG,EAAT,UAAU,OAA+C;;;;;4BAChC,qBAAM,IAAA,wDAAmC,EAAC,OAAO,CAAC,EAAA;;wBAApE,eAAe,GAAG,SAAkD;wBACrD,qBAAM,IAAA,oCAAe,EAAC,eAAe,CAAC,EAAA;;wBAArD,YAAY,GAAG,SAAsC;wBAC3C,qBAAM,IAAA,kCAAyB,EAAC,YAAY,CAAC,EAAA;;wBAAvD,OAAO,GAAG,SAA6C;wBAC3C,qBAAM,IAAA,2BAAY,EAAC,OAAO,EAAE,OAAO,CAAC,EAAA;;wBAAhD,SAAS,GAAG,SAAoC;wBACnC,qBAAM,IAAA,4BAAa,EAAC,OAAO,CAAC,EAAA;;wBAAzC,UAAU,GAAG,SAA4B;wBAC/C,qBAAM,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,EAAE;gCAC/C,iBAAiB,EAAG,sBAAO,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC,MAAM;6BACnD,CAAC,CAAC,OAAO,CAAC;gCACV,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,iBAAU,sBAAO,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC,IAAI,uCAA6B,SAAS,CAAE,CAAC,CAAC,CAAC;4BAC3G,CAAC,CAAC,EAAA;;wBAJF,SAIE,CAAC;;;;;KACH;CACD,CAAC,CAAC"}
+{"version":3,"file":"powerActionCommand.js","sourceRoot":"","sources":["../../../src/Device/PowerAction/powerActionCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4EAAsK;AACtK,gDAAqG;AACrG,uCAAyD;AACzD,+BAA0B;AAC1B,gDAAgD;AAChD,qEAA8F;AAC9F,uDAAsD;AAEtD,IAAM,WAAW,GAAG;IACnB,mDAA8B;IAC9B,4CAAuB;IACvB,gCAAiB;IACjB,uCAAwB;CACf,CAAC;AAEE,QAAA,WAAW,GAAG,IAAA,2CAAuB,EAAC;IAClD,IAAI,EAAE,cAAc;IACpB,WAAW,EAAE,gCAAgC;IAC7C,UAAU,EAAE,WAAW;IACvB,QAAQ,EAAE,EAAE;IACN,GAAG,EAAT,UAAU,OAA+C;;;;;4BAChC,qBAAM,IAAA,wDAAmC,EAAC,OAAO,CAAC,EAAA;;wBAApE,eAAe,GAAG,SAAkD;wBACrD,qBAAM,IAAA,oCAAe,EAAC,eAAe,CAAC,EAAA;;wBAArD,YAAY,GAAG,SAAsC;wBAC3C,qBAAM,IAAA,kCAAyB,EAAC,YAAY,CAAC,EAAA;;wBAAvD,OAAO,GAAG,SAA6C;wBAC3C,qBAAM,IAAA,2BAAY,EAAC,OAAO,EAAE,OAAO,CAAC,EAAA;;wBAAhD,SAAS,GAAG,SAAoC;wBACnC,qBAAM,IAAA,4BAAa,EAAC,OAAO,CAAC,EAAA;;wBAAzC,UAAU,GAAG,SAA4B;wBAC/C,qBAAM,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,EAAE;gCAC/C,iBAAiB,EAAG,sBAAO,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC,MAAM;6BACnD,CAAC,CAAC,OAAO,CAAC;gCACV,IAAA,SAAG,EAAC,MAAM,EAAE,eAAK,CAAC,KAAK,CAAC,iBAAU,sBAAO,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC,IAAI,uCAA6B,SAAS,CAAE,CAAC,CAAC,CAAC;4BAC3G,CAAC,CAAC,EAAA;;wBAJF,SAIE,CAAC;;;;;KACH;CACD,CAAC,CAAC"}

package/dist/Device/deviceCommand.d.ts

@@ -90,17 +90,25 @@ export declare const device: {
             readonly type: StringConstructor;
             readonly description: "Organization UID";
         }, {
-            readonly name: "ip";
+            readonly name: "device-uid";
             readonly type: StringConstructor;
-            readonly description: "Ip address of computer in local network";
+            readonly description: "Device UID";
         }, {
-            readonly name: "device-uid";
+            readonly name: "applet-uid";
             readonly type: StringConstructor;
-            readonly description: "Uid of device from box";
+            readonly description: "Applet UID";
         }, {
-            readonly name: "applet-path";
+            readonly name: "server-public-url";
             readonly type: StringConstructor;
-            readonly description: "Path to the applet file or the project folder depending on the entry file. Relative to the command or absolute.";
+            readonly description: "Public url of local machine server. Is useful when the local machine is behind a reverse proxy.";
+        }, {
+            readonly name: "server-port";
+            readonly type: NumberConstructor;
+            readonly description: "The custom server port for local machine server. Default is detected from currently running applet server.";
+        }, {
+            readonly name: "force";
+            readonly type: BooleanConstructor;
+            readonly description: "Force start applet server even if it is already running on a different port. Kill the running server first.";
         }];
         commands: never[];
         run: (options: import("../Command/commandDefinition").CommandLineOptions<readonly [{
@@ -112,17 +120,25 @@ export declare const device: {
             readonly type: StringConstructor;
             readonly description: "Organization UID";
         }, {
-            readonly name: "ip";
+            readonly name: "device-uid";
             readonly type: StringConstructor;
-            readonly description: "Ip address of computer in local network";
+            readonly description: "Device UID";
         }, {
-            readonly name: "device-uid";
+            readonly name: "applet-uid";
             readonly type: StringConstructor;
-            readonly description: "Uid of device from box";
+            readonly description: "Applet UID";
         }, {
-            readonly name: "applet-path";
+            readonly name: "server-public-url";
             readonly type: StringConstructor;
-            readonly description: "Path to the applet file or the project folder depending on the entry file. Relative to the command or absolute.";
+            readonly description: "Public url of local machine server. Is useful when the local machine is behind a reverse proxy.";
+        }, {
+            readonly name: "server-port";
+            readonly type: NumberConstructor;
+            readonly description: "The custom server port for local machine server. Default is detected from currently running applet server.";
+        }, {
+            readonly name: "force";
+            readonly type: BooleanConstructor;
+            readonly description: "Force start applet server even if it is already running on a different port. Kill the running server first.";
         }]>) => Promise<void>;
     })[];
     run(): Promise<never>;

package/dist/Device/deviceFacade.d.ts

@@ -1,7 +1,6 @@
 import { IOrganization } from '../Organization/organizationFacade';
 import { DevicePowerAction } from '@signageos/sdk/dist/RestApi/Device/PowerAction/IPowerAction';
 import RestApi from "@signageos/sdk/dist/RestApi/RestApi";
-import { IApplet } from "../Applet/appletFacade";
 import { CommandLineOptions } from '../Command/commandDefinition';
 export interface ActionData {
     name: string;
@@ -20,5 +19,4 @@ export declare const POWER_ACTION_TYPE_OPTION: {
 };
 export declare function getDeviceUid(restApi: RestApi, options: CommandLineOptions<[typeof DEVICE_UID_OPTION]>): Promise<string>;
 export declare function getActionType(options: CommandLineOptions<[typeof POWER_ACTION_TYPE_OPTION]>): Promise<string>;
-export declare function connectDevice(organization: IOrganization, deviceUid: String, applet: Partial<IApplet>, serverPort: string): Promise<any>;
 export declare function disconnectDevice(organization: IOrganization, deviceUid: String): Promise<any>;

package/dist/Device/deviceFacade.js

@@ -36,12 +36,11 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.disconnectDevice = exports.connectDevice = exports.getActionType = exports.getDeviceUid = exports.POWER_ACTION_TYPE_OPTION = exports.DEVICE_UID_OPTION = exports.typeMap = void 0;
+exports.disconnectDevice = exports.getActionType = exports.getDeviceUid = exports.POWER_ACTION_TYPE_OPTION = exports.DEVICE_UID_OPTION = exports.typeMap = void 0;
 var Debug = require("debug");
 var prompts = require("prompts");
 var helper_1 = require("../helper");
 var IPowerAction_1 = require("@signageos/sdk/dist/RestApi/Device/PowerAction/IPowerAction");
-var localMachineHelper_1 = require("../Helper/localMachineHelper");
 var apiVersions_1 = require("@signageos/sdk/dist/RestApi/apiVersions");
 var runControlHelper_1 = require("../RunControl/runControlHelper");
 var debug = Debug('@signageos/cli:Device:facade');
@@ -129,44 +128,6 @@ function getActionType(options) {
     });
 }
 exports.getActionType = getActionType;
-function connectDevice(organization, deviceUid, applet, serverPort) {
-    return __awaiter(this, void 0, void 0, function () {
-        var config, DEVICE_RESOURCE, options, computerIp, protocol, body, responseOfPost, _a, _b;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0: return [4 /*yield*/, (0, runControlHelper_1.loadConfig)()];
-                case 1:
-                    config = _c.sent();
-                    DEVICE_RESOURCE = "/device/".concat(deviceUid, "/connect");
-                    options = {
-                        url: (0, helper_1.getApiUrl)(config),
-                        auth: {
-                            clientId: organization.oauthClientId,
-                            secret: organization.oauthClientSecret,
-                        },
-                        version: apiVersions_1.ApiVersions.V1,
-                    };
-                    return [4 /*yield*/, (0, localMachineHelper_1.getMachineIp)()];
-                case 2:
-                    computerIp = _c.sent();
-                    protocol = "http://";
-                    body = {
-                        deviceUid: deviceUid,
-                        appletUid: applet.uid,
-                        remoteIp: protocol.concat(computerIp + ":".concat(serverPort)),
-                        appletVersion: applet.version,
-                    };
-                    return [4 /*yield*/, (0, helper_1.postResource)(options, DEVICE_RESOURCE, null, body)];
-                case 3:
-                    responseOfPost = _c.sent();
-                    _b = (_a = JSON).parse;
-                    return [4 /*yield*/, responseOfPost.text()];
-                case 4: return [2 /*return*/, _b.apply(_a, [_c.sent(), helper_1.deserializeJSON])];
-            }
-        });
-    });
-}
-exports.connectDevice = connectDevice;
 function disconnectDevice(organization, deviceUid) {
     return __awaiter(this, void 0, void 0, function () {
         var config, DEVICE_RESOURCE, options, responseOfPost, _a, _b;

package/dist/Device/deviceFacade.js.map

@@ -1 +1 @@
-{"version":3,"file":"deviceFacade.js","sourceRoot":"","sources":["../../src/Device/deviceFacade.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"deviceFacade.js","sourceRoot":"","sources":["../../src/Device/deviceFacade.ts"],"names":[],"mappings":"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"}

package/dist/Emulator/IEmulator.d.ts

@@ -1,3 +1,3 @@
 export interface IEmulator {
-    stop(): void;
+    stop(): Promise<void>;
 }

package/dist/Emulator/emulatorFacade.js

@@ -44,6 +44,7 @@ var RestApi_1 = require("@signageos/sdk/dist/RestApi/RestApi");
 var AuthenticationError_1 = require("@signageos/sdk/dist/RestApi/Error/AuthenticationError");
 var apiVersions_1 = require("@signageos/sdk/dist/RestApi/apiVersions");
 var helper_1 = require("../helper");
+var log_1 = require("@signageos/sdk/dist/Console/log");
 var createRestApi = function (config) {
     var _a, _b;
     var options = {
@@ -117,14 +118,14 @@ function loadEmulatorOrCreateNewAndReturnUid(organizationUid) {
                         return [2 /*return*/, config.emulatorUid];
                     }
                     else if (config.emulatorUid) {
-                        console.log(chalk_1.default.yellow('Field emulatorUid in sos config links to non existent emulator'));
+                        (0, log_1.log)('warning', chalk_1.default.yellow('Field emulatorUid in sos config links to non existent emulator'));
                     }
                     emulatorUid = '';
-                    console.log('Looking for valid emulator assigned to your account via API...');
+                    (0, log_1.log)('info', 'Looking for valid emulator assigned to your account via API...');
                     if (!(listOfEmulatorsResponse.length === 1)) return [3 /*break*/, 3];
                     emulatorName = listOfEmulatorsResponse[0].name;
                     emulatorUid = listOfEmulatorsResponse[0].duid;
-                    console.log("One valid emulator ".concat(chalk_1.default.green(emulatorName), " fetched and saved into .sosrc"));
+                    (0, log_1.log)('info', "One valid emulator ".concat(chalk_1.default.green(emulatorName), " fetched and saved into .sosrc"));
                     return [3 /*break*/, 8];
                 case 3:
                     if (!(listOfEmulatorsResponse.length > 1)) return [3 /*break*/, 5];
@@ -142,7 +143,7 @@ function loadEmulatorOrCreateNewAndReturnUid(organizationUid) {
                     emulatorUid = selectedEmulator.duid;
                     return [3 /*break*/, 8];
                 case 5:
-                    console.log('No valid emulator assigned to your account found via API thus newone will be created');
+                    (0, log_1.log)('warning', 'No valid emulator assigned to your account found via API thus newone will be created');
                     return [4 /*yield*/, createNewEmulator(restApi, organizationUid)];
                 case 6:
                     _a.sent();
@@ -151,7 +152,7 @@ function loadEmulatorOrCreateNewAndReturnUid(organizationUid) {
                     newEmulatorList = _a.sent();
                     emulatorName = newEmulatorList[0].name;
                     emulatorUid = newEmulatorList[0].duid;
-                    console.log("New emulator ".concat(chalk_1.default.green(emulatorName), " created and saved into .sosrc"));
+                    (0, log_1.log)('info', "New emulator ".concat(chalk_1.default.green(emulatorName), " created and saved into .sosrc"));
                     _a.label = 8;
                 case 8: return [4 /*yield*/, (0, runControlHelper_1.updateConfig)({ emulatorUid: emulatorUid })];
                 case 9:

package/dist/Emulator/emulatorFacade.js.map

@@ -1 +1 @@
-{"version":3,"file":"emulatorFacade.js","sourceRoot":"","sources":["../../src/Emulator/emulatorFacade.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"emulatorFacade.js","sourceRoot":"","sources":["../../src/Emulator/emulatorFacade.ts"],"names":[],"mappings":"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"}

package/dist/Emulator/emulatorFactory.d.ts

@@ -1,9 +1,11 @@
 import { IEmulator } from './IEmulator';
+import { Development } from '@signageos/sdk/dist/Development/Development';
 export interface ICreateEmulatorParams {
-    projectPath: string;
+    appletUid: string | undefined;
+    appletVersion: string | undefined;
     appletPath: string;
     entryFileRelativePath: string;
     emulatorServerPort: number;
     emulatorUid: string;
 }
-export declare function createEmulator(params: ICreateEmulatorParams, organizationUid: string): Promise<IEmulator>;
+export declare function createEmulator(params: ICreateEmulatorParams, organizationUid: string, dev: Development): Promise<IEmulator>;