@abtnode/blocklet-services 1.16.42-beta-20250402-131159-7647e64d → 1.16.42-beta-20250403-230303-c167c6a1

package/api/index.js

@@ -22,6 +22,7 @@ const {
   RESOURCE_PATTERN,
 } = require('@blocklet/constant');
 const { getAppOgCacheDir } = require('@abtnode/util/lib/blocklet');
+const { ensureLocale } = require('@abtnode/util/lib/middlewares/ensure-locale');
 const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
 const createInvite = require('@abtnode/auth/lib/invitation');
 const { getStatusFromError } = require('@abtnode/util/lib/custom-error');
@@ -448,6 +449,8 @@ module.exports = function createServer(node, serverOptions = {}) {
   server.set('trust proxy', 'loopback');
 
   server.use(cookieParser());
+  // 此时没有执行 bodyParser，所以不使用 body 进行判断
+  server.use(ensureLocale({ methods: ['query', 'cookies'] }));
 
   // Shared util functions on current request
   server.use((req, res, next) => {
@@ -649,7 +652,7 @@ self.blocklet = {
   });
 
   // This must come after all proxied requests that begins with WELLKNOWN_SERVICE_PATH_PREFIX
-  server.use(WELLKNOWN_SERVICE_PATH_PREFIX, bodyParser);
+  server.use(WELLKNOWN_SERVICE_PATH_PREFIX, bodyParser, ensureLocale({ force: true }));
 
   // Studio service
   StudioService.init(server, node);

package/api/libs/connect/session.js

@@ -47,6 +47,7 @@ const { getSourceAppPid, getLoginProvider } = require('@blocklet/sdk/lib/util/lo
 const { getDidSpacesInfoByClaims, silentAuthorizationInConnect } = require('@abtnode/auth/lib/util/spaces');
 const getRequestIP = require('@abtnode/util/lib/get-request-ip');
 const { PASSPORT_LOG_ACTION, PASSPORT_SOURCE, PASSPORT_STATUS } = require('@abtnode/constant');
+const { getDeviceData } = require('@abtnode/util/lib/device');
 
 const logger = require('../logger')('connect');
 const { createTokenFn, getDidConnectVersion } = require('../../util');
@@ -595,11 +596,10 @@ module.exports = {
         );
       }
       const lastLoginIp = getRequestIP(request);
-      const walletDeviceMessageToken = request.get('wallet-device-message-token');
-      const walletDeviceId = request.get('wallet-device-id');
       const ua = request.get('user-agent');
       // request.context.store.connectedWallet
       const walletOS = request.context.didwallet.os;
+      const deviceData = getDeviceData({ req: request });
 
       const userSessionDoc = await node.upsertUserSession({
         teamDid,
@@ -612,8 +612,7 @@ module.exports = {
         lastLoginIp,
         extra: {
           walletOS,
-          walletDeviceMessageToken,
-          walletDeviceId,
+          device: deviceData,
         },
       });
 
@@ -651,8 +650,7 @@ module.exports = {
               lastLoginIp,
               extra: {
                 walletOS,
-                walletDeviceMessageToken,
-                walletDeviceId,
+                device: deviceData,
               },
             });
           });

package/api/libs/jwt.js

@@ -47,7 +47,7 @@ const initJwt = (node, options) => {
       elevated,
     });
 
-  const verifySessionToken = (token, secret, { checkFromDb, teamDid, checkToken } = {}) =>
+  const verifySessionToken = (token, secret, { checkFromDb, teamDid, checkToken, locale = 'en' } = {}) =>
     // eslint-disable-next-line implicit-arrow-linebreak
     new Promise((resolve, reject) => {
       jwt.verify(token, secret, async (err, decoded) => {
@@ -91,13 +91,13 @@ const initJwt = (node, options) => {
           }
 
           if (!user.approved) {
-            return reject(new Error(`Invalid jwt token: ${messages.notAllowedAppUser.en}`));
+            return reject(new Error(`Invalid jwt token: ${messages.notAllowedAppUser[locale]}`));
           }
 
           if (passport && passport.id) {
             const valid = await node.isPassportValid({ teamDid, passportId: passport.id });
             if (valid === false) {
-              return reject(new Error(`Passport ${passport.name} has been revoked`));
+              return reject(new Error(messages.passportRevoked[locale](passport.name, passport.issuer?.name)));
             }
           }
 

package/api/libs/push-kit/index.js

@@ -56,10 +56,13 @@ async function sendPush(receiver, notification, { node, teamDid }) {
       user.userSessions.forEach((x) => {
         // NOTICE: 这里需要转为小写来判断
         const platform = x?.extra?.walletOS?.toLowerCase();
-        const deviceToken = x?.extra?.walletDeviceMessageToken;
+        // 兼容处理，支持读取 walletDeviceMessageToken
+        const deviceToken = x?.extra?.device?.messageToken || x?.extra?.walletDeviceMessageToken;
+        const deviceClientName = x?.extra?.device?.clientName;
         if (platform && ['ios', 'android', 'ios-sandbox'].includes(platform) && deviceToken) {
           acc.push({
             platform,
+            deviceClientName,
             deviceToken,
             userDid: x.userDid,
           });
@@ -70,7 +73,7 @@ async function sendPush(receiver, notification, { node, teamDid }) {
   }, []);
 
   const filterTargets = uniqWith(targets, (a, b) => {
-    return a.deviceToken === b.deviceToken && a.platform === b.platform;
+    return a.deviceToken === b.deviceToken && a.platform === b.platform && a.deviceClientName === b.deviceClientName;
   });
 
   if (filterTargets.length === 0) {

package/api/routes/federated.js

@@ -1,4 +1,4 @@
-const { WELLKNOWN_SERVICE_PATH_PREFIX, FEDERATED } = require('@abtnode/constant');
+const { WELLKNOWN_SERVICE_PATH_PREFIX, FEDERATED, PASSPORT_STATUS } = require('@abtnode/constant');
 const { signV2 } = require('@arcblock/jwt');
 const isNil = require('lodash/isNil');
 const pick = require('lodash/pick');
@@ -573,13 +573,23 @@ module.exports = {
           }
         );
         if (prevUser?.approved === false) {
-          res.status(401).json({ error: messages.notAllowedAppUser.en });
+          res.status(401).json({ error: messages.notAllowedAppUser[req.blockletLocale] });
           return;
         }
         // HACK: member 调用 master 时，将 passport 的 role 还原为 master 中原有的 role
         const targetPassport = passport?.id
           ? (prevUser?.passports || []).find((item) => item.id === passport.id)
           : null;
+        if (targetPassport?.status === PASSPORT_STATUS.EXPIRED) {
+          res.status(401).json({ error: messages.passportExpired[req.blockletLocale] });
+          return;
+        }
+        if (targetPassport?.status === PASSPORT_STATUS.REVOKED) {
+          res.status(401).json({
+            error: messages.passportRevoked[req.blockletLocale](targetPassport.title, targetPassport.issuer?.name),
+          });
+          return;
+        }
 
         // HACK: 用户在 master 中存在时，不更新任何用户信息；不存在时，将新增一个用户
         const filterUserInfo = prevUser ? {} : user;

package/api/routes/user-session.js

@@ -1,5 +1,10 @@
 /* eslint-disable no-await-in-loop */
-const { WELLKNOWN_SERVICE_PATH_PREFIX, SESSION_TTL, PASSPORT_LOG_ACTION } = require('@abtnode/constant');
+const {
+  WELLKNOWN_SERVICE_PATH_PREFIX,
+  SESSION_TTL,
+  PASSPORT_LOG_ACTION,
+  PASSPORT_STATUS,
+} = require('@abtnode/constant');
 const { LOGIN_PROVIDER } = require('@blocklet/constant');
 const pick = require('lodash/pick');
 const defaults = require('lodash/defaults');
@@ -11,6 +16,7 @@ const getRequestIP = require('@abtnode/util/lib/get-request-ip');
 const { getFederatedMembers, getFederatedMaster } = require('@abtnode/auth/lib/util/federated');
 const { messages } = require('@abtnode/auth/lib/auth');
 const { Joi } = require('@arcblock/validator');
+const { getDeviceData } = require('@abtnode/util/lib/device');
 const cors = require('cors');
 
 const logger = require('../libs/logger')('blocklet-services:user-session');
@@ -23,6 +29,8 @@ const checkUser = require('../middlewares/check-user');
 const prefix = `${WELLKNOWN_SERVICE_PATH_PREFIX}/api/user-session`;
 const limit = pLimit(5);
 
+const userInfoBlackList = ['extra.walletDeviceId', 'extra.walletDeviceMessageToken', 'extra.device'];
+
 async function getPassport(passportId, { node, teamDid }) {
   const passport = await node.getPassportById({ teamDid, passportId });
   return passport;
@@ -155,7 +163,7 @@ module.exports = {
       if (validSession) {
         const user = await node.getUser({ teamDid, user: { did: validUserSession.userDid } });
         if (!user.approved) {
-          res.status(401).json(messages.notAllowedAppUser.en);
+          res.status(401).json(messages.notAllowedAppUser[req.blockletLocale]);
           return;
         }
         const sourceProvider = getSourceProvider(user);
@@ -209,6 +217,16 @@ module.exports = {
           const targetPassport = validUserSession.passportId
             ? (user?.passports || []).find((item) => item.id === validUserSession.passportId)
             : null;
+          if (targetPassport?.status === PASSPORT_STATUS.EXPIRED) {
+            res.status(401).json({ error: messages.passportExpired[req.blockletLocale] });
+            return;
+          }
+          if (targetPassport?.status === PASSPORT_STATUS.REVOKED) {
+            res.status(401).json({
+              error: messages.passportRevoked[req.blockletLocale](targetPassport.title, targetPassport.issuer.name),
+            });
+            return;
+          }
           const loggedInUser = await node.loginUser({
             teamDid,
             user: {
@@ -259,8 +277,7 @@ module.exports = {
 
         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({
           id: validUserSession.id,
@@ -274,8 +291,7 @@ module.exports = {
           lastLoginIp,
           extra: {
             walletOS,
-            walletDeviceMessageToken,
-            walletDeviceId,
+            device: deviceData,
           },
         });
 
@@ -290,8 +306,7 @@ module.exports = {
             lastLoginIp,
             extra: {
               walletOS,
-              walletDeviceMessageToken,
-              walletDeviceId,
+              device: deviceData,
             },
           });
         }
@@ -349,10 +364,7 @@ module.exports = {
         .filter((x) => {
           return x?.user?.approved;
         })
-        .map((x) => {
-          // NOTICE: 移除 walletDeviceId 和 walletDeviceMessageToken，避免泄露
-          return omit(x, ['extra.walletDeviceId', 'extra.walletDeviceMessageToken']);
-        });
+        .map((x) => omit(x, userInfoBlackList));
 
       res.json(result);
     });
@@ -369,6 +381,8 @@ module.exports = {
       const { appPid } = blocklet;
       const teamDid = appPid;
 
+      const federatedSites = blocklet?.settings?.federated?.sites || [];
+
       const visitorId = req.get('x-blocklet-visitor-id');
 
       if (!visitorId) {
@@ -381,7 +395,17 @@ module.exports = {
         visitorId,
       });
 
-      const pendingList = userSessions.map((item) =>
+      const validUserSessions = userSessions.filter((x) => {
+        const federatedSite = federatedSites.find((y) => y.appPid === x.appPid);
+        if (federatedSite?.appPid === teamDid) {
+          return true;
+        }
+        if (federatedSite?.status === 'approved') {
+          return true;
+        }
+        return false;
+      });
+      const pendingList = validUserSessions.map((item) =>
         limit(() =>
           patchUserSessionData(item, {
             blocklet,
@@ -393,7 +417,7 @@ module.exports = {
       );
       await Promise.all(pendingList);
 
-      const result = userSessions
+      const result = validUserSessions
         .filter((x) => {
           if (x.status === 'expired') {
             return false;
@@ -404,10 +428,7 @@ module.exports = {
 
           return checkLoginUserSession(x, { req });
         })
-        .map((x) => {
-          // NOTICE: 移除 walletDeviceId 和 walletDeviceMessageToken，避免泄露
-          return omit(x, ['extra.walletDeviceId', 'extra.walletDeviceMessageToken']);
-        });
+        .map((x) => omit(x, userInfoBlackList));
 
       res.json(result);
     });

package/api/routes/user.js

@@ -24,6 +24,7 @@ const { xss } = require('@blocklet/xss');
 const { withQuery, joinURL } = require('ufo');
 const cors = require('cors');
 const createTranslator = require('@abtnode/util/lib/translate');
+const { getDeviceData } = require('@abtnode/util/lib/device');
 
 const { createTokenFn, getDidConnectVersion } = require('../util');
 const initJwt = require('../libs/jwt');
@@ -340,8 +341,7 @@ async function loginSDK(req, node, options) {
   );
   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 userSession = await node.upsertUserSession({
     visitorId,
     teamDid,
@@ -352,8 +352,7 @@ async function loginSDK(req, node, options) {
     lastLoginIp,
     extra: {
       walletOS: 'api',
-      walletDeviceMessageToken,
-      walletDeviceId,
+      device: deviceData,
     },
   });
   node.syncUserSession({
@@ -366,8 +365,7 @@ async function loginSDK(req, node, options) {
     lastLoginIp,
     extra: {
       walletOS: 'api',
-      walletDeviceMessageToken,
-      walletDeviceId,
+      device: deviceData,
     },
   });
   return {
@@ -844,8 +842,7 @@ module.exports = {
         { ...sessionConfig, didConnectVersion: getDidConnectVersion(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 userSession = await node.upsertUserSession({
         visitorId,
         teamDid,
@@ -856,8 +853,7 @@ module.exports = {
         lastLoginIp,
         extra: {
           walletOS,
-          walletDeviceMessageToken,
-          walletDeviceId,
+          device: deviceData,
         },
       });
       node.syncUserSession({
@@ -870,8 +866,7 @@ module.exports = {
         lastLoginIp,
         extra: {
           walletOS,
-          walletDeviceMessageToken,
-          walletDeviceId,
+          device: deviceData,
         },
       });
 

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/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/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);