@blocklet/did-space-react 1.0.22 → 1.0.24

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

@@ -12,6 +12,7 @@ const axios = require('axios');
 const ahooks = require('ahooks');
 const semver = require('semver');
 const constants = require('@did-space/core/constants');
+const session = require('../../context/session.js');
 const _package = require('../../package.json.js');
 const constants$1 = require('../../libs/constants.js');
 const useMobile = require('../../hooks/use-mobile.js');
@@ -27,6 +28,18 @@ const spaceDisconnect = require('../../icons/space-disconnect.svg.js');
 const spaceConnectError = require('../../icons/space-connect-error.svg.js');
 
 const expectVersion = `${_package.version}`;
+function getIncompatibleUpgradeUrl({ spaceInfo, session, spaceUrl }) {
+  const shouldBeUpgradeDIDSpaces = !spaceInfo.version || semver.major(spaceInfo.version) !== semver.major(expectVersion) && semver.lt(spaceInfo.version, expectVersion) && spaceInfo.isSiteAdmin;
+  if (shouldBeUpgradeDIDSpaces) {
+    return ufo.joinURL(new URL(spaceUrl).origin, ".well-known/service/admin/components");
+  }
+  const isCurrentSiteAdmin = ["admin", "owner"].includes(session?.user?.role || "");
+  const shouldBeUpgradeApp = spaceInfo.version && semver.major(spaceInfo.version) !== semver.major(expectVersion) && semver.lt(expectVersion, spaceInfo.version) && isCurrentSiteAdmin;
+  if (shouldBeUpgradeApp) {
+    return ufo.joinURL(window.location.origin, ".well-known/service/admin/components");
+  }
+  return null;
+}
 function Status({
   spaceUrl,
   status,
@@ -39,6 +52,7 @@ function Status({
   const { t, locale } = useLocale();
   const iconStyle = { marginRight: "4px" };
   const spaceGuideUrl = ufo.withQuery(ufo.joinURL(spaceUrl, "overview"), { guide: 1 });
+  const { session: session$1 } = session.useSessionContext();
   const statusConfig = ahooks.useCreation(
     () => ({
       // 加载中
@@ -60,8 +74,12 @@ function Status({
     [locale]
   );
   const spaceVersion = React.useMemo(() => spaceInfo?.version, [spaceInfo]);
-  const errorStatusConfig = ahooks.useCreation(
-    () => ({
+  const errorStatusConfig = ahooks.useCreation(() => {
+    if (!spaceInfo) {
+      return {};
+    }
+    const incompatibleUpgradeUrl = getIncompatibleUpgradeUrl({ spaceInfo, session: session$1, spaceUrl });
+    return {
       // 未知的网络错误（如超时）
       [constants.SPACE_CONNECT_ERROR_CODE.NETWORK_ERROR]: {
         icon: /* @__PURE__ */ jsxRuntime.jsx(spaceConnectError, { style: iconStyle }),
@@ -93,23 +111,24 @@ function Status({
         text: /* @__PURE__ */ jsxRuntime.jsx(ErrorLink, { title: t("storage.spaces.error.corsBlocked"), url: ufo.withQuery(constants$1.fixCorsErrorPageUrl, { locale }) })
       },
       // Space 版本不兼容
-      [constants.SPACE_CONNECT_ERROR_CODE.INCOMPATIBLE]: {
-        icon: /* @__PURE__ */ jsxRuntime.jsx(spaceConnectError, { style: iconStyle }),
-        text: /* @__PURE__ */ jsxRuntime.jsx(
-          ErrorLink,
-          {
-            title: t("storage.spaces.error.incompatible", {
-              spaceVersion: spaceVersion || " < 0.5.77",
-              // version 字段是在 0.5.77 版本添加的
-              expectVersion
-            }),
-            url: ufo.joinURL(new URL(spaceUrl).origin, ".well-known/service/admin/components")
-          }
-        )
+      ...incompatibleUpgradeUrl && {
+        [constants.SPACE_CONNECT_ERROR_CODE.INCOMPATIBLE]: {
+          icon: /* @__PURE__ */ jsxRuntime.jsx(spaceConnectError, { style: iconStyle }),
+          text: /* @__PURE__ */ jsxRuntime.jsx(
+            ErrorLink,
+            {
+              title: t("storage.spaces.error.incompatible", {
+                spaceVersion: spaceInfo.version || " < 0.5.77",
+                // version 字段是在 0.5.77 版本添加的
+                expectVersion
+              }),
+              url: incompatibleUpgradeUrl
+            }
+          )
+        }
       }
-    }),
-    [locale, spaceVersion]
-  );
+    };
+  }, [locale, spaceVersion]);
   const { icon, text } = status === index.DIDSpaceStatus.UNAVAILABLE ? errorStatusConfig[errorCode] : statusConfig[status];
   React.useEffect(() => {
     const handleVisibilityChange = () => {
@@ -167,6 +186,7 @@ function DIDSpaceConnection({
 }) {
   const isMobile = useMobile();
   const { t } = useLocale();
+  const { session: session$1 } = session.useSessionContext();
   let isCompact = compat;
   if (isUndefined(isCompact)) {
     isCompact = isMobile;
@@ -202,9 +222,8 @@ function DIDSpaceConnection({
     }
   } else if (spaceInfo) {
     spaceName = spaceInfo.name;
-    const spaceVersion = spaceInfo.version;
-    const isIncompatible = !spaceVersion || semver.major(expectVersion) !== semver.major(spaceVersion);
-    if (isIncompatible) {
+    const incompatibleUpgradeUrl = getIncompatibleUpgradeUrl({ spaceInfo, session: session$1, spaceUrl });
+    if (incompatibleUpgradeUrl) {
       spaceStatus.current = index.DIDSpaceStatus.UNAVAILABLE;
       errorCode = constants.SPACE_CONNECT_ERROR_CODE.INCOMPATIBLE;
     } else if (!isAvailable) {

package/dist/cjs/context/session.d.ts

@@ -0,0 +1,4 @@
+import type { SessionContext as SessionContextType } from '@arcblock/did-connect/lib/types';
+declare const SessionProvider: any, SessionContext: any, SessionConsumer: any, withSession: any;
+declare function useSessionContext(): SessionContextType;
+export { SessionProvider, SessionContext, SessionConsumer, useSessionContext, withSession };

package/dist/cjs/context/session.js

@@ -0,0 +1,16 @@
+'use strict';
+
+const React = require('react');
+const Session = require('@arcblock/did-connect/lib/Session');
+
+const { SessionProvider, SessionContext, SessionConsumer, withSession } = Session.createAuthServiceSessionContext();
+function useSessionContext() {
+  const info = React.useContext(SessionContext);
+  return info;
+}
+
+exports.SessionConsumer = SessionConsumer;
+exports.SessionContext = SessionContext;
+exports.SessionProvider = SessionProvider;
+exports.useSessionContext = useSessionContext;
+exports.withSession = withSession;

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

@@ -5,6 +5,7 @@ export type SpaceInfo = {
     ownerDid: string;
     isAvailable: boolean;
     errorCode: number;
+    isSiteAdmin: boolean;
 };
 export default function useSpaceInfo({ endpoint, deps }: {
     endpoint: string;

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

@@ -26,7 +26,8 @@ function useSpaceInfo({ endpoint, deps = [] }) {
         rawVersion,
         rawOwnerDid,
         rawAvailable,
-        rawErrorCode
+        rawErrorCode,
+        rawIsSiteAdmin
       ] = [
         headers["x-space-name"],
         headers["x-subscription-id"],
@@ -37,7 +38,8 @@ function useSpaceInfo({ endpoint, deps = [] }) {
         headers["x-space-version"],
         headers["x-space-owner-did"],
         headers["x-space-is-available"],
-        headers["x-error-code"]
+        headers["x-error-code"],
+        headers["x-is-site-admin"]
       ];
       const name = rawName ? decodeURIComponent(rawName) : "";
       if (rawAvailable === void 0 || rawErrorCode === void 0) {
@@ -48,7 +50,8 @@ function useSpaceInfo({ endpoint, deps = [] }) {
           subscriptionId: rawSubscriptionId,
           ownerDid: rawOwnerDid || "",
           isAvailable,
-          errorCode: isAvailable ? 0 : constants.SPACE_CONNECT_ERROR_CODE.UNAUTHORIZED
+          errorCode: isAvailable ? 0 : constants.SPACE_CONNECT_ERROR_CODE.UNAUTHORIZED,
+          isSiteAdmin: rawIsSiteAdmin === "true"
         };
       }
       return {
@@ -57,7 +60,8 @@ function useSpaceInfo({ endpoint, deps = [] }) {
         subscriptionId: rawSubscriptionId,
         ownerDid: rawOwnerDid,
         isAvailable: rawAvailable === "true",
-        errorCode: parseInt(rawErrorCode, 10)
+        errorCode: parseInt(rawErrorCode, 10),
+        isSiteAdmin: rawIsSiteAdmin === "true"
       };
     },
     {

package/dist/cjs/package.json.js

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

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

@@ -1,6 +1,6 @@
 import { jsx, jsxs } from 'react/jsx-runtime';
 import isUndefined from 'lodash/isUndefined';
-import { withQuery, joinURL } from 'ufo';
+import { joinURL, withQuery } from 'ufo';
 import { Box, Stack, Tooltip, Link, Skeleton } from '@mui/material';
 import OpenInNewIcon from '@mui/icons-material/OpenInNew';
 import DidAddress from '@arcblock/ux/lib/DID';
@@ -10,6 +10,7 @@ import { AxiosError } from 'axios';
 import { useCreation } from 'ahooks';
 import semver from 'semver';
 import { SPACE_CONNECT_ERROR_CODE } from '@did-space/core/constants';
+import { useSessionContext } from '../../context/session.js';
 import { version } from '../../package.json.js';
 import { fixCorsErrorPageUrl } from '../../libs/constants.js';
 import useMobile from '../../hooks/use-mobile.js';
@@ -25,6 +26,18 @@ import SvgSpaceDisconnect from '../../icons/space-disconnect.svg.js';
 import SvgSpaceConnectError from '../../icons/space-connect-error.svg.js';
 
 const expectVersion = `${version}`;
+function getIncompatibleUpgradeUrl({ spaceInfo, session, spaceUrl }) {
+  const shouldBeUpgradeDIDSpaces = !spaceInfo.version || semver.major(spaceInfo.version) !== semver.major(expectVersion) && semver.lt(spaceInfo.version, expectVersion) && spaceInfo.isSiteAdmin;
+  if (shouldBeUpgradeDIDSpaces) {
+    return joinURL(new URL(spaceUrl).origin, ".well-known/service/admin/components");
+  }
+  const isCurrentSiteAdmin = ["admin", "owner"].includes(session?.user?.role || "");
+  const shouldBeUpgradeApp = spaceInfo.version && semver.major(spaceInfo.version) !== semver.major(expectVersion) && semver.lt(expectVersion, spaceInfo.version) && isCurrentSiteAdmin;
+  if (shouldBeUpgradeApp) {
+    return joinURL(window.location.origin, ".well-known/service/admin/components");
+  }
+  return null;
+}
 function Status({
   spaceUrl,
   status,
@@ -37,6 +50,7 @@ function Status({
   const { t, locale } = useLocale();
   const iconStyle = { marginRight: "4px" };
   const spaceGuideUrl = withQuery(joinURL(spaceUrl, "overview"), { guide: 1 });
+  const { session } = useSessionContext();
   const statusConfig = useCreation(
     () => ({
       // 加载中
@@ -58,8 +72,12 @@ function Status({
     [locale]
   );
   const spaceVersion = useMemo(() => spaceInfo?.version, [spaceInfo]);
-  const errorStatusConfig = useCreation(
-    () => ({
+  const errorStatusConfig = useCreation(() => {
+    if (!spaceInfo) {
+      return {};
+    }
+    const incompatibleUpgradeUrl = getIncompatibleUpgradeUrl({ spaceInfo, session, spaceUrl });
+    return {
       // 未知的网络错误（如超时）
       [SPACE_CONNECT_ERROR_CODE.NETWORK_ERROR]: {
         icon: /* @__PURE__ */ jsx(SvgSpaceConnectError, { style: iconStyle }),
@@ -91,23 +109,24 @@ function Status({
         text: /* @__PURE__ */ jsx(ErrorLink, { title: t("storage.spaces.error.corsBlocked"), url: withQuery(fixCorsErrorPageUrl, { locale }) })
       },
       // Space 版本不兼容
-      [SPACE_CONNECT_ERROR_CODE.INCOMPATIBLE]: {
-        icon: /* @__PURE__ */ jsx(SvgSpaceConnectError, { style: iconStyle }),
-        text: /* @__PURE__ */ jsx(
-          ErrorLink,
-          {
-            title: t("storage.spaces.error.incompatible", {
-              spaceVersion: spaceVersion || " < 0.5.77",
-              // version 字段是在 0.5.77 版本添加的
-              expectVersion
-            }),
-            url: joinURL(new URL(spaceUrl).origin, ".well-known/service/admin/components")
-          }
-        )
+      ...incompatibleUpgradeUrl && {
+        [SPACE_CONNECT_ERROR_CODE.INCOMPATIBLE]: {
+          icon: /* @__PURE__ */ jsx(SvgSpaceConnectError, { style: iconStyle }),
+          text: /* @__PURE__ */ jsx(
+            ErrorLink,
+            {
+              title: t("storage.spaces.error.incompatible", {
+                spaceVersion: spaceInfo.version || " < 0.5.77",
+                // version 字段是在 0.5.77 版本添加的
+                expectVersion
+              }),
+              url: incompatibleUpgradeUrl
+            }
+          )
+        }
       }
-    }),
-    [locale, spaceVersion]
-  );
+    };
+  }, [locale, spaceVersion]);
   const { icon, text } = status === DIDSpaceStatus.UNAVAILABLE ? errorStatusConfig[errorCode] : statusConfig[status];
   useEffect(() => {
     const handleVisibilityChange = () => {
@@ -165,6 +184,7 @@ function DIDSpaceConnection({
 }) {
   const isMobile = useMobile();
   const { t } = useLocale();
+  const { session } = useSessionContext();
   let isCompact = compat;
   if (isUndefined(isCompact)) {
     isCompact = isMobile;
@@ -200,9 +220,8 @@ function DIDSpaceConnection({
     }
   } else if (spaceInfo) {
     spaceName = spaceInfo.name;
-    const spaceVersion = spaceInfo.version;
-    const isIncompatible = !spaceVersion || semver.major(expectVersion) !== semver.major(spaceVersion);
-    if (isIncompatible) {
+    const incompatibleUpgradeUrl = getIncompatibleUpgradeUrl({ spaceInfo, session, spaceUrl });
+    if (incompatibleUpgradeUrl) {
       spaceStatus.current = DIDSpaceStatus.UNAVAILABLE;
       errorCode = SPACE_CONNECT_ERROR_CODE.INCOMPATIBLE;
     } else if (!isAvailable) {

package/dist/es/context/session.d.ts

@@ -0,0 +1,4 @@
+import type { SessionContext as SessionContextType } from '@arcblock/did-connect/lib/types';
+declare const SessionProvider: any, SessionContext: any, SessionConsumer: any, withSession: any;
+declare function useSessionContext(): SessionContextType;
+export { SessionProvider, SessionContext, SessionConsumer, useSessionContext, withSession };

package/dist/es/context/session.js

@@ -0,0 +1,10 @@
+import { useContext } from 'react';
+import { createAuthServiceSessionContext } from '@arcblock/did-connect/lib/Session';
+
+const { SessionProvider, SessionContext, SessionConsumer, withSession } = createAuthServiceSessionContext();
+function useSessionContext() {
+  const info = useContext(SessionContext);
+  return info;
+}
+
+export { SessionConsumer, SessionContext, SessionProvider, useSessionContext, withSession };

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

@@ -5,6 +5,7 @@ export type SpaceInfo = {
     ownerDid: string;
     isAvailable: boolean;
     errorCode: number;
+    isSiteAdmin: boolean;
 };
 export default function useSpaceInfo({ endpoint, deps }: {
     endpoint: string;

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

@@ -24,7 +24,8 @@ function useSpaceInfo({ endpoint, deps = [] }) {
         rawVersion,
         rawOwnerDid,
         rawAvailable,
-        rawErrorCode
+        rawErrorCode,
+        rawIsSiteAdmin
       ] = [
         headers["x-space-name"],
         headers["x-subscription-id"],
@@ -35,7 +36,8 @@ function useSpaceInfo({ endpoint, deps = [] }) {
         headers["x-space-version"],
         headers["x-space-owner-did"],
         headers["x-space-is-available"],
-        headers["x-error-code"]
+        headers["x-error-code"],
+        headers["x-is-site-admin"]
       ];
       const name = rawName ? decodeURIComponent(rawName) : "";
       if (rawAvailable === void 0 || rawErrorCode === void 0) {
@@ -46,7 +48,8 @@ function useSpaceInfo({ endpoint, deps = [] }) {
           subscriptionId: rawSubscriptionId,
           ownerDid: rawOwnerDid || "",
           isAvailable,
-          errorCode: isAvailable ? 0 : SPACE_CONNECT_ERROR_CODE.UNAUTHORIZED
+          errorCode: isAvailable ? 0 : SPACE_CONNECT_ERROR_CODE.UNAUTHORIZED,
+          isSiteAdmin: rawIsSiteAdmin === "true"
         };
       }
       return {
@@ -55,7 +58,8 @@ function useSpaceInfo({ endpoint, deps = [] }) {
         subscriptionId: rawSubscriptionId,
         ownerDid: rawOwnerDid,
         isAvailable: rawAvailable === "true",
-        errorCode: parseInt(rawErrorCode, 10)
+        errorCode: parseInt(rawErrorCode, 10),
+        isSiteAdmin: rawIsSiteAdmin === "true"
       };
     },
     {

package/dist/es/package.json.js

@@ -1,3 +1,3 @@
-const version = "1.0.22";
+const version = "1.0.24";
 
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/did-space-react",
-  "version": "1.0.22",
+  "version": "1.0.24",
   "description": "Reusable react components for did space",
   "keywords": [
     "react",
@@ -80,8 +80,8 @@
     }
   },
   "dependencies": {
-    "@arcblock/did": "^1.19.12",
-    "@did-space/core": "^1.0.22",
+    "@arcblock/did": "^1.19.14",
+    "@did-space/core": "^1.0.24",
     "@mui/icons-material": "^5.16.14",
     "@mui/lab": "^5.0.0-alpha.175",
     "@mui/material": "^5.16.14",
@@ -109,9 +109,9 @@
     "access": "public"
   },
   "devDependencies": {
-    "@arcblock/did-connect": "^2.11.48",
+    "@arcblock/did-connect": "^2.12.2",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@arcblock/ux": "^2.11.48",
+    "@arcblock/ux": "^2.12.2",
     "@babel/cli": "^7.26.4",
     "@babel/core": "^7.26.9",
     "@babel/preset-env": "^7.26.9",
@@ -142,7 +142,7 @@
     "react-dom": "^18.3.1",
     "rollup-plugin-node-builtins": "^2.1.2",
     "storybook": "^7.6.20",
-    "type-fest": "^4.35.0",
+    "type-fest": "^4.37.0",
     "typescript": "~5.5.4",
     "unbuild": "^2.0.0",
     "vite": "^5.4.14",
@@ -150,5 +150,5 @@
     "vite-plugin-node-polyfills": "^0.22.0",
     "vitest": "^3.0.7"
   },
-  "gitHead": "85bf211785c4557570799a40f2835ce815fed1da"
+  "gitHead": "00b4e686b2f11a76e673b70398f4396ebf8e0e27"
 }