@flun/nodejs-mobile-gyp 1.0.1 → 1.1.0

package/lib/list.js

@@ -1,30 +1,24 @@
-import gracefulFs from 'graceful-fs'
-import * as log from './log.js'
+import gracefulFs from 'graceful-fs';
+import * as log from './log.js';
 
-const fs = gracefulFs.promises
+const fs = gracefulFs.promises,
+  /**
+   * 列出已安装的 Node 开发文件版本
+   */
+  list = async (gyp, args) => {
+    const devDir = gyp.devDir;
+    let versions = [];
 
-/**
- * 列出已安装的 Node 开发文件版本
- */
-const list = async (gyp, args) => {
-  const devDir = gyp.devDir
-  log.verbose('list', 'using node-gyp dir:', devDir)
-
-  let versions = []
-  try {
-    const dir = await fs.readdir(devDir)
-    if (Array.isArray(dir)) {
-      versions = dir.filter((v) => v !== 'current')
-    }
-  } catch (err) {
-    if (err && err.code !== 'ENOENT') {
-      throw err
+    log.verbose('list', 'using node-gyp dir:', devDir);
+    try {
+      const dir = await fs.readdir(devDir);
+      if (Array.isArray(dir)) versions = dir.filter((v) => v !== 'current');
+    } catch (err) {
+      if (err && err.code !== 'ENOENT') throw err;
     }
-  }
 
-  return versions
-}
-
-list.usage = 'Prints a listing of the currently installed node development files'
+    return versions;
+  }
 
-export { list }
+list.usage = 'Prints a listing of the currently installed node development files';
+export { list }

package/lib/log.js

@@ -1,174 +1,110 @@
-import procLog from 'proc-log'
-import { format } from 'util'
+import procLog from 'proc-log';
+import { format } from 'util';
 
 // 按级别生成带前缀的日志函数
-const logLevels = Object.keys(procLog).filter((k) => typeof procLog[k] === 'function')
-const withPrefix = (prefix) => logLevels.reduce((acc, level) => {
-  acc[level] = (...args) => procLog[level](prefix, ...args)
-  return acc
-}, {})
-
-// 极简 ANSI 颜色生成器
-const COLORS = {
-  wrap: (str, colors) => {
-    const codes = colors.filter(c => typeof c === 'number')
-    return `\x1b[${codes.join(';')}m${str}\x1b[0m`
-  },
-  inverse: 7,
-  fg: {
-    black: 30,
-    red: 31,
-    green: 32,
-    yellow: 33,
-    blue: 34,
-    magenta: 35,
-    cyan: 36,
-    white: 37
-  },
-  bg: {
-    black: 40,
-    red: 41,
-    green: 42,
-    yellow: 43,
-    blue: 44,
-    magenta: 45,
-    cyan: 46,
-    white: 47
-  }
-}
+const logLevels = Object.keys(procLog.log).filter((k) => typeof procLog.log[k] === 'function'),
+  withPrefix = (prefix) => logLevels.reduce((acc, level) => {
+    acc[level] = (...args) => procLog.log[level](prefix, ...args);
+    return acc;
+  }, {}),
+  // 极简 ANSI 颜色生成器
+  COLORS = {
+    wrap: (str, colors) => {
+      const codes = colors.filter(c => typeof c === 'number')
+      return `\x1b[${codes.join(';')}m${str}\x1b[0m`
+    },
+    inverse: 7,
+    fg: { black: 30, red: 31, green: 32, yellow: 33, blue: 34, magenta: 35, cyan: 36, white: 37 },
+    bg: { black: 40, red: 41, green: 42, yellow: 43, blue: 44, magenta: 45, cyan: 46, white: 47 }
+  };
 
 // 日志器：负责缓冲、暂停/恢复、着色输出
 class Logger {
-  #buffer = []
-  #paused = null
-  #level = null
-  #stream = null
+  #buffer = [];
+  #paused = null;
+  #level = null;
+  #stream = null;
 
   // 从吵闹到安静排序
-  #levels = [{
-    id: 'silly',
-    display: 'sill',
-    style: { inverse: true }
-  }, {
-    id: 'verbose',
-    display: 'verb',
-    style: { fg: 'cyan', bg: 'black' }
-  }, {
-    id: 'info',
-    style: { fg: 'green' }
-  }, {
-    id: 'http',
-    style: { fg: 'green', bg: 'black' }
-  }, {
-    id: 'notice',
-    style: { fg: 'cyan', bg: 'black' }
-  }, {
-    id: 'warn',
-    display: 'WARN',
-    style: { fg: 'black', bg: 'yellow' }
-  }, {
-    id: 'error',
-    display: 'ERR!',
-    style: { fg: 'red', bg: 'black' }
-  }]
-
-  constructor (stream) {
-    process.on('log', (...args) => this.#onLog(...args))
-    this.#levels = new Map(this.#levels.map((level, index) => [level.id, { ...level, index }]))
-    this.level = 'info'
-    this.stream = stream
-    procLog.pause()
+  #levels = [
+    { id: 'silly', display: 'sill', style: { inverse: true } },
+    { id: 'verbose', display: 'verb', style: { fg: 'cyan', bg: 'black' } },
+    { id: 'info', style: { fg: 'green' } },
+    { id: 'http', style: { fg: 'green', bg: 'black' } },
+    { id: 'notice', style: { fg: 'cyan', bg: 'black' } },
+    { id: 'warn', display: 'WARN', style: { fg: 'black', bg: 'yellow' } },
+    { id: 'error', display: 'ERR!', style: { fg: 'red', bg: 'black' } }];
+
+  constructor(stream) {
+    process.on('log', (...args) => this.#onLog(...args));
+    this.#levels = new Map(this.#levels.map((level, index) => [level.id, { ...level, index }]));
+    this.level = 'info', this.stream = stream, procLog.log.pause();
   }
 
-  get stream () {
-    return this.#stream
+  get stream() {
+    return this.#stream;
   }
 
-  set stream (stream) {
-    this.#stream = stream
+  set stream(stream) {
+    this.#stream = stream;
   }
 
-  get level () {
-    return this.#levels.get(this.#level) ?? null
+  get level() {
+    return this.#levels.get(this.#level) ?? null;
   }
 
-  set level (level) {
-    this.#level = this.#levels.get(level)?.id ?? null
+  set level(level) {
+    this.#level = this.#levels.get(level)?.id ?? null;
   }
 
-  isVisible (level) {
-    return this.level?.index <= this.#levels.get(level)?.index ?? -1
+  isVisible(level) {
+    return this.level?.index <= this.#levels.get(level)?.index ?? -1;
   }
 
-  #onLog (...args) {
-    const [level] = args
+  #onLog(...args) {
+    const [level] = args;
 
     if (level === 'pause') {
-      this.#paused = true
+      this.#paused = true;
       return
     }
 
     if (level === 'resume') {
-      this.#paused = false
-      this.#buffer.forEach((b) => this.#log(...b))
-      this.#buffer.length = 0
-      return
+      this.#paused = false, this.#buffer.forEach((b) => this.#log(...b)), this.#buffer.length = 0;
+      return;
     }
 
     if (this.#paused) {
-      this.#buffer.push(args)
-      return
+      this.#buffer.push(args);
+      return;
     }
 
-    this.#log(...args)
+    this.#log(...args);
   }
 
-  #color (str, { fg, bg, inverse }) {
-    if (!this.#stream?.isTTY) {
-      return str
-    }
-
-    return COLORS.wrap(str, [
-      COLORS.fg[fg],
-      COLORS.bg[bg],
-      inverse && COLORS.inverse
-    ])
+  #color(str, { fg, bg, inverse }) {
+    if (!this.#stream?.isTTY) return str
+    return COLORS.wrap(str, [COLORS.fg[fg], COLORS.bg[bg], inverse && COLORS.inverse]);
   }
 
-  #log (levelId, msgPrefix, ...args) {
-    if (!this.isVisible(levelId) || typeof this.#stream?.write !== 'function') {
-      return
-    }
-
-    const level = this.#levels.get(levelId)
-
-    const prefixParts = [
-      this.#color('gyp', { fg: 'white', bg: 'black' }),
-      this.#color(level.display ?? level.id, level.style)
-    ]
-    if (msgPrefix) {
-      prefixParts.push(this.#color(msgPrefix, { fg: 'magenta' }))
-    }
+  #log(levelId, msgPrefix, ...args) {
+    if (!this.isVisible(levelId) || typeof this.#stream?.write !== 'function') return;
 
-    const prefix = prefixParts.join(' ').trim() + ' '
-    const lines = format(...args).split(/\r?\n/).map(l => prefix + l.trim())
+    const level = this.#levels.get(levelId),
+      prefixParts = [
+        this.#color('gyp', { fg: 'white', bg: 'black' }),
+        this.#color(level.display ?? level.id, level.style)
+      ];
+    if (msgPrefix) prefixParts.push(this.#color(msgPrefix, { fg: 'magenta' }));
 
-    this.#stream.write(lines.join('\n') + '\n')
+    const prefix = prefixParts.join(' ').trim() + ' ', lines = format(...args).split(/\r?\n/).map(l => prefix + l.trim());
+    this.#stream.write(lines.join('\n') + '\n');
   }
 }
 
 // 用于测试时抑制日志
-const NULL_LOGGER = !!process.env.NODE_GYP_NULL_LOGGER
-
-const logger = new Logger(NULL_LOGGER ? null : process.stderr)
-const stdout = NULL_LOGGER ? () => {} : (...args) => console.log(...args)
-
-// 解构 proc-log 的函数，供末尾统一导出
-const { notice, error, warn, info, verbose, http, silly, pause, resume } = procLog
+const NULL_LOGGER = !!process.env.NODE_GYP_NULL_LOGGER, logger = new Logger(NULL_LOGGER ? null : process.stderr),
+  stdout = NULL_LOGGER ? () => { } : (...args) => console.log(...args),
+  { notice, error, warn, info, verbose, http, silly, pause, resume } = procLog.log; // 解构 proc-log 的函数，供末尾统一导出
 
-export {
-  logger,
-  stdout,
-  withPrefix,
-  notice, error, warn, info, verbose, http, silly, pause, resume
-}
+export { logger, stdout, withPrefix, notice, error, warn, info, verbose, http, silly, pause, resume }

package/lib/node-gyp.js

@@ -1,32 +1,22 @@
-import path from 'path'
-import nopt from 'nopt'
-import * as log from './log.js'
-import childProcess from 'child_process'
-import { EventEmitter } from 'events'
-import { readFileSync } from 'fs'
-import { fileURLToPath } from 'url'
-
-import { build } from './build.js'
-import { clean } from './clean.js'
-import { configure } from './configure.js'
-import { rebuild } from './rebuild.js'
-import { install } from './install.js'
-import { list } from './list.js'
-import { remove } from './remove.js'
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
-
-// 命令名到实现函数的静态映射（ESM 不支持动态 require）
-const commandModules = {
-  build,
-  clean,
-  configure,
-  rebuild,
-  install,
-  list,
-  remove
-}
-const commands = Object.keys(commandModules)
+import path from 'path';
+import nopt from 'nopt';
+import * as log from './log.js';
+import childProcess from 'child_process';
+import { EventEmitter } from 'events';
+import { readFileSync } from 'fs';
+import { fileURLToPath } from 'url';
+
+import { build } from './build.js';
+import { clean } from './clean.js';
+import { configure } from './configure.js';
+import { rebuild } from './rebuild.js';
+import { install } from './install.js';
+import { list } from './list.js';
+import { remove } from './remove.js';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url)),
+  // 命令名到实现函数的静态映射（ESM 不支持动态 require）
+  commandModules = { build, clean, configure, rebuild, install, list, remove }, commands = Object.keys(commandModules);
 
 /**
  * node-gyp 主类：解析参数、分发命令、生成 usage
@@ -79,123 +69,88 @@ class Gyp extends EventEmitter {
   /**
    * 暴露命令别名供 bin 文件使用
    */
-  aliases = {
-    ls: 'list',
-    rm: 'remove'
-  }
-
-  constructor (...args) {
-    super(...args)
-
-    this.devDir = ''
-
+  aliases = { ls: 'list', rm: 'remove' }
+  constructor(...args) {
+    super(...args), this.devDir = '';
     this.commands = commands.reduce((acc, command) => {
-      acc[command] = (argv) => commandModules[command](this, argv)
-      return acc
+      acc[command] = (argv) => commandModules[command](this, argv);
+      return acc;
     }, {})
 
     Object.defineProperty(this, 'version', {
-      enumerable: true,
-      get: function () { return this.package.version }
+      enumerable: true, get() { return this.package.version }
     })
   }
 
   /**
    * 解析传入的 argv 数组，设置 'opts'、'argv' 和 'command' 属性
    */
-  parseArgv (argv) {
-    this.opts = nopt(this.configDefs, this.shorthands, argv)
-    this.argv = this.opts.argv.remain.slice()
-
-    const commands = this.todo = []
+  parseArgv(argv) {
+    this.opts = nopt(this.configDefs, this.shorthands, argv), this.argv = this.opts.argv.remain.slice();
 
+    const commands = this.todo = [];
     // 创建一份把别名映射后的 argv 副本
-    argv = this.argv.map((arg) => {
-    // 是别名吗？
-      if (arg in this.aliases) {
-        arg = this.aliases[arg]
-      }
+    argv = this.argv.map(arg => {
+      // 如果当前参数是命令别名（如 ls/rm）,就替换成真实命令名
+      if (arg in this.aliases) arg = this.aliases[arg];
       return arg
     })
 
     // 把映射后的参数处理成 "command" 对象（name 和 args 属性）
-    argv.slice().forEach((arg) => {
+    argv.slice().forEach(arg => {
       if (arg in this.commands) {
-        const args = argv.splice(0, argv.indexOf(arg))
-        argv.shift()
-        if (commands.length > 0) {
-          commands[commands.length - 1].args = args
-        }
-        commands.push({ name: arg, args: [] })
+        const args = argv.splice(0, argv.indexOf(arg));
+        argv.shift();
+        if (commands.length > 0) commands[commands.length - 1].args = args;
+        commands.push({ name: arg, args: [] });
       }
     })
-    if (commands.length > 0) {
-      commands[commands.length - 1].args = argv.splice(0)
-    }
+    if (commands.length > 0) commands[commands.length - 1].args = argv.splice(0);
 
     // 支持从 npm 继承配置环境变量
-    const npmConfigPrefix = 'npm_config_'
+    const npmConfigPrefix = 'npm_config_';
     Object.keys(process.env).forEach((name) => {
-      if (name.indexOf(npmConfigPrefix) !== 0) {
-        return
-      }
-      const val = process.env[name]
-      if (name === npmConfigPrefix + 'loglevel') {
-        log.logger.level = val
-      } else {
-      // 把用户定义的选项加入配置
-        name = name.substring(npmConfigPrefix.length)
+      if (name.indexOf(npmConfigPrefix) !== 0) return;
+      const val = process.env[name];
+      if (name === npmConfigPrefix + 'loglevel') log.logger.level = val
+      else {
+        name = name.substring(npmConfigPrefix.length);  // 把用户定义的选项加入配置
         // gyp@741b7f1 遇到零长度选项会死循环，确保过滤掉
         if (name) {
-        // 把 force_process_config 这类名字转成 force-process-config
-          if (name.includes('_')) {
-            name = name.replace(/_/g, '-')
-          }
-          this.opts[name] = val
+          // 把 force_process_config 这类名字转成 force-process-config
+          if (name.includes('_')) name = name.replace(/_/g, '-');
+          this.opts[name] = val;
         }
       }
     })
 
-    if (this.opts.loglevel) {
-      log.logger.level = this.opts.loglevel
-    }
-    log.resume()
+    if (this.opts.loglevel) log.logger.level = this.opts.loglevel;
+    log.resume();
   }
 
   /**
    * 启动子进程并发出 'spawn' 事件
    */
-  spawn (command, args, opts) {
-    if (!opts) {
-      opts = {}
-    }
-    if (!opts.silent && !opts.stdio) {
-      opts.stdio = [0, 1, 2]
-    }
-    const cp = childProcess.spawn(command, args, opts)
-    log.info('spawn', command)
-    log.info('spawn args', args)
-    return cp
+  spawn(command, args, opts) {
+    if (!opts) opts = {};
+    if (!opts.silent && !opts.stdio) opts.stdio = [0, 1, 2];
+    const cp = childProcess.spawn(command, args, opts);
+    log.info('spawn', command), log.info('spawn args', args);
+    return cp;
   }
 
   /**
    * 返回 node-gyp 的用法说明
    */
-  usage () {
+  usage() {
     return [
-      '',
-      '  Usage: node-gyp <command> [options]',
-      '',
-      '  where <command> is one of:',
-      commands.map((c) => '    - ' + c + ' - ' + commandModules[c].usage).join('\n'),
-      '',
-      'node-gyp@' + this.version + '  ' + path.resolve(__dirname, '..'),
-      'node@' + process.versions.node
-    ].join('\n')
+      '', '  Usage: node-gyp <command> [options]', '', '  where <command> is one of:',
+      commands.map((c) => '    - ' + c + ' - ' + commandModules[c].usage).join('\n'), '',
+      'node-gyp@' + this.version + '  ' + path.resolve(__dirname, '..'), 'node@' + process.versions.node
+    ].join('\n');
   }
 }
 
-const createGyp = () => new Gyp()
-
-export default createGyp
-export { Gyp }
+const createGyp = () => new Gyp();
+export default createGyp;
+export { Gyp }