@abtnode/blocklet-services 1.16.41 → 1.16.42-beta-20250403-230303-c167c6a1

package/api/services/auth/connect/invite.js

@@ -11,6 +11,7 @@ const { getSourceAppPid } = require('@blocklet/sdk/lib/util/login');
 const { WELLKNOWN_SERVICE_PATH_PREFIX } = require('@abtnode/constant');
 const { LOGIN_PROVIDER } = require('@blocklet/constant');
 const getRequestIP = require('@abtnode/util/lib/get-request-ip');
+const { getDeviceData } = require('@abtnode/util/lib/device');
 
 const { createTokenFn, getDidConnectVersion } = require('../../../util');
 const { getUserWithinFederated } = require('../../../util/federated');
@@ -122,8 +123,7 @@ module.exports = function createRoutes(node, authenticator, createSessionToken)
 
         const lastLoginIp = getRequestIP(req);
         const ua = req.get('user-agent');
-        const walletDeviceMessageToken = req.get('wallet-device-message-token');
-        const walletDeviceId = req.get('wallet-device-id');
+        const deviceData = getDeviceData({ req });
         const userSessionDoc = await node.upsertUserSession({
           teamDid,
           visitorId,
@@ -135,8 +135,7 @@ module.exports = function createRoutes(node, authenticator, createSessionToken)
           lastLoginIp,
           extra: {
             walletOS,
-            walletDeviceMessageToken,
-            walletDeviceId,
+            device: deviceData,
           },
         });
         node.syncUserSession({
@@ -149,8 +148,7 @@ module.exports = function createRoutes(node, authenticator, createSessionToken)
           lastLoginIp,
           extra: {
             walletOS,
-            walletDeviceMessageToken,
-            walletDeviceId,
+            device: deviceData,
           },
         });
         await updateSession(

package/api/services/auth/connect/issue-passport.js

@@ -10,6 +10,7 @@ const { getSourceAppPid } = require('@blocklet/sdk/lib/util/login');
 const { WELLKNOWN_SERVICE_PATH_PREFIX } = require('@abtnode/constant');
 const { LOGIN_PROVIDER } = require('@blocklet/constant');
 const getRequestIP = require('@abtnode/util/lib/get-request-ip');
+const { getDeviceData } = require('@abtnode/util/lib/device');
 
 const { createTokenFn, getDidConnectVersion } = require('../../../util');
 
@@ -48,8 +49,7 @@ module.exports = function createRoutes(node, authenticator, createSessionToken)
       const walletOS = req.context?.didwallet?.os;
       const lastLoginIp = getRequestIP(req);
       const ua = req.get('user-agent');
-      const walletDeviceMessageToken = req.get('wallet-device-message-token');
-      const walletDeviceId = req.get('wallet-device-id');
+      const deviceData = getDeviceData({ req });
 
       const { response, passport, role } = await handleIssuePassportResponse({
         req,
@@ -96,8 +96,7 @@ module.exports = function createRoutes(node, authenticator, createSessionToken)
         lastLoginIp,
         extra: {
           walletOS,
-          walletDeviceMessageToken,
-          walletDeviceId,
+          device: deviceData,
         },
       });
       node.syncUserSession({
@@ -110,8 +109,7 @@ module.exports = function createRoutes(node, authenticator, createSessionToken)
         lastLoginIp,
         extra: {
           walletOS,
-          walletDeviceMessageToken,
-          walletDeviceId,
+          device: deviceData,
         },
       });
 

package/api/services/auth/session.js

@@ -14,6 +14,7 @@ const {
 const { LOGIN_PROVIDER } = require('@blocklet/constant');
 const { signResponse } = require('@blocklet/meta/lib/security');
 const getRequestIP = require('@abtnode/util/lib/get-request-ip');
+const { getDeviceData } = require('@abtnode/util/lib/device');
 const isUrl = require('is-url');
 
 const { createTokenFn, getDidConnectVersion } = require('../../util');
@@ -230,6 +231,7 @@ module.exports = {
                 throw new Error(`invalid token type ${t.tokenType}`);
               }
             },
+            locale: req.blockletLocale,
           });
 
           const user = await node.getUser({ teamDid, user: { did: userPid } });
@@ -268,8 +270,7 @@ module.exports = {
           );
           const ua = req.get('user-agent');
           const lastLoginIp = getRequestIP(req);
-          const walletDeviceMessageToken = req.get('wallet-device-message-token');
-          const walletDeviceId = req.get('wallet-device-id');
+          const deviceData = getDeviceData({ req });
           const userSession = await node.upsertUserSession({
             visitorId,
             teamDid,
@@ -280,8 +281,7 @@ module.exports = {
             lastLoginIp,
             extra: {
               walletOS,
-              walletDeviceMessageToken,
-              walletDeviceId,
+              device: deviceData,
             },
           });
           if (user?.sourceAppPid) {
@@ -294,8 +294,7 @@ module.exports = {
               lastLoginIp,
               extra: {
                 walletOS,
-                walletDeviceMessageToken,
-                walletDeviceId,
+                device: deviceData,
               },
             });
           }

package/api/services/notification/index.js

@@ -94,23 +94,27 @@ const init = ({ node }) => {
     heartbeatTimeout: 60 * 1000 * 10,
   });
 
-  // Let first worker process do something as master
-  if (process.env.NODE_APP_INSTANCE === '0') {
-    // cron
-    Cron.init({
-      jobs: [
-        // @ts-ignore
-        {
-          name: 'prune messages',
-          time: '0 0 0 * * 1', // every Monday per week
-          fn: () => states.message.prune(),
-        },
-      ],
-      onError: (error, name) => {
-        logger.error('Run job failed', { name, error });
+  // 清除离线的消息
+  Cron.init({
+    jobs: [
+      {
+        name: 'prune messages',
+        time: '0 0 0 * * 1', // every Monday per week
+        fn: () => states.message.prune(),
       },
-    });
-  }
+      {
+        name: 'message-data-cleanup',
+        //   time: '0 0 8 * * *', // check every day
+        time: '0 0 * * * *', // check every hour
+        // time: '*/5 * * * * *', // check every 5 seconds
+        fn: () => states.message.pruneExpiredData(),
+        options: { runOnInit: false },
+      },
+    ],
+    onError: (error, name) => {
+      logger.error('Run job failed', { name, error });
+    },
+  });
 
   const wrapSendHandler = (fn, channel) => {
     return async (req, res) => {

package/api/services/notification/queue.js

@@ -4,7 +4,7 @@ const states = require('@abtnode/core/lib/states');
 const JWT = require('@arcblock/jwt');
 const md5 = require('@abtnode/util/lib/md5');
 const { wipeSensitiveData } = require('@blocklet/meta/lib/util');
-const cloneDeep = require('lodash/cloneDeep');
+const cloneDeep = require('@abtnode/util/lib/deep-clone');
 const {
   NODE_MODES,
   EVENTS,
@@ -12,6 +12,7 @@ const {
   NOTIFICATION_SEND_STATUS,
   NOTIFICATION_SEND_FAILED_REASON,
 } = require('@abtnode/constant');
+const { nanoid } = require('@blocklet/meta/lib/util');
 const get = require('lodash/get');
 const uniqBy = require('lodash/uniqBy');
 const { getWalletDid } = require('@blocklet/meta/lib/did-utils');
@@ -554,6 +555,13 @@ const init = ({ node, notificationService }) => {
         }
       }
 
+      // 如果 notification 没有 id，则生成一个, wallet 要基于这唯一个ID进行处理
+      if (!notification.id) {
+        notification.id = nanoid();
+      }
+
+      notification.type = notification.type || 'notification';
+
       const baseParams = {
         ...rest,
         teamDid,

package/api/socket/channel/did.js

@@ -199,7 +199,7 @@ const sendToAppDid = async ({
   wsServer,
 }) => {
   if (notification && sender) {
-    const { keepForOfflineUser = true } = options || {};
+    const { keepForOfflineUser = true, ttl } = options || {};
     const teamDid = sender.appDid;
     const { id } = notification;
     if (Array.isArray(receiver)) {
@@ -227,14 +227,14 @@ const sendToAppDid = async ({
         });
       }
 
-      // 这里仅 feed 类型不需要保存离线消息
-      // connect｜passthrough 类型都需要保存离线消息，目的是为了快速流转到下一步
-      const isKeepForOfflineUser =
-        keepForOfflineUser && (!notification.type || notification.type?.toLowerCase() !== 'feed');
-
-      if (count <= 0 && isKeepForOfflineUser) {
+      if (count <= 0 && keepForOfflineUser) {
         logger.error('Online client was not found', { userDid: receiver });
-        await states.message.insert({ did: receiver, event: EVENTS.MESSAGE, data: payload });
+        await states.message.insert({
+          did: receiver,
+          event: EVENTS.MESSAGE,
+          data: payload,
+          ttl: typeof ttl === 'number' && ttl > 0 ? ttl : null,
+        });
       }
     });
     return;

package/api/socket/util.js

@@ -16,10 +16,7 @@ const parseNotification = (notification, senderInfo) => {
 
   // TODO: 如果通过 message id 实现消息去重, 消息顺序等
   notifications.forEach((x) => {
-    if (!x.id) {
-      x.createdAt = new Date();
-    }
-
+    x.createdAt = x.createdAt || new Date();
     x.type = x.type || 'notification';
 
     x.sender = {

package/api/state/message.js

@@ -1,12 +1,29 @@
 const BaseState = require('@abtnode/core/lib/states/base');
+const { Op, Sequelize } = require('sequelize');
+const logger = require('@abtnode/logger')('@abtnode/core:states');
+
+const DEFAULT_TTL = 30; // 30 minutes
+const MAX_TTL = 7200; // 7200 minutes (5 days)
+const MINUTE_IN_MS = 1000 * 60;
 
 class MessageState extends BaseState {
   insert(doc, ...args) {
+    const extra = {};
+    if (doc.ttl && typeof doc.ttl === 'number' && doc.ttl > 0) {
+      const ttl = Math.min(doc.ttl, MAX_TTL);
+      extra.expiredAt = new Date(Date.now() + MINUTE_IN_MS * ttl);
+    } else if (!doc.ttl && doc.event === 'message' && doc.data?.type) {
+      if (['feed', 'connect', 'passthrough'].includes(doc.data.type)) {
+        extra.expiredAt = new Date(Date.now() + MINUTE_IN_MS * DEFAULT_TTL); // 30分钟后过期
+      }
+    }
+
     return super.insert(
       {
         ...doc,
         createdAt: Date.now(),
         updatedAt: Date.now(),
+        ...extra,
       },
       ...args
     );
@@ -16,6 +33,48 @@ class MessageState extends BaseState {
     const t = time || 5 * 24 * 60 * 60 * 1000; // 5 day
     return this.remove({ createdAt: { $lt: Date.now() - t } });
   }
+
+  /**
+   * 如果有设置过期时间，则删除过期的数据，
+   * 如果没有设置过期时间，则清除数据的条件如下
+   * 1. 创建时间早于五分钟
+   * 2. event 类型为 'message'
+   * 3. data.type 为 'feed', 'connect' 或 'passthrough'
+   */
+  async pruneExpiredData() {
+    try {
+      // 获取指定时间前的时间戳
+      const expiryThreshold = new Date();
+
+      // 1. 删除有 expiredAt 的记录
+      const deletedExpiredData = await this.remove({
+        where: {
+          expiredAt: { [Op.lt]: expiryThreshold },
+        },
+      });
+
+      logger.info(`message data cleanup completed: deleted ${deletedExpiredData} expired records`);
+
+      // 2. 兼容代码，删除之前没有设置 expiredAt 的记录
+      const timeAgo = new Date();
+      timeAgo.setMinutes(timeAgo.getMinutes() - DEFAULT_TTL); // 设置过期时间
+
+      const where = {
+        createdAt: { [Op.lt]: timeAgo },
+        expiredAt: { [Op.is]: null },
+        event: 'message',
+        [Op.and]: [Sequelize.literal("json_extract(data, '$.type') IN ('feed', 'connect', 'passthrough')")],
+      };
+
+      const deletedCount = await this.remove({
+        where,
+      });
+
+      logger.info(`message data cleanup completed: deleted ${deletedCount} records`);
+    } catch (error) {
+      logger.error('Error during message data cleanup:', error);
+    }
+  }
 }
 
 module.exports = MessageState;

package/api/util/attach-shared-utils.js

@@ -165,6 +165,7 @@ module.exports = ({ node, req, options }) => {
         const opt = {
           checkFromDb: (decoded) => cache.sessionCacheDisabledUser.get(decoded?.did),
           teamDid,
+          locale: req.blockletLocale,
         };
 
         const user = await verifySessionToken(token, secret, opt);

package/api/util/federated.js

@@ -2,7 +2,7 @@ const { joinURL } = require('ufo');
 const { WELLKNOWN_SERVICE_PATH_PREFIX } = require('@abtnode/constant');
 const pick = require('lodash/pick');
 const defaults = require('lodash/defaults');
-const cloneDeep = require('lodash/cloneDeep');
+const cloneDeep = require('@abtnode/util/lib/deep-clone');
 const {
   shouldSyncFederated,
   isMaster,

package/api/util/user-util.js

@@ -0,0 +1,296 @@
+const JWT = require('@arcblock/jwt');
+const CustomError = require('@abtnode/util/lib/custom-error');
+const { callFederated } = require('@abtnode/auth/lib/util/federated');
+const { fromAppDid } = require('@arcblock/did-ext');
+const sortBy = require('lodash/sortBy');
+const pick = require('lodash/pick');
+const last = require('lodash/last');
+const { PASSPORT_STATUS, ROLES, SECURITY_RULE_DEFAULT_ID } = require('@abtnode/constant');
+
+const { getApplicationInfo, messages } = require('@abtnode/auth/lib/auth');
+const { extractUserAvatar, getAvatarByEmail, getUserAvatarUrl, getAvatarByUrl } = require('@abtnode/util/lib/user');
+const getRequestIP = require('@abtnode/util/lib/get-request-ip');
+const formatContext = require('@abtnode/util/lib/format-context');
+const { checkInvitedUserOnly } = require('@abtnode/auth/lib/oauth');
+const { getDeviceData } = require('@abtnode/util/lib/device');
+
+const federatedUtil = require('./federated');
+const initJwt = require('../libs/jwt');
+const { createTokenFn, getDidConnectVersion } = require('.');
+
+// 当无法从 gravatar 获取头像时，使用默认头像
+const defaultAvatar =
+  'data:image/png;base64,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';
+
+/**
+ * @description 获取默认的通行证（常见用于 oauth 账户账户首次登录，无任何可以使用的通行证的情况下，日志中记录的通行证信息）
+ * @returns { name: string, role: string }
+ */
+const getDefaultPassport = () => {
+  return { name: 'Guest', role: 'guest', scope: 'passport' };
+};
+
+/**
+ * @description 从 request 参数中获取验证码
+ * @param {object} options
+ * @param {object} options.logger 日志对象
+ * @param {object} options.req 请求对象
+ * @returns {Promise<string>}
+ */
+const getVerifyCodeFromReq = async ({ logger, req }) => {
+  const { code, magicToken } = req.body;
+  const blocklet = await req.getBlocklet();
+  const blockletInfo = await req.getBlockletInfo();
+  const teamDid = blocklet.appPid;
+  let finalCode = code;
+  if (!code && magicToken) {
+    const valid = await JWT.verify(magicToken, blockletInfo.wallet.publicKey);
+    if (!valid) {
+      logger.error('Email login: Invalid magic token', { teamDid, magicToken });
+      throw new CustomError(401, 'Invalid magic link');
+    }
+    const decodeData = JWT.decode(magicToken, true);
+    if (!decodeData?.data?.code) {
+      logger.error('Email login: failed to parse magicToken data', { teamDid, magicToken, decodeData });
+      throw new CustomError(400, 'Invalid magic token format');
+    }
+    finalCode = decodeData?.data?.code;
+  }
+  return finalCode;
+};
+
+/**
+ * @description 根据 sub 获取用户钱包信息
+ * @param {string} sub 用户信息 sub
+ * @param {object} options
+ * @param {object} options.req 请求对象
+ * @returns {Promise<{ wallet: string }>} 用户钱包信息
+ */
+const getUserFromSub = async (sub, { req }) => {
+  const blocklet = await req.getBlocklet();
+  const blockletInfo = await req.getBlockletInfo();
+  const { sourceAppPid = null } = req.body;
+
+  let userWallet;
+  if (sourceAppPid) {
+    const masterSite = federatedUtil.getFederatedMaster(blocklet);
+    const { permanentWallet } = blockletInfo;
+    const result = await callFederated({
+      action: 'getUser',
+      site: masterSite,
+      permanentWallet,
+      data: {
+        userSub: sub,
+      },
+    });
+    userWallet = result?.wallet;
+  } else {
+    userWallet = fromAppDid(sub, blockletInfo.wallet.secretKey);
+  }
+  return {
+    wallet: userWallet,
+  };
+};
+
+/**
+ * @description 获取上次使用的通行证
+ * @param {params} params
+ * @param {array} params.passports
+ * @returns {object} { id, name, role, scope }
+ */
+const getLastUsedPassport = ({ passports = [] }) => {
+  let result;
+  const validPassports = passports.filter((item) => item.status === PASSPORT_STATUS.VALID);
+  const lastUsedPassport = last(sortBy(validPassports, 'lastLoginAt'));
+  if (lastUsedPassport) {
+    result = pick(lastUsedPassport, ['id', 'name', 'role', 'scope']);
+  }
+  return result;
+};
+
+const getAvatarBnByEmail = async (email, { req, node }) => {
+  if (!email) {
+    return defaultAvatar;
+  }
+  const blocklet = await req.getBlocklet();
+  const nodeInfo = await req.getNodeInfo();
+  const teamDid = blocklet.appPid;
+  const { dataDir } = await getApplicationInfo({ node, nodeInfo, teamDid });
+  let result = await getAvatarByEmail(email);
+  if (!result) result = defaultAvatar;
+  result = await extractUserAvatar(result, { dataDir });
+
+  return result;
+};
+
+const getAvatarBnByUrl = async (url, { req, node }) => {
+  if (!url) {
+    return defaultAvatar;
+  }
+  const blocklet = await req.getBlocklet();
+  const nodeInfo = await req.getNodeInfo();
+  const teamDid = blocklet.appPid;
+  const { dataDir } = await getApplicationInfo({ node, nodeInfo, teamDid });
+  let result;
+  try {
+    result = await getAvatarByUrl(url);
+  } catch {
+    result = defaultAvatar;
+  }
+  result = await extractUserAvatar(result, { dataDir });
+  return result;
+};
+
+const getUserNameByEmail = (email) => {
+  // 目前通过 email 前缀来获取用户名称
+  return email.split('@')[0];
+};
+
+const loginUserSession = async (
+  { did, pk, profile, passport, sourceAppPid, connectedAccount, provider },
+  { req, node, options, loggedUser }
+) => {
+  if (!did || !pk) {
+    throw new CustomError(400, 'Missing required parameters');
+  }
+  const blocklet = await req.getBlocklet();
+  const blockletInfo = await req.getBlockletInfo();
+  const { locale = 'en' } = req.query;
+  const teamDid = blocklet.appPid;
+  const lastLoginIp = getRequestIP(req);
+  const passportForLog = passport || getDefaultPassport();
+
+  if (!loggedUser) {
+    // eslint-disable-next-line no-param-reassign
+    loggedUser = await node.loginUser({
+      teamDid,
+      user: {
+        ...profile,
+        did,
+        pk,
+        locale,
+        lastLoginIp,
+        sourceAppPid,
+        passport,
+        connectedAccount,
+      },
+    });
+  }
+
+  await node.createAuditLog(
+    {
+      action: 'login',
+      args: {
+        teamDid,
+        userDid: did,
+        passport: passportForLog,
+        provider,
+        sourceAppPid,
+      },
+      context: formatContext(Object.assign(req, { user: loggedUser })),
+      result: loggedUser,
+    },
+    node
+  );
+
+  const ua = req.get('user-agent');
+  const visitorId = req.get('x-blocklet-visitor-id');
+  const deviceData = getDeviceData({ req });
+  const userSessionDoc = await node.upsertUserSession({
+    teamDid,
+    userDid: did,
+    visitorId,
+    appPid: teamDid,
+    passportId: passport?.id,
+    status: 'online',
+    ua: null,
+    lastLoginIp,
+    extra: {
+      walletOS: 'web',
+      device: deviceData,
+    },
+  });
+
+  if (federatedUtil.shouldSyncFederated(sourceAppPid, blocklet)) {
+    const syncUserData = {
+      ...profile,
+      did,
+      pk,
+      connectedAccount: [connectedAccount],
+      inviter: loggedUser.inviter,
+    };
+    if (syncUserData.avatar) {
+      syncUserData.avatar = getUserAvatarUrl(blockletInfo.appUrl, syncUserData.avatar);
+    }
+    const masterSite = federatedUtil.getFederatedMaster(blocklet);
+
+    await node.syncFederated({
+      did: teamDid,
+      data: {
+        users: [
+          {
+            ...syncUserData,
+            action: 'connectAccount',
+            sourceAppPid: sourceAppPid || masterSite?.appPid,
+          },
+        ],
+      },
+    });
+    await node.syncUserSession({
+      teamDid,
+      userDid: userSessionDoc.userDid,
+      visitorId: userSessionDoc.visitorId,
+      passportId: passport?.id,
+      targetAppPid: sourceAppPid,
+      ua,
+      lastLoginIp,
+      extra: {
+        walletOS: 'web',
+        device: deviceData,
+      },
+    });
+  }
+  const { createSessionToken } = initJwt(node, options);
+  const createToken = createTokenFn(createSessionToken);
+  const sessionConfig = blocklet.settings?.session || {};
+  const { sessionToken, refreshToken } = createToken(
+    did,
+    {
+      secret: blockletInfo.secret,
+      passport,
+      role: passport?.scope === 'passport' ? passport.role : ROLES.GUEST,
+      fullName: loggedUser.fullName,
+      provider,
+      walletOS: 'web',
+      emailVerified: !!loggedUser?.emailVerified,
+      phoneVerified: !!loggedUser?.phoneVerified,
+    },
+    { ...sessionConfig, didConnectVersion: getDidConnectVersion(req) }
+  );
+
+  return {
+    sessionToken,
+    refreshToken,
+    visitorId: userSessionDoc.visitorId,
+  };
+};
+
+const checkNeedInvite = async ({ req, node, teamDid, locale }) => {
+  const { accessPolicyConfig } = await req.getSecurityConfig({ id: SECURITY_RULE_DEFAULT_ID });
+  const isInvitedUserOnly = await checkInvitedUserOnly(accessPolicyConfig, node, teamDid);
+  if (isInvitedUserOnly) {
+    throw new CustomError(403, messages.notInvited[locale]);
+  }
+};
+
+module.exports = {
+  getDefaultPassport,
+  getVerifyCodeFromReq,
+  getUserFromSub,
+  getLastUsedPassport,
+  getAvatarBnByEmail,
+  getAvatarBnByUrl,
+  getUserNameByEmail,
+  loginUserSession,
+  checkNeedInvite,
+};

package/dist/assets/{ArrowDropDown-odHjNJIs.js → ArrowDropDown-ptWD82T6.js}

@@ -1 +1 @@
-import{a2 as e,j as t}from"./vendor-mui-core-DxqV1NVn.js";import{r as a}from"./vendor-ux-did-connect-Bciw9Ypu.js";var r={},o=e;Object.defineProperty(r,"__esModule",{value:!0});var u=r.default=void 0,i=o(a()),p=t;u=r.default=(0,i.default)((0,p.jsx)("path",{d:"m7 10 5 5 5-5z"}),"ArrowDropDown");export{u as d};
+import{a2 as e,j as t}from"./vendor-mui-core-BL-xsBvI.js";import{r as a}from"./vendor-ux-did-connect-CWUKGZcn.js";var r={},o=e;Object.defineProperty(r,"__esModule",{value:!0});var u=r.default=void 0,i=o(a()),p=t;u=r.default=(0,i.default)((0,p.jsx)("path",{d:"m7 10 5 5 5-5z"}),"ArrowDropDown");export{u as d};

package/dist/assets/{CheckCircle-BqOSvJMp.js → CheckCircle-Btm_ouu-.js}

@@ -1 +1 @@
-import{a2 as r,j as t}from"./vendor-mui-core-DxqV1NVn.js";import{r as a}from"./vendor-ux-did-connect-Bciw9Ypu.js";var e={},o=r;Object.defineProperty(e,"__esModule",{value:!0});var u=e.default=void 0,i=o(a()),l=t;u=e.default=(0,i.default)((0,l.jsx)("path",{d:"M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m-2 15-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8z"}),"CheckCircle");export{u as d};
+import{a2 as r,j as t}from"./vendor-mui-core-BL-xsBvI.js";import{r as a}from"./vendor-ux-did-connect-CWUKGZcn.js";var e={},o=r;Object.defineProperty(e,"__esModule",{value:!0});var u=e.default=void 0,i=o(a()),l=t;u=e.default=(0,i.default)((0,l.jsx)("path",{d:"M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m-2 15-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8z"}),"CheckCircle");export{u as d};

package/dist/assets/{ChevronLeft-Dv7rlUf5.js → ChevronLeft-Dlcukg5b.js}

@@ -1 +1 @@
-import{a2 as r,j as t}from"./vendor-mui-core-DxqV1NVn.js";import{r as a}from"./vendor-ux-did-connect-Bciw9Ypu.js";var e={},o=r;Object.defineProperty(e,"__esModule",{value:!0});var u=e.default=void 0,f=o(a()),i=t;u=e.default=(0,f.default)((0,i.jsx)("path",{d:"M15.41 7.41 14 6l-6 6 6 6 1.41-1.41L10.83 12z"}),"ChevronLeft");export{u as d};
+import{a2 as r,j as t}from"./vendor-mui-core-BL-xsBvI.js";import{r as a}from"./vendor-ux-did-connect-CWUKGZcn.js";var e={},o=r;Object.defineProperty(e,"__esModule",{value:!0});var u=e.default=void 0,f=o(a()),i=t;u=e.default=(0,f.default)((0,i.jsx)("path",{d:"M15.41 7.41 14 6l-6 6 6 6 1.41-1.41L10.83 12z"}),"ChevronLeft");export{u as d};

package/dist/assets/{ChevronRight-CWeJn1iz.js → ChevronRight-Dum8C8k7.js}

@@ -1 +1 @@
-import{a2 as r,j as t}from"./vendor-mui-core-DxqV1NVn.js";import{r as a}from"./vendor-ux-did-connect-Bciw9Ypu.js";var e={},o=r;Object.defineProperty(e,"__esModule",{value:!0});var u=e.default=void 0,i=o(a()),v=t;u=e.default=(0,i.default)((0,v.jsx)("path",{d:"M10 6 8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"}),"ChevronRight");export{u as d};
+import{a2 as r,j as t}from"./vendor-mui-core-BL-xsBvI.js";import{r as a}from"./vendor-ux-did-connect-CWUKGZcn.js";var e={},o=r;Object.defineProperty(e,"__esModule",{value:!0});var u=e.default=void 0,i=o(a()),v=t;u=e.default=(0,i.default)((0,v.jsx)("path",{d:"M10 6 8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"}),"ChevronRight");export{u as d};