@ondevplann/remotetype 0.1.2 → 0.1.3

package/lib/config.js

@@ -1,148 +1,148 @@
-'use strict';
-
-/**
- * 配置解析：默认值 < 配置文件 < 环境变量 < 命令行参数。
- *
- * 配置文件位置：~/.remotetype/config.json
- * 环境变量前缀：REMOTETYPE_
- */
-
-const fs = require('fs');
-const os = require('os');
-const path = require('path');
-const { resolveTarget } = require('./platform');
-
-/** 内置默认公网服务地址（用户可用 --url 或环境变量覆盖）。 */
-const DEFAULT_SERVE_URL = 'wss://remotetype.example.com/ws';
-
-/** 配置目录：~/.remotetype */
-function configDir() {
-  const base =
-    process.env.REMOTETYPE_HOME ||
-    (process.platform === 'win32'
-      ? path.join(process.env.APPDATA || os.homedir(), 'remotetype')
-      : path.join(os.homedir(), '.remotetype'));
-  return base;
-}
-
-function configFile() {
-  return path.join(configDir(), 'config.json');
-}
-
-function readConfigFile() {
-  const file = configFile();
-  try {
-    if (!fs.existsSync(file)) return {};
-    return JSON.parse(fs.readFileSync(file, 'utf8'));
-  } catch {
-    return {};
-  }
-}
-
-/** 生成/持久化 clientId：首次运行按 主机名-随机串 生成并落盘，保证稳定路由。 */
-function ensureClientId() {
-  const dir = configDir();
-  const file = path.join(dir, 'client-id');
-  try {
-    if (fs.existsSync(file)) {
-      const id = fs.readFileSync(file, 'utf8').trim();
-      if (id) return id;
-    }
-  } catch { /* 忽略，继续生成 */ }
-
-  const host = (os.hostname() || 'pc').toLowerCase().replace(/[^a-z0-9-]/g, '-').slice(0, 20);
-  const rand = Math.random().toString(36).slice(2, 8);
-  const id = `${host}-${rand}`;
-  try {
-    fs.mkdirSync(dir, { recursive: true });
-    fs.writeFileSync(file, id, 'utf8');
-  } catch { /* 不可写则每次生成，仅影响路由稳定性 */ }
-  return id;
-}
-
-/** 解析 CLI 参数：支持 --key value 与 --key=value，以及 -h/--help 等布尔位。 */
-function parseArgs(argv) {
-  const flags = {};
-  const positional = [];
-  for (let i = 0; i < argv.length; i += 1) {
-    const arg = argv[i];
-    if (arg.startsWith('--')) {
-      const [rawKey, inline] = arg.slice(2).split('=');
-      // --client-id → clientId：loadConfig 按驼峰读取，
-      // 曾因不做映射导致所有多词参数（--client-id/--log-level/…）静默失效
-      const key = rawKey.replace(/-([a-zA-Z])/g, (_, c) => c.toUpperCase());
-      if (inline !== undefined) {
-        flags[key] = inline;
-      } else {
-        const next = argv[i + 1];
-        if (next !== undefined && !next.startsWith('-')) {
-          flags[key] = next;
-          i += 1;
-        } else {
-          flags[key] = true;
-        }
-      }
-    } else if (arg.startsWith('-') && arg.length > 1) {
-      const short = arg.slice(1);
-      const map = { h: 'help', v: 'version' };
-      flags[map[short] || short] = true;
-    } else {
-      positional.push(arg);
-    }
-  }
-  return { flags, positional };
-}
-
-/** 组装最终配置。 */
-function loadConfig(flags = {}) {
-  const file = readConfigFile();
-  const env = process.env;
-  const target = resolveTarget();
-
-  const num = (v, d) => {
-    const n = Number.parseInt(v, 10);
-    return Number.isFinite(n) ? n : d;
-  };
-
-  const url =
-    flags.url ?? env.REMOTETYPE_URL ?? file.url ?? DEFAULT_SERVE_URL;
-
-  const cfg = {
-    url,
-    clientId: flags.clientId ?? env.REMOTETYPE_CLIENT_ID ?? file.clientId ?? ensureClientId(),
-    logLevel: flags.logLevel ?? env.REMOTETYPE_LOG_LEVEL ?? file.logLevel ?? 'info',
-    logDir: flags.logDir ?? env.REMOTETYPE_LOG_DIR ?? file.logDir ?? path.join(configDir(), 'logs'),
-    recordFile:
-      flags.recordFile ?? env.REMOTETYPE_RECORD_FILE ?? file.recordFile ??
-      path.join(configDir(), 'data', 'records.jsonl'),
-    // 队列与预处理
-    maxQueueSize: num(flags.maxQueueSize ?? env.REMOTETYPE_MAX_QUEUE ?? file.maxQueueSize, 100),
-    maxTextLength: num(flags.maxTextLength ?? env.REMOTETYPE_MAX_TEXT ?? file.maxTextLength, 5000),
-    // 子进程
-    restartDelayMs: num(flags.restartDelayMs ?? env.REMOTETYPE_RESTART_DELAY ?? file.restartDelayMs, 2000),
-    heartbeatMs: num(flags.heartbeatMs ?? env.REMOTETYPE_HEARTBEAT ?? file.heartbeatMs, 15000),
-    requestTimeoutMs: num(flags.requestTimeoutMs ?? env.REMOTETYPE_REQUEST_TIMEOUT ?? file.requestTimeoutMs, 30000),
-    // 二进制
-    agentPath: flags.agent ?? env.REMOTETYPE_AGENT ?? file.agentPath ?? null,
-    // 对齐模式（--align 开关：加密 + 输入实时对齐；--key 传配对 key）
-    align: flags.align === true,
-    alignKey: flags.key ?? env.REMOTETYPE_KEY ?? file.alignKey ?? null,
-    // 注册门禁 token（服务器设 RT_TOKEN 后必须携带同一值才能注册）
-    token: flags.token ?? env.REMOTETYPE_TOKEN ?? env.RT_TOKEN ?? file.token ?? null,
-    configDir: configDir(),
-    configFile: configFile(),
-    target,
-  };
-
-  return cfg;
-}
-
-module.exports = {
-  loadConfig,
-  parseArgs,
-  configDir,
-  configFile,
-  ensureClientId,
-  readConfigFile,
-  DEFAULT_SERVE_URL,
-};
+'use strict';
+
+/**
+ * 配置解析：默认值 < 配置文件 < 环境变量 < 命令行参数。
+ *
+ * 配置文件位置：~/.remotetype/config.json
+ * 环境变量前缀：REMOTETYPE_
+ */
+
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+const { resolveTarget } = require('./platform');
+
+/** 内置默认公网服务地址（用户可用 --url 或环境变量覆盖）。 */
+const DEFAULT_SERVE_URL = 'wss://remotetype.example.com/ws';
+
+/** 配置目录：~/.remotetype */
+function configDir() {
+  const base =
+    process.env.REMOTETYPE_HOME ||
+    (process.platform === 'win32'
+      ? path.join(process.env.APPDATA || os.homedir(), 'remotetype')
+      : path.join(os.homedir(), '.remotetype'));
+  return base;
+}
+
+function configFile() {
+  return path.join(configDir(), 'config.json');
+}
+
+function readConfigFile() {
+  const file = configFile();
+  try {
+    if (!fs.existsSync(file)) return {};
+    return JSON.parse(fs.readFileSync(file, 'utf8'));
+  } catch {
+    return {};
+  }
+}
+
+/** 生成/持久化 clientId：首次运行按 主机名-随机串 生成并落盘，保证稳定路由。 */
+function ensureClientId() {
+  const dir = configDir();
+  const file = path.join(dir, 'client-id');
+  try {
+    if (fs.existsSync(file)) {
+      const id = fs.readFileSync(file, 'utf8').trim();
+      if (id) return id;
+    }
+  } catch { /* 忽略，继续生成 */ }
+
+  const host = (os.hostname() || 'pc').toLowerCase().replace(/[^a-z0-9-]/g, '-').slice(0, 20);
+  const rand = Math.random().toString(36).slice(2, 8);
+  const id = `${host}-${rand}`;
+  try {
+    fs.mkdirSync(dir, { recursive: true });
+    fs.writeFileSync(file, id, 'utf8');
+  } catch { /* 不可写则每次生成，仅影响路由稳定性 */ }
+  return id;
+}
+
+/** 解析 CLI 参数：支持 --key value 与 --key=value，以及 -h/--help 等布尔位。 */
+function parseArgs(argv) {
+  const flags = {};
+  const positional = [];
+  for (let i = 0; i < argv.length; i += 1) {
+    const arg = argv[i];
+    if (arg.startsWith('--')) {
+      const [rawKey, inline] = arg.slice(2).split('=');
+      // --client-id → clientId：loadConfig 按驼峰读取，
+      // 曾因不做映射导致所有多词参数（--client-id/--log-level/…）静默失效
+      const key = rawKey.replace(/-([a-zA-Z])/g, (_, c) => c.toUpperCase());
+      if (inline !== undefined) {
+        flags[key] = inline;
+      } else {
+        const next = argv[i + 1];
+        if (next !== undefined && !next.startsWith('-')) {
+          flags[key] = next;
+          i += 1;
+        } else {
+          flags[key] = true;
+        }
+      }
+    } else if (arg.startsWith('-') && arg.length > 1) {
+      const short = arg.slice(1);
+      const map = { h: 'help', v: 'version' };
+      flags[map[short] || short] = true;
+    } else {
+      positional.push(arg);
+    }
+  }
+  return { flags, positional };
+}
+
+/** 组装最终配置。 */
+function loadConfig(flags = {}) {
+  const file = readConfigFile();
+  const env = process.env;
+  const target = resolveTarget();
+
+  const num = (v, d) => {
+    const n = Number.parseInt(v, 10);
+    return Number.isFinite(n) ? n : d;
+  };
+
+  const url =
+    flags.url ?? env.REMOTETYPE_URL ?? file.url ?? DEFAULT_SERVE_URL;
+
+  const cfg = {
+    url,
+    clientId: flags.clientId ?? env.REMOTETYPE_CLIENT_ID ?? file.clientId ?? ensureClientId(),
+    logLevel: flags.logLevel ?? env.REMOTETYPE_LOG_LEVEL ?? file.logLevel ?? 'info',
+    logDir: flags.logDir ?? env.REMOTETYPE_LOG_DIR ?? file.logDir ?? path.join(configDir(), 'logs'),
+    recordFile:
+      flags.recordFile ?? env.REMOTETYPE_RECORD_FILE ?? file.recordFile ??
+      path.join(configDir(), 'data', 'records.jsonl'),
+    // 队列与预处理
+    maxQueueSize: num(flags.maxQueueSize ?? env.REMOTETYPE_MAX_QUEUE ?? file.maxQueueSize, 100),
+    maxTextLength: num(flags.maxTextLength ?? env.REMOTETYPE_MAX_TEXT ?? file.maxTextLength, 5000),
+    // 子进程
+    restartDelayMs: num(flags.restartDelayMs ?? env.REMOTETYPE_RESTART_DELAY ?? file.restartDelayMs, 2000),
+    heartbeatMs: num(flags.heartbeatMs ?? env.REMOTETYPE_HEARTBEAT ?? file.heartbeatMs, 15000),
+    requestTimeoutMs: num(flags.requestTimeoutMs ?? env.REMOTETYPE_REQUEST_TIMEOUT ?? file.requestTimeoutMs, 30000),
+    // 二进制
+    agentPath: flags.agent ?? env.REMOTETYPE_AGENT ?? file.agentPath ?? null,
+    // 对齐模式（--align 开关：加密 + 输入实时对齐；--key 传配对 key）
+    align: flags.align === true,
+    alignKey: flags.key ?? env.REMOTETYPE_KEY ?? file.alignKey ?? null,
+    // 注册门禁 token（服务器设 RT_TOKEN 后必须携带同一值才能注册）
+    token: flags.token ?? env.REMOTETYPE_TOKEN ?? env.RT_TOKEN ?? file.token ?? null,
+    configDir: configDir(),
+    configFile: configFile(),
+    target,
+  };
+
+  return cfg;
+}
+
+module.exports = {
+  loadConfig,
+  parseArgs,
+  configDir,
+  configFile,
+  ensureClientId,
+  readConfigFile,
+  DEFAULT_SERVE_URL,
+};

package/lib/index.js

@@ -1,27 +1,27 @@
-'use strict';
-
-/**
- * 模块导出：把内部能力暴露出来，便于单元测试与二次开发。
- */
-
-const { AgentManager, STATE } = require('./agent');
-const { MessageQueue } = require('./queue');
-const { ServeClient } = require('./ws-client');
-const { LocalStore } = require('./store');
-const { Logger } = require('./logger');
-const sanitize = require('./sanitize');
-const platform = require('./platform');
-const config = require('./config');
-
-module.exports = {
-  AgentManager,
-  STATE,
-  MessageQueue,
-  ServeClient,
-  LocalStore,
-  Logger,
-  sanitize,
-  platform,
-  config,
-  version: require('../package.json').version,
-};
+'use strict';
+
+/**
+ * 模块导出：把内部能力暴露出来，便于单元测试与二次开发。
+ */
+
+const { AgentManager, STATE } = require('./agent');
+const { MessageQueue } = require('./queue');
+const { ServeClient } = require('./ws-client');
+const { LocalStore } = require('./store');
+const { Logger } = require('./logger');
+const sanitize = require('./sanitize');
+const platform = require('./platform');
+const config = require('./config');
+
+module.exports = {
+  AgentManager,
+  STATE,
+  MessageQueue,
+  ServeClient,
+  LocalStore,
+  Logger,
+  sanitize,
+  platform,
+  config,
+  version: require('../package.json').version,
+};

package/lib/logger.js

@@ -1,95 +1,95 @@
-'use strict';
-
-/**
- * 客户端日志器：控制台（带时间戳与级别色）+ 本地文件。
- * 与 server/src/logger.js 行为保持一致，便于两端日志对照排查。
- */
-
-const fs = require('fs');
-const path = require('path');
-
-const LEVELS = { debug: 10, info: 20, warn: 30, error: 40 };
-const COLORS = {
-  debug: '\x1b[90m',
-  info: '\x1b[36m',
-  warn: '\x1b[33m',
-  error: '\x1b[31m',
-  reset: '\x1b[0m',
-};
-
-function safeStringify(value) {
-  if (value === undefined) return undefined;
-  try {
-    const s = JSON.stringify(value);
-    if (s === undefined) return String(value);
-    return s.length > 2000 ? `${s.slice(0, 2000)}...(truncated)` : s;
-  } catch {
-    return String(value);
-  }
-}
-
-class Logger {
-  /**
-   * @param {object} opts
-   * @param {string} [opts.level]
-   * @param {string|null} [opts.logDir]
-   * @param {string} [opts.name]
-   * @param {boolean} [opts.console]
-   */
-  constructor(opts = {}) {
-    this.level = LEVELS[opts.level] ?? LEVELS.info;
-    this.name = opts.name || 'client';
-    this.printToConsole = opts.console !== false;
-    this.stream = null;
-    this.currentDay = null;
-
-    if (opts.logDir) {
-      this.logDir = opts.logDir;
-      try {
-        fs.mkdirSync(this.logDir, { recursive: true });
-        this._rotate();
-      } catch {
-        // 日志目录不可写时降级为纯控制台，不影响主流程
-        this.stream = null;
-      }
-    }
-  }
-
-  _rotate() {
-    const day = new Date().toISOString().slice(0, 10);
-    if (this.currentDay === day && this.stream) return;
-    if (this.stream) this.stream.end();
-    this.currentDay = day;
-    this.stream = fs.createWriteStream(path.join(this.logDir, `${this.name}-${day}.log`), {
-      flags: 'a',
-    });
-  }
-
-  _write(level, msg, meta) {
-    if (LEVELS[level] < this.level) return;
-    const ts = new Date().toISOString();
-    const metaStr = safeStringify(meta);
-    const line = `${ts} [${level.toUpperCase().padEnd(5)}] ${msg}${metaStr ? ` ${metaStr}` : ''}`;
-    if (this.printToConsole) {
-      process.stdout.write(`${COLORS[level] || ''}${line}${COLORS.reset}\n`);
-    }
-    if (this.stream) {
-      this._rotate();
-      this.stream.write(`${line}\n`);
-    }
-  }
-
-  debug(msg, meta) { this._write('debug', msg, meta); }
-  info(msg, meta) { this._write('info', msg, meta); }
-  warn(msg, meta) { this._write('warn', msg, meta); }
-  error(msg, meta) { this._write('error', msg, meta); }
-
-  close() {
-    if (this.stream) {
-      this.stream.end();
-      this.stream = null;
-    }
-  }
-}
-
-module.exports = { Logger, LEVELS };
+'use strict';
+
+/**
+ * 客户端日志器：控制台（带时间戳与级别色）+ 本地文件。
+ * 与 server/src/logger.js 行为保持一致，便于两端日志对照排查。
+ */
+
+const fs = require('fs');
+const path = require('path');
+
+const LEVELS = { debug: 10, info: 20, warn: 30, error: 40 };
+const COLORS = {
+  debug: '\x1b[90m',
+  info: '\x1b[36m',
+  warn: '\x1b[33m',
+  error: '\x1b[31m',
+  reset: '\x1b[0m',
+};
+
+function safeStringify(value) {
+  if (value === undefined) return undefined;
+  try {
+    const s = JSON.stringify(value);
+    if (s === undefined) return String(value);
+    return s.length > 2000 ? `${s.slice(0, 2000)}...(truncated)` : s;
+  } catch {
+    return String(value);
+  }
+}
+
+class Logger {
+  /**
+   * @param {object} opts
+   * @param {string} [opts.level]
+   * @param {string|null} [opts.logDir]
+   * @param {string} [opts.name]
+   * @param {boolean} [opts.console]
+   */
+  constructor(opts = {}) {
+    this.level = LEVELS[opts.level] ?? LEVELS.info;
+    this.name = opts.name || 'client';
+    this.printToConsole = opts.console !== false;
+    this.stream = null;
+    this.currentDay = null;
+
+    if (opts.logDir) {
+      this.logDir = opts.logDir;
+      try {
+        fs.mkdirSync(this.logDir, { recursive: true });
+        this._rotate();
+      } catch {
+        // 日志目录不可写时降级为纯控制台，不影响主流程
+        this.stream = null;
+      }
+    }
+  }
+
+  _rotate() {
+    const day = new Date().toISOString().slice(0, 10);
+    if (this.currentDay === day && this.stream) return;
+    if (this.stream) this.stream.end();
+    this.currentDay = day;
+    this.stream = fs.createWriteStream(path.join(this.logDir, `${this.name}-${day}.log`), {
+      flags: 'a',
+    });
+  }
+
+  _write(level, msg, meta) {
+    if (LEVELS[level] < this.level) return;
+    const ts = new Date().toISOString();
+    const metaStr = safeStringify(meta);
+    const line = `${ts} [${level.toUpperCase().padEnd(5)}] ${msg}${metaStr ? ` ${metaStr}` : ''}`;
+    if (this.printToConsole) {
+      process.stdout.write(`${COLORS[level] || ''}${line}${COLORS.reset}\n`);
+    }
+    if (this.stream) {
+      this._rotate();
+      this.stream.write(`${line}\n`);
+    }
+  }
+
+  debug(msg, meta) { this._write('debug', msg, meta); }
+  info(msg, meta) { this._write('info', msg, meta); }
+  warn(msg, meta) { this._write('warn', msg, meta); }
+  error(msg, meta) { this._write('error', msg, meta); }
+
+  close() {
+    if (this.stream) {
+      this.stream.end();
+      this.stream = null;
+    }
+  }
+}
+
+module.exports = { Logger, LEVELS };