@jiabaida/tools 1.0.6 → 1.0.8

package/src/core/mqttServer.js

@@ -1,15 +1,15 @@
-import { sleep } from './BleDataProcess.js';
-import { decrypt } from './rsaEncrypt.js';
-import CryptoJS from 'crypto-js/crypto-js.js';
-import mqtt from 'mqtt/dist/mqtt.js';
+import SHA256 from 'crypto-js/sha256';
+import mqtt from 'mqtt/dist/mqtt.min.js';
 import { set_PlanCMD_DD } from './BleCmdAnalysis/BleCmdDD';
 import { getFFAA80Async, resolveFFAA80, set_PlanCMD_FFAA } from './BleCmdAnalysis/BleCmdFFAA';
-import { Transfer } from './Transfer.js';
 import { getCMDESInfoAsync } from './BleCmdAnalysis/BleCmdHVES.js';
+import { sleep } from './BleDataProcess.js';
+import { decrypt } from './rsaEncrypt.js';
+import { Transfer } from './Transfer.js';
 
 // 新的MQTT服务类
-class MqttServer {
-  constructor({ mqttClient = {}, MQTT_HOST = 'wx://mqtt.jiabaida.com:8083/mqtt', DELAY_TIME = 300, networkModelUrl = 'https://cloud.jiabaida.com/bluetooth/server/device/networkModel', request }) {
+export class MqttServer {
+  constructor({ mqttClient = {}, MQTT_HOST = 'wxs://mqtt.jiabaida.com/mqtt', DELAY_TIME = 300, networkModelUrl = 'https://cloud.jiabaida.com/bluetooth/server/device/networkModel', request, store = null }) {
     this.timer = null;
     this.productKey = 'bms_wifi';
     this.is0f = false;
@@ -23,6 +23,7 @@ class MqttServer {
     this.DELAY_TIME = DELAY_TIME;
     this.networkModelUrl = networkModelUrl;
     this.request = request; // 必须传入的http请求方法
+    this.$store = store;
     // ...existing code...
   }
 
@@ -56,7 +57,7 @@ class MqttServer {
         connectTimeout: 4000,
         clientId,
         username,
-        password: CryptoJS.SHA256(password).toString(),
+        password: SHA256(password).toString(),
         deviceId: deviceObj.deviceId,
       };
       const client = mqtt.connect(this.MQTT_HOST, options);
@@ -88,6 +89,7 @@ class MqttServer {
 
   storeMqttClient(client) {
     this.mqttClient[`${client.options.deviceId}_mqtt`] = client;
+    this.$store?.commit('setMqttClient', this.mqttClient);
     console.log('存储的 MQTT 客户端:', this.mqttClient);
   }
 
@@ -151,6 +153,8 @@ class MqttServer {
     }
   }
 
+  
+
   async processMessageAsync(client, message) {
     const msg = JSON.parse(message);
     this.callbackId = msg.callbackId;
@@ -212,6 +216,7 @@ class MqttServer {
       if (isLast) {
         await sleep(300);
         this.mqttPublish = false;
+        this.$store?.commit('setMqttPublish', false);
         uni.removeStorageSync && uni.removeStorageSync(`${deviceId}_mqttPublish`);
       }
     } catch (error) {
@@ -219,10 +224,21 @@ class MqttServer {
     }
   }
 
+  closeMqttByDeviceId(deviceId) {
+    const client = this.mqttClient[`${deviceId}_mqtt`];
+    if (client) {
+      client.end(() => {
+        this.mqttClient[`${deviceId}_mqtt`] = null;
+        console.log(`MQTT 连接已关闭，设备ID: ${deviceId}`);
+      });
+    }
+  }
+
   handleMqttClose(client, res) {
     console.log('MQTT 连接关闭', res, client);
     client.end(() => {
       this.mqttClient[`${client.options.deviceId}_mqtt`] = null;
+      this.$store?.commit('setMqttClient', this.mqttClient);
     });
   }
 
@@ -243,6 +259,7 @@ class MqttServer {
     if (this.publishObj.isLast) {
       await sleep(300);
       this.mqttPublish = false;
+      this.$store?.commit('setMqttPublish', false);
       uni.removeStorageSync && uni.removeStorageSync(`${this.publishObj.deviceId}_mqttPublish`);
     }
   }
@@ -266,6 +283,7 @@ class MqttServer {
   async writePublishInfoCmd(values) {
     clearTimeout(this.timer);
     this.mqttPublish = true;
+    this.$store?.commit('setMqttPublish', true);
     this.mqttCode = values[2];
     let res = null;
     // 下发指令逻辑
@@ -289,8 +307,9 @@ class MqttServer {
     }
     this.timer = setTimeout(() => {
       this.mqttPublish = false;
+      this.$store?.commit('setMqttPublish', false);
     }, 30000);
   }
 }
 
-export default MqttServer;
+// export default MqttServer;

package/src/core/rsaEncrypt.js

@@ -1,4 +1,4 @@
-import JSEncrypt from 'jsencrypt/bin/jsencrypt.min'
+import JSEncrypt from 'jsencrypt'
 
 // 密钥对生成 http://web.chacuo.net/netrsakeypair
 

package/src/core/tcpServer.js

@@ -0,0 +1,303 @@
+// import store from '@/store/index';
+import {
+  reactive
+} from "vue";
+import { set_PlanCMD_DD } from './BleCmdAnalysis/BleCmdDD';
+import { set_PlanCMD_FFAA } from './BleCmdAnalysis/BleCmdFFAA';
+import { getCMDESInfoAsync } from './BleCmdAnalysis/BleCmdHVES.js';
+import { sleep } from './BleDataProcess.js';
+import Queue from './Queue.js';
+import { Transfer } from './Transfer.js';
+export const tcpSend = reactive({
+  isSending: false, //是否在下发平台指令
+  isLast: false,
+  code: null,
+  hasHeartbeat: false,
+  tcpClose: false,
+  devices: {}
+})
+// / 创建一个队列来存储接收到的消息
+const messageQueue = new Queue();
+let timer = null
+export const tcpServer = {
+  version: '2.8.2', // 每次上传需要手动修改此 版本号
+  socketOpen: false, //是否建立连接
+  macAddr: '',
+  txnNo: '',
+  baseDelay: 1000, // 初始重试延迟（毫秒）
+  maxDelay: 60 * 1000, // 最大重试延迟（毫秒）
+  retryCount: 0, // 重试次数
+  url: {
+    address: 'cloud.jiabaida.com',
+    port: 10241
+  },
+  url1: {
+    address: '192.168.80.36',
+    port: 10240
+  },
+  timers: {},
+  heartBeatTimers: {},
+  tcpSockets: {},
+  isRetryings: {},
+  socketOpens: {},
+  async initTCPConnection(macAddr, deviceId) {
+    console.log('macAddr: init-------tcp', macAddr, deviceId);
+    return new Promise((resolve, reject) => {
+      try {
+        tcpSend.devices[macAddr] = {
+          macAddr,
+          deviceId
+        }
+        this.tcpSockets[`${deviceId}_socket`] = wx.createTCPSocket();
+        console.log('this.tcpSockets[`${deviceId}_socket`]: ', this.tcpSockets[`${deviceId}_socket`]);
+        this.tcpSockets[`${deviceId}_socket`].connect(this.url);
+        this.tcpSockets[`${deviceId}_socket`].onConnect(() => {
+          this.listenerConnect(macAddr, deviceId)
+          resolve(true)
+        });
+
+        this.tcpSockets[`${deviceId}_socket`].onMessage((message) => {
+          console.log('接收到消息：', message);
+          // 处理接收到的消息
+          // 将buffer转为常规数组 十六进制
+          const intArr = Array.prototype.map.call(
+            new Uint8Array(message.message),
+            function (bit) {
+              return bit;
+            }
+          );
+          // 将十六进制转为对应的字符
+          let valueString = String.fromCharCode(...intArr)
+          console.log(valueString, 'valueString');
+          // messageQueue.enqueue(valueString);
+          // this.processQueue()
+          this.processMessageAsync(valueString)
+        });
+
+        this.tcpSockets[`${deviceId}_socket`].onError((error) => {
+          this.listenerError(macAddr, deviceId, error)
+          reject(error)
+        });
+
+        this.tcpSockets[`${deviceId}_socket`].onClose(this.listenerClose(deviceId));
+      } catch (error) {
+        console.error('error: tcp连接失败', error);
+        reject(error)
+      }
+    })
+  },
+  listenerConnect(macAddr, deviceId) {
+    this.socketOpens[`open_${deviceId}`] = true
+    this.isRetryings[`retry_${deviceId}`] = false
+    console.log('TCP 连接已建立');
+    clearInterval(this.timers[`timer_${deviceId}`])
+    this.timers[`timer_${deviceId}`] = null
+    // 连接建立后，开始发送心跳包
+    this.sendHeartbeat(macAddr, deviceId);
+  },
+  listenerError(macAddr, deviceId, error) {
+    this.socketOpens[`open_${deviceId}`] = false
+    console.log('TCP 连接错误：', deviceId, error);
+    this.stopHeartBeat(deviceId)
+    if (!this.isRetryings[`retry_${deviceId}`]) {
+      this.retryCount = 0
+      // 重连
+      this.reConnect(macAddr, deviceId, true)
+    }
+  },
+  listenerClose(deviceId) {
+    this.socketOpens[`open_${deviceId}`] = false
+    console.log('TCP 连接已关闭');
+  },
+  // 关闭tcp连接
+  closeTcpSocket(deviceId) {
+    try {
+      clearInterval(this.timers[`timer_${deviceId}`])
+      this.timers[`timer_${deviceId}`] = null
+      if (this.tcpSockets[`${deviceId}_socket`]) {
+        this.socketOpens[`open_${deviceId}`] = false
+        this.stopHeartBeat(deviceId)
+        this.tcpSockets[`${deviceId}_socket`].offMessage()
+        this.tcpSockets[`${deviceId}_socket`].offConnect()
+        this.tcpSockets[`${deviceId}_socket`].offClose()
+        this.tcpSockets[`${deviceId}_socket`].offError()
+        this.tcpSockets[`${deviceId}_socket`].close()
+        this.tcpSockets[`${deviceId}_socket`] = null
+      }
+    } catch (error) {
+      console.error('error: closeTcpSocket', error);
+    }
+  },
+  async reConnect(macAddr, deviceId, closeSocket = false) {
+    console.log('重连 this.macAddr', macAddr);
+    this.isRetryings[`retry_${deviceId}`] = true
+    // 关闭旧的连接再重连
+    if (closeSocket) this.tcpSockets[`${deviceId}_socket`].close()
+    this.tcpSockets[`${deviceId}_socket`].connect(this.url);
+    const delay = Math.min(this.baseDelay * Math.pow(2, this.retryCount), this.maxDelay);
+    console.log(`准备 ${delay}ms 后重试...`);
+    this.timers[`timer_${deviceId}`] = setTimeout(() => {
+      this.reConnect(macAddr, deviceId);
+    }, delay);
+    this.retryCount++
+  },
+  sendHeartbeat(macAddr, deviceId) {
+    let tokenStr = uni.getStorageSync('token')
+    let token = tokenStr.replace('Bearer ', '')
+    const heartbeatMsg = {
+      command: 96, //业务操作码，96代表心跳包
+      data: {
+        token,
+        appVersion: "xiaoxiang:" + this.version, //小程序版本号
+        macAddr,
+      },
+      txnNo: +new Date(), //当前时间戳
+      isAnonymous: 0, //是否匿名登录
+    };
+    console.log('heartbeatMsg: ', heartbeatMsg);
+    tcpSend.hasHeartbeat = false
+    this.tcpSockets[`${deviceId}_socket`].write(JSON.stringify(heartbeatMsg));
+    this.heartBeatTimers[`heartTimer_${deviceId}`] = setInterval(() => {
+      heartbeatMsg.txnNo = +new Date() //当前时间戳
+      //##console.log(heartbeatMsg, 'heartbeatMsg');
+      tcpSend.hasHeartbeat = false
+      this.tcpSockets[`${deviceId}_socket`].write(JSON.stringify(heartbeatMsg));
+    }, 30000); // 每5秒发送一次心跳包
+  },
+  // 清除心跳上报计时器
+  stopHeartBeat(deviceId) {
+    if (this.heartBeatTimers[`heartTimer_${deviceId}`]) {
+      clearInterval(this.heartBeatTimers[`heartTimer_${deviceId}`]);
+      this.heartBeatTimers[`heartTimer_${deviceId}`] = null;
+    }
+  },
+  //上报基础 信息
+  sendReportData(data) {
+    const reportData = {
+      command: 999, //业务操作码，999代表上报
+      data: {
+        value: data.value,
+        cmdCode: 'jbd0F',
+        bluetoothName: data.bluetoothName,
+      },
+      macAddr: data.macAddr,
+      txnNo: +new Date(), //当前时间戳
+    };
+    console.log(reportData, 'reportData111上报基础数据');
+    this.tcpSockets[`${data.deviceId}_socket`].write(JSON.stringify(reportData));
+  },
+  // 执行完平台下发的指令后上报数据
+  sendWriteReportData(data, deviceId) {
+    console.warn('执行后上报数据data: ', data);
+    const reportData = {
+      command: 121, //业务操作码，代表执行上报
+      data: {
+        macAddr: this.macAddr,
+        content: data,
+      },
+      txnNo: this.txnNo, //callbackId
+    };
+    //##console.log(reportData, 'WriteReportData执行指令后上报数据');
+    this.tcpSockets[`${deviceId}_socket`].write(JSON.stringify(reportData));
+    if (tcpSend.isLast) {
+      tcpSend.isSending = false
+    }
+  },
+  // 处理队列中的消息
+  processQueue() {
+    if (!tcpSend.isSending) {
+      this.processNextMessage();
+    }
+  },
+  async processNextMessage() {
+    //##console.log('messageQueue-------', messageQueue);
+
+    if (!messageQueue.isEmpty()) {
+      const message = messageQueue.dequeue();
+      //##console.log('Processing:', message);
+      // 异步处理消息
+      this.processMessageAsync(message).then(() => {
+        this.processNextMessage();
+      });
+    } else {
+      await sleep(300)
+      tcpSend.isSending = false;
+      //##console.log('tcpSend.isSending发送完成', tcpSend.isSending);
+    }
+  },
+  async processMessageAsync(message) {
+    clearTimeout(timer)
+    // 假设这里是异步操作，例如写入数据库
+    return new Promise(async (resolve) => {
+      try {
+        console.log('Message processed:', message);
+        let msgObj = JSON.parse(message)
+        console.warn('----------msgObj后台下发的指令: -----------', msgObj);
+        // 为120，即接收到后台下发的指令
+        if (msgObj.command == 120) {
+          let value = msgObj.data.content
+          if (!value) return
+
+          // 使用正则表达式将字符串两两分隔为数组
+          let resultArray = value.match(/.{1,2}/g);
+          console.log('resultArray: ', resultArray);
+          // 给蓝牙设备发送指令
+          this.macAddr = msgObj.data.macAddr
+          let deviceId = null
+          for (let key in tcpSend.devices) {
+            if (tcpSend.devices[key].macAddr == this.macAddr) {
+              deviceId = tcpSend.devices[key].deviceId
+            }
+          }
+          console.log('deviceId: ', deviceId);
+          this.txnNo = msgObj.txnNo
+          tcpSend.isLast = msgObj.isLast
+          tcpSend.isSending = true
+          tcpSend.code = resultArray[2]
+          // 向蓝牙设备发送一个0x00的16进制数据，读取指令
+          let length = resultArray.length
+          const buffer = new ArrayBuffer(length);
+          const dataView = new DataView(buffer);
+          resultArray.forEach((el, index) => {
+            // 循环,取每一个十六进制值 添加到buffer
+            dataView.setUint8(index, '0x' + el);
+          })
+          console.log(buffer, "读取指令-----------------------");
+          // store.commit('setPassthroughType', 1);// 设置类型为 被动回复1
+          // BLE.sendMsgToKey(buffer, deviceId)
+
+          // this.mqttCode = resultArray[2];
+          let res = null;
+          // 下发指令逻辑
+          if (resultArray[0]?.toUpperCase() === 'FF' && resultArray[1]?.toUpperCase() === 'AA') {
+            res = await set_PlanCMD_FFAA(deviceId, resultArray.join(''));
+          } else if (resultArray[1]?.toUpperCase() === '78' || resultArray[1]?.toUpperCase() === '50') {
+            res = await getCMDESInfoAsync(deviceId, resultArray.join(''));
+          } else {
+            // DD
+            res = await set_PlanCMD_DD(deviceId, resultArray.join(''));
+          }
+          const content = res?.data || []
+          let code = Transfer.decimalToHex(content[1]);
+          if (content[0] == 0xff && content[1] == 0xaa) {
+            code = Transfer.decimalToHex(content[2]);
+          }
+          console.log('code: 回复的code', code);
+          if (code.toUpperCase() == tcpSend?.code?.toUpperCase()) {
+            this.sendWriteReportData(content, deviceId)
+          }
+        } else if (msgObj.command == 97) {
+          tcpSend.hasHeartbeat = true
+        }
+        // 超时 30s 未收到指令反馈 认为指令发送失败
+        timer = setTimeout(() => {
+          tcpSend.isSending = false
+        }, 30000)
+        resolve(true);
+      } catch (error) {
+        console.log('error: ', error);
+
+      }
+    });
+  },
+}

package/src/index.js

@@ -2,10 +2,13 @@
 export * from './core/array';
 export * from './core/BleApiManager';
 export * from './core/BleCmdAnalysis/index';
+export * from './core/BleDataProcess';
 export * from './core/commonfun';
+export * from './core/dataJson/index.js';
 export * from './core/keyAndPwdManager';
+export * from './core/mqttServer.js';
 export * from './core/OtaUpgrade';
+export * from './core/rsaEncrypt';
+export * from './core/tcpServer.js';
 export * from './core/TelinkApi';
 export * from './core/Transfer';
-export * from './core/BleDataProcess'
-export * from './core/dataJson/index.js'