@abtnode/blocklet-services 1.16.18-beta-adeeb0b3 → 1.16.18-beta-aa01bd8e

package/api/index.js

@@ -118,6 +118,7 @@ module.exports = function createServer(node, serverOptions = {}) {
     BlockletEvents.removed,
     BlockletEvents.statusChange,
     BlockletEvents.installed,
+    BlockletEvents.componentRemoved,
   ].forEach((name) => {
     eventHub.on(name, (data) => {
       const did = get(data, 'meta.did');

package/api/libs/connect/session.js

@@ -10,7 +10,6 @@ const {
   getPassportStatusEndpoint,
   getApplicationInfo,
   verifyNFT,
-  upsertUserSession,
 } = require('@abtnode/auth/lib/auth');
 const {
   NODE_SERVICES,
@@ -409,38 +408,51 @@ module.exports = {
           node
         );
       }
+      const lastLoginIp = request.headers['x-real-ip'];
+      const ua = request.headers['user-agent'];
 
-      if (shouldSyncFederated(sourceAppPid, masterSite, blocklet)) {
-        await node.syncFederated({
-          did: teamDid,
-          data: {
-            users: [
-              {
-                did: updatedUser.did,
-                pk: updatedUser.pk,
-                fullName: updatedUser.fullName,
-                email: updatedUser.email || '',
-                avatar: getUserAvatarUrl(updatedUser.avatar, blocklet),
-                connectedAccount: [connectAccount, connectedNft],
-                action: 'connectAccount',
-                sourceAppPid: sourceAppPid || masterSite.appPid,
-              },
-            ],
-          },
-        });
-      }
+      const userSessionDoc = await node.upsertUserSession({
+        teamDid,
+        visitorId,
+        userDid: realDid,
+        appPid: teamDid,
+        passportId: passport?.id,
+        status: 'online',
+        ua,
+        lastLoginIp,
+      });
 
-      const userSessionDoc = await upsertUserSession(
-        {
-          teamDid,
-          visitorId,
-          userDid: realDid,
-          appPid: teamDid,
-          passportId: passport?.id,
-          status: 'online',
-        },
-        { req: request, node, sourceAppPid }
-      );
+      if (shouldSyncFederated(sourceAppPid, blocklet)) {
+        node
+          .syncFederated({
+            did: teamDid,
+            data: {
+              users: [
+                {
+                  did: updatedUser.did,
+                  pk: updatedUser.pk,
+                  fullName: updatedUser.fullName,
+                  email: updatedUser.email || '',
+                  avatar: getUserAvatarUrl(updatedUser.avatar, blocklet),
+                  connectedAccount: [connectAccount, connectedNft],
+                  action: 'connectAccount',
+                  sourceAppPid: sourceAppPid || masterSite.appPid,
+                },
+              ],
+            },
+          })
+          .then(() => {
+            node.syncUserSession({
+              teamDid,
+              userDid: realDid,
+              visitorId: userSessionDoc.visitorId,
+              passportId: passport?.id,
+              targetAppPid: sourceAppPid,
+              ua,
+              lastLoginIp,
+            });
+          });
+      }
 
       // Generate new session token that client can save to localStorage
       const createToken = createTokenFn(createSessionToken);
@@ -586,7 +598,7 @@ module.exports = {
       const sourceAppPid = getSourceAppPid(request);
       const masterSite = getFederatedMaster(blocklet);
       // NOTICE: 采用异步来更新，不阻塞接口的正常响应
-      if (shouldSyncFederated(sourceAppPid, masterSite, blocklet)) {
+      if (shouldSyncFederated(sourceAppPid, blocklet)) {
         node.syncFederated({
           did: teamDid,
           data: {
@@ -914,7 +926,7 @@ module.exports = {
       });
       const masterSite = getFederatedMaster(blocklet);
       // NOTICE: 采用异步来更新，不阻塞接口的正常响应
-      if (shouldSyncFederated(sourceAppPid, masterSite, blocklet)) {
+      if (shouldSyncFederated(sourceAppPid, blocklet)) {
         const syncUserData = {
           did: oauthUser.did,
           pk: oauthUser.pk,

package/api/middlewares/check-running.js

@@ -34,7 +34,7 @@ const checkRunning = async (req, res, next) => {
     }
 
     const nodeInfo = await req.getNodeInfo();
-    res.status(500);
+    res.status(503);
     // return json if json has high priority, e.g. "*/*,application/json"
     if (req.accepts(['html', 'json']) === 'json') {
       res.json({ code: 'error', error: 'blocklet is under maintenance' });

package/api/routes/blocklet.js

@@ -30,6 +30,7 @@ const {
   wipeSensitiveData,
   findComponentByIdV2,
   forEachComponentV2Sync,
+  hasResourceType,
 } = require('@blocklet/meta/lib/util');
 const {
   WELLKNOWN_SERVICE_PATH_PREFIX,
@@ -517,5 +518,22 @@ module.exports = {
         res.status(500).send(err.message);
       }
     });
+
+    server.get(`${prefix}/api/resources`, checkAdminPermission, async (req, res) => {
+      const { resourceType } = req.query;
+      const blocklet = await req.getBlocklet();
+
+      const components = (blocklet.children || []).filter((x) => hasResourceType(x, resourceType));
+
+      const resources = components.map((x) => ({
+        did: x.meta.did,
+        title: x.meta.title,
+        description: x.meta.description,
+        version: x.meta.version,
+        logo: `${prefix}/blocklet/logo-bundle/${x.meta.did}?v=${x.meta.version}`,
+      }));
+
+      res.json(resources);
+    });
   },
 };

package/api/routes/federated.js

@@ -315,11 +315,11 @@ module.exports = {
       const { users = null, sites = null, userSessions = null } = req.body.verifyData;
 
       // FIXME: @zhanghan 校验 users 和 sites 数据合法性
-      const pendingList = [];
       if (!isNil(sites)) {
+        const pendingSiteList = [];
         const federated = cloneDeep(blocklet.settings.federated || {});
         federated.sites = sites;
-        pendingList.push(
+        pendingSiteList.push(
           limitSync(async () => {
             await node.setFederated({
               did: teamDid,
@@ -327,14 +327,16 @@ module.exports = {
             });
           })
         );
+        await Promise.all(pendingSiteList);
       }
 
       if (!isNil(users)) {
         if (Array.isArray(users)) {
+          const pendingUserList = [];
           const nodeInfo = await req.getNodeInfo();
           const { dataDir } = await getApplicationInfo({ node, nodeInfo, teamDid });
           for (const user of users) {
-            pendingList.push(
+            pendingUserList.push(
               limitSync(async () => {
                 await syncFnMaps[user.action]?.(
                   { ...user, sourceAppPid: user.sourceAppPid === teamDid ? undefined : user.sourceAppPid },
@@ -343,30 +345,29 @@ module.exports = {
               })
             );
           }
+          await Promise.all(pendingUserList);
         }
       }
 
       if (!isNil(userSessions)) {
         if (Array.isArray(userSessions)) {
+          const pendingUserSessionList = [];
           for (const userSession of userSessions) {
             const { action, ...userSessionItem } = userSession;
-            pendingList.push(
+            pendingUserSessionList.push(
               limitSync(async () => {
                 if (action === 'login') {
-                  await node.upsertUserSession(
-                    { ...userSessionItem, teamDid, status: 'online' },
-                    { req, node, sourceAppPid: teamDid }
-                  );
+                  await node.upsertUserSession({ ...userSessionItem, teamDid, status: 'online' });
                 } else if (action === 'logout') {
                   await node.logoutUser({ ...userSessionItem, teamDid });
                 }
               })
             );
           }
+          await Promise.all(pendingUserSessionList);
         }
       }
 
-      await Promise.all(pendingList);
       await node.createAuditLog(
         {
           action: 'syncFederated',

package/api/routes/oauth.js

@@ -1,4 +1,4 @@
-const { handleInvitationReceive, getApplicationInfo, upsertUserSession } = require('@abtnode/auth/lib/auth');
+const { handleInvitationReceive, getApplicationInfo } = require('@abtnode/auth/lib/auth');
 const { upsertToPassports, createPassportSvg } = require('@abtnode/auth/lib/passport');
 const { WELLKNOWN_SERVICE_PATH_PREFIX, NODE_SERVICES, PASSPORT_STATUS } = require('@abtnode/constant');
 const { extractUserAvatar, getUserAvatarUrl, getAppAvatarUrl } = require('@abtnode/util/lib/user');
@@ -187,7 +187,19 @@ async function login(req, node, options) {
   );
 
   const masterSite = getFederatedMaster(blocklet);
-  if (shouldSyncFederated(sourceAppPid, masterSite, blocklet)) {
+  const ua = req.headers['user-agent'];
+  const userSessionDoc = await node.upsertUserSession({
+    teamDid,
+    userDid: currentUser.did,
+    visitorId,
+    appPid: teamDid,
+    passportId: passport?.id,
+    status: 'online',
+    ua,
+    lastLoginIp,
+  });
+
+  if (shouldSyncFederated(sourceAppPid, blocklet)) {
     const syncUserData = {
       did: userDid,
       pk: userPk,
@@ -195,35 +207,32 @@ async function login(req, node, options) {
       avatar: getUserAvatarUrl(appUrl, profile.avatar),
       connectedAccount: [connectedAccount],
     };
-    await node.syncFederated({
-      did: teamDid,
-      data: {
-        users: [
-          {
-            ...syncUserData,
-            action: 'connectAccount',
-            sourceAppPid: sourceAppPid || masterSite?.appPid,
-          },
-        ],
-      },
-    });
-  }
 
-  const userSessionDoc = await upsertUserSession(
-    {
-      teamDid,
-      userDid: currentUser.did,
-      visitorId,
-      appPid: teamDid,
-      passportId: passport?.id,
-      status: 'online',
-    },
-    {
-      node,
-      req,
-      sourceAppPid: sourceAppPid || masterSite?.appPid,
-    }
-  );
+    node
+      .syncFederated({
+        did: teamDid,
+        data: {
+          users: [
+            {
+              ...syncUserData,
+              action: 'connectAccount',
+              sourceAppPid: sourceAppPid || masterSite?.appPid,
+            },
+          ],
+        },
+      })
+      .then(() => {
+        node.syncUserSession({
+          teamDid,
+          userDid: currentUser.did,
+          visitorId: userSessionDoc.visitorId,
+          passportId: passport?.id,
+          targetAppPid: sourceAppPid,
+          ua,
+          lastLoginIp,
+        });
+      });
+  }
 
   const { createSessionToken } = initJwt(node, options);
 
@@ -329,6 +338,9 @@ async function invite(req, node, options) {
     provider,
   });
   const masterSite = getFederatedMaster(blocklet);
+  const syncData = {
+    users: [],
+  };
 
   if (currentUser) {
     const walletDid = getWalletDid(currentUser);
@@ -368,28 +380,51 @@ async function invite(req, node, options) {
         sourceAppPid,
       },
     });
-
-    if (shouldSyncFederated(sourceAppPid, masterSite, blocklet)) {
+    if (shouldSyncFederated(sourceAppPid, blocklet)) {
       const syncUserData = {
         did: userDid,
         pk: userPk,
         ...profile,
         connectedAccount: [connectedAccount],
       };
-      await node.syncFederated({
-        did: teamDid,
-        data: {
-          users: [
-            {
-              ...syncUserData,
-              action: 'connectAccount',
-              sourceAppPid: sourceAppPid || masterSite?.appPid,
-            },
-          ],
-        },
+      syncData.users.push({
+        ...syncUserData,
+        action: 'connectAccount',
+        sourceAppPid: sourceAppPid || masterSite?.appPid,
       });
     }
   }
+  const lastLoginIp = req.headers['x-real-ip'];
+  const ua = req.headers['user-agent'];
+  const userSessionDoc = await node.upsertUserSession({
+    teamDid,
+    userDid,
+    visitorId,
+    appPid: teamDid,
+    passportId: passport.id,
+    status: 'online',
+    ua,
+    lastLoginIp,
+  });
+
+  if (shouldSyncFederated(sourceAppPid, blocklet)) {
+    node
+      .syncFederated({
+        did: teamDid,
+        data: syncData,
+      })
+      .then(() => {
+        node.syncUserSession({
+          teamDid,
+          userDid,
+          visitorId: userSessionDoc.visitorId,
+          passportId: passport?.id,
+          targetAppPid: sourceAppPid,
+          ua,
+          lastLoginIp,
+        });
+      });
+  }
 
   const { createSessionToken } = initJwt(node, options);
 
@@ -407,22 +442,6 @@ async function invite(req, node, options) {
     return sessionToken;
   }
 
-  const userSessionDoc = await upsertUserSession(
-    {
-      teamDid,
-      userDid,
-      visitorId,
-      appPid: teamDid,
-      passportId: passport.id,
-      status: 'online',
-    },
-    {
-      node,
-      req,
-      sourceAppPid: sourceAppPid || masterSite?.appPid,
-    }
-  );
-
   return {
     sessionToken,
     refreshToken,
@@ -512,7 +531,7 @@ async function bind(req, node, options) {
   });
 
   const masterSite = getFederatedMaster(blocklet);
-  if (shouldSyncFederated(sourceAppPid, masterSite, blocklet)) {
+  if (shouldSyncFederated(sourceAppPid, blocklet)) {
     // NOTICE: 采用异步来更新，不阻塞接口的正常响应
     const syncUserData = {
       did: bindUser.did,

package/api/routes/user-session.js

@@ -6,7 +6,6 @@ const pick = require('lodash/pick');
 const defaults = require('lodash/defaults');
 const cloneDeep = require('lodash/cloneDeep');
 const pLimit = require('p-limit');
-const { upsertUserSession } = require('@abtnode/auth/lib/auth');
 const logger = require('@abtnode/logger')('blocklet-services:user-session');
 
 const ensureBlocklet = require('../middlewares/ensure-blocklet');
@@ -127,21 +126,29 @@ module.exports = {
           site: memberSite,
         });
 
-        const userSessionDoc = await upsertUserSession(
-          {
-            teamDid,
-            userDid,
-            visitorId,
-            appPid,
-            passportId,
-            status: 'online',
-          },
-          {
-            node,
-            req,
-            sourceAppPid: teamDid,
-          }
-        );
+        const lastLoginIp = req.headers['x-real-ip'];
+        const ua = req.headers['user-agent'];
+
+        const userSessionDoc = await node.upsertUserSession({
+          teamDid,
+          userDid,
+          visitorId,
+          appPid,
+          passportId,
+          status: 'online',
+          ua,
+          lastLoginIp,
+        });
+
+        node.syncUserSession({
+          teamDid,
+          userDid,
+          visitorId: userSessionDoc.visitorId,
+          passportId,
+          targetAppPid: appPid,
+          ua,
+          lastLoginIp,
+        });
 
         logger.info('quick-login with', {
           teamDid,