this fixes #345

Author: gorhill

about.html

@@ -96,6 +96,7 @@ <h2 data-i18n="aboutExtensionDataHeader"></h2>
 <script src="lib/jquery-2.min.js"></script>
 <script src="js/i18n.js"></script>
 <script src="js/dashboard-common.js"></script>
+<script src="js/messaging-client.js"></script>
 <script src="js/about.js"></script>
 
 </body>

background.html

@@ -21,6 +21,7 @@
 <script src="js/httpsb.js"></script>
 <script src="js/reqstats.js"></script>
 <script src="js/cookies.js"></script>
+<script src="js/messaging.js"></script>
 <script src="js/profiler.js"></script>
 <script src="js/presets.js"></script>
 <script src="js/storage.js"></script>
@@ -30,7 +31,7 @@
 <script src="js/traffic.js"></script>
 <script src="js/uritools.js"></script>
 <script src="js/useragent.js"></script>
-<script src="js/contentscripthandlers.js"></script>
+<script src="js/messaging-handlers.js"></script>
 <script src="js/start.js"></script>
 <script src="js/commands.js"></script>
 <script src="js/install.js"></script>

info.html

@@ -168,6 +168,7 @@ <h3 data-i18n="statsPageDetailed"></h3>
 <script src="lib/jquery-2.min.js"></script>
 <script src="js/i18n.js"></script>
 <script src="js/dashboard-common.js"></script>
+<script src="js/messaging-client.js"></script>
 <script src="js/info.js"></script>
 </body>
 </html>

js/about.js

@@ -33,15 +33,7 @@ var commitHistoryURLPrefix = 'https://github.com/gorhill/httpswitchboard/commits
 
 /******************************************************************************/
 
-var getHTTPSB = function() {
-    return chrome.extension.getBackgroundPage().HTTPSB;
-};
-
-/******************************************************************************/
-
 var backupUserDataToFile = function() {
-    var httpsb = getHTTPSB();
-
     var allUserData = {
         timeStamp: Date.now(),
         version: '',
@@ -63,22 +55,22 @@ var backupUserDataToFile = function() {
 
     var userBlacklistReady = function(details) {
         allUserData.ubiquitousBlacklist = details.content;
-        httpsb.assets.get(httpsb.userWhitelistPath, userWhitelistReady);
+        messaging.ask({ what: 'readUserUbiquitousAllowRules' }, userWhitelistReady);
     };
 
     var ruleDataReady = function(store) {
         allUserData.version = store.version;
         allUserData.scopes = store.scopes;
         allUserData.remoteBlacklists = store.remoteBlacklists;
-        httpsb.assets.get(httpsb.userBlacklistPath, userBlacklistReady);
+        messaging.ask({ what: 'readUserUbiquitousBlockRules' }, userBlacklistReady);
     };
 
     var userSettingsReady = function(store) {
         allUserData.userSettings = store;
         chrome.storage.local.get(['version', 'scopes', 'remoteBlacklists'], ruleDataReady);
     };
 
-    chrome.storage.local.get(httpsb.userSettings, userSettingsReady);
+    messaging.ask({ what: 'readUserSettings' }, userSettingsReady);
 };
 
 /******************************************************************************/
@@ -99,7 +91,6 @@ var restoreUserDataFromFile = function() {
     };
 
     var restoreBackup = function(data) {
-        var httpsb = getHTTPSB();
         chrome.storage.local.set(data.userSettings, doCountdown);
         var store = {
             'version': data.version,
@@ -111,8 +102,18 @@ var restoreUserDataFromFile = function() {
             store.remoteBlacklists = data.remoteBlacklists;
         }
         chrome.storage.local.set(store, doCountdown);
-        httpsb.assets.put(httpsb.userBlacklistPath, data.ubiquitousBlacklist, doCountdown);
-        httpsb.assets.put(httpsb.userWhitelistPath, data.ubiquitousWhitelist, doCountdown);
+        messaging.ask({
+                what: 'writeUserUbiquitousBlockRules',
+                content: data.ubiquitousBlacklist
+            },
+            doCountdown
+        );
+        messaging.ask({
+                what: 'writeUserUbiquitousAllowRules',
+                content: data.ubiquitousWhitelist
+            },
+            doCountdown
+        );
     };
 
     var validateBackup = function(s) {
@@ -172,7 +173,7 @@ var restoreUserDataFromFile = function() {
 /******************************************************************************/
 
 var resetUserData = function() {
-    chrome.runtime.sendMessage({
+    messaging.tell({
         what: 'gotoExtensionURL',
         url: 'setup.html'
     });
@@ -221,40 +222,53 @@ var renderAssetList = function(details) {
 /******************************************************************************/
 
 var updateAssets = function() {
-    var httpsb = getHTTPSB();
     setAssetListClassBit(2, true);
     var onDone = function(details) {
         if ( details.changedCount !== 0 ) {
-            httpsb.loadUpdatableAssets();
+            messaging.tell({ what: 'loadUpdatableAssets' });
         }
     };
-    httpsb.assetUpdater.update(updateList, onDone);
+    messaging.ask({ what: 'launchAssetUpdater', list: updateList }, onDone);
 };
 
 /******************************************************************************/
 
 var updateAssetsList = function() {
-    getHTTPSB().assetUpdater.getList(renderAssetList);
+    messaging.ask({ what: 'getAssetUpdaterList' }, renderAssetList);
 };
 
 /******************************************************************************/
 
 // Updating all assets could be done from elsewhere and if so the
 // list here needs to be updated.
 
-var onMessage = function(request) {
-    if ( request && request.what === 'allLocalAssetsUpdated' ) {
-        updateAssetsList();
+var onAnnounce = function(msg) {
+    switch ( msg.what ) {
+        case 'allLocalAssetsUpdated':
+            updateAssetsList();
+            break;
+
+        default:
+            break;
     }
 };
-chrome.runtime.onMessage.addListener(onMessage);
+
+messaging.start('about.js');
+messaging.listen(onAnnounce);
 
 /******************************************************************************/
 
 (function() {
-    var httpsb = getHTTPSB();
-    $('#aboutVersion').html(httpsb.manifest.version);
-    $('#aboutStorageUsed').html(chrome.i18n.getMessage('aboutStorageUsed').replace('{{storageUsed}}', httpsb.storageQuota ? (httpsb.storageUsed / httpsb.storageQuota * 100).toFixed(1) : 0));
+    $('#aboutVersion').html(chrome.runtime.getManifest().version);
+    var renderStats = function(details) {
+        var template = chrome.i18n.getMessage('aboutStorageUsed');
+        var percent = 0;
+        if ( details.storageQuota ) {
+            percent = (details.storageUsed / details.storageQuota * 100).toFixed(1);
+        }
+        $('#aboutStorageUsed').html(template.replace('{{storageUsed}}', percent));
+    };
+    messaging.ask({ what: 'getSomeStats' }, renderStats);
 })();
 
 /******************************************************************************/

js/asset-updater.js

@@ -95,7 +95,7 @@ var getUpdateList = function(callback) {
             }
         }
 
-        HTTPSB.utils.reportBack(callback, { 'list': toUpdate });
+        callback({ 'list': toUpdate });
     };
 
     var validateChecksums = function(details) {
@@ -135,13 +135,13 @@ var update = function(list, callback) {
     var assetProcessedCount;
     var updatedAssetChecksums = [];
 
-    var reportBack = function() {
+    var onCompleted = function() {
         var details = {
             what: 'allLocalAssetsUpdated',
             changedCount: assetChangedCount
         };
-        HTTPSB.utils.reportBack(callback, details);
-        chrome.runtime.sendMessage(details);
+        callback(details);
+        HTTPSB.messaging.announce(details);
     };
 
     var doCountdown = function() {
@@ -152,7 +152,7 @@ var update = function(list, callback) {
         HTTPSB.assets.put(
             'assets/checksums.txt',
             updatedAssetChecksums.join('\n'),
-            reportBack
+            onCompleted
         );
         chrome.storage.local.set({ 'assetsUpdateTimestamp': Date.now() });
     };
@@ -172,7 +172,7 @@ var update = function(list, callback) {
     var processList = function() {
         assetProcessedCount = Object.keys(list).length;
         if ( assetProcessedCount === 0 ) {
-            reportBack();
+            onCompleted();
             return;
         }
         var entry;

js/assets.js

@@ -185,7 +185,7 @@ var readLocalFile = function(path, callback) {
             'content': content,
             'error': err
         };
-        HTTPSB.utils.reportBack(callback, details);
+        callback(details);
     };
 
     var onLocalFileLoaded = function() {
@@ -249,7 +249,7 @@ var readRemoteFile = function(path, callback) {
             'content': content,
             'error': err
         };
-        HTTPSB.utils.reportBack(callback, details);
+        callback(details);
     };
 
     var onRemoteFileLoaded = function() {
@@ -286,7 +286,7 @@ var writeLocalFile = function(path, content, callback) {
             'content': content,
             'error': err
         };
-        HTTPSB.utils.reportBack(callback, details);
+        callback(details);
     };
 
     var onFileWriteSuccess = function() {
@@ -354,7 +354,7 @@ var updateFromRemote = function(details, callback) {
     var targetMd5 = details.md5 || '';
 
     var reportBackError = function() {
-        HTTPSB.utils.reportBack(callback, {
+        callback({
             'path': targetPath,
             'error': 'Error'
         });