From a342b7edec447c5c23e3a50e667798e54cd79b6b Mon Sep 17 00:00:00 2001 From: Xmader Date: Tue, 20 Oct 2020 01:39:38 -0400 Subject: [PATCH] refactor --- src/mscore.ts | 7 ++----- src/utils.ts | 6 ++++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/mscore.ts b/src/mscore.ts index 4a48dcf..7ef0134 100644 --- a/src/mscore.ts +++ b/src/mscore.ts @@ -1,5 +1,6 @@ import { fetchMscz } from './mscz' +import { fetchData } from './utils' const WEBMSCORE_URL = 'https://cdn.jsdelivr.net/npm/webmscore@0.10/webmscore.js' @@ -25,11 +26,7 @@ const initFonts = () => { // CJK (East Asian) characters will be rendered as "tofu" if there is no font if (!fonts) { fonts = Promise.all( - FONT_URLS.map(async (url) => { - const r = await fetch(url) - const data = await r.arrayBuffer() - return new Uint8Array(data) - }), + FONT_URLS.map(url => fetchData(url)), ) } } diff --git a/src/utils.ts b/src/utils.ts index 8fb45ad..f5c11a8 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -13,6 +13,12 @@ export const getIndexPath = (id: number): string => { return indexN.join('/') } +export const fetchData = async (url: string, init?: RequestInit): Promise => { + const r = await fetch(url, init) + const data = await r.arrayBuffer() + return new Uint8Array(data) +} + export const waitForDocumentLoaded = (): Promise => { if (document.readyState !== 'complete') { return new Promise(resolve => {