feat: 云函数支持 method 参数；

maslow · Jun 9, 2021 · 560f4e8 · 560f4e8
1 parent 30b1f98
commit 560f4e8
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 3 deletions.
diff --git a/src/lib/faas/engine.ts b/src/lib/faas/engine.ts
@@ -24,6 +24,8 @@ export class FunctionEngine {
       ctx: {
         query: incomingCtx.query,
         body: incomingCtx.body,
+        method: incomingCtx.method,
+        extra: incomingCtx.extra,
         auth: incomingCtx.auth,
         requestId: requestId,
       },

diff --git a/src/lib/faas/engine2.ts b/src/lib/faas/engine2.ts
@@ -24,6 +24,7 @@ export class FunctionEngine {
         body: incomingCtx.body,
         auth: incomingCtx.auth,
         extra: incomingCtx.extra,
+        method: incomingCtx.method,
         requestId: requestId,
       },
       module: _module,

diff --git a/src/lib/faas/invoke.ts b/src/lib/faas/invoke.ts
@@ -18,7 +18,10 @@ function createCloudSdk(): CloudSdkInterface {
       throw new Error(`invoke() failed to get function: ${name}`)
     }
 
-    const result = await invokeFunction(func, param ?? {})
+    if (param?.method) {
+      param.method = param.method ?? 'call'
+    }
+    const result = await invokeFunction(func, param ?? { method: 'call' })
 
     // 将云函数调用日志存储到数据库
     {
@@ -63,6 +66,7 @@ export async function invokeFunction(func: CloudFunctionStruct, param: FunctionC
     body: body,
     auth: auth,
     extra: param.extra,
+    method: param.method,
     less: createCloudSdk()
   })
 

diff --git a/src/lib/faas/trigger.ts b/src/lib/faas/trigger.ts
@@ -147,6 +147,7 @@ export class TriggerScheduler {
       logger.debug(`TriggerScheduler.emit -> ${event} - executing function : ${tri.func_id}`)
       const param: FunctionContext = {
         extra: data,
+        method: 'trigger',
         requestId: `trigger_${tri.id}`
       }
       this.executeFunction(tri.func_id, param, tri)
@@ -259,6 +260,7 @@ export class TriggerScheduler {
         logger.debug(`TriggerScheduler.timer-loop -> trigger(${tri.id})- executing function : ${tri.func_id}`)
         const param: FunctionContext = {
           extra: tri,
+          method: 'trigger',
           requestId: `trigger_${tri.id}`
         }
         // 执行任务函数

diff --git a/src/lib/faas/types.ts b/src/lib/faas/types.ts
@@ -35,7 +35,8 @@ export interface FunctionContext {
   body?: any,
   auth?: any,
   requestId?: string,
-  extra?: any
+  extra?: any,
+  method?: string
 }
 
 // param for engine.run()

diff --git a/src/router/function/index.ts b/src/router/function/index.ts
@@ -41,7 +41,7 @@ async function handleInvokeFunction(req: Request, res: Response) {
   }
 
   // 调用函数
-  const ctx: FunctionContext = { query: req.query, body: req.body, auth: req['auth'], requestId }
+  const ctx: FunctionContext = { query: req.query, body: req.body, auth: req['auth'], requestId, method: req.method }
   const result = await invokeFunction(func, ctx)
 
   // 将云函数调用日志存储到数据库