@abtnode/core 1.16.26-beta-4831bf3f → 1.16.26-beta-346cba92

package/lib/api/team.js

@@ -1329,6 +1329,11 @@ class TeamAPI extends EventEmitter {
 
     const store = await StoreUtil.getStoreMeta(sanitized);
 
+    const existById = storeList.find((x) => x.id === store.id);
+    if (existById) {
+      throw new Error(`Blocklet registry already exist: ${sanitized}`);
+    }
+
     storeList.push({ ...store, url: sanitized, protected: false });
 
     return this.teamManager.updateStoreList(teamDid, storeList);

package/lib/blocklet/manager/disk.js

@@ -11,6 +11,7 @@ const pick = require('lodash/pick');
 const isEmpty = require('lodash/isEmpty');
 const cloneDeep = require('lodash/cloneDeep');
 const { sign } = require('@arcblock/jwt');
+const { isInServerlessMode } = require('@abtnode/util/lib/serverless');
 const sleep = require('@abtnode/util/lib/sleep');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
 const joinUrl = require('url-join');
@@ -21,7 +22,6 @@ const {
   WHO_CAN_ACCESS,
   WHO_CAN_ACCESS_PREFIX_ROLES,
   BLOCKLET_INSTALL_TYPE,
-  NODE_MODES,
   APP_STRUCT_VERSION,
   BLOCKLET_CACHE_TTL,
   MONITOR_RECORD_INTERVAL_SEC,
@@ -60,7 +60,7 @@ const { titleSchema, updateMountPointSchema, environmentNameSchema } = require('
 const { emailConfigSchema } = require('@blocklet/sdk/lib/validators/email');
 const { encrypt } = require('@blocklet/sdk/lib/security');
 const Lock = require('@abtnode/util/lib/lock');
-const { getComponentApiKey } = require('@abtnode/util/lib/blocklet');
+const { getComponentApiKey, getBlockletLogos } = require('@abtnode/util/lib/blocklet');
 const defaults = require('lodash/defaults');
 
 const {
@@ -230,6 +230,8 @@ const getWalletAppNotification = async (blocklet, tempBlockletInfo) => {
     blockletInfo = getBlockletInfo(blocklet, nodeInfo.sk);
   }
 
+  const { appLogo } = getBlockletLogos(blocklet);
+
   return {
     actions: [
       {
@@ -243,12 +245,7 @@ const getWalletAppNotification = async (blocklet, tempBlockletInfo) => {
         data: {
           url: blockletInfo.appUrl,
           appDID: blocklet.appPid,
-          logo:
-            blocklet.environmentObj.BLOCKLET_APP_LOGO ||
-            joinUrl(
-              blockletInfo.appUrl,
-              normalizePathPrefix(joinUrl(WELLKNOWN_SERVICE_PATH_PREFIX, '/blocklet/logo')) || '/'
-            ),
+          logo: appLogo,
           title: blockletInfo.name,
           desc: blockletInfo.description,
         },
@@ -528,7 +525,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     if (file) {
       // TODO: 如何触发这种场景？
       const info = await states.node.read();
-      if (info.mode === NODE_MODES.SERVERLESS) {
+      if (isInServerlessMode(info)) {
         throw new Error("Can't install component in serverless-mode server via upload");
       }
 
@@ -547,7 +544,7 @@ class DiskBlockletManager extends BaseBlockletManager {
 
     if (url) {
       const info = await states.node.read();
-      if (info.mode === NODE_MODES.SERVERLESS) {
+      if (isInServerlessMode(info)) {
         validateStore(info, url);
       }
 
@@ -874,6 +871,8 @@ class DiskBlockletManager extends BaseBlockletManager {
 
     logger.info('blocklet stopped successfully', { processId, did });
 
+    launcher.notifyBlockletUpdated(blocklet);
+
     if (updateStatus) {
       const res = await states.blocklet.setBlockletStatus(did, BlockletStatus.stopped, { componentDids });
       // send notification to websocket channel
@@ -1571,6 +1570,12 @@ class DiskBlockletManager extends BaseBlockletManager {
         ];
 
         const shouldSendWalletNotification = observableConfigs.some((x) => newConfigs.some((y) => y.key === x));
+
+        if (shouldSendWalletNotification) {
+          // notify launcher config changed
+          launcher.notifyBlockletUpdated(blocklet);
+        }
+
         const receiverUsers = await this.teamManager.getOwnerAndAdminUsers(newState.appPid, 1);
         const receivers = receiverUsers.map((x) => x.did);
 
@@ -2081,7 +2086,7 @@ class DiskBlockletManager extends BaseBlockletManager {
       },
     ];
 
-    if (info.mode === NODE_MODES.SERVERLESS) {
+    if (isInServerlessMode(info)) {
       const serverlessJobs = [
         {
           name: 'check-renewed-blocklet',
@@ -2666,6 +2671,8 @@ class DiskBlockletManager extends BaseBlockletManager {
         severity: 'success',
       });
 
+      launcher.notifyBlockletUpdated(blocklet);
+
       logger.info('blocklet healthy', { did, name, time: Date.now() - startedAt });
     } catch (error) {
       const status = await states.blocklet.getBlockletStatus(did);

package/lib/blocklet/manager/helper/install-application-from-general.js

@@ -1,6 +1,7 @@
 const joi = require('joi');
 
-const { BLOCKLET_INSTALL_TYPE, NODE_MODES, INSTALL_ACTIONS } = require('@abtnode/constant');
+const { isInServerlessMode } = require('@abtnode/util/lib/serverless');
+const { BLOCKLET_INSTALL_TYPE, INSTALL_ACTIONS } = require('@abtnode/constant');
 const { BlockletStatus, BlockletEvents, BLOCKLET_CONFIGURABLE_KEY } = require('@blocklet/constant');
 
 const logger = require('@abtnode/logger')('@abtnode/core:install-app-general');
@@ -64,7 +65,7 @@ const installApplicationFromGeneral = async ({
       blockletWalletType = blockletWalletTypeEnv.default;
     }
 
-    if (nodeInfo.mode === NODE_MODES.SERVERLESS) {
+    if (isInServerlessMode(nodeInfo)) {
       validateInServerless({ blockletMeta: meta });
     }
 

package/lib/team/manager.js

@@ -301,14 +301,25 @@ class TeamManager extends EventEmitter {
   }
 
   async getStoreList(did) {
+    const nodeInfo = await this.states.node.read();
+    const blockletRegistryList = nodeInfo.blockletRegistryList || [];
     if (this.isNodeTeam(did)) {
-      const nodeInfo = await this.states.node.read();
-      return nodeInfo.blockletRegistryList || [];
+      return blockletRegistryList;
     }
 
     const metaDid = await this.states.blocklet.getBlockletMetaDid(did);
     const settings = await this.states.blockletExtras.getSettings(metaDid);
-    return get(settings, 'storeList', []) || [];
+    const storeList = get(settings, 'storeList', []) || [];
+
+    blockletRegistryList.forEach((store) => {
+      if (!storeList.find((x) => x.id === store.id)) {
+        storeList.push({
+          ...store,
+          protected: true,
+        });
+      }
+    });
+    return storeList;
   }
 
   async updateStoreList(did, list) {

package/lib/util/blocklet.js

@@ -37,7 +37,8 @@ const {
   BLOCKLET_MAX_MEM_LIMIT_IN_MB,
   BLOCKLET_INSTALL_TYPE,
   APP_STRUCT_VERSION,
-  NODE_MODES,
+  BLOCKLET_STORE,
+  BLOCKLET_STORE_DEV,
 } = require('@abtnode/constant');
 const {
   parseComponents,
@@ -97,6 +98,7 @@ const { getComponentsInternalInfo } = require('@blocklet/meta/lib/blocklet');
 const { titleSchema, descriptionSchema, logoSchema } = require('@blocklet/meta/lib/schema');
 const { getBlockletMetaFromUrl } = require('@blocklet/meta/lib/util-meta');
 const getComponentProcessId = require('@blocklet/meta/lib/get-component-process-id');
+const { isInServerlessMode } = require('@abtnode/util/lib/serverless');
 const md5 = require('@abtnode/util/lib/md5');
 
 const { validate: validateEngine, get: getEngine } = require('../blocklet/manager/engine');
@@ -1304,6 +1306,27 @@ const getBlocklet = async ({
 
   const nodeInfo = await states.node.read();
 
+  // FIXME: 梁柱, 下面的代码块, 在 1.16.29 之后的版本, 可以删除
+  {
+    // 对于历史项目, server.db -> servers -> blockletRegistryList 已经存储了没有 id 的 store, 这里需要兼容处理
+    let isNeedFixRedundantData = false;
+    const urlToId = {
+      [BLOCKLET_STORE.url]: BLOCKLET_STORE.id,
+      [BLOCKLET_STORE_DEV.url]: BLOCKLET_STORE_DEV.id,
+    };
+    (nodeInfo?.blockletRegistryList || []).forEach((store) => {
+      if (!store.id) {
+        store.id = urlToId[store.url];
+        isNeedFixRedundantData = true;
+      }
+    });
+
+    // 更新历史数据中遗漏的 store id, 方便后期删除这段代码
+    if (isNeedFixRedundantData) {
+      await states.node.updateNodeInfo({ blockletRegistryList: nodeInfo.blockletRegistryList });
+    }
+  }
+
   (nodeInfo?.blockletRegistryList || []).forEach((store) => {
     if (!blocklet.settings.storeList.find((x) => x.url === store.url)) {
       blocklet.settings.storeList.push({
@@ -1313,7 +1336,6 @@ const getBlocklet = async ({
     }
   });
 
-  // app site
   blocklet.site = await states.site.findOneByBlocklet(blocklet.meta.did);
 
   await forEachBlocklet(blocklet, async (component, { id, level, ancestors }) => {
@@ -1859,7 +1881,7 @@ const shouldEnableSlpDomain = ({ mode, launcher }) => {
     return true;
   }
 
-  return mode === NODE_MODES.SERVERLESS && !!launcher;
+  return isInServerlessMode({ mode }) && !!launcher;
 };
 
 const getSlpDid = (serverDid, appPid) => {

package/lib/util/launcher.js

@@ -15,12 +15,13 @@ const {
 const { Hasher } = require('@ocap/mcrypto');
 const { getDisplayName } = require('@blocklet/meta/lib/util');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
+const { getBlockletLogos } = require('@abtnode/util/lib/blocklet');
 
 const { getLauncherUser, getLauncherSession: getLauncherSessionRaw, doRequest } = require('@abtnode/auth/lib/launcher');
 const { createAuthToken, getPassportStatusEndpoint } = require('@abtnode/auth/lib/auth');
 const { createPassportVC, createPassport, createUserPassport } = require('@abtnode/auth/lib/passport');
 
-const { LOGIN_PROVIDER } = require('@blocklet/constant');
+const { LOGIN_PROVIDER, fromBlockletStatus } = require('@blocklet/constant');
 const {
   WELLKNOWN_SERVICE_PATH_PREFIX,
   NODE_DATA_DIR_NAME,
@@ -94,6 +95,55 @@ const reportComponentsEvent = async ({ blocklet, dids, type, time }) => {
   }
 };
 
+const notifyBlockletUpdated = async (blocklet) => {
+  const { controller } = blocklet;
+
+  if (!controller) {
+    return;
+  }
+
+  logger.info('notify blocklet updated', { controller, blockletPid: blocklet.appPid });
+
+  try {
+    const info = await states.node.read();
+
+    const blockletInfo = getBlockletInfo(blocklet, info.sk);
+    const { appLogo, appLogoRect } = getBlockletLogos(blocklet);
+
+    const payload = {
+      type: 'serverless.blocklet.updated',
+      payload: {
+        did: blocklet.appDid,
+        appId: blocklet.appDid,
+        appName: blockletInfo.name,
+        appDescription: blockletInfo.description,
+        status: fromBlockletStatus(blocklet.status),
+        appUrl: blockletInfo.url,
+        appLogo,
+        appLogoRect,
+      },
+    };
+
+    logger.info('notify blocklet updated payload', { controller, blockletPid: blocklet.appPid, payload });
+
+    const result = await doRequest(info.sk, {
+      launcherUrl: controller.launcherUrl,
+      pathname: `/api/launches/${controller.launcherSessionId}/webhook`,
+      payload,
+      method: 'post',
+    });
+
+    logger.info('notified blocklet updated', {
+      controller,
+      blockletPid: blocklet.appPid,
+      result,
+    });
+  } catch (error) {
+    logger.error('notify blocklet updated failed', { controller, blockletPid: blocklet.appPid, error });
+    throw new Error(`notify blocklet updated failed ${blocklet.appPid}`);
+  }
+};
+
 const consumeLauncherSession = async ({ params, blocklet }) => {
   try {
     const info = await states.node.read();
@@ -340,4 +390,5 @@ module.exports = {
   isLauncherSessionConsumed,
   isBlockletExpired,
   isBlockletTerminated,
+  notifyBlockletUpdated,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.26-beta-4831bf3f",
+  "version": "1.16.26-beta-346cba92",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,19 +19,19 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.26-beta-4831bf3f",
-    "@abtnode/auth": "1.16.26-beta-4831bf3f",
-    "@abtnode/certificate-manager": "1.16.26-beta-4831bf3f",
-    "@abtnode/constant": "1.16.26-beta-4831bf3f",
-    "@abtnode/cron": "1.16.26-beta-4831bf3f",
-    "@abtnode/logger": "1.16.26-beta-4831bf3f",
-    "@abtnode/models": "1.16.26-beta-4831bf3f",
-    "@abtnode/queue": "1.16.26-beta-4831bf3f",
-    "@abtnode/rbac": "1.16.26-beta-4831bf3f",
-    "@abtnode/router-provider": "1.16.26-beta-4831bf3f",
-    "@abtnode/static-server": "1.16.26-beta-4831bf3f",
-    "@abtnode/timemachine": "1.16.26-beta-4831bf3f",
-    "@abtnode/util": "1.16.26-beta-4831bf3f",
+    "@abtnode/analytics": "1.16.26-beta-346cba92",
+    "@abtnode/auth": "1.16.26-beta-346cba92",
+    "@abtnode/certificate-manager": "1.16.26-beta-346cba92",
+    "@abtnode/constant": "1.16.26-beta-346cba92",
+    "@abtnode/cron": "1.16.26-beta-346cba92",
+    "@abtnode/logger": "1.16.26-beta-346cba92",
+    "@abtnode/models": "1.16.26-beta-346cba92",
+    "@abtnode/queue": "1.16.26-beta-346cba92",
+    "@abtnode/rbac": "1.16.26-beta-346cba92",
+    "@abtnode/router-provider": "1.16.26-beta-346cba92",
+    "@abtnode/static-server": "1.16.26-beta-346cba92",
+    "@abtnode/timemachine": "1.16.26-beta-346cba92",
+    "@abtnode/util": "1.16.26-beta-346cba92",
     "@arcblock/did": "1.18.115",
     "@arcblock/did-auth": "1.18.115",
     "@arcblock/did-ext": "^1.18.115",
@@ -42,12 +42,12 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.115",
     "@arcblock/vc": "1.18.115",
-    "@blocklet/constant": "1.16.26-beta-4831bf3f",
-    "@blocklet/env": "1.16.26-beta-4831bf3f",
-    "@blocklet/meta": "1.16.26-beta-4831bf3f",
-    "@blocklet/resolver": "1.16.26-beta-4831bf3f",
-    "@blocklet/sdk": "1.16.26-beta-4831bf3f",
-    "@blocklet/store": "1.16.26-beta-4831bf3f",
+    "@blocklet/constant": "1.16.26-beta-346cba92",
+    "@blocklet/env": "1.16.26-beta-346cba92",
+    "@blocklet/meta": "1.16.26-beta-346cba92",
+    "@blocklet/resolver": "1.16.26-beta-346cba92",
+    "@blocklet/sdk": "1.16.26-beta-346cba92",
+    "@blocklet/store": "1.16.26-beta-346cba92",
     "@did-space/client": "^0.3.76",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.115",
@@ -103,5 +103,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "e1b75eed1841ae3589b3f854a9f027f1b7da64ba"
+  "gitHead": "389bb6584585302b9b12ec7133c73cb28b0d663b"
 }