@juzi/wechaty 1.0.58 → 1.0.59
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 +2 -2
- package/dist/cjs/src/user-modules/contact.d.ts.map +1 -1
- package/dist/cjs/src/user-modules/contact.js +31 -34
- package/dist/cjs/src/user-modules/contact.js.map +1 -1
- package/dist/cjs/src/user-modules/message.d.ts.map +1 -1
- package/dist/cjs/src/user-modules/message.js +42 -4
- package/dist/cjs/src/user-modules/message.js.map +1 -1
- package/dist/cjs/src/user-modules/room.d.ts.map +1 -1
- package/dist/cjs/src/user-modules/room.js +31 -34
- package/dist/cjs/src/user-modules/room.js.map +1 -1
- package/dist/cjs/src/user-modules/room.spec.js +25 -0
- package/dist/cjs/src/user-modules/room.spec.js.map +1 -1
- package/dist/cjs/src/user-modules/tag-group.d.ts.map +1 -1
- package/dist/cjs/src/user-modules/tag-group.js +21 -1
- package/dist/cjs/src/user-modules/tag-group.js.map +1 -1
- package/dist/cjs/src/user-modules/tag.d.ts.map +1 -1
- package/dist/cjs/src/user-modules/tag.js +28 -15
- package/dist/cjs/src/user-modules/tag.js.map +1 -1
- package/dist/esm/src/package-json.js +2 -2
- package/dist/esm/src/user-modules/contact.d.ts.map +1 -1
- package/dist/esm/src/user-modules/contact.js +31 -34
- package/dist/esm/src/user-modules/contact.js.map +1 -1
- package/dist/esm/src/user-modules/message.d.ts.map +1 -1
- package/dist/esm/src/user-modules/message.js +42 -4
- package/dist/esm/src/user-modules/message.js.map +1 -1
- package/dist/esm/src/user-modules/room.d.ts.map +1 -1
- package/dist/esm/src/user-modules/room.js +31 -34
- package/dist/esm/src/user-modules/room.js.map +1 -1
- package/dist/esm/src/user-modules/room.spec.js +25 -0
- package/dist/esm/src/user-modules/room.spec.js.map +1 -1
- package/dist/esm/src/user-modules/tag-group.d.ts.map +1 -1
- package/dist/esm/src/user-modules/tag-group.js +21 -1
- package/dist/esm/src/user-modules/tag-group.js.map +1 -1
- package/dist/esm/src/user-modules/tag.d.ts.map +1 -1
- package/dist/esm/src/user-modules/tag.js +28 -15
- package/dist/esm/src/user-modules/tag.js.map +1 -1
- package/package.json +1 -1
- package/src/package-json.ts +2 -2
- package/src/user-modules/contact.ts +34 -36
- package/src/user-modules/message.ts +43 -6
- package/src/user-modules/room.spec.ts +33 -0
- package/src/user-modules/room.ts +33 -36
- package/src/user-modules/tag-group.ts +21 -1
- package/src/user-modules/tag.ts +31 -18
|
@@ -99,43 +99,40 @@ class RoomMixin extends MixinBase {
|
|
|
99
99
|
*/
|
|
100
100
|
static async findAll(query) {
|
|
101
101
|
log.verbose('Room', 'findAll(%s)', JSON.stringify(query, stringifyFilter) || '');
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
}
|
|
117
|
-
});
|
|
118
|
-
continuousErrorCount = 0;
|
|
119
|
-
return result;
|
|
120
|
-
};
|
|
121
|
-
/**
|
|
122
|
-
* we need to use concurrencyExecuter to reduce the parallel number of the requests
|
|
123
|
-
*/
|
|
124
|
-
const CONCURRENCY = 17;
|
|
125
|
-
const roomIterator = concurrencyExecuter(CONCURRENCY)(idToRoom)(roomIdList);
|
|
126
|
-
const roomList = [];
|
|
127
|
-
for await (const room of roomIterator) {
|
|
128
|
-
if (room) {
|
|
129
|
-
roomList.push(room);
|
|
102
|
+
const roomIdList = await this.wechaty.puppet.roomSearch(query);
|
|
103
|
+
let continuousErrorCount = 0;
|
|
104
|
+
let totalErrorCount = 0;
|
|
105
|
+
const totalErrorThreshold = Math.round(roomIdList.length / 5);
|
|
106
|
+
const idToRoom = async (id) => {
|
|
107
|
+
if (!this.wechaty.isLoggedIn) {
|
|
108
|
+
throw new Error('wechaty not logged in');
|
|
109
|
+
}
|
|
110
|
+
const result = await this.wechaty.Room.find({ id }).catch(e => {
|
|
111
|
+
this.wechaty.emitError(e);
|
|
112
|
+
continuousErrorCount++;
|
|
113
|
+
totalErrorCount++;
|
|
114
|
+
if (continuousErrorCount > 5) {
|
|
115
|
+
throw new Error('5 continuous errors!');
|
|
130
116
|
}
|
|
117
|
+
if (totalErrorCount > totalErrorThreshold) {
|
|
118
|
+
throw new Error(`${totalErrorThreshold} total errors!`);
|
|
119
|
+
}
|
|
120
|
+
});
|
|
121
|
+
continuousErrorCount = 0;
|
|
122
|
+
return result;
|
|
123
|
+
};
|
|
124
|
+
/**
|
|
125
|
+
* we need to use concurrencyExecuter to reduce the parallel number of the requests
|
|
126
|
+
*/
|
|
127
|
+
const CONCURRENCY = 17;
|
|
128
|
+
const roomIterator = concurrencyExecuter(CONCURRENCY)(idToRoom)(roomIdList);
|
|
129
|
+
const roomList = [];
|
|
130
|
+
for await (const room of roomIterator) {
|
|
131
|
+
if (room) {
|
|
132
|
+
roomList.push(room);
|
|
131
133
|
}
|
|
132
|
-
return roomList;
|
|
133
|
-
}
|
|
134
|
-
catch (e) {
|
|
135
|
-
this.wechaty.emitError(e);
|
|
136
|
-
log.verbose('Room', 'findAll() rejected: %s', e.message);
|
|
137
|
-
return []; // fail safe
|
|
138
134
|
}
|
|
135
|
+
return roomList;
|
|
139
136
|
}
|
|
140
137
|
/**
|
|
141
138
|
* Try to find a room by filter: {topic: string | RegExp}. If get many, return the first one.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"room.js","sourceRoot":"","sources":["../../../../src/user-modules/room.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"room.js","sourceRoot":"","sources":["../../../../src/user-modules/room.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,11 +37,36 @@ test('findAll()', async (t) => {
|
|
|
37
37
|
topic: EXPECTED_ROOM_TOPIC,
|
|
38
38
|
};
|
|
39
39
|
});
|
|
40
|
+
const mockContact = puppet.mocker.createContact({ name: 'bot' });
|
|
41
|
+
await puppet.mocker.login(mockContact);
|
|
42
|
+
const future = new Promise(resolve => {
|
|
43
|
+
wechaty.on('login', resolve);
|
|
44
|
+
});
|
|
45
|
+
await future;
|
|
40
46
|
const roomList = await wechaty.Room.findAll();
|
|
41
47
|
t.equal(roomList.length, 1, 'should find 1 room');
|
|
42
48
|
t.equal(await roomList[0].topic(), EXPECTED_ROOM_TOPIC, 'should get topic from payload');
|
|
43
49
|
await wechaty.stop();
|
|
44
50
|
});
|
|
51
|
+
test('room.findAll() not login test', async (t) => {
|
|
52
|
+
const EXPECTED_ROOM_ID = 'test-id';
|
|
53
|
+
const EXPECTED_ROOM_TOPIC = 'test-topic';
|
|
54
|
+
const EXPECTED_ROOM_ID_LIST = [EXPECTED_ROOM_ID];
|
|
55
|
+
const sandbox = sinon.createSandbox();
|
|
56
|
+
const puppet = new PuppetMock();
|
|
57
|
+
const wechaty = WechatyBuilder.build({ puppet });
|
|
58
|
+
await wechaty.start();
|
|
59
|
+
sandbox.stub(puppet, 'roomSearch').resolves(EXPECTED_ROOM_ID_LIST);
|
|
60
|
+
sandbox.stub(puppet, 'roomMemberList').resolves([]);
|
|
61
|
+
sandbox.stub(puppet, 'roomPayload').callsFake(async () => {
|
|
62
|
+
await new Promise(resolve => setImmediate(resolve));
|
|
63
|
+
return {
|
|
64
|
+
topic: EXPECTED_ROOM_TOPIC,
|
|
65
|
+
};
|
|
66
|
+
});
|
|
67
|
+
await t.rejects(wechaty.Room.findAll());
|
|
68
|
+
await wechaty.stop();
|
|
69
|
+
});
|
|
45
70
|
test('room.say() smoke testing', async () => {
|
|
46
71
|
const sandbox = sinon.createSandbox();
|
|
47
72
|
const callback = sinon.spy();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"room.spec.js","sourceRoot":"","sources":["../../../../src/user-modules/room.spec.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,EACL,IAAI,EACJ,KAAK,GACN,MAAkB,QAAQ,CAAA;AAG3B,OAAO,EAAE,UAAU,EAAE,MAAQ,2BAA2B,CAAA;AAExD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAMtD,IAAI,CAAC,WAAW,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;IAC1B,MAAM,gBAAgB,GAAQ,SAAS,CAAA;IACvC,MAAM,mBAAmB,GAAK,YAAY,CAAA;IAC1C,MAAM,qBAAqB,GAAG,CAAE,gBAAgB,CAAE,CAAA;IAElD,MAAM,OAAO,GAAG,KAAK,CAAC,aAAa,EAAE,CAAA;IAErC,MAAM,MAAM,GAAG,IAAI,UAAU,EAAS,CAAA;IACtC,MAAM,OAAO,GAAG,cAAc,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;IAEhD,MAAM,OAAO,CAAC,KAAK,EAAE,CAAA;IAErB,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAA;IAClE,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;IACnD,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,SAAS,CAAC,KAAK,IAAI,EAAE;QACvD,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAA;QACnD,OAAO;YACL,KAAK,EAAE,mBAAmB;SACH,CAAA;IAC3B,CAAC,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"room.spec.js","sourceRoot":"","sources":["../../../../src/user-modules/room.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tag-group.d.ts","sourceRoot":"","sources":["../../../../src/user-modules/tag-group.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,KAAK,MAAM,MAAM,sBAAsB,CAAA;AACnD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kDAAkD,CAAA;AAE3F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAS9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAE5C,QAAA,MAAM,SAAS;;;;;;;;;;;sBAId,CAAA;AAED,cAAM,aAAc,SAAQ,SAAS;aAcjB,EAAE,EAAE,MAAM;IAZ5B;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAA;IAElC;;OAEG;gBAEe,EAAE,EAAE,MAAM;IAM5B,IAAI,IAAK,MAAM;WAIF,IAAI,IAAK,OAAO,CAAC,iBAAiB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"tag-group.d.ts","sourceRoot":"","sources":["../../../../src/user-modules/tag-group.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,KAAK,MAAM,MAAM,sBAAsB,CAAA;AACnD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kDAAkD,CAAA;AAE3F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAS9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAE5C,QAAA,MAAM,SAAS;;;;;;;;;;;sBAId,CAAA;AAED,cAAM,aAAc,SAAQ,SAAS;aAcjB,EAAE,EAAE,MAAM;IAZ5B;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAA;IAElC;;OAEG;gBAEe,EAAE,EAAE,MAAM;IAM5B,IAAI,IAAK,MAAM;WAIF,IAAI,IAAK,OAAO,CAAC,iBAAiB,EAAE,CAAC;WA+CrC,cAAc,CAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;WAehE,cAAc,CAAE,QAAQ,EAAE,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAWtF,IAAI,IAAK,OAAO,CAAC,YAAY,EAAE,CAAC;WA0BzB,IAAI,CAAE,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IA0BvF;;;;;;OAMG;IACG,IAAI,IAAK,OAAO,CAAC,IAAI,CAAC;IAK5B;;OAEG;IACH,OAAO,IAAK,OAAO;IAInB;;;;;;;OAOG;IACG,KAAK,CACT,SAAS,UAAQ,GAChB,OAAO,CAAC,IAAI,CAAC;IAoBP,QAAQ;CAIlB;;;;;;;AAED,cAAM,gBAAiB,SAAQ,qBAAuD;CAAI;AAC1F,UAAU,qBAAsB,SAAQ,gBAAgB;CAAI;AAE5D,aAAK,yBAAyB,GAC1B,OAAO,CAAA;AAEX,aAAK,iBAAiB,GAAG,IAAI,CAAC,qBAAqB,EAAE,yBAAyB,CAAC,CAAA;;;;;;;AAC/E,cAAM,YAAa,SAAQ,iBAAsD;CAAI;AAErF,aAAK,mBAAmB,GAAG,WAAW,CACpC,qBAAqB,EACrB,IAAI,CAAC,OAAO,YAAY,EAAE,MAAM,CAAC,CAClC,CAAA;AAED,YAAY,EACV,mBAAmB,EACnB,yBAAyB,EACzB,iBAAiB,GAClB,CAAA;AACD,OAAO,EACL,YAAY,GACb,CAAA"}
|
|
@@ -28,7 +28,27 @@ class TagGroupMixin extends MixinBase {
|
|
|
28
28
|
log.verbose('TagGroup', 'list()');
|
|
29
29
|
try {
|
|
30
30
|
const tagGroupIds = await this.wechaty.puppet.tagGroupList();
|
|
31
|
-
|
|
31
|
+
let continuousErrorCount = 0;
|
|
32
|
+
let totalErrorCount = 0;
|
|
33
|
+
const totalErrorThreshold = Math.round(tagGroupIds.length / 5);
|
|
34
|
+
const idToTagGroup = async (id) => {
|
|
35
|
+
if (!this.wechaty.isLoggedIn) {
|
|
36
|
+
throw new Error('wechaty not logged in');
|
|
37
|
+
}
|
|
38
|
+
const result = this.find({ id }).catch(e => {
|
|
39
|
+
this.wechaty.emitError(e);
|
|
40
|
+
continuousErrorCount++;
|
|
41
|
+
totalErrorCount++;
|
|
42
|
+
if (continuousErrorCount > 5) {
|
|
43
|
+
throw new Error('5 continuous errors!');
|
|
44
|
+
}
|
|
45
|
+
if (totalErrorCount > totalErrorThreshold) {
|
|
46
|
+
throw new Error(`${totalErrorThreshold} total errors!`);
|
|
47
|
+
}
|
|
48
|
+
});
|
|
49
|
+
continuousErrorCount = 0;
|
|
50
|
+
return result;
|
|
51
|
+
};
|
|
32
52
|
const CONCURRENCY = 17;
|
|
33
53
|
const tagGroupIterator = concurrencyExecuter(CONCURRENCY)(idToTagGroup)(tagGroupIds);
|
|
34
54
|
const tagGroupList = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tag-group.js","sourceRoot":"","sources":["../../../../src/user-modules/tag-group.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAA;AAC9C,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAClC,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAExD,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAA;AAC9D,OAAO,EACL,cAAc,GACf,MAAM,6BAA6B,CAAA;AAGpC,MAAM,SAAS,GAAG,cAAc,CAC9B,YAAY,CACV,MAAM,CACP,EAAyB,CAC3B,CAAA;AAED,MAAM,aAAc,SAAQ,SAAS;IAcjB;IAZlB;;;;;OAKG;IACH,OAAO,CAA2B;IAElC;;OAEG;IACH,YACkB,EAAU;QAE1B,KAAK,EAAE,CAAA;QAFS,OAAE,GAAF,EAAE,CAAQ;QAG1B,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,eAAe,CAAC,CAAA;IACxC,CAAC;IAED,IAAI;QACF,OAAO,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAA;IAClD,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,IAAI;QACf,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;QAEjC,IAAI;YACF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,CAAA;YAE5D,MAAM,YAAY,GAAG,KAAK,EAAE,EAAU,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"tag-group.js","sourceRoot":"","sources":["../../../../src/user-modules/tag-group.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tag.d.ts","sourceRoot":"","sources":["../../../../src/user-modules/tag.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAC9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kDAAkD,CAAA;AAEtF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAS9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AACpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAEvD,QAAA,MAAM,SAAS;;;;;;;;;;;sBAId,CAAA;AAED,cAAM,QAAS,SAAQ,SAAS;aAcZ,EAAE,EAAE,MAAM;IAZ5B;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAA;IAE7B;;OAEG;gBAEe,EAAE,EAAE,MAAM;IAM5B,IAAI,IAAK,MAAM,CAAC,KAAK,CAAC,GAAG;IAIzB,IAAI,IAAK,MAAM;IAIf,OAAO,IAAK,MAAM;IAIZ,KAAK,IAAK,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;WAIzC,IAAI,IAAK,OAAO,CAAC,YAAY,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"tag.d.ts","sourceRoot":"","sources":["../../../../src/user-modules/tag.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAC9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kDAAkD,CAAA;AAEtF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAS9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AACpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAEvD,QAAA,MAAM,SAAS;;;;;;;;;;;sBAId,CAAA;AAED,cAAM,QAAS,SAAQ,SAAS;aAcZ,EAAE,EAAE,MAAM;IAZ5B;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAA;IAE7B;;OAEG;gBAEe,EAAE,EAAE,MAAM;IAM5B,IAAI,IAAK,MAAM,CAAC,KAAK,CAAC,GAAG;IAIzB,IAAI,IAAK,MAAM;IAIf,OAAO,IAAK,MAAM;IAIZ,KAAK,IAAK,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;WAIzC,IAAI,IAAK,OAAO,CAAC,YAAY,EAAE,CAAC;WAwChC,IAAI,CAAE,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IA0B7E;;;;;;OAMG;IACG,IAAI,IAAK,OAAO,CAAC,IAAI,CAAC;IAK5B;;OAEG;IACH,OAAO,IAAK,OAAO;IAInB;;;;;;;OAOG;IACG,KAAK,CACT,SAAS,UAAQ,GAChB,OAAO,CAAC,IAAI,CAAC;IAqBV,WAAW,IAAK,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAQ3C,GAAG,CAAE,QAAQ,EAAE,gBAAgB,GAAG,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;WAY7D,SAAS,CAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;WAepF,SAAS,CAAE,WAAW,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAWxD,QAAQ;CAIlB;;;;;;;AAED,cAAM,WAAY,SAAQ,gBAA6C;CAAG;AAC1E,UAAU,gBAAiB,SAAQ,WAAW;CAAG;AAEjD,aAAK,oBAAoB,GACrB,OAAO,CAAA;AAEX,aAAK,YAAY,GAAG,IAAI,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,CAAA;;;;;;;AAChE,cAAM,OAAQ,SAAQ,YAA4C;CAAG;AAErE,aAAK,cAAc,GAAG,WAAW,CAC/B,gBAAgB,EAChB,IAAI,CAAC,OAAO,OAAO,EAAE,MAAM,CAAC,CAC7B,CAAA;AAED,YAAY,EACV,cAAc,EACd,oBAAoB,EACpB,YAAY,GACb,CAAA;AACD,OAAO,EACL,OAAO,GACR,CAAA"}
|
|
@@ -55,24 +55,37 @@ class TagMixin extends MixinBase {
|
|
|
55
55
|
}
|
|
56
56
|
static async list() {
|
|
57
57
|
log.verbose('Tag', 'list()');
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
58
|
+
const tagIdList = await this.wechaty.puppet.tagTagList();
|
|
59
|
+
let continuousErrorCount = 0;
|
|
60
|
+
let totalErrorCount = 0;
|
|
61
|
+
const totalErrorThreshold = Math.round(tagIdList.length / 5);
|
|
62
|
+
const idToTag = async (id) => {
|
|
63
|
+
if (!this.wechaty.isLoggedIn) {
|
|
64
|
+
throw new Error('wechaty not logged in');
|
|
65
|
+
}
|
|
66
|
+
const result = this.find({ id }).catch(e => {
|
|
67
|
+
this.wechaty.emitError(e);
|
|
68
|
+
continuousErrorCount++;
|
|
69
|
+
totalErrorCount++;
|
|
70
|
+
if (continuousErrorCount > 5) {
|
|
71
|
+
throw new Error('5 continuous errors!');
|
|
72
|
+
}
|
|
73
|
+
if (totalErrorCount > totalErrorThreshold) {
|
|
74
|
+
throw new Error(`${totalErrorThreshold} total errors!`);
|
|
67
75
|
}
|
|
76
|
+
});
|
|
77
|
+
continuousErrorCount = 0;
|
|
78
|
+
return result;
|
|
79
|
+
};
|
|
80
|
+
const CONCURRENCY = 17;
|
|
81
|
+
const tagIterator = concurrencyExecuter(CONCURRENCY)(idToTag)(tagIdList);
|
|
82
|
+
const tagList = [];
|
|
83
|
+
for await (const tag of tagIterator) {
|
|
84
|
+
if (tag) {
|
|
85
|
+
tagList.push(tag);
|
|
68
86
|
}
|
|
69
|
-
return tagList;
|
|
70
|
-
}
|
|
71
|
-
catch (e) {
|
|
72
|
-
this.wechaty.emitError(e);
|
|
73
|
-
log.error('Tag', 'list() exception: %s', e.message);
|
|
74
|
-
return [];
|
|
75
87
|
}
|
|
88
|
+
return tagList;
|
|
76
89
|
}
|
|
77
90
|
static async find(filter) {
|
|
78
91
|
log.silly('Tag', 'find(%s)', JSON.stringify(filter));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tag.js","sourceRoot":"","sources":["../../../../src/user-modules/tag.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAI9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAA;AAC9C,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAClC,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAExD,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAA;AAC9D,OAAO,EACL,cAAc,GACf,MAA0B,6BAA6B,CAAA;AAIxD,MAAM,SAAS,GAAG,cAAc,CAC9B,YAAY,CACV,MAAM,CACP,EAAoB,CACtB,CAAA;AAED,MAAM,QAAS,SAAQ,SAAS;IAcZ;IAZlB;;;;;OAKG;IACH,OAAO,CAAsB;IAE7B;;OAEG;IACH,YACkB,EAAU;QAE1B,KAAK,EAAE,CAAA;QAFS,OAAE,GAAF,EAAE,CAAQ;QAG1B,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,eAAe,CAAC,CAAA;IACnC,CAAC;IAED,IAAI;QACF,OAAO,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAA;IAC3E,CAAC;IAED,IAAI;QACF,OAAO,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAA;IAClD,CAAC;IAED,OAAO;QACL,OAAO,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAA;IACrD,CAAC;IAED,KAAK,CAAC,KAAK;QACT,OAAO,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACrG,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,IAAI;QACf,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;QAE5B,
|
|
1
|
+
{"version":3,"file":"tag.js","sourceRoot":"","sources":["../../../../src/user-modules/tag.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/package-json.ts
CHANGED
|
@@ -4,10 +4,10 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import type { PackageJsonWechaty } from './config'
|
|
6
6
|
|
|
7
|
-
export const GIT_COMMIT_HASH: string = '
|
|
7
|
+
export const GIT_COMMIT_HASH: string = 'd455bb3baf306e55e75abe03eda236ceb38ed6c9'
|
|
8
8
|
export const packageJson: PackageJsonWechaty = {
|
|
9
9
|
"name": "@juzi/wechaty",
|
|
10
|
-
"version": "1.0.
|
|
10
|
+
"version": "1.0.59",
|
|
11
11
|
"description": "Wechaty is a RPA SDK for Chatbot Makers.",
|
|
12
12
|
"type": "module",
|
|
13
13
|
"exports": {
|
|
@@ -173,48 +173,46 @@ class ContactMixin extends MixinBase implements SayableSayer {
|
|
|
173
173
|
): Promise<ContactInterface[]> {
|
|
174
174
|
log.verbose('Contact', 'findAll(%s)', JSON.stringify(query, stringifyFilter) || '')
|
|
175
175
|
|
|
176
|
-
|
|
177
|
-
const contactIdList: string[] = await this.wechaty.puppet.contactSearch(query)
|
|
178
|
-
|
|
179
|
-
let continuousErrorCount = 0
|
|
180
|
-
let totalErrorCount = 0
|
|
181
|
-
const idToContact = async (id: string) => {
|
|
182
|
-
const result = await this.wechaty.Contact.find({ id }).catch(e => {
|
|
183
|
-
this.wechaty.emitError(e)
|
|
184
|
-
continuousErrorCount++
|
|
185
|
-
totalErrorCount++
|
|
186
|
-
if (continuousErrorCount > 5) {
|
|
187
|
-
throw new Error('5 continuous errors!')
|
|
188
|
-
}
|
|
189
|
-
if (totalErrorCount > 100) {
|
|
190
|
-
throw new Error('100 total errors!')
|
|
191
|
-
}
|
|
192
|
-
})
|
|
193
|
-
continuousErrorCount = 0
|
|
194
|
-
return result
|
|
195
|
-
}
|
|
196
|
-
|
|
197
|
-
/**
|
|
198
|
-
* we need to use concurrencyExecuter to reduce the parallel number of the requests
|
|
199
|
-
*/
|
|
200
|
-
const CONCURRENCY = 17
|
|
201
|
-
const contactIterator = concurrencyExecuter(CONCURRENCY)(idToContact)(contactIdList)
|
|
176
|
+
const contactIdList: string[] = await this.wechaty.puppet.contactSearch(query)
|
|
202
177
|
|
|
203
|
-
|
|
178
|
+
let continuousErrorCount = 0
|
|
179
|
+
let totalErrorCount = 0
|
|
180
|
+
const totalErrorThreshold = Math.round(contactIdList.length / 5)
|
|
204
181
|
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
}
|
|
182
|
+
const idToContact = async (id: string) => {
|
|
183
|
+
if (!this.wechaty.isLoggedIn) {
|
|
184
|
+
throw new Error('wechaty not logged in')
|
|
209
185
|
}
|
|
186
|
+
const result = await this.wechaty.Contact.find({ id }).catch(e => {
|
|
187
|
+
this.wechaty.emitError(e)
|
|
188
|
+
continuousErrorCount++
|
|
189
|
+
totalErrorCount++
|
|
190
|
+
if (continuousErrorCount > 5) {
|
|
191
|
+
throw new Error('5 continuous errors!')
|
|
192
|
+
}
|
|
193
|
+
if (totalErrorCount > totalErrorThreshold) {
|
|
194
|
+
throw new Error(`${totalErrorThreshold} total errors!`)
|
|
195
|
+
}
|
|
196
|
+
})
|
|
197
|
+
continuousErrorCount = 0
|
|
198
|
+
return result
|
|
199
|
+
}
|
|
210
200
|
|
|
211
|
-
|
|
201
|
+
/**
|
|
202
|
+
* we need to use concurrencyExecuter to reduce the parallel number of the requests
|
|
203
|
+
*/
|
|
204
|
+
const CONCURRENCY = 17
|
|
205
|
+
const contactIterator = concurrencyExecuter(CONCURRENCY)(idToContact)(contactIdList)
|
|
212
206
|
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
207
|
+
const contactList: ContactInterface[] = []
|
|
208
|
+
|
|
209
|
+
for await (const contact of contactIterator) {
|
|
210
|
+
if (contact) {
|
|
211
|
+
contactList.push(contact)
|
|
212
|
+
}
|
|
217
213
|
}
|
|
214
|
+
|
|
215
|
+
return contactList
|
|
218
216
|
}
|
|
219
217
|
|
|
220
218
|
// TODO
|
|
@@ -191,9 +191,28 @@ class MessageMixin extends MixinBase implements SayableSayer {
|
|
|
191
191
|
const { contactIds = [], roomIds = [] } = await this.wechaty.puppet.getMessageBroadcastTarget()
|
|
192
192
|
|
|
193
193
|
const CONCURRENCY = 17
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
194
|
+
|
|
195
|
+
let roomContinuousErrorCount = 0
|
|
196
|
+
let roomTotalErrorCount = 0
|
|
197
|
+
const roomTotalErrorThreshold = Math.round(roomIds.length / 5)
|
|
198
|
+
const idToRoom = async (id: string) => {
|
|
199
|
+
if (!this.wechaty.isLoggedIn) {
|
|
200
|
+
throw new Error('wechaty not logged in')
|
|
201
|
+
}
|
|
202
|
+
const result = await this.wechaty.Room.find({ id }).catch(e => {
|
|
203
|
+
this.wechaty.emitError(e)
|
|
204
|
+
roomContinuousErrorCount++
|
|
205
|
+
roomTotalErrorCount++
|
|
206
|
+
if (roomContinuousErrorCount > 5) {
|
|
207
|
+
throw new Error('5 continuous errors!')
|
|
208
|
+
}
|
|
209
|
+
if (roomTotalErrorCount > roomTotalErrorThreshold) {
|
|
210
|
+
throw new Error(`${roomTotalErrorThreshold} total errors!`)
|
|
211
|
+
}
|
|
212
|
+
})
|
|
213
|
+
roomContinuousErrorCount = 0
|
|
214
|
+
return result
|
|
215
|
+
}
|
|
197
216
|
|
|
198
217
|
const roomIterator = concurrencyExecuter(CONCURRENCY)(idToRoom)(roomIds)
|
|
199
218
|
|
|
@@ -205,9 +224,27 @@ class MessageMixin extends MixinBase implements SayableSayer {
|
|
|
205
224
|
}
|
|
206
225
|
}
|
|
207
226
|
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
227
|
+
let contactContinuousErrorCount = 0
|
|
228
|
+
let contactTotalErrorCount = 0
|
|
229
|
+
const contactTotalErrorThreshold = Math.round(roomIds.length / 5)
|
|
230
|
+
const idToContact = async (id: string) => {
|
|
231
|
+
if (!this.wechaty.isLoggedIn) {
|
|
232
|
+
throw new Error('wechaty not logged in')
|
|
233
|
+
}
|
|
234
|
+
const result = await this.wechaty.Contact.find({ id }).catch(e => {
|
|
235
|
+
this.wechaty.emitError(e)
|
|
236
|
+
contactContinuousErrorCount++
|
|
237
|
+
contactTotalErrorCount++
|
|
238
|
+
if (contactContinuousErrorCount > 5) {
|
|
239
|
+
throw new Error('5 continuous errors!')
|
|
240
|
+
}
|
|
241
|
+
if (contactTotalErrorCount > contactTotalErrorThreshold) {
|
|
242
|
+
throw new Error(`${contactTotalErrorThreshold} total errors!`)
|
|
243
|
+
}
|
|
244
|
+
})
|
|
245
|
+
contactContinuousErrorCount = 0
|
|
246
|
+
return result
|
|
247
|
+
}
|
|
211
248
|
|
|
212
249
|
const contactIterator = concurrencyExecuter(CONCURRENCY)(idToContact)(contactIds)
|
|
213
250
|
|
|
@@ -52,6 +52,13 @@ test('findAll()', async t => {
|
|
|
52
52
|
topic: EXPECTED_ROOM_TOPIC,
|
|
53
53
|
} as PUPPET.payloads.Room
|
|
54
54
|
})
|
|
55
|
+
const mockContact = puppet.mocker.createContact({ name: 'bot' })
|
|
56
|
+
await puppet.mocker.login(mockContact)
|
|
57
|
+
|
|
58
|
+
const future = new Promise(resolve => {
|
|
59
|
+
wechaty.on('login', resolve)
|
|
60
|
+
})
|
|
61
|
+
await future
|
|
55
62
|
|
|
56
63
|
const roomList = await wechaty.Room.findAll()
|
|
57
64
|
t.equal(roomList.length, 1, 'should find 1 room')
|
|
@@ -60,6 +67,32 @@ test('findAll()', async t => {
|
|
|
60
67
|
await wechaty.stop()
|
|
61
68
|
})
|
|
62
69
|
|
|
70
|
+
test('room.findAll() not login test', async t => {
|
|
71
|
+
const EXPECTED_ROOM_ID = 'test-id'
|
|
72
|
+
const EXPECTED_ROOM_TOPIC = 'test-topic'
|
|
73
|
+
const EXPECTED_ROOM_ID_LIST = [ EXPECTED_ROOM_ID ]
|
|
74
|
+
|
|
75
|
+
const sandbox = sinon.createSandbox()
|
|
76
|
+
|
|
77
|
+
const puppet = new PuppetMock() as any
|
|
78
|
+
const wechaty = WechatyBuilder.build({ puppet })
|
|
79
|
+
|
|
80
|
+
await wechaty.start()
|
|
81
|
+
|
|
82
|
+
sandbox.stub(puppet, 'roomSearch').resolves(EXPECTED_ROOM_ID_LIST)
|
|
83
|
+
sandbox.stub(puppet, 'roomMemberList').resolves([])
|
|
84
|
+
sandbox.stub(puppet, 'roomPayload').callsFake(async () => {
|
|
85
|
+
await new Promise(resolve => setImmediate(resolve))
|
|
86
|
+
return {
|
|
87
|
+
topic: EXPECTED_ROOM_TOPIC,
|
|
88
|
+
} as PUPPET.payloads.Room
|
|
89
|
+
})
|
|
90
|
+
|
|
91
|
+
await t.rejects(wechaty.Room.findAll())
|
|
92
|
+
|
|
93
|
+
await wechaty.stop()
|
|
94
|
+
})
|
|
95
|
+
|
|
63
96
|
test('room.say() smoke testing', async () => {
|
|
64
97
|
|
|
65
98
|
const sandbox = sinon.createSandbox()
|