@blocklet/did-space-react 1.0.61 → 1.0.63

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

@@ -11,7 +11,7 @@ const React = require('react');
 const axios = require('axios');
 const ahooks = require('ahooks');
 const semver = require('semver');
-const constants = require('@did-space/core/constants');
+const constants = require('@did-space/constants');
 const session = require('../../context/session.js');
 const _package = require('../../package.json.js');
 const constants$1 = require('../../libs/constants.js');
@@ -81,27 +81,27 @@ function Status({
     const incompatibleUpgradeUrl = getIncompatibleUpgradeUrl({ spaceInfo, session: session$1, spaceUrl });
     return {
       // 订阅过期
-      [constants.SPACE_CONNECT_ERROR_CODE.EXPIRED]: {
+      [constants.SpaceConnectErrorCode.EXPIRED]: {
         icon: /* @__PURE__ */ jsxRuntime.jsx(spaceConnectError, { style: iconStyle }),
         text: /* @__PURE__ */ jsxRuntime.jsx(ErrorLink, { description: t("storage.spaces.error.expired"), url: spaceGuideUrl })
       },
       // 订阅逾期
-      [constants.SPACE_CONNECT_ERROR_CODE.PAST_DUE]: {
+      [constants.SpaceConnectErrorCode.PAST_DUE]: {
         icon: /* @__PURE__ */ jsxRuntime.jsx(spaceConnectError, { style: iconStyle }),
         text: /* @__PURE__ */ jsxRuntime.jsx(ErrorLink, { description: t("storage.spaces.error.pastDue"), url: spaceGuideUrl })
       },
       // 订阅状态异常
-      [constants.SPACE_CONNECT_ERROR_CODE.INVALID]: {
+      [constants.SpaceConnectErrorCode.INVALID]: {
         icon: /* @__PURE__ */ jsxRuntime.jsx(spaceConnectError, { style: iconStyle }),
         text: /* @__PURE__ */ jsxRuntime.jsx(ErrorLink, { description: t("storage.spaces.error.invalid"), url: spaceGuideUrl })
       },
       // 用量不足
-      [constants.SPACE_CONNECT_ERROR_CODE.UNIT_LIMIT]: {
+      [constants.SpaceConnectErrorCode.UNIT_LIMIT]: {
         icon: /* @__PURE__ */ jsxRuntime.jsx(spaceConnectError, { style: iconStyle }),
         text: /* @__PURE__ */ jsxRuntime.jsx(ErrorLink, { description: t("storage.spaces.error.unitLimit"), url: spaceGuideUrl })
       },
       // CORS 拦截
-      [constants.SPACE_CONNECT_ERROR_CODE.CORS_BLOCKED]: {
+      [constants.SpaceConnectErrorCode.CORS_BLOCKED]: {
         icon: /* @__PURE__ */ jsxRuntime.jsx(spaceConnectError, { style: iconStyle }),
         text: /* @__PURE__ */ jsxRuntime.jsx(
           ErrorLink,
@@ -113,7 +113,7 @@ function Status({
         )
       },
       // 未知的网络错误（如超时）
-      [constants.SPACE_CONNECT_ERROR_CODE.NETWORK_ERROR]: {
+      [constants.SpaceConnectErrorCode.NETWORK_ERROR]: {
         icon: /* @__PURE__ */ jsxRuntime.jsx(spaceConnectError, { style: iconStyle }),
         text: /* @__PURE__ */ jsxRuntime.jsx(
           ErrorLink,
@@ -126,7 +126,7 @@ function Status({
       },
       // Space 版本不兼容
       ...incompatibleUpgradeUrl && {
-        [constants.SPACE_CONNECT_ERROR_CODE.INCOMPATIBLE]: {
+        [constants.SpaceConnectErrorCode.INCOMPATIBLE]: {
           icon: /* @__PURE__ */ jsxRuntime.jsx(spaceConnectError, { style: iconStyle }),
           text: /* @__PURE__ */ jsxRuntime.jsx(
             ErrorLink,
@@ -143,7 +143,20 @@ function Status({
       }
     };
   }, [locale, spaceVersion]);
-  const { icon, text } = status === index.DIDSpaceStatus.UNAVAILABLE ? errorStatusConfig[errorCode] : statusConfig[status];
+  const getStatusConfig = ahooks.useMemoizedFn(() => {
+    if (status === index.DIDSpaceStatus.UNAVAILABLE) {
+      let config = errorStatusConfig[errorCode];
+      if (!config) {
+        if (errorCode !== constants.SpaceConnectErrorCode.INCOMPATIBLE) {
+          console.warn("unknown did-spaces error code: ", errorCode);
+        }
+        config = { icon: null, text: null };
+      }
+      return config;
+    }
+    return statusConfig[status];
+  });
+  const { icon, text } = getStatusConfig();
   React.useEffect(() => {
     const handleVisibilityChange = () => {
       if (!document.hidden) {
@@ -229,20 +242,20 @@ function DIDSpaceConnection({
     spaceStatus.current = index.DIDSpaceStatus.UNAVAILABLE;
     spaceName = "";
     if (util.isCorsBlockedError(error)) {
-      errorCode = constants.SPACE_CONNECT_ERROR_CODE.CORS_BLOCKED;
+      errorCode = constants.SpaceConnectErrorCode.CORS_BLOCKED;
     } else {
-      errorCode = constants.SPACE_CONNECT_ERROR_CODE.NETWORK_ERROR;
+      errorCode = constants.SpaceConnectErrorCode.NETWORK_ERROR;
     }
   } else if (spaceInfo) {
     spaceName = spaceInfo.name;
     const incompatibleUpgradeUrl = getIncompatibleUpgradeUrl({ spaceInfo, session: session$1, spaceUrl });
     if (incompatibleUpgradeUrl) {
       spaceStatus.current = index.DIDSpaceStatus.UNAVAILABLE;
-      errorCode = constants.SPACE_CONNECT_ERROR_CODE.INCOMPATIBLE;
+      errorCode = constants.SpaceConnectErrorCode.INCOMPATIBLE;
     } else if (!isAvailable) {
       spaceStatus.current = index.DIDSpaceStatus.UNAVAILABLE;
       errorCode = spaceInfo.errorCode;
-      if (errorCode === constants.SPACE_CONNECT_ERROR_CODE.UNAUTHORIZED) {
+      if (errorCode === constants.SpaceConnectErrorCode.UNAUTHORIZED) {
         spaceStatus.current = index.DIDSpaceStatus.DISCONNECTED;
       }
     } else {

package/dist/cjs/hooks/use-audit-log.d.ts

@@ -1,5 +1,5 @@
 import type { AuditLogModel } from '@did-space/core';
-import { AuditLogAction, AuditLogStatus } from '@did-space/core/model';
+import { SpaceConnectErrorCode, AuditLogAction, AuditLogStatus } from '@did-space/constants';
 import { DIDSpaceStatus } from '../types';
 export interface AuditLogModelExtra extends AuditLogModel {
     description: React.ReactNode;
@@ -7,7 +7,7 @@ export interface AuditLogModelExtra extends AuditLogModel {
 export default function useAuditLog({ endpoint, spaceStatus, errorCode, size, status, actionType, deps, }: {
     endpoint: string;
     spaceStatus: DIDSpaceStatus;
-    errorCode: number;
+    errorCode: SpaceConnectErrorCode;
     size?: number;
     status?: AuditLogStatus | AuditLogStatus[];
     actionType?: AuditLogAction | AuditLogAction[];

package/dist/cjs/hooks/use-audit-log.js

@@ -2,44 +2,43 @@
 
 const isUrl = require('is-url');
 const ahooks = require('ahooks');
-const model = require('@did-space/core/model');
 const ufo = require('ufo');
 const xbytes = require('xbytes');
-const constants = require('@did-space/core/constants');
+const constants = require('@did-space/constants');
 const api = require('../libs/api.js');
 const useLocale = require('./use-locale.js');
 const util = require('../libs/util.js');
 const index = require('../types/index.js');
 
 const translateKeyMap = {
-  [model.AuditLogAction.APP_BACKUP]: {
+  [constants.AuditLogAction.APP_BACKUP]: {
     description: "auditLog.backup.description"
   },
-  [model.AuditLogAction.APP_RESTORE]: {
+  [constants.AuditLogAction.APP_RESTORE]: {
     description: "auditLog.restore.description"
   },
-  [model.AuditLogAction.APP_CONNECTED]: {
+  [constants.AuditLogAction.APP_CONNECTED]: {
     description: "auditLog.connected.description"
   },
-  [model.AuditLogAction.APP_DISCONNECTED]: {
+  [constants.AuditLogAction.APP_DISCONNECTED]: {
     description: "auditLog.disconnected.description"
   },
-  [model.AuditLogAction.APP_OBJECTS_SYNC]: {
+  [constants.AuditLogAction.APP_OBJECTS_SYNC]: {
     description: "auditLog.objectsSync.description"
   }
 };
 const unreachableErrorCodes = [
-  constants.SPACE_CONNECT_ERROR_CODE.CORS_BLOCKED,
-  constants.SPACE_CONNECT_ERROR_CODE.NETWORK_ERROR,
-  constants.SPACE_CONNECT_ERROR_CODE.INCOMPATIBLE
+  constants.SpaceConnectErrorCode.CORS_BLOCKED,
+  constants.SpaceConnectErrorCode.NETWORK_ERROR,
+  constants.SpaceConnectErrorCode.INCOMPATIBLE
 ];
-const defaultActionTypes = [model.AuditLogAction.APP_BACKUP, model.AuditLogAction.APP_RESTORE, model.AuditLogAction.APP_OBJECTS_SYNC];
+const defaultActionTypes = [constants.AuditLogAction.APP_BACKUP, constants.AuditLogAction.APP_RESTORE, constants.AuditLogAction.APP_OBJECTS_SYNC];
 function useAuditLog({
   endpoint,
   spaceStatus,
   errorCode,
   size = 1,
-  status = model.AuditLogStatus.SUCCEEDED,
+  status = constants.AuditLogStatus.SUCCEEDED,
   actionType = defaultActionTypes,
   deps = []
 }) {
@@ -79,7 +78,7 @@ function useAuditLog({
   const rows = ahooks.useCreation(() => {
     return data?.map((v) => {
       const extraData = v.data;
-      if (v.actionType === model.AuditLogAction.APP_OBJECTS_SYNC) {
+      if (v.actionType === constants.AuditLogAction.APP_OBJECTS_SYNC) {
         extraData.size = xbytes(extraData.size, { iec: true });
       }
       const result = {

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

@@ -1,10 +1,11 @@
+import { SpaceConnectErrorCode } from '@did-space/constants';
 export type SpaceInfo = {
     version: string;
     name: string;
     subscriptionId: string;
     ownerDid: string;
     isAvailable: boolean;
-    errorCode: number;
+    errorCode: SpaceConnectErrorCode;
     isSiteAdmin: boolean;
 };
 export default function useSpaceInfo({ endpoint, deps }: {

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

@@ -2,7 +2,7 @@
 
 const isUrl = require('is-url');
 const ahooks = require('ahooks');
-const constants = require('@did-space/core/constants');
+const constants = require('@did-space/constants');
 const api = require('../libs/api.js');
 
 function useSpaceInfo({ endpoint, deps = [] }) {
@@ -50,7 +50,7 @@ function useSpaceInfo({ endpoint, deps = [] }) {
           subscriptionId: rawSubscriptionId,
           ownerDid: rawOwnerDid || "",
           isAvailable,
-          errorCode: isAvailable ? 0 : constants.SPACE_CONNECT_ERROR_CODE.UNAUTHORIZED,
+          errorCode: isAvailable ? 0 : constants.SpaceConnectErrorCode.UNAUTHORIZED,
           isSiteAdmin: rawIsSiteAdmin === "true"
         };
       }

package/dist/cjs/package.json.js

@@ -1,5 +1,5 @@
 'use strict';
 
-const version = "1.0.61";
+const version = "1.0.63";
 
 exports.version = version;

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

@@ -7,9 +7,9 @@ import DidAddress from '@arcblock/ux/lib/DID';
 import { styled } from '@arcblock/ux/lib/Theme';
 import { useState, useMemo, useRef, useEffect } from 'react';
 import { AxiosError } from 'axios';
-import { useCreation } from 'ahooks';
+import { useCreation, useMemoizedFn } from 'ahooks';
 import semver from 'semver';
-import { SPACE_CONNECT_ERROR_CODE } from '@did-space/core/constants';
+import { SpaceConnectErrorCode } from '@did-space/constants';
 import { useSessionContext } from '../../context/session.js';
 import { version } from '../../package.json.js';
 import { fixCorsErrorPageUrl } from '../../libs/constants.js';
@@ -79,27 +79,27 @@ function Status({
     const incompatibleUpgradeUrl = getIncompatibleUpgradeUrl({ spaceInfo, session, spaceUrl });
     return {
       // 订阅过期
-      [SPACE_CONNECT_ERROR_CODE.EXPIRED]: {
+      [SpaceConnectErrorCode.EXPIRED]: {
         icon: /* @__PURE__ */ jsx(SvgSpaceConnectError, { style: iconStyle }),
         text: /* @__PURE__ */ jsx(ErrorLink, { description: t("storage.spaces.error.expired"), url: spaceGuideUrl })
       },
       // 订阅逾期
-      [SPACE_CONNECT_ERROR_CODE.PAST_DUE]: {
+      [SpaceConnectErrorCode.PAST_DUE]: {
         icon: /* @__PURE__ */ jsx(SvgSpaceConnectError, { style: iconStyle }),
         text: /* @__PURE__ */ jsx(ErrorLink, { description: t("storage.spaces.error.pastDue"), url: spaceGuideUrl })
       },
       // 订阅状态异常
-      [SPACE_CONNECT_ERROR_CODE.INVALID]: {
+      [SpaceConnectErrorCode.INVALID]: {
         icon: /* @__PURE__ */ jsx(SvgSpaceConnectError, { style: iconStyle }),
         text: /* @__PURE__ */ jsx(ErrorLink, { description: t("storage.spaces.error.invalid"), url: spaceGuideUrl })
       },
       // 用量不足
-      [SPACE_CONNECT_ERROR_CODE.UNIT_LIMIT]: {
+      [SpaceConnectErrorCode.UNIT_LIMIT]: {
         icon: /* @__PURE__ */ jsx(SvgSpaceConnectError, { style: iconStyle }),
         text: /* @__PURE__ */ jsx(ErrorLink, { description: t("storage.spaces.error.unitLimit"), url: spaceGuideUrl })
       },
       // CORS 拦截
-      [SPACE_CONNECT_ERROR_CODE.CORS_BLOCKED]: {
+      [SpaceConnectErrorCode.CORS_BLOCKED]: {
         icon: /* @__PURE__ */ jsx(SvgSpaceConnectError, { style: iconStyle }),
         text: /* @__PURE__ */ jsx(
           ErrorLink,
@@ -111,7 +111,7 @@ function Status({
         )
       },
       // 未知的网络错误（如超时）
-      [SPACE_CONNECT_ERROR_CODE.NETWORK_ERROR]: {
+      [SpaceConnectErrorCode.NETWORK_ERROR]: {
         icon: /* @__PURE__ */ jsx(SvgSpaceConnectError, { style: iconStyle }),
         text: /* @__PURE__ */ jsx(
           ErrorLink,
@@ -124,7 +124,7 @@ function Status({
       },
       // Space 版本不兼容
       ...incompatibleUpgradeUrl && {
-        [SPACE_CONNECT_ERROR_CODE.INCOMPATIBLE]: {
+        [SpaceConnectErrorCode.INCOMPATIBLE]: {
           icon: /* @__PURE__ */ jsx(SvgSpaceConnectError, { style: iconStyle }),
           text: /* @__PURE__ */ jsx(
             ErrorLink,
@@ -141,7 +141,20 @@ function Status({
       }
     };
   }, [locale, spaceVersion]);
-  const { icon, text } = status === DIDSpaceStatus.UNAVAILABLE ? errorStatusConfig[errorCode] : statusConfig[status];
+  const getStatusConfig = useMemoizedFn(() => {
+    if (status === DIDSpaceStatus.UNAVAILABLE) {
+      let config = errorStatusConfig[errorCode];
+      if (!config) {
+        if (errorCode !== SpaceConnectErrorCode.INCOMPATIBLE) {
+          console.warn("unknown did-spaces error code: ", errorCode);
+        }
+        config = { icon: null, text: null };
+      }
+      return config;
+    }
+    return statusConfig[status];
+  });
+  const { icon, text } = getStatusConfig();
   useEffect(() => {
     const handleVisibilityChange = () => {
       if (!document.hidden) {
@@ -227,20 +240,20 @@ function DIDSpaceConnection({
     spaceStatus.current = DIDSpaceStatus.UNAVAILABLE;
     spaceName = "";
     if (isCorsBlockedError(error)) {
-      errorCode = SPACE_CONNECT_ERROR_CODE.CORS_BLOCKED;
+      errorCode = SpaceConnectErrorCode.CORS_BLOCKED;
     } else {
-      errorCode = SPACE_CONNECT_ERROR_CODE.NETWORK_ERROR;
+      errorCode = SpaceConnectErrorCode.NETWORK_ERROR;
     }
   } else if (spaceInfo) {
     spaceName = spaceInfo.name;
     const incompatibleUpgradeUrl = getIncompatibleUpgradeUrl({ spaceInfo, session, spaceUrl });
     if (incompatibleUpgradeUrl) {
       spaceStatus.current = DIDSpaceStatus.UNAVAILABLE;
-      errorCode = SPACE_CONNECT_ERROR_CODE.INCOMPATIBLE;
+      errorCode = SpaceConnectErrorCode.INCOMPATIBLE;
     } else if (!isAvailable) {
       spaceStatus.current = DIDSpaceStatus.UNAVAILABLE;
       errorCode = spaceInfo.errorCode;
-      if (errorCode === SPACE_CONNECT_ERROR_CODE.UNAUTHORIZED) {
+      if (errorCode === SpaceConnectErrorCode.UNAUTHORIZED) {
         spaceStatus.current = DIDSpaceStatus.DISCONNECTED;
       }
     } else {

package/dist/es/hooks/use-audit-log.d.ts

@@ -1,5 +1,5 @@
 import type { AuditLogModel } from '@did-space/core';
-import { AuditLogAction, AuditLogStatus } from '@did-space/core/model';
+import { SpaceConnectErrorCode, AuditLogAction, AuditLogStatus } from '@did-space/constants';
 import { DIDSpaceStatus } from '../types';
 export interface AuditLogModelExtra extends AuditLogModel {
     description: React.ReactNode;
@@ -7,7 +7,7 @@ export interface AuditLogModelExtra extends AuditLogModel {
 export default function useAuditLog({ endpoint, spaceStatus, errorCode, size, status, actionType, deps, }: {
     endpoint: string;
     spaceStatus: DIDSpaceStatus;
-    errorCode: number;
+    errorCode: SpaceConnectErrorCode;
     size?: number;
     status?: AuditLogStatus | AuditLogStatus[];
     actionType?: AuditLogAction | AuditLogAction[];

package/dist/es/hooks/use-audit-log.js

@@ -1,9 +1,8 @@
 import isUrl from 'is-url';
 import { useRequest, useCreation } from 'ahooks';
-import { AuditLogAction, AuditLogStatus } from '@did-space/core/model';
 import { joinURL } from 'ufo';
 import xbytes from 'xbytes';
-import { SPACE_CONNECT_ERROR_CODE } from '@did-space/core/constants';
+import { AuditLogAction, SpaceConnectErrorCode, AuditLogStatus } from '@did-space/constants';
 import api from '../libs/api.js';
 import useLocale from './use-locale.js';
 import { formatRelativeTime } from '../libs/util.js';
@@ -27,9 +26,9 @@ const translateKeyMap = {
   }
 };
 const unreachableErrorCodes = [
-  SPACE_CONNECT_ERROR_CODE.CORS_BLOCKED,
-  SPACE_CONNECT_ERROR_CODE.NETWORK_ERROR,
-  SPACE_CONNECT_ERROR_CODE.INCOMPATIBLE
+  SpaceConnectErrorCode.CORS_BLOCKED,
+  SpaceConnectErrorCode.NETWORK_ERROR,
+  SpaceConnectErrorCode.INCOMPATIBLE
 ];
 const defaultActionTypes = [AuditLogAction.APP_BACKUP, AuditLogAction.APP_RESTORE, AuditLogAction.APP_OBJECTS_SYNC];
 function useAuditLog({

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

@@ -1,10 +1,11 @@
+import { SpaceConnectErrorCode } from '@did-space/constants';
 export type SpaceInfo = {
     version: string;
     name: string;
     subscriptionId: string;
     ownerDid: string;
     isAvailable: boolean;
-    errorCode: number;
+    errorCode: SpaceConnectErrorCode;
     isSiteAdmin: boolean;
 };
 export default function useSpaceInfo({ endpoint, deps }: {

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

@@ -1,6 +1,6 @@
 import isUrl from 'is-url';
 import { useRequest } from 'ahooks';
-import { SPACE_CONNECT_ERROR_CODE } from '@did-space/core/constants';
+import { SpaceConnectErrorCode } from '@did-space/constants';
 import api from '../libs/api.js';
 
 function useSpaceInfo({ endpoint, deps = [] }) {
@@ -48,7 +48,7 @@ function useSpaceInfo({ endpoint, deps = [] }) {
           subscriptionId: rawSubscriptionId,
           ownerDid: rawOwnerDid || "",
           isAvailable,
-          errorCode: isAvailable ? 0 : SPACE_CONNECT_ERROR_CODE.UNAUTHORIZED,
+          errorCode: isAvailable ? 0 : SpaceConnectErrorCode.UNAUTHORIZED,
           isSiteAdmin: rawIsSiteAdmin === "true"
         };
       }

package/dist/es/package.json.js

@@ -1,3 +1,3 @@
-const version = "1.0.61";
+const version = "1.0.63";
 
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/did-space-react",
-  "version": "1.0.61",
+  "version": "1.0.63",
   "description": "Reusable react components for did space",
   "keywords": [
     "react",
@@ -81,7 +81,7 @@
   },
   "dependencies": {
     "@arcblock/did": "^1.20.14",
-    "@did-space/core": "^1.0.61",
+    "@did-space/constants": "^1.0.63",
     "@mui/icons-material": "^5.17.1",
     "@mui/lab": "^5.0.0-alpha.176",
     "@mui/material": "^5.17.1",
@@ -119,6 +119,7 @@
     "@babel/preset-typescript": "^7.27.1",
     "@blocklet/js-sdk": "^1.16.44",
     "@blocklet/sdk": "^1.16.44",
+    "@did-space/core": "^1.0.63",
     "@storybook/addon-essentials": "^7.6.20",
     "@storybook/addon-interactions": "^7.6.20",
     "@storybook/addon-links": "^7.6.20",
@@ -150,5 +151,5 @@
     "vite-plugin-node-polyfills": "^0.22.0",
     "vitest": "^3.2.3"
   },
-  "gitHead": "5c6fed19a7002ff3ce835955c8e31306d9f5ba9c"
+  "gitHead": "7412e2fc8d017cf57628b68bcbfff9e84fc4611f"
 }