zefie/minisrv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix WTVPNM

Browse Source
This commit is contained in:
zefie
2026-04-27 15:22:08 -04:00
parent 16c2253bbb
commit 72dee2de36
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
zefie_wtvp_minisrv/includes/classes/WTVPNM.js
View File

@@ -24,6 +24,7 @@ class WTVPNM {
server = null; server = null;
wtvshared = null; wtvshared = null;
sessions = new Map(); sessions = new Map();
crypto = null;
constructor(...[minisrv_config, service_name, wtvshared, sendToClient, net, crypto]) { constructor(...[minisrv_config, service_name, wtvshared, sendToClient, net, crypto]) {
this.minisrv_config = minisrv_config; this.minisrv_config = minisrv_config;
@@ -31,7 +32,7 @@ class WTVPNM {
this.service_config = minisrv_config.services[service_name] || {}; this.service_config = minisrv_config.services[service_name] || {};
this.wtvshared = wtvshared; this.wtvshared = wtvshared;
this.server = net.createServer((socket) => this.handleConnection(socket)); this.server = net.createServer((socket) => this.handleConnection(socket));
this.crypto = crypto;
// Descriptor server-id mapping uses full 16-bit source UDP port: // Descriptor server-id mapping uses full 16-bit source UDP port:
// serverId = 0x0007pppp where pppp is the reserved UDP source port. // serverId = 0x0007pppp where pppp is the reserved UDP source port.
this.serverIdPort16Base = 0x00070000; this.serverIdPort16Base = 0x00070000;
@@ -857,7 +858,7 @@ class WTVPNM {
// is used, server-id mapping can follow the full source port. // is used, server-id mapping can follow the full source port.
const range = this.getUdpBindRange(); const range = this.getUdpBindRange();
const span = Math.max(1, (range.max - range.min) + 1); const span = Math.max(1, (range.max - range.min) + 1);
const startOffset = crypto.randomInt(0, span); const startOffset = this.crypto.randomInt(0, span);
let udpSocket = null; let udpSocket = null;
let boundPort = null; let boundPort = null;
@@ -1381,7 +1382,7 @@ class WTVPNM {
if (frameIdx < 5) { if (frameIdx < 5) {
const frameHex = media.slice(o, Math.min(o + 32, end)).toString('hex'); const frameHex = media.slice(o, Math.min(o + 32, end)).toString('hex');
const audioHex = audio.slice(0, Math.min(16, audio.length)).toString('hex'); const audioHex = audio.slice(0, Math.min(16, audio.length)).toString('hex');
const audioHash = crypto.createHash('sha1').update(audio).digest('hex').slice(0, 12); const audioHash = this.crypto.createHash('sha1').update(audio).digest('hex').slice(0, 12);
const prevAudio = frameIdx > 0 ? frames[frameIdx - 1]?.audio : null; const prevAudio = frameIdx > 0 ? frames[frameIdx - 1]?.audio : null;
const sameAsPrev = !!prevAudio && prevAudio.length === audio.length && prevAudio.equals(audio); const sameAsPrev = !!prevAudio && prevAudio.length === audio.length && prevAudio.equals(audio);
this.debugLog('prepareMediaData: frame', session.id, this.debugLog('prepareMediaData: frame', session.id,
@@ -1788,7 +1789,7 @@ class WTVPNM {
challengeSource = 'client-tag0'; challengeSource = 'client-tag0';
} else if (isWebTV || forceNarrow) { } else if (isWebTV || forceNarrow) {
const base = this.service_config.server_challenge_base const base = this.service_config.server_challenge_base
?? (crypto.randomInt(0x0100, 0x0200) & 0xFFFF); ?? (this.crypto.randomInt(0x0100, 0x0200) & 0xFFFF);
const nextSession = this.sessionCounter + 1; const nextSession = this.sessionCounter + 1;
challengeValue = (base + nextSession) & 0xFFFF; challengeValue = (base + nextSession) & 0xFFFF;
challengeSource = 'narrow-fallback'; challengeSource = 'narrow-fallback';
@@ -2368,7 +2369,7 @@ class WTVPNM {
const xorLen = this.pnmStrlen(xorBuf); const xorLen = this.pnmStrlen(xorBuf);
for (let i = 0; i < xorLen; i++) key[8 + i] ^= xorBuf[i]; for (let i = 0; i < xorLen; i++) key[8 + i] ^= xorBuf[i];
} }
return crypto.createHash('md5').update(key).digest(); return this.crypto.createHash('md5').update(key).digest();
} }
// Challenge::response1 / response2(this, src, a3, a4, a5) // Challenge::response1 / response2(this, src, a3, a4, a5)
@@ -2386,7 +2387,7 @@ class WTVPNM {
const xorLen = this.pnmStrlen(xorBuf); const xorLen = this.pnmStrlen(xorBuf);
for (let i = 0; i < xorLen; i++) key[8 + i] ^= xorBuf[i]; for (let i = 0; i < xorLen; i++) key[8 + i] ^= xorBuf[i];
} }
return crypto.createHash('md5').update(key).digest(); return this.crypto.createHash('md5').update(key).digest();
} }
buildSessionToken(session = null) { buildSessionToken(session = null) {