@streamr/dht 102.0.0-beta.0 → 102.0.0-beta.2

package/generated/packages/proto-rpc/protos/ProtoRpc.ts

@@ -1,108 +0,0 @@
-// @generated by protobuf-ts 2.9.4 with parameter server_generic,generate_dependencies,long_type_number
-// @generated from protobuf file "packages/proto-rpc/protos/ProtoRpc.proto" (package "protorpc", syntax proto3)
-// tslint:disable
-import { MessageType } from "@protobuf-ts/runtime";
-import { Empty } from "../../../google/protobuf/empty";
-import { Any } from "../../../google/protobuf/any";
-/**
- * @generated from protobuf message protorpc.RpcMessage
- */
-export interface RpcMessage {
-    /**
-     * @generated from protobuf field: map<string, string> header = 1;
-     */
-    header: {
-        [key: string]: string;
-    };
-    /**
-     * @generated from protobuf field: google.protobuf.Any body = 2;
-     */
-    body?: Any;
-    /**
-     * @generated from protobuf field: string requestId = 3;
-     */
-    requestId: string;
-    /**
-     * @generated from protobuf field: optional protorpc.RpcErrorType errorType = 4;
-     */
-    errorType?: RpcErrorType;
-    /**
-     * @generated from protobuf field: optional string errorClassName = 5;
-     */
-    errorClassName?: string;
-    /**
-     * @generated from protobuf field: optional string errorCode = 6;
-     */
-    errorCode?: string;
-    /**
-     * @generated from protobuf field: optional string errorMessage = 7;
-     */
-    errorMessage?: string;
-}
-// Dummy message to force the generation of the typescript class "google.prototype.Empty"
-// We need this generated class in RpcCommunicator
-
-/**
- * @generated from protobuf message protorpc.Mnfo2uhnf92hvqi2nviouq2hv9puhq
- */
-export interface Mnfo2uhnf92hvqi2nviouq2hv9puhq {
-    /**
-     * @generated from protobuf field: google.protobuf.Empty empty = 1;
-     */
-    empty?: Empty;
-}
-/**
- * @generated from protobuf enum protorpc.RpcErrorType
- */
-export enum RpcErrorType {
-    /**
-     * @generated from protobuf enum value: SERVER_TIMEOUT = 0;
-     */
-    SERVER_TIMEOUT = 0,
-    /**
-     * @generated from protobuf enum value: CLIENT_TIMEOUT = 1;
-     */
-    CLIENT_TIMEOUT = 1,
-    /**
-     * @generated from protobuf enum value: UNKNOWN_RPC_METHOD = 2;
-     */
-    UNKNOWN_RPC_METHOD = 2,
-    /**
-     * @generated from protobuf enum value: CLIENT_ERROR = 3;
-     */
-    CLIENT_ERROR = 3,
-    /**
-     * @generated from protobuf enum value: SERVER_ERROR = 4;
-     */
-    SERVER_ERROR = 4
-}
-// @generated message type with reflection information, may provide speed optimized methods
-class RpcMessage$Type extends MessageType<RpcMessage> {
-    constructor() {
-        super("protorpc.RpcMessage", [
-            { no: 1, name: "header", kind: "map", K: 9 /*ScalarType.STRING*/, V: { kind: "scalar", T: 9 /*ScalarType.STRING*/ } },
-            { no: 2, name: "body", kind: "message", T: () => Any },
-            { no: 3, name: "requestId", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
-            { no: 4, name: "errorType", kind: "enum", opt: true, T: () => ["protorpc.RpcErrorType", RpcErrorType] },
-            { no: 5, name: "errorClassName", kind: "scalar", opt: true, T: 9 /*ScalarType.STRING*/ },
-            { no: 6, name: "errorCode", kind: "scalar", opt: true, T: 9 /*ScalarType.STRING*/ },
-            { no: 7, name: "errorMessage", kind: "scalar", opt: true, T: 9 /*ScalarType.STRING*/ }
-        ]);
-    }
-}
-/**
- * @generated MessageType for protobuf message protorpc.RpcMessage
- */
-export const RpcMessage = new RpcMessage$Type();
-// @generated message type with reflection information, may provide speed optimized methods
-class Mnfo2uhnf92hvqi2nviouq2hv9puhq$Type extends MessageType<Mnfo2uhnf92hvqi2nviouq2hv9puhq> {
-    constructor() {
-        super("protorpc.Mnfo2uhnf92hvqi2nviouq2hv9puhq", [
-            { no: 1, name: "empty", kind: "message", T: () => Empty }
-        ]);
-    }
-}
-/**
- * @generated MessageType for protobuf message protorpc.Mnfo2uhnf92hvqi2nviouq2hv9puhq
- */
-export const Mnfo2uhnf92hvqi2nviouq2hv9puhq = new Mnfo2uhnf92hvqi2nviouq2hv9puhq$Type();

package/jest.config.js

@@ -1,5 +0,0 @@
-const rootConfig = require('../../jest.config')
-module.exports = {
-    ...rootConfig,
-    setupFilesAfterEnv: rootConfig.setupFilesAfterEnv.concat('./test/utils/customMatchers.ts')
-}

package/src/connection/Connection.ts

@@ -1,28 +0,0 @@
-import EventEmitter from 'eventemitter3'
-import { PeerDescriptor } from '../../generated/packages/dht/protos/DhtRpc'
-import { ConnectionID, ConnectionType, ConnectionEvents } from './IConnection'
-import { v4 as uuid } from 'uuid'
-
-export class Connection extends EventEmitter<ConnectionEvents> {
-    public connectionId: ConnectionID
-    public connectionType: ConnectionType
-    private peerDescriptor?: PeerDescriptor
-    
-    constructor(connectionType: ConnectionType) {
-        super()
-        this.connectionId = createRandomConnectionId()
-        this.connectionType = connectionType
-    }
-
-    setPeerDescriptor(peerDescriptor: PeerDescriptor): void {
-        this.peerDescriptor = peerDescriptor
-    }
-    
-    getPeerDescriptor(): PeerDescriptor | undefined {
-        return this.peerDescriptor
-    }
-}
-
-export const createRandomConnectionId = (): ConnectionID => {
-    return uuid() as ConnectionID
-}

package/src/connection/ConnectionLockRpcLocal.ts

@@ -1,78 +0,0 @@
-import { ServerCallContext } from '@protobuf-ts/runtime-rpc'
-import { Logger } from '@streamr/utils'
-import { Empty } from '../../generated/google/protobuf/empty'
-import {
-    DisconnectMode,
-    DisconnectNotice,
-    LockRequest,
-    LockResponse,
-    PeerDescriptor,
-    UnlockRequest,
-    SetPrivateRequest
-} from '../../generated/packages/dht/protos/DhtRpc'
-import { IConnectionLockRpc } from '../../generated/packages/dht/protos/DhtRpc.server'
-import { DhtCallContext } from '../rpc-protocol/DhtCallContext'
-import { getNodeIdOrUnknownFromPeerDescriptor } from './ConnectionManager'
-import { LockID } from './ConnectionLockStates'
-import { DhtAddress, areEqualPeerDescriptors, toNodeId } from '../identifiers'
-
-interface ConnectionLockRpcLocalOptions {
-    addRemoteLocked: (id: DhtAddress, lockId: LockID) => void
-    removeRemoteLocked: (id: DhtAddress, lockId: LockID) => void
-    closeConnection: (peerDescriptor: PeerDescriptor, gracefulLeave: boolean, reason?: string) => Promise<void>
-    getLocalPeerDescriptor: () => PeerDescriptor
-    setPrivate: (id: DhtAddress, isPrivate: boolean) => void
-}
-
-const logger = new Logger(module)
-
-export class ConnectionLockRpcLocal implements IConnectionLockRpc {
-
-    private readonly options: ConnectionLockRpcLocalOptions
-
-    constructor(options: ConnectionLockRpcLocalOptions) {
-        this.options = options
-    }
-
-    async lockRequest(lockRequest: LockRequest, context: ServerCallContext): Promise<LockResponse> {
-        const senderPeerDescriptor = (context as DhtCallContext).incomingSourceDescriptor!
-        if (areEqualPeerDescriptors(senderPeerDescriptor, this.options.getLocalPeerDescriptor())) {
-            const response: LockResponse = {
-                accepted: false
-            }
-            return response
-        }
-        const remoteNodeId = toNodeId(senderPeerDescriptor)
-        this.options.addRemoteLocked(remoteNodeId, lockRequest.lockId)
-        const response: LockResponse = {
-            accepted: true
-        }
-        return response
-    }
-
-    async unlockRequest(unlockRequest: UnlockRequest, context: ServerCallContext): Promise<Empty> {
-        const senderPeerDescriptor = (context as DhtCallContext).incomingSourceDescriptor!
-        const nodeId = toNodeId(senderPeerDescriptor)
-        this.options.removeRemoteLocked(nodeId, unlockRequest.lockId)
-        return {}
-    }
-
-    async gracefulDisconnect(disconnectNotice: DisconnectNotice, context: ServerCallContext): Promise<Empty> {
-        const senderPeerDescriptor = (context as DhtCallContext).incomingSourceDescriptor!
-        logger.trace(getNodeIdOrUnknownFromPeerDescriptor(senderPeerDescriptor) + ' received gracefulDisconnect notice')
-
-        if (disconnectNotice.disconnectMode === DisconnectMode.LEAVING) {
-            await this.options.closeConnection(senderPeerDescriptor, true, 'graceful leave notified')
-        } else {
-            await this.options.closeConnection(senderPeerDescriptor, false, 'graceful disconnect notified')
-        }
-        return {}
-    }
-
-    async setPrivate(request: SetPrivateRequest, context: ServerCallContext): Promise<Empty> {
-        const senderPeerDescriptor = (context as DhtCallContext).incomingSourceDescriptor!
-        const senderId = toNodeId(senderPeerDescriptor)            
-        this.options.setPrivate(senderId, request.isPrivate)
-        return {}
-    }
-}

package/src/connection/ConnectionLockRpcRemote.ts

@@ -1,64 +0,0 @@
-import { Logger } from '@streamr/utils'
-import { RpcRemote } from '../dht/contact/RpcRemote'
-import { DisconnectMode, DisconnectNotice, LockRequest, UnlockRequest, SetPrivateRequest } from '../../generated/packages/dht/protos/DhtRpc'
-import { ConnectionLockRpcClient } from '../../generated/packages/dht/protos/DhtRpc.client'
-import { LockID } from './ConnectionLockStates'
-import { toNodeId } from '../identifiers'
-
-const logger = new Logger(module)
-
-export class ConnectionLockRpcRemote extends RpcRemote<ConnectionLockRpcClient> {
-
-    public async lockRequest(lockId: LockID): Promise<boolean> {
-        logger.trace(`Requesting locked connection to ${toNodeId(this.getPeerDescriptor())}`)
-        const request: LockRequest = {
-            lockId
-        }
-        const options = this.formDhtRpcOptions()
-        try {
-            const res = await this.getClient().lockRequest(request, options)
-            return res.accepted
-        } catch (err) {
-            logger.debug('Connection lock rejected', { err })
-            return false
-        }
-    }
-
-    public unlockRequest(lockId: LockID): void {
-        logger.trace(`Requesting connection to be unlocked from ${toNodeId(this.getPeerDescriptor())}`)
-        const request: UnlockRequest = {
-            lockId
-        }
-        const options = this.formDhtRpcOptions({
-            notification: true
-        })
-        this.getClient().unlockRequest(request, options).catch((_e) => {
-            logger.trace('failed to send unlockRequest')
-        })
-    }
-
-    public async gracefulDisconnect(disconnectMode: DisconnectMode): Promise<void> {
-        logger.trace(`Notifying a graceful disconnect to ${toNodeId(this.getPeerDescriptor())}`)
-        const request: DisconnectNotice = {
-            disconnectMode
-        }
-        const options = this.formDhtRpcOptions({
-            connect: false,
-            sendIfStopped: true,
-            timeout: 2000  // TODO use options option or named constant?
-        })
-        await this.getClient().gracefulDisconnect(request, options)
-    }
-
-    public async setPrivate(isPrivate: boolean): Promise<void> {
-        logger.trace(`Setting isPrivate: ${isPrivate} for ${toNodeId(this.getPeerDescriptor())}`)
-        const request: SetPrivateRequest = {
-            isPrivate
-        }
-        const options = this.formDhtRpcOptions({
-            connect: false,
-            notification: true
-        })
-        await this.getClient().setPrivate(request, options)
-    }
-}

package/src/connection/ConnectionLockStates.ts

@@ -1,131 +0,0 @@
-// Connection locks are independent of the existence of connections
-// that is why this class is needed
-
-import { DhtAddress } from '../identifiers'
-
-export type LockID = string
-
-export class ConnectionLockStates {
-
-    private localLocks: Map<DhtAddress, Set<LockID>> = new Map()
-    private remoteLocks: Map<DhtAddress, Set<LockID>> = new Map()
-    // TODO: remove weakLocks use localLocks instead. When opening weakLocks from the ConnectioManager,
-    // simply do not send lock requests.
-    private weakLocks: Map<DhtAddress, Set<LockID>> = new Map()
-    // Used to filter proxy connections from the connections view
-    private remotePrivateConnections: Set<DhtAddress> = new Set()
-
-    public getLocalLockedConnectionCount(): number {
-        return this.localLocks.size
-    }
-
-    public getRemoteLockedConnectionCount(): number {
-        return this.remoteLocks.size
-    }
-
-    public getWeakLockedConnectionCount(): number {
-        return this.weakLocks.size
-    }
-
-    public isLocalLocked(id: DhtAddress, lockId?: LockID): boolean {
-        if (lockId === undefined) {
-            return this.localLocks.has(id)
-        } else {
-            return this.localLocks.has(id) && this.localLocks.get(id)!.has(lockId)
-        }
-    }
-
-    public isRemoteLocked(id: DhtAddress, lockId?: LockID): boolean {
-        if (lockId === undefined) {
-            return this.remoteLocks.has(id)
-        } else if (this.remoteLocks.has(id) && this.remoteLocks.get(id)!.has(lockId)) {
-            return true
-        } else {
-            return false
-        }
-    }
-
-    private isWeakLocked(id: DhtAddress): boolean {
-        return this.weakLocks.has(id)
-    }
-
-    public isLocked(id: DhtAddress): boolean {
-        return (this.isLocalLocked(id) || this.isRemoteLocked(id) || this.isWeakLocked(id))
-    }
-
-    public addLocalLocked(id: DhtAddress, lockId: LockID): void {
-        if (!this.localLocks.has(id)) {
-            this.localLocks.set(id, new Set())
-        }
-        this.localLocks.get(id)!.add(lockId)
-    }
-
-    public addRemoteLocked(id: DhtAddress, lockId: LockID): void {
-        if (!this.remoteLocks.has(id)) {
-            this.remoteLocks.set(id, new Set())
-        }
-        this.remoteLocks.get(id)!.add(lockId)
-    }
-
-    public addWeakLocked(id: DhtAddress, lockId: LockID): void {
-        if (!this.weakLocks.has(id)) {
-            this.weakLocks.set(id, new Set())
-        }
-        this.weakLocks.get(id)!.add(lockId)
-    }
-
-    public removeLocalLocked(id: DhtAddress, lockId: LockID): void {
-        if (this.localLocks.has(id)) {
-            this.localLocks.get(id)?.delete(lockId)
-            if (this.localLocks.get(id)?.size === 0) {
-                this.localLocks.delete(id)
-            }
-        }
-    }
-
-    public removeRemoteLocked(id: DhtAddress, lockId: LockID): void {
-        if (this.remoteLocks.has(id)) {
-            this.remoteLocks.get(id)?.delete(lockId)
-            if (this.remoteLocks.get(id)?.size === 0) {
-                this.remoteLocks.delete(id)
-            }
-        }
-    }
-
-    public removeWeakLocked(id: DhtAddress, lockId: LockID): void {
-        if (this.weakLocks.has(id)) {
-            this.weakLocks.get(id)?.delete(lockId)
-            if (this.weakLocks.get(id)?.size === 0) {
-                this.weakLocks.delete(id)
-            }
-        }
-    }
-
-    public addPrivate(id: DhtAddress): void {
-        this.remotePrivateConnections.add(id)
-    }
-
-    public removePrivate(id: DhtAddress): void {
-        this.remotePrivateConnections.delete(id)
-    }
-
-    public getPrivateConnections(): Set<DhtAddress> {
-        return this.remotePrivateConnections
-    }
-
-    public isPrivate(id: DhtAddress): boolean {
-        return this.remotePrivateConnections.has(id)
-    }
-
-    public clearAllLocks(id: DhtAddress): void {
-        this.localLocks.delete(id)
-        this.remoteLocks.delete(id)
-        this.weakLocks.delete(id)
-    }
-
-    public clear(): void {
-        this.localLocks.clear()
-        this.remoteLocks.clear()
-        this.weakLocks.clear()
-    }
-}