Merge pull request #227 from arespawn:pair-code-handiling

Fix /pairwithcode phone input handling

Author: arespawn

.github/workflows/new-release-v2.yml

@@ -32,10 +32,10 @@ jobs:
       - name: Generate binaries
         run: |
           mkdir -p build
-          npx -y @yao-pkg/pkg out.cjs -t node24-linux-x64   --options no-warnings --no-bytecode --public --public-packages "*" -o build/WA2DC-Linux
-          npx -y @yao-pkg/pkg out.cjs -t node24-linux-arm64 --options no-warnings --no-bytecode --public --public-packages "*" -o build/WA2DC-Linux-arm64
-          npx -y @yao-pkg/pkg out.cjs -t node24-macos-x64   --options no-warnings --no-bytecode --public --public-packages "*" -o build/WA2DC-macOS
-          npx -y @yao-pkg/pkg out.cjs -t node24-win-x64     --options no-warnings --no-bytecode --public --public-packages "*" -o build/WA2DC.exe
+          npx -y @yao-pkg/pkg@6.19.0 out.cjs -t node24-linux-x64   --options no-warnings --no-bytecode --public --public-packages "*" -o build/WA2DC-Linux
+          npx -y @yao-pkg/pkg@6.19.0 out.cjs -t node24-linux-arm64 --options no-warnings --no-bytecode --public --public-packages "*" -o build/WA2DC-Linux-arm64
+          npx -y @yao-pkg/pkg@6.19.0 out.cjs -t node24-macos-x64   --options no-warnings --no-bytecode --public --public-packages "*" -o build/WA2DC-macOS
+          npx -y @yao-pkg/pkg@6.19.0 out.cjs -t node24-win-x64     --options no-warnings --no-bytecode --public --public-packages "*" -o build/WA2DC.exe
 
       - name: Generate runtime sidecar archives
         run: |

docs/commands.md

@@ -8,7 +8,8 @@ All bot controls now run exclusively through Discord slash commands. Type `/` in
 
 ### `/pairwithcode`
 Request a pairing code for a specific phone number.  
-Usage: `/pairwithcode number:<E.164 phone number>`
+Usage: `/pairwithcode phone:<E.164 phone number>`  
+Note: `phone` can include a leading `+`, spaces, dashes, dots, or parentheses; WA2DC normalizes it before requesting the pairing code.
 
 ### `/chatinfo`
 Show which WhatsApp chat the current channel/thread is linked to (JID + type), plus the Discord target mode.  

docs/dev/testing-and-release.md

@@ -1,7 +1,7 @@
 # Testing And Release
 
 > Owner: WA2DC maintainers
-> Last reviewed: 2026-03-19
+> Last reviewed: 2026-05-07
 > Scope: Validation commands, CI expectations, and packaging constraints.
 
 ## Validation matrix
@@ -24,8 +24,8 @@ CI executes the following on `ubuntu-latest`, `macos-latest`, and `windows-lates
 Release pipeline builds packaged binaries from an ESM runtime bundle plus a pkg-safe CJS bootstrap:
 
 - esbuild bundles `src/runner.js` to `out.js` (ESM) for Node smoke checks
-- esbuild also bundles `src/runner.js` to `out.js` (ESM) for pkg, then writes `out.cjs` as a tiny bootstrap that dynamically imports `out.js`
-- `pkg` produces platform binaries from `out.cjs` with `--no-bytecode`
+- esbuild also bundles `src/runner.js` to `out.js` (ESM) for pkg, then writes `out.cjs` as a tiny bootstrap that loads `out.js` from pkg's virtual filesystem and dynamically imports it
+- pinned `@yao-pkg/pkg` produces platform binaries from `out.cjs` with `--no-bytecode`
 - packaged builds also stage `build/runtime/` as a sidecar for runtime-only media dependencies (`sharp`, `canvas`, `jsdom`, `lottie-web`) so native image normalization and Discord sticker rendering remain available in packaged runtimes
 - release builds publish a signed `${binary}.runtime.tar.gz` archive for each packaged binary so `/update` can refresh the sidecar automatically
 - packaged startup may download that signed runtime archive on demand when a packaged install is missing `runtime/`

scripts/buildBinary.js

@@ -6,6 +6,7 @@ import path from "node:path";
 
 const require = createRequire(import.meta.url);
 const RUNTIME_SIDECAR_DEPENDENCIES = ["sharp", "canvas", "jsdom", "lottie-web"];
+const PKG_PACKAGE_SPEC = process.env.WA2DC_PKG_PACKAGE || "@yao-pkg/pkg@6.19.0";
 
 function platformToPkgOs(platform) {
 	if (platform === "win32") return "win";
@@ -123,7 +124,7 @@ run(getBin("npm"), ["run", "bundle:pkg"]);
 
 const pkgArgs = [
 	"-y",
-	"@yao-pkg/pkg",
+	PKG_PACKAGE_SPEC,
 	pkgEntrypoint,
 	"-t",
 	target,

scripts/buildPkgBundle.js

@@ -18,12 +18,15 @@ await esbuild.build({
 	outfile: "out.js",
 });
 
-const bundleBase64 = fs.readFileSync("out.js", "base64");
 const pkgBootstrap = `'use strict';
 
+const fs = require('fs');
+const path = require('path');
+
 globalThis.__wa2dcPkgRequire = require;
 
-const bundleUrl = "data:text/javascript;base64,${bundleBase64}";
+const bundleBase64 = fs.readFileSync(path.join(__dirname, 'out.js'), 'base64');
+const bundleUrl = \`data:text/javascript;base64,\${bundleBase64}\`;
 
 (async () => {
 	await import(bundleUrl);

src/discordHandler.js

@@ -2183,6 +2183,48 @@ const requireNewsletterMethod = async (ctx, methodName) => {
 	return method.bind(state.waClient);
 };
 
+const getStringOrNumberOptionValue = (ctx, optionName) => {
+	try {
+		const stringValue = ctx.getStringOption(optionName);
+		if (stringValue !== null && stringValue !== undefined) {
+			return stringValue;
+		}
+	} catch {}
+
+	try {
+		const numberValue = ctx.getNumberOption(optionName);
+		if (numberValue !== null && numberValue !== undefined) {
+			return numberValue;
+		}
+	} catch {}
+
+	try {
+		const integerValue = ctx.getIntegerOption(optionName);
+		if (integerValue !== null && integerValue !== undefined) {
+			return integerValue;
+		}
+	} catch {}
+
+	return null;
+};
+
+const normalizePairingPhoneNumber = (value) => {
+	if (
+		typeof value === "number" &&
+		(!Number.isFinite(value) || !Number.isInteger(value))
+	) {
+		return null;
+	}
+
+	const raw = String(value ?? "").trim();
+	if (!raw || !/^\+?[\d\s().-]+$/.test(raw)) {
+		return null;
+	}
+
+	const digits = raw.replace(/\D/g, "");
+	return /^[1-9]\d{6,14}$/.test(digits) ? digits : null;
+};
+
 const commandHandlers = {
 	ping: {
 		description: "Check the bot latency.",
@@ -2230,17 +2272,20 @@ const commandHandlers = {
 		description: "Request a WhatsApp pairing code.",
 		options: [
 			{
-				name: "number",
-				description: "Phone number with country code.",
+				name: "phone",
+				description: "Phone number with country code, such as +12025550123.",
 				type: ApplicationCommandOptionTypes.STRING,
 				required: true,
 			},
 		],
 		async execute(ctx) {
-			const number = ctx.getStringOption("number");
+			const rawNumber =
+				getStringOrNumberOptionValue(ctx, "phone") ??
+				getStringOrNumberOptionValue(ctx, "number");
+			const number = normalizePairingPhoneNumber(rawNumber);
 			if (!number) {
 				await ctx.reply(
-					'Please enter your number. Usage: `pairWithCode <number>`. Don\'t use "+" or any other special characters.',
+					"Please enter a phone number with country code, such as `+12025550123` or `12025550123`.",
 				);
 				return;
 			}

tests/updateCommands.test.js

@@ -3,6 +3,7 @@ import { EventEmitter } from "node:events";
 import test from "node:test";
 import { setTimeout as delay } from "node:timers/promises";
 
+import discordJs from "discord.js";
 import {
 	resetClientFactoryOverrides,
 	setClientFactoryOverrides,
@@ -19,6 +20,8 @@ import initIsolatedStorage from "./helpers/initIsolatedStorage.js";
 
 await initIsolatedStorage(import.meta.url);
 
+const { ApplicationCommandOptionType } = discordJs;
+
 const importDiscordHandler = async (tag) =>
 	(await import(`../src/discordHandler.js?test=${encodeURIComponent(tag)}`))
 		.default;
@@ -1029,6 +1032,200 @@ test("/poll in a newsletter-linked channel falls back to text when interactive a
 	}
 });
 
+test("/pairwithcode registers a phone string option", async () => {
+	const originalDiscordUtils = {
+		getGuild: utils.discord.getGuild,
+		getControlChannel: utils.discord.getControlChannel,
+	};
+	const originalSettings = {
+		Token: state.settings.Token,
+		GuildID: state.settings.GuildID,
+		ControlChannelID: state.settings.ControlChannelID,
+	};
+	const originalDcClient = state.dcClient;
+
+	try {
+		state.settings.Token = "TEST_TOKEN";
+		state.settings.GuildID = "guild";
+		state.settings.ControlChannelID = "control";
+
+		let registeredCommands = null;
+		utils.discord.getGuild = async () => ({
+			commands: {
+				set: async (commands) => {
+					registeredCommands = commands;
+				},
+			},
+		});
+		utils.discord.getControlChannel = async () => ({ send: async () => {} });
+
+		const fakeClient = new FakeDiscordClient();
+		setClientFactoryOverrides({ createDiscordClient: () => fakeClient });
+		const discordHandler = await importDiscordHandler(
+			"pairwithcode-registration",
+		);
+		state.dcClient = await discordHandler.start();
+
+		assert.equal(await waitFor(() => registeredCommands), true);
+		const command = registeredCommands.find(
+			(candidate) => candidate.name === "pairwithcode",
+		);
+		assert.ok(command);
+		assert.deepEqual(command.options, [
+			{
+				name: "phone",
+				description: "Phone number with country code, such as +12025550123.",
+				type: ApplicationCommandOptionType.String,
+				required: true,
+			},
+		]);
+	} finally {
+		utils.discord.getGuild = originalDiscordUtils.getGuild;
+		utils.discord.getControlChannel = originalDiscordUtils.getControlChannel;
+
+		state.settings.Token = originalSettings.Token;
+		state.settings.GuildID = originalSettings.GuildID;
+		state.settings.ControlChannelID = originalSettings.ControlChannelID;
+
+		state.dcClient = originalDcClient;
+		resetClientFactoryOverrides();
+	}
+});
+
+test("/pairwithcode accepts E.164 input and sends digits to Baileys", async () => {
+	const originalDiscordUtils = {
+		getGuild: utils.discord.getGuild,
+		getControlChannel: utils.discord.getControlChannel,
+	};
+	const originalSettings = {
+		Token: state.settings.Token,
+		GuildID: state.settings.GuildID,
+		ControlChannelID: state.settings.ControlChannelID,
+	};
+	const originalDcClient = state.dcClient;
+	const originalWaClient = state.waClient;
+
+	try {
+		state.settings.Token = "TEST_TOKEN";
+		state.settings.GuildID = "guild";
+		state.settings.ControlChannelID = "control";
+
+		utils.discord.getGuild = async () => ({
+			commands: { set: async () => {} },
+		});
+		utils.discord.getControlChannel = async () => ({ send: async () => {} });
+
+		const pairingRequests = [];
+		state.waClient = {
+			async requestPairingCode(phoneNumber) {
+				pairingRequests.push(phoneNumber);
+				return "ABCD-1234";
+			},
+		};
+
+		const fakeClient = new FakeDiscordClient();
+		setClientFactoryOverrides({ createDiscordClient: () => fakeClient });
+		const discordHandler = await importDiscordHandler("pairwithcode-e164");
+		state.dcClient = await discordHandler.start();
+		await delay(0);
+
+		const interaction = createInteraction({
+			channelId: "control",
+			commandName: "pairwithcode",
+			stringOptions: {
+				phone: "+20 (10) 123-4567",
+			},
+		});
+		fakeClient.emit("interactionCreate", interaction);
+		await delay(0);
+
+		assert.deepEqual(pairingRequests, ["20101234567"]);
+		assert.equal(interaction.records.editReply.length, 1);
+		assert.equal(
+			interaction.records.editReply[0]?.content,
+			"Your pairing code is: ABCD-1234",
+		);
+	} finally {
+		utils.discord.getGuild = originalDiscordUtils.getGuild;
+		utils.discord.getControlChannel = originalDiscordUtils.getControlChannel;
+
+		state.settings.Token = originalSettings.Token;
+		state.settings.GuildID = originalSettings.GuildID;
+		state.settings.ControlChannelID = originalSettings.ControlChannelID;
+
+		state.dcClient = originalDcClient;
+		state.waClient = originalWaClient;
+		resetClientFactoryOverrides();
+	}
+});
+
+test("/pairwithcode still accepts legacy number option interactions", async () => {
+	const originalDiscordUtils = {
+		getGuild: utils.discord.getGuild,
+		getControlChannel: utils.discord.getControlChannel,
+	};
+	const originalSettings = {
+		Token: state.settings.Token,
+		GuildID: state.settings.GuildID,
+		ControlChannelID: state.settings.ControlChannelID,
+	};
+	const originalDcClient = state.dcClient;
+	const originalWaClient = state.waClient;
+
+	try {
+		state.settings.Token = "TEST_TOKEN";
+		state.settings.GuildID = "guild";
+		state.settings.ControlChannelID = "control";
+
+		utils.discord.getGuild = async () => ({
+			commands: { set: async () => {} },
+		});
+		utils.discord.getControlChannel = async () => ({ send: async () => {} });
+
+		const pairingRequests = [];
+		state.waClient = {
+			async requestPairingCode(phoneNumber) {
+				pairingRequests.push(phoneNumber);
+				return "WXYZ-9876";
+			},
+		};
+
+		const fakeClient = new FakeDiscordClient();
+		setClientFactoryOverrides({ createDiscordClient: () => fakeClient });
+		const discordHandler = await importDiscordHandler("pairwithcode-legacy");
+		state.dcClient = await discordHandler.start();
+		await delay(0);
+
+		const interaction = createInteraction({
+			channelId: "control",
+			commandName: "pairwithcode",
+			stringOptions: {
+				number: "+1 202 555 0123",
+			},
+		});
+		fakeClient.emit("interactionCreate", interaction);
+		await delay(0);
+
+		assert.deepEqual(pairingRequests, ["12025550123"]);
+		assert.equal(interaction.records.editReply.length, 1);
+		assert.equal(
+			interaction.records.editReply[0]?.content,
+			"Your pairing code is: WXYZ-9876",
+		);
+	} finally {
+		utils.discord.getGuild = originalDiscordUtils.getGuild;
+		utils.discord.getControlChannel = originalDiscordUtils.getControlChannel;
+
+		state.settings.Token = originalSettings.Token;
+		state.settings.GuildID = originalSettings.GuildID;
+		state.settings.ControlChannelID = originalSettings.ControlChannelID;
+
+		state.dcClient = originalDcClient;
+		state.waClient = originalWaClient;
+		resetClientFactoryOverrides();
+	}
+});
+
 test("/setwamediaburstsize updates WhatsApp to Discord media burst size", async () => {
 	const originalDiscordUtils = {
 		getGuild: utils.discord.getGuild,