@signageos/cli 1.1.4 → 1.2.0

package/dist/Emulator/emulatorFactory.js

@@ -45,85 +45,97 @@ var cors = require("cors");
 var serveStatic = require("serve-static");
 var mime = require("mime");
 var fsExtra = require("fs-extra");
-var glob = require("globby");
 var chalk_1 = require("chalk");
-var createDomain_1 = require("./createDomain");
+var log_1 = require("@signageos/sdk/dist/Console/log");
+var helper_1 = require("../FileSystem/helper");
 var DUMMY_CHECKSUM = '0000000000ffffffffff';
 var APPLET_DIRECTORY_PATH = '/applet';
-function createEmulator(params, organizationUid) {
-    var _a;
+function createEmulator(params, organizationUid, dev) {
     return __awaiter(this, void 0, void 0, function () {
-        var projectPath, emulatorServerPort, appletPath, entryFileRelativePath, entryFileAbsolutePath, serverDomainOptions, frontDisplayPath, frontDisplayDistPath, packageConfig, envVars, app, server, appletAssets, entryFileExists;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    projectPath = params.projectPath, emulatorServerPort = params.emulatorServerPort, appletPath = params.appletPath, entryFileRelativePath = params.entryFileRelativePath;
-                    entryFileAbsolutePath = path.join(appletPath, entryFileRelativePath);
-                    serverDomainOptions = { useLocalIp: true, port: emulatorServerPort };
-                    frontDisplayPath = path.dirname(require.resolve('@signageos/front-display/package.json', { paths: [projectPath] }));
-                    frontDisplayDistPath = path.join(frontDisplayPath, 'dist');
-                    packageConfig = JSON.parse(fsExtra.readFileSync(path.join(projectPath, 'package.json')).toString());
-                    if (!organizationUid) {
-                        throw new Error("No default organization selected. Use ".concat(chalk_1.default.green('sos organization set-default'), " first."));
-                    }
-                    envVars = {
-                        uid: ((_a = packageConfig.sos) === null || _a === void 0 ? void 0 : _a.appletUid) || '__default_timing__',
-                        version: packageConfig.version,
-                        organizationUid: organizationUid,
-                        binaryFilePath: "".concat(APPLET_DIRECTORY_PATH, "/").concat(entryFileRelativePath),
-                        checksum: DUMMY_CHECKSUM,
-                        frontAppletVersion: '',
-                        frontAppletBinaryFile: '', // has bundled front applet
-                    };
-                    app = express();
-                    app.use(cors());
-                    app.get('/', function (req, res) {
-                        if (!req.query.duid) {
-                            res.redirect("".concat(req.originalUrl).concat(req.originalUrl.includes('?') ? '&' : '?', "duid=").concat(params.emulatorUid));
-                        }
-                        else {
-                            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>")
-                                + fsExtra.readFileSync(path.join(frontDisplayDistPath, 'index.html')).toString());
-                        }
-                    });
-                    app.use(serveStatic(frontDisplayDistPath));
-                    server = http.createServer(app);
-                    server.listen(emulatorServerPort, function () {
-                        console.log("Emulator is running at ".concat(chalk_1.default.blue(chalk_1.default.bold((0, createDomain_1.createDomain)(serverDomainOptions, server)))));
-                    });
-                    return [4 /*yield*/, glob(['**/*'], {
-                            cwd: appletPath,
-                            absolute: true,
-                            dot: true,
-                        })];
-                case 1:
-                    appletAssets = _b.sent();
-                    entryFileExists = appletAssets.includes(entryFileAbsolutePath.replace(/\\/g, '/'));
-                    if (!entryFileExists) {
-                        throw new Error("Applet has to have ".concat(chalk_1.default.green(entryFileRelativePath), " in applet directory."));
-                    }
-                    app.use(APPLET_DIRECTORY_PATH, function (req, res, next) {
-                        var fileUrl = url.parse(req.url);
-                        var relativeFilePath = fileUrl.pathname ? fileUrl.pathname.substr(1) : '';
-                        var assetPath = appletAssets.find(function (asset) {
-                            return asset.substring(appletPath.length + 1) === relativeFilePath;
-                        });
-                        if (assetPath) {
-                            var contentType = mime.getType(relativeFilePath) || 'application/octet-stream';
+        var appletUid, appletVersion, emulatorServerPort, appletPath, entryFileRelativePath, entryFileAbsolutePath, frontDisplayPath, frontDisplayDistPath, envVars, app, server;
+        var _this = this;
+        return __generator(this, function (_a) {
+            appletUid = params.appletUid, appletVersion = params.appletVersion, emulatorServerPort = params.emulatorServerPort, appletPath = params.appletPath, entryFileRelativePath = params.entryFileRelativePath;
+            entryFileAbsolutePath = path.join(appletPath, entryFileRelativePath);
+            frontDisplayPath = path.dirname(require.resolve('@signageos/front-display/package.json', { paths: [appletPath] }));
+            frontDisplayDistPath = path.join(frontDisplayPath, 'dist');
+            if (!organizationUid) {
+                throw new Error("No default organization selected. Use ".concat(chalk_1.default.green('sos organization set-default'), " first."));
+            }
+            envVars = {
+                uid: appletUid || '__default_timing__',
+                version: appletVersion || '0.0.0',
+                organizationUid: organizationUid,
+                binaryFilePath: "".concat(APPLET_DIRECTORY_PATH, "/").concat(entryFileRelativePath),
+                checksum: DUMMY_CHECKSUM,
+                frontAppletVersion: '',
+                frontAppletBinaryFile: '', // has bundled front applet
+            };
+            app = express();
+            app.use(cors());
+            app.get('/', function (req, res) {
+                if (!req.query.duid) {
+                    res.redirect("".concat(req.originalUrl).concat(req.originalUrl.includes('?') ? '&' : '?', "duid=").concat(params.emulatorUid));
+                }
+                else {
+                    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>")
+                        + fsExtra.readFileSync(path.join(frontDisplayDistPath, 'index.html')).toString());
+                }
+            });
+            app.use(serveStatic(frontDisplayDistPath));
+            server = http.createServer(app);
+            server.listen(emulatorServerPort, function () {
+                var emulatorUrl = "http://localhost:".concat(emulatorServerPort);
+                (0, log_1.log)('info', "Emulator is running at ".concat(chalk_1.default.blue(chalk_1.default.bold(emulatorUrl))));
+            });
+            app.use(APPLET_DIRECTORY_PATH, function (req, res) { return __awaiter(_this, void 0, void 0, function () {
+                var fileUrl, relativeFilePath, absoluteFilePath, appletFilePaths, prependFileContent, entryFileContent, contentType, readStream;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            fileUrl = url.parse(req.url);
+                            relativeFilePath = fileUrl.pathname ? fileUrl.pathname.substring(1) : '';
+                            absoluteFilePath = path.join(appletPath, relativeFilePath);
+                            return [4 /*yield*/, dev.applet.files.listAppletFiles({
+                                    appletPath: appletPath,
+                                })];
+                        case 1:
+                            appletFilePaths = _a.sent();
+                            if (!(0, helper_1.isPathIncluded)(appletFilePaths, absoluteFilePath)) {
+                                res.status(404).send("File \"".concat(relativeFilePath, "\" was not found"));
+                                return [2 /*return*/];
+                            }
+                            if (!(relativeFilePath === entryFileRelativePath)) return [3 /*break*/, 3];
+                            prependFileContent = '<script>window.onunload = function () { window.parent.location.reload(); }</script>';
+                            res.setHeader('Content-Type', 'text/html');
+                            return [4 /*yield*/, fsExtra.readFile(entryFileAbsolutePath, 'utf8')];
+                        case 2:
+                            entryFileContent = _a.sent();
+                            res.send(prependFileContent + entryFileContent);
+                            return [2 /*return*/];
+                        case 3:
+                            contentType = mime.getType(absoluteFilePath) || 'application/octet-stream';
                             res.setHeader('Content-Type', contentType);
-                            var readStream = fsExtra.createReadStream(assetPath);
+                            readStream = fsExtra.createReadStream(absoluteFilePath);
                             readStream.pipe(res);
-                        }
-                        else {
-                            next();
-                        }
-                    });
-                    return [2 /*return*/, {
-                            stop: function () {
-                                server.close();
-                            },
-                        }];
-            }
+                            return [2 /*return*/];
+                    }
+                });
+            }); });
+            return [2 /*return*/, {
+                    stop: function () {
+                        return __awaiter(this, void 0, void 0, function () {
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, new Promise(function (resolve, reject) { return server.close(function (error) { return error ? reject(error) : resolve(); }); })];
+                                    case 1:
+                                        _a.sent();
+                                        return [2 /*return*/];
+                                }
+                            });
+                        });
+                    },
+                }];
         });
     });
 }

package/dist/Emulator/emulatorFactory.js.map

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

package/dist/FileSystem/helper.d.ts

@@ -1,14 +1,9 @@
 export declare function computeFileMD5(filePath: string): Promise<string>;
 export declare function getFileType(filePath: string): Promise<string>;
+export declare function validateAllFormalities(appletPath: string, entryFileAbsolutePath: string, appletFilePaths: string[]): Promise<void>;
 /**
- * @note file existence is validated the very beginning of upload
+ * This is the platform/OS idependent way to check if a file is included in a list of files.
+ * So there can be backslashes and slashes on Windows and only slashes on Linux/UNIX.
+ * This function will ignore differences in slashes. It will only check if the file is included no matter what slashes are used.
  */
-export declare function listDirectoryContentRecursively(appletDirPath: string, ignoreFileDirPath: string): Promise<string[]>;
-export declare function validateAllFormalities(appletDir: string, entryFile: string): Promise<void>;
-/**
- * @note glob patterns are also supported
- * @param appletDir directory of applet
- * @param files is a list of tracked files
- * @returns all matched results, which are included in `files`
- */
-export declare function getAllPaths(appletDir: string, files: string[]): Promise<string[]>;
+export declare function isPathIncluded(filePaths: string[], filePath: string): boolean;

package/dist/FileSystem/helper.js

@@ -35,45 +35,15 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAllPaths = exports.validateAllFormalities = exports.listDirectoryContentRecursively = exports.getFileType = exports.computeFileMD5 = void 0;
+exports.isPathIncluded = exports.validateAllFormalities = exports.getFileType = exports.computeFileMD5 = void 0;
 var fs = require("fs-extra");
 var path = require("path");
 var file_1 = require("@signageos/file");
-var glob = require("globby");
-var chalk_1 = require("chalk");
 var Debug = require("debug");
 var helper_1 = require("../Stream/helper");
-var packageConfig_1 = require("./packageConfig");
+var packageConfig_1 = require("@signageos/sdk/dist/FileSystem/packageConfig");
 var debug = Debug('@signageos/cli:FileSystem:helper');
-var parseIgnoreFile = require('parse-gitignore');
-var DEFAULT_IGNORE_FILE = '.sosignore';
-var IGNORE_FILES = [DEFAULT_IGNORE_FILE, '.npmignore', '.gitignore'];
 var DEFAULT_FILE_TYPE = 'application/octet-stream';
 function computeFileMD5(filePath) {
     return __awaiter(this, void 0, void 0, function () {
@@ -104,133 +74,43 @@ function getFileType(filePath) {
     });
 }
 exports.getFileType = getFileType;
-/**
- * @note file existence is validated the very beginning of upload
- */
-function listDirectoryContentRecursively(appletDirPath, ignoreFileDirPath) {
-    var _a;
+function validateAllFormalities(appletPath, entryFileAbsolutePath, appletFilePaths) {
     return __awaiter(this, void 0, void 0, function () {
-        var pkgJson, files, filesSet_1, paths, ignorePatterns_1, usedIgnoreFilePath, index, ignoreFileName, ignoreFilePath, ignoreFileExists, usedIgnoreFileBuffer, ignoreFilePatterns;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0: return [4 /*yield*/, (0, packageConfig_1.loadPackage)(appletDirPath)];
-                case 1:
-                    pkgJson = (_a = _b.sent()) !== null && _a !== void 0 ? _a : {};
-                    files = [];
-                    if (!(pkgJson.files && Array.isArray(pkgJson.files))) return [3 /*break*/, 3];
-                    filesSet_1 = prepareFilesToInclude();
-                    return [4 /*yield*/, getAllPaths(appletDirPath, pkgJson.files)];
-                case 2:
-                    paths = _b.sent();
-                    paths.forEach(function (p) { return filesSet_1.add(p); });
-                    files = __spreadArray([], __read(filesSet_1), false).map(function (f) { return path.join(appletDirPath, f); });
-                    return [3 /*break*/, 11];
-                case 3:
-                    ignorePatterns_1 = [];
-                    usedIgnoreFilePath = undefined;
-                    index = 0;
-                    _b.label = 4;
-                case 4:
-                    if (!(index < IGNORE_FILES.length)) return [3 /*break*/, 7];
-                    ignoreFileName = IGNORE_FILES[index];
-                    ignoreFilePath = path.join(ignoreFileDirPath, ignoreFileName);
-                    return [4 /*yield*/, fs.pathExists(ignoreFilePath)];
-                case 5:
-                    ignoreFileExists = _b.sent();
-                    if (ignoreFileExists) {
-                        usedIgnoreFilePath = ignoreFilePath;
-                        return [3 /*break*/, 7];
-                    }
-                    _b.label = 6;
-                case 6:
-                    index++;
-                    return [3 /*break*/, 4];
-                case 7:
-                    if (usedIgnoreFilePath) {
-                        console.log("Use ignore file: ".concat(chalk_1.default.green.bold(usedIgnoreFilePath), "."));
-                    }
-                    else {
-                        console.log("No ignore file found in ".concat(chalk_1.default.yellow.bold(ignoreFileDirPath), "."));
-                    }
-                    if (!usedIgnoreFilePath) return [3 /*break*/, 9];
-                    return [4 /*yield*/, fs.readFile(usedIgnoreFilePath)];
-                case 8:
-                    usedIgnoreFileBuffer = _b.sent();
-                    ignoreFilePatterns = parseIgnoreFile(usedIgnoreFileBuffer);
-                    ignoreFilePatterns.forEach(function (pattern) { return ignorePatterns_1.push("!".concat(pattern)); });
-                    _b.label = 9;
-                case 9: return [4 /*yield*/, glob(__spreadArray(['**/*', '!node_modules/'], __read(ignorePatterns_1), false), {
-                        cwd: appletDirPath,
-                        absolute: true,
-                        dot: true,
-                    })];
-                case 10:
-                    files = _b.sent();
-                    _b.label = 11;
-                case 11:
-                    debug('listed files', files);
-                    return [2 /*return*/, files];
-            }
-        });
-    });
-}
-exports.listDirectoryContentRecursively = listDirectoryContentRecursively;
-function prepareFilesToInclude() {
-    var alwaysInclude = [
-        'package.json',
-    ];
-    return new Set(alwaysInclude);
-}
-function validateAllFormalities(appletDir, entryFile) {
-    return __awaiter(this, void 0, void 0, function () {
-        var pkgJson, absolutePkgPath, paths;
+        var packageConfig, expectedMain, mainFileAbsolutePath;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, (0, packageConfig_1.loadPackage)(appletDir)];
+                case 0: return [4 /*yield*/, (0, packageConfig_1.loadPackage)(appletPath)];
                 case 1:
-                    pkgJson = _a.sent();
-                    if (!pkgJson) {
-                        absolutePkgPath = path.join(appletDir, 'package.json');
-                        throw new Error("Cannot find package.json file on path ".concat(absolutePkgPath));
+                    packageConfig = _a.sent();
+                    if (!packageConfig) {
+                        throw new Error("Cannot find package.json file in path ".concat(appletPath));
+                    }
+                    if (!packageConfig.main) {
+                        expectedMain = entryFileAbsolutePath.slice(appletPath.length + 1);
+                        throw new Error("The package.json is missing \"main\", but should to be \"".concat(expectedMain, "\""));
                     }
-                    if (pkgJson.main !== entryFile) {
-                        throw new Error("".concat(pkgJson.main, " from package.json file doesn't match with entry file: ").concat(entryFile));
+                    mainFileAbsolutePath = path.join(appletPath, packageConfig.main);
+                    if (mainFileAbsolutePath !== entryFileAbsolutePath) {
+                        throw new Error("".concat(packageConfig.main, " from package.json file doesn't match with entry file: ").concat(entryFileAbsolutePath));
                     }
-                    if (!Array.isArray(pkgJson.files)) return [3 /*break*/, 3];
-                    return [4 /*yield*/, getAllPaths(appletDir, pkgJson.files)];
-                case 2:
-                    paths = _a.sent();
-                    if (!paths.includes(pkgJson.main)) {
-                        throw new Error("".concat(pkgJson.main, " is not a part of tracking files"));
+                    if (!isPathIncluded(appletFilePaths, mainFileAbsolutePath)) {
+                        throw new Error("".concat(packageConfig.main, " is not a part of tracking files"));
                     }
-                    _a.label = 3;
-                case 3: return [2 /*return*/];
+                    return [2 /*return*/];
             }
         });
     });
 }
 exports.validateAllFormalities = validateAllFormalities;
 /**
- * @note glob patterns are also supported
- * @param appletDir directory of applet
- * @param files is a list of tracked files
- * @returns all matched results, which are included in `files`
+ * This is the platform/OS idependent way to check if a file is included in a list of files.
+ * So there can be backslashes and slashes on Windows and only slashes on Linux/UNIX.
+ * This function will ignore differences in slashes. It will only check if the file is included no matter what slashes are used.
  */
-function getAllPaths(appletDir, files) {
-    return __awaiter(this, void 0, void 0, function () {
-        var paths;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, glob(files, {
-                        cwd: appletDir,
-                        dot: true,
-                    })];
-                case 1:
-                    paths = _a.sent();
-                    return [2 /*return*/, paths];
-            }
-        });
-    });
+function isPathIncluded(filePaths, filePath) {
+    var sanitizedFilePath = filePath.replace(/\\/g, '/');
+    var sanitizedFilePaths = filePaths.map(function (filePathItem) { return filePathItem.replace(/\\/g, '/'); });
+    return sanitizedFilePaths.includes(sanitizedFilePath);
 }
-exports.getAllPaths = getAllPaths;
+exports.isPathIncluded = isPathIncluded;
 //# sourceMappingURL=helper.js.map

package/dist/FileSystem/helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../src/FileSystem/helper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../src/FileSystem/helper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA+B;AAC/B,2BAA6B;AAC7B,wCAAmC;AACnC,6BAA+B;AAC/B,2CAA8C;AAC9C,8EAA2E;AAC3E,IAAM,KAAK,GAAG,KAAK,CAAC,kCAAkC,CAAC,CAAC;AAExD,IAAM,iBAAiB,GAAG,0BAA0B,CAAC;AAErD,SAAsB,cAAc,CAAC,QAAgB;;;;;;oBAC9C,UAAU,GAAG,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;oBAE1C,qBAAM,IAAA,mBAAU,EAAC,UAAU,CAAC,EAAA;wBAAnC,sBAAO,SAA4B,EAAC;;;;CACpC;AAJD,wCAIC;AAED,SAAsB,WAAW,CAAC,QAAgB;;;;;wBAC9B,qBAAM,IAAA,cAAI,EAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAA;;oBAArD,UAAU,GAAG,SAAwC;oBAC3D,KAAK,CAAC,WAAW,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;oBAEzC,sBAAO,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,EAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,iBAAiB,EAAC;;;;CACtE;AALD,kCAKC;AAED,SAAsB,sBAAsB,CAAC,UAAkB,EAAE,qBAA6B,EAAE,eAAyB;;;;;wBAClG,qBAAM,IAAA,2BAAW,EAAC,UAAU,CAAC,EAAA;;oBAA7C,aAAa,GAAG,SAA6B;oBACnD,IAAI,CAAC,aAAa,EAAE;wBACnB,MAAM,IAAI,KAAK,CAAC,gDAAyC,UAAU,CAAE,CAAC,CAAC;qBACvE;oBAED,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE;wBAClB,YAAY,GAAG,qBAAqB,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;wBACxE,MAAM,IAAI,KAAK,CAAC,mEAAyD,YAAY,OAAG,CAAC,CAAC;qBAC1F;oBAEK,oBAAoB,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;oBAEvE,IAAI,oBAAoB,KAAK,qBAAqB,EAAE;wBACnD,MAAM,IAAI,KAAK,CAAC,UAAG,aAAa,CAAC,IAAI,oEAA0D,qBAAqB,CAAE,CAAC,CAAC;qBACxH;oBAED,IAAI,CAAC,cAAc,CAAC,eAAe,EAAE,oBAAoB,CAAC,EAAE;wBAC3D,MAAM,IAAI,KAAK,CAAC,UAAG,aAAa,CAAC,IAAI,qCAAkC,CAAC,CAAC;qBACzE;;;;;CACD;AApBD,wDAoBC;AAED;;;;GAIG;AACH,SAAgB,cAAc,CAAC,SAAmB,EAAE,QAAgB;IACnE,IAAM,iBAAiB,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACvD,IAAM,kBAAkB,GAAG,SAAS,CAAC,GAAG,CAAC,UAAC,YAAY,IAAK,OAAA,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,EAAhC,CAAgC,CAAC,CAAC;IAC7F,OAAO,kBAAkB,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;AACvD,CAAC;AAJD,wCAIC"}

package/dist/Firmware/Upload/firmwareUploadCommand.js

@@ -35,6 +35,31 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.firmwareUpload = void 0;
 var helper_1 = require("../../helper");
@@ -45,6 +70,7 @@ var progressBarFactory_1 = require("../../CommandLine/progressBarFactory");
 var firmwareUploadHelper_1 = require("./firmwareUploadHelper");
 var RequestError_1 = require("@signageos/sdk/dist/RestApi/Error/RequestError");
 var commandDefinition_1 = require("../../Command/commandDefinition");
+var log_1 = require("@signageos/sdk/dist/Console/log");
 var questions = [
     {
         type: 'text',
@@ -105,13 +131,13 @@ exports.firmwareUpload = (0, commandDefinition_1.createCommandDefinition)({
                         typeAnswers = _c.sent();
                         data.type = typeAnswers.firmwareType;
                         if (!data.type) {
-                            console.log("".concat(chalk_1.default.red('You must input firmware type')));
+                            (0, log_1.log)('error', "You must input firmware type");
                             return [2 /*return*/];
                         }
                         _c.label = 4;
                     case 4:
                         if (!data.applicationType || !data.version) {
-                            console.log("".concat(chalk_1.default.red('You must input application type and version')));
+                            (0, log_1.log)('error', "You must input application type and version");
                             return [2 /*return*/];
                         }
                         _c.label = 5;
@@ -131,20 +157,20 @@ exports.firmwareUpload = (0, commandDefinition_1.createCommandDefinition)({
                         try {
                             (0, firmwareUploadHelper_1.default)(path);
                             pathSet.add(path);
-                            console.log("".concat(chalk_1.default.green('File added to upload list')));
+                            (0, log_1.log)('info', "".concat(chalk_1.default.green('File added to upload list')));
                         }
                         catch (e) {
-                            console.log("".concat(chalk_1.default.yellow(e.message)));
+                            (0, log_1.log)('error', e.message);
                         }
                         return [3 /*break*/, 5];
                     case 7:
                         if (!(pathSet.size > 0)) return [3 /*break*/, 9];
-                        console.log('Application type: ', chalk_1.default.green(data.applicationType));
-                        console.log('Version: ', chalk_1.default.green(data.version));
+                        (0, log_1.log)('info', 'Application type: ', chalk_1.default.green(data.applicationType));
+                        (0, log_1.log)('info', 'Version: ', chalk_1.default.green(data.version));
                         if (data.type) {
-                            console.log('Firmware type: ', chalk_1.default.green(data.type));
+                            (0, log_1.log)('info', 'Firmware type: ', chalk_1.default.green(data.type));
                         }
-                        console.log('List of files: ', Array.from(pathSet));
+                        log_1.log.apply(void 0, __spreadArray(['info', 'List of files: '], __read(Array.from(pathSet)), false));
                         return [4 /*yield*/, prompts({
                                 type: 'confirm',
                                 name: 'confirmed',
@@ -167,7 +193,7 @@ exports.firmwareUpload = (0, commandDefinition_1.createCommandDefinition)({
                         data.applicationType = options['application-type'];
                         data.version = options['firmware-version'];
                         if (applicationTypesRequiringType.includes(data.applicationType) && !options['firmware-type']) {
-                            console.log("".concat(chalk_1.default.red('You must input firmware type')));
+                            (0, log_1.log)('error', 'You must input firmware type');
                             return [2 /*return*/];
                         }
                         data.type = options['firmware-type'];

package/dist/Firmware/Upload/firmwareUploadCommand.js.map

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

package/dist/Organization/SetDefault/organizationSetDefaultCommand.js

@@ -42,6 +42,7 @@ var Debug = require("debug");
 var organizationFacade_1 = require("../organizationFacade");
 var runControlHelper_1 = require("../../RunControl/runControlHelper");
 var commandDefinition_1 = require("../../Command/commandDefinition");
+var log_1 = require("@signageos/sdk/dist/Console/log");
 var debug = Debug('@signageos/cli:Organization:get');
 var OPTION_LIST = [
     organizationFacade_1.ORGANIZATION_UID_OPTION,
@@ -69,7 +70,7 @@ exports.organizationSetDefault = (0, commandDefinition_1.createCommandDefinition
                             })];
                     case 3:
                         _a.sent();
-                        console.log("Organization ".concat(chalk_1.default.green("".concat(organization.title, " (").concat(organization.name, ", ").concat(organization.uid, ")")), " has been set as default"));
+                        (0, log_1.log)('info', "Organization ".concat(chalk_1.default.green("".concat(organization.title, " (").concat(organization.name, ", ").concat(organization.uid, ")")), " has been set as default"));
                         return [2 /*return*/];
                 }
             });

package/dist/Organization/SetDefault/organizationSetDefaultCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"organizationSetDefaultCommand.js","sourceRoot":"","sources":["../../../src/Organization/SetDefault/organizationSetDefaultCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA0B;AAC1B,6BAA+B;AAC/B,4DAAwG;AACxG,sEAAiE;AACjE,qEAA8F;AAC9F,IAAM,KAAK,GAAG,KAAK,CAAC,iCAAiC,CAAC,CAAC;AAEvD,IAAM,WAAW,GAAG;IACnB,4CAAuB;CACd,CAAC;AAEE,QAAA,sBAAsB,GAAG,IAAA,2CAAuB,EAAC;IAC7D,IAAI,EAAE,aAAa;IACnB,WAAW,EAAE,iCAAiC;IAC9C,UAAU,EAAE,WAAW;IACvB,QAAQ,EAAE,EAAE;IACN,GAAG,EAAT,UAAU,OAA+C;;;;;;wBACxD,KAAK,CAAC,0BAA0B,CAAC,CAAC;wBACH,qBAAM,IAAA,0CAAqB,EAAC,OAAO,CAAC,EAAA;;wBAA7D,sBAAsB,GAAG,SAAoC;wBAC9C,qBAAM,IAAA,oCAAe,EAAC,sBAAsB,CAAC,EAAA;;wBAA5D,YAAY,GAAG,SAA6C;wBAClE,qBAAM,IAAA,+BAAY,EAAC;gCAClB,sBAAsB,wBAAA;6BACtB,CAAC,EAAA;;wBAFF,SAEE,CAAC;wBACH,OAAO,CAAC,GAAG,CAAC,uBAAgB,eAAK,CAAC,KAAK,CAAC,UAAG,YAAY,CAAC,KAAK,eAAK,YAAY,CAAC,IAAI,eAAK,YAAY,CAAC,GAAG,MAAG,CAAC,6BAA0B,CAAC,CAAC;;;;;KACxI;CACD,CAAC,CAAC"}
+{"version":3,"file":"organizationSetDefaultCommand.js","sourceRoot":"","sources":["../../../src/Organization/SetDefault/organizationSetDefaultCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA0B;AAC1B,6BAA+B;AAC/B,4DAAwG;AACxG,sEAAiE;AACjE,qEAA8F;AAC9F,uDAAsD;AACtD,IAAM,KAAK,GAAG,KAAK,CAAC,iCAAiC,CAAC,CAAC;AAEvD,IAAM,WAAW,GAAG;IACnB,4CAAuB;CACd,CAAC;AAEE,QAAA,sBAAsB,GAAG,IAAA,2CAAuB,EAAC;IAC7D,IAAI,EAAE,aAAa;IACnB,WAAW,EAAE,iCAAiC;IAC9C,UAAU,EAAE,WAAW;IACvB,QAAQ,EAAE,EAAE;IACN,GAAG,EAAT,UAAU,OAA+C;;;;;;wBACxD,KAAK,CAAC,0BAA0B,CAAC,CAAC;wBACH,qBAAM,IAAA,0CAAqB,EAAC,OAAO,CAAC,EAAA;;wBAA7D,sBAAsB,GAAG,SAAoC;wBAC9C,qBAAM,IAAA,oCAAe,EAAC,sBAAsB,CAAC,EAAA;;wBAA5D,YAAY,GAAG,SAA6C;wBAClE,qBAAM,IAAA,+BAAY,EAAC;gCAClB,sBAAsB,wBAAA;6BACtB,CAAC,EAAA;;wBAFF,SAEE,CAAC;wBACH,IAAA,SAAG,EAAC,MAAM,EAAE,uBAAgB,eAAK,CAAC,KAAK,CAAC,UAAG,YAAY,CAAC,KAAK,eAAK,YAAY,CAAC,IAAI,eAAK,YAAY,CAAC,GAAG,MAAG,CAAC,6BAA0B,CAAC,CAAC;;;;;KACxI;CACD,CAAC,CAAC"}