chemicaljs 1.6.7 → 1.7.0

package/README.md

@@ -1,6 +1,9 @@
 # Chemical
 Easily create your own web proxy with no experience required.
 
+> [!IMPORTANT]  
+> I am in the process of creating a documentation site. These docs might be outdated.
+
 ## Setup
 
 A simple example can be found in [`/example/`](https://github.com/chemicaljs/chemical/tree/main/examples/example).
@@ -25,13 +28,13 @@ Create a new Node.js project and create a script file for the server.
 ```js
 import { ChemicalServer } from "chemicaljs";
 
-const chemical = new ChemicalServer();
+const [app, listen] = new ChemicalServer();
 ```
 
 You can pass options to disable proxy services and set the default service.
 
 ```js
-const chemical = new ChemicalServer({
+const [app, listen] = new ChemicalServer({
     default: "rammerhead",
     uv: true,
     scramjet: false,
@@ -43,7 +46,7 @@ const chemical = new ChemicalServer({
 
 `hostname_whitelist` overrides `hostname_blacklist` if you try to set them both.
 
-3. Use `chemical.app` which is an express app. `chemical.use` is shortand for `chemical.app.use` (same with `chemical.get`). You may need to import express for certain APIs.
+3. Use `app` which is an express app. You may need to import express for certain APIs.
 
 ```js
 chemical.get("/", function(req, res){
@@ -51,20 +54,21 @@ chemical.get("/", function(req, res){
 });
 ```
 
+4. Use `app.serveChemical()` to serve Chemical routes.
 
-5. Chemical routes are after user routes as to not overwrite custom files. Due to this you will need to use `chemical.error` for custom error pages.
+5. Use `serveChemical` after main routes but before 404 routes. Example 404 page.
 
 ```js
-chemical.error((req, res) => {
+app.use((req, res) => {
     res.status(404);
     res.send("404 Error");
 });
 ```
 
-4. Use `chemical.listen` on a port of your choosing.
+4. Use `listen` on a port of your choosing.
 
 ```js
-chemical.listen(3000);
+listen(3000);
 ```
 
 Below is an example of a simple backend. This example will setup Chemical and serve the "public" folder along with the `index.html` file as `/` and `.html` files without the extension.
@@ -74,20 +78,22 @@ Below is an example of a simple backend. This example will setup Chemical and se
 import { ChemicalServer } from "chemicaljs";
 import express from "express";
 
-const chemical = new ChemicalServer();
+const [app, listen] = new ChemicalServer();
 const port = process.env.PORT || 3000;
 
-chemical.use(express.static("public", {
+app.use(express.static("public", {
     index: "index.html",
     extensions: ["html"]
 }));
 
-chemical.error((req, res) => {
+app.serveChemical();
+
+app.use((req, res) => {
     res.status(404);
     res.send("404 Error");
 });
 
-chemical.listen(port, () => {
+listen(port, () => {
     console.log(`Chemical demo listening on port ${port}`);
 });
 ```
@@ -150,22 +156,40 @@ If you want to set the transport just change the `transport` attribute. Choose `
 <script data-transport="epoxy" src="/chemical.js"></script>
 ```
 
-2. In a inline script or javascript file, encode a URL with Chemical using the async function `window.chemicalEncode`.
+2. In a inline script or javascript file, encode a URL with Chemical using the async function `chemical.encode`.
 
 ```js
-await window.chemicalEncode("https://example.com")
+await chemical.encode("https://example.com")
 ```
 
 Optional: Change service to `uv`, `scramjet`, or `rammerhead`. Defaults to `uv` or server option.
 
 ```js
-await window.chemicalEncode("https://example.com", "rammerhead")
+await chemical.encode("https://example.com", {
+    service: "rammerhead"
+})
+```
+
+4. Set `autoHttps` to make `example.com` > `https://example.com`
+
+```js
+await chemical.encode("example.com", {
+    autoHttps: true
+})
 ```
 
-3. You may want to check if Chemical has loaded before encoding a URL.
+5. Use a search engine with the `searchEngine` property. Use a search engine URL with "%s" in place of query.
 
 ```js
-if (window.chemicalLoaded) {
+await chemical.encode("cheese", {
+    searchEngine: "https://www.google.com/search?q=%s"
+})
+```
+
+6. You may want to check if Chemical has loaded before encoding a URL.
+
+```js
+if (window.chemical.loaded) {
     //Chemical is loaded
 }
 ```
@@ -176,10 +200,16 @@ window.addEventListener("chemicalLoaded", function(e) {
 });
 ```
 
-4. Change the transport and Wisp URL with `chemicalTransport`
+7. Change the transport with `chemical.setTransport`
 
 ```js
-await chemicalTransport("libcurl", "wss://wisp.mercurywork.shop/")
+await chemical.setTransport("libcurl") //libcurl or epoxy
+```
+
+8. Change the Wisp URL with `chemical.setWisp`
+
+```js
+await chemical.setWisp("wss://wisp.mercurywork.shop/")
 ```
 
 Below is a simple example of a simple input that redirects to the encoded URL when the user presses enter. It checks if there is any input and if Chemical has loaded before loading.
@@ -193,8 +223,8 @@ Below is a simple example of a simple input that redirects to the encoded URL wh
     const search = document.getElementById("search");
 
     search.addEventListener("keydown", async function (e) {
-        if (e.key == "Enter" && window.chemicalLoaded && e.target.value) {
-            window.location = await window.chemicalEncode(e.target.value)
+        if (e.key == "Enter" && chemical.loaded && e.target.value) {
+            window.location = await chemical.encode(e.target.value)
         }
     })
 </script>
@@ -321,13 +351,5 @@ Set the second parameter of `chemicalAction` to the `id` of the iframe.
 <iframe controls="my-controls-2" id="my-iframe-2" is="chemical-iframe"></iframe>
 ```
 
-## Future Additions
-
-- Automatically add https:// if needed
-- Search engine option for search
-- Easy tab cloaking
-- Easy about:blank
-- Proxy switcher/searchengine switcher/cloak switcher
-
 ## License
 Chemical uses the AGPL 3.0 license.

package/client/chemical.js

@@ -1,4 +1,8 @@
-window.chemicalLoaded = false;
+window.chemical = {
+    loaded: false,
+    transport: document.currentScript.dataset.transport || "libcurl",
+    wisp: document.currentScript.dataset.wisp || (location.protocol === "https:" ? "wss" : "ws") + "://" + location.host + "/wisp/"
+}
 
 function rammerheadEncode(baseUrl) {
     const mod = (n, m) => ((n % m) + m) % m
@@ -174,7 +178,7 @@ function rammerheadEncode(baseUrl) {
     })
 }
 
-async function chemicalEncode(url, service = defaultService) {
+async function encodeService(url, service) {
     switch (service) {
         case "uv":
             if (uvEnabled) {
@@ -193,7 +197,7 @@ async function chemicalEncode(url, service = defaultService) {
         case "scramjet":
             if (scramjetEnabled) {
                 return (
-                    window.location.origin +
+                    "https://proxysite.com" +
                     window.__scramjet$config.prefix +
                     window.__scramjet$config.codec.encode(url)
                 );
@@ -202,8 +206,28 @@ async function chemicalEncode(url, service = defaultService) {
     }
 }
 
+window.chemical.encode = async function (url, config) {
+    if (!config || typeof config !== "object" || Array.isArray(config)) {
+        config = {
+            service: defaultService,
+            autoHttps: false
+        }
+    }
+
+    if (url.match(/^https?:\/\//)) {
+        return await encodeService(url, config.service);
+    } else if (config.autoHttps == true && (url.includes(".") && !url.includes(" "))) {
+        return await encodeService("https://" + url, config.service);
+    } else if (config.searchEngine) {
+        return await encodeService(config.searchEngine.replace("%s", encodeURIComponent(url)), config.service);
+    } else {
+        return await encodeService(url, config.service);
+    }
+}
+
 function getTransport(transport) {
     switch (transport) {
+        default:
         case "libcurl":
             return "/libcurl/index.mjs"
             break;
@@ -213,19 +237,17 @@ function getTransport(transport) {
     }
 }
 
-let connection;
-
-let wispURL = document.currentScript.dataset.wisp;
-let transport = document.currentScript.dataset.transport;
+window.chemical.setTransport = async function (newTransport = window.chemical.transport) {
+    await window.chemical.connection.setTransport(getTransport(newTransport), [{ wisp: window.chemical.wisp }]);
+    window.chemical.transport = newTransport;
+}
 
-async function chemicalTransport(newTransport = transport, wisp = wispURL) {
-    await connection.setTransport(getTransport(newTransport) || "/libcurl/index.mjs", [{ wisp: wisp || (location.protocol === "https:" ? "wss" : "ws") + "://" + location.host + "/wisp/" }]);
+window.chemical.setWisp = async function (wisp = window.chemical.wisp) {
+    await window.chemical.connection.setTransport(getTransport(window.chemical.transport), [{ wisp: wisp }]);
+    window.chemical.wisp = wisp;
 }
 
 async function registerSW() {
-    connection = new window.BareMux.BareMuxConnection("/baremux/worker.js");
-    await chemicalTransport();
-
     if ("serviceWorker" in navigator) {
         await navigator.serviceWorker.register("/chemical.sw.js");
     } else {
@@ -247,6 +269,28 @@ async function loadScript(src) {
     });
 }
 
+function setupFetch() {
+    const client = new window.BareMux.BareClient();
+    window.chemical.fetch = client.fetch.bind(client);
+
+    window.chemical.getSuggestions = async function (query) {
+        if (!query) {
+            return [];
+        }
+
+        try {
+            const DDGSuggestions = await window.chemical.fetch(
+                "https://duckduckgo.com/ac/?q=" + query + "&type=list"
+            );
+            const suggestions = await DDGSuggestions.json();
+            return suggestions[1].slice(0, 9);
+        } catch (err) {
+            console.error(err);
+            return [];
+        }
+    }
+}
+
 (async () => {
     await loadScript("/baremux/index.js");
     if (uvEnabled) {
@@ -257,7 +301,10 @@ async function loadScript(src) {
         await loadScript("/scramjet/scramjet.codecs.js");
         await loadScript("/scramjet/scramjet.config.js");
     }
+    window.chemical.connection = new window.BareMux.BareMuxConnection("/baremux/worker.js");
+    await window.chemical.setTransport();
+    setupFetch();
     await registerSW();
-    chemicalLoaded = true;
+    window.chemical.loaded = true;
     window.dispatchEvent(new Event("chemicalLoaded"));
 })();

package/examples/example/index.js

@@ -1,19 +1,21 @@
 import { ChemicalServer } from "chemicaljs";
 import express from "express";
 
-const chemical = new ChemicalServer();
+const [app, listen] = new ChemicalServer();
 const port = process.env.PORT || 3000;
 
-chemical.use(express.static("public", {
+app.use(express.static("public", {
     index: "index.html",
     extensions: ["html"]
 }));
 
-chemical.error((req, res) => {
+app.serveChemical();
+
+app.use((req, res) => {
     res.status(404);
     res.send("404 Error");
 });
 
-chemical.listen(port, () => {
+listen(port, () => {
     console.log(`Chemical example listening on port ${port}`);
 });

package/examples/example/package-lock.json

@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "chemicaljs": "^1.6.6",
+        "chemicaljs": "^1.6.7",
         "express": "^4.19.2"
       }
     },
@@ -409,16 +409,16 @@
       "integrity": "sha512-Y5jByKQ/5ZhyKd3adHUQ18nB+HOUpopxRXIJh6KHXEq4rkG2AazHyMm42dvtAxHvkKlHkLxR7/5oxKZSD6rE4A=="
     },
     "node_modules/@mercuryworkshop/epoxy-tls": {
-      "version": "2.1.0-1",
-      "resolved": "https://registry.npmjs.org/@mercuryworkshop/epoxy-tls/-/epoxy-tls-2.1.0-1.tgz",
-      "integrity": "sha512-vyC2xVEd3gUl00r3CxqVd7qOe0FrkZQT2l6EP0qohqzcwV6oDq27nAa/I/gceYl38lDiqatxEoKKO4okvNbKCw=="
+      "version": "2.1.2-1",
+      "resolved": "https://registry.npmjs.org/@mercuryworkshop/epoxy-tls/-/epoxy-tls-2.1.2-1.tgz",
+      "integrity": "sha512-qt6UOEZcVMYblFwOKaNAZHoDHSYN3JZ5Z6BvRHKB6zo1DFMub+cPuYQ+Aauib7LmIabYWZi2cMyfO5VsNLDYoA=="
     },
     "node_modules/@mercuryworkshop/epoxy-transport": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@mercuryworkshop/epoxy-transport/-/epoxy-transport-2.1.5.tgz",
-      "integrity": "sha512-e4XTHaIK2BEPolhfZmn4OLK9kS4DjnpfzGSazc0yiMMm7j7G2RwevUOp/wO83TkV5jOZdC4O79iaDvFWdDIRuw==",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/@mercuryworkshop/epoxy-transport/-/epoxy-transport-2.1.8.tgz",
+      "integrity": "sha512-quBpEDb3mRxQOl7S6NkT6qFoII+cmBVNOC9/58hN7A4WIg6Q11d+FgAygDLWq5yESgtmDKujZjBVA2XQ6OkLgQ==",
       "dependencies": {
-        "@mercuryworkshop/epoxy-tls": "2.1.0-1"
+        "@mercuryworkshop/epoxy-tls": "2.1.2-1"
       }
     },
     "node_modules/@mercuryworkshop/libcurl-transport": {
@@ -1163,12 +1163,12 @@
       }
     },
     "node_modules/chemicaljs": {
-      "version": "1.6.6",
-      "resolved": "https://registry.npmjs.org/chemicaljs/-/chemicaljs-1.6.6.tgz",
-      "integrity": "sha512-Efih9ve2ezQDdqHeISb//ARLzZAiH1AtRvi3XE6vCaBddvelSKDLoclXLkYtV5rZ2ovlthWakRfP5MbrZOQuSA==",
+      "version": "1.6.7",
+      "resolved": "https://registry.npmjs.org/chemicaljs/-/chemicaljs-1.6.7.tgz",
+      "integrity": "sha512-3BaUpDAaHRD4GiE3MVfJ1cB0lxWx4cojOs/XN3SePmfm96DGjjvWEEpSikoC97yJe2XrNi7JLtASTB1Dk4af9g==",
       "dependencies": {
         "@mercuryworkshop/bare-mux": "^2.0.4",
-        "@mercuryworkshop/epoxy-transport": "^2.1.5",
+        "@mercuryworkshop/epoxy-transport": "^2.1.8",
         "@mercuryworkshop/libcurl-transport": "^1.3.7",
         "@mercuryworkshop/scramjet": "^1.0.2",
         "@mercuryworkshop/wisp-js": "^0.1.1",

package/examples/example/package.json

@@ -18,7 +18,7 @@
   },
   "homepage": "https://github.com/chemicaljs/chemical#readme",
   "dependencies": {
-    "chemicaljs": "^1.6.6",
+    "chemicaljs": "^1.6.7",
     "express": "^4.19.2"
   }
 }

package/examples/example-build/package-lock.json

@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "chemicaljs": "^1.6.6",
+        "chemicaljs": "^1.6.7",
         "express": "^4.19.2"
       }
     },
@@ -409,16 +409,16 @@
       "integrity": "sha512-Y5jByKQ/5ZhyKd3adHUQ18nB+HOUpopxRXIJh6KHXEq4rkG2AazHyMm42dvtAxHvkKlHkLxR7/5oxKZSD6rE4A=="
     },
     "node_modules/@mercuryworkshop/epoxy-tls": {
-      "version": "2.1.0-1",
-      "resolved": "https://registry.npmjs.org/@mercuryworkshop/epoxy-tls/-/epoxy-tls-2.1.0-1.tgz",
-      "integrity": "sha512-vyC2xVEd3gUl00r3CxqVd7qOe0FrkZQT2l6EP0qohqzcwV6oDq27nAa/I/gceYl38lDiqatxEoKKO4okvNbKCw=="
+      "version": "2.1.2-1",
+      "resolved": "https://registry.npmjs.org/@mercuryworkshop/epoxy-tls/-/epoxy-tls-2.1.2-1.tgz",
+      "integrity": "sha512-qt6UOEZcVMYblFwOKaNAZHoDHSYN3JZ5Z6BvRHKB6zo1DFMub+cPuYQ+Aauib7LmIabYWZi2cMyfO5VsNLDYoA=="
     },
     "node_modules/@mercuryworkshop/epoxy-transport": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@mercuryworkshop/epoxy-transport/-/epoxy-transport-2.1.5.tgz",
-      "integrity": "sha512-e4XTHaIK2BEPolhfZmn4OLK9kS4DjnpfzGSazc0yiMMm7j7G2RwevUOp/wO83TkV5jOZdC4O79iaDvFWdDIRuw==",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/@mercuryworkshop/epoxy-transport/-/epoxy-transport-2.1.8.tgz",
+      "integrity": "sha512-quBpEDb3mRxQOl7S6NkT6qFoII+cmBVNOC9/58hN7A4WIg6Q11d+FgAygDLWq5yESgtmDKujZjBVA2XQ6OkLgQ==",
       "dependencies": {
-        "@mercuryworkshop/epoxy-tls": "2.1.0-1"
+        "@mercuryworkshop/epoxy-tls": "2.1.2-1"
       }
     },
     "node_modules/@mercuryworkshop/libcurl-transport": {
@@ -1163,12 +1163,12 @@
       }
     },
     "node_modules/chemicaljs": {
-      "version": "1.6.6",
-      "resolved": "https://registry.npmjs.org/chemicaljs/-/chemicaljs-1.6.6.tgz",
-      "integrity": "sha512-Efih9ve2ezQDdqHeISb//ARLzZAiH1AtRvi3XE6vCaBddvelSKDLoclXLkYtV5rZ2ovlthWakRfP5MbrZOQuSA==",
+      "version": "1.6.7",
+      "resolved": "https://registry.npmjs.org/chemicaljs/-/chemicaljs-1.6.7.tgz",
+      "integrity": "sha512-3BaUpDAaHRD4GiE3MVfJ1cB0lxWx4cojOs/XN3SePmfm96DGjjvWEEpSikoC97yJe2XrNi7JLtASTB1Dk4af9g==",
       "dependencies": {
         "@mercuryworkshop/bare-mux": "^2.0.4",
-        "@mercuryworkshop/epoxy-transport": "^2.1.5",
+        "@mercuryworkshop/epoxy-transport": "^2.1.8",
         "@mercuryworkshop/libcurl-transport": "^1.3.7",
         "@mercuryworkshop/scramjet": "^1.0.2",
         "@mercuryworkshop/wisp-js": "^0.1.1",

package/examples/example-build/package.json

@@ -19,7 +19,7 @@
   },
   "homepage": "https://github.com/chemicaljs/chemical#readme",
   "dependencies": {
-    "chemicaljs": "^1.6.6",
+    "chemicaljs": "^1.6.7",
     "express": "^4.19.2"
   }
 }

package/examples/example-components/index.js

@@ -1,14 +1,16 @@
 import { ChemicalServer } from "chemicaljs";
 import express from "express";
 
-const chemical = new ChemicalServer();
+const [app, listen] = new ChemicalServer();
 const port = process.env.PORT || 3000;
 
-chemical.use(express.static("public", {
+app.use(express.static("public", {
     index: "index.html",
     extensions: ["html"]
 }));
 
-chemical.listen(port, () => {
+app.serveChemical();
+
+listen(port, () => {
     console.log(`Chemical example components listening on port ${port}`);
 });

package/examples/example-components/package-lock.json

@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "chemicaljs": "^1.6.6",
+        "chemicaljs": "^1.6.7",
         "express": "^4.19.2"
       }
     },
@@ -409,16 +409,16 @@
       "integrity": "sha512-Y5jByKQ/5ZhyKd3adHUQ18nB+HOUpopxRXIJh6KHXEq4rkG2AazHyMm42dvtAxHvkKlHkLxR7/5oxKZSD6rE4A=="
     },
     "node_modules/@mercuryworkshop/epoxy-tls": {
-      "version": "2.1.0-1",
-      "resolved": "https://registry.npmjs.org/@mercuryworkshop/epoxy-tls/-/epoxy-tls-2.1.0-1.tgz",
-      "integrity": "sha512-vyC2xVEd3gUl00r3CxqVd7qOe0FrkZQT2l6EP0qohqzcwV6oDq27nAa/I/gceYl38lDiqatxEoKKO4okvNbKCw=="
+      "version": "2.1.2-1",
+      "resolved": "https://registry.npmjs.org/@mercuryworkshop/epoxy-tls/-/epoxy-tls-2.1.2-1.tgz",
+      "integrity": "sha512-qt6UOEZcVMYblFwOKaNAZHoDHSYN3JZ5Z6BvRHKB6zo1DFMub+cPuYQ+Aauib7LmIabYWZi2cMyfO5VsNLDYoA=="
     },
     "node_modules/@mercuryworkshop/epoxy-transport": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@mercuryworkshop/epoxy-transport/-/epoxy-transport-2.1.5.tgz",
-      "integrity": "sha512-e4XTHaIK2BEPolhfZmn4OLK9kS4DjnpfzGSazc0yiMMm7j7G2RwevUOp/wO83TkV5jOZdC4O79iaDvFWdDIRuw==",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/@mercuryworkshop/epoxy-transport/-/epoxy-transport-2.1.8.tgz",
+      "integrity": "sha512-quBpEDb3mRxQOl7S6NkT6qFoII+cmBVNOC9/58hN7A4WIg6Q11d+FgAygDLWq5yESgtmDKujZjBVA2XQ6OkLgQ==",
       "dependencies": {
-        "@mercuryworkshop/epoxy-tls": "2.1.0-1"
+        "@mercuryworkshop/epoxy-tls": "2.1.2-1"
       }
     },
     "node_modules/@mercuryworkshop/libcurl-transport": {
@@ -1163,12 +1163,12 @@
       }
     },
     "node_modules/chemicaljs": {
-      "version": "1.6.6",
-      "resolved": "https://registry.npmjs.org/chemicaljs/-/chemicaljs-1.6.6.tgz",
-      "integrity": "sha512-Efih9ve2ezQDdqHeISb//ARLzZAiH1AtRvi3XE6vCaBddvelSKDLoclXLkYtV5rZ2ovlthWakRfP5MbrZOQuSA==",
+      "version": "1.6.7",
+      "resolved": "https://registry.npmjs.org/chemicaljs/-/chemicaljs-1.6.7.tgz",
+      "integrity": "sha512-3BaUpDAaHRD4GiE3MVfJ1cB0lxWx4cojOs/XN3SePmfm96DGjjvWEEpSikoC97yJe2XrNi7JLtASTB1Dk4af9g==",
       "dependencies": {
         "@mercuryworkshop/bare-mux": "^2.0.4",
-        "@mercuryworkshop/epoxy-transport": "^2.1.5",
+        "@mercuryworkshop/epoxy-transport": "^2.1.8",
         "@mercuryworkshop/libcurl-transport": "^1.3.7",
         "@mercuryworkshop/scramjet": "^1.0.2",
         "@mercuryworkshop/wisp-js": "^0.1.1",

package/examples/example-components/package.json

@@ -18,7 +18,7 @@
   },
   "homepage": "https://github.com/chemicaljs/chemical#readme",
   "dependencies": {
-    "chemicaljs": "^1.6.6",
+    "chemicaljs": "^1.6.7",
     "express": "^4.19.2"
   }
 }

package/examples/example-styled/index.js

@@ -1,14 +1,16 @@
 import { ChemicalServer } from "chemicaljs";
 import express from "express";
 
-const chemical = new ChemicalServer();
+const [app, listen] = new ChemicalServer();
 const port = process.env.PORT || 3000;
 
-chemical.use(express.static("public", {
+app.use(express.static("public", {
     index: "index.html",
     extensions: ["html"]
 }));
 
-chemical.listen(port, () => {
+app.serveChemical();
+
+listen(port, () => {
     console.log(`Chemical example styled listening on port ${port}`);
 });

package/examples/example-styled/package-lock.json

@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "chemicaljs": "^1.6.6",
+        "chemicaljs": "^1.6.7",
         "express": "^4.19.2"
       }
     },
@@ -409,16 +409,16 @@
       "integrity": "sha512-Y5jByKQ/5ZhyKd3adHUQ18nB+HOUpopxRXIJh6KHXEq4rkG2AazHyMm42dvtAxHvkKlHkLxR7/5oxKZSD6rE4A=="
     },
     "node_modules/@mercuryworkshop/epoxy-tls": {
-      "version": "2.1.0-1",
-      "resolved": "https://registry.npmjs.org/@mercuryworkshop/epoxy-tls/-/epoxy-tls-2.1.0-1.tgz",
-      "integrity": "sha512-vyC2xVEd3gUl00r3CxqVd7qOe0FrkZQT2l6EP0qohqzcwV6oDq27nAa/I/gceYl38lDiqatxEoKKO4okvNbKCw=="
+      "version": "2.1.2-1",
+      "resolved": "https://registry.npmjs.org/@mercuryworkshop/epoxy-tls/-/epoxy-tls-2.1.2-1.tgz",
+      "integrity": "sha512-qt6UOEZcVMYblFwOKaNAZHoDHSYN3JZ5Z6BvRHKB6zo1DFMub+cPuYQ+Aauib7LmIabYWZi2cMyfO5VsNLDYoA=="
     },
     "node_modules/@mercuryworkshop/epoxy-transport": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@mercuryworkshop/epoxy-transport/-/epoxy-transport-2.1.5.tgz",
-      "integrity": "sha512-e4XTHaIK2BEPolhfZmn4OLK9kS4DjnpfzGSazc0yiMMm7j7G2RwevUOp/wO83TkV5jOZdC4O79iaDvFWdDIRuw==",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/@mercuryworkshop/epoxy-transport/-/epoxy-transport-2.1.8.tgz",
+      "integrity": "sha512-quBpEDb3mRxQOl7S6NkT6qFoII+cmBVNOC9/58hN7A4WIg6Q11d+FgAygDLWq5yESgtmDKujZjBVA2XQ6OkLgQ==",
       "dependencies": {
-        "@mercuryworkshop/epoxy-tls": "2.1.0-1"
+        "@mercuryworkshop/epoxy-tls": "2.1.2-1"
       }
     },
     "node_modules/@mercuryworkshop/libcurl-transport": {
@@ -1163,12 +1163,12 @@
       }
     },
     "node_modules/chemicaljs": {
-      "version": "1.6.6",
-      "resolved": "https://registry.npmjs.org/chemicaljs/-/chemicaljs-1.6.6.tgz",
-      "integrity": "sha512-Efih9ve2ezQDdqHeISb//ARLzZAiH1AtRvi3XE6vCaBddvelSKDLoclXLkYtV5rZ2ovlthWakRfP5MbrZOQuSA==",
+      "version": "1.6.7",
+      "resolved": "https://registry.npmjs.org/chemicaljs/-/chemicaljs-1.6.7.tgz",
+      "integrity": "sha512-3BaUpDAaHRD4GiE3MVfJ1cB0lxWx4cojOs/XN3SePmfm96DGjjvWEEpSikoC97yJe2XrNi7JLtASTB1Dk4af9g==",
       "dependencies": {
         "@mercuryworkshop/bare-mux": "^2.0.4",
-        "@mercuryworkshop/epoxy-transport": "^2.1.5",
+        "@mercuryworkshop/epoxy-transport": "^2.1.8",
         "@mercuryworkshop/libcurl-transport": "^1.3.7",
         "@mercuryworkshop/scramjet": "^1.0.2",
         "@mercuryworkshop/wisp-js": "^0.1.1",

package/examples/example-styled/package.json

@@ -18,7 +18,7 @@
   },
   "homepage": "https://github.com/chemicaljs/chemical#readme",
   "dependencies": {
-    "chemicaljs": "^1.6.6",
+    "chemicaljs": "^1.6.7",
     "express": "^4.19.2"
   }
 }

package/examples/example-vite/index.js

@@ -1,14 +1,16 @@
 import { ChemicalServer } from "chemicaljs";
 import express from "express";
 
-const chemical = new ChemicalServer();
+const [app, listen] = new ChemicalServer();
 const port = process.env.PORT || 3000;
 
-chemical.use(express.static("dist", {
+app.use(express.static("dist", {
     index: "index.html",
     extensions: ["html"]
 }));
 
-chemical.listen(port, () => {
+app.serveChemical();
+
+listen(port, () => {
     console.log(`Chemical example vite listening on port ${port}`);
 });

package/examples/example-vite/package-lock.json

@@ -6,7 +6,7 @@
     "": {
       "name": "chemical-example-vite",
       "dependencies": {
-        "chemicaljs": "^1.6.6",
+        "chemicaljs": "^1.6.7",
         "express": "^4.19.2",
         "preact": "^10.23.2"
       },
@@ -796,16 +796,16 @@
       "integrity": "sha512-Y5jByKQ/5ZhyKd3adHUQ18nB+HOUpopxRXIJh6KHXEq4rkG2AazHyMm42dvtAxHvkKlHkLxR7/5oxKZSD6rE4A=="
     },
     "node_modules/@mercuryworkshop/epoxy-tls": {
-      "version": "2.1.0-1",
-      "resolved": "https://registry.npmjs.org/@mercuryworkshop/epoxy-tls/-/epoxy-tls-2.1.0-1.tgz",
-      "integrity": "sha512-vyC2xVEd3gUl00r3CxqVd7qOe0FrkZQT2l6EP0qohqzcwV6oDq27nAa/I/gceYl38lDiqatxEoKKO4okvNbKCw=="
+      "version": "2.1.2-1",
+      "resolved": "https://registry.npmjs.org/@mercuryworkshop/epoxy-tls/-/epoxy-tls-2.1.2-1.tgz",
+      "integrity": "sha512-qt6UOEZcVMYblFwOKaNAZHoDHSYN3JZ5Z6BvRHKB6zo1DFMub+cPuYQ+Aauib7LmIabYWZi2cMyfO5VsNLDYoA=="
     },
     "node_modules/@mercuryworkshop/epoxy-transport": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@mercuryworkshop/epoxy-transport/-/epoxy-transport-2.1.5.tgz",
-      "integrity": "sha512-e4XTHaIK2BEPolhfZmn4OLK9kS4DjnpfzGSazc0yiMMm7j7G2RwevUOp/wO83TkV5jOZdC4O79iaDvFWdDIRuw==",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/@mercuryworkshop/epoxy-transport/-/epoxy-transport-2.1.8.tgz",
+      "integrity": "sha512-quBpEDb3mRxQOl7S6NkT6qFoII+cmBVNOC9/58hN7A4WIg6Q11d+FgAygDLWq5yESgtmDKujZjBVA2XQ6OkLgQ==",
       "dependencies": {
-        "@mercuryworkshop/epoxy-tls": "2.1.0-1"
+        "@mercuryworkshop/epoxy-tls": "2.1.2-1"
       }
     },
     "node_modules/@mercuryworkshop/libcurl-transport": {
@@ -1726,12 +1726,12 @@
       }
     },
     "node_modules/chemicaljs": {
-      "version": "1.6.6",
-      "resolved": "https://registry.npmjs.org/chemicaljs/-/chemicaljs-1.6.6.tgz",
-      "integrity": "sha512-Efih9ve2ezQDdqHeISb//ARLzZAiH1AtRvi3XE6vCaBddvelSKDLoclXLkYtV5rZ2ovlthWakRfP5MbrZOQuSA==",
+      "version": "1.6.7",
+      "resolved": "https://registry.npmjs.org/chemicaljs/-/chemicaljs-1.6.7.tgz",
+      "integrity": "sha512-3BaUpDAaHRD4GiE3MVfJ1cB0lxWx4cojOs/XN3SePmfm96DGjjvWEEpSikoC97yJe2XrNi7JLtASTB1Dk4af9g==",
       "dependencies": {
         "@mercuryworkshop/bare-mux": "^2.0.4",
-        "@mercuryworkshop/epoxy-transport": "^2.1.5",
+        "@mercuryworkshop/epoxy-transport": "^2.1.8",
         "@mercuryworkshop/libcurl-transport": "^1.3.7",
         "@mercuryworkshop/scramjet": "^1.0.2",
         "@mercuryworkshop/wisp-js": "^0.1.1",

package/examples/example-vite/package.json

@@ -8,7 +8,7 @@
     "build": "vite build"
   },
   "dependencies": {
-    "chemicaljs": "^1.6.6",
+    "chemicaljs": "^1.6.7",
     "express": "^4.19.2",
     "preact": "^10.23.2"
   },

package/index.js

@@ -39,25 +39,13 @@ class ChemicalServer {
         }
 
         this.options = options;
-
+        this.server = createServer();
         this.app = express();
-        this.use = this.app.use.bind(this.app);
-        this.get = this.app.get.bind(this.app);
-        this.errorFunctions = [];
-
-        this.error = (newErrorFunction) => {
-            if (newErrorFunction) {
-                if (typeof newErrorFunction == "function") {
-                    this.errorFunctions.push(newErrorFunction);
-                } else {
-                    console.error("Error: Invalid type for Chemical error function.")
-                }
-            }
-        }
-    }
-    listen(port, callback) {
-        const server = createServer();
+        this.app.serveChemical = this.serveChemical;
 
+        return [this.app, this.listen]
+    }
+    serveChemical = () => {
         const rh = createRammerhead()
 
         const rammerheadScopes = [
@@ -138,14 +126,14 @@ class ChemicalServer {
             this.app.use("/scramjet/", express.static(resolve(__dirname, "config/scramjet")));
             this.app.use("/scramjet/", express.static(scramjetPath));
         }
-        server.on("request", (req, res) => {
+        this.server.on("request", (req, res) => {
             if (this.options.rammerhead && shouldRouteRh(req)) {
                 routeRhRequest(req, res);
             } else {
                 this.app(req, res);
             }
         });
-        server.on("upgrade", (req, socket, head) => {
+        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
@@ -160,16 +148,9 @@ class ChemicalServer {
                 socket.end();
             }
         });
-
-        if (this.errorFunctions.length) {
-            this.app.use((req, res) => {
-                for (let errorFunction of this.errorFunctions) {
-                    errorFunction(req, res);
-                }
-            });
-        }
-
-        server.listen(port, callback)
+    }
+    listen = (port, callback) => {
+        this.server.listen(port, callback)
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "chemicaljs",
-    "version": "1.6.7",
+    "version": "1.7.0",
     "description": "Easily create your own web proxy with no experience required.",
     "repository": {
         "type": "git",