Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support merging #43

Merged
merged 17 commits into from
Mar 11, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export * from './packet';
export * from './receiver';
export * from './sender';
export * from './merge';
102 changes: 102 additions & 0 deletions src/merge.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
import { Packet, Receiver } from "./index";

interface MergeProps {
universes?: number[];
port?: number;
iface?: string;
reuseAddr?: boolean;
timeout?: number;
}

export class ReceiverMerge extends Receiver {
constructor({
universes = [1],
port = 5568,
iface = undefined,
reuseAddr = false,
timeout = 5000,
}: MergeProps) {
super({
universes,
port,
iface,
reuseAddr
});
hansSchall marked this conversation as resolved.
Show resolved Hide resolved
this.timeout = timeout;
super.on("packet", this.mergePacket);
}
readonly timeout: number;
protected senders = new Map<string, SendersData>();
protected lastData = new sACNData();
mergePacket(packet: Packet) {
// used to identify each source (cid & universe)
let pid: string = packet.cid.toString() + "#" + packet.universe.toString();
this.senders.set(
hansSchall marked this conversation as resolved.
Show resolved Hide resolved
pid,
new SendersData(
packet.cid.toString(),
new sACNData(packet.payload),
packet.priority,
packet.sequence
));
setTimeout(() => {
if (this.senders.get(pid)?.seq == packet.sequence) this.senders.delete(pid);
}, this.timeout);

// detect which source has the highest per-universe priority
let maximumPrio = 0;
for (let [_, data] of this.senders) {
if (data.prio > maximumPrio) {
maximumPrio = data.prio;
}
}

// HTP
let mergedData = new sACNData();
for (let [_, data] of this.senders) {
if (data.prio == maximumPrio) {
let i = 0;
while (i < 512) {
let newValue = data.data.data[i];
if (mergedData.data[i] < newValue) mergedData.data[i] = newValue;
i++;
}
}
}

// console.log(mergedData);
// only changes
let i = 0;
while (i < 512) {
if (this.lastData.data[i] != mergedData.data[i]) {
super.emit("changed", {
hansSchall marked this conversation as resolved.
Show resolved Hide resolved
universe: packet.universe,
addr: i + 1,
newValue: mergedData.data[i],
oldValue: this.lastData.data[i]
})
}
this.lastData.data[i] = mergedData.data[i]
i++;
}
}
}
class SendersData {
constructor(
readonly cid: string,
readonly data: sACNData,
readonly prio: number,
readonly seq: number
) {

}
}
export class sACNData {
data: number[] = new Array(512);
constructor(recordData: Record<number, number> = {}) {
this.data.fill(0);
for (let addr in recordData) {
this.data[+addr - 1] = recordData[+addr];
}
}
}