Address PR comments.

Author: meenie

src/browser/base/content/zen-assets.jar.inc.mn

@@ -52,8 +52,9 @@
         content/browser/zen-styles/zen-gradient-generator.css                   (../../zen/workspaces/zen-gradient-generator.css)
 
         content/browser/zen-components/ZenKeyboardShortcuts.mjs                 (../../zen/kbs/ZenKeyboardShortcuts.mjs)
-        content/browser/zen/modules/ZenAirTrafficControl.mjs                    (../../zen/modules/ZenAirTrafficControl.mjs)
-        content/browser/zen/modules/ZenAirTrafficControlIntegration.mjs         (../../zen/modules/ZenAirTrafficControlIntegration.mjs)
+
+        content/browser/zen-components/ZenAirTrafficControl.mjs                 (../../zen/atc/ZenAirTrafficControl.mjs)
+        content/browser/zen-components/ZenAirTrafficControlIntegration.mjs      (../../zen/atc/ZenAirTrafficControlIntegration.mjs)
 
         content/browser/zen-components/ZenPinnedTabsStorage.mjs                 (../../zen/tabs/ZenPinnedTabsStorage.mjs)
         content/browser/zen-components/ZenPinnedTabManager.mjs                  (../../zen/tabs/ZenPinnedTabManager.mjs)

src/browser/components/preferences/zen-air-traffic-control.js

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const { ZenAirTrafficControl } = ChromeUtils.importESModule(
-  'chrome://browser/content/zen/modules/ZenAirTrafficControl.mjs'
+  'chrome://browser/content/zen-components/ZenAirTrafficControl.mjs'
 );
 
 var gZenAirTrafficControlPane = {

src/browser/modules/BrowserDOMWindow-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/modules/BrowserDOMWindow.sys.mjs b/browser/modules/BrowserDOMWindow.sys.mjs
-index 2bc4918c15b5ea80e486db66d20bb9668b9e29c0..c73cc27d443623b935c8243ed165acc399571bb6 100644
+index 2bc4918c15b5ea80e486db66d20bb9668b9e29c0..261ac326fe233df89b1a33870e0fbcf384783122 100644
 --- a/browser/modules/BrowserDOMWindow.sys.mjs
 +++ b/browser/modules/BrowserDOMWindow.sys.mjs
 @@ -42,7 +42,6 @@ export class BrowserDOMWindow {
@@ -10,27 +10,23 @@ index 2bc4918c15b5ea80e486db66d20bb9668b9e29c0..c73cc27d443623b935c8243ed165acc3
    constructor(win) {
      this.win = win;
    }
-@@ -151,14 +150,45 @@ export class BrowserDOMWindow {
+@@ -151,6 +150,34 @@ export class BrowserDOMWindow {
        console.error("openURI should only be called with a valid URI");
        throw Components.Exception("", Cr.NS_ERROR_FAILURE);
      }
 +
 +    // Zen Air Traffic Control integration - intercept external links
 +    if (aURI && (aFlags & Ci.nsIBrowserDOMWindow.OPEN_EXTERNAL)) {
 +      try {
-+        const { ZenAirTrafficControlIntegration } = ChromeUtils.importESModule(
-+          "chrome://browser/content/zen/modules/ZenAirTrafficControlIntegration.mjs"
-+        );
-+
-+        const decision = ZenAirTrafficControlIntegration.handleExternalLink(
++        const decision = this.win.ZenAirTrafficControlIntegration.handleExternalLink(
 +          aURI,
 +          aWhere,
 +          this.win
 +        );
 +
 +        if (decision) {
 +          // Execute the routing and return the browsing context
-+          const browsingContext = ZenAirTrafficControlIntegration.executeRouting(
++          const browsingContext = this.win.ZenAirTrafficControlIntegration.executeRouting(
 +            decision,
 +            aURI,
 +            this.win
@@ -49,16 +45,7 @@ index 2bc4918c15b5ea80e486db66d20bb9668b9e29c0..c73cc27d443623b935c8243ed165acc3
      return this.getContentWindowOrOpenURI(
        aURI,
        aOpenWindowInfo,
-       aWhere,
-       aFlags,
-       aTriggeringPrincipal,
--      aCsp,
--      false
-+      aCsp
-     );
-   }
- 
-@@ -362,7 +392,7 @@ export class BrowserDOMWindow {
+@@ -362,7 +389,7 @@ export class BrowserDOMWindow {
      // Passing a null-URI to only create the content window,
      // and pass true for aSkipLoad to prevent loading of
      // about:blank
@@ -67,7 +54,7 @@ index 2bc4918c15b5ea80e486db66d20bb9668b9e29c0..c73cc27d443623b935c8243ed165acc3
        null,
        aParams,
        aWhere,
-@@ -370,6 +400,10 @@ export class BrowserDOMWindow {
+@@ -370,6 +397,10 @@ export class BrowserDOMWindow {
        aName,
        true
      );

src/zen/modules/ZenAirTrafficControl.mjs renamed to src/zen/atc/ZenAirTrafficControl.mjs

@@ -2,8 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-// --- helpers --------------------------------------------------------------
-
 const escapeRegExp = (str) => str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 
 const MATCHER_FACTORIES = {
@@ -13,33 +11,27 @@ const MATCHER_FACTORIES = {
   endsWith: (v) => new RegExp(`${escapeRegExp(v)}$`, 'i'),
   regex: (v) => new RegExp(v, 'i'),
 };
-
 const VALID_MATCH_TYPES = Object.keys(MATCHER_FACTORIES);
 
-// Environment helpers (Firefox chrome JS) ----------------------------------
 const PREF_KEY = 'zen.airTrafficControl.rules';
 const readPref = () => Services.prefs.getStringPref(PREF_KEY, '[]');
 const writePref = (json) => Services.prefs.setStringPref(PREF_KEY, json);
 
-// --- class ----------------------------------------------------------------
 class ZenAirTrafficControlImpl {
   _rules = [];
   _initialized = false;
 
-  /* --------------------------------------------------------------------- */
   init() {
     if (this._initialized) return;
-    this._loadRules();
+    this.loadRules();
     this._initialized = true;
   }
 
-  // Convenience – auto-initialise on first public call.
   _ensureInit() {
     if (!this._initialized) this.init();
   }
 
-  /* --------------------------------------------------------------------- */
-  _loadRules() {
+  loadRules() {
     try {
       this._rules = JSON.parse(readPref());
       this._sortRules();
@@ -49,7 +41,7 @@ class ZenAirTrafficControlImpl {
     }
   }
 
-  _saveRules() {
+  saveRules() {
     try {
       writePref(JSON.stringify(this._rules));
     } catch (e) {
@@ -61,7 +53,6 @@ class ZenAirTrafficControlImpl {
     this._rules.sort((a, b) => a.createdAt - b.createdAt);
   }
 
-  /* --------------------------------------------------------------------- */
   _validateRuleShape({ matchType, matchValue, workspaceId }) {
     if (!VALID_MATCH_TYPES.includes(matchType)) {
       throw new Error(`ZenATC: invalid matchType '${matchType}'`);
@@ -74,7 +65,6 @@ class ZenAirTrafficControlImpl {
     }
   }
 
-  /* --------------------------------------------------------------------- */
   createRule(rule) {
     this._ensureInit();
     this._validateRuleShape(rule);
@@ -88,7 +78,7 @@ class ZenAirTrafficControlImpl {
 
     this._rules.push(newRule);
     this._sortRules();
-    this._saveRules();
+    this.saveRules();
     return newRule;
   }
 
@@ -101,22 +91,20 @@ class ZenAirTrafficControlImpl {
     this._validateRuleShape(updated);
 
     this._rules[idx] = updated;
-    this._saveRules();
+    this.saveRules();
   }
 
   deleteRule(uuid) {
     this._ensureInit();
     this._rules = this._rules.filter((r) => r.uuid !== uuid);
-    this._saveRules();
+    this.saveRules();
   }
 
-  /* --------------------------------------------------------------------- */
   getRules() {
     this._ensureInit();
     return [...this._rules];
   }
 
-  /* --------------------------------------------------------------------- */
   _createMatcher(rule) {
     const factory = MATCHER_FACTORIES[rule.matchType];
     return factory(rule.matchValue);
@@ -127,26 +115,13 @@ class ZenAirTrafficControlImpl {
     return this._rules.find((r) => r.enabled && this._createMatcher(r).test(url)) || null;
   }
 
-  /* --------------------------------------------------------------------- */
   routeURL(url, _context = {}) {
     this._ensureInit();
     const rule = this._findFirstMatchingRule(url);
     if (!rule) return null;
     return { rule, workspaceId: rule.workspaceId };
   }
 
-  /* --------------------------------------------------------------------- */
-  // Compatibility wrappers ------------------------------------------------
-  /** Reload rules from storage (primarily used by tests/UI). */
-  loadRules() {
-    this._loadRules();
-  }
-
-  /** Persist current rule list to storage (primarily used by tests/UI). */
-  saveRules() {
-    this._saveRules();
-  }
-
   /** Return *all* enabled rules that match the given URL. */
   findMatchingRules(url) {
     this._ensureInit();
@@ -161,5 +136,4 @@ class ZenAirTrafficControlImpl {
   }
 }
 
-// Single exported instance (backward-compatible with previous object export)
 export const ZenAirTrafficControl = new ZenAirTrafficControlImpl();

src/zen/modules/ZenAirTrafficControlIntegration.mjs renamed to src/zen/atc/ZenAirTrafficControlIntegration.mjs

@@ -6,7 +6,7 @@ const lazy = {};
 
 ChromeUtils.defineLazyGetter(lazy, 'ZenAirTrafficControl', () => {
   const { ZenAirTrafficControl } = ChromeUtils.importESModule(
-    'chrome://browser/content/zen/modules/ZenAirTrafficControl.mjs'
+    'chrome://browser/content/zen-components/ZenAirTrafficControl.mjs'
   );
   return ZenAirTrafficControl;
 });

src/zen/common/ZenStartup.mjs

@@ -68,11 +68,11 @@
     _initAirTrafficControl() {
       try {
         const { ZenAirTrafficControl } = ChromeUtils.importESModule(
-          'chrome://browser/content/zen/modules/ZenAirTrafficControl.mjs'
+          'chrome://browser/content/zen-components/ZenAirTrafficControl.mjs'
         );
 
         const { ZenAirTrafficControlIntegration } = ChromeUtils.importESModule(
-          'chrome://browser/content/zen/modules/ZenAirTrafficControlIntegration.mjs'
+          'chrome://browser/content/zen-components/ZenAirTrafficControlIntegration.mjs'
         );
 
         ZenAirTrafficControl.init();

src/zen/workspaces/ZenWorkspaces.mjs

@@ -2280,6 +2280,7 @@ var gZenWorkspaces = new (class extends ZenMultiWindowFeature {
     // routed workspace, and then the workspace gets switched back to the previously
     // active workspace.
     if (tab.hasAttribute('zen-atc-created')) {
+      tab.removeAttribute('zen-atc-created');
       return;
     }