swtor/ssn
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

🎨 Improve Bencode parser

Browse source
This commit is contained in:
C-3PO 2018-06-22 17:17:12 +02:00
parent a221ee3a6b
commit a578d21663
Signed by: c3po
GPG key ID: 62993C4BB4D86F24
2 changed files with 64 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/ssn/bencodeParser.ts
View file

@ -7,7 +7,7 @@ import { TextDecoder } from 'util';
const Decoder = new TextDecoder('utf-8'); const Decoder = new TextDecoder('utf-8');
/** Takes a Bencoded-encoded file, parses it at the given starting position and returns a JSON object, or rejects on error. */ /** Takes a Bencoded-encoded file, parses it at the given starting position and returns a JSON object, or rejects on error. */
export default function bpParse(dv: DataView, posIn: number = 0): { obj: any, pos: number } { function bpParse(dv: DataView, posIn: number = 0): { obj: any, pos: number } {
let pos = posIn; let pos = posIn;
let obj; let obj;
const header = dv.getUint8(pos); pos += 1; const header = dv.getUint8(pos); pos += 1;
@ -57,6 +57,9 @@ export default function bpParse(dv: DataView, posIn: number = 0): { obj: any, po
let curChar: number = header; let curChar: number = header;
let strLen = 0; let strLen = 0;
while (curChar !== 0x3A) { //':' - integer delimiter, beginning of string while (curChar !== 0x3A) { //':' - integer delimiter, beginning of string
if (curChar < 0x30 || curChar > 0x39) {
throw new Error('Unexpected string length during bencode parsing');
}
strLen *= 10; strLen *= 10;
strLen += curChar - 0x30; strLen += curChar - 0x30;
curChar = dv.getUint8(pos); pos += 1; curChar = dv.getUint8(pos); pos += 1;
@ -71,3 +74,7 @@ export default function bpParse(dv: DataView, posIn: number = 0): { obj: any, po
} }
return { obj, pos }; return { obj, pos };
} }
export default function parseBencode(dv: DataView): any {
return bpParse(dv).obj;
}

4
src/ssn/getSolidpkg.ts
View file

@ -2,7 +2,7 @@ import getUrlContents from '../getUrlContents';
import { Product } from '../interfaces/ISettings'; import { Product } from '../interfaces/ISettings';
import ISolid from '../interfaces/ISolidFile'; import ISolid from '../interfaces/ISolidFile';
import verifyProductName from '../ssn/verifyProductName'; import verifyProductName from '../ssn/verifyProductName';
import bpParse from './bencodeParser'; import parseBencode from './bencodeParser';
import extractFile from './extractFile'; import extractFile from './extractFile';
import readSsnFile from './readSsnFile'; import readSsnFile from './readSsnFile';
import verifySolidpkg from './verifySolidpkg'; import verifySolidpkg from './verifySolidpkg';
@ -39,7 +39,7 @@ export default async function getSolidpkg(product: Product, from: number, to: nu
//Extract metafile.solid file //Extract metafile.solid file
const solidFile = await extractFile(firstFile, [new DataView(ssnFile)]); const solidFile = await extractFile(firstFile, [new DataView(ssnFile)]);
const solidContents = bpParse(new DataView(solidFile)).obj as ISolid; const solidContents = parseBencode(new DataView(solidFile)) as ISolid;
//Verify metafile.solid for correctness //Verify metafile.solid for correctness
verifySolidpkg(solidContents, { product, from, to }); verifySolidpkg(solidContents, { product, from, to });