@juzi/wechaty-puppet-whatsapp 1.0.63 → 1.0.65
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/cjs/src/package-json.js +2 -2
- package/dist/cjs/src/whatsapp/event-handler/login-event-handler.d.ts.map +1 -1
- package/dist/cjs/src/whatsapp/event-handler/login-event-handler.js +8 -1
- package/dist/cjs/src/whatsapp/event-handler/login-event-handler.js.map +1 -1
- package/dist/esm/src/package-json.js +2 -2
- package/dist/esm/src/whatsapp/event-handler/login-event-handler.d.ts.map +1 -1
- package/dist/esm/src/whatsapp/event-handler/login-event-handler.js +8 -1
- package/dist/esm/src/whatsapp/event-handler/login-event-handler.js.map +1 -1
- package/package.json +2 -2
- package/src/package-json.ts +2 -2
- package/src/whatsapp/event-handler/login-event-handler.ts +7 -1
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.packageJson = void 0;
|
|
4
4
|
exports.packageJson = {
|
|
5
5
|
"name": "@juzi/wechaty-puppet-whatsapp",
|
|
6
|
-
"version": "1.0.
|
|
6
|
+
"version": "1.0.65",
|
|
7
7
|
"description": "Wechaty Puppet for WhatsApp",
|
|
8
8
|
"type": "module",
|
|
9
9
|
"exports": {
|
|
@@ -72,7 +72,7 @@ exports.packageJson = {
|
|
|
72
72
|
"@juzi/wechaty-puppet": "^1.0.15"
|
|
73
73
|
},
|
|
74
74
|
"dependencies": {
|
|
75
|
-
"@juzi/whatsapp-web.js": "1.30.
|
|
75
|
+
"@juzi/whatsapp-web.js": "1.30.13",
|
|
76
76
|
"ee-ts": "^1.0.2",
|
|
77
77
|
"flash-store": "^1.0.6",
|
|
78
78
|
"fs-extra": "^10.0.1",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login-event-handler.d.ts","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/login-event-handler.ts"],"names":[],"mappings":"AAcA,OAAO,YAAY,MAAM,qBAAqB,CAAA;AAE9C,OAAO,KAAK,EACV,eAAe,EACf,WAAW,EACX,WAAW,EACZ,MAAM,+BAA+B,CAAA;AAUtC,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,YAAY;IAEzD,SAAS,CAAC,WAAW,EAAE,OAAO,CAAQ;IACtC,OAAO,CAAC,uBAAuB,CAAC,CAAc;IAC9C,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,cAAc,CAAa;IAE5B,QAAQ,CAAE,MAAM,EAAE,MAAM;IAS/B,OAAO,CAAC,uBAAuB;IAWxB,4BAA4B;IAOtB,eAAe;IAIf,aAAa,CAAE,OAAO,EAAE,MAAM;IAM9B,eAAe;IAqBf,OAAO;IAiBP,OAAO,CAAE,iBAAiB,EAAE,eAAe,EAAE;
|
|
1
|
+
{"version":3,"file":"login-event-handler.d.ts","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/login-event-handler.ts"],"names":[],"mappings":"AAcA,OAAO,YAAY,MAAM,qBAAqB,CAAA;AAE9C,OAAO,KAAK,EACV,eAAe,EACf,WAAW,EACX,WAAW,EACZ,MAAM,+BAA+B,CAAA;AAUtC,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,YAAY;IAEzD,SAAS,CAAC,WAAW,EAAE,OAAO,CAAQ;IACtC,OAAO,CAAC,uBAAuB,CAAC,CAAc;IAC9C,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,cAAc,CAAa;IAE5B,QAAQ,CAAE,MAAM,EAAE,MAAM;IAS/B,OAAO,CAAC,uBAAuB;IAWxB,4BAA4B;IAOtB,eAAe;IAIf,aAAa,CAAE,OAAO,EAAE,MAAM;IAM9B,eAAe;IAqBf,OAAO;IAiBP,OAAO,CAAE,iBAAiB,EAAE,eAAe,EAAE;IAkD7C,QAAQ,CAAE,MAAM,GAAE,MAAgD;IAalE,aAAa,CAAE,KAAK,EAAE,WAAW;IAyB9C;;;MAGE;IACW,eAAe,CAAE,WAAW,EAAE,WAAW;CAWvD"}
|
|
@@ -130,7 +130,13 @@ class LoginEventHandler extends whatsapp_base_js_1.default {
|
|
|
130
130
|
await cacheManager.setContactOrRoomRawPayload(contactOrRoomId, contactWithAvatar);
|
|
131
131
|
}
|
|
132
132
|
else if ((0, miscellaneous_js_1.isRoomId)(contactOrRoomId)) {
|
|
133
|
-
|
|
133
|
+
let memberList = [];
|
|
134
|
+
try {
|
|
135
|
+
memberList = await this.manager.syncRoomMemberList(contactOrRoomId);
|
|
136
|
+
}
|
|
137
|
+
catch (error) {
|
|
138
|
+
config_js_1.log.warn(PRE, `syncRoomMemberList(${contactOrRoomId}) failed, ${JSON.stringify(error)}`);
|
|
139
|
+
}
|
|
134
140
|
if (memberList.length > 0) {
|
|
135
141
|
roomCount++;
|
|
136
142
|
await cacheManager.setContactOrRoomRawPayload(contactOrRoomId, contactWithAvatar);
|
|
@@ -138,6 +144,7 @@ class LoginEventHandler extends whatsapp_base_js_1.default {
|
|
|
138
144
|
else {
|
|
139
145
|
await cacheManager.deleteContactOrRoom(contactOrRoomId);
|
|
140
146
|
await cacheManager.deleteRoomMemberIdList(contactOrRoomId);
|
|
147
|
+
return;
|
|
141
148
|
}
|
|
142
149
|
}
|
|
143
150
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login-event-handler.js","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/login-event-handler.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"login-event-handler.js","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/login-event-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export const packageJson = {
|
|
2
2
|
"name": "@juzi/wechaty-puppet-whatsapp",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.65",
|
|
4
4
|
"description": "Wechaty Puppet for WhatsApp",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -69,7 +69,7 @@ export const packageJson = {
|
|
|
69
69
|
"@juzi/wechaty-puppet": "^1.0.15"
|
|
70
70
|
},
|
|
71
71
|
"dependencies": {
|
|
72
|
-
"@juzi/whatsapp-web.js": "1.30.
|
|
72
|
+
"@juzi/whatsapp-web.js": "1.30.13",
|
|
73
73
|
"ee-ts": "^1.0.2",
|
|
74
74
|
"flash-store": "^1.0.6",
|
|
75
75
|
"fs-extra": "^10.0.1",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login-event-handler.d.ts","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/login-event-handler.ts"],"names":[],"mappings":"AAcA,OAAO,YAAY,MAAM,qBAAqB,CAAA;AAE9C,OAAO,KAAK,EACV,eAAe,EACf,WAAW,EACX,WAAW,EACZ,MAAM,+BAA+B,CAAA;AAUtC,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,YAAY;IAEzD,SAAS,CAAC,WAAW,EAAE,OAAO,CAAQ;IACtC,OAAO,CAAC,uBAAuB,CAAC,CAAc;IAC9C,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,cAAc,CAAa;IAE5B,QAAQ,CAAE,MAAM,EAAE,MAAM;IAS/B,OAAO,CAAC,uBAAuB;IAWxB,4BAA4B;IAOtB,eAAe;IAIf,aAAa,CAAE,OAAO,EAAE,MAAM;IAM9B,eAAe;IAqBf,OAAO;IAiBP,OAAO,CAAE,iBAAiB,EAAE,eAAe,EAAE;
|
|
1
|
+
{"version":3,"file":"login-event-handler.d.ts","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/login-event-handler.ts"],"names":[],"mappings":"AAcA,OAAO,YAAY,MAAM,qBAAqB,CAAA;AAE9C,OAAO,KAAK,EACV,eAAe,EACf,WAAW,EACX,WAAW,EACZ,MAAM,+BAA+B,CAAA;AAUtC,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,YAAY;IAEzD,SAAS,CAAC,WAAW,EAAE,OAAO,CAAQ;IACtC,OAAO,CAAC,uBAAuB,CAAC,CAAc;IAC9C,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,cAAc,CAAa;IAE5B,QAAQ,CAAE,MAAM,EAAE,MAAM;IAS/B,OAAO,CAAC,uBAAuB;IAWxB,4BAA4B;IAOtB,eAAe;IAIf,aAAa,CAAE,OAAO,EAAE,MAAM;IAM9B,eAAe;IAqBf,OAAO;IAiBP,OAAO,CAAE,iBAAiB,EAAE,eAAe,EAAE;IAkD7C,QAAQ,CAAE,MAAM,GAAE,MAAgD;IAalE,aAAa,CAAE,KAAK,EAAE,WAAW;IAyB9C;;;MAGE;IACW,eAAe,CAAE,WAAW,EAAE,WAAW;CAWvD"}
|
|
@@ -102,7 +102,13 @@ export default class LoginEventHandler extends WhatsAppBase {
|
|
|
102
102
|
await cacheManager.setContactOrRoomRawPayload(contactOrRoomId, contactWithAvatar);
|
|
103
103
|
}
|
|
104
104
|
else if (isRoomId(contactOrRoomId)) {
|
|
105
|
-
|
|
105
|
+
let memberList = [];
|
|
106
|
+
try {
|
|
107
|
+
memberList = await this.manager.syncRoomMemberList(contactOrRoomId);
|
|
108
|
+
}
|
|
109
|
+
catch (error) {
|
|
110
|
+
log.warn(PRE, `syncRoomMemberList(${contactOrRoomId}) failed, ${JSON.stringify(error)}`);
|
|
111
|
+
}
|
|
106
112
|
if (memberList.length > 0) {
|
|
107
113
|
roomCount++;
|
|
108
114
|
await cacheManager.setContactOrRoomRawPayload(contactOrRoomId, contactWithAvatar);
|
|
@@ -110,6 +116,7 @@ export default class LoginEventHandler extends WhatsAppBase {
|
|
|
110
116
|
else {
|
|
111
117
|
await cacheManager.deleteContactOrRoom(contactOrRoomId);
|
|
112
118
|
await cacheManager.deleteRoomMemberIdList(contactOrRoomId);
|
|
119
|
+
return;
|
|
113
120
|
}
|
|
114
121
|
}
|
|
115
122
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login-event-handler.js","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/login-event-handler.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"login-event-handler.js","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/login-event-handler.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@juzi/wechaty-puppet-whatsapp",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.65",
|
|
4
4
|
"description": "Wechaty Puppet for WhatsApp",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -69,7 +69,7 @@
|
|
|
69
69
|
"@juzi/wechaty-puppet": "^1.0.15"
|
|
70
70
|
},
|
|
71
71
|
"dependencies": {
|
|
72
|
-
"@juzi/whatsapp-web.js": "1.30.
|
|
72
|
+
"@juzi/whatsapp-web.js": "1.30.13",
|
|
73
73
|
"ee-ts": "^1.0.2",
|
|
74
74
|
"flash-store": "^1.0.6",
|
|
75
75
|
"fs-extra": "^10.0.1",
|
package/src/package-json.ts
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
import type { PackageJson } from 'type-fest'
|
|
5
5
|
export const packageJson: PackageJson = {
|
|
6
6
|
"name": "@juzi/wechaty-puppet-whatsapp",
|
|
7
|
-
"version": "1.0.
|
|
7
|
+
"version": "1.0.65",
|
|
8
8
|
"description": "Wechaty Puppet for WhatsApp",
|
|
9
9
|
"type": "module",
|
|
10
10
|
"exports": {
|
|
@@ -73,7 +73,7 @@ export const packageJson: PackageJson = {
|
|
|
73
73
|
"@juzi/wechaty-puppet": "^1.0.15"
|
|
74
74
|
},
|
|
75
75
|
"dependencies": {
|
|
76
|
-
"@juzi/whatsapp-web.js": "1.30.
|
|
76
|
+
"@juzi/whatsapp-web.js": "1.30.13",
|
|
77
77
|
"ee-ts": "^1.0.2",
|
|
78
78
|
"flash-store": "^1.0.6",
|
|
79
79
|
"fs-extra": "^10.0.1",
|
|
@@ -134,13 +134,19 @@ export default class LoginEventHandler extends WhatsAppBase { // FIXME: I have n
|
|
|
134
134
|
}
|
|
135
135
|
await cacheManager.setContactOrRoomRawPayload(contactOrRoomId, contactWithAvatar)
|
|
136
136
|
} else if (isRoomId(contactOrRoomId)) {
|
|
137
|
-
|
|
137
|
+
let memberList: string[] = []
|
|
138
|
+
try {
|
|
139
|
+
memberList = await this.manager.syncRoomMemberList(contactOrRoomId)
|
|
140
|
+
} catch (error) {
|
|
141
|
+
log.warn(PRE, `syncRoomMemberList(${contactOrRoomId}) failed, ${JSON.stringify(error)}`)
|
|
142
|
+
}
|
|
138
143
|
if (memberList.length > 0) {
|
|
139
144
|
roomCount++
|
|
140
145
|
await cacheManager.setContactOrRoomRawPayload(contactOrRoomId, contactWithAvatar)
|
|
141
146
|
} else {
|
|
142
147
|
await cacheManager.deleteContactOrRoom(contactOrRoomId)
|
|
143
148
|
await cacheManager.deleteRoomMemberIdList(contactOrRoomId)
|
|
149
|
+
return
|
|
144
150
|
}
|
|
145
151
|
} else {
|
|
146
152
|
log.warn(PRE, `Unknown contact type: ${JSON.stringify(contactOrRoom)}`)
|