From 076daae89ddc1f0d90ccc6aef091169b2096a1b4 Mon Sep 17 00:00:00 2001 From: Rajeh Taher Date: Sun, 7 Sep 2025 14:47:19 +0300 Subject: [PATCH] types: fix circular import closes #1746 --- src/Defaults/index.ts | 4 +++- src/Types/Message.ts | 3 +-- src/Utils/messages-media.ts | 3 +-- src/Utils/messages.ts | 10 ++++++++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/Defaults/index.ts b/src/Defaults/index.ts index ee68a18d..b1126867 100644 --- a/src/Defaults/index.ts +++ b/src/Defaults/index.ts @@ -1,6 +1,6 @@ import { proto } from '../../WAProto/index.js' import { makeLibSignalRepository } from '../Signal/libsignal' -import type { AuthenticationState, MediaType, SocketConfig, WAVersion } from '../Types' +import type { AuthenticationState, SocketConfig, WAVersion } from '../Types' import { Browsers } from '../Utils' import logger from '../Utils/logger' import defaultVersion from './baileys-version.json' with { type: 'json' } @@ -105,6 +105,8 @@ export const MEDIA_HKDF_KEY_MAPPING = { 'biz-cover-photo': 'Image' } +export type MediaType = keyof typeof MEDIA_HKDF_KEY_MAPPING + export const MEDIA_KEYS = Object.keys(MEDIA_PATH_MAP) as MediaType[] export const MIN_PREKEY_COUNT = 5 diff --git a/src/Types/Message.ts b/src/Types/Message.ts index 581857a3..bf1af218 100644 --- a/src/Types/Message.ts +++ b/src/Types/Message.ts @@ -2,7 +2,7 @@ import type { AxiosRequestConfig } from 'axios' import type { Readable } from 'stream' import type { URL } from 'url' import { proto } from '../../WAProto/index.js' -import { MEDIA_HKDF_KEY_MAPPING } from '../Defaults' +import type { MediaType } from '../Defaults' import type { BinaryNode } from '../WABinary' import type { GroupMetadata } from './GroupMetadata' import type { CacheStore } from './Socket' @@ -152,7 +152,6 @@ type RequestPhoneNumber = { requestPhoneNumber: boolean } -export type MediaType = keyof typeof MEDIA_HKDF_KEY_MAPPING export type AnyMediaMessageContent = ( | ({ image: WAMediaUpload diff --git a/src/Utils/messages-media.ts b/src/Utils/messages-media.ts index 6020f61b..db52fbf0 100644 --- a/src/Utils/messages-media.ts +++ b/src/Utils/messages-media.ts @@ -10,13 +10,12 @@ import { join } from 'path' import { Readable, Transform } from 'stream' import { URL } from 'url' import { proto } from '../../WAProto/index.js' -import { DEFAULT_ORIGIN, MEDIA_HKDF_KEY_MAPPING, MEDIA_PATH_MAP } from '../Defaults' +import { DEFAULT_ORIGIN, MEDIA_HKDF_KEY_MAPPING, MEDIA_PATH_MAP, type MediaType } from '../Defaults' import type { BaileysEventMap, DownloadableMessage, MediaConnInfo, MediaDecryptionKeyInfo, - MediaType, MessageType, SocketConfig, WAGenericMediaMessage, diff --git a/src/Utils/messages.ts b/src/Utils/messages.ts index a872553d..7618b842 100644 --- a/src/Utils/messages.ts +++ b/src/Utils/messages.ts @@ -4,12 +4,18 @@ import { randomBytes } from 'crypto' import { promises as fs } from 'fs' import { type Transform } from 'stream' import { proto } from '../../WAProto/index.js' -import { CALL_AUDIO_PREFIX, CALL_VIDEO_PREFIX, MEDIA_KEYS, URL_REGEX, WA_DEFAULT_EPHEMERAL } from '../Defaults' +import { + CALL_AUDIO_PREFIX, + CALL_VIDEO_PREFIX, + MEDIA_KEYS, + type MediaType, + URL_REGEX, + WA_DEFAULT_EPHEMERAL +} from '../Defaults' import type { AnyMediaMessageContent, AnyMessageContent, DownloadableMessage, - MediaType, MessageContentGenerationOptions, MessageGenerationOptions, MessageGenerationOptionsFromContent,