@juzi/wechaty 1.0.83 → 1.0.85

package/src/wechaty-mixins/puppet-mixin.ts

@@ -28,8 +28,7 @@ import type {
 
 import type { GErrorMixin } from './gerror-mixin.js'
 import type { IoMixin }     from './io-mixin.js'
-import { ContactImportantFields, ContactUpdatableValuePair, InfoUpdateInterface, RoomImportantFields, RoomUpdatableValuePair } from '../schemas/update.js'
-import { checkUntilChanged, diffPayload } from '../pure-functions/update.js'
+import { checkUntilChanged } from '../pure-functions/retry-policy.js'
 
 const PUPPET_MEMORY_NAME = 'puppet'
 
@@ -260,6 +259,16 @@ const puppetMixin = <MixinBase extends WechatifyUserModuleMixin & GErrorMixin &
                   throw new Error('no contact found for id: ' + payload.contactId)
                 }
                 this.emit('login', contact)
+                const readyTimeout = setTimeout(() => {
+                  if (this.puppet.readyIndicator.value()) {
+                    this.emit('ready')
+                  }
+                }, 15 * 1000)
+                puppet.once('ready', () => {
+                  // if we got ready from puppet, we don't have to fire it here.
+                  // it will be fired by ready listener
+                  clearTimeout(readyTimeout)
+                })
               } catch (e) {
                 this.emit('error', GError.from(e))
               }
@@ -642,116 +651,12 @@ const puppetMixin = <MixinBase extends WechatifyUserModuleMixin & GErrorMixin &
                 switch (payloadType) {
                   case PUPPET.types.Payload.Contact: {
                     const contact = await this.Contact.find({ id: payloadId }) as unknown as undefined | ContactImpl
-                    const oldPayload = JSON.parse(JSON.stringify(contact?.payload || {}))
                     await contact?.ready(true)
-                    const newPayload = JSON.parse(JSON.stringify(contact?.payload || {}))
-
-                    const differences = diffPayload<PUPPET.payloads.Contact>(oldPayload, newPayload)
-                    if (differences.length === 0) {
-                      log.info('WechatyPuppetMixin', `got dirty for contact ${payloadId} but cannot find any difference. old payload: ${JSON.stringify(oldPayload)}, new payload: ${JSON.stringify(newPayload)}`)
-                      break
-                    }
-
-                    const importantDifferences = differences.filter(ele => ele && ContactImportantFields.some(key => key === ele.key))
-                    const regularDifferences = differences.filter(ele => ele && !ContactImportantFields.some(key => key === ele.key)) as ContactUpdatableValuePair[]
-                    if (regularDifferences.length > 0) {
-                      const updateEvent: InfoUpdateInterface = {
-                        type: payloadType,
-                        id: payloadId,
-                        updates: regularDifferences,
-                      }
-                      this.emit('update', updateEvent)
-                      contact?.emit('update', updateEvent)
-                    }
-                    for (const difference of importantDifferences) {
-                      switch (difference?.key) {
-                        case 'tags': {
-                          const oldTagsSet = new Set(difference.oldValue)
-                          const newTagsSet = new Set(difference.newValue)
-                          const addedTagPromises = difference.newValue?.filter(ele => !oldTagsSet.has(ele)).map(ele => this.Tag.find({ id: ele })) || []
-                          const removedTagPromises = difference.oldValue?.filter(ele => !newTagsSet.has(ele)).map(ele => this.Tag.find({ id: ele })) || []
-                          if (addedTagPromises.length > 0) {
-                            const addedTags = await Promise.all(addedTagPromises)
-                            this.emit('contact-tag-add', contact, addedTags)
-                          }
-                          if (removedTagPromises.length > 0) {
-                            const removedTags = await Promise.all(removedTagPromises)
-                            this.emit('contact-tag-remove', contact, removedTags)
-                          }
-                          break
-                        }
-                        case 'name': {
-                          this.emit('contact-name', contact, difference.newValue || '', difference.oldValue || '')
-                          contact?.emit('name', difference.newValue || '', difference.oldValue || '')
-                          break
-                        }
-                        case 'alias': {
-                          this.emit('contact-alias', contact, difference.newValue || '', difference.oldValue || '')
-                          contact?.emit('alias', difference.newValue || '', difference.oldValue || '')
-                          break
-                        }
-                        case 'phone': {
-                          this.emit('contact-phone', contact, difference.newValue || [], difference.oldValue || [])
-                          contact?.emit('phone', difference.newValue || [], difference.oldValue || [])
-                          break
-                        }
-                        case 'description': {
-                          this.emit('contact-description', contact, difference.newValue || '', difference.oldValue || '')
-                          contact?.emit('description', difference.newValue || '', difference.oldValue || '')
-                          break
-                        }
-                        case 'corporation': {
-                          this.emit('contact-corporation', contact, difference.newValue || '', difference.oldValue || '')
-                          contact?.emit('corporation', difference.newValue || '', difference.oldValue || '')
-                          break
-                        }
-                        default:
-                          log.warn('WechatyPuppetMixin', 'puppet dirty unsupported difference type: %s', JSON.stringify(difference))
-                      }
-                    }
                     break
                   }
                   case PUPPET.types.Payload.Room: {
                     const room = await this.Room.find({ id: payloadId })  as unknown as undefined | RoomImpl
-                    const oldPayload = JSON.parse(JSON.stringify(room?.payload || {}))
                     await room?.ready(true)
-                    const newPayload = JSON.parse(JSON.stringify(room?.payload || {}))
-
-                    const differences = diffPayload<PUPPET.payloads.Room>(oldPayload, newPayload)
-
-                    if (differences.length === 0) {
-                      log.info('WechatyPuppetMixin', `got dirty for room ${payloadId} but cannot find any difference. old payload: ${JSON.stringify(oldPayload)}, new payload: ${JSON.stringify(newPayload)}`)
-                      break
-                    }
-
-                    const importantDifferences = differences.filter(ele => ele && RoomImportantFields.some(key => key === ele.key))
-                    const regularDifferences = differences.filter(ele => ele && !RoomImportantFields.some(key => key === ele.key)) as RoomUpdatableValuePair[]
-                    if (regularDifferences.length > 0) {
-                      const updateEvent: InfoUpdateInterface = {
-                        type: payloadType,
-                        id: payloadId,
-                        updates: regularDifferences,
-                      }
-                      this.emit('update', updateEvent)
-                      room?.emit('update', updateEvent)
-                    }
-                    for (const difference of importantDifferences) {
-                      switch (difference?.key) {
-                        case 'ownerId': {
-                          const oldOwner = (await this.Contact.find({ id: difference.oldValue }))!
-                          const newOwner = (await this.Contact.find({ id: difference.newValue }))!
-                          this.emit('room-owner', room, newOwner, oldOwner)
-                          room?.emit('owner', newOwner, oldOwner)
-                          break
-                        }
-                        case 'memberIdList':
-                          break // this diff has been handled by room-join and room-leave events
-                        case 'topic':
-                          break // this diff has been handled by room-topic event
-                        default:
-                          log.warn('WechatyPuppetMixin', 'puppet dirty unsupported difference type: %s', JSON.stringify(difference))
-                      }
-                    }
                     break
                   }
                   case PUPPET.types.Payload.RoomMember: {

package/dist/cjs/src/pure-functions/update.d.ts

@@ -1,10 +0,0 @@
-import type { InfoUpdateValuePair } from '../schemas/update';
-/**
- *
- * No need to go recursive on payload diff becasue
- *   1. most fields of payloads are primitive values
- *   2. users does not want to compare array items, they just need to know this field has changed. And we don't offer methods to get a subObject value
- */
-export declare const diffPayload: <T>(objectOld: any, objectNew: any) => InfoUpdateValuePair<T>[];
-export declare const checkUntilChanged: (gapMilliseconds: number, maxRetry: number, judgement: () => Promise<boolean> | boolean) => Promise<boolean>;
-//# sourceMappingURL=update.d.ts.map

package/dist/cjs/src/pure-functions/update.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../src/pure-functions/update.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAE5D;;;;;GAKG;AACH,eAAO,MAAM,WAAW,iBAAkB,GAAG,aAAa,GAAG,6BAyC5D,CAAA;AAqBD,eAAO,MAAM,iBAAiB,oBAA2B,MAAM,YAAY,MAAM,aAAa,MAAM,QAAQ,OAAO,CAAC,GAAG,OAAO,KAAG,QAAQ,OAAO,CAS/I,CAAA"}

package/dist/cjs/src/pure-functions/update.js

@@ -1,85 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkUntilChanged = exports.diffPayload = void 0;
-/**
- *
- * No need to go recursive on payload diff becasue
- *   1. most fields of payloads are primitive values
- *   2. users does not want to compare array items, they just need to know this field has changed. And we don't offer methods to get a subObject value
- */
-const diffPayload = (objectOld, objectNew) => {
-    const keys = new Set([...Object.keys(objectOld || {}), ...Object.keys(objectNew || {})]);
-    const result = [];
-    for (const item of keys) {
-        const key = item;
-        const subObjectOld = objectOld[key];
-        const subObjectNew = objectNew[key];
-        if (typeof subObjectOld !== typeof subObjectNew) {
-            result.push({
-                key,
-                oldValue: subObjectOld,
-                newValue: subObjectNew,
-            });
-        }
-        else {
-            if (typeof subObjectOld !== 'object') {
-                if (subObjectOld === subObjectNew) {
-                    continue;
-                }
-                else {
-                    result.push({
-                        key,
-                        oldValue: subObjectOld,
-                        newValue: subObjectNew,
-                    });
-                }
-            }
-            else {
-                // for objects, we just judge if they were same or not, but do not record every different value
-                if (objectDeepDiff(subObjectOld, subObjectNew)) {
-                    continue;
-                }
-                else {
-                    result.push({
-                        key,
-                        oldValue: subObjectOld,
-                        newValue: subObjectNew,
-                    });
-                }
-            }
-        }
-    }
-    return result;
-};
-exports.diffPayload = diffPayload;
-const objectDeepDiff = (objectA, objectB) => {
-    const keys = new Set([...Object.keys(objectA), ...Object.keys(objectB)]);
-    for (const key of keys) {
-        if (typeof objectA[key] !== typeof objectB[key]) {
-            return false;
-        }
-        if (typeof objectA[key] !== 'object') {
-            if (objectA[key] !== objectB[key]) {
-                return false;
-            }
-        }
-        else {
-            if (!objectDeepDiff(objectA[key], objectB[key])) {
-                return false;
-            }
-        }
-    }
-    return true;
-};
-const checkUntilChanged = async (gapMilliseconds, maxRetry, judgement) => {
-    let changed = await judgement();
-    let currentTry = 1;
-    while (!changed && (currentTry < maxRetry)) {
-        await new Promise(resolve => setTimeout(resolve, gapMilliseconds));
-        changed = await judgement();
-        currentTry++;
-    }
-    return changed;
-};
-exports.checkUntilChanged = checkUntilChanged;
-//# sourceMappingURL=update.js.map

package/dist/cjs/src/pure-functions/update.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/pure-functions/update.ts"],"names":[],"mappings":"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"}

package/dist/cjs/src/schemas/update.d.ts

@@ -1,31 +0,0 @@
-import * as PUPPET from '@juzi/wechaty-puppet';
-export declare const ContactImportantFields: readonly ["name", "tags", "alias", "phone", "description", "corporation"];
-export declare const RoomImportantFields: readonly ["topic", "memberIdList", "ownerId"];
-declare type ContactImportantKeys = typeof ContactImportantFields[number];
-declare type RoomImportantKeys = typeof RoomImportantFields[number];
-declare type ContactUpdatableKeys = Omit<PUPPET.payloads.Contact, ContactImportantKeys>;
-declare type RoomUpdateableKeys = Omit<PUPPET.payloads.Room, RoomImportantKeys>;
-declare type PayloadTypeToUpdateInterface<U> = {
-    [SubType in keyof U]: {
-        type: SubType;
-        id: string;
-        updates: InfoUpdateValuePair<U[SubType]>[];
-    };
-}[keyof U];
-export declare type InfoUpdateValuePair<U> = {
-    [SubType in keyof U]: {
-        key: SubType;
-        oldValue?: U[SubType];
-        newValue?: U[SubType];
-    };
-}[keyof U];
-export declare type InfoUpdateInterface = PayloadTypeToUpdateInterface<{
-    [PUPPET.types.Payload.Contact]: ContactUpdatableKeys;
-    [PUPPET.types.Payload.Room]: RoomUpdateableKeys;
-}>;
-export declare type ContactUpdatableValuePair = InfoUpdateValuePair<ContactUpdatableKeys>;
-export declare type RoomUpdatableValuePair = InfoUpdateValuePair<RoomUpdateableKeys>;
-export declare type ContactValuePair = InfoUpdateValuePair<PUPPET.payloads.Contact>;
-export declare type RoomValuePair = InfoUpdateValuePair<PUPPET.payloads.Room>;
-export {};
-//# sourceMappingURL=update.d.ts.map

package/dist/cjs/src/schemas/update.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../src/schemas/update.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAE9C,eAAO,MAAM,sBAAsB,2EAEzB,CAAA;AAEV,eAAO,MAAM,mBAAmB,+CAEtB,CAAA;AAEV,aAAK,oBAAoB,GAAG,OAAO,sBAAsB,CAAC,MAAM,CAAC,CAAA;AACjE,aAAK,iBAAiB,GAAG,OAAO,mBAAmB,CAAC,MAAM,CAAC,CAAA;AAE3D,aAAK,oBAAoB,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAA;AAC/E,aAAK,kBAAkB,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAA;AAEvE,aAAK,4BAA4B,CAAC,CAAC,IAAI;KACpC,OAAO,IAAI,MAAM,CAAC,GAAG;QACpB,IAAI,EAAE,OAAO,CAAC;QACd,EAAE,EAAE,MAAM,CAAC;QACX,OAAO,EAAE,mBAAmB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;KAC5C;CACF,CAAC,MAAM,CAAC,CAAC,CAAA;AAEV,oBAAY,mBAAmB,CAAC,CAAC,IAAI;KAClC,OAAO,IAAI,MAAM,CAAC,GAAG;QACpB,GAAG,EAAE,OAAO,CAAC;QACb,QAAQ,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;QACtB,QAAQ,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;KACvB;CACF,CAAC,MAAM,CAAC,CAAC,CAAA;AAEV,oBAAY,mBAAmB,GAAG,4BAA4B,CAAC;IAC7D,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,oBAAoB,CAAC;IACrD,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,kBAAkB,CAAC;CACjD,CAAC,CAAA;AAEF,oBAAY,yBAAyB,GAAG,mBAAmB,CAAC,oBAAoB,CAAC,CAAA;AACjF,oBAAY,sBAAsB,GAAG,mBAAmB,CAAC,kBAAkB,CAAC,CAAA;AAE5E,oBAAY,gBAAgB,GAAG,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;AAC3E,oBAAY,aAAa,GAAG,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA"}

package/dist/cjs/src/schemas/update.js

@@ -1,35 +0,0 @@
-"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.RoomImportantFields = exports.ContactImportantFields = void 0;
-/* eslint-disable valid-typeof */
-const PUPPET = __importStar(require("@juzi/wechaty-puppet"));
-exports.ContactImportantFields = [
-    'name', 'tags', 'alias', 'phone', 'description', 'corporation',
-];
-exports.RoomImportantFields = [
-    'topic', 'memberIdList', 'ownerId',
-];
-//# sourceMappingURL=update.js.map

package/dist/cjs/src/schemas/update.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/schemas/update.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAAiC;AACjC,6DAA8C;AAEjC,QAAA,sBAAsB,GAAG;IACpC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa;CACtD,CAAA;AAEG,QAAA,mBAAmB,GAAG;IACjC,OAAO,EAAE,cAAc,EAAE,SAAS;CAC1B,CAAA"}

package/dist/esm/src/pure-functions/update.d.ts

@@ -1,10 +0,0 @@
-import type { InfoUpdateValuePair } from '../schemas/update';
-/**
- *
- * No need to go recursive on payload diff becasue
- *   1. most fields of payloads are primitive values
- *   2. users does not want to compare array items, they just need to know this field has changed. And we don't offer methods to get a subObject value
- */
-export declare const diffPayload: <T>(objectOld: any, objectNew: any) => InfoUpdateValuePair<T>[];
-export declare const checkUntilChanged: (gapMilliseconds: number, maxRetry: number, judgement: () => Promise<boolean> | boolean) => Promise<boolean>;
-//# sourceMappingURL=update.d.ts.map

package/dist/esm/src/pure-functions/update.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../src/pure-functions/update.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAE5D;;;;;GAKG;AACH,eAAO,MAAM,WAAW,iBAAkB,GAAG,aAAa,GAAG,6BAyC5D,CAAA;AAqBD,eAAO,MAAM,iBAAiB,oBAA2B,MAAM,YAAY,MAAM,aAAa,MAAM,QAAQ,OAAO,CAAC,GAAG,OAAO,KAAG,QAAQ,OAAO,CAS/I,CAAA"}

package/dist/esm/src/pure-functions/update.js

@@ -1,80 +0,0 @@
-/**
- *
- * No need to go recursive on payload diff becasue
- *   1. most fields of payloads are primitive values
- *   2. users does not want to compare array items, they just need to know this field has changed. And we don't offer methods to get a subObject value
- */
-export const diffPayload = (objectOld, objectNew) => {
-    const keys = new Set([...Object.keys(objectOld || {}), ...Object.keys(objectNew || {})]);
-    const result = [];
-    for (const item of keys) {
-        const key = item;
-        const subObjectOld = objectOld[key];
-        const subObjectNew = objectNew[key];
-        if (typeof subObjectOld !== typeof subObjectNew) {
-            result.push({
-                key,
-                oldValue: subObjectOld,
-                newValue: subObjectNew,
-            });
-        }
-        else {
-            if (typeof subObjectOld !== 'object') {
-                if (subObjectOld === subObjectNew) {
-                    continue;
-                }
-                else {
-                    result.push({
-                        key,
-                        oldValue: subObjectOld,
-                        newValue: subObjectNew,
-                    });
-                }
-            }
-            else {
-                // for objects, we just judge if they were same or not, but do not record every different value
-                if (objectDeepDiff(subObjectOld, subObjectNew)) {
-                    continue;
-                }
-                else {
-                    result.push({
-                        key,
-                        oldValue: subObjectOld,
-                        newValue: subObjectNew,
-                    });
-                }
-            }
-        }
-    }
-    return result;
-};
-const objectDeepDiff = (objectA, objectB) => {
-    const keys = new Set([...Object.keys(objectA), ...Object.keys(objectB)]);
-    for (const key of keys) {
-        if (typeof objectA[key] !== typeof objectB[key]) {
-            return false;
-        }
-        if (typeof objectA[key] !== 'object') {
-            if (objectA[key] !== objectB[key]) {
-                return false;
-            }
-        }
-        else {
-            if (!objectDeepDiff(objectA[key], objectB[key])) {
-                return false;
-            }
-        }
-    }
-    return true;
-};
-export const checkUntilChanged = async (gapMilliseconds, maxRetry, judgement) => {
-    let changed = await judgement();
-    let currentTry = 1;
-    while (!changed && (currentTry < maxRetry)) {
-        await new Promise(resolve => setTimeout(resolve, gapMilliseconds));
-        changed = await judgement();
-        currentTry++;
-    }
-    return changed;
-};
-//# sourceMappingURL=update.js.map

package/dist/esm/src/pure-functions/update.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/pure-functions/update.ts"],"names":[],"mappings":"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"}

package/dist/esm/src/schemas/update.d.ts

@@ -1,31 +0,0 @@
-import * as PUPPET from '@juzi/wechaty-puppet';
-export declare const ContactImportantFields: readonly ["name", "tags", "alias", "phone", "description", "corporation"];
-export declare const RoomImportantFields: readonly ["topic", "memberIdList", "ownerId"];
-declare type ContactImportantKeys = typeof ContactImportantFields[number];
-declare type RoomImportantKeys = typeof RoomImportantFields[number];
-declare type ContactUpdatableKeys = Omit<PUPPET.payloads.Contact, ContactImportantKeys>;
-declare type RoomUpdateableKeys = Omit<PUPPET.payloads.Room, RoomImportantKeys>;
-declare type PayloadTypeToUpdateInterface<U> = {
-    [SubType in keyof U]: {
-        type: SubType;
-        id: string;
-        updates: InfoUpdateValuePair<U[SubType]>[];
-    };
-}[keyof U];
-export declare type InfoUpdateValuePair<U> = {
-    [SubType in keyof U]: {
-        key: SubType;
-        oldValue?: U[SubType];
-        newValue?: U[SubType];
-    };
-}[keyof U];
-export declare type InfoUpdateInterface = PayloadTypeToUpdateInterface<{
-    [PUPPET.types.Payload.Contact]: ContactUpdatableKeys;
-    [PUPPET.types.Payload.Room]: RoomUpdateableKeys;
-}>;
-export declare type ContactUpdatableValuePair = InfoUpdateValuePair<ContactUpdatableKeys>;
-export declare type RoomUpdatableValuePair = InfoUpdateValuePair<RoomUpdateableKeys>;
-export declare type ContactValuePair = InfoUpdateValuePair<PUPPET.payloads.Contact>;
-export declare type RoomValuePair = InfoUpdateValuePair<PUPPET.payloads.Room>;
-export {};
-//# sourceMappingURL=update.d.ts.map

package/dist/esm/src/schemas/update.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../src/schemas/update.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAE9C,eAAO,MAAM,sBAAsB,2EAEzB,CAAA;AAEV,eAAO,MAAM,mBAAmB,+CAEtB,CAAA;AAEV,aAAK,oBAAoB,GAAG,OAAO,sBAAsB,CAAC,MAAM,CAAC,CAAA;AACjE,aAAK,iBAAiB,GAAG,OAAO,mBAAmB,CAAC,MAAM,CAAC,CAAA;AAE3D,aAAK,oBAAoB,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAA;AAC/E,aAAK,kBAAkB,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAA;AAEvE,aAAK,4BAA4B,CAAC,CAAC,IAAI;KACpC,OAAO,IAAI,MAAM,CAAC,GAAG;QACpB,IAAI,EAAE,OAAO,CAAC;QACd,EAAE,EAAE,MAAM,CAAC;QACX,OAAO,EAAE,mBAAmB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;KAC5C;CACF,CAAC,MAAM,CAAC,CAAC,CAAA;AAEV,oBAAY,mBAAmB,CAAC,CAAC,IAAI;KAClC,OAAO,IAAI,MAAM,CAAC,GAAG;QACpB,GAAG,EAAE,OAAO,CAAC;QACb,QAAQ,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;QACtB,QAAQ,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;KACvB;CACF,CAAC,MAAM,CAAC,CAAC,CAAA;AAEV,oBAAY,mBAAmB,GAAG,4BAA4B,CAAC;IAC7D,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,oBAAoB,CAAC;IACrD,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,kBAAkB,CAAC;CACjD,CAAC,CAAA;AAEF,oBAAY,yBAAyB,GAAG,mBAAmB,CAAC,oBAAoB,CAAC,CAAA;AACjF,oBAAY,sBAAsB,GAAG,mBAAmB,CAAC,kBAAkB,CAAC,CAAA;AAE5E,oBAAY,gBAAgB,GAAG,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;AAC3E,oBAAY,aAAa,GAAG,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA"}

package/dist/esm/src/schemas/update.js

@@ -1,9 +0,0 @@
-/* eslint-disable valid-typeof */
-import * as PUPPET from '@juzi/wechaty-puppet';
-export const ContactImportantFields = [
-    'name', 'tags', 'alias', 'phone', 'description', 'corporation',
-];
-export const RoomImportantFields = [
-    'topic', 'memberIdList', 'ownerId',
-];
-//# sourceMappingURL=update.js.map

package/dist/esm/src/schemas/update.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/schemas/update.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAE9C,MAAM,CAAC,MAAM,sBAAsB,GAAG;IACpC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa;CACtD,CAAA;AAEV,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,OAAO,EAAE,cAAc,EAAE,SAAS;CAC1B,CAAA"}

package/src/pure-functions/update.ts

@@ -1,80 +0,0 @@
-import type { InfoUpdateValuePair } from '../schemas/update'
-
-/**
- *
- * No need to go recursive on payload diff becasue
- *   1. most fields of payloads are primitive values
- *   2. users does not want to compare array items, they just need to know this field has changed. And we don't offer methods to get a subObject value
- */
-export const diffPayload = <T>(objectOld: any, objectNew: any): InfoUpdateValuePair<T>[] => {
-  const keys = new Set([ ...Object.keys(objectOld || {}), ...Object.keys(objectNew || {}) ])
-  const result = []
-  for (const item of keys) {
-    const key = item as keyof T
-    const subObjectOld = objectOld[key] as T[typeof key]
-    const subObjectNew = objectNew[key] as T[typeof key]
-
-    if (typeof subObjectOld !== typeof subObjectNew) {
-      result.push({
-        key,
-        oldValue: subObjectOld,
-        newValue: subObjectNew,
-      })
-    } else {
-      if (typeof subObjectOld !== 'object') {
-        if (subObjectOld === subObjectNew) {
-          continue
-        } else {
-          result.push({
-            key,
-            oldValue: subObjectOld,
-            newValue: subObjectNew,
-          })
-        }
-      } else {
-        // for objects, we just judge if they were same or not, but do not record every different value
-        if (objectDeepDiff(subObjectOld, subObjectNew)) {
-          continue
-        } else {
-          result.push({
-            key,
-            oldValue: subObjectOld,
-            newValue: subObjectNew,
-          })
-        }
-      }
-    }
-  }
-
-  return result
-}
-
-const objectDeepDiff = (objectA: any, objectB: any) => {
-  const keys = new Set([ ...Object.keys(objectA), ...Object.keys(objectB) ])
-  for (const key of keys) {
-    if (typeof objectA[key] !== typeof objectB[key]) {
-      return false
-    }
-    if (typeof objectA[key] !== 'object') {
-      if (objectA[key] !== objectB[key]) {
-        return false
-      }
-    } else {
-      if (!objectDeepDiff(objectA[key], objectB[key])) {
-        return false
-      }
-    }
-  }
-  return true
-}
-
-export const checkUntilChanged = async (gapMilliseconds: number, maxRetry: number, judgement: () => Promise<boolean> | boolean): Promise<boolean> => {
-  let changed = await judgement()
-  let currentTry = 1
-  while (!changed && (currentTry < maxRetry)) {
-    await new Promise(resolve => setTimeout(resolve, gapMilliseconds))
-    changed = await judgement()
-    currentTry++
-  }
-  return changed
-}

package/src/schemas/update.ts

@@ -1,43 +0,0 @@
-/* eslint-disable valid-typeof */
-import * as PUPPET from '@juzi/wechaty-puppet'
-
-export const ContactImportantFields = [
-  'name', 'tags', 'alias', 'phone', 'description', 'corporation',
-] as const
-
-export const RoomImportantFields = [
-  'topic', 'memberIdList', 'ownerId',
-] as const
-
-type ContactImportantKeys = typeof ContactImportantFields[number]
-type RoomImportantKeys = typeof RoomImportantFields[number]
-
-type ContactUpdatableKeys = Omit<PUPPET.payloads.Contact, ContactImportantKeys>
-type RoomUpdateableKeys = Omit<PUPPET.payloads.Room, RoomImportantKeys>
-
-type PayloadTypeToUpdateInterface<U> = {
-  [SubType in keyof U]: {
-    type: SubType,
-    id: string,
-    updates: InfoUpdateValuePair<U[SubType]>[],
-  }
-}[keyof U]
-
-export type InfoUpdateValuePair<U> = {
-  [SubType in keyof U]: {
-    key: SubType,
-    oldValue?: U[SubType],
-    newValue?: U[SubType],
-  }
-}[keyof U]
-
-export type InfoUpdateInterface = PayloadTypeToUpdateInterface<{
-  [PUPPET.types.Payload.Contact]: ContactUpdatableKeys,
-  [PUPPET.types.Payload.Room]: RoomUpdateableKeys,
-}>
-
-export type ContactUpdatableValuePair = InfoUpdateValuePair<ContactUpdatableKeys>
-export type RoomUpdatableValuePair = InfoUpdateValuePair<RoomUpdateableKeys>
-
-export type ContactValuePair = InfoUpdateValuePair<PUPPET.payloads.Contact>
-export type RoomValuePair = InfoUpdateValuePair<PUPPET.payloads.Room>