fix: Improvements; Add prettier; Improve timeouts

.gitignore

@@ -1,2 +1,4 @@
 # deps
 node_modules/
+
+debug.log

.prettierrc.json

@@ -0,0 +1,7 @@
+{
+	"tabWidth": 4,
+	"useTabs": true,
+	"singleQuote": false,
+	"trailingComma": "all",
+	"arrowParens": "avoid"
+}

README.md

@@ -1,9 +1,11 @@
 To install dependencies:
+
 ```sh
 bun install
 ```
 
 To run:
+
 ```sh
 bun run dev
 ```

package.json

@@ -1,7 +1,8 @@
 {
 	"name": "amiopen",
 	"scripts": {
-    "dev": "bun run --hot src/index.ts"
+		"dev": "bun run --hot src/index.ts",
+		"prettier": "prettier --write ."
 	},
 	"dependencies": {
 		"hono": "^4.6.9",
@@ -10,6 +11,7 @@
 	},
 	"devDependencies": {
 		"@types/bun": "latest",
-    "@types/ip": "^1.1.3"
+		"@types/ip": "^1.1.3",
+		"prettier": "^3.3.3"
 	}
 }

src/index.ts

@@ -1,11 +1,8 @@
-import { Hono } from 'hono'
+import { Hono } from "hono";
-import { portRoute } from './routes/port'
+import { portRoute } from "./routes/port";
 
-const app = new Hono()
+const app = new Hono();
 
-app.route(
+app.route("/", portRoute);
-  "/",
-  portRoute,
-)
 
-export default app
+export default app;

src/routes/port.ts

@@ -2,34 +2,55 @@ import { Hono } from "hono";
 import { getConnInfo } from "hono/bun";
 import connectToAddress from "../utils/connect-to-address";
 import { z } from "zod";
-import * as IP from "ip"
+import * as IP from "ip";
 
 export const portRoute = new Hono();
 
 const schema = z.object({
-  ip: z.string().refine(ip => IP.isPublic(ip), "This IP address is not valid"),
+	ip: z
-  port: z.string().transform(Number).pipe(z.number().min(1).max(2**16 - 1)),
+		.string()
+		.refine(ip => IP.isPublic(ip), "This IP address is not valid"),
+	port: z
+		.string()
+		.transform(Number)
+		.pipe(
+			z
+				.number()
+				.min(1)
+				.max(2 ** 16 - 1),
+		),
+	timeout: z
+		.string()
+		.optional()
+		.transform(val => (val === undefined ? 5_000 : Number(val)))
+		.pipe(z.number().min(1_000).max(60_000)),
 });
 
 portRoute.get("/:port", async context => {
-  const info = getConnInfo(context)
+	const info = getConnInfo(context);
 	const rawData = {
 		ip: info.remote.address || "",
 		port: context.req.param("port"),
+		timeout: context.req.query("timeout") || "",
 	};
 	const parsedData = schema.safeParse(rawData);
 
 	if (!parsedData.success) {
-    return context.json({ error: parsedData.error }, 401);
+		return context.json(
+			{
+				error: parsedData.error,
+			},
+			401,
+		);
 	}
 
 	const { ip, port } = parsedData.data;
 
-  const result = await connectToAddress(ip, port)
+	const result = await connectToAddress(ip, port);
 
 	return context.json({
-    isOpen: result.isOpen
+		isOpen: result.isOpen,
-  })
+	});
 });
 
 portRoute.get("/:ip/:port", async context => {
@@ -40,14 +61,19 @@ portRoute.get("/:ip/:port", async context => {
 	const parsedData = schema.safeParse(rawData);
 
 	if (!parsedData.success) {
-    return context.json({ error: parsedData.error }, 401);
+		return context.json(
+			{
+				error: parsedData.error,
+			},
+			401,
+		);
 	}
 
 	const { ip, port } = parsedData.data;
 
-  const result = await connectToAddress(ip, port)
+	const result = await connectToAddress(ip, port);
 
 	return context.json({
-    isOpen: result.isOpen
+		isOpen: result.isOpen,
-  })
+	});
-})
+});

src/utils/connect-to-address.ts

@@ -1,54 +1,57 @@
-import * as net from "net"
+import * as net from "net";
 
 export interface ConnectionResult {
-  isOpen: boolean
+	isOpen: boolean;
 }
 
-const TIMEOUT = 5_000
+const TIMEOUT = 5_000;
 
-export default function connectToAddress(address: string, port: number): Promise<ConnectionResult> {
+export default function connectToAddress(
-  return new Promise<ConnectionResult>(async (resolve) => {
+	address: string,
+	port: number,
+): Promise<ConnectionResult> {
+	return new Promise<ConnectionResult>(async resolve => {
 		const onIsOpen = () => {
 			if (!socket.destroyed) {
-        socket.end()
+				socket.end();
-        socket.destroy()
+				socket.destroy();
 			}
 
 			resolve({
-        isOpen: true
+				isOpen: true,
-      })
+			});
-    }
+		};
 		const onIsClosed = () => {
 			if (!socket.destroyed) {
-        socket.end()
+				socket.end();
-        socket.destroy()
+				socket.destroy();
 			}
 
 			resolve({
-        isOpen: false
+				isOpen: false,
-      })
+			});
-    }
+		};
 
-    const socket = new net.Socket()
+		const socket = new net.Socket();
 
 		// The `setTimeout` function from a socket does not work when connecting,
 		// so we need to use a custom timeout function ourselves.
 		setTimeout(() => {
 			if (!socket.destroyed) {
-        socket.end()
+				socket.end();
-        socket.destroy()
+				socket.destroy();
 			}
 
 			resolve({
-        isOpen: false
+				isOpen: false,
-      })
+			});
-    }, TIMEOUT)
+		}, TIMEOUT);
 
-    socket.on("ready", onIsOpen)
+		socket.on("ready", onIsOpen);
-    socket.on("close", onIsClosed)
+		socket.on("close", onIsClosed);
-    socket.on("error", onIsClosed)
+		socket.on("error", onIsClosed);
-    socket.on("timeout", onIsClosed)
+		socket.on("timeout", onIsClosed);
 
-    socket.connect(port, address)
+		socket.connect(port, address);
-  })
+	});
 }

src/utils/timeout.ts

@@ -1,4 +1,3 @@
 export default function timeout(ms: number): Promise<void> {
-  return new Promise(resolve => setTimeout(resolve, ms))
+	return new Promise(resolve => setTimeout(resolve, ms));
 }
-