chore: remove legacy code

src/Types/Events.ts

@@ -8,11 +8,11 @@ import { GroupMetadata, ParticipantAction } from './GroupMetadata'
 import { MessageUpsertType, MessageUserReceiptUpdate, WAMessage, WAMessageKey, WAMessageUpdate } from './Message'
 import { ConnectionState } from './State'
 
-export type BaileysEventMap<T> = {
+export type BaileysEventMap = {
     /** connection state has been updated -- WS closed, opened, connecting etc. */
 	'connection.update': Partial<ConnectionState>
     /** credentials updated -- some metadata, keys or something */
-    'creds.update': Partial<T>
+    'creds.update': Partial<AuthenticationCreds>
     /** set chats (history sync), chats are reverse chronologically sorted */
     'chats.set': { chats: Chat[], isLatest: boolean }
     /** set messages (history sync), messages are reverse chronologically sorted */
@@ -69,13 +69,11 @@ export type BufferedEventData = {
     groupUpdates: { [jid: string]: Partial<GroupMetadata> }
 }
 
-export type BaileysEvent = keyof BaileysEventMap<any>
+export type BaileysEvent = keyof BaileysEventMap
 
-export interface CommonBaileysEventEmitter<Creds> {
-	on<T extends keyof BaileysEventMap<Creds>>(event: T, listener: (arg: BaileysEventMap<Creds>[T]) => void): void
-    off<T extends keyof BaileysEventMap<Creds>>(event: T, listener: (arg: BaileysEventMap<Creds>[T]) => void): void
-    removeAllListeners<T extends keyof BaileysEventMap<Creds>>(event: T): void
-	emit<T extends keyof BaileysEventMap<Creds>>(event: T, arg: BaileysEventMap<Creds>[T]): boolean
-}
-
-export type BaileysEventEmitter = CommonBaileysEventEmitter<AuthenticationCreds>
+export interface BaileysEventEmitter {
+	on<T extends keyof BaileysEventMap>(event: T, listener: (arg: BaileysEventMap[T]) => void): void
+    off<T extends keyof BaileysEventMap>(event: T, listener: (arg: BaileysEventMap[T]) => void): void
+    removeAllListeners<T extends keyof BaileysEventMap>(event: T): void
+	emit<T extends keyof BaileysEventMap>(event: T, arg: BaileysEventMap[T]): boolean
+}

src/Types/Legacy.ts

@@ -1,82 +0,0 @@
-import { BinaryNode } from '../WABinary'
-import { CommonBaileysEventEmitter } from './Events'
-import { CommonSocketConfig } from './Socket'
-
-export interface LegacyAuthenticationCreds {
-    clientID: string
-    serverToken: string
-    clientToken: string
-    encKey: Buffer
-    macKey: Buffer
-}
-
-/** used for binary messages */
-export enum WAMetric {
-    debugLog = 1,
-    queryResume = 2,
-    liveLocation = 3,
-    queryMedia = 4,
-    queryChat = 5,
-    queryContact = 6,
-    queryMessages = 7,
-    presence = 8,
-    presenceSubscribe = 9,
-    group = 10,
-    read = 11,
-    chat = 12,
-    received = 13,
-    picture = 14,
-    status = 15,
-    message = 16,
-    queryActions = 17,
-    block = 18,
-    queryGroup = 19,
-    queryPreview = 20,
-    queryEmoji = 21,
-    queryRead = 22,
-    queryVCard = 29,
-    queryStatus = 30,
-    queryStatusUpdate = 31,
-    queryLiveLocation = 33,
-    queryLabel = 36,
-    queryQuickReply = 39
-}
-
-/** used for binary messages */
-export enum WAFlag {
-    available = 160,
-    other = 136, // don't know this one
-    ignore = 1 << 7,
-    acknowledge = 1 << 6,
-    unavailable = 1 << 4,
-    expires = 1 << 3,
-    composing = 1 << 2,
-    recording = 1 << 2,
-    paused = 1 << 2
-}
-
-/** Tag used with binary queries */
-export type WATag = [WAMetric, WAFlag]
-
-export type SocketSendMessageOptions = {
-	json: BinaryNode | any[]
-	binaryTag?: WATag
-	tag?: string
-	longTag?: boolean
-}
-
-export type SocketQueryOptions = SocketSendMessageOptions & {
-	timeoutMs?: number
-	expect200?: boolean
-	requiresPhoneConnection?: boolean
-}
-
-export type LegacySocketConfig = CommonSocketConfig & {
-    auth?: LegacyAuthenticationCreds
-	/** max time for the phone to respond to a connectivity test */
-	phoneResponseTimeMs: number
-	/** max time for WA server to respond before error with 422 */
-    expectResponseTimeout: number
-}
-
-export type LegacyBaileysEventEmitter = CommonBaileysEventEmitter<LegacyAuthenticationCreds>

src/Types/Socket.ts

@@ -3,12 +3,16 @@ import type { Agent } from 'https'
 import type NodeCache from 'node-cache'
 import type { Logger } from 'pino'
 import type { URL } from 'url'
+import { proto } from '../../WAProto'
+import { AuthenticationState, TransactionCapabilityOptions } from './Auth'
 import { MediaConnInfo } from './Message'
 
 export type WAVersion = [number, number, number]
 export type WABrowserDescription = [string, string, string]
 
-export type CommonSocketConfig = {
+export type MessageRetryMap = { [msgId: string]: number }
+
+export type SocketConfig = {
     /** the WS url to connect to WA */
     waWebSocketUrl: string | URL
     /** Fails the connection if the socket times out in this interval */
@@ -39,4 +43,34 @@ export type CommonSocketConfig = {
     retryRequestDelayMs: number
     /** time to wait for the generation of the next QR in ms */
     qrTimeout?: number;
+    /** provide an auth state object to maintain the auth state */
+    auth: AuthenticationState
+    /** By default true, should history messages be downloaded and processed */
+    downloadHistory: boolean
+    /** transaction capability options for SignalKeyStore */
+    transactionOpts: TransactionCapabilityOptions
+    /** provide a cache to store a user's device list */
+    userDevicesCache?: NodeCache
+    /** marks the client as online whenever the socket successfully connects */
+    markOnlineOnConnect: boolean
+    /**
+     * map to store the retry counts for failed messages;
+     * used to determine whether to retry a message or not */
+    msgRetryCounterMap?: MessageRetryMap
+    /** width for link preview images */
+    linkPreviewImageThumbnailWidth: number
+    /** Should Baileys ask the phone for full history, will be received async */
+    syncFullHistory: boolean
+    /** Should baileys fire init queries automatically, default true */
+    fireInitQueries: boolean
+    /**
+     * generate a high quality link preview,
+     * entails uploading the jpegThumbnail to WA
+     * */
+    generateHighQualityLinkPreview: boolean
+    /**
+     * fetch a message from your store
+     * implement this so that messages failed to send (solves the "this message can take a while" issue) can be retried
+     * */
+    getMessage: (key: proto.IMessageKey) => Promise<proto.IMessage | undefined>
 }

src/Types/index.ts

@@ -4,51 +4,13 @@ export * from './Chat'
 export * from './Contact'
 export * from './State'
 export * from './Message'
-export * from './Legacy'
 export * from './Socket'
 export * from './Events'
 export * from './Product'
 export * from './Call'
 
-import type NodeCache from 'node-cache'
-import { proto } from '../../WAProto'
-import { AuthenticationState, TransactionCapabilityOptions } from './Auth'
-import { CommonSocketConfig } from './Socket'
-
-export type MessageRetryMap = { [msgId: string]: number }
-
-export type SocketConfig = CommonSocketConfig & {
-    /** provide an auth state object to maintain the auth state */
-    auth: AuthenticationState
-    /** By default true, should history messages be downloaded and processed */
-    downloadHistory: boolean
-    /** transaction capability options for SignalKeyStore */
-    transactionOpts: TransactionCapabilityOptions
-    /** provide a cache to store a user's device list */
-    userDevicesCache?: NodeCache
-    /** marks the client as online whenever the socket successfully connects */
-    markOnlineOnConnect: boolean
-    /**
-     * map to store the retry counts for failed messages;
-     * used to determine whether to retry a message or not */
-    msgRetryCounterMap?: MessageRetryMap
-    /** width for link preview images */
-    linkPreviewImageThumbnailWidth: number
-    /** Should Baileys ask the phone for full history, will be received async */
-    syncFullHistory: boolean
-    /** Should baileys fire init queries automatically, default true */
-    fireInitQueries: boolean
-    /**
-     * generate a high quality link preview,
-     * entails uploading the jpegThumbnail to WA
-     * */
-    generateHighQualityLinkPreview: boolean
-    /**
-     * fetch a message from your store
-     * implement this so that messages failed to send (solves the "this message can take a while" issue) can be retried
-     * */
-    getMessage: (key: proto.IMessageKey) => Promise<proto.IMessage | undefined>
-}
+import { AuthenticationState } from './Auth'
+import { SocketConfig } from './Socket'
 
 export type UserFacingSocketConfig = Partial<SocketConfig> & { auth: AuthenticationState }