chemicaljs 1.8.3 → 1.8.5

package/client/chemical.js

@@ -304,6 +304,45 @@ window.chemical.decode = async function (url, config) {
   }
 };
 
+function checkWhitelist(entries, filter) {
+  let matched = false;
+  for (let entry of entries) {
+    if (filter(entry)) {
+      matched = true;
+      break;
+    }
+  }
+  return !matched;
+}
+
+function checkBlacklist(entries, filter) {
+  for (let entry of entries) {
+    if (filter(entry)) return true;
+  }
+  return false;
+}
+
+window.chemical.blocked = function (url) {
+  let parsedURL;
+  try {
+    parsedURL = new URL(url);
+  } catch {
+    return false;
+  }
+
+  if (hostnameWhitelist.length) {
+    return check_whitelist(hostnameWhitelist, (entry) =>
+      entry.test(parsedURL.hostname)
+    );
+  } else if (hostnameBlacklist.length) {
+    return checkBlacklist(hostnameBlacklist, (entry) =>
+      entry.test(parsedURL.hostname)
+    );
+  } else {
+    return false;
+  }
+};
+
 function getTransport(transport) {
   switch (transport) {
     default:

package/index.js

@@ -108,6 +108,20 @@ class ChemicalServer {
         String(this.options.rammerhead) +
         ";\n" +
         chemicalMain;
+      chemicalMain =
+        "const hostnameBlacklist = [" +
+        (this.options.hostname_blacklist
+          ? this.options.hostname_blacklist.join(", ")
+          : "") +
+        "];\n" +
+        chemicalMain;
+      chemicalMain =
+        "const hostnameWhitelist = [" +
+        (this.options.hostname_whitelist
+          ? this.options.hostname_whitelist.join(", ")
+          : "") +
+        "];\n" +
+        chemicalMain;
 
       chemicalMain = "(async () => {\n" + chemicalMain + "\n})();";
 
@@ -173,12 +187,10 @@ class ChemicalServer {
     this.server.on("upgrade", (req, socket, head) => {
       if (req.url && req.url.endsWith("/wisp/")) {
         if (this.options.hostname_blacklist) {
-          wisp.this.options.hostname_blacklist =
-            this.options.hostname_blacklist;
+          wisp.options.hostname_blacklist = this.options.hostname_blacklist;
         }
         if (this.options.hostname_whitelist) {
-          wisp.this.options.hostname_whitelist =
-            this.options.hostname_whitelist;
+          wisp.options.hostname_whitelist = this.options.hostname_whitelist;
         }
         wisp.routeRequest(req, socket, head);
       } else if (this.options.rammerhead && shouldRouteRh(req)) {
@@ -263,6 +275,20 @@ const ChemicalVitePlugin = (options) => ({
         String(options.rammerhead) +
         ";\n" +
         chemicalMain;
+      chemicalMain =
+        "const hostnameBlacklist = [" +
+        (options.hostname_blacklist
+          ? options.hostname_blacklist.join(", ")
+          : "") +
+        "];\n" +
+        chemicalMain;
+      chemicalMain =
+        "const hostnameWhitelist = [" +
+        (options.hostname_whitelist
+          ? options.hostname_whitelist.join(", ")
+          : "") +
+        "];\n" +
+        chemicalMain;
 
       chemicalMain = "(async () => {\n" + chemicalMain + "\n})();";
 
@@ -283,10 +309,7 @@ const ChemicalVitePlugin = (options) => ({
         ";\n" +
         chemicalSW;
       chemicalSW =
-        "const meteorEnabled = " +
-        String(options.meteor) +
-        ";\n" +
-        chemicalSW;
+        "const meteorEnabled = " + String(options.meteor) + ";\n" + chemicalSW;
       chemicalSW =
         "const rammerheadEnabled = " +
         String(options.rammerhead) +
@@ -443,6 +466,20 @@ class ChemicalBuild {
       String(this.options.rammerhead) +
       ";\n" +
       chemicalMain;
+    chemicalMain =
+      "const hostnameBlacklist = [" +
+      (this.options.hostname_blacklist
+        ? this.options.hostname_blacklist.join(", ")
+        : "") +
+      "];\n" +
+      chemicalMain;
+    chemicalMain =
+      "const hostnameWhitelist = [" +
+      (this.options.hostname_whitelist
+        ? this.options.hostname_whitelist.join(", ")
+        : "") +
+      "];\n" +
+      chemicalMain;
 
     chemicalMain = "(async () => {\n" + chemicalMain + "\n})();";
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "chemicaljs",
-    "version": "1.8.3",
+    "version": "1.8.5",
     "description": "Easily create your own web proxy with no experience required.",
     "repository": {
         "type": "git",
@@ -18,10 +18,10 @@
         "@mercuryworkshop/epoxy-transport": "^2.1.11",
         "@mercuryworkshop/libcurl-transport": "^1.3.10",
         "@mercuryworkshop/scramjet": "^1.0.2",
-        "@mercuryworkshop/wisp-js": "^0.1.1",
+        "@mercuryworkshop/wisp-js": "^0.2.1",
         "@rubynetwork/rammerhead": "^1.3.2",
         "@titaniumnetwork-dev/ultraviolet": "^3.2.7",
-        "express": "^4.19.2",
+        "express": "^4.21.0",
         "meteorproxy": "^1.0.6-patch.1"
     },
     "engines": {