@webos-tools/cli 3.2.0 → 3.2.1

package/lib/base/server.js

@@ -1,137 +1,137 @@
-/*
- * Copyright (c) 2020-2024 LG Electronics Inc.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-const bodyParser = require('body-parser'),
-    Express = require('express'),
-    fs = require('fs'),
-    http = require('http'),
-    npmlog = require('npmlog'),
-    spawn = require('child_process').spawn,
-    errHndl = require('./error-handler');
-
-(function() {
-    const log = npmlog;
-    log.heading = 'server';
-    log.level = 'warn';
-
-    const platformOpen = {
-        win32: [ "cmd" , "/c", "start" ],
-        darwin:[ "open" ],
-        linux: [ "xdg-open" ]
-    };
-
-    const server = {},
-        sockets = {};
-    let localServer,
-        nextSocketId = 0;
-
-    /**
-     * Run a local web server based on the path
-     * @param {path} path where local web server indicates.
-     * @param {port} port number for web server. 0 means random port.
-     * @param {Function} next a common-JS callback invoked when the DB is ready to use.
-     */
-    server.runServer = function(path, port, reqHandlerForIFrame, next) {
-        log.verbose("server#runServer()");
-        if (typeof reqHandlerForIFrame === 'function' && !next) {
-            next = reqHandlerForIFrame;
-            reqHandlerForIFrame = null;
-        }
-        const appPath = fs.realpathSync(path),
-            app = new Express();
-
-        app.use("/", Express.static(appPath));
-        app.use("/ares_cli", Express.static(__dirname));
-        app.use(bodyParser.json());
-
-        if (reqHandlerForIFrame) {
-            app.post('/ares_cli/@@ARES_CLOSE@@', function(req, res) {
-                reqHandlerForIFrame("@@ARES_CLOSE@@", res);
-            });
-            app.post('/ares_cli/@@GET_URL@@', function(req, res) {
-                reqHandlerForIFrame("@@GET_URL@@", res);
-            });
-        }
-
-        localServer = http.createServer(app);
-        localServer.on('error', function(err) {
-            return next(errHndl.getErrMsg(err));
-        });
-        localServer.listen(port, function(err) {
-            if (err) {
-                return next(errHndl.getErrMsg(err));
-            }
-            const localServerPort = localServer.address().port,
-                url = 'http://localhost:' + localServerPort;
-
-            next(null, {
-                "url": url,
-                "port": localServerPort,
-                "openBrowserUrl": url + "/ares_cli/ares.html",
-                "msg":"Local server running on " + url
-            });
-        });
-        localServer.on('connection', function(socket) {
-            // Add a newly connected socket
-            const socketId = nextSocketId++;
-            sockets[socketId] = socket;
-            log.verbose("Socket opened: ", socketId);
-        });
-    };
-
-    /**
-     * Open url with a web browser
-     * @param {url} URL to be opened via web browser.
-     * @param {browserPath} browser exectable path. (optional)
-     * @param {Function} next a common-JS callback invoked when the DB is ready to use. (optional)
-     */
-    server.openBrowser = function(url, browserPath, next) {
-        log.verbose("server#openBrowser()");
-        let info = platformOpen[process.platform];
-        if (typeof browserPath === 'function') {
-            next = browserPath;
-            browserPath = null;
-        }
-        if (browserPath && fs.existsSync(browserPath)) {
-            if (process.platform === 'linux') {
-                info.splice(0, 1); // delete 'xdg-open' command
-            }
-            info = info.concat([browserPath]);
-
-            if (process.platform === 'darwin') {
-                 info = info.concat(['--new', '--args']);
-            }
-        }
-
-        this.browserProcess = spawn(info[0], info.slice(1).concat([url]));
-        if (next) {
-            next(null, {msg:"Browser opened"});
-        }
-    };
-
-    server.stop = function(next) {
-        log.verbose("server#stop()");
-        if (!localServer) {
-            return next(errHndl.getErrMsg("NOT_EXIST_SERVER"));
-        }
-
-        if (Object.keys(sockets).length) {
-            for (const socketId in sockets) {
-                log.verbose("Socket destroyed: ", socketId);
-                sockets[socketId].destroy();
-            }
-        }
-
-        localServer.close(function() {
-            log.verbose("Local server close called");
-            next(null, {msg: "Local server is stopped"});
-        });
-    };
-
-    if (typeof module !== 'undefined' && module.exports) {
-        module.exports = server;
-    }
-}());
+/*
+ * Copyright (c) 2020-2024 LG Electronics Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+const bodyParser = require('body-parser'),
+    Express = require('express'),
+    fs = require('fs'),
+    http = require('http'),
+    npmlog = require('npmlog'),
+    spawn = require('child_process').spawn,
+    errHndl = require('./error-handler');
+
+(function() {
+    const log = npmlog;
+    log.heading = 'server';
+    log.level = 'warn';
+
+    const platformOpen = {
+        win32: [ "cmd" , "/c", "start" ],
+        darwin:[ "open" ],
+        linux: [ "xdg-open" ]
+    };
+
+    const server = {},
+        sockets = {};
+    let localServer,
+        nextSocketId = 0;
+
+    /**
+     * Run a local web server based on the path
+     * @param {path} path where local web server indicates.
+     * @param {port} port number for web server. 0 means random port.
+     * @param {Function} next a common-JS callback invoked when the DB is ready to use.
+     */
+    server.runServer = function(path, port, reqHandlerForIFrame, next) {
+        log.verbose("server#runServer()");
+        if (typeof reqHandlerForIFrame === 'function' && !next) {
+            next = reqHandlerForIFrame;
+            reqHandlerForIFrame = null;
+        }
+        const appPath = fs.realpathSync(path),
+            app = new Express();
+
+        app.use("/", Express.static(appPath));
+        app.use("/ares_cli", Express.static(__dirname));
+        app.use(bodyParser.json());
+
+        if (reqHandlerForIFrame) {
+            app.post('/ares_cli/@@ARES_CLOSE@@', function(req, res) {
+                reqHandlerForIFrame("@@ARES_CLOSE@@", res);
+            });
+            app.post('/ares_cli/@@GET_URL@@', function(req, res) {
+                reqHandlerForIFrame("@@GET_URL@@", res);
+            });
+        }
+
+        localServer = http.createServer(app);
+        localServer.on('error', function(err) {
+            return next(errHndl.getErrMsg(err));
+        });
+        localServer.listen(port, function(err) {
+            if (err) {
+                return next(errHndl.getErrMsg(err));
+            }
+            const localServerPort = localServer.address().port,
+                url = 'http://localhost:' + localServerPort;
+
+            next(null, {
+                "url": url,
+                "port": localServerPort,
+                "openBrowserUrl": url + "/ares_cli/ares.html",
+                "msg":"Local server running on " + url
+            });
+        });
+        localServer.on('connection', function(socket) {
+            // Add a newly connected socket
+            const socketId = nextSocketId++;
+            sockets[socketId] = socket;
+            log.verbose("Socket opened: ", socketId);
+        });
+    };
+
+    /**
+     * Open url with a web browser
+     * @param {url} URL to be opened via web browser.
+     * @param {browserPath} browser exectable path. (optional)
+     * @param {Function} next a common-JS callback invoked when the DB is ready to use. (optional)
+     */
+    server.openBrowser = function(url, browserPath, next) {
+        log.verbose("server#openBrowser()");
+        let info = platformOpen[process.platform];
+        if (typeof browserPath === 'function') {
+            next = browserPath;
+            browserPath = null;
+        }
+        if (browserPath && fs.existsSync(browserPath)) {
+            if (process.platform === 'linux') {
+                info.splice(0, 1); // delete 'xdg-open' command
+            }
+            info = info.concat([browserPath]);
+
+            if (process.platform === 'darwin') {
+                 info = info.concat(['--new', '--args']);
+            }
+        }
+
+        this.browserProcess = spawn(info[0], info.slice(1).concat([url]));
+        if (next) {
+            next(null, {msg:"Browser opened"});
+        }
+    };
+
+    server.stop = function(next) {
+        log.verbose("server#stop()");
+        if (!localServer) {
+            return next(errHndl.getErrMsg("NOT_EXIST_SERVER"));
+        }
+
+        if (Object.keys(sockets).length) {
+            for (const socketId in sockets) {
+                log.verbose("Socket destroyed: ", socketId);
+                sockets[socketId].destroy();
+            }
+        }
+
+        localServer.close(function() {
+            log.verbose("Local server close called");
+            next(null, {msg: "Local server is stopped"});
+        });
+    };
+
+    if (typeof module !== 'undefined' && module.exports) {
+        module.exports = server;
+    }
+}());

package/lib/base/setup-device.js

@@ -204,7 +204,7 @@ const async = require('async'),
             async.series([
                 resolver.load.bind(resolver),
                 resolver.modifyDeviceFile.bind(resolver, mode, inDevice),
-                this.showDeviceList.bind(this),
+                this.showDeviceList.bind(this)
             ], function(err, results) {
                 if (err) {
                     return next(err);
@@ -229,8 +229,8 @@ const async = require('async'),
             resolver.load.bind(resolver),
             resolver.list.bind(resolver),
             function(devices, next) {
+                devices.sort((device1, device2) => device2.index - device1.index);
                 if (Array.isArray(devices)) {
-                    devices.sort((device1, device2) => device2.index - device1.index);
                     devices.forEach(function(device) {
                         const conn = device.conn.concat([]),
                             info = (device.username && device.host && device.port) ? device.username + '@' + device.host + ':' + device.port : device.id,

package/lib/base/version-tools.js

@@ -1,79 +1,79 @@
-/*
- * Copyright (c) 2020-2024 LG Electronics Inc.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-const fs = require('fs'),
-    path = require('path'),
-    semver = require('semver');
-
-(function() {
-    const vtools = {};
-    let pkgInfo = null;
-
-    vtools.showVersionAndExit = function() {
-        getPackageVersion(function(err, version) {
-            console.log("Version: " + version);
-            process.exit(0);
-        });
-    };
-
-    vtools.checkNodeVersion = function(next) {
-        getAllowedNodeVersion(function(err, range) {
-            const expectedRange = semver.validRange(range);
-            if (expectedRange) {
-                if (semver.satisfies(process.version, expectedRange)) {
-                    next();
-                } else {
-                    console.error("This command only works on Node.js version: " + expectedRange);
-                    process.exit(1);
-                }
-            } else {
-                console.error("Invalid Node.js version range: " + range);
-                process.exit(1);
-            }
-        });
-    };
-
-    // Private methods
-    function getAllowedNodeVersion(next) {
-        if (pkgInfo) {
-            next(null, (pkgInfo && pkgInfo.engines && pkgInfo.engines.node) || "");
-        } else {
-            loadPackageJson(function(err) {
-                next(err, (pkgInfo && pkgInfo.engines && pkgInfo.engines.node) || "");
-            });
-        }
-    }
-
-    function loadPackageJson(next) {
-        const filename = path.resolve(__dirname, "../..", "package.json");
-        fs.readFile(filename, function(err, data) {
-            if (err) {
-                return next("loadPackageJson_error");
-            }
-
-            try {
-                pkgInfo = JSON.parse(data);
-                next();
-            } catch(error) {
-                next(error);
-            }
-        });
-    }
-
-    function getPackageVersion(next) {
-        if (pkgInfo) {
-            next(null, pkgInfo.version);
-        } else {
-            loadPackageJson(function(err) {
-                next(err, (pkgInfo && pkgInfo.version) || "unknown");
-            });
-        }
-    }
-
-    if (typeof module !== 'undefined' && module.exports) {
-        module.exports = vtools;
-    }
-}());
+/*
+ * Copyright (c) 2020-2024 LG Electronics Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+const fs = require('fs'),
+    path = require('path'),
+    semver = require('semver');
+
+(function() {
+    const vtools = {};
+    let pkgInfo = null;
+
+    vtools.showVersionAndExit = function() {
+        getPackageVersion(function(err, version) {
+            console.log("Version: " + version);
+            process.exit(0);
+        });
+    };
+
+    vtools.checkNodeVersion = function(next) {
+        getAllowedNodeVersion(function(err, range) {
+            const expectedRange = semver.validRange(range);
+            if (expectedRange) {
+                if (semver.satisfies(process.version, expectedRange)) {
+                    next();
+                } else {
+                    console.error("This command only works on Node.js version: " + expectedRange);
+                    process.exit(1);
+                }
+            } else {
+                console.error("Invalid Node.js version range: " + range);
+                process.exit(1);
+            }
+        });
+    };
+
+    // Private methods
+    function getAllowedNodeVersion(next) {
+        if (pkgInfo) {
+            next(null, (pkgInfo && pkgInfo.engines && pkgInfo.engines.node) || "");
+        } else {
+            loadPackageJson(function(err) {
+                next(err, (pkgInfo && pkgInfo.engines && pkgInfo.engines.node) || "");
+            });
+        }
+    }
+
+    function loadPackageJson(next) {
+        const filename = path.resolve(__dirname, "../..", "package.json");
+        fs.readFile(filename, function(err, data) {
+            if (err) {
+                return next("loadPackageJson_error");
+            }
+
+            try {
+                pkgInfo = JSON.parse(data);
+                next();
+            } catch(error) {
+                next(error);
+            }
+        });
+    }
+
+    function getPackageVersion(next) {
+        if (pkgInfo) {
+            next(null, pkgInfo.version);
+        } else {
+            loadPackageJson(function(err) {
+                next(err, (pkgInfo && pkgInfo.version) || "unknown");
+            });
+        }
+    }
+
+    if (typeof module !== 'undefined' && module.exports) {
+        module.exports = vtools;
+    }
+}());