chemicaljs 1.3.0 → 1.3.2

package/README.md

@@ -5,7 +5,7 @@ Easily create your own web proxy with no experience required.
 
 A simple example can be found in [`/example/`](https://github.com/chemicaljs/chemical/tree/main/example).
 
-A example with the vite plugin can be found in [`/example-vite/`](https://github.com/chemicaljs/chemical/tree/main/example).
+A example with the vite plugin can be found in [`/example-vite/`](https://github.com/chemicaljs/chemical/tree/main/example-vite).
 
 ### Server
 
@@ -81,6 +81,12 @@ If you want to set the wisp server to an external server just change the `wisp`
 <script wisp="wss://wisp.mercurywork.shop" src="/chemical.js"></script>
 ```
 
+If you want to set the transport just change the `transport` attribute. Choose `libcurl` (default becuase it supports Firefox) or `epoxy`.
+
+```html
+<script 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`.
 
 ```js
@@ -107,6 +113,12 @@ window.addEventListener("chemicalLoaded", function(e) {
 });
 ```
 
+4. Change the transport and Wisp URL with `chemicalTransport`
+
+```js
+await chemicalTransport("libcurl", "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.
 
 ```html
@@ -129,14 +141,14 @@ Below is a simple example of a simple input that redirects to the encoded URL wh
 
 1. Create a new vite app and open `vite.config.js` or `vite.config.ts`
 
-2. Import `ChemicalPluginVite` and add it to plugins.
+2. Import `ChemicalVitePlugin` and add it to plugins.
 
 ```js
 import { defineConfig } from "vite"
-import { ChemicalPluginVite } from "chemicaljs"
+import { ChemicalVitePlugin } from "chemicaljs"
 
 export default defineConfig({
-    plugins: [/*Other plugins*/ChemicalPluginVite()],
+    plugins: [/*Other plugins*/ChemicalVitePlugin()],
 })
 ```
 
@@ -145,7 +157,7 @@ You can pass options to just like on the main server.
 ```js
 export default defineConfig({
     plugins: [
-        ChemicalPluginVite({
+        ChemicalVitePlugin({
             default: "rammerhead",
             uv: true,
             scramjet: false,

package/client/chemical.js

@@ -202,11 +202,29 @@ async function chemicalEncode(url, service = defaultService) {
     }
 }
 
+function getTransport(transport) {
+    switch (transport) {
+        case "libcurl":
+            return "/libcurl/index.mjs"
+            break;
+        case "epoxy":
+            return "/epoxy/index.mjs"
+            break;
+    }
+}
+
+let connection;
+
 let wispURL = document.currentScript.getAttribute("wisp");
+let transport = document.currentScript.getAttribute("transport");
+
+async function chemicalTransport(transport, wisp) {
+    await connection.setTransport(getTransport(transport) || "/libcurl/index.mjs", [{ wisp: wisp || (location.protocol === "https:" ? "wss" : "ws") + "://" + location.host + "/wisp/" }]);
+}
 
 async function registerSW() {
-    const connection = new window.BareMux.BareMuxConnection("/baremux/worker.js");
-    await connection.setTransport("/epoxy/index.mjs", [{ wisp: wispURL || (location.protocol === "https:" ? "wss" : "ws") + "://" + location.host + "/wisp/" }]);
+    connection = new window.BareMux.BareMuxConnection("/baremux/worker.js");
+    await chemicalTransport();
 
     if ("serviceWorker" in navigator) {
         await navigator.serviceWorker.register("/chemical.sw.js");

package/example/package-lock.json

@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "chemicaljs": "^1.2.5",
+        "chemicaljs": "^1.3.1",
         "express": "^4.19.2"
       }
     },
@@ -425,6 +425,18 @@
         "rollup-plugin-typescript2": "^0.36.0"
       }
     },
+    "node_modules/@mercuryworkshop/libcurl-transport": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/@mercuryworkshop/libcurl-transport/-/libcurl-transport-1.3.6.tgz",
+      "integrity": "sha512-K4/TSfHlkjuzY6j0XXFmIbG8m3tpMoTxLga46fhmeuX8k3EJR/FVbW8JTXOD34Iofu0vCZuuY8n/ywNCcB6XjA==",
+      "dependencies": {
+        "esbuild-plugin-umd-wrapper": "^2.0.0",
+        "libcurl.js": "^0.6.10",
+        "rollup": "^4.12.0",
+        "rollup-plugin-node-resolve": "^5.2.0",
+        "rollup-plugin-typescript2": "^0.36.0"
+      }
+    },
     "node_modules/@mercuryworkshop/scramjet": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@mercuryworkshop/scramjet/-/scramjet-1.0.2.tgz",
@@ -692,9 +704,9 @@
       ]
     },
     "node_modules/@titaniumnetwork-dev/ultraviolet": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/@titaniumnetwork-dev/ultraviolet/-/ultraviolet-3.2.1.tgz",
-      "integrity": "sha512-J8WsR0LzZp9jFu9ghEpczRpzK9dzdlB5/DjvsCvcD1zJSP17DC3+pVhQaGvLCBqHw+KS06srhFLJMkZqg8I51A=="
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/@titaniumnetwork-dev/ultraviolet/-/ultraviolet-3.2.2.tgz",
+      "integrity": "sha512-W5QMiSkG46JudHJRnyMxuXQXyCQHp+K3gsb0ZH+GM1jaufVawkRuh//37M0EYoI8xIiYGYT4rsRX1bKrHR937Q=="
     },
     "node_modules/@tootallnate/once": {
       "version": "1.1.2",
@@ -1146,14 +1158,15 @@
       }
     },
     "node_modules/chemicaljs": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/chemicaljs/-/chemicaljs-1.2.5.tgz",
-      "integrity": "sha512-MHCs5CDzzwKwdT9ce2ZRdaod0+LoDmtbK7bkyl1I0dfg9Xt8rFeR+dyum4JnYJPHXfwgP86KgHTvSkDEVakT6Q==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/chemicaljs/-/chemicaljs-1.3.1.tgz",
+      "integrity": "sha512-F0c930sI2hTzvLrbSxtVGonCFsATFlXEZkFo74y+ZUVFAF3TaYGRIi0d2tPa0ZZGrJeJlbx43JASRIMGLSTH6w==",
       "dependencies": {
         "@mercuryworkshop/bare-mux": "^2.0.1",
         "@mercuryworkshop/epoxy-transport": "^2.1.3",
+        "@mercuryworkshop/libcurl-transport": "^1.3.6",
         "@mercuryworkshop/scramjet": "^1.0.2",
-        "@titaniumnetwork-dev/ultraviolet": "^3.2.1",
+        "@titaniumnetwork-dev/ultraviolet": "^3.2.2",
         "express": "^4.19.2",
         "rammerhead": "https://github.com/chemicaljs/chemical/raw/main/rammerhead.tgz",
         "wisp-server-node": "^1.1.0"
@@ -2181,6 +2194,11 @@
         "sqlite3": "^5.0.6"
       }
     },
+    "node_modules/libcurl.js": {
+      "version": "0.6.10",
+      "resolved": "https://registry.npmjs.org/libcurl.js/-/libcurl.js-0.6.10.tgz",
+      "integrity": "sha512-GDyxCRi7+R7XFhcCRFAsNYxg3x91LiwiBISo+pWfUXfgO45J/9ZWcHqjKQg8/FbWHRkV1wwSCyPOZ8pLlbdivg=="
+    },
     "node_modules/locate-path": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",

package/example/package.json

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

package/example-vite/package-lock.json

@@ -6,7 +6,7 @@
     "": {
       "name": "chemical-example-vite",
       "dependencies": {
-        "chemicaljs": "^1.2.5",
+        "chemicaljs": "^1.3.1",
         "express": "^4.19.2",
         "preact": "^10.22.0"
       },
@@ -812,6 +812,18 @@
         "rollup-plugin-typescript2": "^0.36.0"
       }
     },
+    "node_modules/@mercuryworkshop/libcurl-transport": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/@mercuryworkshop/libcurl-transport/-/libcurl-transport-1.3.6.tgz",
+      "integrity": "sha512-K4/TSfHlkjuzY6j0XXFmIbG8m3tpMoTxLga46fhmeuX8k3EJR/FVbW8JTXOD34Iofu0vCZuuY8n/ywNCcB6XjA==",
+      "dependencies": {
+        "esbuild-plugin-umd-wrapper": "^2.0.0",
+        "libcurl.js": "^0.6.10",
+        "rollup": "^4.12.0",
+        "rollup-plugin-node-resolve": "^5.2.0",
+        "rollup-plugin-typescript2": "^0.36.0"
+      }
+    },
     "node_modules/@mercuryworkshop/scramjet": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@mercuryworkshop/scramjet/-/scramjet-1.0.2.tgz",
@@ -1709,14 +1721,15 @@
       }
     },
     "node_modules/chemicaljs": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/chemicaljs/-/chemicaljs-1.2.5.tgz",
-      "integrity": "sha512-MHCs5CDzzwKwdT9ce2ZRdaod0+LoDmtbK7bkyl1I0dfg9Xt8rFeR+dyum4JnYJPHXfwgP86KgHTvSkDEVakT6Q==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/chemicaljs/-/chemicaljs-1.3.1.tgz",
+      "integrity": "sha512-F0c930sI2hTzvLrbSxtVGonCFsATFlXEZkFo74y+ZUVFAF3TaYGRIi0d2tPa0ZZGrJeJlbx43JASRIMGLSTH6w==",
       "dependencies": {
         "@mercuryworkshop/bare-mux": "^2.0.1",
         "@mercuryworkshop/epoxy-transport": "^2.1.3",
+        "@mercuryworkshop/libcurl-transport": "^1.3.6",
         "@mercuryworkshop/scramjet": "^1.0.2",
-        "@titaniumnetwork-dev/ultraviolet": "^3.2.1",
+        "@titaniumnetwork-dev/ultraviolet": "^3.2.2",
         "express": "^4.19.2",
         "rammerhead": "https://github.com/chemicaljs/chemical/raw/main/rammerhead.tgz",
         "wisp-server-node": "^1.1.0"
@@ -2878,6 +2891,11 @@
       "integrity": "sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==",
       "dev": true
     },
+    "node_modules/libcurl.js": {
+      "version": "0.6.10",
+      "resolved": "https://registry.npmjs.org/libcurl.js/-/libcurl.js-0.6.10.tgz",
+      "integrity": "sha512-GDyxCRi7+R7XFhcCRFAsNYxg3x91LiwiBISo+pWfUXfgO45J/9ZWcHqjKQg8/FbWHRkV1wwSCyPOZ8pLlbdivg=="
+    },
     "node_modules/locate-path": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",

package/example-vite/package.json

@@ -8,7 +8,7 @@
     "build": "vite build"
   },
   "dependencies": {
-    "chemicaljs": "^1.2.5",
+    "chemicaljs": "^1.3.1",
     "express": "^4.19.2",
     "preact": "^10.22.0"
   },

package/example-vite/vite.config.js

@@ -1,10 +1,10 @@
 import { defineConfig } from "vite"
 import preact from "@preact/preset-vite"
-import { ChemicalPluginVite } from "chemicaljs"
+import { ChemicalVitePlugin } from "chemicaljs"
 
 export default defineConfig({
     plugins: [
         preact(),
-        ChemicalPluginVite()
+        ChemicalVitePlugin()
     ],
 })

package/index.js

@@ -4,6 +4,7 @@ import { createServer } from "node:http";
 import express from "express";
 import wisp from "wisp-server-node";
 import { baremuxPath } from "@mercuryworkshop/bare-mux/node";
+import { libcurlPath } from "@mercuryworkshop/libcurl-transport";
 import { epoxyPath } from "@mercuryworkshop/epoxy-transport";
 import { uvPath } from "@titaniumnetwork-dev/ultraviolet";
 import { scramjetPath } from "@mercuryworkshop/scramjet";
@@ -104,6 +105,7 @@ class ChemicalServer {
         });
         this.app.use(express.static(resolve(import.meta.dirname, "client")));
         this.app.use("/baremux/", express.static(baremuxPath));
+        this.app.use("/libcurl/", express.static(libcurlPath));
         this.app.use("/epoxy/", express.static(epoxyPath));
         if (options.uv) {
             this.app.use("/uv/", express.static(resolve(import.meta.dirname, "config/uv")));
@@ -132,8 +134,8 @@ class ChemicalServer {
     }
 }
 
-const ChemicalPluginVite = (options) => ({
-    name: "chemical-plugin-vite",
+const ChemicalVitePlugin = (options) => ({
+    name: "chemical-vite-plugin",
     configureServer(server) {
         if (options) {
             if (typeof options !== "object" || Array.isArray(options)) {
@@ -227,6 +229,7 @@ const ChemicalPluginVite = (options) => ({
         });
         app.use(express.static(resolve(import.meta.dirname, "client")));
         app.use("/baremux/", express.static(baremuxPath));
+        app.use("/libcurl/", express.static(libcurlPath));
         app.use("/epoxy/", express.static(epoxyPath));
         if (options.uv) {
             app.use("/uv/", express.static(resolve(import.meta.dirname, "config/uv")));
@@ -267,4 +270,4 @@ const ChemicalPluginVite = (options) => ({
     }
 })
 
-export { ChemicalServer, ChemicalPluginVite };
+export { ChemicalServer, ChemicalVitePlugin };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "chemicaljs",
-    "version": "1.3.0",
+    "version": "1.3.2",
     "description": "Easily create your own web proxy with no experience required.",
     "repository": {
         "type": "git",
@@ -13,8 +13,9 @@
     "dependencies": {
         "@mercuryworkshop/bare-mux": "^2.0.1",
         "@mercuryworkshop/epoxy-transport": "^2.1.3",
+        "@mercuryworkshop/libcurl-transport": "^1.3.6",
         "@mercuryworkshop/scramjet": "^1.0.2",
-        "@titaniumnetwork-dev/ultraviolet": "^3.2.1",
+        "@titaniumnetwork-dev/ultraviolet": "^3.2.2",
         "express": "^4.19.2",
         "rammerhead": "https://github.com/chemicaljs/chemical/raw/main/rammerhead.tgz",
         "wisp-server-node": "^1.1.0"