bxo 0.0.10-dev.1 → 0.0.10-dev.2

package/example/websocket-example.ts

@@ -143,19 +143,18 @@ async function main() {
             console.log(`  🔍 Search Params:`, data.searchParams);
             console.log(`  🔐 Authorization:`, data.authorization || 'None');
             
-            // Use convenience methods
-            console.log(`  🍪 Session Cookie:`, data.getCookie('sessionId'));
-            console.log(`  🔍 Room Param:`, data.getSearchParam('room'));
-            console.log(`  👤 Username:`, data.getUsername());
-            console.log(`  🏠 Room:`, data.getRoom());
-            console.log(`  🔐 Has Auth:`, data.hasAuth());
-            console.log(`  🔑 Auth Type:`, data.getAuthType());
-            console.log(`  🎫 Token:`, data.getToken());
+            // Use direct property access
+            console.log(`  🍪 Session Cookie:`, data.cookies.sessionId);
+            console.log(`  🔍 Room Param:`, data.searchParams.room);
+            console.log(`  👤 Username:`, data.searchParams.user || data.searchParams.username);
+            console.log(`  🏠 Room:`, data.searchParams.room);
+            console.log(`  🔐 Has Auth:`, !!(data.authorization || data.searchParams.token || data.searchParams.auth));
+            console.log(`  🔑 Auth Type:`, data.authorization ? (data.authorization.toLowerCase().startsWith('bearer ') ? 'bearer' : 'basic') : 'none');
+            console.log(`  🎫 Token:`, data.searchParams.token || data.searchParams.auth);
             
-            // Check for authentication using convenience methods
-            if (data.hasAuth()) {
-                const authType = data.getAuthType();
-                console.log(`  ✅ Authenticated user detected (${authType})`);
+            // Check for authentication using direct property access
+            if (data.authorization || data.searchParams.token || data.searchParams.auth) {
+                console.log(`  ✅ Authenticated user detected`);
                 ws.send(`Welcome authenticated user! Your WebSocket ID is: ${data.id}`);
             } else {
                 ws.send(`Welcome! Your WebSocket ID is: ${data.id}`);
@@ -169,10 +168,10 @@ async function main() {
             console.log(`   🔍 Search params:`, data.searchParams);
             console.log(`   🔐 Auth:`, data.authorization || 'None');
             
-            // Use convenience methods for cleaner code
-            const username = data.getUsername() || 'Anonymous';
-            const room = data.getRoom();
-            const sessionId = data.getCookie('sessionId');
+            // Use direct property access
+            const username = data.searchParams.user || data.searchParams.username || 'Anonymous';
+            const room = data.searchParams.room;
+            const sessionId = data.cookies.sessionId;
             
             console.log(`   👤 Username: ${username}`);
             console.log(`   🏠 Room: ${room || 'None'}`);
@@ -181,7 +180,7 @@ async function main() {
             // Echo the message back with client ID and context
             let response = `[${data.id}] Echo: ${message}`;
             
-            // Add context using convenience methods
+            // Add context using direct property access
             if (room) {
                 response += ` (Room: ${room})`;
             }
@@ -219,10 +218,10 @@ async function main() {
             console.log(`  🔍 Search Params:`, data.searchParams);
             console.log(`  🔐 Authorization:`, data.authorization || 'None');
             
-            // Use convenience methods for cleaner code
-            const username = data.getUsername() || 'Anonymous';
-            const sessionId = data.getCookie('sessionId');
-            const hasAuth = data.hasAuth();
+            // Use direct property access
+            const username = data.searchParams.user || data.searchParams.username || 'Anonymous';
+            const sessionId = data.cookies.sessionId;
+            const hasAuth = !!(data.authorization || data.searchParams.token || data.searchParams.auth);
             
             console.log(`  👤 Username: ${username}`);
             console.log(`  🍪 Session: ${sessionId || 'None'}`);
@@ -234,8 +233,8 @@ async function main() {
         message(ws, message) {
             const data = ws.data; // Fully typed WebSocketData
             const room = data.path.split('/').pop() || 'unknown';
-            const username = data.getUsername() || 'Anonymous';
-            const sessionId = data.getCookie('sessionId');
+            const username = data.searchParams.user || data.searchParams.username || 'Anonymous';
+            const sessionId = data.cookies.sessionId;
             
             console.log(`💬 Message in room ${room} from ${data.id} (${username}):`, message);
             console.log(`   🍪 Client cookies:`, data.cookies);
@@ -263,15 +262,12 @@ async function main() {
     console.log(`   • ws.data.searchParams - Query parameters from URL`);
     console.log(`   • ws.data.authorization - Authorization header`);
     console.log(`   • Client IP, User Agent, Origin tracking`);
-    console.log(`\n🔧 Typed Interface Methods:`);
-    console.log(`   • ws.data.getCookie(name) - Get specific cookie`);
-    console.log(`   • ws.data.getSearchParam(name) - Get specific search param`);
-    console.log(`   • ws.data.hasAuth() - Check if authenticated`);
-    console.log(`   • ws.data.getAuthType() - Get authentication type`);
-    console.log(`   • ws.data.getToken() - Get authentication token`);
-    console.log(`   • ws.data.getUsername() - Get username from params`);
-    console.log(`   • ws.data.getRoom() - Get room from params`);
-    console.log(`   • ws.data.getUser() - Get user from params`);
+    console.log(`\n🔧 Direct Property Access:`);
+    console.log(`   • ws.data.cookies.name - Get specific cookie`);
+    console.log(`   • ws.data.searchParams.name - Get specific search param`);
+    console.log(`   • ws.data.authorization - Check authorization header`);
+    console.log(`   • ws.data.id - Short client identifier`);
+    console.log(`   • ws.data.connectionId - Detailed connection ID`);
     console.log(`\n🧪 Test URLs:`);
     console.log(`   • Basic: ws://localhost:${app.server?.port}/ws`);
     console.log(`   • With params: ws://localhost:${app.server?.port}/ws?room=test&user=john&theme=dark`);

package/package.json

@@ -5,7 +5,7 @@
     ".": "./src/index.ts",
     "./plugins": "./plugins/index.ts"
   },
-  "version": "0.0.10-dev.1",
+  "version": "0.0.10-dev.2",
   "type": "module",
   "devDependencies": {
     "@types/bun": "latest"

package/src/index.ts

@@ -108,15 +108,8 @@ export type WebSocketClientInfo = {
 
 // WebSocket data interface - this is what you get when accessing ws.data
 export interface WebSocketData extends WebSocketClientInfo {
-    // Additional methods for convenience
-    getCookie(name: string): string | undefined;
-    getSearchParam(name: string): string | string[] | undefined;
-    hasAuth(): boolean;
-    getAuthType(): 'bearer' | 'basic' | 'custom' | 'none';
-    getToken(): string | undefined;
-    getUsername(): string | undefined;
-    getRoom(): string | undefined;
-    getUser(): string | undefined;
+    // Simple interface with just the data properties
+    // No convenience methods - use direct property access
 }
 
 // WebSocket handler types
@@ -530,48 +523,9 @@ export default class BXO {
                                 authorization: authHeader || undefined // Authorization header
                             };
 
-                            // Create enhanced WebSocket data with convenience methods
+                            // Create simple WebSocket data object
                             const clientInfo: WebSocketData = {
-                                ...baseClientInfo,
-                                
-                                // Convenience methods
-                                getCookie(name: string): string | undefined {
-                                    return this.cookies[name];
-                                },
-                                
-                                getSearchParam(name: string): string | string[] | undefined {
-                                    return this.searchParams[name];
-                                },
-                                
-                                hasAuth(): boolean {
-                                    return !!this.authorization || !!this.searchParams.token || !!this.searchParams.auth;
-                                },
-                                
-                                getAuthType(): 'bearer' | 'basic' | 'custom' | 'none' {
-                                    if (!this.authorization) return 'none';
-                                    if (this.authorization.toLowerCase().startsWith('bearer ')) return 'bearer';
-                                    if (this.authorization.toLowerCase().startsWith('basic ')) return 'basic';
-                                    return 'custom';
-                                },
-                                
-                                getToken(): string | undefined {
-                                    if (this.authorization?.toLowerCase().startsWith('bearer ')) {
-                                        return this.authorization.substring(7);
-                                    }
-                                    return this.searchParams.token as string || this.searchParams.auth as string;
-                                },
-                                
-                                getUsername(): string | undefined {
-                                    return this.searchParams.user as string || this.searchParams.username as string;
-                                },
-                                
-                                getRoom(): string | undefined {
-                                    return this.searchParams.room as string;
-                                },
-                                
-                                getUser(): string | undefined {
-                                    return this.searchParams.user as string;
-                                }
+                                ...baseClientInfo
                             };
                             
                             const success = server.upgrade(req, {