@blocklet/discuss-kit 2.0.68 → 2.0.70

package/lib/cjs/comments.js

@@ -84,6 +84,13 @@ const commentAPI = {
     return data;
   }
 };
+const useDiscussKitStatus = () => {
+  const [available, setAvailable] = react.useState(utils.isDiscussKitRunningOrStarting);
+  react.useEffect(() => {
+    api.get("/status", { muteError: true }).then(() => setAvailable(true)).catch(() => setAvailable(false));
+  }, []);
+  return { available };
+};
 const DiscussKitComments = react.forwardRef(
   ({
     displayConnectButton,
@@ -99,18 +106,10 @@ const DiscussKitComments = react.forwardRef(
     sendIcon,
     showTopbar
   }, ref) => {
-    const [apiAvailable, setApiAvailable] = react.useState(utils.isDiscussKitRunning);
     discussKitUx.useDefaultApiErrorHandler({
-      request: api,
-      // eslint-disable-next-line consistent-return
-      onError: (e) => {
-        var _a;
-        if (((_a = e.response) == null ? void 0 : _a.status) === 404) {
-          setApiAvailable(false);
-          return true;
-        }
-      }
+      request: api
     });
+    const { available } = useDiscussKitStatus();
     const { session } = react.useContext(Session.SessionContext) || {};
     const { state, sort, add, updateCommentState, interactive, findById } = discussKitUx.useCommentsContext();
     const { total, order, initialized } = state;
@@ -149,7 +148,7 @@ const DiscussKitComments = react.forwardRef(
       },
       [object.id, state]
     );
-    if (!apiAvailable) {
+    if (!available) {
       return /* @__PURE__ */ jsxRuntime.jsxs(material.Alert, { severity: "info", children: [
         /* @__PURE__ */ jsxRuntime.jsx(material.AlertTitle, { children: t("apiUnavailable.title") }),
         t("apiUnavailable.desc")

package/lib/cjs/lib/utils.js

@@ -20,10 +20,12 @@ const discussKitService = (_b = (_a = window.blocklet) == null ? void 0 : _a.com
 const discussKitPrefix = discussKitService ? joinUrl(discussKitService.mountPoint, "/") : "";
 const discussKitApiPrefix = joinUrl(discussKitPrefix, "/api/");
 const isDiscussKitRunning = (discussKitService == null ? void 0 : discussKitService.status) === "running";
+const isDiscussKitRunningOrStarting = isDiscussKitRunning || (discussKitService == null ? void 0 : discussKitService.status) === "starting";
 exports.discussKitApiPrefix = discussKitApiPrefix;
 exports.discussKitPrefix = discussKitPrefix;
 exports.discussKitService = discussKitService;
 exports.isDiscussKitRunning = isDiscussKitRunning;
+exports.isDiscussKitRunningOrStarting = isDiscussKitRunningOrStarting;
 exports.minDelay = minDelay;
 exports.protectLogin = protectLogin;
 exports.sleep = sleep;

package/lib/es/comments.js

@@ -1,5 +1,5 @@
 import { jsxs, jsx, Fragment } from "react/jsx-runtime";
-import { forwardRef, useState, useContext, useRef, useMemo, useEffect } from "react";
+import { forwardRef, useContext, useRef, useMemo, useEffect, useState } from "react";
 import { styled } from "@arcblock/ux/lib/Theme";
 import PropTypes from "prop-types";
 import SessionManager from "@arcblock/did-connect/lib/SessionManager";
@@ -12,7 +12,7 @@ import { useDefaultApiErrorHandler, useCommentsContext, useSubscription, GithubR
 import { useRequest } from "ahooks";
 import ErrorFallback from "./components/error-fallback";
 import { translations } from "./locales";
-import { isDiscussKitRunning, discussKitPrefix } from "./lib/utils";
+import { discussKitPrefix, isDiscussKitRunningOrStarting } from "./lib/utils";
 import api, { fetchRatings } from "./api";
 const useAsyncRetry = (fn, deps = []) => {
   const state = useRequest(fn, { refreshDeps: deps });
@@ -83,6 +83,13 @@ const commentAPI = {
     return data;
   }
 };
+const useDiscussKitStatus = () => {
+  const [available, setAvailable] = useState(isDiscussKitRunningOrStarting);
+  useEffect(() => {
+    api.get("/status", { muteError: true }).then(() => setAvailable(true)).catch(() => setAvailable(false));
+  }, []);
+  return { available };
+};
 const DiscussKitComments = forwardRef(
   ({
     displayConnectButton,
@@ -98,18 +105,10 @@ const DiscussKitComments = forwardRef(
     sendIcon,
     showTopbar
   }, ref) => {
-    const [apiAvailable, setApiAvailable] = useState(isDiscussKitRunning);
     useDefaultApiErrorHandler({
-      request: api,
-      // eslint-disable-next-line consistent-return
-      onError: (e) => {
-        var _a;
-        if (((_a = e.response) == null ? void 0 : _a.status) === 404) {
-          setApiAvailable(false);
-          return true;
-        }
-      }
+      request: api
     });
+    const { available } = useDiscussKitStatus();
     const { session } = useContext(SessionContext) || {};
     const { state, sort, add, updateCommentState, interactive, findById } = useCommentsContext();
     const { total, order, initialized } = state;
@@ -148,7 +147,7 @@ const DiscussKitComments = forwardRef(
       },
       [object.id, state]
     );
-    if (!apiAvailable) {
+    if (!available) {
       return /* @__PURE__ */ jsxs(Alert, { severity: "info", children: [
         /* @__PURE__ */ jsx(AlertTitle, { children: t("apiUnavailable.title") }),
         t("apiUnavailable.desc")

package/lib/es/lib/utils.js

@@ -18,11 +18,13 @@ const discussKitService = (_b = (_a = window.blocklet) == null ? void 0 : _a.com
 const discussKitPrefix = discussKitService ? joinUrl(discussKitService.mountPoint, "/") : "";
 const discussKitApiPrefix = joinUrl(discussKitPrefix, "/api/");
 const isDiscussKitRunning = (discussKitService == null ? void 0 : discussKitService.status) === "running";
+const isDiscussKitRunningOrStarting = isDiscussKitRunning || (discussKitService == null ? void 0 : discussKitService.status) === "starting";
 export {
   discussKitApiPrefix,
   discussKitPrefix,
   discussKitService,
   isDiscussKitRunning,
+  isDiscussKitRunningOrStarting,
   minDelay,
   protectLogin,
   sleep

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/discuss-kit",
-  "version": "2.0.68",
+  "version": "2.0.70",
   "description": "A react component for Discuss Kit blocklet.",
   "main": "./lib/cjs/index.js",
   "module": "./lib/es/index.js",
@@ -35,8 +35,8 @@
   "license": "MIT",
   "dependencies": {
     "@arcblock/ws": "^1.18.126",
-    "@blocklet/discuss-kit-ux": "2.0.68",
-    "@blocklet/editor": "2.0.68",
+    "@blocklet/discuss-kit-ux": "2.0.70",
+    "@blocklet/editor": "2.0.70",
     "@blocklet/js-sdk": "^1.16.28",
     "@emotion/react": "^11.10.5",
     "@emotion/styled": "^11.10.5",
@@ -78,5 +78,5 @@
     "vite-plugin-build": "^0.10.0",
     "vite-plugin-svgr": "^4.2.0"
   },
-  "gitHead": "63b92e0792ca8647624979646b4b8e54fc25706e"
+  "gitHead": "33b4b65368af257ac54c965ae8658093bb801531"
 }