@flowfuse/driver-localfs 2.21.3-88488c1-202509220522.0 → 2.21.3-c306fa4-202509221214.0

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

@@ -13,6 +13,6 @@ jobs:
         with:
           node-version: 18
       - run: npm ci --omit=dev
-      - uses: JS-DevTools/npm-publish@d9dc932de083f0e6de6a50f0d1097a7142c3751b # v4.0.0
+      - uses: JS-DevTools/npm-publish@ad693561f8a5b5d4c76f14407da60aa15cb10f90 # v4.0.1
         with:
           token: ${{ secrets.NPM_PUBLISH_TOKEN }}

package/localfs.js

@@ -228,12 +228,17 @@ async function getMQTTAgentList (driver) {
     const agents = await driver._app.db.models.BrokerCredentials.findAll({
         include: [{ model: driver._app.db.models.Team }]
     })
+    const teamBrokerAgents = await driver._app.db.models.TeamBrokerAgent.findAll({
+        include: [{ model: driver._app.db.models.Team }]
+    })
 
+    agents.concat(teamBrokerAgents)
     agents.forEach(async (agent) => {
         if (agent.Team && agent.settings.port) {
             driver._usedAgentPorts.add(agent.settings.port)
         }
     })
+
     return agents
 }
 
@@ -306,7 +311,9 @@ async function checkExistingMQTTAgents (driver) {
 }
 
 async function launchMQTTAgent (broker, driver) {
-    logger.info(`[localfs] Starting MQTT Schema agent ${broker.hashid} for ${broker.Team.hashid}`)
+    const agent = broker.constructor.name === 'TeamBrokerAgent'
+
+    logger.info(`[localfs] Starting MQTT Schema agent ${agent ? 'team-broker' : broker.hashid} for ${broker.Team.hashid}`)
     const agentSettings = broker.settings
     agentSettings.port = agentSettings.port || getNextFreePort(driver._usedAgentPorts, initialAgentPortNumber)
 
@@ -315,9 +322,12 @@ async function launchMQTTAgent (broker, driver) {
 
     env.FORGE_TEAM_TOKEN = token
     env.FORGE_URL = driver._app.config.base_url
-    env.FORGE_BROKER_ID = broker.hashid
+    env.FORGE_BROKER_ID = agent ? 'team-broker' : broker.hashid
     env.FORGE_TEAM_ID = broker.Team.hashid
     env.FORGE_PORT = agentSettings.port
+    if (agent) {
+        env.FORGE_TIMEOUT = 24
+    }
 
     if (driver._app.config.node_path) {
         env.PATH = process.env.PATH + path.delimiter + driver._app.config.node_path
@@ -325,8 +335,8 @@ async function launchMQTTAgent (broker, driver) {
         env.PATH = process.env.PATH
     }
 
-    const out = openSync(path.join(driver._rootDir, `/${broker.hashid}-out.log`), 'a')
-    const err = openSync(path.join(driver._rootDir, `/${broker.hashid}-out.log`), 'a')
+    const out = openSync(path.join(driver._rootDir, `/${agent ? 'team-broker-' + broker.Team.hashid : broker.hashid}-out.log`), 'a')
+    const err = openSync(path.join(driver._rootDir, `/${agent ? 'team-broker-' + broker.Team.hashid : broker.hashid}-out.log`), 'a')
 
     fileHandles[broker.hashid] = {
         out,
@@ -334,7 +344,7 @@ async function launchMQTTAgent (broker, driver) {
     }
 
     const processOptions = {
-        detached: true,
+        detached: false,
         windowsHide: true,
         stdio: ['ignore', out, err],
         env,
@@ -760,9 +770,10 @@ module.exports = {
         launchMQTTAgent(broker, this)
     },
     stopBrokerAgent: async (broker) => {
+        const agent = broker.constructor.name === 'TeamBrokerAgent'
         const pid = broker.settings?.pid
         const port = broker.settings?.port
-        logger.info(`Stopping MQTT Schema Agent ${broker.hashid}`)
+        logger.info(`Stopping MQTT Schema Agent ${agent ? 'team-broker' : broker.hashid} for ${broker.Team.hashid}`)
         if (pid) {
             try {
                 if (process.platform === 'win32') {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@flowfuse/driver-localfs",
-    "version": "2.21.3-88488c1-202509220522.0",
+    "version": "2.21.3-c306fa4-202509221214.0",
     "description": "Local Filesystem FlowFuse Project driver",
     "main": "localfs.js",
     "scripts": {