@webos-tools/cli 3.0.6 → 3.1.1

package/spec/jsSpecs/common-spec.js

@@ -1,169 +1,169 @@
-/*
- * Copyright (c) 2020-2024 LG Electronics Inc.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-const path = require('path'),
-    fs = require('fs'),
-    nopt = require('nopt'),
-    exec = require('child_process').exec,
-    shelljs = require('shelljs');
-
-const commonSpec = {};
-const options = {
-    profile: "ose",
-    device: "emulator",
-    ip: "127.0.0.1",
-    port: 6622,
-    pkgId: "com.jasmine.web.app",
-    pkgService: "com.jasmine.web.app.service",
-    ipkFile: "com.jasmine.web.app_0.0.1_all.ipk",
-    ipkPath: path.join(__dirname, "..", "tempFiles",  "com.jasmine.web.app_0.0.1_all.ipk"),
-    passPhrase: ""
-};
-
-if (typeof module !== 'undefined' && module.exports) {
-    module.exports = commonSpec;
-}
-
-const knownOpts = {
-    "profile": String,
-    "device": String,
-    "ip": String,
-    "port": String,
-    "timeInterval": Number,
-    "passPhrase": String
-};
-const shortHands = {
-    "p": ["--profile"],
-    "d": ["--device"],
-    "ip": ["--ip"],
-    "port": ["--port"],
-    "ti": ["--timeInterval"],
-    "pp": ["--passPhrase"]
-};
-
-commonSpec.getOptions = function() {
-    return new Promise(function(resolve, reject) {
-        const argv = nopt(knownOpts, shortHands, process.argv, 2);
-
-        if (argv.profile) {
-            options.profile = argv.profile;
-        }
-        if (argv.device) {
-            options.device = argv.device;
-        }
-        if (argv.ip) {
-            options.ip = argv.ip;
-        }
-        if (options.device !== "emulator") {
-            options.port = argv.port ? argv.port : 22;
-        }
-        if (argv.timeInterval) {
-            jasmine.DEFAULT_TIMEOUT_INTERVAL = argv.timeInterval;
-        }
-        if (argv.profile === "tv" && !argv.passPhrase) {
-            console.error("[Tips] If you want to run a unit test with for tv profile, need the Passphrase value of the device in use.");
-            process.exit(1);
-        }
-        options.passPhrase = argv.passPhrase;
-        console.info(`profile : ${options.profile}, device : ${options.device}, ip : ${options.ip}, port : ${options.port}, timeInterval : ${jasmine.DEFAULT_TIMEOUT_INTERVAL}, passPhrase : ${options.passPhrase}`);
-
-        // set profile
-        const cmd = commonSpec.makeCmd('ares-config');
-        exec(cmd + ` -p ${options.profile}`, function(error, stdout) {
-            if (error) {
-                console.error("set config error " +  error);
-                reject(stdout);
-            }
-            resolve(options);
-        });
-
-        options.skipTxt = `In case of ${options.profile}, skip this test case`;
-    });
-};
-
-commonSpec.getExpectedResult = function(aresCmd) {
-    return new Promise(function(resolve) {
-        try {
-            const text = fs.readFileSync(path.join(__dirname, "../test_data", aresCmd + '.json'), 'utf8');
-            const resultJson = JSON.parse(text);
-            resolve(resultJson[options.profile]);
-        } catch(err) {
-            console.error(err);
-            process.exit(1);
-        }
-    });
-};
-
-commonSpec.resetDeviceList = function() {
-    return new Promise(function(resolve, reject) {
-        const cmd = commonSpec.makeCmd('ares-setup-device');
-        exec(cmd + ' -R', function(error, stdout, stderr) {
-            if (!stderr) {
-                resolve(true);
-            } else {
-                reject(error);
-            }
-        });
-    });
-};
-
-commonSpec.addDeviceInfo = function() {
-    return new Promise(function(resolve, reject) {
-        const cmd = commonSpec.makeCmd('ares-setup-device');
-        exec(cmd + ` -a ${options.device} -i port=${options.port} -i username=root -i host=${options.ip} -i default=true`,
-        function(error, stdout, stderr) {
-            if (stderr) {
-                reject(stderr);
-            } else {
-                resolve(stdout);
-                if (options.profile === "tv") {
-                    commonSpec.getKey(options.passPhrase);
-                }
-            }
-        });
-    });
-};
-
-commonSpec.makeCmd = function(cmd) {
-    return `node ${path.join('bin', cmd + '.js')}`;
-};
-
-commonSpec.createOutDir = function(filePath, mode) {
-    if (!fs.existsSync(filePath)) {
-        shelljs.mkdir(filePath);
-    }
-
-    if (mode) {
-        fs.chmodSync(filePath, mode);
-    }
-};
-
-commonSpec.removeOutDir = function(filePath) {
-    if (fs.existsSync(filePath)) {
-        shelljs.rm('-rf', filePath);
-    }
-};
-
-commonSpec.detectNodeMessage = function(stderr) {
-    if (stderr.includes("node:")) {
-        return fail(stderr);
-    }
-};
-
-// get ssh private key
-commonSpec.getKey = function(passPhrase) {
-    return new Promise(function(resolve, reject) {
-        const cmd = commonSpec.makeCmd('ares-novacom');
-        exec(cmd + ` -k -pass ${passPhrase} -d ${options.device}`,
-        function(error, stdout, stderr) {
-            if (stderr) {
-                reject(stderr);
-            } else {
-                resolve(stdout);
-            }
-        });
-    });
-};
+/*
+ * Copyright (c) 2020-2024 LG Electronics Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+const path = require('path'),
+    fs = require('fs'),
+    nopt = require('nopt'),
+    exec = require('child_process').exec,
+    shelljs = require('shelljs');
+
+const commonSpec = {};
+const options = {
+    profile: "ose",
+    device: "emulator",
+    ip: "127.0.0.1",
+    port: 6622,
+    pkgId: "com.jasmine.web.app",
+    pkgService: "com.jasmine.web.app.service",
+    ipkFile: "com.jasmine.web.app_0.0.1_all.ipk",
+    ipkPath: path.join(__dirname, "..", "tempFiles",  "com.jasmine.web.app_0.0.1_all.ipk"),
+    passPhrase: ""
+};
+
+if (typeof module !== 'undefined' && module.exports) {
+    module.exports = commonSpec;
+}
+
+const knownOpts = {
+    "profile": String,
+    "device": String,
+    "ip": String,
+    "port": String,
+    "timeInterval": Number,
+    "passPhrase": String
+};
+const shortHands = {
+    "p": ["--profile"],
+    "d": ["--device"],
+    "ip": ["--ip"],
+    "port": ["--port"],
+    "ti": ["--timeInterval"],
+    "pp": ["--passPhrase"]
+};
+
+commonSpec.getOptions = function() {
+    return new Promise(function(resolve, reject) {
+        const argv = nopt(knownOpts, shortHands, process.argv, 2);
+
+        if (argv.profile) {
+            options.profile = argv.profile;
+        }
+        if (argv.device) {
+            options.device = argv.device;
+        }
+        if (argv.ip) {
+            options.ip = argv.ip;
+        }
+        if (options.device !== "emulator") {
+            options.port = argv.port ? argv.port : 22;
+        }
+        if (argv.timeInterval) {
+            jasmine.DEFAULT_TIMEOUT_INTERVAL = argv.timeInterval;
+        }
+        if (argv.profile === "tv" && !argv.passPhrase) {
+            console.error("[Tips] If you want to run a unit test with for tv profile, need the Passphrase value of the device in use.");
+            process.exit(1);
+        }
+        options.passPhrase = argv.passPhrase;
+        console.info(`profile : ${options.profile}, device : ${options.device}, ip : ${options.ip}, port : ${options.port}, timeInterval : ${jasmine.DEFAULT_TIMEOUT_INTERVAL}, passPhrase : ${options.passPhrase}`);
+
+        // set profile
+        const cmd = commonSpec.makeCmd('ares-config');
+        exec(cmd + ` -p ${options.profile}`, function(error, stdout) {
+            if (error) {
+                console.error("set config error " +  error);
+                reject(stdout);
+            }
+            resolve(options);
+        });
+
+        options.skipTxt = `In case of ${options.profile}, skip this test case`;
+    });
+};
+
+commonSpec.getExpectedResult = function(aresCmd) {
+    return new Promise(function(resolve) {
+        try {
+            const text = fs.readFileSync(path.join(__dirname, "../test_data", aresCmd + '.json'), 'utf8');
+            const resultJson = JSON.parse(text);
+            resolve(resultJson[options.profile]);
+        } catch(err) {
+            console.error(err);
+            process.exit(1);
+        }
+    });
+};
+
+commonSpec.resetDeviceList = function() {
+    return new Promise(function(resolve, reject) {
+        const cmd = commonSpec.makeCmd('ares-setup-device');
+        exec(cmd + ' -R', function(error, stdout, stderr) {
+            if (!stderr) {
+                resolve(true);
+            } else {
+                reject(error);
+            }
+        });
+    });
+};
+
+commonSpec.addDeviceInfo = function() {
+    return new Promise(function(resolve, reject) {
+        const cmd = commonSpec.makeCmd('ares-setup-device');
+        exec(cmd + ` -a ${options.device} -i port=${options.port} -i username=root -i host=${options.ip} -i default=true`,
+        function(error, stdout, stderr) {
+            if (stderr) {
+                reject(stderr);
+            } else {
+                resolve(stdout);
+                if (options.profile === "tv") {
+                    commonSpec.getKey(options.passPhrase);
+                }
+            }
+        });
+    });
+};
+
+commonSpec.makeCmd = function(cmd) {
+    return `node ${path.join('bin', cmd + '.js')}`;
+};
+
+commonSpec.createOutDir = function(filePath, mode) {
+    if (!fs.existsSync(filePath)) {
+        shelljs.mkdir(filePath);
+    }
+
+    if (mode) {
+        fs.chmodSync(filePath, mode);
+    }
+};
+
+commonSpec.removeOutDir = function(filePath) {
+    if (fs.existsSync(filePath)) {
+        shelljs.rm('-rf', filePath);
+    }
+};
+
+commonSpec.detectNodeMessage = function(stderr) {
+    if (stderr.includes("node:")) {
+        return fail(stderr);
+    }
+};
+
+// get ssh private key
+commonSpec.getKey = function(passPhrase) {
+    return new Promise(function(resolve, reject) {
+        const cmd = commonSpec.makeCmd('ares-novacom');
+        exec(cmd + ` -k -pass ${passPhrase} -d ${options.device}`,
+        function(error, stdout, stderr) {
+            if (stderr) {
+                reject(stderr);
+            } else {
+                resolve(stdout);
+            }
+        });
+    });
+};

package/spec/support/jasmine.json

@@ -1,22 +1,22 @@
-{
-  "spec_dir": "spec",
-  "spec_files": [
-    "jsSpecs/ares-config.spec.js",
-    "jsSpecs/ares-generate.spec.js",
-    "jsSpecs/ares-inspect.spec.js",
-    "jsSpecs/ares-install.spec.js",
-    "jsSpecs/ares-launch.spec.js",
-    "jsSpecs/ares-package.spec.js",
-    "jsSpecs/ares-pull.spec.js",
-    "jsSpecs/ares-push.spec.js",
-    "jsSpecs/ares-server.spec.js",
-    "jsSpecs/ares-setup-device.spec.js",
-    "jsSpecs/ares-shell.spec.js",
-    "jsSpecs/ares.spec.js",
-    "jsSpecs/ares-device.spec.js",
-    "jsSpecs/ares-log.spec.js"
-  ],
-  "helpers": [
-    "helpers/**/*.js"
-  ]
-}
+{
+  "spec_dir": "spec",
+  "spec_files": [
+    "jsSpecs/ares-config.spec.js",
+    "jsSpecs/ares-generate.spec.js",
+    "jsSpecs/ares-inspect.spec.js",
+    "jsSpecs/ares-install.spec.js",
+    "jsSpecs/ares-launch.spec.js",
+    "jsSpecs/ares-package.spec.js",
+    "jsSpecs/ares-pull.spec.js",
+    "jsSpecs/ares-push.spec.js",
+    "jsSpecs/ares-server.spec.js",
+    "jsSpecs/ares-setup-device.spec.js",
+    "jsSpecs/ares-shell.spec.js",
+    "jsSpecs/ares.spec.js",
+    "jsSpecs/ares-device.spec.js",
+    "jsSpecs/ares-log.spec.js"
+  ],
+  "helpers": [
+    "helpers/**/*.js"
+  ]
+}

package/spec/tempFiles/nativeApp/auto/pkg_arm64/appinfo.json

@@ -1,9 +1,9 @@
-{
-  "id": "com.sample.gles2",
-  "version": "1.0.0",
-  "vendor": "LG Electronics",
-  "type": "native",
-  "main": "GLES2",
-  "title": "gles2 sample",
-  "icon": "icon.png"
-}
+{
+  "id": "com.sample.gles2",
+  "version": "1.0.0",
+  "vendor": "LG Electronics",
+  "type": "native",
+  "main": "GLES2",
+  "title": "gles2 sample",
+  "icon": "icon.png"
+}

package/spec/tempFiles/nativeApp/ose/pkg_arm/appinfo.json

@@ -1,9 +1,9 @@
-{
-  "id": "com.ose.target.native",
-  "version": "1.0.0",
-  "vendor": "LG Electronics",
-  "type": "native",
-  "main": "Hello",
-  "title": "ose native app",
-  "icon": "icon.png"
+{
+  "id": "com.ose.target.native",
+  "version": "1.0.0",
+  "vendor": "LG Electronics",
+  "type": "native",
+  "main": "Hello",
+  "title": "ose native app",
+  "icon": "icon.png"
 }

package/spec/tempFiles/nativeApp/ose/pkg_arm/package.properties

@@ -1,2 +1,2 @@
-filemode.777=Hello
-filemode.777=appinfo.json
+filemode.777=Hello
+filemode.777=appinfo.json

package/spec/tempFiles/nativeApp/oseEmul/pkg_x86/appinfo.json

@@ -1,9 +1,9 @@
-{
-  "id": "com.ose.emul.native",
-  "version": "1.0.0",
-  "vendor": "LG Electronics",
-  "type": "native",
-  "main": "Hello",
-  "title": "ose native app",
-  "icon": "icon.png"
-}
+{
+  "id": "com.ose.emul.native",
+  "version": "1.0.0",
+  "vendor": "LG Electronics",
+  "type": "native",
+  "main": "Hello",
+  "title": "ose native app",
+  "icon": "icon.png"
+}

package/spec/tempFiles/nativeApp/rsi/pkg_x86/appinfo.json

@@ -1,9 +1,9 @@
-{
-  "id": "com.sample.gles2",
-  "version": "1.0.0",
-  "vendor": "LG Electronics",
-  "type": "native",
-  "main": "GLES2",
-  "title": "gles2 sample",
-  "icon": "icon.png"
-}
+{
+  "id": "com.sample.gles2",
+  "version": "1.0.0",
+  "vendor": "LG Electronics",
+  "type": "native",
+  "main": "GLES2",
+  "title": "gles2 sample",
+  "icon": "icon.png"
+}

package/spec/tempFiles/sign/sign.crt

@@ -1,32 +1,32 @@
------BEGIN CERTIFICATE-----
-MIIFgTCCA2mgAwIBAgIJAJqAm4XNNsaJMA0GCSqGSIb3DQEBCwUAMFcxCzAJBgNV
-BAYTAktPMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
-aWRnaXRzIFB0eSBMdGQxEDAOBgNVBAMMB1NES19DTEkwHhcNMTkwNDA0MDcwMzUw
-WhcNMTkwNTA0MDcwMzUwWjBXMQswCQYDVQQGEwJLTzETMBEGA1UECAwKU29tZS1T
-dGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMRAwDgYDVQQD
-DAdTREtfQ0xJMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArLeHWy6a
-Jcpe09Ac1MnlkXp+UrgWz/bKvz8IuVl0mejU3X1W0klDS47Rq6zz4+VagGMlTbEK
-arAdXRfagTNTBwmFl6evvmOfFjGizszLF9SoPu1ZOEzn5xn0OFgGsFf57QCgX+fs
-jlVmwGfgX+JZnoGdTb2i+dsDMmub4HZTUaFmS3i046jfe8WWWnRKbSeTdyRNx0Of
-EFPk7LOGEraQ/pMfBVXD/mTCFXpZnZz498QJOZ1kOy2j6M8dDtrILR65AVrvNZMy
-W1lhZfRf0+A9iX7kR368Jqhd135YB/fE+0KGgp2zxlUV8qJI34ZQcMuATAu9x+to
-sobKEM268queeSdUZWnAzdRmpPG86lttVSvVT1lrNWsPIpj3wkurnFBJ17fWkJT4
-djIbtumS2ZS2lhc9P32y4bGQRdECi0FWrztTgY6iOhU/HUB4WNvn9wGsZdQlgaSK
-vQZRhIQb1a+bbzogsSGg7lVJu5kp97zg2csQwLoG6/j72cSbhA3Tr1C4n6OB80RE
-N4tqJI5c1ssZA07VcH5bWlDEFOiBmFOUlflw+i9aCBKcJeolJwM4oaS5hPZ7YqqH
-cZsjFZiVv1PKSluNcoXWVj8+rpoyXfvpigZS2xzkyZhgA2aG3WQdkaC+6RTQOLhb
-E4kBie/Zv4gOAwAyFfFp/NjvDV6nWHp14lcCAwEAAaNQME4wHQYDVR0OBBYEFDki
-ZNcGZCH2dVfURaRor5abtV3uMB8GA1UdIwQYMBaAFDkiZNcGZCH2dVfURaRor5ab
-tV3uMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBADMiOgyoXF1OD0FR
-8haIK95b9AqrYRLcNmwxYInlaUidwygNVoLah3iJF9bQwGCRbf1Fu1ABBPOx1Sho
-Dvwny6Zq6sAZ2YdXPV0XTT/Sxb3pJmUy92y2OXP1jv9xKfBbI0rEeybjbyjDW2zL
-b5FK/Dmv1C8bXCiBm6e/BeSi0iOROM89RGMYxPSGLw6KTGYqQ+zXwBolO9YKTAya
-698sbxJqnhx9faedQuNDDDNST1zrULSxNr4eidtktkgGx5v/VPt4kC+CshoNQLFg
-skEywIhgck0rHFFnbTmeGXOcp0ciTuTjGKWwo/8pgLx6vUN2Zf+y35nSFCnXC55Z
-OWeaWmk1j7X1voRwMXMt06zjzTq0fBtGzxqv7dlSCYtGulxk9eGijOrvPAg3WYhF
-QPl9qM5fe61DiSH+GgztC9xA76g2ui5L9HUehtnRzhOoYo8yc5mqivYoGiAH5/Ss
-nLoayXHgqGZZybm8FX6Z9KzN3Bs8Vt/xJGUSTa9x0igsFSGQr3o3aOV8QExE/LHb
-Y0xaoyAO2bZsHw75CkzCIu0BSyMI5dRcVTqf1gvQodmmlSBUbZaL1Kr/IHOWgWfh
-BtuLIv9/IMst2vDIQKiawcK9mQddC0dsO9IzsyCOJyJP0dZ38/9joQgipeMevKm4
-AC8QMXbbcHuTR8Rgd+cNJo0c1vuy
------END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFgTCCA2mgAwIBAgIJAJqAm4XNNsaJMA0GCSqGSIb3DQEBCwUAMFcxCzAJBgNV
+BAYTAktPMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
+aWRnaXRzIFB0eSBMdGQxEDAOBgNVBAMMB1NES19DTEkwHhcNMTkwNDA0MDcwMzUw
+WhcNMTkwNTA0MDcwMzUwWjBXMQswCQYDVQQGEwJLTzETMBEGA1UECAwKU29tZS1T
+dGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMRAwDgYDVQQD
+DAdTREtfQ0xJMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArLeHWy6a
+Jcpe09Ac1MnlkXp+UrgWz/bKvz8IuVl0mejU3X1W0klDS47Rq6zz4+VagGMlTbEK
+arAdXRfagTNTBwmFl6evvmOfFjGizszLF9SoPu1ZOEzn5xn0OFgGsFf57QCgX+fs
+jlVmwGfgX+JZnoGdTb2i+dsDMmub4HZTUaFmS3i046jfe8WWWnRKbSeTdyRNx0Of
+EFPk7LOGEraQ/pMfBVXD/mTCFXpZnZz498QJOZ1kOy2j6M8dDtrILR65AVrvNZMy
+W1lhZfRf0+A9iX7kR368Jqhd135YB/fE+0KGgp2zxlUV8qJI34ZQcMuATAu9x+to
+sobKEM268queeSdUZWnAzdRmpPG86lttVSvVT1lrNWsPIpj3wkurnFBJ17fWkJT4
+djIbtumS2ZS2lhc9P32y4bGQRdECi0FWrztTgY6iOhU/HUB4WNvn9wGsZdQlgaSK
+vQZRhIQb1a+bbzogsSGg7lVJu5kp97zg2csQwLoG6/j72cSbhA3Tr1C4n6OB80RE
+N4tqJI5c1ssZA07VcH5bWlDEFOiBmFOUlflw+i9aCBKcJeolJwM4oaS5hPZ7YqqH
+cZsjFZiVv1PKSluNcoXWVj8+rpoyXfvpigZS2xzkyZhgA2aG3WQdkaC+6RTQOLhb
+E4kBie/Zv4gOAwAyFfFp/NjvDV6nWHp14lcCAwEAAaNQME4wHQYDVR0OBBYEFDki
+ZNcGZCH2dVfURaRor5abtV3uMB8GA1UdIwQYMBaAFDkiZNcGZCH2dVfURaRor5ab
+tV3uMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBADMiOgyoXF1OD0FR
+8haIK95b9AqrYRLcNmwxYInlaUidwygNVoLah3iJF9bQwGCRbf1Fu1ABBPOx1Sho
+Dvwny6Zq6sAZ2YdXPV0XTT/Sxb3pJmUy92y2OXP1jv9xKfBbI0rEeybjbyjDW2zL
+b5FK/Dmv1C8bXCiBm6e/BeSi0iOROM89RGMYxPSGLw6KTGYqQ+zXwBolO9YKTAya
+698sbxJqnhx9faedQuNDDDNST1zrULSxNr4eidtktkgGx5v/VPt4kC+CshoNQLFg
+skEywIhgck0rHFFnbTmeGXOcp0ciTuTjGKWwo/8pgLx6vUN2Zf+y35nSFCnXC55Z
+OWeaWmk1j7X1voRwMXMt06zjzTq0fBtGzxqv7dlSCYtGulxk9eGijOrvPAg3WYhF
+QPl9qM5fe61DiSH+GgztC9xA76g2ui5L9HUehtnRzhOoYo8yc5mqivYoGiAH5/Ss
+nLoayXHgqGZZybm8FX6Z9KzN3Bs8Vt/xJGUSTa9x0igsFSGQr3o3aOV8QExE/LHb
+Y0xaoyAO2bZsHw75CkzCIu0BSyMI5dRcVTqf1gvQodmmlSBUbZaL1Kr/IHOWgWfh
+BtuLIv9/IMst2vDIQKiawcK9mQddC0dsO9IzsyCOJyJP0dZ38/9joQgipeMevKm4
+AC8QMXbbcHuTR8Rgd+cNJo0c1vuy
+-----END CERTIFICATE-----

package/spec/tempFiles/sign/signPriv.key

@@ -1,52 +1,52 @@
------BEGIN PRIVATE KEY-----
-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
-AF3ZJ1lRJMS0vOAPpxMYZ8MTAq4qwQ==
------END PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+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
+AF3ZJ1lRJMS0vOAPpxMYZ8MTAq4qwQ==
+-----END PRIVATE KEY-----