@juzi/wechaty 1.0.23 → 1.0.24

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.
Files changed (77) hide show
  1. package/dist/cjs/src/config.d.ts +2 -0
  2. package/dist/cjs/src/config.d.ts.map +1 -1
  3. package/dist/cjs/src/config.js +3 -1
  4. package/dist/cjs/src/config.js.map +1 -1
  5. package/dist/cjs/src/package-json.js +4 -4
  6. package/dist/cjs/src/pure-functions/update.d.ts +1 -0
  7. package/dist/cjs/src/pure-functions/update.d.ts.map +1 -1
  8. package/dist/cjs/src/pure-functions/update.js +12 -1
  9. package/dist/cjs/src/pure-functions/update.js.map +1 -1
  10. package/dist/cjs/src/schemas/wechaty-events.d.ts +5 -2
  11. package/dist/cjs/src/schemas/wechaty-events.d.ts.map +1 -1
  12. package/dist/cjs/src/schemas/wechaty-events.js.map +1 -1
  13. package/dist/cjs/src/user-modules/contact.d.ts.map +1 -1
  14. package/dist/cjs/src/user-modules/contact.js +7 -10
  15. package/dist/cjs/src/user-modules/contact.js.map +1 -1
  16. package/dist/cjs/src/user-modules/tag-group.d.ts +54 -20
  17. package/dist/cjs/src/user-modules/tag-group.d.ts.map +1 -1
  18. package/dist/cjs/src/user-modules/tag-group.js +103 -44
  19. package/dist/cjs/src/user-modules/tag-group.js.map +1 -1
  20. package/dist/cjs/src/user-modules/tag.d.ts +57 -22
  21. package/dist/cjs/src/user-modules/tag.d.ts.map +1 -1
  22. package/dist/cjs/src/user-modules/tag.js +140 -48
  23. package/dist/cjs/src/user-modules/tag.js.map +1 -1
  24. package/dist/cjs/src/wechaty/wechaty-base.d.ts +7 -7
  25. package/dist/cjs/src/wechaty-mixins/gerror-mixin.d.ts +1 -1
  26. package/dist/cjs/src/wechaty-mixins/io-mixin.d.ts +2 -2
  27. package/dist/cjs/src/wechaty-mixins/login-mixin.d.ts +5 -5
  28. package/dist/cjs/src/wechaty-mixins/misc-mixin.d.ts +5 -5
  29. package/dist/cjs/src/wechaty-mixins/plugin-mixin.d.ts +6 -6
  30. package/dist/cjs/src/wechaty-mixins/puppet-mixin.d.ts +4 -4
  31. package/dist/cjs/src/wechaty-mixins/puppet-mixin.d.ts.map +1 -1
  32. package/dist/cjs/src/wechaty-mixins/puppet-mixin.js +88 -8
  33. package/dist/cjs/src/wechaty-mixins/puppet-mixin.js.map +1 -1
  34. package/dist/cjs/src/wechaty-mixins/wechatify-user-module-mixin.d.ts +1 -1
  35. package/dist/esm/src/config.d.ts +2 -0
  36. package/dist/esm/src/config.d.ts.map +1 -1
  37. package/dist/esm/src/config.js +2 -0
  38. package/dist/esm/src/config.js.map +1 -1
  39. package/dist/esm/src/package-json.js +4 -4
  40. package/dist/esm/src/pure-functions/update.d.ts +1 -0
  41. package/dist/esm/src/pure-functions/update.d.ts.map +1 -1
  42. package/dist/esm/src/pure-functions/update.js +10 -0
  43. package/dist/esm/src/pure-functions/update.js.map +1 -1
  44. package/dist/esm/src/schemas/wechaty-events.d.ts +5 -2
  45. package/dist/esm/src/schemas/wechaty-events.d.ts.map +1 -1
  46. package/dist/esm/src/schemas/wechaty-events.js.map +1 -1
  47. package/dist/esm/src/user-modules/contact.d.ts.map +1 -1
  48. package/dist/esm/src/user-modules/contact.js +7 -10
  49. package/dist/esm/src/user-modules/contact.js.map +1 -1
  50. package/dist/esm/src/user-modules/tag-group.d.ts +54 -20
  51. package/dist/esm/src/user-modules/tag-group.d.ts.map +1 -1
  52. package/dist/esm/src/user-modules/tag-group.js +104 -45
  53. package/dist/esm/src/user-modules/tag-group.js.map +1 -1
  54. package/dist/esm/src/user-modules/tag.d.ts +57 -22
  55. package/dist/esm/src/user-modules/tag.d.ts.map +1 -1
  56. package/dist/esm/src/user-modules/tag.js +119 -50
  57. package/dist/esm/src/user-modules/tag.js.map +1 -1
  58. package/dist/esm/src/wechaty/wechaty-base.d.ts +7 -7
  59. package/dist/esm/src/wechaty-mixins/gerror-mixin.d.ts +1 -1
  60. package/dist/esm/src/wechaty-mixins/io-mixin.d.ts +2 -2
  61. package/dist/esm/src/wechaty-mixins/login-mixin.d.ts +5 -5
  62. package/dist/esm/src/wechaty-mixins/misc-mixin.d.ts +5 -5
  63. package/dist/esm/src/wechaty-mixins/plugin-mixin.d.ts +6 -6
  64. package/dist/esm/src/wechaty-mixins/puppet-mixin.d.ts +4 -4
  65. package/dist/esm/src/wechaty-mixins/puppet-mixin.d.ts.map +1 -1
  66. package/dist/esm/src/wechaty-mixins/puppet-mixin.js +90 -10
  67. package/dist/esm/src/wechaty-mixins/puppet-mixin.js.map +1 -1
  68. package/dist/esm/src/wechaty-mixins/wechatify-user-module-mixin.d.ts +1 -1
  69. package/package.json +3 -3
  70. package/src/config.ts +3 -0
  71. package/src/package-json.ts +4 -4
  72. package/src/pure-functions/update.ts +11 -0
  73. package/src/schemas/wechaty-events.ts +4 -0
  74. package/src/user-modules/contact.ts +7 -10
  75. package/src/user-modules/tag-group.ts +135 -53
  76. package/src/user-modules/tag.ts +124 -57
  77. package/src/wechaty-mixins/puppet-mixin.ts +106 -10
@@ -1,44 +1,46 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.TagGroupImpl = void 0;
4
+ const rx_queue_1 = require("rx-queue");
4
5
  const config_js_1 = require("../config.js");
6
+ const poolify_js_1 = require("../user-mixins/poolify.js");
5
7
  const validation_js_1 = require("../user-mixins/validation.js");
6
8
  const wechatify_js_1 = require("../user-mixins/wechatify.js");
7
- class TagGroupMixin extends (0, wechatify_js_1.wechatifyMixinBase)() {
8
- payload;
9
+ const MixinBase = (0, wechatify_js_1.wechatifyMixin)((0, poolify_js_1.poolifyMixin)(Object)());
10
+ class TagGroupMixin extends MixinBase {
11
+ id;
9
12
  /**
10
13
  *
11
- * Create
14
+ * Instance properties
15
+ * @ignore
12
16
  *
13
17
  */
14
- static create(payload) {
15
- config_js_1.log.verbose('TagGroup', 'create()');
16
- return new this(payload);
17
- }
18
+ payload;
18
19
  /**
19
20
  * @hideconstructor
20
21
  */
21
- constructor(payload) {
22
+ constructor(id) {
22
23
  super();
23
- this.payload = payload;
24
+ this.id = id;
24
25
  config_js_1.log.silly('TagGroup', 'constructor()');
25
26
  }
26
- id() {
27
- return this.payload.id;
28
- }
29
27
  name() {
30
- return this.payload.name;
28
+ return (this.payload && this.payload.name) || '';
31
29
  }
32
- static pool = [];
33
- static async list(forceSync = false) {
34
- config_js_1.log.verbose('TagGroup', 'list(%s)', forceSync);
35
- if (this.pool.length > 0 && !forceSync) {
36
- return this.pool;
37
- }
30
+ static async list() {
31
+ config_js_1.log.verbose('TagGroup', 'list()');
38
32
  try {
39
- const payloads = await this.wechaty.puppet.tagGroupList();
40
- this.pool = payloads.map(payload => new this(payload));
41
- return this.pool;
33
+ const tagGroupIds = await this.wechaty.puppet.tagGroupList();
34
+ const idToTagGroup = async (id) => this.find(id).catch(e => this.wechaty.emitError(e));
35
+ const CONCURRENCY = 17;
36
+ const tagGroupIterator = (0, rx_queue_1.concurrencyExecuter)(CONCURRENCY)(idToTagGroup)(tagGroupIds);
37
+ const tagGroupList = [];
38
+ for await (const tagGroup of tagGroupIterator) {
39
+ if (tagGroup) {
40
+ tagGroupList.push(tagGroup);
41
+ }
42
+ }
43
+ return tagGroupList;
42
44
  }
43
45
  catch (e) {
44
46
  this.wechaty.emitError(e);
@@ -46,26 +48,12 @@ class TagGroupMixin extends (0, wechatify_js_1.wechatifyMixinBase)() {
46
48
  return [];
47
49
  }
48
50
  }
49
- static async sync() {
50
- config_js_1.log.verbose('TagGroup', 'sync()');
51
- await this.list(true);
52
- }
53
- static load(tagGroupId) {
54
- config_js_1.log.verbose('TagGroup', 'load(%s)', tagGroupId);
55
- for (const item of this.pool) {
56
- if (item.id() === tagGroupId) {
57
- return item;
58
- }
59
- }
60
- return undefined;
61
- }
62
51
  static async createTagGroup(name) {
63
52
  config_js_1.log.verbose('TagGroup', 'createTagGroup(%s, %s)', name);
64
53
  try {
65
- const payload = await this.wechaty.puppet.tagGroupAdd(name);
66
- if (payload) {
67
- const newTagGroup = new this(payload);
68
- this.pool.push(newTagGroup);
54
+ const groupId = await this.wechaty.puppet.tagGroupAdd(name);
55
+ if (groupId) {
56
+ const newTagGroup = await this.find(groupId);
69
57
  return newTagGroup;
70
58
  }
71
59
  }
@@ -77,8 +65,7 @@ class TagGroupMixin extends (0, wechatify_js_1.wechatifyMixinBase)() {
77
65
  static async deleteTagGroup(tagGroup) {
78
66
  config_js_1.log.verbose('TagGroup', 'deleteTagGroup(%s)', tagGroup);
79
67
  try {
80
- await this.wechaty.puppet.tagGroupDelete(tagGroup.id());
81
- this.pool.splice(this.pool.indexOf(tagGroup), 1);
68
+ await this.wechaty.puppet.tagGroupDelete(tagGroup.id);
82
69
  }
83
70
  catch (e) {
84
71
  this.wechaty.emitError(e);
@@ -86,13 +73,85 @@ class TagGroupMixin extends (0, wechatify_js_1.wechatifyMixinBase)() {
86
73
  }
87
74
  }
88
75
  async tags() {
89
- return (await this.wechaty.Tag.list()).filter(tag => tag.groupId() === this.id());
76
+ config_js_1.log.verbose('TagGroup', 'tags(%s)', this);
77
+ try {
78
+ const tagIdentifierList = await this.wechaty.puppet.tagGroupTagList(this.id);
79
+ const identifierToTag = async (tag) => this.wechaty.Tag.find(tag).catch(e => this.wechaty.emitError(e));
80
+ const CONCURRENCY = 17;
81
+ const tagIterator = (0, rx_queue_1.concurrencyExecuter)(CONCURRENCY)(identifierToTag)(tagIdentifierList);
82
+ const tagList = [];
83
+ for await (const tag of tagIterator) {
84
+ if (tag) {
85
+ tagList.push(tag);
86
+ }
87
+ }
88
+ return tagList;
89
+ }
90
+ catch (e) {
91
+ this.wechaty.emitError(e);
92
+ config_js_1.log.error('TagGroup', 'list() exception: %s', e.message);
93
+ return [];
94
+ }
95
+ }
96
+ static async find(id) {
97
+ config_js_1.log.silly('TagGroup', 'find(%s)', id);
98
+ const tagGroup = this.wechaty.TagGroup.load(id);
99
+ try {
100
+ await tagGroup.ready();
101
+ }
102
+ catch (e) {
103
+ this.wechaty.emitError(e);
104
+ return undefined;
105
+ }
106
+ return tagGroup;
107
+ }
108
+ /**
109
+ * Force reload data for TagGroup, Sync data from low-level API again.
110
+ *
111
+ * @returns {Promise<this>}
112
+ * @example
113
+ * await tagGroup.sync()
114
+ */
115
+ async sync() {
116
+ await this.wechaty.puppet.tagGroupPayloadDirty(this.id);
117
+ await this.ready(true);
118
+ }
119
+ /**
120
+ * @ignore
121
+ */
122
+ isReady() {
123
+ return !!(this.payload);
124
+ }
125
+ /**
126
+ * `ready()` is For FrameWork ONLY!
127
+ *
128
+ * Please not to use `ready()` at the user land.
129
+ * If you want to sync data, use `sync()` instead.
130
+ *
131
+ * @ignore
132
+ */
133
+ async ready(forceSync = false) {
134
+ config_js_1.log.silly('TagGroup', 'ready() @ %s with TagGroup="%s"', this.wechaty.puppet, this.id);
135
+ if (!forceSync && this.isReady()) { // already ready
136
+ config_js_1.log.silly('TagGroup', 'ready() isReady() true');
137
+ return;
138
+ }
139
+ try {
140
+ this.payload = await this.wechaty.puppet.tagGroupPayload(this.id);
141
+ }
142
+ catch (e) {
143
+ this.wechaty.emitError(e);
144
+ config_js_1.log.verbose('TagGroup', 'ready() this.wechaty.puppet.tagGroupPayload(%s) exception: %s', this.id, e.message);
145
+ throw e;
146
+ }
90
147
  }
91
148
  toString() {
92
- return `<TagGroup#${this.name() || this.id()}>`;
149
+ return `<TagGroup#${this.name() || this.id}>`;
93
150
  }
94
151
  }
95
- class TagGroupImpl extends (0, validation_js_1.validationMixin)(TagGroupMixin)() {
152
+ class TagGroupImplBase extends (0, validation_js_1.validationMixin)(TagGroupMixin)() {
153
+ }
154
+ class TagGroupImpl extends (0, validation_js_1.validationMixin)(TagGroupImplBase)() {
96
155
  }
97
156
  exports.TagGroupImpl = TagGroupImpl;
98
157
  //# sourceMappingURL=tag-group.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"tag-group.js","sourceRoot":"","sources":["../../../../src/user-modules/tag-group.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tag-group.js","sourceRoot":"","sources":["../../../../src/user-modules/tag-group.ts"],"names":[],"mappings":"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"}
@@ -17,56 +17,91 @@
17
17
  * limitations under the License.
18
18
  *
19
19
  */
20
- import type * as PUPPET from '@juzi/wechaty-puppet';
20
+ import * as PUPPET from '@juzi/wechaty-puppet';
21
21
  import type { TagIdentifier } from '@juzi/wechaty-puppet/filters';
22
22
  import type { Constructor } from 'clone-class';
23
23
  import type { ContactInterface } from './contact.js';
24
24
  import type { TagGroupInterface } from './tag-group.js';
25
- declare const TagMixin_base: ((abstract new (...args: any[]) => {
25
+ declare const MixinBase: ((abstract new (...args: any[]) => {
26
26
  readonly wechaty: import("../wechaty/wechaty-impl.js").WechatyInterface;
27
27
  }) & {
28
28
  readonly wechaty: import("../wechaty/wechaty-impl.js").WechatyInterface;
29
- }) & {
30
- new (): {};
31
- };
32
- declare class TagMixin extends TagMixin_base {
33
- readonly payload: PUPPET.payloads.Tag;
29
+ }) & ((abstract new (...args: any[]) => {}) & {
30
+ _pool?: Map<string, TagImplInterface> | undefined;
31
+ readonly pool: Map<string, TagImplInterface>;
32
+ load<L extends import("clone-class/dist/esm/src/constructor.js").ClassInterface<{}> & {
33
+ new (...args: any[]): TagImplInterface;
34
+ prototype: TagImplInterface;
35
+ } & import("../user-mixins/poolify.js").PoolifyMixin<TagImplInterface>>(this: L, id: string): TagImplInterface;
36
+ }) & ObjectConstructor;
37
+ declare class TagMixin extends MixinBase {
38
+ readonly key: string;
34
39
  /**
35
40
  *
36
- * Create
41
+ * Instance properties
42
+ * @ignore
37
43
  *
38
44
  */
39
- static create(payload: PUPPET.payloads.Tag): TagInterface;
45
+ payload?: PUPPET.payloads.Tag;
46
+ readonly id: string;
47
+ readonly groupId?: string;
40
48
  /**
41
49
  * @hideconstructor
42
50
  */
43
- constructor(payload: PUPPET.payloads.Tag);
44
- id(): string;
51
+ constructor(key: string);
45
52
  type(): PUPPET.types.Tag;
46
- groupId(): string;
47
53
  name(): string;
48
- group(): TagGroupInterface | undefined;
49
- private static pool;
54
+ group(): Promise<TagGroupInterface | undefined>;
50
55
  static list(forceSync?: boolean): Promise<TagInterface[]>;
51
- static sync(): Promise<void>;
52
- static load(tag: TagIdentifier): TagInterface | undefined;
56
+ static find(identifier: TagIdentifier): Promise<TagInterface | undefined>;
57
+ /**
58
+ * Force reload data for Tag, Sync data from low-level API again.
59
+ *
60
+ * @returns {Promise<this>}
61
+ * @example
62
+ * await tag.sync()
63
+ */
64
+ sync(): Promise<void>;
65
+ /**
66
+ * @ignore
67
+ */
68
+ isReady(): boolean;
69
+ /**
70
+ * `ready()` is For FrameWork ONLY!
71
+ *
72
+ * Please not to use `ready()` at the user land.
73
+ * If you want to sync data, use `sync()` instead.
74
+ *
75
+ * @ignore
76
+ */
77
+ ready(forceSync?: boolean): Promise<void>;
53
78
  contactList(): Promise<ContactInterface[]>;
54
79
  tag(contacts: ContactInterface | ContactInterface[]): Promise<void>;
55
80
  static createTag(name: string, tagGroup?: TagGroupInterface): Promise<TagInterface | void>;
56
81
  static deleteTag(tagInstance: TagInterface): Promise<void>;
57
82
  toString(): string;
58
83
  }
84
+ declare const TagImplBase_base: {
85
+ new (...args: any[]): {};
86
+ valid: (o: any) => o is TagImplInterface;
87
+ validInstance: (target: any) => target is TagMixin;
88
+ validInterface: (target: any) => target is TagImplInterface;
89
+ } & typeof TagMixin;
90
+ declare class TagImplBase extends TagImplBase_base {
91
+ }
92
+ interface TagImplInterface extends TagImplBase {
93
+ }
94
+ declare type TagProtectedProperty = 'ready';
95
+ declare type TagInterface = Omit<TagImplInterface, TagProtectedProperty>;
59
96
  declare const TagImpl_base: {
60
97
  new (...args: any[]): {};
61
98
  valid: (o: any) => o is TagInterface;
62
- validInstance: (target: any) => target is TagMixin;
99
+ validInstance: (target: any) => target is TagImplBase;
63
100
  validInterface: (target: any) => target is TagInterface;
64
- } & typeof TagMixin;
101
+ } & typeof TagImplBase;
65
102
  declare class TagImpl extends TagImpl_base {
66
103
  }
67
- interface TagInterface extends TagImpl {
68
- }
69
- declare type TagConstructor = Constructor<TagInterface, typeof TagImpl>;
70
- export type { TagConstructor, TagInterface, };
104
+ declare type TagConstructor = Constructor<TagImplInterface, Omit<typeof TagImpl, 'load'>>;
105
+ export type { TagConstructor, TagProtectedProperty, TagInterface, };
71
106
  export { TagImpl, };
72
107
  //# sourceMappingURL=tag.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"tag.d.ts","sourceRoot":"","sources":["../../../../src/user-modules/tag.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,KAAK,MAAM,MAAM,sBAAsB,CAAA;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAEjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAO9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AACpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;;;;;;;;AAEvD,cAAM,QAAS,SAAQ,aAAoB;aAiBvB,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,GAAG;IAf9C;;;;OAIG;IACH,MAAM,CAAC,MAAM,CAAE,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,GAAG,GAAG,YAAY;IAM1D;;OAEG;gBAEe,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,GAAG;IAM9C,EAAE,IAAK,MAAM;IAIb,IAAI,IAAK,MAAM,CAAC,KAAK,CAAC,GAAG;IAIzB,OAAO,IAAK,MAAM;IAIlB,IAAI,IAAK,MAAM;IAIf,KAAK,IAAK,iBAAiB,GAAG,SAAS;IAIvC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAqB;WAE3B,IAAI,CAAE,SAAS,UAAQ,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;WAkBjD,IAAI,IAAK,OAAO,CAAC,IAAI,CAAC;IAMnC,MAAM,CAAC,IAAI,CAAE,GAAG,EAAE,aAAa,GAAG,YAAY,GAAG,SAAS;IAWpD,WAAW,IAAK,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAS3C,GAAG,CAAE,QAAQ,EAAE,gBAAgB,GAAG,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;WAa7D,SAAS,CAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;WAgBpF,SAAS,CAAE,WAAW,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAcxD,QAAQ;CAIlB;;;;;;;AAED,cAAM,OAAQ,SAAQ,YAAyC;CAAG;AAClE,UAAU,YAAa,SAAQ,OAAO;CAAG;AAEzC,aAAK,cAAc,GAAG,WAAW,CAC/B,YAAY,EACZ,OAAO,OAAO,CACf,CAAA;AAED,YAAY,EACV,cAAc,EACd,YAAY,GACb,CAAA;AACD,OAAO,EACL,OAAO,GACR,CAAA"}
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,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAGjE,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;aAgBZ,GAAG,EAAE,MAAM;IAd7B;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAA;IAC7B,SAAgB,EAAE,EAAE,MAAM,CAAA;IAC1B,SAAgB,OAAO,CAAC,EAAE,MAAM,CAAA;IAEhC;;OAEG;gBAEe,GAAG,EAAE,MAAM;IAQ7B,IAAI,IAAK,MAAM,CAAC,KAAK,CAAC,GAAG;IAIzB,IAAI,IAAK,MAAM;IAIT,KAAK,IAAK,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;WAIzC,IAAI,CAAE,SAAS,UAAQ,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;WA2BjD,IAAI,CAAE,UAAU,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAchF;;;;;;OAMG;IACG,IAAI,IAAK,OAAO,CAAC,IAAI,CAAC;IAQ5B;;OAEG;IACH,OAAO,IAAK,OAAO;IAInB;;;;;;;OAOG;IACG,KAAK,CACT,SAAS,UAAQ,GAChB,OAAO,CAAC,IAAI,CAAC;IAwBV,WAAW,IAAK,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAS3C,GAAG,CAAE,QAAQ,EAAE,gBAAgB,GAAG,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;WAa7D,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;IAaxD,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"}
@@ -1,53 +1,100 @@
1
1
  "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
2
25
  Object.defineProperty(exports, "__esModule", { value: true });
3
26
  exports.TagImpl = void 0;
27
+ /**
28
+ * Wechaty Chatbot SDK - https://github.com/wechaty/wechaty
29
+ *
30
+ * @copyright 2016 Huan LI (李卓桓) <https://github.com/huan>, and
31
+ * Wechaty Contributors <https://github.com/wechaty>.
32
+ *
33
+ * Licensed under the Apache License, Version 2.0 (the "License");
34
+ * you may not use this file except in compliance with the License.
35
+ * You may obtain a copy of the License at
36
+ *
37
+ * http://www.apache.org/licenses/LICENSE-2.0
38
+ *
39
+ * Unless required by applicable law or agreed to in writing, software
40
+ * distributed under the License is distributed on an "AS IS" BASIS,
41
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
42
+ * See the License for the specific language governing permissions and
43
+ * limitations under the License.
44
+ *
45
+ */
46
+ const PUPPET = __importStar(require("@juzi/wechaty-puppet"));
47
+ const helpers_1 = require("@juzi/wechaty-puppet/helpers");
48
+ const rx_queue_1 = require("rx-queue");
4
49
  const config_js_1 = require("../config.js");
50
+ const poolify_js_1 = require("../user-mixins/poolify.js");
5
51
  const validation_js_1 = require("../user-mixins/validation.js");
6
52
  const wechatify_js_1 = require("../user-mixins/wechatify.js");
7
- class TagMixin extends (0, wechatify_js_1.wechatifyMixinBase)() {
8
- payload;
53
+ const MixinBase = (0, wechatify_js_1.wechatifyMixin)((0, poolify_js_1.poolifyMixin)(Object)());
54
+ class TagMixin extends MixinBase {
55
+ key;
9
56
  /**
10
57
  *
11
- * Create
58
+ * Instance properties
59
+ * @ignore
12
60
  *
13
61
  */
14
- static create(payload) {
15
- config_js_1.log.verbose('Tag', 'create()');
16
- return new this(payload);
17
- }
62
+ payload;
63
+ id;
64
+ groupId;
18
65
  /**
19
66
  * @hideconstructor
20
67
  */
21
- constructor(payload) {
68
+ constructor(key) {
22
69
  super();
23
- this.payload = payload;
70
+ this.key = key;
71
+ this.groupId = this.key.split(config_js_1.FOUR_PER_EM_SPACE)[0];
72
+ this.id = this.key.split(config_js_1.FOUR_PER_EM_SPACE)[1];
24
73
  config_js_1.log.silly('Tag', 'constructor()');
25
74
  }
26
- id() {
27
- return this.payload.id;
28
- }
29
75
  type() {
30
- return this.payload.type;
31
- }
32
- groupId() {
33
- return this.payload.groupId || '';
76
+ return (this.payload && this.payload.type) || PUPPET.types.Tag.Personal;
34
77
  }
35
78
  name() {
36
- return this.payload.name;
79
+ return (this.payload && this.payload.name) || '';
37
80
  }
38
- group() {
39
- return this.wechaty.TagGroup.load(this.groupId());
81
+ async group() {
82
+ return this.groupId ? this.wechaty.TagGroup.find(this.groupId) : undefined;
40
83
  }
41
- static pool = [];
42
84
  static async list(forceSync = false) {
43
85
  config_js_1.log.verbose('Tag', 'list(%s)', forceSync);
44
- if (this.pool.length > 0 && !forceSync) {
45
- return this.pool;
46
- }
47
86
  try {
48
- const payloads = await this.wechaty.puppet.tagTagList();
49
- this.pool = payloads.map(payload => new this(payload));
50
- return this.pool;
87
+ const tagIdentifierList = await this.wechaty.puppet.tagTagList();
88
+ const identifierToTag = async (identifier) => this.find(identifier).catch(e => this.wechaty.emitError(e));
89
+ const CONCURRENCY = 17;
90
+ const tagIterator = (0, rx_queue_1.concurrencyExecuter)(CONCURRENCY)(identifierToTag)(tagIdentifierList);
91
+ const tagList = [];
92
+ for await (const tag of tagIterator) {
93
+ if (tag) {
94
+ tagList.push(tag);
95
+ }
96
+ }
97
+ return tagList;
51
98
  }
52
99
  catch (e) {
53
100
  this.wechaty.emitError(e);
@@ -55,29 +102,74 @@ class TagMixin extends (0, wechatify_js_1.wechatifyMixinBase)() {
55
102
  return [];
56
103
  }
57
104
  }
58
- static async sync() {
59
- config_js_1.log.verbose('Tag', 'sync()');
60
- await this.list(true);
105
+ static async find(identifier) {
106
+ config_js_1.log.silly('Tag', 'find(%s)', JSON.stringify(identifier));
107
+ const tag = this.wechaty.Tag.load((0, helpers_1.getTagKey)(identifier));
108
+ try {
109
+ await tag.ready();
110
+ }
111
+ catch (e) {
112
+ this.wechaty.emitError(e);
113
+ return undefined;
114
+ }
115
+ return tag;
61
116
  }
62
- static load(tag) {
63
- config_js_1.log.verbose('TagGroup', 'load(%s)', tag);
64
- for (const item of this.pool) {
65
- if (item.id() === tag.id && (item.groupId() === tag.groupId || (!item.groupId() && !tag.groupId))) {
66
- return item;
67
- }
117
+ /**
118
+ * Force reload data for Tag, Sync data from low-level API again.
119
+ *
120
+ * @returns {Promise<this>}
121
+ * @example
122
+ * await tag.sync()
123
+ */
124
+ async sync() {
125
+ await this.wechaty.puppet.tagPayloadDirty((0, helpers_1.getTagKey)({
126
+ id: this.id,
127
+ groupId: this.groupId,
128
+ }));
129
+ await this.ready(true);
130
+ }
131
+ /**
132
+ * @ignore
133
+ */
134
+ isReady() {
135
+ return !!(this.payload && this.payload.name);
136
+ }
137
+ /**
138
+ * `ready()` is For FrameWork ONLY!
139
+ *
140
+ * Please not to use `ready()` at the user land.
141
+ * If you want to sync data, use `sync()` instead.
142
+ *
143
+ * @ignore
144
+ */
145
+ async ready(forceSync = false) {
146
+ config_js_1.log.silly('Tag', 'ready() @ %s with Tag key="%s"', this.wechaty.puppet, this.key);
147
+ if (!forceSync && this.isReady()) { // already ready
148
+ config_js_1.log.silly('Tag', 'ready() isReady() true');
149
+ return;
150
+ }
151
+ try {
152
+ this.payload = await this.wechaty.puppet.tagPayload({
153
+ id: this.id,
154
+ groupId: this.groupId,
155
+ });
156
+ }
157
+ catch (e) {
158
+ this.wechaty.emitError(e);
159
+ config_js_1.log.verbose('Tag', 'ready() this.wechaty.puppet.tagPayload(%s) exception: %s', this.id, e.message);
160
+ throw e;
68
161
  }
69
- return undefined;
70
162
  }
71
163
  async contactList() {
72
164
  config_js_1.log.verbose('Tag', 'contactList() for tag : %s', this);
73
- const tag = { id: this.id(), groupId: this.groupId() };
165
+ const tag = { id: this.id, groupId: this.groupId };
74
166
  const contactIds = await this.wechaty.puppet.tagTagContactList(tag);
75
167
  const contactPromises = contactIds.map(id => this.wechaty.Contact.find({ id }));
76
168
  return Promise.all(contactPromises);
77
169
  }
78
170
  async tag(contacts) {
79
171
  config_js_1.log.verbose('Tag', 'tag(%s) for tag : %s', contacts, this);
80
- const tag = { id: this.id(), groupId: this.groupId() };
172
+ const tag = { id: this.id, groupId: this.groupId };
81
173
  let contactIds;
82
174
  if (Array.isArray(contacts)) {
83
175
  contactIds = contacts.map(c => c.id);
@@ -90,24 +182,22 @@ class TagMixin extends (0, wechatify_js_1.wechatifyMixinBase)() {
90
182
  static async createTag(name, tagGroup) {
91
183
  config_js_1.log.verbose('Tag', 'createTag(%s, %s)', tagGroup, name);
92
184
  try {
93
- const payload = await this.wechaty.puppet.tagTagAdd(name, tagGroup?.name());
94
- if (payload) {
95
- const newTag = new this(payload);
96
- this.pool.push(newTag);
185
+ const tagIdentifier = await this.wechaty.puppet.tagTagAdd(name, tagGroup?.name());
186
+ if (tagIdentifier) {
187
+ const newTag = await this.find(tagIdentifier);
97
188
  return newTag;
98
189
  }
99
190
  }
100
191
  catch (e) {
101
192
  this.wechaty.emitError(e);
102
- config_js_1.log.error('Contact', 'createTag() exception: %s', e.message);
193
+ config_js_1.log.error('Tag', 'createTag() exception: %s', e.message);
103
194
  }
104
195
  }
105
196
  static async deleteTag(tagInstance) {
106
197
  config_js_1.log.verbose('Tag', 'deleteTag(%s, %s)', tagInstance);
107
- const tag = { id: tagInstance.id(), groupId: tagInstance.groupId() };
198
+ const tagIdentifier = { id: tagInstance.id, groupId: tagInstance.groupId };
108
199
  try {
109
- await this.wechaty.puppet.tagTagDelete(tag);
110
- this.pool.splice(this.pool.indexOf(tagInstance), 1);
200
+ await this.wechaty.puppet.tagTagDelete(tagIdentifier);
111
201
  }
112
202
  catch (e) {
113
203
  this.wechaty.emitError(e);
@@ -115,10 +205,12 @@ class TagMixin extends (0, wechatify_js_1.wechatifyMixinBase)() {
115
205
  }
116
206
  }
117
207
  toString() {
118
- return `<Tag#${this.name() || this.id()}>`;
208
+ return `<Tag#${this.name() || this.id}>`;
119
209
  }
120
210
  }
121
- class TagImpl extends (0, validation_js_1.validationMixin)(TagMixin)() {
211
+ class TagImplBase extends (0, validation_js_1.validationMixin)(TagMixin)() {
212
+ }
213
+ class TagImpl extends (0, validation_js_1.validationMixin)(TagImplBase)() {
122
214
  }
123
215
  exports.TagImpl = TagImpl;
124
216
  //# sourceMappingURL=tag.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"tag.js","sourceRoot":"","sources":["../../../../src/user-modules/tag.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tag.js","sourceRoot":"","sources":["../../../../src/user-modules/tag.ts"],"names":[],"mappings":"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"}