Skip to content

Commit dec39ae

Browse files
committed
download bug fixes:
- fix bug with fuzzy match revisit records getting invalid timestamp - fix missing return in recorder, caused potentially invalid redirect to be added - remove unused assignment in requestresponseinfo bump to 0.6.15
1 parent a389ae9 commit dec39ae

File tree

8 files changed

+15
-13
lines changed

8 files changed

+15
-13
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "archiveweb.page",
3-
"version": "0.6.14",
3+
"version": "0.6.15",
44
"main": "index.js",
55
"description": "Create Web Archives directly in your browser",
66
"repository": "https://github.com/webrecorder/archiveweb.page",

src/downloader.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,7 @@ class Downloader
361361
const m = resource.url.match(SPLIT_REQUEST_Q_RX);
362362
if (m) {
363363
data.url = m[1];
364+
// resource.requestBody is the raw payload, use the converted one from the url for the cdx
364365
data.requestBody = m[2];
365366
}
366367
data.method = resource.method;
@@ -621,7 +622,8 @@ class Downloader
621622
// if original request body + original requestURL is preserved, write that with original method
622623
// otherwise, just serialize the converted-to-GET form
623624
if (resource.method && resource.method !== "GET" && resource.requestBody && resource.requestUrl) {
624-
requestBody = resource.requestBody;
625+
// ensure payload is an arraybuffer
626+
requestBody = typeof(resource.requestBody) === "string" ? encoder.encode(resource.requestBody) : resource.requestBody;
625627
method = resource.method;
626628
url = resource.requestUrl;
627629
} else {
@@ -631,7 +633,6 @@ class Downloader
631633
const digestOriginal = this.digestsVisted[resource.digest];
632634

633635
if (resource.digest && digestOriginal) {
634-
635636
// if exact resource in a row, and same page, then just skip instead of writing revisit
636637
if (url === this.lastUrl && pageId === this.lastPageId && method === "GET") {
637638
//console.log("Skip Dupe: " + url);
@@ -656,7 +657,7 @@ class Downloader
656657
payload = EMPTY;
657658

658659
refersToUrl = resource.origURL;
659-
refersToDate = resource.origTS;
660+
refersToDate = new Date(resource.origTS).toISOString();
660661

661662
} else {
662663
type = "response";

src/recorder.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1249,6 +1249,7 @@ class Recorder {
12491249
if (resp.status === 0) {
12501250
console.warn(`async fetch error ${resp.status}, opaque due to redirect, retrying in browser`);
12511251
await this.doAsyncFetchInBrowser(request, request.sessions, true);
1252+
return;
12521253
} else if (resp.status >= 400) {
12531254
console.warn(`async fetch error ${resp.status}, retrying without headers`);
12541255
resp = await fetch(request.url, this.defaultFetchOpts);

src/requestresponseinfo.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ class RequestResponseInfo
166166
postData: this.postData,
167167
};
168168
if (postToGetUrl(convData)) {
169-
this.requestBody = convData.requestBody;
169+
//this.requestBody = convData.requestBody;
170170
// truncate to avoid extra long URLs
171171
this.url = convData.url.slice(0, MAX_URL_LENGTH);
172172
}

wr-ext/bg.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wr-ext/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "Webrecorder ArchiveWeb.page",
33
"description": "Create high-fidelity web archives directly in your browser",
4-
"version": "0.6.14",
4+
"version": "0.6.15",
55
"content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'",
66
"permissions": [
77
"debugger",

wr-ext/replay/sw.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wr-ext/replay/ui.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)