@greendrake/rpc-server 0.1.0 → 0.3.0

package/README.md

@@ -8,7 +8,7 @@ The server half of the [`@greendrake/rpc`](../rpc) wire format: one dispatch tab
 bun add @greendrake/rpc-server
 ```
 
-TypeScript source ships as-is (`src/main.ts` is the entry; no build step, no `.d.ts`). Extend `@greendrake/dev-config/tsconfig/base.json` with `"types": ["bun"]` — base rather than the node config because `@greendrake/rpc`, the client this serves and whose wire types it imports, is the same code a browser runs and needs the DOM lib.
+TypeScript source ships as-is (`src/main.ts` is the entry; no build step, no `.d.ts`). Extend `@greendrake/dev-config/tsconfig/node.json` with `"types": ["bun"]`, and `strict.json` over it if you like: this package checks itself under both, without the DOM lib, so neither it nor `@greendrake/rpc` — the client this serves, whose wire types it imports — asks anything of your options.
 
 ## A service, whole
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@greendrake/rpc-server",
-    "version": "0.1.0",
+    "version": "0.3.0",
     "description": "RPC server over JSON for bun: method dispatch with auth, nonce and Standard Schema argument validation, HTTP and WebSocket transports, connection registry and server push",
     "license": "MIT",
     "author": "Eugene Greendrake <eugene@greendrake.nz>",
@@ -34,11 +34,11 @@
     },
     "prettier": "@greendrake/dev-config/prettier",
     "dependencies": {
-        "@greendrake/rpc": "0.1.0",
+        "@greendrake/rpc": "0.3.0",
         "@standard-schema/spec": "^1.1.0"
     },
     "devDependencies": {
-        "@greendrake/dev-config": "0.1.0",
+        "@greendrake/dev-config": "0.3.0",
         "@types/bun": "^1.3.5",
         "typescript": "6.0.3"
     }

package/src/dispatcher.ts

@@ -20,7 +20,7 @@ export interface Dispatcher {
     // Exposed because the transports resolve credentials of their own — a
     // bearer header, a query parameter at the WebSocket handshake, an in-band
     // auth frame — before there is a request to dispatch.
-    readonly auth?: AuthResolver
+    readonly auth: AuthResolver | undefined
     dispatch(request: IncomingRequest, context: CallContext): Promise<RpcResponse>
 }
 
@@ -41,10 +41,10 @@ export const createDispatcher = (methods: Methods, options: DispatcherOptions =
             }
             // Own properties only: a method named `toString` or `constructor`
             // is not a method this service serves.
-            if (!Object.hasOwn(methods, request.method)) {
+            const def = Object.hasOwn(methods, request.method) ? methods[request.method] : undefined
+            if (def === undefined) {
                 return failure('UNKNOWN_METHOD')
             }
-            const def = methods[request.method]
             if (def.auth !== 'none') {
                 if (context.auth.userId === null) {
                     return failure('AUTH_REQUIRED')

package/src/http.ts

@@ -19,7 +19,7 @@ export const clientIp = <T>(request: Request, server: Server<T>): string => {
     if (forwarded) {
         // The left-most entry is the original client; the rest are the proxies
         // it passed through.
-        return forwarded.split(',')[0].trim()
+        return forwarded.replace(/,.*/, '').trim()
     }
     return request.headers.get('x-real-ip') ?? server.requestIP(request)?.address ?? ''
 }

package/src/types.ts

@@ -97,7 +97,9 @@ export type ClientMethods<M extends Methods> = {
 // response with its request, and the frames the server pushes unasked.
 export interface WsResponse extends RpcResponse {
     type: 'response'
-    id?: string
+    // Undefined answering a frame whose id could not be read — one that did
+    // not parse — and dropped from the wire by JSON, like an absent one.
+    id?: string | undefined
 }
 
 export interface EventFrame {