@dobot-plus/template 1.2.10 → 1.2.11

package/.dobot/components/DobotPlusApp.tsx

@@ -1,4 +1,4 @@
-import { ReactNode, useEffect } from 'react'
+import { ReactNode, useEffect, useRef } from 'react'
 import { MqttWebSocketClient } from '../utils/mqtt'
 import dptConfig from '../../dpt.json'
 import MainConfig from '../../configs/Main.json'
@@ -27,6 +27,9 @@ export type DobotPlusAppProps =
 export function DobotPlusApp(props: DobotPlusAppProps) {
   const { children, useMqtt } = props
   const { portData } = useSelector((state: IStoreState) => state.toolReducer)
+  const mqttConnected = useRef(false)
+  const mqttClientRef = useRef<MqttWebSocketClient | null>(null)
+
   useEffect(() => {
     const pluginName = MainConfig.name
     const pluginVersion = MainConfig.version
@@ -35,11 +38,11 @@ export function DobotPlusApp(props: DobotPlusAppProps) {
       const { topic, onMessage, port } = props
 
       const ip = process.env.NODE_ENV === 'production' ? portData.ip : dptConfig.ip
-
-      if (ip && onMessage) {
+      if (ip && onMessage && !mqttConnected.current && portData.isSync) {
         const serverUrl = `ws://${ip}:${port || 8083}/mqtt`
         const clientId = `${pluginName}_clientId`
         const mqttClient = new MqttWebSocketClient(serverUrl, clientId)
+        mqttClientRef.current = mqttClient
         mqttClient.connect()
         mqttClient.subscribe(topic || `${pluginName}Status`, (topic, buf) => {
           let data = {}
@@ -50,13 +53,14 @@ export function DobotPlusApp(props: DobotPlusAppProps) {
           }
           onMessage(data)
         })
+        mqttConnected.current = true
       }
     }
 
     getPluginPort()
       .then((res) => {
         const { data } = res
-        const pluginKey = data[`${pluginName}_v${pluginVersion}`]
+        const pluginKey = `${pluginName}_v${pluginVersion}`
         if (data) {
           console.log('pluginPorts', data)
           const pluginPort = data[pluginKey]
@@ -72,7 +76,19 @@ export function DobotPlusApp(props: DobotPlusAppProps) {
       .catch((err) => {
         console.log(err)
       })
-  }, [portData.isSync])
+
+    return () => {
+      if (mqttClientRef.current) {
+        try {
+          mqttClientRef.current.disconnect()
+        } catch (e) {
+          console.warn('mqtt disconnect error', e)
+        }
+        mqttClientRef.current = null
+      }
+      mqttConnected.current = false
+    }
+  }, [portData.isSync, useMqtt])
 
   return <>{children}</>
 }

package/.dobot/http/axios.ts

@@ -23,12 +23,12 @@ instance.interceptors.response.use(
 )
 
 export function request(config: AxiosRequestConfig, port?: number) {
-  const { portData } = store.getState().toolReducer
+  const { portData, pluginPort } = store.getState().toolReducer
 
   const options: AxiosRequestConfig = {
     ...config,
     withCredentials: true,
-    baseURL: `http://${portData.ip}:${port}/dobotPlus/${pluginConfig.name}_v${pluginConfig.version}`
+    baseURL: `http://${portData.ip}:${port || pluginPort}/dobotPlus/${pluginConfig.name}_v${pluginConfig.version}`
   }
 
   if (process.env.NODE_ENV !== 'production') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dobot-plus/template",
-  "version": "1.2.10",
+  "version": "1.2.11",
   "engines": {
     "node": "20"
   },