@abtnode/ux 1.16.25-next-3d78a4cb → 1.16.25-next-bc2f4c63

package/es/subscription/blocklet.js

@@ -51,6 +51,9 @@ function SubscriptionBlocklet({
       launcherSessionId,
       locale
     })]);
+    if (data?.error) {
+      throw new Error(data.error);
+    }
     return {
       launcherSession: data.launcherSession,
       subscriptionURL

package/es/subscription/server.js

@@ -10,7 +10,7 @@ import { useRef } from 'react';
 import useAsyncRetry from 'react-use/lib/useAsyncRetry';
 import useSetState from 'react-use/lib/useSetState';
 import { useNodeContext } from '../contexts/node';
-import { formatPrettyMsLocale, getAssetExpiration, getSubscriptionUrlV2 } from '../util';
+import { formatPrettyMsLocale, getSubscriptionUrlV2 } from '../util';
 import ChipLabel from './chip-label';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 const ALERT_THRESHOLD_MS = 30 * 24 * 60 * 60 * 1000;
@@ -40,9 +40,12 @@ function SubscriptionServer({
   } = props;
   const typoKey = isMobile ? 'mobile' : 'desktop';
   const asyncState = useAsyncRetry(async () => {
-    const [asset, subscriptionURL] = await Promise.all([node.api.getLauncherSession({
+    const [data, subscriptionURL] = await Promise.all([
+    // 新 Launch 的 Server 会有 launcherSessionId 信息，旧的 Server 只有 nftId
+    // 这里做兼容处理，优先使用 launcherSessionId, 如果没有则使用 nftId
+    node.api.getLauncherSession({
       input: {
-        launcherSessionId,
+        launcherSessionId: launcherSessionId || nftId,
         launcherUrl
       }
     }), getSubscriptionUrlV2({
@@ -51,8 +54,11 @@ function SubscriptionServer({
       launcherSessionId,
       locale
     })]);
+    if (data?.error) {
+      throw new Error(data.error);
+    }
     return {
-      asset,
+      launcherSession: data.launcherSession,
       subscriptionURL
     };
   }, [locale]);
@@ -87,7 +93,7 @@ function SubscriptionServer({
       onClick: () => asyncState.retry()
     });
   }
-  const expirationDate = getAssetExpiration(asyncState.value?.asset);
+  const expirationDate = asyncState.value?.launcherSession?.expirationDate;
   const isExpired = dayjs(expirationDate).isBefore(dayjs());
   const validityMs = dayjs(expirationDate).diff(dayjs(), 'ms');
   let status = 'success';

package/es/util/index.js

@@ -6,7 +6,6 @@ import filesize from 'filesize';
 import humanizeUrl from 'humanize-url';
 import isUrl from 'is-url';
 import get from 'lodash/get';
-import last from 'lodash/last';
 import trimEnd from 'lodash/trimEnd';
 import qs from 'querystring';
 import joinUrl from 'url-join';
@@ -531,9 +530,6 @@ export async function getAsset(chainHost, address) {
   }
   return state;
 }
-export function getAssetExpiration(asset) {
-  return last(get(asset, 'data.value.expirationDate', []));
-}
 
 /**
  * 检查url是否 未添加到 store list 中

package/lib/subscription/blocklet.js

@@ -69,6 +69,9 @@ function SubscriptionBlocklet(_ref) {
       launcherSessionId,
       locale
     })]);
+    if (data !== null && data !== void 0 && data.error) {
+      throw new Error(data.error);
+    }
     return {
       launcherSession: data.launcherSession,
       subscriptionURL

package/lib/subscription/server.js

@@ -58,9 +58,12 @@ function SubscriptionServer(_ref) {
     rest = _objectWithoutProperties(props, _excluded2);
   const typoKey = isMobile ? 'mobile' : 'desktop';
   const asyncState = (0, _useAsyncRetry.default)(async () => {
-    const [asset, subscriptionURL] = await Promise.all([node.api.getLauncherSession({
+    const [data, subscriptionURL] = await Promise.all([
+    // 新 Launch 的 Server 会有 launcherSessionId 信息，旧的 Server 只有 nftId
+    // 这里做兼容处理，优先使用 launcherSessionId, 如果没有则使用 nftId
+    node.api.getLauncherSession({
       input: {
-        launcherSessionId,
+        launcherSessionId: launcherSessionId || nftId,
         launcherUrl
       }
     }), (0, _util.getSubscriptionUrlV2)({
@@ -69,8 +72,11 @@ function SubscriptionServer(_ref) {
       launcherSessionId,
       locale
     })]);
+    if (data !== null && data !== void 0 && data.error) {
+      throw new Error(data.error);
+    }
     return {
-      asset,
+      launcherSession: data.launcherSession,
       subscriptionURL
     };
   }, [locale]);
@@ -102,7 +108,7 @@ function SubscriptionServer(_ref) {
       onClick: () => asyncState.retry()
     }));
   }
-  const expirationDate = (0, _util.getAssetExpiration)((_asyncState$value = asyncState.value) === null || _asyncState$value === void 0 ? void 0 : _asyncState$value.asset);
+  const expirationDate = (_asyncState$value = asyncState.value) === null || _asyncState$value === void 0 || (_asyncState$value = _asyncState$value.launcherSession) === null || _asyncState$value === void 0 ? void 0 : _asyncState$value.expirationDate;
   const isExpired = (0, _dayjs.default)(expirationDate).isBefore((0, _dayjs.default)());
   const validityMs = (0, _dayjs.default)(expirationDate).diff((0, _dayjs.default)(), 'ms');
   let status = 'success';

package/lib/util/index.js

@@ -23,7 +23,6 @@ exports.formatUrl = void 0;
 exports.getAccessUrl = getAccessUrl;
 exports.getAccessibleUrl = void 0;
 exports.getAsset = getAsset;
-exports.getAssetExpiration = getAssetExpiration;
 exports.getBlockletLogoUrl = void 0;
 exports.getBlockletMetaUrl = getBlockletMetaUrl;
 exports.getBlockletUrl = getBlockletUrl;
@@ -46,7 +45,6 @@ var _filesize = _interopRequireDefault(require("filesize"));
 var _humanizeUrl = _interopRequireDefault(require("humanize-url"));
 var _isUrl = _interopRequireDefault(require("is-url"));
 var _get = _interopRequireDefault(require("lodash/get"));
-var _last = _interopRequireDefault(require("lodash/last"));
 var _trimEnd = _interopRequireDefault(require("lodash/trimEnd"));
 var _querystring = _interopRequireDefault(require("querystring"));
 var _urlJoin = _interopRequireDefault(require("url-join"));
@@ -617,9 +615,6 @@ async function getAsset(chainHost, address) {
   }
   return state;
 }
-function getAssetExpiration(asset) {
-  return (0, _last.default)((0, _get.default)(asset, 'data.value.expirationDate', []));
-}
 
 /**
  * 检查url是否 未添加到 store list 中

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.25-next-3d78a4cb",
+  "version": "1.16.25-next-bc2f4c63",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -28,9 +28,9 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.25-next-3d78a4cb",
-    "@abtnode/constant": "1.16.25-next-3d78a4cb",
-    "@abtnode/util": "1.16.25-next-3d78a4cb",
+    "@abtnode/auth": "1.16.25-next-bc2f4c63",
+    "@abtnode/constant": "1.16.25-next-bc2f4c63",
+    "@abtnode/util": "1.16.25-next-bc2f4c63",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.113",
     "@arcblock/did-connect": "^2.9.60",
@@ -40,10 +40,10 @@
     "@arcblock/react-hooks": "^2.9.60",
     "@arcblock/terminal": "^2.9.60",
     "@arcblock/ux": "^2.9.60",
-    "@blocklet/constant": "1.16.25-next-3d78a4cb",
+    "@blocklet/constant": "1.16.25-next-bc2f4c63",
     "@blocklet/launcher-layout": "2.2.60",
     "@blocklet/list": "^0.12.78",
-    "@blocklet/meta": "1.16.25-next-3d78a4cb",
+    "@blocklet/meta": "1.16.25-next-bc2f4c63",
     "@blocklet/ui-react": "^2.9.60",
     "@blocklet/uploader": "^0.0.75",
     "@emotion/react": "^11.10.4",
@@ -107,7 +107,7 @@
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0"
   },
-  "gitHead": "26b43891e46756b142bcd6b62c57357c7c23cf2f",
+  "gitHead": "499ecf2bde0cdb25dbfdd1cf7807212f5fe37ad9",
   "exports": {
     ".": {
       "import": "./es/index.js",