utilize Pattern Tree to decide the policy to use and modify HTTP response headers according to that policy

This commit also enhances the build script so that preprocessor conditionals can now use operators '&&' and '||'.
The features being developed are not yet included in the actual Haketilo build.
Some of the new source files contain similar functionality to other ones already existing in the source tree. At some point the latter will be removed.

1 files changed, 20 insertions, 7 deletions

diff --git a/background/patterns_query_manager.js b/background/patterns_query_manager.js
index cb14cb1..e364668 100644
--- a/background/patterns_query_manager.js
+++ b/background/patterns_query_manager.js
@@ -45,13 +45,18 @@
 #IMPORT common/patterns_query_tree.js  AS pqt
 #IMPORT common/indexeddb.js            AS haketilodb
 
+#IF MOZILLA || MV3
 #FROM common/browser.js IMPORT browser
+#ENDIF
+
+let secret;
 
 const tree = pqt.make();
 #EXPORT tree
 
 const current_mappings = new Map();
 
+#IF MOZILLA || MV3
 let registered_script = null;
 let script_update_occuring = false;
 let script_update_needed;
@@ -67,6 +72,7 @@ async function update_content_script()
 	script_update_needed = false;
 
 	const code = `\
+this.haketilo_secret       = ${secret};
 this.haketilo_pattern_tree = ${JSON.stringify(tree)};
 if (this.haketilo_content_script_main)
     haketilo_content_script_main();`;
@@ -89,36 +95,43 @@ if (this.haketilo_content_script_main)
 
 function register_mapping(mapping)
 {
-    for (const pattern in mapping.payloads)
-	pqt.register(tree, pattern, mapping.identifier, mapping);
+    for (const [pattern, resource] of Object.entries(mapping.payloads))
+	pqt.register(tree, pattern, mapping.identifier, resource);
     current_mappings.set(mapping.identifier, mapping);
 }
+#ENDIF
 
 function mapping_changed(change)
 {
     console.log('mapping changes!', arguments);
-    const old_version = current_mappings.get(change.identifier);
+    const old_version = current_mappings.get(change.key);
     if (old_version !== undefined) {
 	for (const pattern in old_version.payloads)
-	    pqt.deregister(tree, pattern, change.identifier);
+	    pqt.deregister(tree, pattern, change.key);
 
-	current_mappings.delete(change.identifier);
+	current_mappings.delete(change.key);
     }
 
     if (change.new_val !== undefined)
 	register_mapping(change.new_val);
 
+#IF MOZILLA || MV3
     script_update_needed = true;
     setTimeout(update_content_script, 0);
+#ENDIF
 }
 
-async function start()
+async function start(secret_)
 {
+    secret = secret_;
+
     const [tracking, initial_mappings] =
-	  await haketilodb.track_mappings(mapping_changed);
+	  await haketilodb.track.mappings(mapping_changed);
 
     initial_mappings.forEach(register_mapping);
+#IF MOZILLA || MV3
     script_update_needed = true;
     await update_content_script();
+#ENDIF
 }
 #EXPORT start