@flowfuse/nr-file-nodes 0.0.6-5bedbbc-202405281102.0 → 0.0.6-66b148e-202406101509.0

package/package.json

@@ -1,14 +1,15 @@
 {
     "name": "@flowfuse/nr-file-nodes",
-    "version": "0.0.6-5bedbbc-202405281102.0",
+    "version": "0.0.6-66b148e-202406101509.0",
     "description": "Node-RED file nodes packaged for FlowFuse",
     "main": "index.js",
     "scripts": {
-        "test": "npm run test:files && npm run test:memory",
+        "test": "npm run test:files && npm run test:memory && npm run test:utils",
         "test:memory": "mocha 'test/memory_spec.js' --timeout 5000",
         "test:files": "mocha 'test/file_spec.js' --timeout 5000",
-        "lint": "eslint -c .eslintrc *.js",
-        "lint:fix": "eslint -c .eslintrc *.js --fix"
+        "test:utils": "mocha 'test/utils_spec.js' --timeout 5000",
+        "lint": "eslint -c .eslintrc *.js test/*.js",
+        "lint:fix": "eslint -c .eslintrc *.js test/*.js --fix"
     },
     "keywords": [
         "FlowFuse",
@@ -34,7 +35,9 @@
     "homepage": "https://github.com/FlowFuse/nr-file-nodes#readme",
     "dependencies": {
         "got": "11.8.5",
-        "iconv-lite": "0.6.3"
+        "iconv-lite": "0.6.3",
+        "http-proxy-agent": "^7.0.2",
+        "https-proxy-agent": "^7.0.4"
     },
     "engines": {
         "node": ">=16.x"

package/utils.js

@@ -0,0 +1,21 @@
+module.exports = {
+    getHTTPProxyAgent
+}
+
+/**
+ * Get proxy agents for HTTP and/or HTTPS connections
+ * @param {import('http').AgentOptions} proxyOptions - proxy options
+ * @returns {{http: import('http-proxy-agent').HttpProxyAgent | undefined, https: import('https-proxy-agent').HttpsProxyAgent | undefined}}
+ */
+function getHTTPProxyAgent (proxyOptions) {
+    const agent = {}
+    if (process.env.http_proxy) {
+        const HttpAgent = require('http-proxy-agent').HttpProxyAgent
+        agent.http = new HttpAgent(process.env.http_proxy, proxyOptions)
+    }
+    if (process.env.https_proxy) {
+        const HttpsAgent = require('https-proxy-agent').HttpsProxyAgent
+        agent.https = new HttpsAgent(process.env.https_proxy, proxyOptions)
+    }
+    return agent
+}

package/vfs.js

@@ -15,7 +15,8 @@
  **/
 
 const Stream = require('stream')
-const got = require('got')
+const utils = require('./utils')
+const got = require('got').default
 
 module.exports = function (RED, _teamID, _projectID, _token) {
     'use strict'
@@ -36,7 +37,8 @@ module.exports = function (RED, _teamID, _projectID, _token) {
         },
         retry: {
             limit: 0
-        }
+        },
+        agent: utils.getHTTPProxyAgent({ timeout: 3000 })
     })
 
     const normaliseError = (err, filename) => {