From f666805425fafd2bfa4aa5e63f33af53626040e4 Mon Sep 17 00:00:00 2001 From: TheoryOfNekomata Date: Sat, 25 Jul 2020 03:53:05 +0800 Subject: [PATCH] Fix URL bug Specify URL for querying in shields. --- getBadgeUrl.js | 5 ++++- index.js | 2 +- loadBrands.js | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/getBadgeUrl.js b/getBadgeUrl.js index 242f7f6..8881f3b 100644 --- a/getBadgeUrl.js +++ b/getBadgeUrl.js @@ -1,3 +1,4 @@ +const path = require('path') const RESOLVE = require('./resolve.json') const loadBrands = require('./loadBrands') const getLibraryColor = require('./getLibraryColor') @@ -27,6 +28,7 @@ module.exports = async ({ label: repo, style, labelColor, + url: new URL(path.join(repo, 'raw', 'branch', process.env.MAIN_BRANCH, 'package.json'), process.env.REPO_BASE_URL), }).toString() return badgeUrl case 'dependency': @@ -42,7 +44,8 @@ module.exports = async ({ logo: libraryInfo.name, logoColor, style, - }) + url: new URL(path.join(repo, 'raw', 'branch', process.env.MAIN_BRANCH, 'package.json'), process.env.REPO_BASE_URL), + }).toString() return badgeUrl default: break diff --git a/index.js b/index.js index 82358ce..4d2d5fd 100644 --- a/index.js +++ b/index.js @@ -30,7 +30,7 @@ const server = http.createServer(async (req, res) => { const response = await axios({ method: 'GET', - url: badgeUrl, + url: badgeUrl.toString(), responseType: 'stream' }) res.writeHead(200, { 'content-type': 'image/svg+xml', }) diff --git a/loadBrands.js b/loadBrands.js index aa0094f..fb28850 100644 --- a/loadBrands.js +++ b/loadBrands.js @@ -38,7 +38,7 @@ const fetchBrands = () => new Promise(async (resolve, reject) => { module.exports = () => new Promise((resolve, reject) => { fs.readFile(process.env.BRANDS_JSON_FILE_PATH, async (err, file) => { - if (err.code === 'ENOENT') { + if (err && err.code === 'ENOENT') { const result = await fetchBrands() resolve(result) return