Skip to content

Support protocol v2 #13

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.

Sign up for GitHub

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

Open
Tsuk1ko wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support protocol v2 #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 15 additions & 7 deletions src/transport/SectionConnection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*/

const { Buffer } = require('buffer');
const { inflateSync } = require('zlib');
const log = require('debug')('bilibili-danmaku-client/SectionConnection');
const { isEqual } = require('lodash');

Expand Down Expand Up @@ -191,6 +192,7 @@ class SectionConnection extends CascadeConnection {
if (sectionProtoVer !== protoVer) throw new Error(`Invalid section header: protoVer=${sectionProtoVer}, expected=${protoVer}.`);
return {
length,
version: buf.readInt16BE(offset + 6),
header: {
controlFlag: buf[offset + 7] === 0x01,
opCode: buf.readInt32BE(offset + 8),
Expand All @@ -200,10 +202,9 @@ class SectionConnection extends CascadeConnection {
}

decodeSection(sections, buf, offset) {
let header;
let length;
let header, length, version;
try {
({ header, length } = this.decodeHeader(buf, offset));
({ header, length, version } = this.decodeHeader(buf, offset));
} catch (e) {
log('Unable to decoder header: %s', e);
return buf.length; // stop debundling process
Expand All @@ -216,10 +217,17 @@ class SectionConnection extends CascadeConnection {
}

const content = buf.slice(offset + 16, offset + length);
try {
sections.push(coder.construct(content));
} catch (e) {
log('Unable to decode section: content=%s, coder=%s.', content, coder);
switch (version) {
case 2:
this.decodeSection(sections, inflateSync(content), 0);
break;
default:
try {
sections.push(coder.construct(content));
} catch (e) {
log('Unable to decode section: content=%s, coder=%s.', content, coder);
}
break;
}
return offset + length; // proceed to next section
}
Expand Down