Fix eslint

This commit is contained in:
morrigan 2019-11-25 10:45:58 +01:00
parent 9c898043b8
commit 79d81c3117
8 changed files with 38 additions and 36 deletions

View File

@ -1,6 +1,6 @@
export type Duplex = [Stream, Stream]; export type Duplex = [Stream, Stream];
type Stream = { type Stream = {
sink(source: Iterable<any>), sink(source: Iterable<any>);
source: Object, source: Record<string, any>;
} }

View File

@ -2,11 +2,11 @@ declare module "it-pb-rpc" {
import { Buffer } from "buffer"; import { Buffer } from "buffer";
import { Duplex } from "it-pair"; import { Duplex } from "it-pair";
type WrappedDuplex = { type WrappedDuplex = {
read(bytes: number): Buffer, read(bytes: number): Buffer;
readLP(): Buffer, readLP(): Buffer;
write(input: Buffer): void, write(input: Buffer): void;
writeLP(input: Buffer): void, writeLP(input: Buffer): void;
unwrap(): Duplex unwrap(): Duplex;
} }
function Wrap (duplex: any): WrappedDuplex; function Wrap (duplex: any): WrappedDuplex;

View File

@ -2,24 +2,24 @@ import { bytes, bytes32 } from "./basic";
import { Duplex } from "it-pair"; import { Duplex } from "it-pair";
export interface KeyPair { export interface KeyPair {
publicKey: bytes32, publicKey: bytes32;
privateKey: bytes32, privateKey: bytes32;
} }
export type PeerId = { export type PeerId = {
id: string, id: string;
privKey: string, privKey: string;
pubKey: string, pubKey: string;
}; };
export interface NoiseConnection { export interface NoiseConnection {
remoteEarlyData?(): bytes, remoteEarlyData?(): bytes;
secureOutbound(localPeer: PeerId, insecure: any, remotePeer: PeerId): Promise<SecureOutbound>, secureOutbound(localPeer: PeerId, insecure: any, remotePeer: PeerId): Promise<SecureOutbound>;
secureInbound(localPeer: PeerId, insecure: any, remotePeer: PeerId): Promise<SecureOutbound>, secureInbound(localPeer: PeerId, insecure: any, remotePeer: PeerId): Promise<SecureOutbound>;
} }
export type SecureOutbound = { export type SecureOutbound = {
conn: Duplex, conn: Duplex;
remotePeer: PeerId, remotePeer: PeerId;
} }

View File

@ -3,11 +3,13 @@ import { NoiseSession } from "./xx";
// Send encrypted payload from the user to stream // Send encrypted payload from the user to stream
export async function encryptStreams(streams: Duplex, session: NoiseSession): Promise<Duplex> { export async function encryptStreams(streams: Duplex, session: NoiseSession): Promise<Duplex> {
// TODO: implement
return streams;
} }
// Decrypt received payload from the stream and pipe to user // Decrypt received payload from the stream and pipe to user
export async function decryptStreams(streams: Duplex, session: NoiseSession): Promise<Duplex> { export async function decryptStreams(streams: Duplex, session: NoiseSession): Promise<Duplex> {
// TODO: implement
return streams;
} }

View File

@ -46,7 +46,7 @@ export const getHandshakePayload = (publicKey: bytes ) => Buffer.concat([Buffer.
export const getEarlyDataPayload = (earlyData: bytes) => Buffer.concat([Buffer.from("noise-libp2p-early-data:"), earlyData]); export const getEarlyDataPayload = (earlyData: bytes) => Buffer.concat([Buffer.from("noise-libp2p-early-data:"), earlyData]);
function resolveEarlyDataPayload(privateKey?: bytes, earlyData?: bytes) : Object { function resolveEarlyDataPayload(privateKey?: bytes, earlyData?: bytes): Record<string, any> {
if (!earlyData || !privateKey) { if (!earlyData || !privateKey) {
return {}; return {};
} }

View File

@ -155,7 +155,7 @@ export class XXHandshake {
return { cs, ck, h }; return { cs, ck, h };
} }
private mixKey(ss: SymmetricState, ikm: bytes32) { private mixKey(ss: SymmetricState, ikm: bytes32): void {
const [ ck, tempK ] = this.getHkdf(ss.ck, ikm); const [ ck, tempK ] = this.getHkdf(ss.ck, ikm);
ss.cs = this.initializeKey(tempK) as CipherState; ss.cs = this.initializeKey(tempK) as CipherState;
ss.ck = ck; ss.ck = ck;
@ -183,7 +183,7 @@ export class XXHandshake {
return [ k1, k2, k3 ]; return [ k1, k2, k3 ];
} }
private mixHash(ss: SymmetricState, data: bytes) { private mixHash(ss: SymmetricState, data: bytes): void {
ss.h = this.getHash(ss.h, data); ss.h = this.getHash(ss.h, data);
} }
@ -215,7 +215,7 @@ export class XXHandshake {
return plaintext; return plaintext;
} }
private split (ss: SymmetricState) { private split (ss: SymmetricState): void {
const [ tempk1, tempk2 ] = this.getHkdf(ss.ck, Buffer.alloc(0)); const [ tempk1, tempk2 ] = this.getHkdf(ss.ck, Buffer.alloc(0));
const cs1 = this.initializeKey(tempk1); const cs1 = this.initializeKey(tempk1);
const cs2 = this.initializeKey(tempk2); const cs2 = this.initializeKey(tempk2);