fix ts errors in testing and a typing issue

joeferner · Nov 25, 2023 · 07f80b7 · 07f80b7
1 parent 310a3bc
commit 07f80b7
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 16 deletions.
diff --git a/examples/forwardHttps.ts b/examples/forwardHttps.ts
@@ -1,13 +1,17 @@
 const port = 8081;
 import net from "net";
 import assert from "assert";
-import Proxy from "../";
+import { Proxy } from "../";
 const proxy = new Proxy();
 import { exec } from "child_process";
 
 proxy.onConnect((req, socket, head) => {
+  if (!req.url) {
+    console.log("No url in request");
+    return;
+  }
   const host = req.url.split(":")[0];
-  const port = req.url.split(":")[1];
+  const port = parseInt(req.url.split(":")[1]);
 
   console.log("Tunnel to", req.url);
   const conn = net.connect(
@@ -23,7 +27,7 @@ proxy.onConnect((req, socket, head) => {
       socket.on("close", () => {
         conn.end();
       });
-      socket.write("HTTP/1.1 200 OK\r\n\r\n", "UTF-8", () => {
+      socket.write("HTTP/1.1 200 OK\r\n\r\n", "utf-8", () => {
         conn.pipe(socket);
         socket.pipe(conn);
       });

diff --git a/examples/modifyGoogle.ts b/examples/modifyGoogle.ts
@@ -1,6 +1,6 @@
 const port = 8081;
 
-import Proxy from "../";
+import { Proxy } from "../";
 const proxy = new Proxy();
 
 proxy.onError((ctx, err, errorKind) => {
@@ -13,7 +13,7 @@ proxy.onRequest((ctx, callback) => {
   //console.log('REQUEST: http://' + ctx.clientToProxyRequest.headers.host + ctx.clientToProxyRequest.url);
   if (
     ctx.clientToProxyRequest.headers.host == "www.google.com" &&
-    ctx.clientToProxyRequest.url.indexOf("/search") == 0
+    ctx.clientToProxyRequest.url?.indexOf("/search") == 0
   ) {
     ctx.use(Proxy.gunzip);
 

diff --git a/examples/onCertificateMissing.ts b/examples/onCertificateMissing.ts
@@ -1,5 +1,5 @@
 const port = 8081;
-import Proxy from "../";
+import { Proxy } from "../";
 const proxy = new Proxy();
 
 proxy.onError((ctx, err, errorKind) => {

diff --git a/examples/onCertificateRequired.ts b/examples/onCertificateRequired.ts
@@ -1,6 +1,6 @@
 const port = 8081;
 import path from "path";
-import Proxy from "../";
+import { Proxy } from "../";
 const proxy = new Proxy();
 
 proxy.onError((ctx, err, errorKind) => {

diff --git a/examples/preventRequest.ts b/examples/preventRequest.ts
@@ -1,6 +1,6 @@
 const port = 8081;
 
-import Proxy from "../";
+import { Proxy } from "../";
 const proxy = new Proxy();
 
 proxy.onError((ctx, err, errorKind) => {

diff --git a/examples/processFullResponseBody.ts b/examples/processFullResponseBody.ts
@@ -1,6 +1,6 @@
 const port = 8081;
 
-import Proxy from "../";
+import { Proxy } from "../";
 const proxy = new Proxy();
 
 proxy.onError((ctx, err, errorKind) => {
@@ -13,14 +13,15 @@ proxy.onError((ctx, err, errorKind) => {
 proxy.use(Proxy.gunzip);
 
 proxy.onRequest((ctx, callback) => {
-  const chunks = [];
+  const chunks = new Array<Buffer>();
   ctx.onResponseData((ctx, chunk, callback) => {
     chunks.push(chunk);
-    return callback(null, null); // don't write chunks to client response
+    return callback(null, undefined); // don't write chunks to client response
   });
   ctx.onResponseEnd((ctx, callback) => {
     let body: string | Buffer = Buffer.concat(chunks);
     if (
+      ctx.serverToProxyResponse !== undefined &&
       ctx.serverToProxyResponse.headers["content-type"] &&
       ctx.serverToProxyResponse.headers["content-type"].indexOf("text/html") ===
         0

diff --git a/examples/removeProxyToServerContentLength.ts b/examples/removeProxyToServerContentLength.ts
@@ -1,10 +1,13 @@
 const port = 8081;
 
-import Proxy from "../";
+import { Proxy } from "../";
 const proxy = new Proxy();
 
 proxy.onRequest((ctx, callback) => {
-  if ("content-length" in ctx.proxyToServerRequestOptions.headers) {
+  if (
+    ctx.proxyToServerRequestOptions !== undefined &&
+    "content-length" in ctx.proxyToServerRequestOptions.headers
+  ) {
     console.log(
       `found "content-length" header in request to "${ctx.proxyToServerRequestOptions.host}${ctx.proxyToServerRequestOptions.path}". Removing.`
     );

diff --git a/examples/websocket.ts b/examples/websocket.ts
@@ -1,6 +1,6 @@
 const port = 8081;
 
-import Proxy from "../";
+import { Proxy } from "../";
 const proxy = new Proxy();
 
 proxy.onError((ctx, err, errorKind) => {

diff --git a/examples/wildcard.ts b/examples/wildcard.ts
@@ -1,6 +1,6 @@
 const port = 8081;
 
-import Proxy from "../";
+import { Proxy } from "../";
 const proxy = new Proxy();
 
 proxy.use(Proxy.wildcard);

diff --git a/lib/types.ts b/lib/types.ts
@@ -91,7 +91,7 @@ export type OnWebSocketCloseParams = (
 export interface ICertDetails {
   keyFile: string;
   certFile: string;
-  hosts: string[];
+  hosts?: string[];
 }
 
 export type MaybeError = Error | null | undefined;