@flowfuse/file-server 2.24.6-fcb4d71-202512151818.0 → 2.25.1-0064109-202601051157.0

package/CHANGELOG.md

@@ -1,3 +1,8 @@
+#### 2.25.0: Release
+
+ - Bump flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml (#193)
+ - Bump flowfuse/github-actions-workflows/.github/workflows/build_node_package.yml from 0.43.0 to 0.44.0 (#192) @app/dependabot
+
 #### 2.24.5: Release
 
  - Bump actions/setup-node from 6.0.0 to 6.1.0 (#190) @app/dependabot

package/README.md

@@ -165,7 +165,7 @@ options.
 
 ### Context Storage
 
-#### Sequelize
+#### Database
 
 This driver can use either PostgreSQL or SQLite to hold context values.
 
@@ -173,7 +173,7 @@ To use with PostgreSQL configure as follows:
 
 ```yaml
 context:
-  type: sequelize
+  type: db
   options:
     type: postgres
     host: 127.0.0.1
@@ -188,7 +188,7 @@ To use with SQLite configure as follows:
 
 ```yaml
 context:
-  type: sequelize
+  type: db
   options:
     type: sqlite
     storage: ff-context.db

package/eslint.config.mjs

@@ -0,0 +1,56 @@
+import globals from 'globals'
+import js from '@eslint/js'
+import neostandard, { resolveIgnoresFromGitignore } from 'neostandard'
+import stylistic from '@stylistic/eslint-plugin'
+import noOnlyTests from 'eslint-plugin-no-only-tests'
+
+export default [
+    {
+        files: ['**/*.js'],
+        languageOptions: {
+            globals: {
+                ...globals.browser
+            },
+            sourceType: 'script'
+        }
+    },
+    {
+        files: ['test/**/*.js'],
+        languageOptions: {
+            globals: {
+                ...globals.browser,
+                ...globals.mocha
+            },
+            sourceType: 'script'
+        }
+    },
+    {
+        ignores: [
+            ...resolveIgnoresFromGitignore()
+        ]
+    },
+    js.configs.recommended,
+    ...neostandard(),
+    {
+        plugins: {
+            '@stylistic': stylistic,
+            'no-only-tests': noOnlyTests
+        },
+        rules: {
+            // built-in
+            eqeqeq: 'error',
+            'object-shorthand': ['error'],
+            'no-console': ['error', { allow: ['debug', 'info', 'warn', 'error'] }],
+            quotes: ['off', 'error', 'single', { avoidEscape: true }],
+
+            // plugin:stylistic
+            '@stylistic/indent': ['warn', 4], // https://eslint.style/rules/indent#options
+            '@stylistic/spaced-comment': ['error', 'always'], // https://eslint.style/rules/spaced-comment
+            '@stylistic/no-multi-spaces': 'error', // https://eslint.style/rules/no-multi-spaces#no-multi-spaces
+            '@stylistic/comma-dangle': ['error', 'never'], // https://eslint.style/rules/comma-dangle#comma-dangle
+
+            // plugin:no-only-tests
+            'no-only-tests/no-only-tests': 'error'
+        }
+    }
+]

package/forge/auth.js

@@ -4,7 +4,7 @@ const got = require('got')
 const authCache = {}
 const ttl = 90 * 1000
 
-module.exports = fp(async function (app, opts, done) {
+module.exports = fp(async function (app, opts) {
     const client = got.extend({
         prefixUrl: `${app.config.base_url}/account/check/project`,
         headers: {
@@ -102,5 +102,4 @@ module.exports = fp(async function (app, opts, done) {
     }
 
     app.decorate('checkAuth', checkAuth)
-    done()
 })

package/forge/config.js

@@ -74,7 +74,7 @@ module.exports = {
 
         return config
     },
-    attach: fp(async function (app, opts, next) {
+    attach: fp(async function (app, opts) {
         Object.freeze(config)
         app.decorate('config', config)
 
@@ -87,7 +87,5 @@ module.exports = {
         if (!opts.config) {
             app.log.info(`Config File: ${config.configFile}`)
         }
-
-        next()
     })
 }

package/forge/driver.js

@@ -1,7 +1,7 @@
 const fp = require('fastify-plugin')
 const getDriver = require('./drivers/vfs.js')
 
-module.exports = fp(async function (app, opts, done) {
+module.exports = fp(async function (app, opts) {
     const Driver = require('./drivers/' + app.config.driver.type)
     try {
         app.decorate('_driver', new Driver(app))
@@ -13,7 +13,6 @@ module.exports = fp(async function (app, opts, done) {
             done()
         })
     } catch (err) {
-        console.log(err)
+        console.error(err)
     }
-    done()
 })

package/forge/fileServer.js

@@ -45,7 +45,9 @@ module.exports = async (options = {}) => {
 
     const server = fastify({
         bodyLimit: 10 * 1024 * 1024, // Limit set to 10MB,
-        maxParamLength: 500,
+        routerOptions: {
+            maxParamLength: 500
+        },
         trustProxy: true,
         logger: loggerConfig
     })

package/forge/routes/context.js

@@ -9,8 +9,13 @@
 /** @typedef {import('fastify').FastifyReply} FastifyReply */
 /** @typedef {import('fastify').FastifyRequest} FastifyRequest */
 
-module.exports = async function (app, opts, done) {
-    const driver = require(`../context-driver/${app.config.context.type}`)
+module.exports = async function (app, opts) {
+    let driver
+    if (app.config.context.type === 'db') {
+        driver = require('../context-driver/sequelize')
+    } else {
+        driver = require(`../context-driver/${app.config.context.type}`)
+    }
 
     await driver.init(app)
 
@@ -181,6 +186,4 @@ module.exports = async function (app, opts, done) {
         await driver.clean(request.params.projectId, request.body)
         reply.send()
     })
-
-    done()
 }

package/forge/routes/files.js

@@ -9,7 +9,7 @@
 /** @typedef {import('fastify').FastifyReply} FastifyReply */
 /** @typedef {import('fastify').FastifyRequest} FastifyRequest */
 
-module.exports = async function (app, opts, done) {
+module.exports = async function (app, opts) {
     app.addContentTypeParser('application/octet-stream', { parseAs: 'buffer' }, function (request, payload, done) {
         done(null, payload)
     })
@@ -66,7 +66,7 @@ module.exports = async function (app, opts, done) {
             }
             reply.code(200).send()
         } catch (err) {
-            console.log(err)
+            console.error(err)
             reply.code(400).send(err)
         }
     })
@@ -125,6 +125,4 @@ module.exports = async function (app, opts, done) {
             reply.code(err.statusCode || 400).send(err)
         }
     })
-
-    done()
 }

package/forge/routes/index.js

@@ -1,6 +1,6 @@
 const fp = require('fastify-plugin')
 
-module.exports = fp(async function (app, opts, done) {
+module.exports = fp(async function (app, opts) {
     app.addHook('preHandler', app.checkAuth)
     await app.register(require('./files'), { prefix: '/v1/files', logLevel: app.config.logging.http })
     await app.register(require('./quota'), { prefix: '/v1/quota', logLevel: app.config.logging.http })
@@ -14,5 +14,4 @@ module.exports = fp(async function (app, opts, done) {
         }
         return result
     })
-    done()
 })

package/forge/routes/quota.js

@@ -1,9 +1,7 @@
-module.exports = async function (app, opts, done) {
+module.exports = async function (app, opts) {
     app.get('/:teamId/:projectId', async (request, reply) => {
         reply.send({
             used: await request.vfs.quota(request.params.teamId, request.params.projectId)
         })
     })
-
-    done()
 }

package/package.json

@@ -1,13 +1,13 @@
 {
     "name": "@flowfuse/file-server",
-    "version": "2.24.6-fcb4d71-202512151818.0",
+    "version": "2.25.1-0064109-202601051157.0",
     "description": "A basic Object Storage backend",
     "main": "index.js",
     "scripts": {
         "start": "node index.js",
         "serve": "cross-env NODE_ENV=development nodemon -w forge index.js",
-        "lint": "eslint -c .eslintrc \"forge/**/*.js\" \"test/**/*.js\" index.js",
-        "lint:fix": "eslint -c .eslintrc \"forge/**/*.js\" \"test/**/*.js\" index.js --fix",
+        "lint": "eslint -c eslint.config.mjs",
+        "lint:fix": "eslint -c eslint.config.mjs --fix",
         "test": "mocha test/unit/**/*_spec.js --timeout 5000",
         "test:nopg": "cross-env TEST_POSTGRES=false mocha test/unit/**/*_spec.js --timeout 5000"
     },
@@ -32,12 +32,12 @@
     "homepage": "https://github.com/FlowFuse/file-server#readme",
     "dependencies": {
         "@aws-sdk/client-s3": "^3.388.0",
-        "@fastify/helmet": "^11.0.0",
+        "@fastify/helmet": "^13.0.2",
         "@node-red/util": "^3.1.0",
-        "fastify": "^4.21.0",
-        "fastify-metrics": "^10.3.0",
-        "fastify-plugin": "^4.5.1",
-        "fastify-healthcheck": "^4.4.0",
+        "fastify": "^5.6.2",
+        "fastify-healthcheck": "^5.1.0",
+        "fastify-metrics": "^12.1.0",
+        "fastify-plugin": "^5.1.0",
         "got": "^11.8.6",
         "pg": "^8.11.2",
         "pino": "^8.15.1",
@@ -48,17 +48,18 @@
         "yaml": "^2.1.3"
     },
     "devDependencies": {
+        "@eslint/js": "^9.39.2",
         "cross-env": "^7.0.3",
-        "eslint": "^8.47.0",
-        "eslint-config-standard": "^17.1.0",
-        "eslint-plugin-no-only-tests": "^3.1.0",
-        "eslint-plugin-promise": "^6.1.1",
+        "eslint": "^9.39.2",
+        "eslint-plugin-no-only-tests": "^3.3.0",
+        "globals": "^16.5.0",
         "mocha": "^10.1.0",
         "mocha-cli": "^1.0.1",
+        "neostandard": "^0.12.2",
         "nodemon": "^3.0.1",
         "should": "^13.2.3"
     },
     "engines": {
-        "node": ">=16.x"
+        "node": ">=20.x"
     }
 }