chemicaljs 1.8.6 → 2.0.0

package/client/chemical.components.js

@@ -4,10 +4,23 @@ class ChemicalInput extends HTMLInputElement {
   }
   connectedCallback() {
     this.addEventListener("keydown", async function (e) {
-      if (e.key == "Enter" && window.chemical.loaded && e.target.value) {
-        let service = this.dataset.service || "uv";
-        let autoHttps = this.dataset.autoHttps !== undefined ? true : false;
-        let searchEngine = this.dataset.searchEngine;
+      if (e.key === "Enter" && window.chemical.loaded && e.target.value) {
+        let service =
+          this.dataset.serviceStore !== undefined
+            ? localStorage.getItem("@chemical/service") ||
+              this.dataset.service ||
+              "uv"
+            : this.dataset.service || "uv";
+        let autoHttps =
+          this.dataset.autoHttpsStore !== undefined
+            ? localStorage.getItem("@chemical/autoHttps") === "true"
+            : this.dataset.autoHttps !== undefined
+            ? true
+            : false;
+        let searchEngine =
+          this.dataset.searchEngineStore !== undefined
+            ? localStorage.getItem("@chemical/searchEngine")
+            : this.dataset.searchEngine;
         let action = this.dataset.action;
         let target = this.dataset.target;
         let frame = this.dataset.frame;
@@ -28,9 +41,9 @@ class ChemicalInput extends HTMLInputElement {
         }
 
         if (target) {
-          if (target == "_self") {
+          if (target === "_self") {
             window.location = encodedURL;
-          } else if (target == "_blank") {
+          } else if (target === "_blank") {
             window.open(encodedURL);
           }
         }
@@ -65,12 +78,12 @@ class ChemicalIFrame extends HTMLIFrameElement {
   }
   connectedCallback() {
     let open = this.dataset.open;
-    this.style.display = open == "true" ? "" : "none";
+    this.style.display = open === "true" ? "" : "none";
   }
   attributeChangedCallback(name, oldValue, newValue) {
-    if (name == "data-open") {
+    if (name === "data-open") {
       let open = this.dataset.open;
-      this.style.display = open == "true" ? "" : "none";
+      this.style.display = open === "true" ? "" : "none";
 
       let controls = document.getElementById(this.dataset.controls);
 
@@ -88,12 +101,12 @@ class ChemicalControls extends HTMLElement {
   }
   connectedCallback() {
     let open = this.dataset.open;
-    this.style.display = open == "true" ? "" : "none";
+    this.style.display = open === "true" ? "" : "none";
   }
   attributeChangedCallback(name, oldValue, newValue) {
-    if (name == "data-open") {
+    if (name === "data-open") {
       let open = this.dataset.open;
-      this.style.display = open == "true" ? "" : "none";
+      this.style.display = open === "true" ? "" : "none";
     }
   }
 }
@@ -135,6 +148,41 @@ class ChemicalLink extends HTMLAnchorElement {
   }
 }
 
+class ChemicalSelect extends HTMLSelectElement {
+  constructor() {
+    super();
+  }
+  connectedCallback() {
+    const store = this.dataset.defaultStore;
+
+    this.addEventListener("change", function () {
+      window.chemical.setStore(store, this.value);
+    });
+
+    if (store) {
+      const value = window.chemical.getStore(store);
+
+      const observerOptions = {
+        childList: true,
+        subtree: false,
+      };
+
+      const observer = new MutationObserver((records, observer) => {
+        for (const record of records) {
+          for (const addedNode of record.addedNodes) {
+            if (addedNode.tagName === "OPTION") {
+              if (addedNode.getAttribute("value") === value) {
+                addedNode.setAttribute("selected", "");
+              }
+            }
+          }
+        }
+      });
+      observer.observe(this, observerOptions);
+    }
+  }
+}
+
 customElements.define("chemical-input", ChemicalInput, { extends: "input" });
 customElements.define("chemical-button", ChemicalButton, { extends: "button" });
 customElements.define("chemical-iframe", ChemicalIFrame, { extends: "iframe" });
@@ -142,8 +190,9 @@ customElements.define("chemical-controls", ChemicalControls, {
   extends: "section",
 });
 customElements.define("chemical-link", ChemicalLink, { extends: "a" });
+customElements.define("chemical-select", ChemicalSelect, { extends: "select" });
 
-function chemicalAction(action, frameID) {
+window.chemical.componentAction = function (action, frameID) {
   let frame = document.getElementById(frameID);
 
   if (frame) {
@@ -162,4 +211,4 @@ function chemicalAction(action, frameID) {
         frame.src = "";
     }
   }
-}
+};

package/client/chemical.js

@@ -1,12 +1,26 @@
+const currentScript = document.currentScript;
+
 window.chemical = {
   loaded: false,
-  transport: document.currentScript.dataset.transport || "libcurl",
+  transport:
+    currentScript.dataset.transportStore !== undefined
+      ? localStorage.getItem("@chemical/transport") ||
+        currentScript.dataset.transport ||
+        "libcurl"
+      : currentScript.dataset.transport || "libcurl",
   wisp:
-    document.currentScript.dataset.wisp ||
-    (location.protocol === "https:" ? "wss" : "ws") +
-      "://" +
-      location.host +
-      "/wisp/",
+    currentScript.dataset.wispStore !== undefined
+      ? localStorage.getItem("@chemical/wisp") ||
+        currentScript.dataset.wisp ||
+        (location.protocol === "https:" ? "wss" : "ws") +
+          "://" +
+          location.host +
+          "/wisp/"
+      : currentScript.dataset.wisp ||
+        (location.protocol === "https:" ? "wss" : "ws") +
+          "://" +
+          location.host +
+          "/wisp/",
 };
 
 function rammerheadEncode(baseUrl, decode = false) {
@@ -242,18 +256,18 @@ window.chemical.encode = async function (url, config) {
     };
   }
 
-  if (config.service == undefined) {
+  if (config.service === undefined) {
     config.service = defaultService;
   }
 
-  if (config.autoHttps == undefined) {
+  if (config.autoHttps === undefined) {
     config.autoHttps = false;
   }
 
   if (url.match(/^https?:\/\//)) {
     return await encodeService(url, config.service);
   } else if (
-    config.autoHttps == true &&
+    config.autoHttps === true &&
     url.includes(".") &&
     !url.includes(" ")
   ) {
@@ -304,43 +318,39 @@ 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;
-}
+window.chemical.setStore = function (key, value) {
+  const allowed = ["transport", "wisp", "service", "autoHttps", "searchEngine"];
 
-function checkBlacklist(entries, filter) {
-  for (let entry of entries) {
-    if (filter(entry)) return true;
+  if (allowed.includes(key)) {
+    localStorage.setItem("@chemical/" + key, String(value));
+    if (key === "transport") {
+      window.chemical.setTransport(value);
+    }
+    if (key === "wisp") {
+      window.chemical.setWisp(value);
+    }
+    window.dispatchEvent(
+      new CustomEvent("chemicalStoreChange", {
+        detail: { key, value },
+      })
+    );
   }
-  return false;
-}
+};
 
-window.chemical.blocked = function (url) {
-  let parsedURL;
-  try {
-    parsedURL = new URL(url);
-  } catch {
-    return false;
-  }
+window.chemical.getStore = function (key) {
+  const value =
+    key === "autoHttps"
+      ? localStorage.getItem("@chemical/" + key) === "true"
+      : localStorage.getItem("@chemical/" + key);
+
+  const defaults = {
+    transport: window.chemical.transport,
+    wisp: window.chemical.wisp,
+    service: "uv",
+    autoHttps: 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;
-  }
+  return value || defaults[key];
 };
 
 function getTransport(transport) {
@@ -355,16 +365,22 @@ function getTransport(transport) {
   }
 }
 
-window.chemical.setTransport = async function (
-  newTransport = window.chemical.transport
-) {
+window.chemical.setTransport = async function (newTransport) {
+  newTransport = newTransport || currentScript.dataset.transport || "libcurl";
   await window.chemical.connection.setTransport(getTransport(newTransport), [
     { wisp: window.chemical.wisp },
   ]);
   window.chemical.transport = newTransport;
 };
 
-window.chemical.setWisp = async function (wisp = window.chemical.wisp) {
+window.chemical.setWisp = async function (wisp) {
+  wisp =
+    wisp ||
+    currentScript.dataset.wisp ||
+    (location.protocol === "https:" ? "wss" : "ws") +
+      "://" +
+      location.host +
+      "/wisp/";
   await window.chemical.connection.setTransport(
     getTransport(window.chemical.transport),
     [{ wisp: wisp }]
@@ -450,7 +466,7 @@ if (meteorEnabled) {
 window.chemical.connection = new window.BareMux.BareMuxConnection(
   "/baremux/worker.js"
 );
-await window.chemical.setTransport();
+await window.chemical.setTransport(window.chemical.transport);
 setupFetch();
 await registerSW();
 window.chemical.loaded = true;

package/index.js

@@ -40,19 +40,23 @@ class ChemicalServer {
       options = {};
     }
 
-    if (options.uv == undefined) {
+    if (options.uv === undefined) {
       options.uv = true;
     }
 
-    if (options.scramjet == undefined) {
-      options.scramjet = true;
+    if (options.experimental === undefined) {
+      options.experimental = {};
     }
 
-    if (options.meteor == undefined) {
-      options.meteor = true;
+    if (options.experimental.scramjet === undefined) {
+      options.experimental.scramjet = false;
     }
 
-    if (options.rammerhead == undefined) {
+    if (options.experimental.meteor === undefined) {
+      options.experimental.meteor = false;
+    }
+
+    if (options.rammerhead === undefined) {
       options.rammerhead = true;
     }
 
@@ -95,12 +99,12 @@ class ChemicalServer {
         "const uvEnabled = " + String(this.options.uv) + ";\n" + chemicalMain;
       chemicalMain =
         "const scramjetEnabled = " +
-        String(this.options.scramjet) +
+        String(this.options.experimental.scramjet) +
         ";\n" +
         chemicalMain;
       chemicalMain =
         "const meteorEnabled = " +
-        String(this.options.meteor) +
+        String(this.options.experimental.meteor) +
         ";\n" +
         chemicalMain;
       chemicalMain =
@@ -108,20 +112,6 @@ 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})();";
 
@@ -138,12 +128,12 @@ class ChemicalServer {
         "const uvEnabled = " + String(this.options.uv) + ";\n" + chemicalSW;
       chemicalSW =
         "const scramjetEnabled = " +
-        String(this.options.scramjet) +
+        String(this.options.experimental.scramjet) +
         ";\n" +
         chemicalSW;
       chemicalSW =
         "const meteorEnabled = " +
-        String(this.options.meteor) +
+        String(this.options.experimental.meteor) +
         ";\n" +
         chemicalSW;
       chemicalSW =
@@ -163,14 +153,14 @@ class ChemicalServer {
       this.app.use("/uv/", express.static(resolve(__dirname, "config/uv")));
       this.app.use("/uv/", express.static(uvPath));
     }
-    if (this.options.scramjet) {
+    if (this.options.experimental.scramjet) {
       this.app.use(
         "/scramjet/",
         express.static(resolve(__dirname, "config/scramjet"))
       );
       this.app.use("/scramjet/", express.static(scramjetPath));
     }
-    if (this.options.meteor) {
+    if (this.options.experimental.meteor) {
       this.app.use(
         "/meteor/",
         express.static(resolve(__dirname, "config/meteor"))
@@ -186,11 +176,10 @@ class ChemicalServer {
     });
     this.server.on("upgrade", (req, socket, head) => {
       if (req.url && req.url.endsWith("/wisp/")) {
-        if (this.options.hostname_blacklist) {
-          wisp.options.hostname_blacklist = this.options.hostname_blacklist;
-        }
-        if (this.options.hostname_whitelist) {
-          wisp.options.hostname_whitelist = this.options.hostname_whitelist;
+        if (this.options.wispOptions) {
+          for (let option in this.options.wispOptions) {
+            wisp.options[option] = this.options.wispOptions[option];
+          }
         }
         wisp.routeRequest(req, socket, head);
       } else if (this.options.rammerhead && shouldRouteRh(req)) {
@@ -217,19 +206,23 @@ const ChemicalVitePlugin = (options) => ({
       options = {};
     }
 
-    if (options.uv == undefined) {
+    if (options.uv === undefined) {
       options.uv = true;
     }
 
-    if (options.scramjet == undefined) {
-      options.scramjet = true;
+    if (options.experimental === undefined) {
+      options.experimental = {};
+    }
+
+    if (options.experimental.scramjet === undefined) {
+      options.experimental.scramjet = false;
     }
 
-    if (options.meteor == undefined) {
-      options.meteor = true;
+    if (options.experimental.meteor === undefined) {
+      options.experimental.meteor = false;
     }
 
-    if (options.rammerhead == undefined) {
+    if (options.rammerhead === undefined) {
       options.rammerhead = true;
     }
 
@@ -262,12 +255,12 @@ const ChemicalVitePlugin = (options) => ({
         "const uvEnabled = " + String(options.uv) + ";\n" + chemicalMain;
       chemicalMain =
         "const scramjetEnabled = " +
-        String(options.scramjet) +
+        String(options.experimental.scramjet) +
         ";\n" +
         chemicalMain;
       chemicalMain =
         "const meteorEnabled = " +
-        String(options.meteor) +
+        String(options.experimental.meteor) +
         ";\n" +
         chemicalMain;
       chemicalMain =
@@ -275,20 +268,6 @@ 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})();";
 
@@ -305,11 +284,14 @@ const ChemicalVitePlugin = (options) => ({
         "const uvEnabled = " + String(options.uv) + ";\n" + chemicalSW;
       chemicalSW =
         "const scramjetEnabled = " +
-        String(options.scramjet) +
+        String(options.experimental.scramjet) +
         ";\n" +
         chemicalSW;
       chemicalSW =
-        "const meteorEnabled = " + String(options.meteor) + ";\n" + chemicalSW;
+        "const meteorEnabled = " +
+        String(options.experimental.meteor) +
+        ";\n" +
+        chemicalSW;
       chemicalSW =
         "const rammerheadEnabled = " +
         String(options.rammerhead) +
@@ -327,14 +309,14 @@ const ChemicalVitePlugin = (options) => ({
       app.use("/uv/", express.static(resolve(__dirname, "config/uv")));
       app.use("/uv/", express.static(uvPath));
     }
-    if (options.scramjet) {
+    if (options.experimental.scramjet) {
       app.use(
         "/scramjet/",
         express.static(resolve(__dirname, "config/scramjet"))
       );
       app.use("/scramjet/", express.static(scramjetPath));
     }
-    if (options.meteor) {
+    if (options.experimental.meteor) {
       app.use("/meteor/", express.static(resolve(__dirname, "config/meteor")));
       app.use("/meteor/", express.static(meteorPath));
     }
@@ -357,11 +339,10 @@ const ChemicalVitePlugin = (options) => ({
 
     server.httpServer.on("upgrade", (req, socket, head) => {
       if (req.url && req.url.endsWith("/wisp/")) {
-        if (options.hostname_blacklist) {
-          wisp.options.hostname_blacklist = options.hostname_blacklist;
-        }
-        if (options.hostname_whitelist) {
-          wisp.options.hostname_whitelist = options.hostname_whitelist;
+        if (options.wispOptions) {
+          for (let option in options.wispOptions) {
+            wisp.options[option] = options.wispOptions[option];
+          }
         }
         wisp.routeRequest(req, socket, head);
       } else if (options.rammerhead && shouldRouteRh(req)) {
@@ -386,7 +367,7 @@ class ChemicalBuild {
       options = {};
     }
 
-    if (options.path == undefined) {
+    if (options.path === undefined) {
       options.path = "dist";
     }
 
@@ -398,19 +379,23 @@ class ChemicalBuild {
       options.path = options.path.slice(0, -1);
     }
 
-    if (options.uv == undefined) {
+    if (options.uv === undefined) {
       options.uv = true;
     }
 
-    if (options.scramjet == undefined) {
-      options.scramjet = true;
+    if (options.experimental === undefined) {
+      options.experimental = {};
     }
 
-    if (options.meteor == undefined) {
-      options.meteor = true;
+    if (options.experimental.scramjet === undefined) {
+      options.experimental.scramjet = false;
     }
 
-    if (options.rammerhead == undefined) {
+    if (options.experimental.meteor === undefined) {
+      options.experimental.meteor = false;
+    }
+
+    if (options.rammerhead === undefined) {
       options.rammerhead = true;
     }
 
@@ -453,12 +438,12 @@ class ChemicalBuild {
       "const uvEnabled = " + String(this.options.uv) + ";\n" + chemicalMain;
     chemicalMain =
       "const scramjetEnabled = " +
-      String(this.options.scramjet) +
+      String(this.options.experimental.scramjet) +
       ";\n" +
       chemicalMain;
     chemicalMain =
       "const meteorEnabled = " +
-      String(this.options.meteor) +
+      String(this.options.experimental.meteor) +
       ";\n" +
       chemicalMain;
     chemicalMain =
@@ -466,20 +451,6 @@ 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})();";
 
@@ -494,12 +465,12 @@ class ChemicalBuild {
       "const uvEnabled = " + String(this.options.uv) + ";\n" + chemicalSW;
     chemicalSW =
       "const scramjetEnabled = " +
-      String(this.options.scramjet) +
+      String(this.options.experimental.scramjet) +
       ";\n" +
       chemicalSW;
     chemicalSW =
       "const meteorEnabled = " +
-      String(this.options.meteor) +
+      String(this.options.experimental.meteor) +
       ";\n" +
       chemicalSW;
     chemicalSW =
@@ -527,7 +498,7 @@ class ChemicalBuild {
         resolve(this.options.path, "uv/uv.config.js")
       );
     }
-    if (this.options.scramjet) {
+    if (this.options.experimental.scramjet) {
       cpSync(scramjetPath, resolve(this.options.path, "scramjet"), {
         recursive: true,
       });
@@ -536,7 +507,7 @@ class ChemicalBuild {
         resolve(this.options.path, "scramjet/scramjet.config.js")
       );
     }
-    if (this.options.meteor) {
+    if (this.options.experimental.meteor) {
       cpSync(meteorPath, resolve(this.options.path, "meteor"), {
         recursive: true,
       });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "chemicaljs",
-    "version": "1.8.6",
+    "version": "2.0.0",
     "description": "Easily create your own web proxy with no experience required.",
     "repository": {
         "type": "git",
@@ -18,7 +18,7 @@
         "@mercuryworkshop/epoxy-transport": "^2.1.11",
         "@mercuryworkshop/libcurl-transport": "^1.3.10",
         "@mercuryworkshop/scramjet": "^1.0.2",
-        "@mercuryworkshop/wisp-js": "^0.3.0",
+        "@mercuryworkshop/wisp-js": "^0.3.1",
         "@rubynetwork/rammerhead": "^1.3.2",
         "@titaniumnetwork-dev/ultraviolet": "^3.2.7",
         "express": "^4.21.0",