@agent-wechat/wechaty-puppet 0.8.3 → 0.8.5
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/dist/mod.js
CHANGED
|
@@ -4496,6 +4496,8 @@ var PuppetAgentWeChat = class extends PUPPET2.Puppet {
|
|
|
4496
4496
|
client;
|
|
4497
4497
|
pollTimer;
|
|
4498
4498
|
loginHandle;
|
|
4499
|
+
loginTerminalSeen = false;
|
|
4500
|
+
loginFailureEmitted = false;
|
|
4499
4501
|
lastSeenId = /* @__PURE__ */ new Map();
|
|
4500
4502
|
// In-memory stores
|
|
4501
4503
|
contactStore = /* @__PURE__ */ new Map();
|
|
@@ -4572,21 +4574,42 @@ var PuppetAgentWeChat = class extends PUPPET2.Puppet {
|
|
|
4572
4574
|
// ==================
|
|
4573
4575
|
startLoginSubscription() {
|
|
4574
4576
|
log.verbose("PuppetAgentWeChat", "startLoginSubscription()");
|
|
4577
|
+
this.loginTerminalSeen = false;
|
|
4578
|
+
this.loginFailureEmitted = false;
|
|
4575
4579
|
this.loginHandle = this.client.loginSubscribe({
|
|
4576
4580
|
timeoutMs: 3e5,
|
|
4577
4581
|
onEvent: (event) => {
|
|
4578
4582
|
this.handleLoginEvent(event);
|
|
4579
4583
|
},
|
|
4580
4584
|
onError: (err) => {
|
|
4581
|
-
|
|
4582
|
-
this.
|
|
4585
|
+
const message = err.message?.trim() || "WebSocket error";
|
|
4586
|
+
const settled = this.loginTerminalSeen || Boolean(this.currentUserId);
|
|
4587
|
+
if (settled) {
|
|
4588
|
+
log.verbose("PuppetAgentWeChat", "Ignoring login WS error after terminal state: %s", message);
|
|
4589
|
+
return;
|
|
4590
|
+
}
|
|
4591
|
+
log.error("PuppetAgentWeChat", "Login WS error: %s", message);
|
|
4592
|
+
this.emitLoginFailure(message);
|
|
4593
|
+
this.loginTerminalSeen = true;
|
|
4583
4594
|
},
|
|
4584
4595
|
onClose: () => {
|
|
4585
4596
|
log.verbose("PuppetAgentWeChat", "Login WS closed");
|
|
4586
4597
|
this.loginHandle = void 0;
|
|
4598
|
+
const settled = this.loginTerminalSeen || Boolean(this.currentUserId);
|
|
4599
|
+
if (!settled) {
|
|
4600
|
+
const message = "Login connection closed before completion";
|
|
4601
|
+
log.error("PuppetAgentWeChat", message);
|
|
4602
|
+
this.emitLoginFailure(message);
|
|
4603
|
+
this.loginTerminalSeen = true;
|
|
4604
|
+
}
|
|
4587
4605
|
}
|
|
4588
4606
|
});
|
|
4589
4607
|
}
|
|
4608
|
+
emitLoginFailure(message) {
|
|
4609
|
+
if (this.loginFailureEmitted) return;
|
|
4610
|
+
this.loginFailureEmitted = true;
|
|
4611
|
+
this.emit("error", { data: message });
|
|
4612
|
+
}
|
|
4590
4613
|
handleLoginEvent(event) {
|
|
4591
4614
|
switch (event.type) {
|
|
4592
4615
|
case "qr": {
|
|
@@ -4604,13 +4627,20 @@ var PuppetAgentWeChat = class extends PUPPET2.Puppet {
|
|
|
4604
4627
|
});
|
|
4605
4628
|
break;
|
|
4606
4629
|
case "login_success":
|
|
4630
|
+
this.loginTerminalSeen = true;
|
|
4631
|
+
if (this.loginHandle) {
|
|
4632
|
+
this.loginHandle.close();
|
|
4633
|
+
this.loginHandle = void 0;
|
|
4634
|
+
}
|
|
4607
4635
|
void this.onLoginSuccess(event.userId ?? "unknown");
|
|
4608
4636
|
break;
|
|
4609
4637
|
case "login_timeout":
|
|
4610
|
-
this.
|
|
4638
|
+
this.loginTerminalSeen = true;
|
|
4639
|
+
this.emitLoginFailure("Login timed out");
|
|
4611
4640
|
break;
|
|
4612
4641
|
case "error":
|
|
4613
|
-
this.
|
|
4642
|
+
this.loginTerminalSeen = true;
|
|
4643
|
+
this.emitLoginFailure(event.message ?? "Login error");
|
|
4614
4644
|
break;
|
|
4615
4645
|
case "status":
|
|
4616
4646
|
log.verbose("PuppetAgentWeChat", "Login status: %s", event.message);
|
|
@@ -10,6 +10,8 @@ export declare class PuppetAgentWeChat extends PUPPET.Puppet {
|
|
|
10
10
|
private client;
|
|
11
11
|
private pollTimer?;
|
|
12
12
|
private loginHandle?;
|
|
13
|
+
private loginTerminalSeen;
|
|
14
|
+
private loginFailureEmitted;
|
|
13
15
|
private lastSeenId;
|
|
14
16
|
private contactStore;
|
|
15
17
|
private roomStore;
|
|
@@ -24,6 +26,7 @@ export declare class PuppetAgentWeChat extends PUPPET.Puppet {
|
|
|
24
26
|
onStart(): Promise<void>;
|
|
25
27
|
onStop(): Promise<void>;
|
|
26
28
|
private startLoginSubscription;
|
|
29
|
+
private emitLoginFailure;
|
|
27
30
|
private handleLoginEvent;
|
|
28
31
|
private onLoginSuccess;
|
|
29
32
|
private startPolling;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"puppet-agent-wechat.d.ts","sourceRoot":"","sources":["../src/puppet-agent-wechat.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAA;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAoBlC,MAAM,WAAW,wBAAyB,SAAQ,MAAM,CAAC,aAAa;IACpE,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB;AAED,qBAAa,iBAAkB,SAAQ,MAAM,CAAC,MAAM;IAElD,gBAAyB,OAAO,MAAU;IAE1C,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,SAAS,CAAC,CAAgC;IAClD,OAAO,CAAC,WAAW,CAAC,CAAuB;IAC3C,OAAO,CAAC,UAAU,CAA4B;IAG9C,OAAO,CAAC,YAAY,CAA6C;IACjE,OAAO,CAAC,SAAS,CAA0C;IAC3D,OAAO,CAAC,YAAY,CAA6C;IAEjE,OAAO,CAAC,eAAe,CAA6B;IAEpD,OAAO,KAAK,SAAS,GAIpB;IAED,OAAO,KAAK,KAAK,GAYhB;IAED,OAAO,KAAK,cAAc,GAEzB;gBAEW,OAAO,GAAE,wBAA6B;IAKzC,IAAI;IACJ,OAAO;IAMD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA2BxB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAqBtC,OAAO,CAAC,sBAAsB;
|
|
1
|
+
{"version":3,"file":"puppet-agent-wechat.d.ts","sourceRoot":"","sources":["../src/puppet-agent-wechat.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED