@juzi/wechaty-puppet-whatsapp 1.0.55 → 1.0.57
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 +14 -0
- package/dist/cjs/examples/ding-dong-bot.js.map +1 -1
- package/dist/cjs/src/package-json.js +1 -1
- package/dist/cjs/src/puppet-mixin/contact.js +1 -1
- package/dist/cjs/src/puppet-mixin/contact.js.map +1 -1
- package/dist/cjs/src/puppet-mixin/friendship.js +2 -2
- package/dist/cjs/src/puppet-mixin/friendship.js.map +1 -1
- 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 -7
- package/dist/cjs/src/whatsapp/event-handler/login-event-handler.js.map +1 -1
- package/dist/esm/examples/ding-dong-bot.js +14 -0
- package/dist/esm/examples/ding-dong-bot.js.map +1 -1
- package/dist/esm/src/package-json.js +1 -1
- package/dist/esm/src/puppet-mixin/contact.js +1 -1
- package/dist/esm/src/puppet-mixin/contact.js.map +1 -1
- package/dist/esm/src/puppet-mixin/friendship.js +2 -2
- package/dist/esm/src/puppet-mixin/friendship.js.map +1 -1
- 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 -7
- package/dist/esm/src/whatsapp/event-handler/login-event-handler.js.map +1 -1
- package/package.json +1 -1
- package/src/package-json.ts +1 -1
- package/src/puppet-mixin/contact.ts +1 -1
- package/src/puppet-mixin/friendship.ts +2 -2
- package/src/whatsapp/event-handler/login-event-handler.ts +11 -10
|
@@ -182,4 +182,18 @@ Please wait... I'm trying to login in...
|
|
|
182
182
|
|
|
183
183
|
`;
|
|
184
184
|
console.info(welcome);
|
|
185
|
+
process.on('unhandledRejection', (reason, promise) => {
|
|
186
|
+
console.error('Config', '###########################');
|
|
187
|
+
console.error('Config', `unhandledRejection: ${reason} ${promise}`);
|
|
188
|
+
console.error('Config', '###########################');
|
|
189
|
+
promise.catch(err => {
|
|
190
|
+
const message = err.message;
|
|
191
|
+
console.error('Config', `process.on(unhandledRejection) promise.catch(${message})`);
|
|
192
|
+
});
|
|
193
|
+
});
|
|
194
|
+
process.on('uncaughtException', e => {
|
|
195
|
+
console.error('Config', '###########################');
|
|
196
|
+
console.error('Config', `uncaughtException: ${e.stack}`);
|
|
197
|
+
console.error('Config', '###########################');
|
|
198
|
+
});
|
|
185
199
|
//# sourceMappingURL=ding-dong-bot.js.map
|
|
@@ -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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"}
|
|
@@ -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.57",
|
|
7
7
|
"description": "Wechaty Puppet for WhatsApp",
|
|
8
8
|
"type": "module",
|
|
9
9
|
"exports": {
|
|
@@ -92,7 +92,7 @@ exports.contactAvatar = contactAvatar;
|
|
|
92
92
|
async function contactRawPayload(id, forceSync = false) {
|
|
93
93
|
config_js_1.log.verbose(PRE, 'contactRawPayload(%s)', id);
|
|
94
94
|
if (!(0, miscellaneous_js_1.isContactId)(id)) {
|
|
95
|
-
throw (0, whatsapp_error_js_1.default)(error_type_js_1.WA_ERROR_TYPE.ERR_CONTACT_NOT_FOUND, `please check contact id: ${id} again.`);
|
|
95
|
+
throw (0, whatsapp_error_js_1.default)(error_type_js_1.WA_ERROR_TYPE.ERR_CONTACT_NOT_FOUND, `please check contact id: ${id.toString()} again.`);
|
|
96
96
|
}
|
|
97
97
|
const cacheManager = await this.manager.getCacheManager();
|
|
98
98
|
let contact = await cacheManager.getContactOrRoomRawPayload(id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contact.js","sourceRoot":"","sources":["../../../../src/puppet-mixin/contact.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"contact.js","sourceRoot":"","sources":["../../../../src/puppet-mixin/contact.ts"],"names":[],"mappings":"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"}
|
|
@@ -78,7 +78,7 @@ async function friendshipAdd(contactId, option) {
|
|
|
78
78
|
// if (hello.length === 0) {
|
|
79
79
|
// hello = STRINGS[LANGUAGE].DEFAULT_HELLO_MESSAGE
|
|
80
80
|
// }
|
|
81
|
-
config_js_1.log.
|
|
81
|
+
config_js_1.log.info(PRE, 'friendshipAdd(%s, %s)', contactId, JSON.stringify(option));
|
|
82
82
|
const isUser = await this.manager.isWhatsappUser(contactId);
|
|
83
83
|
if (!isUser) {
|
|
84
84
|
throw (0, whatsapp_error_js_1.default)(error_type_js_1.WA_ERROR_TYPE.ERR_CONTACT_NOT_FOUND, 'Not a registered user on WhatsApp.', `contactId: ${contactId}`);
|
|
@@ -86,7 +86,7 @@ async function friendshipAdd(contactId, option) {
|
|
|
86
86
|
const contactPayload = await this.contactRawPayload(contactId, true);
|
|
87
87
|
if (!contactPayload.isMyContact) {
|
|
88
88
|
const contactPhone = contactId.split('@')[0] || '';
|
|
89
|
-
await this.manager.getWhatsAppClient().saveOrEditAddressbookContact(contactPhone, contactPayload.pushname ||
|
|
89
|
+
await this.manager.getWhatsAppClient().saveOrEditAddressbookContact(contactPhone, contactPayload.pushname || contactPhone, '', true);
|
|
90
90
|
}
|
|
91
91
|
if (hello) {
|
|
92
92
|
await this.messageSendText(contactId, hello);
|
|
@@ -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;AAEpD,yCAA0D;AAE1D,MAAM,GAAG,GAAG,kBAAkB,CAAA;AAEvB,KAAK,UAAU,oBAAoB,CAAwB,EAAU;IAC1E,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAA;IAClD,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,uBAAuB,CAAC,EAAE,CAAC,CAAA;IAC1D,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,IAAA,2BAAO,EAAC,6BAAa,CAAC,iBAAiB,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,EAAE,CAAC,CAAA;KAC9F;IACD,OAAO,UAAU,CAAA;AACnB,CAAC;AAPD,oDAOC;AAEM,KAAK,UAAU,0BAA0B,CAAE,UAAsB;IACtE,OAAO,UAAU,CAAA;AACnB,CAAC;AAFD,gEAEC;AAEM,KAAK,UAAU,qBAAqB,CAEzC,KAAa;IAEb,eAAG,CAAC,OAAO,CAAC,GAAG,EAAE,2BAA2B,EAAE,KAAK,CAAC,CAAA;IACpD,MAAM,SAAS,GAAG,GAAG,KAAK,OAAO,CAAA;IACjC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,CAAA;IAC3D,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAA,2BAAO,EAAC,6BAAa,CAAC,qBAAqB,EAAE,oCAAoC,EAAE,cAAc,SAAS,EAAE,CAAC,CAAA;KACpH;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAXD,sDAWC;AAEM,KAAK,UAAU,sBAAsB,CAC1C,MAAc;IAEd,eAAG,CAAC,OAAO,CAAC,GAAG,EAAE,4BAA4B,EAAE,MAAM,CAAC,CAAA;IACtD,OAAO,MAAM,CAAC,qBAAqB,EAAE,CAAA;AACvC,CAAC;AALD,wDAKC;AAEM,KAAK,UAAU,sBAAsB,CAC1C,MAAc;IAEd,eAAG,CAAC,OAAO,CAAC,GAAG,EAAE,4BAA4B,EAAE,MAAM,CAAC,CAAA;IACtD,OAAO,MAAM,CAAC,qBAAqB,EAAE,CAAA;AACvC,CAAC;AALD,wDAKC;AAEM,KAAK,UAAU,aAAa,CAEjC,SAAiB,EACjB,MAA0C;IAE1C,IAAI,KAAK,GAAW,EAAE,CAAA;IACtB,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,QAAQ,EAAE;QAChC,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE,CAAA;KAC3B;SAAM;QACL,KAAK,GAAG,MAAM,IAAI,EAAE,CAAA;KACrB;IAED,uCAAuC;IACvC,4BAA4B;IAC5B,oDAAoD;IACpD,IAAI;IAEJ,eAAG,CAAC,
|
|
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":"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;
|
|
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;IAiBf,OAAO,CAAE,iBAAiB,EAAE,eAAe,EAAE;IA4B7C,OAAO,CAAE,iBAAiB,EAAE,eAAe,EAAE;IA4C7C,QAAQ,CAAE,MAAM,GAAE,MAAgD;IAalE,aAAa,CAAE,KAAK,EAAE,WAAW;IAyB9C;;;MAGE;IACW,eAAe,CAAE,WAAW,EAAE,WAAW;CAWvD"}
|
|
@@ -76,6 +76,14 @@ class LoginEventHandler extends whatsapp_base_js_1.default {
|
|
|
76
76
|
config_js_1.log.verbose(PRE, 'onWhatsAppReady()');
|
|
77
77
|
this.hasLogin = true;
|
|
78
78
|
this.clearQrcodeOrLoginCheckTimer();
|
|
79
|
+
const whatsapp = this.getWhatsAppClient();
|
|
80
|
+
try {
|
|
81
|
+
this.botId = whatsapp.info.wid._serialized;
|
|
82
|
+
await this.manager.initCache(this.botId);
|
|
83
|
+
}
|
|
84
|
+
catch (error) {
|
|
85
|
+
throw (0, whatsapp_error_js_1.default)(error_type_js_1.WA_ERROR_TYPE.ERR_INIT, `Can not get bot id from WhatsApp client, current state: ${await whatsapp.getState()}`, JSON.stringify(error));
|
|
86
|
+
}
|
|
79
87
|
const contactOrRoomList = await this.manager.syncContactOrRoomList();
|
|
80
88
|
await this.onLogin(contactOrRoomList);
|
|
81
89
|
await this.onReady(contactOrRoomList);
|
|
@@ -84,14 +92,7 @@ class LoginEventHandler extends whatsapp_base_js_1.default {
|
|
|
84
92
|
async onLogin(contactOrRoomList) {
|
|
85
93
|
config_js_1.log.verbose(PRE, 'onLogin()');
|
|
86
94
|
const whatsapp = this.getWhatsAppClient();
|
|
87
|
-
try {
|
|
88
|
-
this.botId = whatsapp.info.wid._serialized;
|
|
89
|
-
}
|
|
90
|
-
catch (error) {
|
|
91
|
-
throw (0, whatsapp_error_js_1.default)(error_type_js_1.WA_ERROR_TYPE.ERR_INIT, `Can not get bot id from WhatsApp client, current state: ${await whatsapp.getState()}`, JSON.stringify(error));
|
|
92
|
-
}
|
|
93
95
|
config_js_1.log.info(PRE, `WhatsApp Client Info: ${JSON.stringify(whatsapp.info)}`);
|
|
94
|
-
await this.manager.initCache(this.botId);
|
|
95
96
|
const cacheManager = await this.manager.getCacheManager();
|
|
96
97
|
const botSelf = await this.manager.requestManager.getContactById(this.botId);
|
|
97
98
|
await cacheManager.setContactOrRoomRawPayload(this.botId, {
|
|
@@ -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,oEAKsC;AAEtC,MAAM,GAAG,GAAG,mBAAmB,CAAA;AAE/B,MAAqB,iBAAkB,SAAQ,0BAAY;IAE/C,WAAW,GAAY,KAAK,CAAA;IAC9B,uBAAuB,CAAe;IACtC,QAAQ,GAAY,KAAK,CAAA;IACzB,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;IAE5B,QAAQ,CAAE,MAAc;QAC7B,eAAG,CAAC,IAAI,CAAC,GAAG,EAAE,YAAY,MAAM,GAAG,CAAC,CAAA;QACpC,gEAAgE;QAChE,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAChC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAA;QACrB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;QAC7F,IAAI,CAAC,uBAAuB,EAAE,CAAA;IAChC,CAAC;IAEO,uBAAuB;QAC7B,IAAI,IAAI,CAAC,uBAAuB,EAAE;YAChC,OAAM;SACP;QACD,IAAI,CAAC,uBAAuB,GAAG,WAAW,CAAC,GAAG,EAAE;YAC9C,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,cAAc,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,EAAE;gBACtE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,kDAAkD,CAAC,CAAA;aACvE;QACH,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,CAAA;IACf,CAAC;IAEM,4BAA4B;QACjC,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE;YACjC,OAAM;SACP;QACD,aAAa,CAAC,IAAI,CAAC,uBAA8B,CAAC,CAAA;IACpD,CAAC;IAEM,KAAK,CAAC,eAAe;QAC1B,eAAG,CAAC,IAAI,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAA;IACpC,CAAC;IAEM,KAAK,CAAC,aAAa,CAAE,OAAe;QACzC,eAAG,CAAC,IAAI,CAAC,GAAG,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAA;QAC1C,mCAAmC;QACnC,MAAM,IAAI,CAAC,YAAY,EAAE,CAAA;IAC3B,CAAC;IAEM,KAAK,CAAC,eAAe;QAC1B,eAAG,CAAC,OAAO,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAA;QACrC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAA;QACpB,IAAI,CAAC,4BAA4B,EAAE,CAAA;QACnC,MAAM,
|
|
1
|
+
{"version":3,"file":"login-event-handler.js","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/login-event-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -154,4 +154,18 @@ Please wait... I'm trying to login in...
|
|
|
154
154
|
|
|
155
155
|
`;
|
|
156
156
|
console.info(welcome);
|
|
157
|
+
process.on('unhandledRejection', (reason, promise) => {
|
|
158
|
+
console.error('Config', '###########################');
|
|
159
|
+
console.error('Config', `unhandledRejection: ${reason} ${promise}`);
|
|
160
|
+
console.error('Config', '###########################');
|
|
161
|
+
promise.catch(err => {
|
|
162
|
+
const message = err.message;
|
|
163
|
+
console.error('Config', `process.on(unhandledRejection) promise.catch(${message})`);
|
|
164
|
+
});
|
|
165
|
+
});
|
|
166
|
+
process.on('uncaughtException', e => {
|
|
167
|
+
console.error('Config', '###########################');
|
|
168
|
+
console.error('Config', `uncaughtException: ${e.stack}`);
|
|
169
|
+
console.error('Config', '###########################');
|
|
170
|
+
});
|
|
157
171
|
//# sourceMappingURL=ding-dong-bot.js.map
|
|
@@ -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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"}
|
|
@@ -57,7 +57,7 @@ export async function contactAvatar(contactId, file) {
|
|
|
57
57
|
export async function contactRawPayload(id, forceSync = false) {
|
|
58
58
|
log.verbose(PRE, 'contactRawPayload(%s)', id);
|
|
59
59
|
if (!isContactId(id)) {
|
|
60
|
-
throw WAError(WA_ERROR_TYPE.ERR_CONTACT_NOT_FOUND, `please check contact id: ${id} again.`);
|
|
60
|
+
throw WAError(WA_ERROR_TYPE.ERR_CONTACT_NOT_FOUND, `please check contact id: ${id.toString()} again.`);
|
|
61
61
|
}
|
|
62
62
|
const cacheManager = await this.manager.getCacheManager();
|
|
63
63
|
let contact = await cacheManager.getContactOrRoomRawPayload(id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contact.js","sourceRoot":"","sources":["../../../../src/puppet-mixin/contact.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"contact.js","sourceRoot":"","sources":["../../../../src/puppet-mixin/contact.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,7 +44,7 @@ export async function friendshipAdd(contactId, option) {
|
|
|
44
44
|
// if (hello.length === 0) {
|
|
45
45
|
// hello = STRINGS[LANGUAGE].DEFAULT_HELLO_MESSAGE
|
|
46
46
|
// }
|
|
47
|
-
log.
|
|
47
|
+
log.info(PRE, 'friendshipAdd(%s, %s)', contactId, JSON.stringify(option));
|
|
48
48
|
const isUser = await this.manager.isWhatsappUser(contactId);
|
|
49
49
|
if (!isUser) {
|
|
50
50
|
throw WAError(WA_ERROR_TYPE.ERR_CONTACT_NOT_FOUND, 'Not a registered user on WhatsApp.', `contactId: ${contactId}`);
|
|
@@ -52,7 +52,7 @@ export async function friendshipAdd(contactId, option) {
|
|
|
52
52
|
const contactPayload = await this.contactRawPayload(contactId, true);
|
|
53
53
|
if (!contactPayload.isMyContact) {
|
|
54
54
|
const contactPhone = contactId.split('@')[0] || '';
|
|
55
|
-
await this.manager.getWhatsAppClient().saveOrEditAddressbookContact(contactPhone, contactPayload.pushname ||
|
|
55
|
+
await this.manager.getWhatsAppClient().saveOrEditAddressbookContact(contactPhone, contactPayload.pushname || contactPhone, '', true);
|
|
56
56
|
}
|
|
57
57
|
if (hello) {
|
|
58
58
|
await this.messageSendText(contactId, hello);
|
|
@@ -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;AAEpD,OAA2B,+BAA+B,CAAA;AAE1D,MAAM,GAAG,GAAG,kBAAkB,CAAA;AAE9B,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAwB,EAAU;IAC1E,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAA;IAClD,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,uBAAuB,CAAC,EAAE,CAAC,CAAA;IAC1D,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,OAAO,CAAC,aAAa,CAAC,iBAAiB,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,EAAE,CAAC,CAAA;KAC9F;IACD,OAAO,UAAU,CAAA;AACnB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAAE,UAAsB;IACtE,OAAO,UAAU,CAAA;AACnB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAEzC,KAAa;IAEb,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,2BAA2B,EAAE,KAAK,CAAC,CAAA;IACpD,MAAM,SAAS,GAAG,GAAG,KAAK,OAAO,CAAA;IACjC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,CAAA;IAC3D,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,OAAO,CAAC,aAAa,CAAC,qBAAqB,EAAE,oCAAoC,EAAE,cAAc,SAAS,EAAE,CAAC,CAAA;KACpH;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,MAAc;IAEd,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,4BAA4B,EAAE,MAAM,CAAC,CAAA;IACtD,OAAO,MAAM,CAAC,qBAAqB,EAAE,CAAA;AACvC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,MAAc;IAEd,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,4BAA4B,EAAE,MAAM,CAAC,CAAA;IACtD,OAAO,MAAM,CAAC,qBAAqB,EAAE,CAAA;AACvC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAEjC,SAAiB,EACjB,MAA0C;IAE1C,IAAI,KAAK,GAAW,EAAE,CAAA;IACtB,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,QAAQ,EAAE;QAChC,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE,CAAA;KAC3B;SAAM;QACL,KAAK,GAAG,MAAM,IAAI,EAAE,CAAA;KACrB;IAED,uCAAuC;IACvC,4BAA4B;IAC5B,oDAAoD;IACpD,IAAI;IAEJ,GAAG,CAAC,
|
|
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":"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;
|
|
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;IAiBf,OAAO,CAAE,iBAAiB,EAAE,eAAe,EAAE;IA4B7C,OAAO,CAAE,iBAAiB,EAAE,eAAe,EAAE;IA4C7C,QAAQ,CAAE,MAAM,GAAE,MAAgD;IAalE,aAAa,CAAE,KAAK,EAAE,WAAW;IAyB9C;;;MAGE;IACW,eAAe,CAAE,WAAW,EAAE,WAAW;CAWvD"}
|
|
@@ -48,6 +48,14 @@ export default class LoginEventHandler extends WhatsAppBase {
|
|
|
48
48
|
log.verbose(PRE, 'onWhatsAppReady()');
|
|
49
49
|
this.hasLogin = true;
|
|
50
50
|
this.clearQrcodeOrLoginCheckTimer();
|
|
51
|
+
const whatsapp = this.getWhatsAppClient();
|
|
52
|
+
try {
|
|
53
|
+
this.botId = whatsapp.info.wid._serialized;
|
|
54
|
+
await this.manager.initCache(this.botId);
|
|
55
|
+
}
|
|
56
|
+
catch (error) {
|
|
57
|
+
throw WAError(WA_ERROR_TYPE.ERR_INIT, `Can not get bot id from WhatsApp client, current state: ${await whatsapp.getState()}`, JSON.stringify(error));
|
|
58
|
+
}
|
|
51
59
|
const contactOrRoomList = await this.manager.syncContactOrRoomList();
|
|
52
60
|
await this.onLogin(contactOrRoomList);
|
|
53
61
|
await this.onReady(contactOrRoomList);
|
|
@@ -56,14 +64,7 @@ export default class LoginEventHandler extends WhatsAppBase {
|
|
|
56
64
|
async onLogin(contactOrRoomList) {
|
|
57
65
|
log.verbose(PRE, 'onLogin()');
|
|
58
66
|
const whatsapp = this.getWhatsAppClient();
|
|
59
|
-
try {
|
|
60
|
-
this.botId = whatsapp.info.wid._serialized;
|
|
61
|
-
}
|
|
62
|
-
catch (error) {
|
|
63
|
-
throw WAError(WA_ERROR_TYPE.ERR_INIT, `Can not get bot id from WhatsApp client, current state: ${await whatsapp.getState()}`, JSON.stringify(error));
|
|
64
|
-
}
|
|
65
67
|
log.info(PRE, `WhatsApp Client Info: ${JSON.stringify(whatsapp.info)}`);
|
|
66
|
-
await this.manager.initCache(this.botId);
|
|
67
68
|
const cacheManager = await this.manager.getCacheManager();
|
|
68
69
|
const botSelf = await this.manager.requestManager.getContactById(this.botId);
|
|
69
70
|
await cacheManager.setContactOrRoomRawPayload(this.botId, {
|
|
@@ -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,EACR,KAAK,GACN,MAAM,+BAA+B,CAAA;AAEtC,MAAM,GAAG,GAAG,mBAAmB,CAAA;AAE/B,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,YAAY;IAE/C,WAAW,GAAY,KAAK,CAAA;IAC9B,uBAAuB,CAAe;IACtC,QAAQ,GAAY,KAAK,CAAA;IACzB,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;IAE5B,QAAQ,CAAE,MAAc;QAC7B,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,YAAY,MAAM,GAAG,CAAC,CAAA;QACpC,gEAAgE;QAChE,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAChC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAA;QACrB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;QAC7F,IAAI,CAAC,uBAAuB,EAAE,CAAA;IAChC,CAAC;IAEO,uBAAuB;QAC7B,IAAI,IAAI,CAAC,uBAAuB,EAAE;YAChC,OAAM;SACP;QACD,IAAI,CAAC,uBAAuB,GAAG,WAAW,CAAC,GAAG,EAAE;YAC9C,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,cAAc,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,EAAE;gBACtE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,kDAAkD,CAAC,CAAA;aACvE;QACH,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,CAAA;IACf,CAAC;IAEM,4BAA4B;QACjC,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE;YACjC,OAAM;SACP;QACD,aAAa,CAAC,IAAI,CAAC,uBAA8B,CAAC,CAAA;IACpD,CAAC;IAEM,KAAK,CAAC,eAAe;QAC1B,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAA;IACpC,CAAC;IAEM,KAAK,CAAC,aAAa,CAAE,OAAe;QACzC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAA;QAC1C,mCAAmC;QACnC,MAAM,IAAI,CAAC,YAAY,EAAE,CAAA;IAC3B,CAAC;IAEM,KAAK,CAAC,eAAe;QAC1B,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAA;QACrC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAA;QACpB,IAAI,CAAC,4BAA4B,EAAE,CAAA;QACnC,MAAM,
|
|
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
package/src/package-json.ts
CHANGED
|
@@ -79,7 +79,7 @@ export async function contactAvatar (this: PuppetWhatsApp, contactId: string, fi
|
|
|
79
79
|
export async function contactRawPayload (this: PuppetWhatsApp, id: string, forceSync = false): Promise<WhatsAppContactPayload> {
|
|
80
80
|
log.verbose(PRE, 'contactRawPayload(%s)', id)
|
|
81
81
|
if (!isContactId(id)) {
|
|
82
|
-
throw WAError(WA_ERROR_TYPE.ERR_CONTACT_NOT_FOUND, `please check contact id: ${id} again.`)
|
|
82
|
+
throw WAError(WA_ERROR_TYPE.ERR_CONTACT_NOT_FOUND, `please check contact id: ${id.toString()} again.`)
|
|
83
83
|
}
|
|
84
84
|
const cacheManager = await this.manager.getCacheManager()
|
|
85
85
|
let contact = await cacheManager.getContactOrRoomRawPayload(id)
|
|
@@ -64,7 +64,7 @@ export async function friendshipAdd (
|
|
|
64
64
|
// hello = STRINGS[LANGUAGE].DEFAULT_HELLO_MESSAGE
|
|
65
65
|
// }
|
|
66
66
|
|
|
67
|
-
log.
|
|
67
|
+
log.info(PRE, 'friendshipAdd(%s, %s)', contactId, JSON.stringify(option))
|
|
68
68
|
const isUser = await this.manager.isWhatsappUser(contactId)
|
|
69
69
|
if (!isUser) {
|
|
70
70
|
throw WAError(WA_ERROR_TYPE.ERR_CONTACT_NOT_FOUND, 'Not a registered user on WhatsApp.', `contactId: ${contactId}`)
|
|
@@ -73,7 +73,7 @@ export async function friendshipAdd (
|
|
|
73
73
|
const contactPayload = await this.contactRawPayload(contactId, true)
|
|
74
74
|
if (!contactPayload.isMyContact) {
|
|
75
75
|
const contactPhone = contactId.split('@')[0] || ''
|
|
76
|
-
await this.manager.getWhatsAppClient().saveOrEditAddressbookContact(contactPhone, contactPayload.pushname ||
|
|
76
|
+
await this.manager.getWhatsAppClient().saveOrEditAddressbookContact(contactPhone, contactPayload.pushname || contactPhone, '', true)
|
|
77
77
|
}
|
|
78
78
|
|
|
79
79
|
if (hello) {
|
|
@@ -76,6 +76,13 @@ export default class LoginEventHandler extends WhatsAppBase { // FIXME: I have n
|
|
|
76
76
|
log.verbose(PRE, 'onWhatsAppReady()')
|
|
77
77
|
this.hasLogin = true
|
|
78
78
|
this.clearQrcodeOrLoginCheckTimer()
|
|
79
|
+
const whatsapp = this.getWhatsAppClient()
|
|
80
|
+
try {
|
|
81
|
+
this.botId = whatsapp.info.wid._serialized
|
|
82
|
+
await this.manager.initCache(this.botId)
|
|
83
|
+
} catch (error) {
|
|
84
|
+
throw WAError(WA_ERROR_TYPE.ERR_INIT, `Can not get bot id from WhatsApp client, current state: ${await whatsapp.getState()}`, JSON.stringify(error))
|
|
85
|
+
}
|
|
79
86
|
const contactOrRoomList = await this.manager.syncContactOrRoomList()
|
|
80
87
|
await this.onLogin(contactOrRoomList)
|
|
81
88
|
await this.onReady(contactOrRoomList)
|
|
@@ -85,20 +92,14 @@ export default class LoginEventHandler extends WhatsAppBase { // FIXME: I have n
|
|
|
85
92
|
public async onLogin (contactOrRoomList: WhatsAppContact[]) {
|
|
86
93
|
log.verbose(PRE, 'onLogin()')
|
|
87
94
|
const whatsapp = this.getWhatsAppClient()
|
|
88
|
-
try {
|
|
89
|
-
this.botId = whatsapp.info.wid._serialized
|
|
90
|
-
} catch (error) {
|
|
91
|
-
throw WAError(WA_ERROR_TYPE.ERR_INIT, `Can not get bot id from WhatsApp client, current state: ${await whatsapp.getState()}`, JSON.stringify(error))
|
|
92
|
-
}
|
|
93
95
|
log.info(PRE, `WhatsApp Client Info: ${JSON.stringify(whatsapp.info)}`)
|
|
94
96
|
|
|
95
|
-
await this.manager.initCache(this.botId)
|
|
96
97
|
const cacheManager = await this.manager.getCacheManager()
|
|
97
98
|
|
|
98
|
-
const botSelf = await this.manager.requestManager.getContactById(this.botId)
|
|
99
|
-
await cacheManager.setContactOrRoomRawPayload(this.botId
|
|
99
|
+
const botSelf = await this.manager.requestManager.getContactById(this.botId!)
|
|
100
|
+
await cacheManager.setContactOrRoomRawPayload(this.botId!, {
|
|
100
101
|
...botSelf,
|
|
101
|
-
avatar: await this.manager.requestManager.getAvatarUrl(this.botId),
|
|
102
|
+
avatar: await this.manager.requestManager.getAvatarUrl(this.botId!),
|
|
102
103
|
})
|
|
103
104
|
|
|
104
105
|
const batchSize = 500
|
|
@@ -112,7 +113,7 @@ export default class LoginEventHandler extends WhatsAppBase { // FIXME: I have n
|
|
|
112
113
|
await cacheManager.setContactOrRoomRawPayload(contactOrRoomId, contactWithAvatar)
|
|
113
114
|
})
|
|
114
115
|
|
|
115
|
-
this.emit('login', this.botId)
|
|
116
|
+
this.emit('login', this.botId!)
|
|
116
117
|
log.info(PRE, `onLogin(${this.botId}})`)
|
|
117
118
|
}
|
|
118
119
|
|