@juzi/wechaty-puppet-whatsapp 1.0.43 → 1.0.45
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/config.js +2 -2
- package/dist/cjs/src/config.js.map +1 -1
- package/dist/cjs/src/package-json.d.ts.map +1 -1
- package/dist/cjs/src/package-json.js +2 -1
- package/dist/cjs/src/package-json.js.map +1 -1
- package/dist/cjs/src/puppet-mixin/message.d.ts.map +1 -1
- package/dist/cjs/src/puppet-mixin/message.js +22 -8
- package/dist/cjs/src/puppet-mixin/message.js.map +1 -1
- 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 +7 -6
- package/dist/cjs/src/whatsapp/event-handler/message-event-handler.js.map +1 -1
- package/dist/esm/src/config.js +2 -2
- package/dist/esm/src/config.js.map +1 -1
- package/dist/esm/src/package-json.d.ts.map +1 -1
- package/dist/esm/src/package-json.js +2 -1
- package/dist/esm/src/package-json.js.map +1 -1
- package/dist/esm/src/puppet-mixin/message.d.ts.map +1 -1
- package/dist/esm/src/puppet-mixin/message.js +23 -9
- package/dist/esm/src/puppet-mixin/message.js.map +1 -1
- 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 +7 -6
- package/dist/esm/src/whatsapp/event-handler/message-event-handler.js.map +1 -1
- package/package.json +2 -1
- package/src/config.ts +2 -2
- package/src/package-json.ts +2 -1
- package/src/puppet-mixin/message.ts +22 -8
- package/src/whatsapp/event-handler/message-event-handler.ts +7 -6
package/dist/cjs/src/config.js
CHANGED
|
@@ -56,9 +56,9 @@ exports.STRINGS = {
|
|
|
56
56
|
};
|
|
57
57
|
exports.LANGUAGE = process.env['LANGUAGE'] || 'zh_CN';
|
|
58
58
|
exports.DEFAULT_TIMEOUT = {
|
|
59
|
-
MESSAGE_SEND:
|
|
59
|
+
MESSAGE_SEND: 120 * 1000,
|
|
60
60
|
MESSAGE_SEND_FILE: 15 * 60 * 1000,
|
|
61
|
-
MESSAGE_SEND_TEXT:
|
|
61
|
+
MESSAGE_SEND_TEXT: 120 * 1000,
|
|
62
62
|
TIMEOUT_WAIT_CONNECTED: 10 * 1000,
|
|
63
63
|
};
|
|
64
64
|
exports.HISTORY_MESSAGES_DAYS = Number(process.env['HISTORY_MESSAGES_DAYS'] || '3');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/config.ts"],"names":[],"mappings":";;;;;;AAAA,uCAAuC;AACvC,0EAEuC;AACvC,uDAA+C;AAE/C,4CAAmB;AACnB,gDAAuB;AACvB,uCAAqC;AACrC,uDAA0C;AAAjC,qGAAA,GAAG,OAAA;AACZ,qCAIiB;AAHf,mGAAA,OAAO,OAAA;AACP,uGAAA,WAAW,OAAA;AAIb,MAAM,OAAO,GAAG,6BAAW,CAAC,OAAO,IAAI,OAAO,CAAA;AA8B5C,0BAAO;AA5BT,MAAM,WAAW,GAAG,2BAA2B,CAAA;AA2B7C,kCAAW;AA1Bb,MAAM,GAAG,GAAG,gBAAgB,CAAA;AA4B1B,kBAAG;AA1BQ,QAAA,oBAAoB,GAAG,GAAG,CAAA,CAAC,qFAAqF;AAEhH,QAAA,4BAA4B,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC,IAAI,CAAC,CAAA;AAEvF,QAAA,cAAc,GAAG,cAAI,CAAC,IAAI,CACrC,YAAE,CAAC,OAAO,EAAE,EACZ,UAAU,EACV,iBAAiB,EACjB,MAAM,CACP,CAAA;AAED,IAAA,qBAAU,EAAC,sBAAc,CAAC,CAAA;AAEb,QAAA,oBAAoB,GAAG;IAClC,0CAA0C;IAC1C,oCAAmB,CAAC,KAAK;IACzB,oCAAmB,CAAC,KAAK;IACzB,oCAAmB,CAAC,KAAK;IACzB,oCAAmB,CAAC,KAAK;IACzB,oCAAmB,CAAC,QAAQ;IAC5B,oCAAmB,CAAC,OAAO;CAC5B,CAAA;AAQY,QAAA,OAAO,GAAG;IACrB,KAAK,EAAE;QACL,qBAAqB,EAAE,uCAAuC;QAC9D,aAAa,EAAE;YACb,sBAAsB,EAAE,0DAA0D;YAClF,OAAO,EAAE,YAAY;YACrB,cAAc,EAAE,2BAA2B;YAC3C,wBAAwB,EAAE,gCAAgC;SAC3D;KACF;IACD,KAAK,EAAE;QACL,qBAAqB,EAAE,qBAAqB;QAC5C,aAAa,EAAE;YACb,sBAAsB,EAAE,yBAAyB;YACjD,OAAO,EAAE,OAAO;YAChB,cAAc,EAAE,WAAW;YAC3B,wBAAwB,EAAE,WAAW;SACtC;KACF;CACF,CAAA;AAIY,QAAA,QAAQ,GAAc,OAAO,CAAC,GAAG,CAAC,UAAU,CAA0B,IAAI,OAAO,CAAA;AAEjF,QAAA,eAAe,GAAG;IAC7B,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/config.ts"],"names":[],"mappings":";;;;;;AAAA,uCAAuC;AACvC,0EAEuC;AACvC,uDAA+C;AAE/C,4CAAmB;AACnB,gDAAuB;AACvB,uCAAqC;AACrC,uDAA0C;AAAjC,qGAAA,GAAG,OAAA;AACZ,qCAIiB;AAHf,mGAAA,OAAO,OAAA;AACP,uGAAA,WAAW,OAAA;AAIb,MAAM,OAAO,GAAG,6BAAW,CAAC,OAAO,IAAI,OAAO,CAAA;AA8B5C,0BAAO;AA5BT,MAAM,WAAW,GAAG,2BAA2B,CAAA;AA2B7C,kCAAW;AA1Bb,MAAM,GAAG,GAAG,gBAAgB,CAAA;AA4B1B,kBAAG;AA1BQ,QAAA,oBAAoB,GAAG,GAAG,CAAA,CAAC,qFAAqF;AAEhH,QAAA,4BAA4B,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC,IAAI,CAAC,CAAA;AAEvF,QAAA,cAAc,GAAG,cAAI,CAAC,IAAI,CACrC,YAAE,CAAC,OAAO,EAAE,EACZ,UAAU,EACV,iBAAiB,EACjB,MAAM,CACP,CAAA;AAED,IAAA,qBAAU,EAAC,sBAAc,CAAC,CAAA;AAEb,QAAA,oBAAoB,GAAG;IAClC,0CAA0C;IAC1C,oCAAmB,CAAC,KAAK;IACzB,oCAAmB,CAAC,KAAK;IACzB,oCAAmB,CAAC,KAAK;IACzB,oCAAmB,CAAC,KAAK;IACzB,oCAAmB,CAAC,QAAQ;IAC5B,oCAAmB,CAAC,OAAO;CAC5B,CAAA;AAQY,QAAA,OAAO,GAAG;IACrB,KAAK,EAAE;QACL,qBAAqB,EAAE,uCAAuC;QAC9D,aAAa,EAAE;YACb,sBAAsB,EAAE,0DAA0D;YAClF,OAAO,EAAE,YAAY;YACrB,cAAc,EAAE,2BAA2B;YAC3C,wBAAwB,EAAE,gCAAgC;SAC3D;KACF;IACD,KAAK,EAAE;QACL,qBAAqB,EAAE,qBAAqB;QAC5C,aAAa,EAAE;YACb,sBAAsB,EAAE,yBAAyB;YACjD,OAAO,EAAE,OAAO;YAChB,cAAc,EAAE,WAAW;YAC3B,wBAAwB,EAAE,WAAW;SACtC;KACF;CACF,CAAA;AAIY,QAAA,QAAQ,GAAc,OAAO,CAAC,GAAG,CAAC,UAAU,CAA0B,IAAI,OAAO,CAAA;AAEjF,QAAA,eAAe,GAAG;IAC7B,YAAY,EAAE,GAAG,GAAG,IAAI;IACxB,iBAAiB,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI;IACjC,iBAAiB,EAAE,GAAG,GAAG,IAAI;IAC7B,sBAAsB,EAAE,EAAE,GAAG,IAAI;CAClC,CAAA;AAEY,QAAA,qBAAqB,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,IAAI,GAAG,CAAC,CAAA;AAC3E,QAAA,oBAAoB,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,IAAI,GAAG,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-json.d.ts","sourceRoot":"","sources":["../../../src/package-json.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAC5C,eAAO,MAAM,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"package-json.d.ts","sourceRoot":"","sources":["../../../src/package-json.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAC5C,eAAO,MAAM,WAAW,EAAE,WA+FlB,CAAA"}
|
|
@@ -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.45",
|
|
7
7
|
"description": "Wechaty Puppet for WhatsApp",
|
|
8
8
|
"type": "module",
|
|
9
9
|
"exports": {
|
|
@@ -72,6 +72,7 @@ exports.packageJson = {
|
|
|
72
72
|
"@juzi/wechaty-puppet": "^1.0.15"
|
|
73
73
|
},
|
|
74
74
|
"dependencies": {
|
|
75
|
+
"@juzi/wechaty-puppet-whatsapp": "1.0.44",
|
|
75
76
|
"@juzi/whatsapp-web.js": "^1.30.2",
|
|
76
77
|
"ee-ts": "^1.0.2",
|
|
77
78
|
"flash-store": "^1.0.6",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-json.js","sourceRoot":"","sources":["../../../src/package-json.ts"],"names":[],"mappings":";;;AAIa,QAAA,WAAW,GAAgB;IACtC,MAAM,EAAE,+BAA+B;IACvC,SAAS,EAAE,QAAQ;IACnB,aAAa,EAAE,6BAA6B;IAC5C,MAAM,EAAE,QAAQ;IAChB,SAAS,EAAE;QACT,GAAG,EAAE;YACH,QAAQ,EAAE,uBAAuB;YACjC,SAAS,EAAE,uBAAuB;SACnC;KACF;IACD,SAAS,EAAE,yBAAyB;IACpC,SAAS,EAAE;QACT,MAAM,EAAE,MAAM;QACd,KAAK,EAAE,KAAK;KACb;IACD,SAAS,EAAE;QACT,OAAO,EAAE,mBAAmB;QAC5B,MAAM,EAAE,+BAA+B;QACvC,OAAO,EAAE,iCAAiC;QAC1C,OAAO,EAAE,6DAA6D;QACtE,OAAO,EAAE,4FAA4F;QACrG,MAAM,EAAE,qCAAqC;QAC7C,SAAS,EAAE,wBAAwB;QACnC,SAAS,EAAE,gCAAgC;QAC3C,SAAS,EAAE,gFAAgF;QAC3F,MAAM,EAAE,4BAA4B;QACpC,WAAW,EAAE,qCAAqC;QAClD,WAAW,EAAE,sGAAsG;KACpH;IACD,YAAY,EAAE;QACZ,MAAM,EAAE,KAAK;QACb,KAAK,EAAE,oDAAoD;KAC5D;IACD,UAAU,EAAE;QACV,QAAQ;QACR,SAAS;QACT,SAAS;QACT,KAAK;QACL,QAAQ;QACR,KAAK;QACL,QAAQ;QACR,MAAM;KACP;IACD,QAAQ,EAAE,2BAA2B;IACrC,SAAS,EAAE,YAAY;IACvB,MAAM,EAAE;QACN,KAAK,EAAE,mDAAmD;KAC3D;IACD,UAAU,EAAE,mDAAmD;IAC/D,iBAAiB,EAAE;QACjB,uBAAuB,EAAE,OAAO;QAChC,gBAAgB,EAAE,QAAQ;QAC1B,kBAAkB,EAAE,OAAO;QAC3B,sBAAsB,EAAE,UAAU;QAClC,WAAW,EAAE,SAAS;QACtB,aAAa,EAAE,QAAQ;QACvB,iBAAiB,EAAE,SAAS;QAC5B,aAAa,EAAE,QAAQ;QACvB,sBAAsB,EAAE,QAAQ;QAChC,wBAAwB,EAAE,SAAS;QACnC,aAAa,EAAE,QAAQ;QACvB,iBAAiB,EAAE,SAAS;QAC5B,SAAS,EAAE,SAAS;QACpB,QAAQ,EAAE,QAAQ;QAClB,YAAY,EAAE,OAAO;KACtB;IACD,kBAAkB,EAAE;QAClB,sBAAsB,EAAE,SAAS;KAClC;IACD,cAAc,EAAE;QACd,uBAAuB,EAAE,SAAS;QAClC,OAAO,EAAE,QAAQ;QACjB,aAAa,EAAE,QAAQ;QACvB,UAAU,EAAE,SAAS;QACrB,QAAQ,EAAE,SAAS;QACnB,MAAM,EAAE,QAAQ;QAChB,eAAe,EAAE,QAAQ;QACzB,MAAM,EAAE,QAAQ;QAChB,WAAW,EAAE,SAAS;QACtB,MAAM,EAAE,QAAQ;KACjB;IACD,OAAO,EAAE;QACP,MAAM;QACN,OAAO;QACP,MAAM;KACP;IACD,KAAK,EAAE;QACL,gBAAgB,EAAE,KAAK;KACxB;IACD,eAAe,EAAE;QACf,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE,MAAM;KACd;CACK,CAAA"}
|
|
1
|
+
{"version":3,"file":"package-json.js","sourceRoot":"","sources":["../../../src/package-json.ts"],"names":[],"mappings":";;;AAIa,QAAA,WAAW,GAAgB;IACtC,MAAM,EAAE,+BAA+B;IACvC,SAAS,EAAE,QAAQ;IACnB,aAAa,EAAE,6BAA6B;IAC5C,MAAM,EAAE,QAAQ;IAChB,SAAS,EAAE;QACT,GAAG,EAAE;YACH,QAAQ,EAAE,uBAAuB;YACjC,SAAS,EAAE,uBAAuB;SACnC;KACF;IACD,SAAS,EAAE,yBAAyB;IACpC,SAAS,EAAE;QACT,MAAM,EAAE,MAAM;QACd,KAAK,EAAE,KAAK;KACb;IACD,SAAS,EAAE;QACT,OAAO,EAAE,mBAAmB;QAC5B,MAAM,EAAE,+BAA+B;QACvC,OAAO,EAAE,iCAAiC;QAC1C,OAAO,EAAE,6DAA6D;QACtE,OAAO,EAAE,4FAA4F;QACrG,MAAM,EAAE,qCAAqC;QAC7C,SAAS,EAAE,wBAAwB;QACnC,SAAS,EAAE,gCAAgC;QAC3C,SAAS,EAAE,gFAAgF;QAC3F,MAAM,EAAE,4BAA4B;QACpC,WAAW,EAAE,qCAAqC;QAClD,WAAW,EAAE,sGAAsG;KACpH;IACD,YAAY,EAAE;QACZ,MAAM,EAAE,KAAK;QACb,KAAK,EAAE,oDAAoD;KAC5D;IACD,UAAU,EAAE;QACV,QAAQ;QACR,SAAS;QACT,SAAS;QACT,KAAK;QACL,QAAQ;QACR,KAAK;QACL,QAAQ;QACR,MAAM;KACP;IACD,QAAQ,EAAE,2BAA2B;IACrC,SAAS,EAAE,YAAY;IACvB,MAAM,EAAE;QACN,KAAK,EAAE,mDAAmD;KAC3D;IACD,UAAU,EAAE,mDAAmD;IAC/D,iBAAiB,EAAE;QACjB,uBAAuB,EAAE,OAAO;QAChC,gBAAgB,EAAE,QAAQ;QAC1B,kBAAkB,EAAE,OAAO;QAC3B,sBAAsB,EAAE,UAAU;QAClC,WAAW,EAAE,SAAS;QACtB,aAAa,EAAE,QAAQ;QACvB,iBAAiB,EAAE,SAAS;QAC5B,aAAa,EAAE,QAAQ;QACvB,sBAAsB,EAAE,QAAQ;QAChC,wBAAwB,EAAE,SAAS;QACnC,aAAa,EAAE,QAAQ;QACvB,iBAAiB,EAAE,SAAS;QAC5B,SAAS,EAAE,SAAS;QACpB,QAAQ,EAAE,QAAQ;QAClB,YAAY,EAAE,OAAO;KACtB;IACD,kBAAkB,EAAE;QAClB,sBAAsB,EAAE,SAAS;KAClC;IACD,cAAc,EAAE;QACd,+BAA+B,EAAE,QAAQ;QACzC,uBAAuB,EAAE,SAAS;QAClC,OAAO,EAAE,QAAQ;QACjB,aAAa,EAAE,QAAQ;QACvB,UAAU,EAAE,SAAS;QACrB,QAAQ,EAAE,SAAS;QACnB,MAAM,EAAE,QAAQ;QAChB,eAAe,EAAE,QAAQ;QACzB,MAAM,EAAE,QAAQ;QAChB,WAAW,EAAE,SAAS;QACtB,MAAM,EAAE,QAAQ;KACjB;IACD,OAAO,EAAE;QACP,MAAM;QACN,OAAO;QACP,MAAM;KACP;IACD,KAAK,EAAE;QACL,gBAAgB,EAAE,KAAK;KACxB;IACD,eAAe,EAAE;QACf,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE,MAAM;KACd;CACK,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../../../src/puppet-mixin/message.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAG9C,OAAO,KAAK,cAAc,MAAM,uBAAuB,CAAA;AACvD,OAAO,KAAK,EACV,cAAc,EACd,sBAAsB,EACtB,kBAAkB,EACnB,MAAM,4BAA4B,CAAA;
|
|
1
|
+
{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../../../src/puppet-mixin/message.ts"],"names":[],"mappings":"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"}
|
|
@@ -266,12 +266,23 @@ async function messageChannel(messageId) {
|
|
|
266
266
|
}
|
|
267
267
|
exports.messageChannel = messageChannel;
|
|
268
268
|
async function messageSend(conversationId, content, options, timeout = config_js_1.DEFAULT_TIMEOUT.MESSAGE_SEND) {
|
|
269
|
-
config_js_1.log.
|
|
269
|
+
config_js_1.log.info(PRE, 'messageSend(%s, %s)', conversationId, JSON.stringify(options));
|
|
270
|
+
void timeout;
|
|
271
|
+
void request_pool_js_1.RequestPool;
|
|
270
272
|
const msg = await this.manager.sendMessage(conversationId, content, options);
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
273
|
+
if (msg.ack >= 0) {
|
|
274
|
+
const cacheManager = await this.manager.getCacheManager();
|
|
275
|
+
await cacheManager.setMessageRawPayload(msg.id.id, msg);
|
|
276
|
+
return msg.id.id;
|
|
277
|
+
}
|
|
278
|
+
else {
|
|
279
|
+
config_js_1.log.error(PRE, 'messageSend failed, id: %s, ack: %s, detail: %s', msg.id.id, msg.ack, JSON.stringify(msg));
|
|
280
|
+
throw (0, whatsapp_error_js_1.default)(error_type_js_1.WA_ERROR_TYPE.ERR_SEND_MSG, `Message send failed, id: ${msg.id.id}, ack: ${msg.ack}, detail: ${JSON.stringify(msg)}`);
|
|
281
|
+
}
|
|
282
|
+
// const messageId = msg.id.id
|
|
283
|
+
// const requestPool = RequestPool.Instance
|
|
284
|
+
// await requestPool.pushRequest(messageId, timeout)
|
|
285
|
+
// return messageId
|
|
275
286
|
}
|
|
276
287
|
exports.messageSend = messageSend;
|
|
277
288
|
async function messageSendText(conversationId, text, options = {}) {
|
|
@@ -358,9 +369,12 @@ async function messageSendChannel(conversationId, channelPayload) {
|
|
|
358
369
|
exports.messageSendChannel = messageSendChannel;
|
|
359
370
|
async function messageSendLocation(conversationId, locationPayload) {
|
|
360
371
|
config_js_1.log.verbose(PRE, 'messageSendLocation(%s, %s)', conversationId, JSON.stringify(locationPayload));
|
|
361
|
-
throw PUPPET.throwUnsupportedError()
|
|
362
|
-
|
|
363
|
-
|
|
372
|
+
// throw PUPPET.throwUnsupportedError()
|
|
373
|
+
const location = new whatsapp_interface_js_1.Location(locationPayload.latitude, locationPayload.longitude, {
|
|
374
|
+
name: locationPayload.name,
|
|
375
|
+
address: locationPayload.address,
|
|
376
|
+
});
|
|
377
|
+
return messageSend.call(this, conversationId, location);
|
|
364
378
|
// can send via whatsapp-web.js, however whatsapp-web itself does not offer location sending, so that the message cannot reach the server
|
|
365
379
|
}
|
|
366
380
|
exports.messageSendLocation = messageSendLocation;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../../src/puppet-mixin/message.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../../src/puppet-mixin/message.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;IAiDzE;;;;OAIG;IACU,YAAY,CAAE,OAAO,EAAE,eAAe;IA6BnD;;;;OAIG;IACU,eAAe,CAAE,OAAO,EAAE,eAAe;
|
|
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;IA6BzC,qBAAqB,CAAE,OAAO,EAAE,eAAe;IAoC/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"}
|
|
@@ -126,12 +126,13 @@ class MessageEventHandler extends whatsapp_base_js_1.default {
|
|
|
126
126
|
const messageId = message.id.id;
|
|
127
127
|
const cacheManager = await this.manager.getCacheManager();
|
|
128
128
|
await cacheManager.setMessageRawPayload(messageId, message);
|
|
129
|
-
|
|
130
|
-
const
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
129
|
+
void miscellaneous_js_1.sleep;
|
|
130
|
+
// const requestPool = RequestPool.Instance
|
|
131
|
+
// const now = Date.now()
|
|
132
|
+
// while (!requestPool.hasRequest(messageId) && Date.now() - now < 400) {
|
|
133
|
+
// await sleep(100)
|
|
134
|
+
// }
|
|
135
|
+
// requestPool.resolveRequest(messageId)
|
|
135
136
|
const receiverId = message.to;
|
|
136
137
|
if (receiverId && (0, miscellaneous_js_1.isContactId)(receiverId)) {
|
|
137
138
|
const contact = await cacheManager.getContactOrRoomRawPayload(receiverId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-event-handler.js","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/message-event-handler.ts"],"names":[],"mappings":"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
|
|
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/dist/esm/src/config.js
CHANGED
|
@@ -45,9 +45,9 @@ export const STRINGS = {
|
|
|
45
45
|
};
|
|
46
46
|
export const LANGUAGE = process.env['LANGUAGE'] || 'zh_CN';
|
|
47
47
|
export const DEFAULT_TIMEOUT = {
|
|
48
|
-
MESSAGE_SEND:
|
|
48
|
+
MESSAGE_SEND: 120 * 1000,
|
|
49
49
|
MESSAGE_SEND_FILE: 15 * 60 * 1000,
|
|
50
|
-
MESSAGE_SEND_TEXT:
|
|
50
|
+
MESSAGE_SEND_TEXT: 120 * 1000,
|
|
51
51
|
TIMEOUT_WAIT_CONNECTED: 10 * 1000,
|
|
52
52
|
};
|
|
53
53
|
export const HISTORY_MESSAGES_DAYS = Number(process.env['HISTORY_MESSAGES_DAYS'] || '3');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/config.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,OAAO,EACL,YAAY,IAAI,mBAAmB,GACpC,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAE/C,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AACrC,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAC1C,OAAO,EACL,OAAO,EACP,WAAW,GAEZ,MAAM,UAAU,CAAA;AAEjB,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,IAAI,OAAO,CAAA;AAE9C,MAAM,WAAW,GAAG,2BAA2B,CAAA;AAC/C,MAAM,GAAG,GAAG,gBAAgB,CAAA;AAE5B,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAG,CAAA,CAAC,qFAAqF;AAE7H,MAAM,CAAC,MAAM,4BAA4B,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC,IAAI,CAAC,CAAA;AAEpG,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CACrC,EAAE,CAAC,OAAO,EAAE,EACZ,UAAU,EACV,iBAAiB,EACjB,MAAM,CACP,CAAA;AAED,UAAU,CAAC,cAAc,CAAC,CAAA;AAE1B,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC,0CAA0C;IAC1C,mBAAmB,CAAC,KAAK;IACzB,mBAAmB,CAAC,KAAK;IACzB,mBAAmB,CAAC,KAAK;IACzB,mBAAmB,CAAC,KAAK;IACzB,mBAAmB,CAAC,QAAQ;IAC5B,mBAAmB,CAAC,OAAO;CAC5B,CAAA;AAED,OAAO,EACL,WAAW,EACX,OAAO,EACP,GAAG,GACJ,CAAA;AAED,MAAM,CAAC,MAAM,OAAO,GAAG;IACrB,KAAK,EAAE;QACL,qBAAqB,EAAE,uCAAuC;QAC9D,aAAa,EAAE;YACb,sBAAsB,EAAE,0DAA0D;YAClF,OAAO,EAAE,YAAY;YACrB,cAAc,EAAE,2BAA2B;YAC3C,wBAAwB,EAAE,gCAAgC;SAC3D;KACF;IACD,KAAK,EAAE;QACL,qBAAqB,EAAE,qBAAqB;QAC5C,aAAa,EAAE;YACb,sBAAsB,EAAE,yBAAyB;YACjD,OAAO,EAAE,OAAO;YAChB,cAAc,EAAE,WAAW;YAC3B,wBAAwB,EAAE,WAAW;SACtC;KACF;CACF,CAAA;AAID,MAAM,CAAC,MAAM,QAAQ,GAAc,OAAO,CAAC,GAAG,CAAC,UAAU,CAA0B,IAAI,OAAO,CAAA;AAE9F,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/config.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,OAAO,EACL,YAAY,IAAI,mBAAmB,GACpC,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAE/C,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AACrC,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAC1C,OAAO,EACL,OAAO,EACP,WAAW,GAEZ,MAAM,UAAU,CAAA;AAEjB,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,IAAI,OAAO,CAAA;AAE9C,MAAM,WAAW,GAAG,2BAA2B,CAAA;AAC/C,MAAM,GAAG,GAAG,gBAAgB,CAAA;AAE5B,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAG,CAAA,CAAC,qFAAqF;AAE7H,MAAM,CAAC,MAAM,4BAA4B,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC,IAAI,CAAC,CAAA;AAEpG,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CACrC,EAAE,CAAC,OAAO,EAAE,EACZ,UAAU,EACV,iBAAiB,EACjB,MAAM,CACP,CAAA;AAED,UAAU,CAAC,cAAc,CAAC,CAAA;AAE1B,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC,0CAA0C;IAC1C,mBAAmB,CAAC,KAAK;IACzB,mBAAmB,CAAC,KAAK;IACzB,mBAAmB,CAAC,KAAK;IACzB,mBAAmB,CAAC,KAAK;IACzB,mBAAmB,CAAC,QAAQ;IAC5B,mBAAmB,CAAC,OAAO;CAC5B,CAAA;AAED,OAAO,EACL,WAAW,EACX,OAAO,EACP,GAAG,GACJ,CAAA;AAED,MAAM,CAAC,MAAM,OAAO,GAAG;IACrB,KAAK,EAAE;QACL,qBAAqB,EAAE,uCAAuC;QAC9D,aAAa,EAAE;YACb,sBAAsB,EAAE,0DAA0D;YAClF,OAAO,EAAE,YAAY;YACrB,cAAc,EAAE,2BAA2B;YAC3C,wBAAwB,EAAE,gCAAgC;SAC3D;KACF;IACD,KAAK,EAAE;QACL,qBAAqB,EAAE,qBAAqB;QAC5C,aAAa,EAAE;YACb,sBAAsB,EAAE,yBAAyB;YACjD,OAAO,EAAE,OAAO;YAChB,cAAc,EAAE,WAAW;YAC3B,wBAAwB,EAAE,WAAW;SACtC;KACF;CACF,CAAA;AAID,MAAM,CAAC,MAAM,QAAQ,GAAc,OAAO,CAAC,GAAG,CAAC,UAAU,CAA0B,IAAI,OAAO,CAAA;AAE9F,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,YAAY,EAAE,GAAG,GAAG,IAAI;IACxB,iBAAiB,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI;IACjC,iBAAiB,EAAE,GAAG,GAAG,IAAI;IAC7B,sBAAsB,EAAE,EAAE,GAAG,IAAI;CAClC,CAAA;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,IAAI,GAAG,CAAC,CAAA;AACxF,MAAM,CAAC,MAAM,oBAAoB,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,IAAI,GAAG,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-json.d.ts","sourceRoot":"","sources":["../../../src/package-json.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAC5C,eAAO,MAAM,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"package-json.d.ts","sourceRoot":"","sources":["../../../src/package-json.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAC5C,eAAO,MAAM,WAAW,EAAE,WA+FlB,CAAA"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export const packageJson = {
|
|
2
2
|
"name": "@juzi/wechaty-puppet-whatsapp",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.45",
|
|
4
4
|
"description": "Wechaty Puppet for WhatsApp",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -69,6 +69,7 @@ export const packageJson = {
|
|
|
69
69
|
"@juzi/wechaty-puppet": "^1.0.15"
|
|
70
70
|
},
|
|
71
71
|
"dependencies": {
|
|
72
|
+
"@juzi/wechaty-puppet-whatsapp": "1.0.44",
|
|
72
73
|
"@juzi/whatsapp-web.js": "^1.30.2",
|
|
73
74
|
"ee-ts": "^1.0.2",
|
|
74
75
|
"flash-store": "^1.0.6",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-json.js","sourceRoot":"","sources":["../../../src/package-json.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,WAAW,GAAgB;IACtC,MAAM,EAAE,+BAA+B;IACvC,SAAS,EAAE,QAAQ;IACnB,aAAa,EAAE,6BAA6B;IAC5C,MAAM,EAAE,QAAQ;IAChB,SAAS,EAAE;QACT,GAAG,EAAE;YACH,QAAQ,EAAE,uBAAuB;YACjC,SAAS,EAAE,uBAAuB;SACnC;KACF;IACD,SAAS,EAAE,yBAAyB;IACpC,SAAS,EAAE;QACT,MAAM,EAAE,MAAM;QACd,KAAK,EAAE,KAAK;KACb;IACD,SAAS,EAAE;QACT,OAAO,EAAE,mBAAmB;QAC5B,MAAM,EAAE,+BAA+B;QACvC,OAAO,EAAE,iCAAiC;QAC1C,OAAO,EAAE,6DAA6D;QACtE,OAAO,EAAE,4FAA4F;QACrG,MAAM,EAAE,qCAAqC;QAC7C,SAAS,EAAE,wBAAwB;QACnC,SAAS,EAAE,gCAAgC;QAC3C,SAAS,EAAE,gFAAgF;QAC3F,MAAM,EAAE,4BAA4B;QACpC,WAAW,EAAE,qCAAqC;QAClD,WAAW,EAAE,sGAAsG;KACpH;IACD,YAAY,EAAE;QACZ,MAAM,EAAE,KAAK;QACb,KAAK,EAAE,oDAAoD;KAC5D;IACD,UAAU,EAAE;QACV,QAAQ;QACR,SAAS;QACT,SAAS;QACT,KAAK;QACL,QAAQ;QACR,KAAK;QACL,QAAQ;QACR,MAAM;KACP;IACD,QAAQ,EAAE,2BAA2B;IACrC,SAAS,EAAE,YAAY;IACvB,MAAM,EAAE;QACN,KAAK,EAAE,mDAAmD;KAC3D;IACD,UAAU,EAAE,mDAAmD;IAC/D,iBAAiB,EAAE;QACjB,uBAAuB,EAAE,OAAO;QAChC,gBAAgB,EAAE,QAAQ;QAC1B,kBAAkB,EAAE,OAAO;QAC3B,sBAAsB,EAAE,UAAU;QAClC,WAAW,EAAE,SAAS;QACtB,aAAa,EAAE,QAAQ;QACvB,iBAAiB,EAAE,SAAS;QAC5B,aAAa,EAAE,QAAQ;QACvB,sBAAsB,EAAE,QAAQ;QAChC,wBAAwB,EAAE,SAAS;QACnC,aAAa,EAAE,QAAQ;QACvB,iBAAiB,EAAE,SAAS;QAC5B,SAAS,EAAE,SAAS;QACpB,QAAQ,EAAE,QAAQ;QAClB,YAAY,EAAE,OAAO;KACtB;IACD,kBAAkB,EAAE;QAClB,sBAAsB,EAAE,SAAS;KAClC;IACD,cAAc,EAAE;QACd,uBAAuB,EAAE,SAAS;QAClC,OAAO,EAAE,QAAQ;QACjB,aAAa,EAAE,QAAQ;QACvB,UAAU,EAAE,SAAS;QACrB,QAAQ,EAAE,SAAS;QACnB,MAAM,EAAE,QAAQ;QAChB,eAAe,EAAE,QAAQ;QACzB,MAAM,EAAE,QAAQ;QAChB,WAAW,EAAE,SAAS;QACtB,MAAM,EAAE,QAAQ;KACjB;IACD,OAAO,EAAE;QACP,MAAM;QACN,OAAO;QACP,MAAM;KACP;IACD,KAAK,EAAE;QACL,gBAAgB,EAAE,KAAK;KACxB;IACD,eAAe,EAAE;QACf,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE,MAAM;KACd;CACK,CAAA"}
|
|
1
|
+
{"version":3,"file":"package-json.js","sourceRoot":"","sources":["../../../src/package-json.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,WAAW,GAAgB;IACtC,MAAM,EAAE,+BAA+B;IACvC,SAAS,EAAE,QAAQ;IACnB,aAAa,EAAE,6BAA6B;IAC5C,MAAM,EAAE,QAAQ;IAChB,SAAS,EAAE;QACT,GAAG,EAAE;YACH,QAAQ,EAAE,uBAAuB;YACjC,SAAS,EAAE,uBAAuB;SACnC;KACF;IACD,SAAS,EAAE,yBAAyB;IACpC,SAAS,EAAE;QACT,MAAM,EAAE,MAAM;QACd,KAAK,EAAE,KAAK;KACb;IACD,SAAS,EAAE;QACT,OAAO,EAAE,mBAAmB;QAC5B,MAAM,EAAE,+BAA+B;QACvC,OAAO,EAAE,iCAAiC;QAC1C,OAAO,EAAE,6DAA6D;QACtE,OAAO,EAAE,4FAA4F;QACrG,MAAM,EAAE,qCAAqC;QAC7C,SAAS,EAAE,wBAAwB;QACnC,SAAS,EAAE,gCAAgC;QAC3C,SAAS,EAAE,gFAAgF;QAC3F,MAAM,EAAE,4BAA4B;QACpC,WAAW,EAAE,qCAAqC;QAClD,WAAW,EAAE,sGAAsG;KACpH;IACD,YAAY,EAAE;QACZ,MAAM,EAAE,KAAK;QACb,KAAK,EAAE,oDAAoD;KAC5D;IACD,UAAU,EAAE;QACV,QAAQ;QACR,SAAS;QACT,SAAS;QACT,KAAK;QACL,QAAQ;QACR,KAAK;QACL,QAAQ;QACR,MAAM;KACP;IACD,QAAQ,EAAE,2BAA2B;IACrC,SAAS,EAAE,YAAY;IACvB,MAAM,EAAE;QACN,KAAK,EAAE,mDAAmD;KAC3D;IACD,UAAU,EAAE,mDAAmD;IAC/D,iBAAiB,EAAE;QACjB,uBAAuB,EAAE,OAAO;QAChC,gBAAgB,EAAE,QAAQ;QAC1B,kBAAkB,EAAE,OAAO;QAC3B,sBAAsB,EAAE,UAAU;QAClC,WAAW,EAAE,SAAS;QACtB,aAAa,EAAE,QAAQ;QACvB,iBAAiB,EAAE,SAAS;QAC5B,aAAa,EAAE,QAAQ;QACvB,sBAAsB,EAAE,QAAQ;QAChC,wBAAwB,EAAE,SAAS;QACnC,aAAa,EAAE,QAAQ;QACvB,iBAAiB,EAAE,SAAS;QAC5B,SAAS,EAAE,SAAS;QACpB,QAAQ,EAAE,QAAQ;QAClB,YAAY,EAAE,OAAO;KACtB;IACD,kBAAkB,EAAE;QAClB,sBAAsB,EAAE,SAAS;KAClC;IACD,cAAc,EAAE;QACd,+BAA+B,EAAE,QAAQ;QACzC,uBAAuB,EAAE,SAAS;QAClC,OAAO,EAAE,QAAQ;QACjB,aAAa,EAAE,QAAQ;QACvB,UAAU,EAAE,SAAS;QACrB,QAAQ,EAAE,SAAS;QACnB,MAAM,EAAE,QAAQ;QAChB,eAAe,EAAE,QAAQ;QACzB,MAAM,EAAE,QAAQ;QAChB,WAAW,EAAE,SAAS;QACtB,MAAM,EAAE,QAAQ;KACjB;IACD,OAAO,EAAE;QACP,MAAM;QACN,OAAO;QACP,MAAM;KACP;IACD,KAAK,EAAE;QACL,gBAAgB,EAAE,KAAK;KACxB;IACD,eAAe,EAAE;QACf,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE,MAAM;KACd;CACK,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../../../src/puppet-mixin/message.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAG9C,OAAO,KAAK,cAAc,MAAM,uBAAuB,CAAA;AACvD,OAAO,KAAK,EACV,cAAc,EACd,sBAAsB,EACtB,kBAAkB,EACnB,MAAM,4BAA4B,CAAA;
|
|
1
|
+
{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../../../src/puppet-mixin/message.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as PUPPET from '@juzi/wechaty-puppet';
|
|
2
2
|
import * as path from 'path';
|
|
3
3
|
import mime from 'mime';
|
|
4
|
-
import { MessageMedia, MessageTypes, ProductMessage, UrlLink, MessageTypes as WhatsAppMessageType, } from '../schema/whatsapp-interface.js';
|
|
4
|
+
import { Location, MessageMedia, MessageTypes, ProductMessage, UrlLink, MessageTypes as WhatsAppMessageType, } from '../schema/whatsapp-interface.js';
|
|
5
5
|
import { WA_ERROR_TYPE } from '../exception/error-type.js';
|
|
6
6
|
import WAError from '../exception/whatsapp-error.js';
|
|
7
7
|
import { DEFAULT_TIMEOUT, FileBox, log, } from '../config.js';
|
|
@@ -229,12 +229,23 @@ export async function messageChannel(messageId) {
|
|
|
229
229
|
return PUPPET.throwUnsupportedError();
|
|
230
230
|
}
|
|
231
231
|
export async function messageSend(conversationId, content, options, timeout = DEFAULT_TIMEOUT.MESSAGE_SEND) {
|
|
232
|
-
log.
|
|
232
|
+
log.info(PRE, 'messageSend(%s, %s)', conversationId, JSON.stringify(options));
|
|
233
|
+
void timeout;
|
|
234
|
+
void RequestPool;
|
|
233
235
|
const msg = await this.manager.sendMessage(conversationId, content, options);
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
236
|
+
if (msg.ack >= 0) {
|
|
237
|
+
const cacheManager = await this.manager.getCacheManager();
|
|
238
|
+
await cacheManager.setMessageRawPayload(msg.id.id, msg);
|
|
239
|
+
return msg.id.id;
|
|
240
|
+
}
|
|
241
|
+
else {
|
|
242
|
+
log.error(PRE, 'messageSend failed, id: %s, ack: %s, detail: %s', msg.id.id, msg.ack, JSON.stringify(msg));
|
|
243
|
+
throw WAError(WA_ERROR_TYPE.ERR_SEND_MSG, `Message send failed, id: ${msg.id.id}, ack: ${msg.ack}, detail: ${JSON.stringify(msg)}`);
|
|
244
|
+
}
|
|
245
|
+
// const messageId = msg.id.id
|
|
246
|
+
// const requestPool = RequestPool.Instance
|
|
247
|
+
// await requestPool.pushRequest(messageId, timeout)
|
|
248
|
+
// return messageId
|
|
238
249
|
}
|
|
239
250
|
export async function messageSendText(conversationId, text, options = {}) {
|
|
240
251
|
log.verbose(PRE, 'messageSendText(%s, %s, %s)', conversationId, text, JSON.stringify(options));
|
|
@@ -314,9 +325,12 @@ export async function messageSendChannel(conversationId, channelPayload) {
|
|
|
314
325
|
}
|
|
315
326
|
export async function messageSendLocation(conversationId, locationPayload) {
|
|
316
327
|
log.verbose(PRE, 'messageSendLocation(%s, %s)', conversationId, JSON.stringify(locationPayload));
|
|
317
|
-
throw PUPPET.throwUnsupportedError()
|
|
318
|
-
|
|
319
|
-
|
|
328
|
+
// throw PUPPET.throwUnsupportedError()
|
|
329
|
+
const location = new Location(locationPayload.latitude, locationPayload.longitude, {
|
|
330
|
+
name: locationPayload.name,
|
|
331
|
+
address: locationPayload.address,
|
|
332
|
+
});
|
|
333
|
+
return messageSend.call(this, conversationId, location);
|
|
320
334
|
// can send via whatsapp-web.js, however whatsapp-web itself does not offer location sending, so that the message cannot reach the server
|
|
321
335
|
}
|
|
322
336
|
export async function messageLocation(messageId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../../src/puppet-mixin/message.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../../src/puppet-mixin/message.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;IAiDzE;;;;OAIG;IACU,YAAY,CAAE,OAAO,EAAE,eAAe;IA6BnD;;;;OAIG;IACU,eAAe,CAAE,OAAO,EAAE,eAAe;
|
|
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;IA6BzC,qBAAqB,CAAE,OAAO,EAAE,eAAe;IAoC/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"}
|
|
@@ -98,12 +98,13 @@ export default class MessageEventHandler extends WhatsAppBase {
|
|
|
98
98
|
const messageId = message.id.id;
|
|
99
99
|
const cacheManager = await this.manager.getCacheManager();
|
|
100
100
|
await cacheManager.setMessageRawPayload(messageId, message);
|
|
101
|
-
|
|
102
|
-
const
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
101
|
+
void sleep;
|
|
102
|
+
// const requestPool = RequestPool.Instance
|
|
103
|
+
// const now = Date.now()
|
|
104
|
+
// while (!requestPool.hasRequest(messageId) && Date.now() - now < 400) {
|
|
105
|
+
// await sleep(100)
|
|
106
|
+
// }
|
|
107
|
+
// requestPool.resolveRequest(messageId)
|
|
107
108
|
const receiverId = message.to;
|
|
108
109
|
if (receiverId && isContactId(receiverId)) {
|
|
109
110
|
const contact = await cacheManager.getContactOrRoomRawPayload(receiverId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-event-handler.js","sourceRoot":"","sources":["../../../../../src/whatsapp/event-handler/message-event-handler.ts"],"names":[],"mappings":"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
|
|
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
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@juzi/wechaty-puppet-whatsapp",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.45",
|
|
4
4
|
"description": "Wechaty Puppet for WhatsApp",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -69,6 +69,7 @@
|
|
|
69
69
|
"@juzi/wechaty-puppet": "^1.0.15"
|
|
70
70
|
},
|
|
71
71
|
"dependencies": {
|
|
72
|
+
"@juzi/wechaty-puppet-whatsapp": "1.0.44",
|
|
72
73
|
"@juzi/whatsapp-web.js": "^1.30.2",
|
|
73
74
|
"ee-ts": "^1.0.2",
|
|
74
75
|
"flash-store": "^1.0.6",
|
package/src/config.ts
CHANGED
|
@@ -74,9 +74,9 @@ type LangCodes = keyof typeof STRINGS
|
|
|
74
74
|
export const LANGUAGE: LangCodes = process.env['LANGUAGE'] as LangCodes | undefined || 'zh_CN'
|
|
75
75
|
|
|
76
76
|
export const DEFAULT_TIMEOUT = {
|
|
77
|
-
MESSAGE_SEND:
|
|
77
|
+
MESSAGE_SEND: 120 * 1000, // should allow long waiting time since connection breaks a log (maybe even no timeout limit?)
|
|
78
78
|
MESSAGE_SEND_FILE: 15 * 60 * 1000,
|
|
79
|
-
MESSAGE_SEND_TEXT:
|
|
79
|
+
MESSAGE_SEND_TEXT: 120 * 1000,
|
|
80
80
|
TIMEOUT_WAIT_CONNECTED: 10 * 1000,
|
|
81
81
|
}
|
|
82
82
|
|
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.45",
|
|
8
8
|
"description": "Wechaty Puppet for WhatsApp",
|
|
9
9
|
"type": "module",
|
|
10
10
|
"exports": {
|
|
@@ -73,6 +73,7 @@ export const packageJson: PackageJson = {
|
|
|
73
73
|
"@juzi/wechaty-puppet": "^1.0.15"
|
|
74
74
|
},
|
|
75
75
|
"dependencies": {
|
|
76
|
+
"@juzi/wechaty-puppet-whatsapp": "1.0.44",
|
|
76
77
|
"@juzi/whatsapp-web.js": "^1.30.2",
|
|
77
78
|
"ee-ts": "^1.0.2",
|
|
78
79
|
"flash-store": "^1.0.6",
|
|
@@ -8,6 +8,7 @@ import type {
|
|
|
8
8
|
MessageSendOptions,
|
|
9
9
|
} from '../schema/whatsapp-type.js'
|
|
10
10
|
import {
|
|
11
|
+
Location,
|
|
11
12
|
MessageMedia,
|
|
12
13
|
MessageTypes,
|
|
13
14
|
ProductMessage,
|
|
@@ -251,13 +252,23 @@ export async function messageChannel (this: PuppetWhatsApp, messageId: string):
|
|
|
251
252
|
}
|
|
252
253
|
|
|
253
254
|
export async function messageSend (this: PuppetWhatsApp, conversationId: string, content: MessageContent, options?: MessageSendOptions, timeout = DEFAULT_TIMEOUT.MESSAGE_SEND): Promise<string> {
|
|
254
|
-
log.
|
|
255
|
+
log.info(PRE, 'messageSend(%s, %s)', conversationId, JSON.stringify(options))
|
|
256
|
+
void timeout
|
|
257
|
+
void RequestPool
|
|
255
258
|
|
|
256
259
|
const msg = await this.manager.sendMessage(conversationId, content, options)
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
260
|
+
if (msg.ack >= 0) {
|
|
261
|
+
const cacheManager = await this.manager.getCacheManager()
|
|
262
|
+
await cacheManager.setMessageRawPayload(msg.id.id, msg)
|
|
263
|
+
return msg.id.id
|
|
264
|
+
} else {
|
|
265
|
+
log.error(PRE, 'messageSend failed, id: %s, ack: %s, detail: %s', msg.id.id, msg.ack, JSON.stringify(msg))
|
|
266
|
+
throw WAError(WA_ERROR_TYPE.ERR_SEND_MSG, `Message send failed, id: ${msg.id.id}, ack: ${msg.ack}, detail: ${JSON.stringify(msg)}`)
|
|
267
|
+
}
|
|
268
|
+
// const messageId = msg.id.id
|
|
269
|
+
// const requestPool = RequestPool.Instance
|
|
270
|
+
// await requestPool.pushRequest(messageId, timeout)
|
|
271
|
+
// return messageId
|
|
261
272
|
}
|
|
262
273
|
|
|
263
274
|
export async function messageSendText (this: PuppetWhatsApp, conversationId: string, text: string, options: PUPPET.types.MessageSendTextOptions = {}): Promise<void | string> {
|
|
@@ -348,10 +359,13 @@ export async function messageSendChannel (this: PuppetWhatsApp, conversationId:
|
|
|
348
359
|
|
|
349
360
|
export async function messageSendLocation (this: PuppetWhatsApp, conversationId: string, locationPayload: PUPPET.payloads.Location): Promise<string> {
|
|
350
361
|
log.verbose(PRE, 'messageSendLocation(%s, %s)', conversationId, JSON.stringify(locationPayload))
|
|
351
|
-
throw PUPPET.throwUnsupportedError()
|
|
362
|
+
// throw PUPPET.throwUnsupportedError()
|
|
352
363
|
|
|
353
|
-
|
|
354
|
-
|
|
364
|
+
const location = new Location(locationPayload.latitude, locationPayload.longitude, {
|
|
365
|
+
name: locationPayload.name,
|
|
366
|
+
address: locationPayload.address,
|
|
367
|
+
})
|
|
368
|
+
return messageSend.call(this, conversationId, location)
|
|
355
369
|
|
|
356
370
|
// can send via whatsapp-web.js, however whatsapp-web itself does not offer location sending, so that the message cannot reach the server
|
|
357
371
|
}
|
|
@@ -123,12 +123,13 @@ export default class MessageEventHandler extends WhatsAppBase {
|
|
|
123
123
|
const messageId = message.id.id
|
|
124
124
|
const cacheManager = await this.manager.getCacheManager()
|
|
125
125
|
await cacheManager.setMessageRawPayload(messageId, message)
|
|
126
|
-
|
|
127
|
-
const
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
126
|
+
void sleep
|
|
127
|
+
// const requestPool = RequestPool.Instance
|
|
128
|
+
// const now = Date.now()
|
|
129
|
+
// while (!requestPool.hasRequest(messageId) && Date.now() - now < 400) {
|
|
130
|
+
// await sleep(100)
|
|
131
|
+
// }
|
|
132
|
+
// requestPool.resolveRequest(messageId)
|
|
132
133
|
const receiverId = message.to
|
|
133
134
|
if (receiverId && isContactId(receiverId)) {
|
|
134
135
|
const contact = await cacheManager.getContactOrRoomRawPayload(receiverId)
|