From e79abff7f7004661b4e5b475ca582a6a58dba542 Mon Sep 17 00:00:00 2001 From: achingbrain Date: Thu, 6 Feb 2025 08:42:26 +0100 Subject: [PATCH] fix: import types from interface module Where registrar types were duplicated between `@libp2p/interface` and `@libp2p/interface-internal`, import them from `@libp2p/interface` --- packages/interface-compliance-tests/src/mocks/registrar.ts | 4 ++-- packages/kad-dht/src/rpc/index.ts | 3 +-- packages/protocol-autonat/src/autonat.ts | 4 ++-- packages/protocol-fetch/src/fetch.ts | 3 +-- packages/protocol-identify/src/identify-push.ts | 4 ++-- packages/protocol-identify/src/identify.ts | 3 +-- packages/protocol-perf/src/perf-service.ts | 3 +-- packages/protocol-ping/src/ping.ts | 3 +-- packages/pubsub/src/index.ts | 4 ++-- packages/pubsub/test/utils/index.ts | 4 ++-- packages/transport-circuit-relay-v2/src/server/index.ts | 4 ++-- .../transport-circuit-relay-v2/src/transport/transport.ts | 4 ++-- packages/transport-circuit-relay-v2/test/stop.spec.ts | 4 ++-- .../src/private-to-private/initiate-connection.ts | 4 ++-- .../src/private-to-private/signaling-stream-handler.ts | 3 +-- packages/transport-webrtc/src/private-to-private/transport.ts | 4 ++-- 16 files changed, 26 insertions(+), 32 deletions(-) diff --git a/packages/interface-compliance-tests/src/mocks/registrar.ts b/packages/interface-compliance-tests/src/mocks/registrar.ts index fe22e1a219..f9168406b5 100644 --- a/packages/interface-compliance-tests/src/mocks/registrar.ts +++ b/packages/interface-compliance-tests/src/mocks/registrar.ts @@ -1,6 +1,6 @@ import merge from 'merge-options' -import type { Connection, PeerId, Topology } from '@libp2p/interface' -import type { IncomingStreamData, Registrar, StreamHandler, StreamHandlerOptions, StreamHandlerRecord } from '@libp2p/interface-internal' +import type { Connection, PeerId, Topology, IncomingStreamData, StreamHandler, StreamHandlerOptions, StreamHandlerRecord } from '@libp2p/interface' +import type { Registrar } from '@libp2p/interface-internal' export class MockRegistrar implements Registrar { private readonly topologies = new Map>() diff --git a/packages/kad-dht/src/rpc/index.ts b/packages/kad-dht/src/rpc/index.ts index 4a0c70aff4..9eb4c95c29 100644 --- a/packages/kad-dht/src/rpc/index.ts +++ b/packages/kad-dht/src/rpc/index.ts @@ -11,8 +11,7 @@ import type { PeerInfoMapper, Validators } from '../index.js' import type { PeerRouting } from '../peer-routing' import type { Providers } from '../providers' import type { RoutingTable } from '../routing-table' -import type { CounterGroup, Logger, Metrics, PeerId } from '@libp2p/interface' -import type { IncomingStreamData } from '@libp2p/interface-internal' +import type { CounterGroup, Logger, Metrics, PeerId, IncomingStreamData } from '@libp2p/interface' export interface DHTMessageHandler { handle(peerId: PeerId, msg: Message): Promise diff --git a/packages/protocol-autonat/src/autonat.ts b/packages/protocol-autonat/src/autonat.ts index bb2e5bc8f9..a295f96c9b 100644 --- a/packages/protocol-autonat/src/autonat.ts +++ b/packages/protocol-autonat/src/autonat.ts @@ -13,8 +13,8 @@ import * as Digest from 'multiformats/hashes/digest' import { DEFAULT_CONNECTION_THRESHOLD, MAX_INBOUND_STREAMS, MAX_MESSAGE_SIZE, MAX_OUTBOUND_STREAMS, PROTOCOL_NAME, PROTOCOL_PREFIX, PROTOCOL_VERSION, TIMEOUT } from './constants.js' import { Message } from './pb/index.js' import type { AutoNATComponents, AutoNATServiceInit } from './index.js' -import type { Logger, Connection, PeerId, Startable, AbortOptions } from '@libp2p/interface' -import type { AddressType, IncomingStreamData } from '@libp2p/interface-internal' +import type { Logger, Connection, PeerId, Startable, AbortOptions, IncomingStreamData } from '@libp2p/interface' +import type { AddressType } from '@libp2p/interface-internal' import type { PeerSet } from '@libp2p/peer-collections' import type { Filter } from '@libp2p/utils/filters' import type { RepeatingTask } from '@libp2p/utils/repeating-task' diff --git a/packages/protocol-fetch/src/fetch.ts b/packages/protocol-fetch/src/fetch.ts index c7fd391458..d27bd130be 100644 --- a/packages/protocol-fetch/src/fetch.ts +++ b/packages/protocol-fetch/src/fetch.ts @@ -5,8 +5,7 @@ import { toString as uint8arrayToString } from 'uint8arrays/to-string' import { PROTOCOL_NAME, PROTOCOL_VERSION } from './constants.js' import { FetchRequest, FetchResponse } from './pb/proto.js' import type { Fetch as FetchInterface, FetchComponents, FetchInit, LookupFunction } from './index.js' -import type { AbortOptions, Logger, Stream, PeerId, Startable } from '@libp2p/interface' -import type { IncomingStreamData } from '@libp2p/interface-internal' +import type { AbortOptions, Logger, Stream, PeerId, Startable, IncomingStreamData } from '@libp2p/interface' const DEFAULT_TIMEOUT = 10000 diff --git a/packages/protocol-identify/src/identify-push.ts b/packages/protocol-identify/src/identify-push.ts index 7489dc9412..55cff68b54 100644 --- a/packages/protocol-identify/src/identify-push.ts +++ b/packages/protocol-identify/src/identify-push.ts @@ -15,8 +15,8 @@ import { import { Identify as IdentifyMessage } from './pb/message.js' import { AbstractIdentify, consumeIdentifyMessage, defaultValues } from './utils.js' import type { IdentifyPush as IdentifyPushInterface, IdentifyPushComponents, IdentifyPushInit } from './index.js' -import type { Stream, Startable } from '@libp2p/interface' -import type { ConnectionManager, IncomingStreamData } from '@libp2p/interface-internal' +import type { Stream, Startable, IncomingStreamData } from '@libp2p/interface' +import type { ConnectionManager } from '@libp2p/interface-internal' export class IdentifyPush extends AbstractIdentify implements Startable, IdentifyPushInterface { private readonly connectionManager: ConnectionManager diff --git a/packages/protocol-identify/src/identify.ts b/packages/protocol-identify/src/identify.ts index 7ab98ac572..8ba0137368 100644 --- a/packages/protocol-identify/src/identify.ts +++ b/packages/protocol-identify/src/identify.ts @@ -16,8 +16,7 @@ import { import { Identify as IdentifyMessage } from './pb/message.js' import { AbstractIdentify, consumeIdentifyMessage, defaultValues, getCleanMultiaddr } from './utils.js' import type { Identify as IdentifyInterface, IdentifyComponents, IdentifyInit } from './index.js' -import type { IdentifyResult, AbortOptions, Connection, Stream, Startable } from '@libp2p/interface' -import type { IncomingStreamData } from '@libp2p/interface-internal' +import type { IdentifyResult, AbortOptions, Connection, Stream, Startable, IncomingStreamData } from '@libp2p/interface' const CODEC_IP6 = 0x29 diff --git a/packages/protocol-perf/src/perf-service.ts b/packages/protocol-perf/src/perf-service.ts index ad35b61eb0..23e9096739 100644 --- a/packages/protocol-perf/src/perf-service.ts +++ b/packages/protocol-perf/src/perf-service.ts @@ -1,8 +1,7 @@ import { pushable } from 'it-pushable' import { MAX_INBOUND_STREAMS, MAX_OUTBOUND_STREAMS, PROTOCOL_NAME, RUN_ON_LIMITED_CONNECTION, WRITE_BLOCK_SIZE } from './constants.js' import type { PerfOptions, PerfOutput, PerfComponents, PerfInit, Perf as PerfInterface } from './index.js' -import type { Logger, Startable } from '@libp2p/interface' -import type { IncomingStreamData } from '@libp2p/interface-internal' +import type { Logger, Startable, IncomingStreamData } from '@libp2p/interface' import type { Multiaddr } from '@multiformats/multiaddr' export class Perf implements Startable, PerfInterface { diff --git a/packages/protocol-ping/src/ping.ts b/packages/protocol-ping/src/ping.ts index a1111bfb3c..1f822f1cf4 100644 --- a/packages/protocol-ping/src/ping.ts +++ b/packages/protocol-ping/src/ping.ts @@ -4,8 +4,7 @@ import { byteStream } from 'it-byte-stream' import { equals as uint8ArrayEquals } from 'uint8arrays/equals' import { PROTOCOL_PREFIX, PROTOCOL_NAME, PING_LENGTH, PROTOCOL_VERSION, TIMEOUT, MAX_INBOUND_STREAMS, MAX_OUTBOUND_STREAMS } from './constants.js' import type { PingServiceComponents, PingServiceInit, PingService as PingServiceInterface } from './index.js' -import type { AbortOptions, Logger, Stream, PeerId, Startable } from '@libp2p/interface' -import type { IncomingStreamData } from '@libp2p/interface-internal' +import type { AbortOptions, Logger, Stream, PeerId, Startable, IncomingStreamData } from '@libp2p/interface' import type { Multiaddr } from '@multiformats/multiaddr' export class PingService implements Startable, PingServiceInterface { diff --git a/packages/pubsub/src/index.ts b/packages/pubsub/src/index.ts index 1b35e368f2..d3d26f353f 100644 --- a/packages/pubsub/src/index.ts +++ b/packages/pubsub/src/index.ts @@ -40,8 +40,8 @@ import { verifySignature } from './sign.js' import { toMessage, ensureArray, noSignMsgId, msgId, toRpcMessage, randomSeqno } from './utils.js' -import type { PubSub, Message, StrictNoSign, StrictSign, PubSubInit, PubSubEvents, PeerStreams, PubSubRPCMessage, PubSubRPC, PubSubRPCSubscription, SubscriptionChangeData, PublishResult, TopicValidatorFn, ComponentLogger, Logger, Connection, PeerId, PrivateKey } from '@libp2p/interface' -import type { IncomingStreamData, Registrar } from '@libp2p/interface-internal' +import type { PubSub, Message, StrictNoSign, StrictSign, PubSubInit, PubSubEvents, PeerStreams, PubSubRPCMessage, PubSubRPC, PubSubRPCSubscription, SubscriptionChangeData, PublishResult, TopicValidatorFn, ComponentLogger, Logger, Connection, PeerId, PrivateKey, IncomingStreamData } from '@libp2p/interface' +import type { Registrar } from '@libp2p/interface-internal' import type { Uint8ArrayList } from 'uint8arraylist' export interface PubSubComponents { diff --git a/packages/pubsub/test/utils/index.ts b/packages/pubsub/test/utils/index.ts index fe0c974727..453981c567 100644 --- a/packages/pubsub/test/utils/index.ts +++ b/packages/pubsub/test/utils/index.ts @@ -1,8 +1,8 @@ import { duplexPair } from 'it-pair/duplex' import { PubSubBaseProtocol } from '../../src/index.js' import { RPC } from '../message/rpc.js' -import type { Connection, PeerId, PublishResult, PubSubRPC, PubSubRPCMessage, Topology } from '@libp2p/interface' -import type { IncomingStreamData, Registrar, StreamHandler, StreamHandlerRecord } from '@libp2p/interface-internal' +import type { Connection, PeerId, PublishResult, PubSubRPC, PubSubRPCMessage, Topology, IncomingStreamData, StreamHandler, StreamHandlerRecord } from '@libp2p/interface' +import type { Registrar } from '@libp2p/interface-internal' export class PubsubImplementation extends PubSubBaseProtocol { async publishMessage (): Promise { diff --git a/packages/transport-circuit-relay-v2/src/server/index.ts b/packages/transport-circuit-relay-v2/src/server/index.ts index 021cb28b12..7da1101fa5 100644 --- a/packages/transport-circuit-relay-v2/src/server/index.ts +++ b/packages/transport-circuit-relay-v2/src/server/index.ts @@ -19,8 +19,8 @@ import { createLimitedRelay } from '../utils.js' import { ReservationStore, type ReservationStoreInit } from './reservation-store.js' import { ReservationVoucherRecord } from './reservation-voucher.js' import type { CircuitRelayService, RelayReservation } from '../index.js' -import type { ComponentLogger, Logger, Connection, Stream, ConnectionGater, PeerId, PeerStore, Startable, PrivateKey, Metrics, AbortOptions } from '@libp2p/interface' -import type { AddressManager, ConnectionManager, IncomingStreamData, Registrar } from '@libp2p/interface-internal' +import type { ComponentLogger, Logger, Connection, Stream, ConnectionGater, PeerId, PeerStore, Startable, PrivateKey, Metrics, AbortOptions, IncomingStreamData } from '@libp2p/interface' +import type { AddressManager, ConnectionManager, Registrar } from '@libp2p/interface-internal' import type { PeerMap } from '@libp2p/peer-collections' const isRelayAddr = (ma: Multiaddr): boolean => ma.protoCodes().includes(CIRCUIT_PROTO_CODE) diff --git a/packages/transport-circuit-relay-v2/src/transport/transport.ts b/packages/transport-circuit-relay-v2/src/transport/transport.ts index 6f0a254b60..7917f0ae3a 100644 --- a/packages/transport-circuit-relay-v2/src/transport/transport.ts +++ b/packages/transport-circuit-relay-v2/src/transport/transport.ts @@ -14,8 +14,8 @@ import { RelayDiscovery } from './discovery.js' import { createListener } from './listener.js' import { ReservationStore } from './reservation-store.js' import type { CircuitRelayTransportComponents, CircuitRelayTransportInit } from './index.js' -import type { Transport, CreateListenerOptions, Listener, Upgrader, ComponentLogger, Logger, Connection, Stream, ConnectionGater, PeerId, PeerStore, OutboundConnectionUpgradeEvents, DialTransportOptions, OpenConnectionProgressEvents } from '@libp2p/interface' -import type { AddressManager, ConnectionManager, IncomingStreamData, Registrar, TransportManager } from '@libp2p/interface-internal' +import type { Transport, CreateListenerOptions, Listener, Upgrader, ComponentLogger, Logger, Connection, Stream, ConnectionGater, PeerId, PeerStore, OutboundConnectionUpgradeEvents, DialTransportOptions, OpenConnectionProgressEvents, IncomingStreamData } from '@libp2p/interface' +import type { AddressManager, ConnectionManager, Registrar, TransportManager } from '@libp2p/interface-internal' import type { Multiaddr } from '@multiformats/multiaddr' import type { ProgressEvent } from 'progress-events' diff --git a/packages/transport-circuit-relay-v2/test/stop.spec.ts b/packages/transport-circuit-relay-v2/test/stop.spec.ts index f25a639147..aa90575484 100644 --- a/packages/transport-circuit-relay-v2/test/stop.spec.ts +++ b/packages/transport-circuit-relay-v2/test/stop.spec.ts @@ -14,8 +14,8 @@ import Sinon from 'sinon' import { stubInterface, type StubbedInstance } from 'sinon-ts' import { Status, StopMessage } from '../src/pb/index.js' import { CircuitRelayTransport } from '../src/transport/transport.js' -import type { TypedEventTarget, ComponentLogger, Libp2pEvents, Connection, Stream, ConnectionGater, PeerId, PeerStore, Upgrader } from '@libp2p/interface' -import type { AddressManager, ConnectionManager, RandomWalk, Registrar, StreamHandler, TransportManager } from '@libp2p/interface-internal' +import type { TypedEventTarget, ComponentLogger, Libp2pEvents, Connection, Stream, ConnectionGater, PeerId, PeerStore, Upgrader, StreamHandler } from '@libp2p/interface' +import type { AddressManager, ConnectionManager, RandomWalk, Registrar, TransportManager } from '@libp2p/interface-internal' interface StubbedCircuitRelayTransportComponents { peerId: PeerId diff --git a/packages/transport-webrtc/src/private-to-private/initiate-connection.ts b/packages/transport-webrtc/src/private-to-private/initiate-connection.ts index f4299ace9e..97cb2a8f11 100644 --- a/packages/transport-webrtc/src/private-to-private/initiate-connection.ts +++ b/packages/transport-webrtc/src/private-to-private/initiate-connection.ts @@ -9,8 +9,8 @@ import { Message } from './pb/message.js' import { SIGNALING_PROTO_ID, splitAddr, type WebRTCDialEvents, type WebRTCTransportMetrics } from './transport.js' import { readCandidatesUntilConnected } from './util.js' import type { DataChannelOptions } from '../index.js' -import type { LoggerOptions, Connection, ComponentLogger } from '@libp2p/interface' -import type { ConnectionManager, IncomingStreamData, TransportManager } from '@libp2p/interface-internal' +import type { LoggerOptions, Connection, ComponentLogger, IncomingStreamData } from '@libp2p/interface' +import type { ConnectionManager, TransportManager } from '@libp2p/interface-internal' import type { Multiaddr } from '@multiformats/multiaddr' import type { ProgressOptions } from 'progress-events' diff --git a/packages/transport-webrtc/src/private-to-private/signaling-stream-handler.ts b/packages/transport-webrtc/src/private-to-private/signaling-stream-handler.ts index cfd115210a..675ddd6051 100644 --- a/packages/transport-webrtc/src/private-to-private/signaling-stream-handler.ts +++ b/packages/transport-webrtc/src/private-to-private/signaling-stream-handler.ts @@ -4,8 +4,7 @@ import { SDPHandshakeFailedError } from '../error.js' import { type RTCPeerConnection, RTCSessionDescription } from '../webrtc/index.js' import { Message } from './pb/message.js' import { getConnectionState, readCandidatesUntilConnected } from './util.js' -import type { Logger } from '@libp2p/interface' -import type { IncomingStreamData } from '@libp2p/interface-internal' +import type { Logger, IncomingStreamData } from '@libp2p/interface' export interface IncomingStreamOpts extends IncomingStreamData { peerConnection: RTCPeerConnection diff --git a/packages/transport-webrtc/src/private-to-private/transport.ts b/packages/transport-webrtc/src/private-to-private/transport.ts index 1e374107ba..decd807445 100644 --- a/packages/transport-webrtc/src/private-to-private/transport.ts +++ b/packages/transport-webrtc/src/private-to-private/transport.ts @@ -10,8 +10,8 @@ import { initiateConnection } from './initiate-connection.js' import { WebRTCPeerListener } from './listener.js' import { handleIncomingStream } from './signaling-stream-handler.js' import type { DataChannelOptions } from '../index.js' -import type { OutboundConnectionUpgradeEvents, CreateListenerOptions, DialTransportOptions, Transport, Listener, Upgrader, ComponentLogger, Logger, Connection, PeerId, CounterGroup, Metrics, Startable, OpenConnectionProgressEvents } from '@libp2p/interface' -import type { IncomingStreamData, Registrar, ConnectionManager, TransportManager } from '@libp2p/interface-internal' +import type { OutboundConnectionUpgradeEvents, CreateListenerOptions, DialTransportOptions, Transport, Listener, Upgrader, ComponentLogger, Logger, Connection, PeerId, CounterGroup, Metrics, Startable, OpenConnectionProgressEvents, IncomingStreamData } from '@libp2p/interface' +import type { Registrar, ConnectionManager, TransportManager } from '@libp2p/interface-internal' import type { ProgressEvent } from 'progress-events' const WEBRTC_TRANSPORT = '/webrtc'