@mega-yfue/eufy-sdk 0.5.0-beta.55 → 0.5.0-beta.57

package/dist/index.js

@@ -1605,6 +1605,8 @@ var MegaHttpClient = class {
   /** True while a 2FA code is outstanding: `auth_` holds only the limited pre-verify token, so the
    *  restored-session short-circuit must NOT treat it as a usable session. Cleared on Ok/reset. */
   pending2fa = false;
+  /** An autonomous re-login answered captcha/2FA; see {@link canReauthenticate}. */
+  reloginChallenged = false;
   tokenExpiresAt = 0;
   /**
    * Stable per-install device id: `openudid` as configured, as restored from the session store, or as
@@ -1656,6 +1658,7 @@ var MegaHttpClient = class {
    *
    * Read at construction, and again when a rejection is being recovered from — a store SHARED with another
    * client may already hold the session that client obtained, which is cheaper to adopt than to compete with.
+   * An adopted session is a complete one, so it ends any 2FA or challenged re-login this client was left with.
    *
    * Note: the device identity (openudid + phone model + media UA) is NOT restored here — it is resolved once
    * in the constructor, where an explicit config wins over the stored value, and must not be re-derived from a
@@ -1674,6 +1677,8 @@ var MegaHttpClient = class {
       geoKey: saved.geoKey
     };
     this.tokenExpiresAt = saved.tokenExpiresAt;
+    this.pending2fa = false;
+    this.reloginChallenged = false;
     this.sessionKey = {
       keyIdent: saved.keyIdent,
       shareKey: saved.shareKey,
@@ -2358,11 +2363,13 @@ ${this.auth_?.authToken ?? ""}`;
    * Structural rather than a list of paths: a login round trip is itself an authenticated call while a limited
    * token is held, so re-logging in from inside one would recurse — and a path list would have to be
    * maintained alongside every request the login flow makes. A 2FA code already outstanding is a login a human
-   * is part-way through, and restarting it silently would discard it. No credentials means nothing to try,
+   * is part-way through, and restarting it silently would discard it. A re-login that already came back needing
+   * a captcha or a 2FA code would need the same again, and each attempt sends the account another code, so
+   * none is tried until a login completes or a stored session is adopted. No credentials means nothing to try,
    * so the rejection surfaces instead.
    */
   canReauthenticate() {
-    return !!this.cfg.email && !!this.cfg.password && !this.loggingIn && !this.pending2fa;
+    return !!this.cfg.email && !!this.cfg.password && !this.loggingIn && !this.pending2fa && !this.reloginChallenged;
   }
   /**
    * Replace a rejected token by running the login state machine again, at most once at a time.
@@ -2379,8 +2386,10 @@ ${this.auth_?.authToken ?? ""}`;
     this.reauthAttempt ??= this.login().then((result) => {
       if (result.status === LoginStatus.Ok)
         this.logger.debug("[mega] token was rejected \u2014 logged in again");
-      else
+      else {
+        this.reloginChallenged = true;
         this.logger.warn(`[mega] token was rejected and the re-login needs ${result.status} \u2014 cannot recover`);
+      }
       return result.status === LoginStatus.Ok;
     }).catch((e) => {
       this.logger.warn(`[mega] re-login failed: ${e instanceof Error ? e.message : String(e)}`);
@@ -2457,6 +2466,7 @@ ${this.auth_?.authToken ?? ""}`;
     }
     this.pendingCaptchaId = void 0;
     this.pending2fa = false;
+    this.reloginChallenged = false;
     this.auth_ = { userId, accountUserId, authToken, geoKey };
     this.tokenExpiresAt = reply.tokenExpiresAt;
     this.sessionKey = void 0;
@@ -4591,7 +4601,7 @@ function decodePowerSource(raw) {
 function recordSetting(param, value, ctx) {
   return setStationScalar(param, value, ctx.channel);
 }
-var MAINS_CAMERA_MODELS = ["T8425", "T8419", "T8410", "T84A1", "T8423"];
+var MAINS_CAMERA_MODELS = ["T8425", "T8419", "T8410", "T84A1", "T8423", "T8E00", "T8P00"];
 function cameraPowerTier(model, capabilities) {
   return capabilities.has("battery") && notMainsCamera({ model }) ? "battery" : "wired";
 }
@@ -17575,7 +17585,7 @@ var P2PSession = class _P2PSession extends EventEmitter2 {
       } catch {
       }
     }
-    if (header.commandId === CMD_GATEWAYINFO && header.signCode === 1 && !this.level2Key && !this.level2Negotiating && this.cfg.resolveCipherKey) {
+    if (header.commandId === CMD_GATEWAYINFO && header.signCode <= 1 && !this.level2Key && !this.level2Negotiating && this.cfg.resolveCipherKey) {
       this.negotiateLevel2Key(data);
     }
     if (header.commandId === CMD_DATABASE && header.signCode > 0) {