@next-core/brick-kit 2.120.0 → 2.121.1

package/dist/index.esm.js

@@ -4072,8 +4072,16 @@ class WebsocketMessageResponse {
 }
 
 class WebSocketService {
+  get retryCount() {
+    return this._retryCount;
+  }
+
+  set retryCount(value) {
+    this._retryCount = value;
+  }
+
   constructor(options) {
-    _defineProperty$1(this, "retryCount", 0);
+    _defineProperty$1(this, "_retryCount", 0);
 
     _defineProperty$1(this, "ws", null);
 
@@ -4142,7 +4150,18 @@ class WebSocketService {
     };
 
     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();
@@ -4202,7 +4221,7 @@ class WebSocketService {
 
   onClose(event) {}
 
-  onError(event) {}
+  onError(event, data) {}
 
   onMessage(message) {}
 
@@ -5472,8 +5491,27 @@ class MessageDispatcher {
   }
 
   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);
@@ -5486,7 +5524,7 @@ class MessageDispatcher {
 
     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;
     }
 
@@ -5517,6 +5555,10 @@ class MessageDispatcher {
   createWebsocketService() {
     this.ws = createWebSocket();
 
+    this.ws.onError = (_event, data) => {
+      this.handleError(data);
+    };
+
     this.ws.onMessage = message => {
       this.reducer(message);
     };
@@ -5526,6 +5568,19 @@ class MessageDispatcher {
     };
   }
 
+  handleError(data) {
+    var event = new CustomEvent("callback.error", {
+      detail: _objectSpread({
+        payload: {
+          message: {}
+        }
+      }, data)
+    });
+    this.messageCallbackHandlers.forEach(callbacks => {
+      this.messageSubscribeCallbacksHandler(callbacks, "error", event);
+    });
+  }
+
   onClose(event) {
     _internalApiMessageCloseHandler(event);
   }
@@ -5612,19 +5667,22 @@ class MessageDispatcher {
     }
   }
 
-  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();
@@ -6668,7 +6726,14 @@ function builtinMessageListenerFactory(method, args, ifContainer, context) {
       return;
     }
 
-    message[method](...argsFactory(args, context, event));
+    var processArg = argsFactory(args, context, event);
+    var contentNode = /*#__PURE__*/React.createElement("span", null, "".concat(processArg[0]));
+    var argProp = {
+      content: contentNode,
+      className: "ant-message-notice-".concat(method)
+    };
+    processArg[0] = argProp;
+    message[method](...processArg);
   };
 }