diff --git a/package-lock.json b/package-lock.json index b8b6b8c..8625880 100644 --- a/package-lock.json +++ b/package-lock.json @@ -709,18 +709,26 @@ } }, "elliptic": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz", - "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==", + "version": "6.5.4", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", + "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", "dev": true, "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", + "bn.js": "^4.11.9", + "brorand": "^1.1.0", "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.0" + "hmac-drbg": "^1.0.1", + "inherits": "^2.0.4", + "minimalistic-assert": "^1.0.1", + "minimalistic-crypto-utils": "^1.0.1" + }, + "dependencies": { + "bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true + } } }, "emoji-regex": { diff --git a/src/cli.ts b/src/cli.ts index fc60273..3a1b98e 100644 --- a/src/cli.ts +++ b/src/cli.ts @@ -88,7 +88,7 @@ void (async () => { if (!confirmed) return // initiate LibreScore link request - librescoreLink = getLibreScoreLink(scoreinfo) + librescoreLink = getLibreScoreLink(scoreinfo, true) // print a blank line to the terminal console.log() @@ -133,6 +133,8 @@ void (async () => { spinner.info('Score loaded by webmscore') } catch (err) { spinner.fail(err.message) + spinner.info( + "Send your URL to the #dataset-bugs channel in the LibreScore Community Discord server:\n https://discord.gg/kTyx6nUjMv"); return } spinner.succeed('OK\n') diff --git a/src/librescore-link.ts b/src/librescore-link.ts index 04d8044..bdcc5cf 100644 --- a/src/librescore-link.ts +++ b/src/librescore-link.ts @@ -6,7 +6,7 @@ const _getLink = (scorepack: string) => { return `https://librescore.org/score/${scorepack}` } -export const getLibreScoreLink = async (scoreinfo: ScoreInfo, _fetch = getFetch()): Promise => { +export const getLibreScoreLink = async (scoreinfo: ScoreInfo, isMsdl: boolean, _fetch = getFetch()): Promise => { const mainCid = await getMainCid(scoreinfo, _fetch) const ref = scoreinfo.getScorepackRef(mainCid) const url = `https://ipfs.infura.io:5001/api/v0/dag/get?arg=${ref}` @@ -16,7 +16,7 @@ export const getLibreScoreLink = async (scoreinfo: ScoreInfo, _fetch = getFetch( assertRes(r0) } const res: { Message: string } | string = await r0.json() - if (typeof res !== 'string') { + if (typeof res !== 'string' && !isMsdl) { // read further error msg throw new Error(res.Message) } diff --git a/src/mscz.ts b/src/mscz.ts index a2e43e5..7234162 100644 --- a/src/mscz.ts +++ b/src/mscz.ts @@ -48,7 +48,7 @@ export const loadMsczUrl = async (scoreinfo: ScoreInfo, _fetch = getFetch()): Pr // read further error msg const err = cidRes.Message if (err.includes('no link named')) { // file not found - throw new Error('score not in dataset') + throw new Error('Score not in dataset') } else { throw new Error(err) }