mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: make sure invalid URL loads promises are fulfilled. (#41194)

Browse source 
* fix: make sure invalid URL loads promisses are fulfilled.

* fixup! fix: make sure invalid URL loads promisses are fulfilled.
This commit is contained in:
marekharanczyk 2024-02-05 08:36:51 +01:00 • committed by GitHub
parent dac29f9949
commit 398ca2a019
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/browser/api/web-contents.ts
View file

@ -366,11 +366,6 @@ WebContents.prototype.loadURL = function (url, options) {
resolveAndCleanup(); resolveAndCleanup();
} }
}; };
const failListener = (event: Electron.Event, errorCode: number, errorDescription: string, validatedURL: string, isMainFrame: boolean) => {
if (!error && isMainFrame) {
error = { errorCode, errorDescription, url: validatedURL };
}
};
let navigationStarted = false; let navigationStarted = false;
let browserInitiatedInPageNavigation = false; let browserInitiatedInPageNavigation = false;
@ -392,6 +387,14 @@ WebContents.prototype.loadURL = function (url, options) {
navigationStarted = true; navigationStarted = true;
} }
}; };
const failListener = (event: Electron.Event, errorCode: number, errorDescription: string, validatedURL: string, isMainFrame: boolean) => {
if (!error && isMainFrame) {
error = { errorCode, errorDescription, url: validatedURL };
}
if (!navigationStarted && isMainFrame) {
finishListener();
}
};
const stopLoadingListener = () => { const stopLoadingListener = () => {
// By the time we get here, either 'finish' or 'fail' should have fired // By the time we get here, either 'finish' or 'fail' should have fired
// if the navigation occurred. However, in some situations (e.g. when // if the navigation occurred. However, in some situations (e.g. when

4
spec/api-web-contents-spec.ts
View file

@ -519,6 +519,10 @@ describe('webContents module', () => {
await expect(w.loadURL('file:non-existent')).to.eventually.be.rejected(); await expect(w.loadURL('file:non-existent')).to.eventually.be.rejected();
await expect(w.loadURL('file:non-existent')).to.eventually.be.rejected(); await expect(w.loadURL('file:non-existent')).to.eventually.be.rejected();
}); });
it('invalid URL load rejects', async () => {
await expect(w.loadURL('invalidURL')).to.eventually.be.rejected();
});
}); });
describe('getFocusedWebContents() API', () => { describe('getFocusedWebContents() API', () => {