1.17.6

Fixed #2241 settings config file not loaded everytime in Firefox

Author: brookhong

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Surfingkeys",
-  "version": "1.17.5",
+  "version": "1.17.6",
   "description": "Map your keys for web surfing, expand your browser with javascript and keyboard.",
   "main": "background.js",
   "directories": {
@@ -70,7 +70,7 @@
     "@pixi/utils": "^7.4.0",
     "@pixi/extensions": "^7.4.0",
     "ace-builds": "^1.4.12",
-    "dompurify": "^2.3.1",
+    "dompurify": "^3.2.4",
     "js-base64": "^3.7.2",
     "lodash": "^4.17.21",
     "marked": "^4.0.10",

src/background/start.js

@@ -273,7 +273,7 @@ function start(browser) {
                 set.autoproxy_hosts = [set.autoproxy_hosts];
             }
             if (set.localPath) {
-                request(set.localPath, function(resp) {
+                request(appendNonce(set.localPath), function(resp) {
                     set.snippets = resp;
                     cb(set);
                 }, undefined, undefined, function (po) {
@@ -640,8 +640,18 @@ function start(browser) {
         });
     };
 
+    function appendNonce(url) {
+        if (/https?:\/\//.test(url)) {
+            url = url.replace(/\?$/, "");
+            let u = new URL(url);
+            let con = u.search ? "&" : "?";
+            url = `${url}${con}nonce=${new Date().getTime()}`;
+        }
+        return url;
+    }
+
     function _loadSettingsFromUrl(url, cb) {
-        request(url, function(resp) {
+        request(appendNonce(url), function(resp) {
             _updateAndPostSettings({localPath: url, snippets: resp});
             cb({status: "Succeeded", snippets: resp});
         }, undefined, undefined, function (po) {

src/content_scripts/common/utils.js

@@ -1,4 +1,4 @@
-import * as DOMPurify from 'dompurify';
+import DOMPurify from "dompurify";
 import KeyboardUtils from './keyboardUtils';
 import { RUNTIME, dispatchSKEvent, runtime } from './runtime.js';