@abtnode/core 1.16.23-beta-abdda301 → 1.16.23-beta-035db744

package/lib/blocklet/manager/disk.js

@@ -575,6 +575,16 @@ class DiskBlockletManager extends BaseBlockletManager {
   ) {
     const blocklet = await this.ensureBlocklet(did, { e2eMode });
 
+    const componentDids = inputComponentDids?.length ? inputComponentDids : blocklet.children.map((x) => x.meta.did);
+
+    // sync component config before at first to ensure resource component config is ready
+    const serverSk = (await states.node.read()).sk;
+    await Promise.all(
+      componentDids.map((componentDid) =>
+        this.configSynchronizer.syncComponentConfig(componentDid, blocklet.meta.did, { serverSk })
+      )
+    );
+
     if (atomic || !blocklet.structVersion) {
       return this._start(
         { did, throwOnError, checkHealthImmediately, e2eMode, componentDids: inputComponentDids },
@@ -582,8 +592,6 @@ class DiskBlockletManager extends BaseBlockletManager {
       );
     }
 
-    const componentDids = inputComponentDids?.length ? inputComponentDids : blocklet.children.map((x) => x.meta.did);
-
     const tasks = componentDids.map((componentDid) =>
       this._start({ blocklet, throwOnError, checkHealthImmediately, e2eMode, componentDids: [componentDid] }, context)
     );

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

@@ -72,7 +72,10 @@ const installComponentFromDev = async ({ folder, meta, rootDid, mountPoint, mana
 
   const componentDids = children.map((x) => x.meta.did);
 
-  await states.blocklet.addChildren(rootDid, children);
+  const { BLOCKLET_PORT } = process.env;
+  await states.blocklet.addChildren(rootDid, children, {
+    manualPorts: BLOCKLET_PORT ? [{ did: component.meta.did, ports: { BLOCKLET_PORT } }] : null,
+  });
 
   const newBlocklet = await states.blocklet.getBlocklet(rootDid);
   await validateBlocklet(newBlocklet);

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

@@ -30,12 +30,9 @@ const check = async ({ did, states }) => {
     const bundleSource = getFixedBundleSource(child);
 
     if (bundleSource) {
-      const {
-        staticComponents: [newChild],
-        dynamicComponents,
-      } = await parseComponents({
+      const { dynamicComponents } = await parseComponents({
         meta: {
-          staticComponents: [
+          components: [
             {
               source: bundleSource,
               name: child.meta.name,
@@ -45,7 +42,8 @@ const check = async ({ did, states }) => {
           ],
         },
       });
-      newChild._dynamicComponents = dynamicComponents;
+      const newChild = dynamicComponents.find((x) => x.meta.name === child.meta.name);
+      newChild._dynamicComponents = dynamicComponents.filter((x) => x.meta.name !== child.meta.name);
       newChildren.push(newChild);
     } else {
       const { dynamicComponents } = await parseComponents(child);

package/lib/blocklet/project/create-pack-release.js

@@ -17,8 +17,6 @@ const { createReleaseSchema } = require('../../validators/project');
 
 const { getLogoFile, exportBlockletResources, getResourceList, checkResourceExists } = require('./util');
 
-const createRandomStr = () => Math.random().toString(36).substring(2, 8);
-
 const createPackRelease = async ({
   did,
   projectId,
@@ -110,7 +108,6 @@ const createPackRelease = async ({
 
   const _releaseId = release.id;
 
-  const tmpDir = path.join(manager.dataDirs.tmp, PROJECT.DIR, `${blockletDid}-${createRandomStr()}`);
   const releaseDir = path.join(projectDir, PROJECT.RELEASE_DIR, `${_releaseId}`);
   const resourceDir = path.join(releaseDir, PROJECT.RESOURCE_DIR);
   const tmpResourceDir = path.join(projectDir, PROJECT.RESOURCE_DIR);
@@ -130,14 +127,9 @@ const createPackRelease = async ({
     return release;
   }
 
-  // create a release
-  if (fs.existsSync(tmpDir)) {
-    await fs.remove(tmpDir);
-  }
-
-  const tmpExportDir = path.join(tmpDir, 'export');
-  const tmpBundleDir = path.join(tmpExportDir, 'bundle');
-  const tmpReleaseDir = path.join(tmpExportDir, 'release');
+  const releaseExportDir = path.join(releaseDir, '.blocklet');
+  const releaseBundleDir = path.join(releaseExportDir, 'bundle');
+  const releaseReleaseDir = path.join(releaseExportDir, 'release');
 
   const moniker = (urlPathFriendly(slugify(release.blockletTitle)) || 'blocklet').toLowerCase();
   const releaseFileName = `${moniker}-${release.blockletVersion}.zip`;
@@ -148,14 +140,14 @@ const createPackRelease = async ({
   }
 
   try {
-    await fs.ensureDir(tmpBundleDir);
+    await fs.ensureDir(releaseBundleDir);
 
     // create logo
     const { logoFile, logoFileName } = getLogoFile(blocklet, project);
-    await fs.copy(logoFile, path.join(tmpBundleDir, logoFileName));
+    await fs.copy(logoFile, path.join(releaseBundleDir, logoFileName));
 
     // create screenshots
-    const screenshotsDistDir = path.join(tmpBundleDir, 'screenshots');
+    const screenshotsDistDir = path.join(releaseBundleDir, 'screenshots');
     await fs.ensureDir(screenshotsDistDir);
     if (project.blockletScreenshots?.length) {
       await Promise.all(
@@ -168,11 +160,11 @@ const createPackRelease = async ({
 
     // create readme
     if (blockletIntroduction) {
-      await fs.outputFile(path.join(tmpBundleDir, 'README.md'), blockletIntroduction);
+      await fs.outputFile(path.join(releaseBundleDir, 'README.md'), blockletIntroduction);
     }
 
     // changelog
-    const changelogDistFile = path.join(tmpBundleDir, 'CHANGELOG.md');
+    const changelogDistFile = path.join(releaseBundleDir, 'CHANGELOG.md');
     const releases = await releaseState.getReleases({ projectId, status: PROJECT.RELEASE_STATUS.published });
     const changelog = releases.map((_release) => {
       const { blockletVersion: version, note: content } = _release;
@@ -185,11 +177,11 @@ const createPackRelease = async ({
       app: blocklet,
       projectId,
       releaseId: _releaseId,
-      exportDir: tmpBundleDir,
+      exportDir: releaseBundleDir,
       blockletDid,
       isPack: true,
     });
-    const resourceList = await getResourceList(tmpBundleDir, { isPublic: false });
+    const resourceList = await getResourceList(releaseBundleDir, { isPublic: false });
 
     const components = blocklet.children
       .filter((x) => x.bundleSource?.url || x.bundleSource?.store)
@@ -216,10 +208,10 @@ const createPackRelease = async ({
       files: project.blockletScreenshots?.length ? ['screenshots'] : [],
       screenshots: project.blockletScreenshots || [],
     };
-    await updateMetaFile(path.join(tmpBundleDir, BLOCKLET_META_FILE), meta);
+    await updateMetaFile(path.join(releaseBundleDir, BLOCKLET_META_FILE), meta);
 
     // create release
-    await createBlockletRelease(tmpExportDir, { printError: logger.error, printInfo: logger.info });
+    await createBlockletRelease(releaseExportDir, { printError: logger.error, printInfo: logger.info });
 
     // archive
     const archive = createArchive('zip', { zlib: { level: 9 } });
@@ -227,7 +219,7 @@ const createPackRelease = async ({
 
     await new Promise((resolve, reject) => {
       archive
-        .directory(tmpReleaseDir, false)
+        .directory(releaseReleaseDir, false)
         .on('error', (err) => reject(err))
         .pipe(writeStream);
 
@@ -241,13 +233,11 @@ const createPackRelease = async ({
       files: [releaseFileName],
     });
 
-    await fs.remove(tmpDir);
-
     logger.info('create release success', res2);
 
     return res2;
   } catch (error) {
-    await fs.remove(tmpDir);
+    await fs.remove(releaseExportDir);
     await fs.remove(releaseFile);
     if (action === 'create') {
       await fs.remove(releaseDir);

package/lib/blocklet/project/index.js

@@ -16,8 +16,6 @@ const { createReleaseSchema } = require('../../validators/project');
 const { getLogoFile, exportBlockletResources, getResourceList, checkResourceExists } = require('./util');
 const createPackRelease = require('./create-pack-release');
 
-const createRandomStr = () => Math.random().toString(36).substring(2, 8);
-
 const COMPONENT_CONFIG_MAP_DIR = '.component_config';
 
 // project
@@ -200,7 +198,6 @@ const createRelease = async ({
 
   const _releaseId = release.id;
 
-  const tmpDir = path.join(manager.dataDirs.tmp, PROJECT.DIR, `${blockletDid}-${createRandomStr()}`);
   const releaseDir = path.join(projectDir, PROJECT.RELEASE_DIR, `${_releaseId}`);
   const resourceDir = path.join(releaseDir, PROJECT.RESOURCE_DIR);
   const tmpResourceDir = path.join(projectDir, PROJECT.RESOURCE_DIR);
@@ -220,14 +217,9 @@ const createRelease = async ({
     return release;
   }
 
-  // create a release
-  if (fs.existsSync(tmpDir)) {
-    await fs.remove(tmpDir);
-  }
-
-  const tmpExportDir = path.join(tmpDir, 'export');
-  const tmpBundleDir = path.join(tmpExportDir, 'bundle');
-  const tmpReleaseDir = path.join(tmpExportDir, 'release');
+  const releaseExportDir = path.join(releaseDir, '.blocklet');
+  const releaseBundleDir = path.join(releaseExportDir, 'bundle');
+  const releaseReleaseDir = path.join(releaseExportDir, 'release');
 
   const moniker = (urlPathFriendly(slugify(release.blockletTitle)) || 'blocklet').toLowerCase();
   const releaseFileName = `${moniker}-${release.blockletVersion}.zip`;
@@ -238,14 +230,14 @@ const createRelease = async ({
   }
 
   try {
-    await fs.ensureDir(tmpBundleDir);
+    await fs.ensureDir(releaseBundleDir);
 
     // create logo
     const { logoFile, logoFileName } = getLogoFile(blocklet, project);
-    await fs.copy(logoFile, path.join(tmpBundleDir, logoFileName));
+    await fs.copy(logoFile, path.join(releaseBundleDir, logoFileName));
 
     // create screenshots
-    const screenshotsDistDir = path.join(tmpBundleDir, 'screenshots');
+    const screenshotsDistDir = path.join(releaseBundleDir, 'screenshots');
     await fs.ensureDir(screenshotsDistDir);
     if (project.blockletScreenshots?.length) {
       await Promise.all(
@@ -258,11 +250,11 @@ const createRelease = async ({
 
     // create readme
     if (blockletIntroduction) {
-      await fs.outputFile(path.join(tmpBundleDir, 'README.md'), blockletIntroduction);
+      await fs.outputFile(path.join(releaseBundleDir, 'README.md'), blockletIntroduction);
     }
 
     // changelog
-    const changelogDistFile = path.join(tmpBundleDir, 'CHANGELOG.md');
+    const changelogDistFile = path.join(releaseBundleDir, 'CHANGELOG.md');
     const releases = await releaseState.getReleases({ projectId, status: PROJECT.RELEASE_STATUS.published });
     const changelog = releases.map((_release) => {
       const { blockletVersion: version, note: content } = _release;
@@ -275,7 +267,7 @@ const createRelease = async ({
       app: blocklet,
       projectId,
       releaseId: _releaseId,
-      exportDir: tmpBundleDir,
+      exportDir: releaseBundleDir,
       blockletDid,
     });
 
@@ -295,10 +287,10 @@ const createRelease = async ({
       files: project.blockletScreenshots?.length ? ['screenshots'] : [],
       screenshots: project.blockletScreenshots || [],
     };
-    await updateMetaFile(path.join(tmpBundleDir, BLOCKLET_META_FILE), meta);
+    await updateMetaFile(path.join(releaseBundleDir, BLOCKLET_META_FILE), meta);
 
     // create release
-    await createBlockletRelease(tmpExportDir, { printError: logger.error, printInfo: logger.info });
+    await createBlockletRelease(releaseExportDir, { printError: logger.error, printInfo: logger.info });
 
     // archive
     const archive = createArchive('zip', { zlib: { level: 9 } });
@@ -306,7 +298,7 @@ const createRelease = async ({
 
     await new Promise((resolve, reject) => {
       archive
-        .directory(tmpReleaseDir, false)
+        .directory(releaseReleaseDir, false)
         .on('error', (err) => reject(err))
         .pipe(writeStream);
 
@@ -320,13 +312,11 @@ const createRelease = async ({
       files: [releaseFileName],
     });
 
-    await fs.remove(tmpDir);
-
     logger.info('create release success', res2);
 
     return res2;
   } catch (error) {
-    await fs.remove(tmpDir);
+    await fs.remove(releaseExportDir);
     await fs.remove(releaseFile);
     if (action === 'create') {
       await fs.remove(releaseDir);

package/lib/states/blocklet.js

@@ -306,7 +306,7 @@ class BlockletState extends BaseState {
     return updated;
   }
 
-  async upgradeBlocklet({ meta, source, deployedFrom = '', children } = {}) {
+  async upgradeBlocklet({ meta, source, deployedFrom = '', children, manualChildPorts } = {}) {
     const doc = await this.getBlocklet(meta.did);
     if (!doc) {
       throw new Error(`Blocklet does not exist on upgrade: ${meta.did}`);
@@ -336,6 +336,20 @@ class BlockletState extends BaseState {
       logger.info('Fill children ports when when upgrading blocklet', { name: doc.meta.name, did: doc.meta.did });
       await this.fillChildrenPorts(children, { oldChildren: doc.children, defaultPort: getMaxPort(ports) });
 
+      if (manualChildPorts?.length) {
+        logger.info('Fill manual child ports when when upgrading blocklet', {
+          did: doc.meta.did,
+          manualChildPorts,
+        });
+        children.forEach((child) => {
+          manualChildPorts.forEach((x) => {
+            if (child.meta.did === x.did) {
+              child.ports = x.ports;
+            }
+          });
+        });
+      }
+
       fixChildren(children);
 
       // add to db
@@ -630,7 +644,19 @@ class BlockletState extends BaseState {
     return children;
   }
 
-  async addChildren(did, children) {
+  /**
+   *
+   * @param {string} did
+   * @param {array} children
+   * @param {{
+   *   manualChildPorts: Array<{
+   *     did: string,
+   *     ports: Record<string, number>,
+   *   }>
+   * }} param2
+   * @returns
+   */
+  async addChildren(did, children, { manualPorts = [] } = {}) {
     const parent = await this.getBlocklet(did);
     if (!parent) {
       throw new Error(`Blocklet does not exist on addChildren: ${did}`);
@@ -669,6 +695,7 @@ class BlockletState extends BaseState {
       source: parent.source,
       deployedFrom: parent.deployedFrom,
       children: newChildren,
+      manualChildPorts: manualPorts,
     });
   }
 

package/lib/webhook/index.js

@@ -9,6 +9,7 @@ const createQueue = require('../util/queue');
 const IP = require('../util/ip');
 const states = require('../states');
 const { getBaseUrls } = require('../util');
+const reduceQueue = require('./reduce-queue');
 
 const getSlackUrlInfo = async ({ blockletUrl, path: actionPath = '/notifications', serverUrls: urls }) => {
   const info = [];
@@ -132,14 +133,13 @@ module.exports = ({ events, dataDirs, instance }) => {
     },
   });
 
-  events.on(EVENTS.NOTIFICATION_CREATE, (data) => {
-    const { title, description, severity, action, entityType, blockletUrl } = data;
-    queue.push({ title, description, status: severity, action, entityType, blockletUrl });
-  });
-
-  events.on(EVENTS.NOTIFICATION_BLOCKLET_CREATE, (data) => {
-    const { title, description, severity, action, entityType, blockletUrl } = data;
-    queue.push({ title, description, status: severity, action, entityType, blockletUrl });
+  [EVENTS.NOTIFICATION_CREATE, EVENTS.NOTIFICATION_BLOCKLET_CREATE].forEach((event) => {
+    events.on(event, (data) => {
+      const { title, description, severity, action, entityType, blockletUrl, entityId } = data;
+      if (!reduceQueue({ title, description, entityType, entityId, severity })) {
+        queue.push({ title, description, status: severity, action, entityType, blockletUrl });
+      }
+    });
   });
 
   events.on(EVENTS.NODE_STARTED, async (message) => {

package/lib/webhook/reduce-queue.js

@@ -0,0 +1,12 @@
+const LRU = require('lru-cache');
+
+const reduceCache = new LRU({ max: 50, maxAge: 5 * 1000 });
+
+const reduceQueue = (obj) => {
+  const key = JSON.stringify(obj);
+  const has = reduceCache.has(key);
+  reduceCache.set(key, true);
+  return has;
+};
+
+module.exports = reduceQueue;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.23-beta-abdda301",
+  "version": "1.16.23-beta-035db744",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -12,46 +12,46 @@
   "scripts": {
     "lint": "eslint tests lib",
     "lint:fix": "eslint --fix tests lib",
-    "test": "node tools/jest.js --maxWorkers=2",
+    "test": "node tools/jest.js",
     "coverage": "npm run test -- --coverage"
   },
   "keywords": [],
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.23-beta-abdda301",
-    "@abtnode/auth": "1.16.23-beta-abdda301",
-    "@abtnode/certificate-manager": "1.16.23-beta-abdda301",
-    "@abtnode/constant": "1.16.23-beta-abdda301",
-    "@abtnode/cron": "1.16.23-beta-abdda301",
-    "@abtnode/logger": "1.16.23-beta-abdda301",
-    "@abtnode/models": "1.16.23-beta-abdda301",
-    "@abtnode/queue": "1.16.23-beta-abdda301",
-    "@abtnode/rbac": "1.16.23-beta-abdda301",
-    "@abtnode/router-provider": "1.16.23-beta-abdda301",
-    "@abtnode/static-server": "1.16.23-beta-abdda301",
-    "@abtnode/timemachine": "1.16.23-beta-abdda301",
-    "@abtnode/util": "1.16.23-beta-abdda301",
-    "@arcblock/did": "1.18.108",
-    "@arcblock/did-auth": "1.18.108",
-    "@arcblock/did-ext": "^1.18.108",
+    "@abtnode/analytics": "1.16.23-beta-035db744",
+    "@abtnode/auth": "1.16.23-beta-035db744",
+    "@abtnode/certificate-manager": "1.16.23-beta-035db744",
+    "@abtnode/constant": "1.16.23-beta-035db744",
+    "@abtnode/cron": "1.16.23-beta-035db744",
+    "@abtnode/logger": "1.16.23-beta-035db744",
+    "@abtnode/models": "1.16.23-beta-035db744",
+    "@abtnode/queue": "1.16.23-beta-035db744",
+    "@abtnode/rbac": "1.16.23-beta-035db744",
+    "@abtnode/router-provider": "1.16.23-beta-035db744",
+    "@abtnode/static-server": "1.16.23-beta-035db744",
+    "@abtnode/timemachine": "1.16.23-beta-035db744",
+    "@abtnode/util": "1.16.23-beta-035db744",
+    "@arcblock/did": "1.18.110",
+    "@arcblock/did-auth": "1.18.110",
+    "@arcblock/did-ext": "^1.18.110",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/did-util": "1.18.108",
-    "@arcblock/event-hub": "1.18.108",
-    "@arcblock/jwt": "^1.18.108",
+    "@arcblock/did-util": "1.18.110",
+    "@arcblock/event-hub": "1.18.110",
+    "@arcblock/jwt": "^1.18.110",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/validator": "^1.18.108",
-    "@arcblock/vc": "1.18.108",
-    "@blocklet/constant": "1.16.23-beta-abdda301",
-    "@blocklet/env": "1.16.23-beta-abdda301",
-    "@blocklet/meta": "1.16.23-beta-abdda301",
-    "@blocklet/resolver": "1.16.23-beta-abdda301",
-    "@blocklet/sdk": "1.16.23-beta-abdda301",
-    "@did-space/client": "^0.3.56",
+    "@arcblock/validator": "^1.18.110",
+    "@arcblock/vc": "1.18.110",
+    "@blocklet/constant": "1.16.23-beta-035db744",
+    "@blocklet/env": "1.16.23-beta-035db744",
+    "@blocklet/meta": "1.16.23-beta-035db744",
+    "@blocklet/resolver": "1.16.23-beta-035db744",
+    "@blocklet/sdk": "1.16.23-beta-035db744",
+    "@did-space/client": "^0.3.58",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.18.108",
-    "@ocap/util": "1.18.108",
-    "@ocap/wallet": "1.18.108",
+    "@ocap/mcrypto": "1.18.110",
+    "@ocap/util": "1.18.110",
+    "@ocap/wallet": "1.18.110",
     "@slack/webhook": "^5.0.4",
     "archiver": "^5.3.1",
     "axios": "^0.27.2",
@@ -102,5 +102,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "2b064df15b34007f6145170ee691ae9e91ff1528"
+  "gitHead": "43b1f85fa413b81be8b8015031ac271a9d9f3456"
 }