chemicaljs 1.6.0 → 1.6.2

package/README.md

@@ -51,10 +51,10 @@ chemical.app.get("/", function(req, res){
 });
 ```
 
-4. Use `chemical.server` and listen on a port of your choosing.
+4. Use `chemical.listen` on a port of your choosing.
 
 ```js
-chemical.server.listen(3000);
+chemical.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.
@@ -71,7 +71,7 @@ chemical.app.use(express.static("public", {
     extensions: ["html"]
 }));
 
-chemical.server.listen(port, () => {
+chemical.listen(port, () => {
     console.log(`Chemical demo listening on port ${port}`);
 });
 ```

package/examples/example/index.js

@@ -9,6 +9,6 @@ chemical.app.use(express.static("public", {
     extensions: ["html"]
 }));
 
-chemical.server.listen(port, () => {
+chemical.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.5.0",
+        "chemicaljs": "^1.6.1",
         "express": "^4.19.2"
       }
     },
@@ -1167,9 +1167,9 @@
       }
     },
     "node_modules/chemicaljs": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/chemicaljs/-/chemicaljs-1.5.0.tgz",
-      "integrity": "sha512-kDNm1OZfKEVQgaUv2dANM75/9Eg3xKzkKQ1C7tZT745sHEMYmRhRP98uHpLpVsmtfvE0hULN1U97KifPuWDxTg==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/chemicaljs/-/chemicaljs-1.6.1.tgz",
+      "integrity": "sha512-iolcUgXd4eHC9vB6/7CMXIOpRNEEErO5SMPCv54h0wgPdnoOP/pfZqseYgDfyMl398zKDCWSC5x8GPhLaqNK4g==",
       "dependencies": {
         "@mercuryworkshop/bare-mux": "^2.0.4",
         "@mercuryworkshop/epoxy-transport": "^2.1.3",

package/examples/example/package.json

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

package/examples/{example build/build.js → example-build/build.js}

@@ -8,4 +8,6 @@ const build = new ChemicalBuild({
     rammerhead: false,
 });
 
-await build.write(true);
+await build.write(true);
+
+console.log("Built!")

package/examples/{example build/index.js → example-build/index.js}

@@ -11,6 +11,6 @@ chemical.app.use(express.static("public", {
     extensions: ["html"]
 }));
 
-chemical.server.listen(port, () => {
+chemical.listen(port, () => {
     console.log(`Chemical example build listening on port ${port}`);
 });

package/examples/{example build/package-lock.json → example-build/package-lock.json}

@@ -1,15 +1,15 @@
 {
-  "name": "chemical-example",
+  "name": "chemical-example-build",
   "version": "1.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "chemical-example",
+      "name": "chemical-example-build",
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "chemicaljs": "^1.5.0",
+        "chemicaljs": "^1.6.1",
         "express": "^4.19.2"
       }
     },
@@ -1167,9 +1167,9 @@
       }
     },
     "node_modules/chemicaljs": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/chemicaljs/-/chemicaljs-1.5.0.tgz",
-      "integrity": "sha512-kDNm1OZfKEVQgaUv2dANM75/9Eg3xKzkKQ1C7tZT745sHEMYmRhRP98uHpLpVsmtfvE0hULN1U97KifPuWDxTg==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/chemicaljs/-/chemicaljs-1.6.1.tgz",
+      "integrity": "sha512-iolcUgXd4eHC9vB6/7CMXIOpRNEEErO5SMPCv54h0wgPdnoOP/pfZqseYgDfyMl398zKDCWSC5x8GPhLaqNK4g==",
       "dependencies": {
         "@mercuryworkshop/bare-mux": "^2.0.4",
         "@mercuryworkshop/epoxy-transport": "^2.1.3",

package/examples/{example build/package.json → example-build/package.json}

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

package/examples/example-components/index.js

@@ -9,6 +9,6 @@ chemical.app.use(express.static("public", {
     extensions: ["html"]
 }));
 
-chemical.server.listen(port, () => {
+chemical.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.5.0",
+        "chemicaljs": "^1.6.1",
         "express": "^4.19.2"
       }
     },
@@ -1167,9 +1167,9 @@
       }
     },
     "node_modules/chemicaljs": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/chemicaljs/-/chemicaljs-1.5.0.tgz",
-      "integrity": "sha512-kDNm1OZfKEVQgaUv2dANM75/9Eg3xKzkKQ1C7tZT745sHEMYmRhRP98uHpLpVsmtfvE0hULN1U97KifPuWDxTg==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/chemicaljs/-/chemicaljs-1.6.1.tgz",
+      "integrity": "sha512-iolcUgXd4eHC9vB6/7CMXIOpRNEEErO5SMPCv54h0wgPdnoOP/pfZqseYgDfyMl398zKDCWSC5x8GPhLaqNK4g==",
       "dependencies": {
         "@mercuryworkshop/bare-mux": "^2.0.4",
         "@mercuryworkshop/epoxy-transport": "^2.1.3",

package/examples/example-components/package.json

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

package/examples/example-styled/index.js

@@ -9,6 +9,6 @@ chemical.app.use(express.static("public", {
     extensions: ["html"]
 }));
 
-chemical.server.listen(port, () => {
+chemical.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.5.0",
+        "chemicaljs": "^1.6.1",
         "express": "^4.19.2"
       }
     },
@@ -1167,9 +1167,9 @@
       }
     },
     "node_modules/chemicaljs": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/chemicaljs/-/chemicaljs-1.5.0.tgz",
-      "integrity": "sha512-kDNm1OZfKEVQgaUv2dANM75/9Eg3xKzkKQ1C7tZT745sHEMYmRhRP98uHpLpVsmtfvE0hULN1U97KifPuWDxTg==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/chemicaljs/-/chemicaljs-1.6.1.tgz",
+      "integrity": "sha512-iolcUgXd4eHC9vB6/7CMXIOpRNEEErO5SMPCv54h0wgPdnoOP/pfZqseYgDfyMl398zKDCWSC5x8GPhLaqNK4g==",
       "dependencies": {
         "@mercuryworkshop/bare-mux": "^2.0.4",
         "@mercuryworkshop/epoxy-transport": "^2.1.3",

package/examples/example-styled/package.json

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

package/examples/example-vite/index.js

@@ -9,6 +9,6 @@ chemical.app.use(express.static("dist", {
     extensions: ["html"]
 }));
 
-chemical.server.listen(port, () => {
+chemical.listen(port, () => {
     console.log(`Chemical example vite listening on port ${port}`);
 });

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

@@ -6,13 +6,13 @@
     "": {
       "name": "chemical-example-vite",
       "dependencies": {
-        "chemicaljs": "^1.5.0",
+        "chemicaljs": "^1.6.1",
         "express": "^4.19.2",
-        "preact": "^10.23.0"
+        "preact": "^10.23.1"
       },
       "devDependencies": {
         "@preact/preset-vite": "^2.9.0",
-        "vite": "^5.3.4"
+        "vite": "^5.3.5"
       }
     },
     "node_modules/@ampproject/remapping": {
@@ -1730,9 +1730,9 @@
       }
     },
     "node_modules/chemicaljs": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/chemicaljs/-/chemicaljs-1.5.0.tgz",
-      "integrity": "sha512-kDNm1OZfKEVQgaUv2dANM75/9Eg3xKzkKQ1C7tZT745sHEMYmRhRP98uHpLpVsmtfvE0hULN1U97KifPuWDxTg==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/chemicaljs/-/chemicaljs-1.6.1.tgz",
+      "integrity": "sha512-iolcUgXd4eHC9vB6/7CMXIOpRNEEErO5SMPCv54h0wgPdnoOP/pfZqseYgDfyMl398zKDCWSC5x8GPhLaqNK4g==",
       "dependencies": {
         "@mercuryworkshop/bare-mux": "^2.0.4",
         "@mercuryworkshop/epoxy-transport": "^2.1.3",
@@ -3615,9 +3615,9 @@
       }
     },
     "node_modules/preact": {
-      "version": "10.23.0",
-      "resolved": "https://registry.npmjs.org/preact/-/preact-10.23.0.tgz",
-      "integrity": "sha512-Pox0jeY4q6PGkFB5AsXni+zHxxx/sAYFIFZzukW4nIpoJLRziRX0xC4WjZENlkSrDQvqVgZcaZzZ/NL8/A+H/w==",
+      "version": "10.23.1",
+      "resolved": "https://registry.npmjs.org/preact/-/preact-10.23.1.tgz",
+      "integrity": "sha512-O5UdRsNh4vdZaTieWe3XOgSpdMAmkIYBCT3VhQDlKrzyCm8lUYsk0fmVEvoQQifoOjFRTaHZO69ylrzTW2BH+A==",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/preact"
@@ -4713,9 +4713,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "5.3.4",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.4.tgz",
-      "integrity": "sha512-Cw+7zL3ZG9/NZBB8C+8QbQZmR54GwqIz+WMI4b3JgdYJvX+ny9AjJXqkGQlDXSXRP9rP0B4tbciRMOVEKulVOA==",
+      "version": "5.3.5",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.5.tgz",
+      "integrity": "sha512-MdjglKR6AQXQb9JGiS7Rc2wC6uMjcm7Go/NHNO63EwiJXfuk9PgqiP/n5IDJCziMkfw9n4Ubp7lttNwz+8ZVKA==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.21.3",

package/examples/example-vite/package.json

@@ -8,12 +8,12 @@
     "build": "vite build"
   },
   "dependencies": {
-    "chemicaljs": "^1.5.0",
+    "chemicaljs": "^1.6.1",
     "express": "^4.19.2",
-    "preact": "^10.23.0"
+    "preact": "^10.23.1"
   },
   "devDependencies": {
     "@preact/preset-vite": "^2.9.0",
-    "vite": "^5.3.4"
+    "vite": "^5.3.5"
   }
 }

package/index.js

@@ -38,6 +38,13 @@ class ChemicalServer {
             options.rammerhead = true;
         }
 
+        this.options = options;
+
+        this.app = express();
+    }
+    listen(port, callback) {
+        const server = createServer();
+
         const rh = createRammerhead()
 
         const rammerheadScopes = [
@@ -75,14 +82,12 @@ class ChemicalServer {
             rh.emit("upgrade", req, socket, head)
         }
 
-        this.server = createServer();
-        this.app = express();
-        this.app.get("/chemical.js", async function (req, res) {
+        this.app.get("/chemical.js", async (req, res) => {
             let chemicalMain = await readFileSync(resolve(__dirname, "client/chemical.js"), "utf8");
 
-            if (options.default) {
-                if (["uv", "rammerhead", "scramjet"].includes(options.default)) {
-                    chemicalMain = `const defaultService = "${options.default}";\n\n` + chemicalMain
+            if (this.options.default) {
+                if (["uv", "rammerhead", "scramjet"].includes(this.options.default)) {
+                    chemicalMain = `const defaultService = "${this.options.default}";\n\n` + chemicalMain
                 } else {
                     chemicalMain = `const defaultService = "uv";\n\n` + chemicalMain
                     console.error("Error: Chemical default option invalid.")
@@ -91,19 +96,19 @@ class ChemicalServer {
                 chemicalMain = `const defaultService = "uv";\n\n` + chemicalMain;
             }
 
-            chemicalMain = "const uvEnabled = " + String(options.uv) + ";\n" + chemicalMain
-            chemicalMain = "const scramjetEnabled = " + String(options.scramjet) + ";\n" + chemicalMain
-            chemicalMain = "const rammerheadEnabled = " + String(options.rammerhead) + ";\n" + chemicalMain
+            chemicalMain = "const uvEnabled = " + String(this.options.uv) + ";\n" + chemicalMain
+            chemicalMain = "const scramjetEnabled = " + String(this.options.scramjet) + ";\n" + chemicalMain
+            chemicalMain = "const rammerheadEnabled = " + String(this.options.rammerhead) + ";\n" + chemicalMain
 
             res.type("application/javascript");
             return res.send(chemicalMain);
         });
-        this.app.get("/chemical.sw.js", async function (req, res) {
+        this.app.get("/chemical.sw.js", async (req, res) => {
             let chemicalSW = await readFileSync(resolve(__dirname, "client/chemical.sw.js"), "utf8");
 
-            chemicalSW = "const uvEnabled = " + String(options.uv) + ";\n" + chemicalSW
-            chemicalSW = "const scramjetEnabled = " + String(options.scramjet) + ";\n" + chemicalSW
-            chemicalSW = "const rammerheadEnabled = " + String(options.rammerhead) + ";\n" + chemicalSW
+            chemicalSW = "const uvEnabled = " + String(this.options.uv) + ";\n" + chemicalSW
+            chemicalSW = "const scramjetEnabled = " + String(this.options.scramjet) + ";\n" + chemicalSW
+            chemicalSW = "const rammerheadEnabled = " + String(this.options.rammerhead) + ";\n" + chemicalSW
 
             res.type("application/javascript");
             return res.send(chemicalSW);
@@ -112,36 +117,38 @@ class ChemicalServer {
         this.app.use("/baremux/", express.static(baremuxPath));
         this.app.use("/libcurl/", express.static(libcurlPath));
         this.app.use("/epoxy/", express.static(epoxyPath));
-        if (options.uv) {
+        if (this.options.uv) {
             this.app.use("/uv/", express.static(resolve(__dirname, "config/uv")));
             this.app.use("/uv/", express.static(uvPath));
         }
-        if (options.scramjet) {
+        if (this.options.scramjet) {
             this.app.use("/scramjet/", express.static(resolve(__dirname, "config/scramjet")));
             this.app.use("/scramjet/", express.static(scramjetPath));
         }
-        this.server.on("request", (req, res) => {
-            if (options.rammerhead && shouldRouteRh(req)) {
+        server.on("request", (req, res) => {
+            if (this.options.rammerhead && shouldRouteRh(req)) {
                 routeRhRequest(req, res);
             } else {
                 this.app(req, res);
             }
         });
-        this.server.on("upgrade", (req, socket, head) => {
+        server.on("upgrade", (req, socket, head) => {
             if (req.url && req.url.endsWith("/wisp/")) {
-                if (options.hostname_blacklist) {
-                    wisp.options.hostname_blacklist = options.hostname_blacklist
+                if (this.options.hostname_blacklist) {
+                    wisp.this.options.hostname_blacklist = this.options.hostname_blacklist
                 }
-                if (options.hostname_whitelist) {
-                    wisp.options.hostname_whitelist = options.hostname_whitelist
+                if (this.options.hostname_whitelist) {
+                    wisp.this.options.hostname_whitelist = this.options.hostname_whitelist
                 }
                 wisp.routeRequest(req, socket, head);
-            } else if (options.rammerhead && shouldRouteRh(req)) {
+            } else if (this.options.rammerhead && shouldRouteRh(req)) {
                 routeRhUpgrade(req, socket, head);
             } else {
                 socket.end();
             }
         });
+
+        server.listen(port, callback)
     }
 }
 
@@ -325,11 +332,11 @@ class ChemicalBuild {
         this.options = options;
     }
     async write(deletePath = false) {
-        if (!existsSync(resolve(__dirname, this.options.path))) {
-            mkdirSync(resolve(__dirname, this.options.path), { recursive: true });
+        if (!existsSync(resolve(this.options.path))) {
+            mkdirSync(resolve(this.options.path), { recursive: true });
         } else {
             if (deletePath) {
-                readdirSync(resolve(__dirname, this.options.path)).forEach((file) => rmSync(resolve(__dirname, this.options.path, file), { recursive: true }));
+                readdirSync(resolve(this.options.path)).forEach((file) => rmSync(resolve(this.options.path, file), { recursive: true }));
             }
         }
 
@@ -350,7 +357,7 @@ class ChemicalBuild {
         chemicalMain = "const scramjetEnabled = " + String(this.options.scramjet) + ";\n" + chemicalMain
         chemicalMain = "const rammerheadEnabled = " + String(this.options.rammerhead) + ";\n" + chemicalMain
 
-        writeFileSync(resolve(__dirname, this.options.path, "chemical.js"), chemicalMain);
+        writeFileSync(resolve(this.options.path, "chemical.js"), chemicalMain);
 
         let chemicalSW = await readFileSync(resolve(__dirname, "client/chemical.sw.js"), "utf8");
 
@@ -358,19 +365,19 @@ class ChemicalBuild {
         chemicalSW = "const scramjetEnabled = " + String(this.options.scramjet) + ";\n" + chemicalSW
         chemicalSW = "const rammerheadEnabled = " + String(this.options.rammerhead) + ";\n" + chemicalSW
 
-        writeFileSync(resolve(__dirname, this.options.path, "chemical.sw.js"), chemicalSW);
+        writeFileSync(resolve(this.options.path, "chemical.sw.js"), chemicalSW);
 
-        cpSync(baremuxPath, resolve(__dirname, this.options.path, "baremux"), { recursive: true });
-        cpSync(libcurlPath, resolve(__dirname, this.options.path, "libcurl"), { recursive: true });
-        cpSync(epoxyPath, resolve(__dirname, this.options.path, "epoxy"), { recursive: true });
-        cpSync(libcurlPath, resolve(__dirname, this.options.path, "libcurl"), { recursive: true });
+        cpSync(baremuxPath, resolve(this.options.path, "baremux"), { recursive: true });
+        cpSync(libcurlPath, resolve(this.options.path, "libcurl"), { recursive: true });
+        cpSync(epoxyPath, resolve(this.options.path, "epoxy"), { recursive: true });
+        cpSync(libcurlPath, resolve(this.options.path, "libcurl"), { recursive: true });
         if (this.options.uv) {
-            cpSync(uvPath, resolve(__dirname, this.options.path, "uv"), { recursive: true });
-            copyFileSync(resolve(__dirname, "config/uv/uv.config.js"), resolve(__dirname, this.options.path, "uv/uv.config.js"));
+            cpSync(uvPath, resolve(this.options.path, "uv"), { recursive: true });
+            copyFileSync(resolve(__dirname, "config/uv/uv.config.js"), resolve(this.options.path, "uv/uv.config.js"));
         }
         if (this.options.scramjet) {
-            cpSync(scramjetPath, resolve(__dirname, this.options.path, "scramjet"), { recursive: true });
-            copyFileSync(resolve(__dirname, "config/scramjet/scramjet.config.js"), resolve(__dirname, this.options.path, "scramjet/scramjet.config.js"));
+            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"));
         }
     }
 }

package/package.json

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

package/update.bash

@@ -10,4 +10,7 @@ npx npm-check-updates -u && npm i
 cd ../../
 cd examples/example-styled
 npx npm-check-updates -u && npm i
+cd ../../
+cd examples/example-build
+npx npm-check-updates -u && npm i
 cd ../../