From 153f51ae5a403ec90ae42181aa7f185d7bace801 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marin=20Petruni=C4=87?= Date: Fri, 19 Jun 2020 13:23:18 +0200 Subject: [PATCH] fix type errors --- src/@types/it-length-prefixed/index.d.ts | 13 ++++++------- src/encoder.ts | 5 +++-- src/errors.ts | 8 +++++--- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/@types/it-length-prefixed/index.d.ts b/src/@types/it-length-prefixed/index.d.ts index 9dc8269..99de1ad 100644 --- a/src/@types/it-length-prefixed/index.d.ts +++ b/src/@types/it-length-prefixed/index.d.ts @@ -1,7 +1,6 @@ -declare module "it-length-prefixed" { - /* eslint-disable @typescript-eslint/interface-name-prefix */ - import BufferList from "bl"; - import {Buffer} from "buffer" +declare module 'it-length-prefixed' { + import BufferList from 'bl' + import { Buffer } from 'buffer' interface LengthDecoderFunction { (data: Buffer | BufferList): number; @@ -9,7 +8,7 @@ declare module "it-length-prefixed" { } interface LengthEncoderFunction { - (value: Buffer, target: number, offset: number): number|Buffer; + (value: number, target: Buffer, offset: number): number|Buffer; bytes: number; } @@ -33,7 +32,7 @@ declare module "it-length-prefixed" { MAX_DATA_LENGTH: number; } - export const encode: Encoder; - export const decode: Decoder; + export const encode: Encoder + export const decode: Decoder } diff --git a/src/encoder.ts b/src/encoder.ts index f60ea3a..3afc00a 100644 --- a/src/encoder.ts +++ b/src/encoder.ts @@ -1,15 +1,16 @@ import { Buffer } from 'buffer' import { bytes } from './@types/basic' import { MessageBuffer } from './@types/handshake' +import BufferList from 'bl' -export const uint16BEEncode = (value: number, target: bytes, offset: number): bytes => { +export const uint16BEEncode = (value: number, target: Buffer, offset: number): Buffer => { target = target || Buffer.allocUnsafe(2) target.writeUInt16BE(value, offset) return target } uint16BEEncode.bytes = 2 -export const uint16BEDecode = (data: bytes): number => { +export const uint16BEDecode = (data: Buffer | BufferList): number => { if (data.length < 2) throw RangeError('Could not decode int16BE') return data.readUInt16BE(0) } diff --git a/src/errors.ts b/src/errors.ts index e04d520..5738e3a 100644 --- a/src/errors.ts +++ b/src/errors.ts @@ -1,7 +1,9 @@ -export class FailedIKError extends Error { - public initialMsg: string; +import BufferList from 'bl' - constructor (initialMsg: string, message?: string) { +export class FailedIKError extends Error { + public initialMsg: string|BufferList|Buffer; + + constructor (initialMsg: string|BufferList|Buffer, message?: string) { super(message) this.initialMsg = initialMsg