@juzi/wechaty-puppet-whatsapp 1.0.3 → 1.0.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/src/package-json.js +1 -1
- package/dist/cjs/src/request/request-pool.d.ts +1 -0
- package/dist/cjs/src/request/request-pool.d.ts.map +1 -1
- package/dist/cjs/src/request/request-pool.js +3 -0
- package/dist/cjs/src/request/request-pool.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 +4 -0
- package/dist/cjs/src/whatsapp/event-handler/message-event-handler.js.map +1 -1
- package/dist/esm/src/package-json.js +1 -1
- package/dist/esm/src/request/request-pool.d.ts +1 -0
- package/dist/esm/src/request/request-pool.d.ts.map +1 -1
- package/dist/esm/src/request/request-pool.js +3 -0
- package/dist/esm/src/request/request-pool.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 +5 -1
- package/dist/esm/src/whatsapp/event-handler/message-event-handler.js.map +1 -1
- package/package.json +1 -1
- package/src/package-json.ts +1 -1
- package/src/request/request-pool.ts +4 -0
- package/src/whatsapp/event-handler/message-event-handler.ts +5 -0
|
@@ -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.4",
|
|
7
7
|
"description": "Wechaty Puppet for WhatsApp",
|
|
8
8
|
"type": "module",
|
|
9
9
|
"exports": {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-pool.d.ts","sourceRoot":"","sources":["../../../../src/request/request-pool.ts"],"names":[],"mappings":"AAEA,qBAAa,WAAW;IAEtB,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAa;IACtC,OAAO,CAAC,OAAO,CAAiC;IAChD,OAAO;IAEP,WAAkB,QAAQ,gBAKzB;IAEM,WAAW,CAAE,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;IAgBzC,cAAc,CAAE,EAAE,EAAE,MAAM;IAS1B,SAAS;CAIjB"}
|
|
1
|
+
{"version":3,"file":"request-pool.d.ts","sourceRoot":"","sources":["../../../../src/request/request-pool.ts"],"names":[],"mappings":"AAEA,qBAAa,WAAW;IAEtB,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAa;IACtC,OAAO,CAAC,OAAO,CAAiC;IAChD,OAAO;IAEP,WAAkB,QAAQ,gBAKzB;IAEM,UAAU,CAAE,EAAE,EAAE,MAAM;IAItB,WAAW,CAAE,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;IAgBzC,cAAc,CAAE,EAAE,EAAE,MAAM;IAS1B,SAAS;CAIjB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-pool.js","sourceRoot":"","sources":["../../../../src/request/request-pool.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA0D;AAC1D,uFAAoD;AACpD,MAAa,WAAW;IAEd,MAAM,CAAC,SAAS,CAAc;IAC9B,OAAO,GAA+B,EAAE,CAAA;IAChD,gBAAwB,CAAC;IAElB,MAAM,KAAK,QAAQ;QACxB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,IAAI,CAAC,SAAS,GAAG,IAAI,WAAW,EAAE,CAAA;SACnC;QACD,OAAO,IAAI,CAAC,SAAS,CAAA;IACvB,CAAC;IAEM,WAAW,CAAE,EAAU,EAAE,OAAgB;QAC9C,MAAM,QAAQ,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;gBACrB,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,CAAA;aACtB;YACD,IAAI,CAAC,OAAO,CAAC,EAAE,CAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAC/B,IAAI,OAAO,EAAE;gBACX,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;aAC5B;QACH,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YACZ,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;YACvB,MAAM,IAAA,2BAAO,EAAC,6BAAa,CAAC,mBAAmB,EAAE,oCAAoC,EAAE,EAAE,CAAC,CAAA;QAC5F,CAAC,CAAC,CAAA;QACF,OAAO,QAAQ,CAAA;IACjB,CAAC;IAEM,cAAc,CAAE,EAAU;QAC/B,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAClC,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;YACxC,OAAM;SACP;QACD,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;QAC7B,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IACzB,CAAC;IAEM,SAAS;QACd,IAAI,CAAC,OAAO,GAAG,EAAE,CAAA;IACnB,CAAC;CAEF;
|
|
1
|
+
{"version":3,"file":"request-pool.js","sourceRoot":"","sources":["../../../../src/request/request-pool.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA0D;AAC1D,uFAAoD;AACpD,MAAa,WAAW;IAEd,MAAM,CAAC,SAAS,CAAc;IAC9B,OAAO,GAA+B,EAAE,CAAA;IAChD,gBAAwB,CAAC;IAElB,MAAM,KAAK,QAAQ;QACxB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,IAAI,CAAC,SAAS,GAAG,IAAI,WAAW,EAAE,CAAA;SACnC;QACD,OAAO,IAAI,CAAC,SAAS,CAAA;IACvB,CAAC;IAEM,UAAU,CAAE,EAAU;QAC3B,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAC3B,CAAC;IAEM,WAAW,CAAE,EAAU,EAAE,OAAgB;QAC9C,MAAM,QAAQ,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;gBACrB,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,CAAA;aACtB;YACD,IAAI,CAAC,OAAO,CAAC,EAAE,CAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAC/B,IAAI,OAAO,EAAE;gBACX,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;aAC5B;QACH,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YACZ,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;YACvB,MAAM,IAAA,2BAAO,EAAC,6BAAa,CAAC,mBAAmB,EAAE,oCAAoC,EAAE,EAAE,CAAC,CAAA;QAC5F,CAAC,CAAC,CAAA;QACF,OAAO,QAAQ,CAAA;IACjB,CAAC;IAEM,cAAc,CAAE,EAAU;QAC/B,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAClC,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;YACxC,OAAM;SACP;QACD,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;QAC7B,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IACzB,CAAC;IAEM,SAAS;QACd,IAAI,CAAC,OAAO,GAAG,EAAE,CAAA;IACnB,CAAC;CAEF;AA9CD,kCA8CC"}
|
|
@@ -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;
|
|
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;IAmCzE;;;;OAIG;IACU,YAAY,CAAE,OAAO,EAAE,eAAe;IA0BnD;;;;OAIG;IACU,eAAe,CAAE,OAAO,EAAE,eAAe;IAgBzC,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;IAc/G;;OAEG;IACU,iBAAiB,CAAE,OAAO,EAAE,eAAe;IAiBjD,2BAA2B,CAAE,SAAS,EAAE,MAAM;CAItD"}
|
|
@@ -82,6 +82,10 @@ class MessageEventHandler extends whatsapp_base_js_1.default {
|
|
|
82
82
|
const cacheManager = await this.manager.getCacheManager();
|
|
83
83
|
await cacheManager.setMessageRawPayload(messageId, message);
|
|
84
84
|
const requestPool = request_pool_js_1.RequestPool.Instance;
|
|
85
|
+
const now = Date.now();
|
|
86
|
+
while (!requestPool.hasRequest(messageId) && Date.now() - now < 400) {
|
|
87
|
+
await (0, miscellaneous_js_1.sleep)(100);
|
|
88
|
+
}
|
|
85
89
|
requestPool.resolveRequest(messageId);
|
|
86
90
|
this.emit('message', { messageId });
|
|
87
91
|
}
|
|
@@ -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,
|
|
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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-pool.d.ts","sourceRoot":"","sources":["../../../../src/request/request-pool.ts"],"names":[],"mappings":"AAEA,qBAAa,WAAW;IAEtB,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAa;IACtC,OAAO,CAAC,OAAO,CAAiC;IAChD,OAAO;IAEP,WAAkB,QAAQ,gBAKzB;IAEM,WAAW,CAAE,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;IAgBzC,cAAc,CAAE,EAAE,EAAE,MAAM;IAS1B,SAAS;CAIjB"}
|
|
1
|
+
{"version":3,"file":"request-pool.d.ts","sourceRoot":"","sources":["../../../../src/request/request-pool.ts"],"names":[],"mappings":"AAEA,qBAAa,WAAW;IAEtB,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAa;IACtC,OAAO,CAAC,OAAO,CAAiC;IAChD,OAAO;IAEP,WAAkB,QAAQ,gBAKzB;IAEM,UAAU,CAAE,EAAE,EAAE,MAAM;IAItB,WAAW,CAAE,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;IAgBzC,cAAc,CAAE,EAAE,EAAE,MAAM;IAS1B,SAAS;CAIjB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-pool.js","sourceRoot":"","sources":["../../../../src/request/request-pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAC1D,OAAO,OAAO,MAAM,gCAAgC,CAAA;AACpD,MAAM,OAAO,WAAW;IAEd,MAAM,CAAC,SAAS,CAAc;IAC9B,OAAO,GAA+B,EAAE,CAAA;IAChD,gBAAwB,CAAC;IAElB,MAAM,KAAK,QAAQ;QACxB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,IAAI,CAAC,SAAS,GAAG,IAAI,WAAW,EAAE,CAAA;SACnC;QACD,OAAO,IAAI,CAAC,SAAS,CAAA;IACvB,CAAC;IAEM,WAAW,CAAE,EAAU,EAAE,OAAgB;QAC9C,MAAM,QAAQ,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;gBACrB,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,CAAA;aACtB;YACD,IAAI,CAAC,OAAO,CAAC,EAAE,CAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAC/B,IAAI,OAAO,EAAE;gBACX,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;aAC5B;QACH,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YACZ,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;YACvB,MAAM,OAAO,CAAC,aAAa,CAAC,mBAAmB,EAAE,oCAAoC,EAAE,EAAE,CAAC,CAAA;QAC5F,CAAC,CAAC,CAAA;QACF,OAAO,QAAQ,CAAA;IACjB,CAAC;IAEM,cAAc,CAAE,EAAU;QAC/B,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAClC,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;YACxC,OAAM;SACP;QACD,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;QAC7B,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IACzB,CAAC;IAEM,SAAS;QACd,IAAI,CAAC,OAAO,GAAG,EAAE,CAAA;IACnB,CAAC;CAEF"}
|
|
1
|
+
{"version":3,"file":"request-pool.js","sourceRoot":"","sources":["../../../../src/request/request-pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAC1D,OAAO,OAAO,MAAM,gCAAgC,CAAA;AACpD,MAAM,OAAO,WAAW;IAEd,MAAM,CAAC,SAAS,CAAc;IAC9B,OAAO,GAA+B,EAAE,CAAA;IAChD,gBAAwB,CAAC;IAElB,MAAM,KAAK,QAAQ;QACxB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,IAAI,CAAC,SAAS,GAAG,IAAI,WAAW,EAAE,CAAA;SACnC;QACD,OAAO,IAAI,CAAC,SAAS,CAAA;IACvB,CAAC;IAEM,UAAU,CAAE,EAAU;QAC3B,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAC3B,CAAC;IAEM,WAAW,CAAE,EAAU,EAAE,OAAgB;QAC9C,MAAM,QAAQ,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;gBACrB,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,CAAA;aACtB;YACD,IAAI,CAAC,OAAO,CAAC,EAAE,CAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAC/B,IAAI,OAAO,EAAE;gBACX,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;aAC5B;QACH,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YACZ,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;YACvB,MAAM,OAAO,CAAC,aAAa,CAAC,mBAAmB,EAAE,oCAAoC,EAAE,EAAE,CAAC,CAAA;QAC5F,CAAC,CAAC,CAAA;QACF,OAAO,QAAQ,CAAA;IACjB,CAAC;IAEM,cAAc,CAAE,EAAU;QAC/B,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAClC,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;YACxC,OAAM;SACP;QACD,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;QAC7B,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IACzB,CAAC;IAEM,SAAS;QACd,IAAI,CAAC,OAAO,GAAG,EAAE,CAAA;IACnB,CAAC;CAEF"}
|
|
@@ -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;
|
|
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;IAmCzE;;;;OAIG;IACU,YAAY,CAAE,OAAO,EAAE,eAAe;IA0BnD;;;;OAIG;IACU,eAAe,CAAE,OAAO,EAAE,eAAe;IAgBzC,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;IAc/G;;OAEG;IACU,iBAAiB,CAAE,OAAO,EAAE,eAAe;IAiBjD,2BAA2B,CAAE,SAAS,EAAE,MAAM;CAItD"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { MessageMediaTypeList, log, } from '../../config.js';
|
|
2
2
|
import { MessageTypes as WhatsAppMessageType, MessageAck, } from '../../schema/whatsapp-interface.js';
|
|
3
3
|
import WhatsAppBase from '../whatsapp-base.js';
|
|
4
|
-
import { isContactId, isInviteLink, getInviteCode, } from '../../helper/miscellaneous.js';
|
|
4
|
+
import { isContactId, isInviteLink, getInviteCode, sleep, } from '../../helper/miscellaneous.js';
|
|
5
5
|
import { RequestPool } from '../../request/request-pool.js';
|
|
6
6
|
const PRE = 'MessageEventHandler';
|
|
7
7
|
export default class MessageEventHandler extends WhatsAppBase {
|
|
@@ -77,6 +77,10 @@ export default class MessageEventHandler extends WhatsAppBase {
|
|
|
77
77
|
const cacheManager = await this.manager.getCacheManager();
|
|
78
78
|
await cacheManager.setMessageRawPayload(messageId, message);
|
|
79
79
|
const requestPool = RequestPool.Instance;
|
|
80
|
+
const now = Date.now();
|
|
81
|
+
while (!requestPool.hasRequest(messageId) && Date.now() - now < 400) {
|
|
82
|
+
await sleep(100);
|
|
83
|
+
}
|
|
80
84
|
requestPool.resolveRequest(messageId);
|
|
81
85
|
this.emit('message', { messageId });
|
|
82
86
|
}
|
|
@@ -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,
|
|
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,SAAS,GAAG,OAAO,CAAC,EAAE,CAAC,EAAE,CAAA;QAC/B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAA;QACzD,MAAM,cAAc,GAAG,MAAM,YAAY,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAA;QACzE,IAAI,cAAc,EAAE;YAClB,OAAM;SACP;QACD,MAAM,YAAY,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;QAE3D,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAA;QAC9B,IAAI,SAAS,IAAI,WAAW,CAAC,SAAS,CAAC,EAAE;YACvC,MAAM,UAAU,GAAG,MAAM,YAAY,CAAC,gBAAgB,EAAE,CAAA;YACxD,MAAM,SAAS,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,CAAA;YACxD,IAAI,SAAS,EAAE;gBACb,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC,CAAA;aACrD;SACF;QAED,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,+BAA+B,CAAC,OAAO,CAAC,CAAA;QAC3E,IAAI,eAAe,EAAE;YACnB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,CAAC,CAAA;SACpC;IACH,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,YAAY,CAAE,OAAwB;QACjD,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,gBAAgB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QAE1D;;;;;;;;WAQG;QACH,IAAI,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE;YACrB,IAAI,oBAAoB,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBAC/C,IAAI,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,KAAK,UAAU,CAAC,UAAU,EAAE;oBAC7D,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAA;iBAC1C;gBACD,IAAI,OAAO,CAAC,GAAG,KAAK,UAAU,CAAC,UAAU,IAAI,OAAO,CAAC,GAAG,KAAK,UAAU,CAAC,QAAQ,EAAE;oBAChF,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAA;iBAC1C;aACF;iBAAM;gBACL,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAA;aAC1C;SACF;IACH,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,eAAe,CAAE,OAAwB;QACpD,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,mBAAmB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QAC7D,IAAI,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE;YACrB,MAAM,SAAS,GAAG,OAAO,CAAC,EAAE,CAAC,EAAE,CAAA;YAC/B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAA;YACzD,MAAM,YAAY,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;YAC3D,MAAM,WAAW,GAAG,WAAW,CAAC,QAAQ,CAAA;YACxC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YACtB,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,GAAG,EAAE;gBACnE,MAAM,KAAK,CAAC,GAAG,CAAC,CAAA;aACjB;YACD,WAAW,CAAC,cAAc,CAAC,SAAS,CAAC,CAAA;YACrC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,CAAC,CAAA;SACpC;IACH,CAAC;IAEM,KAAK,CAAC,qBAAqB,CAAE,OAAwB;QAC1D,MAAM,SAAS,GAAG,OAAO,CAAC,EAAE,CAAC,EAAE,CAAA;QAC/B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAA;QACzD,MAAM,cAAc,GAAG,MAAM,YAAY,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAA;QACzE,MAAM,YAAY,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA,CAAC,yCAAyC;QACrG;;;;;;WAMG;QACH,IAAI,CAAC,cAAc,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,cAAc,CAAC,GAAG,KAAK,UAAU,CAAC,UAAU,CAAC,EAAE;YACpH,MAAM,WAAW,GAAG,WAAW,CAAC,QAAQ,CAAA;YACxC,WAAW,CAAC,cAAc,CAAC,SAAS,CAAC,CAAA;YACrC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,CAAC,CAAA;SACpC;IACH,CAAC;IAEM,KAAK,CAAC,+BAA+B,CAAE,OAAiD;QAC7F,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAA;QACzD,IAAI,OAAO,CAAC,IAAI,KAAK,mBAAmB,CAAC,YAAY,EAAE;YACrD,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAA;YAC/C,IAAI,UAAU,EAAE;gBACd,MAAM,qBAAqB,GAAoC;oBAC7D,gBAAgB,EAAE,UAAU;iBAC7B,CAAA;gBACD,MAAM,YAAY,CAAC,2BAA2B,CAAC,UAAU,EAAE,EAAE,UAAU,EAAE,CAAC,CAAA;gBAC1E,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,qBAAqB,CAAC,CAAA;aAChD;iBAAM;gBACL,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,4DAA4D,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;aACrG;YACD,OAAO,KAAK,CAAA;SACb;QAED,uEAAuE;QACvE,IAAI,OAAO,CAAC,IAAI,KAAK,mBAAmB,CAAC,IAAI,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,IAAI,CAAC,EAAE;YACpI,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,IAAI,CAAC,CAAA;YACxD,IAAI,UAAU,EAAE;gBACd,MAAM,qBAAqB,GAAoC;oBAC7D,gBAAgB,EAAE,UAAU;iBAC7B,CAAA;gBACD,MAAM,YAAY,CAAC,2BAA2B,CAAC,UAAU,EAAE,EAAE,UAAU,EAAE,CAAC,CAAA;gBAC1E,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,qBAAqB,CAAC,CAAA;gBAC/C,OAAO,KAAK,CAAA;aACb;SACF;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,KAAK,CAAC,cAAc,CAAE,GAAG,IAAW;QACzC,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,kBAAkB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC3D,CAAC;IAEM,KAAK,CAAC,eAAe,CAAE,OAAwB;QACpD,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,mBAAmB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QAC7D,MAAM,IAAI,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAA;QAC9C,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;YACrB,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,uCAAuC,OAAO,CAAC,EAAE,CAAC,EAAE,WAAW,OAAO,CAAC,IAAI,kBAAkB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;SACtI;IACH,CAAC;IAEM,KAAK,CAAC,0BAA0B,CAAE,OAAwB;QAC/D,IAAI,OAAO,CAAC,IAAI,KAAK,mBAAmB,CAAC,KAAK,EAAE;YAC9C,MAAM,SAAS,GAAG,OAAO,CAAC,EAAE,CAAC,EAAE,CAAA;YAC/B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAA;YACzD,MAAM,cAAc,GAAG,MAAM,YAAY,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAA;YACzE,IAAI,cAAc,EAAE;gBAClB,OAAO,CAAC,IAAI,GAAG,cAAc,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAA;gBAClD,MAAM,YAAY,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;gBAC3D,OAAM;aACP;YACD,MAAM,YAAY,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;SAC5D;IACH,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,uBAAuB,CAAE,OAAwB,EAAE,UAA+C;QAC7G,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,mCAAmC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,kBAAkB,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;QACzH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAA;QACzD,MAAM,SAAS,GAAG,OAAO,CAAC,EAAE,CAAC,EAAE,CAAA;QAC/B,IAAI,UAAU,EAAE;YACd,MAAM,iBAAiB,GAAG,UAAU,CAAC,EAAE,CAAC,EAAE,CAAA;YAC1C,MAAM,iBAAiB,GAAG,IAAI,CAAC,2BAA2B,CAAC,iBAAiB,CAAC,CAAA;YAC7E,OAAO,CAAC,IAAI,GAAG,iBAAiB,CAAA;YAChC,MAAM,YAAY,CAAC,oBAAoB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAA;SACvE;QACD,MAAM,YAAY,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;QAC3D,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,CAAC,CAAA;IACrC,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,iBAAiB,CAAE,OAAwB;QACtD,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,qBAAqB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QAC/D;;;;;;;;;;;;UAYE;IACJ,CAAC;IAEM,2BAA2B,CAAE,SAAiB;QACnD,OAAO,GAAG,SAAS,UAAU,CAAA;IAC/B,CAAC;CAEF"}
|
package/package.json
CHANGED
package/src/package-json.ts
CHANGED
|
@@ -13,6 +13,10 @@ export class RequestPool {
|
|
|
13
13
|
return this._instance
|
|
14
14
|
}
|
|
15
15
|
|
|
16
|
+
public hasRequest (id: string) {
|
|
17
|
+
return !!this.poolMap[id]
|
|
18
|
+
}
|
|
19
|
+
|
|
16
20
|
public pushRequest (id: string, timeout?: number) {
|
|
17
21
|
const callback = new Promise<void>((resolve, reject) => {
|
|
18
22
|
if (!this.poolMap[id]) {
|
|
@@ -17,6 +17,7 @@ import {
|
|
|
17
17
|
isContactId,
|
|
18
18
|
isInviteLink,
|
|
19
19
|
getInviteCode,
|
|
20
|
+
sleep,
|
|
20
21
|
} from '../../helper/miscellaneous.js'
|
|
21
22
|
import { RequestPool } from '../../request/request-pool.js'
|
|
22
23
|
|
|
@@ -102,6 +103,10 @@ export default class MessageEventHandler extends WhatsAppBase {
|
|
|
102
103
|
const cacheManager = await this.manager.getCacheManager()
|
|
103
104
|
await cacheManager.setMessageRawPayload(messageId, message)
|
|
104
105
|
const requestPool = RequestPool.Instance
|
|
106
|
+
const now = Date.now()
|
|
107
|
+
while (!requestPool.hasRequest(messageId) && Date.now() - now < 400) {
|
|
108
|
+
await sleep(100)
|
|
109
|
+
}
|
|
105
110
|
requestPool.resolveRequest(messageId)
|
|
106
111
|
this.emit('message', { messageId })
|
|
107
112
|
}
|