@flowfuse/driver-docker 2.21.1 → 2.22.0

package/.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
         steps:
             - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
             - name: Use Node.js ${{ matrix.node-version }}
-              uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+              uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
               with:
                   node-version: ${{ matrix.node-version }}
             - name: Install Dependencies

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

@@ -9,10 +9,10 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-            - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+            - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
               with:
                   node-version: 18
             - run: npm ci --omit dev
-            - uses: JS-DevTools/npm-publish@19c28f1ef146469e409470805ea4279d47c3d35c # v3.1.1
+            - uses: JS-DevTools/npm-publish@ad693561f8a5b5d4c76f14407da60aa15cb10f90 # v4.0.1
               with:
                   token: ${{ secrets.NPM_PUBLISH_TOKEN }}

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+#### 2.22.0: Release
+
+ - Bump JS-DevTools/npm-publish from 3.1.1 to 4.0.0 (#148)
+ - add team broker mqtt agent support (#147) @hardillb
+ - Bump JS-DevTools/npm-publish from 4.0.0 to 4.0.1 (#149) @app/dependabot
+
+#### 2.21.2: Release
+
+ - Bump actions/setup-node from 4.4.0 to 5.0.0 (#145)
+
 #### 2.21.1: Release
 
 

package/docker.js

@@ -181,9 +181,16 @@ const getStaticFileUrl = async (instance, filePath) => {
     return `http://${instance.id}:2880/flowforge/files/_/${encodeURIComponent(filePath)}`
 }
 
+const getBrokerName = (broker) => {
+    const agent = broker.constructor.name === 'TeamBrokerAgent'
+    const name = `mqtt-schema-agent-${broker.Team.hashid.toLowerCase()}-${agent ? 'team-broker' : broker.hashid.toLowerCase()}`
+    return name
+}
+
 const createMQttTopicAgent = async (broker) => {
+    const agent = broker.constructor.name === 'TeamBrokerAgent'
     const image = this._app.config.driver.options?.mqttSchemaContainer || `${this._app.config.driver.options?.registry ? this._app.config.driver.options.registry + '/' : ''}flowfuse/mqtt-schema-agent`
-    const name = `mqtt-schema-agent-${broker.Team.hashid.toLowerCase()}-${broker.hashid.toLowerCase()}`
+    const name = getBrokerName(broker)
     const contOptions = {
         Image: image,
         name,
@@ -207,8 +214,11 @@ const createMQttTopicAgent = async (broker) => {
     const { token } = await broker.refreshAuthTokens()
     contOptions.Env.push(`FORGE_TEAM_TOKEN=${token}`)
     contOptions.Env.push(`FORGE_URL=${this._app.config.api_url}`)
-    contOptions.Env.push(`FORGE_BROKER_ID=${broker.hashid}`)
+    contOptions.Env.push(`FORGE_BROKER_ID=${agent ? 'team-broker' : broker.hashid}`)
     contOptions.Env.push(`FORGE_TEAM_ID=${broker.Team.hashid}`)
+    if (agent) {
+        contOptions.Env.push('FORGE_TIMEOUT=24')
+    }
 
     const containerList = await this._docker.listImages()
     let containerFound = false
@@ -381,7 +391,7 @@ module.exports = {
                 brokers.forEach(async (broker) => {
                     if (broker.Team) {
                         if (broker.state === 'running') {
-                            const name = `mqtt-schema-agent-${broker.Team.hashid.toLowerCase()}-${broker.hashid.toLowerCase()}`
+                            const name = getBrokerName(broker)
                             this._app.log.info(`[docker] Testing MQTT Agent ${name} container exists`)
                             this._app.log.debug(`${name}`)
                             let container
@@ -733,7 +743,7 @@ module.exports = {
         createMQttTopicAgent(broker)
     },
     stopBrokerAgent: async (broker) => {
-        const name = `mqtt-schema-agent-${broker.Team.hashid.toLowerCase()}-${broker.hashid.toLowerCase()}`
+        const name = getBrokerName(broker)
         try {
             const container = await this._docker.getContainer(name)
             await container.stop()
@@ -743,7 +753,7 @@ module.exports = {
         }
     },
     getBrokerAgentState: async (broker) => {
-        const name = `mqtt-schema-agent-${broker.Team.hashid.toLowerCase()}-${broker.hashid.toLowerCase()}`
+        const name = getBrokerName(broker)
         try {
             const status = await got.get(`http://${name}:3500/api/v1/status`).json()
             return status
@@ -752,7 +762,7 @@ module.exports = {
         }
     },
     sendBrokerAgentCommand: async (broker, command) => {
-        const name = `mqtt-schema-agent-${broker.Team.hashid.toLowerCase()}-${broker.hashid.toLowerCase()}`
+        const name = getBrokerName(broker)
         if (command === 'start' || command === 'restart') {
             try {
                 await got.post(`http://${name}:3500/api/v1/commands/start`)

package/package.json

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