@bobfrankston/rmfmail 1.2.122 → 1.2.124

package/client/android-bootstrap.bundle.js

@@ -5822,13 +5822,13 @@ var WebMailxService = class _WebMailxService {
       raw = await this.syncManager.fetchMessageBody(accountId, envelope.folderId, envelope.uid);
     } catch (fetchErr) {
       const rawErr = fetchErr.message || "fetch failed";
-      const isTransient = /connection|Too many|UNAVAILABLE|rate|429|5\d\d|timeout|ENOTFOUND|ECONNRESET|ETIMEDOUT/i.test(rawErr);
+      const serverSaysGone = /no such message|not found|does not exist|nonexistent|expunged|invalid uid/i.test(rawErr);
       return {
         ...envelope,
         bodyHtml: "",
         bodyText: "",
         bodyError: rawErr,
-        bodyErrorTransient: isTransient,
+        bodyErrorTransient: !serverSaysGone,
         hasRemoteContent: false,
         remoteAllowed: false,
         attachments: [],
@@ -7226,6 +7226,13 @@ Accept: application/json\r
 };
 
 // ../../MailApps/tcp-transport/bridge-tcp-transport.js
+function bridge() {
+  const g = globalThis;
+  const api = g.msgapi || g._nativeBridge;
+  if (!api?.tcp)
+    throw new Error("TCP bridge not available \u2014 host has not injected msgapi/_nativeBridge (yet)");
+  return api;
+}
 var BridgeTcpTransport = class {
   streamId = null;
   dataHandler = null;
@@ -7237,18 +7244,19 @@ var BridgeTcpTransport = class {
     return this._connected;
   }
   async connect(host, port, tls, _servername) {
-    this.streamId = await msgapi.tcp.connect(host, port, tls);
+    const api = bridge();
+    this.streamId = await api.tcp.connect(host, port, tls);
     this._connected = true;
-    msgapi.tcp.onData(this.streamId, (data) => {
+    api.tcp.onData(this.streamId, (data) => {
       if (this.dataHandler)
         this.dataHandler(this.encoder.encode(data));
     });
-    msgapi.tcp.onClose(this.streamId, (hadError) => {
+    api.tcp.onClose(this.streamId, (hadError) => {
       this._connected = false;
       if (this.closeHandler)
         this.closeHandler(hadError);
     });
-    msgapi.tcp.onError(this.streamId, (message) => {
+    api.tcp.onError(this.streamId, (message) => {
       if (this.errorHandler)
         this.errorHandler(new Error(message));
     });
@@ -7256,13 +7264,13 @@ var BridgeTcpTransport = class {
   async upgradeTLS(servername) {
     if (this.streamId == null)
       throw new Error("Not connected");
-    await msgapi.tcp.upgradeTLS(this.streamId, servername || "");
+    await bridge().tcp.upgradeTLS(this.streamId, servername || "");
   }
   async write(data) {
     if (this.streamId == null)
       throw new Error("Not connected");
     const s = typeof data === "string" ? data : new TextDecoder().decode(data);
-    await msgapi.tcp.write(this.streamId, s);
+    await bridge().tcp.write(this.streamId, s);
   }
   onData(handler) {
     this.dataHandler = handler;
@@ -7276,7 +7284,7 @@ var BridgeTcpTransport = class {
   close() {
     if (this.streamId != null) {
       try {
-        msgapi.tcp.close(this.streamId);
+        bridge().tcp.close(this.streamId);
       } catch {
       }
       this.streamId = null;
@@ -10736,8 +10744,8 @@ function createNativeTokenProvider(email) {
         }
       }
     }
-    const bridge = window._nativeBridge;
-    if (!bridge?.app?.startOAuth) {
+    const bridge2 = window._nativeBridge;
+    if (!bridge2?.app?.startOAuth) {
       throw new Error("No native OAuth bridge");
     }
     const authUrl = `${OAUTH_CLIENT.authUri}?` + new URLSearchParams({
@@ -10750,7 +10758,7 @@ function createNativeTokenProvider(email) {
       login_hint: email
     }).toString();
     console.log(`[oauth] Starting browser consent for ${email}`);
-    const code = await bridge.app.startOAuth(authUrl);
+    const code = await bridge2.app.startOAuth(authUrl);
     const tokens = await exchangeCodeForTokens(code);
     const token = {
       access_token: tokens.access_token,
@@ -10765,11 +10773,11 @@ function createNativeTokenProvider(email) {
 async function registerDeviceInGDrive(tokenProvider2, folderId, accountIds) {
   try {
     const token = await tokenProvider2();
-    const bridge = window._nativeBridge;
+    const bridge2 = window._nativeBridge;
     let deviceId = "android-unknown";
-    if (bridge?.app?.getAndroidId) {
+    if (bridge2?.app?.getAndroidId) {
       try {
-        const androidId = await bridge.app.getAndroidId();
+        const androidId = await bridge2.app.getAndroidId();
         deviceId = `android-${androidId.substring(0, 12)}`;
       } catch {
         deviceId = `android-${getDeviceId().substring(0, 8)}`;
@@ -11282,9 +11290,9 @@ function installBridge() {
       return { ok: true };
     },
     getDeviceAccounts: async () => {
-      const bridge = window._nativeBridge;
-      if (bridge?.app?.getDeviceAccounts) {
-        return bridge.app.getDeviceAccounts();
+      const bridge2 = window._nativeBridge;
+      if (bridge2?.app?.getDeviceAccounts) {
+        return bridge2.app.getDeviceAccounts();
       }
       return [];
     },
@@ -11329,9 +11337,9 @@ function installBridge() {
     repairAccounts: async () => ({ ok: false, error: "Use desktop for repair" }),
     resetStore: () => resetStore(),
     resetAll: async () => {
-      const bridge = window._nativeBridge;
-      if (bridge?.app?.resetAll) {
-        await bridge.app.resetAll();
+      const bridge2 = window._nativeBridge;
+      if (bridge2?.app?.resetAll) {
+        await bridge2.app.resetAll();
       } else {
         await resetStore();
         location.reload();