275 bun optimized

lessons/275/bun-app/package.json

@@ -11,7 +11,7 @@
     "typescript": "^5"
   },
   "scripts": {
-    "build": "bun build --compile --minify --sourcemap ./src/app.ts --outfile bun-app"
+    "build": "bun build --compile --minify --sourcemap --sql-preconnect ./src/app.ts --outfile bun-app"
   },
   "dependencies": {
     "js-yaml": "^4.1.1"

lessons/275/bun-app/src/app.ts

@@ -1,67 +1,51 @@
 import config from "./config.ts";
 import { save } from "./users.ts";
 import type { User } from "./types.ts";
-import type { Config } from "./config.ts";
-
 
 const server = Bun.serve({
   // Timeout in seconds to match Node.js
   idleTimeout: 60,
   development: false,
   reusePort: true,
-  port: (config as Config).appPort,
+  port: config.appPort,
   async fetch(req: Request): Promise<Response> {
     const path = new URL(req.url).pathname;
-    if (path === "/healthz") return new Response("OK");
 
-    if (req.method === "GET" && path === "/api/users") {
-      const users: User[] = [
-        {
-          id: 1,
-          name: "David D. Patton",
-          address: "1670 Stiles Street",
-          phone: "412-578-3857",
-          image: `user.png`,
-        },
-        {
-          id: 2,
-          name: "Gary E. Eaton",
-          address: "828 Collins Avenue",
-          phone: "614-866-1660",
-          image: `user.png`,
-        },
-        {
-          id: 3,
-          name: "John J. Fox",
-          address: "1895 Columbia Mine Road",
-          phone: "304-505-3622",
-          image: `user.png`,
-        },
-      ];
-      return Response.json(users);
-    }
+    if (path === "/healthz") return new Response("OK", { status: 200 });
+    if (path === "/api/users") {
+      if (req.method === "GET") {
+        const users: User[] = [
+          { id: 1, name: "David D. Patton", address: "1670 Stiles Street", phone: "412-578-3857", image: `user.png`, },
+          { id: 2, name: "Gary E. Eaton", address: "828 Collins Avenue", phone: "614-866-1660", image: `user.png`, },
+          { id: 3, name: "John J. Fox", address: "1895 Columbia Mine Road", phone: "304-505-3622", image: `user.png`, },
+        ];
+        return Response.json(users);
+      }
 
-    if (req.method === "POST" && path === "/api/users") {
-      const incomingUser: any = await req.json();
-      const datetime = new Date();
-      const key = `user-bun-${datetime.getTime()}.png`;
-      const user: User = {
-        ...incomingUser,
-        createdAt: datetime,
-        updatedAt: datetime,
-        image: key,
-      };
+      if (req.method === "POST") {
+        const incomingUser = await req.json() as User;
+        const now = Date.now();
+        const datetime = new Date(now);
 
-      return save(user)
-        .then((record: [{ id: number }]) => {
+        const user: User = {
+          name: incomingUser.name,
+          address: incomingUser.address,
+          phone: incomingUser.phone,
+          image: `user-bun-${now}.png`,
+          createdAt: datetime,
+          updatedAt: datetime,
+        };
+
+        try {
+          const record = await save(user);
           user.id = record[0].id;
           return Response.json(user, { status: 201 });
-        })
-        .catch((error: Error) => {
-          console.error(error);
-          return Response.json({ message: error.message }, { status: 400 });
-        });
+        } catch (error: unknown) {
+          return Response.json({ message: (error as Error).message }, { status: 400 });
+        }
+      }
     }
+
     return new Response("Resource not found", { status: 404 });
   },
 });

lessons/275/bun-app/src/config.ts

@@ -1,7 +1,7 @@
-import { readFileSync } from "fs";
 import { load } from "js-yaml";
 import type { Config } from "./types.ts";
 
-const config: Config = load(readFileSync("config.yaml", "utf8")) as Config;
+const config: Config = load(await Bun.file("config.yaml").text()) as Config;
 
+export type { Config } from './types.ts';
 export default config;

lessons/275/bun-app/src/db.ts

@@ -1,10 +1,14 @@
 import config from "./config.ts";
 import { SQL } from "bun";
-import type { Config } from "./types.ts";
+
+const { db } = config;
 
 const sql = new SQL({
-  url: `postgres://${(config as Config).db.user}:${(config as Config).db.password}@${(config as Config).db.host}:5432/${(config as Config).db.database}`,
-  max: (config as Config).db.maxConnections,
+  url: `postgresql://${db.user}:${db.password}@${db.host}:5432/${db.database}`,
+  max: db.maxConnections,
+  idleTimeout: 60,
+  connectionTimeout: 30,
+  maxLifetime: 1800
 });
 
 export default sql;

lessons/275/bun-app/src/users.ts

@@ -1,13 +1,7 @@
 import sql from "./db.ts";
 import type { User } from "./types.ts";
 
-export async function save({
-  name,
-  address,
-  phone,
-  image,
-  createdAt,
-  updatedAt,
-}: User): Promise<any> {
+export function save(user: User): Promise<[{ id: number }]> {
+  const { name, address, phone, image, createdAt, updatedAt } = user;
   return sql`INSERT INTO bun_app (name, address, phone, image, created_at, updated_at) VALUES (${name}, ${address}, ${phone}, ${image}, ${createdAt}, ${updatedAt}) RETURNING id;`;
 }