Skip to content

ensure about:blank pages are never recorded! #329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −10
Open

ensure about:blank pages are never recorded! #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@webrecorder/archivewebpage",
"productName": "ArchiveWeb.page",
"version": "0.15.8",
"version": "0.15.9",
"main": "index.js",
"description": "Create Web Archives directly in your browser",
"repository": {
Expand Down
27 changes: 18 additions & 9 deletions src/recorder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ class Recorder {
}

// @ts-expect-error - TS2339 - Property '_cachePageInfo' does not exist on type 'Recorder'.
if (this._cachePageInfo) {
if (!this.isEmptyPage(this._cachePageInfo)) {
// @ts-expect-error - TS2339 - Property '_doAddPage' does not exist on type 'Recorder'. | TS2339 - Property '_cachePageInfo' does not exist on type 'Recorder'.
await this._doAddPage(this._cachePageInfo);
// @ts-expect-error - TS2339 - Property '_cachePageInfo' does not exist on type 'Recorder'.
Expand Down Expand Up @@ -1107,10 +1107,9 @@ class Recorder {

// @ts-expect-error - TS7006 - Parameter 'currPage' implicitly has an 'any' type. | TS7006 - Parameter 'domSnapshot' implicitly has an 'any' type. | TS7006 - Parameter 'finished' implicitly has an 'any' type.
commitPage(currPage, domSnapshot, finished) {
if (!currPage?.url || !currPage.ts || currPage.url === "about:blank") {
if (this.isEmptyPage(currPage)) {
return;
}

if (domSnapshot) {
currPage.text = this.parseTextFromDOMSnapshot(domSnapshot);
} else if (!currPage.text) {
Expand Down Expand Up @@ -1147,12 +1146,14 @@ class Recorder {
// @ts-expect-error - TS2339 - Property 'sizeNew' does not exist on type 'Recorder'.
this.sizeNew += writtenSize;

// @ts-expect-error - TS2339 - Property '_cachePageInfo' does not exist on type 'Recorder'.
this._cachePageInfo = pageInfo;
// @ts-expect-error - TS2339 - Property '_cacheSessionTotal' does not exist on type 'Recorder'.
this._cacheSessionTotal += payloadSize;
// @ts-expect-error - TS2339 - Property '_cacheSessionNew' does not exist on type 'Recorder'.
this._cacheSessionNew += writtenSize;
if (writtenSize) {
// @ts-expect-error - TS2339 - Property '_cachePageInfo' does not exist on type 'Recorder'.
this._cachePageInfo = pageInfo;
// @ts-expect-error - TS2339 - Property '_cacheSessionTotal' does not exist on type 'Recorder'.
this._cacheSessionTotal += payloadSize;
// @ts-expect-error - TS2339 - Property '_cacheSessionNew' does not exist on type 'Recorder'.
this._cacheSessionNew += writtenSize;
}
}

// @ts-expect-error - TS7006 - Parameter 'params' implicitly has an 'any' type. | TS7006 - Parameter 'sessions' implicitly has an 'any' type.
Expand Down Expand Up @@ -1227,6 +1228,14 @@ class Recorder {
this.firstPageStarted = true;
}

// eslint-disable-next-line @typescript-eslint/no-explicit-any
isEmptyPage(pageInfo: any) {
if (!pageInfo?.url || !pageInfo.ts || pageInfo.url === "about:blank") {
return true;
}
return false;
}

// @ts-expect-error - TS7006 - Parameter 'url' implicitly has an 'any' type. | TS7006 - Parameter 'mime' implicitly has an 'any' type.
_initNewPage(url, mime) {
// @ts-expect-error - TS2339 - Property 'pageInfo' does not exist on type 'Recorder'.
Expand Down
Loading