updates related to #1509

extension/chrome/elements/add_pubkey.ts

@@ -19,8 +19,8 @@ import { KeyUtil } from '../../js/common/core/crypto/key.js';
 
 View.run(
   class AddPubkeyView extends View {
+    public readonly parentTabId: string;
     private readonly acctEmail: string;
-    private readonly parentTabId: string;
     private readonly missingPubkeyEmails: string[];
     private readonly fetchKeyUi = new FetchKeyUI();
     private readonly attachmentUI = new AttachmentUI(() =>
@@ -86,7 +86,7 @@ View.run(
     };
 
     private closeDialog = () => {
-      BrowserMsg.send.closeDialog(this.parentTabId);
+      BrowserMsg.send.closeDialog(this);
     };
 
     private copyFromEmailHandler = async (fromSelect: HTMLElement) => {

extension/chrome/elements/attachment.ts

@@ -43,7 +43,7 @@ export class AttachmentDownloadView extends View {
   private originalButtonHTML: string | undefined;
   private canClickOnAttachment = false;
   private downloadInProgress = false;
-  private tabId!: string;
+  private readonly tabId = BrowserMsg.generateTabId();
 
   public constructor() {
     super();
@@ -89,7 +89,6 @@ export class AttachmentDownloadView extends View {
   };
 
   public render = async () => {
-    this.tabId = await BrowserMsg.requiredTabId();
     const storage = await AcctStore.get(this.acctEmail, ['setup_done', 'email_provider', 'fesUrl']);
     this.fesUrl = storage.fesUrl;
     try {
@@ -320,7 +319,7 @@ export class AttachmentDownloadView extends View {
       errorDetailsOpened,
       this.frameId
     );
-    BrowserMsg.send.showAttachmentPreview(this.parentTabId, { iframeUrl });
+    BrowserMsg.send.showAttachmentPreview(this, { iframeUrl });
   };
 
   private decryptAndSaveAttachmentToDownloads = async () => {

extension/chrome/elements/attachment_preview.ts

@@ -73,7 +73,7 @@ View.run(
           }
           $('body').on('click', e => {
             if (e.target === document.body || $('body').children().toArray().indexOf(e.target) !== -1) {
-              BrowserMsg.send.closeDialog(this.parentTabId);
+              BrowserMsg.send.closeDialog(this);
             }
           });
           $('#attachment-preview-download')

extension/chrome/elements/compose.ts

@@ -50,7 +50,7 @@ export class ComposeView extends View {
   public threadId = '';
   public ppChangedPromiseCancellation: PromiseCancellation = { cancel: false };
 
-  public tabId!: string;
+  public readonly tabId = BrowserMsg.generateTabId();
   public factory!: XssSafeFactory;
   public replyParams: ReplyParams | undefined;
   public emailProvider: EmailProviderInterface;
@@ -170,7 +170,6 @@ export class ComposeView extends View {
       opgp.config.showVersion = false;
     }
     this.pubLookup = new PubLookup(this.clientConfiguration);
-    this.tabId = await BrowserMsg.requiredTabId();
     this.factory = new XssSafeFactory(this.acctEmail, this.tabId);
     this.draftModule = new ComposeDraftModule(this);
     this.quoteModule = new ComposeQuoteModule(this);

extension/chrome/elements/passphrase.ts

@@ -26,8 +26,8 @@ type PassPhraseType = (typeof passPhraseTypes)[number];
 View.run(
   class PassphraseView extends View {
     public fesUrl?: string;
+    public readonly parentTabId: string;
     private readonly acctEmail: string;
-    private readonly parentTabId: string;
     private readonly longids: string[];
     private readonly type: PassPhraseType;
     private readonly initiatorFrameId?: string;
@@ -196,8 +196,8 @@ View.run(
     };
 
     private closeDialog = (entered = false, initiatorFrameId?: string) => {
-      BrowserMsg.send.closeDialog(this.parentTabId);
-      BrowserMsg.send.passphraseEntry('broadcast', { entered, initiatorFrameId });
+      BrowserMsg.send.closeDialog(this);
+      BrowserMsg.send.passphraseEntry({ entered, initiatorFrameId });
     };
 
     private submitHandler = async () => {

extension/chrome/elements/pgp_block.ts

@@ -27,7 +27,7 @@ export class PgpBlockView extends View {
   public readonly errorModule: PgpBlockViewErrorModule;
   public readonly renderModule: PgpBlockViewRenderModule;
   public readonly printModule = new PgpBlockViewPrintModule();
-  private tabId!: string;
+  private readonly tabId = BrowserMsg.generateTabId();
 
   public constructor() {
     super();
@@ -49,7 +49,7 @@ export class PgpBlockView extends View {
   };
 
   public render = async () => {
-    this.tabId = await BrowserMsg.requiredTabId();
+    //
   };
 
   public setHandlers = () => {
@@ -62,7 +62,7 @@ export class PgpBlockView extends View {
     });
     BrowserMsg.addListener('confirmation_result', CommonHandlers.createAsyncResultHandler());
     BrowserMsg.listen(this.tabId);
-    BrowserMsg.send.pgpBlockReady({ frameId: this.frameId, messageSender: this.tabId });
+    BrowserMsg.send.pgpBlockReady(this, { frameId: this.frameId, messageSender: this.tabId });
   };
 
   private processMessage = (data: RenderMessage) => {

extension/chrome/elements/pgp_block_modules/pgp-block-attachmens-module.ts

@@ -79,7 +79,7 @@ export class PgpBlockViewAttachmentsModule {
   private previewAttachmentClickedHandler = async (attachment: Attachment) => {
     const factory = new XssSafeFactory(this.view.acctEmail, this.view.parentTabId);
     const iframeUrl = factory.srcPgpAttachmentIframe(attachment, false, undefined, 'chrome/elements/attachment_preview.htm');
-    BrowserMsg.send.showAttachmentPreview(this.view.parentTabId, { iframeUrl });
+    BrowserMsg.send.showAttachmentPreview(this.view, { iframeUrl });
   };
 
   private decryptAndSaveAttachmentToDownloads = async (encrypted: Attachment) => {

extension/chrome/elements/pgp_block_modules/pgp-block-render-module.ts

@@ -145,7 +145,7 @@ export class PgpBlockViewRenderModule {
   public renderSignatureOffline = () => {
     this.renderSignatureStatus('error verifying signature: offline, click to retry').on(
       'click',
-      this.view.setHandler(() => BrowserMsg.send.pgpBlockRetry({ frameId: this.view.frameId, messageSender: this.view.getDest() }))
+      this.view.setHandler(() => BrowserMsg.send.pgpBlockRetry(this.view, { frameId: this.view.frameId, messageSender: this.view.getDest() }))
     );
   };
 }

extension/chrome/settings/inbox/inbox.ts

@@ -44,7 +44,7 @@ export class InboxView extends View {
   public messageRenderer!: MessageRenderer;
   public factory!: XssSafeFactory;
   public picture?: string;
-  public tabId!: string;
+  public readonly tabId = BrowserMsg.generateTabId();
   public relayManager!: RelayManager;
 
   public constructor() {
@@ -64,7 +64,6 @@ export class InboxView extends View {
   }
 
   public render = async () => {
-    this.tabId = await BrowserMsg.requiredTabId();
     this.relayManager = new RelayManager(this.debug);
     this.factory = new XssSafeFactory(this.acctEmail, this.tabId);
     this.injector = new Injector('settings', undefined, this.factory);
@@ -101,7 +100,6 @@ export class InboxView extends View {
     // BrowserMsg.addPgpListeners(); // todo - re-allow when https://github.com/FlowCrypt/flowcrypt-browser/issues/2560 fixed
     this.addBrowserMsgListeners();
     BrowserMsg.listen(this.tabId);
-    BrowserMsg.listenForWindowMessages(); // listen for direct messages from child iframes
     Catch.setHandledInterval(this.webmailCommon.addOrRemoveEndSessionBtnIfNeeded, 30000);
     $('.action_open_settings').on(
       'click',

extension/chrome/settings/index.ts

@@ -39,7 +39,7 @@ View.run(
     private readonly advanced: boolean;
 
     private readonly gmail: Gmail | undefined;
-    private tabId!: string;
+    private readonly tabId = BrowserMsg.generateTabId();
     private notifications!: Notifications;
     private clientConfiguration: ClientConfiguration | undefined;
     private acctServer: AccountServer | undefined;
@@ -74,7 +74,6 @@ View.run(
       for (const webmailLName of await Env.webmails()) {
         $('.signin_button.' + webmailLName).css('display', 'inline-block');
       }
-      this.tabId = await BrowserMsg.requiredTabId();
       this.notifications = new Notifications();
       await this.acctServer?.initialize();
       if (this.acctEmail) {

extension/chrome/settings/modules/contacts.ts

@@ -40,7 +40,7 @@ View.run(
     }
 
     public render = async () => {
-      const tabId = await BrowserMsg.requiredTabId();
+      const tabId = BrowserMsg.generateTabId();
       BrowserMsg.listen(tabId); // set_css
       const storage = await AcctStore.get(this.acctEmail, ['fesUrl']);
       this.fesUrl = storage.fesUrl;

extension/chrome/settings/modules/decrypt.ts

@@ -35,7 +35,7 @@ View.run(
     }
 
     public render = async () => {
-      const tabId = await BrowserMsg.requiredTabId();
+      const tabId = BrowserMsg.generateTabId();
       this.factory = new XssSafeFactory(this.acctEmail, tabId);
       BrowserMsg.addListener('close_dialog', async () => {
         $('.passphrase_dialog').text('');

extension/chrome/settings/setup.ts

@@ -64,7 +64,7 @@ export class SetupView extends View {
   public readonly setupWithEmailKeyManager: SetupWithEmailKeyManagerModule;
   public readonly backupUi: BackupUi;
 
-  public tabId!: string;
+  public readonly tabId = BrowserMsg.generateTabId();
   public storage!: AcctStoreDict;
   public clientConfiguration!: ClientConfiguration;
   public pubLookup!: PubLookup;
@@ -159,7 +159,6 @@ export class SetupView extends View {
       $('.input_backup_inbox').prop('checked', false).prop('disabled', true);
       $('.remove_if_backup_not_allowed').remove();
     }
-    this.tabId = await BrowserMsg.requiredTabId();
     await this.setupRender.renderInitial();
   };
 
@@ -174,10 +173,7 @@ export class SetupView extends View {
     $('.action_send').attr('href', Google.webmailUrl(this.acctEmail));
     $('.action_show_help').on(
       'click',
-      this.setHandler(
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        async () => await Settings.renderSubPage(this.acctEmail, this.tabId!, '/chrome/settings/modules/help.htm')
-      )
+      this.setHandler(async () => await Settings.renderSubPage(this.acctEmail, this.tabId, '/chrome/settings/modules/help.htm'))
     );
     $('#button-go-back')
       .off()

extension/js/background_page/background_page.ts

@@ -70,9 +70,8 @@ console.info('background_process.js starting');
   BrowserMsg.bgAddListener('update_uninstall_url', BgHandlers.updateUninstallUrl);
   BrowserMsg.bgAddListener('get_active_tab_info', BgHandlers.getActiveTabInfo);
   BrowserMsg.bgAddListener('reconnect_acct_auth_popup', (r: Bm.ReconnectAcctAuthPopup) => GoogleAuth.newAuthPopup(r));
-  BrowserMsg.bgAddListener('_tab_', BgHandlers.respondWithSenderTabId);
   BrowserMsg.bgListen();
 
-  await BgHandlers.updateUninstallUrl({}, {});
+  await BgHandlers.updateUninstallUrl({});
   injectFcIntoWebmail();
 })().catch(Catch.reportErr);

extension/js/background_page/bg-handlers.ts

@@ -29,26 +29,15 @@ export class BgHandlers {
     return await dbFunc(db, ...request.args);
   };
 
-  public static ajaxHandler = async (r: Bm.Ajax, sender: Bm.Sender): Promise<Bm.Res.Ajax> => {
+  public static ajaxHandler = async (r: Bm.Ajax): Promise<Bm.Res.Ajax> => {
     if (r.req.context?.operationId) {
       // progress updates were requested via messages
-      let dest = r.req.context.tabId;
-      if (typeof dest === 'undefined') {
-        // detect tabId from sender
-        if (sender !== 'background') {
-          if (typeof sender?.tab?.id !== 'undefined') {
-            dest = `${sender.tab.id}:0`;
-          }
-        }
-      }
-      if (typeof dest !== 'undefined') {
-        const destination = dest;
-        const operationId = r.req.context.operationId;
-        const expectedTransferSize = r.req.context.expectedTransferSize;
-        r.req.xhr = Api.getAjaxProgressXhrFactory({
-          download: (percent, loaded, total) => BrowserMsg.send.ajaxProgress(destination, { percent, loaded, total, expectedTransferSize, operationId }),
-        });
-      }
+      const destination = r.req.context.tabId;
+      const operationId = r.req.context.operationId;
+      const expectedTransferSize = r.req.context.expectedTransferSize;
+      r.req.xhr = Api.getAjaxProgressXhrFactory({
+        download: (percent, loaded, total) => BrowserMsg.send.ajaxProgress(destination, { percent, loaded, total, expectedTransferSize, operationId }),
+      });
     }
     return await Api.ajax(r.req, r.stack);
   };
@@ -90,21 +79,4 @@ export class BgHandlers {
         }
       });
     });
-
-  public static respondWithSenderTabId = async (r: Bm._tab_, sender: Bm.Sender): Promise<Bm.Res._tab_> => {
-    if (sender === 'background') {
-      return { tabId: null }; // eslint-disable-line no-null/no-null
-    } else if (typeof sender.tab?.id === 'number' && sender.tab.id > 0) {
-      const tabId = `${sender.tab.id}:${sender.frameId}`;
-      if (r.contentScript) {
-        BrowserMsg.contentScriptsRegistry.add(tabId);
-      }
-      return { tabId };
-    } else {
-      // sender.tab: "This property will only be present when the connection was opened from a tab (including content scripts)"
-      // https://developers.chrome.com/extensions/runtime#type-MessageSender
-      // MDN says the same - thus this is most likely a background script, through browser message passing
-      return { tabId: null }; // eslint-disable-line no-null/no-null
-    }
-  };
 }

extension/js/common/api/shared/api.ts

@@ -25,7 +25,7 @@ type RawAjaxErr = {
   status?: number;
   statusText?: string;
 };
-export type ProgressDestFrame = { operationId: string; expectedTransferSize: number; tabId?: string };
+export type ProgressDestFrame = { operationId: string; expectedTransferSize: number; tabId: string };
 export type ApiCallContext = ProgressDestFrame | undefined;
 
 export type ChunkedCb = (r: ProviderContactsResults) => Promise<void>;