From 29f6745c4dbda2fbffb2d002208e21efd1d6cae1 Mon Sep 17 00:00:00 2001 From: pipboy96 <46632672+pipboy96@users.noreply.github.com> Date: Mon, 28 Jan 2019 06:23:56 +0300 Subject: [PATCH 1/8] Update util.js --- chromium/background-scripts/util.js | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/chromium/background-scripts/util.js b/chromium/background-scripts/util.js index 1946e141122d..4161db6cba6e 100644 --- a/chromium/background-scripts/util.js +++ b/chromium/background-scripts/util.js @@ -36,30 +36,6 @@ function getDefaultLogLevel() { return DEFAULT_LOG_LEVEL; } -/** - * Load a file packaged with the extension - * - * @param url: a relative URL to local file - */ -function loadExtensionFile(url, returnType) { - var xhr = new XMLHttpRequest(); - // Use blocking XHR to ensure everything is loaded by the time - // we return. - xhr.open("GET", chrome.runtime.getURL(url), false); - xhr.send(null); - // Get file contents - if (xhr.readyState !== 4) { - return; - } - if (returnType === 'xml') { - return xhr.responseXML; - } - if (returnType === 'json') { - return JSON.parse(xhr.responseText); - } - return xhr.responseText; -} - /** * Convert an ArrayBuffer to string * @@ -86,7 +62,6 @@ Object.assign(exports, { log, setDefaultLogLevel, getDefaultLogLevel, - loadExtensionFile, ArrayBufferToString }); From 71a562f795e55d8fc313a1af6968d40ab7c827c0 Mon Sep 17 00:00:00 2001 From: pipboy96 <46632672+pipboy96@users.noreply.github.com> Date: Mon, 28 Jan 2019 06:29:49 +0300 Subject: [PATCH 2/8] Update update_test.js --- chromium/test/update_test.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/chromium/test/update_test.js b/chromium/test/update_test.js index bc9bde52bf1b..15e23c48c89b 100644 --- a/chromium/test/update_test.js +++ b/chromium/test/update_test.js @@ -20,9 +20,6 @@ describe('update.js', function() { describe('applyStoredRulesets', function() { beforeEach(() => { chrome.flush(); - if(util.loadExtensionFile.restore) { - util.loadExtensionFile.restore(); - } }); it('applies compressed rulesets from chrome.storage', function(done) { @@ -57,8 +54,6 @@ describe('update.js', function() { const example_rulesets = new TextDecoder("utf-8").decode(example_rulesets_byte_array); const example_rulesets_json = JSON.parse(example_rulesets); - sinon.stub(util, "loadExtensionFile").returns(example_rulesets_json.rulesets); - update.applyStoredRulesets({addFromJson: response => { assert.isArray(response); assert.equal(response[0].name, "Example.com"); From 4de71923dce250cc1dec5533859ebcedc9388cc8 Mon Sep 17 00:00:00 2001 From: pipboy96 <46632672+pipboy96@users.noreply.github.com> Date: Mon, 28 Jan 2019 06:41:42 +0300 Subject: [PATCH 3/8] Update update.js --- chromium/background-scripts/update.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/chromium/background-scripts/update.js b/chromium/background-scripts/update.js index 930974ff3c03..4e18832c9dda 100644 --- a/chromium/background-scripts/update.js +++ b/chromium/background-scripts/update.js @@ -203,7 +203,10 @@ async function applyStoredRulesets(rulesets_obj) { rulesets_obj.addFromJson(channel_result.json.rulesets, channel_result.scope); } } else { - rulesets_obj.addFromJson(util.loadExtensionFile('rules/default.rulesets', 'json')); + const url = chrome.runtime.getURL('rules/default.rulesets'); + const response = await fetch(url); + + rulesets_obj.addFromJson(await response.json()); } } From c7750622e337db6c6ffb56cffc2c3feda98d389e Mon Sep 17 00:00:00 2001 From: pipboy96 <46632672+pipboy96@users.noreply.github.com> Date: Mon, 28 Jan 2019 06:53:02 +0300 Subject: [PATCH 4/8] Update update_test.js --- chromium/test/update_test.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/chromium/test/update_test.js b/chromium/test/update_test.js index 15e23c48c89b..a657f3c6ad23 100644 --- a/chromium/test/update_test.js +++ b/chromium/test/update_test.js @@ -6,7 +6,8 @@ const assert = require('chai').assert, util = require('../background-scripts/util'), atob = require("atob"), TextDecoder = require('text-encoding').TextDecoder, - sinon = require('sinon'); + sinon = require('sinon'), + fetchMock = require('fetch-mock'); const fs = require('fs'), { update_channels } = require('../background-scripts/update_channels'), @@ -54,6 +55,8 @@ describe('update.js', function() { const example_rulesets = new TextDecoder("utf-8").decode(example_rulesets_byte_array); const example_rulesets_json = JSON.parse(example_rulesets); + fetchMock.get('*', example_rulesets_json); + update.applyStoredRulesets({addFromJson: response => { assert.isArray(response); assert.equal(response[0].name, "Example.com"); From 627ad6ee89a8fcf7b2e52cd14fef2e5536ee17cc Mon Sep 17 00:00:00 2001 From: pipboy96 <46632672+pipboy96@users.noreply.github.com> Date: Mon, 28 Jan 2019 07:05:47 +0300 Subject: [PATCH 5/8] Update update_test.js --- chromium/test/update_test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium/test/update_test.js b/chromium/test/update_test.js index a657f3c6ad23..2b0b8785db05 100644 --- a/chromium/test/update_test.js +++ b/chromium/test/update_test.js @@ -55,7 +55,7 @@ describe('update.js', function() { const example_rulesets = new TextDecoder("utf-8").decode(example_rulesets_byte_array); const example_rulesets_json = JSON.parse(example_rulesets); - fetchMock.get('*', example_rulesets_json); + fetchMock.get('*', example_rulesets_json.rulesets); update.applyStoredRulesets({addFromJson: response => { assert.isArray(response); From 8770ceb769e795954fd7bf3cd96b8b26f9c7615a Mon Sep 17 00:00:00 2001 From: pipboy96 <46632672+pipboy96@users.noreply.github.com> Date: Mon, 28 Jan 2019 07:07:34 +0300 Subject: [PATCH 6/8] Update package.json --- chromium/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/chromium/package.json b/chromium/package.json index 4dab859e9913..7369a8b7f785 100644 --- a/chromium/package.json +++ b/chromium/package.json @@ -16,7 +16,8 @@ "nyc": "^11.6.0", "sinon": "^4.4.8", "sinon-chrome": "^2.3.1", - "text-encoding": "^0.6.4" + "text-encoding": "^0.6.4", + "node-fetch": "^2.3.0" }, "scripts": { "test": "mocha", From a0eb2b32b93e4ac45059fde019f505e6c9721975 Mon Sep 17 00:00:00 2001 From: pipboy96 <46632672+pipboy96@users.noreply.github.com> Date: Mon, 28 Jan 2019 07:17:03 +0300 Subject: [PATCH 7/8] Update update_test.js --- chromium/test/update_test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium/test/update_test.js b/chromium/test/update_test.js index 2b0b8785db05..ec5acb5c1de2 100644 --- a/chromium/test/update_test.js +++ b/chromium/test/update_test.js @@ -56,7 +56,7 @@ describe('update.js', function() { const example_rulesets_json = JSON.parse(example_rulesets); fetchMock.get('*', example_rulesets_json.rulesets); - + update.applyStoredRulesets({addFromJson: response => { assert.isArray(response); assert.equal(response[0].name, "Example.com"); From b32bee2bf89ba298cf3dca75965ecebd97a52b5b Mon Sep 17 00:00:00 2001 From: pipboy96 <46632672+pipboy96@users.noreply.github.com> Date: Mon, 28 Jan 2019 07:24:33 +0300 Subject: [PATCH 8/8] Update update_test.js --- chromium/test/update_test.js | 1 - 1 file changed, 1 deletion(-) diff --git a/chromium/test/update_test.js b/chromium/test/update_test.js index ec5acb5c1de2..500475b29155 100644 --- a/chromium/test/update_test.js +++ b/chromium/test/update_test.js @@ -6,7 +6,6 @@ const assert = require('chai').assert, util = require('../background-scripts/util'), atob = require("atob"), TextDecoder = require('text-encoding').TextDecoder, - sinon = require('sinon'), fetchMock = require('fetch-mock'); const fs = require('fs'),