fix: EventSource undefined in Renderer/Worker (#44475)

This commit is contained in:
Shelley Vohr 2024-10-31 20:24:44 +01:00 коммит произвёл GitHub
Родитель 8be4ae4bab
Коммит 15151c6853
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
6 изменённых файлов: 52 добавлений и 6 удалений

Просмотреть файл

@ -6,7 +6,7 @@ wrapFsWithAsar(require('fs'));
// See ElectronRendererClient::DidCreateScriptContext. // See ElectronRendererClient::DidCreateScriptContext.
if ((globalThis as any).blinkfetch) { if ((globalThis as any).blinkfetch) {
const keys = ['fetch', 'Response', 'FormData', 'Request', 'Headers']; const keys = ['fetch', 'Response', 'FormData', 'Request', 'Headers', 'EventSource'];
for (const key of keys) { for (const key of keys) {
(globalThis as any)[key] = (globalThis as any)[`blink${key}`]; (globalThis as any)[key] = (globalThis as any)[`blink${key}`];
} }

Просмотреть файл

@ -19,7 +19,7 @@ global.require = makeRequireFunction(global.module);
// See WebWorkerObserver::WorkerScriptReadyForEvaluation. // See WebWorkerObserver::WorkerScriptReadyForEvaluation.
if ((globalThis as any).blinkfetch) { if ((globalThis as any).blinkfetch) {
const keys = ['fetch', 'Response', 'FormData', 'Request', 'Headers']; const keys = ['fetch', 'Response', 'FormData', 'Request', 'Headers', 'EventSource'];
for (const key of keys) { for (const key of keys) {
(globalThis as any)[key] = (globalThis as any)[`blink${key}`]; (globalThis as any)[key] = (globalThis as any)[`blink${key}`];
} }

Просмотреть файл

@ -118,8 +118,8 @@ void ElectronRendererClient::DidCreateScriptContext(
v8::Isolate* isolate = env->isolate(); v8::Isolate* isolate = env->isolate();
v8::Local<v8::Object> global = renderer_context->Global(); v8::Local<v8::Object> global = renderer_context->Global();
std::vector<std::string> keys = {"fetch", "Response", "FormData", "Request", std::vector<std::string> keys = {"fetch", "Response", "FormData",
"Headers"}; "Request", "Headers", "EventSource"};
for (const auto& key : keys) { for (const auto& key : keys) {
v8::MaybeLocal<v8::Value> value = v8::MaybeLocal<v8::Value> value =
global->Get(renderer_context, gin::StringToV8(isolate, key)); global->Get(renderer_context, gin::StringToV8(isolate, key));

Просмотреть файл

@ -71,8 +71,8 @@ void WebWorkerObserver::WorkerScriptReadyForEvaluation(
// is loaded. See corresponding change in node/init.ts. // is loaded. See corresponding change in node/init.ts.
v8::Local<v8::Object> global = worker_context->Global(); v8::Local<v8::Object> global = worker_context->Global();
std::vector<std::string> keys = {"fetch", "Response", "FormData", "Request", std::vector<std::string> keys = {"fetch", "Response", "FormData",
"Headers"}; "Request", "Headers", "EventSource"};
for (const auto& key : keys) { for (const auto& key : keys) {
v8::MaybeLocal<v8::Value> value = v8::MaybeLocal<v8::Value> value =
global->Get(worker_context, gin::StringToV8(isolate, key.c_str())); global->Get(worker_context, gin::StringToV8(isolate, key.c_str()));

Просмотреть файл

@ -1028,6 +1028,43 @@ describe('chromium features', () => {
expect(code).to.equal(0); expect(code).to.equal(0);
}); });
itremote('Worker with nodeIntegrationInWorker has access to EventSource', () => {
const es = new EventSource('https://example.com');
expect(es).to.have.property('url').that.is.a('string');
expect(es).to.have.property('readyState').that.is.a('number');
expect(es).to.have.property('withCredentials').that.is.a('boolean');
});
itremote('Worker with nodeIntegrationInWorker has access to fetch-dependent interfaces', async (fixtures: string) => {
const file = require('node:path').join(fixtures, 'hello.txt');
expect(() => {
fetch('file://' + file);
}).to.not.throw();
expect(() => {
const formData = new FormData();
formData.append('username', 'Groucho');
}).not.to.throw();
expect(() => {
const request = new Request('https://example.com', {
method: 'POST',
body: JSON.stringify({ foo: 'bar' })
});
expect(request.method).to.equal('POST');
}).not.to.throw();
expect(() => {
const response = new Response('Hello, world!');
expect(response.status).to.equal(200);
}).not.to.throw();
expect(() => {
const headers = new Headers();
headers.append('Content-Type', 'text/xml');
}).not.to.throw();
}, [path.join(__dirname, 'fixtures')]);
it('Worker can work', async () => { it('Worker can work', async () => {
const w = new BrowserWindow({ show: false }); const w = new BrowserWindow({ show: false });
await w.loadURL(`file://${fixturesPath}/pages/blank.html`); await w.loadURL(`file://${fixturesPath}/pages/blank.html`);

Просмотреть файл

@ -162,6 +162,15 @@ describe('node feature', () => {
}); });
}); });
describe('EventSource', () => {
itremote('works correctly when nodeIntegration is enabled in the renderer', () => {
const es = new EventSource('https://example.com');
expect(es).to.have.property('url').that.is.a('string');
expect(es).to.have.property('readyState').that.is.a('number');
expect(es).to.have.property('withCredentials').that.is.a('boolean');
});
});
describe('fetch', () => { describe('fetch', () => {
itremote('works correctly when nodeIntegration is enabled in the renderer', async (fixtures: string) => { itremote('works correctly when nodeIntegration is enabled in the renderer', async (fixtures: string) => {
const file = require('node:path').join(fixtures, 'hello.txt'); const file = require('node:path').join(fixtures, 'hello.txt');