open.source/stylus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use second metablock's @updateURL in USO-archive styles

Browse Source 
fixes #1323
This commit is contained in:
tophf 2021-08-23 16:21:40 +03:00
parent 2eeab2c1be
commit b0ed85c5ea
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
background/update-manager.js
View File

@ -164,15 +164,11 @@ const updateMan = (() => {
} }
async function updateToUSOArchive(url, req) { async function updateToUSOArchive(url, req) {
// UserCSS metadata may be embedded in the original USO style so let's use its updateURL const m2 = getUsoEmbeddedMeta(req.response);
const [meta2] = req.response.replace(RX_META, '').match(RX_META) || []; if (m2) {
if (meta2 && meta2.includes('@updateURL')) { url = (await m2).updateUrl;
const {updateUrl} = await API.usercss.buildMeta({sourceCode: meta2}).catch(() => ({}));
if (updateUrl) {
url = updateUrl;
req = await tryDownload(url, RH_ETAG); req = await tryDownload(url, RH_ETAG);
} }
}
const json = await API.usercss.buildMeta({ const json = await API.usercss.buildMeta({
id, id,
etag: req.headers.etag, etag: req.headers.etag,
@ -209,13 +205,21 @@ const updateMan = (() => {
} }
async function updateUsercss() { async function updateUsercss() {
if (style.etag && style.etag === await downloadEtag()) { let oldVer = ucd.version;
let {etag: oldEtag, updateUrl} = style;
let m2 = URLS.extractUsoArchiveId(updateUrl) && getUsoEmbeddedMeta();
if (m2 && (m2 = await m2).updateUrl) {
updateUrl = m2.updateUrl;
oldVer = m2.usercssData.version || '0';
oldEtag = '';
}
if (oldEtag && oldEtag === await downloadEtag()) {
return Promise.reject(STATES.SAME_CODE); return Promise.reject(STATES.SAME_CODE);
} }
// TODO: when sourceCode is > 100kB use http range request(s) for version check // TODO: when sourceCode is > 100kB use http range request(s) for version check
const {headers: {etag}, response} = await tryDownload(style.updateUrl, RH_ETAG); const {headers: {etag}, response} = await tryDownload(updateUrl, RH_ETAG);
const json = await API.usercss.buildMeta({sourceCode: response, etag}); const json = await API.usercss.buildMeta({sourceCode: response, etag, updateUrl});
const delta = compareVersion(json.usercssData.version, ucd.version); const delta = compareVersion(json.usercssData.version, oldVer);
let err; let err;
if (!delta && !ignoreDigest) { if (!delta && !ignoreDigest) {
// re-install is invalid in a soft upgrade // re-install is invalid in a soft upgrade
@ -285,6 +289,12 @@ const updateMan = (() => {
} }
} }
/** UserCSS metadata may be embedded in the original USO style so let's use its updateURL */
function getUsoEmbeddedMeta(code = style.sourceCode) {
const m = code.includes('@updateURL') && code.replace(RX_META, '').match(RX_META);
return m && API.usercss.buildMeta({sourceCode: m[0]}).catch(() => null);
}
function getVarOptByName(varDef, name) { function getVarOptByName(varDef, name) {
return varDef.options.find(o => o.name === name); return varDef.options.find(o => o.name === name);
} }