fix: change outputs (#82)

* fix: change outputs

* fix: 修改版本

Co-authored-by: rongxwang <rongxwang@tencent.com>

Author: Rong5180

serverless.component.yml

@@ -1,5 +1,5 @@
 name: scf
-version: 0.8.6
+version: 0.9.0
 author: Tencent Cloud, Inc.
 org: Tencent Cloud, Inc.
 description: 单函数组件，允许用户开发部署单个腾讯 SCF 函数实例。适合进行单一函数开发的场景。如：定时触发任务。

src/package.json

@@ -2,7 +2,7 @@
   "dependencies": {
     "adm-zip": "^0.5.5",
     "download": "^8.0.0",
-    "tencent-component-toolkit": "^2.22.0",
+    "tencent-component-toolkit": "^2.22.1",
     "type": "^2.0.0"
   }
 }

src/serverless.js

@@ -136,16 +136,16 @@ class ServerlessComponent extends Component {
           if (getType(item.subDomain) === 'Array') {
             item.subDomain.forEach((domain) => {
               item.urls.push(
-                `${getDefaultProtocol(item.protocols)}://${domain}/${item.environment}${
+                `${getDefaultProtocol(item.protocols, inputs)}://${domain}/${item.environment}${
                   apiItem.path
                 }`
               )
             })
           } else {
             item.urls.push(
-              `${getDefaultProtocol(item.protocols)}://${item.subDomain}/${item.environment}${
-                apiItem.path
-              }`
+              `${getDefaultProtocol(item.protocols, inputs)}://${item.subDomain}/${
+                item.environment
+              }${apiItem.path}`
             )
           }
         })

src/utils.js

@@ -40,7 +40,10 @@ const validateTraffic = (num) => {
   return true
 }
 
-const getDefaultProtocol = (protocols) => {
+const getDefaultProtocol = (protocols, inputs) => {
+  if (inputs && inputs.protocolType === 'WS' && inputs.type === 'web') {
+    return 'ws'
+  }
   return String(protocols).includes('https') ? 'https' : 'http'
 }
 
@@ -188,7 +191,7 @@ const formatInputs = async (instance, credentials, appId, inputs) => {
     inputs.publish = false
   }
   // 如果是ws函数，protocolType置为WEBSOCKET
-  if (inputs.protocolType === 'WS' || inputs.type === 'web') {
+  if (inputs.protocolType === 'WS' && inputs.type === 'web') {
     inputs.events &&
       inputs.events.forEach((v) => {
         v.apigw.parameters.endpoints &&
@@ -197,7 +200,7 @@ const formatInputs = async (instance, credentials, appId, inputs) => {
           })
       })
   }
-  
+
   // 基于镜像部署
   let imageCode
   if (inputs.image) {
@@ -272,8 +275,8 @@ const formatInputs = async (instance, credentials, appId, inputs) => {
           getDefaultServiceName(instance)
 
         let { serviceId } = currentEvent.parameters
-        currentEvent.parameters.isInputServiceId = !!serviceId
-        currentEvent.parameters.serviceName = serviceName
+        // currentEvent.parameters.isInputServiceId = !!serviceId
+        // currentEvent.parameters.serviceName = serviceName
         currentEvent.parameters.description =
           currentEvent.parameters.description || getDefaultServiceDescription(instance)
         currentEvent.name = currentEvent.name || getDefaultTriggerName(eventType, instance)