@blocklet/discuss-kit-ux 2.6.11 → 2.6.13

package/dist/components/api-error-handler/default-handler.mjs

@@ -4,14 +4,68 @@ import Box from "@mui/material/Box";
 import { useLocaleContext } from "@arcblock/ux/lib/Locale/context";
 import { useApiErrorHandler } from "./api-error-handler.mjs";
 import { toast } from "../toast.mjs";
+const recentErrors = /* @__PURE__ */ new Map();
+const ERROR_COOLDOWN_MS = 3e3;
+const MAX_TOASTS_PER_SECOND = 3;
+let toastCount = 0;
+let lastResetTime = Date.now();
+const getErrorKey = (msg) => {
+  if (typeof msg === "string") return msg;
+  return `react-element-${msg.type?.toString() || "unknown"}-${msg.key || ""}`;
+};
+const shouldShowError = (errorKey) => {
+  const now = Date.now();
+  if (now - lastResetTime > 1e3) {
+    toastCount = 0;
+    lastResetTime = now;
+  }
+  if (toastCount >= MAX_TOASTS_PER_SECOND) {
+    return false;
+  }
+  const lastShown = recentErrors.get(errorKey);
+  if (lastShown && now - lastShown < ERROR_COOLDOWN_MS) {
+    return false;
+  }
+  if (recentErrors.size > 50) {
+    const cutoff = now - ERROR_COOLDOWN_MS;
+    for (const [key, time] of recentErrors.entries()) {
+      if (time < cutoff) {
+        recentErrors.delete(key);
+      }
+    }
+  }
+  return true;
+};
+const markErrorShown = (errorKey) => {
+  recentErrors.set(errorKey, Date.now());
+  toastCount++;
+};
+const getErrorMessage = (data, fallback) => {
+  if (data && typeof data === "object") {
+    const { message, error } = data;
+    if (typeof message === "string" && message) return message;
+    if (typeof error === "string" && error) return error;
+  }
+  return fallback;
+};
 export const useDefaultApiErrorHandler = (options) => {
   const { request, onError } = options;
   const { t } = useLocaleContext();
   const showError = (msg, toastOptions) => {
-    toast.error(msg, toastOptions);
+    const errorKey = getErrorKey(msg);
+    if (!shouldShowError(errorKey)) {
+      return;
+    }
+    markErrorShown(errorKey);
+    toast.error(msg, { ...toastOptions, id: errorKey });
   };
   const showWarning = (msg, toastOptions) => {
-    toast.warning(msg, toastOptions);
+    const errorKey = getErrorKey(msg);
+    if (!shouldShowError(errorKey)) {
+      return;
+    }
+    markErrorShown(errorKey);
+    toast.warning(msg, { ...toastOptions, id: errorKey });
   };
   const errorHandler = {
     handleError(error) {
@@ -27,21 +81,21 @@ export const useDefaultApiErrorHandler = (options) => {
         const statusCode = response.status;
         switch (statusCode) {
           case 400: {
-            showError(t("apiError.400"));
+            showError(getErrorMessage(response.data, t("apiError.400")));
             break;
           }
           case 401: {
-            showError(t("apiError.401"));
+            showError(getErrorMessage(response.data, t("apiError.401")));
             break;
           }
           case 403: {
-            showError(t("apiError.403"));
+            showError(getErrorMessage(response.data, t("apiError.403")));
             break;
           }
           case 409: {
             showWarning(
               /* @__PURE__ */ jsxs(Box, { children: [
-                /* @__PURE__ */ jsx(Box, { children: t("apiError.409") }),
+                /* @__PURE__ */ jsx(Box, { children: getErrorMessage(response.data, t("apiError.409")) }),
                 /* @__PURE__ */ jsxs(Box, { children: [
                   "(",
                   t("apiError.staleTip"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/discuss-kit-ux",
-  "version": "2.6.11",
+  "version": "2.6.13",
   "files": [
     "dist"
   ],
@@ -47,8 +47,8 @@
     "unstated-next": "^1.1.0",
     "url-join": "^4.0.1",
     "zustand": "^4.5.5",
-    "@blocklet/labels": "2.6.11",
-    "@blocklet/editor": "2.6.11"
+    "@blocklet/editor": "2.6.13",
+    "@blocklet/labels": "2.6.13"
   },
   "peerDependencies": {
     "@arcblock/did-connect-react": "^3.1.5",