spiceflow 1.12.2 → 1.13.0

package/dist/waitUntil.test.js

@@ -0,0 +1,142 @@
+import { describe, test, expect, vi } from 'vitest';
+import { Spiceflow } from "./spiceflow.js";
+describe('waitUntil', () => {
+    test('waitUntil is available in handler context', async () => {
+        let waitUntilCalled = false;
+        let waitUntilPromise = null;
+        const mockWaitUntil = vi.fn((promise) => {
+            waitUntilCalled = true;
+            waitUntilPromise = promise;
+        });
+        const app = new Spiceflow({
+            waitUntil: mockWaitUntil
+        }).route({
+            method: 'GET',
+            path: '/test',
+            handler({ waitUntil }) {
+                expect(typeof waitUntil).toBe('function');
+                const backgroundTask = Promise.resolve('background work done');
+                waitUntil(backgroundTask);
+                return { success: true };
+            }
+        });
+        const response = await app.handle(new Request('http://localhost/test'));
+        const data = await response.json();
+        expect(data).toEqual({ success: true });
+        expect(waitUntilCalled).toBe(true);
+        expect(mockWaitUntil).toHaveBeenCalledTimes(1);
+        expect(waitUntilPromise).toBeInstanceOf(Promise);
+    });
+    test('waitUntil defaults to noop when not provided', async () => {
+        const app = new Spiceflow().route({
+            method: 'GET',
+            path: '/test',
+            handler({ waitUntil }) {
+                expect(typeof waitUntil).toBe('function');
+                // Should not throw when called
+                waitUntil(Promise.resolve('test'));
+                return { success: true };
+            }
+        });
+        const response = await app.handle(new Request('http://localhost/test'));
+        const data = await response.json();
+        expect(data).toEqual({ success: true });
+    });
+    test('waitUntil can be called multiple times', async () => {
+        const mockWaitUntil = vi.fn();
+        const app = new Spiceflow({
+            waitUntil: mockWaitUntil
+        }).route({
+            method: 'POST',
+            path: '/multi',
+            handler({ waitUntil }) {
+                waitUntil(Promise.resolve('task 1'));
+                waitUntil(Promise.resolve('task 2'));
+                waitUntil(Promise.resolve('task 3'));
+                return { taskCount: 3 };
+            }
+        });
+        const response = await app.handle(new Request('http://localhost/multi', {
+            method: 'POST'
+        }));
+        const data = await response.json();
+        expect(data).toEqual({ taskCount: 3 });
+        expect(mockWaitUntil).toHaveBeenCalledTimes(3);
+    });
+    test('waitUntil works with middleware context', async () => {
+        const mockWaitUntil = vi.fn();
+        const app = new Spiceflow({
+            waitUntil: mockWaitUntil
+        })
+            .use(({ waitUntil }, next) => {
+            expect(typeof waitUntil).toBe('function');
+            waitUntil(Promise.resolve('middleware task'));
+            return next();
+        })
+            .route({
+            method: 'GET',
+            path: '/middleware',
+            handler({ waitUntil }) {
+                waitUntil(Promise.resolve('handler task'));
+                return { success: true };
+            }
+        });
+        const response = await app.handle(new Request('http://localhost/middleware'));
+        const data = await response.json();
+        expect(data).toEqual({ success: true });
+        expect(mockWaitUntil).toHaveBeenCalledTimes(2);
+    });
+    test('waitUntil uses global waitUntil when available', async () => {
+        // Mock global waitUntil
+        const originalGlobal = globalThis;
+        const mockGlobalWaitUntil = vi.fn();
+        originalGlobal.waitUntil = mockGlobalWaitUntil;
+        try {
+            const app = new Spiceflow().route({
+                method: 'GET',
+                path: '/global',
+                handler({ waitUntil }) {
+                    waitUntil(Promise.resolve('using global'));
+                    return { usingGlobal: true };
+                }
+            });
+            const response = await app.handle(new Request('http://localhost/global'));
+            const data = await response.json();
+            expect(data).toEqual({ usingGlobal: true });
+            expect(mockGlobalWaitUntil).toHaveBeenCalledTimes(1);
+        }
+        finally {
+            // Clean up
+            delete originalGlobal.waitUntil;
+        }
+    });
+    test('custom waitUntil overrides global waitUntil', async () => {
+        // Mock global waitUntil
+        const originalGlobal = globalThis;
+        const mockGlobalWaitUntil = vi.fn();
+        const mockCustomWaitUntil = vi.fn();
+        originalGlobal.waitUntil = mockGlobalWaitUntil;
+        try {
+            const app = new Spiceflow({
+                waitUntil: mockCustomWaitUntil
+            }).route({
+                method: 'GET',
+                path: '/custom',
+                handler({ waitUntil }) {
+                    waitUntil(Promise.resolve('using custom'));
+                    return { usingCustom: true };
+                }
+            });
+            const response = await app.handle(new Request('http://localhost/custom'));
+            const data = await response.json();
+            expect(data).toEqual({ usingCustom: true });
+            expect(mockCustomWaitUntil).toHaveBeenCalledTimes(1);
+            expect(mockGlobalWaitUntil).not.toHaveBeenCalled();
+        }
+        finally {
+            // Clean up
+            delete originalGlobal.waitUntil;
+        }
+    });
+});
+//# sourceMappingURL=waitUntil.test.js.map

package/dist/waitUntil.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"waitUntil.test.js","sourceRoot":"","sources":["../src/waitUntil.test.ts"],"names":[],"mappings":"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"}

package/dist/zod.test.js

@@ -58,3 +58,4 @@ test('body is parsed as json', async () => {
     expect(res.status).toBe(200);
     expect(await res.json()).toEqual({ name: 'John', nameEcho: 'John' });
 });
+//# sourceMappingURL=zod.test.js.map

package/dist/zod.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"zod.test.js","sourceRoot":"","sources":["../src/zod.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AACrC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAA;AAEhC,IAAI,CAAC,wBAAwB,EAAE,KAAK,IAAI,EAAE;IACxC,IAAI,IAAI,GAAG,EAAE,CAAA;IACb,MAAM,GAAG,GAAG,MAAM,IAAI,SAAS,EAAE;SAC9B,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;SAEf,IAAI,CACH,OAAO,EACP,KAAK,EAAE,CAAC,EAAE,EAAE;QACV,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,CAAA;QACnC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;QAChB,mBAAmB;QACnB,IAAI,CAAC,gBAAgB,CAAA;QACrB,OAAO;YACL,IAAI;YACJ,QAAQ,EAAE,IAAI,CAAC,IAAI;YACnB,UAAU;SACX,CAAA;IACH,CAAC,EACD;QACE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;YACb,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;SACjB,CAAC;QACF,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC;YACjB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;YAChB,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;SACrB,CAAC;KACH,CACF;SACA,IAAI,CACH,QAAQ,EACR,KAAK,EAAE,CAAC,EAAE,EAAE;QACV,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,CAAA;QACnC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;QAChB,mBAAmB;QACnB,IAAI,CAAC,gBAAgB,CAAA;QACrB,OAAO;YACL,IAAI;YACJ,QAAQ,EAAE,IAAI,CAAC,IAAI;SACpB,CAAA;IACH,CAAC,EACD;QACE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;YACb,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;SACjB,CAAC;QACF,QAAQ,EAAE;YACR,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC;gBACZ,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;gBAChB,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;aACrB,CAAC;YACF,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC;gBACZ,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE;aACzB,CAAC;SACH;KACF,CACF;SACA,MAAM,CACL,GAAG,CAAC,OAAO,EAAE;QACX,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;SACnC;QACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;KACvC,CAAC,CACH,CAAA;IACH,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC5B,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAA;AACtE,CAAC,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spiceflow",
-  "version": "1.12.2",
+  "version": "1.13.0",
   "description": "Simple API framework with RPC and type safety",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -70,14 +70,15 @@
     }
   },
   "devDependencies": {
-    "@modelcontextprotocol/sdk": "^1.12.1",
+    "@modelcontextprotocol/sdk": "^1.12.3",
+    "ai": "^4.3.16",
     "eventsource": "^3.0.5",
     "formdata-node": "^6.0.3",
     "js-base64": "^3.7.7",
     "js-yaml": "^4.1.0"
   },
   "scripts": {
-    "build": "cp ../README.md ./README.md && rm -rf dist && tsc",
+    "build": "cp ../README.md ./README.md && rm -rf dist && pnpm tsc",
     "gen-openapi": "pnpm tsx scripts/openapi-fern.ts",
     "docs:dev": "pnpm run gen-openapi && fern docs dev",
     "docs:prod": "pnpm run gen-openapi && fern generate --docs --force",

package/src/_node-server.ts

@@ -6,7 +6,6 @@ import {
 } from 'node:http'
 import { AddressInfo } from 'node:net'
 import { AnySpiceflow, type Spiceflow, SpiceflowRequest } from './spiceflow.ts'
-import { superjsonSerialize } from './serialize.ts'
 
 export async function listenForNode(
   app: AnySpiceflow,
@@ -110,6 +109,6 @@ export async function handleForNode(
   } catch (error) {
     console.error('Error handling request:', error)
     res.statusCode = 500
-    res.end(superjsonSerialize({ message: 'Internal Server Error' }))
+    res.end(JSON.stringify({ message: 'Internal Server Error' }))
   }
 }

package/src/client/index.ts

@@ -113,7 +113,7 @@ const processHeaders = (
 }
 
 interface SSEEvent {
-  event: string
+  event?: string
   data: any
   id?: string
 }
@@ -146,6 +146,7 @@ export class TextDecoderStream extends TransformStream<Uint8Array, string> {
 
 export async function* streamSSEResponse(
   response: Response,
+  map: (x: SSEEvent) => any,
 ): AsyncGenerator<SSEEvent> {
   const body = response.body
   if (!body) return
@@ -162,7 +163,7 @@ export async function* streamSSEResponse(
       throw new SpiceflowFetchError(500, superjsonDeserialize(event.data))
     }
     if (event) {
-      yield tryParsingSSEJson(event.data)
+      yield map({ ...event, data: event.data })
     }
   }
 }
@@ -171,7 +172,7 @@ function tryParsingSSEJson(data: string): any {
   try {
     return superjsonDeserialize(JSON.parse(data))
   } catch (error) {
-    return null
+    return data
   }
 }
 
@@ -405,7 +406,10 @@ const createProxy = (
 
           switch (response.headers.get('Content-Type')?.split(';')[0]) {
             case 'text/event-stream':
-              data = streamSSEResponse(response)
+              data = streamSSEResponse(response, (x) => {
+                return tryParsingSSEJson(x.data)
+              })
+
               break
 
             case 'application/json':
@@ -463,9 +467,7 @@ const createProxy = (
   }) as any
 }
 
-export const createSpiceflowClient = <
-  const App extends AnySpiceflow,
->(
+export const createSpiceflowClient = <const App extends AnySpiceflow>(
   domain: App | string,
   config?: SpiceflowClient.Config &
     (App extends Spiceflow<any, any, infer Singleton, any, any, any, any>

package/src/context.ts

@@ -13,7 +13,7 @@ import type {
   GetRequestSchema,
 } from './types.ts'
 
-import { SpiceflowRequest } from './spiceflow.ts'
+import { SpiceflowRequest, WaitUntil } from './spiceflow.ts'
 
 export type ErrorContext<
   in out Route extends RouteSchema = {},
@@ -55,6 +55,7 @@ export type ErrorContext<
   // route: string
   request: SpiceflowRequest<GetRequestSchema<Route>>
   state: Singleton['state']
+  waitUntil: WaitUntil
   // response: Route['response']
 }>
 
@@ -83,6 +84,7 @@ export type Context<
 
   request: SpiceflowRequest<GetRequestSchema<Route>>
   state: Singleton['state']
+  waitUntil: WaitUntil
   // response?: Route['response']
 }>
 
@@ -97,6 +99,7 @@ export type MiddlewareContext<
   path: string
   query?: Record<string, string | undefined>
   params?: Record<string, string | undefined>
+  waitUntil: WaitUntil
 
   redirect: Redirect
   // server: Server | null

package/src/index.ts

@@ -1,3 +1,3 @@
 export { Spiceflow } from './spiceflow.ts'
-export type { AnySpiceflow } from './spiceflow.ts'
+export type { AnySpiceflow, WaitUntil } from './spiceflow.ts'
 export { ValidationError } from './error.ts'

package/src/mcp-client-transport.ts

@@ -0,0 +1,184 @@
+// fetch version of https://github.com/modelcontextprotocol/typescript-sdk/blob/main/src/client/sse.ts
+import { Transport } from '@modelcontextprotocol/sdk/shared/transport.js'
+import {
+  JSONRPCMessage,
+  JSONRPCMessageSchema,
+} from '@modelcontextprotocol/sdk/types.js'
+import { streamSSEResponse } from './client/index.ts'
+
+export type SpiceflowClientTransportOptions = {
+  fetch?: FetchType
+  url: string
+}
+
+export type FetchType = (input: Request) => Promise<Response>
+
+export class FetchMCPCLientTransport implements Transport {
+  private _endpoint?: URL
+  private sseUrl: URL
+  private _abortController: AbortController
+  fetch: FetchType
+  onmessage?: (message: JSONRPCMessage) => void
+  onerror?: (error: Error) => void = (e) => {
+    throw e
+  }
+  onclose?: () => void
+
+  constructor(opts: SpiceflowClientTransportOptions) {
+    this.fetch = opts.fetch || fetch
+    this.sseUrl = new URL(opts.url)
+    this._abortController = new AbortController()
+  }
+
+  onEndpointMessage: (endpoint: URL) => void = () => {}
+
+  async start(): Promise<void> {
+    const { promise, resolve, reject } = withResolvers<URL>()
+    this.consumeEvents().catch((e) => {
+      reject(e)
+    })
+
+    this.onEndpointMessage = (endpoint) => {
+      this._endpoint = endpoint
+      resolve(endpoint)
+    }
+
+    await promise
+    this.log(`finished start`)
+  }
+
+  log(...x: any[]) {
+    // console.log(...x)
+    //
+  }
+  async consumeEvents() {
+    const sseRes = await this.fetch(
+      new Request(this.sseUrl!.toString(), {
+        method: 'GET',
+        signal: this._abortController.signal,
+        headers: {
+          ...(await this._commonHeaders()),
+          accept: 'text/event-stream',
+        },
+      }),
+    )
+    if (!sseRes.ok || !sseRes.body) {
+      const text = sseRes.body ? await sseRes.text().catch(() => '') : ''
+      throw new Error(
+        `SSE connection failed (HTTP ${sseRes.status})\nURL: ${this.sseUrl}\nText: ${text}`,
+      )
+    }
+    for await (const evt of streamSSEResponse(sseRes, (x) => {
+      return x
+    }) as AsyncGenerator<{
+      event: string
+      data: any
+    }>) {
+      if (evt.event === 'endpoint') {
+        const url = new URL(evt.data, this.sseUrl)
+        if (url.origin !== this.sseUrl.origin) {
+          throw new Error(`Endpoint origin mismatch: ${url.origin}`)
+        }
+        this.onEndpointMessage(url)
+        this._endpoint = url
+      } else if (evt.event === 'message') {
+        // JSON-RPC payload
+        try {
+          const msg = JSONRPCMessageSchema.parse(JSON.parse(evt.data))
+          this.log(msg)
+          this.onmessage?.(msg)
+        } catch (err) {
+          this.onerror?.(err as Error)
+        }
+      } else {
+        this.log('Unknown MCP event:', evt)
+      }
+    }
+    this.close?.()
+  }
+  catch(err) {
+    this.onerror?.(err as Error)
+  }
+
+  private async _commonHeaders() {
+    const headers = {} as Record<string, string>
+    // if (this._authProvider) {
+    //   const tokens = await this._authProvider.tokens()
+    //   if (tokens) {
+    //     headers['Authorization'] = `Bearer ${tokens.access_token}`
+    //   }
+    // }
+    if (this._protocolVersion) {
+      headers['mcp-protocol-version'] = this._protocolVersion
+    }
+
+    return headers
+  }
+
+  /**
+   * Sends a JSON-RPC message by POSTing to the negotiated endpoint.
+   * Must call start() first so that endpoint is set.
+   */
+  async send(message: JSONRPCMessage): Promise<void> {
+    if (!this._endpoint) {
+      throw new Error('Not connected')
+    }
+    this.log(`sending`, message)
+
+    const res = await this.fetch(
+      new Request(this._endpoint.toString(), {
+        method: 'POST',
+        headers: {
+          ...(await this._commonHeaders()),
+          'content-type': 'application/json',
+        },
+        body: JSON.stringify(message),
+        signal: this._abortController?.signal,
+      }),
+    )
+    if (!res.ok) {
+      const text = await res.text().catch(() => '')
+      const err = new Error(
+        `Error POSTing to endpoint ${this._endpoint || '.'} (HTTP ${res.status}): ${text}`,
+      )
+      this.onerror?.(err)
+      throw err
+    }
+  }
+
+  /**
+   * Aborts the SSE stream and notifies onclose.
+   */
+  async close(): Promise<void> {
+    this._abortController?.abort()
+    this.onclose?.()
+  }
+
+  _protocolVersion?: any
+  setProtocolVersion(version: string): void {
+    this._protocolVersion = version
+  }
+}
+
+/**
+ * Polyfill for Promise.withResolvers
+ * Returns an object { promise, resolve, reject }
+ * If native Promise.withResolvers exists, uses it.
+ */
+function withResolvers<T = unknown>(): {
+  promise: Promise<T>
+  resolve: (value: T | PromiseLike<T>) => void
+  reject: (reason?: any) => void
+} {
+  if (typeof Promise.withResolvers === 'function') {
+    return Promise.withResolvers()
+  }
+  let resolve: (value: T | PromiseLike<T>) => void
+  let reject: (reason?: any) => void
+  const promise = new Promise<T>((res, rej) => {
+    resolve = res!
+    reject = rej!
+  })
+  // @ts-ignore checked by closure above
+  return { promise, resolve, reject }
+}