@juzi/wechaty-puppet-whatsapp 1.0.25 → 1.0.26
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/examples/ding-dong-bot.js +5 -1
- package/dist/cjs/examples/ding-dong-bot.js.map +1 -1
- package/dist/cjs/src/helper/pure-function/contact-raw-payload-parser.d.ts.map +1 -1
- package/dist/cjs/src/helper/pure-function/contact-raw-payload-parser.js +6 -1
- package/dist/cjs/src/helper/pure-function/contact-raw-payload-parser.js.map +1 -1
- package/dist/cjs/src/package-json.js +1 -1
- package/dist/cjs/src/puppet-mixin/friendship.d.ts.map +1 -1
- package/dist/cjs/src/puppet-mixin/friendship.js +2 -1
- package/dist/cjs/src/puppet-mixin/friendship.js.map +1 -1
- package/dist/cjs/src/puppet-whatsapp.d.ts.map +1 -1
- package/dist/cjs/src/puppet-whatsapp.js +8 -2
- package/dist/cjs/src/puppet-whatsapp.js.map +1 -1
- package/dist/cjs/src/schema/contact.d.ts +8 -0
- package/dist/cjs/src/schema/contact.d.ts.map +1 -0
- package/dist/cjs/src/schema/contact.js +12 -0
- package/dist/cjs/src/schema/contact.js.map +1 -0
- 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 +1 -0
- package/dist/cjs/src/whatsapp/event-handler/login-event-handler.js.map +1 -1
- package/dist/cjs/src/whatsapp/event-handler/message-event-handler.d.ts +1 -0
- package/dist/cjs/src/whatsapp/event-handler/message-event-handler.d.ts.map +1 -1
- package/dist/cjs/src/whatsapp/event-handler/message-event-handler.js +40 -9
- package/dist/cjs/src/whatsapp/event-handler/message-event-handler.js.map +1 -1
- package/dist/esm/examples/ding-dong-bot.js +5 -1
- package/dist/esm/examples/ding-dong-bot.js.map +1 -1
- package/dist/esm/src/helper/pure-function/contact-raw-payload-parser.d.ts.map +1 -1
- package/dist/esm/src/helper/pure-function/contact-raw-payload-parser.js +6 -1
- package/dist/esm/src/helper/pure-function/contact-raw-payload-parser.js.map +1 -1
- package/dist/esm/src/package-json.js +1 -1
- package/dist/esm/src/puppet-mixin/friendship.d.ts.map +1 -1
- package/dist/esm/src/puppet-mixin/friendship.js +2 -1
- package/dist/esm/src/puppet-mixin/friendship.js.map +1 -1
- package/dist/esm/src/puppet-whatsapp.d.ts.map +1 -1
- package/dist/esm/src/puppet-whatsapp.js +8 -2
- package/dist/esm/src/puppet-whatsapp.js.map +1 -1
- package/dist/esm/src/schema/contact.d.ts +8 -0
- package/dist/esm/src/schema/contact.d.ts.map +1 -0
- package/dist/esm/src/schema/contact.js +9 -0
- package/dist/esm/src/schema/contact.js.map +1 -0
- 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 +2 -1
- package/dist/esm/src/whatsapp/event-handler/login-event-handler.js.map +1 -1
- package/dist/esm/src/whatsapp/event-handler/message-event-handler.d.ts +1 -0
- package/dist/esm/src/whatsapp/event-handler/message-event-handler.d.ts.map +1 -1
- package/dist/esm/src/whatsapp/event-handler/message-event-handler.js +40 -9
- package/dist/esm/src/whatsapp/event-handler/message-event-handler.js.map +1 -1
- package/package.json +1 -1
- package/src/helper/pure-function/contact-raw-payload-parser.ts +6 -1
- package/src/package-json.ts +1 -1
- package/src/puppet-mixin/friendship.ts +2 -1
- package/src/puppet-whatsapp.ts +7 -2
- package/src/schema/contact.ts +7 -0
- package/src/whatsapp/event-handler/login-event-handler.ts +2 -0
- package/src/whatsapp/event-handler/message-event-handler.ts +42 -9
|
@@ -72,7 +72,8 @@ puppet
|
|
|
72
72
|
.on('scan', onScan)
|
|
73
73
|
.on('error', onError)
|
|
74
74
|
.on('message', onMessage)
|
|
75
|
-
.on('dirty', onDirty)
|
|
75
|
+
.on('dirty', onDirty)
|
|
76
|
+
.on('ready', onReady);
|
|
76
77
|
/**
|
|
77
78
|
*
|
|
78
79
|
* 3. Start the bot!
|
|
@@ -154,6 +155,9 @@ async function onDirty(payload) {
|
|
|
154
155
|
console.log('updated contact: ', JSON.stringify(contact));
|
|
155
156
|
}
|
|
156
157
|
}
|
|
158
|
+
async function onReady() {
|
|
159
|
+
console.log('onReady()');
|
|
160
|
+
}
|
|
157
161
|
/**
|
|
158
162
|
*
|
|
159
163
|
* 7. Output the Welcome Message
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ding-dong-bot.js","sourceRoot":"","sources":["../../../examples/ding-dong-bot.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ding-dong-bot.js","sourceRoot":"","sources":["../../../examples/ding-dong-bot.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contact-raw-payload-parser.d.ts","sourceRoot":"","sources":["../../../../../src/helper/pure-function/contact-raw-payload-parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAG9C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAA;
|
|
1
|
+
{"version":3,"file":"contact-raw-payload-parser.d.ts","sourceRoot":"","sources":["../../../../../src/helper/pure-function/contact-raw-payload-parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAG9C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAA;AAG3E,wBAAgB,uBAAuB,CAAE,cAAc,EAAE,sBAAsB,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CA0C3H"}
|
|
@@ -26,6 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
26
26
|
exports.parserContactRawPayload = void 0;
|
|
27
27
|
const PUPPET = __importStar(require("@juzi/wechaty-puppet"));
|
|
28
28
|
const config_js_1 = require("../../config.js");
|
|
29
|
+
const contact_js_1 = require("../../schema/contact.js");
|
|
29
30
|
function parserContactRawPayload(contactPayload, userName) {
|
|
30
31
|
let type;
|
|
31
32
|
if (contactPayload.isUser) {
|
|
@@ -53,9 +54,10 @@ function parserContactRawPayload(contactPayload, userName) {
|
|
|
53
54
|
name = contactPayload.name || contactPayload.pushname;
|
|
54
55
|
}
|
|
55
56
|
const number = contactPayload.number || contactPayload.id.user;
|
|
57
|
+
const isFriend = contactPayload.isMyContact && contactPayload.isUser;
|
|
56
58
|
return {
|
|
57
59
|
avatar: contactPayload.avatar,
|
|
58
|
-
friend:
|
|
60
|
+
friend: isFriend,
|
|
59
61
|
gender: PUPPET.types.ContactGender.Unknown,
|
|
60
62
|
id: contactPayload.id._serialized,
|
|
61
63
|
name: name || contactPayload.id._serialized,
|
|
@@ -63,6 +65,9 @@ function parserContactRawPayload(contactPayload, userName) {
|
|
|
63
65
|
type: type,
|
|
64
66
|
handle: number,
|
|
65
67
|
weixin: number,
|
|
68
|
+
additionalInfo: JSON.stringify({
|
|
69
|
+
status: isFriend ? contact_js_1.ContactStatus.FRIEND : contact_js_1.ContactStatus.NOT_FRIEND,
|
|
70
|
+
}),
|
|
66
71
|
};
|
|
67
72
|
}
|
|
68
73
|
exports.parserContactRawPayload = parserContactRawPayload;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contact-raw-payload-parser.js","sourceRoot":"","sources":["../../../../../src/helper/pure-function/contact-raw-payload-parser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAA8C;AAC9C,+CAAsD;
|
|
1
|
+
{"version":3,"file":"contact-raw-payload-parser.js","sourceRoot":"","sources":["../../../../../src/helper/pure-function/contact-raw-payload-parser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAA8C;AAC9C,+CAAsD;AAGtD,wDAAuD;AAEvD,SAAgB,uBAAuB,CAAE,cAAsC,EAAE,QAAiB;IAChG,IAAI,IAAI,CAAA;IACR,IAAI,cAAc,CAAC,MAAM,EAAE;QACzB,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAA;KACvC;SAAM,IAAI,cAAc,CAAC,YAAY,EAAE;QACtC,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAA;KACxC;SAAM;QACL,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAA;KACpC;IACD,IAAI,IAAI,CAAA;IAER,IAAI,cAAc,CAAC,IAAI,EAAE;QACvB,IAAI,GAAG,QAAQ,IAAI,cAAc,CAAC,QAAQ,CAAA;QAC1C,IAAI,IAAI,KAAK,gCAAoB,EAAE;YACjC,IAAI,GAAG,cAAc,CAAC,SAAS,CAAA;SAChC;KACF;SAAM;QACL;;;;WAIG;QACH,IAAI,GAAG,cAAc,CAAC,IAAI,IAAI,cAAc,CAAC,QAAQ,CAAA;KACtD;IAED,MAAM,MAAM,GAAG,cAAc,CAAC,MAAM,IAAI,cAAc,CAAC,EAAE,CAAC,IAAI,CAAA;IAE9D,MAAM,QAAQ,GAAG,cAAc,CAAC,WAAW,IAAI,cAAc,CAAC,MAAM,CAAA;IACpE,OAAO;QACL,MAAM,EAAE,cAAc,CAAC,MAAM;QAC7B,MAAM,EAAE,QAAQ;QAChB,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO;QAC1C,EAAE,EAAE,cAAc,CAAC,EAAE,CAAC,WAAW;QACjC,IAAI,EAAE,IAAI,IAAI,cAAc,CAAC,EAAE,CAAC,WAAW;QAC3C,KAAK,EAAE,CAAC,MAAM,CAAC;QACf,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,MAAM;QACd,MAAM,EAAE,MAAM;QACd,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC;YAC7B,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,0BAAa,CAAC,MAAM,CAAC,CAAC,CAAC,0BAAa,CAAC,UAAU;SACnE,CAAC;KACH,CAAA;AACH,CAAC;AA1CD,0DA0CC"}
|
|
@@ -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.26",
|
|
7
7
|
"description": "Wechaty Puppet for WhatsApp",
|
|
8
8
|
"type": "module",
|
|
9
9
|
"exports": {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"friendship.d.ts","sourceRoot":"","sources":["../../../../src/puppet-mixin/friendship.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAI9C,OAAO,KAAK,cAAc,MAAM,uBAAuB,CAAA;AACvD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAA;AAIxE,MAAM,MAAM,oBAAoB,GAAG,sBAAsB,CAAA;AAEzD,wBAAsB,oBAAoB,CAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAoB3G;AAED,wBAAsB,0BAA0B,CAAE,UAAU,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"friendship.d.ts","sourceRoot":"","sources":["../../../../src/puppet-mixin/friendship.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAI9C,OAAO,KAAK,cAAc,MAAM,uBAAuB,CAAA;AACvD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAA;AAIxE,MAAM,MAAM,oBAAoB,GAAG,sBAAsB,CAAA;AAEzD,wBAAsB,oBAAoB,CAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAoB3G;AAED,wBAAsB,0BAA0B,CAAE,UAAU,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CASvH;AAED,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,cAAc,EACpB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,CAQxB;AAED,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,CAGxB;AAED,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,CAGxB;AAED,wBAAsB,aAAa,CACjC,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,oBAAoB,GACzC,OAAO,CAAC,IAAI,CAAC,CA+Bf;AAED,wBAAsB,gBAAgB,CACpC,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC,CAGf;AAED,wBAAgB,4BAA4B,CAAE,EAAE,EAAE,MAAM;;;EAWvD"}
|
|
@@ -55,8 +55,9 @@ async function friendshipRawPayload(id) {
|
|
|
55
55
|
}
|
|
56
56
|
exports.friendshipRawPayload = friendshipRawPayload;
|
|
57
57
|
async function friendshipRawPayloadParser(rawPayload) {
|
|
58
|
+
const contactId = rawPayload.fromMe ? rawPayload.to : rawPayload.from;
|
|
58
59
|
return {
|
|
59
|
-
contactId
|
|
60
|
+
contactId,
|
|
60
61
|
hello: rawPayload.body,
|
|
61
62
|
id: rawPayload.id.id,
|
|
62
63
|
timestamp: rawPayload.timestamp,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"friendship.js","sourceRoot":"","sources":["../../../../src/puppet-mixin/friendship.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAA8C;AAC9C,4CAAkC;AAClC,8DAA0D;AAC1D,uFAAoD;AAIpD,MAAM,GAAG,GAAG,kBAAkB,CAAA;AAIvB,KAAK,UAAU,oBAAoB,CAAwB,EAAU;IAC1E,IAAI,EAAE,CAAC,UAAU,CAAC,wBAAwB,CAAC,EAAE;QAC3C,gCAAgC;QAChC,MAAM,IAAI,GAAG,4BAA4B,CAAC,EAAE,CAAC,CAAA;QAC7C,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,SAAS;YACpB,IAAI,EAAE,EAAE;YACR,EAAE,EAAE;gBACF,EAAE;aACH;YACD,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO;SAC/B,CAAA;KACT;IACD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAA;IAClD,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAA;IACpD,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAA,2BAAO,EAAC,6BAAa,CAAC,iBAAiB,EAAE,mBAAmB,EAAE,cAAc,EAAE,EAAE,CAAC,CAAA;KACxF;IACD,OAAO,OAAO,CAAA;AAChB,CAAC;AApBD,oDAoBC;AAEM,KAAK,UAAU,0BAA0B,CAAE,UAAgC;IAChF,
|
|
1
|
+
{"version":3,"file":"friendship.js","sourceRoot":"","sources":["../../../../src/puppet-mixin/friendship.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"puppet-whatsapp.d.ts","sourceRoot":"","sources":["../../../src/puppet-whatsapp.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAE9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAM7C,OAAO,OAAO,MAAM,cAAc,CAAA;AAClC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AACtE,OAAO,KAAK,EAAE,aAAa,EAAsB,MAAM,2BAA2B,CAAA;AAKlF,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAA;AACzG,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,WAAW,EAAE,aAAa,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAC5L,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAA;AACrE,OAAO,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,aAAa,EAAE,gBAAgB,EAAE,sBAAsB,EAAgC,MAAM,8BAA8B,CAAA;AACrO,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,aAAa,EAAE,WAAW,EAAE,UAAU,EAAE,kBAAkB,EAAE,eAAe,EAAE,eAAe,EAAE,kBAAkB,EAAE,cAAc,EAAE,sBAAsB,EAAE,cAAc,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,WAAW,EAAE,kBAAkB,EAAE,cAAc,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AACrX,OAAO,EAAE,oBAAoB,EAAE,cAAc,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,cAAc,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,YAAY,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,8BAA8B,EAAE,MAAM,wBAAwB,CAAA;AAClU,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,WAAW,EAAE,cAAc,EAAE,YAAY,EAAE,eAAe,EAAE,SAAS,EAAE,iBAAiB,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAGpN,KAAK,yBAAyB,GAAG,OAAO,GAAG,kBAAkB,CAAA;AAE7D,MAAM,MAAM,qBAAqB,GAAG,MAAM,CAAC,aAAa,GAAG;IACzD,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,gBAAgB,CAAC,EAAE,aAAa,CAAA;CACjC,CAAA;AAID,cAAM,cAAe,SAAQ,MAAM,CAAC,MAAM;IAO7B,OAAO,EAAE,qBAAqB;IALzC,gBAAyB,OAAO,SAAU;IAEnC,OAAO,EAAE,yBAAyB,CAAA;gBAG9B,OAAO,GAAE,qBAA0B;IAQrC,OAAO;IAID,OAAO,IAAK,OAAO,CAAC,IAAI,CAAC;YAgC1B,YAAY;IA2BX,MAAM,IAAK,OAAO,CAAC,IAAI,CAAC;YASzB,WAAW;IAKzB;;OAEG;YACW,OAAO;YAcP,QAAQ;YAcR,SAAS;YAKT,MAAM;YAON,OAAO;YAOP,OAAO;YAKP,YAAY;
|
|
1
|
+
{"version":3,"file":"puppet-whatsapp.d.ts","sourceRoot":"","sources":["../../../src/puppet-whatsapp.ts"],"names":[],"mappings":"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"}
|
|
@@ -191,10 +191,16 @@ class PuppetWhatsapp extends PUPPET.Puppet {
|
|
|
191
191
|
contactId = (0, friendship_js_1.getFriendshipFromContactData)(payload.friendshipId).contactId;
|
|
192
192
|
}
|
|
193
193
|
else {
|
|
194
|
-
|
|
194
|
+
const message = await this.messageRawPayload(payload.friendshipId);
|
|
195
|
+
if (message.fromMe) {
|
|
196
|
+
contactId = message.to;
|
|
197
|
+
}
|
|
198
|
+
else {
|
|
199
|
+
contactId = message.from;
|
|
200
|
+
}
|
|
195
201
|
}
|
|
196
202
|
// NOTE: this function automatically put non-contact into cache
|
|
197
|
-
await this.contactRawPayload(contactId);
|
|
203
|
+
await this.contactRawPayload(contactId, true);
|
|
198
204
|
this.emit('friendship', payload);
|
|
199
205
|
}
|
|
200
206
|
async onRoomJoin(payload) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"puppet-whatsapp.js","sourceRoot":"","sources":["../../../src/puppet-whatsapp.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"puppet-whatsapp.js","sourceRoot":"","sources":["../../../src/puppet-whatsapp.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"contact.d.ts","sourceRoot":"","sources":["../../../../src/schema/contact.ts"],"names":[],"mappings":"AAAA,oBAAY,aAAa;IACvB,MAAM,IAAI;IACV,QAAQ,IAAI;IACZ,UAAU,IAAI;IACd,MAAM,IAAI;IACV,OAAO,IAAI;CACZ"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ContactStatus = void 0;
|
|
4
|
+
var ContactStatus;
|
|
5
|
+
(function (ContactStatus) {
|
|
6
|
+
ContactStatus[ContactStatus["FRIEND"] = 1] = "FRIEND";
|
|
7
|
+
ContactStatus[ContactStatus["CUSTOMER"] = 2] = "CUSTOMER";
|
|
8
|
+
ContactStatus[ContactStatus["NOT_FRIEND"] = 3] = "NOT_FRIEND";
|
|
9
|
+
ContactStatus[ContactStatus["DELETE"] = 4] = "DELETE";
|
|
10
|
+
ContactStatus[ContactStatus["REMOVED"] = 5] = "REMOVED";
|
|
11
|
+
})(ContactStatus || (exports.ContactStatus = ContactStatus = {}));
|
|
12
|
+
//# sourceMappingURL=contact.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"contact.js","sourceRoot":"","sources":["../../../../src/schema/contact.ts"],"names":[],"mappings":";;;AAAA,IAAY,aAMX;AAND,WAAY,aAAa;IACvB,qDAAU,CAAA;IACV,yDAAY,CAAA;IACZ,6DAAc,CAAA;IACd,qDAAU,CAAA;IACV,uDAAW,CAAA;AACb,CAAC,EANW,aAAa,6BAAb,aAAa,QAMxB"}
|
|
@@ -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;
|
|
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;IAUf,OAAO,CAAE,iBAAiB,EAAE,eAAe,EAAE;IAkC7C,OAAO,CAAE,iBAAiB,EAAE,eAAe,EAAE;IA4C7C,QAAQ,CAAE,MAAM,GAAE,MAAgD;IASlE,aAAa,CAAE,KAAK,EAAE,WAAW;IAyB9C;;;MAGE;IACW,eAAe,CAAE,WAAW,EAAE,WAAW;CAWvD"}
|
|
@@ -151,6 +151,7 @@ class LoginEventHandler extends whatsapp_base_js_1.default {
|
|
|
151
151
|
await this.manager.processHistoryMessages(contactOrRoom);
|
|
152
152
|
});
|
|
153
153
|
config_js_1.log.info(PRE, `onReady() all contacts and rooms are ready, friendCount: ${friendCount} contactCount: ${contactCount} roomCount: ${roomCount}`);
|
|
154
|
+
await (0, miscellaneous_js_1.sleep)(15 * 1000);
|
|
154
155
|
this.emit('ready');
|
|
155
156
|
this.loadingData = false;
|
|
156
157
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login-event-handler.js","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/login-event-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAAyC;AACzC,6DAA8C;AAC9C,+CAMwB;AACxB,iEAA6D;AAC7D,0FAAuD;AACvD,8EAE2C;AAC3C,2EAA8C;AAO9C,
|
|
1
|
+
{"version":3,"file":"login-event-handler.js","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/login-event-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,5 +31,6 @@ export default class MessageEventHandler extends WhatsAppBase {
|
|
|
31
31
|
*/
|
|
32
32
|
onMessageRevokeMe(message: WhatsAppMessage): Promise<void>;
|
|
33
33
|
generateFakeRecallMessageId(messageId: string): string;
|
|
34
|
+
private checkCacheManager;
|
|
34
35
|
}
|
|
35
36
|
//# sourceMappingURL=message-event-handler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-event-handler.d.ts","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/message-event-handler.ts"],"names":[],"mappings":"AASA,OAAO,YAAY,MAAM,qBAAqB,CAAA;AAE9C,OAAO,KAAK,EACV,eAAe,EACf,sBAAsB,EACvB,MAAM,+BAA+B,CAAA;AAWtC,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,YAAY;IAE9C,SAAS,CAAE,OAAO,EAAE,eAAe,GAAG,sBAAsB;
|
|
1
|
+
{"version":3,"file":"message-event-handler.d.ts","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/message-event-handler.ts"],"names":[],"mappings":"AASA,OAAO,YAAY,MAAM,qBAAqB,CAAA;AAE9C,OAAO,KAAK,EACV,eAAe,EACf,sBAAsB,EACvB,MAAM,+BAA+B,CAAA;AAWtC,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,YAAY;IAE9C,SAAS,CAAE,OAAO,EAAE,eAAe,GAAG,sBAAsB;IAiDzE;;;;OAIG;IACU,YAAY,CAAE,OAAO,EAAE,eAAe;IA6BnD;;;;OAIG;IACU,eAAe,CAAE,OAAO,EAAE,eAAe;IA4BzC,qBAAqB,CAAE,OAAO,EAAE,eAAe;IAmB/C,+BAA+B,CAAE,OAAO,EAAE,eAAe,GAAG,sBAAsB,GAAG,OAAO,CAAC,OAAO,CAAC;IA+BrG,cAAc,CAAE,GAAG,IAAI,EAAE,GAAG,EAAE;IAI9B,eAAe,CAAE,OAAO,EAAE,eAAe;IAQzC,0BAA0B,CAAE,OAAO,EAAE,eAAe;IAcjE;;;;;OAKG;IACU,uBAAuB,CAAE,OAAO,EAAE,eAAe,EAAE,UAAU,CAAC,EAAE,eAAe,GAAG,IAAI,GAAG,SAAS;IAkB/G;;OAEG;IACU,iBAAiB,CAAE,OAAO,EAAE,eAAe;IAqBjD,2BAA2B,CAAE,SAAS,EAAE,MAAM;YAIvC,iBAAiB;CAYhC"}
|
|
@@ -12,6 +12,10 @@ const PRE = 'MessageEventHandler';
|
|
|
12
12
|
class MessageEventHandler extends whatsapp_base_js_1.default {
|
|
13
13
|
async onMessage(message) {
|
|
14
14
|
config_js_1.log.info(PRE, `onMessage(${JSON.stringify(message)})`);
|
|
15
|
+
if (!(await this.checkCacheManager())) {
|
|
16
|
+
config_js_1.log.warn('message ignored because login process is not finished');
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
15
19
|
// @ts-ignore
|
|
16
20
|
if (message.type === 'multi_vcard'
|
|
17
21
|
|| (message.type === 'e2e_notification'
|
|
@@ -20,16 +24,8 @@ class MessageEventHandler extends whatsapp_base_js_1.default {
|
|
|
20
24
|
// skip room join notification and multi_vcard message
|
|
21
25
|
return;
|
|
22
26
|
}
|
|
27
|
+
const cacheManager = await this.manager.getCacheManager();
|
|
23
28
|
const messageId = message.id.id;
|
|
24
|
-
let cacheManager;
|
|
25
|
-
try {
|
|
26
|
-
cacheManager = await this.manager.getCacheManager();
|
|
27
|
-
}
|
|
28
|
-
catch (e) { }
|
|
29
|
-
if (!cacheManager) {
|
|
30
|
-
// message comes before login process finished
|
|
31
|
-
return;
|
|
32
|
-
}
|
|
33
29
|
const messageInCache = await cacheManager.getMessageRawPayload(messageId);
|
|
34
30
|
if (messageInCache) {
|
|
35
31
|
return;
|
|
@@ -64,6 +60,10 @@ class MessageEventHandler extends whatsapp_base_js_1.default {
|
|
|
64
60
|
*/
|
|
65
61
|
async onMessageAck(message) {
|
|
66
62
|
config_js_1.log.silly(PRE, `onMessageAck(${JSON.stringify(message)})`);
|
|
63
|
+
if (!(await this.checkCacheManager())) {
|
|
64
|
+
config_js_1.log.warn('message ignored because login process is not finished');
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
67
|
/**
|
|
68
68
|
* if message ack equal MessageAck.ACK_DEVICE, we could regard it as has already send success.
|
|
69
69
|
*
|
|
@@ -94,6 +94,10 @@ class MessageEventHandler extends whatsapp_base_js_1.default {
|
|
|
94
94
|
*/
|
|
95
95
|
async onMessageCreate(message) {
|
|
96
96
|
config_js_1.log.silly(PRE, `onMessageCreate(${JSON.stringify(message)})`);
|
|
97
|
+
if (!(await this.checkCacheManager())) {
|
|
98
|
+
config_js_1.log.warn('message ignored because login process is not finished');
|
|
99
|
+
return;
|
|
100
|
+
}
|
|
97
101
|
if (message.id.fromMe) {
|
|
98
102
|
const messageId = message.id.id;
|
|
99
103
|
const cacheManager = await this.manager.getCacheManager();
|
|
@@ -104,6 +108,14 @@ class MessageEventHandler extends whatsapp_base_js_1.default {
|
|
|
104
108
|
await (0, miscellaneous_js_1.sleep)(100);
|
|
105
109
|
}
|
|
106
110
|
requestPool.resolveRequest(messageId);
|
|
111
|
+
const receiverId = message.to;
|
|
112
|
+
if (receiverId && (0, miscellaneous_js_1.isContactId)(receiverId)) {
|
|
113
|
+
const contactIds = await cacheManager.getContactIdList();
|
|
114
|
+
const notFriend = !contactIds.find(c => c === receiverId);
|
|
115
|
+
if (notFriend) {
|
|
116
|
+
this.emit('friendship', { friendshipId: messageId });
|
|
117
|
+
}
|
|
118
|
+
}
|
|
107
119
|
this.emit('message', { messageId });
|
|
108
120
|
}
|
|
109
121
|
}
|
|
@@ -186,6 +198,10 @@ class MessageEventHandler extends whatsapp_base_js_1.default {
|
|
|
186
198
|
*/
|
|
187
199
|
async onMessageRevokeEveryone(message, revokedMsg) {
|
|
188
200
|
config_js_1.log.silly(PRE, `onMessageRevokeEveryone(newMsg: ${JSON.stringify(message)}, originalMsg: ${JSON.stringify(revokedMsg)})`);
|
|
201
|
+
if (!(await this.checkCacheManager())) {
|
|
202
|
+
config_js_1.log.warn('message ignored because login process is not finished');
|
|
203
|
+
return;
|
|
204
|
+
}
|
|
189
205
|
const cacheManager = await this.manager.getCacheManager();
|
|
190
206
|
const messageId = message.id.id;
|
|
191
207
|
if (revokedMsg) {
|
|
@@ -202,6 +218,9 @@ class MessageEventHandler extends whatsapp_base_js_1.default {
|
|
|
202
218
|
*/
|
|
203
219
|
async onMessageRevokeMe(message) {
|
|
204
220
|
config_js_1.log.silly(PRE, `onMessageRevokeMe(${JSON.stringify(message)})`);
|
|
221
|
+
if (!(await this.checkCacheManager())) {
|
|
222
|
+
config_js_1.log.warn('message ignored because login process is not finished');
|
|
223
|
+
}
|
|
205
224
|
/*
|
|
206
225
|
if (message.ack === MessageAck.ACK_PENDING) {
|
|
207
226
|
// when the bot logout, it will receive onMessageRevokeMe event, but it's ack is MessageAck.ACK_PENDING, so let's ignore this event.
|
|
@@ -219,6 +238,18 @@ class MessageEventHandler extends whatsapp_base_js_1.default {
|
|
|
219
238
|
generateFakeRecallMessageId(messageId) {
|
|
220
239
|
return `${messageId}_revoked`;
|
|
221
240
|
}
|
|
241
|
+
async checkCacheManager() {
|
|
242
|
+
let cacheManager;
|
|
243
|
+
try {
|
|
244
|
+
cacheManager = await this.manager.getCacheManager();
|
|
245
|
+
}
|
|
246
|
+
catch (e) { }
|
|
247
|
+
if (!cacheManager) {
|
|
248
|
+
config_js_1.log.warn(PRE, 'message comes before login process finished');
|
|
249
|
+
return false;
|
|
250
|
+
}
|
|
251
|
+
return true;
|
|
252
|
+
}
|
|
222
253
|
}
|
|
223
254
|
exports.default = MessageEventHandler;
|
|
224
255
|
//# sourceMappingURL=message-event-handler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-event-handler.js","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/message-event-handler.ts"],"names":[],"mappings":";;;;;AACA,+CAGwB;AACxB,8EAG2C;AAC3C,2EAA8C;AAM9C,oEAKsC;AACtC,mEAA2D;AAE3D,MAAM,GAAG,GAAG,qBAAqB,CAAA;AAEjC,MAAqB,mBAAoB,SAAQ,0BAAY;IAEpD,KAAK,CAAC,SAAS,CAAE,OAAiD;QACvE,eAAG,CAAC,IAAI,CAAC,GAAG,EAAE,aAAa,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QACtD,aAAa;QACb,IACE,OAAO,CAAC,IAAI,KAAK,aAAa;eAC3B,CAAC,OAAO,CAAC,IAAI,KAAK,kBAAkB;mBACpC,OAAO,CAAC,IAAI,KAAK,EAAE;mBACnB,CAAC,OAAO,CAAC,MAAM,CAAC,EACnB;YACA,sDAAsD;YACtD,OAAM;SACP;QACD,MAAM,
|
|
1
|
+
{"version":3,"file":"message-event-handler.js","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/message-event-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,7 +44,8 @@ puppet
|
|
|
44
44
|
.on('scan', onScan)
|
|
45
45
|
.on('error', onError)
|
|
46
46
|
.on('message', onMessage)
|
|
47
|
-
.on('dirty', onDirty)
|
|
47
|
+
.on('dirty', onDirty)
|
|
48
|
+
.on('ready', onReady);
|
|
48
49
|
/**
|
|
49
50
|
*
|
|
50
51
|
* 3. Start the bot!
|
|
@@ -126,6 +127,9 @@ async function onDirty(payload) {
|
|
|
126
127
|
console.log('updated contact: ', JSON.stringify(contact));
|
|
127
128
|
}
|
|
128
129
|
}
|
|
130
|
+
async function onReady() {
|
|
131
|
+
console.log('onReady()');
|
|
132
|
+
}
|
|
129
133
|
/**
|
|
130
134
|
*
|
|
131
135
|
* 7. Output the Welcome Message
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ding-dong-bot.js","sourceRoot":"","sources":["../../../examples/ding-dong-bot.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ding-dong-bot.js","sourceRoot":"","sources":["../../../examples/ding-dong-bot.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contact-raw-payload-parser.d.ts","sourceRoot":"","sources":["../../../../../src/helper/pure-function/contact-raw-payload-parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAG9C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAA;
|
|
1
|
+
{"version":3,"file":"contact-raw-payload-parser.d.ts","sourceRoot":"","sources":["../../../../../src/helper/pure-function/contact-raw-payload-parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAG9C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAA;AAG3E,wBAAgB,uBAAuB,CAAE,cAAc,EAAE,sBAAsB,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CA0C3H"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as PUPPET from '@juzi/wechaty-puppet';
|
|
2
2
|
import { SPECIAL_BOT_PUSHNAME } from '../../config.js';
|
|
3
|
+
import { ContactStatus } from '../../schema/contact.js';
|
|
3
4
|
export function parserContactRawPayload(contactPayload, userName) {
|
|
4
5
|
let type;
|
|
5
6
|
if (contactPayload.isUser) {
|
|
@@ -27,9 +28,10 @@ export function parserContactRawPayload(contactPayload, userName) {
|
|
|
27
28
|
name = contactPayload.name || contactPayload.pushname;
|
|
28
29
|
}
|
|
29
30
|
const number = contactPayload.number || contactPayload.id.user;
|
|
31
|
+
const isFriend = contactPayload.isMyContact && contactPayload.isUser;
|
|
30
32
|
return {
|
|
31
33
|
avatar: contactPayload.avatar,
|
|
32
|
-
friend:
|
|
34
|
+
friend: isFriend,
|
|
33
35
|
gender: PUPPET.types.ContactGender.Unknown,
|
|
34
36
|
id: contactPayload.id._serialized,
|
|
35
37
|
name: name || contactPayload.id._serialized,
|
|
@@ -37,6 +39,9 @@ export function parserContactRawPayload(contactPayload, userName) {
|
|
|
37
39
|
type: type,
|
|
38
40
|
handle: number,
|
|
39
41
|
weixin: number,
|
|
42
|
+
additionalInfo: JSON.stringify({
|
|
43
|
+
status: isFriend ? ContactStatus.FRIEND : ContactStatus.NOT_FRIEND,
|
|
44
|
+
}),
|
|
40
45
|
};
|
|
41
46
|
}
|
|
42
47
|
//# sourceMappingURL=contact-raw-payload-parser.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contact-raw-payload-parser.js","sourceRoot":"","sources":["../../../../../src/helper/pure-function/contact-raw-payload-parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"contact-raw-payload-parser.js","sourceRoot":"","sources":["../../../../../src/helper/pure-function/contact-raw-payload-parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAA;AAGtD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AAEvD,MAAM,UAAU,uBAAuB,CAAE,cAAsC,EAAE,QAAiB;IAChG,IAAI,IAAI,CAAA;IACR,IAAI,cAAc,CAAC,MAAM,EAAE;QACzB,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAA;KACvC;SAAM,IAAI,cAAc,CAAC,YAAY,EAAE;QACtC,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAA;KACxC;SAAM;QACL,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAA;KACpC;IACD,IAAI,IAAI,CAAA;IAER,IAAI,cAAc,CAAC,IAAI,EAAE;QACvB,IAAI,GAAG,QAAQ,IAAI,cAAc,CAAC,QAAQ,CAAA;QAC1C,IAAI,IAAI,KAAK,oBAAoB,EAAE;YACjC,IAAI,GAAG,cAAc,CAAC,SAAS,CAAA;SAChC;KACF;SAAM;QACL;;;;WAIG;QACH,IAAI,GAAG,cAAc,CAAC,IAAI,IAAI,cAAc,CAAC,QAAQ,CAAA;KACtD;IAED,MAAM,MAAM,GAAG,cAAc,CAAC,MAAM,IAAI,cAAc,CAAC,EAAE,CAAC,IAAI,CAAA;IAE9D,MAAM,QAAQ,GAAG,cAAc,CAAC,WAAW,IAAI,cAAc,CAAC,MAAM,CAAA;IACpE,OAAO;QACL,MAAM,EAAE,cAAc,CAAC,MAAM;QAC7B,MAAM,EAAE,QAAQ;QAChB,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO;QAC1C,EAAE,EAAE,cAAc,CAAC,EAAE,CAAC,WAAW;QACjC,IAAI,EAAE,IAAI,IAAI,cAAc,CAAC,EAAE,CAAC,WAAW;QAC3C,KAAK,EAAE,CAAC,MAAM,CAAC;QACf,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,MAAM;QACd,MAAM,EAAE,MAAM;QACd,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC;YAC7B,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,UAAU;SACnE,CAAC;KACH,CAAA;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"friendship.d.ts","sourceRoot":"","sources":["../../../../src/puppet-mixin/friendship.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAI9C,OAAO,KAAK,cAAc,MAAM,uBAAuB,CAAA;AACvD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAA;AAIxE,MAAM,MAAM,oBAAoB,GAAG,sBAAsB,CAAA;AAEzD,wBAAsB,oBAAoB,CAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAoB3G;AAED,wBAAsB,0BAA0B,CAAE,UAAU,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"friendship.d.ts","sourceRoot":"","sources":["../../../../src/puppet-mixin/friendship.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAI9C,OAAO,KAAK,cAAc,MAAM,uBAAuB,CAAA;AACvD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAA;AAIxE,MAAM,MAAM,oBAAoB,GAAG,sBAAsB,CAAA;AAEzD,wBAAsB,oBAAoB,CAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAoB3G;AAED,wBAAsB,0BAA0B,CAAE,UAAU,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CASvH;AAED,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,cAAc,EACpB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,CAQxB;AAED,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,CAGxB;AAED,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,CAGxB;AAED,wBAAsB,aAAa,CACjC,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,oBAAoB,GACzC,OAAO,CAAC,IAAI,CAAC,CA+Bf;AAED,wBAAsB,gBAAgB,CACpC,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC,CAGf;AAED,wBAAgB,4BAA4B,CAAE,EAAE,EAAE,MAAM;;;EAWvD"}
|
|
@@ -25,8 +25,9 @@ export async function friendshipRawPayload(id) {
|
|
|
25
25
|
return message;
|
|
26
26
|
}
|
|
27
27
|
export async function friendshipRawPayloadParser(rawPayload) {
|
|
28
|
+
const contactId = rawPayload.fromMe ? rawPayload.to : rawPayload.from;
|
|
28
29
|
return {
|
|
29
|
-
contactId
|
|
30
|
+
contactId,
|
|
30
31
|
hello: rawPayload.body,
|
|
31
32
|
id: rawPayload.id.id,
|
|
32
33
|
timestamp: rawPayload.timestamp,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"friendship.js","sourceRoot":"","sources":["../../../../src/puppet-mixin/friendship.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAC1D,OAAO,OAAO,MAAM,gCAAgC,CAAA;AAIpD,MAAM,GAAG,GAAG,kBAAkB,CAAA;AAI9B,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAwB,EAAU;IAC1E,IAAI,EAAE,CAAC,UAAU,CAAC,wBAAwB,CAAC,EAAE;QAC3C,gCAAgC;QAChC,MAAM,IAAI,GAAG,4BAA4B,CAAC,EAAE,CAAC,CAAA;QAC7C,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,SAAS;YACpB,IAAI,EAAE,EAAE;YACR,EAAE,EAAE;gBACF,EAAE;aACH;YACD,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO;SAC/B,CAAA;KACT;IACD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAA;IAClD,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAA;IACpD,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,OAAO,CAAC,aAAa,CAAC,iBAAiB,EAAE,mBAAmB,EAAE,cAAc,EAAE,EAAE,CAAC,CAAA;KACxF;IACD,OAAO,OAAO,CAAA;AAChB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAAE,UAAgC;IAChF,
|
|
1
|
+
{"version":3,"file":"friendship.js","sourceRoot":"","sources":["../../../../src/puppet-mixin/friendship.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"puppet-whatsapp.d.ts","sourceRoot":"","sources":["../../../src/puppet-whatsapp.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAE9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAM7C,OAAO,OAAO,MAAM,cAAc,CAAA;AAClC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AACtE,OAAO,KAAK,EAAE,aAAa,EAAsB,MAAM,2BAA2B,CAAA;AAKlF,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAA;AACzG,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,WAAW,EAAE,aAAa,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAC5L,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAA;AACrE,OAAO,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,aAAa,EAAE,gBAAgB,EAAE,sBAAsB,EAAgC,MAAM,8BAA8B,CAAA;AACrO,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,aAAa,EAAE,WAAW,EAAE,UAAU,EAAE,kBAAkB,EAAE,eAAe,EAAE,eAAe,EAAE,kBAAkB,EAAE,cAAc,EAAE,sBAAsB,EAAE,cAAc,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,WAAW,EAAE,kBAAkB,EAAE,cAAc,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AACrX,OAAO,EAAE,oBAAoB,EAAE,cAAc,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,cAAc,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,YAAY,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,8BAA8B,EAAE,MAAM,wBAAwB,CAAA;AAClU,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,WAAW,EAAE,cAAc,EAAE,YAAY,EAAE,eAAe,EAAE,SAAS,EAAE,iBAAiB,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAGpN,KAAK,yBAAyB,GAAG,OAAO,GAAG,kBAAkB,CAAA;AAE7D,MAAM,MAAM,qBAAqB,GAAG,MAAM,CAAC,aAAa,GAAG;IACzD,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,gBAAgB,CAAC,EAAE,aAAa,CAAA;CACjC,CAAA;AAID,cAAM,cAAe,SAAQ,MAAM,CAAC,MAAM;IAO7B,OAAO,EAAE,qBAAqB;IALzC,gBAAyB,OAAO,SAAU;IAEnC,OAAO,EAAE,yBAAyB,CAAA;gBAG9B,OAAO,GAAE,qBAA0B;IAQrC,OAAO;IAID,OAAO,IAAK,OAAO,CAAC,IAAI,CAAC;YAgC1B,YAAY;IA2BX,MAAM,IAAK,OAAO,CAAC,IAAI,CAAC;YASzB,WAAW;IAKzB;;OAEG;YACW,OAAO;YAcP,QAAQ;YAcR,SAAS;YAKT,MAAM;YAON,OAAO;YAOP,OAAO;YAKP,YAAY;
|
|
1
|
+
{"version":3,"file":"puppet-whatsapp.d.ts","sourceRoot":"","sources":["../../../src/puppet-whatsapp.ts"],"names":[],"mappings":"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"}
|
|
@@ -162,10 +162,16 @@ class PuppetWhatsapp extends PUPPET.Puppet {
|
|
|
162
162
|
contactId = getFriendshipFromContactData(payload.friendshipId).contactId;
|
|
163
163
|
}
|
|
164
164
|
else {
|
|
165
|
-
|
|
165
|
+
const message = await this.messageRawPayload(payload.friendshipId);
|
|
166
|
+
if (message.fromMe) {
|
|
167
|
+
contactId = message.to;
|
|
168
|
+
}
|
|
169
|
+
else {
|
|
170
|
+
contactId = message.from;
|
|
171
|
+
}
|
|
166
172
|
}
|
|
167
173
|
// NOTE: this function automatically put non-contact into cache
|
|
168
|
-
await this.contactRawPayload(contactId);
|
|
174
|
+
await this.contactRawPayload(contactId, true);
|
|
169
175
|
this.emit('friendship', payload);
|
|
170
176
|
}
|
|
171
177
|
async onRoomJoin(payload) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"puppet-whatsapp.js","sourceRoot":"","sources":["../../../src/puppet-whatsapp.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"puppet-whatsapp.js","sourceRoot":"","sources":["../../../src/puppet-whatsapp.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"contact.d.ts","sourceRoot":"","sources":["../../../../src/schema/contact.ts"],"names":[],"mappings":"AAAA,oBAAY,aAAa;IACvB,MAAM,IAAI;IACV,QAAQ,IAAI;IACZ,UAAU,IAAI;IACd,MAAM,IAAI;IACV,OAAO,IAAI;CACZ"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
export var ContactStatus;
|
|
2
|
+
(function (ContactStatus) {
|
|
3
|
+
ContactStatus[ContactStatus["FRIEND"] = 1] = "FRIEND";
|
|
4
|
+
ContactStatus[ContactStatus["CUSTOMER"] = 2] = "CUSTOMER";
|
|
5
|
+
ContactStatus[ContactStatus["NOT_FRIEND"] = 3] = "NOT_FRIEND";
|
|
6
|
+
ContactStatus[ContactStatus["DELETE"] = 4] = "DELETE";
|
|
7
|
+
ContactStatus[ContactStatus["REMOVED"] = 5] = "REMOVED";
|
|
8
|
+
})(ContactStatus || (ContactStatus = {}));
|
|
9
|
+
//# sourceMappingURL=contact.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"contact.js","sourceRoot":"","sources":["../../../../src/schema/contact.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,aAMX;AAND,WAAY,aAAa;IACvB,qDAAU,CAAA;IACV,yDAAY,CAAA;IACZ,6DAAc,CAAA;IACd,qDAAU,CAAA;IACV,uDAAW,CAAA;AACb,CAAC,EANW,aAAa,KAAb,aAAa,QAMxB"}
|
|
@@ -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;
|
|
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;IAUf,OAAO,CAAE,iBAAiB,EAAE,eAAe,EAAE;IAkC7C,OAAO,CAAE,iBAAiB,EAAE,eAAe,EAAE;IA4C7C,QAAQ,CAAE,MAAM,GAAE,MAAgD;IASlE,aAAa,CAAE,KAAK,EAAE,WAAW;IAyB9C;;;MAGE;IACW,eAAe,CAAE,WAAW,EAAE,WAAW;CAWvD"}
|
|
@@ -5,7 +5,7 @@ import { WA_ERROR_TYPE } from '../../exception/error-type.js';
|
|
|
5
5
|
import WAError from '../../exception/whatsapp-error.js';
|
|
6
6
|
import { WAState, } from '../../schema/whatsapp-interface.js';
|
|
7
7
|
import WhatsAppBase from '../whatsapp-base.js';
|
|
8
|
-
import { batchProcess, isContactId, isRoomId, } from '../../helper/miscellaneous.js';
|
|
8
|
+
import { batchProcess, isContactId, isRoomId, sleep, } from '../../helper/miscellaneous.js';
|
|
9
9
|
const PRE = 'LoginEventHandler';
|
|
10
10
|
export default class LoginEventHandler extends WhatsAppBase {
|
|
11
11
|
loadingData = false;
|
|
@@ -123,6 +123,7 @@ export default class LoginEventHandler extends WhatsAppBase {
|
|
|
123
123
|
await this.manager.processHistoryMessages(contactOrRoom);
|
|
124
124
|
});
|
|
125
125
|
log.info(PRE, `onReady() all contacts and rooms are ready, friendCount: ${friendCount} contactCount: ${contactCount} roomCount: ${roomCount}`);
|
|
126
|
+
await sleep(15 * 1000);
|
|
126
127
|
this.emit('ready');
|
|
127
128
|
this.loadingData = false;
|
|
128
129
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login-event-handler.js","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/login-event-handler.ts"],"names":[],"mappings":"AAAA,yCAAyC;AACzC,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EACL,4BAA4B,EAC5B,eAAe,EACf,GAAG,EACH,OAAO,EACP,QAAQ,GACT,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAC7D,OAAO,OAAO,MAAM,mCAAmC,CAAA;AACvD,OAAO,EACL,OAAO,GACR,MAAM,oCAAoC,CAAA;AAC3C,OAAO,YAAY,MAAM,qBAAqB,CAAA;AAO9C,OAAO,EACL,YAAY,EACZ,WAAW,EACX,QAAQ,
|
|
1
|
+
{"version":3,"file":"login-event-handler.js","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/login-event-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,5 +31,6 @@ export default class MessageEventHandler extends WhatsAppBase {
|
|
|
31
31
|
*/
|
|
32
32
|
onMessageRevokeMe(message: WhatsAppMessage): Promise<void>;
|
|
33
33
|
generateFakeRecallMessageId(messageId: string): string;
|
|
34
|
+
private checkCacheManager;
|
|
34
35
|
}
|
|
35
36
|
//# sourceMappingURL=message-event-handler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-event-handler.d.ts","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/message-event-handler.ts"],"names":[],"mappings":"AASA,OAAO,YAAY,MAAM,qBAAqB,CAAA;AAE9C,OAAO,KAAK,EACV,eAAe,EACf,sBAAsB,EACvB,MAAM,+BAA+B,CAAA;AAWtC,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,YAAY;IAE9C,SAAS,CAAE,OAAO,EAAE,eAAe,GAAG,sBAAsB;
|
|
1
|
+
{"version":3,"file":"message-event-handler.d.ts","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/message-event-handler.ts"],"names":[],"mappings":"AASA,OAAO,YAAY,MAAM,qBAAqB,CAAA;AAE9C,OAAO,KAAK,EACV,eAAe,EACf,sBAAsB,EACvB,MAAM,+BAA+B,CAAA;AAWtC,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,YAAY;IAE9C,SAAS,CAAE,OAAO,EAAE,eAAe,GAAG,sBAAsB;IAiDzE;;;;OAIG;IACU,YAAY,CAAE,OAAO,EAAE,eAAe;IA6BnD;;;;OAIG;IACU,eAAe,CAAE,OAAO,EAAE,eAAe;IA4BzC,qBAAqB,CAAE,OAAO,EAAE,eAAe;IAmB/C,+BAA+B,CAAE,OAAO,EAAE,eAAe,GAAG,sBAAsB,GAAG,OAAO,CAAC,OAAO,CAAC;IA+BrG,cAAc,CAAE,GAAG,IAAI,EAAE,GAAG,EAAE;IAI9B,eAAe,CAAE,OAAO,EAAE,eAAe;IAQzC,0BAA0B,CAAE,OAAO,EAAE,eAAe;IAcjE;;;;;OAKG;IACU,uBAAuB,CAAE,OAAO,EAAE,eAAe,EAAE,UAAU,CAAC,EAAE,eAAe,GAAG,IAAI,GAAG,SAAS;IAkB/G;;OAEG;IACU,iBAAiB,CAAE,OAAO,EAAE,eAAe;IAqBjD,2BAA2B,CAAE,SAAS,EAAE,MAAM;YAIvC,iBAAiB;CAYhC"}
|
|
@@ -7,6 +7,10 @@ const PRE = 'MessageEventHandler';
|
|
|
7
7
|
export default class MessageEventHandler extends WhatsAppBase {
|
|
8
8
|
async onMessage(message) {
|
|
9
9
|
log.info(PRE, `onMessage(${JSON.stringify(message)})`);
|
|
10
|
+
if (!(await this.checkCacheManager())) {
|
|
11
|
+
log.warn('message ignored because login process is not finished');
|
|
12
|
+
return;
|
|
13
|
+
}
|
|
10
14
|
// @ts-ignore
|
|
11
15
|
if (message.type === 'multi_vcard'
|
|
12
16
|
|| (message.type === 'e2e_notification'
|
|
@@ -15,16 +19,8 @@ export default class MessageEventHandler extends WhatsAppBase {
|
|
|
15
19
|
// skip room join notification and multi_vcard message
|
|
16
20
|
return;
|
|
17
21
|
}
|
|
22
|
+
const cacheManager = await this.manager.getCacheManager();
|
|
18
23
|
const messageId = message.id.id;
|
|
19
|
-
let cacheManager;
|
|
20
|
-
try {
|
|
21
|
-
cacheManager = await this.manager.getCacheManager();
|
|
22
|
-
}
|
|
23
|
-
catch (e) { }
|
|
24
|
-
if (!cacheManager) {
|
|
25
|
-
// message comes before login process finished
|
|
26
|
-
return;
|
|
27
|
-
}
|
|
28
24
|
const messageInCache = await cacheManager.getMessageRawPayload(messageId);
|
|
29
25
|
if (messageInCache) {
|
|
30
26
|
return;
|
|
@@ -59,6 +55,10 @@ export default class MessageEventHandler extends WhatsAppBase {
|
|
|
59
55
|
*/
|
|
60
56
|
async onMessageAck(message) {
|
|
61
57
|
log.silly(PRE, `onMessageAck(${JSON.stringify(message)})`);
|
|
58
|
+
if (!(await this.checkCacheManager())) {
|
|
59
|
+
log.warn('message ignored because login process is not finished');
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
62
62
|
/**
|
|
63
63
|
* if message ack equal MessageAck.ACK_DEVICE, we could regard it as has already send success.
|
|
64
64
|
*
|
|
@@ -89,6 +89,10 @@ export default class MessageEventHandler extends WhatsAppBase {
|
|
|
89
89
|
*/
|
|
90
90
|
async onMessageCreate(message) {
|
|
91
91
|
log.silly(PRE, `onMessageCreate(${JSON.stringify(message)})`);
|
|
92
|
+
if (!(await this.checkCacheManager())) {
|
|
93
|
+
log.warn('message ignored because login process is not finished');
|
|
94
|
+
return;
|
|
95
|
+
}
|
|
92
96
|
if (message.id.fromMe) {
|
|
93
97
|
const messageId = message.id.id;
|
|
94
98
|
const cacheManager = await this.manager.getCacheManager();
|
|
@@ -99,6 +103,14 @@ export default class MessageEventHandler extends WhatsAppBase {
|
|
|
99
103
|
await sleep(100);
|
|
100
104
|
}
|
|
101
105
|
requestPool.resolveRequest(messageId);
|
|
106
|
+
const receiverId = message.to;
|
|
107
|
+
if (receiverId && isContactId(receiverId)) {
|
|
108
|
+
const contactIds = await cacheManager.getContactIdList();
|
|
109
|
+
const notFriend = !contactIds.find(c => c === receiverId);
|
|
110
|
+
if (notFriend) {
|
|
111
|
+
this.emit('friendship', { friendshipId: messageId });
|
|
112
|
+
}
|
|
113
|
+
}
|
|
102
114
|
this.emit('message', { messageId });
|
|
103
115
|
}
|
|
104
116
|
}
|
|
@@ -181,6 +193,10 @@ export default class MessageEventHandler extends WhatsAppBase {
|
|
|
181
193
|
*/
|
|
182
194
|
async onMessageRevokeEveryone(message, revokedMsg) {
|
|
183
195
|
log.silly(PRE, `onMessageRevokeEveryone(newMsg: ${JSON.stringify(message)}, originalMsg: ${JSON.stringify(revokedMsg)})`);
|
|
196
|
+
if (!(await this.checkCacheManager())) {
|
|
197
|
+
log.warn('message ignored because login process is not finished');
|
|
198
|
+
return;
|
|
199
|
+
}
|
|
184
200
|
const cacheManager = await this.manager.getCacheManager();
|
|
185
201
|
const messageId = message.id.id;
|
|
186
202
|
if (revokedMsg) {
|
|
@@ -197,6 +213,9 @@ export default class MessageEventHandler extends WhatsAppBase {
|
|
|
197
213
|
*/
|
|
198
214
|
async onMessageRevokeMe(message) {
|
|
199
215
|
log.silly(PRE, `onMessageRevokeMe(${JSON.stringify(message)})`);
|
|
216
|
+
if (!(await this.checkCacheManager())) {
|
|
217
|
+
log.warn('message ignored because login process is not finished');
|
|
218
|
+
}
|
|
200
219
|
/*
|
|
201
220
|
if (message.ack === MessageAck.ACK_PENDING) {
|
|
202
221
|
// when the bot logout, it will receive onMessageRevokeMe event, but it's ack is MessageAck.ACK_PENDING, so let's ignore this event.
|
|
@@ -214,5 +233,17 @@ export default class MessageEventHandler extends WhatsAppBase {
|
|
|
214
233
|
generateFakeRecallMessageId(messageId) {
|
|
215
234
|
return `${messageId}_revoked`;
|
|
216
235
|
}
|
|
236
|
+
async checkCacheManager() {
|
|
237
|
+
let cacheManager;
|
|
238
|
+
try {
|
|
239
|
+
cacheManager = await this.manager.getCacheManager();
|
|
240
|
+
}
|
|
241
|
+
catch (e) { }
|
|
242
|
+
if (!cacheManager) {
|
|
243
|
+
log.warn(PRE, 'message comes before login process finished');
|
|
244
|
+
return false;
|
|
245
|
+
}
|
|
246
|
+
return true;
|
|
247
|
+
}
|
|
217
248
|
}
|
|
218
249
|
//# sourceMappingURL=message-event-handler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-event-handler.js","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/message-event-handler.ts"],"names":[],"mappings":"AACA,OAAO,EACL,oBAAoB,EACpB,GAAG,GACJ,MAAM,iBAAiB,CAAA;AACxB,OAAO,EACL,YAAY,IAAI,mBAAmB,EACnC,UAAU,GACX,MAAM,oCAAoC,CAAA;AAC3C,OAAO,YAAY,MAAM,qBAAqB,CAAA;AAM9C,OAAO,EACL,WAAW,EACX,YAAY,EACZ,aAAa,EACb,KAAK,GACN,MAAM,+BAA+B,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAE3D,MAAM,GAAG,GAAG,qBAAqB,CAAA;AAEjC,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,YAAY;IAEpD,KAAK,CAAC,SAAS,CAAE,OAAiD;QACvE,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,aAAa,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QACtD,aAAa;QACb,IACE,OAAO,CAAC,IAAI,KAAK,aAAa;eAC3B,CAAC,OAAO,CAAC,IAAI,KAAK,kBAAkB;mBACpC,OAAO,CAAC,IAAI,KAAK,EAAE;mBACnB,CAAC,OAAO,CAAC,MAAM,CAAC,EACnB;YACA,sDAAsD;YACtD,OAAM;SACP;QACD,MAAM,
|
|
1
|
+
{"version":3,"file":"message-event-handler.js","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/message-event-handler.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -2,6 +2,7 @@ import * as PUPPET from '@juzi/wechaty-puppet'
|
|
|
2
2
|
import { SPECIAL_BOT_PUSHNAME } from '../../config.js'
|
|
3
3
|
|
|
4
4
|
import type { WhatsAppContactPayload } from '../../schema/whatsapp-type.js'
|
|
5
|
+
import { ContactStatus } from '../../schema/contact.js'
|
|
5
6
|
|
|
6
7
|
export function parserContactRawPayload (contactPayload: WhatsAppContactPayload, userName?: string): PUPPET.payloads.Contact {
|
|
7
8
|
let type
|
|
@@ -30,9 +31,10 @@ export function parserContactRawPayload (contactPayload: WhatsAppContactPayload,
|
|
|
30
31
|
|
|
31
32
|
const number = contactPayload.number || contactPayload.id.user
|
|
32
33
|
|
|
34
|
+
const isFriend = contactPayload.isMyContact && contactPayload.isUser
|
|
33
35
|
return {
|
|
34
36
|
avatar: contactPayload.avatar,
|
|
35
|
-
friend:
|
|
37
|
+
friend: isFriend,
|
|
36
38
|
gender: PUPPET.types.ContactGender.Unknown,
|
|
37
39
|
id: contactPayload.id._serialized,
|
|
38
40
|
name: name || contactPayload.id._serialized,
|
|
@@ -40,5 +42,8 @@ export function parserContactRawPayload (contactPayload: WhatsAppContactPayload,
|
|
|
40
42
|
type: type,
|
|
41
43
|
handle: number,
|
|
42
44
|
weixin: number,
|
|
45
|
+
additionalInfo: JSON.stringify({
|
|
46
|
+
status: isFriend ? ContactStatus.FRIEND : ContactStatus.NOT_FRIEND,
|
|
47
|
+
}),
|
|
43
48
|
}
|
|
44
49
|
}
|
package/src/package-json.ts
CHANGED
|
@@ -32,8 +32,9 @@ export async function friendshipRawPayload (this: PuppetWhatsApp, id: string): P
|
|
|
32
32
|
}
|
|
33
33
|
|
|
34
34
|
export async function friendshipRawPayloadParser (rawPayload: FriendshipRawPayload): Promise<PUPPET.payloads.Friendship> {
|
|
35
|
+
const contactId = rawPayload.fromMe ? rawPayload.to : rawPayload.from
|
|
35
36
|
return {
|
|
36
|
-
contactId
|
|
37
|
+
contactId,
|
|
37
38
|
hello: rawPayload.body,
|
|
38
39
|
id: rawPayload.id.id,
|
|
39
40
|
timestamp: rawPayload.timestamp,
|
package/src/puppet-whatsapp.ts
CHANGED
|
@@ -202,10 +202,15 @@ class PuppetWhatsapp extends PUPPET.Puppet {
|
|
|
202
202
|
// friendship from friendshipAdd
|
|
203
203
|
contactId = getFriendshipFromContactData(payload.friendshipId).contactId
|
|
204
204
|
} else {
|
|
205
|
-
|
|
205
|
+
const message = await this.messageRawPayload(payload.friendshipId)
|
|
206
|
+
if (message.fromMe) {
|
|
207
|
+
contactId = message.to
|
|
208
|
+
} else {
|
|
209
|
+
contactId = message.from
|
|
210
|
+
}
|
|
206
211
|
}
|
|
207
212
|
// NOTE: this function automatically put non-contact into cache
|
|
208
|
-
await this.contactRawPayload(contactId)
|
|
213
|
+
await this.contactRawPayload(contactId, true)
|
|
209
214
|
this.emit('friendship', payload)
|
|
210
215
|
}
|
|
211
216
|
|
|
@@ -23,6 +23,7 @@ import {
|
|
|
23
23
|
batchProcess,
|
|
24
24
|
isContactId,
|
|
25
25
|
isRoomId,
|
|
26
|
+
sleep,
|
|
26
27
|
} from '../../helper/miscellaneous.js'
|
|
27
28
|
|
|
28
29
|
const PRE = 'LoginEventHandler'
|
|
@@ -154,6 +155,7 @@ export default class LoginEventHandler extends WhatsAppBase { // FIXME: I have n
|
|
|
154
155
|
})
|
|
155
156
|
|
|
156
157
|
log.info(PRE, `onReady() all contacts and rooms are ready, friendCount: ${friendCount} contactCount: ${contactCount} roomCount: ${roomCount}`)
|
|
158
|
+
await sleep(15 * 1000)
|
|
157
159
|
this.emit('ready')
|
|
158
160
|
this.loadingData = false
|
|
159
161
|
}
|
|
@@ -27,6 +27,11 @@ export default class MessageEventHandler extends WhatsAppBase {
|
|
|
27
27
|
|
|
28
28
|
public async onMessage (message: WhatsAppMessage | WhatsAppMessagePayload) {
|
|
29
29
|
log.info(PRE, `onMessage(${JSON.stringify(message)})`)
|
|
30
|
+
if (!(await this.checkCacheManager())) {
|
|
31
|
+
log.warn('message ignored because login process is not finished')
|
|
32
|
+
return
|
|
33
|
+
}
|
|
34
|
+
|
|
30
35
|
// @ts-ignore
|
|
31
36
|
if (
|
|
32
37
|
message.type === 'multi_vcard'
|
|
@@ -37,15 +42,8 @@ export default class MessageEventHandler extends WhatsAppBase {
|
|
|
37
42
|
// skip room join notification and multi_vcard message
|
|
38
43
|
return
|
|
39
44
|
}
|
|
45
|
+
const cacheManager = await this.manager.getCacheManager()
|
|
40
46
|
const messageId = message.id.id
|
|
41
|
-
let cacheManager
|
|
42
|
-
try {
|
|
43
|
-
cacheManager = await this.manager.getCacheManager()
|
|
44
|
-
} catch (e) {}
|
|
45
|
-
if (!cacheManager) {
|
|
46
|
-
// message comes before login process finished
|
|
47
|
-
return
|
|
48
|
-
}
|
|
49
47
|
const messageInCache = await cacheManager.getMessageRawPayload(messageId)
|
|
50
48
|
if (messageInCache) {
|
|
51
49
|
return
|
|
@@ -83,7 +81,10 @@ export default class MessageEventHandler extends WhatsAppBase {
|
|
|
83
81
|
*/
|
|
84
82
|
public async onMessageAck (message: WhatsAppMessage) {
|
|
85
83
|
log.silly(PRE, `onMessageAck(${JSON.stringify(message)})`)
|
|
86
|
-
|
|
84
|
+
if (!(await this.checkCacheManager())) {
|
|
85
|
+
log.warn('message ignored because login process is not finished')
|
|
86
|
+
return
|
|
87
|
+
}
|
|
87
88
|
/**
|
|
88
89
|
* if message ack equal MessageAck.ACK_DEVICE, we could regard it as has already send success.
|
|
89
90
|
*
|
|
@@ -114,6 +115,10 @@ export default class MessageEventHandler extends WhatsAppBase {
|
|
|
114
115
|
*/
|
|
115
116
|
public async onMessageCreate (message: WhatsAppMessage) {
|
|
116
117
|
log.silly(PRE, `onMessageCreate(${JSON.stringify(message)})`)
|
|
118
|
+
if (!(await this.checkCacheManager())) {
|
|
119
|
+
log.warn('message ignored because login process is not finished')
|
|
120
|
+
return
|
|
121
|
+
}
|
|
117
122
|
if (message.id.fromMe) {
|
|
118
123
|
const messageId = message.id.id
|
|
119
124
|
const cacheManager = await this.manager.getCacheManager()
|
|
@@ -124,6 +129,14 @@ export default class MessageEventHandler extends WhatsAppBase {
|
|
|
124
129
|
await sleep(100)
|
|
125
130
|
}
|
|
126
131
|
requestPool.resolveRequest(messageId)
|
|
132
|
+
const receiverId = message.to
|
|
133
|
+
if (receiverId && isContactId(receiverId)) {
|
|
134
|
+
const contactIds = await cacheManager.getContactIdList()
|
|
135
|
+
const notFriend = !contactIds.find(c => c === receiverId)
|
|
136
|
+
if (notFriend) {
|
|
137
|
+
this.emit('friendship', { friendshipId: messageId })
|
|
138
|
+
}
|
|
139
|
+
}
|
|
127
140
|
this.emit('message', { messageId })
|
|
128
141
|
}
|
|
129
142
|
}
|
|
@@ -212,6 +225,10 @@ export default class MessageEventHandler extends WhatsAppBase {
|
|
|
212
225
|
*/
|
|
213
226
|
public async onMessageRevokeEveryone (message: WhatsAppMessage, revokedMsg?: WhatsAppMessage | null | undefined) {
|
|
214
227
|
log.silly(PRE, `onMessageRevokeEveryone(newMsg: ${JSON.stringify(message)}, originalMsg: ${JSON.stringify(revokedMsg)})`)
|
|
228
|
+
if (!(await this.checkCacheManager())) {
|
|
229
|
+
log.warn('message ignored because login process is not finished')
|
|
230
|
+
return
|
|
231
|
+
}
|
|
215
232
|
const cacheManager = await this.manager.getCacheManager()
|
|
216
233
|
const messageId = message.id.id
|
|
217
234
|
if (revokedMsg) {
|
|
@@ -229,6 +246,10 @@ export default class MessageEventHandler extends WhatsAppBase {
|
|
|
229
246
|
*/
|
|
230
247
|
public async onMessageRevokeMe (message: WhatsAppMessage) {
|
|
231
248
|
log.silly(PRE, `onMessageRevokeMe(${JSON.stringify(message)})`)
|
|
249
|
+
if (!(await this.checkCacheManager())) {
|
|
250
|
+
log.warn('message ignored because login process is not finished')
|
|
251
|
+
|
|
252
|
+
}
|
|
232
253
|
/*
|
|
233
254
|
if (message.ack === MessageAck.ACK_PENDING) {
|
|
234
255
|
// when the bot logout, it will receive onMessageRevokeMe event, but it's ack is MessageAck.ACK_PENDING, so let's ignore this event.
|
|
@@ -248,4 +269,16 @@ export default class MessageEventHandler extends WhatsAppBase {
|
|
|
248
269
|
return `${messageId}_revoked`
|
|
249
270
|
}
|
|
250
271
|
|
|
272
|
+
private async checkCacheManager () {
|
|
273
|
+
let cacheManager
|
|
274
|
+
try {
|
|
275
|
+
cacheManager = await this.manager.getCacheManager()
|
|
276
|
+
} catch (e) {}
|
|
277
|
+
if (!cacheManager) {
|
|
278
|
+
log.warn(PRE, 'message comes before login process finished')
|
|
279
|
+
return false
|
|
280
|
+
}
|
|
281
|
+
return true
|
|
282
|
+
}
|
|
283
|
+
|
|
251
284
|
}
|