@atomservice/functions-sdk 0.1.6 → 0.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomservice/functions-sdk",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "函数作者 SDK：定义器（defineFunction 等）、event 类型推导、schema 校验、结构化日志、内置 HTTP 运行时",
   "type": "module",
   "author": "openorson",

package/src/sdk.consts.ts

@@ -1,4 +1,4 @@
-export const INVOKE_PATH_PREFIX = "/__invoke/"
+export const INVOKE_PATH_PREFIX = "/invoke/"
 export const HEALTH_PATH = "/__health"
 export const DEFAULT_BUNDLE_PORT = 8080
 export const REQUEST_ID_HEADER = "x-atomfn-request-id"

package/src/sdk.runtime.ts

@@ -54,7 +54,7 @@ interface ExecutorRouter {
   dispose: () => Promise<void>
 }
 
-function buildExecutorRouter(registry: FunctionRegistry, options: ServeOptions): ExecutorRouter {
+function buildExecutorRouter<T extends FunctionRegistry>(registry: T, options: ServeOptions): ExecutorRouter {
   const inline = new InlineExecutor(registry, makeContextFactory(options))
   const workerEnv: Record<string, string> = {
     ...(process.env as Record<string, string>),
@@ -90,8 +90,8 @@ function overloaded(options: ServeOptions): boolean {
   return rssMb > options.memoryLimitMb * MEMORY_BACKPRESSURE_RATIO
 }
 
-export function serve(
-  registry: FunctionRegistry,
+export function serve<T extends FunctionRegistry>(
+  registry: T,
   overrides?: Partial<ServeOptions>,
 ): Bun.Server<undefined> | undefined {
   const options = resolveOptions(overrides)
@@ -114,6 +114,12 @@ export function serve(
     })
   }
 
+  const fnNames = Object.keys(registry)
+  console.log("\n%s", options.bundle)
+  for (const name of fnNames) {
+    console.log("- %s/%s", options.bundle, name)
+  }
+
   return Bun.serve({
     port: options.port,
     async fetch(request) {
@@ -124,7 +130,7 @@ export function serve(
         return Response.json({ ok: true, functions })
       }
 
-      if (request.method === "POST" && url.pathname.startsWith(INVOKE_PATH_PREFIX)) {
+      if ((request.method === "GET" || request.method === "POST") && url.pathname.startsWith(INVOKE_PATH_PREFIX)) {
         const name = url.pathname.slice(INVOKE_PATH_PREFIX.length)
         const def = registry[name]
         if (!def) {
@@ -148,16 +154,23 @@ export function serve(
         }
 
         const id = requestId(request)
-        const body = await readBody(request)
+        const queryParams: Record<string, unknown> = {}
+        url.searchParams.forEach((v, k) => {
+          queryParams[k] = v
+        })
+        const bodyParams = await readBody(request)
+        const event = typeof bodyParams === "object" && bodyParams !== null
+          ? { ...queryParams, ...(bodyParams as Record<string, unknown>) }
+          : queryParams
         const deps = { executor: router.pick(def), name, requestId: id, defaultTimeout: options.defaultTimeout }
 
         if (isStreamKind(def)) {
-          const response = invokeStream(def, body, deps)
+          const response = invokeStream(def, event, deps)
           response.headers.set(REQUEST_ID_HEADER, id)
           return response
         }
 
-        const { status, envelope } = await invokeOneShot(def, body, deps)
+        const { status, envelope } = await invokeOneShot(def, event, deps)
         return Response.json(envelope, { status, headers: { [REQUEST_ID_HEADER]: id } })
       }