eufy-security-client 4.1.0-dev.36 → 4.1.0-dev.38

package/build/eufysecurity.js

@@ -287,14 +287,30 @@ class EufySecurity extends tiny_typed_emitter_1.TypedEmitter {
         this.api.setSerialNumber(this.persistentData.serial_number);
         this.pushService = await service_1.PushNotificationService.initialize();
         this.pushService.on("connect", async (token) => {
-            this.pushCloudRegistered = await this.api.registerPushToken(token);
-            this.pushCloudChecked = await this.api.checkPushToken();
-            const megaRegistered = await this.megaTransition.registerMegaPushToken(token);
-            //TODO: Retry if failed with max retry to not lock account
-            // Push is "connected" if registration succeeded on EITHER backend: on a migrated account the
-            // legacy registration fails (no legacy session) but the v6 one carries the events.
-            if ((this.pushCloudRegistered && this.pushCloudChecked) || megaRegistered) {
-                logging_1.rootMainLogger.info("Push notification connection successfully established");
+            // Register the SAME FCM token on BOTH backends, INDEPENDENTLY. A migrated account is rejected
+            // by the legacy endpoint; a non-migrated one has no mega session. Whichever backend accepts the
+            // token delivers events — so one failing must never starve the other, and push counts as
+            // established if EITHER side accepted it.
+            let legacyOk = false;
+            try {
+                legacyOk = await this.api.registerPushToken(token);
+                legacyOk = legacyOk && (await this.api.checkPushToken());
+            }
+            catch (err) {
+                logging_1.rootMainLogger.warn("Legacy push token registration failed (v6 may still deliver)", {
+                    error: (0, utils_1.getError)((0, error_1.ensureError)(err)),
+                });
+            }
+            this.pushCloudRegistered = legacyOk;
+            this.pushCloudChecked = legacyOk;
+            // Adjust this call to match your build: inline it's this.registerMegaPushToken(token);
+            // after the refactor it's likely this.megaTransition.registerMegaPushToken(token).
+            const megaOk = await this.megaTransition.registerMegaPushToken(token); // must return boolean, best-effort, never throws
+            if (legacyOk || megaOk) {
+                logging_1.rootMainLogger.info("Push notification connection successfully established", {
+                    legacy: legacyOk,
+                    eufyMega: megaOk,
+                });
                 this.emit("push connect");
             }
             else {