react-native-email-imap-smtp 0.3.11 → 0.3.12

package/lib/typescript/server/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/src/index.ts"],"names":[],"mappings":"AAiHA,OAAO,OAAO,MAAM,SAAS,CAAC;AAO9B,QAAA,MAAM,GAAG,EAAE,OAAO,CAAC,OAAmB,CAAC;AACvC,QAAA,MAAM,MAAM,mHAAoB,CAAC;AAgajC,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B;AAED,wBAAsB,WAAW,CAC/B,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,YAAY,CAAC,CAuBvB;AAQD,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/src/index.ts"],"names":[],"mappings":"AAiHA,OAAO,OAAO,MAAM,SAAS,CAAC;AAO9B,QAAA,MAAM,GAAG,EAAE,OAAO,CAAC,OAAmB,CAAC;AACvC,QAAA,MAAM,MAAM,mHAAoB,CAAC;AAscjC,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B;AAED,wBAAsB,WAAW,CAC/B,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,YAAY,CAAC,CAuBvB;AAQD,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-email-imap-smtp",
-  "version": "0.3.11",
+  "version": "0.3.12",
   "description": "The best of imap and smtp client of react native",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",
@@ -9,7 +9,7 @@
   },
   "exports": {
     ".": {
-      "react-native-email-imap-smtp-source": "./src/index.tsx",
+      "react-native-email-imap-smtp-source": "./sr/index.tsx",
       "types": "./lib/typescript/src/index.d.ts",
       "default": "./lib/module/index.js"
     },

package/server/bin.mjs

@@ -7,9 +7,14 @@
 //   email-imap-proxy                   默认：分离模式（启动后退出，代理后台运行）
 //   email-imap-proxy --foreground      前台模式（保持运行，Ctrl+C 停止）
 //   email-imap-proxy -f                同上
+//   email-imap-proxy --window          新开终端窗口显示日志（推荐）
+//   email-imap-proxy -w                同上
 //   email-imap-proxy --port 3987       指定端口
 //   email-imap-proxy --silent          静默模式
 //
+// 关闭代理:
+//   关闭日志窗口即可（如果使用 --window）或直接关闭终端
+//
 // 与 dev server 一起使用:
 //   email-imap-proxy & vite            ← Windows/Linux 通吃
 //   email-imap-proxy & webpack serve
@@ -23,6 +28,8 @@
 //   await startEmailProxy();
 // ============================================================
 
+import { spawn } from 'child_process';
+import { fileURLToPath } from 'url';
 import { startEmailProxy } from './proxy.mjs';
 
 // ─── 解析命令行参数 ─────────────────────────────────────
@@ -31,10 +38,40 @@ const args = process.argv.slice(2);
 const portIndex = args.indexOf('--port');
 const port = portIndex >= 0 ? parseInt(args[portIndex + 1], 10) : parseInt(process.env.PROXY_PORT ?? '3987', 10);
 const silent = args.includes('--silent') || process.env.PROXY_SILENT === '1';
-// 分离模式为默认行为（解决 Windows & 不阻塞）
 const foreground = args.includes('--foreground') || args.includes('-f');
+const openWindow = args.includes('--window') || args.includes('-w');
+
+// 将当前终端 PID 传给代理服务器，用于父终端存活检测
+// 仅当未被外部传入时设置（--window 模式会显式传入原始终端 PID）
+if (!process.env.PROXY_WATCH_PPID) {
+  process.env.PROXY_WATCH_PPID = String(process.ppid);
+}
+
+// ─── --window 模式 ──────────────────────────────────────
+// 在新终端窗口中运行代理（foreground 模式），方便查看调试日志
+
+if (openWindow && !foreground) {
+  const scriptPath = fileURLToPath(import.meta.url);
+  const nodeExe = process.execPath;
+  // process.ppid 是当前终端（cmd.exe/shell）的 PID
+  const termPid = process.ppid;
+
+  if (process.platform === 'win32') {
+    const cmd = `start "Email Proxy :${port}" cmd /c "set PROXY_WATCH_PPID=${termPid}&& \\"${nodeExe}\\" \\"${scriptPath}\\" --foreground --port ${port}"`;
+    spawn('cmd', ['/c', cmd], { stdio: 'ignore', detached: true, windowsHide: false }).unref();
+  } else {
+    spawn('open', ['-a', 'Terminal', scriptPath, '--args', '--foreground', `--port=${port}`], {
+      stdio: 'ignore', detached: true,
+      env: { ...process.env, PROXY_WATCH_PPID: String(termPid) }
+    }).unref();
+  }
+
+  console.log(`[email-proxy] 启动代理 :${port}`);
+  console.log(`[email-proxy] 日志窗口已打开，关闭此终端即可停止`);
+  process.exit(0);
+}
 
-// ─── 启动 ───────────────────────────────────────────────
+// ─── 正常启动 ───────────────────────────────────────────────
 
 startEmailProxy({ port, silent, detach: !foreground }).then((handle) => {
   handle.onStderr((msg) => {

package/server/src/index.ts

@@ -531,6 +531,44 @@ function broadcastNotification(sessionId: string, notification: any): void {
   }
 }
 
+// ══════════════════════════════════════════════════════════════
+// 父终端检测 — 自动关闭
+// ══════════════════════════════════════════════════════════════
+// 当 PROXY_WATCH_PPID 环境变量设置时，定时检测该进程是否存活。
+// 如果启动代理的网页终端（如 Vite/Webpack 终端）已关闭，
+// 服务器自动退出，避免残留进程。
+// ══════════════════════════════════════════════════════════════
+
+const watchPid = process.env.PROXY_WATCH_PPID
+  ? parseInt(process.env.PROXY_WATCH_PPID, 10)
+  : 0;
+
+if (watchPid > 0) {
+  let cleanExit = false;
+  const timer = setInterval(() => {
+    try {
+      process.kill(watchPid, 0);
+    } catch {
+      // 父进程已不存在，自动关闭服务器
+      cleanExit = true;
+      clearInterval(timer);
+      console.log('[email-proxy] 父终端已关闭，正在停止服务...');
+
+      for (const id of imap.getAllSessionIds()) {
+        try { imap.disconnect(id); } catch {}
+      }
+      for (const id of smtp.getAllSessionIds()) {
+        try { smtp.disconnect(id); } catch {}
+      }
+
+      server.close(() => process.exit(0));
+      setTimeout(() => process.exit(0), 3000);
+    }
+  }, 3000);
+
+  process.on('exit', () => { if (!cleanExit) clearInterval(timer); });
+}
+
 // ══════════════════════════════════════════════════════════════
 // 启动 (程序化 API)
 // ══════════════════════════════════════════════════════════════