Merge branch 'main' into jkt/seenBeforeDay

.github/workflows/beta.yml

@@ -9,7 +9,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: 'npm'

.github/workflows/checks.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: 'npm'
@@ -26,7 +26,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.version }}
           cache: 'npm'
@@ -36,7 +36,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: 'npm'
@@ -53,7 +53,7 @@ jobs:
         shard: [1/4, 2/4, 3/4, 4/4]
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: 'npm'

.github/workflows/ddg2dnr.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
           cache: 'npm'
@@ -27,7 +27,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
           cache: 'npm'

.github/workflows/privacy-grade.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: 'npm'
@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: 'npm'

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
     if: "contains(github.event.head_commit.message, 'ci release')"
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: 'npm'

.github/workflows/stage.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: 'npm'

Makefile

@@ -261,7 +261,7 @@ BUILD_TARGETS += $(BUILD_DIR)/public/js/inject.js
 ## SASS
 SASS = node_modules/.bin/sass
 SCSS_SOURCE = $(shell find shared/scss/ -type f)
-OUTPUT_CSS_FILES = $(BUILD_DIR)/public/css/noatb.css $(BUILD_DIR)/public/css/options.css $(BUILD_DIR)/public/css/feedback.css
+OUTPUT_CSS_FILES = $(BUILD_DIR)/public/css/options.css $(BUILD_DIR)/public/css/feedback.css
 $(BUILD_DIR)/public/css/base.css: shared/scss/base/base.scss $(SCSS_SOURCE)
 	$(SASS) $< $@
 $(BUILD_DIR)/public/css/%.css: shared/scss/%.scss $(SCSS_SOURCE)

browsers/chrome-mv3/manifest.json

@@ -37,21 +37,6 @@
         "extension_pages": "script-src 'self'; object-src 'self'; frame-ancestors https://duckduckgo.com https://*.duckduckgo.com"
     },
     "content_scripts": [
-        {
-            "matches": [
-                "<all_urls>"
-            ],
-            "exclude_matches": [
-                "*://localhost/*",
-                "*://*.localhost/*"
-            ],
-            "match_about_blank": true,
-            "all_frames": true,
-            "css": [
-                "public/css/noatb.css"
-            ],
-            "run_at": "document_start"
-        },
         {
             "js": [
                 "public/js/content-scripts/autofill.js"

browsers/chrome/manifest.json

@@ -47,9 +47,6 @@
             ],
             "match_about_blank": true,
             "all_frames": true,
-            "css": [
-                "public/css/noatb.css"
-            ],
             "js": [
                 "public/js/inject.js"
             ],

browsers/firefox/manifest.json

@@ -48,9 +48,6 @@
             ],
             "match_about_blank": true,
             "all_frames": true,
-            "css": [
-                "public/css/noatb.css"
-            ],
             "js": [
                 "public/js/inject.js"
             ],

integration-test/atb.spec.js

@@ -52,7 +52,7 @@ test.describe('install workflow', () => {
             })
 
             // try get ATB params
-            await backgroundPage.evaluate(() => globalThis.dbg.atb.updateATBValues())
+            await backgroundPage.evaluate(async () => globalThis.dbg.atb.updateATBValues(await globalThis.dbg.Wrapper.getDDGTabUrls()))
 
             // wait for an exti call
             // eslint-disable-next-line no-unmodified-loop-condition
@@ -87,7 +87,7 @@ test.describe('install workflow', () => {
             await page.goto('https://duckduckgo.com/?natb=v123-4ab&cp=atbhc', { waitUntil: 'networkidle' })
 
             // try get ATB params again
-            await backgroundPage.evaluate(() => globalThis.dbg.atb.updateATBValues())
+            await backgroundPage.evaluate(async () => globalThis.dbg.atb.updateATBValues(await globalThis.dbg.Wrapper.getDDGTabUrls()))
             // eslint-disable-next-line no-unmodified-loop-condition
             while (numExtiCalled < 0) {
                 page.waitForTimeout(100)

package.json

@@ -45,7 +45,7 @@
         "eslint-config-standard": "^17.1.0",
         "eslint-plugin-import": "^2.29.0",
         "eslint-plugin-node": "^11.1.0",
-        "fake-indexeddb": "^5.0.0",
+        "fake-indexeddb": "^5.0.1",
         "glob": "^10.3.10",
         "jasmine": "5.0.2",
         "jsdom": "^22.0.0",
@@ -55,7 +55,7 @@
         "karma-source-map-support": "1.4.0",
         "node-fetch": "^3.3.2",
         "puppeteer": "^19.3.0",
-        "sass": "^1.69.4",
+        "sass": "^1.69.5",
         "standard": "17.1.0",
         "timekeeper": "^2.3.1",
         "typescript": "^5.2.2",

shared/js/background/atb.js

@@ -157,15 +157,14 @@ const ATB = (() => {
             return new URLSearchParams()
         },
 
-        updateATBValues: () => {
+        updateATBValues: (ddgTabUrls) => {
             // wait until settings is ready to try and get atb from the page
             return settings.ready()
                 .then(ATB.setInitialVersions)
-                .then(browserWrapper.getDDGTabUrls)
-                .then((urls) => {
+                .then(() => {
                     let atb
                     let params
-                    urls.some(url => {
+                    ddgTabUrls.some(url => {
                         params = ATB.getAcceptedParamsFromURL(url)
                         atb = params.has('atb') && params.get('atb')
                         return !!atb

shared/js/background/broken-site-report.js

@@ -199,7 +199,8 @@ export async function breakageReportForTab ({
         urlParametersRemoved,
         ctlYouTube,
         ctlFacebookPlaceholderShown,
-        ctlFacebookLogin
+        ctlFacebookLogin,
+        protectionsState: tab.site.isFeatureEnabled('contentBlocking') ? '1' : '0'
     })
 
     for (const [key, value] of Object.entries(requestCategories)) {

shared/js/background/events.js

@@ -36,13 +36,15 @@ async function onInstalled (details) {
     tdsStorage.initOnInstall()
 
     if (details.reason.match(/install/)) {
+        // get tab URLs immediately to prevent race with install page
+        const ddgTabUrls = await browserWrapper.getDDGTabUrls()
         await settings.ready()
         settings.updateSetting('showWelcomeBanner', true)
         if (browserName === 'chrome') {
             settings.updateSetting('showCounterMessaging', true)
             settings.updateSetting('shouldFireIncontextEligibilityPixel', true)
         }
-        await ATB.updateATBValues()
+        await ATB.updateATBValues(ddgTabUrls)
         await ATB.openPostInstallPage()
 
         if (browserName === 'chrome') {

shared/js/background/wrapper.js

@@ -85,14 +85,6 @@ export function mergeSavedSettings (settings, results) {
 
 export async function getDDGTabUrls () {
     const tabs = await browser.tabs.query({ url: 'https://*.duckduckgo.com/*' }) || []
-
-    tabs.forEach(tab => {
-        insertCSS({
-            target: { tabId: tab.id },
-            files: ['/public/css/noatb.css']
-        })
-    })
-
     return tabs.map(tab => tab.url)
 }
 

unit-test/background/atb.js

@@ -249,37 +249,23 @@ describe('complex install workflow cases', () => {
     })
 
     it('should handle the install process correctly if there\'s no DDG pages open', () => {
-        spyOn(browser.tabs, 'query').and.returnValue(Promise.resolve([]))
-
-        return atb.updateATBValues()
+        return atb.updateATBValues([])
             .then(() => {
                 validateExtiWasHit('v112-2')
                 expect(settings.getSetting('atb')).toEqual('v112-2')
                 expect(settings.getSetting('set_atb')).toEqual('v112-2')
             })
     })
     it('should handle the install process correctly if there\'s DDG pages open that pass an ATB param', () => {
-        // pretend one of the pages has an ATB to pass
-        spyOn(browser.tabs, 'query').and.returnValue([
-            { url: 'https://duckduckgo.com/about' },
-            { url: 'https://duckduckgo.com/?natb=v112-2ab' }
-        ])
-
-        return atb.updateATBValues()
+        return atb.updateATBValues(['https://duckduckgo.com/about', 'https://duckduckgo.com/?natb=v112-2ab'])
             .then(() => {
                 validateExtiWasHit('v112-2ab')
                 expect(settings.getSetting('atb')).toEqual('v112-2ab')
                 expect(settings.getSetting('set_atb')).toEqual('v112-2ab')
             })
     })
     it('should handle the install process correctly if there\'s DDG pages open that do not pass an ATB param', () => {
-        // pretend no pages have ATB to pass
-        spyOn(browser.tabs, 'query').and.returnValue([
-            { url: 'https://duckduckgo.com/about' },
-            { url: 'https://duckduckgo.com/?q=test' }
-        ])
-
-        return atb.updateATBValues()
+        return atb.updateATBValues(['https://duckduckgo.com/about', 'https://duckduckgo.com/?q=test'])
             .then(() => {
                 validateExtiWasHit('v112-2')
                 expect(settings.getSetting('atb')).toEqual('v112-2')