@meta2d/core 1.0.90 → 1.0.92

package/src/core.js

@@ -13,7 +13,7 @@ import pkg from '../package.json';
 import { lockedError } from './utils/error';
 import { Scroll } from './scroll';
 import { getter } from './utils/object';
-import { getCookie, getMeta2dData, getToken, queryURLParams } from './utils/url';
+import { d, getCookie, getMeta2dData, getToken, queryURLParams } from './utils/url';
 import { HotkeyType } from './data';
 import { Message, messageList } from './message';
 import { closeJetLinks, connectJetLinks, getSendData, sendJetLinksData } from './utils/jetLinks';
@@ -1261,15 +1261,21 @@ export class Meta2d {
                 });
             });
         });
+        if (!this.store.data.iot) {
+            this.store.data.iot = {};
+        }
         if (devices.length) {
-            if (!this.store.data.iot) {
-                this.store.data.iot = {};
-            }
             this.store.data.iot.devices = devices;
         }
+        else {
+            delete this.store.data.iot.devices;
+        }
         if (properties.length) {
             this.store.data.iot.list = properties;
         }
+        else {
+            delete this.store.data.iot.list;
+        }
     }
     connectSocket() {
         this.connectWebsocket();
@@ -2019,6 +2025,7 @@ export class Meta2d {
         return getAllFollowers(pen, this.store);
     }
     data() {
+        this.initBinds();
         const data = deepClone(this.store.data);
         const { pens, paths } = this.store.data;
         data.version = pkg.version;
@@ -2516,11 +2523,11 @@ export class Meta2d {
             Object.assign(options, { keepallive: 30 });
         }
         //  clean为false 时，clientId 是必填项 
-        if (options.clientId && !options.hasOwnProperty("clean")) {
-            Object.assign(options, { clean: false });
-        }
+        // if(options.clientId && !options.hasOwnProperty("clean")){
+        //   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 });
@@ -2538,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) {
@@ -2942,8 +2950,15 @@ export class Meta2d {
     // }
     //获取动态参数
     getDynamicParam(key) {
+        let lsValue = localStorage.getItem(key);
+        if (globalThis.le5leTokenD) {
+            let tokenkeys = [globalThis.le5leSSOTokenName ?? 'ssotoken', globalThis.le5leTokenName ?? 'token'];
+            if (tokenkeys.includes(key)) {
+                lsValue = d(lsValue);
+            }
+        }
         let params = queryURLParams();
-        let value = params[key] || localStorage[key] || getCookie(key) || globalThis[key] || '';
+        let value = params[key] || lsValue || getCookie(key) || globalThis[key] || '';
         return value;
     }
     onNetworkConnect(https) {