@blocklet/did-space-react 0.5.66 → 0.5.68

package/dist/cjs/components/base-connect-to/index.js

@@ -2,13 +2,13 @@
 
 const jsxRuntime = require('react/jsx-runtime');
 const React = require('react');
-const did = require('@arcblock/did');
 const material = require('@mui/material');
 const HelpOutlineIcon = require('@mui/icons-material/HelpOutline');
 const Button = require('@arcblock/ux/lib/Button');
 const SplitButton = require('@arcblock/ux/lib/SplitButton');
 const Dialog = require('@arcblock/ux/lib/Dialog');
 const ufo = require('ufo');
+const axios = require('axios');
 const constants = require('../../libs/constants.js');
 const util = require('../../libs/util.js');
 const gateway = require('../../libs/gateway.js');
@@ -25,16 +25,17 @@ function BaseConnectTo({ style, onWalletClick, onGatewayConfirm, ...rest }) {
       setLoading(true);
       const spaceGatewayUrl = await gateway.getSpaceGatewayUrl(url);
       const didSpacesCoreUrl = util.extraDIDSpacesCoreUrl(spaceGatewayUrl);
-      const spaceDid = util.getSpaceDidFromGatewayUrl(url);
-      if (!did.isValid(spaceDid) || !await gateway.isValidSpaceGatewayUrl(didSpacesCoreUrl)) {
-        throw new Error(t("storage.spaces.gateway.add.invalidUrl"));
-      }
+      const spaceDid = util.getSpaceDidFromSpaceUrl(url);
+      await gateway.verifySpaceUrl({ spaceGatewayUrl, spaceDid, locale });
       onGatewayConfirm?.({
         spaceDid,
         spaceGatewayUrl: didSpacesCoreUrl
       });
       setOpen(false);
     } catch (err) {
+      if (err instanceof axios.AxiosError && util.isCorsBlockedError(err)) {
+        err.message = t("storage.spaces.error.corsBlocked");
+      }
       console.error(err);
       setErrorMessage(err.message);
     } finally {

package/dist/cjs/components/space-card/index.d.ts

@@ -3,6 +3,7 @@ import { SpaceGateway, SpaceStatus } from '../../types';
 export type Action = React.ReactNode | ((props: {
     spaceGateway: SpaceGateway;
     spaceStatus: SpaceStatus;
+    errorCode: number;
     selected: boolean;
     compat: boolean;
     refresh: () => void;

package/dist/cjs/components/space-card/index.js

@@ -9,6 +9,8 @@ const DidAddress = require('@arcblock/ux/lib/DID');
 const Theme = require('@arcblock/ux/lib/Theme');
 const React = require('react');
 const axios = require('axios');
+const ahooks = require('ahooks');
+const constants = require('../../libs/constants.js');
 const useMobile = require('../../hooks/use-mobile.js');
 const useSpaceInfo = require('../../hooks/use-space-info.js');
 const useLocale = require('../../hooks/use-locale.js');
@@ -23,61 +25,83 @@ const spaceConnectError = require('../../icons/space-connect-error.svg.js');
 function Status({
   spaceUrl,
   status,
-  isError,
+  errorCode,
   refresh,
   sx,
   ...rest
 }) {
-  const { t } = useLocale();
+  const { t, locale } = useLocale();
   const iconStyle = { marginRight: "4px" };
-  let icon = null;
-  let text = null;
-  if (status === index.SpaceStatus.CONNECTED) {
-    icon = /* @__PURE__ */ jsxRuntime.jsx(spaceConnected, { style: iconStyle });
-    text = /* @__PURE__ */ jsxRuntime.jsx("span", { style: { color: "#047857" }, children: t("storage.spaces.connected.tag") });
-  }
-  if (status === index.SpaceStatus.DISCONNECTED) {
-    icon = /* @__PURE__ */ jsxRuntime.jsx(spaceDisconnect, { style: iconStyle });
-    text = /* @__PURE__ */ jsxRuntime.jsx("span", { style: { color: "#626a77" }, children: t("storage.spaces.disconnected.tag") });
-  }
-  if (status === index.SpaceStatus.EXPIRED) {
-    icon = /* @__PURE__ */ jsxRuntime.jsx(spaceConnectError, { style: iconStyle });
-    text = /* @__PURE__ */ jsxRuntime.jsx(material.Tooltip, { title: t("storage.spaces.error.expired"), placement: "top", children: /* @__PURE__ */ jsxRuntime.jsxs(
-      material.Link,
-      {
-        href: ufo.withQuery(ufo.joinURL(spaceUrl, "overview"), { guide: 1 }),
-        target: "_blank",
-        underline: "hover",
-        color: "error",
-        sx: { display: "flex", alignItems: "center", color: "error.main" },
-        children: [
-          /* @__PURE__ */ jsxRuntime.jsx("span", { children: t("storage.spaces.error.tag") }),
-          /* @__PURE__ */ jsxRuntime.jsx(OpenInNewIcon, { sx: { fontSize: "14px", marginLeft: "4px" } })
-        ]
+  const spaceGuideUrl = ufo.withQuery(ufo.joinURL(spaceUrl, "overview"), { guide: 1 });
+  const statusConfig = ahooks.useCreation(
+    () => ({
+      // 加载中
+      [index.SpaceStatus.LOADING]: {
+        icon: null,
+        text: null
+      },
+      // 已连接
+      [index.SpaceStatus.CONNECTED]: {
+        icon: /* @__PURE__ */ jsxRuntime.jsx(spaceConnected, { style: iconStyle }),
+        text: /* @__PURE__ */ jsxRuntime.jsx("span", { style: { color: "#047857" }, children: t("storage.spaces.connected.tag") })
+      },
+      // 未连接(未授权)
+      [index.SpaceStatus.DISCONNECTED]: {
+        icon: /* @__PURE__ */ jsxRuntime.jsx(spaceDisconnect, { style: iconStyle }),
+        text: /* @__PURE__ */ jsxRuntime.jsx("span", { style: { color: "#626a77" }, children: t("storage.spaces.disconnected.tag") })
       }
-    ) });
-  }
-  if (status === index.SpaceStatus.CORS_BLOCKED) {
-    icon = /* @__PURE__ */ jsxRuntime.jsx(spaceConnectError, { style: iconStyle });
-    text = /* @__PURE__ */ jsxRuntime.jsx(material.Tooltip, { title: t("storage.spaces.error.corsBlocked"), placement: "top", children: /* @__PURE__ */ jsxRuntime.jsx(material.Box, { sx: { display: "flex", alignItems: "center", color: "error.main" }, children: /* @__PURE__ */ jsxRuntime.jsx("span", { children: t("storage.spaces.error.tag") }) }) });
-  }
-  if (status === index.SpaceStatus.UNKNOWN) {
-    icon = /* @__PURE__ */ jsxRuntime.jsx(spaceConnectError, { style: iconStyle });
-    text = /* @__PURE__ */ jsxRuntime.jsx(material.Box, { sx: { color: "error.main" }, children: t("storage.spaces.error.networkError") });
-  }
+    }),
+    [locale]
+  );
+  const errorStatusConfig = ahooks.useCreation(
+    () => ({
+      // 未知的网络错误（如超时）
+      [constants.SPACE_CONNECT_ERROR_CODE.NETWORK_ERROR]: {
+        icon: /* @__PURE__ */ jsxRuntime.jsx(spaceConnectError, { style: iconStyle }),
+        text: /* @__PURE__ */ jsxRuntime.jsx(material.Box, { sx: { color: "error.main" }, children: t("storage.spaces.error.networkError") })
+      },
+      // 订阅过期
+      [constants.SPACE_CONNECT_ERROR_CODE.EXPIRED]: {
+        icon: /* @__PURE__ */ jsxRuntime.jsx(spaceConnectError, { style: iconStyle }),
+        text: /* @__PURE__ */ jsxRuntime.jsx(ErrorLink, { title: t("storage.spaces.error.expired"), url: spaceGuideUrl })
+      },
+      // 订阅逾期
+      [constants.SPACE_CONNECT_ERROR_CODE.PAST_DUE]: {
+        icon: /* @__PURE__ */ jsxRuntime.jsx(spaceConnectError, { style: iconStyle }),
+        text: /* @__PURE__ */ jsxRuntime.jsx(ErrorLink, { title: t("storage.spaces.error.pastDue"), url: spaceGuideUrl })
+      },
+      // 订阅状态异常
+      [constants.SPACE_CONNECT_ERROR_CODE.INVALID]: {
+        icon: /* @__PURE__ */ jsxRuntime.jsx(spaceConnectError, { style: iconStyle }),
+        text: /* @__PURE__ */ jsxRuntime.jsx(ErrorLink, { title: t("storage.spaces.error.invalid"), url: spaceGuideUrl })
+      },
+      // 用量不足
+      [constants.SPACE_CONNECT_ERROR_CODE.UNIT_LIMIT]: {
+        icon: /* @__PURE__ */ jsxRuntime.jsx(spaceConnectError, { style: iconStyle }),
+        text: /* @__PURE__ */ jsxRuntime.jsx(ErrorLink, { title: t("storage.spaces.error.unitLimit"), url: spaceGuideUrl })
+      },
+      // CORS 拦截
+      [constants.SPACE_CONNECT_ERROR_CODE.CORS_BLOCKED]: {
+        icon: /* @__PURE__ */ jsxRuntime.jsx(spaceConnectError, { style: iconStyle }),
+        text: /* @__PURE__ */ jsxRuntime.jsx(material.Tooltip, { title: t("storage.spaces.error.corsBlocked"), placement: "top", children: /* @__PURE__ */ jsxRuntime.jsx(material.Box, { sx: { display: "flex", alignItems: "center", color: "error.main" }, children: /* @__PURE__ */ jsxRuntime.jsx("span", { children: t("storage.spaces.error.tag") }) }) })
+      }
+    }),
+    [locale]
+  );
+  const { icon, text } = status === index.SpaceStatus.UNAVAILABLE ? errorStatusConfig[errorCode] : statusConfig[status];
   React.useEffect(() => {
     const handleVisibilityChange = () => {
       if (!document.hidden) {
         refresh();
       }
     };
-    if (isError) {
+    if (status !== index.SpaceStatus.CONNECTED) {
       document.addEventListener("visibilitychange", handleVisibilityChange);
     } else {
       document.removeEventListener("visibilitychange", handleVisibilityChange);
     }
     return () => document.removeEventListener("visibilitychange", handleVisibilityChange);
-  }, [isError, refresh]);
+  }, [status, refresh]);
   return /* @__PURE__ */ jsxRuntime.jsxs(
     material.Box,
     {
@@ -92,6 +116,23 @@ function Status({
     }
   );
 }
+function ErrorLink({ title, url }) {
+  const { t } = useLocale();
+  return /* @__PURE__ */ jsxRuntime.jsx(material.Tooltip, { title, placement: "top", children: /* @__PURE__ */ jsxRuntime.jsxs(
+    material.Link,
+    {
+      href: url,
+      target: "_blank",
+      underline: "hover",
+      color: "error",
+      sx: { display: "flex", alignItems: "center", color: "error.main" },
+      children: [
+        /* @__PURE__ */ jsxRuntime.jsx("span", { children: t("storage.spaces.error.tag") }),
+        /* @__PURE__ */ jsxRuntime.jsx(OpenInNewIcon, { sx: { fontSize: "14px", marginLeft: "4px" } })
+      ]
+    }
+  ) });
+}
 function SpaceCard({ endpoint, selected = false, compat, action, className, deps, ...rest }) {
   const isMobile = useMobile();
   const { t } = useLocale();
@@ -113,33 +154,30 @@ function SpaceCard({ endpoint, selected = false, compat, action, className, deps
     deps: [refreshSpaceInfo].concat(deps ?? [])
   });
   let spaceName = "";
-  const hasPermission = spaceInfo?.hasPermission ?? false;
   const isAvailable = spaceInfo?.isAvailable ?? false;
-  let isError = false;
   const spaceStatus = React.useRef(index.SpaceStatus.LOADING);
+  let errorCode = 0;
   if (loading) {
     spaceStatus.current = index.SpaceStatus.LOADING;
     spaceName = /* @__PURE__ */ jsxRuntime.jsx(material.Skeleton, { variant: "text", sx: { width: "180px", fontSize: "1rem" } });
   } else if (spaceInfo) {
     spaceName = spaceInfo.spaceName;
     if (!isAvailable) {
-      spaceStatus.current = index.SpaceStatus.EXPIRED;
-      isError = true;
-    } else if (hasPermission) {
-      spaceStatus.current = index.SpaceStatus.CONNECTED;
+      spaceStatus.current = index.SpaceStatus.UNAVAILABLE;
+      errorCode = spaceInfo.errorCode;
+      if (errorCode === constants.SPACE_CONNECT_ERROR_CODE.UNAUTHORIZED) {
+        spaceStatus.current = index.SpaceStatus.DISCONNECTED;
+      }
     } else {
-      spaceStatus.current = index.SpaceStatus.DISCONNECTED;
+      spaceStatus.current = index.SpaceStatus.CONNECTED;
     }
   } else if (error instanceof axios.AxiosError) {
     spaceName = t("common.unknown");
-    isError = true;
-    if (!error.response && // 无响应
-    error.message === "Network Error" && // 网络错误
-    error.code !== "ECONNABORTED" && // 非超时引起
-    new URL(error.config.url).origin !== window.location.origin) {
-      spaceStatus.current = index.SpaceStatus.CORS_BLOCKED;
+    spaceStatus.current = index.SpaceStatus.UNAVAILABLE;
+    if (util.isCorsBlockedError(error)) {
+      errorCode = constants.SPACE_CONNECT_ERROR_CODE.CORS_BLOCKED;
     } else {
-      spaceStatus.current = index.SpaceStatus.UNKNOWN;
+      errorCode = constants.SPACE_CONNECT_ERROR_CODE.NETWORK_ERROR;
     }
   }
   const renderAction = () => {
@@ -154,6 +192,7 @@ function SpaceCard({ endpoint, selected = false, compat, action, className, deps
           endpoint
         },
         spaceStatus: spaceStatus.current,
+        errorCode,
         selected,
         compat: isCompact,
         refresh
@@ -166,7 +205,7 @@ function SpaceCard({ endpoint, selected = false, compat, action, className, deps
     {
       className: util.classNames(className, {
         selected,
-        error: isError
+        error: errorCode > 0
       }),
       ...rest,
       children: [
@@ -180,8 +219,8 @@ function SpaceCard({ endpoint, selected = false, compat, action, className, deps
                 {
                   spaceUrl,
                   status: spaceStatus.current,
+                  errorCode,
                   refresh,
-                  isError,
                   sx: { mr: 1 }
                 }
               )
@@ -210,8 +249,8 @@ function SpaceCard({ endpoint, selected = false, compat, action, className, deps
             {
               spaceUrl,
               status: spaceStatus.current,
+              errorCode,
               refresh,
-              isError,
               flexShrink: 0
             }
           ),

package/dist/cjs/hooks/use-space-info.d.ts

@@ -3,6 +3,8 @@ export default function useSpaceInfo({ endpoint, deps }: {
     deps?: any[];
 }): import("ahooks/lib/useRequest/src/types").Result<{
     spaceName: string;
-    hasPermission: boolean;
+    subscriptionId: any;
     isAvailable: boolean;
+    errorMessage: string;
+    errorCode: number;
 } | undefined, []>;

package/dist/cjs/hooks/use-space-info.js

@@ -11,13 +11,18 @@ function useSpaceInfo({ endpoint, deps = [] }) {
         return void 0;
       }
       const { headers } = await api.head(endpoint, {
-        timeout: 1e3 * 30
+        timeout: 1e3 * 30,
+        params: {
+          withExtras: true
+        }
       });
       const spaceName = headers["x-space-name"];
       return {
         spaceName: spaceName ? decodeURIComponent(spaceName) : "",
-        hasPermission: headers["x-listable"] === "true" && headers["x-readable"] === "true" && headers["x-writeable"] === "true",
-        isAvailable: headers["x-space-is-available"] === "true"
+        subscriptionId: headers["x-subscription-id"],
+        isAvailable: headers["x-space-is-available"] === "true",
+        errorMessage: decodeURIComponent(headers["x-error-message"]),
+        errorCode: parseInt(headers["x-error-code"], 10)
       };
     },
     {

package/dist/cjs/index.d.ts

@@ -7,6 +7,7 @@ export * from './components/preview-space-nft';
 export * from './components/base-connect-to';
 export * from './components/auth-connect-to';
 export * from './components/session-connect-to';
+export * from './libs/constants';
 export * from './libs/util';
 export * from './libs/gateway';
 export * from './locales';

package/dist/cjs/index.js

@@ -9,6 +9,7 @@ const index$1 = require('./components/preview-space-nft/index.js');
 const index$2 = require('./components/base-connect-to/index.js');
 const index$3 = require('./components/auth-connect-to/index.js');
 const index$4 = require('./components/session-connect-to/index.js');
+const constants = require('./libs/constants.js');
 const util = require('./libs/util.js');
 const gateway = require('./libs/gateway.js');
 const index$5 = require('./locales/index.js');
@@ -33,17 +34,22 @@ exports.PreviewSpaceNft = index$1.PreviewSpaceNft;
 exports.BaseConnectTo = index$2.BaseConnectTo;
 exports.AuthConnectTo = index$3.AuthConnectTo;
 exports.SessionConnectTo = index$4.SessionConnectTo;
+exports.AUTHORIZE = constants.AUTHORIZE;
+exports.SPACE_CONNECT_ERROR_CODE = constants.SPACE_CONNECT_ERROR_CODE;
+exports.copyGatewayPageUrl = constants.copyGatewayPageUrl;
 exports.classNames = util.classNames;
 exports.decryptSpaceGateway = util.decryptSpaceGateway;
 exports.extraDIDSpacesCoreUrl = util.extraDIDSpacesCoreUrl;
 exports.getDIDSpaceDidFromEndpoint = util.getDIDSpaceDidFromEndpoint;
 exports.getDIDSpaceUrlFromEndpoint = util.getDIDSpaceUrlFromEndpoint;
 exports.getSpaceDidFromEndpoint = util.getSpaceDidFromEndpoint;
-exports.getSpaceDidFromGatewayUrl = util.getSpaceDidFromGatewayUrl;
+exports.getSpaceDidFromSpaceUrl = util.getSpaceDidFromSpaceUrl;
 exports.getSpaceGatewayUrlFromEndpoint = util.getSpaceGatewayUrlFromEndpoint;
 exports.getSpaceNftDisplayUrlFromEndpoint = util.getSpaceNftDisplayUrlFromEndpoint;
+exports.isCorsBlockedError = util.isCorsBlockedError;
+exports.t = util.t;
 exports.getSpaceGatewayUrl = gateway.getSpaceGatewayUrl;
-exports.isValidSpaceGatewayUrl = gateway.isValidSpaceGatewayUrl;
+exports.verifySpaceUrl = gateway.verifySpaceUrl;
 exports.translations = index$5.translations;
 exports.SpaceStatus = index$6.SpaceStatus;
 exports.EmptySpacesNFTIcon = emptySpaceNft;

package/dist/cjs/libs/constants.d.ts

@@ -1,3 +1,19 @@
+export declare const SPACE_CONNECT_ERROR_CODE: {
+    /** 网络错误 */
+    NETWORK_ERROR: number;
+    /** 未授权 */
+    UNAUTHORIZED: number;
+    /** 订阅过期 */
+    EXPIRED: number;
+    /** 订阅逾期 */
+    PAST_DUE: number;
+    /** 订阅状态异常 */
+    INVALID: number;
+    /** 用量不足 */
+    UNIT_LIMIT: number;
+    /** 跨域限制 */
+    CORS_BLOCKED: number;
+};
 export declare const AUTHORIZE: {
     DEFAULT_SCOPE: string;
 };

package/dist/cjs/libs/constants.js

@@ -1,9 +1,26 @@
 'use strict';
 
+const SPACE_CONNECT_ERROR_CODE = {
+  /** 网络错误 */
+  NETWORK_ERROR: 1001,
+  /** 未授权 */
+  UNAUTHORIZED: 1002,
+  /** 订阅过期 */
+  EXPIRED: 1003,
+  /** 订阅逾期 */
+  PAST_DUE: 1004,
+  /** 订阅状态异常 */
+  INVALID: 1005,
+  /** 用量不足 */
+  UNIT_LIMIT: 1006,
+  /** 跨域限制 */
+  CORS_BLOCKED: 1007
+};
 const AUTHORIZE = {
   DEFAULT_SCOPE: "list:object read:object write:object"
 };
 const copyGatewayPageUrl = "https://www.arcblock.io/content/docs/did-spaces/how-to-obtain-space-gateway-url";
 
 exports.AUTHORIZE = AUTHORIZE;
+exports.SPACE_CONNECT_ERROR_CODE = SPACE_CONNECT_ERROR_CODE;
 exports.copyGatewayPageUrl = copyGatewayPageUrl;

package/dist/cjs/libs/gateway.d.ts

@@ -2,4 +2,8 @@ export declare function getSpaceGatewayUrl(anyUrl: string, options?: {
     timeout: number;
     withSearchParams: boolean;
 }): Promise<string>;
-export declare function isValidSpaceGatewayUrl(spaceGatewayUrl: string): Promise<boolean>;
+export declare function verifySpaceUrl({ spaceGatewayUrl, spaceDid, locale, }: {
+    spaceGatewayUrl: string;
+    spaceDid?: string;
+    locale?: string;
+}): Promise<void>;

package/dist/cjs/libs/gateway.js

@@ -4,6 +4,7 @@ const ufo = require('ufo');
 const isUrl = require('is-url');
 const isString = require('lodash/isString');
 const isObject = require('lodash/isObject');
+const did = require('@arcblock/did');
 const api = require('./api.js');
 const util = require('./util.js');
 
@@ -26,22 +27,26 @@ async function getSpaceGatewayUrl(anyUrl, options = { timeout: 3e4, withSearchPa
   const spaceGatewayUrl = options.withSearchParams && u.searchParams.get("spaceDid") ? ufo.withQuery(didSpacesCoreUrl, { spaceDid: u.searchParams.get("spaceDid") }) : didSpacesCoreUrl;
   return spaceGatewayUrl;
 }
-async function isValidSpaceGatewayUrl(spaceGatewayUrl) {
-  try {
-    if (!isUrl(spaceGatewayUrl)) {
-      return false;
-    }
-    const didSpacesCoreUrl = util.extraDIDSpacesCoreUrl(spaceGatewayUrl);
-    const didConnectTokenUrl = ufo.joinURL(didSpacesCoreUrl, "space/api/did/one-click-authorization/token");
-    const { status, data } = await api.get(didConnectTokenUrl, {
-      timeout: 5e3
-    });
-    return status === 200 && isObject(data);
-  } catch (error) {
-    console.error(error);
-    return false;
+async function verifySpaceUrl({
+  spaceGatewayUrl,
+  spaceDid,
+  locale
+}) {
+  if (!isUrl(spaceGatewayUrl)) {
+    throw new Error(util.t("common.invalidUrl", locale, { url: spaceGatewayUrl }));
+  }
+  if (!spaceDid || !did.isValid(spaceDid)) {
+    throw new Error(util.t("storage.spaces.gateway.add.invalidUrl", locale));
+  }
+  const didSpacesCoreUrl = util.extraDIDSpacesCoreUrl(spaceGatewayUrl);
+  const didConnectTokenUrl = ufo.joinURL(didSpacesCoreUrl, "space/api/did/one-click-authorization/token");
+  const { status, data } = await api.get(didConnectTokenUrl, {
+    timeout: 5e3
+  });
+  if (!(status === 200 && isObject(data))) {
+    throw new Error(util.t("storage.spaces.gateway.add.invalidUrl", locale));
   }
 }
 
 exports.getSpaceGatewayUrl = getSpaceGatewayUrl;
-exports.isValidSpaceGatewayUrl = isValidSpaceGatewayUrl;
+exports.verifySpaceUrl = verifySpaceUrl;

package/dist/cjs/libs/util.d.ts

@@ -1,3 +1,4 @@
+import { type AxiosError } from 'axios';
 type ClassStr = string | undefined | null;
 /** classObj -> className
  * examples:
@@ -16,6 +17,9 @@ export declare function getSpaceNftDisplayUrlFromEndpoint(endpoint: string): str
 export declare function getSpaceDidFromEndpoint(endpoint: string): string | undefined;
 export declare function getSpaceGatewayUrlFromEndpoint(endpoint: string): string;
 export declare function extraDIDSpacesCoreUrl(url: string): string;
-export declare function getSpaceDidFromGatewayUrl(url: string): string | undefined;
+export declare function getSpaceDidFromSpaceUrl(url: string): string | undefined;
 export declare function decryptSpaceGateway(response: Record<string, string>, decrypt: Function): any;
+export declare function isCorsBlockedError(error: AxiosError): boolean;
+export declare function t(key: string, locale?: string, data?: Record<string, any>): string;
+export declare function t(key: string, data?: Record<string, any>): string;
 export {};

package/dist/cjs/libs/util.js

@@ -2,6 +2,8 @@
 
 const ufo = require('ufo');
 const isEmpty = require('lodash/isEmpty');
+const util = require('@arcblock/ux/lib/Locale/util');
+const index = require('../locales/index.js');
 
 function classNames(...classes) {
   const result = [];
@@ -54,7 +56,7 @@ function extraDIDSpacesCoreUrl(url) {
   return didSpacesCoreUrl;
 }
 const spaceDidRegex = /\/space\/([^/]+)/;
-function getSpaceDidFromGatewayUrl(url) {
+function getSpaceDidFromSpaceUrl(url) {
   return new URL(url).pathname.match(spaceDidRegex)?.[1];
 }
 function decryptSpaceGateway(response, decrypt) {
@@ -70,6 +72,17 @@ function decryptSpaceGateway(response, decrypt) {
     ...space
   };
 }
+function isCorsBlockedError(error) {
+  return !error.response && // 无响应
+  error.message === "Network Error" && // 是网络错误
+  error.code !== "ECONNABORTED" && // 非超时引起
+  new URL(error.config.url).origin !== window.location.origin;
+}
+function t(key, localeOrData, data = {}) {
+  const locale = typeof localeOrData === "string" ? localeOrData : "en";
+  const finalData = typeof localeOrData === "object" ? localeOrData : data;
+  return util.translate(index.translations, key, locale, "en", finalData);
+}
 
 exports.classNames = classNames;
 exports.decryptSpaceGateway = decryptSpaceGateway;
@@ -77,6 +90,8 @@ exports.extraDIDSpacesCoreUrl = extraDIDSpacesCoreUrl;
 exports.getDIDSpaceDidFromEndpoint = getDIDSpaceDidFromEndpoint;
 exports.getDIDSpaceUrlFromEndpoint = getDIDSpaceUrlFromEndpoint;
 exports.getSpaceDidFromEndpoint = getSpaceDidFromEndpoint;
-exports.getSpaceDidFromGatewayUrl = getSpaceDidFromGatewayUrl;
+exports.getSpaceDidFromSpaceUrl = getSpaceDidFromSpaceUrl;
 exports.getSpaceGatewayUrlFromEndpoint = getSpaceGatewayUrlFromEndpoint;
 exports.getSpaceNftDisplayUrlFromEndpoint = getSpaceNftDisplayUrlFromEndpoint;
+exports.isCorsBlockedError = isCorsBlockedError;
+exports.t = t;

package/dist/cjs/locales/en.js

@@ -9,7 +9,8 @@ const en = flat.flatten({
     delete: "Delete",
     error: "Error",
     open: "Open",
-    unknown: "Unknown"
+    unknown: "Unknown",
+    invalidUrl: "Invalid url: {url}"
   },
   storage: {
     spaces: {
@@ -34,8 +35,11 @@ const en = flat.flatten({
       },
       error: {
         tag: "Need Attention",
-        expired: "This DID spaces has expired, you can re-subscribe by opening this link",
-        corsBlocked: "Connection requests may be blocked by CORS. Please check security settings in the DID Space dashboard.",
+        expired: "DID Spaces has expired, click this link to re-subscribe",
+        pastDue: "DID Spaces has unpaid bills, click this link to complete payment",
+        invalid: "DID Spaces subscription anomaly, click this link to check",
+        unitLimit: "DID Spaces free quota has been used up, click this link to pay for the upgrade",
+        corsBlocked: "Connection requests may be blocked by CORS. Please contact your DID Space administrator to check the settings",
         networkError: "Network error"
       },
       gateway: {

package/dist/cjs/locales/zh.js

@@ -9,7 +9,8 @@ const zh = flat.flatten({
     delete: "\u5220\u9664",
     error: "\u9519\u8BEF",
     open: "\u6253\u5F00",
-    unknown: "\u672A\u77E5"
+    unknown: "\u672A\u77E5",
+    invalidUrl: "\u65E0\u6548\u7684 url: {url}"
   },
   storage: {
     spaces: {
@@ -34,8 +35,11 @@ const zh = flat.flatten({
       },
       error: {
         tag: "\u9700\u8981\u5173\u6CE8",
-        expired: "\u6B64 DID Spaces \u5DF2\u8FC7\u671F\uFF0C\u60A8\u53EF\u4EE5\u6253\u5F00\u6B64\u94FE\u63A5\u91CD\u65B0\u8BA2\u9605",
-        corsBlocked: "\u8FDE\u63A5\u8BF7\u6C42\u53EF\u80FD\u88AB CORS \u963B\u6B62\u3002\u8BF7\u68C0\u67E5 DID Space \u63A7\u5236\u9762\u677F\u4E2D\u7684\u5B89\u5168\u8BBE\u7F6E\u3002",
+        expired: "DID Spaces \u5DF2\u8FC7\u671F\uFF0C\u70B9\u51FB\u6B64\u94FE\u63A5\u91CD\u65B0\u8BA2\u9605",
+        pastDue: "DID Spaces \u6709\u672A\u652F\u4ED8\u8D26\u5355\uFF0C\u70B9\u51FB\u6B64\u94FE\u63A5\u5B8C\u6210\u652F\u4ED8",
+        invalid: "DID Spaces \u8BA2\u9605\u5F02\u5E38\uFF0C\u70B9\u51FB\u6B64\u94FE\u63A5\u68C0\u67E5",
+        unitLimit: "DID Spaces \u514D\u8D39\u989D\u5EA6\u5DF2\u7528\u5B8C\uFF0C\u70B9\u51FB\u6B64\u94FE\u63A5\u4ED8\u8D39\u5347\u7EA7",
+        corsBlocked: "\u8FDE\u63A5\u8BF7\u6C42\u53EF\u80FD\u88AB CORS \u9650\u5236\uFF0C\u8BF7\u8054\u7CFB DID Space \u7BA1\u7406\u5458\u68C0\u67E5\u76F8\u5173\u8BBE\u7F6E",
         networkError: "\u7F51\u7EDC\u9519\u8BEF"
       },
       gateway: {

package/dist/cjs/types/index.d.ts

@@ -20,9 +20,8 @@ export declare enum SpaceStatus {
     LOADING = "loading",
     CONNECTED = "connected",
     DISCONNECTED = "disconnected",
-    EXPIRED = "expired",
-    CORS_BLOCKED = "corsBlocked",
-    UNKNOWN = "unknown"
+    /** 不可用，跟订阅状态相关，比如过期、逾期、用量不足等 */
+    UNAVAILABLE = "unavailable"
 }
 export interface SpaceGateway {
     did: string;

package/dist/cjs/types/index.js

@@ -4,9 +4,7 @@ var SpaceStatus = /* @__PURE__ */ ((SpaceStatus2) => {
   SpaceStatus2["LOADING"] = "loading";
   SpaceStatus2["CONNECTED"] = "connected";
   SpaceStatus2["DISCONNECTED"] = "disconnected";
-  SpaceStatus2["EXPIRED"] = "expired";
-  SpaceStatus2["CORS_BLOCKED"] = "corsBlocked";
-  SpaceStatus2["UNKNOWN"] = "unknown";
+  SpaceStatus2["UNAVAILABLE"] = "unavailable";
   return SpaceStatus2;
 })(SpaceStatus || {});
 

package/dist/es/components/base-connect-to/index.js

@@ -1,15 +1,15 @@
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import { useState } from 'react';
-import { isValid } from '@arcblock/did';
 import { Typography, CircularProgress, DialogContentText, TextField, Tooltip, Link } from '@mui/material';
 import HelpOutlineIcon from '@mui/icons-material/HelpOutline';
 import Button from '@arcblock/ux/lib/Button';
 import SplitButton from '@arcblock/ux/lib/SplitButton';
 import Dialog from '@arcblock/ux/lib/Dialog';
 import { withQuery } from 'ufo';
+import { AxiosError } from 'axios';
 import { copyGatewayPageUrl } from '../../libs/constants.js';
-import { extraDIDSpacesCoreUrl, getSpaceDidFromGatewayUrl } from '../../libs/util.js';
-import { getSpaceGatewayUrl, isValidSpaceGatewayUrl } from '../../libs/gateway.js';
+import { extraDIDSpacesCoreUrl, getSpaceDidFromSpaceUrl, isCorsBlockedError } from '../../libs/util.js';
+import { getSpaceGatewayUrl, verifySpaceUrl } from '../../libs/gateway.js';
 import useLocale from '../../hooks/use-locale.js';
 
 function BaseConnectTo({ style, onWalletClick, onGatewayConfirm, ...rest }) {
@@ -23,16 +23,17 @@ function BaseConnectTo({ style, onWalletClick, onGatewayConfirm, ...rest }) {
       setLoading(true);
       const spaceGatewayUrl = await getSpaceGatewayUrl(url);
       const didSpacesCoreUrl = extraDIDSpacesCoreUrl(spaceGatewayUrl);
-      const spaceDid = getSpaceDidFromGatewayUrl(url);
-      if (!isValid(spaceDid) || !await isValidSpaceGatewayUrl(didSpacesCoreUrl)) {
-        throw new Error(t("storage.spaces.gateway.add.invalidUrl"));
-      }
+      const spaceDid = getSpaceDidFromSpaceUrl(url);
+      await verifySpaceUrl({ spaceGatewayUrl, spaceDid, locale });
       onGatewayConfirm?.({
         spaceDid,
         spaceGatewayUrl: didSpacesCoreUrl
       });
       setOpen(false);
     } catch (err) {
+      if (err instanceof AxiosError && isCorsBlockedError(err)) {
+        err.message = t("storage.spaces.error.corsBlocked");
+      }
       console.error(err);
       setErrorMessage(err.message);
     } finally {