@abtnode/core 1.16.24-beta-c8847287 → 1.16.24-beta-5334b8f2

package/lib/blocklet/downloader/resolve-download.js

@@ -9,6 +9,7 @@ const defaultLogger = require('@abtnode/logger')('@abtnode/core:resolve-download
 const { getBlockletMeta } = require('../../util');
 
 const { ensureBlockletExpanded, expandTarball, getBundleDir } = require('../../util/blocklet');
+const { installExternalDependencies } = require('../../util/install-external-dependencies');
 
 const asyncFs = fs.promises;
 
@@ -76,6 +77,8 @@ const resolveDownload = async (tarFile, dist, { removeTarFile = true, logger = d
     fs.mkdirSync(installDir, { recursive: true });
 
     await fs.move(downloadDir, installDir, { overwrite: true });
+
+    installExternalDependencies(installDir);
   } catch (error) {
     fs.removeSync(downloadDir);
     fs.removeSync(tmp);
@@ -142,6 +145,8 @@ const resolveDiffDownload = async (
     logger.info('Move downloadDir to installDir', { downloadDir, bundleDir });
     await fs.move(downloadDir, bundleDir, { overwrite: true });
 
+    installExternalDependencies(bundleDir);
+
     return { meta, installDir: bundleDir };
   } catch (error) {
     fs.removeSync(downloadDir);

package/lib/blocklet/manager/disk.js

@@ -745,7 +745,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         blocklet1.meta.title
       }: ${error.message}`;
       this._createNotification(did, {
-        title: '',
+        title: 'Component start failed',
         description,
         entityType: 'blocklet',
         entityId: did,
@@ -827,7 +827,7 @@ class DiskBlockletManager extends BaseBlockletManager {
       this.configSynchronizer.throttledSyncAppConfig(blocklet.meta.did);
 
       this._createNotification(did, {
-        title: '',
+        title: 'Component stop succeed',
         description: `${
           componentDids?.length ? getComponentNamesWithVersion(blocklet, componentDids) : 'All components'
         } is successfully stopped for ${blocklet.meta.title}.`,
@@ -925,7 +925,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         result.meta.title
       }: ${err.message || 'queue exception'}`;
       this._createNotification(did, {
-        title: '',
+        title: 'Component restart failed',
         description,
         entityType: 'blocklet',
         entityId: did,
@@ -1140,7 +1140,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     this.emit(BlockletEvents.upgraded, { blocklet: newBlocklet, context: { ...context, createAuditLog: false } }); // trigger router refresh
 
     this._createNotification(newBlocklet.meta.did, {
-      title: '',
+      title: 'Component delete succeed',
       description: `${child.meta.title} is successfully deleted for ${newBlocklet.meta.title}.`,
       entityType: 'blocklet',
       entityId: newBlocklet.meta.did,
@@ -1482,27 +1482,28 @@ class DiskBlockletManager extends BaseBlockletManager {
 
         const shouldSendWalletNotification = observableConfigs.some((x) => newConfigs.some((y) => y.key === x));
         const receiverUsers = await this.teamManager.getOwnerAndAdminUsers(newState.appPid, 1);
-        const receiver = receiverUsers.map((x) => x.did);
+        const receivers = receiverUsers.map((x) => x.did);
 
-        if (shouldSendWalletNotification && receiver) {
+        if (shouldSendWalletNotification && receivers.length) {
           const nodeInfo = await states.node.read();
           const blockletInfo = getBlockletInfo(newState, nodeInfo.sk);
-          const walletExtra = await getWalletAppNotification(newState, blockletInfo);
+          const { actions, attachments } = await getWalletAppNotification(newState, blockletInfo);
 
-          const notification = {
-            receiver,
-            teamDid: newState.appPid,
-            title: 'Blocklet Config Changed',
-            description: `Blocklet ${blockletInfo.name} config changed`,
-            action: `/blocklets/${did}/overview`,
-            entityType: 'blocklet',
-            entityId: newState.appPid,
-            severity: 'success',
-            blockletUrl: blockletInfo.appUrl,
-            extra: { wallet: walletExtra },
+          const sender = {
+            appDid: blockletInfo.wallet.address,
+            appSk: blockletInfo.wallet.secretKey,
           };
 
-          await this.teamManager.createNotification(notification);
+          await sendToUser(
+            receivers,
+            {
+              title: 'Blocklet Config Changed',
+              body: `Blocklet ${blockletInfo.name} config changed`,
+              attachments,
+              actions,
+            },
+            sender
+          );
         }
       } catch (error) {
         logger.error('Failed to send wallet notification after updated config', { did, error });
@@ -2375,7 +2376,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         },
       });
       this._createNotification(did, {
-        title: '',
+        title: 'Component download failed',
         description: `${childrenToDownload
           .map((x) => `${x.meta.title}@${x.meta.version}`)
           .join(', ')} download failed for ${title}: ${err.message}`,
@@ -2539,7 +2540,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         ? `${getComponentNamesWithVersion(blocklet, componentDids)} is successfully started for ${blocklet.meta.title}.`
         : `${blocklet.meta.title} is successfully started`;
       this._createNotification(did, {
-        title: '',
+        title: 'Component start succeed',
         description,
         entityType: 'blocklet',
         entityId: did,
@@ -2565,7 +2566,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         : `${blocklet.meta.title} start failed: ${error.message}`;
 
       this._createNotification(did, {
-        title: '',
+        title: 'Component start failed',
         description,
         entityType: 'blocklet',
         entityId: did,
@@ -2887,7 +2888,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     users,
   }) {
     this._createNotification(did, {
-      title: '',
+      title: title.en,
       description: description.en,
       entityType: 'blocklet',
       entityId: did,
@@ -3307,7 +3308,6 @@ class DiskBlockletManager extends BaseBlockletManager {
             entityType: 'blocklet',
             entityId: did,
             severity: 'success',
-            receiver: blocklet?.controller?.nftOwner,
             extra: { wallet: walletExtra },
           });
         } catch (error) {
@@ -3406,7 +3406,7 @@ class DiskBlockletManager extends BaseBlockletManager {
             throw error;
           }
         };
-        await forEachComponentV2(blocklet, runMigration, { parallel: true, concurrencyLimit: 2 });
+        await forEachComponentV2(blocklet, runMigration, { parallel: true, concurrencyLimit: 4 });
       }
       logger.info('done migration on upgrading', { did, componentDids });
 
@@ -3466,7 +3466,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         this.emit(notificationEvent, { ...blocklet, componentDids, context });
 
         this._createNotification(did, {
-          title: '',
+          title: `Component ${actionName} succeed`,
           description: `${getComponentNamesWithVersion(
             newBlocklet,
             componentDids
@@ -3522,7 +3522,7 @@ class DiskBlockletManager extends BaseBlockletManager {
       });
 
       this._createNotification(did, {
-        title: '',
+        title: `Component ${actionName} failed`,
         description: `${getComponentNamesWithVersion(newBlocklet, componentDids)} ${actionName} failed for ${title}: ${
           err.message
         }.`,
@@ -3792,7 +3792,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         ...getHooksOutputFiles(b),
       });
 
-    await forEachBlocklet(blocklet, hookFn, { parallel: true, concurrencyLimit: 2 });
+    await forEachBlocklet(blocklet, hookFn, { parallel: true, concurrencyLimit: 4 });
   }
 
   async _createNotification(did, notification) {
@@ -3819,8 +3819,7 @@ class DiskBlockletManager extends BaseBlockletManager {
       const extra = await states.blockletExtras.getMeta(did);
       const isExternal = !!extra?.controller;
 
-      // 如果指定了 receiver, 或者是内部 blocklet, 则创建 notification
-      if (notification.receiver || !isExternal) {
+      if (!isExternal) {
         await states.notification.create({ ...notification, blockletUrl });
       }
       await this.teamManager.createNotification({

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

@@ -196,7 +196,7 @@ const installComponentFromUrl = async ({
     });
 
     manager._createNotification(rootDid, {
-      title: '',
+      title: `Component ${actionName} failed`,
       description: `${getComponentNamesWithVersion(newBlocklet, componentDids)} ${actionName} failed for ${
         newBlocklet.meta.title
       }: ${err.message || 'queue exception'}.`,

package/lib/blocklet/manager/helper/upgrade-components.js

@@ -151,7 +151,7 @@ const upgrade = async ({ updateId, componentDids, context, states, manager }) =>
     });
 
     manager._createNotification(did, {
-      title: '',
+      title: 'Component upgrade failed',
       description: `${getComponentNamesWithVersion(oldBlocklet, componentDids)} upgrade failed for ${
         oldBlocklet.meta.title
       }: ${err.message || 'queue exception'}.`,

package/lib/event/index.js

@@ -67,7 +67,7 @@ module.exports = ({
   };
 
   // Listen events from eventHub and call eventHandler
-  [...Object.values(BlockletEvents), ...Object.values(EVENTS)].forEach((name) => {
+  [...Object.values(BlockletEvents), ...Object.values(TeamEvents), ...Object.values(EVENTS)].forEach((name) => {
     eventHub.on(name, (data) => {
       if (name === BlockletEvents.removed) {
         // Cleanup cache in teamManager for every node instance

package/lib/util/blocklet.js

@@ -106,7 +106,6 @@ const { validate: validateEngine, get: getEngine } = require('../blocklet/manage
 const isRequirementsSatisfied = require('./requirement');
 const { getDidDomainForBlocklet } = require('./get-domain-for-blocklet');
 const { expandBundle, findInterfacePortByName, prettyURL, templateReplace, getServerDidDomain } = require('./index');
-const { installExternalDependencies } = require('./install-external-dependencies');
 
 /**
  * get blocklet engine info, default is node
@@ -565,9 +564,6 @@ const startBlockletProcess = async (
       const env = getRuntimeEnvironments(b, nodeEnvironments, ancestors);
       const startedAt = Date.now();
 
-      // install external dependencies
-      await Promise.resolve(installExternalDependencies(b, { env }));
-
       // run hook
       await preFlight(b, { env });
 
@@ -660,7 +656,7 @@ const startBlockletProcess = async (
         logger.error('blocklet post start failed', { processId, error: err });
       });
     },
-    { parallel: true, concurrencyLimit: 2 }
+    { parallel: true, concurrencyLimit: 4 }
   );
 };
 

package/lib/util/install-external-dependencies.js

@@ -2,27 +2,38 @@ const { spawnSync } = require('child_process');
 const fs = require('fs-extra');
 const path = require('path');
 
-function installExternalDependencies(blocklet, { env }) {
-  if (!env.BLOCKLET_APP_DIR) {
-    throw new Error('BLOCKLET_APP_DIR is required');
+function installExternalDependencies(appDir) {
+  if (!appDir) {
+    throw new Error('appDir is required');
+  }
+  if (!fs.existsSync(appDir)) {
+    throw new Error(`not a correct appDir directory: ${appDir}`);
   }
 
   // 读取 BLOCKLET_APP_DIR 的 package.json
-  const packageJsonPath = path.resolve(env.BLOCKLET_APP_DIR, 'package.json');
+  const packageJsonPath = path.resolve(appDir, 'package.json');
+
   if (!fs.existsSync(packageJsonPath)) {
     return;
   }
 
   const packageJson = fs.readJsonSync(packageJsonPath);
 
-  if (!packageJson.externalManager) {
+  // FIXME: 梁柱, 等未来所有的 blocklet 使用了正式版, 废弃 singleExternals
+  const { singleExternals, blockletExternalDependencies } = packageJson;
+  const externals = singleExternals || blockletExternalDependencies;
+  if (!externals || !externals?.length) {
     return;
   }
 
-  const result = spawnSync(packageJson.externalManager, ['install'], {
-    cwd: env.BLOCKLET_APP_DIR,
+  const result = spawnSync('npm', ['install'], {
+    cwd: appDir,
     stdio: 'pipe',
     shell: true,
+    env: {
+      ...process.env,
+      NODE_ENV: 'production',
+    },
   });
 
   if (result.status !== 0 && result.stderr && result.stderr.toString().trim()) {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.24-beta-c8847287",
+  "version": "1.16.24-beta-5334b8f2",
   "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.24-beta-c8847287",
-    "@abtnode/auth": "1.16.24-beta-c8847287",
-    "@abtnode/certificate-manager": "1.16.24-beta-c8847287",
-    "@abtnode/constant": "1.16.24-beta-c8847287",
-    "@abtnode/cron": "1.16.24-beta-c8847287",
-    "@abtnode/logger": "1.16.24-beta-c8847287",
-    "@abtnode/models": "1.16.24-beta-c8847287",
-    "@abtnode/queue": "1.16.24-beta-c8847287",
-    "@abtnode/rbac": "1.16.24-beta-c8847287",
-    "@abtnode/router-provider": "1.16.24-beta-c8847287",
-    "@abtnode/static-server": "1.16.24-beta-c8847287",
-    "@abtnode/timemachine": "1.16.24-beta-c8847287",
-    "@abtnode/util": "1.16.24-beta-c8847287",
+    "@abtnode/analytics": "1.16.24-beta-5334b8f2",
+    "@abtnode/auth": "1.16.24-beta-5334b8f2",
+    "@abtnode/certificate-manager": "1.16.24-beta-5334b8f2",
+    "@abtnode/constant": "1.16.24-beta-5334b8f2",
+    "@abtnode/cron": "1.16.24-beta-5334b8f2",
+    "@abtnode/logger": "1.16.24-beta-5334b8f2",
+    "@abtnode/models": "1.16.24-beta-5334b8f2",
+    "@abtnode/queue": "1.16.24-beta-5334b8f2",
+    "@abtnode/rbac": "1.16.24-beta-5334b8f2",
+    "@abtnode/router-provider": "1.16.24-beta-5334b8f2",
+    "@abtnode/static-server": "1.16.24-beta-5334b8f2",
+    "@abtnode/timemachine": "1.16.24-beta-5334b8f2",
+    "@abtnode/util": "1.16.24-beta-5334b8f2",
     "@arcblock/did": "1.18.110",
     "@arcblock/did-auth": "1.18.110",
     "@arcblock/did-ext": "^1.18.110",
@@ -42,12 +42,12 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.110",
     "@arcblock/vc": "1.18.110",
-    "@blocklet/constant": "1.16.24-beta-c8847287",
-    "@blocklet/env": "1.16.24-beta-c8847287",
-    "@blocklet/meta": "1.16.24-beta-c8847287",
-    "@blocklet/resolver": "1.16.24-beta-c8847287",
-    "@blocklet/sdk": "1.16.24-beta-c8847287",
-    "@did-space/client": "^0.3.64",
+    "@blocklet/constant": "1.16.24-beta-5334b8f2",
+    "@blocklet/env": "1.16.24-beta-5334b8f2",
+    "@blocklet/meta": "1.16.24-beta-5334b8f2",
+    "@blocklet/resolver": "1.16.24-beta-5334b8f2",
+    "@blocklet/sdk": "1.16.24-beta-5334b8f2",
+    "@did-space/client": "^0.3.67",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.110",
     "@ocap/util": "1.18.110",
@@ -102,5 +102,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "463311bdbd2cf425eb5c1fcf94e821053de1f7b1"
+  "gitHead": "dc7651d34cff0f2b57e528a78969957f6ce73c8e"
 }