@cloudbase/cloudrun 3.0.0 → 3.0.2
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.d.ts +2 -2
- package/dist/cjs/index.js +39 -18
- package/dist/esm/index.d.ts +2 -2
- package/dist/esm/index.js +39 -18
- package/package.json +4 -4
- package/src/index.ts +36 -7
- package/tsconfig.json +1 -1
package/dist/cjs/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { ICloudbase } from '@cloudbase/types';
|
|
2
|
-
import { ICallFunctionOptions } from '@cloudbase/types/functions';
|
|
3
|
-
export declare function requestContainer(this: any, options: ICallFunctionOptions): Promise<any>;
|
|
2
|
+
import { ICallFunctionOptions, ICustomReqOpts } from '@cloudbase/types/functions';
|
|
3
|
+
export declare function requestContainer(this: any, options: ICallFunctionOptions, customReqOpts?: ICustomReqOpts): Promise<any>;
|
|
4
4
|
export declare function registerCloudrun(app: Pick<ICloudbase, 'registerComponent'>): void;
|
package/dist/cjs/index.js
CHANGED
|
@@ -54,7 +54,7 @@ var COMPONENT_NAME = 'cloudrun';
|
|
|
54
54
|
var CloudbaseRun = (function () {
|
|
55
55
|
function CloudbaseRun() {
|
|
56
56
|
}
|
|
57
|
-
CloudbaseRun.prototype.callContainer = function (options) {
|
|
57
|
+
CloudbaseRun.prototype.callContainer = function (options, customReqOpts) {
|
|
58
58
|
return __awaiter(this, void 0, void 0, function () {
|
|
59
59
|
var name, data, jsonData;
|
|
60
60
|
return __generator(this, function (_a) {
|
|
@@ -76,7 +76,7 @@ var CloudbaseRun = (function () {
|
|
|
76
76
|
msg: "[".concat(COMPONENT_NAME, ".callContainer] invalid data"),
|
|
77
77
|
}));
|
|
78
78
|
}
|
|
79
|
-
return [4, requestContainer.call(this, __assign(__assign({}, options), { data: jsonData }))];
|
|
79
|
+
return [4, requestContainer.call(this, __assign(__assign({}, options), { data: jsonData }), customReqOpts)];
|
|
80
80
|
case 1: return [2, _a.sent()];
|
|
81
81
|
}
|
|
82
82
|
});
|
|
@@ -84,27 +84,44 @@ var CloudbaseRun = (function () {
|
|
|
84
84
|
};
|
|
85
85
|
return CloudbaseRun;
|
|
86
86
|
}());
|
|
87
|
-
function requestContainer(options) {
|
|
87
|
+
function requestContainer(options, customReqOpts) {
|
|
88
|
+
var _a;
|
|
88
89
|
return __awaiter(this, void 0, void 0, function () {
|
|
89
|
-
var name, data,
|
|
90
|
-
return __generator(this, function (
|
|
91
|
-
switch (
|
|
90
|
+
var name, data, _b, path, method, _c, header, _d, BASE_URL, PROTOCOL, endpoint, reqPath, isGetAndHead, dataParse_1, response;
|
|
91
|
+
return __generator(this, function (_e) {
|
|
92
|
+
switch (_e.label) {
|
|
92
93
|
case 0:
|
|
93
|
-
name = options.name, data = options.data,
|
|
94
|
-
|
|
94
|
+
name = options.name, data = options.data, _b = options.path, path = _b === void 0 ? '' : _b, method = options.method, _c = options.header, header = _c === void 0 ? {} : _c;
|
|
95
|
+
_d = this.getEndPointWithKey('GATEWAY'), BASE_URL = _d.BASE_URL, PROTOCOL = _d.PROTOCOL;
|
|
96
|
+
endpoint = "".concat(PROTOCOL).concat(BASE_URL, "/cloudrun/").concat(name);
|
|
95
97
|
reqPath = path.startsWith('/') ? path : "/".concat(path);
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
98
|
+
isGetAndHead = ['GET', 'HEAD'].includes((_a = method === null || method === void 0 ? void 0 : method.toUpperCase) === null || _a === void 0 ? void 0 : _a.call(method));
|
|
99
|
+
if (isGetAndHead) {
|
|
100
|
+
try {
|
|
101
|
+
dataParse_1 = {};
|
|
102
|
+
try {
|
|
103
|
+
dataParse_1 = JSON.parse(data);
|
|
104
|
+
}
|
|
105
|
+
catch (error) {
|
|
106
|
+
dataParse_1 = data || {};
|
|
107
|
+
}
|
|
108
|
+
reqPath = "".concat(reqPath).concat(reqPath.includes('?') ? '&' : '?').concat(Object.keys(dataParse_1)
|
|
109
|
+
.map(function (key) { return "".concat(key, "=").concat(dataParse_1[key]); })
|
|
110
|
+
.join('&'));
|
|
111
|
+
}
|
|
112
|
+
catch (error) {
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
return [4, this.request.fetch(__assign(__assign({ method: method || 'POST', headers: Object.assign({}, {
|
|
99
116
|
'Content-Type': 'application/json; charset=utf-8',
|
|
100
|
-
}, header),
|
|
101
|
-
body: data,
|
|
102
|
-
url: "".concat(endpoint).concat(reqPath),
|
|
103
|
-
})];
|
|
117
|
+
}, header) }, (isGetAndHead ? {} : { body: data })), { url: "".concat(endpoint).concat(reqPath), customReqOpts: customReqOpts }))];
|
|
104
118
|
case 1:
|
|
105
|
-
response =
|
|
119
|
+
response = _e.sent();
|
|
120
|
+
if ((customReqOpts === null || customReqOpts === void 0 ? void 0 : customReqOpts.from) === 'node-sdk') {
|
|
121
|
+
return [2, response];
|
|
122
|
+
}
|
|
106
123
|
return [4, response.data];
|
|
107
|
-
case 2: return [2,
|
|
124
|
+
case 2: return [2, _e.sent()];
|
|
108
125
|
}
|
|
109
126
|
});
|
|
110
127
|
});
|
|
@@ -130,4 +147,8 @@ function registerCloudrun(app) {
|
|
|
130
147
|
}
|
|
131
148
|
}
|
|
132
149
|
exports.registerCloudrun = registerCloudrun;
|
|
133
|
-
|
|
150
|
+
try {
|
|
151
|
+
window.registerCloudrun = registerCloudrun;
|
|
152
|
+
}
|
|
153
|
+
catch (e) { }
|
|
154
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFHQSxrREFBZ0Q7QUFJeEMsSUFBQSxNQUFNLEdBQUsscUJBQVMsT0FBZCxDQUFjO0FBRTVCLElBQU0sY0FBYyxHQUFHLFVBQVUsQ0FBQTtBQUVqQztJQUFBO0lBc0JBLENBQUM7SUFyQmMsb0NBQWEsR0FBMUIsVUFBMkIsT0FBNkIsRUFBRSxhQUE4Qjs7Ozs7O3dCQUM5RSxJQUFJLEdBQVcsT0FBTyxLQUFsQixFQUFFLElBQUksR0FBSyxPQUFPLEtBQVosQ0FBWTt3QkFFOUIsSUFBSSxDQUFDLElBQUksRUFBRTs0QkFDVCxNQUFNLElBQUksS0FBSyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUM7Z0NBQzdCLElBQUksRUFBRSxNQUFNLENBQUMsY0FBYztnQ0FDM0IsR0FBRyxFQUFFLFdBQUksY0FBYyxpQ0FBOEI7NkJBQ3RELENBQUMsQ0FBRSxDQUFBO3lCQUNMO3dCQUVELElBQUk7NEJBQ0YsUUFBUSxHQUFHLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFBO3lCQUM1Qzt3QkFBQyxPQUFPLENBQUMsRUFBRTs0QkFDVixNQUFNLElBQUksS0FBSyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUM7Z0NBQzdCLElBQUksRUFBRSxNQUFNLENBQUMsY0FBYztnQ0FDM0IsR0FBRyxFQUFFLFdBQUksY0FBYyxpQ0FBOEI7NkJBQ3RELENBQUMsQ0FBRSxDQUFBO3lCQUNMO3dCQUVNLFdBQU0sZ0JBQWdCLENBQUMsSUFBSSxDQUFDLElBQUksd0JBQU8sT0FBTyxLQUFFLElBQUksRUFBRSxRQUFRLEtBQUksYUFBYSxDQUFDLEVBQUE7NEJBQXZGLFdBQU8sU0FB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QyxpQkFBaUIsQ0FBQyxTQUFTLENBQUMsQ0FBQTtDQUN2QztBQUFDLE9BQU8sQ0FBQyxFQUFFLEdBQUU7QUFFZCxTQUFnQixnQkFBZ0IsQ0FBQyxHQUEwQztJQUN6RSxJQUFJO1FBQ0YsR0FBRyxDQUFDLGlCQUFpQixDQUFDLFNBQVMsQ0FBQyxDQUFBO0tBQ2pDO0lBQUMsT0FBTyxDQUFDLEVBQUU7UUFDVixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO0tBQ2hCO0FBQ0gsQ0FBQztBQU5ELDRDQU1DO0FBRUQsSUFBSTtJQUNELE1BQWMsQ0FBQyxnQkFBZ0IsR0FBRyxnQkFBZ0IsQ0FBQTtDQUNwRDtBQUFDLE9BQU8sQ0FBQyxFQUFFLEdBQUUiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJQ2xvdWRiYXNlIH0gZnJvbSAnQGNsb3VkYmFzZS90eXBlcydcbmltcG9ydCB7IElDbG91ZGJhc2VDb21wb25lbnQgfSBmcm9tICdAY2xvdWRiYXNlL3R5cGVzL2NvbXBvbmVudCdcbmltcG9ydCB7IElDYWxsRnVuY3Rpb25PcHRpb25zLCBJQ3VzdG9tUmVxT3B0cyB9IGZyb20gJ0BjbG91ZGJhc2UvdHlwZXMvZnVuY3Rpb25zJ1xuaW1wb3J0IHsgY29uc3RhbnRzIH0gZnJvbSAnQGNsb3VkYmFzZS91dGlsaXRpZXMnXG5cbmRlY2xhcmUgY29uc3QgY2xvdWRiYXNlOiBJQ2xvdWRiYXNlXG5cbmNvbnN0IHsgRVJST1JTIH0gPSBjb25zdGFudHNcblxuY29uc3QgQ09NUE9ORU5UX05BTUUgPSAnY2xvdWRydW4nXG5cbmNsYXNzIENsb3VkYmFzZVJ1biB7XG4gIHB1YmxpYyBhc3luYyBjYWxsQ29udGFpbmVyKG9wdGlvbnM6IElDYWxsRnVuY3Rpb25PcHRpb25zLCBjdXN0b21SZXFPcHRzPzogSUN1c3RvbVJlcU9wdHMpIHtcbiAgICBjb25zdCB7IG5hbWUsIGRhdGEgfSA9IG9wdGlvbnNcblxuICAgIGlmICghbmFtZSkge1xuICAgICAgdGhyb3cgbmV3IEVycm9yKEpTT04uc3RyaW5naWZ5KHtcbiAgICAgICAgY29kZTogRVJST1JTLklOVkFMSURfUEFSQU1TLFxuICAgICAgICBtc2c6IGBbJHtDT01QT05FTlRfTkFNRX0uY2FsbENvbnRhaW5lcl0gaW52YWxpZCBuYW1lYCxcbiAgICAgIH0pLClcbiAgICB9XG4gICAgbGV0IGpzb25EYXRhXG4gICAgdHJ5IHtcbiAgICAgIGpzb25EYXRhID0gZGF0YSA/IEpTT04uc3RyaW5naWZ5KGRhdGEpIDogJydcbiAgICB9IGNhdGNoIChlKSB7XG4gICAgICB0aHJvdyBuZXcgRXJyb3IoSlNPTi5zdHJpbmdpZnkoe1xuICAgICAgICBjb2RlOiBFUlJPUlMuSU5WQUxJRF9QQVJBTVMsXG4gICAgICAgIG1zZzogYFske0NPTVBPTkVOVF9OQU1FfS5jYWxsQ29udGFpbmVyXSBpbnZhbGlkIGRhdGFgLFxuICAgICAgfSksKVxuICAgIH1cblxuICAgIHJldHVybiBhd2FpdCByZXF1ZXN0Q29udGFpbmVyLmNhbGwodGhpcywgeyAuLi5vcHRpb25zLCBkYXRhOiBqc29uRGF0YSB9LCBjdXN0b21SZXFPcHRzKVxuICB9XG59XG5cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiByZXF1ZXN0Q29udGFpbmVyKHRoaXM6IGFueSwgb3B0aW9uczogSUNhbGxGdW5jdGlvbk9wdGlvbnMsIGN1c3RvbVJlcU9wdHM/OiBJQ3VzdG9tUmVxT3B0cykge1xuICBjb25zdCB7IG5hbWUsIGRhdGEsIHBhdGggPSAnJywgbWV0aG9kLCBoZWFkZXIgPSB7fSB9ID0gb3B0aW9uc1xuICBjb25zdCB7IEJBU0VfVVJMLCBQUk9UT0NPTCB9ID0gdGhpcy5nZXRFbmRQb2ludFdpdGhLZXkoJ0dBVEVXQVknKVxuICBjb25zdCBlbmRwb2ludCA9IGAke1BST1RPQ09MfSR7QkFTRV9VUkx9L2Nsb3VkcnVuLyR7bmFtZX1gXG4gIGxldCByZXFQYXRoID0gcGF0aC5zdGFydHNXaXRoKCcvJykgPyBwYXRoIDogYC8ke3BhdGh9YFxuICBjb25zdCBpc0dldEFuZEhlYWQgPSBbJ0dFVCcsICdIRUFEJ10uaW5jbHVkZXMobWV0aG9kPy50b1VwcGVyQ2FzZT8uKCkpXG5cbiAgaWYgKGlzR2V0QW5kSGVhZCkge1xuICAgIHRyeSB7XG4gICAgICBsZXQgZGF0YVBhcnNlID0ge31cbiAgICAgIHRyeSB7XG4gICAgICAgIGRhdGFQYXJzZSA9IEpTT04ucGFyc2UoZGF0YSBhcyBhbnkpXG4gICAgICB9IGNhdGNoIChlcnJvcikge1xuICAgICAgICBkYXRhUGFyc2UgPSBkYXRhIHx8IHt9XG4gICAgICB9XG4gICAgICByZXFQYXRoID0gYCR7cmVxUGF0aH0ke3JlcVBhdGguaW5jbHVkZXMoJz8nKSA/ICcmJyA6ICc/J30ke09iamVjdC5rZXlzKGRhdGFQYXJzZSlcbiAgICAgICAgLm1hcChrZXkgPT4gYCR7a2V5fT0ke2RhdGFQYXJzZVtrZXldfWApXG4gICAgICAgIC5qb2luKCcmJyl9YFxuICAgIH0gY2F0Y2ggKGVycm9yKSB7XG4gICAgICAvL1xuICAgIH1cbiAgfVxuXG4gIC8vIEB0cy1pZ25vcmVcbiAgY29uc3QgcmVzcG9uc2UgPSBhd2FpdCB0aGlzLnJlcXVlc3QuZmV0Y2goe1xuICAgIG1ldGhvZDogbWV0aG9kIHx8ICdQT1NUJyxcbiAgICBoZWFkZXJzOiBPYmplY3QuYXNzaWduKFxuICAgICAge30sXG4gICAgICB7XG4gICAgICAgICdDb250ZW50LVR5cGUnOiAnYXBwbGljYXRpb24vanNvbjsgY2hhcnNldD11dGYtOCcsXG4gICAgICB9LFxuICAgICAgaGVhZGVyLFxuICAgICksXG4gICAgLy8gUmVxdWVzdCB3aXRoIEdFVC9IRUFEIG1ldGhvZCBjYW5ub3QgaGF2ZSBib2R5XG4gICAgLi4uKGlzR2V0QW5kSGVhZCA/IHt9IDogeyBib2R5OiBkYXRhIH0pLFxuICAgIHVybDogYCR7ZW5kcG9pbnR9JHtyZXFQYXRofWAsXG4gICAgY3VzdG9tUmVxT3B0cyxcbiAgfSlcblxuICBpZiAoY3VzdG9tUmVxT3B0cz8uZnJvbSA9PT0gJ25vZGUtc2RrJykge1xuICAgIHJldHVybiByZXNwb25zZVxuICB9XG5cbiAgcmV0dXJuIGF3YWl0IHJlc3BvbnNlLmRhdGFcbn1cblxuY29uc3QgY2xvdWRiYXNlUnVuID0gbmV3IENsb3VkYmFzZVJ1bigpXG5cbmNvbnN0IGNvbXBvbmVudDogSUNsb3VkYmFzZUNvbXBvbmVudCA9IHtcbiAgbmFtZTogQ09NUE9ORU5UX05BTUUsXG4gIGVudGl0eToge1xuICAgIGNhbGxDb250YWluZXI6IGNsb3VkYmFzZVJ1bi5jYWxsQ29udGFpbmVyLFxuICB9LFxufVxudHJ5IHtcbiAgY2xvdWRiYXNlLnJlZ2lzdGVyQ29tcG9uZW50KGNvbXBvbmVudClcbn0gY2F0Y2ggKGUpIHt9XG5cbmV4cG9ydCBmdW5jdGlvbiByZWdpc3RlckNsb3VkcnVuKGFwcDogUGljazxJQ2xvdWRiYXNlLCAncmVnaXN0ZXJDb21wb25lbnQnPikge1xuICB0cnkge1xuICAgIGFwcC5yZWdpc3RlckNvbXBvbmVudChjb21wb25lbnQpXG4gIH0gY2F0Y2ggKGUpIHtcbiAgICBjb25zb2xlLndhcm4oZSlcbiAgfVxufVxuXG50cnkge1xuICAod2luZG93IGFzIGFueSkucmVnaXN0ZXJDbG91ZHJ1biA9IHJlZ2lzdGVyQ2xvdWRydW5cbn0gY2F0Y2ggKGUpIHt9XG4iXX0=
|
package/dist/esm/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { ICloudbase } from '@cloudbase/types';
|
|
2
|
-
import { ICallFunctionOptions } from '@cloudbase/types/functions';
|
|
3
|
-
export declare function requestContainer(this: any, options: ICallFunctionOptions): Promise<any>;
|
|
2
|
+
import { ICallFunctionOptions, ICustomReqOpts } from '@cloudbase/types/functions';
|
|
3
|
+
export declare function requestContainer(this: any, options: ICallFunctionOptions, customReqOpts?: ICustomReqOpts): Promise<any>;
|
|
4
4
|
export declare function registerCloudrun(app: Pick<ICloudbase, 'registerComponent'>): void;
|
package/dist/esm/index.js
CHANGED
|
@@ -51,7 +51,7 @@ var COMPONENT_NAME = 'cloudrun';
|
|
|
51
51
|
var CloudbaseRun = (function () {
|
|
52
52
|
function CloudbaseRun() {
|
|
53
53
|
}
|
|
54
|
-
CloudbaseRun.prototype.callContainer = function (options) {
|
|
54
|
+
CloudbaseRun.prototype.callContainer = function (options, customReqOpts) {
|
|
55
55
|
return __awaiter(this, void 0, void 0, function () {
|
|
56
56
|
var name, data, jsonData;
|
|
57
57
|
return __generator(this, function (_a) {
|
|
@@ -73,7 +73,7 @@ var CloudbaseRun = (function () {
|
|
|
73
73
|
msg: "[".concat(COMPONENT_NAME, ".callContainer] invalid data"),
|
|
74
74
|
}));
|
|
75
75
|
}
|
|
76
|
-
return [4, requestContainer.call(this, __assign(__assign({}, options), { data: jsonData }))];
|
|
76
|
+
return [4, requestContainer.call(this, __assign(__assign({}, options), { data: jsonData }), customReqOpts)];
|
|
77
77
|
case 1: return [2, _a.sent()];
|
|
78
78
|
}
|
|
79
79
|
});
|
|
@@ -81,27 +81,44 @@ var CloudbaseRun = (function () {
|
|
|
81
81
|
};
|
|
82
82
|
return CloudbaseRun;
|
|
83
83
|
}());
|
|
84
|
-
export function requestContainer(options) {
|
|
84
|
+
export function requestContainer(options, customReqOpts) {
|
|
85
|
+
var _a;
|
|
85
86
|
return __awaiter(this, void 0, void 0, function () {
|
|
86
|
-
var name, data,
|
|
87
|
-
return __generator(this, function (
|
|
88
|
-
switch (
|
|
87
|
+
var name, data, _b, path, method, _c, header, _d, BASE_URL, PROTOCOL, endpoint, reqPath, isGetAndHead, dataParse_1, response;
|
|
88
|
+
return __generator(this, function (_e) {
|
|
89
|
+
switch (_e.label) {
|
|
89
90
|
case 0:
|
|
90
|
-
name = options.name, data = options.data,
|
|
91
|
-
|
|
91
|
+
name = options.name, data = options.data, _b = options.path, path = _b === void 0 ? '' : _b, method = options.method, _c = options.header, header = _c === void 0 ? {} : _c;
|
|
92
|
+
_d = this.getEndPointWithKey('GATEWAY'), BASE_URL = _d.BASE_URL, PROTOCOL = _d.PROTOCOL;
|
|
93
|
+
endpoint = "".concat(PROTOCOL).concat(BASE_URL, "/cloudrun/").concat(name);
|
|
92
94
|
reqPath = path.startsWith('/') ? path : "/".concat(path);
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
95
|
+
isGetAndHead = ['GET', 'HEAD'].includes((_a = method === null || method === void 0 ? void 0 : method.toUpperCase) === null || _a === void 0 ? void 0 : _a.call(method));
|
|
96
|
+
if (isGetAndHead) {
|
|
97
|
+
try {
|
|
98
|
+
dataParse_1 = {};
|
|
99
|
+
try {
|
|
100
|
+
dataParse_1 = JSON.parse(data);
|
|
101
|
+
}
|
|
102
|
+
catch (error) {
|
|
103
|
+
dataParse_1 = data || {};
|
|
104
|
+
}
|
|
105
|
+
reqPath = "".concat(reqPath).concat(reqPath.includes('?') ? '&' : '?').concat(Object.keys(dataParse_1)
|
|
106
|
+
.map(function (key) { return "".concat(key, "=").concat(dataParse_1[key]); })
|
|
107
|
+
.join('&'));
|
|
108
|
+
}
|
|
109
|
+
catch (error) {
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
return [4, this.request.fetch(__assign(__assign({ method: method || 'POST', headers: Object.assign({}, {
|
|
96
113
|
'Content-Type': 'application/json; charset=utf-8',
|
|
97
|
-
}, header),
|
|
98
|
-
body: data,
|
|
99
|
-
url: "".concat(endpoint).concat(reqPath),
|
|
100
|
-
})];
|
|
114
|
+
}, header) }, (isGetAndHead ? {} : { body: data })), { url: "".concat(endpoint).concat(reqPath), customReqOpts: customReqOpts }))];
|
|
101
115
|
case 1:
|
|
102
|
-
response =
|
|
116
|
+
response = _e.sent();
|
|
117
|
+
if ((customReqOpts === null || customReqOpts === void 0 ? void 0 : customReqOpts.from) === 'node-sdk') {
|
|
118
|
+
return [2, response];
|
|
119
|
+
}
|
|
103
120
|
return [4, response.data];
|
|
104
|
-
case 2: return [2,
|
|
121
|
+
case 2: return [2, _e.sent()];
|
|
105
122
|
}
|
|
106
123
|
});
|
|
107
124
|
});
|
|
@@ -125,4 +142,8 @@ export function registerCloudrun(app) {
|
|
|
125
142
|
console.warn(e);
|
|
126
143
|
}
|
|
127
144
|
}
|
|
128
|
-
|
|
145
|
+
try {
|
|
146
|
+
window.registerCloudrun = registerCloudrun;
|
|
147
|
+
}
|
|
148
|
+
catch (e) { }
|
|
149
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFHQSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFJeEMsSUFBQSxNQUFNLEdBQUssU0FBUyxPQUFkLENBQWM7QUFFNUIsSUFBTSxjQUFjLEdBQUcsVUFBVSxDQUFBO0FBRWpDO0lBQUE7SUFzQkEsQ0FBQztJQXJCYyxvQ0FBYSxHQUExQixVQUEyQixPQUE2QixFQUFFLGFBQThCOzs7Ozs7d0JBQzlFLElBQUksR0FBVyxPQUFPLEtBQWxCLEVBQUUsSUFBSSxHQUFLLE9BQU8sS0FBWixDQUFZO3dCQUU5QixJQUFJLENBQUMsSUFBSSxFQUFFOzRCQUNULE1BQU0sSUFBSSxLQUFLLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQztnQ0FDN0IsSUFBSSxFQUFFLE1BQU0sQ0FBQyxjQUFjO2dDQUMzQixHQUFHLEVBQUUsV0FBSSxjQUFjLGlDQUE4Qjs2QkFDdEQsQ0FBQyxDQUFFLENBQUE7eUJBQ0w7d0JBRUQsSUFBSTs0QkFDRixRQUFRLEdBQUcsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUE7eUJBQzVDO3dCQUFDLE9BQU8sQ0FBQyxFQUFFOzRCQUNWLE1BQU0sSUFBSSxLQUFLLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQztnQ0FDN0IsSUFBSSxFQUFFLE1BQU0sQ0FBQyxjQUFjO2dDQUMzQixHQUFHLEVBQUUsV0FBSSxjQUFjLGlDQUE4Qjs2QkFDdEQsQ0FBQyxDQUFFLENBQUE7eUJBQ0w7d0JBRU0sV0FBTSxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsSUFBSSx3QkFBTyxPQUFPLEtBQUUsSUFBSSxFQUFFLFFBQVEsS0FBSSxhQUFh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SUFBSTtJQUNGLFNBQVMsQ0FBQyxpQkFBaUIsQ0FBQyxTQUFTLENBQUMsQ0FBQTtDQUN2QztBQUFDLE9BQU8sQ0FBQyxFQUFFLEdBQUU7QUFFZCxNQUFNLFVBQVUsZ0JBQWdCLENBQUMsR0FBMEM7SUFDekUsSUFBSTtRQUNGLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBQyxTQUFTLENBQUMsQ0FBQTtLQUNqQztJQUFDLE9BQU8sQ0FBQyxFQUFFO1FBQ1YsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtLQUNoQjtBQUNILENBQUM7QUFFRCxJQUFJO0lBQ0QsTUFBYyxDQUFDLGdCQUFnQixHQUFHLGdCQUFnQixDQUFBO0NBQ3BEO0FBQUMsT0FBTyxDQUFDLEVBQUUsR0FBRSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IElDbG91ZGJhc2UgfSBmcm9tICdAY2xvdWRiYXNlL3R5cGVzJ1xuaW1wb3J0IHsgSUNsb3VkYmFzZUNvbXBvbmVudCB9IGZyb20gJ0BjbG91ZGJhc2UvdHlwZXMvY29tcG9uZW50J1xuaW1wb3J0IHsgSUNhbGxGdW5jdGlvbk9wdGlvbnMsIElDdXN0b21SZXFPcHRzIH0gZnJvbSAnQGNsb3VkYmFzZS90eXBlcy9mdW5jdGlvbnMnXG5pbXBvcnQgeyBjb25zdGFudHMgfSBmcm9tICdAY2xvdWRiYXNlL3V0aWxpdGllcydcblxuZGVjbGFyZSBjb25zdCBjbG91ZGJhc2U6IElDbG91ZGJhc2VcblxuY29uc3QgeyBFUlJPUlMgfSA9IGNvbnN0YW50c1xuXG5jb25zdCBDT01QT05FTlRfTkFNRSA9ICdjbG91ZHJ1bidcblxuY2xhc3MgQ2xvdWRiYXNlUnVuIHtcbiAgcHVibGljIGFzeW5jIGNhbGxDb250YWluZXIob3B0aW9uczogSUNhbGxGdW5jdGlvbk9wdGlvbnMsIGN1c3RvbVJlcU9wdHM/OiBJQ3VzdG9tUmVxT3B0cykge1xuICAgIGNvbnN0IHsgbmFtZSwgZGF0YSB9ID0gb3B0aW9uc1xuXG4gICAgaWYgKCFuYW1lKSB7XG4gICAgICB0aHJvdyBuZXcgRXJyb3IoSlNPTi5zdHJpbmdpZnkoe1xuICAgICAgICBjb2RlOiBFUlJPUlMuSU5WQUxJRF9QQVJBTVMsXG4gICAgICAgIG1zZzogYFske0NPTVBPTkVOVF9OQU1FfS5jYWxsQ29udGFpbmVyXSBpbnZhbGlkIG5hbWVgLFxuICAgICAgfSksKVxuICAgIH1cbiAgICBsZXQganNvbkRhdGFcbiAgICB0cnkge1xuICAgICAganNvbkRhdGEgPSBkYXRhID8gSlNPTi5zdHJpbmdpZnkoZGF0YSkgOiAnJ1xuICAgIH0gY2F0Y2ggKGUpIHtcbiAgICAgIHRocm93IG5ldyBFcnJvcihKU09OLnN0cmluZ2lmeSh7XG4gICAgICAgIGNvZGU6IEVSUk9SUy5JTlZBTElEX1BBUkFNUyxcbiAgICAgICAgbXNnOiBgWyR7Q09NUE9ORU5UX05BTUV9LmNhbGxDb250YWluZXJdIGludmFsaWQgZGF0YWAsXG4gICAgICB9KSwpXG4gICAgfVxuXG4gICAgcmV0dXJuIGF3YWl0IHJlcXVlc3RDb250YWluZXIuY2FsbCh0aGlzLCB7IC4uLm9wdGlvbnMsIGRhdGE6IGpzb25EYXRhIH0sIGN1c3RvbVJlcU9wdHMpXG4gIH1cbn1cblxuZXhwb3J0IGFzeW5jIGZ1bmN0aW9uIHJlcXVlc3RDb250YWluZXIodGhpczogYW55LCBvcHRpb25zOiBJQ2FsbEZ1bmN0aW9uT3B0aW9ucywgY3VzdG9tUmVxT3B0cz86IElDdXN0b21SZXFPcHRzKSB7XG4gIGNvbnN0IHsgbmFtZSwgZGF0YSwgcGF0aCA9ICcnLCBtZXRob2QsIGhlYWRlciA9IHt9IH0gPSBvcHRpb25zXG4gIGNvbnN0IHsgQkFTRV9VUkwsIFBST1RPQ09MIH0gPSB0aGlzLmdldEVuZFBvaW50V2l0aEtleSgnR0FURVdBWScpXG4gIGNvbnN0IGVuZHBvaW50ID0gYCR7UFJPVE9DT0x9JHtCQVNFX1VSTH0vY2xvdWRydW4vJHtuYW1lfWBcbiAgbGV0IHJlcVBhdGggPSBwYXRoLnN0YXJ0c1dpdGgoJy8nKSA/IHBhdGggOiBgLyR7cGF0aH1gXG4gIGNvbnN0IGlzR2V0QW5kSGVhZCA9IFsnR0VUJywgJ0hFQUQnXS5pbmNsdWRlcyhtZXRob2Q/LnRvVXBwZXJDYXNlPy4oKSlcblxuICBpZiAoaXNHZXRBbmRIZWFkKSB7XG4gICAgdHJ5IHtcbiAgICAgIGxldCBkYXRhUGFyc2UgPSB7fVxuICAgICAgdHJ5IHtcbiAgICAgICAgZGF0YVBhcnNlID0gSlNPTi5wYXJzZShkYXRhIGFzIGFueSlcbiAgICAgIH0gY2F0Y2ggKGVycm9yKSB7XG4gICAgICAgIGRhdGFQYXJzZSA9IGRhdGEgfHwge31cbiAgICAgIH1cbiAgICAgIHJlcVBhdGggPSBgJHtyZXFQYXRofSR7cmVxUGF0aC5pbmNsdWRlcygnPycpID8gJyYnIDogJz8nfSR7T2JqZWN0LmtleXMoZGF0YVBhcnNlKVxuICAgICAgICAubWFwKGtleSA9PiBgJHtrZXl9PSR7ZGF0YVBhcnNlW2tleV19YClcbiAgICAgICAgLmpvaW4oJyYnKX1gXG4gICAgfSBjYXRjaCAoZXJyb3IpIHtcbiAgICAgIC8vXG4gICAgfVxuICB9XG5cbiAgLy8gQHRzLWlnbm9yZVxuICBjb25zdCByZXNwb25zZSA9IGF3YWl0IHRoaXMucmVxdWVzdC5mZXRjaCh7XG4gICAgbWV0aG9kOiBtZXRob2QgfHwgJ1BPU1QnLFxuICAgIGhlYWRlcnM6IE9iamVjdC5hc3NpZ24oXG4gICAgICB7fSxcbiAgICAgIHtcbiAgICAgICAgJ0NvbnRlbnQtVHlwZSc6ICdhcHBsaWNhdGlvbi9qc29uOyBjaGFyc2V0PXV0Zi04JyxcbiAgICAgIH0sXG4gICAgICBoZWFkZXIsXG4gICAgKSxcbiAgICAvLyBSZXF1ZXN0IHdpdGggR0VUL0hFQUQgbWV0aG9kIGNhbm5vdCBoYXZlIGJvZHlcbiAgICAuLi4oaXNHZXRBbmRIZWFkID8ge30gOiB7IGJvZHk6IGRhdGEgfSksXG4gICAgdXJsOiBgJHtlbmRwb2ludH0ke3JlcVBhdGh9YCxcbiAgICBjdXN0b21SZXFPcHRzLFxuICB9KVxuXG4gIGlmIChjdXN0b21SZXFPcHRzPy5mcm9tID09PSAnbm9kZS1zZGsnKSB7XG4gICAgcmV0dXJuIHJlc3BvbnNlXG4gIH1cblxuICByZXR1cm4gYXdhaXQgcmVzcG9uc2UuZGF0YVxufVxuXG5jb25zdCBjbG91ZGJhc2VSdW4gPSBuZXcgQ2xvdWRiYXNlUnVuKClcblxuY29uc3QgY29tcG9uZW50OiBJQ2xvdWRiYXNlQ29tcG9uZW50ID0ge1xuICBuYW1lOiBDT01QT05FTlRfTkFNRSxcbiAgZW50aXR5OiB7XG4gICAgY2FsbENvbnRhaW5lcjogY2xvdWRiYXNlUnVuLmNhbGxDb250YWluZXIsXG4gIH0sXG59XG50cnkge1xuICBjbG91ZGJhc2UucmVnaXN0ZXJDb21wb25lbnQoY29tcG9uZW50KVxufSBjYXRjaCAoZSkge31cblxuZXhwb3J0IGZ1bmN0aW9uIHJlZ2lzdGVyQ2xvdWRydW4oYXBwOiBQaWNrPElDbG91ZGJhc2UsICdyZWdpc3RlckNvbXBvbmVudCc+KSB7XG4gIHRyeSB7XG4gICAgYXBwLnJlZ2lzdGVyQ29tcG9uZW50KGNvbXBvbmVudClcbiAgfSBjYXRjaCAoZSkge1xuICAgIGNvbnNvbGUud2FybihlKVxuICB9XG59XG5cbnRyeSB7XG4gICh3aW5kb3cgYXMgYW55KS5yZWdpc3RlckNsb3VkcnVuID0gcmVnaXN0ZXJDbG91ZHJ1blxufSBjYXRjaCAoZSkge31cbiJdfQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cloudbase/cloudrun",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.2",
|
|
4
4
|
"description": "cloudbase javascript sdk cloudrun componets",
|
|
5
5
|
"main": "dist/cjs/index.js",
|
|
6
6
|
"module": "dist/esm/index.js",
|
|
@@ -29,8 +29,8 @@
|
|
|
29
29
|
"license": "Apache-2.0",
|
|
30
30
|
"dependencies": {
|
|
31
31
|
"@cloudbase/adapter-interface": "^0.7.1",
|
|
32
|
-
"@cloudbase/types": "3.0.
|
|
33
|
-
"@cloudbase/utilities": "3.0.
|
|
32
|
+
"@cloudbase/types": "3.0.2",
|
|
33
|
+
"@cloudbase/utilities": "3.0.2"
|
|
34
34
|
},
|
|
35
|
-
"gitHead": "
|
|
35
|
+
"gitHead": "56b879a3e173e64e44ca36c1260b3fc66d0e822a"
|
|
36
36
|
}
|
package/src/index.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ICloudbase } from '@cloudbase/types'
|
|
2
2
|
import { ICloudbaseComponent } from '@cloudbase/types/component'
|
|
3
|
-
import { ICallFunctionOptions } from '@cloudbase/types/functions'
|
|
3
|
+
import { ICallFunctionOptions, ICustomReqOpts } from '@cloudbase/types/functions'
|
|
4
4
|
import { constants } from '@cloudbase/utilities'
|
|
5
5
|
|
|
6
6
|
declare const cloudbase: ICloudbase
|
|
@@ -10,7 +10,7 @@ const { ERRORS } = constants
|
|
|
10
10
|
const COMPONENT_NAME = 'cloudrun'
|
|
11
11
|
|
|
12
12
|
class CloudbaseRun {
|
|
13
|
-
public async callContainer(options: ICallFunctionOptions) {
|
|
13
|
+
public async callContainer(options: ICallFunctionOptions, customReqOpts?: ICustomReqOpts) {
|
|
14
14
|
const { name, data } = options
|
|
15
15
|
|
|
16
16
|
if (!name) {
|
|
@@ -29,14 +29,33 @@ class CloudbaseRun {
|
|
|
29
29
|
}),)
|
|
30
30
|
}
|
|
31
31
|
|
|
32
|
-
return await requestContainer.call(this, { ...options, data: jsonData })
|
|
32
|
+
return await requestContainer.call(this, { ...options, data: jsonData }, customReqOpts)
|
|
33
33
|
}
|
|
34
34
|
}
|
|
35
35
|
|
|
36
|
-
export async function requestContainer(this: any, options: ICallFunctionOptions) {
|
|
36
|
+
export async function requestContainer(this: any, options: ICallFunctionOptions, customReqOpts?: ICustomReqOpts) {
|
|
37
37
|
const { name, data, path = '', method, header = {} } = options
|
|
38
|
-
const
|
|
39
|
-
const
|
|
38
|
+
const { BASE_URL, PROTOCOL } = this.getEndPointWithKey('GATEWAY')
|
|
39
|
+
const endpoint = `${PROTOCOL}${BASE_URL}/cloudrun/${name}`
|
|
40
|
+
let reqPath = path.startsWith('/') ? path : `/${path}`
|
|
41
|
+
const isGetAndHead = ['GET', 'HEAD'].includes(method?.toUpperCase?.())
|
|
42
|
+
|
|
43
|
+
if (isGetAndHead) {
|
|
44
|
+
try {
|
|
45
|
+
let dataParse = {}
|
|
46
|
+
try {
|
|
47
|
+
dataParse = JSON.parse(data as any)
|
|
48
|
+
} catch (error) {
|
|
49
|
+
dataParse = data || {}
|
|
50
|
+
}
|
|
51
|
+
reqPath = `${reqPath}${reqPath.includes('?') ? '&' : '?'}${Object.keys(dataParse)
|
|
52
|
+
.map(key => `${key}=${dataParse[key]}`)
|
|
53
|
+
.join('&')}`
|
|
54
|
+
} catch (error) {
|
|
55
|
+
//
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
|
|
40
59
|
// @ts-ignore
|
|
41
60
|
const response = await this.request.fetch({
|
|
42
61
|
method: method || 'POST',
|
|
@@ -47,10 +66,16 @@ export async function requestContainer(this: any, options: ICallFunctionOptions)
|
|
|
47
66
|
},
|
|
48
67
|
header,
|
|
49
68
|
),
|
|
50
|
-
body
|
|
69
|
+
// Request with GET/HEAD method cannot have body
|
|
70
|
+
...(isGetAndHead ? {} : { body: data }),
|
|
51
71
|
url: `${endpoint}${reqPath}`,
|
|
72
|
+
customReqOpts,
|
|
52
73
|
})
|
|
53
74
|
|
|
75
|
+
if (customReqOpts?.from === 'node-sdk') {
|
|
76
|
+
return response
|
|
77
|
+
}
|
|
78
|
+
|
|
54
79
|
return await response.data
|
|
55
80
|
}
|
|
56
81
|
|
|
@@ -73,3 +98,7 @@ export function registerCloudrun(app: Pick<ICloudbase, 'registerComponent'>) {
|
|
|
73
98
|
console.warn(e)
|
|
74
99
|
}
|
|
75
100
|
}
|
|
101
|
+
|
|
102
|
+
try {
|
|
103
|
+
(window as any).registerCloudrun = registerCloudrun
|
|
104
|
+
} catch (e) {}
|