@meta2d/core 1.0.53 → 1.0.54

package/src/core.d.ts

@@ -185,8 +185,10 @@ export declare class Meta2d {
     undo(): void;
     redo(): void;
     listenSocket(): boolean;
+    websocketTimes: number;
     connectWebsocket(websocket?: string): void;
     closeWebsocket(): void;
+    mqttTimes: number;
     connectMqtt(params?: {
         mqtt: string;
         mqttTopics: string;
@@ -207,6 +209,7 @@ export declare class Meta2d {
     updateTimer: any;
     updateTimerList: any[];
     connectNetwork(): void;
+    connectNetWebSocket(net: Network): void;
     randomString(e: number): string;
     mockValue(data: any): any;
     dataMock(): void;

package/src/core.js

@@ -83,7 +83,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 import { commonAnchors, commonPens, cube } from './diagrams';
 import { Canvas } from './canvas';
-import { calcInView, calcTextDrawRect, calcTextLines, calcTextRect, facePen, formatAttrs, getAllChildren, getFromAnchor, getParent, getToAnchor, getWords, LockState, PenType, renderPenRaw, setElemPosition, connectLine, nearestAnchor, setChildValue, isAncestor, isShowChild, CanvasLayer, validationPlugin, setLifeCycleFunc, getAllFollowers } from './pen';
+import { calcInView, calcTextDrawRect, calcTextLines, calcTextRect, facePen, formatAttrs, getAllChildren, getFromAnchor, getParent, getToAnchor, getWords, LockState, PenType, renderPenRaw, setElemPosition, connectLine, nearestAnchor, setChildValue, isAncestor, isShowChild, CanvasLayer, validationPlugin, setLifeCycleFunc, getAllFollowers, isInteraction } from './pen';
 import { rotatePoint } from './point';
 import { clearStore, EditType, globalStore, register, registerAnchors, registerCanvasDraw, useStore, } from './store';
 import { formatPadding, loadCss, s8, valueInArray, valueInRange, } from './utils';
@@ -112,6 +112,8 @@ var Meta2d = /** @class */ (function () {
         this.register = register;
         this.registerCanvasDraw = registerCanvasDraw;
         this.registerAnchors = registerAnchors;
+        this.websocketTimes = 0;
+        this.mqttTimes = 0;
         this.httpTimerList = [];
         this.updateTimerList = [];
         this.onEvent = function (eventName, e) {
@@ -184,6 +186,12 @@ var Meta2d = /** @class */ (function () {
                     }
                     _this.navigatorTo(e.params);
                     break;
+                case 'input':
+                    _this.store.data.locked && e && (!e.disabled) && _this.doEvent(e, eventName);
+                    break;
+                case 'change':
+                    _this.store.data.locked && e && (!e.disabled) && _this.doEvent(e, eventName);
+                    break;
             }
             if (_this.store.messageEvents[eventName]) {
                 _this.store.messageEvents[eventName].forEach(function (item) {
@@ -425,7 +433,7 @@ var Meta2d = /** @class */ (function () {
                                                     return _this.judgeCondition(pen, condition.key, condition);
                                                 });
                                             }
-                                            else if (trigger.conditionType === 'or') {
+                                            else if (state.conditionType === 'or') {
                                                 flag = state.conditions.some(function (condition) {
                                                     return _this.judgeCondition(pen, condition.key, condition);
                                                 });
@@ -1406,8 +1414,10 @@ var Meta2d = /** @class */ (function () {
         this.stopPencil();
         //恢复可选状态
         this.store.data.pens.forEach(function (pen) {
+            var _a;
             if (pen.externElement === true) {
-                pen.onMove && pen.onMove(pen);
+                // pen.onMove && pen.onMove(pen);
+                ((_a = pen.calculative.singleton) === null || _a === void 0 ? void 0 : _a.div) && setElemPosition(pen, pen.calculative.singleton.div);
             }
         });
         if (lock > 0) {
@@ -1832,6 +1842,7 @@ var Meta2d = /** @class */ (function () {
             var childRect = calcRelativeRect(pen.calculative.worldRect, rect);
             Object.assign(pen, childRect);
             pen.locked = (_a = pen.lockedOnCombine) !== null && _a !== void 0 ? _a : LockState.DisableMove;
+            pen.locked = (pen.interaction || isInteraction.includes(pen.name)) ? 0 : pen.locked;
         });
         //将组合后的父节点置底
         this.store.data.pens.splice(minIndex, 0, parent);
@@ -2057,7 +2068,18 @@ var Meta2d = /** @class */ (function () {
                     url: _this.store.data.websocket,
                 });
             };
+            this.websocket.onerror = function (error) {
+                _this.store.emitter.emit('error', { type: 'websocket', error: error });
+            };
             this.websocket.onclose = function () {
+                if (_this.store.options.reconnetTimes) {
+                    _this.websocketTimes++;
+                    if (_this.websocketTimes >= _this.store.options.reconnetTimes) {
+                        _this.websocketTimes = 0;
+                        _this.closeWebsocket();
+                        return;
+                    }
+                }
                 console.info('Canvas websocket closed and reconneting...');
                 _this.connectWebsocket();
             };
@@ -2102,6 +2124,18 @@ var Meta2d = /** @class */ (function () {
                         url: _this.store.data.mqtt,
                     });
                 });
+                this.mqttClient.on('error', function (error) {
+                    _this.store.emitter.emit('error', { type: 'mqtt', error: error });
+                });
+                this.mqttClient.on('close', function () {
+                    if (_this.store.options.reconnetTimes) {
+                        _this.mqttTimes++;
+                        if (_this.mqttTimes >= _this.store.options.reconnetTimes) {
+                            _this.mqttTimes = 0;
+                            _this.closeMqtt();
+                        }
+                    }
+                });
                 if (this.store.data.mqttTopics) {
                     this.mqttClient.subscribe(this.store.data.mqttTopics.split(','));
                 }
@@ -2130,10 +2164,19 @@ var Meta2d = /** @class */ (function () {
             }
             https.forEach(function (item, index) {
                 if (item.http) {
+                    item.times = 0;
                     _this.httpTimerList[index] = setInterval(function () { return __awaiter(_this, void 0, void 0, function () {
                         return __generator(this, function (_a) {
                             // 默认每一秒请求一次
                             this.oldRequestHttp(item);
+                            if (this.store.options.reconnetTimes) {
+                                item.times++;
+                                if (item.times >= this.store.options.reconnetTimes) {
+                                    item.times = 0;
+                                    clearInterval(this.httpTimerList[index]);
+                                    this.httpTimerList[index] = undefined;
+                                }
+                            }
                             return [2 /*return*/];
                         });
                     }); }, item.httpTimeInterval || 1000);
@@ -2172,7 +2215,7 @@ var Meta2d = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         req = deepClone(_req);
-                        if (!req.http) return [3 /*break*/, 3];
+                        if (!req.http) return [3 /*break*/, 4];
                         return [4 /*yield*/, fetch(req.http, {
                                 headers: req.httpHeaders,
                                 method: req.method || 'GET',
@@ -2185,8 +2228,11 @@ var Meta2d = /** @class */ (function () {
                     case 2:
                         data = _a.sent();
                         this.socketCallback(data, { type: 'http', url: req.http });
-                        _a.label = 3;
-                    case 3: return [2 /*return*/];
+                        return [3 /*break*/, 4];
+                    case 3:
+                        this.store.emitter.emit('error', { type: 'http', error: res });
+                        _a.label = 4;
+                    case 4: return [2 /*return*/];
                 }
             });
         });
@@ -2263,9 +2309,11 @@ var Meta2d = /** @class */ (function () {
             networks.forEach(function (net) {
                 if (net.type === 'subscribe') {
                     if (net.protocol === 'mqtt') {
+                        net.index = mqttIndex_1;
                         if (net.options.clientId && !net.options.customClientId) {
                             net.options.clientId = s8();
                         }
+                        net.times = 0;
                         _this.mqttClients[mqttIndex_1] = mqtt.connect(net.url, net.options);
                         _this.mqttClients[mqttIndex_1].on('message', function (topic, message) {
                             _this.socketCallback(message.toString(), {
@@ -2274,16 +2322,48 @@ var Meta2d = /** @class */ (function () {
                                 url: net.url,
                             });
                         });
+                        _this.mqttClients[mqttIndex_1].on('error', function (error) {
+                            _this.store.emitter.emit('error', { type: 'mqtt', error: error });
+                        });
+                        _this.mqttClients[mqttIndex_1].on('close', function () {
+                            var _a;
+                            if (_this.store.options.reconnetTimes) {
+                                net.times++;
+                                if (net.times >= _this.store.options.reconnetTimes) {
+                                    net.times = 0;
+                                    _this.mqttClients && ((_a = _this.mqttClients[net.index]) === null || _a === void 0 ? void 0 : _a.end());
+                                }
+                            }
+                        });
                         if (net.topics) {
                             _this.mqttClients[mqttIndex_1].subscribe(net.topics.split(','));
                         }
                         mqttIndex_1 += 1;
                     }
                     else if (net.protocol === 'websocket') {
-                        _this.websockets[websocketIndex_1] = new WebSocket(net.url, net.protocols || undefined);
-                        _this.websockets[websocketIndex_1].onmessage = function (e) {
-                            _this.socketCallback(e.data, { type: 'websocket', url: net.url });
-                        };
+                        net.index = websocketIndex_1;
+                        _this.connectNetWebSocket(net);
+                        // this.websockets[websocketIndex] = new WebSocket(
+                        //   net.url,
+                        //   net.protocols || undefined
+                        // );
+                        // this.websockets[websocketIndex].onmessage = (e) => {
+                        //   this.socketCallback(e.data, { type: 'websocket', url: net.url });
+                        // };
+                        // this.websockets[websocketIndex].onerror = (error) => {
+                        //   this.store.emitter.emit('error', { type: 'websocket', error });
+                        // };
+                        // this.websockets[websocketIndex].onclose = () => {
+                        //   if (this.store.options.reconnetTimes) {
+                        //     net.times++;
+                        //     if (net.times >= this.store.options.reconnetTimes) {
+                        //       net.times = 0;
+                        //       this.websockets[net.index]?.close();
+                        //       return;
+                        //     }
+                        //   }
+                        // console.info('Canvas websocket closed and reconneting...');
+                        // };
                         websocketIndex_1 += 1;
                     }
                     else if (net.protocol === 'http') {
@@ -2300,6 +2380,39 @@ var Meta2d = /** @class */ (function () {
         }
         this.onNetworkConnect(https);
     };
+    Meta2d.prototype.connectNetWebSocket = function (net) {
+        var _this = this;
+        var _a;
+        if (this.websockets[net.index]) {
+            this.websockets[net.index].onclose = undefined;
+            (_a = this.websockets[net.index]) === null || _a === void 0 ? void 0 : _a.close();
+            this.websockets[net.index] = undefined;
+        }
+        this.websockets[net.index] = new WebSocket(net.url, net.protocols || undefined);
+        this.websockets[net.index].onmessage = function (e) {
+            _this.socketCallback(e.data, { type: 'websocket', url: net.url });
+        };
+        this.websockets[net.index].onerror = function (error) {
+            _this.store.emitter.emit('error', { type: 'websocket', error: error });
+        };
+        this.websockets[net.index].onclose = function () {
+            var _a;
+            if (_this.store.options.reconnetTimes) {
+                net.times++;
+                if (net.times >= _this.store.options.reconnetTimes) {
+                    net.times = 0;
+                    _this.websockets[net.index].onclose = undefined;
+                    (_a = _this.websockets[net.index]) === null || _a === void 0 ? void 0 : _a.close();
+                    _this.websockets[net.index] = undefined;
+                    return;
+                }
+            }
+            setTimeout(function () {
+                console.info('Canvas websocket closed and reconneting...');
+                _this.connectNetWebSocket(net);
+            }, 2000);
+        };
+    };
     Meta2d.prototype.randomString = function (e) {
         e = e || 32;
         var t = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678', a = t.length, n = '';
@@ -2479,8 +2592,9 @@ var Meta2d = /** @class */ (function () {
             if (Object.keys(_d_1).length) {
                 var data = pen.onBeforeValue ? pen.onBeforeValue(pen, _d_1) : _d_1;
                 this.canvas.updateValue(pen, data);
-                this.store.emitter.emit('valueUpdate', pen);
+                // this.store.emitter.emit('valueUpdate', pen);
                 (_a = pen.onValue) === null || _a === void 0 ? void 0 : _a.call(pen, pen);
+                this.store.emitter.emit('valueUpdate', pen);
             }
         }
     };
@@ -2551,9 +2665,18 @@ var Meta2d = /** @class */ (function () {
         //   }, this.store.data.networkInterval || 1000);
         // }
         https.forEach(function (_item, index) {
+            _item.times = 0;
             _this.updateTimerList[index] = setInterval(function () { return __awaiter(_this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     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;
+                        }
+                    }
                     return [2 /*return*/];
                 });
             }); }, _item.interval || 1000);
@@ -2566,7 +2689,7 @@ var Meta2d = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         req = deepClone(_req);
-                        if (!req.url) return [3 /*break*/, 3];
+                        if (!req.url) return [3 /*break*/, 4];
                         if (typeof req.headers === 'object') {
                             for (i in req.headers) {
                                 if (typeof req.headers[i] === 'string') {
@@ -2599,8 +2722,11 @@ var Meta2d = /** @class */ (function () {
                     case 2:
                         data = _a.sent();
                         this.socketCallback(data, { type: 'http', url: req.url });
-                        _a.label = 3;
-                    case 3: return [2 /*return*/];
+                        return [3 /*break*/, 4];
+                    case 3:
+                        this.store.emitter.emit('error', { type: 'http', error: res });
+                        _a.label = 4;
+                    case 4: return [2 /*return*/];
                 }
             });
         });
@@ -2612,7 +2738,11 @@ var Meta2d = /** @class */ (function () {
             });
         this.websockets &&
             this.websockets.forEach(function (websocket) {
-                websocket.close();
+                if (websocket) {
+                    websocket.onclose = undefined;
+                    websocket.close();
+                    websocket = undefined;
+                }
             });
         this.mqttClients = undefined;
         this.websockets = undefined;