Skip to content
This repository was archived by the owner on Jun 26, 2025. It is now read-only.

Commit f8faed7

Browse files
committed
fix(core, cef): registerEvent with empty string, off bus, cef instances
1 parent 49fc8ed commit f8faed7

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

packages/cef/src/main.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ export class Cef {
215215
return Cef.instances.get(pid + "_" + browserId);
216216
}
217217
static getInstances() {
218-
return Cef.instances.values();
218+
return [...Cef.instances.values()];
219219
}
220220
}
221221

packages/core/src/controllers/bus/index.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,9 @@ export function defineEvent<T extends object>(options: Options<T>) {
9999
const pushedPos = length - 1;
100100

101101
const off = () => {
102-
const currentMiddlewares = eventBus.get(name) || [];
102+
const currentMiddlewares = eventBus.get(name);
103+
if (!currentMiddlewares) return;
104+
103105
const currentMaxPos = currentMiddlewares.length - 1;
104106

105107
const endIdx = currentMaxPos < pushedPos ? currentMaxPos : pushedPos;
@@ -111,6 +113,10 @@ export function defineEvent<T extends object>(options: Options<T>) {
111113
}
112114
}
113115

116+
if (currentMiddlewares.length === 0) {
117+
eventBus.delete(name);
118+
}
119+
114120
return currentMiddlewares.length;
115121
};
116122

@@ -120,7 +126,7 @@ export function defineEvent<T extends object>(options: Options<T>) {
120126
const h = [pusher, trigger] as const;
121127

122128
if (isNative) {
123-
identifier && samp.registerEvent(name, identifier);
129+
typeof identifier !== "undefined" && samp.registerEvent(name, identifier);
124130
samp.on(name, trigger);
125131
}
126132

0 commit comments

Comments
 (0)