@next-core/brick-kit 2.120.0 → 2.121.1

package/CHANGELOG.md

@@ -3,6 +3,38 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.121.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.121.0...@next-core/brick-kit@2.121.1) (2022-06-06)
+
+**Note:** Version bump only for package @next-core/brick-kit
+
+
+
+
+
+# [2.121.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.120.1...@next-core/brick-kit@2.121.0) (2022-06-01)
+
+
+### Features
+
+* **MessageDispatcher:** call error callbacks on WS error event ([d89a993](https://github.com/easyops-cn/next-core/commit/d89a993347107b8bc15e2e54cce68a620374d451))
+
+
+
+
+
+## [2.120.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.120.0...@next-core/brick-kit@2.120.1) (2022-05-27)
+
+
+### Bug Fixes
+
+* theme dark ([8ff6958](https://github.com/easyops-cn/next-core/commit/8ff6958e134c199e58ec4e026003839dcbc5ea57))
+* 兼容message事件传多个参数的情况 ([fbde026](https://github.com/easyops-cn/next-core/commit/fbde026b51f8bd2d4a83b3c2ac3ac93bf6515179))
+* 支持message.*传任意多个参数 ([abbfaeb](https://github.com/easyops-cn/next-core/commit/abbfaeb4752b408005a82e6a6cf57505b9d3aeb8))
+
+
+
+
+
 # [2.120.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.119.1...@next-core/brick-kit@2.120.0) (2022-05-26)
 
 

package/dist/index.bundle.js

@@ -4071,8 +4071,16 @@
   }
 
   class WebSocketService {
+    get retryCount() {
+      return this._retryCount;
+    }
+
+    set retryCount(value) {
+      this._retryCount = value;
+    }
+
     constructor(options) {
-      _defineProperty__default["default"](this, "retryCount", 0);
+      _defineProperty__default["default"](this, "_retryCount", 0);
 
       _defineProperty__default["default"](this, "ws", null);
 
@@ -4141,7 +4149,18 @@
       };
 
       this.ws.onerror = event => {
-        this.onError(event); // eslint-disable-next-line no-console
+        var {
+          options,
+          retryCount,
+          state,
+          readyState
+        } = this;
+        this.onError(event, {
+          options: getReadOnlyProxy(options),
+          retryCount,
+          state,
+          readyState
+        }); // eslint-disable-next-line no-console
 
         console.log("WebSocket encountered error: ", event);
         this.reconnect();
@@ -4201,7 +4220,7 @@
 
     onClose(event) {}
 
-    onError(event) {}
+    onError(event, data) {}
 
     onMessage(message) {}
 
@@ -5471,8 +5490,27 @@
     }
 
     subscribe(channel, topic, callback) {
+      var _this$ws;
+
       var req = new WebsocketMessageRequest(PluginWebSocketMessageEvent.SUB, topic);
-      this.setMessageCallbackHandlers(req.identity, callback); // Prevent repeated subscriptions to the same topic.
+      this.setMessageCallbackHandlers(req.identity, callback);
+
+      if (((_this$ws = this.ws) === null || _this$ws === void 0 ? void 0 : _this$ws.state) === "finished") {
+        var {
+          options,
+          retryCount,
+          state,
+          readyState
+        } = this.ws;
+        this.handleError({
+          options: getReadOnlyProxy(options),
+          retryCount,
+          state,
+          readyState
+        });
+        return;
+      } // Prevent repeated subscriptions to the same topic.
+
 
       if (!this.channels.has(req.topic)) {
         this.channels.set(req.topic, channel);
@@ -5485,7 +5523,7 @@
 
       if (!t) {
         // eslint-disable-next-line no-console
-        console.error("Message channel\uFF1A\"".concat(channel, "\" not found. "));
+        console.error("Message channel: \"".concat(channel, "\" not found. "));
         return;
       }
 
@@ -5516,6 +5554,10 @@
     createWebsocketService() {
       this.ws = createWebSocket();
 
+      this.ws.onError = (_event, data) => {
+        this.handleError(data);
+      };
+
       this.ws.onMessage = message => {
         this.reducer(message);
       };
@@ -5525,6 +5567,19 @@
       };
     }
 
+    handleError(data) {
+      var event = new CustomEvent("callback.error", {
+        detail: _objectSpread__default["default"]({
+          payload: {
+            message: {}
+          }
+        }, data)
+      });
+      this.messageCallbackHandlers.forEach(callbacks => {
+        this.messageSubscribeCallbacksHandler(callbacks, "error", event);
+      });
+    }
+
     onClose(event) {
       _internalApiMessageCloseHandler(event);
     }
@@ -5611,19 +5666,22 @@
       }
     }
 
-    messageSubscribeResponseEventHandler(response, method, event) {
-      var callbacks = this.messageCallbackHandlers.get(response.identity);
-
+    messageSubscribeCallbacksHandler(callbacks, method, event) {
       if (Array.isArray(callbacks)) {
         for (var handler of callbacks) {
-          var e = new CustomEvent(event, {
-            detail: response.message
-          });
-          this.dispatch(e, handler.runtimeBrick, handler.context, [].concat(handler === null || handler === void 0 ? void 0 : handler[method]).filter(Boolean));
+          this.dispatch(event, handler.runtimeBrick, handler.context, [].concat(handler === null || handler === void 0 ? void 0 : handler[method]).filter(Boolean));
         }
       }
     }
 
+    messageSubscribeResponseEventHandler(response, method, event) {
+      var callbacks = this.messageCallbackHandlers.get(response.identity);
+      var e = new CustomEvent(event, {
+        detail: response.message
+      });
+      this.messageSubscribeCallbacksHandler(callbacks, method, e);
+    }
+
   }
 
   var timeoutIdList = new Set();
@@ -6667,7 +6725,14 @@
         return;
       }
 
-      antd.message[method](...argsFactory(args, context, event));
+      var processArg = argsFactory(args, context, event);
+      var contentNode = /*#__PURE__*/React__default["default"].createElement("span", null, "".concat(processArg[0]));
+      var argProp = {
+        content: contentNode,
+        className: "ant-message-notice-".concat(method)
+      };
+      processArg[0] = argProp;
+      antd.message[method](...processArg);
     };
   }