chemicaljs 1.6.1 → 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.6.0",
+        "chemicaljs": "^1.6.1",
         "express": "^4.19.2"
       }
     },
@@ -1167,9 +1167,9 @@
       }
     },
     "node_modules/chemicaljs": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/chemicaljs/-/chemicaljs-1.6.0.tgz",
-      "integrity": "sha512-k5TOed003eTwczb88OSMpXl0hFQANvvX+7EHnWZvoe1vdOg2KUeHA40slO+b+cdbiVvL+UAO4b8/E5dqrw6gPA==",
+      "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.6.0",
+    "chemicaljs": "^1.6.1",
     "express": "^4.19.2"
   }
 }

package/examples/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

@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "chemicaljs": "^1.6.0",
+        "chemicaljs": "^1.6.1",
         "express": "^4.19.2"
       }
     },
@@ -1167,9 +1167,9 @@
       }
     },
     "node_modules/chemicaljs": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/chemicaljs/-/chemicaljs-1.6.0.tgz",
-      "integrity": "sha512-k5TOed003eTwczb88OSMpXl0hFQANvvX+7EHnWZvoe1vdOg2KUeHA40slO+b+cdbiVvL+UAO4b8/E5dqrw6gPA==",
+      "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

@@ -19,7 +19,7 @@
   },
   "homepage": "https://github.com/chemicaljs/chemical#readme",
   "dependencies": {
-    "chemicaljs": "^1.6.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.6.0",
+        "chemicaljs": "^1.6.1",
         "express": "^4.19.2"
       }
     },
@@ -1167,9 +1167,9 @@
       }
     },
     "node_modules/chemicaljs": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/chemicaljs/-/chemicaljs-1.6.0.tgz",
-      "integrity": "sha512-k5TOed003eTwczb88OSMpXl0hFQANvvX+7EHnWZvoe1vdOg2KUeHA40slO+b+cdbiVvL+UAO4b8/E5dqrw6gPA==",
+      "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.6.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.6.0",
+        "chemicaljs": "^1.6.1",
         "express": "^4.19.2"
       }
     },
@@ -1167,9 +1167,9 @@
       }
     },
     "node_modules/chemicaljs": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/chemicaljs/-/chemicaljs-1.6.0.tgz",
-      "integrity": "sha512-k5TOed003eTwczb88OSMpXl0hFQANvvX+7EHnWZvoe1vdOg2KUeHA40slO+b+cdbiVvL+UAO4b8/E5dqrw6gPA==",
+      "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.6.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,7 +6,7 @@
     "": {
       "name": "chemical-example-vite",
       "dependencies": {
-        "chemicaljs": "^1.6.0",
+        "chemicaljs": "^1.6.1",
         "express": "^4.19.2",
         "preact": "^10.23.1"
       },
@@ -1730,9 +1730,9 @@
       }
     },
     "node_modules/chemicaljs": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/chemicaljs/-/chemicaljs-1.6.0.tgz",
-      "integrity": "sha512-k5TOed003eTwczb88OSMpXl0hFQANvvX+7EHnWZvoe1vdOg2KUeHA40slO+b+cdbiVvL+UAO4b8/E5dqrw6gPA==",
+      "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-vite/package.json

@@ -8,7 +8,7 @@
     "build": "vite build"
   },
   "dependencies": {
-    "chemicaljs": "^1.6.0",
+    "chemicaljs": "^1.6.1",
     "express": "^4.19.2",
     "preact": "^10.23.1"
   },

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)
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "chemicaljs",
-    "version": "1.6.1",
+    "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 ../../

package/dist/baremux/baretypes.d.ts

@@ -1,22 +0,0 @@
-export type BareHeaders = Record<string, string | string[]>;
-export type BareMeta = {};
-export type TransferrableResponse = {
-    body: ReadableStream | ArrayBuffer | Blob | string;
-    headers: BareHeaders;
-    status: number;
-    statusText: string;
-};
-export interface BareTransport {
-    init: () => Promise<void>;
-    ready: boolean;
-    connect: (url: URL, origin: string, protocols: string[], requestHeaders: BareHeaders, onopen: (protocol: string) => void, onmessage: (data: Blob | ArrayBuffer | string) => void, onclose: (code: number, reason: string) => void, onerror: (error: string) => void) => [(data: Blob | ArrayBuffer | string) => void, (code: number, reason: string) => void];
-    request: (remote: URL, method: string, body: BodyInit | null, headers: BareHeaders, signal: AbortSignal | undefined) => Promise<TransferrableResponse>;
-    meta: () => BareMeta;
-}
-export interface BareWebSocketMeta {
-    protocol: string;
-    setCookies: string[];
-}
-export type BareHTTPProtocol = 'blob:' | 'http:' | 'https:' | string;
-export type BareWSProtocol = 'ws:' | 'wss:' | string;
-export declare const maxRedirects = 20;

package/dist/baremux/client.d.ts

@@ -1,73 +0,0 @@
-import { BareHeaders, BareTransport } from './baretypes';
-import { WorkerConnection } from './connection';
-export declare function validProtocol(protocol: string): boolean;
-export type WebSocketImpl = {
-    new (...args: ConstructorParameters<typeof WebSocket>): WebSocket;
-};
-export declare namespace BareWebSocket {
-    type GetReadyStateCallback = () => number;
-    type GetSendErrorCallback = () => Error | undefined;
-    type GetProtocolCallback = () => string;
-    type HeadersType = BareHeaders | Headers | undefined;
-    type HeadersProvider = BareHeaders | (() => BareHeaders | Promise<BareHeaders>);
-    interface Options {
-        /**
-         * A provider of request headers to pass to the remote.
-         * Usually one of `User-Agent`, `Origin`, and `Cookie`
-         * Can be just the headers object or an synchronous/asynchronous function that returns the headers object
-         */
-        headers?: BareWebSocket.HeadersProvider;
-        /**
-         * A hook executed by this function with helper arguments for hooking the readyState property. If a hook isn't provided, bare-client will hook the property on the instance. Hooking it on an instance basis is good for small projects, but ideally the class should be hooked by the user of bare-client.
-         */
-        readyStateHook?: ((socket: WebSocket, getReadyState: BareWebSocket.GetReadyStateCallback) => void) | undefined;
-        /**
-         * A hook executed by this function with helper arguments for determining if the send function should throw an error. If a hook isn't provided, bare-client will hook the function on the instance.
-         */
-        sendErrorHook?: ((socket: WebSocket, getSendError: BareWebSocket.GetSendErrorCallback) => void) | undefined;
-        /**
-         * A hook executed by this function with the URL. If a hook isn't provided, bare-client will hook the URL.
-         */
-        urlHook?: ((socket: WebSocket, url: URL) => void) | undefined;
-        /**
-         * A hook executed by this function with a helper for getting the current fake protocol. If a hook isn't provided, bare-client will hook the protocol.
-         */
-        protocolHook?: ((socket: WebSocket, getProtocol: BareWebSocket.GetProtocolCallback) => void) | undefined;
-        /**
-         * A callback executed by this function with an array of cookies. This is called once the metadata from the server is received.
-         */
-        setCookiesCallback?: ((setCookies: string[]) => void) | undefined;
-        webSocketImpl?: WebSocket;
-    }
-}
-/**
- * A Response with additional properties.
- */
-export interface BareResponse extends Response {
-    rawResponse: Response;
-    rawHeaders: BareHeaders;
-}
-/**
- * A BareResponse with additional properties.
- */
-export interface BareResponseFetch extends BareResponse {
-    finalURL: string;
-}
-export declare class BareMuxConnection {
-    worker: WorkerConnection;
-    constructor(workerPath: string);
-    getTransport(): Promise<string>;
-    setTransport(path: string, options: any[], transferables?: Transferable[]): Promise<void>;
-    setManualTransport(functionBody: string, options: any[], transferables?: Transferable[]): Promise<void>;
-    setRemoteTransport(transport: BareTransport, name: string): Promise<void>;
-    getInnerPort(): MessagePort | Promise<MessagePort>;
-}
-export declare class BareClient {
-    worker: WorkerConnection;
-    /**
-     * Create a BareClient. Calls to fetch and connect will wait for an implementation to be ready.
-     */
-    constructor(worker?: string | MessagePort);
-    createWebSocket(remote: string | URL, protocols?: string | string[] | undefined, webSocketImpl?: WebSocketImpl, requestHeaders?: BareHeaders, arrayBufferImpl?: ArrayBuffer): WebSocket;
-    fetch(url: string | URL, init?: RequestInit): Promise<BareResponseFetch>;
-}

package/dist/baremux/connection.d.ts

@@ -1,43 +0,0 @@
-import { BareHeaders, TransferrableResponse } from "./baretypes";
-export type WorkerMessage = {
-    type: "fetch" | "websocket" | "set" | "get" | "ping";
-    fetch?: {
-        remote: string;
-        method: string;
-        headers: BareHeaders;
-        body: ReadableStream | ArrayBuffer | undefined;
-    };
-    websocket?: {
-        url: string;
-        origin: string;
-        protocols: string[];
-        requestHeaders: BareHeaders;
-        channel: MessagePort;
-    };
-    client?: {
-        function: string;
-        args: any[];
-    };
-};
-export type WorkerRequest = {
-    message: WorkerMessage;
-    port: MessagePort;
-};
-export type WorkerResponse = {
-    type: "fetch" | "websocket" | "set" | "get" | "pong" | "error";
-    fetch?: TransferrableResponse;
-    name?: string;
-    error?: Error;
-};
-export type BroadcastMessage = {
-    type: "refreshPort";
-};
-export declare function browserSupportsTransferringStreams(): boolean;
-export declare class WorkerConnection {
-    channel: BroadcastChannel;
-    port: MessagePort | Promise<MessagePort>;
-    workerPath: string;
-    constructor(worker?: string | MessagePort);
-    createChannel(workerPath?: string, inInit?: boolean): void;
-    sendMessage(message: WorkerMessage, transferable?: Transferable[]): Promise<WorkerResponse>;
-}

package/dist/baremux/index.d.ts

@@ -1,9 +0,0 @@
-export * from './baretypes';
-export * from './client';
-export * from './connection';
-export { BareClient as default } from './client';
-export { WebSocketFields } from "./snapshot";
-export type * from './baretypes';
-export type * from './client';
-export type * from './connection';
-export type * from "./snapshot";