mirror/appium
1
0
Fork 0
mirror of https://github.com/appium/appium.git synced 2026-02-20 18:30:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(base-driver): Use proper cached headers for app download (#18874)

Browse Source
This commit is contained in:
Mykola Mokhnach
2023-07-14 17:59:12 +00:00
committed by GitHub
parent e5b569c3a0
commit 75650a6b74
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/base-driver/lib/basedriver/helpers.js
View File

@@ -141,6 +141,9 @@ async function configureApp(
const isUrl = protocol === null ? false : ['http:', 'https:'].includes(protocol);
const cachedAppInfo = APPLICATIONS_CACHE.get(app);
if (cachedAppInfo) {
logger.debug(`Cached app data: ${JSON.stringify(cachedAppInfo, null, 2)}`);
}
return await APPLICATIONS_CACHE_GUARD.acquire(app, async () => {
if (isUrl) {
@@ -150,27 +153,23 @@ async function configureApp(
...DEFAULT_REQ_HEADERS,
};
if (cachedAppInfo?.etag) {
reqHeaders['if-none-match'] = remoteAppProps.etag;
reqHeaders['if-none-match'] = cachedAppInfo.etag;
} else if (cachedAppInfo?.lastModified) {
reqHeaders['if-modified-since'] = remoteAppProps.lastModified?.toString();
reqHeaders['if-modified-since'] = cachedAppInfo.lastModified.toUTCString();
}
let {headers, stream, status} = await queryAppLink(newApp, reqHeaders);
try {
if (!_.isEmpty(headers)) {
logger.debug(`Etag: ${remoteAppProps?.etag} -> ${headers.etag}`);
logger.debug(`Etag: ${headers.etag}`);
if (headers.etag) {
remoteAppProps.etag = headers.etag;
}
logger.debug(
`Last-Modified: ${remoteAppProps?.['last-modified']} -> ${headers['last-modified']}`
);
logger.debug(`Last-Modified: ${headers['last-modified']}`);
if (headers['last-modified']) {
remoteAppProps.lastModified = new Date(headers['last-modified']);
}
logger.debug(
`Cache-Control: ${remoteAppProps?.['cache-control']} -> ${headers['cache-control']}`
);
logger.debug(`Cache-Control: ${headers['cache-control']}`);
if (headers['cache-control']) {
remoteAppProps.immutable = /\bimmutable\b/i.test(headers['cache-control']);
const maxAgeMatch = /\bmax-age=(\d+)\b/i.exec(headers['cache-control']);