wechat-to-anything 0.6.9 → 0.6.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cli/bridge.mjs +4 -3
- package/cli/weixin.mjs +1 -1
- package/package.json +1 -1
package/cli/bridge.mjs
CHANGED
|
@@ -30,18 +30,19 @@ export async function start(agents, defaultAgent, { port = 9099 } = {}) {
|
|
|
30
30
|
if (!creds) {
|
|
31
31
|
console.log(pc.yellow("📱 首次使用，请扫码登录微信\n"));
|
|
32
32
|
try {
|
|
33
|
-
creds = await loginWithQR(async (
|
|
33
|
+
creds = await loginWithQR(async (qrToken, qrImgUrl) => {
|
|
34
34
|
try {
|
|
35
35
|
const qrt = await import("qrcode-terminal");
|
|
36
36
|
await new Promise((resolve) => {
|
|
37
|
-
qrt.default.generate(
|
|
37
|
+
qrt.default.generate(qrToken, { small: true }, (qr) => {
|
|
38
38
|
console.log(qr);
|
|
39
39
|
resolve();
|
|
40
40
|
});
|
|
41
41
|
});
|
|
42
42
|
} catch {
|
|
43
|
-
|
|
43
|
+
// qrcode-terminal 不可用时 fallback
|
|
44
44
|
}
|
|
45
|
+
console.log(pc.dim(` 浏览器扫码备用: ${qrImgUrl}`));
|
|
45
46
|
});
|
|
46
47
|
console.log(pc.green("✅ 微信登录成功！"));
|
|
47
48
|
} catch (err) {
|
package/cli/weixin.mjs
CHANGED
|
@@ -82,7 +82,7 @@ export async function pollQRStatus(qrcode) {
|
|
|
82
82
|
*/
|
|
83
83
|
export async function loginWithQR(onQrCode) {
|
|
84
84
|
const qr = await getQRCode();
|
|
85
|
-
await onQrCode(qr.qrcode_img_content);
|
|
85
|
+
await onQrCode(qr.qrcode, qr.qrcode_img_content);
|
|
86
86
|
|
|
87
87
|
const deadline = Date.now() + 5 * 60_000; // 5 min
|
|
88
88
|
while (Date.now() < deadline) {
|