Jingga/jsOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/jsOMS.git synced 2026-02-15 08:48:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make event manager same as php version

Browse Source
This commit is contained in:
Dennis Eichhorn 2021-03-05 21:00:19 +01:00
parent d723bfa264
commit 6ef63d10df
1 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
Event/EventManager.js
View File

@ -104,24 +104,36 @@ export class EventManager
const idIsRegex = id.startsWith('/'); const idIsRegex = id.startsWith('/');
const groups = {}; const groups = {};
if (groupIsRegex) { for (const groupName in this.groups) {
for (const groupName in this.groups) { const groupNameIsRegex = groupName.startsWith('/');
if (groupIsRegex) {
if (groupName.match(group)) { if (groupName.match(group)) {
groups[groupName] = []; groups[groupName] = [];
} }
} else if (groupNameIsRegex && group.match(groupName)) {
groups[groupName] = [];
} else if (groupName === group) {
groups[groupName] = [];
} }
} else {
groups[group] = [];
} }
for (const groupName in groups) { for (const groupName in groups) {
if (idIsRegex) { for (const idName in this.groups[groupName]) {
for (const idName in this.groups[groupName]) { const idNameIsRegex = idName.startsWith('/');
if (idIsRegex) {
if (idName.match(id)) { if (idName.match(id)) {
groups[groupName].push(idName); groups[groupName].push(idName);
} }
} else if (idNameIsRegex && id.match(idName)) {
groups[groupName].push(id);
} else if (idName === id) {
groups[groupName].push([]);
} }
} else { }
if (groups[groupName].length === 0) {
groups[groupName].push(id); groups[groupName].push(id);
} }
} }
@ -129,7 +141,7 @@ export class EventManager
let triggerValue = false; let triggerValue = false;
for (const groupName in groups) { for (const groupName in groups) {
for (const id in groups[groupName]) { for (const id in groups[groupName]) {
triggerValue = triggerValue || this.trigger(groupName, id, data); triggerValue = this.trigger(groupName, id, data) || triggerValue;
} }
} }
@ -155,7 +167,7 @@ export class EventManager
return false; return false;
} }
if (Math.abs(Date.now() - this.callbacks[group].lastRun) < 500) { if (Math.abs(Date.now() - this.callbacks[group].lastRun) < 300) {
return false; return false;
} }
@ -163,24 +175,24 @@ export class EventManager
this.groups[group][id] = true; this.groups[group][id] = true;
} }
if (!this.hasOutstanding(group)) { if (this.hasOutstanding(group)) {
const length = this.callbacks[group].callbacks.length; return false;
this.callbacks[group].lastRun = Date.now();
for (let i = 0; i < length; ++i) {
this.callbacks[group].callbacks[i](data);
}
if (this.callbacks[group].remove) {
this.detach(group);
} else if (this.callbacks[group].reset) {
this.reset(group);
}
return true;
} }
return false; const length = this.callbacks[group].callbacks.length;
this.callbacks[group].lastRun = Date.now();
for (let i = 0; i < length; ++i) {
this.callbacks[group].callbacks[i](data);
}
if (this.callbacks[group].remove) {
this.detach(group);
} else if (this.callbacks[group].reset) {
this.reset(group);
}
return true;
}; };
/** /**