feat(runtime): support multi-level uri of cloud function (#1203)

labring · May 31, 2023 · df478bf · df478bf
1 parent 2fed138
commit df478bf
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 31 deletions.
diff --git a/runtimes/nodejs/env.sh b/runtimes/nodejs/env.sh
diff --git a/runtimes/nodejs/src/handler/router.ts b/runtimes/nodejs/src/handler/router.ts
@@ -42,4 +42,20 @@ router.get('/_/healthz', (_req, res) => res.status(200).send('ok'))
  * Invoke cloud function through HTTP request.
  * @method *
  */
-router.all('/:name', uploader.any(), handleInvokeFunction)
+// router.all('/:name', uploader.any(), handleInvokeFunction)
+router.all('*', uploader.any(), (req, res) => {
+  let func_name = req.path
+
+  // remove the leading slash
+  if (func_name.startsWith('/')) {
+    func_name = func_name.slice(1)
+  }
+
+  // check length
+  if (func_name.length > 256) {
+    return res.status(500).send('function name is too long')
+  }
+
+  req.params['name'] = func_name
+  handleInvokeFunction(req, res)
+})
diff --git a/runtimes/python/TBD.md b/runtimes/python/TBD.md
@@ -0,0 +1,2 @@
+
+> TBD
diff --git a/server/src/account/account.controller.ts b/server/src/account/account.controller.ts
@@ -58,6 +58,7 @@ export class AccountController {
   async findOne(@Req() req: IRequest) {
     const user = req.user
     const data = await this.accountService.findOne(user._id)
+    data.balance = Math.floor(data.balance)
     return ResponseUtil.ok(data)
   }
 

diff --git a/server/src/function/dto/create-function.dto.ts b/server/src/function/dto/create-function.dto.ts
@@ -15,7 +15,7 @@ export class CreateFunctionDto {
     description: 'Function name is unique in the application',
   })
   @IsNotEmpty()
-  @Matches(/^[a-zA-Z0-9_.-]{1,128}$/)
+  @Matches(/^[a-zA-Z0-9_.-\/]{1,256}$/)
   name: string
 
   @ApiPropertyOptional()

diff --git a/web/public/locales/zh-CN/translation.json b/web/public/locales/zh-CN/translation.json
@@ -105,7 +105,7 @@
     "SystemDependence": "内置依赖",
     "Value": "值",
     "isSupport": "是否支持",
-    "FunctionNameRule": "函数名须由字母、数字、点（.）和划线(-_)组成，匹配正则：/^[a-zA-Z0-9_.-]{1,128}$/",
+    "FunctionNameRule": "函数名须由字母、数字、点（.）和划线(-_)组成，匹配正则：/^[a-zA-Z0-9_.-\/]{1,256}$/",
     "EmptyDebugTip": "暂无运行结果",
     "EmptyFunctionTip": "您还没有创建函数",
     "UploadButton": "上传",
@@ -439,4 +439,4 @@
   "CostTime": "扣费时间",
   "Duration": "计费周期",
   "TotalAmount": "总费用"
-}
+}
diff --git a/web/public/locales/zh/translation.json b/web/public/locales/zh/translation.json
@@ -105,7 +105,7 @@
     "SystemDependence": "内置依赖",
     "Value": "值",
     "isSupport": "是否支持",
-    "FunctionNameRule": "函数名须由字母、数字、点（.）和划线(-_)组成，匹配正则：/^[a-zA-Z0-9_.-]{1,128}$/",
+    "FunctionNameRule": "函数名须由字母、数字、点（.）和划线(-_)组成，匹配正则：/^[a-zA-Z0-9_.-\/]{1,256}$/",
     "EmptyDebugTip": "暂无运行结果",
     "EmptyFunctionTip": "您还没有创建函数",
     "UploadButton": "上传",
@@ -440,4 +440,4 @@
   "Duration": "计费周期",
   "State": "状态",
   "TotalAmount": "总费用"
-}
+}
diff --git a/web/src/pages/app/functions/mods/FunctionPanel/CreateModal/PromptModal.tsx b/web/src/pages/app/functions/mods/FunctionPanel/CreateModal/PromptModal.tsx
@@ -151,7 +151,7 @@ const PromptModal = (props: {
                 <Input
                   {...register("name", {
                     pattern: {
-                      value: /^[a-zA-Z0-9_.-]{1,128}$/,
+                      value: /^[a-zA-Z0-9_.-\/]{1,256}$/,
                       message: t("FunctionPanel.FunctionNameRule"),
                     },
                   })}

diff --git a/web/src/pages/app/functions/mods/FunctionPanel/CreateModal/index.tsx b/web/src/pages/app/functions/mods/FunctionPanel/CreateModal/index.tsx
@@ -122,7 +122,7 @@ const CreateModal = (props: {
                 <Input
                   {...register("name", {
                     pattern: {
-                      value: /^[a-zA-Z0-9_.-]{1,128}$/,
+                      value: /^[a-zA-Z0-9_.-\/]{1,256}$/,
                       message: t("FunctionPanel.FunctionNameRule"),
                     },
                   })}