@jiabaida/tools 1.0.8 → 1.1.0

package/src/core/mqttServer.js

@@ -9,7 +9,15 @@ import { Transfer } from './Transfer.js';
 
 // 新的MQTT服务类
 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 }) {
+  constructor(options = {}) {
+    const {
+      mqttClient = {},
+      MQTT_HOST = 'wxs://mqtt.jiabaida.com/mqtt',
+      DELAY_TIME = 300,
+      networkModelUrl = 'https://cloud.jiabaida.com/bluetooth/server/device/networkModel',
+      request,
+      store = null,
+    } = options;
     this.timer = null;
     this.productKey = 'bms_wifi';
     this.is0f = false;
@@ -24,9 +32,39 @@ export class MqttServer {
     this.networkModelUrl = networkModelUrl;
     this.request = request; // 必须传入的http请求方法
     this.$store = store;
+    this.setPassthroughType = 1; // 1 - 被动回复   0 - 主动回复
+    this.currentCommand = "";
+    this.verify3LevelPasswordFn = async (deviceObj, ciphertext) => {}
     // ...existing code...
   }
 
+  initData(options = {}) {
+    const {
+      mqttClient = {},
+      MQTT_HOST = 'wxs://mqtt.jiabaida.com/mqtt',
+      DELAY_TIME = 300,
+      networkModelUrl = 'https://cloud.jiabaida.com/bluetooth/server/device/networkModel',
+      request,
+      store = null,
+      verify3LevelPasswordFn = async () => {},
+    } = options;
+    this.timer = null;
+    this.productKey = 'bms_wifi';
+    this.is0f = false;
+    this.publishObj = {};
+    this.cmdCode = '';
+    this.callbackId = '';
+    this.mqttCode = '';
+    this.mqttPublish = false;
+    this.mqttClient = mqttClient;
+    this.MQTT_HOST = MQTT_HOST;
+    this.DELAY_TIME = DELAY_TIME;
+    this.networkModelUrl = networkModelUrl;
+    this.request = request; // 必须传入的http请求方法
+    this.$store = store;
+    this.verify3LevelPasswordFn = verify3LevelPasswordFn;
+  }
+
   // 获取参数方法
   async getParams(item) {
     try {
@@ -83,13 +121,14 @@ export class MqttServer {
   handleMqttConnect(client, deviceObj) {
     console.log('MQTT 连接成功 client', client);
     console.log('MQTT 连接成功 deviceObj', deviceObj);
-    this.storeMqttClient(client);
+    this.storeMqttClient(client, deviceObj);
     this.publishInOrder(client, deviceObj).then(() => this.subscribeInOrder(client));
   }
 
-  storeMqttClient(client) {
+  storeMqttClient(client, deviceObj) {
     this.mqttClient[`${client.options.deviceId}_mqtt`] = client;
-    this.$store?.commit('setMqttClient', this.mqttClient);
+    this.mqttClient[`${client.options.deviceId}_mqtt`].deviceObj = deviceObj;
+    // this.$store?.commit('setMqttClient', this.mqttClient);
     console.log('存储的 MQTT 客户端:', this.mqttClient);
   }
 
@@ -162,6 +201,8 @@ export class MqttServer {
     let resultArray = [];
     let codeValue = [];
     if (this.cmdCode === 'jbdPWD') {
+      const deviceObj = this.mqttClient[`${client.options.deviceId}_mqtt`]?.deviceObj || {};
+      await this.verify3LevelPasswordFn(deviceObj, deviceObj.macAddr);
       const cmdMap = {
         2: 'FFAA23010125',
         3: 'FFAA1F010121',
@@ -178,6 +219,7 @@ export class MqttServer {
     try {
       if (resultArray[0]?.toUpperCase() === 'FF' && resultArray[1]?.toUpperCase() === 'AA') {
       } else if (resultArray[1]?.toUpperCase() === '78' || resultArray[1]?.toUpperCase() === '50') {
+        this.currentCommand = resultArray.slice(0, 4).map(o => `0x${o}`)
       } else {
       }
       const publishObj = {
@@ -193,6 +235,7 @@ export class MqttServer {
       if (this.cmdCode.toLowerCase().includes('wifi_')) {
         await this.publishATHandle(msg.value);
       } else {
+        console.log('resultArray', resultArray)
         this.writePublishInfoCmd(resultArray);
         await sleep(this.DELAY_TIME);
       }
@@ -226,6 +269,7 @@ export class MqttServer {
 
   closeMqttByDeviceId(deviceId) {
     const client = this.mqttClient[`${deviceId}_mqtt`];
+    console.log('closeMqttByDeviceId', this.mqttClient, client)
     if (client) {
       client.end(() => {
         this.mqttClient[`${deviceId}_mqtt`] = null;
@@ -238,7 +282,7 @@ export class MqttServer {
     console.log('MQTT 连接关闭', res, client);
     client.end(() => {
       this.mqttClient[`${client.options.deviceId}_mqtt`] = null;
-      this.$store?.commit('setMqttClient', this.mqttClient);
+      // this.$store?.commit('setMqttClient', this.mqttClient);
     });
   }
 
@@ -254,7 +298,10 @@ export class MqttServer {
       callbackId: this.publishObj.callbackId,
     });
     if (client) {
-      client.publish(`/${this.publishObj.productKey}/${this.publishObj.clientId}/plat/passthrough/reply`, msg, () => {});
+      console.log('publishHandle', client, msg, this.publishObj)
+      client.publish(`/${this.publishObj.productKey}/${this.publishObj.clientId}/plat/passthrough/reply`, msg, () => {
+        console.log('发布回复主题完成', msg)
+      });
     }
     if (this.publishObj.isLast) {
       await sleep(300);
@@ -286,6 +333,7 @@ export class MqttServer {
     this.$store?.commit('setMqttPublish', true);
     this.mqttCode = values[2];
     let res = null;
+    this.setPassthroughType = 1;
     // 下发指令逻辑
     if (values[0]?.toUpperCase() === 'FF' && values[1]?.toUpperCase() === 'AA') {
       res = await set_PlanCMD_FFAA(this.publishObj.deviceId, values.join(''));
@@ -295,12 +343,13 @@ export class MqttServer {
       // DD
       res = await set_PlanCMD_DD(this.publishObj.deviceId, values.join(''));
     }
+    console.log('res', res)
     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);
+    console.log('code: 回复的code', code, this.mqttCode);
     // mqtt连接正常且是平台下发的指令 需上报数据到后端
     if (code.toUpperCase() == this.mqttCode.toUpperCase()) {
       this.publishHandle(res?.dataStr);
@@ -312,4 +361,6 @@ export class MqttServer {
   }
 }
 
+export const mqttServer = new MqttServer()
+
 // export default MqttServer;

package/src/core/tcpServer.js

@@ -40,7 +40,14 @@ export const tcpServer = {
   tcpSockets: {},
   isRetryings: {},
   socketOpens: {},
-  async initTCPConnection(macAddr, deviceId) {
+  deviceObj: {
+    macAddr: '',
+    deviceId: ''
+  },
+  async verify3LevelPasswordFn(deviceObj, ciphertext){},
+  async initTCPConnection(deviceObj) {
+    const { macAddr, deviceId } = deviceObj
+    this.deviceObj = deviceObj
     console.log('macAddr: init-------tcp', macAddr, deviceId);
     return new Promise((resolve, reject) => {
       try {
@@ -237,10 +244,37 @@ export const tcpServer = {
         if (msgObj.command == 120) {
           let value = msgObj.data.content
           if (!value) return
-
+          let resultArray = []
+          let codeValue = ''
+          if (msgObj.data.cmdCode == 'jbdPWD') {
+            // 先验证三级
+            console.log('this.deviceObj: 验证三级密码', this.deviceObj);
+            await this.verify3LevelPasswordFn(this.deviceObj, this.deviceObj.macAddr)
+            console.log('this.deviceObj: 验证三级密码', this.deviceObj);
+            let cmdContent = ''
+            switch (value) {
+              case '2': // 清除一级密码
+                cmdContent = "FFAA23010125";
+                break
+              case '3': // 恢复二级临时密码
+                cmdContent = "FFAA1F010121";
+                break;
+              case '4': // 恢复出厂设置
+                cmdContent = "FFAA20010122";
+                break;
+              case '5': // 清除APPKEY启用标志
+                cmdContent = "FFAA23010226";
+                break;
+              default:
+                break;
+            }
+            codeValue = cmdContent
+          } else {
+            codeValue = value
+          }
           // 使用正则表达式将字符串两两分隔为数组
-          let resultArray = value.match(/.{1,2}/g);
-          console.log('resultArray: ', resultArray);
+          resultArray = codeValue.match(/.{1,2}/g);
+          console.log('resultArray: ', value, resultArray, codeValue);
           // 给蓝牙设备发送指令
           this.macAddr = msgObj.data.macAddr
           let deviceId = null
@@ -252,40 +286,7 @@ export const tcpServer = {
           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)
-          }
+          this.writePublishInfoCmd(resultArray, deviceId)
         } else if (msgObj.command == 97) {
           tcpSend.hasHeartbeat = true
         }
@@ -300,4 +301,41 @@ export const tcpServer = {
       }
     });
   },
+  // 发送接收的指令
+  async writePublishInfoCmd(values, deviceId) {
+    tcpSend.isSending = true
+    tcpSend.code = values[2]
+    // 向蓝牙设备发送一个0x00的16进制数据，读取指令
+    let length = values.length
+    const buffer = new ArrayBuffer(length);
+    const dataView = new DataView(buffer);
+    values.forEach((el, index) => {
+      // 循环,取每一个十六进制值 添加到buffer
+      dataView.setUint8(index, '0x' + el);
+    })
+    console.log(buffer, values, "读取指令-----------------------");
+
+    let res = null;
+    // 下发指令逻辑
+    if (values[0]?.toUpperCase() === 'FF' && values[1]?.toUpperCase() === 'AA') {
+      res = await set_PlanCMD_FFAA(deviceId, values.join(''));
+    } else if (values[1]?.toUpperCase() === '78' || values[1]?.toUpperCase() === '50') {
+      res = await getCMDESInfoAsync(deviceId, values.join(''));
+    } else {
+      // DD
+      res = await set_PlanCMD_DD(deviceId, values.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()) {
+      let hexValue = content
+            ?.map((num) => Transfer.decimalToHex(num))
+            ?.join("");
+      this.sendWriteReportData(hexValue, deviceId)
+    }
+  },
 }