@flowfuse/driver-docker 2.16.0 → 2.18.0

package/.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
         steps:
             - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
             - name: Use Node.js ${{ matrix.node-version }}
-              uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
+              uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
               with:
                   node-version: ${{ matrix.node-version }}
             - name: Install Dependencies

package/.github/workflows/release-publish.yml

@@ -9,7 +9,7 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-            - uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
+            - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
               with:
                   node-version: 18
             - run: npm ci --omit dev

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+#### 2.18.0: Release
+
+ - Bump tar-fs from 2.1.2 to 2.1.3 (#133) @app/dependabot
+ - Add Resources API endpoint (#132) @hardillb
+
+#### 2.17.0: Release
+
+ - Bump actions/setup-node from 4.3.0 to 4.4.0 (#130)
+
 #### 2.16.0: Release
 
  - chore: fix lint script (#128) @ppawlowski

package/docker.js

@@ -1,6 +1,7 @@
 const got = require('got')
 const FormData = require('form-data')
 const Docker = require('dockerode')
+const { WebSocket } = require('ws')
 
 const createContainer = async (project, domain) => {
     const stack = project.ProjectStack.properties
@@ -765,5 +766,45 @@ module.exports = {
 
             }
         }
+    },
+
+    // Resources API
+    resources: async (project) => {
+        if (this._projects[project.id] === undefined) {
+            return { state: 'unknown' }
+        }
+        const result = await got.get('http://' + project.id + ':2880/flowforge/resources').json()
+        if (Array.isArray(result)) {
+            return {
+                meta: {},
+                resources: result,
+                count: result.length
+            }
+        } else {
+            return result
+        }
+    },
+    resourcesStream: async (project, socket) => {
+        if (this._projects[project.id] === undefined) {
+            throw new Error('Cannot get instance resources')
+        }
+        const url = 'ws://' + project.id + ':2800/flowforge/resources'
+        const resourceStream = new WebSocket(url, {})
+
+        resourceStream.on('message', (data) => {
+            socket.send(data)
+        })
+        resourceStream.on('error', (err) => {
+            this._app.log.error(`Error in resource stream: ${err}`)
+            socket.close()
+        })
+        socket.on('close', () => {
+            try {
+                resourceStream.close()
+            } catch (_err) {
+                // ignore error
+            }
+        })
+        return resourceStream
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@flowfuse/driver-docker",
-    "version": "2.16.0",
+    "version": "2.18.0",
     "description": "Docker driver for FlowFuse",
     "main": "docker.js",
     "scripts": {