darkreader 4.9.40 → 4.9.43

package/README.md

@@ -90,6 +90,9 @@ const CSS = await collectCSS();
 const isEnabled = isDarkReaderEnabled();
 ```
 
+Be aware, that darkreader will add the `chrome` object onto the `window` object, these are to stub certain functions that
+the code will use. They originate from the webextension-api.
+
 ## Site fixes
 
 Automatically syncing the site fixes to every Dark Reader user was disabled because the GitHub team doesn't allow using GitHub as a CDN. Storing these files and making requests to other resources would be expensive and look suspicious. As such, changes are included with each new Dark Reader release.

package/darkreader.js

@@ -1,5 +1,5 @@
 /**
- * Dark Reader v4.9.40
+ * Dark Reader v4.9.43
  * https://darkreader.org/
  */
 
@@ -819,19 +819,16 @@
             return true;
         }
         var url = parseURL(href);
-        var base = parseURL(location.href);
-        if (url.protocol !== base.protocol) {
+        if (url.protocol !== location.protocol) {
             return false;
         }
-        if (url.hostname !== base.hostname) {
+        if (url.hostname !== location.hostname) {
             return false;
         }
-        if (url.port !== base.port) {
+        if (url.port !== location.port) {
             return false;
         }
-        var path = /.*\//.exec(url.pathname)[0];
-        var basePath = /.*\//.exec(base.pathname)[0];
-        return path === basePath;
+        return url.pathname === location.pathname;
     }
 
     function iterateCSSRules(rules, iterate, onMediaRuleError) {
@@ -850,9 +847,9 @@
             }
             else if (rule.media) {
                 var media = Array.from(rule.media);
-                var isScreenOrAll = media.some(function (m) { return m.startsWith('screen') || m.startsWith('all'); });
+                var isScreenOrAllOrQuery = media.some(function (m) { return m.startsWith('screen') || m.startsWith('all') || m.startsWith('('); });
                 var isPrintOrSpeech = media.some(function (m) { return m.startsWith('print') || m.startsWith('speech'); });
-                if (isScreenOrAll || !isPrintOrSpeech) {
+                if (isScreenOrAllOrQuery || !isPrintOrSpeech) {
                     iterateCSSRules(rule.cssRules, iterate, onMediaRuleError);
                 }
             }
@@ -912,7 +909,7 @@
         }
     }
     var cssURLRegex = /url\((('.+?')|(".+?")|([^\)]*?))\)/g;
-    var cssImportRegex = /@import\s*(url\()?(('.+?')|(".+?")|([^\)]*?))\)?;?/g;
+    var cssImportRegex = /@import\s*(url\()?(('.+?')|(".+?")|([^\)]*?))\)? ?(screen)?;?/g;
     function getCSSURLValue(cssURL) {
         return cssURL.replace(/^url\((.*)\)$/, '$1').trim().replace(/^"(.*)"$/, '$1').replace(/^'(.*)'$/, '$1');
     }
@@ -923,7 +920,13 @@
     function replaceCSSRelativeURLsWithAbsolute($css, cssBasePath) {
         return $css.replace(cssURLRegex, function (match) {
             var pathValue = getCSSURLValue(match);
-            return "url(\"" + getAbsoluteURL(cssBasePath, pathValue) + "\")";
+            try {
+                return "url(\"" + getAbsoluteURL(cssBasePath, pathValue) + "\")";
+            }
+            catch (err) {
+                logWarn('Not able to replace relative URL with Absolute URL, skipping');
+                return match;
+            }
         });
     }
     var cssCommentsRegex = /\/\*[\s\S]*?\*\//g;
@@ -2254,7 +2257,8 @@
     function getModifiedFallbackStyle(filter, _a) {
         var strict = _a.strict;
         var lines = [];
-        lines.push("html, body, " + (strict ? 'body :not(iframe):not(div[style^="position:absolute;top:0;left:-"]' : 'body > :not(iframe)') + " {");
+        var isMicrosoft = location.hostname.endsWith('microsoft.com');
+        lines.push("html, body, " + (strict ? "body :not(iframe)" + (isMicrosoft ? ':not(div[style^="position:absolute;top:0;left:-"]' : '') : 'body > :not(iframe)') + " {");
         lines.push("    background-color: " + modifyBackgroundColor({ r: 255, g: 255, b: 255 }, filter) + " !important;");
         lines.push("    border-color: " + modifyBorderColor({ r: 64, g: 64, b: 64 }, filter) + " !important;");
         lines.push("    color: " + modifyForegroundColor({ r: 0, g: 0, b: 0 }, filter) + " !important;");
@@ -2787,25 +2791,8 @@
                 };
             }
             if (property.startsWith('border') || property.startsWith('outline')) {
-                if (sourceValue.endsWith(')')) {
-                    var colorTypeMatch = sourceValue.match(/((rgb|hsl)a?)\(/);
-                    if (colorTypeMatch) {
-                        var index_1 = colorTypeMatch.index;
-                        return function (theme) {
-                            var value = insertVarValues(sourceValue, _this.unstableVarValues);
-                            if (!value) {
-                                return sourceValue;
-                            }
-                            var beginning = sourceValue.substring(0, index_1);
-                            var color = sourceValue.substring(index_1, sourceValue.length);
-                            var inserted = insertVarValues(color, _this.unstableVarValues);
-                            var modified = tryModifyBorderColor(inserted, theme);
-                            return "" + beginning + modified;
-                        };
-                    }
-                }
                 return function (theme) {
-                    return replaceCSSVariablesNames(sourceValue, function (v) { return wrapBorderColorVariableName(v); }, function (fallback) { return tryModifyTextColor(fallback, theme); });
+                    return replaceCSSVariablesNames(sourceValue, function (v) { return wrapBorderColorVariableName(v); }, function (fallback) { return tryModifyBorderColor(fallback, theme); });
                 };
             }
             return null;
@@ -3119,17 +3106,41 @@
     function isConstructedColorVar(value) {
         return value.match(/^\s*(rgb|hsl)a?\(/);
     }
+    var rawValueRegex = /^\d{1,3}, ?\d{1,3}, ?\d{1,3}$/;
+    function parseRawValue(color) {
+        if (rawValueRegex.test(color)) {
+            var splitted = color.split(',');
+            var resultInRGB_1 = 'rgb(';
+            splitted.forEach(function (number) {
+                resultInRGB_1 += number.trim() + ", ";
+            });
+            resultInRGB_1 = resultInRGB_1.substr(0, resultInRGB_1.length - 2);
+            resultInRGB_1 += ')';
+            return { isRaw: true, color: resultInRGB_1 };
+        }
+        return { isRaw: false, color: color };
+    }
+    function handleRawValue(color, theme, modifyFunction) {
+        var _a = parseRawValue(color), isRaw = _a.isRaw, newColor = _a.color;
+        var rgb = tryParseColor(newColor);
+        if (rgb) {
+            var outputColor = modifyFunction(rgb, theme);
+            if (isRaw) {
+                var outputInRGB = tryParseColor(outputColor);
+                return outputInRGB ? outputInRGB.r + ", " + outputInRGB.g + ", " + outputInRGB.b : outputColor;
+            }
+            return outputColor;
+        }
+        return newColor;
+    }
     function tryModifyBgColor(color, theme) {
-        var rgb = tryParseColor(color);
-        return rgb ? modifyBackgroundColor(rgb, theme) : color;
+        return handleRawValue(color, theme, modifyBackgroundColor);
     }
     function tryModifyTextColor(color, theme) {
-        var rgb = tryParseColor(color);
-        return rgb ? modifyForegroundColor(rgb, theme) : color;
+        return handleRawValue(color, theme, modifyForegroundColor);
     }
     function tryModifyBorderColor(color, theme) {
-        var rgb = tryParseColor(color);
-        return rgb ? modifyBorderColor(rgb, theme) : color;
+        return handleRawValue(color, theme, modifyBorderColor);
     }
     function insertVarValues(source, varValues, stack) {
         if (stack === void 0) { stack = new Set(); }
@@ -3615,7 +3626,11 @@
                     var property = dec.property, value = dec.value, important = dec.important, sourceValue = dec.sourceValue;
                     return property + ": " + (value == null ? sourceValue : value) + (important ? ' !important' : '') + ";";
                 };
-                var ruleText = selector + " { " + declarations.map(getDeclarationText).join(' ') + " }";
+                var cssRulesText = '';
+                declarations.forEach(function (declarations) {
+                    cssRulesText += getDeclarationText(declarations) + " ";
+                });
+                var ruleText = selector + " { " + cssRulesText + " }";
                 target.insertRule(ruleText, index);
             }
             var asyncDeclarations = new Map();
@@ -3777,7 +3792,8 @@
             (element instanceof HTMLLinkElement &&
                 element.rel &&
                 element.rel.toLowerCase().includes('stylesheet') &&
-                !element.disabled)) &&
+                !element.disabled &&
+                (isFirefox ? !element.href.startsWith('moz-extension://') : true))) &&
             !element.classList.contains('darkreader') &&
             element.media.toLowerCase() !== 'print' &&
             !element.classList.contains('stylus'));
@@ -3941,10 +3957,7 @@
                             _c.label = 5;
                         case 5:
                             if (cssRules) {
-                                if (isRelativeHrefOnAbsolutePath(element.href)) {
-                                    return [2, cssRules];
-                                }
-                                else if (!hasImports(cssRules, false)) {
+                                if (!hasImports(cssRules, false)) {
                                     return [2, cssRules];
                                 }
                             }
@@ -3990,9 +4003,13 @@
                 });
             });
         }
-        function details() {
+        function details(options) {
             var rules = getRulesSync();
             if (!rules) {
+                if (options.secondRound) {
+                    logWarn('Detected dead-lock at details(), returning early to prevent it.');
+                    return null;
+                }
                 if (isLoadingRules || wasLoadingError) {
                     return null;
                 }
@@ -4247,7 +4264,7 @@
         });
     }
     function getCSSImportURL(importDeclaration) {
-        return getCSSURLValue(importDeclaration.substring(7).trim().replace(/;$/, ''));
+        return getCSSURLValue(importDeclaration.substring(7).trim().replace(/;$/, '').replace(/screen$/, ''));
     }
     function loadText(url) {
         return __awaiter(this, void 0, void 0, function () {
@@ -4643,13 +4660,14 @@
         };
     }
 
-    function injectProxy() {
+    function injectProxy(enableStyleSheetsProxy) {
         document.dispatchEvent(new CustomEvent('__darkreader__inlineScriptsAllowed'));
         var addRuleDescriptor = Object.getOwnPropertyDescriptor(CSSStyleSheet.prototype, 'addRule');
         var insertRuleDescriptor = Object.getOwnPropertyDescriptor(CSSStyleSheet.prototype, 'insertRule');
         var deleteRuleDescriptor = Object.getOwnPropertyDescriptor(CSSStyleSheet.prototype, 'deleteRule');
         var removeRuleDescriptor = Object.getOwnPropertyDescriptor(CSSStyleSheet.prototype, 'removeRule');
-        var documentStyleSheetsDescriptor = Object.getOwnPropertyDescriptor(Document.prototype, 'styleSheets');
+        var documentStyleSheetsDescriptor = enableStyleSheetsProxy ?
+            Object.getOwnPropertyDescriptor(Document.prototype, 'styleSheets') : null;
         var shouldWrapHTMLElement = location.hostname.endsWith('baidu.com');
         var getElementsByTagNameDescriptor = shouldWrapHTMLElement ?
             Object.getOwnPropertyDescriptor(Element.prototype, 'getElementsByTagName') : null;
@@ -4660,7 +4678,9 @@
             Object.defineProperty(CSSStyleSheet.prototype, 'removeRule', removeRuleDescriptor);
             document.removeEventListener('__darkreader__cleanUp', cleanUp);
             document.removeEventListener('__darkreader__addUndefinedResolver', addUndefinedResolver);
-            Object.defineProperty(Document.prototype, 'styleSheets', documentStyleSheetsDescriptor);
+            if (enableStyleSheetsProxy) {
+                Object.defineProperty(Document.prototype, 'styleSheets', documentStyleSheetsDescriptor);
+            }
             if (shouldWrapHTMLElement) {
                 Object.defineProperty(Element.prototype, 'getElementsByTagName', getElementsByTagNameDescriptor);
             }
@@ -4708,14 +4728,14 @@
         }
         function proxyGetElementsByTagName(tagName) {
             var _this = this;
+            if (tagName !== 'style') {
+                return getElementsByTagNameDescriptor.value.call(this, tagName);
+            }
             var getCurrentElementValue = function () {
                 var elements = getElementsByTagNameDescriptor.value.call(_this, tagName);
-                if (tagName === 'style') {
-                    elements = Object.setPrototypeOf(__spreadArray([], __read(elements), false).filter(function (element) {
-                        return !element.classList.contains('darkreader');
-                    }), NodeList.prototype);
-                }
-                return elements;
+                return Object.setPrototypeOf(__spreadArray([], __read(elements), false).filter(function (element) {
+                    return !element.classList.contains('darkreader');
+                }), NodeList.prototype);
             };
             var elements = getCurrentElementValue();
             var NodeListBehavior = {
@@ -4730,7 +4750,9 @@
         Object.defineProperty(CSSStyleSheet.prototype, 'insertRule', Object.assign({}, insertRuleDescriptor, { value: proxyInsertRule }));
         Object.defineProperty(CSSStyleSheet.prototype, 'deleteRule', Object.assign({}, deleteRuleDescriptor, { value: proxyDeleteRule }));
         Object.defineProperty(CSSStyleSheet.prototype, 'removeRule', Object.assign({}, removeRuleDescriptor, { value: proxyRemoveRule }));
-        Object.defineProperty(Document.prototype, 'styleSheets', Object.assign({}, documentStyleSheetsDescriptor, { get: proxyDocumentStyleSheets }));
+        if (enableStyleSheetsProxy) {
+            Object.defineProperty(Document.prototype, 'styleSheets', Object.assign({}, documentStyleSheetsDescriptor, { get: proxyDocumentStyleSheets }));
+        }
         if (shouldWrapHTMLElement) {
             Object.defineProperty(Element.prototype, 'getElementsByTagName', Object.assign({}, getElementsByTagNameDescriptor, { value: proxyGetElementsByTagName }));
         }
@@ -4834,7 +4856,7 @@
         var rootVarsStyle = createOrUpdateStyle('darkreader--root-vars');
         document.head.insertBefore(rootVarsStyle, variableStyle.nextSibling);
         var proxyScript = createOrUpdateScript('darkreader--proxy');
-        proxyScript.append("(" + injectProxy + ")()");
+        proxyScript.append("(" + injectProxy + ")(!" + fixes.disableStyleSheetsProxy + ")");
         document.head.insertBefore(proxyScript, rootVarsStyle.nextSibling);
         proxyScript.remove();
     }
@@ -4883,7 +4905,7 @@
             .filter(function (style) { return !styleManagers.has(style); })
             .map(function (style) { return createManager(style); });
         newManagers
-            .map(function (manager) { return manager.details(); })
+            .map(function (manager) { return manager.details({ secondRound: false }); })
             .filter(function (detail) { return detail && detail.rules.length > 0; })
             .forEach(function (detail) {
             variablesStore.addRulesForMatching(detail.rules);
@@ -4933,7 +4955,7 @@
             }
         }
         function update() {
-            var details = manager.details();
+            var details = manager.details({ secondRound: true });
             if (!details) {
                 return;
             }
@@ -5023,7 +5045,7 @@
             var newManagers = stylesToManage
                 .map(function (style) { return createManager(style); });
             newManagers
-                .map(function (manager) { return manager.details(); })
+                .map(function (manager) { return manager.details({ secondRound: false }); })
                 .filter(function (detail) { return detail && detail.rules.length > 0; })
                 .forEach(function (detail) {
                 variablesStore.addRulesForMatching(detail.rules);

package/index.d.ts

@@ -23,6 +23,10 @@ declare namespace DarkReader {
      * @param isEnabled Boolean `false` value.
      */
     function auto(isEnabled: false): void;
+    /**
+     * Returns if darkreader is enabled.
+     */
+    function isEnabled(): boolean;
 
     /**
      * Sets a function for making CORS requests.
@@ -146,6 +150,13 @@ declare namespace DarkReader {
          * Mostly used for wrongly inverted background-images
          */
         ignoreImageAnalysis: string[];
+
+        /**
+         * A toggle to disable the proxying of `document.styleSheets`.
+         * This is a API-Exclusive option, as it can break legitmate websites,
+         * who are using the Dark Reader API.
+         */
+        disableStyleSheetsProxy: boolean;
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "darkreader",
-  "version": "4.9.40",
+  "version": "4.9.43",
   "description": "Dark mode for every website",
   "scripts": {
     "api": "node tasks/build.js --api",
@@ -96,7 +96,7 @@
     "puppeteer-core": "10.4.0",
     "rollup": "2.59.0",
     "rollup-plugin-istanbul2": "2.0.2",
-    "rollup-plugin-typescript2": "0.30.0",
+    "rollup-plugin-typescript2": "0.31.1",
     "ts-jest": "27.0.7",
     "ts-node": "10.4.0",
     "tsconfig-paths": "3.11.0",