@abtnode/core 1.16.25-next-b726d470 → 1.16.25

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

@@ -78,7 +78,7 @@ const resolveDownload = async (tarFile, dist, { removeTarFile = true, logger = d
 
     await fs.move(downloadDir, installDir, { overwrite: true });
 
-    installExternalDependencies(installDir);
+    await installExternalDependencies({ appDir: installDir, forceInstall: true });
   } catch (error) {
     fs.removeSync(downloadDir);
     fs.removeSync(tmp);
@@ -145,7 +145,7 @@ const resolveDiffDownload = async (
     logger.info('Move downloadDir to installDir', { downloadDir, bundleDir });
     await fs.move(downloadDir, bundleDir, { overwrite: true });
 
-    installExternalDependencies(bundleDir);
+    await installExternalDependencies({ appDir: bundleDir, forceInstall: true });
 
     return { meta, installDir: bundleDir };
   } catch (error) {

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

@@ -62,10 +62,6 @@ const createPackRelease = async ({
     throw new Error('project not found');
   }
 
-  if (project0.type !== PROJECT.TYPES.pack) {
-    throw new Error('project type is not pack');
-  }
-
   const action = releaseId ? 'update' : 'create';
 
   if (action === 'update') {
@@ -99,10 +95,8 @@ const createPackRelease = async ({
     releaseId,
     status,
   });
-  const project = await projectState.updateProject(projectId, params);
 
   const _releaseId = release.id;
-
   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);
@@ -118,10 +112,6 @@ const createPackRelease = async ({
     await fs.ensureDir(tmpResourceDir);
   }
 
-  if (status === PROJECT.RELEASE_STATUS.draft) {
-    return release;
-  }
-
   const releaseExportDir = path.join(releaseDir, '.blocklet');
   const releaseBundleDir = path.join(releaseExportDir, 'bundle');
   const releaseReleaseDir = path.join(releaseExportDir, 'release');
@@ -129,6 +119,18 @@ const createPackRelease = async ({
   const moniker = (urlPathFriendly(slugify(release.blockletTitle)) || 'blocklet').toLowerCase();
   const releaseFileName = `${moniker}-${release.blockletVersion}.zip`;
   const releaseFile = path.join(releaseDir, releaseFileName);
+
+  if (status !== PROJECT.RELEASE_STATUS.draft) {
+    params.lastReleaseId = _releaseId;
+    params.lastReleaseFiles = [releaseFileName];
+  }
+
+  const project = await projectState.updateProject(projectId, params);
+
+  if (status === PROJECT.RELEASE_STATUS.draft) {
+    return release;
+  }
+
   if (fs.existsSync(releaseFile)) {
     logger.error('release file already exists, remove it', releaseFile);
     await fs.remove(releaseFile);

package/lib/blocklet/project/index.js

@@ -150,7 +150,9 @@ const createRelease = async ({
     throw new Error('project not found');
   }
 
-  if (project0.type === PROJECT.TYPES.pack) {
+  const isPack = blockletComponents?.length > 0;
+
+  if (isPack) {
     return createPackRelease({
       did,
       projectId,
@@ -201,10 +203,8 @@ const createRelease = async ({
     releaseId,
     status,
   });
-  const project = await projectState.updateProject(projectId, params);
 
   const _releaseId = release.id;
-
   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,10 +220,6 @@ const createRelease = async ({
     await fs.ensureDir(tmpResourceDir);
   }
 
-  if (status === PROJECT.RELEASE_STATUS.draft) {
-    return release;
-  }
-
   const releaseExportDir = path.join(releaseDir, '.blocklet');
   const releaseBundleDir = path.join(releaseExportDir, 'bundle');
   const releaseReleaseDir = path.join(releaseExportDir, 'release');
@@ -231,6 +227,18 @@ const createRelease = async ({
   const moniker = (urlPathFriendly(slugify(release.blockletTitle)) || 'blocklet').toLowerCase();
   const releaseFileName = `${moniker}-${release.blockletVersion}.zip`;
   const releaseFile = path.join(releaseDir, releaseFileName);
+
+  if (status !== PROJECT.RELEASE_STATUS.draft) {
+    params.lastReleaseId = _releaseId;
+    params.lastReleaseFiles = [releaseFileName];
+  }
+
+  const project = await projectState.updateProject(projectId, params);
+
+  if (status === PROJECT.RELEASE_STATUS.draft) {
+    return release;
+  }
+
   if (fs.existsSync(releaseFile)) {
     logger.error('release file already exists, remove it', releaseFile);
     await fs.remove(releaseFile);

package/lib/states/project.js

@@ -42,10 +42,12 @@ class Project extends BaseState {
         'blockletDescription',
         'blockletDid',
         'blockletScreenshots',
+        'lastReleaseId',
+        'lastReleaseFiles',
       ]),
       (x) => !isUndefinedOrNull(x)
     );
-
+    _params.type = params.blockletComponents?.length ? 'pack' : 'resource';
     const [, [updated]] = await this.update({ id }, { $set: _params });
     return updated;
   }

package/lib/util/blocklet.js

@@ -104,6 +104,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
@@ -562,6 +563,8 @@ const startBlockletProcess = async (
       const env = getRuntimeEnvironments(b, nodeEnvironments, ancestors);
       const startedAt = Date.now();
 
+      await installExternalDependencies({ appDir: env?.BLOCKLET_APP_DIR });
+
       // run hook
       await preFlight(b, { env });
 

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

@@ -1,8 +1,12 @@
-const { spawnSync } = require('child_process');
+const { spawn } = require('child_process');
 const fs = require('fs-extra');
 const path = require('path');
 
-function installExternalDependencies(appDir) {
+function isDependencyInstalled(appDir, dependency) {
+  return fs.existsSync(path.resolve(appDir, 'node_modules', dependency));
+}
+
+function installExternalDependencies({ appDir, forceInstall = false } = {}) {
   if (!appDir) {
     throw new Error('appDir is required');
   }
@@ -22,25 +26,44 @@ function installExternalDependencies(appDir) {
   // FIXME: 梁柱, 等未来所有的 blocklet 使用了正式版, 废弃 singleExternals
   const { singleExternals, blockletExternalDependencies } = packageJson;
   const externals = singleExternals || blockletExternalDependencies;
-  if (!externals || !externals?.length) {
+  if (!Array.isArray(externals) || !externals.length) {
     return;
   }
 
-  const result = spawnSync('npm', ['install'], {
-    cwd: appDir,
-    stdio: 'pipe',
-    shell: true,
-    env: {
-      ...process.env,
-      NODE_ENV: 'production',
-    },
-  });
+  const isNeedInstall = forceInstall || externals.some((dependency) => !isDependencyInstalled(appDir, dependency));
 
-  if (result.status !== 0 && result.stderr && result.stderr.toString().trim()) {
-    throw new Error(result.stderr.toString());
-  }
-  if (result.error) {
-    throw result.error;
+  if (!isNeedInstall) {
+    return;
   }
+
+  // eslint-disable-next-line consistent-return
+  return new Promise((resolve, reject) => {
+    const child = spawn('npm', ['install'], {
+      cwd: appDir,
+      stdio: 'pipe',
+      shell: true,
+      env: {
+        ...process.env,
+        NODE_ENV: 'production',
+      },
+    });
+
+    let errorOutput = '';
+    child.stderr.on('data', (data) => {
+      errorOutput += data.toString();
+    });
+
+    child.on('close', (code) => {
+      if (code !== 0 && errorOutput.trim()) {
+        reject(new Error(errorOutput));
+      } else {
+        resolve();
+      }
+    });
+
+    child.on('error', (err) => {
+      reject(err);
+    });
+  });
 }
 module.exports = { installExternalDependencies };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.25-next-b726d470",
+  "version": "1.16.25",
   "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.25-next-b726d470",
-    "@abtnode/auth": "1.16.25-next-b726d470",
-    "@abtnode/certificate-manager": "1.16.25-next-b726d470",
-    "@abtnode/constant": "1.16.25-next-b726d470",
-    "@abtnode/cron": "1.16.25-next-b726d470",
-    "@abtnode/logger": "1.16.25-next-b726d470",
-    "@abtnode/models": "1.16.25-next-b726d470",
-    "@abtnode/queue": "1.16.25-next-b726d470",
-    "@abtnode/rbac": "1.16.25-next-b726d470",
-    "@abtnode/router-provider": "1.16.25-next-b726d470",
-    "@abtnode/static-server": "1.16.25-next-b726d470",
-    "@abtnode/timemachine": "1.16.25-next-b726d470",
-    "@abtnode/util": "1.16.25-next-b726d470",
+    "@abtnode/analytics": "1.16.25",
+    "@abtnode/auth": "1.16.25",
+    "@abtnode/certificate-manager": "1.16.25",
+    "@abtnode/constant": "1.16.25",
+    "@abtnode/cron": "1.16.25",
+    "@abtnode/logger": "1.16.25",
+    "@abtnode/models": "1.16.25",
+    "@abtnode/queue": "1.16.25",
+    "@abtnode/rbac": "1.16.25",
+    "@abtnode/router-provider": "1.16.25",
+    "@abtnode/static-server": "1.16.25",
+    "@abtnode/timemachine": "1.16.25",
+    "@abtnode/util": "1.16.25",
     "@arcblock/did": "1.18.113",
     "@arcblock/did-auth": "1.18.113",
     "@arcblock/did-ext": "^1.18.113",
@@ -42,12 +42,12 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.113",
     "@arcblock/vc": "1.18.113",
-    "@blocklet/constant": "1.16.25-next-b726d470",
-    "@blocklet/env": "1.16.25-next-b726d470",
-    "@blocklet/meta": "1.16.25-next-b726d470",
-    "@blocklet/resolver": "1.16.25-next-b726d470",
-    "@blocklet/sdk": "1.16.25-next-b726d470",
-    "@did-space/client": "^0.3.71",
+    "@blocklet/constant": "1.16.25",
+    "@blocklet/env": "1.16.25",
+    "@blocklet/meta": "1.16.25",
+    "@blocklet/resolver": "1.16.25",
+    "@blocklet/sdk": "1.16.25",
+    "@did-space/client": "^0.3.73",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.113",
     "@ocap/util": "1.18.113",
@@ -102,5 +102,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "3adef75441748e01ccba82fa1bfd875cbd096185"
+  "gitHead": "8752b9a0caa8745e16e1de8db4ef696b713ffb4d"
 }