From 819409bce1b25eac0de345ad94542e52bb6a3b86 Mon Sep 17 00:00:00 2001 From: MathieuG-P <40181755+Zagrios@users.noreply.github.com> Date: Thu, 5 Oct 2023 16:36:25 +0200 Subject: [PATCH] [bugfix] fix wrong configuration https --- src/main/services/ipc.service.ts | 2 +- src/main/services/request.service.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/services/ipc.service.ts b/src/main/services/ipc.service.ts index 9ef6ff4f..e48ea26f 100644 --- a/src/main/services/ipc.service.ts +++ b/src/main/services/ipc.service.ts @@ -52,7 +52,7 @@ export class IpcService { const sub = observable.subscribe({ next: data => this.send(channel, window, data), error: error => { - log.error(error); + log.error(channel, error); this.send(this.getErrorChannel(channel), window, error); }, complete: () => this.send(this.getCompleteChannel(channel), window) diff --git a/src/main/services/request.service.ts b/src/main/services/request.service.ts index 87e5916d..e6e208c6 100644 --- a/src/main/services/request.service.ts +++ b/src/main/services/request.service.ts @@ -24,10 +24,10 @@ export class RequestService { public async getJSON(url: RequestInfo, options?: RequestInit): Promise { try { - const response = await fetch(url, {...{ agent: this.ipv4Agent }, ...options}); + const response = await fetch(url, {...options, agent: this.ipv4Agent}); if (!response.ok) { - throw new Error(`HTTP error! status: ${response.status} ${response}`); + throw new Error(`HTTP error! status: ${response.status} ${url}`); } return await response.json(); @@ -50,7 +50,7 @@ export class RequestService { }); file.on("error", err => unlink(dest, () => subscriber.error(err))); - const req = get({href: url, agent: this.ipv4Agent}, res => { + const req = get(url, { agent: this.ipv4Agent }, res => { progress.total = parseInt(res.headers?.["content-length"] || "0", 10); res.on("data", chunk => { @@ -77,7 +77,7 @@ export class RequestService { const allChunks: Buffer[] = []; - const req = get({href: url, agent: this.ipv4Agent}, res => { + const req = get(url, { agent: this.ipv4Agent }, res => { progress.total = parseInt(res.headers?.["content-length"] || "0", 10); res.on("data", chunk => {