First pass at file api

index.js

@@ -11,6 +11,7 @@ if (NODE_MAJOR_VERSION > 14) {
 
 const { Launcher } = require('./lib/launcher')
 const { AdminInterface } = require('./lib/admin')
+const { filesInterface } = require('./lib/files')
 
 const cmdLineOptions = [
     { name: 'port', alias: 'p', type: Number },
@@ -111,6 +112,7 @@ async function main () {
         await launcher.logAuditEvent('start-failed', { error })
     }
 
+    filesInterface(adminInterface.app, launcher.settings)
     // const wss = new ws.Server({ clientTracking: false, noServer: true })
     //
     // server.on('upgrade', (req, socket, head) => {

lib/admin.js

@@ -13,6 +13,7 @@ class AdminInterface {
         this.launcher = launcher
 
         const app = express()
+        this.app = app
         this.server = http.createServer(app)
 
         app.use(bodyParser.json({}))

lib/files/index.js

@@ -0,0 +1,134 @@
+const { mkdir, readdir, rm, rename, stat, writeFile } = require('fs/promises')
+const { existsSync } = require('fs')
+const { dirname, join, normalize } = require('path')
+const multer = require('multer')
+
+const filesInterface = (app, settings) => {
+    const BASE_PATH = join(settings.rootDir, settings.userDir, 'storage')
+    // not sure about this yet, need to check how file storage works
+    const storage = multer.memoryStorage()
+    const upload = multer({ storage })
+
+    const regex = /^\/flowforge\/files\/_\/(.*)$/
+
+    const listDirectory = async (path = '') => {
+        const fullPath = normalize(join(BASE_PATH, path))
+        if (fullPath.startsWith(BASE_PATH)) {
+            const files = await readdir(fullPath, { withFileTypes: true })
+            const response = {
+                meta: { },
+                files: [],
+                count: files.length
+            }
+            for (const i in files) {
+                const file = files[i]
+                const filePath = join(fullPath, file.name)
+                const s = await stat(filePath)
+                const rep = {
+                    name: file.name,
+                    lastModified: s.mtime
+                }
+                if (file.isFile()) {
+                    rep.type = 'file'
+                    rep.size = s.size
+                } else if (file.isDirectory()) {
+                    rep.type = 'directory'
+                }
+                response.files.push(rep)
+            }
+            return response
+        } else {
+            return []
+        }
+    }
+
+    app.get(regex, async (request, reply) => {
+        try {
+            const files = await listDirectory(request.params[0])
+            reply.send(files)
+        } catch (err) {
+            if (err.code === 'ENOENT') {
+                reply.status(404).send()
+            } else if (err.code === 'ENOTDIR') {
+                reply.status(400).send()
+            } else {
+                reply.status(500).send()
+            }
+        }
+    })
+
+    app.put(regex, async (request, reply) => {
+        const fullPath = normalize(join(BASE_PATH, request.params[0]))
+        const newPath = normalize(join(BASE_PATH, request.body.path))
+        if (fullPath.startsWith(BASE_PATH) && newPath.startsWith(BASE_PATH)) {
+            if (existsSync(fullPath) && existsSync(dirname(newPath))) {
+                try {
+                    await rename(fullPath, newPath)
+                    reply.status(202).send()
+                } catch (err) {
+                    reply.status(500).send()
+                }
+            } else {
+                reply.status(404).send()
+            }
+        }
+        reply.status(403).send()
+    })
+
+    app.post(regex, upload.single('file'), async (request, reply) => {
+        const startPath = normalize(join(BASE_PATH, request.params[0]))
+        if (startPath.startsWith(BASE_PATH)) {
+            if (request.get('content-type') === 'application/json') {
+                const newPath = request.body.path
+                const fullPath = normalize(join(startPath, newPath))
+                if (fullPath.startsWith(BASE_PATH)) {
+                    try {
+                        await mkdir(fullPath, { recursive: true })
+                        reply.status(201).send()
+                    } catch (err) {
+                        reply.status(500).send()
+                    }
+                } else {
+                    reply.status(500).send()
+                }
+            } else if (request.get('content-type').startsWith('multipart/form-data')) {
+                const targetDir = dirname(startPath)
+                if (existsSync(targetDir)) {
+                    await writeFile(startPath, request.file.buffer)
+                    reply.status(201).send()
+                } else {
+                    reply.status(404).send()
+                }
+            } else {
+                reply.status(406).send()
+            }
+        } else {
+            reply.status(403).send()
+        }
+    })
+
+    app.delete(regex, async (request, reply) => {
+        const fullPath = normalize(join(BASE_PATH, request.params[0]))
+        if (fullPath !== BASE_PATH && fullPath.startsWith(BASE_PATH)) {
+            if (existsSync(fullPath)) {
+                try {
+                    await rm(fullPath, {
+                        force: true,
+                        recursive: true
+                    })
+                    reply.status(204).send()
+                } catch (err) {
+                    reply.status(500).send()
+                }
+            } else {
+                reply.status(404).send()
+            }
+        } else {
+            reply.status(403).send()
+        }
+    })
+}
+
+module.exports = {
+    filesInterface
+}

lib/launcher.js

@@ -131,6 +131,8 @@ class Launcher {
         this.settings.broker = this.options.broker
         this.settings.launcherVersion = this.options?.versions?.launcher || ''
 
+        this.settings.storageDir = path.normalize(path.join(this.settings.rootDir, this.settings.userDir, 'storage'))
+
         // setup nodeDir to include the path to additional nodes and plugins
         const nodesDir = []
         if (Array.isArray(this.settings.nodesDir) && this.settings.nodesDir.length) {
@@ -367,7 +369,7 @@ class Launcher {
             windowsHide: true,
             env: appEnv,
             stdio: ['ignore', 'pipe', 'pipe'],
-            cwd: path.join(this.settings.rootDir, this.settings.userDir, 'storage')
+            cwd: this.settings.storageDir
         }
 
         const processArguments = [

lib/resources/sample.js

@@ -6,15 +6,14 @@ let pptf
     } catch (err) {
         console.log(err)
     }
-})();
-
+})()
 
 let lastCPUTime = 0
 
 async function sampleResources (url, time) {
     const response = {}
     try {
-        const res  = await got.get(url, {
+        const res = await got.get(url, {
             headers: {
                 pragma: 'no-cache',
                 'Cache-Control': 'max-age=0, must-revalidate, no-cache'
@@ -33,12 +32,12 @@ async function sampleResources (url, time) {
                     response.hu = parseInt(v.value)
                 })
             } else if (metric.name === 'process_resident_memory_bytes') {
-                response.ps = parseInt(metric.metrics[0].value)/(1024*1024)
+                response.ps = parseInt(metric.metrics[0].value) / (1024 * 1024)
             } else if (metric.name === 'process_cpu_seconds_total') {
-                cpuTime = parseFloat(metric.metrics[0].value)
-                if (lastCPUTime != 0) {
+                const cpuTime = parseFloat(metric.metrics[0].value)
+                if (lastCPUTime !== 0) {
                     const delta = cpuTime - lastCPUTime
-                    response.cpu = (delta/time) * 100
+                    response.cpu = (delta / time) * 100
                 }
                 lastCPUTime = cpuTime
             } else if (metric.name === 'nodejs_eventloop_lag_mean_seconds') {
@@ -54,4 +53,4 @@ async function sampleResources (url, time) {
     return response
 }
 
-module.exports = sampleResources
+module.exports = sampleResources

lib/resources/sampleBuffer.js

@@ -1,7 +1,3 @@
-const os = require('node:os')
-const crypto = require('crypto')
-
-const instanceId = crypto.createHash('md5').update(os.hostname()).digest('hex').substring(0, 4)
 class SampleBuffer {
     constructor (size = 1000) {
         this.size = size
@@ -17,7 +13,7 @@ class SampleBuffer {
             sample.ts = Date.now()
         }
         this.buffer[this.head++] = sample
-        if (this.head == this.size) {
+        if (this.head === this.size) {
             this.head = 0
             this.wrapped = true
         }
@@ -33,9 +29,9 @@ class SampleBuffer {
     toArray () {
         if (!this.wrapped) {
             return this.buffer.slice(0, this.head)
-        } else  {
+        } else {
             const result = this.buffer.slice(this.head, this.size)
-            result.push(...this.buffer.slice(0,this.head))
+            result.push(...this.buffer.slice(0, this.head))
             return result
         }
     }
@@ -56,7 +52,7 @@ class SampleBuffer {
     }
 
     avgLastX (x) {
-        const samples  = this.lastX(x)
+        const samples = this.lastX(x)
         const result = {}
         let skipped = 0
         samples.forEach(sample => {
@@ -68,18 +64,18 @@ class SampleBuffer {
                         } else {
                             result[key] = value
                         }
-                    } 
+                    }
                 }
             } else {
                 skipped++
             }
         })
         for (const [key, value] of Object.entries(result)) {
-            result[key] = value/(samples.length-skipped)
+            result[key] = value / (samples.length - skipped)
         }
         result.count = samples.length
         return result
     }
 }
 
-module.exports = SampleBuffer
+module.exports = SampleBuffer

lib/runtimeSettings.js

@@ -159,10 +159,26 @@ function getSettingsFile (settings) {
 
     // all current drivers add settings.rootDir and settings.userDir
     if (settings.rootDir) {
-        const uibRoot = path.join(settings.rootDir, settings.userDir, 'storage', 'uibuilder').split(path.sep).join(path.posix.sep)
+        const uibRoot = path.join(settings.storageDir, 'uibuilder').split(path.sep).join(path.posix.sep)
         projectSettings.uibuilder = { uibRoot }
     }
 
+    if (settings.settings?.httpStatic) {
+        // This is an array of httpStatic properties - however their path setting
+        // will currently be relative to cwd. For safety, map them to absolute paths
+        // and validate they are not traversing out of the storageDir
+        const httpStatic = []
+        settings.settings.httpStatic.forEach(staticSetting => {
+            staticSetting.path = path.normalize(path.join(settings.storageDir, staticSetting.path))
+            if (staticSetting.path.startsWith(settings.storageDir)) {
+                httpStatic.push(staticSetting)
+            }
+        })
+        if (httpStatic.length > 0) {
+            projectSettings.httpStatic = httpStatic
+        }
+    }
+
     let contextStorage = ''
     if (settings.fileStore?.url) {
         // file nodes settings
@@ -358,7 +374,8 @@ module.exports = {
         next()
     },
     httpAdminCookieOptions: ${JSON.stringify(httpAdminCookieOptions)},
-    ${projectSettings.uibuilder ? 'uibuilder: ' + JSON.stringify(projectSettings.uibuilder) : ''}
+    ${projectSettings.uibuilder ? 'uibuilder: ' + JSON.stringify(projectSettings.uibuilder) + ',' : ''}
+    ${projectSettings.httpStatic ? 'httpStatic: ' + JSON.stringify(projectSettings.httpStatic) : ''}
 }
 `
     return settingsTemplate