Skip to content

Commit

Permalink
Update base (#2)
Browse files Browse the repository at this point in the history 
* fix(master): New profile update/removal endpoint (inspired by WhiskeySockets#1048)

* remove duplicated call reject event / add terminate tag (WhiskeySockets#1031)

* initial commit

* add terminate tag

* lint

* lint 2

* Update src/Socket/messages-recv.ts

* chore: linting

---------

Co-authored-by: Rajeh Taher <rajeh@reforward.dev>

* fix: messaging-history.set event not emitting syncType and progress / add PDO request id (WhiskeySockets#1042)

* initial commit

* add PDO request id

* hotfix: always send acks even in case of errors (WhiskeySockets#1043)

* chore: update-cache-manager-dependency (WhiskeySockets#996)

* chore: update-cache-manager-dependency

* fix: Linting

---------

Co-authored-by: Eduardo <eduandy@gmail.com>

* feat: add label feature (WhiskeySockets#955)

Co-authored-by: 刘建辉 <liujianhui@gongchang.com>

* chore(release): v6.7.8

* fix(master): Small fix to the profile picture endpoints

* fix(master): Fixes prop hash reset due to missing property in the response

* chat-utils: fix the clear chat chat mod

* mobile: deprecation.

* lint: 0 warnings left

* messages-send,tsconfig: add poll message attributes + fix tsconfig

* Update Baileys version

* chore(release): v6.7.9

---------

Co-authored-by: Rajeh Taher <rajeh@reforward.dev>
Co-authored-by: vini <91087061+vinikjkkj@users.noreply.github.com>
Co-authored-by: wduandy <64294538+wduandy@users.noreply.github.com>
Co-authored-by: Eduardo <eduandy@gmail.com>
Co-authored-by: 建辉 <jianhuihi@gmail.com>
Co-authored-by: 刘建辉 <liujianhui@gongchang.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
@raphaelmprimo @purpshell
@vinikjkkj @wduandy @eduandy @jianhuihi @github-actions
8 people authored Nov 22, 2024
1 parent a69fe06 commit 20d9dc3
Show file tree
Hide file tree
Showing 51 changed files with 996 additions and 1,714 deletions.
2 changes: 1 addition & 1 deletion .eslintignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ coverage
src/WABinary/index.ts
WAProto
WASignalGroup
Example/test.ts
Example/Example.ts
docs
10 changes: 2 additions & 8 deletions .eslintrc.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "@adiwajshing",
"extends": "@whiskeysockets",
"parserOptions": {
"sourceType": "module",
"project": "./tsconfig.json"
Expand All @@ -21,13 +21,7 @@
"@typescript-eslint/no-unnecessary-type-assertion": [
"warn"
],
"no-restricted-syntax": [
"warn",
{
"selector": "TSEnumDeclaration",
"message": "Don't declare enums, use literals instead"
}
],
"no-restricted-syntax": "off",
"keyword-spacing": [
"warn"
]
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## 6.7.7 (2024-08-22)
## 6.7.9 (2024-10-22)



90 changes: 4 additions & 86 deletions Example/example.ts
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Boom } from '@hapi/boom'
import NodeCache from 'node-cache'
import readline from 'readline'
import makeWASocket, { AnyMessageContent, BinaryInfo, delay, DisconnectReason, downloadAndProcessHistorySyncNotification, encodeWAM, fetchLatestBaileysVersion, getAggregateVotesInPollMessage, getHistoryMsg, isJidNewsletter, makeCacheableSignalKeyStore, makeInMemoryStore, PHONENUMBER_MCC, proto, useMultiFileAuthState, WAMessageContent, WAMessageKey } from '../src'
import makeWASocket, { AnyMessageContent, BinaryInfo, delay, DisconnectReason, downloadAndProcessHistorySyncNotification, encodeWAM, fetchLatestBaileysVersion, getAggregateVotesInPollMessage, getHistoryMsg, isJidNewsletter, makeCacheableSignalKeyStore, makeInMemoryStore, proto, useMultiFileAuthState, WAMessageContent, WAMessageKey } from '../src'
//import MAIN_LOGGER from '../src/Utils/logger'
import open from 'open'
import fs from 'fs'
Expand All @@ -13,7 +13,6 @@ logger.level = 'trace'
const useStore = !process.argv.includes('--no-store')
const doReplies = process.argv.includes('--do-reply')
const usePairingCode = process.argv.includes('--use-pairing-code')
const useMobile = process.argv.includes('--mobile')

// external map to store retry counts of messages when decryption/encryption fails
// keep this out of the socket itself, so as to prevent a message decryption/encryption loop across socket restarts
Expand Down Expand Up @@ -45,7 +44,6 @@ const startSock = async() => {
version,
logger,
printQRInTerminal: !usePairingCode,
mobile: useMobile,
auth: {
creds: state.creds,
/** caching makes the store faster to send/recv messages */
Expand All @@ -63,93 +61,13 @@ const startSock = async() => {
store?.bind(sock.ev)

// Pairing code for Web clients
if(usePairingCode && !sock.authState.creds.registered) {
if(useMobile) {
throw new Error('Cannot use pairing code with mobile api')
}

const phoneNumber = await question('Please enter your mobile phone number:\n')
if (usePairingCode && !sock.authState.creds.registered) {
// todo move to QR event
const phoneNumber = await question('Please enter your phone number:\n')
const code = await sock.requestPairingCode(phoneNumber)
console.log(`Pairing code: ${code}`)
}

// If mobile was chosen, ask for the code
if(useMobile && !sock.authState.creds.registered) {
const { registration } = sock.authState.creds || { registration: {} }

if(!registration.phoneNumber) {
registration.phoneNumber = await question('Please enter your mobile phone number:\n')
}

const libPhonenumber = await import("libphonenumber-js")
const phoneNumber = libPhonenumber.parsePhoneNumber(registration!.phoneNumber)
if(!phoneNumber?.isValid()) {
throw new Error('Invalid phone number: ' + registration!.phoneNumber)
}

registration.phoneNumber = phoneNumber.format('E.164')
registration.phoneNumberCountryCode = phoneNumber.countryCallingCode
registration.phoneNumberNationalNumber = phoneNumber.nationalNumber
const mcc = PHONENUMBER_MCC[phoneNumber.countryCallingCode]
if(!mcc) {
throw new Error('Could not find MCC for phone number: ' + registration!.phoneNumber + '\nPlease specify the MCC manually.')
}

registration.phoneNumberMobileCountryCode = mcc

async function enterCode() {
try {
const code = await question('Please enter the one time code:\n')
const response = await sock.register(code.replace(/["']/g, '').trim().toLowerCase())
console.log('Successfully registered your phone number.')
console.log(response)
rl.close()
} catch(error) {
console.error('Failed to register your phone number. Please try again.\n', error)
await askForOTP()
}
}

async function enterCaptcha() {
const response = await sock.requestRegistrationCode({ ...registration, method: 'captcha' })
const path = __dirname + '/captcha.png'
fs.writeFileSync(path, Buffer.from(response.image_blob!, 'base64'))

open(path)
const code = await question('Please enter the captcha code:\n')
fs.unlinkSync(path)
registration.captcha = code.replace(/["']/g, '').trim().toLowerCase()
}

async function askForOTP() {
if (!registration.method) {
await delay(2000)
let code = await question('How would you like to receive the one time code for registration? "sms" or "voice"\n')
code = code.replace(/["']/g, '').trim().toLowerCase()
if(code !== 'sms' && code !== 'voice') {
return await askForOTP()
}

registration.method = code
}

try {
await sock.requestRegistrationCode(registration)
await enterCode()
} catch(error) {
console.error('Failed to request registration code. Please try again.\n', error)

if(error?.reason === 'code_checkpoint') {
await enterCaptcha()
}

await askForOTP()
}
}

askForOTP()
}

const sendMessageWTyping = async(msg: AnyMessageContent, jid: string) => {
await sock.presenceSubscribe(jid)
await delay(500)
Expand Down
10 changes: 0 additions & 10 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,16 +89,6 @@ connectToWhatsApp()

If the connection is successful, you will see a QR code printed on your terminal screen, scan it with WhatsApp on your phone and you'll be logged in!

**Note:** install `qrcode-terminal` using `yarn add qrcode-terminal` to auto-print the QR to the terminal.

**Note:** the code to support the legacy version of WA Web (pre multi-device) has been removed in v5. Only the standard multi-device connection is now supported. This is done as WA seems to have completely dropped support for the legacy version.

## Connecting native mobile api

Baileys also supports the native mobile API, which allows users to authenticate as a standalone WhatsApp client using their phone number.

Run the [example](Example/example.ts) file with ``--mobile`` cli flag to use the native mobile API.

## Configuring the Connection

You can configure the connection by passing a `SocketConfig` object.
Expand Down
11 changes: 5 additions & 6 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "baileys",
"version": "6.7.7",
"version": "6.7.9",
"description": "WhatsApp API",
"keywords": [
"whatsapp",
Expand Down Expand Up @@ -33,10 +33,9 @@
"changelog:preview": "conventional-changelog -p angular -u",
"changelog:update": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
"example": "node --inspect -r ts-node/register Example/example.ts",
"example:mobile": "node --inspect -r ts-node/register Example/example.ts --mobile",
"gen:protobuf": "sh WAProto/GenerateStatics.sh",
"lint": "eslint src --ext .js,.ts,.jsx,.tsx",
"lint:fix": "eslint src --fix --ext .js,.ts,.jsx,.tsx",
"lint": "eslint src --ext .js,.ts",
"lint:fix": "yarn lint --fix",
"prepack": "tsc",
"prepare": "tsc",
"release": "release-it",
Expand All @@ -45,10 +44,11 @@
"dependencies": {
"@adiwajshing/keyed-db": "^0.2.4",
"@hapi/boom": "^9.1.3",
"@whiskeysockets/eslint-config": "github:whiskeysockets/eslint-config",
"async-lock": "^1.4.1",
"audio-decode": "^2.1.3",
"axios": "^1.6.0",
"cache-manager": "4.0.1",
"cache-manager": "^5.7.6",
"futoin-hkdf": "^1.5.1",
"libphonenumber-js": "^1.10.20",
"libsignal": "github:WhiskeySockets/libsignal-node",
Expand All @@ -61,7 +61,6 @@
"ws": "^8.13.0"
},
"devDependencies": {
"@adiwajshing/eslint-config": "github:adiwajshing/eslint-config",
"@types/got": "^9.6.11",
"@types/jest": "^27.5.1",
"@types/node": "^16.0.0",
Expand Down
2 changes: 1 addition & 1 deletion src/Defaults/baileys-version.json
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": [2, 3000, 1015901307]
"version": [2, 3000, 1017531287]
}
18 changes: 0 additions & 18 deletions src/Defaults/index.ts
View file
Original file line number Diff line number Diff line change
@@ -1,43 +1,25 @@
import { createHash } from 'crypto'
import { proto } from '../../WAProto'
import { makeLibSignalRepository } from '../Signal/libsignal'
import type { AuthenticationState, MediaType, SocketConfig, WAVersion } from '../Types'
import { Browsers } from '../Utils'
import logger from '../Utils/logger'
import { version } from './baileys-version.json'
import phoneNumberMCC from './phonenumber-mcc.json'

export const UNAUTHORIZED_CODES = [401, 403, 419]

export const PHONENUMBER_MCC = phoneNumberMCC

export const DEFAULT_ORIGIN = 'https://web.whatsapp.com'
export const MOBILE_ENDPOINT = 'g.whatsapp.net'
export const MOBILE_PORT = 443
export const DEF_CALLBACK_PREFIX = 'CB:'
export const DEF_TAG_PREFIX = 'TAG:'
export const PHONE_CONNECTION_CB = 'CB:Pong'

export const WA_DEFAULT_EPHEMERAL = 7 * 24 * 60 * 60

const WA_VERSION = '2.24.6.77'

const WA_VERSION_HASH = createHash('md5').update(WA_VERSION).digest('hex')
export const MOBILE_TOKEN = Buffer.from('0a1mLfGUIBVrMKF1RdvLI5lkRBvof6vn0fD2QRSM' + WA_VERSION_HASH)
export const MOBILE_REGISTRATION_ENDPOINT = 'https://v.whatsapp.net/v2'
export const MOBILE_USERAGENT = `WhatsApp/${WA_VERSION} iOS/15.3.1 Device/Apple-iPhone_7`
export const REGISTRATION_PUBLIC_KEY = Buffer.from([
5, 142, 140, 15, 116, 195, 235, 197, 215, 166, 134, 92, 108, 60, 132, 56, 86, 176, 97, 33, 204, 232, 234, 119, 77,
34, 251, 111, 18, 37, 18, 48, 45,
])
export const NOISE_MODE = 'Noise_XX_25519_AESGCM_SHA256\0\0\0\0'
export const DICT_VERSION = 2
export const KEY_BUNDLE_TYPE = Buffer.from([5])
export const NOISE_WA_HEADER = Buffer.from(
[ 87, 65, 6, DICT_VERSION ]
) // last is "DICT_VERSION"
export const PROTOCOL_VERSION = [5, 2]
export const MOBILE_NOISE_HEADER = Buffer.concat([Buffer.from('WA'), Buffer.from(PROTOCOL_VERSION)])
/** from: https://stackoverflow.com/questions/3809401/what-is-a-good-regular-expression-to-match-a-url */
export const URL_REGEX = /(http(s)?:\/\/.)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/

Expand Down
5 changes: 2 additions & 3 deletions src/Socket/Client/index.ts
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
export * from './abstract-socket-client'
export * from './mobile-socket-client'
export * from './web-socket-client'
export * from './types'
export * from './websocket'
66 changes: 0 additions & 66 deletions src/Socket/Client/mobile-socket-client.ts
View file

This file was deleted.

0 src/Socket/Client/abstract-socket-client.ts → src/Socket/Client/types.ts
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion src/Socket/Client/web-socket-client.ts → src/Socket/Client/websocket.ts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import WebSocket from 'ws'
import { DEFAULT_ORIGIN } from '../../Defaults'
import { AbstractSocketClient } from './abstract-socket-client'
import { AbstractSocketClient } from './types'

export class WebSocketClient extends AbstractSocketClient {

Expand Down
Loading

0 comments on commit 20d9dc3

Please sign in to comment.