keryx 0.3.4 → 0.4.0

package/classes/Connection.ts

@@ -32,7 +32,7 @@ export class Connection<T extends Record<string, any> = Record<string, any>> {
     this.subscriptions = new Set();
     this.rawConnection = rawConnection;
 
-    api.connections.connections.push(this);
+    api.connections.connections.set(this.id, this);
   }
 
   /**

package/config/server/web.ts

@@ -27,6 +27,11 @@ export const configServerWeb = {
     "assets",
   ),
   staticFilesRoute: await loadFromEnvIfSet("WEB_SERVER_STATIC_ROUTE", "/"),
+  staticFilesCacheControl: await loadFromEnvIfSet(
+    "WEB_SERVER_STATIC_CACHE_CONTROL",
+    "public, max-age=3600",
+  ),
+  staticFilesEtag: await loadFromEnvIfSet("WEB_SERVER_STATIC_ETAG", true),
   websocketMaxPayloadSize: await loadFromEnvIfSet(
     "WS_MAX_PAYLOAD_SIZE",
     65_536,

package/initializers/channels.ts

@@ -175,7 +175,7 @@ export class Channels extends Initializer {
   refreshPresence = async (): Promise<void> => {
     const keysToRefresh = new Set<string>();
 
-    for (const connection of api.connections.connections) {
+    for (const connection of api.connections.connections.values()) {
       for (const channelName of connection.subscriptions) {
         const channel = this.findChannel(channelName);
         const key = channel

package/initializers/connections.ts

@@ -17,21 +17,31 @@ export class Connections extends Initializer {
 
   async initialize() {
     function find(type: string, identifier: string, id: string) {
-      const index = api.connections.connections.findIndex(
-        (c) => c.type === type && c.id === id && c.identifier === identifier,
-      );
-
-      return { connection: api.connections.connections[index], index };
+      for (const connection of api.connections.connections.values()) {
+        if (
+          connection.type === type &&
+          connection.id === id &&
+          connection.identifier === identifier
+        ) {
+          return { connection };
+        }
+      }
+      return { connection: undefined };
     }
 
     function destroy(type: string, identifier: string, id: string) {
-      const { connection, index } = find(type, identifier, id);
+      const { connection } = find(type, identifier, id);
       if (connection) {
-        return api.connections.connections.splice(index, 1);
+        api.connections.connections.delete(connection.id);
+        return [connection];
       }
       return [];
     }
 
-    return { connections: [] as Connection[], find, destroy };
+    return {
+      connections: new Map<string, Connection>(),
+      find,
+      destroy,
+    };
   }
 }

package/initializers/pubsub.ts

@@ -72,7 +72,7 @@ export class PubSub extends Initializer {
     incomingMessage: string | Buffer,
   ) {
     const payload = JSON.parse(incomingMessage.toString()) as PubSubMessage;
-    for (const connection of api.connections.connections) {
+    for (const connection of api.connections.connections.values()) {
       if (connection.subscriptions.has(payload.channel)) {
         connection.onBroadcastMessageReceived(payload);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "keryx",
-  "version": "0.3.4",
+  "version": "0.4.0",
   "module": "index.ts",
   "type": "module",
   "license": "MIT",
@@ -69,22 +69,22 @@
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.26.0",
     "colors": "^1.4.0",
-    "commander": "^12.1.0",
     "cookie": "^0.6.0",
-    "drizzle-orm": "^0.45.1",
     "ioredis": "^5.9.2",
     "mustache": "^4.2.0",
     "node-resque": "^9.5.0",
     "pg": "^8.18.0",
     "ts-morph": "^27.0.2",
     "typescript": "^5.9.3",
-    "zod": "^4.3.6",
     "@types/cookie": "^0.6.0",
     "@types/mustache": "^4.2.6",
     "@types/pg": "^8.16.0"
   },
   "peerDependencies": {
-    "drizzle-zod": "^0.8.3"
+    "commander": "^12.1.0",
+    "drizzle-orm": "^0.45.1",
+    "drizzle-zod": "^0.8.3",
+    "zod": "^4.3.6"
   },
   "devDependencies": {
     "@trivago/prettier-plugin-sort-imports": "^5.2.2",

package/servers/web.ts

@@ -220,6 +220,8 @@ export class WebServer extends Server<ReturnType<typeof Bun.serve>> {
       //@ts-expect-error
       ws.data.id,
     );
+    if (!connection) return;
+
     this.wsRateMap.delete(connection.id);
 
     try {
@@ -547,7 +549,7 @@ export class WebServer extends Server<ReturnType<typeof Bun.serve>> {
   }
 
   async handleStaticFile(
-    _req: Request,
+    req: Request,
     url: ReturnType<typeof parse>,
   ): Promise<Response | null> {
     const staticRoute = config.server.web.staticFilesRoute;
@@ -592,23 +594,66 @@ export class WebServer extends Server<ReturnType<typeof Bun.serve>> {
           const indexFile = Bun.file(indexPath);
           const indexExists = await indexFile.exists();
           if (indexExists) {
-            return new Response(indexFile, {
-              headers: this.getStaticFileHeaders(finalPath + "/index.html"),
-            });
+            return this.buildStaticFileResponse(
+              req,
+              indexFile,
+              finalPath + "/index.html",
+            );
           }
         }
         return null; // File not found, let other handlers deal with it
       }
 
-      return new Response(file, {
-        headers: this.getStaticFileHeaders(finalPath),
-      });
+      return this.buildStaticFileResponse(req, file, finalPath);
     } catch (error) {
       logger.error(`Error serving static file ${finalPath}: ${error}`);
       return null;
     }
   }
 
+  private async buildStaticFileResponse(
+    req: Request,
+    file: ReturnType<typeof Bun.file>,
+    filePath: string,
+  ): Promise<Response> {
+    const headers = this.getStaticFileHeaders(filePath);
+
+    // Generate ETag from mtime + size (fast, no hashing needed)
+    if (config.server.web.staticFilesEtag) {
+      const mtime = file.lastModified;
+      const size = file.size;
+      const etag = `"${mtime.toString(36)}-${size.toString(36)}"`;
+      headers["ETag"] = etag;
+      headers["Last-Modified"] = new Date(mtime).toUTCString();
+
+      // Check If-None-Match (takes precedence over If-Modified-Since per HTTP spec)
+      const ifNoneMatch = req.headers.get("if-none-match");
+      if (ifNoneMatch && ifNoneMatch === etag) {
+        return new Response(null, { status: 304, headers });
+      }
+
+      // Check If-Modified-Since
+      const ifModifiedSince = req.headers.get("if-modified-since");
+      if (ifModifiedSince) {
+        const ifModifiedSinceDate = new Date(ifModifiedSince).getTime();
+        // File mtime is in ms; compare at second precision (HTTP dates are second-precision)
+        if (
+          !isNaN(ifModifiedSinceDate) &&
+          Math.floor(mtime / 1000) <= Math.floor(ifModifiedSinceDate / 1000)
+        ) {
+          return new Response(null, { status: 304, headers });
+        }
+      }
+    }
+
+    // Add Cache-Control
+    if (config.server.web.staticFilesCacheControl) {
+      headers["Cache-Control"] = config.server.web.staticFilesCacheControl;
+    }
+
+    return new Response(file, { headers });
+  }
+
   private getStaticFileHeaders(filePath: string): Record<string, string> {
     const headers: Record<string, string> = {
       "X-SERVER-NAME": config.process.name,

package/util/scaffold.ts

@@ -216,7 +216,14 @@ export async function scaffoldProject(
         },
         dependencies: {
           keryx: `^${keryxVersion}`,
-          ...(options.includeDb ? { "drizzle-zod": "^0.8.3" } : {}),
+          commander: "^12.1.0",
+          zod: "^4.3.6",
+          ...(options.includeDb
+            ? {
+                "drizzle-orm": "^0.45.1",
+                "drizzle-zod": "^0.8.3",
+              }
+            : {}),
         },
         devDependencies: {
           "@types/bun": "latest",