Skip to content

Commit 892d2ad

Browse files
refactor: modify one-time fetch to be format-agnostic
return a string, not JSON
1 parent b122640 commit 892d2ad

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

src/main/one-time-fetch.ts

+2-6
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,8 @@ async function oneTimeFetch(url) {
88
if (url.length == 0) return false
99

1010
let res = await fetch(url)
11-
if (res) {
12-
return res.json()
13-
}
14-
else {
15-
return null
16-
}
11+
let txt = await res.text()
12+
return txt ?? null
1713
}
1814

1915
function setupOneTimeFetchEvent() {
+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { ipcRenderer } from 'electron'
22
import * as events from 'shared/main-renderer-events'
33

4-
// get JSON data from an arbitrary endpoint
4+
// get data from an arbitrary endpoint using main process fetch
55
export function oneTimeFetch(url) {
6-
return new Promise<JSON>((resolve, reject) => {
7-
ipcRenderer.send(events.IPC_EVENT_oneTimeFetch, url)
8-
ipcRenderer.once(events.IPC_EVENT_oneTimeFetch, (event, res: JSON) => {
6+
return new Promise<string>((resolve, reject) => {
7+
ipcRenderer.once(events.IPC_EVENT_oneTimeFetch, (event, res) => {
98
resolve(res)
109
})
10+
ipcRenderer.send(events.IPC_EVENT_oneTimeFetch, url)
1111
})
1212
}

src/renderer/utils/sponsorship.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ let defaultSponsorshipMessage = {
1212
async function updateSponsorshipMessage() {
1313
// fetch the latest sponsorship message
1414
try {
15-
let sponsorshipData = await App.oneTimeFetch(
15+
let data = await App.oneTimeFetch(
1616
'https://dl.daisy.org/tools/sponsorship.json'
1717
)
18-
if (sponsorshipData) {
18+
if (data) {
19+
let sponsorshipData = JSON.parse(data)
1920
return sponsorshipData['PipelineApp']['en']
2021
} else {
2122
return defaultSponsorshipMessage

0 commit comments

Comments
 (0)