chemicaljs 1.1.0 → 1.2.0

package/README.md

@@ -19,6 +19,17 @@ import { ChemicalServer } from "chemicaljs";
 const chemical = new ChemicalServer();
 ```
 
+You can pass options to disable proxy services and set the default service.
+
+```js
+const chemical = new ChemicalServer({
+    default: "rammerhead",
+    uv: true,
+    scramjet: false,
+    rammerhead: true
+});
+```
+
 3. Use `chemical.app` which is an express app. You may need to import express for certain APIs.
 
 ```js
@@ -74,7 +85,7 @@ If you want to set the wisp server to an external server just change the `wisp`
 await window.chemicalEncode("https://example.com")
 ```
 
-Optional: Change service to `ultraviolet`, `scramjet`, or `rammerhead`.
+Optional: Change service to `ultraviolet`, `scramjet`, or `rammerhead`. Defaults to `uv` or server option.
 
 ```js
 await window.chemicalEncode("https://example.com", "rammerhead")
@@ -116,7 +127,6 @@ Below is a simple example of a simple input that redirects to the encoded URL wh
 
 Some features that may come in the future are:
 
-- Server options to disable services.
 - Easy client components.
 - Easy tab cloaking components.
 

package/client/chemical.js

@@ -174,24 +174,30 @@ function rammerheadEncode(baseUrl) {
     })
 }
 
-async function chemicalEncode(url, service = "ultraviolet") {
+async function chemicalEncode(url, service = defaultService) {
     switch (service) {
-        case "ultraviolet":
-            return (
-                window.location.origin +
-                window.__uv$config.prefix +
-                window.__uv$config.encodeUrl(url)
-            );
+        case "uv":
+            if (uvEnabled) {
+                return (
+                    window.location.origin +
+                    window.__uv$config.prefix +
+                    window.__uv$config.encodeUrl(url)
+                );
+            }
             break;
         case "rammerhead":
-            return window.location.origin + (await rammerheadEncode(url));
+            if (rammerheadEnabled) {
+                return window.location.origin + (await rammerheadEncode(url));
+            }
             break;
         case "scramjet":
-            return (
-                window.location.origin +
-                window.__scramjet$config.prefix +
-                window.__scramjet$config.codec.encode(url)
-            );
+            if (scramjetEnabled) {
+                return (
+                    window.location.origin +
+                    window.__scramjet$config.prefix +
+                    window.__scramjet$config.codec.encode(url)
+                );
+            }
             break;
     }
 }
@@ -225,10 +231,14 @@ async function loadScript(src) {
 
 (async () => {
     await loadScript("/baremux/index.js");
-    await loadScript("/uv/uv.bundle.js");
-    await loadScript("/uv/uv.config.js");
-    await loadScript("/scramjet/scramjet.codecs.js");
-    await loadScript("/scramjet/scramjet.config.js");
+    if (uvEnabled) {
+        await loadScript("/uv/uv.bundle.js");
+        await loadScript("/uv/uv.config.js");
+    }
+    if (scramjetEnabled) {
+        await loadScript("/scramjet/scramjet.codecs.js");
+        await loadScript("/scramjet/scramjet.config.js");
+    }
     await registerSW();
     chemicalLoaded = true;
     window.dispatchEvent(new Event("chemicalLoaded"));

package/client/chemical.sw.js

@@ -1,19 +1,35 @@
-importScripts("/libcurl/index.js");
-importScripts("/uv/uv.bundle.js");
-importScripts("/uv/uv.config.js");
-importScripts(__uv$config.sw || "/uv/uv.sw.js");
+if (uvEnabled) {
+    importScripts("/uv/uv.bundle.js");
+    importScripts("/uv/uv.config.js");
+    importScripts(__uv$config.sw || "/uv/uv.sw.js");
+}
+if (scramjetEnabled) {
+    importScripts("/scramjet/scramjet.codecs.js");
+    importScripts("/scramjet/scramjet.config.js");
+    importScripts(__scramjet$config.bundle || "/scramjet/scramjet.bundle.js");
+    importScripts(__scramjet$config.worker || "/scramjet/scramjet.worker.js");
+}
 
 Object.defineProperty(self, "crossOriginIsolated", { value: true }); // Firefox fix
 
-const uv = new UVServiceWorker();
+let uv, scramjet;
+
+if (uvEnabled) {
+    uv = new UVServiceWorker();
+}
+if (scramjetEnabled) {
+    scramjet = new ScramjetServiceWorker();
+}
 
 self.addEventListener("fetch", (event) => {
     event.respondWith(
         (async () => {
-            if (uv.route(event)) {
+            if (uvEnabled && uv.route(event)) {
                 return await uv.fetch(event);
+            } else if (scramjetEnabled && scramjet.route(event)) {
+                return await scramjet.fetch(event);
             }
             return await fetch(event.request);
         })(),
     );
-});
+});

package/config/scramjet/scramjet.config.js

@@ -0,0 +1,9 @@
+self.__scramjet$config = {
+	prefix: "/~/sj/",
+	codec: self.__scramjet$codecs.plain,
+	config: "/scramjet/scramjet.config.js",
+	bundle: "/scramjet/scramjet.bundle.js",
+	worker: "/scramjet/scramjet.worker.js",
+	client: "/scramjet/scramjet.client.js",
+	codecs: "/scramjet/scramjet.codecs.js",
+};

package/{client → config}/uv/uv.config.js

@@ -1,5 +1,5 @@
 self.__uv$config = {
-	prefix: "/~/",
+	prefix: "/~/uv/",
 	encodeUrl: Ultraviolet.codec.xor.encode,
 	decodeUrl: Ultraviolet.codec.xor.decode,
 	handler: "/uv/uv.handler.js",

package/index.js

@@ -1,4 +1,5 @@
 import { resolve } from "node:path";
+import { readFileSync } from "node:fs";
 import { createServer } from "node:http";
 import express from "express";
 import wisp from "wisp-server-node";
@@ -9,7 +10,12 @@ import { scramjetPath } from "@mercuryworkshop/scramjet";
 import createRammerhead from "rammerhead/src/server/index.js";
 
 class ChemicalServer {
-    constructor() {
+    constructor(options) {
+        if (typeof options !== "object" || Array.isArray(options)) {
+            options = {}
+            console.error("Error: ChemicalServer options invalid.")
+        }
+
         const rh = createRammerhead()
 
         const rammerheadScopes = [
@@ -49,13 +55,72 @@ class ChemicalServer {
 
         this.server = createServer();
         this.app = express();
+        this.app.get("/chemical.js", async function (req, res) {
+            let chemicalMain = await readFileSync(resolve(import.meta.dirname, "client/chemical.js"), "utf8");
+
+            if (options.default) {
+                if (["uv", "rammerhead", "scramjet"].includes(options.default)) {
+                    chemicalMain = `const defaultService = "${options.default}";\n\n` + chemicalMain
+                } else {
+                    chemicalMain = `const defaultService = "uv";\n\n` + chemicalMain
+                    console.error("Error: Chemical default option invalid.")
+                }
+            }
+
+            if (options.uv == false) {
+                chemicalMain = "const uvEnabled = false;\n" + chemicalMain
+            } else {
+                chemicalMain = "const uvEnabled = true;\n" + chemicalMain
+            }
+            if (options.scramjet == false) {
+                chemicalMain = "const scramjetEnabled = false;\n" + chemicalMain
+            } else {
+                chemicalMain = "const scramjetEnabled = true;\n" + chemicalMain
+            }
+            if (options.rammerhead == false) {
+                chemicalMain = "const rammerheadEnabled = false;\n" + chemicalMain
+            } else {
+                chemicalMain = "const rammerheadEnabled = true;\n" + chemicalMain
+            }
+
+            res.type("application/javascript");
+            return res.send(chemicalMain);
+        });
+        this.app.get("/chemical.sw.js", async function (req, res) {
+            let chemicalSW = await readFileSync(resolve(import.meta.dirname, "client/chemical.sw.js"), "utf8");
+
+            if (options.uv == false) {
+                chemicalSW = "const uvEnabled = false;\n\n" + chemicalSW
+            } else {
+                chemicalSW = "const uvEnabled = true;\n\n" + chemicalSW
+            }
+            if (options.scramjet == false) {
+                chemicalSW = "const scramjetEnabled = false;\n" + chemicalSW
+            } else {
+                chemicalSW = "const scramjetEnabled = true;\n" + chemicalSW
+            }
+            if (options.rammerhead == false) {
+                chemicalSW = "const rammerheadEnabled = false;\n" + chemicalSW
+            } else {
+                chemicalSW = "const rammerheadEnabled = true;\n" + chemicalSW
+            }
+
+            res.type("application/javascript");
+            return res.send(chemicalSW);
+        });
         this.app.use(express.static(resolve(import.meta.dirname, "client")));
         this.app.use("/baremux/", express.static(baremuxPath));
         this.app.use("/epoxy/", express.static(epoxyPath));
-        this.app.use("/uv/", express.static(uvPath));
-        this.app.use("/scramjet/", express.static(scramjetPath));
+        if (options.uv !== false) {
+            this.app.use("/uv/", express.static(resolve(import.meta.dirname, "config/uv")));
+            this.app.use("/uv/", express.static(uvPath));
+        }
+        if (options.scramjet !== false) {
+            this.app.use("/scramjet/", express.static(resolve(import.meta.dirname, "config/scramjet")));
+            this.app.use("/scramjet/", express.static(scramjetPath));
+        }
         this.server.on("request", (req, res) => {
-            if (shouldRouteRh(req)) {
+            if (options.rammerhead !== false && shouldRouteRh(req)) {
                 routeRhRequest(req, res);
             } else {
                 this.app(req, res);
@@ -64,7 +129,7 @@ class ChemicalServer {
         this.server.on("upgrade", (req, socket, head) => {
             if (req.url && req.url.endsWith("/wisp/")) {
                 wisp.routeRequest(req, socket, head);
-            } else if (shouldRouteRh(req)) {
+            } else if (options.rammerhead !== false && shouldRouteRh(req)) {
                 routeRhUpgrade(req, socket, head);
             } else {
                 socket.end();

package/package.json

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