@abtnode/core 1.16.24-beta-64150e24 → 1.16.24-beta-3d2e25fd

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

@@ -113,7 +113,6 @@ const installComponentFromUrl = async ({
   if (onlyRequired) {
     newChildren = filterRequiredComponents(newChild, newChildren);
   }
-
   blocklet.children.push(...newChildren);
 
   checkVersionCompatibility(blocklet.children);

package/lib/util/blocklet.js

@@ -106,6 +106,7 @@ 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
@@ -564,6 +565,9 @@ 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 });
 

package/lib/util/get-dynamic-components.js

@@ -8,7 +8,40 @@ const { filterDuplicateComponents, parseComponents } = require('./blocklet');
 async function getDynamicComponents({ url }) {
   const rawMeta = await axios.get(url).then((res) => res.data);
   const { dynamicComponents } = await parseComponents({ meta: rawMeta });
-  return filterDuplicateComponents(dynamicComponents);
+
+  const components = filterDuplicateComponents(dynamicComponents);
+
+  const requiredComponents = {};
+  rawMeta.components?.forEach((component) => {
+    if (component.required) {
+      requiredComponents[component.source?.name || component.name] = true;
+    }
+  });
+
+  const subRequiredComponents = {};
+  components.forEach((component) => {
+    component.required = !!requiredComponents[component.meta?.name || component.meta?.did];
+    if (component.required && component.meta?.components) {
+      component.meta.components.forEach((subComponent) => {
+        if (subComponent.required) {
+          if (subComponent.source?.name) {
+            subRequiredComponents[subComponent.source?.name] = true;
+          }
+          subRequiredComponents[subComponent.name] = true;
+        }
+      });
+    }
+  });
+  components.forEach((component) => {
+    if (subRequiredComponents[component.meta?.name || component.meta?.did]) {
+      component.required = true;
+    }
+  });
+
+  // eslint-disable-next-line no-nested-ternary
+  components.sort((a, b) => (a.required === b.required ? 0 : a.required ? -1 : 1));
+
+  return components;
 }
 
 module.exports = getDynamicComponents;

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

@@ -0,0 +1,35 @@
+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');
+  }
+
+  // 读取 BLOCKLET_APP_DIR 的 package.json
+  const packageJsonPath = path.resolve(env.BLOCKLET_APP_DIR, 'package.json');
+  if (!fs.existsSync(packageJsonPath)) {
+    return;
+  }
+
+  const packageJson = fs.readJsonSync(packageJsonPath);
+
+  if (!packageJson.externalManager) {
+    return;
+  }
+
+  const result = spawnSync(packageJson.externalManager, ['install'], {
+    cwd: env.BLOCKLET_APP_DIR,
+    stdio: 'pipe',
+    shell: true,
+  });
+
+  if (result.status !== 0 && result.stderr && result.stderr.toString().trim()) {
+    throw new Error(result.stderr.toString());
+  }
+  if (result.error) {
+    throw result.error;
+  }
+}
+module.exports = { installExternalDependencies };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.24-beta-64150e24",
+  "version": "1.16.24-beta-3d2e25fd",
   "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-64150e24",
-    "@abtnode/auth": "1.16.24-beta-64150e24",
-    "@abtnode/certificate-manager": "1.16.24-beta-64150e24",
-    "@abtnode/constant": "1.16.24-beta-64150e24",
-    "@abtnode/cron": "1.16.24-beta-64150e24",
-    "@abtnode/logger": "1.16.24-beta-64150e24",
-    "@abtnode/models": "1.16.24-beta-64150e24",
-    "@abtnode/queue": "1.16.24-beta-64150e24",
-    "@abtnode/rbac": "1.16.24-beta-64150e24",
-    "@abtnode/router-provider": "1.16.24-beta-64150e24",
-    "@abtnode/static-server": "1.16.24-beta-64150e24",
-    "@abtnode/timemachine": "1.16.24-beta-64150e24",
-    "@abtnode/util": "1.16.24-beta-64150e24",
+    "@abtnode/analytics": "1.16.24-beta-3d2e25fd",
+    "@abtnode/auth": "1.16.24-beta-3d2e25fd",
+    "@abtnode/certificate-manager": "1.16.24-beta-3d2e25fd",
+    "@abtnode/constant": "1.16.24-beta-3d2e25fd",
+    "@abtnode/cron": "1.16.24-beta-3d2e25fd",
+    "@abtnode/logger": "1.16.24-beta-3d2e25fd",
+    "@abtnode/models": "1.16.24-beta-3d2e25fd",
+    "@abtnode/queue": "1.16.24-beta-3d2e25fd",
+    "@abtnode/rbac": "1.16.24-beta-3d2e25fd",
+    "@abtnode/router-provider": "1.16.24-beta-3d2e25fd",
+    "@abtnode/static-server": "1.16.24-beta-3d2e25fd",
+    "@abtnode/timemachine": "1.16.24-beta-3d2e25fd",
+    "@abtnode/util": "1.16.24-beta-3d2e25fd",
     "@arcblock/did": "1.18.110",
     "@arcblock/did-auth": "1.18.110",
     "@arcblock/did-ext": "^1.18.110",
@@ -42,11 +42,11 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.110",
     "@arcblock/vc": "1.18.110",
-    "@blocklet/constant": "1.16.24-beta-64150e24",
-    "@blocklet/env": "1.16.24-beta-64150e24",
-    "@blocklet/meta": "1.16.24-beta-64150e24",
-    "@blocklet/resolver": "1.16.24-beta-64150e24",
-    "@blocklet/sdk": "1.16.24-beta-64150e24",
+    "@blocklet/constant": "1.16.24-beta-3d2e25fd",
+    "@blocklet/env": "1.16.24-beta-3d2e25fd",
+    "@blocklet/meta": "1.16.24-beta-3d2e25fd",
+    "@blocklet/resolver": "1.16.24-beta-3d2e25fd",
+    "@blocklet/sdk": "1.16.24-beta-3d2e25fd",
     "@did-space/client": "^0.3.64",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.110",
@@ -102,5 +102,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "30c91a8e2790a0527ba336497f5032ba54ed4225"
+  "gitHead": "6dce348d0d02a6c0ef5735a0b73bfd8b2e1503fd"
 }