happy-imou-cloud 2.0.1 → 2.0.3

package/dist/{persistence-CzpZpiL3.mjs → persistence-CqgPgbzN.mjs}

@@ -1,7 +1,7 @@
-import { readFile, unlink, open, stat, mkdir, writeFile, rename } from 'node:fs/promises';
+import { readFile, unlink, mkdir, open, stat, writeFile, rename } from 'node:fs/promises';
 import { existsSync, unlinkSync, writeFileSync, readdirSync, readFileSync, constants } from 'node:fs';
 import { join, dirname } from 'node:path';
-import { c as configuration, l as logger, e as encodeBase64 } from './api-B5Ui8Fw0.mjs';
+import { c as configuration, l as logger, e as encodeBase64 } from './api-DpQIC-DJ.mjs';
 import * as z from 'zod';
 import 'axios';
 import 'chalk';
@@ -185,16 +185,37 @@ async function updateSettings(updater) {
   const LOCK_RETRY_INTERVAL_MS = 100;
   const MAX_LOCK_ATTEMPTS = 50;
   const STALE_LOCK_TIMEOUT_MS = 1e4;
+  const LOCK_CONTENTION_CODES = /* @__PURE__ */ new Set(["EEXIST", "EPERM", "EACCES", "EBUSY"]);
+  const LOCK_RELEASE_RETRYABLE_CODES = /* @__PURE__ */ new Set(["EPERM", "EACCES", "EBUSY"]);
   const lockFile = configuration.settingsFile + ".lock";
-  const tmpFile = `${configuration.settingsFile}.${process.pid}.${Date.now()}.tmp`;
+  const tmpFile = `${configuration.settingsFile}.${process.pid}.${Date.now()}.${Math.random().toString(36).slice(2)}.tmp`;
   let fileHandle;
   let attempts = 0;
+  if (!existsSync(configuration.happyCloudHomeDir)) {
+    await mkdir(configuration.happyCloudHomeDir, { recursive: true });
+  }
+  async function removeFileWithRetry(path) {
+    for (let attempt = 1; attempt <= 20; attempt++) {
+      try {
+        await unlink(path);
+        return;
+      } catch (err) {
+        if (err?.code === "ENOENT") {
+          return;
+        }
+        if (!LOCK_RELEASE_RETRYABLE_CODES.has(err?.code) || attempt === 20) {
+          throw err;
+        }
+        await new Promise((resolve) => setTimeout(resolve, 25));
+      }
+    }
+  }
   while (attempts < MAX_LOCK_ATTEMPTS) {
     try {
       fileHandle = await open(lockFile, constants.O_CREAT | constants.O_EXCL | constants.O_WRONLY);
       break;
     } catch (err) {
-      if (err.code === "EEXIST") {
+      if (LOCK_CONTENTION_CODES.has(err?.code)) {
         attempts++;
         await new Promise((resolve) => setTimeout(resolve, LOCK_RETRY_INTERVAL_MS));
         try {
@@ -224,11 +245,12 @@ async function updateSettings(updater) {
     return updated;
   } finally {
     if (existsSync(tmpFile)) {
-      await unlink(tmpFile).catch(() => {
+      await removeFileWithRetry(tmpFile).catch(() => {
       });
     }
-    await fileHandle.close();
-    await unlink(lockFile).catch(() => {
+    await fileHandle.close().catch(() => {
+    });
+    await removeFileWithRetry(lockFile).catch(() => {
     });
   }
 }

package/dist/{persistence-C33AMdtv.cjs → persistence-PzKU0QCa.cjs}

@@ -1,9 +1,9 @@
 'use strict';
 
 var promises = require('node:fs/promises');
-var fs = require('node:fs');
-var path = require('node:path');
-var api = require('./api-B8v4tczT.cjs');
+var node_fs = require('node:fs');
+var node_path = require('node:path');
+var api = require('./api-D9dIR956.cjs');
 var z = require('zod');
 require('axios');
 require('chalk');
@@ -169,7 +169,7 @@ function migrateSettings(raw, fromVersion) {
   return migrated;
 }
 async function readSettings() {
-  if (!fs.existsSync(api.configuration.settingsFile)) {
+  if (!node_fs.existsSync(api.configuration.settingsFile)) {
     return { ...defaultSettings };
   }
   try {
@@ -206,16 +206,37 @@ async function updateSettings(updater) {
   const LOCK_RETRY_INTERVAL_MS = 100;
   const MAX_LOCK_ATTEMPTS = 50;
   const STALE_LOCK_TIMEOUT_MS = 1e4;
+  const LOCK_CONTENTION_CODES = /* @__PURE__ */ new Set(["EEXIST", "EPERM", "EACCES", "EBUSY"]);
+  const LOCK_RELEASE_RETRYABLE_CODES = /* @__PURE__ */ new Set(["EPERM", "EACCES", "EBUSY"]);
   const lockFile = api.configuration.settingsFile + ".lock";
-  const tmpFile = `${api.configuration.settingsFile}.${process.pid}.${Date.now()}.tmp`;
+  const tmpFile = `${api.configuration.settingsFile}.${process.pid}.${Date.now()}.${Math.random().toString(36).slice(2)}.tmp`;
   let fileHandle;
   let attempts = 0;
+  if (!node_fs.existsSync(api.configuration.happyCloudHomeDir)) {
+    await promises.mkdir(api.configuration.happyCloudHomeDir, { recursive: true });
+  }
+  async function removeFileWithRetry(path) {
+    for (let attempt = 1; attempt <= 20; attempt++) {
+      try {
+        await promises.unlink(path);
+        return;
+      } catch (err) {
+        if (err?.code === "ENOENT") {
+          return;
+        }
+        if (!LOCK_RELEASE_RETRYABLE_CODES.has(err?.code) || attempt === 20) {
+          throw err;
+        }
+        await new Promise((resolve) => setTimeout(resolve, 25));
+      }
+    }
+  }
   while (attempts < MAX_LOCK_ATTEMPTS) {
     try {
-      fileHandle = await promises.open(lockFile, fs.constants.O_CREAT | fs.constants.O_EXCL | fs.constants.O_WRONLY);
+      fileHandle = await promises.open(lockFile, node_fs.constants.O_CREAT | node_fs.constants.O_EXCL | node_fs.constants.O_WRONLY);
       break;
     } catch (err) {
-      if (err.code === "EEXIST") {
+      if (LOCK_CONTENTION_CODES.has(err?.code)) {
         attempts++;
         await new Promise((resolve) => setTimeout(resolve, LOCK_RETRY_INTERVAL_MS));
         try {
@@ -237,19 +258,20 @@ async function updateSettings(updater) {
   try {
     const current = await readSettings() || { ...defaultSettings };
     const updated = await updater(current);
-    if (!fs.existsSync(api.configuration.happyCloudHomeDir)) {
+    if (!node_fs.existsSync(api.configuration.happyCloudHomeDir)) {
       await promises.mkdir(api.configuration.happyCloudHomeDir, { recursive: true });
     }
     await promises.writeFile(tmpFile, JSON.stringify(updated, null, 2));
     await promises.rename(tmpFile, api.configuration.settingsFile);
     return updated;
   } finally {
-    if (fs.existsSync(tmpFile)) {
-      await promises.unlink(tmpFile).catch(() => {
+    if (node_fs.existsSync(tmpFile)) {
+      await removeFileWithRetry(tmpFile).catch(() => {
       });
     }
-    await fileHandle.close();
-    await promises.unlink(lockFile).catch(() => {
+    await fileHandle.close().catch(() => {
+    });
+    await removeFileWithRetry(lockFile).catch(() => {
     });
   }
 }
@@ -269,7 +291,7 @@ const credentialsSchema = z__namespace.object({
   }).nullish()
 });
 async function readCredentials() {
-  if (!fs.existsSync(api.configuration.privateKeyFile)) {
+  if (!node_fs.existsSync(api.configuration.privateKeyFile)) {
     return null;
   }
   try {
@@ -301,7 +323,7 @@ async function readCredentials() {
   return null;
 }
 async function writeCredentialsLegacy(credentials) {
-  if (!fs.existsSync(api.configuration.happyCloudHomeDir)) {
+  if (!node_fs.existsSync(api.configuration.happyCloudHomeDir)) {
     await promises.mkdir(api.configuration.happyCloudHomeDir, { recursive: true });
   }
   await promises.writeFile(api.configuration.privateKeyFile, JSON.stringify({
@@ -311,7 +333,7 @@ async function writeCredentialsLegacy(credentials) {
   }, null, 2));
 }
 async function writeCredentialsDataKey(credentials) {
-  if (!fs.existsSync(api.configuration.happyCloudHomeDir)) {
+  if (!node_fs.existsSync(api.configuration.happyCloudHomeDir)) {
     await promises.mkdir(api.configuration.happyCloudHomeDir, { recursive: true });
   }
   await promises.writeFile(api.configuration.privateKeyFile, JSON.stringify({
@@ -321,7 +343,7 @@ async function writeCredentialsDataKey(credentials) {
   }, null, 2));
 }
 async function clearCredentials() {
-  if (fs.existsSync(api.configuration.privateKeyFile)) {
+  if (node_fs.existsSync(api.configuration.privateKeyFile)) {
     await promises.unlink(api.configuration.privateKeyFile);
   }
 }
@@ -333,7 +355,7 @@ async function clearMachineId() {
 }
 async function readDaemonState() {
   try {
-    if (!fs.existsSync(api.configuration.daemonStateFile)) {
+    if (!node_fs.existsSync(api.configuration.daemonStateFile)) {
       return null;
     }
     const content = await promises.readFile(api.configuration.daemonStateFile, "utf-8");
@@ -344,13 +366,13 @@ async function readDaemonState() {
   }
 }
 function writeDaemonState(state) {
-  fs.writeFileSync(api.configuration.daemonStateFile, JSON.stringify(state, null, 2), "utf-8");
+  node_fs.writeFileSync(api.configuration.daemonStateFile, JSON.stringify(state, null, 2), "utf-8");
 }
 async function clearDaemonState() {
-  if (fs.existsSync(api.configuration.daemonStateFile)) {
+  if (node_fs.existsSync(api.configuration.daemonStateFile)) {
     await promises.unlink(api.configuration.daemonStateFile);
   }
-  if (fs.existsSync(api.configuration.daemonLockFile)) {
+  if (node_fs.existsSync(api.configuration.daemonLockFile)) {
     try {
       await promises.unlink(api.configuration.daemonLockFile);
     } catch {
@@ -359,7 +381,7 @@ async function clearDaemonState() {
 }
 async function acquireDaemonLock(maxAttempts = 3, delayIncrementMs = 1e3) {
   const lockFileName = `daemon.lock.${process.pid}.${Date.now()}`;
-  const lockFile = path.join(path.dirname(api.configuration.daemonLockFile), lockFileName);
+  const lockFile = node_path.join(node_path.dirname(api.configuration.daemonLockFile), lockFileName);
   api.logger.debug(`[ACQUIRE LOCK] Attempting to acquire lock: ${lockFile}`);
   api.logger.debug(`[ACQUIRE LOCK] Platform: ${process.platform}, PID: ${process.pid}`);
   const isPidAlive = (pid) => {
@@ -372,8 +394,8 @@ async function acquireDaemonLock(maxAttempts = 3, delayIncrementMs = 1e3) {
   };
   const readLockPid = () => {
     try {
-      if (fs.existsSync(lockFile)) {
-        const content = fs.readFileSync(lockFile, "utf-8").trim();
+      if (node_fs.existsSync(lockFile)) {
+        const content = node_fs.readFileSync(lockFile, "utf-8").trim();
         const pid = parseInt(content, 10);
         if (!isNaN(pid) && pid > 0) {
           return pid;
@@ -384,7 +406,7 @@ async function acquireDaemonLock(maxAttempts = 3, delayIncrementMs = 1e3) {
     return null;
   };
   const writeLockPid = (pid) => {
-    fs.writeFileSync(lockFile, String(pid), "utf-8");
+    node_fs.writeFileSync(lockFile, String(pid), "utf-8");
   };
   for (let attempt = 1; attempt <= maxAttempts; attempt++) {
     api.logger.debug(`[ACQUIRE LOCK] Attempt ${attempt}/${maxAttempts}`);
@@ -401,9 +423,9 @@ async function acquireDaemonLock(maxAttempts = 3, delayIncrementMs = 1e3) {
       api.logger.debug(`[ACQUIRE LOCK] No existing lock file`);
     }
     try {
-      if (fs.existsSync(lockFile)) {
+      if (node_fs.existsSync(lockFile)) {
         try {
-          fs.unlinkSync(lockFile);
+          node_fs.unlinkSync(lockFile);
           api.logger.debug(`[ACQUIRE LOCK] Removed existing lock file`);
         } catch (unlinkError) {
           api.logger.debug(`[ACQUIRE LOCK] Could not remove lock file, trying anyway`);
@@ -450,17 +472,17 @@ async function releaseDaemonLock(lockHandle) {
   } catch {
   }
   try {
-    if (fs.existsSync(api.configuration.daemonLockFile)) {
-      fs.unlinkSync(api.configuration.daemonLockFile);
+    if (node_fs.existsSync(api.configuration.daemonLockFile)) {
+      node_fs.unlinkSync(api.configuration.daemonLockFile);
       api.logger.debug(`[RELEASE LOCK] Released daemon lock`);
     }
-    const lockDir = path.dirname(api.configuration.daemonLockFile);
+    const lockDir = node_path.dirname(api.configuration.daemonLockFile);
     try {
-      const files = fs.readdirSync(lockDir);
+      const files = node_fs.readdirSync(lockDir);
       for (const file of files) {
         if (file.startsWith("daemon.lock.") && file.includes(`.${process.pid}.`)) {
-          const lockPath = path.join(lockDir, file);
-          fs.unlinkSync(lockPath);
+          const lockPath = node_path.join(lockDir, file);
+          node_fs.unlinkSync(lockPath);
           api.logger.debug(`[RELEASE LOCK] Released lock: ${file}`);
         }
       }

package/dist/{registerKillSessionHandler-BkzQulD9.cjs → registerKillSessionHandler-BDBPoQSA.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
-var index = require('./index-BOqJ9hwi.cjs');
-var api = require('./api-B8v4tczT.cjs');
+var index = require('./index-LYPXVO_L.cjs');
+var api = require('./api-D9dIR956.cjs');
 var crypto = require('crypto');
 require('axios');
 require('node:events');

package/dist/{registerKillSessionHandler-BtSK7IOa.mjs → registerKillSessionHandler-C3M_-4Zg.mjs}

@@ -1,5 +1,5 @@
-import { f as formatDisplayMessage } from './index-BByhFIIq.mjs';
-import { l as logger } from './api-B5Ui8Fw0.mjs';
+import { f as formatDisplayMessage } from './index-CriPm_z9.mjs';
+import { l as logger } from './api-DpQIC-DJ.mjs';
 import { createHash } from 'crypto';
 import 'axios';
 import 'node:events';