@webos-tools/cli 3.2.0 → 3.2.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 3.2.2 (February 26, 2026) 
+
+### ares-package
+
+* Fixed the issue where ares-package failed to package an app correctly in `Signage` profile.
+
+
+## 3.2.1 (April 2, 2025) 
+
+### ares-package
+
+* Fixed a bug related to the use of the `sign` and `certificate` options in `tv` profile.
+
+
 ## 3.2.0 (December 24, 2024) 
 
 ### ares-config
@@ -33,7 +47,6 @@
 * Fixed a bug that device name can not be added with "-".
 
 
-
 ## 3.1.2 (August 07, 2024)
 ### ares-config
 * Added a new apollo profile for apollo platform.
@@ -44,17 +57,17 @@
 
 ## 3.1.1 (July 15, 2024)
 ### ares-inspect
-* Fixed a bug that ares-inspect --service display error message on webOS TV 4.5 or lower.
+* Fixed a bug that ares-inspect --service display error message on webOS TV 4.5 or lower
 
 
 ## 3.1.0 (July 12, 2024)
 ### ares-generate
-* Fixed a bug that can not generate without --template option.
+* Fixed a bug that can not generate without --template option
 
 ### ares-setup-device
 * Enhance usability of --add option.
-* Enhance emulator remove usability.
-* Change default device information of TV profile (user: prisoner, port:9922).
+* Enhance emulator remove usability
+* Change default device information of TV profile (user: prisoner, port:9922)
 * Change device name validation logic that accepts all characters except "$" & "%"
 
 ### common

package/bin/ares-config.js

@@ -208,4 +208,4 @@ function finish(err, value) {
         }
         cliControl.end();
     }
-}
+}

package/bin/ares-log.js

@@ -256,4 +256,4 @@ function finish(err, value) {
         }
         cliControl.end();
     }
-}
+}

package/bin/ares-setup-device.js

@@ -230,7 +230,7 @@ function _queryAddRemove(ssdpDevices, next) {
                 when: function(answers) {
                     return (["remove"].indexOf(answers.op) !== -1 && !ssdpDevice);
                 }
-            },{
+            }, {
                 type: "list",
                 name: "device_name",
                 message: "Select a device",
@@ -328,7 +328,7 @@ function _queryDeviceInfo(selDevice, next) {
             return idx;
         },
         when: function(answers) {
-            return _needInq(mode)(inqChoices) && answers.user === 'root';
+            return _needInq(mode)(inqChoices) && answers.user === "root";
         }
     }, {
         type: "password",
@@ -347,8 +347,7 @@ function _queryDeviceInfo(selDevice, next) {
         when: function(answers) {
             return _needInq(mode)(inqChoices) && (answers.auth_type === "ssh key");
         }
-    },
-    {
+    }, {
         type: "confirm",
         name: "default",
         message: "Set default ?",
@@ -381,16 +380,14 @@ function _queryDeviceInfo(selDevice, next) {
           username: answers.user,
           default: answers.default
         };
-
        
-        if (answers.
-            user !== 'prisoner' && ["add", "modify"].includes(mode)) {
+        if (answers.user !== 'prisoner' && ["add", "modify"].includes(mode)) {
             if (answers.auth_type && answers.auth_type === "password") {
                 inDevice.password = answers.password;
                 inDevice.privateKey = "@DELETE@";
                 inDevice.passphrase = "@DELETE@";
                 inDevice.privateKeyName = "@DELETE@";
-            } else if ((answers.auth_type && answers.auth_type === "ssh key") || answers.user === "developer") {
+            } else if ((answers.auth_type && answers.auth_type === "ssh key") ||  answers.user === "developer") {
                 inDevice.password = "@DELETE@";
                 inDevice.privateKey = {
                     "openSsh": answers.ssh_key || "webos_emul"
@@ -417,7 +414,7 @@ function _queryDeviceInfo(selDevice, next) {
             setupDevice.showDeviceList.bind(this),
         ], function(err, results) {
             if (err) {
-                return next(err,);
+                return next(err);
             }
             if(results[2] && results[2].msg){
                 console.log(results[2].msg);
@@ -574,4 +571,3 @@ function reParse(argv, mode) {
     }
     return argv
 }
-

package/bin/ares.js

@@ -119,7 +119,7 @@ function display (next) {
         for (const arg in argv) {
             if (Object.hasOwnProperty.call(commandsList, 'ares-'+ arg) && fs.existsSync(path.join(__dirname, 'ares-'+ arg + '.js'))) {
                 if (commandsList['ares-'+ arg].profile && !commandsList['ares-'+ arg].profile.includes(profile)) {
-                   return next(errHndl.getErrMsg("NOT_SUPPORT_COMMOND", profile));
+                    return next(errHndl.getErrMsg("NOT_SUPPORT_COMMOND", profile));
                 } else {
                     help.display('ares-'+arg, appdata.getConfig(true).profile);
                     found = true;

package/files/conf/ares.json

@@ -3,7 +3,6 @@
         "description": "Configure webOS CLI"
     },
     "ares-device": {
-        "profile": ["ose", "apollo", "tv"],
         "description": "Display the device information"
     },
     "ares-generate": {
@@ -47,4 +46,4 @@
         "profile": ["ose","apollo"],
         "description": "Open a device terminal or run a command"
     }
-}
+}

package/files/conf/novacom-devices.json

@@ -38,7 +38,7 @@
         "profile": "apollo",
         "name": "emulator",
         "type": "starfish",
-        "description": "LG webOS TV Emulator",
+        "description": "LG webOS Apollo Emulator",
         "host": "127.0.0.1",
         "port": 6622,
         "username": "developer",
@@ -66,4 +66,4 @@
         "noPortForwarding":false,
         "indelible": true
     }
-]
+]

package/files/conf-base/env/sdk-apollo.json

@@ -5,4 +5,4 @@
         "darwin": "/IDE/chromium/Chromium.app",
         "linux": "/IDE/chromium/chrome"
     }
-}
+}

package/files/conf-base/profile/config-apollo.json

@@ -26,4 +26,4 @@
     },
     "dataDir":".webos/apollo",
     "logDaemon": "journald"
-}
+}

package/files/conf-base/profile/config-ose.json

@@ -10,7 +10,7 @@
             "native": "executable"
         }
     },
-    "defaultDeviceInfo":{
+    "defaultDeviceInfo": {
         "ipAddress": "127.0.0.1",
         "port": "22",
         "user": "root",

package/files/conf-base/query/signage/query-app.json

@@ -11,4 +11,4 @@
         "query": "version",
         "default": "0.0.1"
     }
-}
+}

package/files/conf-base/query/signage/query-service.json

@@ -3,4 +3,4 @@
         "query": "service id",
         "default": "com.lg.app.signage.service"
     }
-}
+}

package/files/help/ares-launch.help

@@ -10,7 +10,7 @@
         "tv" : [
             "ares-launch -H, --hosted <APP_DIR> [-I, --host-ip <HOST_IP>]",
             "ares-launch -s, --simulator <WEBOS_TV_VERSION> <APP_DIR> [-sp, --simulator-path <SIMULATOR_PATH>] [OPTION...]"
-        ]
+          ]
     },
     "description" : {
         "default" : [

package/files/templates/signage-sdk-templates/Backlight_Scheduling/index.html

@@ -12,7 +12,7 @@
         
         <!--  Include IDCAP API Library -->
         
-        <script type="text/javascript" src="./js/idcap.js"></script>      
+        <script type="text/javascript" src="./js/idcap.js"></script>
         
         <!--  Script Files -->
         <script src = './setanddelete.js'></script>

package/files/templates/signage-sdk-templates/Backlight_Scheduling/scheduler.js

@@ -82,7 +82,7 @@ function getTime() {
         "onFailure": function (err) {
             console.log("onFailure : errorMessage = " + err.errorMessage);
         }
-    });   
+    });
 }
 
 // If parameter value(time value) and current time is matched, do backlight scheduling
@@ -119,5 +119,4 @@ function do_scheduling_by_IDCAP(hour, minute) {
             }
         }); 
     }
- }
-
+ }

package/files/templates/signage-sdk-templates/File_Explorer/index.html

@@ -6,39 +6,7 @@
 		
 		<script src = ./js/definition.js></script>
 		<script src = ./js/Root.js></script>    
-		<script src = ./js/explorer.js></script>
-		<script src = ./js/mainController.js></script>
-		<script src = ./js/explorerController.js></script>
-		
-		<link rel="stylesheet" type="text/css" href="./style.css">
-		 			
-	</head>
-
-	<body onload = "init()"> 
-		<div id = "menu_popup"></div>
-	
-		<div id="currentPos"></div>
-		<div id="filetitle">
-			<div id ="filetitle_name">Name</div>
-			<div id ="filetitle_type">Type</div>
-			<div id ="filetitle_size">Size</div>
-			<div id ="filetitle_ctime">Create Time</div> 
-			<div id ="filetitle_atime">Access Time</div> 
-			<div id ="filetitle_mtime">Modify Time</div>
-		</div>
-		
-		<div id ="fileList_name"></div>
-		<div id ="fileList_type"></div>
-		<div id ="fileList_size"></div>
-		<div id ="fileList_ctime"></div> 
-		<div id ="fileList_atime"></div> 
-		<div id ="fileList_mtime"></div>  
-		
-		<div id="fileInfo">			
-			<div id="status"></div>	
-			<div id="contents"></div>
-		</div>	
 			
 			
 	</body>
-</html>
+</html>

package/files/templates/signage-sdk-templates/File_Explorer/js/Root.js

@@ -1,12 +1,3 @@
-/**
- * 
- * Root.js
- * Get each storage information(total/free/used size), and open selected storage
- * 
- */
-
-var isRoot;
-
 function ROOT() {
 	isRoot = true;
 	var numOfDevice = 1;

package/lib/base/cli-appdata.js

@@ -101,6 +101,7 @@ const Cli = (function() {
         if (this.config.simulatorConfig) {
             this.simulatorConfigPath = path.join(workDir, this.config.simulatorConfig);
         }
+
         return true;
     }
 

package/lib/base/novacom.js

@@ -638,9 +638,9 @@ const async = require('async'),
                     if (Array.isArray(errorMessages) && errorMessages.length > 0) {
                         for (const index in errorMessages) {
                             log.error(
-                                        "novacom#Session()#begin() " + errorMessages[index].heading,
-                                        errorMessages[index].message
-                                    );
+                                "novacom#Session()#begin() " + errorMessages[index].heading,
+                                errorMessages[index].message
+                            );
                         }
                     }
                     if (this.errorImmediate) clearImmediate(this.errorImmediate);
@@ -987,7 +987,7 @@ const async = require('async'),
                 chStream.on('close', function() {
                     log.silly("novacom#Session()#run()", "event close (cmd:" + cmd + ")");
                     if (err === undefined) {
-                       setImmediate(next);
+                        setImmediate(next);
                     }
                 });
 

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/generator.js

@@ -405,4 +405,4 @@ function parsePropArgs(property, targetInfo) {
     });
 }
 
-module.exports = Generator;
+module.exports = Generator;

package/lib/package.js

@@ -25,8 +25,13 @@ const ar = require('ar-async'),
     temp = require('temp'),
     uglify = require('terser'),
     util = require('util'),
+    // zlib = require('zlib'),
+    // tarFilterPack = require('./tar-filter-pack'),
     errHndl = require('./base/error-handler'),
-    tar = require('tar');
+    tar = require('tar'),
+    commonTools = require('./base/common-tools');
+
+const appdata = commonTools.appdata;
 
 (function() {
     log.heading = 'packager';
@@ -62,8 +67,6 @@ const ar = require('ar-async'),
         this.nativecmd = false;
         this.minify = true;
         this.excludeFiles = [];
-        this.rom = false;
-        this.encrypt = false;
         this.sign = null;
         this.certificate = null;
         this.appCount = 0;
@@ -132,7 +135,7 @@ const ar = require('ar-async'),
 
             if (options && Object.prototype.hasOwnProperty.call(options, 'remainPlainIPK')) {
                 this.remainPlainIPK = options.remainPlainIPK;
-            }    
+            } 
 
             if (options && Object.prototype.hasOwnProperty.call(options, 'sign')) {
                 if (!fs.existsSync(path.resolve(options.sign))) {
@@ -1283,6 +1286,7 @@ const ar = require('ar-async'),
                     createDataHash.bind(this, tempCtrlDir, dataTgzFile),
                     createCertificateHash.bind(this, tempCtrlDir),
                     createControlFile.bind(this, tempCtrlDir, false),
+                    createSign.bind(this, tempCtrlDir, dataTgzFile),
                     createControlSignFile.bind(this, tempCtrlDir),
                     makeTgz.bind(this, tempCtrlDir, ctrlTgzFile),
                     createDebianBinary.bind(this, tempDir),
@@ -1365,6 +1369,9 @@ const ar = require('ar-async'),
     }
 
     function createDataHash(dstDir, dataTgzPath, next) {
+        // This function applies only to the signage profile.
+        if (appdata.config.profile !== 'signage') return setImmediate(next);
+
         const self = this;
         log.verbose("package#createDataHash()", "Create data hash");
 
@@ -1401,6 +1408,9 @@ const ar = require('ar-async'),
     }
 
     function createCertificateHash(dstDir, next) {
+        // This function applies only to the signage profile.
+        if (appdata.config.profile !== 'signage') return setImmediate(next);
+
         const self = this;
         try {
             if (!self.certificate) {
@@ -1448,11 +1458,12 @@ const ar = require('ar-async'),
         ];
 
         // To IPK security (SEAL)
-        if (this.sign !== null) {
+        // The data hashs apply only to the signage profile.
+        if (this.sign !== null && appdata.config.profile === 'signage') {
             lines.push('Application-Hash-Algorithm: SHA-256');
             lines.push('Application-Hash: ' + this.dataHash);
         }
-        if (this.certificate !== null) {
+        if (this.certificate !== null && appdata.config.profile === 'signage') {
             lines.push('Certificate-Hash: ' + this.certificateHash);
             lines.push('Signature-Algorithm: RSA');
         }
@@ -1465,6 +1476,9 @@ const ar = require('ar-async'),
     }
 
     function createControlSignFile(ctrlDir, next) {
+        // This function applies only to the signage profile.
+        if (appdata.config.profile !== 'signage') return setImmediate(next);
+
         try {
             if (this.sign === null) {
                 log.verbose("package#createControlSignFile()", "App signing is skipped");
@@ -1490,7 +1504,7 @@ const ar = require('ar-async'),
                 let controlSigner = crypto.createSign('sha256')
                 controlSigner.update(controlData);
                 controlSigner.end();
-                controlSign = controlSigner.sign(privateKey);
+                const controlSign = controlSigner.sign(privateKey);
                 let base64data = Buffer.from(controlSign).toString('base64');
                 
                 fs.writeFile(controlSignFilePath, base64data, next);
@@ -1500,6 +1514,44 @@ const ar = require('ar-async'),
         }
     }
 
+    function createSign(dstDir, dataTgzPath, next) {
+        // This function does not apply to the signage profile.
+        if (appdata.config.profile === 'signage') return setImmediate(next);
+
+        if ((!this.sign) || (!this.certificate)) {
+            log.verbose("package#createSign()", "App signing is skipped");
+            return setImmediate(next);
+        }
+
+        const sigFilePath = path.join(dstDir, 'data.tar.gz.sha256.txt'),
+            keyPath = path.resolve(this.sign),
+            crtPath = path.resolve(this.certificate);
+
+        log.verbose("package#createSign()", "dataTgzPath:" + dataTgzPath + ", sigfile:" + sigFilePath);
+        log.verbose("package#createSign()", "keyPath:" + keyPath + ", crtPath:" + crtPath);
+
+        try {
+            // Create certificate to tmp/ctrl directory
+            shelljs.cp('-f', crtPath, dstDir);
+
+            // Create signature and write data.tar.gz.sha256.txt
+            const privateKey = fs.readFileSync(keyPath, 'utf-8'),
+                dataFile = fs.readFileSync(dataTgzPath), // data.tar.gz
+                signer = crypto.createSign('sha256');
+
+            signer.update(dataFile);
+            signer.end();
+
+            const signature = signer.sign(privateKey),
+                buff = Buffer.from(signature),
+                base64data = buff.toString('base64');
+
+            fs.writeFile(sigFilePath, base64data, next);
+        } catch (err) {
+            setImmediate(next, err);
+        }
+    }
+
     function createDebianBinary(dstDir, next) {
         const dstFilePath = path.join(dstDir, "debian-binary");
         log.verbose("package#createDebianBinary()", dstFilePath);
@@ -1706,7 +1758,7 @@ const ar = require('ar-async'),
             this.rscCount++;
             log.verbose("FOUND resourceinfo.json, rscCount " + this.rscCount);
             if (this.appCount > 0 || this.svcDir && this.svcDir.length > 0) {
-               return callback(errHndl.getErrMsg("NOT_PACKAGE_WITH_RESOURCE"));
+                return callback(errHndl.getErrMsg("NOT_PACKAGE_WITH_RESOURCE"));
             }
             this.resources = this.resources || [];
             const rsc = {};

package/lib/shell.js

@@ -34,7 +34,7 @@ const async = require('async'),
                 },
                 function(next) {
                     if (options && options.display && !options.sessionCall) {
-                       return setImmediate(next, errHndl.getErrMsg("NOT_SUPPORT_SESSION"), {});
+                        return setImmediate(next, errHndl.getErrMsg("NOT_SUPPORT_SESSION"), {});
                     }
                     next();
                 },

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@webos-tools/cli",
-  "version": "3.2.0",
+  "version": "3.2.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@webos-tools/cli",
-      "version": "3.2.0",
+      "version": "3.2.1",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "os": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webos-tools/cli",
-  "version": "3.2.0",
+  "version": "3.2.2",
   "description": "Command Line Interface for development webOS application and service",
   "main": "APIs.js",
   "scripts": {

package/spec/jsSpecs/ares-generate.spec.js

@@ -100,7 +100,7 @@ describe(aresCmd +' --property', function() {
     });
 
     it('Set the properties of packageinfo.json', function(done) {
-        if (options.profile !== "tv") {
+        if (options.profile === "ose" || options.profile === "apollo") {
             pending(options.skipTxt);
         }
 
@@ -157,7 +157,7 @@ describe(aresCmd +' --property', function() {
     });
 
     it('Set the properties of qmlappinfo.json', function(done) {
-        if (options.profile != "ose") {
+        if (options.profile === "tv" || options.profile === "apollo") {
             pending(options.skipTxt);
         }
 
@@ -222,7 +222,7 @@ describe(aresCmd + ' --template', function() {
     });
 
     it('packageinfo : packageinfo.json for webOS package', function(done) {
-        if (options.profile != "tv") {
+        if (options.profile === "ose" || options.profile === "apollo") {
             pending(options.skipTxt);
         }
 
@@ -249,10 +249,6 @@ describe(aresCmd + ' --template', function() {
     });
 
     it('hosted_webapp : generate hosted template app', function(done) {
-        if (options.profile == "signage") {
-            pending(options.skipTxt);
-        }
-
         const url = "http://www.google.com";
         exec(cmd + ` -t hosted_webapp -p "url=${url}" ${sampleAppPath}`, function(error, stdout, stderr) {
             if (stderr && stderr.length > 0) {
@@ -274,7 +270,7 @@ describe(aresCmd + ' --template', function() {
     });
 
     it('qmlapp : generate qml template app', function(done) {
-        if (options.profile != "ose") {
+        if (options.profile === "tv" || options.profile === "apollo") {
             pending(options.skipTxt);
         }
 

package/spec/jsSpecs/ares-log.spec.js

@@ -121,7 +121,7 @@ describe(aresCmd + " -sd", function() {
         exec(cmd + ` -sd ${targetLogDaemon}`, function(error, stdout, stderr) {
             if (stderr && stderr.length > 0) {
                 common.detectNodeMessage(stderr);
-            } 
+            }
             expect(stdout).toContain(`CLI's current logging daemon : ${targetLogDaemon}`);
             done();
         });

package/spec/jsSpecs/ares-setup-device.spec.js

@@ -78,6 +78,7 @@ describe(aresCmd + ' --add(-a)', function() {
             expect(stdout).toContain(port);
             expect(stdout).toContain(username);
             expect(stdout).toContain("emulator");
+            expect(stdout).toContain(options.device + " (default)");
             done();
         });
     });

package/spec/test_data/ares-generate.json

@@ -54,38 +54,5 @@
             "jsservice": "js_service",
             "webappinfo": ["appinfo.json"]
         }
-    },
-    "signage":{
-        "list":[
-            "ID                          Project Type     Description",
-            "--------------------------  ---------------  ----------------------------------------------",
-            "backlight-scheduling        Web App          (default) SCAP - Backlight Scheduling",
-            "app-update-without-restart  Web App          SCAP - App update without restart",
-            "download-progress           Web App          SCAP - Download progress",
-            "simple-network-failover     Web App          SCAP - Simple Network Failover",
-            "file-explorer               Web App          SCAP - File Explorer",
-            "local-content-scheduling    Web App          SCAP - Local Content Scheduling",
-            "timezone-setting            Web App          SCAP - Timezone Setting",
-            "fashion-multimedia-ad       Web App          Web - (Fashion/Jewelry) Fashion Multimedia",
-            "information-kiosk           Web App          Web - (Fashion/Jewelry) Information Kiosk",
-            "weather-dependent-ad        Web App          Web - (Fashion/Jewelry) Weather Dependent Adv.",
-            "flight-schedule             Web App          Web - (Flight Info Display) Flight Schedule",
-            "information-board           Web App          Web - (Public Place/Edu) Information Board",
-            "multimedia-ad               Web App          Web - (Public Place/Edu) Multimedia Adv.",
-            "wayfinder                   Web App          Web - (Public Place/Edu) Wayfinder",
-            "widget-overlay              Web App          Web - (Public Place/Edu) Widget Overlay",
-            "mart                        Web App          Web - (QSR/Retail) Mart",
-            "price-board-for-QSR         Web App          Web - (QSR/Retail) Price Board for QSR",
-            "special-menu-board          Web App          Web - (QSR/Retail) Special Menu Board",
-            "hello-service               JS Service       js service for webOS Signage",
-            "webappinfo                  Web App Info     appinfo.json for web app",
-            "jsserviceinfo               JS Service Info  services.json, package.json for JS service",
-            "signageicon                 Icon             signage app icon path [80x80, 130x130]"
-        ],
-        "template": {
-            "webapp": "backlight-scheduling",
-            "jsservice": "hello-service",
-            "webappinfo": ["appinfo.json"]
-        }
     }
-}
+}