@iobroker/js-controller-common 4.0.5-alpha.2-20220208-ac4cf51e → 4.0.7

package/lib/common/logger.js

@@ -61,23 +61,23 @@ const IoSeq =
     Seq &&
     class extends Seq {
         log(info, callback) {
-            const ioInfo = info;
+            const ioInfo = deepClone(info);
             ioInfo.props = ioInfo.props || {};
 
             // map our log levels to Seq levels
-            const level = (info.level || '').toLowerCase();
+            const level = (ioInfo.level || '').toLowerCase();
             if (level.includes('error')) {
-                info.level = 'Error';
+                ioInfo.level = 'Error';
             } else if (level.includes('warn')) {
-                info.level = 'Warning';
+                ioInfo.level = 'Warning';
             } else if (level.includes('info')) {
-                info.level = 'Information';
+                ioInfo.level = 'Information';
             } else if (level.includes('debug')) {
-                info.level = 'Debug';
+                ioInfo.level = 'Debug';
             } else if (level.includes('silly')) {
-                info.level = 'Verbose';
+                ioInfo.level = 'Verbose';
             } else {
-                info.level = 'Information';
+                ioInfo.level = 'Information';
             }
 
             // we add own properties

package/lib/common/tools.js

@@ -10,7 +10,7 @@ const cpPromise = require('promisify-child-process');
 const jwt = require('jsonwebtoken');
 const { createInterface } = require('readline');
 const { PassThrough } = require('stream');
-const { detectPackageManager } = require('@alcalzone/pak');
+const { detectPackageManager, packageManagers } = require('@alcalzone/pak');
 const EXIT_CODES = require('./exitCodes');
 const zlib = require('zlib');
 
@@ -1258,34 +1258,32 @@ function getRepositoryFile(urlOrPath, additionalInfo, callback) {
  */
 async function getRepositoryFileAsync(url, hash, force, _actualRepo) {
     let _hash;
-    if (_actualRepo && !force && hash && (url.startsWith('http://') || url.startsWith('https://'))) {
-        axios = axios || require('axios');
-        _hash = await axios({ url: url.replace(/\.json$/, '-hash.json'), timeout: 10000 });
-        if (_hash && _hash.data && hash === _hash.data.hash) {
-            return _actualRepo;
-        }
-    }
-
     let data;
 
     if (url.startsWith('http://') || url.startsWith('https://')) {
         axios = axios || require('axios');
-        if (!_hash) {
+        try {
             _hash = await axios({ url: url.replace(/\.json$/, '-hash.json'), timeout: 10000 });
+        } catch {
+            // ignore missing hash file
         }
 
-        if (_actualRepo && hash && _hash && _hash.data && _hash.data.hash === hash) {
+        if (_actualRepo && !force && hash && _hash && _hash.data && _hash.data.hash === hash) {
             data = _actualRepo;
         } else {
             const agent = `${module.exports.appName}, RND: ${randomID}, Node:${process.version}, V:${
                 require('../../package.json').version
             }`;
-            data = await axios({
-                url,
-                timeout: 10000,
-                headers: { 'User-Agent': agent }
-            });
-            data = data.data;
+            try {
+                data = await axios({
+                    url,
+                    timeout: 10000,
+                    headers: { 'User-Agent': agent }
+                });
+                data = data.data;
+            } catch (e) {
+                throw new Error(`Cannot download repository file from "${url}": ${e.message}`);
+            }
         }
     } else {
         if (fs.existsSync(url)) {
@@ -1456,6 +1454,38 @@ function getSystemNpmVersion(callback) {
 
 const getSystemNpmVersionAsync = promisify(getSystemNpmVersion);
 
+/**
+ * @private
+ * Figure out which package manager is in charge, but with a fallback to npm.
+ * @param {string} [cwd] Which directory to work in. If none is given, this defaults to ioBroker's root directory.
+ * @returns {Promise<PackageManager>}
+ */
+async function detectPackageManagerWithFallback(cwd) {
+    try {
+        // For the first attempt, use pak's default of requiring a lockfile. This makes sure we find ioBroker's root dir
+        return await detectPackageManager(
+            typeof cwd === 'string'
+                ? // If a cwd was provided, use it
+                  { cwd }
+                : // Otherwise try to find the ioBroker root dir
+                  {
+                      cwd: __dirname,
+                      setCwdToPackageRoot: true
+                  }
+        );
+    } catch {
+        // Lockfile not found, use default to avoid picking up a wrong package manager
+        // like a globally installed yarn
+    }
+
+    // Since we have no lockfile to rely on, assume the root dir is 2 levels above js-controller
+    const ioBrokerRootDir = path.join(getControllerDir(), '../..');
+    // And fallback to npm
+    const pak = new packageManagers.npm();
+    pak.cwd = cwd || ioBrokerRootDir;
+    return pak;
+}
+
 /**
  * @typedef {object} InstallNodeModuleOptions
  * @property {boolean} [unsafePerm] Whether the `--unsafe-perm` flag should be used
@@ -1471,16 +1501,7 @@ const getSystemNpmVersionAsync = promisify(getSystemNpmVersion);
  */
 async function installNodeModule(npmUrl, options = {}) {
     // Figure out which package manager is in charge (probably npm at this point)
-    const pak = await detectPackageManager(
-        typeof options.cwd === 'string'
-            ? // If a cwd was provided, use it
-              { cwd: options.cwd }
-            : // Otherwise find the ioBroker root dir
-              {
-                  cwd: __dirname,
-                  setCwdToPackageRoot: true
-              }
-    );
+    const pak = await detectPackageManagerWithFallback(options.cwd);
     // By default, don't print all the stuff the package manager spits out
     if (!options.debug) {
         pak.loglevel = 'error';
@@ -1520,16 +1541,7 @@ async function installNodeModule(npmUrl, options = {}) {
  */
 async function uninstallNodeModule(packageName, options = {}) {
     // Figure out which package manager is in charge (probably npm at this point)
-    const pak = await detectPackageManager(
-        typeof options.cwd === 'string'
-            ? // If a cwd was provided, use it
-              { cwd: options.cwd }
-            : // Otherwise find the ioBroker root dir
-              {
-                  cwd: __dirname,
-                  setCwdToPackageRoot: true
-              }
-    );
+    const pak = await detectPackageManagerWithFallback(options.cwd);
     // By default, don't print all the stuff the package manager spits out
     if (!options.debug) {
         pak.loglevel = 'error';
@@ -1563,16 +1575,7 @@ async function uninstallNodeModule(packageName, options = {}) {
  */
 async function rebuildNodeModules(options = {}) {
     // Figure out which package manager is in charge (probably npm at this point)
-    const pak = await detectPackageManager(
-        typeof options.cwd === 'string'
-            ? // If a cwd was provided, use it
-              { cwd: options.cwd }
-            : // Otherwise find the ioBroker root dir
-              {
-                  cwd: __dirname,
-                  setCwdToPackageRoot: true
-              }
-    );
+    const pak = await detectPackageManagerWithFallback(options.cwd);
     // By default, don't print all the stuff the package manager spits out
     if (!options.debug) {
         pak.loglevel = 'error';
@@ -2995,6 +2998,7 @@ function pipeLinewise(input, output) {
         crlfDelay: Infinity
     });
     rl.on('line', line => output.write(line + os.EOL));
+    rl.on('error', () => {}); // Ignore errors
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iobroker/js-controller-common",
-  "version": "4.0.5-alpha.2-20220208-ac4cf51e",
+  "version": "4.0.7",
   "engines": {
     "node": ">=12.0.0"
   },
@@ -47,5 +47,5 @@
     "lib/",
     "index.js"
   ],
-  "gitHead": "164e97c24ac7094a4442a3d44268e2b480db1171"
+  "gitHead": "2237fea5948423f64650a3cc58286eec11335729"
 }