@meta2d/core 1.0.70 → 1.0.72

package/src/core.d.ts

@@ -3,7 +3,7 @@ import { Canvas } from './canvas';
 import { Options, PenPlugin, PluginOptions } from './options';
 import { calcTextDrawRect, calcTextLines, calcTextRect, facePen, getWords, LockState, Pen, renderPenRaw, IValue, setElemPosition } from './pen';
 import { Point } from './point';
-import { EditAction, register, registerAnchors, registerCanvasDraw, Meta2dData, Meta2dStore, Network, HttpOptions } from './store';
+import { EditAction, register, registerAnchors, registerCanvasDraw, Meta2dData, Meta2dStore, Network, HttpOptions, Sql } from './store';
 import { Padding } from './utils';
 import { Rect } from './rect';
 import { Event, TriggerCondition } from './event';
@@ -17,6 +17,7 @@ export declare class Meta2d {
     mqttClient: MqttClient;
     websockets: WebSocket[];
     mqttClients: MqttClient[];
+    eventSources: EventSource[];
     penPluginMap: Map<PenPlugin, {
         tag?: string;
         name?: string;
@@ -235,9 +236,17 @@ export declare class Meta2d {
     updateTimerList: any[];
     sqlTimerList: any[];
     connectNetwork(): void;
+    iotMqttClient: MqttClient;
+    iotTimer: any;
+    iotWebsocketClient: WebSocket;
+    connectIot(): Promise<void>;
+    connectSqls(): void;
+    connectSSE(net: Network): void;
+    closeSSE(): void;
     connectNetWebSocket(net: Network): void;
-    getIotToken(devices: any): Promise<any>;
-    doSqlCode(type: string, dbid: string, sql: string): Promise<void>;
+    getMqttUrl(): Promise<string>;
+    getIotToken(devices: any, type: number): Promise<any>;
+    doSqlCode(sql: Sql): Promise<void>;
     randomString(e: number): string;
     mockValue(data: any): any;
     dataMock(): void;

package/src/core.js

@@ -13,9 +13,10 @@ import pkg from '../package.json';
 import { lockedError } from './utils/error';
 import { Scroll } from './scroll';
 import { getter } from './utils/object';
-import { getCookie, getMeta2dData, queryURLParams } from './utils/url';
+import { getCookie, getMeta2dData, getToken, queryURLParams } from './utils/url';
 import { HotkeyType } from './data';
 import { Message, messageList } from './message';
+import { closeJetLinks, connectJetLinks, getSendData, sendJetLinksData } from './utils/jetLinks';
 import { le5leTheme } from './theme';
 export class Meta2d {
     store;
@@ -24,6 +25,7 @@ export class Meta2d {
     mqttClient;
     websockets;
     mqttClients;
+    eventSources;
     penPluginMap = new Map();
     socketFn;
     events = {};
@@ -133,6 +135,7 @@ export class Meta2d {
                 this.canvas.scroll && this.canvas.scroll.hide();
             }
         }
+        this.canvas?.initGlobalStyle();
     }
     getOptions() {
         return this.store.options;
@@ -150,6 +153,11 @@ export class Meta2d {
         // 更新全局的主题css变量 
         le5leTheme.updateCssRule(this.store.id, theme);
         this.canvas.initGlobalStyle();
+        for (let i = 0; i < this.store.data.pens.length; i++) {
+            const pen = this.store.data.pens[i];
+            // 调用pen的主题设置函数,如果单个pen有主题的自定义设置的话
+            pen.setTheme && pen.setTheme(pen, this.store.styles);
+        }
         this.render();
     }
     setDatabyOptions(options = {}) {
@@ -368,6 +376,16 @@ export class Meta2d {
                         });
                     }
                 }
+                Object.keys(e.extend).forEach((key) => {
+                    if (!['x', 'y', 'width', 'height'].includes(key)) {
+                        if (url.indexOf('?') !== -1) {
+                            url += `&${key}=${e.extend[key]}`;
+                        }
+                        else {
+                            url += `?${key}=${e.extend[key]}`;
+                        }
+                    }
+                });
                 const data = this.getEventData(e.list, pen);
                 this.canvas.dialog.show(e.value, url, e.extend, data);
             }
@@ -375,51 +393,10 @@ export class Meta2d {
         this.events[EventAction.SendData] = (pen, e) => {
             if (e.list?.length) {
                 // if (e.targetType === 'id') {
-                if (e.network && e.network.protocol === 'jetLinks') {
-                    const list = [];
-                    e.list.forEach((item, index) => {
-                        const _pen = item.params ? this.findOne(item.params) : pen;
-                        list[index] = {
-                            deviceId: _pen.deviceId,
-                            productId: _pen.productId,
-                            properties: {},
-                        };
-                        for (let key in item.value) {
-                            if (item.value[key] === undefined || item.value[key] === '') {
-                                //找到绑定了这个设备属性的图元属性
-                                const realTime = _pen.realTimes?.find((item) => item.propertyId === key);
-                                if (realTime) {
-                                    list[index].properties[key] = _pen[realTime.key];
-                                }
-                            }
-                            else if (typeof item.value[key] === 'string' &&
-                                item.value[key]?.indexOf('${') > -1) {
-                                let keys = item.value[key].match(/\$\{([^}]+)\}/g)?.map(m => m.slice(2, -1));
-                                if (keys?.length) {
-                                    list[index].properties[key] =
-                                        _pen[keys[0]] ?? this.getDynamicParam(keys[0]);
-                                }
-                            }
-                            else {
-                                list[index].properties[key] = item.value[key];
-                            }
-                        }
-                    });
-                    if (this.jetLinksClient && list.length) {
-                        list.forEach((item) => {
-                            this.jetLinksClient.send(JSON.stringify({
-                                type: 'sub',
-                                topic: `/device-message-sender/${item.productId}/${item.deviceId}`,
-                                parameter: {
-                                    messageType: 'WRITE_PROPERTY',
-                                    properties: item.properties,
-                                    headers: {
-                                        async: false,
-                                    },
-                                },
-                                id: item.productId + '/' + item.deviceId + '-' + s8(),
-                            }));
-                        });
+                if (e.network && e.network.protocol === 'ADIIOT') {
+                    const list = getSendData(this, pen, e);
+                    if (list.length) {
+                        sendJetLinksData(this, list);
                     }
                     return;
                 }
@@ -558,6 +535,7 @@ export class Meta2d {
         const data = await getMeta2dData(this.store, id);
         if (data) {
             this.open(data);
+            this.fitView(true, 10);
         }
     }
     doSendDataEvent(value, topics) {
@@ -949,9 +927,47 @@ export class Meta2d {
     initBinds() {
         this.jetLinksList = [];
         this.store.bind = {};
+        const devices = [];
+        const properties = [];
         this.store.data.pens.forEach((pen) => {
             pen.realTimes?.forEach((realTime) => {
                 if (realTime.bind && realTime.bind.id) {
+                    // if (!this.store.bind[realTime.bind.id]) {
+                    //   this.store.bind[realTime.bind.id] = [];
+                    // }
+                    // this.store.bind[realTime.bind.id].push({
+                    //   id: pen.id,
+                    //   key: realTime.key,
+                    // });
+                    //JetLinks
+                    let productId = realTime.productId || pen.productId;
+                    let deviceId = realTime.deviceId || pen.deviceId;
+                    let propertyId = realTime.propertyId;
+                    let flag = false;
+                    if (productId && productId.indexOf('${') > -1) {
+                        let keys = productId.match(/(?<=\$\{).*?(?=\})/g);
+                        if (keys?.length) {
+                            productId = this.getDynamicParam(keys[0]) || productId;
+                        }
+                        flag = true;
+                    }
+                    if (deviceId && deviceId.indexOf('${') > -1) {
+                        let keys = deviceId.match(/(?<=\$\{).*?(?=\})/g);
+                        if (keys?.length) {
+                            deviceId = this.getDynamicParam(keys[0]) || deviceId;
+                        }
+                        flag = true;
+                    }
+                    if (propertyId && propertyId.indexOf('${') > -1) {
+                        let keys = propertyId.match(/(?<=\$\{).*?(?=\})/g);
+                        if (keys?.length) {
+                            propertyId = this.getDynamicParam(keys[0]) || propertyId;
+                        }
+                        flag = true;
+                    }
+                    if (flag) {
+                        realTime.bind && (realTime.bind.id = productId + '#' + deviceId + '#' + propertyId);
+                    }
                     if (!this.store.bind[realTime.bind.id]) {
                         this.store.bind[realTime.bind.id] = [];
                     }
@@ -959,10 +975,6 @@ export class Meta2d {
                         id: pen.id,
                         key: realTime.key,
                     });
-                    //JetLinks
-                    const productId = realTime.productId || pen.productId;
-                    const deviceId = realTime.deviceId || pen.deviceId;
-                    const propertyId = realTime.propertyId;
                     if (productId && deviceId && propertyId) {
                         const index = this.jetLinksList.findIndex((item) => item.topic.startsWith(`/${productId}/${deviceId}`));
                         if (index > -1) {
@@ -979,9 +991,55 @@ export class Meta2d {
                             });
                         }
                     }
+                    if (realTime.bind.class === 'iot') {
+                        let bind = realTime.bind.id.split('#');
+                        let idx = devices.findIndex((item) => item.deviceId === bind[0]);
+                        if (idx > -1) {
+                            if (!devices[idx].properties.includes(bind[1])) {
+                                devices[idx].properties.push(bind[1]);
+                            }
+                        }
+                        else {
+                            devices.push({
+                                deviceId: bind[0],
+                                properties: [bind[1]],
+                                token: realTime.bind.token
+                            });
+                        }
+                        let index = properties.findIndex((item) => item.key === realTime.bind.id);
+                        if (index === -1) {
+                            properties.push({
+                                key: realTime.bind.id,
+                                label: realTime.bind.label,
+                            });
+                        }
+                    }
+                    else if (realTime.bind.class === 'sql') {
+                        let bind = realTime.bind.id.split('#');
+                        const sql = this.store.data.sqls.find((item) => item.bindId === bind[0]);
+                        if (sql) {
+                            if (!sql.keys) {
+                                sql.keys = [];
+                            }
+                            bind.shift();
+                            const key = bind.join('#');
+                            if (!sql.keys.includes(key)) {
+                                sql.keys.push(key);
+                            }
+                        }
+                    }
                 }
             });
         });
+        if (devices.length) {
+            if (!this.store.data.iot) {
+                this.store.data.iot = {};
+            }
+            this.store.data.iot.devices = devices;
+        }
+        if (properties.length) {
+            this.store.data.iot.list = properties;
+        }
     }
     connectSocket() {
         this.connectWebsocket();
@@ -1929,8 +1987,10 @@ export class Meta2d {
             let mqttIndex = 0;
             this.mqttClients = [];
             let websocketIndex = 0;
+            let sseIndex = 0;
             let sqlIndex = 0;
             this.websockets = [];
+            this.eventSources = [];
             networks.forEach(async (net) => {
                 // if (net.type === 'subscribe') {
                 if (net.protocol === 'mqtt') {
@@ -1999,93 +2059,101 @@ export class Meta2d {
                         body: net.body,
                     });
                 }
-                else if (net.protocol === 'iot') {
-                    const token = await this.getIotToken(net.devices);
-                    //物联网设备
-                    if (net.method === 'mqtt') {
-                        net.index = mqttIndex;
-                        this.mqttClients[mqttIndex] = mqtt.connect(net.url);
-                        this.mqttClients[mqttIndex].on('message', (topic, message) => {
-                            this.socketCallback(message.toString(), {
-                                topic: `le5le-iot/properties/${token}`,
-                                type: 'iot',
-                                url: net.url,
-                                method: 'mqtt',
-                            });
-                        });
-                        this.mqttClients[mqttIndex].on('error', (error) => {
-                            this.store.emitter.emit('error', { type: 'mqtt', error });
-                        });
-                        this.mqttClients[mqttIndex].subscribe(`le5le-iot/properties/${token}`);
-                        mqttIndex += 1;
-                    }
-                    else if (net.method === 'websocket') {
-                        net.index = websocketIndex;
-                        this.websockets[websocketIndex] = new WebSocket(`${location.protocol === 'https:' ? 'wss' : 'ws'}://${location.host}/api/ws/iot/properties`, token);
-                        this.websockets[websocketIndex].onmessage = (e) => {
-                            this.socketCallback(e.data, { type: 'iot', method: 'websocket' });
-                        };
-                        this.websockets[websocketIndex].onerror = (error) => {
-                            this.store.emitter.emit('error', { type: 'websocket', error });
-                        };
-                        websocketIndex += 1;
-                    }
+                else if (net.protocol === 'ADIIOT') {
+                    connectJetLinks(this, net);
                 }
-                else if (net.protocol === 'sql') {
-                    await this.doSqlCode('list', net.dbId, net.sql);
-                    if (net.interval) {
-                        net.index = sqlIndex;
-                        this.sqlTimerList[sqlIndex] = setInterval(async () => {
-                            await this.doSqlCode('list', net.dbId, net.sql);
-                        }, net.interval);
-                        sqlIndex += 1;
-                    }
-                }
-                else if (net.protocol === 'jetLinks') {
-                    if (this.jetLinksList.length) {
-                        this.jetLinksClient = new WebSocket(`${net.url}/${localStorage.getItem('X-Access-Token') ||
-                            getCookie('X-Access-Token') ||
-                            new URLSearchParams(location.search).get('X-Access-Token') ||
-                            ''}`
-                        // 'ws://8.134.86.52:29000/api/messaging/961d8b395298d3ec3a021df70d6b6ca4'
-                        );
-                        //消息接收
-                        this.jetLinksClient.onmessage = (e) => {
-                            const mess = JSON.parse(e.data);
-                            if (mess.payload &&
-                                mess.payload.success &&
-                                mess.payload?.properties) {
-                                const data = [];
-                                for (let key in mess.payload.properties) {
-                                    if (!key.startsWith('_')) {
-                                        data.push({
-                                            id: `${mess.payload.headers.productId}#${mess.payload.deviceId}#${key}`,
-                                            value: mess.payload.properties[key],
-                                        });
-                                    }
-                                }
-                                this.setDatas(data, { history: false });
-                            }
-                        };
-                        this.jetLinksClient.onopen = () => {
-                            this.jetLinksList.forEach((item) => {
-                                this.jetLinksClient.send(JSON.stringify({
-                                    type: 'sub',
-                                    topic: `/device${item.topic}/message/property/report`,
-                                    parameter: {
-                                        deviceId: item.deviceId,
-                                        properties: item.properties,
-                                        history: 1,
-                                    },
-                                    id: item.topic + '-' + s8(),
-                                }));
-                            });
-                        };
-                    }
+                else if (net.protocol === 'SSE') {
+                    net.index = sseIndex;
+                    this.connectSSE(net);
+                    sseIndex += 1;
                 }
             });
         }
         this.onNetworkConnect(https);
+        this.connectIot();
+        this.connectSqls();
+    }
+    iotMqttClient;
+    iotTimer;
+    iotWebsocketClient;
+    async connectIot() {
+        const { iot } = this.store.data;
+        if (!(iot && iot?.devices?.length)) {
+            return;
+        }
+        const url = globalThis.iotUrl || await this.getMqttUrl();
+        if (!url) {
+            console.warn('iot Request address error');
+            return;
+        }
+        const token = await this.getIotToken(iot.devices, iot.protocol === 'websocket' ? 1 : undefined);
+        //物联网设备
+        // if(iot.protocol === 'mqtt'){
+        // const url ='ws://192.168.110.148:8083/mqtt'; //`${location.protocol === 'https:'?'wss':'ws'}://${iot.host}:${location.protocol === 'https:'?'8084':'8083'}/mqtt`
+        this.iotMqttClient = mqtt.connect(url);
+        this.iotMqttClient.on('message', (topic, message) => {
+            this.socketCallback(message.toString(), {
+                topic: `le5le-iot/properties/${token}`,
+                type: 'iot',
+                url,
+                method: 'mqtt'
+            });
+        });
+        this.iotMqttClient.on('error', (error) => {
+            this.store.emitter.emit('error', { type: 'mqtt', error });
+        });
+        this.iotMqttClient.subscribe(`le5le-iot/properties/${token}`);
+        this.iotTimer = setInterval(() => {
+            this.iotMqttClient && this.iotMqttClient.publish(`le5le-iot/subscribe/ping`, token);
+        }, 300000);
+        // }else if(iot.protocol === 'websocket'){
+        //   const url = 'ws://192.168.110.6/api/ws/iot/properties'// `${location.protocol === 'https:'?'wss':'ws'}://${location.host}/api/ws/iot/properties`
+        //   this.iotWebsocketClient = new WebSocket(
+        //     url,
+        //     token
+        //   );
+        //   this.iotWebsocketClient.onmessage = (e) => {
+        //     this.socketCallback(e.data, { type: 'iot', method: 'websocket' });   
+        //   };
+        //   this.iotWebsocketClient.onerror = (error) => {
+        //     this.store.emitter.emit('error', { type: 'websocket', error });
+        //   };
+        // }
+    }
+    //  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;
+                }
+            });
+        }
+    }
+    connectSSE(net) {
+        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 });
+        };
+        this.eventSources[net.index].onerror = (error) => {
+            this.store.emitter.emit('error', { type: 'SSE', error });
+        };
+    }
+    closeSSE() {
+        this.eventSources &&
+            this.eventSources.forEach((es) => {
+                if (es) {
+                    es.close();
+                    es = undefined;
+                }
+            });
     }
     connectNetWebSocket(net) {
         if (this.websockets[net.index]) {
@@ -2117,28 +2185,59 @@ export class Meta2d {
             }, 2000);
         };
     }
-    async getIotToken(devices) {
+    async getMqttUrl() {
+        const res = await fetch('/api/iot/app/mqtt', {
+            method: 'GET',
+            headers: {
+                Authorization: `Bearer ${getToken()}`,
+            },
+        });
+        if (res.ok) {
+            const data = await res.text();
+            let results = JSON.parse(data);
+            let port = results.wssPort || results.wsPort;
+            if (!port) {
+                return;
+            }
+            return `${location.protocol === 'https:' ? 'wss' : 'ws'}://${results.host}:${location.protocol === 'https:' ? results.wssPort : results.wsPort}${results.path}`;
+        }
+    }
+    async getIotToken(devices, type) {
         const res = await fetch('/api/iot/subscribe/properties', {
             method: 'POST',
-            body: JSON.stringify({ devices: devices }),
+            headers: {
+                Authorization: `Bearer ${getToken()}`,
+            },
+            body: JSON.stringify({ devices: devices, type }),
         });
         if (res.ok) {
             const data = await res.text();
             return JSON.parse(data).token;
         }
     }
-    async doSqlCode(type, dbid, sql) {
-        const res = await fetch(`/api/iot/data/sql/${type}`, {
+    async doSqlCode(sql) {
+        const method = sql.method || 'get';
+        let _sql = sql.sql;
+        if (method === 'list') {
+            _sql += ` LIMIT ${sql.pageSize || 20}` + (sql.current > 1 ? (' OFFSET ' + (sql.current - 1) * sql.pageSize) : '');
+        }
+        const res = await fetch(`/api/iot/data/sql/${method}`, {
             method: 'POST',
-            body: JSON.stringify({ dbid, sql }),
+            headers: {
+                Authorization: `Bearer ${getCookie('token') || localStorage.getItem('token') || new URLSearchParams(location.search).get('token') || ''}`,
+            },
+            body: JSON.stringify({ dbid: sql.dbid, sql: _sql, }),
         });
         if (res.ok) {
-            const data = await res.text();
+            let data = await res.text();
             if (data) {
-                this.socketCallback(data, {
-                    type: 'sql',
-                    url: `/api/iot/data/sql/${type}`,
+                const arr = [];
+                data = JSON.parse(data);
+                sql.keys?.forEach((key) => {
+                    arr.push({ id: sql.bindId + '#' + key, value: getter(data, key.split('#').join('.')) });
                 });
+                arr.push({ id: sql.bindId, value: data });
+                this.socketCallback(JSON.stringify(arr), { type: 'sql', url: `/api/iot/data/sql/${method}`, method });
             }
         }
     }
@@ -2473,6 +2572,19 @@ export class Meta2d {
                 clearInterval(_sqlTimer);
                 _sqlTimer = undefined;
             });
+        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();
+        //   this.iotWebsocketClient = undefined;
+        // }
+        closeJetLinks(this);
+        this.closeSSE();
     }
     socketCallback(message, context) {
         this.store.emitter.emit('socket', { message, context });