@meta2d/core 1.0.91 → 1.0.93

package/src/core.js

@@ -2527,7 +2527,7 @@ export class Meta2d {
         //   Object.assign(options,{clean: false});
         // }
         if (!options.hasOwnProperty("reconnectPeriod")) {
-            Object.assign(options, { reconnectPeriod: 0 });
+            Object.assign(options, { reconnectPeriod: 5000 });
         }
         if (!options.hasOwnProperty("connectTimeout")) {
             Object.assign(options, { connectTimeout: 10 * 1000 });
@@ -2545,24 +2545,25 @@ export class Meta2d {
         this.mqttClients[net.index].on('error', (error) => {
             this.store.emitter.emit('error', { type: 'mqtt', error });
         });
-        let reconnectDelay = 1000;
-        this.mqttClients[net.index].on('close', () => {
-            if (this.store.options.reconnetTimes) {
-                net.times++;
-                if (net.times >= this.store.options.reconnetTimes) {
-                    net.times = 0;
-                    this.mqttClients && this.mqttClients[net.index]?.end();
-                }
-                setTimeout(() => {
-                    if (net.times < this.store.options.reconnetTimes) {
-                        this.mqttClients[net.index].reconnect(options);
-                        reconnectDelay = Math.min(reconnectDelay * 2, 10 * 1000);
-                    }
-                }, reconnectDelay);
-            }
-        });
+        //mqtt 默认重连配置 reconnectPeriod
+        // let reconnectDelay = 1000;
+        // this.mqttClients[net.index].on('close', () => {
+        //   if (this.store.options.reconnetTimes) {
+        //     net.times++;
+        //     if (net.times >= this.store.options.reconnetTimes) {
+        //       net.times = 0;
+        //       this.mqttClients && this.mqttClients[net.index]?.end();
+        //     }
+        //     setTimeout(()=>{
+        //       if (net.times < this.store.options.reconnetTimes) {
+        //         this.mqttClients[net.index].reconnect(options as any);
+        //         reconnectDelay = Math.min(reconnectDelay * 2, 10 * 1000);
+        //       }
+        //     },reconnectDelay)
+        //   }
+        // });
         this.mqttClients[net.index].on('connect', (connack) => {
-            reconnectDelay = 1000;
+            // reconnectDelay = 1000;
             if (!connack.sessionPresent) {
                 // 创建了新会话或没有找到旧会话，需要重新订阅主题
                 if (net.topics) {
@@ -2633,7 +2634,7 @@ export class Meta2d {
         const res = await fetch('/api/iot/app/mqtt', {
             method: 'GET',
             headers: {
-                Authorization: `Bearer ${getToken()}`,
+                Authorization: getToken(),
             },
         });
         if (res.ok) {
@@ -2650,7 +2651,7 @@ export class Meta2d {
         const res = await fetch('/api/iot/subscribe/properties', {
             method: 'POST',
             headers: {
-                Authorization: `Bearer ${getToken()}`,
+                Authorization: getToken(),
             },
             body: JSON.stringify({ devices: devices, type }),
         });
@@ -2663,7 +2664,7 @@ export class Meta2d {
         const ret = await fetch(`/api/iot/unsubscribe/properties`, {
             method: 'POST',
             headers: {
-                Authorization: `Bearer ${getToken()}`,
+                Authorization: getToken(),
             },
             body: JSON.stringify({ token }),
         });
@@ -2688,7 +2689,7 @@ export class Meta2d {
         const res = await fetch(`/api/iot/data/sql/${method}`, {
             method: 'POST',
             headers: {
-                Authorization: `Bearer ${getCookie('token') || localStorage.getItem('token') || new URLSearchParams(location.search).get('token') || ''}`,
+                Authorization: getToken(),
             },
             body: JSON.stringify({ dbId: sql.dbId || sql.dbid, sql: _sql, }),
         });