From d276d0963441a8931d5e043eb9b1478f6195a724 Mon Sep 17 00:00:00 2001 From: C-3PO Date: Mon, 9 Jul 2018 16:02:39 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9C=94=20Allow=20for=20128=20KiB=20piece=20l?= =?UTF-8?q?ength?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/interfaces/ISolidFile.ts | 4 ++-- src/ssn/verify/verifySolidpkg.ts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/interfaces/ISolidFile.ts b/src/interfaces/ISolidFile.ts index 084bc2c..0120c9f 100644 --- a/src/interfaces/ISolidFile.ts +++ b/src/interfaces/ISolidFile.ts @@ -8,8 +8,8 @@ interface ISolidFile { interface ISolidFileInfo { /** List of files that are part of this torrent. */ files: ISolidFile[]; - /** Length of one piece in bytes, i.e. 64 KiB, 256 KiB, 512 KiB, 1 MiB, 2MiB or 4 MiB */ - 'piece length': 65536 | 262144| 524288 | 1048576| 2097152| 4194304; + /** Length of one piece in bytes, i.e. 64 KiB, 128 KiB, 256 KiB, 512 KiB, 1 MiB, 2MiB or 4 MiB */ + 'piece length': 65536 | 131072 | 262144| 524288 | 1048576| 2097152| 4194304; /** Concatenated SHA1 hashes of all pieces, where each hash is 20 bytes long. */ pieces: string; /** Whether the torrent is private, always 0. */ diff --git a/src/ssn/verify/verifySolidpkg.ts b/src/ssn/verify/verifySolidpkg.ts index df34a23..cfa60c3 100644 --- a/src/ssn/verify/verifySolidpkg.ts +++ b/src/ssn/verify/verifySolidpkg.ts @@ -58,9 +58,9 @@ export default function verifySolidpkg(file: ISolid, { product, from, to }: {pro } } - //64 KiB, 256 KiB, 512 KiB, 1 MiB, 2 MiB, 4 MiB - if (!([0x1_0000, 0x4_0000, 0x8_0000, 0x10_0000, 0x20_0000, 0x40_0000]).includes(file.info['piece length'])) { - throw new Error(`Expected piece length to be "65536", "262144", 524288", "1048576", "2097152" or "4194304" but it was "${file.info['piece length']}".`); + //64 KiB, 128 KiB, 256 KiB, 512 KiB, 1 MiB, 2 MiB, 4 MiB + if (!([0x1_0000, 0x2_0000, 0x4_0000, 0x8_0000, 0x10_0000, 0x20_0000, 0x40_0000]).includes(file.info['piece length'])) { + throw new Error(`Expected piece length to be "65536", "131072", 262144", 524288", "1048576", "2097152" or "4194304" but it was "${file.info['piece length']}".`); } if (typeof file.info.pieces !== 'string') { throw new Error(`Expected pieces to be a string but it was "${file.info.pieces}".`);