@juzi/wechaty 1.0.23 → 1.0.26

package/dist/cjs/src/user-modules/tag-group.js

@@ -1,44 +1,46 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TagGroupImpl = void 0;
+const rx_queue_1 = require("rx-queue");
 const config_js_1 = require("../config.js");
+const poolify_js_1 = require("../user-mixins/poolify.js");
 const validation_js_1 = require("../user-mixins/validation.js");
 const wechatify_js_1 = require("../user-mixins/wechatify.js");
-class TagGroupMixin extends (0, wechatify_js_1.wechatifyMixinBase)() {
-    payload;
+const MixinBase = (0, wechatify_js_1.wechatifyMixin)((0, poolify_js_1.poolifyMixin)(Object)());
+class TagGroupMixin extends MixinBase {
+    id;
     /**
      *
-     * Create
+     * Instance properties
+     * @ignore
      *
      */
-    static create(payload) {
-        config_js_1.log.verbose('TagGroup', 'create()');
-        return new this(payload);
-    }
+    payload;
     /**
      * @hideconstructor
      */
-    constructor(payload) {
+    constructor(id) {
         super();
-        this.payload = payload;
+        this.id = id;
         config_js_1.log.silly('TagGroup', 'constructor()');
     }
-    id() {
-        return this.payload.id;
-    }
     name() {
-        return this.payload.name;
+        return (this.payload && this.payload.name) || '';
     }
-    static pool = [];
-    static async list(forceSync = false) {
-        config_js_1.log.verbose('TagGroup', 'list(%s)', forceSync);
-        if (this.pool.length > 0 && !forceSync) {
-            return this.pool;
-        }
+    static async list() {
+        config_js_1.log.verbose('TagGroup', 'list()');
         try {
-            const payloads = await this.wechaty.puppet.tagGroupList();
-            this.pool = payloads.map(payload => new this(payload));
-            return this.pool;
+            const tagGroupIds = await this.wechaty.puppet.tagGroupList();
+            const idToTagGroup = async (id) => this.find({ id }).catch(e => this.wechaty.emitError(e));
+            const CONCURRENCY = 17;
+            const tagGroupIterator = (0, rx_queue_1.concurrencyExecuter)(CONCURRENCY)(idToTagGroup)(tagGroupIds);
+            const tagGroupList = [];
+            for await (const tagGroup of tagGroupIterator) {
+                if (tagGroup) {
+                    tagGroupList.push(tagGroup);
+                }
+            }
+            return tagGroupList;
         }
         catch (e) {
             this.wechaty.emitError(e);
@@ -46,26 +48,12 @@ class TagGroupMixin extends (0, wechatify_js_1.wechatifyMixinBase)() {
             return [];
         }
     }
-    static async sync() {
-        config_js_1.log.verbose('TagGroup', 'sync()');
-        await this.list(true);
-    }
-    static load(tagGroupId) {
-        config_js_1.log.verbose('TagGroup', 'load(%s)', tagGroupId);
-        for (const item of this.pool) {
-            if (item.id() === tagGroupId) {
-                return item;
-            }
-        }
-        return undefined;
-    }
     static async createTagGroup(name) {
         config_js_1.log.verbose('TagGroup', 'createTagGroup(%s, %s)', name);
         try {
-            const payload = await this.wechaty.puppet.tagGroupAdd(name);
-            if (payload) {
-                const newTagGroup = new this(payload);
-                this.pool.push(newTagGroup);
+            const groupId = await this.wechaty.puppet.tagGroupAdd(name);
+            if (groupId) {
+                const newTagGroup = await this.find({ id: groupId });
                 return newTagGroup;
             }
         }
@@ -77,8 +65,7 @@ class TagGroupMixin extends (0, wechatify_js_1.wechatifyMixinBase)() {
     static async deleteTagGroup(tagGroup) {
         config_js_1.log.verbose('TagGroup', 'deleteTagGroup(%s)', tagGroup);
         try {
-            await this.wechaty.puppet.tagGroupDelete(tagGroup.id());
-            this.pool.splice(this.pool.indexOf(tagGroup), 1);
+            await this.wechaty.puppet.tagGroupDelete(tagGroup.id);
         }
         catch (e) {
             this.wechaty.emitError(e);
@@ -86,13 +73,95 @@ class TagGroupMixin extends (0, wechatify_js_1.wechatifyMixinBase)() {
         }
     }
     async tags() {
-        return (await this.wechaty.Tag.list()).filter(tag => tag.groupId() === this.id());
+        config_js_1.log.verbose('TagGroup', 'tags(%s)', this);
+        try {
+            const tagIdList = await this.wechaty.puppet.tagGroupTagList(this.id);
+            const idToTag = async (tagId) => this.wechaty.Tag.find({ id: tagId }).catch(e => this.wechaty.emitError(e));
+            const CONCURRENCY = 17;
+            const tagIterator = (0, rx_queue_1.concurrencyExecuter)(CONCURRENCY)(idToTag)(tagIdList);
+            const tagList = [];
+            for await (const tag of tagIterator) {
+                if (tag) {
+                    tagList.push(tag);
+                }
+            }
+            return tagList;
+        }
+        catch (e) {
+            this.wechaty.emitError(e);
+            config_js_1.log.error('TagGroup', 'list() exception: %s', e.message);
+            return [];
+        }
+    }
+    static async find(filter) {
+        config_js_1.log.silly('TagGroup', 'find(%s)', JSON.stringify(filter));
+        if (filter.id) {
+            const tagGroup = this.wechaty.TagGroup.load(filter.id);
+            try {
+                await tagGroup.ready();
+            }
+            catch (e) {
+                this.wechaty.emitError(e);
+                return undefined;
+            }
+            return tagGroup;
+        }
+        if (filter.name) {
+            const tagGroups = (await this.wechaty.TagGroup.list()).filter(tagGroup => tagGroup.name() === filter.name);
+            if (tagGroups.length > 0) {
+                return tagGroups[0];
+            }
+        }
+        return undefined;
+        // TODO: use a puppet method to find tag, like how contact and room do it
+    }
+    /**
+     * Force reload data for TagGroup, Sync data from low-level API again.
+     *
+     * @returns {Promise<this>}
+     * @example
+     * await tagGroup.sync()
+     */
+    async sync() {
+        await this.wechaty.puppet.tagGroupPayloadDirty(this.id);
+        await this.ready(true);
+    }
+    /**
+     * @ignore
+     */
+    isReady() {
+        return !!(this.payload);
+    }
+    /**
+     * `ready()` is For FrameWork ONLY!
+     *
+     * Please not to use `ready()` at the user land.
+     * If you want to sync data, use `sync()` instead.
+     *
+     * @ignore
+     */
+    async ready(forceSync = false) {
+        config_js_1.log.silly('TagGroup', 'ready() @ %s with TagGroup="%s"', this.wechaty.puppet, this.id);
+        if (!forceSync && this.isReady()) { // already ready
+            config_js_1.log.silly('TagGroup', 'ready() isReady() true');
+            return;
+        }
+        try {
+            this.payload = await this.wechaty.puppet.tagGroupPayload(this.id);
+        }
+        catch (e) {
+            this.wechaty.emitError(e);
+            config_js_1.log.verbose('TagGroup', 'ready() this.wechaty.puppet.tagGroupPayload(%s) exception: %s', this.id, e.message);
+            throw e;
+        }
     }
     toString() {
-        return `<TagGroup#${this.name() || this.id()}>`;
+        return `<TagGroup#${this.name() || this.id}>`;
     }
 }
-class TagGroupImpl extends (0, validation_js_1.validationMixin)(TagGroupMixin)() {
+class TagGroupImplBase extends (0, validation_js_1.validationMixin)(TagGroupMixin)() {
+}
+class TagGroupImpl extends (0, validation_js_1.validationMixin)(TagGroupImplBase)() {
 }
 exports.TagGroupImpl = TagGroupImpl;
 //# sourceMappingURL=tag-group.js.map

package/dist/cjs/src/user-modules/tag-group.js.map

@@ -1 +1 @@
-{"version":3,"file":"tag-group.js","sourceRoot":"","sources":["../../../../src/user-modules/tag-group.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tag-group.js","sourceRoot":"","sources":["../../../../src/user-modules/tag-group.ts"],"names":[],"mappings":"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"}

package/dist/cjs/src/user-modules/tag.d.ts

@@ -17,56 +17,90 @@
  *   limitations under the License.
  *
  */
-import type * as PUPPET from '@juzi/wechaty-puppet';
-import type { TagIdentifier } from '@juzi/wechaty-puppet/filters';
+import * as PUPPET from '@juzi/wechaty-puppet';
+import type { TagQueryFilter } from '@juzi/wechaty-puppet/dist/esm/src/schemas/tag.js';
 import type { Constructor } from 'clone-class';
 import type { ContactInterface } from './contact.js';
 import type { TagGroupInterface } from './tag-group.js';
-declare const TagMixin_base: ((abstract new (...args: any[]) => {
+declare const MixinBase: ((abstract new (...args: any[]) => {
     readonly wechaty: import("../wechaty/wechaty-impl.js").WechatyInterface;
 }) & {
     readonly wechaty: import("../wechaty/wechaty-impl.js").WechatyInterface;
-}) & {
-    new (): {};
-};
-declare class TagMixin extends TagMixin_base {
-    readonly payload: PUPPET.payloads.Tag;
+}) & ((abstract new (...args: any[]) => {}) & {
+    _pool?: Map<string, TagImplInterface> | undefined;
+    readonly pool: Map<string, TagImplInterface>;
+    load<L extends import("clone-class/dist/esm/src/constructor.js").ClassInterface<{}> & {
+        new (...args: any[]): TagImplInterface;
+        prototype: TagImplInterface;
+    } & import("../user-mixins/poolify.js").PoolifyMixin<TagImplInterface>>(this: L, id: string): TagImplInterface;
+}) & ObjectConstructor;
+declare class TagMixin extends MixinBase {
+    readonly id: string;
     /**
      *
-     * Create
+     * Instance properties
+     * @ignore
      *
      */
-    static create(payload: PUPPET.payloads.Tag): TagInterface;
+    payload?: PUPPET.payloads.Tag;
     /**
      * @hideconstructor
      */
-    constructor(payload: PUPPET.payloads.Tag);
-    id(): string;
+    constructor(id: string);
     type(): PUPPET.types.Tag;
-    groupId(): string;
     name(): string;
-    group(): TagGroupInterface | undefined;
-    private static pool;
-    static list(forceSync?: boolean): Promise<TagInterface[]>;
-    static sync(): Promise<void>;
-    static load(tag: TagIdentifier): TagInterface | undefined;
+    groupId(): string;
+    group(): Promise<TagGroupInterface | undefined>;
+    static list(): Promise<TagInterface[]>;
+    static find(filter: TagQueryFilter): Promise<TagInterface | undefined>;
+    /**
+     * Force reload data for Tag, Sync data from low-level API again.
+     *
+     * @returns {Promise<this>}
+     * @example
+     * await tag.sync()
+     */
+    sync(): Promise<void>;
+    /**
+     * @ignore
+     */
+    isReady(): boolean;
+    /**
+     * `ready()` is For FrameWork ONLY!
+     *
+     * Please not to use `ready()` at the user land.
+     * If you want to sync data, use `sync()` instead.
+     *
+     * @ignore
+     */
+    ready(forceSync?: boolean): Promise<void>;
     contactList(): Promise<ContactInterface[]>;
     tag(contacts: ContactInterface | ContactInterface[]): Promise<void>;
     static createTag(name: string, tagGroup?: TagGroupInterface): Promise<TagInterface | void>;
     static deleteTag(tagInstance: TagInterface): Promise<void>;
     toString(): string;
 }
+declare const TagImplBase_base: {
+    new (...args: any[]): {};
+    valid: (o: any) => o is TagImplInterface;
+    validInstance: (target: any) => target is TagMixin;
+    validInterface: (target: any) => target is TagImplInterface;
+} & typeof TagMixin;
+declare class TagImplBase extends TagImplBase_base {
+}
+interface TagImplInterface extends TagImplBase {
+}
+declare type TagProtectedProperty = 'ready';
+declare type TagInterface = Omit<TagImplInterface, TagProtectedProperty>;
 declare const TagImpl_base: {
     new (...args: any[]): {};
     valid: (o: any) => o is TagInterface;
-    validInstance: (target: any) => target is TagMixin;
+    validInstance: (target: any) => target is TagImplBase;
     validInterface: (target: any) => target is TagInterface;
-} & typeof TagMixin;
+} & typeof TagImplBase;
 declare class TagImpl extends TagImpl_base {
 }
-interface TagInterface extends TagImpl {
-}
-declare type TagConstructor = Constructor<TagInterface, typeof TagImpl>;
-export type { TagConstructor, TagInterface, };
+declare type TagConstructor = Constructor<TagImplInterface, Omit<typeof TagImpl, 'load'>>;
+export type { TagConstructor, TagProtectedProperty, TagInterface, };
 export { TagImpl, };
 //# sourceMappingURL=tag.d.ts.map

package/dist/cjs/src/user-modules/tag.d.ts.map

@@ -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"}
+{"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;WA2BhC,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"}

package/dist/cjs/src/user-modules/tag.js

@@ -1,53 +1,98 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TagImpl = void 0;
+/**
+ *   Wechaty Chatbot SDK - https://github.com/wechaty/wechaty
+ *
+ *   @copyright 2016 Huan LI (李卓桓) <https://github.com/huan>, and
+ *                   Wechaty Contributors <https://github.com/wechaty>.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+const PUPPET = __importStar(require("@juzi/wechaty-puppet"));
+const rx_queue_1 = require("rx-queue");
 const config_js_1 = require("../config.js");
+const poolify_js_1 = require("../user-mixins/poolify.js");
 const validation_js_1 = require("../user-mixins/validation.js");
 const wechatify_js_1 = require("../user-mixins/wechatify.js");
-class TagMixin extends (0, wechatify_js_1.wechatifyMixinBase)() {
-    payload;
+const MixinBase = (0, wechatify_js_1.wechatifyMixin)((0, poolify_js_1.poolifyMixin)(Object)());
+class TagMixin extends MixinBase {
+    id;
     /**
      *
-     * Create
+     * Instance properties
+     * @ignore
      *
      */
-    static create(payload) {
-        config_js_1.log.verbose('Tag', 'create()');
-        return new this(payload);
-    }
+    payload;
     /**
      * @hideconstructor
      */
-    constructor(payload) {
+    constructor(id) {
         super();
-        this.payload = payload;
+        this.id = id;
         config_js_1.log.silly('Tag', 'constructor()');
     }
-    id() {
-        return this.payload.id;
-    }
     type() {
-        return this.payload.type;
-    }
-    groupId() {
-        return this.payload.groupId || '';
+        return (this.payload && this.payload.type) || PUPPET.types.Tag.Unspecific;
     }
     name() {
-        return this.payload.name;
+        return (this.payload && this.payload.name) || '';
     }
-    group() {
-        return this.wechaty.TagGroup.load(this.groupId());
+    groupId() {
+        return (this.payload && this.payload.groupId) || '';
     }
-    static pool = [];
-    static async list(forceSync = false) {
-        config_js_1.log.verbose('Tag', 'list(%s)', forceSync);
-        if (this.pool.length > 0 && !forceSync) {
-            return this.pool;
-        }
+    async group() {
+        return this.payload?.groupId ? this.wechaty.TagGroup.find({ id: this.payload.groupId }) : undefined;
+    }
+    static async list() {
+        config_js_1.log.verbose('Tag', 'list()');
         try {
-            const payloads = await this.wechaty.puppet.tagTagList();
-            this.pool = payloads.map(payload => new this(payload));
-            return this.pool;
+            const tagIdList = await this.wechaty.puppet.tagTagList();
+            const idToTag = async (id) => this.find({ id }).catch(e => this.wechaty.emitError(e));
+            const CONCURRENCY = 17;
+            const tagIterator = (0, rx_queue_1.concurrencyExecuter)(CONCURRENCY)(idToTag)(tagIdList);
+            const tagList = [];
+            for await (const tag of tagIterator) {
+                if (tag) {
+                    tagList.push(tag);
+                }
+            }
+            return tagList;
         }
         catch (e) {
             this.wechaty.emitError(e);
@@ -55,29 +100,76 @@ class TagMixin extends (0, wechatify_js_1.wechatifyMixinBase)() {
             return [];
         }
     }
-    static async sync() {
-        config_js_1.log.verbose('Tag', 'sync()');
-        await this.list(true);
-    }
-    static load(tag) {
-        config_js_1.log.verbose('TagGroup', 'load(%s)', tag);
-        for (const item of this.pool) {
-            if (item.id() === tag.id && (item.groupId() === tag.groupId || (!item.groupId() && !tag.groupId))) {
-                return item;
+    static async find(filter) {
+        config_js_1.log.silly('Tag', 'find(%s)', JSON.stringify(filter));
+        if (filter.id) {
+            const tag = this.wechaty.Tag.load(filter.id);
+            try {
+                await tag.ready();
+            }
+            catch (e) {
+                this.wechaty.emitError(e);
+                return undefined;
+            }
+            return tag;
+        }
+        if (filter.name) {
+            const tags = (await this.wechaty.Tag.list()).filter(t => t.name() === filter.name);
+            if (tags.length > 0) {
+                return tags[0];
             }
         }
         return undefined;
+        // TODO: use a puppet method to find tag, like how contact and room do it
+    }
+    /**
+     * Force reload data for Tag, Sync data from low-level API again.
+     *
+     * @returns {Promise<this>}
+     * @example
+     * await tag.sync()
+     */
+    async sync() {
+        await this.wechaty.puppet.tagPayloadDirty(this.id);
+        await this.ready(true);
+    }
+    /**
+     * @ignore
+     */
+    isReady() {
+        return !!(this.payload && this.payload.name);
+    }
+    /**
+     * `ready()` is For FrameWork ONLY!
+     *
+     * Please not to use `ready()` at the user land.
+     * If you want to sync data, use `sync()` instead.
+     *
+     * @ignore
+     */
+    async ready(forceSync = false) {
+        config_js_1.log.silly('Tag', 'ready() @ %s with Tag key="%s"', this.wechaty.puppet, this.id);
+        if (!forceSync && this.isReady()) { // already ready
+            config_js_1.log.silly('Tag', 'ready() isReady() true');
+            return;
+        }
+        try {
+            this.payload = await this.wechaty.puppet.tagPayload(this.id);
+        }
+        catch (e) {
+            this.wechaty.emitError(e);
+            config_js_1.log.verbose('Tag', 'ready() this.wechaty.puppet.tagPayload(%s) exception: %s', this.id, e.message);
+            throw e;
+        }
     }
     async contactList() {
         config_js_1.log.verbose('Tag', 'contactList() for tag : %s', this);
-        const tag = { id: this.id(), groupId: this.groupId() };
-        const contactIds = await this.wechaty.puppet.tagTagContactList(tag);
+        const contactIds = await this.wechaty.puppet.tagTagContactList(this.id);
         const contactPromises = contactIds.map(id => this.wechaty.Contact.find({ id }));
         return Promise.all(contactPromises);
     }
     async tag(contacts) {
         config_js_1.log.verbose('Tag', 'tag(%s) for tag : %s', contacts, this);
-        const tag = { id: this.id(), groupId: this.groupId() };
         let contactIds;
         if (Array.isArray(contacts)) {
             contactIds = contacts.map(c => c.id);
@@ -85,29 +177,26 @@ class TagMixin extends (0, wechatify_js_1.wechatifyMixinBase)() {
         else {
             contactIds = [contacts.id];
         }
-        await this.wechaty.puppet.tagContactTagAdd([tag], contactIds);
+        await this.wechaty.puppet.tagContactTagAdd([this.id], contactIds);
     }
     static async createTag(name, tagGroup) {
         config_js_1.log.verbose('Tag', 'createTag(%s, %s)', tagGroup, name);
         try {
-            const payload = await this.wechaty.puppet.tagTagAdd(name, tagGroup?.name());
-            if (payload) {
-                const newTag = new this(payload);
-                this.pool.push(newTag);
+            const tagId = await this.wechaty.puppet.tagTagAdd(name, tagGroup?.name());
+            if (tagId) {
+                const newTag = await this.find({ id: tagId });
                 return newTag;
             }
         }
         catch (e) {
             this.wechaty.emitError(e);
-            config_js_1.log.error('Contact', 'createTag() exception: %s', e.message);
+            config_js_1.log.error('Tag', 'createTag() exception: %s', e.message);
         }
     }
     static async deleteTag(tagInstance) {
         config_js_1.log.verbose('Tag', 'deleteTag(%s, %s)', tagInstance);
-        const tag = { id: tagInstance.id(), groupId: tagInstance.groupId() };
         try {
-            await this.wechaty.puppet.tagTagDelete(tag);
-            this.pool.splice(this.pool.indexOf(tagInstance), 1);
+            await this.wechaty.puppet.tagTagDelete(tagInstance.id);
         }
         catch (e) {
             this.wechaty.emitError(e);
@@ -115,10 +204,12 @@ class TagMixin extends (0, wechatify_js_1.wechatifyMixinBase)() {
         }
     }
     toString() {
-        return `<Tag#${this.name() || this.id()}>`;
+        return `<Tag#${this.name() || this.id}>`;
     }
 }
-class TagImpl extends (0, validation_js_1.validationMixin)(TagMixin)() {
+class TagImplBase extends (0, validation_js_1.validationMixin)(TagMixin)() {
+}
+class TagImpl extends (0, validation_js_1.validationMixin)(TagImplBase)() {
 }
 exports.TagImpl = TagImpl;
 //# sourceMappingURL=tag.js.map