chemicaljs 2.1.1 → 2.3.1

package/client/chemical.demo.html

@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Demo Site</title>
+    <style>
+      *,
+      *::before,
+      *::after {
+        box-sizing: border-box;
+      }
+
+      body {
+        margin: 0;
+        min-height: 100vh;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        font-family: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji",
+          "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+        background: #e5e5e5;
+        color: black;
+      }
+
+      @media (prefers-color-scheme: dark) {
+        body {
+          background: #0a0a0a;
+          color: #fafafa;
+        }
+      }
+
+      h1 {
+        margin: 0;
+      }
+    </style>
+  </head>
+  <body>
+    <h1>Demo Site</h1>
+    <p>This is a demo site without proxy functionality.</p>
+  </body>
+</html>

package/client/chemical.js

@@ -2,6 +2,7 @@ const currentScript = document.currentScript;
 
 window.chemical = {
   loaded: false,
+  demoMode,
   transport:
     currentScript.dataset.transportStore !== undefined
       ? localStorage.getItem("@chemical/transport") ||
@@ -229,20 +230,7 @@ async function encodeService(url, service) {
       break;
     case "scramjet":
       if (scramjetEnabled) {
-        return (
-          window.location.origin +
-          __scramjet$config.prefix +
-          __scramjet$config.codec.encode(url)
-        );
-      }
-      break;
-    case "meteor":
-      if (meteorEnabled) {
-        return (
-          window.location.origin +
-          $meteor_config.prefix +
-          $meteor_config.codec.encode(url)
-        );
+        return window.location.origin + chemical.scramjet.encodeUrl(url);
       }
       break;
   }
@@ -264,6 +252,10 @@ window.chemical.encode = async function (url, config) {
     config.autoHttps = false;
   }
 
+  if (demoMode) {
+    return "/chemical.demo.html";
+  }
+
   if (url.match(/^https?:\/\//)) {
     return await encodeService(url, config.service);
   } else if (
@@ -305,14 +297,7 @@ window.chemical.decode = async function (url, config) {
       break;
     case "scramjet":
       if (scramjetEnabled) {
-        return __scramjet$config.codec.decode(
-          url.split(__scramjet$config.prefix)[1]
-        );
-      }
-      break;
-    case "meteor":
-      if (meteorEnabled) {
-        return $meteor_config.codec.decode(url.split($meteor_config.prefix)[1]);
+        return $scramjet.codec.decode(url.split($scramjet.config.prefix)[1]);
       }
       break;
   }
@@ -456,12 +441,19 @@ if (uvEnabled) {
   await loadScript("/uv/uv.config.js");
 }
 if (scramjetEnabled) {
-  await loadScript("/scramjet/scramjet.codecs.js");
-  await loadScript("/scramjet/scramjet.config.js");
-}
-if (meteorEnabled) {
-  await loadScript("/meteor/meteor.codecs.js");
-  await loadScript("/meteor/meteor.config.js");
+  await loadScript("/scramjet/scramjet.shared.js");
+  await loadScript("/scramjet/scramjet.controller.js");
+  chemical.scramjet = new ScramjetController({
+    prefix: "/~/scramjet/",
+    files: {
+      wasm: "/scramjet/scramjet.wasm.js",
+      worker: "/scramjet/scramjet.worker.js",
+      client: "/scramjetetscramjet.client.js",
+      shared: "/scramjetetscramjet.shared.js",
+      sync: "/scramjet/scramjet.sync.js",
+    },
+  });
+  chemical.scramjet.init("/chemical.sw.js");
 }
 window.chemical.connection = new window.BareMux.BareMuxConnection(
   "/baremux/worker.js"

package/client/chemical.sw.js

@@ -4,21 +4,19 @@ if (uvEnabled) {
   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");
-}
-if (meteorEnabled) {
-  importScripts("/meteor/meteor.codecs.js");
-  importScripts("/meteor/meteor.config.js");
-  importScripts($meteor_config.files.bundle || "/meteor/meteor.bundle.js");
-  importScripts($meteor_config.files.worker || "/meteor/meteor.worker.js");
+  importScripts("/scramjet/scramjet.wasm.js");
+  importScripts("/scramjet/scramjet.shared.js");
+  importScripts("/scramjet/scramjet.worker.js");
 }
 
-Object.defineProperty(self, "crossOriginIsolated", { value: true }); // Firefox fix
+if (navigator.userAgent.includes("Firefox")) {
+  Object.defineProperty(globalThis, "crossOriginIsolated", {
+    value: true,
+    writable: false,
+  });
+}
 
-let uv, scramjet, meteor;
+let uv, scramjet;
 
 if (uvEnabled) {
   uv = new UVServiceWorker();
@@ -26,19 +24,18 @@ if (uvEnabled) {
 if (scramjetEnabled) {
   scramjet = new ScramjetServiceWorker();
 }
-if (meteorEnabled) {
-  meteor = new MeteorServiceWorker();
-}
 
 self.addEventListener("fetch", (event) => {
   event.respondWith(
     (async () => {
+      if (scramjetEnabled) {
+        await scramjet.loadConfig();
+      }
+
       if (uvEnabled && uv.route(event)) {
         return await uv.fetch(event);
       } else if (scramjetEnabled && scramjet.route(event)) {
         return await scramjet.fetch(event);
-      } else if (meteorEnabled && meteor.shouldRoute(event)) {
-        return meteor.handleFetch(event);
       }
       return await fetch(event.request);
     })()

package/index.js

@@ -17,8 +17,7 @@ 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";
-import { meteorPath } from "meteorproxy";
+import { scramjetPath } from "./scramjet/index.js";
 import createRammerhead from "rammerhead/src/server/index.js";
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
@@ -39,22 +38,18 @@ class ChemicalServer {
       options.uv = true;
     }
 
-    if (options.experimental === undefined) {
-      options.experimental = {};
-    }
-
-    if (options.experimental.scramjet === undefined) {
-      options.experimental.scramjet = false;
-    }
-
-    if (options.experimental.meteor === undefined) {
-      options.experimental.meteor = false;
+    if (options.scramjet === undefined) {
+      options.scramjet = true;
     }
 
     if (options.rammerhead === undefined) {
       options.rammerhead = true;
     }
 
+    if (options.demoMode === undefined) {
+      options.demoMode = false;
+    }
+
     this.options = options;
     this.server = createServer();
     this.app = express();
@@ -102,11 +97,7 @@ class ChemicalServer {
       );
 
       if (this.options.default) {
-        if (
-          ["uv", "rammerhead", "scramjet", "meteor"].includes(
-            this.options.default
-          )
-        ) {
+        if (["uv", "rammerhead", "scramjet"].includes(this.options.default)) {
           chemicalMain =
             `const defaultService = "${this.options.default}";\n\n` +
             chemicalMain;
@@ -122,17 +113,17 @@ class ChemicalServer {
         "const uvEnabled = " + String(this.options.uv) + ";\n" + chemicalMain;
       chemicalMain =
         "const scramjetEnabled = " +
-        String(this.options.experimental.scramjet) +
+        String(this.options.scramjet) +
         ";\n" +
         chemicalMain;
       chemicalMain =
-        "const meteorEnabled = " +
-        String(this.options.experimental.meteor) +
+        "const rammerheadEnabled = " +
+        String(this.options.rammerhead) +
         ";\n" +
         chemicalMain;
       chemicalMain =
-        "const rammerheadEnabled = " +
-        String(this.options.rammerhead) +
+        "const demoMode = " +
+        String(this.options.demoMode) +
         ";\n" +
         chemicalMain;
 
@@ -151,12 +142,7 @@ class ChemicalServer {
         "const uvEnabled = " + String(this.options.uv) + ";\n" + chemicalSW;
       chemicalSW =
         "const scramjetEnabled = " +
-        String(this.options.experimental.scramjet) +
-        ";\n" +
-        chemicalSW;
-      chemicalSW =
-        "const meteorEnabled = " +
-        String(this.options.experimental.meteor) +
+        String(this.options.scramjet) +
         ";\n" +
         chemicalSW;
       chemicalSW =
@@ -176,20 +162,9 @@ class ChemicalServer {
       this.app.use("/uv/", express.static(resolve(__dirname, "config/uv")));
       this.app.use("/uv/", express.static(uvPath));
     }
-    if (this.options.experimental.scramjet) {
-      this.app.use(
-        "/scramjet/",
-        express.static(resolve(__dirname, "config/scramjet"))
-      );
+    if (this.options.scramjet) {
       this.app.use("/scramjet/", express.static(scramjetPath));
     }
-    if (this.options.experimental.meteor) {
-      this.app.use(
-        "/meteor/",
-        express.static(resolve(__dirname, "config/meteor"))
-      );
-      this.app.use("/meteor/", express.static(meteorPath));
-    }
     this.server.on("request", (req, res) => {
       if (this.options.rammerhead && shouldRouteRh(req)) {
         routeRhRequest(req, res);
@@ -233,22 +208,18 @@ const ChemicalVitePlugin = (options) => ({
       options.uv = true;
     }
 
-    if (options.experimental === undefined) {
-      options.experimental = {};
-    }
-
-    if (options.experimental.scramjet === undefined) {
-      options.experimental.scramjet = false;
-    }
-
-    if (options.experimental.meteor === undefined) {
-      options.experimental.meteor = false;
+    if (options.scramjet === undefined) {
+      options.scramjet = true;
     }
 
     if (options.rammerhead === undefined) {
       options.rammerhead = true;
     }
 
+    if (options.demoMode === undefined) {
+      options.demoMode = false;
+    }
+
     const rh = createRammerhead();
     const rammerheadScopes = [
       "/rammerhead.js",
@@ -289,9 +260,7 @@ const ChemicalVitePlugin = (options) => ({
       );
 
       if (options.default) {
-        if (
-          ["uv", "rammerhead", "scramjet", "meteor"].includes(options.default)
-        ) {
+        if (["uv", "rammerhead", "scramjet"].includes(options.default)) {
           chemicalMain =
             `const defaultService = "${options.default}";\n\n` + chemicalMain;
         } else {
@@ -306,12 +275,7 @@ const ChemicalVitePlugin = (options) => ({
         "const uvEnabled = " + String(options.uv) + ";\n" + chemicalMain;
       chemicalMain =
         "const scramjetEnabled = " +
-        String(options.experimental.scramjet) +
-        ";\n" +
-        chemicalMain;
-      chemicalMain =
-        "const meteorEnabled = " +
-        String(options.experimental.meteor) +
+        String(options.scramjet) +
         ";\n" +
         chemicalMain;
       chemicalMain =
@@ -319,6 +283,8 @@ const ChemicalVitePlugin = (options) => ({
         String(options.rammerhead) +
         ";\n" +
         chemicalMain;
+      chemicalMain =
+        "const demoMode = " + String(options.demoMode) + ";\n" + chemicalMain;
 
       chemicalMain = "(async () => {\n" + chemicalMain + "\n})();";
 
@@ -335,12 +301,7 @@ const ChemicalVitePlugin = (options) => ({
         "const uvEnabled = " + String(options.uv) + ";\n" + chemicalSW;
       chemicalSW =
         "const scramjetEnabled = " +
-        String(options.experimental.scramjet) +
-        ";\n" +
-        chemicalSW;
-      chemicalSW =
-        "const meteorEnabled = " +
-        String(options.experimental.meteor) +
+        String(options.scramjet) +
         ";\n" +
         chemicalSW;
       chemicalSW =
@@ -360,18 +321,9 @@ const ChemicalVitePlugin = (options) => ({
       app.use("/uv/", express.static(resolve(__dirname, "config/uv")));
       app.use("/uv/", express.static(uvPath));
     }
-    if (options.experimental.scramjet) {
-      app.use(
-        "/scramjet/",
-        express.static(resolve(__dirname, "config/scramjet"))
-      );
+    if (options.scramjet) {
       app.use("/scramjet/", express.static(scramjetPath));
     }
-    if (options.experimental.meteor) {
-      app.use("/meteor/", express.static(resolve(__dirname, "config/meteor")));
-      app.use("/meteor/", express.static(meteorPath));
-    }
-
     server.middlewares.use(app);
 
     server.middlewares.use((req, res, next) => {
@@ -434,22 +386,18 @@ class ChemicalBuild {
       options.uv = true;
     }
 
-    if (options.experimental === undefined) {
-      options.experimental = {};
-    }
-
-    if (options.experimental.scramjet === undefined) {
-      options.experimental.scramjet = false;
-    }
-
-    if (options.experimental.meteor === undefined) {
-      options.experimental.meteor = false;
+    if (options.scramjet === undefined) {
+      options.scramjet = true;
     }
 
     if (options.rammerhead === undefined) {
       options.rammerhead = true;
     }
 
+    if (options.demoMode === undefined) {
+      options.demoMode = false;
+    }
+
     this.options = options;
   }
   async write(deletePath = false) {
@@ -469,11 +417,7 @@ class ChemicalBuild {
     );
 
     if (this.options.default) {
-      if (
-        ["uv", "rammerhead", "scramjet", "meteor"].includes(
-          this.options.default
-        )
-      ) {
+      if (["uv", "rammerhead", "scramjet"].includes(this.options.default)) {
         chemicalMain =
           `const defaultService = "${this.options.default}";\n\n` +
           chemicalMain;
@@ -489,17 +433,17 @@ class ChemicalBuild {
       "const uvEnabled = " + String(this.options.uv) + ";\n" + chemicalMain;
     chemicalMain =
       "const scramjetEnabled = " +
-      String(this.options.experimental.scramjet) +
+      String(this.options.scramjet) +
       ";\n" +
       chemicalMain;
     chemicalMain =
-      "const meteorEnabled = " +
-      String(this.options.experimental.meteor) +
+      "const rammerheadEnabled = " +
+      String(this.options.rammerhead) +
       ";\n" +
       chemicalMain;
     chemicalMain =
-      "const rammerheadEnabled = " +
-      String(this.options.rammerhead) +
+      "const demoMode = " +
+      String(this.options.demoMode) +
       ";\n" +
       chemicalMain;
 
@@ -516,12 +460,7 @@ class ChemicalBuild {
       "const uvEnabled = " + String(this.options.uv) + ";\n" + chemicalSW;
     chemicalSW =
       "const scramjetEnabled = " +
-      String(this.options.experimental.scramjet) +
-      ";\n" +
-      chemicalSW;
-    chemicalSW =
-      "const meteorEnabled = " +
-      String(this.options.experimental.meteor) +
+      String(this.options.scramjet) +
       ";\n" +
       chemicalSW;
     chemicalSW =
@@ -532,6 +471,13 @@ class ChemicalBuild {
 
     writeFileSync(resolve(this.options.path, "chemical.sw.js"), chemicalSW);
 
+    if (this.options.demoMode) {
+      copyFileSync(
+        resolve(__dirname, "client/chemical.demo.html"),
+        resolve(this.options.path, "chemical.demo.html")
+      );
+    }
+
     cpSync(baremuxPath, resolve(this.options.path, "baremux"), {
       recursive: true,
     });
@@ -549,24 +495,6 @@ class ChemicalBuild {
         resolve(this.options.path, "uv/uv.config.js")
       );
     }
-    if (this.options.experimental.scramjet) {
-      cpSync(scramjetPath, resolve(this.options.path, "scramjet"), {
-        recursive: true,
-      });
-      copyFileSync(
-        resolve(__dirname, "config/scramjet/scramjet.config.js"),
-        resolve(this.options.path, "scramjet/scramjet.config.js")
-      );
-    }
-    if (this.options.experimental.meteor) {
-      cpSync(meteorPath, resolve(this.options.path, "meteor"), {
-        recursive: true,
-      });
-      copyFileSync(
-        resolve(__dirname, "config/meteor/meteor.config.js"),
-        resolve(this.options.path, "meteor/meteor.config.js")
-      );
-    }
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chemicaljs",
-  "version": "2.1.1",
+  "version": "2.3.1",
   "description": "Easily create your own web proxy with no experience required.",
   "repository": {
     "type": "git",
@@ -14,14 +14,13 @@
     "update": "npx npm-check-updates -u && npm i"
   },
   "dependencies": {
-    "@mercuryworkshop/bare-mux": "^2.1.2",
-    "@mercuryworkshop/epoxy-transport": "^2.1.17",
-    "@mercuryworkshop/libcurl-transport": "^1.3.10",
+    "@mercuryworkshop/bare-mux": "^2.1.6",
+    "@mercuryworkshop/epoxy-transport": "^2.1.26",
+    "@mercuryworkshop/libcurl-transport": "^1.3.12",
     "@mercuryworkshop/scramjet": "^1.0.2",
-    "@mercuryworkshop/wisp-js": "^0.3.2",
-    "@titaniumnetwork-dev/ultraviolet": "^3.2.7",
+    "@mercuryworkshop/wisp-js": "^0.3.3",
+    "@titaniumnetwork-dev/ultraviolet": "^3.2.10",
     "express": "^4.21.1",
-    "meteorproxy": "^1.0.6-patch.1",
     "rammerhead": "https://github.com/chemicaljs/chemical/raw/main/rammerhead.tgz"
   },
   "engines": {