chtk/updates
1
0
Fork 0
forked from silverwind/updates
Code Pull Requests Activity

more refactor

Browse Source
This commit is contained in:
silverwind 2024-03-19 00:59:53 +01:00
parent d94ed4fd4f
commit 25fa123af6
Signed by untrusted user: silverwind
GPG Key ID: 2E62B41C93869443
1 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
updates.js
View File

@ -105,19 +105,11 @@ const registryUrl = memize((scope, npmrc) => {
return url.endsWith("/") ? url : `${url}/`; return url.endsWith("/") ? url : `${url}/`;
}); });
function findUpSync(filename, dir, stopDir) { function findUpSync(filename, dir) {
const path = join(dir, filename); const path = join(dir, filename);
try { try { accessSync(path); return path; } catch {}
accessSync(path);
return path;
} catch {}
const parent = dirname(dir); const parent = dirname(dir);
if ((stopDir && path === stopDir) || parent === dir) { return parent === dir ? null : findUpSync(filename, parent);
return null;
} else {
return findUpSync(filename, parent, stopDir);
}
} }
function getAuthAndRegistry(name, registry) { function getAuthAndRegistry(name, registry) {
@ -146,17 +138,21 @@ const getFetchOpts = memize((agentOpts, authType, authToken) => {
}; };
}); });
async function doFetch(url, opts) {
if (args.verbose) console.error(`${magenta("fetch")} ${url}`);
const res = await fetch(url, opts);
if (args.verbose) console.error(`${res.ok ? green("done") : red("error")} ${url}`);
return res;
}
async function fetchNpmInfo(name, type, originalRegistry, agentOpts) { async function fetchNpmInfo(name, type, originalRegistry, agentOpts) {
const [auth, registry] = getAuthAndRegistry(name, originalRegistry); const [auth, registry] = getAuthAndRegistry(name, originalRegistry);
const packageName = type === "resolutions" ? resolutionsBasePackage(name) : name; const packageName = type === "resolutions" ? resolutionsBasePackage(name) : name;
const urlName = packageName.replace(/\//g, "%2f"); const urlName = packageName.replace(/\//g, "%2f");
const url = `${registry}/${urlName}`; const url = `${registry}/${urlName}`;
if (args.verbose) console.error(`${magenta("fetch")} ${url}`); const res = await doFetch(url, getFetchOpts(agentOpts, auth?.type, auth?.token));
const res = await fetch(url, getFetchOpts(agentOpts, auth?.type, auth?.token));
if (res?.ok) { if (res?.ok) {
if (args.verbose) console.error(`${green("done")} ${url}`);
return [await res.json(), type, registry, name]; return [await res.json(), type, registry, name];
} else { } else {
if (res?.status && res?.statusText) { if (res?.status && res?.statusText) {
@ -169,11 +165,9 @@ async function fetchNpmInfo(name, type, originalRegistry, agentOpts) {
async function fetchPypiInfo(name, type, agentOpts) { async function fetchPypiInfo(name, type, agentOpts) {
const url = `${pypiApiUrl}/pypi/${name}/json`; const url = `${pypiApiUrl}/pypi/${name}/json`;
if (args.verbose) console.error(`${magenta("fetch")} ${url}`);
const res = await fetch(url, getFetchOpts(agentOpts)); const res = await doFetch(url, getFetchOpts(agentOpts));
if (res?.ok) { if (res?.ok) {
if (args.verbose) console.error(`${green("done")} ${url}`);
return [await res.json(), type, null, name]; return [await res.json(), type, null, name];
} else { } else {
if (res?.status && res?.statusText) { if (res?.status && res?.statusText) {
@ -516,15 +510,12 @@ function fetchGitHub(url) {
if (token) { if (token) {
opts.headers = {Authorization: `Bearer ${token}`}; opts.headers = {Authorization: `Bearer ${token}`};
} }
return fetch(url, opts); return doFetch(url, opts);
} }
async function getLastestCommit(user, repo) { async function getLastestCommit(user, repo) {
const url = `${githubApiUrl}/repos/${user}/${repo}/commits`; const url = `${githubApiUrl}/repos/${user}/${repo}/commits`;
if (args.verbose) console.error(`${magenta("fetch")} ${url}`);
const res = await fetchGitHub(url); const res = await fetchGitHub(url);
if (args.verbose && res?.ok) console.error(`${green("done")} ${url}`);
if (!res || !res.ok) return; if (!res || !res.ok) return;
const data = await res.json(); const data = await res.json();
const {sha: hash, commit} = data[0]; const {sha: hash, commit} = data[0];