Skip to content

Commit da381fd

Browse files
committed
chore: Update to 30.4
1 parent 704f278 commit da381fd

File tree

2 files changed

+50
-12
lines changed

2 files changed

+50
-12
lines changed

src/hooks/game.js

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,30 @@ onPage("Game", function () {
77
debug("Game: Timeout hook");
88
return setTimeout(hook);
99
}
10-
const oHandler = socket.onmessage;
11-
socket.onmessage = function onMessageScript(event) {
12-
const data = JSON.parse(event.data);
13-
eventManager.emit('PreGameEvent', data);
14-
oHandler(event);
15-
eventManager.emit('GameEvent', data);
16-
};
10+
function callGameHooks(data, original) {
11+
const run = !eventManager.emit('PreGameEvent', data).canceled;
12+
try {
13+
if (run) original(data);
14+
} catch (e) {
15+
console.error(e);
16+
}
17+
eventManager.emit('GameEvent', data);
18+
}
19+
if (undefined !== bypassQueueEvents) {
20+
const oRunEvent = runEvent;
21+
const oBypassEvent = bypassQueueEvent;
22+
runEvent = function runEventScript(event) {
23+
callGameHooks(event, oRunEvent);
24+
};
25+
bypassQueueEvent = function runEventScript(event) {
26+
callGameHooks(event, oBypassEvent);
27+
};
28+
} else {
29+
const oHandler = socket.onmessage;
30+
socket.onmessage = function onMessageScript(event) {
31+
const data = JSON.parse(event.data);
32+
callGameHooks(data, oHandler);
33+
};
34+
}
1735
})();
1836
});

src/hooks/spectate.js

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,32 @@ onPage("gameSpectate", function () {
66
debug("Spectate: Timeout hook");
77
return setTimeout(hook);
88
}
9-
const oHandler = socket.onmessage;
10-
socket.onmessage = function onMessageScript(event) {
11-
const data = JSON.parse(event.data);
9+
function callGameHooks(data, original) {
1210
const run = !eventManager.emit('PreGameEvent', data, data.action === 'getResult').canceled;
13-
if (run) oHandler(event);
11+
try {
12+
if (run) original(data);
13+
} catch (e) {
14+
console.error(e);
15+
}
1416
eventManager.emit('GameEvent', data);
15-
};
17+
}
18+
if (undefined !== window.bypassQueueEvents) {
19+
const oRunEvent = runEvent;
20+
const oBypassEvent = bypassQueueEvent;
21+
runEvent = function runEventScript(event) {
22+
callGameHooks(event, oRunEvent);
23+
};
24+
bypassQueueEvent = function runEventScript(event) {
25+
callGameHooks(event, oBypassEvent);
26+
};
27+
} else {
28+
const oHandler = socket.onmessage;
29+
socket.onmessage = function onMessageScript(event) {
30+
const data = JSON.parse(event.data);
31+
const run = !eventManager.emit('PreGameEvent', data, data.action === 'getResult').canceled;
32+
if (run) oHandler(event);
33+
eventManager.emit('GameEvent', data);
34+
};
35+
}
1636
})();
1737
});

0 commit comments

Comments
 (0)