From a3ec28e051c336dcd8c61a3df07fc6596175650d Mon Sep 17 00:00:00 2001 From: Jefferson Felix Date: Wed, 8 Oct 2025 03:27:43 -0300 Subject: [PATCH] fix error and linting (#1888) * fix: build * fix: linting * fix: cast type --- src/Signal/libsignal.ts | 2 +- src/Signal/lid-mapping.ts | 4 ++-- src/Utils/signal.ts | 13 +++++++++++-- src/WABinary/jid-utils.ts | 4 ++-- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/Signal/libsignal.ts b/src/Signal/libsignal.ts index 7ce83dd9..b9f6c71e 100644 --- a/src/Signal/libsignal.ts +++ b/src/Signal/libsignal.ts @@ -332,7 +332,7 @@ const jidToSignalProtocolAddress = (jid: string): libsignal.ProtocolAddress => { const signalUser = domainType !== WAJIDDomains.WHATSAPP ? `${user}_${domainType}` : user const finalDevice = device || 0 - if (device == 99 && decoded.server !== 'hosted' && decoded.server !== 'hosted.lid') { + if (device === 99 && decoded.server !== 'hosted' && decoded.server !== 'hosted.lid') { throw new Error('Unexpected non-hosted device JID with device 99. This ID seems invalid. ID:' + jid) } diff --git a/src/Signal/lid-mapping.ts b/src/Signal/lid-mapping.ts index 4f11c89a..e1c89000 100644 --- a/src/Signal/lid-mapping.ts +++ b/src/Signal/lid-mapping.ts @@ -154,13 +154,13 @@ export class LIDMappingStore { if (!lidUser) continue for (const device of usyncFetch[pair.pn]!) { - const deviceSpecificLid = `${lidUser}${!!device ? `:${device}` : ``}@${device == 99 ? 'hosted.lid' : 'lid'}` + const deviceSpecificLid = `${lidUser}${!!device ? `:${device}` : ``}@${device === 99 ? 'hosted.lid' : 'lid'}` this.logger.trace( `getLIDForPN: USYNC success for ${pair.pn} → ${deviceSpecificLid} (user mapping with device ${device})` ) - const deviceSpecificPn = `${pnUser}${!!device ? `:${device}` : ``}@${device == 99 ? 'hosted' : 's.whatsapp.net'}` + const deviceSpecificPn = `${pnUser}${!!device ? `:${device}` : ``}@${device === 99 ? 'hosted' : 's.whatsapp.net'}` successfulPairs[deviceSpecificPn] = { lid: deviceSpecificLid, pn: deviceSpecificPn } } diff --git a/src/Utils/signal.ts b/src/Utils/signal.ts index 346838d1..53638cae 100644 --- a/src/Utils/signal.ts +++ b/src/Utils/signal.ts @@ -18,7 +18,7 @@ import { getBinaryNodeChildUInt, jidDecode, S_WHATSAPP_NET, - WAJIDDomains, + WAJIDDomains } from '../WABinary' import type { DeviceListData, ParsedDeviceInfo, USyncQueryResultList } from '../WAUSync' import { Curve, generateSignalPubKey } from './crypto' @@ -153,7 +153,16 @@ export const extractDeviceJids = ( ((myUser !== user && myLid !== user) || myDevice !== device) && // either different user or if me user, not this device (device === 0 || !!keyIndex) // ensure that "key-index" is specified for "non-zero" devices, produces a bad req otherwise ) { - extracted.push({ user, device, domainType: isHosted ? domainType === WAJIDDomains.LID ? WAJIDDomains.HOSTED_LID : WAJIDDomains.HOSTED : domainType, server }) + extracted.push({ + user, + device, + domainType: isHosted + ? domainType === WAJIDDomains.LID + ? WAJIDDomains.HOSTED_LID + : WAJIDDomains.HOSTED + : domainType, + server + }) } } } diff --git a/src/WABinary/jid-utils.ts b/src/WABinary/jid-utils.ts index 1b74d54d..8a11c57c 100644 --- a/src/WABinary/jid-utils.ts +++ b/src/WABinary/jid-utils.ts @@ -35,7 +35,7 @@ export type FullJid = JidWithDevice & { } export const getServerFromDomainType = (initialServer: string, domainType?: WAJIDDomains): JidServer => { - switch(domainType) { + switch (domainType) { case WAJIDDomains.LID: return 'lid' case WAJIDDomains.HOSTED: @@ -44,7 +44,7 @@ export const getServerFromDomainType = (initialServer: string, domainType?: WAJI return 'hosted.lid' case WAJIDDomains.WHATSAPP: default: - return initialServer + return initialServer as JidServer } }