@abtnode/core 1.16.18-beta-7aa6be5a → 1.16.18-beta-aa01bd8e

package/lib/api/team.js

@@ -42,7 +42,7 @@ const { validateCreatePermission, validateUpdatePermission } = require('../valid
 const { getBlocklet } = require('../util/blocklet');
 const StoreUtil = require('../util/store');
 const { profileSchema } = require('../validators/user');
-const { callFederated } = require('../util/federated');
+const { callFederated, getFederatedMaster, findFederatedSite } = require('../util/federated');
 
 const sanitizeUrl = (url) => {
   if (!url) {
@@ -1409,7 +1409,20 @@ class TeamAPI extends EventEmitter {
     return result;
   }
 
-  async upsertUserSession({ teamDid, appPid, userDid, visitorId, ua, lastLoginIp, sourceAppPid, passportId, status }) {
+  /**
+   * 新增|更新一个 userSession
+   * @param {string} params.teamDid - 当前更新的这个应用的 teamDid
+   * @param {string} params.appPid - 记录的 userSession 中应用的 appPid
+   * @param {string} params.userDid - 记录的 userSession 中当前用户的 did
+   * @param {string} params.visitorId - 记录的 userSession 中当前用户所使用设备的 visitorId
+   * @param {string} params.ua - 记录的 userSession 中当前用户所使用设备的 ua
+   * @param {string} params.lastLoginIp - 记录的 userSession 中当前用户的最后登录 ip
+   * @param {string} params.passportId - 记录的 userSession 中当前用户登录所使用的 passportId
+   * @param {string} params.status - 记录的 userSession 的状态
+   * @returns
+   */
+
+  async upsertUserSession({ teamDid, appPid, userDid, visitorId, ua, lastLoginIp, passportId, status }) {
     if (!userDid) {
       throw new Error('userDid are required');
     }
@@ -1443,62 +1456,88 @@ class TeamAPI extends EventEmitter {
       }
     }
 
-    if (sourceAppPid) {
-      const blocklet = await getBlocklet({ did: teamDid, states: this.states, dataDirs: this.dataDirs });
-      const nodeInfo = await this.node.read();
-      const { permanentWallet } = getBlockletInfo(blocklet, nodeInfo.sk);
-      const federated = defaults(cloneDeep(blocklet.settings.federated || {}), {
-        config: {},
-        sites: [],
-      });
-      const masterSite = federated.sites[0];
-      if (masterSite && masterSite.isMaster !== false && masterSite.appPid === sourceAppPid) {
+    return data;
+  }
+
+  /**
+   * 同步一个 userSession（userSession 只能向 master 同步，或 master 向 member 同步，不能由 member 向 member 同步）
+   * @param {string} params.teamDid - 当前更新的这个应用的 teamDid
+   * @param {string} params.targetAppPid - 同步的 userSession 的目标站点 appPid
+   * @param {string} params.userDid - 同步的 userSession 中当前用户的 did
+   * @param {string} params.visitorId - 同步的 userSession 中当前用户所使用设备的 visitorId
+   * @param {string} params.ua - 同步的 userSession 中当前用户所使用设备的 ua
+   * @param {string} params.lastLoginIp - 同步的 userSession 中当前用户的最后登录 ip
+   * @param {string} params.passportId - 同步的 userSession 中当前用户登录所使用的 passportId
+   * @returns
+   */
+  async syncUserSession({ teamDid, targetAppPid, userDid, visitorId, ua, lastLoginIp, passportId }) {
+    if (!targetAppPid) return;
+
+    const blocklet = await getBlocklet({ did: teamDid, states: this.states, dataDirs: this.dataDirs });
+    const nodeInfo = await this.node.read();
+    const { permanentWallet } = getBlockletInfo(blocklet, nodeInfo.sk);
+
+    const targetSite = findFederatedSite(blocklet, targetAppPid);
+    const masterSite = getFederatedMaster(blocklet);
+
+    let syncSite = null;
+    let appPid;
+    if (masterSite && targetSite) {
+      if (targetSite.appPid === masterSite.appPid) {
+        if (teamDid !== masterSite.appPid) {
+          syncSite = masterSite;
+          appPid = teamDid;
+        }
+      } else if (teamDid === masterSite.appPid) {
+        syncSite = targetSite;
+        appPid = targetAppPid;
+      }
+
+      if (syncSite) {
         try {
+          const userSession = {
+            action: 'login',
+            userDid,
+            visitorId,
+            ua,
+            lastLoginIp,
+            appPid,
+            passportId,
+          };
           await callFederated({
             action: 'sync',
             permanentWallet,
-            site: masterSite,
+            site: targetSite,
             data: {
-              userSessions: [
-                {
-                  action: 'login',
-                  userDid,
-                  visitorId: data.visitorId,
-                  ua,
-                  lastLoginIp,
-                  appPid: teamDid,
-                  passportId,
-                },
-              ],
+              userSessions: [userSession],
             },
           });
           logger.info('sync userSession to federated site successfully', {
             userDid,
-            visitorId: data.visitorId,
+            visitorId,
             ua,
             lastLoginIp,
-            appPid: teamDid,
+            appPid,
             passportId,
+            targetSite,
           });
         } catch (err) {
           logger.info(
             'sync userSession to federated site failed',
             {
               userDid,
-              visitorId: data.visitorId,
+              visitorId,
               ua,
               lastLoginIp,
-              appPid: teamDid,
+              appPid,
               passportId,
+              targetSite,
             },
             err
           );
-          throw err;
         }
       }
     }
-
-    return data;
   }
 
   async logoutUser({ teamDid, userDid, visitorId, appPid }) {

package/lib/blocklet/extras.js

@@ -63,7 +63,7 @@ const mergeConfigs = ({ old: oldConfigs, cur: newConfigs = [], did = '', dek = '
 
   if (enableSecurity) {
     newConfig.forEach((x) => {
-      if (x.secure) {
+      if (x.secure || oldConfig[x.key]?.secure) {
         x.value = security.encrypt(x.value, did, dek);
         if (x.default) {
           x.default = security.encrypt(x.default, did, dek);

package/lib/blocklet/manager/disk.js

@@ -359,23 +359,9 @@ class DiskBlockletManager extends BaseBlockletManager {
    * @param {ConfigEntry} configs pre configs
    */
   async installComponent(
-    {
-      rootDid,
-      mountPoint: tmpMountPoint,
-      url,
-      file,
-      did,
-      diffVersion,
-      deleteSet,
-      title,
-      name,
-      configs,
-      sync,
-      downloadTokenList,
-    },
+    { rootDid, mountPoint, url, file, did, diffVersion, deleteSet, title, name, configs, sync, downloadTokenList },
     context = {}
   ) {
-    const mountPoint = await updateMountPointSchema.validateAsync(tmpMountPoint);
     logger.debug('start install component', { rootDid, mountPoint, url });
 
     if (file) {
@@ -1968,8 +1954,8 @@ class DiskBlockletManager extends BaseBlockletManager {
     return createProject({ did, ...params, manager: this });
   }
 
-  getProjects({ did } = {}) {
-    return getProjects({ did, manager: this });
+  getProjects({ did, componentDid } = {}) {
+    return getProjects({ did, componentDid, manager: this });
   }
 
   getProject({ did, projectId } = {}) {
@@ -4072,7 +4058,7 @@ class FederatedBlockletManager extends DiskBlockletManager {
    * @param {{users?:Array; sites?:Array}} options.data - 需要同步的数据
    * @returns
    */
-  async syncFederated({ did, data = {} } = {}) {
+  async syncFederated({ did, data = {}, syncSites } = {}) {
     const blocklet = await this.getBlocklet(did);
 
     const federated = defaults(cloneDeep(blocklet.settings.federated || {}), {
@@ -4116,7 +4102,18 @@ class FederatedBlockletManager extends DiskBlockletManager {
     const { permanentWallet } = getBlockletInfo(blocklet, nodeInfo.sk);
 
     const waitingList = federated.sites
-      .filter((item) => item.appId !== federated.config.appId)
+      .filter((item) => {
+        // 未指定 syncSites 向全员通知（除了自己）
+        if (isUndefined(syncSites)) {
+          // 排除通知自己
+          return item.appPid !== blocklet.appPid;
+        }
+        // 如果指定了要通知的站点，则按指定的站点来过滤
+        if (Array.isArray(syncSites)) {
+          return syncSites.some((x) => x.appPid === item.appPid);
+        }
+        return false;
+      })
       .map((item) => {
         return limitSync(async () => {
           try {

package/lib/blocklet/manager/helper/install-component-from-upload.js

@@ -2,10 +2,11 @@ const path = require('path');
 
 const logger = require('@abtnode/logger')('@abtnode/core:install-component-upload');
 const getComponentProcessId = require('@blocklet/meta/lib/get-component-process-id');
-const { isInProgress } = require('@blocklet/meta/lib/util');
+const { isInProgress, hasStartEngine } = require('@blocklet/meta/lib/util');
 
 const { BlockletSource, BlockletGroup, fromBlockletStatus } = require('@blocklet/constant');
 const { INSTALL_ACTIONS } = require('@abtnode/constant');
+const { updateMountPointSchema } = require('@blocklet/meta/lib/schema');
 const {
   parseComponents,
   filterDuplicateComponents,
@@ -20,7 +21,7 @@ const { resolveDownload, resolveDiffDownload, downloadFromUpload } = require('..
 
 const installComponentFromUpload = async ({
   rootDid,
-  mountPoint,
+  mountPoint: tmpMountPoint,
   file,
   did,
   diffVersion,
@@ -83,11 +84,15 @@ const installComponentFromUpload = async ({
 
   const newChild = {
     meta: ensureMeta(meta),
-    mountPoint,
     source: BlockletSource.upload,
     deployedFrom: `Upload by ${context.user.fullName}`,
     bundleSource: null,
   };
+  if (hasStartEngine(newChild.meta)) {
+    const mountPoint = await updateMountPointSchema.validateAsync(tmpMountPoint);
+    newChild.mountPoint = mountPoint;
+  }
+
   const index = newBlocklet.children.findIndex((child) => child.meta.did === meta.did);
   if (index >= 0) {
     // if upgrade, do not update mountPoint

package/lib/blocklet/manager/helper/install-component-from-url.js

@@ -3,7 +3,7 @@ const { sign } = require('@arcblock/jwt');
 const logger = require('@abtnode/logger')('@abtnode/core:install-component-url');
 
 const { isFreeBlocklet, hasStartEngine } = require('@blocklet/meta/lib/util');
-const { titleSchema } = require('@blocklet/meta/lib/schema');
+const { titleSchema, updateMountPointSchema } = require('@blocklet/meta/lib/schema');
 const hasReservedKey = require('@blocklet/meta/lib/has-reserved-key');
 
 const { BlockletStatus, BlockletEvents, BlockletGroup } = require('@blocklet/constant');
@@ -23,7 +23,7 @@ const { formatName } = require('../../../util/get-domain-for-blocklet');
 
 const installComponentFromUrl = async ({
   rootDid,
-  mountPoint,
+  mountPoint: tmpMountPoint,
   url,
   context,
   title,
@@ -86,6 +86,7 @@ const installComponentFromUrl = async ({
   };
 
   if (hasStartEngine(newChildMeta)) {
+    const mountPoint = await updateMountPointSchema.validateAsync(tmpMountPoint);
     newChild.mountPoint = mountPoint || formatName(newChildMeta.title) || formatName(newChildMeta.name);
   }
 
@@ -156,7 +157,7 @@ const installComponentFromUrl = async ({
   // backup rollback data
   await manager._rollbackCache.backup({ did: rootDid, action, oldBlocklet });
 
-  logger.info('install component from url', { rootDid, url, mountPoint, sync, componentDids });
+  logger.info('install component from url', { rootDid, url, mountPoint: tmpMountPoint, sync, componentDids });
 
   if (sync) {
     await manager._downloadAndInstall({ ...downloadParams, throwOnError: true });

package/lib/blocklet/project/index.js

@@ -15,9 +15,11 @@ const { createReleaseSchema } = require('../../validators/project');
 
 const createRandomStr = () => Math.random().toString(36).substring(2, 8);
 
+const COMPONENT_CONFIG_MAP_DIR = '.component_config';
+
 // project
 
-const createProject = async ({ did, type, blockletTitle, blockletDid, manager }) => {
+const createProject = async ({ did, type, blockletTitle, blockletDid, componentDid, manager }) => {
   await titleSchema.validateAsync(blockletTitle);
   validateNewDid(blockletDid);
   if (!PROJECT.TYPES[type]) {
@@ -27,7 +29,7 @@ const createProject = async ({ did, type, blockletTitle, blockletDid, manager })
   const blocklet = await manager.getBlocklet(did, { useCache: true });
   const { projectState } = await manager._getProjectState(did);
 
-  const project = await projectState.createProject({ blockletTitle, blockletDid, type });
+  const project = await projectState.createProject({ blockletTitle, blockletDid, type, componentDid });
 
   // create project dir
   const projectDir = path.join(blocklet.env.dataDir, PROJECT.DIR, `${project.id}`);
@@ -41,9 +43,9 @@ const createProject = async ({ did, type, blockletTitle, blockletDid, manager })
   return project;
 };
 
-const getProjects = async ({ did, manager }) => {
+const getProjects = async ({ did, manager, componentDid }) => {
   const { projectState } = await manager._getProjectState(did);
-  const projects = await projectState.getProjects();
+  const projects = await projectState.getProjects({ componentDid });
   return { projects };
 };
 
@@ -237,22 +239,6 @@ const createRelease = async ({
       await fs.outputFile(path.join(tmpBundleDir, 'README.md'), blockletIntroduction);
     }
 
-    // create blocklet.yml
-    const meta = {
-      did: blockletDid,
-      name: blockletDid,
-      title: blockletTitle,
-      description: blockletDescription,
-      version: blockletVersion,
-      logo: logoFileName,
-      resources: ['/resource'],
-      components: [],
-      files: ['screenshots'],
-      screenshots: project.blockletScreenshots || [],
-    };
-
-    await updateMetaFile(path.join(tmpBundleDir, BLOCKLET_META_FILE), meta);
-
     // changelog
     const changelogDistFile = path.join(tmpBundleDir, 'CHANGELOG.md');
     const releases = await releaseState.getReleases({ projectId, status: PROJECT.RELEASE_STATUS.published });
@@ -270,6 +256,25 @@ const createRelease = async ({
     await fs.remove(tmpResourceDir);
     await fs.copy(resourceDir, tmpResourceDir);
 
+    // create blocklet.yml
+    const resourceList = await fs.readdir(resourceDir);
+    const resourcesPaths = resourceList
+      .filter((x) => x !== COMPONENT_CONFIG_MAP_DIR)
+      .map((x) => path.join('/resource', x));
+    const meta = {
+      did: blockletDid,
+      name: blockletDid,
+      title: blockletTitle,
+      description: blockletDescription,
+      version: blockletVersion,
+      logo: logoFileName,
+      resources: resourcesPaths.length ? resourcesPaths : undefined,
+      components: [],
+      files: ['screenshots'],
+      screenshots: project.blockletScreenshots || [],
+    };
+    await updateMetaFile(path.join(tmpBundleDir, BLOCKLET_META_FILE), meta);
+
     // create release
     await createBlockletRelease(tmpExportDir, { printError: logger.error, printInfo: logger.info });
 
@@ -319,7 +324,7 @@ const getSelectedResourcesFile = ({ app, projectId, releaseId, componentDid }) =
     dirArr.push(PROJECT.RELEASE_DIR, releaseId || '/');
   }
   dirArr.push(PROJECT.RESOURCE_DIR);
-  dirArr.push('.component_config');
+  dirArr.push(COMPONENT_CONFIG_MAP_DIR);
   dirArr.push(`${componentDid}.json`);
   return path.join(...dirArr);
 };

package/lib/index.js

@@ -385,6 +385,7 @@ function ABTNode(options) {
     // user-session
     getUserSession: teamAPI.getUserSession.bind(teamAPI),
     upsertUserSession: teamAPI.upsertUserSession.bind(teamAPI),
+    syncUserSession: teamAPI.syncUserSession.bind(teamAPI),
     logoutUser: teamAPI.logoutUser.bind(teamAPI),
     getPassportById: teamAPI.getPassportById.bind(teamAPI),
     getPassportFromFederated: teamAPI.getPassportFromFederated.bind(teamAPI),

package/lib/states/audit-log.js

@@ -245,7 +245,7 @@ ${JSON.stringify(syncData, null, 2)}
     case 'switchPassport':
       return `${args.provider} user ${user} switched passport to ${args.passport.name}`;
     case 'login':
-      return `${args.provider} user ${user} logged in with passport ${args.passport.name}`;
+      return `${args.provider} user ${user} logged in with passport ${args.passport?.name}`;
     case 'updateWhoCanAccess':
       return `updated access control policy of **${
         args.did[1] ? getComponentNames(result, [args.did[1]]) : 'application'

package/lib/states/project.js

@@ -8,13 +8,22 @@ const isUndefinedOrNull = (x) => x === undefined || x === null;
  * @extends BaseState<import('@abtnode/models').ProjectState>
  */
 class Project extends BaseState {
-  createProject({ type, blockletDid, blockletTitle }) {
-    return this.insert({ id: blockletDid, type, blockletDid, blockletTitle });
+  createProject({ type, blockletDid, blockletTitle, componentDid }) {
+    const doc = { id: blockletDid, type, blockletDid, blockletTitle };
+    if (componentDid) {
+      doc.componentDid = componentDid;
+    }
+
+    return this.insert(doc);
   }
 
-  getProjects() {
+  getProjects({ componentDid }) {
+    const query = {};
+    if (componentDid) {
+      query.componentDid = componentDid;
+    }
     return this.find(
-      {},
+      query,
       {},
       {
         createdAt: -1,

package/lib/util/federated.js

@@ -5,6 +5,22 @@ const joinUrl = require('url-join');
 
 const request = require('./request');
 
+function isMaster(site) {
+  return site?.isMaster !== false;
+}
+
+function getFederatedMaster(blocklet) {
+  const { sites } = blocklet?.settings?.federated || {};
+  const masterSite = (sites || []).find((item) => isMaster(item));
+  return masterSite || null;
+}
+
+function findFederatedSite(blocklet, targetAppPid) {
+  const { sites } = blocklet?.settings?.federated || {};
+  const targetSite = (sites || []).find((item) => item.appPid === targetAppPid);
+  return targetSite || null;
+}
+
 async function callFederated({ site, permanentWallet, data, action }) {
   const url = new URL(site.appUrl);
   url.pathname = joinUrl(WELLKNOWN_SERVICE_PATH_PREFIX, `/api/federated/${action}`);
@@ -21,4 +37,7 @@ async function callFederated({ site, permanentWallet, data, action }) {
 
 module.exports = {
   callFederated,
+  getFederatedMaster,
+  findFederatedSite,
+  isMaster,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.18-beta-7aa6be5a",
+  "version": "1.16.18-beta-aa01bd8e",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,39 +19,39 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.18-beta-7aa6be5a",
-    "@abtnode/auth": "1.16.18-beta-7aa6be5a",
-    "@abtnode/certificate-manager": "1.16.18-beta-7aa6be5a",
-    "@abtnode/constant": "1.16.18-beta-7aa6be5a",
-    "@abtnode/cron": "1.16.18-beta-7aa6be5a",
-    "@abtnode/logger": "1.16.18-beta-7aa6be5a",
-    "@abtnode/models": "1.16.18-beta-7aa6be5a",
-    "@abtnode/queue": "1.16.18-beta-7aa6be5a",
-    "@abtnode/rbac": "1.16.18-beta-7aa6be5a",
-    "@abtnode/router-provider": "1.16.18-beta-7aa6be5a",
-    "@abtnode/static-server": "1.16.18-beta-7aa6be5a",
-    "@abtnode/timemachine": "1.16.18-beta-7aa6be5a",
-    "@abtnode/util": "1.16.18-beta-7aa6be5a",
-    "@arcblock/did": "1.18.93",
-    "@arcblock/did-auth": "1.18.93",
-    "@arcblock/did-ext": "^1.18.93",
+    "@abtnode/analytics": "1.16.18-beta-aa01bd8e",
+    "@abtnode/auth": "1.16.18-beta-aa01bd8e",
+    "@abtnode/certificate-manager": "1.16.18-beta-aa01bd8e",
+    "@abtnode/constant": "1.16.18-beta-aa01bd8e",
+    "@abtnode/cron": "1.16.18-beta-aa01bd8e",
+    "@abtnode/logger": "1.16.18-beta-aa01bd8e",
+    "@abtnode/models": "1.16.18-beta-aa01bd8e",
+    "@abtnode/queue": "1.16.18-beta-aa01bd8e",
+    "@abtnode/rbac": "1.16.18-beta-aa01bd8e",
+    "@abtnode/router-provider": "1.16.18-beta-aa01bd8e",
+    "@abtnode/static-server": "1.16.18-beta-aa01bd8e",
+    "@abtnode/timemachine": "1.16.18-beta-aa01bd8e",
+    "@abtnode/util": "1.16.18-beta-aa01bd8e",
+    "@arcblock/did": "1.18.95",
+    "@arcblock/did-auth": "1.18.95",
+    "@arcblock/did-ext": "^1.18.95",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/did-util": "1.18.93",
-    "@arcblock/event-hub": "1.18.93",
-    "@arcblock/jwt": "^1.18.93",
+    "@arcblock/did-util": "1.18.95",
+    "@arcblock/event-hub": "1.18.95",
+    "@arcblock/jwt": "^1.18.95",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/validator": "^1.18.93",
-    "@arcblock/vc": "1.18.93",
-    "@blocklet/constant": "1.16.18-beta-7aa6be5a",
-    "@blocklet/env": "1.16.18-beta-7aa6be5a",
-    "@blocklet/meta": "1.16.18-beta-7aa6be5a",
-    "@blocklet/resolver": "1.16.18-beta-7aa6be5a",
-    "@blocklet/sdk": "1.16.18-beta-7aa6be5a",
-    "@did-space/client": "^0.3.12",
+    "@arcblock/validator": "^1.18.95",
+    "@arcblock/vc": "1.18.95",
+    "@blocklet/constant": "1.16.18-beta-aa01bd8e",
+    "@blocklet/env": "1.16.18-beta-aa01bd8e",
+    "@blocklet/meta": "1.16.18-beta-aa01bd8e",
+    "@blocklet/resolver": "1.16.18-beta-aa01bd8e",
+    "@blocklet/sdk": "1.16.18-beta-aa01bd8e",
+    "@did-space/client": "^0.3.20",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.18.93",
-    "@ocap/util": "1.18.93",
-    "@ocap/wallet": "1.18.93",
+    "@ocap/mcrypto": "1.18.95",
+    "@ocap/util": "1.18.95",
+    "@ocap/wallet": "1.18.95",
     "@slack/webhook": "^5.0.4",
     "archiver": "^5.3.1",
     "axios": "^0.27.2",
@@ -101,5 +101,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "b2da6c7e30adf84d7eca941ada27427344c49044"
+  "gitHead": "2bfa63d05ad290f13eee359661e4175b857d9f9d"
 }