@elysiajs/eden 0.1.0 → 0.2.0-rc.1

package/README.md

@@ -33,13 +33,13 @@ import type { App } from './server'
 const client = eden<App>('http://localhost:8080')
 
 // return: Hi Elysia (fully type-safe)
-client.index.GET().then(console.log)
+client.index.get().then(console.log)
 
 // return: 1895
-client.id.1895.GET().then(console.log)
+client.id.1895.get().then(console.log)
 
 // return: { id: 1895, name: 'Skadi' }
-client.mirror.POST({
+client.mirror.post({
     id: 1895,
     name: 'Skadi'
 }).then(console.log)

package/dist/index.d.ts

@@ -1,3 +1,15 @@
-import type { Elysia } from 'elysia';
-import { Eden } from './types';
+/// <reference types="bun-types" />
+import type { Elysia, TypedSchema } from 'elysia';
+import type { Eden, EdenWSEvent } from './types';
+export declare class EdenWS<Schema extends TypedSchema<any> = TypedSchema> {
+    ws: WebSocket;
+    url: string;
+    constructor(url: string);
+    send(data: Schema['body'] | Schema['body'][]): this;
+    on<K extends keyof WebSocketEventMap>(type: K, listener: (event: EdenWSEvent<K, Schema['response']>) => void, options?: boolean | AddEventListenerOptions): this;
+    off<K extends keyof WebSocketEventMap>(type: K, listener: (this: WebSocket, ev: WebSocketEventMap[K]) => any, options?: boolean | EventListenerOptions): this;
+    addEventListener<K extends keyof WebSocketEventMap>(type: K, listener: (event: EdenWSEvent<K, Schema['response']>) => void, options?: boolean | AddEventListenerOptions): this;
+    removeEventListener<K extends keyof WebSocketEventMap>(type: K, listener: (this: WebSocket, ev: WebSocketEventMap[K]) => any, options?: boolean | EventListenerOptions): this;
+    close(): this;
+}
 export declare const eden: <App extends Elysia<any>>(domain: string) => Eden<App>;

package/dist/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const g=t=>t.replace(/[A-Z]/g,e=>`-${e.toLowerCase()}`),y=(t,e,r)=>{if(t.endsWith("/")||(t+="/"),e=g(e.replace(/index/g,"")),!r||!Object.keys(r).length)return`${t}${e}`;let n="";for(const[a,o]of Object.entries(r))n+=`${a}=${o}&`;return`${t}${e}?${n.slice(0,-1)}`},u=(t,e="")=>new Proxy(()=>{},{get(r,n,a){return u(t,`${e}/${n.toString()}`)},apply(r,n,[{$query:a,$fetch:o,...c}={$fetch:void 0,$query:void 0}]=[{}]){const l=e.lastIndexOf("/");return fetch(y(t,e.slice(0,l),a),{method:e.slice(l+1),headers:{"content-type":"application/json",...o==null?void 0:o.headers},body:Object.keys(c).length?JSON.stringify(c):void 0,...o}).then(async s=>{if(s.status>=300)throw new Error(await s.text());if(s.headers.get("content-type")==="application/json")return s.json();const i=await s.text();return Number.isNaN(+i)?i==="true"?!0:i==="false"?!1:i:+i})}}),f=t=>new Proxy({},{get(e,r,n){return u(t,r)}});exports.eden=f;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});class g{constructor(e){this.ws=new WebSocket(e),this.url=e}send(e){return Array.isArray(e)?(e.forEach(t=>this.send(t)),this):(this.ws.send(typeof e=="object"?JSON.stringify(e):e.toString()),this)}on(e,t,s){return this.addEventListener(e,t,s)}off(e,t,s){return this.ws.removeEventListener(e,t,s),this}addEventListener(e,t,s){return this.ws.addEventListener(e,i=>{if(e==="message"){let r=i.data.toString();const l=r.charCodeAt(0);if(l===47||l===123)try{r=JSON.parse(r)}catch{}else Number.isNaN(+r)?r==="true"?r=!0:r==="fase"&&(r=!1):r=+r;t({...i,data:r})}else t(i)},s),this}removeEventListener(e,t,s){return this.off(e,t,s),this}close(){return this.ws.close(),this}}const y=n=>n.replace(/[A-Z]/g,e=>`-${e.toLowerCase()}`),w=(n,e,t)=>{if(n.endsWith("/")||(n+="/"),e=y(e.replace(/index/g,"")),!t||!Object.keys(t).length)return`${n}${e}`;let s="";for(const[i,r]of Object.entries(t))s+=`${i}=${r}&`;return`${n}${e}?${s.slice(0,-1)}`},v=(n,e="")=>new Proxy(()=>{},{get(t,s,i){return v(n,`${e}/${s.toString()}`)},apply(t,s,[{$query:i,$fetch:r,$body:l,...u}={$fetch:void 0,$query:void 0,$body:void 0}]=[{}]){const f=e.lastIndexOf("/"),h=e.slice(f+1),d=w(n,e.slice(0,f),i);if(h==="subscribe")return new g(d.replace(/^([^]+):\/\//,"ws://"));const o=l??(Object.keys(u).length?u:void 0);return fetch(d,{method:h,body:JSON.stringify(o),headers:o?{"content-type":typeof u=="object"?"application/json":"text/plain","content-length":o==null?void 0:o.length,...r==null?void 0:r.headers}:void 0,...r}).then(async c=>{if(c.status>=300)throw new Error(await c.text());if(c.headers.get("content-type")==="application/json")return c.json();const a=await c.text();return Number.isNaN(+a)?a==="true"?!0:a==="false"?!1:a:+a})}}),S=n=>new Proxy({},{get(e,t,s){return v(n,t)}});exports.EdenWS=g;exports.eden=S;

package/dist/index.mjs

@@ -1,47 +1,99 @@
-const g = (t) => t.replace(/[A-Z]/g, (e) => `-${e.toLowerCase()}`), f = (t, e, r) => {
-  if (t.endsWith("/") || (t += "/"), e = g(e.replace(/index/g, "")), !r || !Object.keys(r).length)
-    return `${t}${e}`;
-  let n = "";
-  for (const [a, o] of Object.entries(r))
-    n += `${a}=${o}&`;
-  return `${t}${e}?${n.slice(0, -1)}`;
-}, u = (t, e = "") => new Proxy(() => {
+class v {
+  constructor(e) {
+    this.ws = new WebSocket(e), this.url = e;
+  }
+  send(e) {
+    return Array.isArray(e) ? (e.forEach((t) => this.send(t)), this) : (this.ws.send(
+      typeof e == "object" ? JSON.stringify(e) : e.toString()
+    ), this);
+  }
+  on(e, t, s) {
+    return this.addEventListener(e, t, s);
+  }
+  off(e, t, s) {
+    return this.ws.removeEventListener(e, t, s), this;
+  }
+  addEventListener(e, t, s) {
+    return this.ws.addEventListener(
+      e,
+      (i) => {
+        if (e === "message") {
+          let r = i.data.toString();
+          const l = r.charCodeAt(0);
+          if (l === 47 || l === 123)
+            try {
+              r = JSON.parse(r);
+            } catch {
+            }
+          else
+            Number.isNaN(+r) ? r === "true" ? r = !0 : r === "fase" && (r = !1) : r = +r;
+          t({
+            ...i,
+            data: r
+          });
+        } else
+          t(i);
+      },
+      s
+    ), this;
+  }
+  removeEventListener(e, t, s) {
+    return this.off(e, t, s), this;
+  }
+  close() {
+    return this.ws.close(), this;
+  }
+}
+const y = (n) => n.replace(/[A-Z]/g, (e) => `-${e.toLowerCase()}`), w = (n, e, t) => {
+  if (n.endsWith("/") || (n += "/"), e = y(e.replace(/index/g, "")), !t || !Object.keys(t).length)
+    return `${n}${e}`;
+  let s = "";
+  for (const [i, r] of Object.entries(t))
+    s += `${i}=${r}&`;
+  return `${n}${e}?${s.slice(0, -1)}`;
+}, d = (n, e = "") => new Proxy(() => {
 }, {
-  get(r, n, a) {
-    return u(t, `${e}/${n.toString()}`);
+  get(t, s, i) {
+    return d(n, `${e}/${s.toString()}`);
   },
-  apply(r, n, [
-    { $query: a, $fetch: o, ...c } = {
+  apply(t, s, [
+    { $query: i, $fetch: r, $body: l, ...u } = {
       $fetch: void 0,
-      $query: void 0
+      $query: void 0,
+      $body: void 0
     }
   ] = [{}]) {
-    const l = e.lastIndexOf("/");
-    return fetch(f(t, e.slice(0, l), a), {
-      method: e.slice(l + 1),
-      headers: {
-        "content-type": "application/json",
-        ...o == null ? void 0 : o.headers
-      },
-      body: Object.keys(c).length ? JSON.stringify(c) : void 0,
-      ...o
-    }).then(async (s) => {
-      if (s.status >= 300)
-        throw new Error(await s.text());
-      if (s.headers.get("content-type") === "application/json")
-        return s.json();
-      const i = await s.text();
-      return Number.isNaN(+i) ? i === "true" ? !0 : i === "false" ? !1 : i : +i;
+    const f = e.lastIndexOf("/"), h = e.slice(f + 1), g = w(n, e.slice(0, f), i);
+    if (h === "subscribe")
+      return new v(g.replace(/^([^]+):\/\//, "ws://"));
+    const o = l ?? (Object.keys(u).length ? u : void 0);
+    return fetch(g, {
+      method: h,
+      body: JSON.stringify(o),
+      headers: o ? {
+        "content-type": typeof u == "object" ? "application/json" : "text/plain",
+        "content-length": o == null ? void 0 : o.length,
+        ...r == null ? void 0 : r.headers
+      } : void 0,
+      ...r
+    }).then(async (c) => {
+      if (c.status >= 300)
+        throw new Error(await c.text());
+      if (c.headers.get("content-type") === "application/json")
+        return c.json();
+      const a = await c.text();
+      return Number.isNaN(+a) ? a === "true" ? !0 : a === "false" ? !1 : a : +a;
     });
   }
-}), y = (t) => new Proxy(
+}), p = (n) => new Proxy(
   {},
   {
-    get(e, r, n) {
-      return u(t, r);
+    get(e, t, s) {
+      return d(n, t);
     }
   }
 );
 export {
-  y as eden
+  v as EdenWS,
+  p as eden
 };

package/dist/index.umd.js

@@ -1 +1 @@
-(function(r,s){typeof exports=="object"&&typeof module<"u"?s(exports):typeof define=="function"&&define.amd?define(["exports"],s):(r=typeof globalThis<"u"?globalThis:r||self,s(r["@elysia/eden"]={}))})(this,function(r){"use strict";const s=t=>t.replace(/[A-Z]/g,e=>`-${e.toLowerCase()}`),y=(t,e,n)=>{if(t.endsWith("/")||(t+="/"),e=s(e.replace(/index/g,"")),!n||!Object.keys(n).length)return`${t}${e}`;let o="";for(const[c,i]of Object.entries(n))o+=`${c}=${i}&`;return`${t}${e}?${o.slice(0,-1)}`},a=(t,e="")=>new Proxy(()=>{},{get(n,o,c){return a(t,`${e}/${o.toString()}`)},apply(n,o,[{$query:c,$fetch:i,...f}={$fetch:void 0,$query:void 0}]=[{}]){const d=e.lastIndexOf("/");return fetch(y(t,e.slice(0,d),c),{method:e.slice(d+1),headers:{"content-type":"application/json",...i==null?void 0:i.headers},body:Object.keys(f).length?JSON.stringify(f):void 0,...i}).then(async u=>{if(u.status>=300)throw new Error(await u.text());if(u.headers.get("content-type")==="application/json")return u.json();const l=await u.text();return Number.isNaN(+l)?l==="true"?!0:l==="false"?!1:l:+l})}}),g=t=>new Proxy({},{get(e,n,o){return a(t,n)}});r.eden=g,Object.defineProperty(r,Symbol.toStringTag,{value:"Module"})});
+(function(o,c){typeof exports=="object"&&typeof module<"u"?c(exports):typeof define=="function"&&define.amd?define(["exports"],c):(o=typeof globalThis<"u"?globalThis:o||self,c(o["@elysia/eden"]={}))})(this,function(o){"use strict";class c{constructor(e){this.ws=new WebSocket(e),this.url=e}send(e){return Array.isArray(e)?(e.forEach(t=>this.send(t)),this):(this.ws.send(typeof e=="object"?JSON.stringify(e):e.toString()),this)}on(e,t,r){return this.addEventListener(e,t,r)}off(e,t,r){return this.ws.removeEventListener(e,t,r),this}addEventListener(e,t,r){return this.ws.addEventListener(e,i=>{if(e==="message"){let n=i.data.toString();const a=n.charCodeAt(0);if(a===47||a===123)try{n=JSON.parse(n)}catch{}else Number.isNaN(+n)?n==="true"?n=!0:n==="fase"&&(n=!1):n=+n;t({...i,data:n})}else t(i)},r),this}removeEventListener(e,t,r){return this.off(e,t,r),this}close(){return this.ws.close(),this}}const p=s=>s.replace(/[A-Z]/g,e=>`-${e.toLowerCase()}`),w=(s,e,t)=>{if(s.endsWith("/")||(s+="/"),e=p(e.replace(/index/g,"")),!t||!Object.keys(t).length)return`${s}${e}`;let r="";for(const[i,n]of Object.entries(t))r+=`${i}=${n}&`;return`${s}${e}?${r.slice(0,-1)}`},h=(s,e="")=>new Proxy(()=>{},{get(t,r,i){return h(s,`${e}/${r.toString()}`)},apply(t,r,[{$query:i,$fetch:n,$body:a,...d}={$fetch:void 0,$query:void 0,$body:void 0}]=[{}]){const g=e.lastIndexOf("/"),y=e.slice(g+1),v=w(s,e.slice(0,g),i);if(y==="subscribe")return new c(v.replace(/^([^]+):\/\//,"ws://"));const u=a??(Object.keys(d).length?d:void 0);return fetch(v,{method:y,body:JSON.stringify(u),headers:u?{"content-type":typeof d=="object"?"application/json":"text/plain","content-length":u==null?void 0:u.length,...n==null?void 0:n.headers}:void 0,...n}).then(async f=>{if(f.status>=300)throw new Error(await f.text());if(f.headers.get("content-type")==="application/json")return f.json();const l=await f.text();return Number.isNaN(+l)?l==="true"?!0:l==="false"?!1:l:+l})}}),S=s=>new Proxy({},{get(e,t,r){return h(s,t)}});o.EdenWS=c,o.eden=S,Object.defineProperty(o,Symbol.toStringTag,{value:"Module"})});

package/dist/types.d.ts

@@ -1,5 +1,7 @@
 /// <reference types="bun-types" />
 import type { Elysia, SCHEMA, TypedRoute } from 'elysia';
+import type { IsPathParameter } from 'elysia/dist/types';
+import type { EdenWS } from '.';
 export declare type Eden<App extends Elysia<any>> = App['store'] extends {
     [key in typeof SCHEMA]: any;
 } ? UnionToIntersection<CreateEden<App['store'][typeof SCHEMA]>> : never;
@@ -9,21 +11,42 @@ export interface EdenCall {
     $query?: Record<string, string | boolean | number>;
 }
 export declare type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
-declare type TypedRouteToParams<Route extends TypedRoute> = (Route['body'] extends NonNullable<Route['body']> ? Route['body'] : {}) & (Route['query'] extends NonNullable<Route['query']> ? {
+declare type TypedRouteToParams<Route extends TypedRoute> = (Route['body'] extends NonNullable<Route['body']> ? Route['body'] extends Record<any, any> ? Route['body'] : {
+    $body: Route['body'];
+} : {}) & (Route['query'] extends NonNullable<Route['query']> ? unknown extends Route['query'] ? {} : {
     $query: Route['query'];
 } : {});
-export declare type CreateEden<Server extends Record<string, Record<string, TypedRoute>>, Path extends string = keyof Server, Full extends string = ''> = Path extends `/${infer Start}` ? CreateEden<Server, Start, Path> : Path extends `${infer A}/${infer B}` ? {
+export declare type CreateEden<Server extends Record<string, Record<string, TypedRoute>>, Path extends string = keyof Server, Full extends string = ''> = Path extends `/${infer Start}` ? CreateEden<Server, Start, Path> : Path extends `${infer A}/${infer B}` ? IsPathParameter<A> extends never ? {
     [key in A]: CreateEden<Server, B, Full>;
+} : {
+    [x: string]: CreateEden<Server, B, Full>;
 } : {
     [key in Path extends '' ? 'index' : Path extends `:${infer params}` ? string : Path | CamelCase<Path>]: Full extends keyof Server ? {
-        [key in keyof Server[Full]]: keyof TypedRouteToParams<Server[Full][key]> extends never ? (params?: {
+        [key in keyof Server[Full] extends string ? Lowercase<keyof Server[Full]> : keyof Server[Full]]: keyof TypedRouteToParams<Server[Full][key extends string ? Uppercase<key> : key]> extends never ? key extends 'subscribe' ? unknown extends NonNullable<Server[Full][key]['query']> ? (params?: {
+            $query?: EdenCall['$query'];
+        }) => EdenWS<Server[Full][key]> : Server[Full][key]['query'] extends NonNullable<Server[Full][key]['query']> ? (params: {
+            $query: Server[Full][key]['query'];
+        }) => EdenWS<Server[Full][key]> : (params?: {
+            $query?: EdenCall['$query'];
+        }) => EdenWS<Server[Full][key]> : (params?: {
             $query?: EdenCall['$query'];
             $fetch?: EdenCall['$fetch'];
-        }) => Promise<Server[Full][key]['response']> : (params: TypedRouteToParams<Server[Full][key]> & {
+        }) => Promise<Server[Full][key]['response']> : key extends 'subscribe' ? unknown extends NonNullable<Server[Full][key]['query']> ? (params?: {
+            $query?: EdenCall['$query'];
+        }) => EdenWS<Server[Full][key]> : Server[Full][key]['query'] extends NonNullable<Server[Full][key]['query']> ? (params: {
+            $query: Server[Full][key]['query'];
+        }) => EdenWS<Server[Full][key]> : (params?: {
+            $query?: EdenCall['$query'];
+        }) => EdenWS<Server[Full][key]> : (params: TypedRouteToParams<Server[Full][key extends string ? Uppercase<key> : key]> & {
             $query?: EdenCall['$query'];
             $fetch?: EdenCall['$fetch'];
-        }) => Promise<Server[Full][key]['response']>;
+        }) => Promise<Server[Full][key extends string ? Uppercase<key> : key]['response']>;
     } : never;
 };
 declare type CamelCase<S extends string> = S extends `${infer P1}-${infer P2}${infer P3}` ? `${Lowercase<P1>}${Uppercase<P2>}${CamelCase<P3>}` : Lowercase<S>;
+export interface EdenWSOnMessage<Data = unknown> extends MessageEvent {
+    data: Data;
+    rawData: MessageEvent['data'];
+}
+export declare type EdenWSEvent<K extends keyof WebSocketEventMap, Data = unknown> = K extends 'message' ? EdenWSOnMessage<Data> : WebSocketEventMap[K];
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elysiajs/eden",
-  "version": "0.1.0",
+  "version": "0.2.0-rc.1",
   "description": "Fully type-safe Elysia client",
   "author": {
     "name": "saltyAom",
@@ -33,15 +33,15 @@
     "build": "vite build",
     "release": "npm run build && npm run test && npm publish --access public"
   },
-  "peerDependencies": {
-    "elysia": ">= 0.1.0-rc.5"
+  "dependencies": {
+    "elysia": "^0.1.2"
   },
   "devDependencies": {
-    "@elysiajs/cors": "^0.1.0-rc.3",
+    "@elysiajs/cors": "^0.1.0",
+    "@elysiajs/websocket": "^0.2.1",
     "@sinclair/typebox": "^0.25.13",
     "@types/node": "^18.11.7",
     "bun-types": "^0.3.0",
-    "elysia": "^0.1.0-rc.8",
     "eslint": "^8.26.0",
     "rimraf": "^3.0.2",
     "typescript": "^4.8.4",

package/src/index.ts

@@ -1,7 +1,106 @@
-import type { Elysia } from 'elysia'
-import type { HTTPMethod } from 'elysia'
+import type { Elysia, TypedSchema, HTTPMethod } from 'elysia'
 
-import { CreateEden, Eden, EdenCall, UnionToIntersection } from './types'
+import type {
+    CreateEden,
+    Eden,
+    EdenCall,
+    EdenWSEvent,
+    UnionToIntersection
+} from './types'
+
+export class EdenWS<Schema extends TypedSchema<any> = TypedSchema> {
+    ws: WebSocket
+    url: string
+
+    constructor(url: string) {
+        this.ws = new WebSocket(url)
+        this.url = url
+    }
+
+    send(data: Schema['body'] | Schema['body'][]) {
+        if (Array.isArray(data)) {
+            data.forEach((datum) => this.send(datum))
+
+            return this
+        }
+
+        this.ws.send(
+            typeof data === 'object' ? JSON.stringify(data) : data.toString()
+        )
+
+        return this
+    }
+
+    on<K extends keyof WebSocketEventMap>(
+        type: K,
+        listener: (event: EdenWSEvent<K, Schema['response']>) => void,
+        options?: boolean | AddEventListenerOptions
+    ) {
+        return this.addEventListener(type, listener, options)
+    }
+
+    off<K extends keyof WebSocketEventMap>(
+        type: K,
+        listener: (this: WebSocket, ev: WebSocketEventMap[K]) => any,
+        options?: boolean | EventListenerOptions
+    ) {
+        this.ws.removeEventListener(type, listener, options)
+
+        return this
+    }
+
+    addEventListener<K extends keyof WebSocketEventMap>(
+        type: K,
+        listener: (event: EdenWSEvent<K, Schema['response']>) => void,
+        options?: boolean | AddEventListenerOptions
+    ) {
+        this.ws.addEventListener(
+            type,
+            (ws) => {
+                if (type === 'message') {
+                    let data = (ws as MessageEvent).data.toString() as any
+                    const start = data.charCodeAt(0)
+
+                    if (start === 47 || start === 123)
+                        try {
+                            data = JSON.parse(data)
+                        } catch {}
+                    else if (!Number.isNaN(+data)) data = +data
+                    else if (data === 'true') data = true
+                    else if (data === 'fase') data = false
+
+                    // @ts-ignore
+                    listener({
+                        ...ws,
+                        data
+                    })
+                } else {
+                    // @ts-ignore
+                    listener(ws)
+                }
+            },
+            options
+        )
+
+        return this
+    }
+
+    removeEventListener<K extends keyof WebSocketEventMap>(
+        type: K,
+        listener: (this: WebSocket, ev: WebSocketEventMap[K]) => any,
+        options?: boolean | EventListenerOptions
+    ) {
+        this.off(type, listener, options)
+
+        return this
+    }
+
+    close() {
+        this.ws.close()
+
+        return this
+    }
+}
 
 const camelToDash = (str: string) =>
     str.replace(/[A-Z]/g, (letter) => `-${letter.toLowerCase()}`)
@@ -34,22 +133,35 @@ const createProxy = (
             target,
             _,
             [
-                { $query, $fetch, ...body } = {
+                { $query, $fetch, $body, ...bodyObj } = {
                     $fetch: undefined,
-                    $query: undefined
+                    $query: undefined,
+                    $body: undefined
                 }
             ]: EdenCall[] = [{}]
         ) {
-            const i = path.lastIndexOf('/')
-
-            return fetch(composePath(domain, path.slice(0, i), $query), {
-                method: path.slice(i + 1),
-                headers: {
-                    'content-type': 'application/json',
-                    ...$fetch?.['headers']
-                },
-                body: Object.keys(body).length
-                    ? JSON.stringify(body)
+            const i = path.lastIndexOf('/'),
+                method = path.slice(i + 1),
+                url = composePath(domain, path.slice(0, i), $query)
+
+            if (method === 'subscribe')
+                return new EdenWS(url.replace(/^([^]+):\/\//, 'ws://'))
+
+            const body =
+                $body ?? (Object.keys(bodyObj).length ? bodyObj : undefined)
+
+            return fetch(url, {
+                method,
+                body: JSON.stringify(body),
+                headers: body
+                    ? {
+                          'content-type':
+                              typeof bodyObj === 'object'
+                                  ? 'application/json'
+                                  : 'text/plain',
+                          'content-length': body?.length,
+                          ...$fetch?.['headers']
+                      }
                     : undefined,
                 ...$fetch
             }).then(async (res) => {

package/src/types.ts

@@ -1,4 +1,8 @@
 import type { Elysia, SCHEMA, TypedRoute } from 'elysia'
+import type { IsPathParameter } from 'elysia/dist/types'
+import { TObject } from '@sinclair/typebox'
+
+import type { EdenWS } from '.'
 
 export type Eden<App extends Elysia<any>> = App['store'] extends {
     [key in typeof SCHEMA]: any
@@ -6,7 +10,6 @@ export type Eden<App extends Elysia<any>> = App['store'] extends {
     ? UnionToIntersection<CreateEden<App['store'][typeof SCHEMA]>>
     : never
 
-
 export interface EdenCall {
     [x: string]: any
     $fetch?: RequestInit
@@ -20,11 +23,19 @@ export type UnionToIntersection<U> = (
     : never
 
 type TypedRouteToParams<Route extends TypedRoute> =
-    (Route['body'] extends NonNullable<Route['body']> ? Route['body'] : {}) &
-        (Route['query'] extends NonNullable<Route['query']>
-            ? {
-                  $query: Route['query']
+    (Route['body'] extends NonNullable<Route['body']>
+        ? Route['body'] extends Record<any, any>
+            ? Route['body']
+            : {
+                  $body: Route['body']
               }
+        : {}) &
+        (Route['query'] extends NonNullable<Route['query']>
+            ? unknown extends Route['query']
+                ? {}
+                : {
+                      $query: Route['query']
+                  }
             : {})
 
 export type CreateEden<
@@ -35,9 +46,13 @@ export type CreateEden<
 > = Path extends `/${infer Start}`
     ? CreateEden<Server, Start, Path>
     : Path extends `${infer A}/${infer B}`
-    ? {
-          [key in A]: CreateEden<Server, B, Full>
-      }
+    ? IsPathParameter<A> extends never
+        ? {
+              [key in A]: CreateEden<Server, B, Full>
+          }
+        : {
+              [x: string]: CreateEden<Server, B, Full>
+          }
     : {
           [key in Path extends ''
               ? 'index'
@@ -45,19 +60,61 @@ export type CreateEden<
               ? string
               : Path | CamelCase<Path>]: Full extends keyof Server
               ? {
-                    [key in keyof Server[Full]]: keyof TypedRouteToParams<
-                        Server[Full][key]
+                    [key in keyof Server[Full] extends string
+                        ? Lowercase<keyof Server[Full]>
+                        : keyof Server[Full]]: keyof TypedRouteToParams<
+                        Server[Full][key extends string ? Uppercase<key> : key]
                     > extends never
-                        ? (params?: {
-                              $query?: EdenCall['$query']
-                              $fetch?: EdenCall['$fetch']
-                          }) => Promise<Server[Full][key]['response']>
+                        ? key extends 'subscribe'
+                            ? unknown extends NonNullable<
+                                  Server[Full][key]['query']
+                              >
+                                ? (params?: {
+                                      $query?: EdenCall['$query']
+                                  }) => EdenWS<Server[Full][key]>
+                                : Server[Full][key]['query'] extends NonNullable<
+                                      Server[Full][key]['query']
+                                  >
+                                ? (params: {
+                                      $query: Server[Full][key]['query']
+                                  }) => EdenWS<Server[Full][key]>
+                                : (params?: {
+                                      $query?: EdenCall['$query']
+                                  }) => EdenWS<Server[Full][key]>
+                            : (params?: {
+                                  $query?: EdenCall['$query']
+                                  $fetch?: EdenCall['$fetch']
+                              }) => Promise<Server[Full][key]['response']>
+                        : key extends 'subscribe'
+                        ? unknown extends NonNullable<
+                              Server[Full][key]['query']
+                          >
+                            ? (params?: {
+                                  $query?: EdenCall['$query']
+                              }) => EdenWS<Server[Full][key]>
+                            : Server[Full][key]['query'] extends NonNullable<
+                                  Server[Full][key]['query']
+                              >
+                            ? (params: {
+                                  $query: Server[Full][key]['query']
+                              }) => EdenWS<Server[Full][key]>
+                            : (params?: {
+                                  $query?: EdenCall['$query']
+                              }) => EdenWS<Server[Full][key]>
                         : (
-                              params: TypedRouteToParams<Server[Full][key]> & {
+                              params: TypedRouteToParams<
+                                  Server[Full][key extends string
+                                      ? Uppercase<key>
+                                      : key]
+                              > & {
                                   $query?: EdenCall['$query']
                                   $fetch?: EdenCall['$fetch']
                               }
-                          ) => Promise<Server[Full][key]['response']>
+                          ) => Promise<
+                              Server[Full][key extends string
+                                  ? Uppercase<key>
+                                  : key]['response']
+                          >
                 }
               : never
       }
@@ -68,4 +125,12 @@ type CamelCase<S extends string> =
         ? `${Lowercase<P1>}${Uppercase<P2>}${CamelCase<P3>}`
         : Lowercase<S>
 
-type A = CamelCase<'sign-in'>
+export interface EdenWSOnMessage<Data = unknown> extends MessageEvent {
+    data: Data
+    rawData: MessageEvent['data']
+}
+
+export type EdenWSEvent<
+    K extends keyof WebSocketEventMap,
+    Data = unknown
+> = K extends 'message' ? EdenWSOnMessage<Data> : WebSocketEventMap[K]