@flun/nodejs-mobile-gyp 1.0.1 → 1.0.2

package/lib/create-config-gypi.js

@@ -1,163 +1,109 @@
-import gracefulFs from 'graceful-fs'
-import * as log from './log.js'
-import path from 'path'
-
-const fs = gracefulFs.promises
-
-/**
- * 解析 config.gypi 内容为 JSON 对象
- * 逻辑翻译自 Node.js 的 tools/js2c.py
- */
-const parseConfigGypi = (config) => {
-  // 1. 去掉 # 注释
-  config = config.replace(/#.*/g, '')
-  // 2. 拼接多行字符串
-  config = config.replace(/'$\s+'/mg, '')
-  // 3. 把单引号字符串归一化为双引号
-  config = config.replace(/'/g, '"')
-  return JSON.parse(config)
-}
-
-/**
- * 读取基础 config.gypi
- */
-const getBaseConfigGypi = async ({ gyp, nodeDir }) => {
-  // 在以下情况优先读取 $nodeDir/include/node/config.gypi：
-  // 1. 指定了 --dist-url 或 --nodedir
-  // 2. 且没有指定 --force-process-config
-  const useCustomHeaders = gyp.opts.nodedir || gyp.opts.disturl || gyp.opts['dist-url']
-  const shouldReadConfigGypi = useCustomHeaders && !gyp.opts['force-process-config']
-  if (shouldReadConfigGypi && nodeDir) {
-    try {
-      const baseConfigGypiPath = path.resolve(nodeDir, 'include/node/config.gypi')
-      const baseConfigGypi = await fs.readFile(baseConfigGypiPath)
-      return parseConfigGypi(baseConfigGypi.toString())
-    } catch (err) {
-      log.warn('read config.gypi', err.message)
+import gracefulFs from 'graceful-fs';
+import * as log from './log.js';
+import path from 'path';
+
+const fs = gracefulFs.promises,
+  /**
+   * 解析 config.gypi 内容为 JSON 对象
+   * 逻辑翻译自 Node.js 的 tools/js2c.py
+   */
+  parseConfigGypi = config => {
+    // 去掉 # 注释,拼接多行字符串,把单引号字符串归一化为双引号
+    config = config.replace(/#.*/g, ''), config = config.replace(/'$\s+'/mg, ''), config = config.replace(/'/g, '"');
+    return JSON.parse(config);
+  },
+  /**
+   * 读取基础 config.gypi
+   */
+  getBaseConfigGypi = async ({ gyp, nodeDir }) => {
+    // 在以下情况优先读取 $nodeDir/include/node/config.gypi：
+    // 1. 指定了 --dist-url 或 --nodedir
+    // 2. 且没有指定 --force-process-config
+    const useCustomHeaders = gyp.opts.nodedir || gyp.opts.disturl || gyp.opts['dist-url'],
+      shouldReadConfigGypi = useCustomHeaders && !gyp.opts['force-process-config'];
+    if (shouldReadConfigGypi && nodeDir) {
+      try {
+        const baseConfigGypi = await fs.readFile(path.resolve(nodeDir, 'include/node/config.gypi'));
+        return parseConfigGypi(baseConfigGypi.toString());
+      } catch (err) { log.warn('read config.gypi', err.message) }
     }
-  }
-
-  // 回退到 process.config
-  return JSON.parse(JSON.stringify(process.config))
-}
-
-/**
- * 基于当前环境生成 config.gypi 内容
- */
-const getCurrentConfigGypi = async ({ gyp, nodeDir, vsInfo, python }) => {
-  const config = await getBaseConfigGypi({ gyp, nodeDir })
-  if (!config.target_defaults) {
-    config.target_defaults = {}
-  }
-  if (!config.variables) {
-    config.variables = {}
-  }
-
-  const defaults = config.target_defaults
-  const variables = config.variables
-
-  // 不要继承 base config.gypi 的 defaults，
-  // 否则当 node 可执行文件在另一台机器编译（lib/include 路径不同）时会出问题
-  defaults.cflags = []
-  defaults.defines = []
-  defaults.include_dirs = []
-  defaults.libraries = []
-
-  // 设置 default_configuration
-  if ('debug' in gyp.opts) {
-    defaults.default_configuration = gyp.opts.debug ? 'Debug' : 'Release'
-  }
-
-  if (!defaults.default_configuration) {
-    defaults.default_configuration = 'Release'
-  }
-
-  // 设置 target_arch
-  variables.target_arch = gyp.opts.arch || process.arch || 'ia32'
-  if (variables.target_arch === 'arm64') {
-    defaults.msvs_configuration_platform = 'ARM64'
-    defaults.xcode_configuration_platform = 'arm64'
-  }
-
-  // 设置 Node 开发目录
-  variables.nodedir = nodeDir
-
-  // 设置 Python 路径
-  variables.python = python
-
-  // 默认禁用 -T "thin" 静态归档
-  variables.standalone_static_library = gyp.opts.thin ? 0 : 1
 
-  if (process.platform === 'win32') {
-    defaults.msbuild_toolset = vsInfo.toolset
-    if (vsInfo.sdk) {
-      defaults.msvs_windows_target_platform_version = vsInfo.sdk
-    }
-    if (variables.target_arch === 'arm64') {
-      if (vsInfo.versionMajor > 15 ||
-          (vsInfo.versionMajor === 15 && vsInfo.versionMajor >= 9)) {
-        defaults.msvs_enable_marmasm = 1
-      } else {
-        log.warn('Compiling ARM64 assembly is only available in\n' +
-          'Visual Studio 2017 version 15.9 and above')
+    return JSON.parse(JSON.stringify(process.config)); // 回退到 process.config
+  },
+
+  /**
+   * 基于当前环境生成 config.gypi 内容
+   */
+  getCurrentConfigGypi = async ({ gyp, nodeDir, vsInfo, python }) => {
+    const config = await getBaseConfigGypi({ gyp, nodeDir });
+    if (!config.target_defaults) config.target_defaults = {};
+    if (!config.variables) config.variables = {};
+
+    const defaults = config.target_defaults, variables = config.variables;
+    // 不要继承 base config.gypi 的 defaults，
+    // 否则当 node 可执行文件在另一台机器编译（lib/include 路径不同）时会出问题
+    defaults.cflags = [], defaults.defines = [], defaults.include_dirs = [], defaults.libraries = [];
+
+    // 设置 default_configuration
+    if ('debug' in gyp.opts) defaults.default_configuration = gyp.opts.debug ? 'Debug' : 'Release'
+    if (!defaults.default_configuration) defaults.default_configuration = 'Release';
+
+    // 设置 target_arch
+    variables.target_arch = gyp.opts.arch || process.arch || 'ia32';
+    if (variables.target_arch === 'arm64')
+      defaults.msvs_configuration_platform = 'ARM64', defaults.xcode_configuration_platform = 'arm64';
+
+    // 设置 Node 开发目录和 Python 路径,默认禁用 -T "thin" 静态归档
+    variables.nodedir = nodeDir, variables.python = python;
+    variables.standalone_static_library = gyp.opts.thin ? 0 : 1;
+
+    if (process.platform === 'win32') {
+      defaults.msbuild_toolset = vsInfo.toolset;
+      if (vsInfo.sdk) defaults.msvs_windows_target_platform_version = vsInfo.sdk;
+      if (variables.target_arch === 'arm64') {
+        if (vsInfo.versionMajor > 15 || (vsInfo.versionMajor === 15 && vsInfo.versionMajor >= 9))
+          defaults.msvs_enable_marmasm = 1;
+        else log.warn('仅 Visual Studio 2017 15.9 及以上版本支持编译 ARM64 汇编');
       }
+      variables.msbuild_path = vsInfo.msBuild;
+      // Windows 原生构建走 MSVC 工具集：必须关闭 clang 与 LTO，
+      // 否则 common.gypi 会把 toolset 设为 ClangCL，并向 MSVC 链接器传入 Clang 专用参数
+      // （-flto=thin、/opt:lldltojobs），导致 MSB8020 或 LNK1117
+      if (!gyp.opts.format || gyp.opts.format === 'msvs')
+        variables.clang = 0, variables.enable_lto = 'false', variables.enable_thin_lto = 'false', variables.lto_jobs = '';
     }
-    variables.msbuild_path = vsInfo.msBuild
-    // Windows 原生构建走 MSVC 工具集：必须关闭 clang 与 LTO，
-    // 否则 common.gypi 会把 toolset 设为 ClangCL，并向 MSVC 链接器传入 Clang 专用参数
-    // （-flto=thin、/opt:lldltojobs），导致 MSB8020 或 LNK1117
-    if (!gyp.opts.format || gyp.opts.format === 'msvs') {
-      variables.clang = 0
-      variables.enable_lto = 'false'
-      variables.enable_thin_lto = 'false'
-      variables.lto_jobs = ''
-    }
-  }
 
-  // 把其余未知选项当作变量写入，支持模块自定义 configure 参数，例如：
-  //   $ node-gyp configure --shared-libxml2
-  Object.keys(gyp.opts).forEach(function (opt) {
-    if (opt === 'argv') {
-      return
+    // 把其余未知选项当作变量写入，支持模块自定义 configure 参数，例如：
+    //   $ node-gyp configure --shared-libxml2
+    for (const [k, v] of Object.entries(gyp.opts)) {
+      if (k === 'argv' || k in gyp.configDefs) continue;
+      variables[k.replace(/-/g, '_')] = v;
     }
-    if (opt in gyp.configDefs) {
-      return
-    }
-    variables[opt.replace(/-/g, '_')] = gyp.opts[opt]
-  })
-
-  return config
-}
-
-/**
- * 生成并写出 config.gypi 文件
- */
-const createConfigGypi = async ({ gyp, buildDir, nodeDir, vsInfo, python }) => {
-  const configFilename = 'config.gypi'
-  const configPath = path.resolve(buildDir, configFilename)
-
-  log.verbose('build/' + configFilename, 'creating config file')
-
-  const config = await getCurrentConfigGypi({ gyp, nodeDir, vsInfo, python })
-
-  // 保证 config.gypi 中的布尔值都转成字符串
-  const boolsToString = (k, v) => {
-    if (typeof v === 'boolean') {
-      return String(v)
-    }
-    return v
-  }
-
-  log.silly('build/' + configFilename, config)
-
-  // 把 config.gypi 写入 build/ 目录
-  const prefix = '# Do not edit. File was generated by node-gyp\'s "configure" step'
-
-  const json = JSON.stringify(config, boolsToString, 2)
-  log.verbose('build/' + configFilename, 'writing out config file: %s', configPath)
-  await fs.writeFile(configPath, [prefix, json, ''].join('\n'))
-
-  return configPath
-}
 
-export { createConfigGypi, parseConfigGypi, getCurrentConfigGypi }
+    return config;
+  },
+
+  /**
+   * 生成并写出 config.gypi 文件
+   */
+  createConfigGypi = async ({ gyp, buildDir, nodeDir, vsInfo, python }) => {
+    const configFilename = 'config.gypi', configPath = path.resolve(buildDir, configFilename);
+
+    log.verbose('build/' + configFilename, 'creating config file');
+    const config = await getCurrentConfigGypi({ gyp, nodeDir, vsInfo, python }),
+      // 保证 config.gypi 中的布尔值都转成字符串
+      boolsToString = (k, v) => {
+        if (typeof v === 'boolean') return String(v);
+        return v;
+      };
+
+    log.silly('build/' + configFilename, config);
+    // 把 config.gypi 写入 build/ 目录
+    const prefix = '# Do not edit. File was generated by node-gyp\'s "configure" step',
+      json = JSON.stringify(config, boolsToString, 2);
+    log.verbose('build/' + configFilename, 'writing out config file: %s', configPath);
+    await fs.writeFile(configPath, [prefix, json, ''].join('\n'));
+    return configPath;
+  };
+
+export { createConfigGypi, parseConfigGypi, getCurrentConfigGypi }

package/lib/download.js

@@ -1,44 +1,31 @@
-import fetch from 'make-fetch-happen'
-import gracefulFs from 'graceful-fs'
-import * as log from './log.js'
-
-const { promises: fs } = gracefulFs
-
-/**
- * 读取 CA 证书文件，按证书边界切分为多个证书
- */
-const readCAFile = async (filename) => {
-  // CA 文件可能包含多份证书，按证书边界切分
-  // [\S\s]*? 用于匹配包括换行在内的所有内容
-  const ca = await fs.readFile(filename, 'utf8')
-  const re = /(-----BEGIN CERTIFICATE-----[\S\s]*?-----END CERTIFICATE-----)/g
-  return ca.match(re)
-}
-
-/**
- * 使用 make-fetch-happen 下载指定 URL
- */
-const download = async (gyp, url) => {
-  log.http('GET', url)
-
-  const requestOpts = {
-    headers: {
-      'User-Agent': `node-gyp v${gyp.version} (node ${process.version})`,
-      Connection: 'keep-alive'
-    },
-    proxy: gyp.opts.proxy,
-    noProxy: gyp.opts.noproxy
+import fetch from 'make-fetch-happen';
+import gracefulFs from 'graceful-fs';
+import * as log from './log.js';
+
+const { promises: fs } = gracefulFs,
+  /**
+   * 读取 CA 证书文件，按证书边界切分为多个证书
+   */
+  readCAFile = async filename => {
+    // CA 文件可能包含多份证书，按证书边界切分; [\S\s]*? 用于匹配包括换行在内的所有内容;
+    const ca = await fs.readFile(filename, 'utf8'), re = /(-----BEGIN CERTIFICATE-----[\S\s]*?-----END CERTIFICATE-----)/g;
+    return ca.match(re);
+  },
+  /**
+   * 使用 make-fetch-happen 下载指定 URL
+   */
+  download = async (gyp, url) => {
+    log.http('GET', url);
+
+    const requestOpts = {
+      headers: { 'User-Agent': `node-gyp v${gyp.version} (node ${process.version})`, Connection: 'keep-alive' },
+      proxy: gyp.opts.proxy, noProxy: gyp.opts.noproxy
+    }, cafile = gyp.opts.cafile;
+
+    if (cafile) requestOpts.ca = await readCAFile(cafile);
+    const res = await fetch(url, requestOpts);
+    log.http(res.status, res.url);
+    return res;
   }
 
-  const cafile = gyp.opts.cafile
-  if (cafile) {
-    requestOpts.ca = await readCAFile(cafile)
-  }
-
-  const res = await fetch(url, requestOpts)
-  log.http(res.status, res.url)
-
-  return res
-}
-
-export { download, readCAFile }
+export { readCAFile, download }

package/lib/find-node-directory.js

@@ -1,62 +1,45 @@
-import path from 'path'
-import { fileURLToPath } from 'url'
-import * as log from './log.js'
+import path from 'path';
+import { fileURLToPath } from 'url';
+import * as log from './log.js';
 
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const __dirname = path.dirname(fileURLToPath(import.meta.url)),
+  /**
+   * 从脚本位置或进程对象推断 Node 根目录
+   */
+  findNodeDirectory = (scriptLocation, processObj) => {
+    // 未传入时使用默认值，便于回归测试
+    if (scriptLocation === undefined) scriptLocation = __dirname;
+    if (processObj === undefined) processObj = process;
 
-/**
- * 从脚本位置或进程对象推断 Node 根目录
- */
-const findNodeDirectory = (scriptLocation, processObj) => {
-  // 未传入时使用默认值，便于回归测试
-  if (scriptLocation === undefined) {
-    scriptLocation = __dirname
-  }
-  if (processObj === undefined) {
-    processObj = process
-  }
-
-  // 看看上层目录结构，判断当前所处位置
-  const npmParentDirectory = path.join(scriptLocation, '../../../..')
-  log.verbose('node-gyp root', 'npm_parent_directory is ' +
-              path.basename(npmParentDirectory))
-  let nodeRootDir = ''
-
-  log.verbose('node-gyp root', 'Finding node root directory')
-  if (path.basename(npmParentDirectory) === 'deps') {
-    // 处于构建目录中，脚本位于 deps/npm/node_modules/node-gyp/lib
-    nodeRootDir = path.join(npmParentDirectory, '..')
-    log.verbose('node-gyp root', 'in build directory, root = ' +
-                nodeRootDir)
-  } else if (path.basename(npmParentDirectory) === 'node_modules') {
-    // 处于 Node 安装目录中，脚本位于
-    // lib/node_modules/npm/node_modules/node-gyp/lib 或
-    // node_modules/npm/node_modules/node-gyp/lib（视平台而定）
-    if (processObj.platform === 'win32') {
-      nodeRootDir = path.join(npmParentDirectory, '..')
+    // 看看上层目录结构，判断当前所处位置
+    const npmParentDirectory = path.join(scriptLocation, '../../../..');
+    log.verbose('node-gyp root', 'npm_parent_directory is ' + path.basename(npmParentDirectory));
+    log.verbose('node-gyp root', 'Finding node root directory');
+    let nodeRootDir = '';
+    if (path.basename(npmParentDirectory) === 'deps') {
+      // 处于构建目录中，脚本位于 deps/npm/node_modules/node-gyp/lib
+      nodeRootDir = path.join(npmParentDirectory, '..');
+      log.verbose('node-gyp root', 'in build directory, root = ' + nodeRootDir);
+    } else if (path.basename(npmParentDirectory) === 'node_modules') {
+      // 处于 Node 安装目录中，脚本位于
+      // lib/node_modules/npm/node_modules/node-gyp/lib 或
+      // node_modules/npm/node_modules/node-gyp/lib（视平台而定）
+      if (processObj.platform === 'win32') nodeRootDir = path.join(npmParentDirectory, '..');
+      else nodeRootDir = path.join(npmParentDirectory, '../..');
+      log.verbose('node-gyp root', 'in install directory, root = ' + nodeRootDir);
     } else {
-      nodeRootDir = path.join(npmParentDirectory, '../..')
-    }
-    log.verbose('node-gyp root', 'in install directory, root = ' +
-                nodeRootDir)
-  } else {
-    // 无法判断，尝试从 node 可执行文件的位置推断
-    const nodeDir = path.dirname(processObj.execPath)
-    const directoryUp = path.basename(nodeDir)
-    if (directoryUp === 'bin') {
-      nodeRootDir = path.join(nodeDir, '..')
-    } else if (directoryUp === 'Release' || directoryUp === 'Debug') {
-      // 如果是刚构建的 node，且目录结构为仓库结构：
-      // Windows 只需上一层，其余平台两层
-      if (processObj.platform === 'win32') {
-        nodeRootDir = path.join(nodeDir, '..')
-      } else {
-        nodeRootDir = path.join(nodeDir, '../..')
+      // 无法判断，尝试从 node 可执行文件的位置推断
+      const nodeDir = path.dirname(processObj.execPath), directoryUp = path.basename(nodeDir);
+      if (directoryUp === 'bin') nodeRootDir = path.join(nodeDir, '..');
+      else if (directoryUp === 'Release' || directoryUp === 'Debug') {
+        // 如果是刚构建的 node，且目录结构为仓库结构：
+        // Windows 只需上一层，其余平台两层
+        if (processObj.platform === 'win32') nodeRootDir = path.join(nodeDir, '..');
+        else nodeRootDir = path.join(nodeDir, '../..');
       }
+      // 否则返回默认空串 ""
     }
-    // 否则返回默认空串 ""
+    return nodeRootDir;
   }
-  return nodeRootDir
-}
 
-export { findNodeDirectory }
+export { findNodeDirectory }