gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

server-esm: Handle async client

Browse Source
This commit is contained in:
Elian Doran 2024-07-18 23:42:54 +03:00
parent da0829245f
commit f137d38300
No known key found for this signature in database
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/services/request.ts
View File

@ -50,7 +50,7 @@ async function exec<T>(opts: ExecOpts): Promise<T> {
const proxyAgent = await getProxyAgent(opts); const proxyAgent = await getProxyAgent(opts);
const parsedTargetUrl = url.parse(opts.url); const parsedTargetUrl = url.parse(opts.url);
return new Promise((resolve, reject) => { return new Promise(async (resolve, reject) => {
try { try {
const headers: Record<string, string | number> = { const headers: Record<string, string | number> = {
Cookie: (opts.cookieJar && opts.cookieJar.header) || "", Cookie: (opts.cookieJar && opts.cookieJar.header) || "",
@ -64,7 +64,7 @@ async function exec<T>(opts: ExecOpts): Promise<T> {
headers['trilium-cred'] = Buffer.from(`dummy:${opts.auth.password}`).toString('base64'); headers['trilium-cred'] = Buffer.from(`dummy:${opts.auth.password}`).toString('base64');
} }
const request = client.request({ const request = (await client).request({
method: opts.method, method: opts.method,
// url is used by electron net module // url is used by electron net module
url: opts.url, url: opts.url,
@ -145,7 +145,7 @@ async function getImage(imageUrl: string): Promise<Buffer> {
proxy: proxyConf !== "noproxy" ? proxyConf : null proxy: proxyConf !== "noproxy" ? proxyConf : null
}; };
const client = getClient(opts); const client = await getClient(opts);
const proxyAgent = await getProxyAgent(opts); const proxyAgent = await getProxyAgent(opts);
const parsedTargetUrl = url.parse(opts.url); const parsedTargetUrl = url.parse(opts.url);
@ -207,19 +207,17 @@ async function getProxyAgent(opts: ClientOpts) {
return new AgentClass(opts.proxy); return new AgentClass(opts.proxy);
} }
function getClient(opts: ClientOpts): Client { async function getClient(opts: ClientOpts): Promise<Client> {
// it's not clear how to explicitly configure proxy (as opposed to system proxy), // it's not clear how to explicitly configure proxy (as opposed to system proxy),
// so in that case, we always use node's modules // so in that case, we always use node's modules
if (utils.isElectron() && !opts.proxy) { if (utils.isElectron() && !opts.proxy) {
return require('electron').net as Client; return (await import('electron')).net as Client;
} } else {
else {
const {protocol} = url.parse(opts.url); const {protocol} = url.parse(opts.url);
if (protocol === 'http:' || protocol === 'https:') { if (protocol === 'http:' || protocol === 'https:') {
return require(protocol.substr(0, protocol.length - 1)); return await import(protocol.substr(0, protocol.length - 1));
} } else {
else {
throw new Error(`Unrecognized protocol '${protocol}'`); throw new Error(`Unrecognized protocol '${protocol}'`);
} }
} }