@dobot-plus/template 1.2.6 → 1.2.8

package/.dobot/components/DobotPlusApp.tsx

@@ -1,78 +1,78 @@
-import { ReactNode, useEffect } from 'react'
-import { MqttWebSocketClient } from '../utils/mqtt'
-import dptConfig from '../../dpt.json'
-import MainConfig from '../../configs/Main.json'
-import { getPluginPort } from '@dobot/http/axios'
-import '@dobot/protocol/methodsHandler'
-import { toolActions } from '@dobot/store/actions/toolActions'
-import store from '@dobot/store'
-import { useSelector } from 'react-redux'
-import { IStoreState } from '@dobot/store/types'
-
-type BasicProps = {
-  children: ReactNode
-}
-
-export type DobotPlusAppProps =
-  | (BasicProps & {
-      useMqtt: true
-      topic?: string
-      onMessage: (data: any) => void
-      port?: number
-    })
-  | (BasicProps & {
-      useMqtt?: false
-    })
-
-export function DobotPlusApp(props: DobotPlusAppProps) {
-  const { children, useMqtt } = props
-  const { portData } = useSelector((state: IStoreState) => state.toolReducer)
-  useEffect(() => {
-    const pluginName = MainConfig.name
-    const pluginVersion = MainConfig.version
-
-    if (useMqtt) {
-      const { topic, onMessage, port } = props
-
-      const ip = process.env.NODE_ENV === 'production' ? portData.ip : dptConfig.ip
-
-      if (ip && onMessage) {
-        const serverUrl = `ws://${ip}:${port || 8083}/mqtt`
-        const clientId = `${pluginName}_clientId`
-        const mqttClient = new MqttWebSocketClient(serverUrl, clientId)
-        mqttClient.connect()
-        mqttClient.subscribe(topic || `${pluginName}Status`, (topic, buf) => {
-          let data = {}
-          try {
-            data = JSON.parse(buf.toString())
-          } catch {
-            data = buf.toString()
-          }
-          onMessage(data)
-        })
-      }
-    }
-
-    getPluginPort()
-      .then((res) => {
-        const { data } = res
-        const pluginKey = data[`${pluginName}_v${pluginVersion}`]
-        if (data) {
-          console.log('pluginPorts', data)
-          const pluginPort = data[pluginKey]
-          if (!pluginPort) {
-            setTimeout(() => {
-              getPluginPort()
-            }, 500)
-          } else {
-            store.dispatch(toolActions.setPluginPort(pluginPort))
-          }
-        }
-      })
-      .catch((err) => {
-        console.log(err)
-      })
-  }, [portData.isSync])
-
-  return <>{children}</>
-}
+import { ReactNode, useEffect } from 'react'
+import { MqttWebSocketClient } from '../utils/mqtt'
+import dptConfig from '../../dpt.json'
+import MainConfig from '../../configs/Main.json'
+import { getPluginPort } from '@dobot/http/axios'
+import '@dobot/protocol/methodsHandler'
+import { toolActions } from '@dobot/store/actions/toolActions'
+import store from '@dobot/store'
+import { useSelector } from 'react-redux'
+import { IStoreState } from '@dobot/store/types'
+
+type BasicProps = {
+  children: ReactNode
+}
+
+export type DobotPlusAppProps =
+  | (BasicProps & {
+      useMqtt: true
+      topic?: string
+      onMessage: (data: any) => void
+      port?: number
+    })
+  | (BasicProps & {
+      useMqtt?: false
+    })
+
+export function DobotPlusApp(props: DobotPlusAppProps) {
+  const { children, useMqtt } = props
+  const { portData } = useSelector((state: IStoreState) => state.toolReducer)
+  useEffect(() => {
+    const pluginName = MainConfig.name
+    const pluginVersion = MainConfig.version
+
+    if (useMqtt) {
+      const { topic, onMessage, port } = props
+
+      const ip = process.env.NODE_ENV === 'production' ? portData.ip : dptConfig.ip
+
+      if (ip && onMessage) {
+        const serverUrl = `ws://${ip}:${port || 8083}/mqtt`
+        const clientId = `${pluginName}_clientId`
+        const mqttClient = new MqttWebSocketClient(serverUrl, clientId)
+        mqttClient.connect()
+        mqttClient.subscribe(topic || `${pluginName}Status`, (topic, buf) => {
+          let data = {}
+          try {
+            data = JSON.parse(buf.toString())
+          } catch {
+            data = buf.toString()
+          }
+          onMessage(data)
+        })
+      }
+    }
+
+    getPluginPort()
+      .then((res) => {
+        const { data } = res
+        const pluginKey = data[`${pluginName}_v${pluginVersion}`]
+        if (data) {
+          console.log('pluginPorts', data)
+          const pluginPort = data[pluginKey]
+          if (!pluginPort) {
+            setTimeout(() => {
+              getPluginPort()
+            }, 500)
+          } else {
+            store.dispatch(toolActions.setPluginPort(pluginPort))
+          }
+        }
+      })
+      .catch((err) => {
+        console.log(err)
+      })
+  }, [portData.isSync])
+
+  return <>{children}</>
+}

package/.dobot/http/axios.ts

@@ -1,52 +1,52 @@
-import axios, { AxiosError, AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig } from 'axios'
-import dptConfig from '../../dpt.json'
-import pluginConfig from '../../configs/Main.json'
-import store from '@dobot/store'
-
-const instance = axios.create()
-
-instance.interceptors.request.use(
-  (config: InternalAxiosRequestConfig) => {
-    config.headers.AuthorizationToken = localStorage.getItem('AuthorizationToken') || ''
-    return config
-  },
-  (err: AxiosError) => Promise.reject(err)
-)
-
-instance.interceptors.response.use(
-  (res: AxiosResponse) => {
-    return res
-  },
-  (err: AxiosError) => {
-    return Promise.reject(err)
-  }
-)
-
-export function request(config: AxiosRequestConfig, port?: number) {
-  const { portData } = store.getState().toolReducer
-
-  const options: AxiosRequestConfig = {
-    ...config,
-    withCredentials: true,
-    baseURL: `http://${portData.ip}:${port}/dobotPlus/${pluginConfig.name}_v${pluginConfig.version}`
-  }
-
-  if (process.env.NODE_ENV !== 'production') {
-    options.baseURL = `/dobotPlus/${pluginConfig.name}_v${pluginConfig.version}`
-  }
-
-  return instance.request({
-    ...options,
-    method: 'post'
-  })
-}
-
-export function getPluginPort() {
-  return instance.request({
-    baseURL: process.env.NODE_ENV !== 'production' ? `` : `http://${dptConfig.ip}:22001`,
-    url: '/dobotPlus/getPorts',
-    method: 'get'
-  })
-}
-
-export default instance
+import axios, { AxiosError, AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig } from 'axios'
+import dptConfig from '../../dpt.json'
+import pluginConfig from '../../configs/Main.json'
+import store from '@dobot/store'
+
+const instance = axios.create()
+
+instance.interceptors.request.use(
+  (config: InternalAxiosRequestConfig) => {
+    config.headers.AuthorizationToken = localStorage.getItem('AuthorizationToken') || ''
+    return config
+  },
+  (err: AxiosError) => Promise.reject(err)
+)
+
+instance.interceptors.response.use(
+  (res: AxiosResponse) => {
+    return res
+  },
+  (err: AxiosError) => {
+    return Promise.reject(err)
+  }
+)
+
+export function request(config: AxiosRequestConfig, port?: number) {
+  const { portData } = store.getState().toolReducer
+
+  const options: AxiosRequestConfig = {
+    ...config,
+    withCredentials: true,
+    baseURL: `http://${portData.ip}:${port}/dobotPlus/${pluginConfig.name}_v${pluginConfig.version}`
+  }
+
+  if (process.env.NODE_ENV !== 'production') {
+    options.baseURL = `/dobotPlus/${pluginConfig.name}_v${pluginConfig.version}`
+  }
+
+  return instance.request({
+    ...options,
+    method: 'post'
+  })
+}
+
+export function getPluginPort() {
+  return instance.request({
+    baseURL: process.env.NODE_ENV !== 'production' ? `` : `http://${dptConfig.ip}:22001`,
+    url: '/dobotPlus/getPorts',
+    method: 'get'
+  })
+}
+
+export default instance

package/.dobot/http/http.ts

@@ -1,22 +1,22 @@
-import { request } from './axios'
-
-export const demoMethod1 = (data: any) => {
-  return request({
-    url: 'demoMethod1',
-    data
-  })
-}
-
-export const demoMethod2 = (data: any) => {
-  return request({
-    url: 'demoMethod2',
-    data
-  })
-}
-
-export const demoMethod3 = (data: any) => {
-  return request({
-    url: 'demoMethod3',
-    data
-  })
-}
+import { request } from './axios'
+
+export const demoMethod1 = (data: any) => {
+  return request({
+    url: 'demoMethod1',
+    data
+  })
+}
+
+export const demoMethod2 = (data: any) => {
+  return request({
+    url: 'demoMethod2',
+    data
+  })
+}
+
+export const demoMethod3 = (data: any) => {
+  return request({
+    url: 'demoMethod3',
+    data
+  })
+}

package/.dobot/index.ts

@@ -1,2 +1,2 @@
-export * as http from './http/http'
-export { DobotPlusApp } from './components/DobotPlusApp'
+export * as http from './http/http'
+export { DobotPlusApp } from './components/DobotPlusApp'

package/.dobot/protocol/methodsHandler.ts

@@ -1,15 +1,15 @@
-import { PostMessageHandler } from './postMessageHandler'
-import { WebSocketHandler } from './websocketHandler'
-import './keyBoard'
-import { isInIframe } from '@dobot/utils/tool'
-
-let methodsHandler: any = undefined
-const postMessageHandler = new PostMessageHandler()
-// 根据环境判断
-if (isInIframe) {
-  methodsHandler = postMessageHandler
-} else {
-  methodsHandler = new WebSocketHandler()
-}
-
-export { methodsHandler, postMessageHandler }
+import { PostMessageHandler } from './postMessageHandler'
+import { WebSocketHandler } from './websocketHandler'
+import './keyBoard'
+import { isInIframe } from '@dobot/utils/tool'
+
+let methodsHandler: any = undefined
+const postMessageHandler = new PostMessageHandler()
+// 根据环境判断
+if (isInIframe) {
+  methodsHandler = postMessageHandler
+} else {
+  methodsHandler = new WebSocketHandler()
+}
+
+export { methodsHandler, postMessageHandler }