perf(plugin): plugin use meta to speed up

binggg · binggg · commit 0d9579bfc376 · 2021-01-21T19:51:32.000+08:00
diff --git a/packages/framework-core/package.json b/packages/framework-core/package.json
@@ -55,9 +55,11 @@
     "figlet": "^1.4.0",
     "fs-extra": "^8.1.0",
     "gradient-string": "^1.2.0",
+    "https-proxy-agent": "^5.0.0",
     "inquirer": "^7.1.0",
     "js-yaml": "^3.14.0",
     "lodash.merge": "^4.6.2",
+    "package-json": "^6.5.0",
     "progress": "^2.0.3",
     "terminal-link": "^2.1.1",
     "winston": "^3.2.1"
diff --git a/packages/framework-core/src/config/resolve-config.ts b/packages/framework-core/src/config/resolve-config.ts
@@ -224,11 +224,10 @@ async function resolveRcConfig(
   let projectName = config?.framework?.name;
   let originProjectInfo;
 
-  logger.debug('process.env', process.env);
-
   // 如果是云端构建，addon 等信息环境变量中读取，配置优先读取本地，再读取环境变量中的信息
   if (process.env.CLOUDBASE_CIID) {
     logger.debug('云端构建场景');
+    logger.debug('process.env', process.env);
     const cloudRcJSON = jsonParse(process.env.TCB_RC_JSON);
 
     extraData = getCIProjectInfo();
diff --git a/packages/framework-core/src/index.ts b/packages/framework-core/src/index.ts
@@ -223,7 +223,7 @@ export class CloudBaseFrameworkCore {
    */
   async run(module?: string, params?: CommandParams) {
     const logger = getLogger();
-    logger.debug('run', module, params);
+    logger.debug('run', module || '', params || '');
     await this.pluginManager.run(module, params?.runCommandKey);
   }
 
@@ -235,7 +235,7 @@ export class CloudBaseFrameworkCore {
    */
   async compile(module?: string, params?: any) {
     const logger = getLogger();
-    logger.debug('compile', module, params);
+    logger.debug('compile', module || '', params || '');
     await this.hooks.callHook('preDeploy');
     await this._compile(module);
   }
@@ -247,7 +247,7 @@ export class CloudBaseFrameworkCore {
    */
   async deploy(module?: string, params?: any) {
     const logger = getLogger();
-    logger.debug('deploy', module, params);
+    logger.debug('deploy', module || '', params || '');
     await this.hooks.callHook('preDeploy');
     await this._compile(module);
     await this.samManager.install(this.ciId, async (extensionId) => {
diff --git a/packages/framework-core/src/plugin-manager/index.ts b/packages/framework-core/src/plugin-manager/index.ts
@@ -13,7 +13,7 @@ import fs from 'fs';
 
 const corePackageInfo = require('../../package');
 
-import { install } from './pkg-install';
+import { npmInstallWithCheck } from './pkg-install';
 import { emoji } from '../utils/emoji';
 import { Config } from '../types';
 import Context from '../context';
@@ -68,11 +68,7 @@ export default class PluginManager {
    * @param id
    */
   async init(id?: string) {
-    try {
-      await this.pluginInstallPromise;
-    } catch (e) {
-      this.context.logger.debug(e);
-    }
+    await this.pluginInstallPromise;
 
     return this.callPluginHook('init', {
       id,
@@ -195,27 +191,13 @@ export default class PluginManager {
 
     let PluginCode: Plugin | undefined;
 
-    try {
-      await this.pluginInstallPromise;
-    } catch (e) {
-      this.context.logger.error(e);
-      throw new Error(
-        `CloudBase Framework: can't install plugin npm package '${pluginData.name}'`
-      );
-    }
+    await this.pluginInstallPromise;
 
-    try {
-      PluginCode = require(path.join(
-        this.pluginRegistry,
-        'node_modules',
-        pluginData.name
-      )).plugin;
-    } catch (e) {
-      this.context.logger.error(e);
-      throw new Error(
-        `CloudBase Framework: can't find plugin '${pluginData.name}'`
-      );
-    }
+    PluginCode = require(path.join(
+      this.pluginRegistry,
+      'node_modules',
+      pluginData.name
+    )).plugin;
 
     if (!PluginCode) {
       this.context.logger.error(
@@ -249,7 +231,7 @@ export default class PluginManager {
    */
   private async installPackage(packageInfo: Record<string, string>) {
     this.context.logger.info(`${emoji('📦')} install plugins`);
-    await install(
+    await npmInstallWithCheck(
       {
         ...packageInfo,
       },
diff --git a/packages/framework-core/src/plugin-manager/pkg-install.ts b/packages/framework-core/src/plugin-manager/pkg-install.ts
@@ -5,8 +5,94 @@
  *
  * Please refer to license text included with this package for license details.
  */
+import path from 'path';
+import packageJson from 'package-json';
+import httpsProxyAgent from 'https-proxy-agent';
+import { getProxy } from '@cloudbase/toolbox';
+import getLogger from '../logger';
+
 import { spawnPromise } from '../utils/spawn';
 
+export async function npmInstallWithCheck(
+  packageInfo: Record<string, string>,
+  options?: Record<string, any>
+) {
+  let needUpdatePackageInfo: Record<string, string> = {};
+  const logger = getLogger();
+
+  await Promise.all(
+    Object.entries(packageInfo).map(async ([name, version]) => {
+      const startTime = new Date();
+      const checkResult = await checkNeedUpdate(
+        name,
+        version,
+        options?.cwd || process.cwd()
+      );
+
+      if (checkResult.isNeedUpdate) {
+        needUpdatePackageInfo[name] = checkResult.resolvedVersion;
+      }
+      logger.debug(
+        `resolve plugin ${name}@${version}: use ${(
+          (new Date().valueOf() - startTime.valueOf()) /
+          1000
+        ).toFixed(2)} s, mismatch：${
+          checkResult.isNeedUpdate
+        }, resolved version：${checkResult.resolvedVersion}`
+      );
+    })
+  );
+
+  const args = ['install'];
+  const packageList = getPackageList(needUpdatePackageInfo);
+
+  if (packageList.length === 0) {
+    return;
+  }
+
+  const npmOptions = ['--no-audit', '--progress=false'];
+  // 支持node8
+  return spawnPromise('npm', [...args, ...packageList, ...npmOptions], {
+    cwd: options?.cwd || process.cwd(),
+  });
+}
+
+async function checkNeedUpdate(name: string, version: string, cwd: string) {
+  const isResolvedVersion = /^\d/.test(version);
+  let resolvedVersion;
+
+  if (isResolvedVersion) {
+    resolvedVersion = version;
+  } else {
+    const proxy = getProxy();
+    const meta = await packageJson(name, {
+      version,
+      ...(proxy ? { agent: httpsProxyAgent(proxy) } : {}),
+    });
+    resolvedVersion = meta.version as string;
+  }
+  const localVersion = checkLocalVersion(name, cwd);
+  return {
+    isNeedUpdate: resolvedVersion !== localVersion,
+    resolvedVersion: resolvedVersion,
+  };
+}
+
+function checkLocalVersion(name: string, cwd: string) {
+  let version;
+  try {
+    const localPackageJson = require(path.join(
+      cwd,
+      'node_modules',
+      name,
+      'package.json'
+    ));
+    version = localPackageJson.version;
+  } catch (e) {}
+
+  return version;
+}
+
 export function install(
   packageInfo: Record<string, string>,
   options?: Record<string, any>
@@ -15,7 +101,7 @@ export function install(
 
   const args = ['install'];
 
-  const npmOptions = ['--prefer-offline','--no-audit', '--progress=false'];
+  const npmOptions = ['--prefer-offline', '--no-audit', '--progress=false'];
 
   // 支持node8
   return spawnPromise('npm', [...args, ...packageList, ...npmOptions], {
diff --git a/packages/framework-plugin-container/src/index.ts b/packages/framework-plugin-container/src/index.ts
@@ -305,11 +305,11 @@ class ContainerPlugin extends Plugin {
 
     let cloudInputs = latestVersionDetail
       ? {
-        cpu: latestVersionDetail.Cpu,
-        mem: latestVersionDetail.Mem,
-        maxNum: latestVersionDetail.MaxNum,
-        minNum: latestVersionDetail.MinNum,
-      }
+          cpu: latestVersionDetail.Cpu,
+          mem: latestVersionDetail.Mem,
+          maxNum: latestVersionDetail.MaxNum,
+          minNum: latestVersionDetail.MinNum,
+        }
       : {};
 
     let modeInputs = this.inputs.mode ? MODE_INPUTS[this.inputs.mode] : {};
@@ -452,7 +452,6 @@ class ContainerPlugin extends Plugin {
    */
   async ensurePostPay() {
     const res = await this.api.cloudApi.tcbService.request('DescribeEnvs');
-    this.api.logger.debug('环境信息', res);
 
     let env = res?.EnvList?.[0];
 
diff --git a/packages/framework-plugin-website/src/index.ts b/packages/framework-plugin-website/src/index.ts
@@ -8,8 +8,6 @@
 import path from 'path';
 import fs from 'fs';
 import os from 'os';
-import { exec } from 'child_process';
-import { promisify } from 'util';
 import merge from 'lodash.merge';
 
 import { Plugin, PluginServiceApi } from '@cloudbase/framework-core';
@@ -249,7 +247,7 @@ class WebsitePlugin extends Plugin {
     if (command) {
       this.api.logger.info('running', command);
       await this.api.spawnPromise(command, [], {
-        env: Object.assign({}, process.env, envVariables)
+        env: Object.assign({}, process.env, envVariables),
       });
     }
 
@@ -292,7 +290,7 @@ class WebsitePlugin extends Plugin {
     this.api.logger.info('running', command);
 
     return this.api.spawnPromise(command, [], {
-      env: Object.assign({}, process.env, envVariables)
+      env: Object.assign({}, process.env, envVariables),
     });
   }
 
@@ -306,7 +304,7 @@ class WebsitePlugin extends Plugin {
       if (fs.statSync('package.json')) {
         this.api.logger.info('running', command);
         return this.api.spawnPromise(command, [], {
-          env: Object.assign({}, process.env, envVariables)
+          env: Object.assign({}, process.env, envVariables),
         });
       }
     } catch (e) {}
@@ -317,7 +315,6 @@ class WebsitePlugin extends Plugin {
    */
   async ensurePostPay() {
     const res = await this.api.cloudApi.tcbService.request('DescribeEnvs');
-    this.api.logger.debug('环境信息', res);
 
     let env = res?.EnvList?.[0];
 
diff --git a/scripts/spawn.js b/scripts/spawn.js
@@ -8,10 +8,11 @@
 
 const { spawn } = require('child_process');
 
-async function spawnPromise(command, options) {
+async function spawnPromise(command, options, args) {
   return new Promise((resolve, reject) => {
     const cm = spawn(
       command,
+      args,
       Object.assign(
         {
           shell: true,
