@juzi/wechaty-puppet-service 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/client/puppet-service.d.ts +3 -4
- package/dist/cjs/src/client/puppet-service.d.ts.map +1 -1
- package/dist/cjs/src/client/puppet-service.js +80 -198
- package/dist/cjs/src/client/puppet-service.js.map +1 -1
- package/dist/cjs/src/package-json.d.ts.map +1 -1
- package/dist/cjs/src/package-json.js +4 -3
- package/dist/cjs/src/package-json.js.map +1 -1
- package/dist/cjs/src/server/puppet-implementation.d.ts.map +1 -1
- package/dist/cjs/src/server/puppet-implementation.js +41 -127
- package/dist/cjs/src/server/puppet-implementation.js.map +1 -1
- package/dist/cjs/src/utils/pb-payload-helper.d.ts +5 -2
- package/dist/cjs/src/utils/pb-payload-helper.d.ts.map +1 -1
- package/dist/cjs/src/utils/pb-payload-helper.js +146 -1
- package/dist/cjs/src/utils/pb-payload-helper.js.map +1 -1
- package/dist/esm/src/client/puppet-service.d.ts +3 -4
- package/dist/esm/src/client/puppet-service.d.ts.map +1 -1
- package/dist/esm/src/client/puppet-service.js +78 -196
- package/dist/esm/src/client/puppet-service.js.map +1 -1
- package/dist/esm/src/package-json.d.ts.map +1 -1
- package/dist/esm/src/package-json.js +4 -3
- package/dist/esm/src/package-json.js.map +1 -1
- package/dist/esm/src/server/puppet-implementation.d.ts.map +1 -1
- package/dist/esm/src/server/puppet-implementation.js +40 -126
- package/dist/esm/src/server/puppet-implementation.js.map +1 -1
- package/dist/esm/src/utils/pb-payload-helper.d.ts +5 -2
- package/dist/esm/src/utils/pb-payload-helper.d.ts.map +1 -1
- package/dist/esm/src/utils/pb-payload-helper.js +120 -0
- package/dist/esm/src/utils/pb-payload-helper.js.map +1 -1
- package/package.json +4 -3
- package/src/client/puppet-service.ts +97 -214
- package/src/package-json.ts +4 -3
- package/src/server/puppet-implementation.ts +50 -144
- package/src/utils/pb-payload-helper.ts +119 -2
- package/dist/cjs/src/deprecated/chunk-pb.d.ts +0 -15
- package/dist/cjs/src/deprecated/chunk-pb.d.ts.map +0 -1
- package/dist/cjs/src/deprecated/chunk-pb.js +0 -60
- package/dist/cjs/src/deprecated/chunk-pb.js.map +0 -1
- package/dist/cjs/src/deprecated/chunk-pb.spec.d.ts +0 -3
- package/dist/cjs/src/deprecated/chunk-pb.spec.d.ts.map +0 -1
- package/dist/cjs/src/deprecated/chunk-pb.spec.js +0 -144
- package/dist/cjs/src/deprecated/chunk-pb.spec.js.map +0 -1
- package/dist/cjs/src/deprecated/conversation-id-file-box.d.ts +0 -21
- package/dist/cjs/src/deprecated/conversation-id-file-box.d.ts.map +0 -1
- package/dist/cjs/src/deprecated/conversation-id-file-box.js +0 -43
- package/dist/cjs/src/deprecated/conversation-id-file-box.js.map +0 -1
- package/dist/cjs/src/deprecated/conversation-id-file-box.spec.d.ts +0 -3
- package/dist/cjs/src/deprecated/conversation-id-file-box.spec.d.ts.map +0 -1
- package/dist/cjs/src/deprecated/conversation-id-file-box.spec.js +0 -94
- package/dist/cjs/src/deprecated/conversation-id-file-box.spec.js.map +0 -1
- package/dist/cjs/src/deprecated/file-box-chunk.d.ts +0 -14
- package/dist/cjs/src/deprecated/file-box-chunk.d.ts.map +0 -1
- package/dist/cjs/src/deprecated/file-box-chunk.js +0 -67
- package/dist/cjs/src/deprecated/file-box-chunk.js.map +0 -1
- package/dist/cjs/src/deprecated/file-box-chunk.spec.d.ts +0 -3
- package/dist/cjs/src/deprecated/file-box-chunk.spec.d.ts.map +0 -1
- package/dist/cjs/src/deprecated/file-box-chunk.spec.js +0 -134
- package/dist/cjs/src/deprecated/file-box-chunk.spec.js.map +0 -1
- package/dist/cjs/src/deprecated/file-box-pb.d.ts +0 -15
- package/dist/cjs/src/deprecated/file-box-pb.d.ts.map +0 -1
- package/dist/cjs/src/deprecated/file-box-pb.js +0 -26
- package/dist/cjs/src/deprecated/file-box-pb.js.map +0 -1
- package/dist/cjs/src/deprecated/file-box-pb.spec.d.ts +0 -3
- package/dist/cjs/src/deprecated/file-box-pb.spec.d.ts.map +0 -1
- package/dist/cjs/src/deprecated/file-box-pb.spec.js +0 -18
- package/dist/cjs/src/deprecated/file-box-pb.spec.js.map +0 -1
- package/dist/cjs/src/deprecated/file-box-pb.type.d.ts +0 -15
- package/dist/cjs/src/deprecated/file-box-pb.type.d.ts.map +0 -1
- package/dist/cjs/src/deprecated/file-box-pb.type.js +0 -3
- package/dist/cjs/src/deprecated/file-box-pb.type.js.map +0 -1
- package/dist/cjs/src/deprecated/mod.d.ts +0 -3
- package/dist/cjs/src/deprecated/mod.d.ts.map +0 -1
- package/dist/cjs/src/deprecated/mod.js +0 -10
- package/dist/cjs/src/deprecated/mod.js.map +0 -1
- package/dist/cjs/src/deprecated/next-data.d.ts +0 -7
- package/dist/cjs/src/deprecated/next-data.d.ts.map +0 -1
- package/dist/cjs/src/deprecated/next-data.js +0 -26
- package/dist/cjs/src/deprecated/next-data.js.map +0 -1
- package/dist/cjs/src/deprecated/serialize-file-box.d.ts +0 -6
- package/dist/cjs/src/deprecated/serialize-file-box.d.ts.map +0 -1
- package/dist/cjs/src/deprecated/serialize-file-box.js +0 -22
- package/dist/cjs/src/deprecated/serialize-file-box.js.map +0 -1
- package/dist/esm/src/deprecated/chunk-pb.d.ts +0 -15
- package/dist/esm/src/deprecated/chunk-pb.d.ts.map +0 -1
- package/dist/esm/src/deprecated/chunk-pb.js +0 -56
- package/dist/esm/src/deprecated/chunk-pb.js.map +0 -1
- package/dist/esm/src/deprecated/chunk-pb.spec.d.ts +0 -3
- package/dist/esm/src/deprecated/chunk-pb.spec.d.ts.map +0 -1
- package/dist/esm/src/deprecated/chunk-pb.spec.js +0 -142
- package/dist/esm/src/deprecated/chunk-pb.spec.js.map +0 -1
- package/dist/esm/src/deprecated/conversation-id-file-box.d.ts +0 -21
- package/dist/esm/src/deprecated/conversation-id-file-box.d.ts.map +0 -1
- package/dist/esm/src/deprecated/conversation-id-file-box.js +0 -39
- package/dist/esm/src/deprecated/conversation-id-file-box.js.map +0 -1
- package/dist/esm/src/deprecated/conversation-id-file-box.spec.d.ts +0 -3
- package/dist/esm/src/deprecated/conversation-id-file-box.spec.d.ts.map +0 -1
- package/dist/esm/src/deprecated/conversation-id-file-box.spec.js +0 -92
- package/dist/esm/src/deprecated/conversation-id-file-box.spec.js.map +0 -1
- package/dist/esm/src/deprecated/file-box-chunk.d.ts +0 -14
- package/dist/esm/src/deprecated/file-box-chunk.d.ts.map +0 -1
- package/dist/esm/src/deprecated/file-box-chunk.js +0 -63
- package/dist/esm/src/deprecated/file-box-chunk.js.map +0 -1
- package/dist/esm/src/deprecated/file-box-chunk.spec.d.ts +0 -3
- package/dist/esm/src/deprecated/file-box-chunk.spec.d.ts.map +0 -1
- package/dist/esm/src/deprecated/file-box-chunk.spec.js +0 -132
- package/dist/esm/src/deprecated/file-box-chunk.spec.js.map +0 -1
- package/dist/esm/src/deprecated/file-box-pb.d.ts +0 -15
- package/dist/esm/src/deprecated/file-box-pb.d.ts.map +0 -1
- package/dist/esm/src/deprecated/file-box-pb.js +0 -22
- package/dist/esm/src/deprecated/file-box-pb.js.map +0 -1
- package/dist/esm/src/deprecated/file-box-pb.spec.d.ts +0 -3
- package/dist/esm/src/deprecated/file-box-pb.spec.d.ts.map +0 -1
- package/dist/esm/src/deprecated/file-box-pb.spec.js +0 -16
- package/dist/esm/src/deprecated/file-box-pb.spec.js.map +0 -1
- package/dist/esm/src/deprecated/file-box-pb.type.d.ts +0 -15
- package/dist/esm/src/deprecated/file-box-pb.type.d.ts.map +0 -1
- package/dist/esm/src/deprecated/file-box-pb.type.js +0 -2
- package/dist/esm/src/deprecated/file-box-pb.type.js.map +0 -1
- package/dist/esm/src/deprecated/mod.d.ts +0 -3
- package/dist/esm/src/deprecated/mod.d.ts.map +0 -1
- package/dist/esm/src/deprecated/mod.js +0 -3
- package/dist/esm/src/deprecated/mod.js.map +0 -1
- package/dist/esm/src/deprecated/next-data.d.ts +0 -7
- package/dist/esm/src/deprecated/next-data.d.ts.map +0 -1
- package/dist/esm/src/deprecated/next-data.js +0 -23
- package/dist/esm/src/deprecated/next-data.js.map +0 -1
- package/dist/esm/src/deprecated/serialize-file-box.d.ts +0 -6
- package/dist/esm/src/deprecated/serialize-file-box.d.ts.map +0 -1
- package/dist/esm/src/deprecated/serialize-file-box.js +0 -18
- package/dist/esm/src/deprecated/serialize-file-box.js.map +0 -1
- package/src/deprecated/chunk-pb.spec.ts +0 -210
- package/src/deprecated/chunk-pb.ts +0 -75
- package/src/deprecated/conversation-id-file-box.spec.ts +0 -131
- package/src/deprecated/conversation-id-file-box.ts +0 -72
- package/src/deprecated/file-box-chunk.spec.ts +0 -184
- package/src/deprecated/file-box-chunk.ts +0 -87
- package/src/deprecated/file-box-pb.spec.ts +0 -31
- package/src/deprecated/file-box-pb.ts +0 -41
- package/src/deprecated/file-box-pb.type.ts +0 -16
- package/src/deprecated/mod.ts +0 -8
- package/src/deprecated/next-data.ts +0 -35
- package/src/deprecated/serialize-file-box.ts +0 -24
|
@@ -6,6 +6,7 @@ import { Ducks } from 'ducks';
|
|
|
6
6
|
import type { Store } from 'redux';
|
|
7
7
|
import { GrpcManager } from './grpc-manager.js';
|
|
8
8
|
import { PayloadStore } from './payload-store.js';
|
|
9
|
+
import type { MessageBroadcastTargets, MessageBroadcastTargetType } from '@juzi/wechaty-puppet/dist/esm/src/schemas/message.js';
|
|
9
10
|
export type PuppetServiceOptions = PUPPET.PuppetOptions & {
|
|
10
11
|
authority?: string;
|
|
11
12
|
tls?: {
|
|
@@ -113,6 +114,8 @@ declare class PuppetService extends PUPPET.Puppet {
|
|
|
113
114
|
messageSendContact(conversationId: string, contactId: string): Promise<void | string>;
|
|
114
115
|
messageSendUrl(conversationId: string, urlLinkPayload: PUPPET.payloads.UrlLink): Promise<void | string>;
|
|
115
116
|
messageUrl(messageId: string): Promise<PUPPET.payloads.UrlLink>;
|
|
117
|
+
getMessageBroadcastTarget(): Promise<MessageBroadcastTargets>;
|
|
118
|
+
createMessageBroadcast(targets: string[], type: MessageBroadcastTargetType, content: PUPPET.payloads.Post): Promise<string | void>;
|
|
116
119
|
/**
|
|
117
120
|
*
|
|
118
121
|
* Room
|
|
@@ -180,10 +183,6 @@ declare class PuppetService extends PUPPET.Puppet {
|
|
|
180
183
|
postRawPayloadParser(payload: PUPPET.payloads.Post): Promise<PUPPET.payloads.Post>;
|
|
181
184
|
tap(postId: string, type?: PUPPET.types.Tap, tap?: boolean): Promise<boolean | void>;
|
|
182
185
|
momentVisibleList(): Promise<string[]>;
|
|
183
|
-
/**
|
|
184
|
-
* @deprecated Will be removed in v2.0
|
|
185
|
-
*/
|
|
186
|
-
private messageSendFileStream;
|
|
187
186
|
healthCheckInterval?: NodeJS.Timer;
|
|
188
187
|
startHealthCheck(): void;
|
|
189
188
|
stopHealthCheck(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"puppet-service.d.ts","sourceRoot":"","sources":["../../../../src/client/puppet-service.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"puppet-service.d.ts","sourceRoot":"","sources":["../../../../src/client/puppet-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -52,13 +52,8 @@ const wechaty_grpc_1 = require("@juzi/wechaty-grpc");
|
|
|
52
52
|
const wechaty_redux_1 = require("@juzi/wechaty-redux");
|
|
53
53
|
const ducks_1 = require("ducks");
|
|
54
54
|
// import type { Subscription } from 'rxjs'
|
|
55
|
-
/**
|
|
56
|
-
* Deprecated. Will be removed after Dec 31, 2022
|
|
57
|
-
*/
|
|
58
|
-
const mod_js_1 = require("../deprecated/mod.js");
|
|
59
|
-
const serialize_file_box_js_1 = require("../deprecated/serialize-file-box.js");
|
|
60
55
|
const timestamp_js_1 = require("../pure-functions/timestamp.js");
|
|
61
|
-
const
|
|
56
|
+
const mod_js_1 = require("../file-box-helper/mod.js");
|
|
62
57
|
const config_js_1 = require("../config.js");
|
|
63
58
|
const event_type_rev_js_1 = require("../event-type-rev.js");
|
|
64
59
|
const package_json_js_1 = require("../package-json.js");
|
|
@@ -99,7 +94,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
99
94
|
this._ducks = new ducks_1.Ducks({ puppet: wechaty_redux_1.Duck });
|
|
100
95
|
this._store = this._ducks.configureStore();
|
|
101
96
|
this._cleanupCallbackList = [];
|
|
102
|
-
this.FileBoxUuid = (0,
|
|
97
|
+
this.FileBoxUuid = (0, mod_js_1.uuidifyFileBoxGrpc)(() => this.grpcManager.client);
|
|
103
98
|
}
|
|
104
99
|
async serializeFileBox(fileBox) {
|
|
105
100
|
/**
|
|
@@ -109,7 +104,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
109
104
|
* then it need to be convert to type `Uuid`
|
|
110
105
|
* before serialized by `fileBox.toString()`
|
|
111
106
|
*/
|
|
112
|
-
const normalizedFileBox = await (0,
|
|
107
|
+
const normalizedFileBox = await (0, mod_js_1.normalizeFileBoxUuid)(this.FileBoxUuid)(fileBox);
|
|
113
108
|
return JSON.stringify(normalizedFileBox);
|
|
114
109
|
}
|
|
115
110
|
name() {
|
|
@@ -468,12 +463,6 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
468
463
|
request.setId(contactId);
|
|
469
464
|
const serializedFileBox = await this.serializeFileBox(fileBox);
|
|
470
465
|
request.setFileBox(serializedFileBox);
|
|
471
|
-
{
|
|
472
|
-
// DEPRECATED, will be removed after Dec 31, 2022
|
|
473
|
-
const fileboxWrapper = new wechaty_grpc_1.StringValue();
|
|
474
|
-
fileboxWrapper.setValue(await (0, serialize_file_box_js_1.serializeFileBox)(fileBox));
|
|
475
|
-
request.setFileboxStringValueDeprecated(fileboxWrapper);
|
|
476
|
-
}
|
|
477
466
|
await util_1.default.promisify(this.grpcManager.client.contactAvatar
|
|
478
467
|
.bind(this.grpcManager.client))(request);
|
|
479
468
|
return;
|
|
@@ -559,58 +548,58 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
559
548
|
if (payload.id) {
|
|
560
549
|
throw new Error('cannot modify contactId');
|
|
561
550
|
}
|
|
562
|
-
if (payload.gender) {
|
|
551
|
+
if (typeof payload.gender !== 'undefined') {
|
|
563
552
|
request.setGender(payload.gender);
|
|
564
553
|
}
|
|
565
|
-
if (payload.type) {
|
|
554
|
+
if (typeof payload.type !== 'undefined') {
|
|
566
555
|
request.setType(payload.type);
|
|
567
556
|
}
|
|
568
|
-
if (payload.name) {
|
|
557
|
+
if (typeof payload.name !== 'undefined') {
|
|
569
558
|
request.setName(payload.name);
|
|
570
559
|
}
|
|
571
|
-
if (payload.avatar) {
|
|
560
|
+
if (typeof payload.avatar !== 'undefined') {
|
|
572
561
|
request.setAvatar(payload.avatar);
|
|
573
562
|
}
|
|
574
|
-
if (payload.address) {
|
|
563
|
+
if (typeof payload.address !== 'undefined') {
|
|
575
564
|
request.setAddress(payload.address);
|
|
576
565
|
}
|
|
577
|
-
if (payload.alias) {
|
|
566
|
+
if (typeof payload.alias !== 'undefined') {
|
|
578
567
|
request.setAlias(payload.alias);
|
|
579
568
|
}
|
|
580
|
-
if (payload.city) {
|
|
569
|
+
if (typeof payload.city !== 'undefined') {
|
|
581
570
|
request.setCity(payload.city);
|
|
582
571
|
}
|
|
583
|
-
if (payload.friend) {
|
|
572
|
+
if (typeof payload.friend !== 'undefined') {
|
|
584
573
|
request.setFriend(payload.friend);
|
|
585
574
|
}
|
|
586
|
-
if (payload.province) {
|
|
575
|
+
if (typeof payload.province !== 'undefined') {
|
|
587
576
|
request.setProvince(payload.province);
|
|
588
577
|
}
|
|
589
|
-
if (payload.star) {
|
|
578
|
+
if (typeof payload.star !== 'undefined') {
|
|
590
579
|
request.setStar(payload.star);
|
|
591
580
|
}
|
|
592
|
-
if (payload.weixin) {
|
|
581
|
+
if (typeof payload.weixin !== 'undefined') {
|
|
593
582
|
request.setWeixin(payload.weixin);
|
|
594
583
|
}
|
|
595
|
-
if (payload.corporation) {
|
|
584
|
+
if (typeof payload.corporation !== 'undefined') {
|
|
596
585
|
request.setCorporation(payload.corporation);
|
|
597
586
|
}
|
|
598
|
-
if (payload.title) {
|
|
587
|
+
if (typeof payload.title !== 'undefined') {
|
|
599
588
|
request.setTitle(payload.title);
|
|
600
589
|
}
|
|
601
|
-
if (payload.description) {
|
|
590
|
+
if (typeof payload.description !== 'undefined') {
|
|
602
591
|
request.setDescription(payload.description);
|
|
603
592
|
}
|
|
604
|
-
if (payload.coworker) {
|
|
593
|
+
if (typeof payload.coworker !== 'undefined') {
|
|
605
594
|
request.setCoworker(payload.coworker);
|
|
606
595
|
}
|
|
607
|
-
if (payload.phone) {
|
|
596
|
+
if (typeof payload.phone !== 'undefined') {
|
|
608
597
|
request.setPhonesList(payload.phone);
|
|
609
598
|
}
|
|
610
|
-
if (payload.additionalInfo) {
|
|
599
|
+
if (typeof payload.additionalInfo !== 'undefined') {
|
|
611
600
|
request.setAdditionalInfo(payload.additionalInfo);
|
|
612
601
|
}
|
|
613
|
-
if (payload.tags) {
|
|
602
|
+
if (typeof payload.tags !== 'undefined') {
|
|
614
603
|
request.setTagIdsList(payload.tags);
|
|
615
604
|
}
|
|
616
605
|
await util_1.default.promisify(this.grpcManager.client.contactPayloadModify
|
|
@@ -698,31 +687,16 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
698
687
|
}
|
|
699
688
|
async messageImage(messageId, imageType) {
|
|
700
689
|
config_js_1.log.verbose('PuppetService', 'messageImage(%s, %s[%s])', messageId, imageType, PUPPET.types.Image[imageType]);
|
|
701
|
-
|
|
702
|
-
|
|
703
|
-
|
|
704
|
-
|
|
705
|
-
|
|
706
|
-
|
|
707
|
-
|
|
708
|
-
|
|
709
|
-
return this.FileBoxUuid.fromJSON(jsonText);
|
|
710
|
-
}
|
|
711
|
-
}
|
|
712
|
-
catch (e) {
|
|
713
|
-
config_js_1.log.verbose('PuppetService', 'messageImage() rejection %s', e.message);
|
|
714
|
-
}
|
|
715
|
-
{
|
|
716
|
-
// Deprecated. Will be removed after Dec 31, 2022
|
|
717
|
-
const request = new wechaty_grpc_1.puppet.MessageImageStreamRequest();
|
|
718
|
-
request.setId(messageId);
|
|
719
|
-
request.setType(imageType);
|
|
720
|
-
const pbStream = this.grpcManager.client.messageImageStream(request);
|
|
721
|
-
const fileBox = await (0, mod_js_1.unpackFileBoxFromPb)(pbStream);
|
|
722
|
-
// const fileBoxChunkStream = unpackFileBoxChunk(stream)
|
|
723
|
-
// return unpackFileBox(fileBoxChunkStream)
|
|
724
|
-
return fileBox;
|
|
690
|
+
const request = new wechaty_grpc_1.puppet.MessageImageRequest();
|
|
691
|
+
request.setId(messageId);
|
|
692
|
+
request.setType(imageType);
|
|
693
|
+
const response = await util_1.default.promisify(this.grpcManager.client.messageImage
|
|
694
|
+
.bind(this.grpcManager.client))(request);
|
|
695
|
+
const jsonText = response.getFileBox();
|
|
696
|
+
if (jsonText) {
|
|
697
|
+
return this.FileBoxUuid.fromJSON(jsonText);
|
|
725
698
|
}
|
|
699
|
+
throw new Error(`failed to get image filebox for message ${messageId}`);
|
|
726
700
|
}
|
|
727
701
|
async messageContact(messageId) {
|
|
728
702
|
config_js_1.log.verbose('PuppetService', 'messageContact(%s)', messageId);
|
|
@@ -842,36 +816,15 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
842
816
|
}
|
|
843
817
|
async messageFile(id) {
|
|
844
818
|
config_js_1.log.verbose('PuppetService', 'messageFile(%s)', id);
|
|
845
|
-
|
|
846
|
-
|
|
847
|
-
|
|
848
|
-
|
|
849
|
-
|
|
850
|
-
|
|
851
|
-
|
|
852
|
-
return this.FileBoxUuid.fromJSON(jsonText);
|
|
853
|
-
}
|
|
854
|
-
}
|
|
855
|
-
catch (e) {
|
|
856
|
-
config_js_1.log.warn('PuppetService', 'messageFile() rejection: %s', e.message);
|
|
857
|
-
config_js_1.log.warn('PuppetService', [
|
|
858
|
-
'This might because you are using Wechaty v1.x with a Puppet Service v0.x',
|
|
859
|
-
'Contact your Wechaty Puppet Service provided to report this problem',
|
|
860
|
-
'Related issues:',
|
|
861
|
-
' - https://github.com/wechaty/puppet-service/issues/179',
|
|
862
|
-
' - https://github.com/wechaty/puppet-service/pull/170',
|
|
863
|
-
].join('\n'));
|
|
864
|
-
}
|
|
865
|
-
{
|
|
866
|
-
// Deprecated. `MessageFileStream` Will be removed after Dec 31, 2022
|
|
867
|
-
const request = new wechaty_grpc_1.puppet.MessageFileStreamRequest();
|
|
868
|
-
request.setId(id);
|
|
869
|
-
const pbStream = this.grpcManager.client.messageFileStream(request);
|
|
870
|
-
// const fileBoxChunkStream = unpackFileBoxChunk(pbStream)
|
|
871
|
-
// return unpackFileBox(fileBoxChunkStream)
|
|
872
|
-
const fileBox = await (0, mod_js_1.unpackFileBoxFromPb)(pbStream);
|
|
873
|
-
return fileBox;
|
|
819
|
+
const request = new wechaty_grpc_1.puppet.MessageFileRequest();
|
|
820
|
+
request.setId(id);
|
|
821
|
+
const response = await util_1.default.promisify(this.grpcManager.client.messageFile
|
|
822
|
+
.bind(this.grpcManager.client))(request);
|
|
823
|
+
const jsonText = response.getFileBox();
|
|
824
|
+
if (jsonText) {
|
|
825
|
+
return this.FileBoxUuid.fromJSON(jsonText);
|
|
874
826
|
}
|
|
827
|
+
throw new Error(`failed to get filebox for message ${id}`);
|
|
875
828
|
}
|
|
876
829
|
async messagePreview(id) {
|
|
877
830
|
config_js_1.log.verbose('PuppetService', 'messagePreview(%s)', id);
|
|
@@ -990,40 +943,27 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
990
943
|
}
|
|
991
944
|
async messageSendFile(conversationId, fileBox) {
|
|
992
945
|
config_js_1.log.verbose('PuppetService', 'messageSendFile(%s, %s)', conversationId, fileBox);
|
|
993
|
-
|
|
994
|
-
|
|
995
|
-
|
|
996
|
-
|
|
997
|
-
|
|
998
|
-
|
|
999
|
-
|
|
1000
|
-
|
|
1001
|
-
|
|
1002
|
-
|
|
1003
|
-
|
|
1004
|
-
return messageId;
|
|
1005
|
-
}
|
|
1006
|
-
else {
|
|
1007
|
-
/**
|
|
1008
|
-
* Huan(202110): Deprecated: will be removed after Dec 31, 2022
|
|
1009
|
-
*/
|
|
1010
|
-
const messageIdWrapper = response.getIdStringValueDeprecated();
|
|
1011
|
-
if (messageIdWrapper) {
|
|
1012
|
-
return messageIdWrapper.getValue();
|
|
1013
|
-
}
|
|
1014
|
-
}
|
|
1015
|
-
return; // void
|
|
946
|
+
const request = new wechaty_grpc_1.puppet.MessageSendFileRequest();
|
|
947
|
+
request.setConversationId(conversationId);
|
|
948
|
+
const serializedFileBox = await this.serializeFileBox(fileBox);
|
|
949
|
+
request.setFileBox(serializedFileBox);
|
|
950
|
+
config_js_1.log.info('PuppetService', `messageSendFile(${conversationId}, ${fileBox}) about to call grpc`);
|
|
951
|
+
const response = await util_1.default.promisify(this.grpcManager.client.messageSendFile
|
|
952
|
+
.bind(this.grpcManager.client))(request);
|
|
953
|
+
const messageId = response.getId();
|
|
954
|
+
config_js_1.log.info('PuppetService', `messageSendFile(${conversationId}, ${fileBox}) grpc called, messageId: ${messageId}`);
|
|
955
|
+
if (messageId) {
|
|
956
|
+
return messageId;
|
|
1016
957
|
}
|
|
1017
|
-
|
|
1018
|
-
|
|
958
|
+
else {
|
|
959
|
+
/**
|
|
960
|
+
* Huan(202110): Deprecated: will be removed after Dec 31, 2022
|
|
961
|
+
*/
|
|
962
|
+
const messageIdWrapper = response.getIdStringValueDeprecated();
|
|
963
|
+
if (messageIdWrapper) {
|
|
964
|
+
return messageIdWrapper.getValue();
|
|
965
|
+
}
|
|
1019
966
|
}
|
|
1020
|
-
/**
|
|
1021
|
-
* Huan(202110): Deprecated: will be removed after Dec 31, 2022
|
|
1022
|
-
* The old server will not support `Upload` gRPC method,
|
|
1023
|
-
* which I'm expecting the above code will throw a exception,
|
|
1024
|
-
* then the below code will be executed.
|
|
1025
|
-
*/
|
|
1026
|
-
return this.messageSendFileStream(conversationId, fileBox);
|
|
1027
967
|
}
|
|
1028
968
|
async messageSendContact(conversationId, contactId) {
|
|
1029
969
|
config_js_1.log.verbose('PuppetService', 'messageSend("%s", %s)', conversationId, contactId);
|
|
@@ -1101,6 +1041,28 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1101
1041
|
};
|
|
1102
1042
|
return payload;
|
|
1103
1043
|
}
|
|
1044
|
+
async getMessageBroadcastTarget() {
|
|
1045
|
+
config_js_1.log.verbose('PuppetService', 'getMessageBroadcastTarget()');
|
|
1046
|
+
const request = new wechaty_grpc_1.puppet.GetMessageBroadcastTargetRequest();
|
|
1047
|
+
const response = await util_1.default.promisify(this.grpcManager.client.getMessageBroadcastTarget.bind(this.grpcManager.client))(request);
|
|
1048
|
+
return {
|
|
1049
|
+
contactIds: response.getContactIdsList(),
|
|
1050
|
+
roomIds: response.getRoomIdsList(),
|
|
1051
|
+
};
|
|
1052
|
+
}
|
|
1053
|
+
async createMessageBroadcast(targets, type, content) {
|
|
1054
|
+
config_js_1.log.verbose('PuppetService', 'createMessageBroadcast()');
|
|
1055
|
+
if (!PUPPET.payloads.isPostClient(content)) {
|
|
1056
|
+
throw new Error('can only create broadcast with client post');
|
|
1057
|
+
}
|
|
1058
|
+
const request = new wechaty_grpc_1.puppet.CreateMessageBroadcastRequest();
|
|
1059
|
+
const post = await (0, pb_payload_helper_js_1.postPayloadToPb)(wechaty_grpc_1.puppet, content, this.serializeFileBox.bind(this));
|
|
1060
|
+
request.setContent(post);
|
|
1061
|
+
request.setTargetIdsList(targets);
|
|
1062
|
+
request.setType(type);
|
|
1063
|
+
const response = await util_1.default.promisify(this.grpcManager.client.createMessageBroadcast.bind(this.grpcManager.client))(request);
|
|
1064
|
+
return response.getId();
|
|
1065
|
+
}
|
|
1104
1066
|
/**
|
|
1105
1067
|
*
|
|
1106
1068
|
* Room
|
|
@@ -1644,57 +1606,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1644
1606
|
throw new Error('can only publish client post now');
|
|
1645
1607
|
}
|
|
1646
1608
|
const request = new wechaty_grpc_1.puppet.MomentPublishRequest();
|
|
1647
|
-
const post =
|
|
1648
|
-
post.setType(wechaty_grpc_1.puppet.PostType.POST_TYPE_MOMENT);
|
|
1649
|
-
for (const item of payload.sayableList) {
|
|
1650
|
-
const sayable = new wechaty_grpc_1.puppet.PostSayable();
|
|
1651
|
-
switch (item.type) {
|
|
1652
|
-
case PUPPET.types.Sayable.Text:
|
|
1653
|
-
sayable.setType(wechaty_grpc_1.puppet.SayableType.SAYABLE_TYPE_TEXT);
|
|
1654
|
-
sayable.setText(item.payload.text);
|
|
1655
|
-
sayable.setMentionIdListList(item.payload.mentions);
|
|
1656
|
-
break;
|
|
1657
|
-
case PUPPET.types.Sayable.Attachment: {
|
|
1658
|
-
sayable.setType(wechaty_grpc_1.puppet.SayableType.SAYABLE_TYPE_FILE);
|
|
1659
|
-
const serializedFileBox = typeof item.payload.filebox === 'string' ? item.payload.filebox : await this.serializeFileBox(item.payload.filebox);
|
|
1660
|
-
sayable.setFileBox(serializedFileBox);
|
|
1661
|
-
break;
|
|
1662
|
-
}
|
|
1663
|
-
case PUPPET.types.Sayable.Url: {
|
|
1664
|
-
sayable.setType(wechaty_grpc_1.puppet.SayableType.SAYABLE_TYPE_URL);
|
|
1665
|
-
const urlLinkPayload = item.payload;
|
|
1666
|
-
const pbUrlLinkPayload = (0, pb_payload_helper_js_1.urlLinkPayloadToPb)(wechaty_grpc_1.puppet, urlLinkPayload);
|
|
1667
|
-
sayable.setUrlLink(pbUrlLinkPayload);
|
|
1668
|
-
break;
|
|
1669
|
-
}
|
|
1670
|
-
case PUPPET.types.Sayable.Channel: {
|
|
1671
|
-
sayable.setType(wechaty_grpc_1.puppet.SayableType.SAYABLE_TYPE_CHANNEL);
|
|
1672
|
-
const channelPayload = item.payload;
|
|
1673
|
-
const pbChannelPayload = (0, pb_payload_helper_js_1.channelPayloadToPb)(wechaty_grpc_1.puppet, channelPayload);
|
|
1674
|
-
sayable.setChannel(pbChannelPayload);
|
|
1675
|
-
break;
|
|
1676
|
-
}
|
|
1677
|
-
default:
|
|
1678
|
-
throw new Error(`postPublish unsupported type ${item.type}`);
|
|
1679
|
-
}
|
|
1680
|
-
post.addSayableList(sayable);
|
|
1681
|
-
}
|
|
1682
|
-
if (payload.rootId) {
|
|
1683
|
-
post.setRootId(payload.rootId);
|
|
1684
|
-
}
|
|
1685
|
-
if (payload.parentId) {
|
|
1686
|
-
post.setParentId(payload.parentId);
|
|
1687
|
-
}
|
|
1688
|
-
if (payload.location) {
|
|
1689
|
-
const location = new wechaty_grpc_1.puppet.LocationPayload();
|
|
1690
|
-
location.setAccuracy(payload.location.accuracy);
|
|
1691
|
-
location.setAddress(payload.location.address);
|
|
1692
|
-
location.setName(payload.location.name);
|
|
1693
|
-
location.setLatitude(payload.location.latitude);
|
|
1694
|
-
location.setLongitude(payload.location.longitude);
|
|
1695
|
-
post.setLocation(location);
|
|
1696
|
-
}
|
|
1697
|
-
post.setVisibleListList(payload.visibleList || []);
|
|
1609
|
+
const post = await (0, pb_payload_helper_js_1.postPayloadToPb)(wechaty_grpc_1.puppet, payload, this.serializeFileBox.bind(this));
|
|
1698
1610
|
request.setPost(post);
|
|
1699
1611
|
const result = await util_1.default.promisify(this.grpcManager.client.momentPublish
|
|
1700
1612
|
.bind(this.grpcManager.client))(request);
|
|
@@ -1847,36 +1759,6 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1847
1759
|
const contactIdsList = response.getContactIdsList();
|
|
1848
1760
|
return contactIdsList;
|
|
1849
1761
|
}
|
|
1850
|
-
/**
|
|
1851
|
-
* @deprecated Will be removed in v2.0
|
|
1852
|
-
*/
|
|
1853
|
-
async messageSendFileStream(conversationId, file) {
|
|
1854
|
-
const request = await (0, mod_js_1.packConversationIdFileBoxToPb)(wechaty_grpc_1.puppet.MessageSendFileStreamRequest)(conversationId, file);
|
|
1855
|
-
const response = await new Promise((resolve, reject) => {
|
|
1856
|
-
const stream = this.grpcManager.client.messageSendFileStream((err, response) => {
|
|
1857
|
-
if (err) {
|
|
1858
|
-
reject(err);
|
|
1859
|
-
}
|
|
1860
|
-
else {
|
|
1861
|
-
resolve(response);
|
|
1862
|
-
}
|
|
1863
|
-
});
|
|
1864
|
-
request.pipe(stream); // Huan(202203): FIXME: as unknown as
|
|
1865
|
-
});
|
|
1866
|
-
const messageId = response.getId();
|
|
1867
|
-
if (messageId) {
|
|
1868
|
-
return messageId;
|
|
1869
|
-
}
|
|
1870
|
-
{
|
|
1871
|
-
/**
|
|
1872
|
-
* Huan(202110): Deprecated: will be removed after Dec 31, 2022
|
|
1873
|
-
*/
|
|
1874
|
-
const messageIdWrapper = response.getIdStringValueDeprecated();
|
|
1875
|
-
if (messageIdWrapper) {
|
|
1876
|
-
return messageIdWrapper.getValue();
|
|
1877
|
-
}
|
|
1878
|
-
}
|
|
1879
|
-
}
|
|
1880
1762
|
healthCheckInterval;
|
|
1881
1763
|
startHealthCheck() {
|
|
1882
1764
|
this.healthCheckInterval = setInterval(() => {
|