Don't rely on window (#4757)

This commit is contained in:
Moritz Hedtke authored and GitHub committed 2025-10-10 11:53:19 -07:00
1 parent 09c1de7574
commit b0774510d8
3 files changed
+8 -8

No files matched your search

+1 -1
View File
@@ -1 +1 @@
class Channel{pending;waiting;constructor(){this.pending=[],this.waiting=[]}send(data){if(this.waiting.length>0){this.waiting.shift()(data);return}this.pending.push(data)}async recv(){return new Promise((resolve,_reject)=>{if(this.pending.length>0){resolve(this.pending.shift());return}this.waiting.push(resolve)})}}class WeakDioxusChannel{inner;constructor(channel){this.inner=new WeakRef(channel)}rustSend(data){let channel=this.inner.deref();if(channel)channel.rustSend(data)}async rustRecv(){let channel=this.inner.deref();if(channel)return await channel.rustRecv()}}class DioxusChannel{weak(){return new WeakDioxusChannel(this)}}window.__nextChannelId=0;window.__channels=[];class WebDioxusChannel extends DioxusChannel{js_to_rust;rust_to_js;owner;id;constructor(owner){super();this.owner=owner,this.js_to_rust=new Channel,this.rust_to_js=new Channel,this.id=window.__nextChannelId,window.__channels[this.id]=this,window.__nextChannelId+=1}weak(){return new WeakDioxusChannel(this)}async recv(){return await this.rust_to_js.recv()}send(data){this.js_to_rust.send(data)}rustSend(data){this.rust_to_js.send(data)}async rustRecv(){return await this.js_to_rust.recv()}close(){window.__channels[this.id]=null}}export{WebDioxusChannel,WeakDioxusChannel};
class Channel{pending;waiting;constructor(){this.pending=[],this.waiting=[]}send(data){if(this.waiting.length>0){this.waiting.shift()(data);return}this.pending.push(data)}async recv(){return new Promise((resolve,_reject)=>{if(this.pending.length>0){resolve(this.pending.shift());return}this.waiting.push(resolve)})}}class WeakDioxusChannel{inner;constructor(channel){this.inner=new WeakRef(channel)}rustSend(data){let channel=this.inner.deref();if(channel)channel.rustSend(data)}async rustRecv(){let channel=this.inner.deref();if(channel)return await channel.rustRecv()}}class DioxusChannel{weak(){return new WeakDioxusChannel(this)}}globalThis.__nextChannelId=0;globalThis.__channels=[];class WebDioxusChannel extends DioxusChannel{js_to_rust;rust_to_js;owner;id;constructor(owner){super();this.owner=owner,this.js_to_rust=new Channel,this.rust_to_js=new Channel,this.id=globalThis.__nextChannelId,globalThis.__channels[this.id]=this,globalThis.__nextChannelId+=1}weak(){return new WeakDioxusChannel(this)}async recv(){return await this.rust_to_js.recv()}send(data){this.js_to_rust.send(data)}rustSend(data){this.rust_to_js.send(data)}async rustRecv(){return await this.js_to_rust.recv()}close(){globalThis.__channels[this.id]=null}}export{WebDioxusChannel,WeakDioxusChannel};
+1 -1
View File
@@ -1 +1 @@
[460758788096589933]
[1857573420427678443]
+6 -6
View File
@@ -4,8 +4,8 @@ import {
WeakDioxusChannel,
} from "../../../document/src/ts/eval";
window.__nextChannelId = 0;
window.__channels = [];
globalThis.__nextChannelId = 0;
globalThis.__channels = [];
export { WeakDioxusChannel };
export class WebDioxusChannel extends DioxusChannel {
@@ -20,9 +20,9 @@ export class WebDioxusChannel extends DioxusChannel {
this.js_to_rust = new Channel();
this.rust_to_js = new Channel();
this.id = window.__nextChannelId;
window.__channels[this.id] = this;
window.__nextChannelId += 1;
this.id = globalThis.__nextChannelId;
globalThis.__channels[this.id] = this;
globalThis.__nextChannelId += 1;
}
// Return a weak reference to this channel
@@ -52,6 +52,6 @@ export class WebDioxusChannel extends DioxusChannel {
// Close the channel, dropping it.
close(): void {
window.__channels[this.id] = null;
globalThis.__channels[this.id] = null;
}
}