@blocklet/discuss-kit 2.0.43 → 2.0.45

package/lib/cjs/api.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const jsSdk = require("@blocklet/js-sdk");
-const request = jsSdk.createAxios({ baseURL: "/", timeout: 2e4 });
+const utils = require("./lib/utils");
+const request = jsSdk.createAxios({ baseURL: utils.discussKitApiPrefix, timeout: 2e4 });
 request.interceptors.request.use(
   (config) => {
     return config;

package/lib/cjs/comments.js

@@ -2,7 +2,7 @@
 const jsxRuntime = require("react/jsx-runtime");
 const react = require("react");
 const Theme = require("@arcblock/ux/lib/Theme");
-const joinUrl = require("url-join");
+require("url-join");
 const PropTypes = require("prop-types");
 const SessionManager = require("@arcblock/did-connect/lib/SessionManager");
 const Session = require("@arcblock/did-connect/lib/Session");
@@ -14,16 +14,12 @@ const discussKitUx = require("@blocklet/discuss-kit-ux");
 const ahooks = require("ahooks");
 const ErrorFallback = require("./components/error-fallback");
 const locales = require("./locales");
+const utils = require("./lib/utils");
 const api = require("./api");
 const useAsyncRetry = (fn, deps = []) => {
   const state = ahooks.useRequest(fn, { refreshDeps: deps });
   return { ...state, value: state == null ? void 0 : state.data, retry: state == null ? void 0 : state.run };
 };
-const getPrefix = () => {
-  var _a, _b;
-  const service = (_b = (_a = window.blocklet) == null ? void 0 : _a.componentMountPoints) == null ? void 0 : _b.find((x) => x.name === "did-comments");
-  return service ? joinUrl(service.mountPoint, "/") : "";
-};
 const getCurrentBlockletComponentName = () => {
   var _a, _b;
   const ensureTrailingSlash = (str) => str.endsWith("/") ? str : `${str}/`;
@@ -104,7 +100,7 @@ const DiscussKitComments = react.forwardRef(
     sendIcon,
     showTopbar
   }, ref) => {
-    const [apiAvailable, setApiAvailable] = react.useState(true);
+    const [apiAvailable, setApiAvailable] = react.useState(utils.isDiscussKitRunning);
     discussKitUx.useDefaultApiErrorHandler({
       request: api,
       onError: (e) => {
@@ -153,6 +149,12 @@ const DiscussKitComments = react.forwardRef(
       },
       [object.id, state]
     );
+    if (!apiAvailable) {
+      return /* @__PURE__ */ jsxRuntime.jsxs(material.Alert, { severity: "info", children: [
+        /* @__PURE__ */ jsxRuntime.jsx(material.AlertTitle, { children: t("apiUnavailable.title") }),
+        t("apiUnavailable.desc")
+      ] });
+    }
     if (!initialized) {
       return /* @__PURE__ */ jsxRuntime.jsx(material.Box, { width: "100%", display: "flex", justifyContent: "center", children: /* @__PURE__ */ jsxRuntime.jsx(material.CircularProgress, {}) });
     }
@@ -189,12 +191,6 @@ const DiscussKitComments = react.forwardRef(
         }
       );
     };
-    if (!apiAvailable) {
-      return /* @__PURE__ */ jsxRuntime.jsxs(material.Alert, { severity: "info", children: [
-        /* @__PURE__ */ jsxRuntime.jsx(material.AlertTitle, { children: t("apiUnavailable.title") }),
-        t("apiUnavailable.desc")
-      ] });
-    }
     return /* @__PURE__ */ jsxRuntime.jsxs(Container, { ref, children: [
       /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
         /* @__PURE__ */ jsxRuntime.jsxs(material.Box, { display: "flex", justifyContent: "space-between", alignItems: "end", children: [
@@ -269,7 +265,6 @@ DiscussKitComments.defaultProps = {
 };
 function Wrapper({
   target,
-  prefix,
   flatView,
   autoCollapse,
   autoLoadComments,
@@ -294,11 +289,7 @@ function Wrapper({
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [target]
   );
-  const _prefix = prefix || getPrefix();
-  if (!_prefix) {
-    throw new Error("prefix is required.");
-  }
-  const wsClient = discussKitUx.getWsClient(_prefix);
+  const wsClient = discussKitUx.getWsClient(utils.discussKitPrefix);
   react.useEffect(() => {
     wsClient.connect();
     return () => {
@@ -306,7 +297,6 @@ function Wrapper({
         ;
     };
   }, []);
-  api.defaults.baseURL = joinUrl(_prefix, "/api/");
   return /* @__PURE__ */ jsxRuntime.jsx(discussKitUx.UploaderProvider, { children: /* @__PURE__ */ jsxRuntime.jsx(reactErrorBoundary.ErrorBoundary, { FallbackComponent: ErrorFallback, children: /* @__PURE__ */ jsxRuntime.jsx(context.LocaleProvider, { translations: locales.translations, locale, children: /* @__PURE__ */ jsxRuntime.jsx(discussKitUx.InternalThemeProvider, { children: /* @__PURE__ */ jsxRuntime.jsx(discussKitUx.ConfirmProvider, { children: /* @__PURE__ */ jsxRuntime.jsx(discussKitUx.DefaultEditorConfigProvider, { request: api, children: /* @__PURE__ */ jsxRuntime.jsx(
     discussKitUx.CommentsProvider,
     {
@@ -335,7 +325,6 @@ Wrapper.propTypes = {
   displayConnectButton: PropTypes.bool,
   displayReaction: PropTypes.bool,
   onChange: PropTypes.func,
-  prefix: PropTypes.string,
   flatView: PropTypes.bool,
   autoCollapse: PropTypes.bool,
   autoLoadComments: PropTypes.bool,
@@ -351,7 +340,6 @@ Wrapper.defaultProps = {
   displayReaction: true,
   onChange: () => {
   },
-  prefix: "",
   flatView: false,
   autoCollapse: false,
   autoLoadComments: true,

package/lib/cjs/lib/utils.js

@@ -1,5 +1,7 @@
 "use strict";
+var _a, _b;
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const joinUrl = require("url-join");
 const protectLogin = (session, action) => {
   if (session.user) {
     return action();
@@ -12,6 +14,16 @@ const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 const minDelay = (promise, ms) => {
   return Promise.all([promise, sleep(ms)]).then(([result]) => result);
 };
+const discussKitService = (_b = (_a = window.blocklet) == null ? void 0 : _a.componentMountPoints) == null ? void 0 : _b.find(
+  (x) => x.did === "z8ia1WEiBZ7hxURf6LwH21Wpg99vophFwSJdu"
+);
+const discussKitPrefix = discussKitService ? joinUrl(discussKitService.mountPoint, "/") : "";
+const discussKitApiPrefix = joinUrl(discussKitPrefix, "/api/");
+const isDiscussKitRunning = (discussKitService == null ? void 0 : discussKitService.status) === "running";
+exports.discussKitApiPrefix = discussKitApiPrefix;
+exports.discussKitPrefix = discussKitPrefix;
+exports.discussKitService = discussKitService;
+exports.isDiscussKitRunning = isDiscussKitRunning;
 exports.minDelay = minDelay;
 exports.protectLogin = protectLogin;
 exports.sleep = sleep;

package/lib/es/api.js

@@ -1,5 +1,6 @@
 import { createAxios } from "@blocklet/js-sdk";
-const request = createAxios({ baseURL: "/", timeout: 2e4 });
+import { discussKitApiPrefix } from "./lib/utils";
+const request = createAxios({ baseURL: discussKitApiPrefix, timeout: 2e4 });
 request.interceptors.request.use(
   (config) => {
     return config;

package/lib/es/comments.js

@@ -1,28 +1,24 @@
-import { jsx, jsxs, Fragment } from "react/jsx-runtime";
+import { jsxs, jsx, Fragment } from "react/jsx-runtime";
 import { forwardRef, useState, useContext, useRef, useMemo, useEffect } from "react";
 import { styled } from "@arcblock/ux/lib/Theme";
-import joinUrl from "url-join";
+import "url-join";
 import PropTypes from "prop-types";
 import SessionManager from "@arcblock/did-connect/lib/SessionManager";
 import { SessionContext } from "@arcblock/did-connect/lib/Session";
 import Button from "@arcblock/ux/lib/Button";
-import { Box, CircularProgress, Alert, AlertTitle } from "@mui/material";
+import { Alert, AlertTitle, Box, CircularProgress } from "@mui/material";
 import { useLocaleContext, LocaleProvider } from "@arcblock/ux/lib/Locale/context";
 import { ErrorBoundary } from "react-error-boundary";
 import { useDefaultApiErrorHandler, useCommentsContext, useSubscription, GithubReaction, SegmentedControl, CommentList, getWsClient, UploaderProvider, InternalThemeProvider, ConfirmProvider, DefaultEditorConfigProvider, CommentsProvider, CommentInput } from "@blocklet/discuss-kit-ux";
 import { useRequest } from "ahooks";
 import ErrorFallback from "./components/error-fallback";
 import { translations } from "./locales";
+import { isDiscussKitRunning, discussKitPrefix } from "./lib/utils";
 import api, { fetchRatings } from "./api";
 const useAsyncRetry = (fn, deps = []) => {
   const state = useRequest(fn, { refreshDeps: deps });
   return { ...state, value: state == null ? void 0 : state.data, retry: state == null ? void 0 : state.run };
 };
-const getPrefix = () => {
-  var _a, _b;
-  const service = (_b = (_a = window.blocklet) == null ? void 0 : _a.componentMountPoints) == null ? void 0 : _b.find((x) => x.name === "did-comments");
-  return service ? joinUrl(service.mountPoint, "/") : "";
-};
 const getCurrentBlockletComponentName = () => {
   var _a, _b;
   const ensureTrailingSlash = (str) => str.endsWith("/") ? str : `${str}/`;
@@ -103,7 +99,7 @@ const DiscussKitComments = forwardRef(
     sendIcon,
     showTopbar
   }, ref) => {
-    const [apiAvailable, setApiAvailable] = useState(true);
+    const [apiAvailable, setApiAvailable] = useState(isDiscussKitRunning);
     useDefaultApiErrorHandler({
       request: api,
       onError: (e) => {
@@ -152,6 +148,12 @@ const DiscussKitComments = forwardRef(
       },
       [object.id, state]
     );
+    if (!apiAvailable) {
+      return /* @__PURE__ */ jsxs(Alert, { severity: "info", children: [
+        /* @__PURE__ */ jsx(AlertTitle, { children: t("apiUnavailable.title") }),
+        t("apiUnavailable.desc")
+      ] });
+    }
     if (!initialized) {
       return /* @__PURE__ */ jsx(Box, { width: "100%", display: "flex", justifyContent: "center", children: /* @__PURE__ */ jsx(CircularProgress, {}) });
     }
@@ -188,12 +190,6 @@ const DiscussKitComments = forwardRef(
         }
       );
     };
-    if (!apiAvailable) {
-      return /* @__PURE__ */ jsxs(Alert, { severity: "info", children: [
-        /* @__PURE__ */ jsx(AlertTitle, { children: t("apiUnavailable.title") }),
-        t("apiUnavailable.desc")
-      ] });
-    }
     return /* @__PURE__ */ jsxs(Container, { ref, children: [
       /* @__PURE__ */ jsxs(Fragment, { children: [
         /* @__PURE__ */ jsxs(Box, { display: "flex", justifyContent: "space-between", alignItems: "end", children: [
@@ -268,7 +264,6 @@ DiscussKitComments.defaultProps = {
 };
 function Wrapper({
   target,
-  prefix,
   flatView,
   autoCollapse,
   autoLoadComments,
@@ -293,11 +288,7 @@ function Wrapper({
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [target]
   );
-  const _prefix = prefix || getPrefix();
-  if (!_prefix) {
-    throw new Error("prefix is required.");
-  }
-  const wsClient = getWsClient(_prefix);
+  const wsClient = getWsClient(discussKitPrefix);
   useEffect(() => {
     wsClient.connect();
     return () => {
@@ -305,7 +296,6 @@ function Wrapper({
         ;
     };
   }, []);
-  api.defaults.baseURL = joinUrl(_prefix, "/api/");
   return /* @__PURE__ */ jsx(UploaderProvider, { children: /* @__PURE__ */ jsx(ErrorBoundary, { FallbackComponent: ErrorFallback, children: /* @__PURE__ */ jsx(LocaleProvider, { translations, locale, children: /* @__PURE__ */ jsx(InternalThemeProvider, { children: /* @__PURE__ */ jsx(ConfirmProvider, { children: /* @__PURE__ */ jsx(DefaultEditorConfigProvider, { request: api, children: /* @__PURE__ */ jsx(
     CommentsProvider,
     {
@@ -334,7 +324,6 @@ Wrapper.propTypes = {
   displayConnectButton: PropTypes.bool,
   displayReaction: PropTypes.bool,
   onChange: PropTypes.func,
-  prefix: PropTypes.string,
   flatView: PropTypes.bool,
   autoCollapse: PropTypes.bool,
   autoLoadComments: PropTypes.bool,
@@ -350,7 +339,6 @@ Wrapper.defaultProps = {
   displayReaction: true,
   onChange: () => {
   },
-  prefix: "",
   flatView: false,
   autoCollapse: false,
   autoLoadComments: true,

package/lib/es/lib/utils.js

@@ -1,3 +1,5 @@
+var _a, _b;
+import joinUrl from "url-join";
 const protectLogin = (session, action) => {
   if (session.user) {
     return action();
@@ -10,7 +12,17 @@ const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 const minDelay = (promise, ms) => {
   return Promise.all([promise, sleep(ms)]).then(([result]) => result);
 };
+const discussKitService = (_b = (_a = window.blocklet) == null ? void 0 : _a.componentMountPoints) == null ? void 0 : _b.find(
+  (x) => x.did === "z8ia1WEiBZ7hxURf6LwH21Wpg99vophFwSJdu"
+);
+const discussKitPrefix = discussKitService ? joinUrl(discussKitService.mountPoint, "/") : "";
+const discussKitApiPrefix = joinUrl(discussKitPrefix, "/api/");
+const isDiscussKitRunning = (discussKitService == null ? void 0 : discussKitService.status) === "running";
 export {
+  discussKitApiPrefix,
+  discussKitPrefix,
+  discussKitService,
+  isDiscussKitRunning,
   minDelay,
   protectLogin,
   sleep

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/discuss-kit",
-  "version": "2.0.43",
+  "version": "2.0.45",
   "description": "A react component for Discuss Kit blocklet.",
   "main": "./lib/cjs/index.js",
   "module": "./lib/es/index.js",
@@ -37,8 +37,8 @@
     "@arcblock/did-connect": "^2.10.1",
     "@arcblock/ux": "^2.10.1",
     "@arcblock/ws": "^1.18.123",
-    "@blocklet/discuss-kit-ux": "2.0.43",
-    "@blocklet/editor": "2.0.43",
+    "@blocklet/discuss-kit-ux": "2.0.45",
+    "@blocklet/editor": "2.0.45",
     "@blocklet/js-sdk": "^1.16.28",
     "@blocklet/ui-react": "^2.10.1",
     "@emotion/react": "^11.10.5",
@@ -78,5 +78,5 @@
     "vite-plugin-build": "^0.10.0",
     "vite-plugin-svgr": "^4.2.0"
   },
-  "gitHead": "60d44b1cda7dc0d87fb7b665941bac5579049845"
+  "gitHead": "3edd8218822e22b9855555c8e677cdb14c91e03c"
 }