@cloudbase/functions 2.9.2 → 2.9.4-alpha.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/index.js +43 -15
- package/dist/esm/index.js +43 -15
- package/package.json +5 -4
- package/src/index.ts +20 -2
package/dist/cjs/index.js
CHANGED
|
@@ -1,4 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __assign = (this && this.__assign) || function () {
|
|
3
|
+
__assign = Object.assign || function(t) {
|
|
4
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
+
s = arguments[i];
|
|
6
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
+
t[p] = s[p];
|
|
8
|
+
}
|
|
9
|
+
return t;
|
|
10
|
+
};
|
|
11
|
+
return __assign.apply(this, arguments);
|
|
12
|
+
};
|
|
2
13
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
14
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
15
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
@@ -47,6 +58,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
47
58
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
48
59
|
exports.registerFunctions = void 0;
|
|
49
60
|
var utilities_1 = require("@cloudbase/utilities");
|
|
61
|
+
var cloudrun_1 = require("@cloudbase/cloudrun");
|
|
50
62
|
var getSdkName = utilities_1.constants.getSdkName, ERRORS = utilities_1.constants.ERRORS, COMMUNITY_SITE_URL = utilities_1.constants.COMMUNITY_SITE_URL;
|
|
51
63
|
var execCallback = utilities_1.utils.execCallback;
|
|
52
64
|
var catchErrorsDecorator = utilities_1.helpers.catchErrorsDecorator;
|
|
@@ -57,11 +69,11 @@ var CloudbaseFunctions = (function () {
|
|
|
57
69
|
CloudbaseFunctions.prototype.callFunction = function (options, callback) {
|
|
58
70
|
var _a, _b;
|
|
59
71
|
return __awaiter(this, void 0, void 0, function () {
|
|
60
|
-
var name, data, query, parse, search, jsonData, action, params, request, res, result, e_1;
|
|
61
|
-
return __generator(this, function (
|
|
62
|
-
switch (
|
|
72
|
+
var name, data, query, parse, search, type, _c, path, method, _d, header, jsonData, requestId, result, action, params, request, res, result, e_1;
|
|
73
|
+
return __generator(this, function (_e) {
|
|
74
|
+
switch (_e.label) {
|
|
63
75
|
case 0:
|
|
64
|
-
name = options.name, data = options.data, query = options.query, parse = options.parse, search = options.search;
|
|
76
|
+
name = options.name, data = options.data, query = options.query, parse = options.parse, search = options.search, type = options.type, _c = options.path, path = _c === void 0 ? '' : _c, method = options.method, _d = options.header, header = _d === void 0 ? {} : _d;
|
|
65
77
|
if (!name) {
|
|
66
78
|
throw new Error(JSON.stringify({
|
|
67
79
|
code: ERRORS.INVALID_PARAMS,
|
|
@@ -77,6 +89,22 @@ var CloudbaseFunctions = (function () {
|
|
|
77
89
|
msg: "[".concat(COMPONENT_NAME, ".callFunction] invalid data"),
|
|
78
90
|
}));
|
|
79
91
|
}
|
|
92
|
+
if (!(type === 'cloudrun')) return [3, 2];
|
|
93
|
+
requestId = utilities_1.utils.generateRequestId();
|
|
94
|
+
return [4, cloudrun_1.requestContainer.call(this, {
|
|
95
|
+
name: name,
|
|
96
|
+
data: jsonData,
|
|
97
|
+
path: path,
|
|
98
|
+
method: method,
|
|
99
|
+
header: __assign(__assign({}, header), { 'X-Request-Id': requestId }),
|
|
100
|
+
})];
|
|
101
|
+
case 1:
|
|
102
|
+
result = _e.sent();
|
|
103
|
+
return [2, {
|
|
104
|
+
result: result,
|
|
105
|
+
requestId: requestId,
|
|
106
|
+
}];
|
|
107
|
+
case 2:
|
|
80
108
|
action = 'functions.invokeFunction';
|
|
81
109
|
params = {
|
|
82
110
|
inQuery: query,
|
|
@@ -86,14 +114,14 @@ var CloudbaseFunctions = (function () {
|
|
|
86
114
|
request_data: jsonData,
|
|
87
115
|
};
|
|
88
116
|
request = this.request;
|
|
89
|
-
|
|
90
|
-
case
|
|
91
|
-
|
|
117
|
+
_e.label = 3;
|
|
118
|
+
case 3:
|
|
119
|
+
_e.trys.push([3, 5, , 6]);
|
|
92
120
|
return [4, request.send(action, params, {
|
|
93
121
|
defaultQuery: ((_a = data === null || data === void 0 ? void 0 : data.params) === null || _a === void 0 ? void 0 : _a.action) ? { action: (_b = data === null || data === void 0 ? void 0 : data.params) === null || _b === void 0 ? void 0 : _b.action } : {},
|
|
94
122
|
})];
|
|
95
|
-
case
|
|
96
|
-
res =
|
|
123
|
+
case 4:
|
|
124
|
+
res = _e.sent();
|
|
97
125
|
if (res.code) {
|
|
98
126
|
return [2, execCallback(callback, null, res)];
|
|
99
127
|
}
|
|
@@ -114,12 +142,12 @@ var CloudbaseFunctions = (function () {
|
|
|
114
142
|
catch (e) {
|
|
115
143
|
execCallback(callback, new Error("[".concat(getSdkName(), "][").concat(ERRORS.INVALID_PARAMS, "][").concat(COMPONENT_NAME, ".callFunction] response data must be json")));
|
|
116
144
|
}
|
|
117
|
-
return [3,
|
|
118
|
-
case
|
|
119
|
-
e_1 =
|
|
145
|
+
return [3, 6];
|
|
146
|
+
case 5:
|
|
147
|
+
e_1 = _e.sent();
|
|
120
148
|
execCallback(callback, e_1);
|
|
121
|
-
return [3,
|
|
122
|
-
case
|
|
149
|
+
return [3, 6];
|
|
150
|
+
case 6: return [2];
|
|
123
151
|
}
|
|
124
152
|
});
|
|
125
153
|
});
|
|
@@ -165,4 +193,4 @@ function registerFunctions(app) {
|
|
|
165
193
|
}
|
|
166
194
|
}
|
|
167
195
|
exports.registerFunctions = registerFunctions;
|
|
168
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
196
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { ICloudbase } from '@cloudbase/types'\nimport { ICloudbaseComponent } from '@cloudbase/types/component'\nimport { ICallFunctionOptions } from '@cloudbase/types/functions'\nimport { constants, utils, helpers } from '@cloudbase/utilities'\nimport { requestContainer } from '@cloudbase/cloudrun'\n\ndeclare const cloudbase: ICloudbase\n\nconst { getSdkName, ERRORS, COMMUNITY_SITE_URL } = constants\nconst { execCallback } = utils\nconst { catchErrorsDecorator } = helpers\n\nconst COMPONENT_NAME = 'functions'\n\nclass CloudbaseFunctions {\n  @catchErrorsDecorator({\n    customInfo: {\n      className: 'Cloudbase',\n      methodName: 'callFunction',\n    },\n    title: '函数调用失败',\n    messages: [\n      '请确认以下各项：',\n      '  1 - 调用 callFunction() 的语法或参数是否正确',\n      '  2 - 当前环境下是否存在此函数',\n      '  3 - 函数安全规则是否限制了当前登录状态访问',\n      `如果问题依然存在，建议到官方问答社区提问或寻找帮助：${COMMUNITY_SITE_URL}`,\n    ],\n  })\n  public async callFunction(options: ICallFunctionOptions, callback?: Function) {\n    const { name, data, query, parse, search, type, path = '', method, header = {} } = options\n\n    if (!name) {\n      throw new Error(JSON.stringify({\n        code: ERRORS.INVALID_PARAMS,\n        msg: `[${COMPONENT_NAME}.callFunction] invalid function name`,\n      }),)\n    }\n    let jsonData\n    try {\n      jsonData = data ? JSON.stringify(data) : ''\n    } catch (e) {\n      throw new Error(JSON.stringify({\n        code: ERRORS.INVALID_PARAMS,\n        msg: `[${COMPONENT_NAME}.callFunction] invalid data`,\n      }),)\n    }\n\n    if (type === 'cloudrun') {\n      const requestId = utils.generateRequestId()\n      const result = await requestContainer.call(this, {\n        name,\n        data: jsonData,\n        path,\n        method,\n        header: { ...header, 'X-Request-Id': requestId },\n      })\n\n      return {\n        result,\n        requestId,\n      }\n    }\n\n    const action = 'functions.invokeFunction'\n\n    const params = {\n      inQuery: query,\n      parse,\n      search,\n      function_name: name,\n      request_data: jsonData,\n    }\n    // @ts-ignore\n    const { request } = this\n\n    try {\n      const res = await request.send(action, params, {\n        defaultQuery: data?.params?.action ? { action: data?.params?.action } : {},\n      })\n      if (res.code) {\n        return execCallback(callback, null, res)\n      }\n      let result = res.data.response_data\n      // parse 为 true 时服务端解析 JSON，SDK 不再次解析\n      if (parse) {\n        return execCallback(callback, null, {\n          result,\n          requestId: res.requestId,\n        })\n      }\n      try {\n        result = JSON.parse(res.data.response_data)\n        return execCallback(callback, null, {\n          result,\n          requestId: res.requestId,\n        })\n      } catch (e) {\n        execCallback(\n          callback,\n          new Error(`[${getSdkName()}][${ERRORS.INVALID_PARAMS}][${COMPONENT_NAME}.callFunction] response data must be json`,),\n        )\n      }\n    } catch (e) {\n      execCallback(callback, e)\n    }\n  }\n}\n\nconst cloudbaseFunctions = new CloudbaseFunctions()\n\nconst component: ICloudbaseComponent = {\n  name: COMPONENT_NAME,\n  entity: {\n    callFunction: cloudbaseFunctions.callFunction,\n  },\n}\ntry {\n  cloudbase.registerComponent(component)\n} catch (e) { }\n\nexport function registerFunctions(app: Pick<ICloudbase, 'registerComponent'>) {\n  try {\n    app.registerComponent(component)\n  } catch (e) {\n    console.warn(e)\n  }\n}\n"]}
|
package/dist/esm/index.js
CHANGED
|
@@ -1,3 +1,14 @@
|
|
|
1
|
+
var __assign = (this && this.__assign) || function () {
|
|
2
|
+
__assign = Object.assign || function(t) {
|
|
3
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
4
|
+
s = arguments[i];
|
|
5
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
6
|
+
t[p] = s[p];
|
|
7
|
+
}
|
|
8
|
+
return t;
|
|
9
|
+
};
|
|
10
|
+
return __assign.apply(this, arguments);
|
|
11
|
+
};
|
|
1
12
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
2
13
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
3
14
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
@@ -44,6 +55,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
44
55
|
}
|
|
45
56
|
};
|
|
46
57
|
import { constants, utils, helpers } from '@cloudbase/utilities';
|
|
58
|
+
import { requestContainer } from '@cloudbase/cloudrun';
|
|
47
59
|
var getSdkName = constants.getSdkName, ERRORS = constants.ERRORS, COMMUNITY_SITE_URL = constants.COMMUNITY_SITE_URL;
|
|
48
60
|
var execCallback = utils.execCallback;
|
|
49
61
|
var catchErrorsDecorator = helpers.catchErrorsDecorator;
|
|
@@ -54,11 +66,11 @@ var CloudbaseFunctions = (function () {
|
|
|
54
66
|
CloudbaseFunctions.prototype.callFunction = function (options, callback) {
|
|
55
67
|
var _a, _b;
|
|
56
68
|
return __awaiter(this, void 0, void 0, function () {
|
|
57
|
-
var name, data, query, parse, search, jsonData, action, params, request, res, result, e_1;
|
|
58
|
-
return __generator(this, function (
|
|
59
|
-
switch (
|
|
69
|
+
var name, data, query, parse, search, type, _c, path, method, _d, header, jsonData, requestId, result, action, params, request, res, result, e_1;
|
|
70
|
+
return __generator(this, function (_e) {
|
|
71
|
+
switch (_e.label) {
|
|
60
72
|
case 0:
|
|
61
|
-
name = options.name, data = options.data, query = options.query, parse = options.parse, search = options.search;
|
|
73
|
+
name = options.name, data = options.data, query = options.query, parse = options.parse, search = options.search, type = options.type, _c = options.path, path = _c === void 0 ? '' : _c, method = options.method, _d = options.header, header = _d === void 0 ? {} : _d;
|
|
62
74
|
if (!name) {
|
|
63
75
|
throw new Error(JSON.stringify({
|
|
64
76
|
code: ERRORS.INVALID_PARAMS,
|
|
@@ -74,6 +86,22 @@ var CloudbaseFunctions = (function () {
|
|
|
74
86
|
msg: "[".concat(COMPONENT_NAME, ".callFunction] invalid data"),
|
|
75
87
|
}));
|
|
76
88
|
}
|
|
89
|
+
if (!(type === 'cloudrun')) return [3, 2];
|
|
90
|
+
requestId = utils.generateRequestId();
|
|
91
|
+
return [4, requestContainer.call(this, {
|
|
92
|
+
name: name,
|
|
93
|
+
data: jsonData,
|
|
94
|
+
path: path,
|
|
95
|
+
method: method,
|
|
96
|
+
header: __assign(__assign({}, header), { 'X-Request-Id': requestId }),
|
|
97
|
+
})];
|
|
98
|
+
case 1:
|
|
99
|
+
result = _e.sent();
|
|
100
|
+
return [2, {
|
|
101
|
+
result: result,
|
|
102
|
+
requestId: requestId,
|
|
103
|
+
}];
|
|
104
|
+
case 2:
|
|
77
105
|
action = 'functions.invokeFunction';
|
|
78
106
|
params = {
|
|
79
107
|
inQuery: query,
|
|
@@ -83,14 +111,14 @@ var CloudbaseFunctions = (function () {
|
|
|
83
111
|
request_data: jsonData,
|
|
84
112
|
};
|
|
85
113
|
request = this.request;
|
|
86
|
-
|
|
87
|
-
case
|
|
88
|
-
|
|
114
|
+
_e.label = 3;
|
|
115
|
+
case 3:
|
|
116
|
+
_e.trys.push([3, 5, , 6]);
|
|
89
117
|
return [4, request.send(action, params, {
|
|
90
118
|
defaultQuery: ((_a = data === null || data === void 0 ? void 0 : data.params) === null || _a === void 0 ? void 0 : _a.action) ? { action: (_b = data === null || data === void 0 ? void 0 : data.params) === null || _b === void 0 ? void 0 : _b.action } : {},
|
|
91
119
|
})];
|
|
92
|
-
case
|
|
93
|
-
res =
|
|
120
|
+
case 4:
|
|
121
|
+
res = _e.sent();
|
|
94
122
|
if (res.code) {
|
|
95
123
|
return [2, execCallback(callback, null, res)];
|
|
96
124
|
}
|
|
@@ -111,12 +139,12 @@ var CloudbaseFunctions = (function () {
|
|
|
111
139
|
catch (e) {
|
|
112
140
|
execCallback(callback, new Error("[".concat(getSdkName(), "][").concat(ERRORS.INVALID_PARAMS, "][").concat(COMPONENT_NAME, ".callFunction] response data must be json")));
|
|
113
141
|
}
|
|
114
|
-
return [3,
|
|
115
|
-
case
|
|
116
|
-
e_1 =
|
|
142
|
+
return [3, 6];
|
|
143
|
+
case 5:
|
|
144
|
+
e_1 = _e.sent();
|
|
117
145
|
execCallback(callback, e_1);
|
|
118
|
-
return [3,
|
|
119
|
-
case
|
|
146
|
+
return [3, 6];
|
|
147
|
+
case 6: return [2];
|
|
120
148
|
}
|
|
121
149
|
});
|
|
122
150
|
});
|
|
@@ -161,4 +189,4 @@ export function registerFunctions(app) {
|
|
|
161
189
|
console.warn(e);
|
|
162
190
|
}
|
|
163
191
|
}
|
|
164
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
192
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { ICloudbase } from '@cloudbase/types'\nimport { ICloudbaseComponent } from '@cloudbase/types/component'\nimport { ICallFunctionOptions } from '@cloudbase/types/functions'\nimport { constants, utils, helpers } from '@cloudbase/utilities'\nimport { requestContainer } from '@cloudbase/cloudrun'\n\ndeclare const cloudbase: ICloudbase\n\nconst { getSdkName, ERRORS, COMMUNITY_SITE_URL } = constants\nconst { execCallback } = utils\nconst { catchErrorsDecorator } = helpers\n\nconst COMPONENT_NAME = 'functions'\n\nclass CloudbaseFunctions {\n  @catchErrorsDecorator({\n    customInfo: {\n      className: 'Cloudbase',\n      methodName: 'callFunction',\n    },\n    title: '函数调用失败',\n    messages: [\n      '请确认以下各项：',\n      '  1 - 调用 callFunction() 的语法或参数是否正确',\n      '  2 - 当前环境下是否存在此函数',\n      '  3 - 函数安全规则是否限制了当前登录状态访问',\n      `如果问题依然存在，建议到官方问答社区提问或寻找帮助：${COMMUNITY_SITE_URL}`,\n    ],\n  })\n  public async callFunction(options: ICallFunctionOptions, callback?: Function) {\n    const { name, data, query, parse, search, type, path = '', method, header = {} } = options\n\n    if (!name) {\n      throw new Error(JSON.stringify({\n        code: ERRORS.INVALID_PARAMS,\n        msg: `[${COMPONENT_NAME}.callFunction] invalid function name`,\n      }),)\n    }\n    let jsonData\n    try {\n      jsonData = data ? JSON.stringify(data) : ''\n    } catch (e) {\n      throw new Error(JSON.stringify({\n        code: ERRORS.INVALID_PARAMS,\n        msg: `[${COMPONENT_NAME}.callFunction] invalid data`,\n      }),)\n    }\n\n    if (type === 'cloudrun') {\n      const requestId = utils.generateRequestId()\n      const result = await requestContainer.call(this, {\n        name,\n        data: jsonData,\n        path,\n        method,\n        header: { ...header, 'X-Request-Id': requestId },\n      })\n\n      return {\n        result,\n        requestId,\n      }\n    }\n\n    const action = 'functions.invokeFunction'\n\n    const params = {\n      inQuery: query,\n      parse,\n      search,\n      function_name: name,\n      request_data: jsonData,\n    }\n    // @ts-ignore\n    const { request } = this\n\n    try {\n      const res = await request.send(action, params, {\n        defaultQuery: data?.params?.action ? { action: data?.params?.action } : {},\n      })\n      if (res.code) {\n        return execCallback(callback, null, res)\n      }\n      let result = res.data.response_data\n      // parse 为 true 时服务端解析 JSON，SDK 不再次解析\n      if (parse) {\n        return execCallback(callback, null, {\n          result,\n          requestId: res.requestId,\n        })\n      }\n      try {\n        result = JSON.parse(res.data.response_data)\n        return execCallback(callback, null, {\n          result,\n          requestId: res.requestId,\n        })\n      } catch (e) {\n        execCallback(\n          callback,\n          new Error(`[${getSdkName()}][${ERRORS.INVALID_PARAMS}][${COMPONENT_NAME}.callFunction] response data must be json`,),\n        )\n      }\n    } catch (e) {\n      execCallback(callback, e)\n    }\n  }\n}\n\nconst cloudbaseFunctions = new CloudbaseFunctions()\n\nconst component: ICloudbaseComponent = {\n  name: COMPONENT_NAME,\n  entity: {\n    callFunction: cloudbaseFunctions.callFunction,\n  },\n}\ntry {\n  cloudbase.registerComponent(component)\n} catch (e) { }\n\nexport function registerFunctions(app: Pick<ICloudbase, 'registerComponent'>) {\n  try {\n    app.registerComponent(component)\n  } catch (e) {\n    console.warn(e)\n  }\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cloudbase/functions",
|
|
3
|
-
"version": "2.9.
|
|
3
|
+
"version": "2.9.4-alpha.0",
|
|
4
4
|
"description": "cloudbase javascript sdk functions componets",
|
|
5
5
|
"main": "dist/cjs/index.js",
|
|
6
6
|
"module": "dist/esm/index.js",
|
|
@@ -29,8 +29,9 @@
|
|
|
29
29
|
"license": "Apache-2.0",
|
|
30
30
|
"dependencies": {
|
|
31
31
|
"@cloudbase/adapter-interface": "^0.6.0",
|
|
32
|
-
"@cloudbase/
|
|
33
|
-
"@cloudbase/
|
|
32
|
+
"@cloudbase/cloudrun": "^2.9.4-alpha.0",
|
|
33
|
+
"@cloudbase/types": "^2.9.4-alpha.0",
|
|
34
|
+
"@cloudbase/utilities": "^2.9.4-alpha.0"
|
|
34
35
|
},
|
|
35
|
-
"gitHead": "
|
|
36
|
+
"gitHead": "8bb917b10675bccc98f6d2dac9e2ded561cdf094"
|
|
36
37
|
}
|
package/src/index.ts
CHANGED
|
@@ -2,6 +2,7 @@ import { ICloudbase } from '@cloudbase/types'
|
|
|
2
2
|
import { ICloudbaseComponent } from '@cloudbase/types/component'
|
|
3
3
|
import { ICallFunctionOptions } from '@cloudbase/types/functions'
|
|
4
4
|
import { constants, utils, helpers } from '@cloudbase/utilities'
|
|
5
|
+
import { requestContainer } from '@cloudbase/cloudrun'
|
|
5
6
|
|
|
6
7
|
declare const cloudbase: ICloudbase
|
|
7
8
|
|
|
@@ -27,7 +28,8 @@ class CloudbaseFunctions {
|
|
|
27
28
|
],
|
|
28
29
|
})
|
|
29
30
|
public async callFunction(options: ICallFunctionOptions, callback?: Function) {
|
|
30
|
-
const { name, data, query, parse, search } = options
|
|
31
|
+
const { name, data, query, parse, search, type, path = '', method, header = {} } = options
|
|
32
|
+
|
|
31
33
|
if (!name) {
|
|
32
34
|
throw new Error(JSON.stringify({
|
|
33
35
|
code: ERRORS.INVALID_PARAMS,
|
|
@@ -44,6 +46,22 @@ class CloudbaseFunctions {
|
|
|
44
46
|
}),)
|
|
45
47
|
}
|
|
46
48
|
|
|
49
|
+
if (type === 'cloudrun') {
|
|
50
|
+
const requestId = utils.generateRequestId()
|
|
51
|
+
const result = await requestContainer.call(this, {
|
|
52
|
+
name,
|
|
53
|
+
data: jsonData,
|
|
54
|
+
path,
|
|
55
|
+
method,
|
|
56
|
+
header: { ...header, 'X-Request-Id': requestId },
|
|
57
|
+
})
|
|
58
|
+
|
|
59
|
+
return {
|
|
60
|
+
result,
|
|
61
|
+
requestId,
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
|
|
47
65
|
const action = 'functions.invokeFunction'
|
|
48
66
|
|
|
49
67
|
const params = {
|
|
@@ -99,7 +117,7 @@ const component: ICloudbaseComponent = {
|
|
|
99
117
|
}
|
|
100
118
|
try {
|
|
101
119
|
cloudbase.registerComponent(component)
|
|
102
|
-
} catch (e) {}
|
|
120
|
+
} catch (e) { }
|
|
103
121
|
|
|
104
122
|
export function registerFunctions(app: Pick<ICloudbase, 'registerComponent'>) {
|
|
105
123
|
try {
|