Working loader

jsha · jsha · commit ebb5eebf5fd1 · 2014-01-07T23:33:10.000-08:00
diff --git a/chromium/background.js b/chromium/background.js
@@ -16,7 +16,7 @@ function getRuleXml() {
   return output;
 }
 
-var all_rules = new RuleSets(navigator.userAgent, LRUCache, getRuleXml());
+var all_rules = new RuleSets(navigator.userAgent, LRUCache, getRuleXml(), localStorage);
 var wr = chrome.webRequest;
 
 /*
diff --git a/chromium/rewriter.js b/chromium/rewriter.js
@@ -1,21 +1,41 @@
+var fs = require("fs");
+var DOMParser = require('xmldom').DOMParser;
+
 var lrucache = require("./lru");
 var rules = require("./rules");
-var rules = require("./rules");
-var XMLHttpRequest = require("xmlhttprequest").XMLHttpRequest;
 
-function getRuleXml() {
-    var xhr = new XMLHttpRequest();
-    // Use blocking XHR to ensure everything is loaded by the time
-    // we return.
-    xhr.open("GET", "file:///home/jsha/https-everywhere/chromium/rules/default.rulesets", false);
-    xhr.send(null);
-    // Get file contents
-    if (xhr.readyState != 4) {
-      return "yy";
-    }
-    return xhr.responseXML;
+var URI = require("URIjs");
+
+var ruleSets = null;
+
+function processFile() {
+  fs.readFile('/home/jsha/index.html',
+    {encoding: 'utf-8'},
+    function (err, data) {
+      if (err) throw err;
+      var result = URI.withinString(data, function(url) {
+        var uri = new URI(url);
+        if (uri.protocol() != 'http') return url;
+
+        uri.normalize();
+        var rewritten = ruleSets.rewriteURI(uri.toString(), uri.host());
+        if (rewritten) {
+          console.log(uri.toString(), rewritten);
+          return rewritten;
+        } else {
+          return url;
+        }
+      });
+    });
 }
 
-new rules.RuleSets("foo", lrucache.LRUCache,
-  getRuleXml());
-console.log("ok");
+fs.readFile('rules/default.rulesets',
+  {encoding: 'utf-8'},
+  function (err, data) {
+  if (err) throw err;
+  var xml = new DOMParser().parseFromString(data, 'text/xml');
+  ruleSets = new rules.RuleSets("foo", lrucache.LRUCache, xml, {});
+  console.log("ok");
+
+  processFile();
+});
diff --git a/chromium/rules.js b/chromium/rules.js
@@ -71,7 +71,7 @@ RuleSet.prototype = {
 };
 
 
-function RuleSets(userAgent, cache, rule_xml) {
+function RuleSets(userAgent, cache, ruleXml, ruleActiveStates) {
   // Load rules into structure
   this.targets = {};
   this.userAgent = userAgent;
@@ -83,7 +83,10 @@ function RuleSets(userAgent, cache, rule_xml) {
   // A cache for cookie hostnames.
   this.cookieHostCache = new cache(100);
 
-  var sets = rule_xml.getElementsByTagName("ruleset");
+  // A hash of rule name -> active status (true/false).
+  this.ruleActiveStates = ruleActiveStates;
+
+  var sets = ruleXml.getElementsByTagName("ruleset");
   for (var i = 0; i < sets.length; ++i) {
     this.parseOneRuleset(sets[i]);
   }
@@ -125,8 +128,8 @@ RuleSets.prototype = {
                                note.trim());
 
     // Read user prefs
-    if (rule_set.name in localStorage) {
-      rule_set.active = (localStorage[rule_set.name] == "true");
+    if (rule_set.name in this.ruleActiveStates) {
+      rule_set.active = (this.ruleActiveStates[rule_set.name] == "true");
     }
 
     var rules = ruletag.getElementsByTagName("rule");

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ function getRuleXml() {`
`16`	`16`	`return output;`
`17`	`17`	`}`
`18`	`18`
`19`		`-var all_rules = new RuleSets(navigator.userAgent, LRUCache, getRuleXml());`
	`19`	`+var all_rules = new RuleSets(navigator.userAgent, LRUCache, getRuleXml(), localStorage);`
`20`	`20`	`var wr = chrome.webRequest;`
`21`	`21`
`22`	`22`	`/*`