@kenkaiiii/gg-core 5.84.2 → 5.84.3

package/dist/index.cjs

@@ -417,16 +417,19 @@ var import_gg_ai = require("@kenkaiiii/gg-ai");
 var MAX_BYTES = 10 * 1024 * 1024;
 var MIN_HEADROOM_BYTES = 64 * 1024;
 var fd = null;
-var bytesWritten = 0;
+var logPath = null;
+var fileBytes = 0;
+var processBytes = 0;
+var rotationFailed = false;
 var capped = false;
 var sessionId = "";
 var appName = "app";
 var cleanups = [];
 var exactSecrets = [];
-function rotateIfNeeded(filePath) {
+function rotateIfNeeded(filePath, force = false) {
   try {
     const st = import_node_fs2.default.statSync(filePath);
-    if (st.size <= MAX_BYTES - MIN_HEADROOM_BYTES) return;
+    if (!force && st.size <= MAX_BYTES - MIN_HEADROOM_BYTES) return;
     const rotated = `${filePath}.1`;
     try {
       import_node_fs2.default.unlinkSync(rotated);
@@ -436,6 +439,32 @@ function rotateIfNeeded(filePath) {
   } catch {
   }
 }
+function rotateOpenLog() {
+  if (fd === null || logPath === null) return false;
+  const sizeBefore = fileBytes;
+  try {
+    import_node_fs2.default.closeSync(fd);
+  } catch {
+  }
+  fd = null;
+  rotateIfNeeded(logPath, true);
+  try {
+    fd = import_node_fs2.default.openSync(logPath, "a");
+    fileBytes = import_node_fs2.default.fstatSync(fd).size;
+  } catch {
+    if (fd !== null) {
+      try {
+        import_node_fs2.default.closeSync(fd);
+      } catch {
+      }
+    }
+    fd = null;
+    capped = true;
+    return false;
+  }
+  if (fileBytes >= sizeBefore) rotationFailed = true;
+  return true;
+}
 function openLog(filePath, name) {
   if (fd !== null || capped) return false;
   appName = name;
@@ -449,24 +478,29 @@ function openLog(filePath, name) {
     fd = import_node_fs2.default.openSync(filePath, "a");
   } catch {
     fd = null;
-    bytesWritten = 0;
+    fileBytes = 0;
     return false;
   }
   try {
-    bytesWritten = import_node_fs2.default.fstatSync(fd).size;
+    fileBytes = import_node_fs2.default.fstatSync(fd).size;
   } catch {
     try {
       import_node_fs2.default.closeSync(fd);
     } catch {
     }
     fd = null;
-    bytesWritten = 0;
+    fileBytes = 0;
     return false;
   }
+  logPath = filePath;
+  processBytes = 0;
+  rotationFailed = false;
   sessionId = (0, import_node_crypto2.randomBytes)(4).toString("hex");
   try {
-    if (bytesWritten < MAX_BYTES) {
-      bytesWritten += import_node_fs2.default.writeSync(fd, "\n");
+    if (fileBytes < MAX_BYTES) {
+      const written = import_node_fs2.default.writeSync(fd, "\n");
+      fileBytes += written;
+      processBytes += written;
     }
   } catch {
   }
@@ -494,12 +528,12 @@ function log(level, category, message, data) {
   }
   line += "\n";
   const lineBytes = Buffer.byteLength(line);
-  if (bytesWritten + lineBytes > MAX_BYTES) {
+  if (processBytes + lineBytes > MAX_BYTES) {
     const capLine = `[${ts}] [sid=${sessionId}] [WARN] [logger] Log cap reached; file logging disabled until restart
 `;
     try {
-      if (bytesWritten + Buffer.byteLength(capLine) <= MAX_BYTES) {
-        bytesWritten += import_node_fs2.default.writeSync(fd, capLine);
+      if (fileBytes + Buffer.byteLength(capLine) <= MAX_BYTES) {
+        fileBytes += import_node_fs2.default.writeSync(fd, capLine);
       }
       import_node_fs2.default.closeSync(fd);
     } catch {
@@ -508,8 +542,12 @@ function log(level, category, message, data) {
     capped = true;
     return;
   }
+  if (fileBytes + lineBytes > MAX_BYTES && !rotationFailed && !rotateOpenLog()) return;
+  if (fd === null) return;
   try {
-    bytesWritten += import_node_fs2.default.writeSync(fd, line);
+    const written = import_node_fs2.default.writeSync(fd, line);
+    fileBytes += written;
+    processBytes += written;
   } catch {
   }
 }
@@ -525,7 +563,10 @@ function closeLogger(opts) {
     }
   }
   fd = null;
-  bytesWritten = 0;
+  logPath = null;
+  fileBytes = 0;
+  processBytes = 0;
+  rotationFailed = false;
   capped = false;
   exactSecrets = [];
   for (const unsub of cleanups) unsub();
@@ -2033,9 +2074,20 @@ var AuthStorage = class {
         const msg = err instanceof Error ? err.message : String(err);
         const isAuthFailure = /\((401|400)\)/.test(msg) || /invalid_grant|invalid_token|invalid.*refresh/i.test(msg) || /unauthorized/i.test(msg);
         if (isAuthFailure) {
-          delete latest[provider];
-          this.data = latest;
-          await atomicWriteFile(this.filePath, JSON.stringify(latest, null, 2));
+          const current = await readAuthData(this.filePath);
+          const currentCreds = current[provider];
+          if (currentCreds && currentCreds.refreshToken !== latestCreds.refreshToken) {
+            log(
+              "WARN",
+              "auth",
+              `${provider} token refresh was rejected, but another gg process already saved a newer credential \u2014 adopting it instead of signing out`
+            );
+            this.data = current;
+            return currentCreds;
+          }
+          delete current[provider];
+          this.data = current;
+          await atomicWriteFile(this.filePath, JSON.stringify(current, null, 2));
           throw new NotLoggedInError(provider);
         }
         throw err;