@bendover111222333444/epoxy-transport 3.0.2 → 3.0.3

package/dist/index.js

@@ -1585,39 +1585,51 @@ var EpoxyTransport = class {
   }
   async request(remote, method, body, headers, signal) {
     if (body instanceof Blob) body = await body.arrayBuffer();
-    try {
-      let headersObj = {};
-      for (let [key, value] of headers) {
-        if (headersObj[key]) {
-          console.warn(
-            `Duplicate header key "${key}" detected. Overwriting previous value.`
-          );
+    const doRequest = async () => {
+      try {
+        let headersObj = {};
+        for (let [key, value] of headers) {
+          if (headersObj[key]) {
+            console.warn(
+              `Duplicate header key "${key}" detected. Overwriting previous value.`
+            );
+          }
+          headersObj[key] = value;
         }
-        headersObj[key] = value;
-      }
-      let res = await this.client.fetch(remote.href, {
-        method,
-        body,
-        headers: headersObj,
-        redirect: "manual"
-      });
-      let headersEntries = [];
-      for (let [key, value] of Object.entries(res.rawHeaders)) {
-        if (Array.isArray(value)) {
-          for (let v of value) {
-            headersEntries.push([key, v]);
+        let res = await this.client.fetch(remote.href, {
+          method,
+          body,
+          headers: headersObj,
+          redirect: "manual"
+        });
+        let headersEntries = [];
+        for (let [key, value] of Object.entries(res.rawHeaders)) {
+          if (Array.isArray(value)) {
+            for (let v of value) {
+              headersEntries.push([key, v]);
+            }
+          } else {
+            headersEntries.push([key, value]);
           }
-        } else {
-          headersEntries.push([key, value]);
         }
+        return {
+          body: res.body,
+          headers: headersEntries,
+          status: res.status,
+          statusText: res.statusText
+        };
+      } catch (err) {
+        throw err;
       }
-      return {
-        body: res.body,
-        headers: headersEntries,
-        status: res.status,
-        statusText: res.statusText
-      };
+    };
+    try {
+      return await doRequest();
     } catch (err) {
+      const msg = String(err);
+      if (msg.includes("tls handshake eof") || msg.includes("MuxTaskEnded") || msg.includes("UnexpectedEof")) {
+        await this.init();
+        return await doRequest();
+      }
       console.error(err);
       throw err;
     }

package/dist/index.mjs

@@ -1556,39 +1556,51 @@ var EpoxyTransport = class {
   }
   async request(remote, method, body, headers, signal) {
     if (body instanceof Blob) body = await body.arrayBuffer();
-    try {
-      let headersObj = {};
-      for (let [key, value] of headers) {
-        if (headersObj[key]) {
-          console.warn(
-            `Duplicate header key "${key}" detected. Overwriting previous value.`
-          );
+    const doRequest = async () => {
+      try {
+        let headersObj = {};
+        for (let [key, value] of headers) {
+          if (headersObj[key]) {
+            console.warn(
+              `Duplicate header key "${key}" detected. Overwriting previous value.`
+            );
+          }
+          headersObj[key] = value;
         }
-        headersObj[key] = value;
-      }
-      let res = await this.client.fetch(remote.href, {
-        method,
-        body,
-        headers: headersObj,
-        redirect: "manual"
-      });
-      let headersEntries = [];
-      for (let [key, value] of Object.entries(res.rawHeaders)) {
-        if (Array.isArray(value)) {
-          for (let v of value) {
-            headersEntries.push([key, v]);
+        let res = await this.client.fetch(remote.href, {
+          method,
+          body,
+          headers: headersObj,
+          redirect: "manual"
+        });
+        let headersEntries = [];
+        for (let [key, value] of Object.entries(res.rawHeaders)) {
+          if (Array.isArray(value)) {
+            for (let v of value) {
+              headersEntries.push([key, v]);
+            }
+          } else {
+            headersEntries.push([key, value]);
           }
-        } else {
-          headersEntries.push([key, value]);
         }
+        return {
+          body: res.body,
+          headers: headersEntries,
+          status: res.status,
+          statusText: res.statusText
+        };
+      } catch (err) {
+        throw err;
       }
-      return {
-        body: res.body,
-        headers: headersEntries,
-        status: res.status,
-        statusText: res.statusText
-      };
+    };
+    try {
+      return await doRequest();
     } catch (err) {
+      const msg = String(err);
+      if (msg.includes("tls handshake eof") || msg.includes("MuxTaskEnded") || msg.includes("UnexpectedEof")) {
+        await this.init();
+        return await doRequest();
+      }
       console.error(err);
       throw err;
     }

package/package.json

@@ -1,34 +1,33 @@
-{
-	"name": "@bendover111222333444/epoxy-transport",
-	"version": "3.0.2",
-	"description": "a bare transport that implements end-to-end encryption with epoxy-tls and wisp",
-	"main": "./dist/index.mjs",
-	"keywords": [],
-	"author": "",
-	"type": "module",
-	"license": "AGPL-3.0-only",
-	"repository": {
-		"type": "git",
-		"url": "git+https://github.com/MercuryWorkshop/epoxy-transport.git"
-	},
-	"scripts": {
-		"build": "node esbuild.bundle.mjs",
-		"prepack": "npm run build"
-	},
-	"dependencies": {
-		"@mercuryworkshop/epoxy-tls": "2.1.19-1"
-	},
-	"devDependencies": {
-		"@mercuryworkshop/proxy-transports": "^1.0.2",
-		"esbuild": "^0.25.8",
-		"esbuild-plugin-d.ts": "^1.3.1",
-		"esbuild-plugin-umd-wrapper": "^3.0.0"
-	},
-	"exports": {
-    	".": {
-      		"import": "./dist/index.mjs",
-      		"require": "./dist/index.js",
-      		"types": "./dist/index.d.ts"
-    	}
-  	}
-}
+{
+  "name": "@bendover111222333444/epoxy-transport",
+  "version": "3.0.3",
+  "description": "a bare transport that implements end-to-end encryption with epoxy-tls and wisp modified by bendover111222333444",
+  "main": "./dist/index.mjs",
+  "keywords": [],
+  "author": "",
+  "type": "module",
+  "license": "AGPL-3.0-only",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/MercuryWorkshop/epoxy-transport.git"
+  },
+  "dependencies": {
+    "@mercuryworkshop/epoxy-tls": "2.1.19-1"
+  },
+  "devDependencies": {
+    "@mercuryworkshop/proxy-transports": "^1.0.2",
+    "esbuild": "^0.25.8",
+    "esbuild-plugin-d.ts": "^1.3.1",
+    "esbuild-plugin-umd-wrapper": "^3.0.0"
+  },
+  "exports": {
+    ".": {
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.js",
+      "types": "./dist/index.d.ts"
+    }
+  },
+  "scripts": {
+    "build": "node esbuild.bundle.mjs"
+  }
+}

package/src/main.ts

@@ -78,41 +78,53 @@ export default class EpoxyTransport implements ProxyTransport {
 	): Promise<TransferrableResponse> {
 		if (body instanceof Blob) body = await body.arrayBuffer();
 
-		try {
-			let headersObj: Record<string, string> = {};
-			for (let [key, value] of headers) {
-				if (headersObj[key]) {
-					// epoxy does not support multiple headers with the same key
-					console.warn(
-						`Duplicate header key "${key}" detected. Overwriting previous value.`
-					);
+		const doRequest = async () => {
+			try {
+				let headersObj: Record<string, string> = {};
+				for (let [key, value] of headers) {
+					if (headersObj[key]) {
+						console.warn(
+							`Duplicate header key "${key}" detected. Overwriting previous value.`
+						);
+					}
+					headersObj[key] = value;
 				}
-				headersObj[key] = value;
-			}
 
-			let res = await this.client.fetch(remote.href, {
-				method,
-				body,
-				headers: headersObj,
-				redirect: "manual",
-			});
-			let headersEntries: RawHeaders = [];
-			for (let [key, value] of Object.entries((res as any).rawHeaders) as any) {
-				if (Array.isArray(value)) {
-					for (let v of value) {
-						headersEntries.push([key, v]);
+				let res = await this.client.fetch(remote.href, {
+					method,
+					body,
+					headers: headersObj,
+					redirect: "manual",
+				});
+				let headersEntries: RawHeaders = [];
+				for (let [key, value] of Object.entries((res as any).rawHeaders) as any) {
+					if (Array.isArray(value)) {
+						for (let v of value) {
+							headersEntries.push([key, v]);
+						}
+					} else {
+						headersEntries.push([key, value]);
 					}
-				} else {
-					headersEntries.push([key, value]);
 				}
+				return {
+					body: res.body!,
+					headers: headersEntries,
+					status: res.status,
+					statusText: res.statusText,
+				};
+			} catch (err) {
+				throw err;
 			}
-			return {
-				body: res.body!,
-				headers: headersEntries,
-				status: res.status,
-				statusText: res.statusText,
-			};
+		};
+
+		try {
+			return await doRequest();
 		} catch (err) {
+			const msg = String(err);
+			if (msg.includes("tls handshake eof") || msg.includes("MuxTaskEnded") || msg.includes("UnexpectedEof")) {
+				await this.init();
+				return await doRequest();
+			}
 			console.error(err);
 			throw err;
 		}