Update node 22

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: ['18', '20', '22', '23']
+        node: ['22', '24', '26']
     steps:
       - uses: actions/checkout@v7
       - name: Setup node ${{ matrix.node }}

eslint.config.js

@@ -13,7 +13,7 @@ module.exports = [
             globals: {
                 ...globals.node
             },
-            ecmaVersion: 2020,
+            ecmaVersion: 2023,
             sourceType: 'commonjs'
         }
     }

examples/docker/config.js

@@ -1,4 +1,4 @@
-const path = require('path');
+const path = require('node:path');
 
 module.exports = {
     resourcesPath: path.join(__dirname, 'resources'),

examples/docker/worker.js

@@ -1,5 +1,5 @@
 const flora = require('flora');
 
-const server = new flora.Server(require('path').join(__dirname, 'config.js'));
+const server = new flora.Server(require('node:path').join(__dirname, 'config.js'));
 
 server.run();

examples/express/README.md

@@ -5,7 +5,7 @@ This is an example for an adapter between Flora and Express.
 ```js
 const express = require('express');
 const flora = require('flora');
-const path = require('path');
+const path = require('node:path');
 const floraExpress = require('./');
 
 // Flora

examples/express/index.js

@@ -2,7 +2,7 @@
 
 const errors = require('@florajs/errors');
 const flora = require('flora');
-const { URL } = require('url');
+const { URL } = require('node:url');
 
 module.exports = function (api) {
     function sendResponse(response, httpRequest, httpResponse) {
@@ -49,7 +49,7 @@ module.exports = function (api) {
         if (matches[3]) opts.format = matches[3];
 
         parsedUrl.searchParams.forEach((value, param) => {
-            if (!Object.prototype.hasOwnProperty.call(opts, param)) {
+            if (!Object.hasOwn(opts, param)) {
                 if (parsedUrl.searchParams.getAll(param).length > 1) {
                     return next(new errors.RequestError(`Duplicate parameter "${param}" in URL`));
                 }

examples/extensions/config.js

@@ -1,4 +1,4 @@
-const path = require('path');
+const path = require('node:path');
 
 class EmptyDataSource {
     async process(/* request */) {

examples/extensions/server.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const path = require('path');
+const path = require('node:path');
 const flora = require('flora');
 
 const server = new flora.Server(path.join(__dirname, 'config.js'));

examples/native/native.js

@@ -1,4 +1,4 @@
-const path = require('path');
+const path = require('node:path');
 const flora = require('flora');
 
 /*

examples/plugins/master.js

@@ -1,4 +1,4 @@
-const path = require('path');
+const path = require('node:path');
 const flora = require('flora');
 
 /*

examples/plugins/worker.js

@@ -1,4 +1,4 @@
-const path = require('path');
+const path = require('node:path');
 const flora = require('flora');
 
 /*

examples/simple/config.js

@@ -1,4 +1,4 @@
-const path = require('path');
+const path = require('node:path');
 
 module.exports = {
     exec: path.join(__dirname, 'worker.js'),

examples/simple/master.js

@@ -1,4 +1,4 @@
-const path = require('path');
+const path = require('node:path');
 const flora = require('flora');
 
 const master = new flora.Master(path.join(__dirname, 'config.js'));

examples/simple/worker.js

@@ -1,4 +1,4 @@
-const path = require('path');
+const path = require('node:path');
 const flora = require('flora');
 
 const server = new flora.Server(path.join(__dirname, 'config.example.js'));

lib/api.js

@@ -186,7 +186,7 @@ class Api extends PromiseEventEmitter {
         const resource = this.getResource(request.resource);
         if (!resource) throw new NotFoundError(`Unknown resource "${request.resource}" in request`);
 
-        if (!resource.actions || !Object.prototype.hasOwnProperty.call(resource.actions, request.action)) {
+        if (!resource.actions || !Object.hasOwn(resource.actions, request.action)) {
             throw new RequestError(`Action "${request.action}" is not implemented`);
         }
 
@@ -200,7 +200,7 @@ class Api extends PromiseEventEmitter {
                     throw new RequestError(`Invalid format "${request.format}" for action "${request.action}"`);
                 }
                 if (
-                    !Object.prototype.hasOwnProperty.call(resource.actions[request.action], method) ||
+                    !Object.hasOwn(resource.actions[request.action], method) ||
                     typeof resource.actions[request.action][method] !== 'function'
                 ) {
                     throw new RequestError(`Invalid format "${request.format}" for action "${request.action}"`);
@@ -277,8 +277,7 @@ class Api extends PromiseEventEmitter {
      * @returns {*}
      */
     getPlugin(name) {
-        if (!Object.prototype.hasOwnProperty.call(this.plugins, name))
-            throw new Error(`Plugin "${name}" is not registered`);
+        if (!Object.hasOwn(this.plugins, name)) throw new Error(`Plugin "${name}" is not registered`);
         return this.plugins[name];
     }
 }

lib/ascii-art-profile.js

@@ -1,9 +1,5 @@
 'use strict';
 
-function strRepeat(str, count) {
-    return new Array(count + 1).join(str);
-}
-
 module.exports = function asciiArtProfile(profile, totalDuration, width) {
     if (totalDuration <= 0) return ['total duration = ' + totalDuration + 'ms!? Wow ... that was fast :-)'];
     if (width < 10) width = 10;
@@ -12,14 +8,12 @@ module.exports = function asciiArtProfile(profile, totalDuration, width) {
         const beforeChar = '.';
         const afterChar = '.';
         let endChar = '';
-        let beforeWidth = 0;
         let beginChar = '';
         let durationChar = '#';
-        let durationWidth = 0;
-        let afterWidth = 0;
-        let description = '';
+        let afterWidth;
+        let description;
 
-        beforeWidth = Math.round((measure.startTime * width) / totalDuration);
+        let beforeWidth = Math.round((measure.startTime * width) / totalDuration);
         if (beforeWidth > width) {
             beforeWidth = width;
             beginChar = '>';
@@ -29,6 +23,7 @@ module.exports = function asciiArtProfile(profile, totalDuration, width) {
             beginChar = '<';
         }
 
+        let durationWidth;
         if (measure.duration !== null) {
             durationWidth = Math.round((measure.duration * width) / totalDuration);
             if (durationWidth > width - beforeWidth) {
@@ -50,7 +45,6 @@ module.exports = function asciiArtProfile(profile, totalDuration, width) {
         } else {
             durationWidth = width - beforeWidth;
             durationChar = '?';
-            afterWidth = 0;
             description = ' (' + measure.name + ' - still running!)';
         }
 
@@ -63,11 +57,11 @@ module.exports = function asciiArtProfile(profile, totalDuration, width) {
         }
 
         return (
-            strRepeat(beforeChar, beforeWidth) +
+            beforeChar.repeat(beforeWidth) +
             beginChar +
-            strRepeat(durationChar, durationWidth) +
+            durationChar.repeat(durationWidth) +
             endChar +
-            strRepeat(afterChar, afterWidth) +
+            afterChar.repeat(afterWidth) +
             description
         );
     });

lib/cast.js

@@ -147,7 +147,7 @@ class Cast {
         }
 
         if (value === null) return value;
-        if (Object.prototype.hasOwnProperty.call(casts, opts.type)) return casts[opts.type](value, opts, this.api);
+        if (Object.hasOwn(casts, opts.type)) return casts[opts.type](value, opts, this.api);
 
         return value;
     }

lib/config-loader.js

@@ -1,41 +1,9 @@
 'use strict';
 
 const fs = require('node:fs/promises');
-const path = require('path');
+const path = require('node:path');
 
-/**
- * Read config files from directory recursively.
- *
- * @param {string} configDirectory
- * @param {string} resourceName
- * @param {object} resources
- * @return {Array}
- * @private
- */
-async function walk(configDirectory, resourceName, resources) {
-    resourceName = resourceName || '';
-    resources = resources || {};
-
-    for (const fileName of await fs.readdir(path.join(configDirectory, resourceName))) {
-        const subResourceName = (resourceName !== '' ? resourceName + '/' : '') + fileName;
-        const absoluteFilePath = path.join(configDirectory, subResourceName);
-        const stat = await fs.stat(absoluteFilePath);
-        if (stat && stat.isDirectory()) {
-            await walk(configDirectory, subResourceName, resources);
-        } else if (resourceName !== '') {
-            if (fileName.startsWith('config.')) {
-                if (!resources[resourceName]) resources[resourceName] = {};
-                resources[resourceName].configFile = absoluteFilePath;
-            }
-            if (fileName === 'index.js') {
-                if (!resources[resourceName]) resources[resourceName] = {};
-                resources[resourceName].instanceFile = absoluteFilePath;
-            }
-        }
-    }
-
-    return resources;
-}
+const { ImplementationError } = require('@florajs/errors');
 
 /**
  * Load resource configs from config directory.
@@ -53,71 +21,47 @@ module.exports = async function configLoader(api, options) {
         },
         ...options
     };
-    let resources;
-
     const configDirectory = path.resolve(cfg.directory);
     const configParsers = cfg.parsers;
 
-    if (
-        !(await fs
-            .access(configDirectory)
-            .then(() => true)
-            .catch(() => false))
-    ) {
-        throw new Error(`Config directory "${configDirectory}" does not exist`);
-    }
-
     try {
-        resources = await walk(configDirectory);
+        await fs.access(configDirectory);
     } catch (err) {
-        err.message = 'Error reading resource directory tree: ' + err.message;
-        throw err;
+        throw new ImplementationError(`Cannot access config directory "${configDirectory}"`, { cause: err });
     }
 
-    // parse all configs
-    await Promise.all(
-        Object.keys(resources).map(async (resourceName) => {
-            const file = resources[resourceName].configFile;
-            if (!file) return null;
+    const resources = {};
+    for await (const entry of fs.glob('*/**/{config.*,index.js}', { cwd: configDirectory, withFileTypes: true })) {
+        if (!entry.isFile()) continue;
+
+        const resourceName = path.relative(configDirectory, entry.parentPath).split(path.sep).join('/');
+        const absoluteFilePath = path.join(entry.parentPath, entry.name);
 
-            const extension = path.extname(file);
-            const type = extension.substring(1);
+        resources[resourceName] ??= {};
+
+        if (entry.name.startsWith('config.')) {
+            const type = path.extname(entry.name).substring(1);
             const parseConfig = configParsers[type];
 
-            if (!parseConfig) return Promise.reject(new Error(`No "${type}" config parser registered`));
+            if (!parseConfig) throw new ImplementationError(`No "${type}" config parser registered`);
 
-            api.log.trace('Parsing config for resource ' + resourceName);
+            api.log.trace(`Parsing config for resource ${resourceName}`);
             try {
-                resources[resourceName].config = await parseConfig(file);
-                delete resources[resourceName].configFile;
-            } catch (e) {
-                e.message = `Error parsing resource "${resourceName}": ${e.message}`;
-                throw e;
+                resources[resourceName].config = await parseConfig(absoluteFilePath);
+            } catch (err) {
+                throw new ImplementationError(`Error parsing resource "${resourceName}"`, { cause: err });
             }
-        })
-    );
-
-    // load all resources
-    await Promise.all(
-        Object.keys(resources).map((resourceName) => {
-            if (!resources[resourceName].instanceFile) return null;
-
-            return new Promise((resolve, reject) => {
-                api.log.trace('Loading resource ' + resourceName);
-                const resourceFunction = require(resources[resourceName].instanceFile);
-                if (typeof resourceFunction !== 'function') {
-                    return reject(
-                        new Error(`Resource does not export a function: ${resources[resourceName].instanceFile}`)
-                    );
-                }
-                resources[resourceName].instance = resourceFunction(api);
+        }
 
-                delete resources[resourceName].instanceFile;
-                resolve();
-            });
-        })
-    );
+        if (entry.name === 'index.js') {
+            api.log.trace(`Loading resource ${resourceName}`);
+            const resourceFunction = require(absoluteFilePath);
+            if (typeof resourceFunction !== 'function') {
+                throw new ImplementationError(`Resource does not export a function: ${absoluteFilePath}`);
+            }
+            resources[resourceName].instance = resourceFunction(api);
+        }
+    }
 
-    // done
     return resources;
 };

lib/config-parser.js

@@ -129,7 +129,7 @@ function parseMap(map, context) {
  * @private
  */
 function checkWhitelist(str, whitelist, context) {
-    if (whitelist.indexOf(str) === -1) {
+    if (!whitelist.includes(str)) {
         throw new ImplementationError(
             'Invalid "' + str + '" (allowed: ' + whitelist.join(', ') + ')' + context.errorContext
         );
@@ -642,7 +642,7 @@ function prepareDataSources(attrNode, context) {
         }
 
         // make attributes unique:
-        dataSourceAttributes = dataSourceAttributes.filter((value, index, self) => self.indexOf(value) === index);
+        dataSourceAttributes = [...new Set(dataSourceAttributes)];
 
         try {
             dataSourceInstance.prepare(dataSource, dataSourceAttributes);