refactor: less obscure transport names

packages/core/src/network/transports/index.ts

@@ -12,8 +12,8 @@ export * from './obfuscated'
 export let defaultTransportFactory: TransportFactory
 if (typeof process !== 'undefined') {
     // we are in node, use tcp transport by default
-    const { TcpIntermediateTransport } = require('./tcp')
+    const { TcpTransport } = require('./tcp')
-    defaultTransportFactory = () => new TcpIntermediateTransport()
+    defaultTransportFactory = () => new TcpTransport()
 } else {
     // we are in browser (probably), use websocket
     // if no websocket, throw an error i guess ¯\_(ツ)_/¯
@@ -25,7 +25,7 @@ if (typeof process !== 'undefined') {
             )
         }
     } else {
-        const { WebSocketIntermediateTransport } = require('./websocket')
+        const { WebSocketTransport } = require('./websocket')
-        defaultTransportFactory = () => new WebSocketIntermediateTransport()
+        defaultTransportFactory = () => new WebSocketTransport()
     }
 }

packages/core/src/network/transports/tcp.ts

@@ -11,7 +11,7 @@ const debug = require('debug')('mtcute:tcp')
  * Base for TCP transports.
  * Subclasses must provide packet codec in `_packetCodec` property
  */
-export abstract class TcpTransport
+export abstract class BaseTcpTransport
     extends EventEmitter
     implements ICuteTransport {
     protected _currentDc: tl.RawDcOption | null = null
@@ -109,6 +109,6 @@ export abstract class TcpTransport
     }
 }
 
-export class TcpIntermediateTransport extends TcpTransport {
+export class TcpTransport extends BaseTcpTransport {
     _packetCodec = new IntermediatePacketCodec()
 }

packages/core/src/network/transports/websocket.ts

@@ -34,7 +34,7 @@ const subdomainsMap: Record<string, string> = {
  * Base for WebSocket transports.
  * Subclasses must provide packet codec in `_packetCodec` property
  */
-export abstract class WebSocketTransport
+export abstract class BaseWebSocketTransport
     extends EventEmitter
     implements ICuteTransport {
     private _currentDc: tl.RawDcOption | null = null
@@ -150,6 +150,6 @@ export abstract class WebSocketTransport
     }
 }
 
-export class WebSocketIntermediateTransport extends WebSocketTransport {
+export class WebSocketTransport extends BaseWebSocketTransport {
     _packetCodec = new ObfuscatedPacketCodec(new IntermediatePacketCodec())
 }

packages/http-proxy/index.ts

@@ -1,6 +1,6 @@
 import {
     IntermediatePacketCodec,
-    TcpTransport,
+    BaseTcpTransport,
     TransportState,
 } from '@mtcute/core'
 import { tl } from '@mtcute/tl'
@@ -66,7 +66,7 @@ export interface HttpProxySettings {
 /**
  * TCP transport that connects via an HTTP(S) proxy.
  */
-export abstract class HttpProxiedTcpTransport extends TcpTransport {
+export abstract class BaseHttpProxyTcpTransport extends BaseTcpTransport {
     readonly _proxy: HttpProxySettings
 
     constructor(proxy: HttpProxySettings) {
@@ -173,6 +173,6 @@ export abstract class HttpProxiedTcpTransport extends TcpTransport {
     }
 }
 
-export class HttpProxiedIntermediateTcpTransport extends HttpProxiedTcpTransport {
+export class HttpProxyTcpTransport extends BaseHttpProxyTcpTransport {
     _packetCodec = new IntermediatePacketCodec()
 }

packages/mtproxy/index.ts

@@ -4,7 +4,7 @@ import {
     IPacketCodec,
     PaddedIntermediatePacketCodec,
     parseUrlSafeBase64,
-    TcpTransport,
+    BaseTcpTransport,
     TransportState,
 } from '@mtcute/core'
 import { tl } from '@mtcute/tl'
@@ -37,7 +37,7 @@ const TLS_START = [
 /**
  * TCP transport that connects via an MTProxy
  */
-export class MtProxyTcpTransport extends TcpTransport {
+export class MtProxyTcpTransport extends BaseTcpTransport {
     readonly _proxy: MtProxySettings
 
     private _rawSecret: Buffer

packages/socks-proxy/index.ts

@@ -1,6 +1,6 @@
 import {
     IntermediatePacketCodec,
-    TcpTransport,
+    BaseTcpTransport,
     TransportState,
 } from '@mtcute/core'
 import { tl } from '@mtcute/tl'
@@ -178,7 +178,7 @@ const SOCKS5_ERRORS: Record<number, string> = {
 /**
  * TCP transport that connects via a SOCKS4/5 proxy.
  */
-export abstract class SocksProxiedTcpTransport extends TcpTransport {
+export abstract class BaseSocksTcpTransport extends BaseTcpTransport {
     readonly _proxy: SocksProxySettings
 
     constructor(proxy: SocksProxySettings) {
@@ -472,6 +472,6 @@ export abstract class SocksProxiedTcpTransport extends TcpTransport {
     }
 }
 
-export class SocksProxiedIntermediateTcpTransport extends SocksProxiedTcpTransport {
+export class SocksTcpTransport extends BaseSocksTcpTransport {
     _packetCodec = new IntermediatePacketCodec()
 }