@abtnode/ux 1.16.28-beta-bfbab430 → 1.16.28-beta-641c9f13

package/lib/analytics/traffic.js

@@ -3,16 +3,10 @@
 import { useEffect, useState } from 'react';
 import dayjs from '@abtnode/util/lib/dayjs';
 import nthArg from 'lodash/nthArg';
-import joinUrl from 'url-join';
+import { joinURL } from 'ufo';
 import useAsyncRetry from 'react-use/lib/useAsyncRetry';
 import Iframe from 'react-iframe';
-import Alert from '@mui/material/Alert';
-import Spinner from '@mui/material/CircularProgress';
-import Grid from '@mui/material/Grid';
-import Typography from '@mui/material/Typography';
-import Button from '@mui/material/Button';
-import IconButton from '@mui/material/IconButton';
-import Popover from '@mui/material/Popover';
+import { Alert, CircularProgress, Grid, Typography, Button, IconButton, Popover } from '@mui/material';
 import ViewIcon from '@mui/icons-material/LaunchOutlined';
 import { DateRangePicker } from 'mui-daterange-picker';
 import { DatePicker } from '@mui/x-date-pickers';
@@ -114,7 +108,7 @@ export default function TrafficInsights({
     error
   } = data;
   if (!list.length && loading) {
-    return /*#__PURE__*/_jsx(Spinner, {});
+    return /*#__PURE__*/_jsx(CircularProgress, {});
   }
   if (error) {
     return /*#__PURE__*/_jsx(Alert, {
@@ -150,7 +144,7 @@ export default function TrafficInsights({
 
   // eslint-disable-next-line no-nested-ternary
   const pathPrefix = inService ? WELLKNOWN_SERVICE_PATH_PREFIX : process.env.NODE_ENV === 'production' ? info.routing.adminPath : '';
-  const breakdownUrl = joinUrl(window.location.origin, pathPrefix, `/api/analytics/traffic?date=${dayjs(date).format('YYYY-MM-DD')}&did=${did}`);
+  const breakdownUrl = joinURL(window.location.origin, pathPrefix, `/api/analytics/traffic?date=${dayjs(date).format('YYYY-MM-DD')}&did=${did}`);
   const onRangeChange = range => {
     setDateRange(range);
     setAnchorEl(null);

package/lib/blocklet/authentication/federated/federated-detail-dialog.js

@@ -11,7 +11,7 @@ import { Address } from '@arcblock/did-connect';
 import Dialog from '@arcblock/ux/lib/Dialog';
 import StarsIcon from '@mui/icons-material/Stars';
 import isUrl from 'is-url';
-import joinUrl from 'url-join';
+import { joinURL } from 'ufo';
 import { useBlockletContext } from '../../../contexts/blocklet';
 import { useNodeContext } from '../../../contexts/node';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
@@ -95,7 +95,7 @@ const FederatedDetailDialog = /*#__PURE__*/forwardRef((props, ref) => {
         });
       }
       if (['appLogo'].includes(key)) {
-        const logoUrl = isUrl(value) ? value : joinUrl(state.data.appUrl || '', value || '');
+        const logoUrl = isUrl(value) ? value : joinURL(state.data.appUrl || '', value || '');
         try {
           const logoUrlInstance = new URL(logoUrl);
           logoUrlInstance.searchParams.set('imageFilter', 'resize');

package/lib/blocklet/blocklet-source.js

@@ -1,6 +1,6 @@
 import { useContext } from 'react';
 import PropTypes from 'prop-types';
-import joinUrl from 'url-join';
+import { joinURL } from 'ufo';
 import toUpper from 'lodash/toUpper';
 import Tag from '@arcblock/ux/lib/Tag';
 import { LocaleContext } from '@arcblock/ux/lib/Locale/context';
@@ -21,7 +21,7 @@ export default function BlockletSource({
       type: "success",
       children: toUpper(sourceInfo.source)
     }, "source"), sourceInfo.source === 'registry' && /*#__PURE__*/_jsx(ExternalLink, {
-      href: joinUrl(sourceInfo.deployedFrom, 'blocklets', blocklet?.meta?.bundleDid || ''),
+      href: joinURL(sourceInfo.deployedFrom, 'blocklets', blocklet?.meta?.bundleDid || ''),
       target: "_blank",
       className: "page-link",
       underline: "hover",

package/lib/blocklet/component/add-component/add-component-core.js

@@ -7,7 +7,7 @@ import Alert from '@arcblock/ux/lib/Alert';
 import AnimationWaiter from '@arcblock/ux/lib/AnimationWaiter';
 import Button from '@arcblock/ux/lib/Button';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import { BLOCKLET_APP_SPACE_REQUIREMENT, BLOCKLET_CONFIGURABLE_KEY, BlockletEvents, BlockletGroup, BlockletStatus } from '@blocklet/constant';
+import { BLOCKLET_APP_SPACE_REQUIREMENT, BLOCKLET_CONFIGURABLE_KEY, BlockletEvents, BlockletStatus } from '@blocklet/constant';
 import { StepProvider } from '@blocklet/launcher-layout/lib/context/step';
 import ResultMessage from '@blocklet/launcher-layout/lib/launch-result-message';
 import PageHeader from '@blocklet/launcher-layout/lib/page-header';
@@ -851,7 +851,7 @@ export default function AddComponentCore({
       }
     });
   }
-  if (hasStartEngine(meta) && meta.group !== BlockletGroup.engine && !alreadyInstalled(meta.did)) {
+  if (hasStartEngine(meta) && !alreadyInstalled(meta.did)) {
     steps.push({
       key: 'config',
       name: t('common.config'),

package/lib/blocklet/component/did-space/connect-to.js

@@ -3,7 +3,7 @@ import React, { useState } from 'react';
 import Button from '@arcblock/ux/lib/Button';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import DidConnect from '@arcblock/did-connect/lib/Connect';
-import joinUrl from 'url-join';
+import { joinURL } from 'ufo';
 import toast from '@arcblock/ux/lib/Toast';
 import SplitButton from '@arcblock/ux/lib/SplitButton';
 import Dialog from '@arcblock/ux/lib/Dialog';
@@ -62,7 +62,7 @@ function ConnectTo({
     checkTimeout: 1000 * 300,
     prefix: '/api/did',
     checkFn: axios.create({
-      baseURL: joinUrl(window.location.origin, getPathPrefix())
+      baseURL: joinURL(window.location.origin, getPathPrefix())
     }).get,
     messages: {
       title: t('storage.spaces.provideNFT.title', {
@@ -191,10 +191,10 @@ function ConnectTo({
       setAuthorizeConnect(preValue => ({
         ...preValue,
         open: true,
-        prefix: joinUrl(didSpacesCoreUrl, 'space/api/did'),
+        prefix: joinURL(didSpacesCoreUrl, 'space/api/did'),
         baseUrl: new URL(didSpacesCoreUrl).origin,
         checkFn: axios.create({
-          baseURL: joinUrl(didSpacesCoreUrl, 'space')
+          baseURL: joinURL(didSpacesCoreUrl, 'space')
         }).get,
         extraParams: {
           appDid: blockletInfo.appDid,

package/lib/blocklet/component/navigation/navigation-dialog.js

@@ -23,8 +23,7 @@ import { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRe
 import { Controller, useForm } from 'react-hook-form';
 import { Icon, loadIcon } from '@iconify/react';
 import { isMatchSection, checkLink, flattenNavigation } from '@blocklet/meta/lib/parse-navigation-from-blocklet';
-import urljoin from 'url-join';
-import { withoutTrailingSlash } from 'ufo/dist/index.mjs';
+import { joinURL, withoutTrailingSlash } from 'ufo';
 import isAbsoluteUrl from 'is-absolute-url';
 import { SUPPORTED_LANGUAGES } from '@blocklet/constant';
 import LocaleTabs from './locale-tabs';
@@ -169,7 +168,7 @@ const NavigationDialog = /*#__PURE__*/forwardRef(function NavigationDialog({
         return withoutTrailingSlash(stringLink);
       }
       const selectedLink = isObject(selectedOption.link) ? selectedOption.link[state.locale] : selectedOption.link;
-      return withoutTrailingSlash(urljoin(stringLink, selectedLink || '/'));
+      return withoutTrailingSlash(joinURL(stringLink, selectedLink || '/'));
     }
     return null;
   }, [components, state.locale, selectedOption, watchComponent]);

package/lib/blocklet/component/space-connector.js

@@ -4,7 +4,7 @@ import { LocaleContext } from '@arcblock/ux/lib/Locale/context';
 import { BLOCKLET_CONFIGURABLE_KEY, DID_SPACES } from '@blocklet/constant';
 import axios from 'axios';
 import PropTypes from 'prop-types';
-import joinUrl from 'url-join';
+import { joinURL } from 'ufo';
 import { isEmpty } from 'lodash';
 import Typography from '@mui/material/Typography';
 import Toast from '@arcblock/ux/lib/Toast';
@@ -118,10 +118,10 @@ const SpaceConnector = /*#__PURE__*/forwardRef(({
       ...preValue,
       action: 'one-click-authorization',
       checkTimeout: 1000 * 300,
-      prefix: joinUrl(gatewayUrl, 'space/api/did'),
+      prefix: joinURL(gatewayUrl, 'space/api/did'),
       baseUrl: new URL(gatewayUrl).origin,
       checkFn: axios.create({
-        baseURL: joinUrl(gatewayUrl, 'space')
+        baseURL: joinURL(gatewayUrl, 'space')
       }).get,
       extraParams: {
         appDid: blocklet.appDid,

package/lib/blocklet/component/space-selector.js

@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 import styled from '@emotion/styled';
-import joinUrl from 'url-join';
+import { joinURL } from 'ufo';
 import isUrl from 'is-url';
 import useLocalStorage from 'react-use/lib/useLocalStorage';
 import Button from '@arcblock/ux/lib/Button';
@@ -40,7 +40,7 @@ function SpaceSelector({
   } = useSessionContext();
   useEffect(() => {
     if (gatewayUrl && !gatewayList.find(x => x.value === gatewayUrl)) {
-      api.get(joinUrl(gatewayUrl, '/__blocklet__.js?type=json')).then(res => {
+      api.get(joinURL(gatewayUrl, '/__blocklet__.js?type=json')).then(res => {
         // FIXME: @wangshijun handle mountPoint
         setGatewayList([...gatewayList, {
           value: gatewayUrl,

package/lib/blocklet/component/store-blocklet-list.js

@@ -3,7 +3,7 @@
 import { useEffect, useState } from 'react';
 import styled from '@emotion/styled';
 import PropTypes from 'prop-types';
-import joinUrl from 'url-join';
+import { joinURL } from 'ufo';
 import Link from '@mui/material/Link';
 import { ErrorFallback } from '@arcblock/ux/lib/ErrorBoundary';
 import { ErrorBoundary } from 'react-error-boundary';
@@ -20,7 +20,7 @@ import { formatRegistryLogoPath } from '../../util';
 import { useBlockletContext } from '../../contexts/blocklet';
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 const getStoreDetail = (meta, endpoint) => {
-  return joinUrl(endpoint, `/blocklets/${meta.did}`);
+  return joinURL(endpoint, `/blocklets/${meta.did}`);
 };
 const displayAttributes = ({
   blocklet,
@@ -42,7 +42,7 @@ function BlockletItem({
   const {
     t
   } = useLocaleContext();
-  let logoUrl = joinUrl(endpoint, formatRegistryLogoPath(blocklet.did, blocklet.logo || ''));
+  let logoUrl = joinURL(endpoint, formatRegistryLogoPath(blocklet.did, blocklet.logo || ''));
   try {
     const tempURL = new URL(logoUrl);
     tempURL.searchParams.set('v', blocklet.version || +new Date());

package/lib/blocklet/logo-uploader.js

@@ -1,6 +1,6 @@
 import React, { lazy, useRef } from 'react';
 import PropTypes from 'prop-types';
-import joinUrl from 'url-join';
+import { joinURL } from 'ufo';
 import styled from '@emotion/styled';
 import noop from 'lodash/noop';
 import Box from '@mui/material/Box';
@@ -52,7 +52,7 @@ export default function LogoUploader({
         disabled: true
       },
       apiPathProps: {
-        uploader: joinUrl(prefix, uploadPrefix, type, did),
+        uploader: joinURL(prefix, uploadPrefix, type, did),
         disableMediaKitPrefix: true
       },
       coreProps: {

package/lib/blocklet/notification/push-kit.js

@@ -85,7 +85,7 @@ function NotificationPushKit() {
       await api.sendPush({
         input: {
           did,
-          receiver: 'z1b9wxs47TXpA5s6VMoGFBk933tF7ujzFDt',
+          receiver: pageState.testReceiver,
           notification: JSON.stringify({
             title: 'Test push-kit notification',
             body: 'This is message from push-kit config test',

package/lib/blocklet/preferences/index.js

@@ -2,7 +2,7 @@ import React, { useState, useContext } from 'react';
 import styled from '@emotion/styled';
 import PropTypes from 'prop-types';
 import Iframe from 'react-iframe';
-import joinUrl from 'url-join';
+import { joinURL } from 'ufo';
 import { WELLKNOWN_SERVICE_PATH_PREFIX } from '@abtnode/constant';
 import { Grid, Box } from '@mui/material';
 import GeneralIcon from '@mui/icons-material/TuneRounded';
@@ -236,9 +236,9 @@ export default function BlockletPreferences({
     if (!inService) {
       urlSearchParams.set('authKey', '__sst');
     }
-    urlSearchParams.set('schemaKey', joinUrl(window.location.origin, pathPrefix, `/api/preferences?id=${encodeURIComponent(current)}`));
+    urlSearchParams.set('schemaKey', joinURL(window.location.origin, pathPrefix, `/api/preferences?id=${encodeURIComponent(current)}`));
     content = /*#__PURE__*/_jsx(Iframe, {
-      url: `${joinUrl(window.location.origin, pathPrefix, '/hosted/form-collector/')}?${urlSearchParams.toString()}`,
+      url: `${joinURL(window.location.origin, pathPrefix, '/hosted/form-collector/')}?${urlSearchParams.toString()}`,
       width: "100%",
       height: "100%",
       frameBorder: 0,

package/lib/blocklet/publish/create-release/header.js

@@ -122,6 +122,7 @@ function Header({
       });
       return;
     }
+    setLoading(true);
     if (initLogoUrl) {
       try {
         const filename = await uploadImageToProject({
@@ -135,10 +136,10 @@ function Header({
         });
       } catch (err) {
         Toast.error(err.message);
+        setLoading(false);
         return;
       }
     }
-    setLoading(true);
     const saveKeys = Object.keys(saveSelectedEventsRef.current);
     try {
       await pAll(saveKeys.map(x => {

package/lib/blocklet/publish/create-release/keep-now-resources.js

@@ -0,0 +1,15 @@
+function keepNowResources(trees, list) {
+  const listSet = new Set(list || []);
+  const result = [];
+  function traverse(tree) {
+    if (listSet.has(tree?.id)) {
+      result.push(tree?.id);
+    }
+    if (tree?.children) {
+      tree.children.forEach(traverse);
+    }
+  }
+  (trees || []).forEach(traverse);
+  return result;
+}
+export default keepNowResources;

package/lib/blocklet/publish/create-release/resources.js

@@ -3,7 +3,7 @@ import classnames from 'classnames';
 import PropTypes from 'prop-types';
 import { useEffect, useRef } from 'react';
 import useSetState from 'react-use/lib/useSetState';
-import joinUrl from 'url-join';
+import { joinURL } from 'ufo';
 import { Box } from '@mui/material';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import { hasStartEngine } from '@blocklet/meta/lib/engine';
@@ -14,6 +14,7 @@ import { useNodeContext } from '../../../contexts/node';
 import { axios } from '../../../util/api';
 import StopBox from './stop-box';
 import Tree from './tree';
+import keepNowResources from './keep-now-resources';
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 const fillParent = (nodes, parentId) => {
   nodes.forEach(node => {
@@ -31,7 +32,7 @@ const parseUrl = (component, projectId, releaseId, locale, initUrl) => {
   const {
     exportApi = '/'
   } = component?.meta.resource || {};
-  const urlObj = new URL(joinUrl('http://127.0.0.1', component.mountPoint, exportApi || '/').replace(/\/+/g, '/'));
+  const urlObj = new URL(joinURL('http://127.0.0.1', component.mountPoint, exportApi || '/').replace(/\/+/g, '/'));
   urlObj.searchParams.set('projectId', projectId);
   urlObj.searchParams.set('releaseId', releaseId);
   urlObj.searchParams.set('local', locale);
@@ -178,7 +179,7 @@ export default function Resources({
             const list = res?.resources || [];
             if (list?.length) {
               setSelectedResourceIds({
-                [child.meta.did]: list
+                [child.meta.did]: keepNowResources(tree, list)
               });
               setSelectedComponentsMapByIds(child.meta.did, tree, list);
               if (!readOnly) {

package/lib/blocklet/publish/release-list.js

@@ -2,7 +2,7 @@
 import React, { useState, useEffect } from 'react';
 import { Link, useParams } from 'react-router-dom';
 import styled from '@emotion/styled';
-import joinUrl from 'url-join';
+import { joinURL } from 'ufo';
 import upperFirst from 'lodash/upperFirst';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import { Box, useMediaQuery, IconButton, Typography, Tooltip, Breadcrumbs } from '@mui/material';
@@ -234,12 +234,12 @@ export default function ReleaseList() {
         let downloadUrl = '';
         const published = release.status === 'published';
         if (published) {
-          const blockletMetaUrl = joinUrl(serverEndpoint, `/api/project/${blocklet.meta.did}/${project.id}/${project.lastReleaseId}/release/blocklet.json`);
+          const blockletMetaUrl = joinURL(serverEndpoint, `/api/project/${blocklet.meta.did}/${project.id}/${project.lastReleaseId}/release/blocklet.json`);
           const url = new URL(serverEndpoint);
-          url.pathname = joinUrl(url.pathname, '/launch-blocklet/agreement');
+          url.pathname = joinURL(url.pathname, '/launch-blocklet/agreement');
           url.searchParams.set('blocklet_meta_url', blockletMetaUrl);
           installUrl = url.href;
-          downloadUrl = joinUrl(`${WELLKNOWN_SERVICE_PATH_PREFIX}/api/project/${blocklet.meta.did}/${project.id}/${project.lastReleaseId}/download/${(project.lastReleaseFiles || [])[0]}`);
+          downloadUrl = joinURL(`${WELLKNOWN_SERVICE_PATH_PREFIX}/api/project/${blocklet.meta.did}/${project.id}/${project.lastReleaseId}/download/${(project.lastReleaseFiles || [])[0]}`);
         }
         return /*#__PURE__*/_jsxs(Box, {
           display: "flex",

package/lib/blocklet/publish/utils/upload-image-to-project.js

@@ -41,7 +41,7 @@ const uploadImageToProject = async ({
   };
 
   // 使用 Tus 协议上传文件
-  const createUploadResponse = await axios.post(joinURL(WELLKNOWN_SERVICE_PATH_PREFIX, '/api/project', did, projectId, uploadType, 'upload'), formData, {
+  const createUploadResponse = await axios.post(joinURL(WELLKNOWN_SERVICE_PATH_PREFIX, '/api/project', did, projectId, uploadType, 'upload'), null, {
     headers: {
       'Tus-Resumable': '1.0.0',
       'Upload-Length': file.size,
@@ -53,7 +53,7 @@ const uploadImageToProject = async ({
   const uploadUrl = createUploadResponse.headers.location;
 
   // Upload the file in chunks
-  const chunkSize = 5 * 1024 * 1024;
+  const chunkSize = 2 * 1024 * 1024;
   let offset = 0;
   let filename = '';
   for (const chunk of createFileChunks(file, chunkSize)) {

package/lib/blocklet/purchase/component-purchase.js

@@ -1,6 +1,6 @@
 /* eslint-disable react/jsx-one-expression-per-line */
 import { useState, useEffect, useImperativeHandle, forwardRef } from 'react';
-import joinUrl from 'url-join';
+import { joinURL } from 'ufo';
 import { getDisplayName } from '@blocklet/meta/lib/util';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import DidConnect from '@arcblock/did-connect/lib/Connect';
@@ -132,7 +132,7 @@ export function ComponentPurchase({
     purchase: {
       action: 'acquire-asset',
       checkFn: axios.create({
-        baseURL: joinUrl(baseUrl, '/store')
+        baseURL: joinURL(baseUrl, '/store')
       }).get,
       extraParams: {
         factory: meta.nftFactory,

package/lib/blocklet/storage/connect-to.js

@@ -3,7 +3,7 @@ import React, { useState } from 'react';
 import Button from '@arcblock/ux/lib/Button';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import DidConnect from '@arcblock/did-connect/lib/Connect';
-import joinUrl from 'url-join';
+import { joinURL } from 'ufo';
 import toast from '@arcblock/ux/lib/Toast';
 import SplitButton from '@arcblock/ux/lib/SplitButton';
 import Dialog from '@arcblock/ux/lib/Dialog';
@@ -53,7 +53,7 @@ function ConnectTo({
     action: 'connect-to-did-spaces',
     checkTimeout: 1000 * 300,
     checkFn: axios.create({
-      baseURL: joinUrl(window.location.origin, getPathPrefix())
+      baseURL: joinURL(window.location.origin, getPathPrefix())
     }).get,
     messages: {
       title: t('storage.spaces.provideNFT.title', {
@@ -198,10 +198,10 @@ function ConnectTo({
       setAuthorizeConnect(preValue => ({
         ...preValue,
         open: true,
-        prefix: joinUrl(didSpacesCoreUrl, 'space/api/did'),
+        prefix: joinURL(didSpacesCoreUrl, 'space/api/did'),
         baseUrl: new URL(didSpacesCoreUrl).origin,
         checkFn: axios.create({
-          baseURL: joinUrl(didSpacesCoreUrl, 'space')
+          baseURL: joinURL(didSpacesCoreUrl, 'space')
         }).get,
         extraParams: {
           appDid: blockletInfo.appDid,

package/lib/blocklet/storage/item.js

@@ -4,7 +4,7 @@ import Button from '@arcblock/ux/lib/Button';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import PropTypes from 'prop-types';
 import Toast from '@arcblock/ux/lib/Toast';
-import joinUrl from 'url-join';
+import { joinURL } from 'ufo';
 import { BLOCKLET_CONFIGURABLE_KEY } from '@blocklet/constant';
 import DidConnect from '@arcblock/did-connect/lib/Connect';
 import { useRequest } from 'ahooks';
@@ -176,10 +176,10 @@ function SpaceItem({
     setAuthorizeConnect(preValue => ({
       ...preValue,
       open: true,
-      prefix: joinUrl(spaceGateway.url, 'space/api/did'),
+      prefix: joinURL(spaceGateway.url, 'space/api/did'),
       baseUrl: new URL(spaceGateway.url).origin,
       checkFn: axios.create({
-        baseURL: joinUrl(spaceGateway.url, 'space')
+        baseURL: joinURL(spaceGateway.url, 'space')
       }).get,
       extraParams: {
         appDid,

package/lib/blocklet/util.js

@@ -1,5 +1,5 @@
 import sortBy from 'lodash/sortBy';
-import joinUrl from 'url-join';
+import { joinURL } from 'ufo';
 import isEmpty from 'lodash/isEmpty';
 import normalizePathPrefix from '@abtnode/util/lib/normalize-path-prefix';
 import { forEachBlockletSync, replaceSlotToIp } from '@blocklet/meta/lib/util';
@@ -7,12 +7,12 @@ import { BLOCKLET_APP_SPACE_REQUIREMENT } from '@blocklet/constant';
 import { SLOT_FOR_IP_DNS_SITE } from '@abtnode/constant';
 export const getServerUrl = (info, encodeURI = false) => {
   const adminPath = process.env.NODE_ENV === 'production' ? info.routing.adminPath : '';
-  return encodeURI ? encodeURIComponent(joinUrl(window.location.origin, adminPath)) : joinUrl(window.location.origin, adminPath);
+  return encodeURI ? encodeURIComponent(joinURL(window.location.origin, adminPath)) : joinURL(window.location.origin, adminPath);
 };
 export const getLaunchAgreementUrl = (meta, info, storeUrl) => {
   const serverUrl = getServerUrl(info);
-  const metaUrl = joinUrl(storeUrl, `/api/blocklets/${meta.did}/blocklet.json`);
-  const url = new URL(joinUrl(serverUrl, '/launch-blocklet/agreement'));
+  const metaUrl = joinURL(storeUrl, `/api/blocklets/${meta.did}/blocklet.json`);
+  const url = new URL(joinURL(serverUrl, '/launch-blocklet/agreement'));
   url.searchParams.set('blocklet_meta_url', metaUrl);
   url.searchParams.set('from', window.location.href);
   return url.href;

package/lib/hooks/url-evaluation.js

@@ -1,5 +1,5 @@
 import { useState, useEffect, useMemo, useRef, useContext } from 'react';
-import joinUrl from 'url-join';
+import { joinURL } from 'ufo';
 import memoize from 'lodash/memoize';
 import { WELLKNOWN_PING_PREFIX } from '@abtnode/constant';
 import { evaluateURLs } from '@abtnode/util/lib/url-evaluation';
@@ -16,7 +16,7 @@ const ping = memoize(url => {
   if (hostname === window.location.hostname) {
     return true;
   }
-  return defaultCheckAccessible(joinUrl(origin, WELLKNOWN_PING_PREFIX));
+  return defaultCheckAccessible(joinURL(origin, WELLKNOWN_PING_PREFIX));
 });
 
 // url <-> evaluation cache

package/lib/hooks/use-app-logo.js

@@ -1,4 +1,4 @@
-import joinUrl from 'url-join';
+import { joinURL } from 'ufo';
 import { BLOCKLET_CONFIGURABLE_KEY } from '@blocklet/constant';
 import { useNodeContext } from '../contexts/node';
 import { isInstalling, getLogoHash } from '../util';
@@ -21,9 +21,9 @@ export default function useAppLogo({
   const customRectLogo = (blocklet?.environments || []).find(x => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_RECT)?.value;
   const customFavicon = (blocklet?.environments || []).find(x => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_FAVICON)?.value;
   const prefix = window.env?.apiPrefix || '/';
-  const logoUrl = joinUrl(prefix, `/blocklet/logo/${inService ? '' : blocklet.meta.did}`, getSearch(blocklet, customLogo));
-  const rectLogoUrl = joinUrl(prefix, `/blocklet/logo-rect/${inService ? '' : blocklet.meta.did}`, getSearch(blocklet, customRectLogo));
-  const faviconUrl = joinUrl(prefix, `/blocklet/logo-favicon/${inService ? '' : blocklet.meta.did}`, getSearch(blocklet, customFavicon));
+  const logoUrl = `${joinURL(prefix, `/blocklet/logo/${inService ? '' : blocklet.meta.did}`)}${getSearch(blocklet, customLogo)}`;
+  const rectLogoUrl = `${joinURL(prefix, `/blocklet/logo-rect/${inService ? '' : blocklet.meta.did}`)}${getSearch(blocklet, customRectLogo)}`;
+  const faviconUrl = `${joinURL(prefix, `/blocklet/logo-favicon/${inService ? '' : blocklet.meta.did}`)}${getSearch(blocklet, customFavicon)}`;
   return {
     logoUrl,
     rectLogoUrl,

package/lib/hooks/use-bundle-logo.js

@@ -1,4 +1,4 @@
-import joinUrl from 'url-join';
+import { joinURL } from 'ufo';
 import { WELLKNOWN_SERVICE_PATH_PREFIX } from '@abtnode/constant';
 import { useNodeContext } from '../contexts/node';
 import { formatRegistryLogoPath, APP_PREFIX, isDownloading, isExtracting } from '../util';
@@ -12,14 +12,14 @@ export default function useAvatar({
   } = node;
   const pending = isDownloading(blocklet?.status) || isExtracting(blocklet?.status);
   const search = `?v=${blocklet?.meta?.version}${pending ? '~' : ''}`;
-  let logoUrl = inService ? joinUrl(APP_PREFIX, WELLKNOWN_SERVICE_PATH_PREFIX, '/blocklet/logo-bundle', search) : joinUrl(node.imgPrefix, 'blocklet.png');
+  let logoUrl = inService ? `${joinURL(APP_PREFIX, WELLKNOWN_SERVICE_PATH_PREFIX, '/blocklet/logo-bundle')}${search}` : joinURL(node.imgPrefix, 'blocklet.png');
   if (blocklet.source === 'registry' && blocklet.deployedFrom && blocklet.meta.logo) {
-    logoUrl = joinUrl(blocklet.deployedFrom, formatRegistryLogoPath(blocklet.meta.bundleDid, blocklet.meta.logo), search);
+    logoUrl = `${joinURL(blocklet.deployedFrom, formatRegistryLogoPath(blocklet.meta.bundleDid, blocklet.meta.logo))}${search}`;
   } else {
     const prefix = window.env.apiPrefix || '/';
     const components = ancestors.concat(blocklet);
     const list = inService ? components.slice(1) : components;
-    logoUrl = joinUrl(prefix, `/blocklet/logo-bundle${list.map(x => `/${x.meta.did}`).join('')}`, search);
+    logoUrl = `${joinURL(prefix, `/blocklet/logo-bundle${list.map(x => `/${x.meta.did}`).join('')}`)}${search}`;
   }
   return {
     logoUrl,

package/lib/invitation/invitation-receive.js

@@ -4,7 +4,7 @@ import styled from '@emotion/styled';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import DidButton from '@arcblock/did-connect/lib/Button';
 import { AUTH_SERVICE_PREFIX, API_DID_PREFIX } from '@arcblock/did-connect/lib/constant';
-import joinURL from 'url-join';
+import { joinURL } from 'ufo';
 import { formatDateTime } from '../util';
 import usePassportId from '../hooks/use-passport-id';
 import { useSessionContext } from '../contexts/session';

package/lib/locales/ar.js

@@ -979,7 +979,10 @@ export default {
       testReceiver: 'مستقبل PushKit',
       testSend: 'اختبار إرسال مجموعة الدفع',
       inputTestReceiver: 'الرجاء إدخال مستقبل الاختبار',
-      receiverRequired: 'مطلوب مستقبل PushKit'
+      receiverRequired: 'مطلوب مستقبل PushKit',
+      pushPath: 'مسار Api ل push-kit (افتراضي /api/push)',
+      did: 'PushKit Blocklet DID',
+      customOptions: 'خيارات مخصصة'
     }
   },
   router: {
@@ -1501,7 +1504,7 @@ export default {
       installedButStopped: 'تم تثبيت التطبيق بنجاح ، ولكن لا يمكن تشغيله. يمكنك بدء تشغيله يدويًا بعد حل مشكلة الحجب.',
       installedButError: 'تم تثبيت التطبيق بنجاح ، ولكن فشل في البدء',
       restoreFailed: 'فشل في استعادة التطبيق، يرجى المحاولة مرة أخرى',
-      resourceBlocklet: 'لا يمكن تثبيت بلوكليت الموارد كتطبيق، يمكنك تركيب هذا البلوكليت في التطبيقات الحالية.'
+      resourceBlocklet: 'لا يمكن تثبيت الكتلة كتطبيق، يمكنك إضافة هذه الكتلة إلى التطبيقات الحالية.'
     },
     steps: {
       introduction: 'مقدمة',

package/lib/locales/de.js

@@ -979,7 +979,10 @@ export default {
       testReceiver: 'PushKit-Empfänger',
       testSend: 'Test-Push-Kit senden',
       inputTestReceiver: 'Bitte geben Sie den Test-Empfänger ein',
-      receiverRequired: 'PushKit-Empfänger ist erforderlich'
+      receiverRequired: 'PushKit-Empfänger ist erforderlich',
+      pushPath: 'Api-Pfad für Push-Kit (Standard /api/push)',
+      did: 'PushKit Blocklet DID',
+      customOptions: 'Benutzerdefinierte Optionen'
     }
   },
   router: {
@@ -1501,7 +1504,7 @@ export default {
       installedButStopped: 'Die App wurde erfolgreich installiert, kann jedoch nicht gestartet werden. Sie können sie manuell starten, nachdem Sie die blockierenden Probleme behoben haben.',
       installedButError: 'Die App wurde erfolgreich installiert, konnte jedoch nicht gestartet werden',
       restoreFailed: 'Fehler beim Wiederherstellen der App, bitte versuchen Sie es erneut',
-      resourceBlocklet: 'Das Ressourcen-Blocklet kann nicht als Anwendung installiert werden. Du kannst dieses Blocklet in bestehende Anwendungen einbinden.'
+      resourceBlocklet: 'Blocklet kann nicht als Anwendung installiert werden, Sie können diese Blocklet in vorhandene Anwendungen einfügen.'
     },
     steps: {
       introduction: 'Einführung',

package/lib/locales/en.js

@@ -833,6 +833,10 @@ export default {
       welcome: {
         switchLabel: 'Welcome Page'
       },
+      security: {
+        switchLabel: 'File System Isolation',
+        switchTips: 'After disabling this option, the file system of the Blocklet will no longer be in isolation, which may pose a risk of malicious software damaging the file system.'
+      },
       upgrade: {
         title: 'Upgrade Blocklet Server to {version}',
         description: 'During the upgrade, your Blocklet Server will enter maintenance mode for a few minutes while the update is completed.',
@@ -1493,7 +1497,7 @@ export default {
       installedButStopped: 'The app is installed successfully, but cannot be started. You can start it manually after resolving blocking issues',
       installedButError: 'The app is successfully installed, but failed to start',
       restoreFailed: 'Failed to restore app, please try again',
-      resourceBlocklet: 'Resource Blocklet cannot be installed as an application, you can mount this blocklet into existing applications.'
+      resourceBlocklet: 'Blocklet cannot be installed as an application, you can add this blocklet into existing applications.'
     },
     steps: {
       introduction: 'Introduction',