@blocklet/ui-react 2.9.52 → 2.9.54

package/src/UserSessions/libs/utils.ts

@@ -0,0 +1,82 @@
+const RESERVED_IP = 'Reserved IP';
+const IP_REGION_CACHE = 'ip-region-cache';
+
+async function getIpRegionFromIpApi(ip: string): Promise<string> {
+  const url = `https://ipapi.co/${ip}/json/`;
+  const result = await fetch(url);
+  const data = await result.json();
+
+  let region = '';
+  if (data.error) {
+    if (data.reserved) {
+      region = RESERVED_IP;
+    }
+  } else {
+    region = [data.country_name, data.region, data.city].filter(Boolean).join('/');
+  }
+  return region;
+}
+async function getIpRegionFromIpSb(ip: string): Promise<string> {
+  const url = `https://api.ip.sb/geoip/${ip}`;
+  const result = await fetch(url);
+  const data = await result.json();
+
+  let region = '';
+  if (data.error) {
+    if (data.reserved) {
+      region = RESERVED_IP;
+    }
+  } else {
+    region = [data.country, data.region, data.city].filter(Boolean).join('/');
+  }
+  return region;
+}
+
+export async function ip2Region(ip: string): Promise<string> {
+  let region = '';
+  let ipRegionCache: Record<string, string> = {};
+  try {
+    const tmpCache = localStorage.getItem(IP_REGION_CACHE);
+    if (tmpCache) {
+      ipRegionCache = JSON.parse(tmpCache);
+    }
+  } catch {
+    ipRegionCache = {};
+  }
+  if (ipRegionCache[ip]) {
+    region = ipRegionCache[ip];
+  } else {
+    try {
+      region = await getIpRegionFromIpSb(ip);
+    } catch {
+      console.warn('Fail to get ip region from ip.sb');
+    }
+
+    if (!region) {
+      try {
+        region = await getIpRegionFromIpApi(ip);
+      } catch {
+        console.warn('Fail to get ip region from ip-api.co');
+      }
+    }
+  }
+
+  if (region) {
+    // NOTICE: 为了防止 cache 过大，将在 size 超过 100 时，删除最旧的数据
+    const ipList = Object.keys(ipRegionCache);
+    if (ipList.length > 100) {
+      delete ipRegionCache[ipList[0]];
+    }
+    if (ipRegionCache[ip]) {
+      delete ipRegionCache[ip];
+    }
+    ipRegionCache[ip] = region;
+    localStorage.setItem(IP_REGION_CACHE, JSON.stringify(ipRegionCache));
+  }
+  return region;
+}
+
+// eslint-disable-next-line require-await
+export async function batchIp2Region(ips: string[]): Promise<string[]> {
+  return Promise.all(ips.map((ip) => ip2Region(ip)));
+}

package/src/blocklets.js

@@ -28,30 +28,30 @@ export const getLocalizedNavigation = (navigation, locale = 'en') => {
     return navigation;
   }
   // eslint-disable-next-line no-shadow
-  const getTitle = (title, locale) => {
+  const getTitle = (title, _locale) => {
     if (typeof title === 'string') {
       return title;
     }
     if (typeof title === 'object') {
-      return title[locale] || title?.en || title?.zh;
+      return title[_locale] || title?.en || title?.zh;
     }
     return title;
   };
   // eslint-disable-next-line no-shadow
-  const getLink = (link, locale) => {
+  const getLink = (link, _locale) => {
     if (typeof link === 'string') {
       // http[s] 开头的 url
       if (isUrl(link)) {
         const url = new URL(link);
-        url.searchParams.set('locale', locale);
+        url.searchParams.set('locale', _locale);
         return url.href;
       }
       const url = new URL(link, window.location.origin);
-      url.searchParams.set('locale', locale);
+      url.searchParams.set('locale', _locale);
       return url.pathname + url.search;
     }
     if (typeof link === 'object') {
-      return link[locale] || link?.en || link?.zh;
+      return link[_locale] || link?.en || link?.zh;
     }
     return link;
   };

package/src/common/header-addons.jsx

@@ -9,7 +9,7 @@ import SessionUser from '@arcblock/ux/lib/SessionUser';
 import SessionBlocklet from '@arcblock/ux/lib/SessionBlocklet';
 import LocaleSelector from '@arcblock/ux/lib/Locale/selector';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import { sessionManagerProps } from '../types';
+import { SessionManagerProps } from '../types';
 import { getLocalizedNavigation, filterNavByRole } from '../blocklets';
 
 // eslint-disable-next-line no-shadow
@@ -81,7 +81,7 @@ HeaderAddons.propTypes = {
   // - PropTypes.func: 可以把自定义 addons 插在 session-manager 或 locale-selector (如果存在的话) 前/中/后
   // - PropTypes.node: 将 addons 原样传给 UX Header 组件
   addons: PropTypes.oneOfType([PropTypes.func, PropTypes.node]),
-  sessionManagerProps,
+  sessionManagerProps: SessionManagerProps,
 };
 
 HeaderAddons.defaultProps = {

package/src/contexts/config-user-space.tsx

@@ -1,7 +1,7 @@
 import { createContext, useContext, useMemo, useState, useEffect } from 'react';
-import { SessionContext as TSessionContext } from '../@types';
 import { SessionContext } from '@arcblock/did-connect/lib/Session';
 
+import { SessionContext as TSessionContext } from '../@types';
 
 export interface SpaceGateway {
   did: string;
@@ -12,13 +12,13 @@ export interface SpaceGateway {
 
 export interface SettingStorageEndpoint {
   (endpoint: string | undefined): void | Promise<void>;
-} 
+}
 
 interface ConfigUserSpaceContextType {
   loading: boolean;
   spaceGateway: SpaceGateway | undefined;
   deleteSpaceGateway: (spaceGateway: SpaceGateway) => Promise<void>;
-  updateSpaceGateway: (updateSpaceGateway: SpaceGateway) =>  Promise<void>;
+  updateSpaceGateway: (updateSpaceGateway: SpaceGateway) => Promise<void>;
   storageEndpoint: string;
   settingStorageEndpoint: SettingStorageEndpoint;
   hasStorageEndpoint: boolean;
@@ -27,9 +27,9 @@ interface ConfigUserSpaceContextType {
 const ConfigUserSpaceContext = createContext<ConfigUserSpaceContextType>({} as ConfigUserSpaceContextType);
 const { Provider, Consumer } = ConfigUserSpaceContext;
 
-function ConfigUserSpaceProvider({ children }: {children: React.ReactNode }) {
+function ConfigUserSpaceProvider({ children }: { children: React.ReactNode }) {
   const [loading] = useState(false);
-  const {session} = useContext<TSessionContext>(SessionContext);
+  const { session } = useContext<TSessionContext>(SessionContext);
   const { user } = session;
 
   const [spaceGateway, setSpaceGateway] = useState<SpaceGateway | undefined>();
@@ -38,13 +38,17 @@ function ConfigUserSpaceProvider({ children }: {children: React.ReactNode }) {
   }, [user?.didSpace]);
 
   useEffect(() => {
-    setSpaceGateway(user?.didSpace as SpaceGateway)
-  }, [user?.didSpace])
+    setSpaceGateway(user?.didSpace as SpaceGateway);
+  }, [user?.didSpace]);
 
+  // eslint-disable-next-line require-await
   const deleteSpaceGateway = async (): Promise<void> => {
     setSpaceGateway(undefined);
   };
- 
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const settingStorageEndpoint = (endpoint: string | undefined) => {};
+
   const updateSpaceGateway = async (x: SpaceGateway) => {
     setSpaceGateway(x);
     session.refresh();
@@ -52,9 +56,6 @@ function ConfigUserSpaceProvider({ children }: {children: React.ReactNode }) {
     await settingStorageEndpoint(x.endpoint);
   };
 
-
-  const settingStorageEndpoint =  (endpoint: string | undefined) => {};
-
   const hasStorageEndpoint = Boolean(storageEndpoint && spaceGateway);
 
   return (

package/src/index.ts

@@ -11,3 +11,4 @@ export { default as ComponentInstaller } from './ComponentInstaller';
 // @ts-ignore
 export { default as useComponentInstaller } from './ComponentInstaller/use-component-installed';
 export * from './UserCenter';
+export * from './UserSessions';

package/src/{UserCenter/libs → libs}/client.ts

@@ -1,3 +1,4 @@
 import { BlockletSDK } from '@blocklet/js-sdk';
 
+// eslint-disable-next-line import/prefer-default-export
 export const client = new BlockletSDK();

package/src/libs/spaces.tsx

@@ -1,4 +1,4 @@
-import { joinURL } from "ufo";
+import { joinURL } from 'ufo';
 
 export function getSpaceNftDisplayUrlFromEndpoint(endpoint: string): string {
   const prefix = endpoint.replace(/\/api\/space\/.+/, '');
@@ -7,4 +7,4 @@ export function getSpaceNftDisplayUrlFromEndpoint(endpoint: string): string {
   const spaceDid = strArray.at(-4);
 
   return joinURL(prefix, `/api/space/nft/display?spaceDid=${spaceDid}`);
-}
+}

package/src/types.js

@@ -1,7 +1,7 @@
 /* eslint-disable import/prefer-default-export */
 import PropTypes from 'prop-types';
 
-export const blockletMetaProps = PropTypes.shape({
+export const BlockletMetaProps = PropTypes.shape({
   appLogo: PropTypes.node,
   appName: PropTypes.string,
   theme: PropTypes.shape({
@@ -24,7 +24,7 @@ export const blockletMetaProps = PropTypes.shape({
   ),
 });
 
-export const sessionManagerProps = PropTypes.shape({
+export const SessionManagerProps = PropTypes.shape({
   showText: PropTypes.bool,
   showRole: PropTypes.bool,
   switchDid: PropTypes.bool,