@blocklet/launcher-workflow 2.4.3 → 2.4.5

package/es/locales/en.js

@@ -39,15 +39,15 @@ export default {
   },
   prepare: {
     serverless: {
-      preparing: 'Allocating space on the server. Please wait...',
-      prepared: 'The space is ready. Redirecting to the server to continue the installation...',
-      prepareFailed: 'Failed to allocate space!'
+      preparing: 'Setting up your space...',
+      prepared: 'Space is ready! Installing your blocklet...',
+      prepareFailed: 'Failed to set up your space!'
     }
   },
   launch: {
     pageTitle: 'Preparing Space',
     invalidFftId: 'Invalid Purchase NFT ID',
-    launchApp: 'Launch App',
+    launchApp: 'Launch Blocklet',
     launching: 'Your Blocklet Space is being baked, please be patient, it usually takes about 5 minutes',
     launched: 'Your Blocklet Space is up and running',
     launchSuccess: 'Blocklet Space is successfully launched',
@@ -55,11 +55,11 @@ export default {
     waitingForLaunching: 'Your Blocklet Space launch request is being processed, please be patient, it usually takes about 5 minutes',
     accessServer: 'Access Blocklet Space',
     waiting: {
-      starting: 'Starting Blocklet Space',
-      securing: 'Securing Network',
-      prepare: 'Prepare Storage',
-      waiting: 'Waiting for Ready',
-      done: 'Blocklet Space is Ready'
+      starting: 'Starting Blocklet Space...',
+      securing: 'Securing Network...',
+      prepare: 'Prepare Storage...',
+      waiting: 'Waiting for Ready...',
+      done: 'Blocklet Space is Ready...'
     },
     dialog: {
       title: 'Launch Blocklet Space',
@@ -74,6 +74,63 @@ export default {
       notFoundDescription: 'You can launch the Space by clicking the button below'
     }
   },
+  install: {
+    pageTitle: 'Install Blocklet',
+    waiting: {
+      verifying: 'Verifying blocklet metadata...',
+      downloading: 'Downloading blocklet...',
+      extracting: 'Extracting blocklet data...',
+      downloadingComponent: 'Downloading {name}',
+      extractingComponent: 'Extracting {name}',
+      installing: 'Installing blocklet components...',
+      installed: 'Blocklet is installed'
+    },
+    installing: 'Installing Blocklet...',
+    installed: 'Blocklet is installed',
+    installFailed: 'Install Blocklet Failed!'
+  },
+  startApp: {
+    pageTitle: 'Start Blocklet',
+    starting: 'Starting Blocklet...',
+    started: 'Blocklet is ready to use!',
+    startedDescription: 'Your blocklet has been successfully started and is now ready to use.',
+    startFailed: 'Start Blocklet Failed',
+    installFailed: 'Install Blocklet Failed',
+    visit: 'Visit Blocklet',
+    dashboard: 'View Blocklet Dashboard',
+    subscription: 'Manage Subscription',
+    unknownApp: 'Unknown Blocklet',
+    appInfo: 'Blocklet Information',
+    appDid: 'Blocklet DID',
+    serverUrl: 'Server URL',
+    status: 'Status',
+    version: 'Version',
+    running: 'Running',
+    myOrders: 'My Orders',
+    myOrdersDesc: 'View and manage all your orders',
+    projectName: 'Project Name',
+    visitUrl: 'Visit URL',
+    visitApp: 'Visit Blocklet',
+    visitAppDesc: 'Open your blocklet homepage',
+    dashboardDesc: 'View monitoring status and resource usage',
+    subscriptionDesc: 'Manage stake amount and renewal settings',
+    appManagement: 'Blocklet Management',
+    appManagementDesc: 'Change configuration and blocklet settings',
+    waiting: {
+      starting: 'Starting blocklet...',
+      parsing: 'Parsing blocklet metadata...',
+      initializing: 'Initializing blocklet configuration...',
+      initializingOwner: 'Initializing blocklet owner...',
+      creatingSecurityRules: 'Creating default security rules...',
+      assigningDomain: 'Assigning default domain name...',
+      waitingForDomain: 'Waiting for default domain name...'
+    }
+  },
+  loading: {
+    completed: 'completed',
+    retry: 'Retry',
+    remainingTime: 'About {time} remaining'
+  },
   start: {
     title: 'Starting Space',
     error: {
@@ -108,10 +165,10 @@ export default {
     morePlanPrompt: 'Flip the page to see more plans',
     redeem: 'Select purchased space',
     noProducts: 'No products available for purchase, please check your payment-kit config',
-    serverlessNotSupported: 'This app is not allowed in sigular and on-demand space, please select dedicated space',
+    serverlessNotSupported: 'This blocklet is not allowed in sigular and on-demand space, please select dedicated space',
     componentCount: '{count} Component Included',
     componentsCount: '{count} Components Included',
-    onDemandNotSupport: 'This app does not support installation in on-demand space, please purchase dedicated space or install in your own dedicated space',
+    onDemandNotSupport: 'This blocklet does not support installation in on-demand space, please purchase dedicated space or install in your own dedicated space',
     dialog: {
       title: 'Purchase Blocklet Space NFT',
       scan: 'Scan the QR code below with your DID wallet to complete purchase',
@@ -120,7 +177,7 @@ export default {
     },
     serverlessDialog: {
       title: 'Purchase successfully',
-      redirectToStoreButton: 'Go to install the application →',
+      redirectToStoreButton: 'Go to install the blocklet →',
       purchaseServerlessSuccess: 'The purchase of Running Space is successful and you can go ahead and install Blocklet.'
     },
     inProgress: {
@@ -141,7 +198,7 @@ export default {
       paid: 'Current order has been paid',
       paidDescription: 'The current order has been paid, you can choose to purchase a new space or continue the launch process.',
       installed: 'Order has been installed',
-      installedDescription: 'The current order has been successfully installed, you can choose to purchase a new space or jump to the current application.',
+      installedDescription: 'The current order has been successfully installed, you can choose to purchase a new space or jump to the current blocklet.',
       expired: 'Order has been expired',
       expiredDescription: 'The current order has expired, you can choose to purchase a new space.'
     }
@@ -156,7 +213,7 @@ export default {
     agreement: '{name} User Agreement',
     estimatedCost: 'Estimated Cost',
     estimatedCostFreeTrial: 'Estimated Cost After The Trial ends',
-    estimatedCostHint: 'The total cost will vary depending on the actual number and duration of components used in the application. The calculation method is: Unit price of component * Number of components * Duration.',
+    estimatedCostHint: 'The total cost will vary depending on the actual number and duration of components used in the blocklet. The calculation method is: Unit price of component * Number of components * Duration.',
     freeTrial: 'Free Trial',
     freeTrialHint: 'Free trial for {duration}',
     stakeAmount: 'Stake Amount',

package/es/locales/zh.js

@@ -47,7 +47,7 @@ export default {
   launch: {
     pageTitle: '准备空间',
     invalidFftId: '无效的购买凭证',
-    launchApp: '启动应用',
+    launchApp: '启动 Blocklet',
     launching: '空间正在启动中, 大约需要 5 分钟',
     launched: '空间已启动',
     launchSuccess: '创建空间成功',
@@ -55,11 +55,11 @@ export default {
     waitingForLaunching: '空间正在启动中，大约需要 5 分钟',
     accessServer: '访问空间',
     waiting: {
-      starting: '启动空间',
-      securing: '确保空间的网络安全',
-      prepare: '准备好空间存储',
-      waiting: '等待空间就绪',
-      done: '空间已准备就绪'
+      starting: '启动空间...',
+      securing: '确保空间的网络安全...',
+      prepare: '准备好空间存储...',
+      waiting: '等待空间就绪...',
+      done: '空间已准备就绪...'
     },
     dialog: {
       title: '创建空间',
@@ -74,6 +74,62 @@ export default {
       notFoundDescription: '您可以点击下面按钮启动空间'
     }
   },
+  install: {
+    pageTitle: '安装 Blocklet',
+    waiting: {
+      verifying: '验证 Blocklet 元数据...',
+      downloading: '下载 Blocklet...',
+      extracting: '提取 Blocklet 数据...',
+      downloadingComponent: '下载 {name}',
+      extractingComponent: '提取 {name}',
+      installing: '安装 Blocklet 组件...',
+      installed: 'Blocklet 已安装'
+    },
+    installing: '正在安装 Blocklet...',
+    installFailed: '安装 Blocklet 失败!'
+  },
+  startApp: {
+    pageTitle: '启动 Blocklet',
+    starting: '正在启动 Blocklet...',
+    started: 'Blocklet 启动成功',
+    startedDescription: '您的 Blocklet 已成功启动并准备就绪，现在可以开始使用了。',
+    startFailed: '启动 Blocklet 失败',
+    installFailed: '安装 Blocklet 失败',
+    visit: '访问 Blocklet',
+    dashboard: '查看 Blocklet 仪表盘',
+    subscription: '管理订阅',
+    unknownApp: '未知 Blocklet',
+    appInfo: 'Blocklet 信息',
+    appDid: 'Blocklet DID',
+    serverUrl: '服务器地址',
+    status: '状态',
+    version: '版本',
+    running: '运行中',
+    myOrders: '我的订单',
+    myOrdersDesc: '查看和管理您的所有订单',
+    projectName: '项目名称',
+    visitUrl: '访问地址',
+    visitApp: '访问 Blocklet',
+    visitAppDesc: '打开您的 Blocklet 主页面',
+    dashboardDesc: '查看监控状态和资源使用',
+    subscriptionDesc: '管理质押金额和续费设置',
+    appManagement: 'Blocklet 管理',
+    appManagementDesc: '更改配置和 Blocklet 设置',
+    waiting: {
+      starting: '正在启动 Blocklet...',
+      parsing: '正在解析 Blocklet 元数据...',
+      initializing: '正在初始化 Blocklet 配置...',
+      initializingOwner: '正在初始化 Blocklet 所有者...',
+      creatingSecurityRules: '正在创建默认安全规则...',
+      assigningDomain: '正在为 Blocklet 分配默认域名...',
+      waitingForDomain: '正在等待默认域名生效...'
+    }
+  },
+  loading: {
+    completed: '完成',
+    retry: '重试',
+    remainingTime: '大约需要 {time}'
+  },
   start: {
     title: '启动空间',
     error: {
@@ -108,10 +164,10 @@ export default {
     noPlan: '选择套餐以继续',
     hasPlan: '选用{name}',
     noProducts: '没有可购买的商品，请检查 PaymentKit 的配置',
-    serverlessNotSupported: '该应用被禁止能在单应用或者按需空间中运行，请选择专用空间',
+    serverlessNotSupported: '该 Blocklet 被禁止能在单 Blocklet 或者按需空间中运行，请选择专用空间',
     componentCount: '共 {count} 个组件',
     componentsCount: '共 {count} 个组件',
-    onDemandNotSupport: '该应用不支持安装在按需空间中，请购买专用空间，或者安装在自己已有的专用空间中',
+    onDemandNotSupport: '该 Blocklet 不支持安装在按需空间中，请购买专用空间，或者安装在自己已有的专用空间中',
     dialog: {
       title: '购买 Blocklet Server NFT',
       scan: '用您的 DID 钱包扫描下面的二维码完成购买',
@@ -120,8 +176,8 @@ export default {
     },
     serverlessDialog: {
       title: '购买成功',
-      redirectToStoreButton: '去安装应用 →',
-      purchaseServerlessSuccess: '购买运行空间成功，您可以去安装应用.'
+      redirectToStoreButton: '去安装 Blocklet →',
+      purchaseServerlessSuccess: '购买运行空间成功，您可以去安装 Blocklet.'
     },
     inProgress: {
       title: '未完成的订单',
@@ -141,7 +197,7 @@ export default {
       paid: '订单已支付',
       paidDescription: '检测当前订单已经支付，您可以选择购买新的空间，或者继续启动流程',
       installed: '订单已安装',
-      installedDescription: '检测当前订单已经安装成功，您可以选择购买新的空间，或者跳转到当前应用。',
+      installedDescription: '检测当前订单已经安装成功，您可以选择购买新的空间，或者跳转到当前 Blocklet。',
       expired: '订单已过期',
       expiredDescription: '检测当前订单已经过期，您可以选择购买新的空间。'
     }
@@ -156,7 +212,7 @@ export default {
     agreement: '{name} 用户协议',
     estimatedCostFreeTrial: '试用结束后估算成本',
     estimatedCost: '估算成本',
-    estimatedCostHint: '总成本会根据应用实际使用的组件数量和时长而变化，计算方式为: 组件单价*组件数量*时长',
+    estimatedCostHint: '总成本会根据 Blocklet 实际使用的组件数量和时长而变化，计算方式为: 组件单价*组件数量*时长',
     freeTrial: '免费试用',
     freeTrialHint: '免费试用{duration}',
     stakeAmount: '质押金额',

package/es/paid.js

@@ -4,7 +4,7 @@ import CircularProgress from '@mui/material/CircularProgress';
 import { useRequest } from 'ahooks';
 import { useEffect } from 'react';
 import { useNavigate, useSearchParams } from 'react-router-dom';
-import joinURL from 'url-join';
+import { joinURL } from 'ufo';
 import { useLocaleContext } from './contexts/locale';
 import useRequestContext from './contexts/request';
 import { useWorkflowContext } from './contexts/workflow';

package/es/prepare.js

@@ -17,7 +17,7 @@ import { useCallback, useEffect, useMemo } from 'react';
 import { Link, useNavigate, useSearchParams } from 'react-router-dom';
 import useAsync from 'react-use/lib/useAsync';
 import useSetState from 'react-use/lib/useSetState';
-import joinURL from 'url-join';
+import { joinURL } from 'ufo';
 import ConfirmDialog from './components/confirm';
 import Body from './components/layout/body';
 import Header from './components/layout/header';

package/es/start-app.js

@@ -0,0 +1,28 @@
+import { useEffect } from 'react';
+import { useParams } from 'react-router-dom';
+import StartAppServerless from './components/launch-serverless/start-app';
+import { useSessionContext } from './contexts/session';
+import { jsx as _jsx } from "react/jsx-runtime";
+export default function Launch() {
+  const {
+    sessionId
+  } = useParams();
+  const {
+    session
+  } = useSessionContext();
+  useEffect(() => {
+    if (!session.user) {
+      return session.login(() => {
+        session.refresh();
+      });
+    }
+    return () => {};
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [session.user]);
+  if (!session.user) {
+    return '';
+  }
+  return /*#__PURE__*/_jsx(StartAppServerless, {
+    sessionId: sessionId
+  });
+}

package/es/util.js

@@ -1,9 +1,15 @@
+import { WELLKNOWN_PATH_PREFIX, WELLKNOWN_PING_PREFIX } from '@abtnode/constant';
+import axios from '@abtnode/util/lib/axios';
+import normalizePathPrefix from '@abtnode/util/lib/normalize-path-prefix';
+import tryWithTimeout from '@abtnode/util/lib/try-with-timeout';
+import { evaluateURLs } from '@abtnode/util/lib/url-evaluation';
+import checkAccessible from '@abtnode/util/lib/url-evaluation/check-accessible-browser';
 import { create as createRequestInstance } from '@blocklet/launcher-util/es/api';
 import { getFromQuery } from '@blocklet/launcher-ux/lib/util';
 import get from 'lodash.get';
 import noop from 'lodash.noop';
 import pick from 'lodash.pick';
-import joinURL from 'url-join';
+import { joinURL } from 'ufo';
 export const BLOCKLET_STORE_URL = get(window, 'blocklet.LAUNCHER_BLOCKLET_STORE_URL') || 'https://store.blocklet.dev';
 export function getBlockletMetaUrl(registry, did) {
   return joinURL(registry, `/api/blocklets/${did}/blocklet.json?source=webapp`);
@@ -162,4 +168,177 @@ export const launchSession = {
       done(err);
     });
   }
-};
+};
+export function sleep(t) {
+  // eslint-disable-next-line no-promise-executor-return
+  return new Promise(resolve => setTimeout(resolve, t));
+}
+export const isUrlAccessible = url => checkAccessible(joinURL(new URL(url).origin, WELLKNOWN_PING_PREFIX));
+export const checkBlockletAccessible = async (url, timeout = 5000, controller = null) => {
+  try {
+    const urlObj = new URL(url);
+    urlObj.protocol = 'https';
+    const res = await axios.get(joinURL(urlObj.toString(), '/api/__blocklet__.js?type=json'), {
+      timeout,
+      signal: controller?.signal,
+      validateStatus: status => {
+        return status >= 200 && status < 400 || status === 503; // 503 是 not running, 可以访问 blocklet service
+      }
+    });
+    return res.data;
+  } catch (error) {
+    return null;
+  }
+};
+export const checkUrlAccessible = async (url, timeout = 30 * 1000, controller = null) => {
+  try {
+    return await tryWithTimeout(async () => {
+      let res = null;
+      do {
+        res = await checkBlockletAccessible(url, 5000, controller);
+        await sleep(2000);
+      } while (!res && !controller?.signal?.aborted);
+      return res;
+    }, timeout);
+  } catch (error) {
+    console.error(error);
+    return null;
+  }
+};
+export const waitingForRaceAccessible = async (urls, timeout = 30 * 1000) => {
+  // Create an AbortController for each request
+  const controllers = urls.map(() => new AbortController());
+  try {
+    const tasks = urls.map((url, index) => checkUrlAccessible(url, timeout, controllers[index]).then(res => [url, res]).catch(error => {
+      // If this request failed but wasn't aborted, we should still propagate the error
+      if (error.name !== 'AbortError') {
+        throw error;
+      }
+      return null;
+    }));
+
+    // Add a timeout promise to the race
+    const timeoutPromise = new Promise((_, reject) => {
+      setTimeout(() => reject(new Error('All requests timed out')), timeout);
+    });
+
+    // Race all tasks including the timeout
+    const result = await Promise.race([
+    // Wait for the first successful response
+    ...tasks, timeoutPromise]);
+
+    // Cancel all other requests
+    controllers.forEach(controller => controller.abort());
+    return result;
+  } catch (error) {
+    // Cancel all requests on error
+    controllers.forEach(controller => controller.abort());
+    throw error;
+  }
+};
+const waitingForAccessible = async (urls, timeout = 30 * 1000) => {
+  const tasks = await urls.map(url => checkUrlAccessible(url, timeout));
+  const result = await Promise.all(tasks);
+  return result;
+};
+export const sortUrls = urls => {
+  return evaluateURLs(urls, {
+    checkAccessible: null
+  }).then(items => items.map(item => item.url));
+};
+export const getAccessibleUrl = async urls => {
+  try {
+    await waitingForAccessible(urls);
+    const res = await evaluateURLs(urls, {
+      checkAccessible: checkBlockletAccessible
+    });
+    return res[0].url;
+  } catch (error) {
+    console.warn('get accessible url failed', error);
+    return '';
+  }
+};
+
+/**
+ * get access url
+ * auto fix http/https, port, query
+ * docker friendly
+ */
+export function getAccessUrl(hostname, path = '', params = undefined) {
+  if (!hostname) {
+    return '';
+  }
+  try {
+    let port = '';
+    const browserPort = Number(window.location.port);
+    if (process.env.NODE_ENV !== 'development' && browserPort && ![80, 443].includes(browserPort)) {
+      port = `:${browserPort}`;
+    }
+    const urlObj = new URL(`${window.location.protocol}//${hostname}${port}`);
+    urlObj.pathname = path;
+    const url = urlObj.href.replace(/\/$/, '');
+    if (!params || !Object.keys(params)) {
+      return url;
+    }
+    const searchParams = new URLSearchParams();
+    Object.keys(params).forEach(key => {
+      searchParams.append(key, params[key]);
+    });
+    return `${url}${urlObj.pathname === '/' ? '/' : ''}?${searchParams.toString()}`;
+  } catch (err) {
+    console.error(err);
+    return '';
+  }
+}
+export function getBlockletUrl({
+  blocklet,
+  domain: inputDomain,
+  mountPoint: inputMountPoint,
+  params
+} = {}) {
+  const {
+    site
+  } = blocklet;
+  if (!site) {
+    return null;
+  }
+  const domain = inputDomain || (site.domainAliases || [])[0];
+  if (!domain) {
+    return null;
+  }
+  let mountPoint = inputMountPoint;
+  if (!mountPoint) {
+    const rule = site.rules.filter(x => !x.from.pathPrefix.startsWith(WELLKNOWN_PATH_PREFIX))[0];
+    mountPoint = rule ? rule.from.pathPrefix : '/';
+  }
+  return getAccessUrl(domain.value, mountPoint, params);
+}
+export function getBlockletUrls({
+  blocklet,
+  mountPoint: inputMountPoint,
+  params
+} = {}) {
+  const {
+    site
+  } = blocklet;
+  if (!site) {
+    return [];
+  }
+  const domains = site.domainAliases || [];
+  if (!domains.length) {
+    return [];
+  }
+  let mountPoint = inputMountPoint;
+  if (!mountPoint) {
+    const rules = site.rules.filter(x => !x.from.pathPrefix.startsWith(WELLKNOWN_PATH_PREFIX));
+    let rule = rules[0];
+    if (rule?.from?.pathPrefix !== '/') {
+      const rootRule = rules.find(x => x.from?.pathPrefix === '/');
+      if (rootRule) {
+        rule = rootRule;
+      }
+    }
+    mountPoint = normalizePathPrefix(rule?.from?.pathPrefix || '/');
+  }
+  return domains.map(domain => getAccessUrl(domain.value, mountPoint, params));
+}

package/lib/components/in-progress-session.js

@@ -11,7 +11,7 @@ var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _Link = _interopRequireDefault(require("@mui/material/Link"));
 var _react = require("react");
 var _useAsync = _interopRequireDefault(require("react-use/lib/useAsync"));
-var _urlJoin = _interopRequireDefault(require("url-join"));
+var _ufo = require("ufo");
 var _locale = require("../contexts/locale");
 var _request = _interopRequireDefault(require("../contexts/request"));
 var _workflow = require("../contexts/workflow");
@@ -36,7 +36,7 @@ function InProgressSession() {
   const state = (0, _useAsync.default)(async () => {
     const {
       data
-    } = await api.get((0, _urlJoin.default)(routerPrefix, '/launches/in-progress'));
+    } = await api.get((0, _ufo.joinURL)(routerPrefix, '/launches/in-progress'));
     if (data.launch) {
       if (localStorage.getItem(IGNORE_LAUNCH_SESSION_KEY) === data.launch.id) {
         return null;
@@ -59,7 +59,7 @@ function InProgressSession() {
   let continueBaseURL = '';
   try {
     continueBaseURL = (0, _util.getContinueLaunchURL)({
-      baseURL: (0, _urlJoin.default)(window.location.origin, baseURL),
+      baseURL: (0, _ufo.joinURL)(window.location.origin, baseURL),
       launch: state.value
     });
   } catch (error) {