@meta2d/core 1.0.81 → 1.0.83

package/src/core.d.ts

@@ -257,6 +257,7 @@ export declare class Meta2d {
     iotTimer: any;
     iotWebsocketClient: WebSocket;
     connectIot(): Promise<void>;
+    closeIot(): void;
     connectSqls(): void;
     connectSSE(net: Network): void;
     closeSSE(): void;
@@ -264,6 +265,7 @@ export declare class Meta2d {
     connectNetWebSocket(net: Network): void;
     getMqttUrl(): Promise<string>;
     getIotToken(devices: any, type: number): Promise<any>;
+    unsubscribeIot(token: string): Promise<any>;
     doSqlCode(sql: Sql): Promise<void>;
     randomString(e: number): string;
     mockValue(data: any): any;
@@ -282,6 +284,7 @@ export declare class Meta2d {
         url?: string;
         method?: string;
         name?: string;
+        net?: Network;
     }): void;
     setDatas(datas: {
         dataId?: string;

package/src/core.js

@@ -234,7 +234,7 @@ export class Meta2d {
                     let keys = url.match(/\$\{([^}]+)\}/g)?.map(m => m.slice(2, -1));
                     if (keys) {
                         keys?.forEach((key) => {
-                            url = url.replace(`\${${key}}`, pen[key]);
+                            url = url.replace(`\${${key}}`, pen[key] || this.getDynamicParam(key));
                         });
                     }
                 }
@@ -434,7 +434,7 @@ export class Meta2d {
                     let keys = e.params.match(/\$\{([^}]+)\}/g)?.map(m => m.slice(2, -1));
                     if (keys) {
                         keys?.forEach((key) => {
-                            url = url.replace(`\${${key}}`, pen[key]);
+                            url = url.replace(`\${${key}}`, pen[key] || this.getDynamicParam(key));
                         });
                     }
                 }
@@ -1000,7 +1000,8 @@ export class Meta2d {
     loadLineAnimateDraws() {
         globalStore.lineAnimateDraws = {};
         Object.entries(this.store.data.lineAnimateDraws).forEach(([key, drawFunc]) => {
-            globalStore.lineAnimateDraws[key] = eval(drawFunc);
+            // @ts-ignore
+            globalStore.lineAnimateDraws[key] = new Function('ctx', 'pen', 'state', 'index', drawFunc);
         });
     }
     statistics() {
@@ -1370,10 +1371,10 @@ export class Meta2d {
     registerCanvasDraw = registerCanvasDraw;
     registerAnchors = registerAnchors;
     registerLineAnimateDraws = (name, drawFunc) => {
-        drawFunc = typeof drawFunc === 'string' ? drawFunc : drawFunc.toString();
         this.store.data.lineAnimateDraws[name] = drawFunc;
         // 同步到store
-        globalStore.lineAnimateDraws[name] = eval(drawFunc);
+        // @ts-ignore
+        globalStore.lineAnimateDraws[name] = new Function('ctx', 'pen', 'state', 'index', drawFunc);
     };
     updateLineAnimateDraws(name, option) {
         if (!option)
@@ -1951,9 +1952,6 @@ export class Meta2d {
             ...Object.keys(this.store.bind),
             ...Object.keys(this.store.bindDatas),
         ];
-        Object.entries(globalStore.lineAnimateDraws).forEach(([key, drawFunc]) => {
-            data.lineAnimateDraws[key] = drawFunc.toString();
-        });
         return data;
     }
     copy(pens) {
@@ -2240,6 +2238,8 @@ export class Meta2d {
                         headers: net.headers || undefined,
                         method: net.method,
                         body: net.body,
+                        enable: net.enable,
+                        index: net.index
                     });
                     httpIndex += 1;
                 }
@@ -2297,7 +2297,7 @@ export class Meta2d {
     iotWebsocketClient;
     async connectIot() {
         const { iot } = this.store.data;
-        if (!(iot && iot?.devices?.length)) {
+        if (!(iot && iot?.devices?.length) || (iot && iot.enable === false)) {
             return;
         }
         const url = globalThis.iotUrl || await this.getMqttUrl();
@@ -2340,27 +2340,44 @@ export class Meta2d {
         //   };
         // }
     }
+    closeIot() {
+        if (this.iotMqttClient) {
+            const { iot } = this.store.data;
+            if (iot?.token) {
+                this.unsubscribeIot(iot.token);
+            }
+            this.iotMqttClient.end();
+            this.iotMqttClient = undefined;
+        }
+        clearInterval(this.iotTimer);
+        this.iotTimer = undefined;
+    }
     //  type SqlType = 'list' | 'get' | 'exec' | 'add' | 'update' | 'delete';
     connectSqls() {
         const { sqls } = this.store.data;
         if (sqls && sqls.length) {
-            let sqlIndex = 0;
-            sqls.forEach(async (sql) => {
-                await this.doSqlCode(sql);
-                if (sql.interval) {
-                    sql.index = sqlIndex;
-                    this.sqlTimerList[sqlIndex] = setInterval(async () => {
-                        await this.doSqlCode(sql);
-                    }, sql.interval);
-                    sqlIndex += 1;
+            // let sqlIndex = 0;
+            sqls.forEach(async (sql, index) => {
+                if (sql.enable !== false) {
+                    await this.doSqlCode(sql);
+                    if (sql.interval) {
+                        sql.index = index;
+                        this.sqlTimerList[index] = setInterval(async () => {
+                            await this.doSqlCode(sql);
+                        }, sql.interval);
+                        // index += 1;
+                    }
                 }
             });
         }
     }
     connectSSE(net) {
+        if (net.enable === false) {
+            return;
+        }
         this.eventSources[net.index] = new EventSource(net.url, { withCredentials: net.withCredentials });
         this.eventSources[net.index].onmessage = (e) => {
-            this.socketCallback(e.data, { type: 'SSE', url: net.url, name: net.name });
+            this.socketCallback(e.data, { type: 'SSE', url: net.url, name: net.name, net });
         };
         this.eventSources[net.index].onerror = (error) => {
             this.store.emitter.emit('error', { type: 'SSE', error });
@@ -2376,6 +2393,9 @@ export class Meta2d {
             });
     }
     connectNetMqtt(net) {
+        if (net.enable === false) {
+            return;
+        }
         if (net.options.clientId && !net.options.customClientId) {
             net.options.clientId = s8();
         }
@@ -2412,7 +2432,8 @@ export class Meta2d {
                 topic,
                 type: 'mqtt',
                 url: net.url,
-                name: net.name
+                name: net.name,
+                net
             });
         });
         this.mqttClients[net.index].on('error', (error) => {
@@ -2446,6 +2467,9 @@ export class Meta2d {
             this.websockets[net.index]?.close();
             this.websockets[net.index] = undefined;
         }
+        if (net.enable === false) {
+            return;
+        }
         let url = net.url;
         if (url.indexOf('${') > -1) {
             let keys = url.match(/\$\{([^}]+)\}/g)?.map(m => m.slice(2, -1));
@@ -2457,7 +2481,7 @@ export class Meta2d {
         }
         this.websockets[net.index] = new WebSocket(url, net.protocols || undefined);
         this.websockets[net.index].onmessage = (e) => {
-            this.socketCallback(e.data, { type: 'websocket', url: net.url, name: net.name });
+            this.socketCallback(e.data, { type: 'websocket', url: net.url, name: net.name, net });
         };
         this.websockets[net.index].onerror = (error) => {
             this.store.emitter.emit('error', { type: 'websocket', error });
@@ -2509,6 +2533,16 @@ export class Meta2d {
             return JSON.parse(data).token;
         }
     }
+    async unsubscribeIot(token) {
+        const ret = await fetch(`/api/iot/unsubscribe/properties`, {
+            method: 'POST',
+            headers: {
+                Authorization: `Bearer ${getToken()}`,
+            },
+            body: JSON.stringify({ token }),
+        });
+        return ret;
+    }
     async doSqlCode(sql) {
         const method = sql.method || 'get';
         let _sql = sql.sql;
@@ -2520,13 +2554,17 @@ export class Meta2d {
             headers: {
                 Authorization: `Bearer ${getCookie('token') || localStorage.getItem('token') || new URLSearchParams(location.search).get('token') || ''}`,
             },
-            body: JSON.stringify({ dbid: sql.dbid, sql: _sql, }),
+            body: JSON.stringify({ dbId: sql.dbId || sql.dbid, sql: _sql, }),
         });
         if (res.ok) {
             let data = await res.text();
             if (data) {
                 const arr = [];
                 data = JSON.parse(data);
+                if (data.error) {
+                    this.store.emitter.emit('error', { type: 'sql', error: data.error });
+                    return;
+                }
                 sql.keys?.forEach((key) => {
                     arr.push({ id: sql.bindId + '#' + key, value: getter(data, key.split('#').join('.')) });
                 });
@@ -2760,7 +2798,9 @@ export class Meta2d {
         }
         if (!this.store.data.cancelFirstConnect) {
             https.forEach(async (_item) => {
-                this.requestHttp(_item);
+                if (_item.enable !== false) {
+                    this.requestHttp(_item);
+                }
             });
         }
         // if( enable ){
@@ -2777,18 +2817,25 @@ export class Meta2d {
         // }
         https.forEach((_item, index) => {
             _item.times = 0;
-            if (_item.interval !== 0) {
-                this.updateTimerList[index] = setInterval(async () => {
-                    this.requestHttp(_item);
-                    if (this.store.options.reconnetTimes) {
-                        // _item.times++;
-                        if (_item.times >= this.store.options.reconnetTimes) {
-                            _item.times = 0;
-                            clearInterval(this.updateTimerList[index]);
-                            this.updateTimerList[index] = undefined;
+            if (_item.interval !== 0 && _item.enable !== false) {
+                if (_item.once) {
+                    setTimeout(async () => {
+                        this.requestHttp(_item);
+                    }, _item.interval || 1000);
+                }
+                else {
+                    this.updateTimerList[index] = setInterval(async () => {
+                        this.requestHttp(_item);
+                        if (this.store.options.reconnetTimes) {
+                            // _item.times++;
+                            if (_item.times >= this.store.options.reconnetTimes) {
+                                _item.times = 0;
+                                clearInterval(this.updateTimerList[index]);
+                                this.updateTimerList[index] = undefined;
+                            }
                         }
-                    }
-                }, _item.interval || 1000);
+                    }, _item.interval || 1000);
+                }
             }
         });
     }
@@ -2831,7 +2878,8 @@ export class Meta2d {
             });
             if (res.ok) {
                 const data = await res.text();
-                this.socketCallback(data, { type: 'http', url: req.url, name: req.name });
+                const net = this.store.data.networks.filter(item => item.protocol === 'http')[req.index];
+                this.socketCallback(data, { type: 'http', url: req.url, name: req.name, net });
             }
             else {
                 _req.times++;
@@ -2866,12 +2914,13 @@ export class Meta2d {
                 clearInterval(_sqlTimer);
                 _sqlTimer = undefined;
             });
-        if (this.iotMqttClient) {
-            this.iotMqttClient.end();
-            this.iotMqttClient = undefined;
-        }
-        clearInterval(this.iotTimer);
-        this.iotTimer = undefined;
+        this.closeIot();
+        // if(this.iotMqttClient){
+        //   this.iotMqttClient.end();
+        //   this.iotMqttClient = undefined;
+        // }
+        // clearInterval(this.iotTimer);
+        // this.iotTimer = undefined;
         // if(this.iotWebsocketClient){
         //   this.iotWebsocketClient.onclose = undefined;
         //   this.iotWebsocketClient.close();
@@ -2883,6 +2932,26 @@ export class Meta2d {
     socketCallback(message, context) {
         this.store.emitter.emit('socket', { message, context });
         let _message = message;
+        if (context.net?.socketCbJs) {
+            if (!context.net?.socketFn) {
+                context.net.socketFn = new Function('e', 'context', context.net.socketCbJs);
+            }
+            if (context.net.socketFn) {
+                _message = context.net.socketFn(message, {
+                    meta2d: this,
+                    type: context.type,
+                    topic: context.topic,
+                    url: context.url,
+                    method: context.method,
+                });
+                if (!_message) {
+                    return;
+                }
+                if (_message && _message !== true) {
+                    message = _message;
+                }
+            }
+        }
         if (this.socketFn) {
             _message = this.socketFn(message, {
                 meta2d: this,
@@ -4114,6 +4183,17 @@ export class Meta2d {
                     pen.onResize?.(pen);
                 }
             });
+            const videoPens = this.store.data.pens.filter((pen) => pen.name === 'video');
+            videoPens?.forEach((pen) => {
+                const worldRect = pen.calculative.worldRect;
+                if (worldRect.width / this.store.data.scale > rect.width * 0.8) {
+                    //作为背景的video
+                    pen.calculative.worldRect.x = worldRect.x - wGap / 2;
+                    pen.calculative.worldRect.width = worldRect.width + wGap;
+                    pen.calculative.worldRect.ex = worldRect.ex + wGap;
+                    pen.onResize?.(pen);
+                }
+            });
         }
         //高度拉伸
         if (Math.abs(hGap) > 10) {
@@ -4216,6 +4296,17 @@ export class Meta2d {
                     pen.onResize?.(pen);
                 }
             });
+            const videoPens = this.store.data.pens.filter((pen) => pen.name === 'video');
+            videoPens?.forEach((pen) => {
+                const worldRect = pen.calculative.worldRect;
+                if (worldRect.height / this.store.data.scale > rect.height * 0.8) {
+                    //作为背景的video
+                    pen.calculative.worldRect.y = worldRect.y - hGap / 2;
+                    pen.calculative.worldRect.height = worldRect.height + hGap;
+                    pen.calculative.worldRect.ey = worldRect.ey + hGap;
+                    pen.onResize?.(pen);
+                }
+            });
         }
         this.canvas.canvasTemplate.fit = true;
         this.canvas.canvasTemplate.init();