@xiaoyuanhao/yunzhi-cli 2.1.2 → 2.1.3

package/lib/auth-context.cjs

@@ -1,6 +1,7 @@
 // Conversation authorization state is local to the command working directory.
 const fs = require('node:fs/promises');
 const path = require('node:path');
+const net = require('node:net');
 const { createHash } = require('node:crypto');
 const { root, loadConfig } = require('./storage.cjs');
 const { gatewayURL } = require('./gateway.cjs');
@@ -18,9 +19,20 @@ async function withState(action, create = false) {
   const info = await fs.lstat(directory);
   if (!info.isDirectory() || info.isSymbolicLink()) throw stopped('授权上下文目录无效。');
   const file = path.join(directory, hash(process.cwd()) + '.json');
-  let lock;
-  try { lock = await fs.open(file + '.lock', 'wx', 0o600); }
-  catch (error) { if (error.code === 'EEXIST') throw stopped('本工作目录的授权操作正在进行或上次被中断，请先检查该操作。'); throw error; }
+  // A loopback listener is only a process mutex; the OS releases it on exit.
+  // A port collision fails closed instead of choosing a different mutex.
+  const port = 49152 + parseInt(hash(path.resolve(file)).slice(0, 4), 16) % 16384;
+  const lock = net.createServer(socket => socket.destroy());
+  try {
+    await new Promise((resolve, reject) => {
+      lock.once('error', reject);
+      lock.listen({ host: '127.0.0.1', port, exclusive: true }, resolve);
+    });
+  } catch (error) {
+    throw stopped(error.code === 'EADDRINUSE'
+      ? '授权操作正在进行，或本机授权互斥端口被占用；本次未执行操作。'
+      : '无法取得本机授权互斥锁；本次未执行操作。');
+  }
   try {
     let state = null;
     try {
@@ -29,11 +41,12 @@ async function withState(action, create = false) {
       state = JSON.parse(await fs.readFile(file, 'utf8'));
     } catch (error) { if (error.code !== 'ENOENT') throw error; }
     const save = async value => {
-      await fs.writeFile(file + '.tmp', JSON.stringify(value), { mode: 0o600, flag: 'wx' });
-      await fs.rename(file + '.tmp', file);
+      const handle = await fs.open(file, 'w', 0o600);
+      try { await handle.writeFile(JSON.stringify(value)); await handle.sync(); }
+      finally { await handle.close(); }
     };
     return await action(state, save);
-  } finally { await lock.close(); await fs.unlink(file + '.lock'); }
+  } finally { await new Promise((resolve, reject) => lock.close(error => error ? reject(error) : resolve())); }
 }
 async function binding() {
   const config = await loadConfig();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xiaoyuanhao/yunzhi-cli",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "description": "Yunzhi Campus CLI for lesson preparation and school library workflows",
   "bin": {
     "yunzhi-cli": "yunzhi-cli.cjs"