Oak-Team
/
oak-domain
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 33 Wiki Activity

merge

This commit is contained in:
Xu Chang 2023-06-12 09:16:42 +08:00
parent 6d85c2291a 75b1d3d131
commit b66c2886c1
2 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/utils/SimpleConnector.js
View File

@ -150,17 +150,19 @@ var SimpleConnector = /** @class */ (function (_super) {
* @param headers
*/
SimpleConnector.prototype.makeBridgeUrl = function (url, headers) {
if (process.env.NODE_ENV === 'development' && process.env.PROD !== 'true') {
console.warn('在development下无法通过bridge访问资源，将直接访问，可能失败', url);
return url;
}
var search = new url_1.default.URLSearchParams({
url: url,
});
if (headers) {
search.append('headers', JSON.stringify(headers));
}
return "".concat(this.serverBridgeUrl, "?").concat(search.toString());
// if (process.env.PROD !== 'true') {
//     console.warn('在development下无法通过bridge访问资源，将直接访问，可能失败', url);
//     return url;
// }
var encodeUrl = encodeURIComponent(url);
// const urlParse = URL.parse(url, true);
// const { search } = urlParse as {
//     search: string;
// };
// if (headers) {
//     search.append('headers', JSON.stringify(headers));
// }
return "".concat(this.serverBridgeUrl, "?url=").concat(encodeUrl);
};
SimpleConnector.prototype.parseBridgeRequestQuery = function (urlParams) {
var search = new url_1.default.URLSearchParams(urlParams);

25
src/utils/SimpleConnector.ts
View File

@ -145,19 +145,20 @@ export class SimpleConnector<ED extends EntityDict, BackCxt extends AsyncContext
* @param headers
*/
makeBridgeUrl(url: string, headers?: Record<string, string>) {
if (process.env.NODE_ENV === 'development' && process.env.PROD !== 'true') {
console.warn('在development下无法通过bridge访问资源，将直接访问，可能失败', url);
return url;
}
// if (process.env.PROD !== 'true') {
//     console.warn('在development下无法通过bridge访问资源，将直接访问，可能失败', url);
//     return url;
// }
const encodeUrl = encodeURIComponent(url);
// const urlParse = URL.parse(url, true);
// const { search } = urlParse as {
//     search: string;
// };
// if (headers) {
//     search.append('headers', JSON.stringify(headers));
// }
const search = new URL.URLSearchParams({
url,
});
if (headers) {
search.append('headers', JSON.stringify(headers));
}
return `${this.serverBridgeUrl}?${search.toString()}`;
return `${this.serverBridgeUrl}?url=${encodeUrl}`;
}
parseBridgeRequestQuery(urlParams: string): { url: string; headers?: Record<string, string> | undefined; } {
const search = new URL.URLSearchParams(urlParams);