chemicaljs 1.9.0 → 2.0.1

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,6 +318,41 @@ window.chemical.decode = async function (url, config) {
   }
 };
 
+window.chemical.setStore = function (key, value) {
+  const allowed = ["transport", "wisp", "service", "autoHttps", "searchEngine"];
+
+  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 },
+      })
+    );
+  }
+};
+
+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,
+  };
+
+  return value || defaults[key];
+};
+
 function getTransport(transport) {
   switch (transport) {
     default:
@@ -316,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 }]
@@ -411,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,23 +40,23 @@ class ChemicalServer {
       options = {};
     }
 
-    if (options.uv == undefined) {
+    if (options.uv === undefined) {
       options.uv = true;
     }
 
-    if (options.experimental == undefined) {
-      options.experimental = {}
+    if (options.experimental === undefined) {
+      options.experimental = {};
     }
 
-    if (options.experimental.scramjet == undefined) {
+    if (options.experimental.scramjet === undefined) {
       options.experimental.scramjet = false;
     }
 
-    if (options.experimental.meteor == undefined) {
+    if (options.experimental.meteor === undefined) {
       options.experimental.meteor = false;
     }
 
-    if (options.rammerhead == undefined) {
+    if (options.rammerhead === undefined) {
       options.rammerhead = true;
     }
 
@@ -178,7 +178,7 @@ class ChemicalServer {
       if (req.url && req.url.endsWith("/wisp/")) {
         if (this.options.wispOptions) {
           for (let option in this.options.wispOptions) {
-            wisp.options[option] = this.options.wispOptions[option]
+            wisp.options[option] = this.options.wispOptions[option];
           }
         }
         wisp.routeRequest(req, socket, head);
@@ -206,23 +206,23 @@ const ChemicalVitePlugin = (options) => ({
       options = {};
     }
 
-    if (options.uv == undefined) {
+    if (options.uv === undefined) {
       options.uv = true;
     }
 
-    if (options.experimental == undefined) {
-      options.experimental = {}
+    if (options.experimental === undefined) {
+      options.experimental = {};
     }
 
-    if (options.experimental.scramjet == undefined) {
+    if (options.experimental.scramjet === undefined) {
       options.experimental.scramjet = false;
     }
 
-    if (options.experimental.meteor == undefined) {
+    if (options.experimental.meteor === undefined) {
       options.experimental.meteor = false;
     }
 
-    if (options.rammerhead == undefined) {
+    if (options.rammerhead === undefined) {
       options.rammerhead = true;
     }
 
@@ -288,7 +288,10 @@ const ChemicalVitePlugin = (options) => ({
         ";\n" +
         chemicalSW;
       chemicalSW =
-        "const meteorEnabled = " + String(options.experimental.meteor) + ";\n" + chemicalSW;
+        "const meteorEnabled = " +
+        String(options.experimental.meteor) +
+        ";\n" +
+        chemicalSW;
       chemicalSW =
         "const rammerheadEnabled = " +
         String(options.rammerhead) +
@@ -338,7 +341,7 @@ const ChemicalVitePlugin = (options) => ({
       if (req.url && req.url.endsWith("/wisp/")) {
         if (options.wispOptions) {
           for (let option in options.wispOptions) {
-            wisp.options[option] = options.wispOptions[option]
+            wisp.options[option] = options.wispOptions[option];
           }
         }
         wisp.routeRequest(req, socket, head);
@@ -364,7 +367,7 @@ class ChemicalBuild {
       options = {};
     }
 
-    if (options.path == undefined) {
+    if (options.path === undefined) {
       options.path = "dist";
     }
 
@@ -376,23 +379,23 @@ class ChemicalBuild {
       options.path = options.path.slice(0, -1);
     }
 
-    if (options.uv == undefined) {
+    if (options.uv === undefined) {
       options.uv = true;
     }
 
-    if (options.experimental == undefined) {
-      options.experimental = {}
+    if (options.experimental === undefined) {
+      options.experimental = {};
     }
 
-    if (options.experimental.scramjet == undefined) {
+    if (options.experimental.scramjet === undefined) {
       options.experimental.scramjet = false;
     }
 
-    if (options.experimental.meteor == undefined) {
+    if (options.experimental.meteor === undefined) {
       options.experimental.meteor = false;
     }
 
-    if (options.rammerhead == undefined) {
+    if (options.rammerhead === undefined) {
       options.rammerhead = true;
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "chemicaljs",
-    "version": "1.9.0",
+    "version": "2.0.1",
     "description": "Easily create your own web proxy with no experience required.",
     "repository": {
         "type": "git",
@@ -15,11 +15,11 @@
     },
     "dependencies": {
         "@mercuryworkshop/bare-mux": "^2.0.9",
-        "@mercuryworkshop/epoxy-transport": "^2.1.11",
+        "@mercuryworkshop/epoxy-transport": "^2.1.12",
         "@mercuryworkshop/libcurl-transport": "^1.3.10",
         "@mercuryworkshop/scramjet": "^1.0.2",
-        "@mercuryworkshop/wisp-js": "^0.3.1",
-        "@rubynetwork/rammerhead": "^1.3.2",
+        "@mercuryworkshop/wisp-js": "^0.3.2",
+        "@rubynetwork/rammerhead": "^1.3.3",
         "@titaniumnetwork-dev/ultraviolet": "^3.2.7",
         "express": "^4.21.0",
         "meteorproxy": "^1.0.6-patch.1"