@juzi/wechaty 1.0.132 → 1.0.134

package/src/sayable/types.ts

@@ -36,6 +36,8 @@ import {
   ConsultCardInterface,
   PremiumOnlineAppointmentCardInterface,
   DouyinOneClickPhoneCollectionInterface,
+  WxxdProductInterface,
+  WxxdOrderInterface,
 }                           from '../user-modules/mod.js'
 
 import type {
@@ -58,6 +60,8 @@ type Sayable =
   | ConsultCardInterface
   | PremiumOnlineAppointmentCardInterface
   | DouyinOneClickPhoneCollectionInterface
+  | WxxdProductInterface
+  | WxxdOrderInterface
 
 interface SayableSayer {
   id      : string,

package/src/schemas/wechaty-events.ts

@@ -60,6 +60,9 @@ type WechatyEventListenerLoginUrl           = (url: string) => void | Promise<vo
 type WechatyEventListenerIntentComment      = (payload: PUPPET.payloads.IntentComment) => void | Promise<void>
 type WechatyEventListenerContactEnterConversation = (contact: ContactInterface, date?: Date) => void | Promise<void>
 type WechatyEventListenerContactLeadFilled = (contact: ContactInterface, leads: { name: string, value: string }[], date?: Date) => void | Promise<void>
+type WechatyEventListenerWxxdShop         = (payload: PUPPET.payloads.WxxdShop) => void | Promise<void>
+type WechatyEventListenerWxxdProduct      = (payload: PUPPET.payloads.WxxdProduct) => void | Promise<void>
+type WechatyEventListenerWxxdOrder        = (payload: PUPPET.payloads.WxxdOrder) => void | Promise<void>
 
 /**
  * @desc       Wechaty Class Event Type
@@ -245,6 +248,9 @@ interface WechatyEventListeners {
   'verify-slide'       : WechatyEventListenerVerifySlide
   'contact-enter-conversation' : WechatyEventListenerContactEnterConversation
   'contact-lead-filled' : WechatyEventListenerContactLeadFilled
+  'wxxd-shop'           : WechatyEventListenerWxxdShop
+  'wxxd-product'        : WechatyEventListenerWxxdProduct
+  'wxxd-order'          : WechatyEventListenerWxxdOrder
 }
 
 const WechatyEventEmitter = EventEmitter as any as new () => TypedEventEmitter<

package/src/user-modules/im-specific.ts

@@ -22,6 +22,11 @@ class ImSpecificMixin extends wechatifyMixinBase() {
     return this.wechaty.puppet.intentCommentPayload(id)
   }
 
+  // 微信小店
+  static async getWxxdShop () {
+    return this.wechaty.puppet.wxxdShopPayload()
+  }
+
   /*
    * @hideconstructor
    */

package/src/user-modules/message.ts

@@ -61,9 +61,8 @@ import type {
 import type {
   ImageInterface,
 }                       from './image.js'
-import {
+import type {
   PostInterface,
-  PostImpl,
 }                       from './post.js'
 import type {
   LocationInterface,
@@ -1377,7 +1376,7 @@ class MessageMixin extends MixinBase implements SayableSayer {
       throw new Error('message type not a Post')
     }
 
-    const post = PostImpl.load(this.id)
+    const post = this.wechaty.Post.load(this.id)
     await post.ready()
     return post
   }

package/src/user-modules/mod.ts

@@ -147,6 +147,16 @@ import {
   ImSpecificInterface,
   ImSpecificConstructor,
 }                           from './im-specific.js'
+import {
+  WxxdProductImpl,
+  WxxdProductInterface,
+  WxxdProductConstructor,
+}                           from './wxxd-product.js'
+import {
+  WxxdOrderImpl,
+  WxxdOrderInterface,
+  WxxdOrderConstructor,
+}                           from './wxxd-order.js'
 
 import { wechatifyUserModule } from '../user-mixins/wechatify.js'
 
@@ -177,6 +187,8 @@ export type {
   WecomInterface,
   DouyinOneClickPhoneCollectionInterface,
   ImSpecificInterface,
+  WxxdProductInterface,
+  WxxdOrderInterface,
 }
 
 export type {
@@ -206,6 +218,8 @@ export type {
   WecomConstructor,
   DouyinOneClickPhoneCollectionConstructor,
   ImSpecificConstructor,
+  WxxdProductConstructor,
+  WxxdOrderConstructor,
 }
 
 export {
@@ -237,4 +251,6 @@ export {
   WecomImpl,
   DouyinOneClickPhoneCollectionImpl,
   ImSpecificImpl,
+  WxxdProductImpl,
+  WxxdOrderImpl,
 }

package/src/user-modules/wxxd-order.ts

@@ -0,0 +1,161 @@
+import type { Constructor } from 'clone-class'
+import type { PaginationRequest } from '@juzi/wechaty-puppet/filters'
+import * as PUPPET from '@juzi/wechaty-puppet'
+
+import { log } from '../config.js'
+import { poolifyMixin } from '../user-mixins/poolify.js'
+import { validationMixin } from '../user-mixins/validation.js'
+import { wechatifyMixin } from '../user-mixins/wechatify.js'
+
+const MixinBase = wechatifyMixin(
+  poolifyMixin(Object)<WxxdOrderImplInterface>(),
+)
+
+class WxxdOrderMixin extends MixinBase {
+
+  /**
+   * Instance properties
+   * @ignore
+   */
+  payload?: PUPPET.payloads.WxxdOrder
+
+  /**
+   * @hideconstructor
+   */
+  constructor (
+    public readonly id: string,
+  ) {
+    super()
+    log.silly('WxxdOrder', 'constructor(%s)', id)
+  }
+
+  /**
+   * List all orders
+   */
+  static async list (query: PaginationRequest) {
+    log.verbose('WxxdOrder', 'list(%s)', JSON.stringify(query))
+
+    return await this.wechaty.puppet.listWxxdOrders(query)
+  }
+
+  /**
+   * Find order by id or filter
+   */
+  static async find (
+    query: string | { id: string },
+  ): Promise<WxxdOrderInterface | undefined> {
+    log.verbose('WxxdOrder', 'find(%s)', JSON.stringify(query))
+
+    const id = typeof query === 'string' ? query : query.id
+
+    if (!id) {
+      return undefined
+    }
+
+    const order = (this.wechaty.WxxdOrder as any as typeof WxxdOrderImpl).load(id)
+
+    try {
+      await order.ready()
+    } catch (e) {
+      this.wechaty.emitError(e)
+      return undefined
+    }
+
+    return order
+  }
+
+  isReady (): boolean {
+    return !!(this.payload && this.payload.orderId)
+  }
+
+  async ready (forceSync = false): Promise<void> {
+    log.silly('WxxdOrder', 'ready() @ %s with id="%s"', this.wechaty.puppet, this.id)
+
+    if (!forceSync && this.isReady()) {
+      log.silly('WxxdOrder', 'ready() isReady() true')
+      return
+    }
+
+    try {
+      this.payload = await this.wechaty.puppet.wxxdOrderPayload(this.id)
+    } catch (e) {
+      this.wechaty.emitError(e)
+      log.verbose('WxxdOrder', 'ready() this.wechaty.puppet.wxxdOrderPayload(%s) exception: %s',
+        this.id,
+        (e as Error).message,
+      )
+      throw e
+    }
+  }
+
+  /**
+   * Get order ID
+   */
+  orderId (): string {
+    return this.payload?.orderId || this.id
+  }
+
+  /**
+   * Get order open ID
+   */
+  openId (): string {
+    return this.payload?.openId || ''
+  }
+
+  /**
+   * Get order status
+   */
+  status (): PUPPET.types.WxxdOrderStatus {
+    return this.payload?.status || PUPPET.types.WxxdOrderStatus.Unpaid
+  }
+
+  /**
+   * Get order create time
+   */
+  createTime (): number {
+    return this.payload?.createTime || 0
+  }
+
+  /**
+   * Get order update time
+   */
+  updateTime (): number {
+    return this.payload?.updateTime || 0
+  }
+
+  /**
+   * Get order products
+   */
+  products (): PUPPET.payloads.WxxdOrderProduct[] {
+    return this.payload?.products || []
+  }
+
+  /**
+   * Get order ext info
+   */
+  extInfo (): PUPPET.payloads.WxxdOrderExtInfo | undefined {
+    return this.payload?.extInfo
+  }
+
+}
+
+class WxxdOrderImplBase extends validationMixin(WxxdOrderMixin)<WxxdOrderImplInterface>() { }
+interface WxxdOrderImplInterface extends WxxdOrderImplBase { }
+
+type WxxdOrderProtectedProperty = 'ready'
+type WxxdOrderInterface = Omit<WxxdOrderImplInterface, WxxdOrderProtectedProperty>
+class WxxdOrderImpl extends validationMixin(WxxdOrderImplBase)<WxxdOrderInterface>() { }
+
+type WxxdOrderConstructor = Constructor<
+  WxxdOrderImplInterface,
+  typeof WxxdOrderImpl
+>
+
+export type {
+  WxxdOrderConstructor,
+  WxxdOrderProtectedProperty,
+  WxxdOrderInterface,
+}
+export {
+  WxxdOrderImpl,
+}

package/src/user-modules/wxxd-product.ts

@@ -0,0 +1,154 @@
+import type { Constructor } from 'clone-class'
+import type { PaginationRequest } from '@juzi/wechaty-puppet/filters'
+import * as PUPPET from '@juzi/wechaty-puppet'
+
+import { log } from '../config.js'
+import { poolifyMixin } from '../user-mixins/poolify.js'
+import { validationMixin } from '../user-mixins/validation.js'
+import { wechatifyMixin } from '../user-mixins/wechatify.js'
+
+const MixinBase = wechatifyMixin(
+  poolifyMixin(Object)<WxxdProductImplInterface>(),
+)
+
+class WxxdProductMixin extends MixinBase {
+
+  /**
+   * Instance properties
+   * @ignore
+   */
+  payload?: PUPPET.payloads.WxxdProduct
+
+  /**
+   * @hideconstructor
+   */
+  constructor (
+    public readonly id: string,
+  ) {
+    super()
+    log.silly('WxxdProduct', 'constructor(%s)', id)
+  }
+
+  /**
+   * List all products
+   */
+  static async list (query: PaginationRequest) {
+    log.verbose('WxxdProduct', 'list(%s)', JSON.stringify(query))
+
+    return await this.wechaty.puppet.listWxxdProducts(query)
+  }
+
+  /**
+   * Find product by id or filter
+   */
+  static async find (
+    query: string | { id: string },
+  ): Promise<WxxdProductInterface | undefined> {
+    log.verbose('WxxdProduct', 'find(%s)', JSON.stringify(query))
+
+    const id = typeof query === 'string' ? query : query.id
+
+    if (!id) {
+      return undefined
+    }
+
+    const product = (this.wechaty.WxxdProduct as any as typeof WxxdProductImpl).load(id)
+
+    try {
+      await product.ready()
+    } catch (e) {
+      this.wechaty.emitError(e)
+      return undefined
+    }
+
+    return product
+  }
+
+  isReady (): boolean {
+    return !!(this.payload && this.payload.productId)
+  }
+
+  async ready (forceSync = false): Promise<void> {
+    log.silly('WxxdProduct', 'ready() @ %s with id="%s"', this.wechaty.puppet, this.id)
+
+    if (!forceSync && this.isReady()) {
+      log.silly('WxxdProduct', 'ready() isReady() true')
+      return
+    }
+
+    try {
+      this.payload = await this.wechaty.puppet.wxxdProductPayload(this.id)
+    } catch (e) {
+      this.wechaty.emitError(e)
+      log.verbose('WxxdProduct', 'ready() this.wechaty.puppet.wxxdProductPayload(%s) exception: %s',
+        this.id,
+        (e as Error).message,
+      )
+      throw e
+    }
+  }
+
+  /**
+   * Get product title
+   */
+  title (): string {
+    return this.payload?.title || ''
+  }
+
+  /**
+   * Get product short title
+   */
+  shortTitle (): string {
+    return this.payload?.shortTitle || ''
+  }
+
+  /**
+   * Get product status
+   */
+  status (): PUPPET.types.WxxdProductStatus {
+    return this.payload?.status || PUPPET.types.WxxdProductStatus.NotExist
+  }
+
+  /**
+   * Get product min price
+   */
+  minPrice (): number {
+    return this.payload?.minPrice || 0
+  }
+
+  /**
+   * Get product total sold number
+   */
+  totalSoldNum (): number {
+    return this.payload?.totalSoldNum || 0
+  }
+
+  /**
+   * Get product SKUs
+   */
+  skus (): PUPPET.payloads.WxxdProductSku[] {
+    return this.payload?.skus || []
+  }
+
+}
+
+class WxxdProductImplBase extends validationMixin(WxxdProductMixin)<WxxdProductImplInterface>() { }
+interface WxxdProductImplInterface extends WxxdProductImplBase { }
+
+type WxxdProductProtectedProperty = 'ready'
+type WxxdProductInterface = Omit<WxxdProductImplInterface, WxxdProductProtectedProperty>
+class WxxdProductImpl extends validationMixin(WxxdProductImplBase)<WxxdProductInterface>() { }
+
+type WxxdProductConstructor = Constructor<
+  WxxdProductImplInterface,
+  typeof WxxdProductImpl
+>
+
+export type {
+  WxxdProductConstructor,
+  WxxdProductProtectedProperty,
+  WxxdProductInterface,
+}
+export {
+  WxxdProductImpl,
+}

package/src/wechaty/wechaty-impl.spec.ts

@@ -30,6 +30,8 @@ import type {
   WecomConstructor,
   DouyinOneClickPhoneCollectionConstructor,
   ImSpecificConstructor,
+  WxxdProductConstructor,
+  WxxdOrderConstructor,
 }                             from '../user-modules/mod.js'
 
 import {
@@ -67,6 +69,8 @@ test('Wechaty interface', async t => {
     Wecom                         : WecomConstructor
     DouyinOneClickPhoneCollection : DouyinOneClickPhoneCollectionConstructor
     ImSpecific                    : ImSpecificConstructor
+    WxxdProduct                   : WxxdProductConstructor
+    WxxdOrder                     : WxxdOrderConstructor
 
     constructor () {
       super()
@@ -95,6 +99,8 @@ test('Wechaty interface', async t => {
         = this.Wecom
         = this.DouyinOneClickPhoneCollection
         = this.ImSpecific
+        = this.WxxdProduct
+        = this.WxxdOrder
         = {} as any
     }
 

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

@@ -758,6 +758,27 @@ const puppetMixin = <MixinBase extends WechatifyUserModuleMixin & GErrorMixin &
             })
             break
 
+          case 'wxxd-shop':
+            puppet.on('wxxd-shop', async () => {
+              const payload = await this.ImSpecific.getWxxdShop()
+              this.emit('wxxd-shop', payload)
+            })
+            break
+
+          case 'wxxd-product':
+            puppet.on('wxxd-product', async ({ productId: id }) => {
+              const payload = await this.WxxdProduct.find({ id })
+              this.emit('wxxd-product', payload)
+            })
+            break
+
+          case 'wxxd-order':
+            puppet.on('wxxd-order', async ({ orderId: id }) => {
+              const payload = await this.WxxdOrder.find({ id })
+              this.emit('wxxd-order', payload)
+            })
+            break
+
           default:
             /**
              * Check: The eventName here should have the type `never`

package/src/wechaty-mixins/wechatify-user-module-mixin.ts

@@ -25,6 +25,8 @@ import {
   WecomImpl,
   DouyinOneClickPhoneCollectionImpl,
   ImSpecificImpl,
+  WxxdProductImpl,
+  WxxdOrderImpl,
 
   ContactConstructor,
   ContactSelfConstructor,
@@ -50,6 +52,8 @@ import {
   WecomConstructor,
   DouyinOneClickPhoneCollectionConstructor,
   ImSpecificConstructor,
+  WxxdProductConstructor,
+  WxxdOrderConstructor,
   wechatifyUserModule,
 }                       from '../user-modules/mod.js'
 
@@ -91,6 +95,8 @@ const wechatifyUserModuleMixin = <MixinBase extends typeof WechatySkeleton> (mix
     __wechatifiedWecom?                         : WecomConstructor
     __wechatifiedDouyinOneClickPhoneCollection? : DouyinOneClickPhoneCollectionConstructor
     __wechatifiedImSpecific?                    : ImSpecificConstructor
+    __wechatifiedWxxdProduct?                   : WxxdProductConstructor
+    __wechatifiedWxxdOrder?                     : WxxdOrderConstructor
 
     get Contact ()                      : ContactConstructor                        { return guardWechatify(this.__wechatifiedContact)        }
     get ContactSelf ()                  : ContactSelfConstructor                    { return guardWechatify(this.__wechatifiedContactSelf)    }
@@ -116,6 +122,8 @@ const wechatifyUserModuleMixin = <MixinBase extends typeof WechatySkeleton> (mix
     get Wecom ()                        : WecomConstructor                          { return guardWechatify(this.__wechatifiedWecom)          }
     get DouyinOneClickPhoneCollection () : DouyinOneClickPhoneCollectionConstructor { return guardWechatify(this.__wechatifiedDouyinOneClickPhoneCollection) }
     get ImSpecific ()                    : ImSpecificConstructor                    { return guardWechatify(this.__wechatifiedImSpecific)      }
+    get WxxdProduct ()                   : WxxdProductConstructor                   { return guardWechatify(this.__wechatifiedWxxdProduct)     }
+    get WxxdOrder ()                     : WxxdOrderConstructor                     { return guardWechatify(this.__wechatifiedWxxdOrder)       }
 
     override async init (): Promise<void> {
       log.verbose('WechatifyUserModuleMixin', 'init()')
@@ -161,6 +169,8 @@ const wechatifyUserModuleMixin = <MixinBase extends typeof WechatySkeleton> (mix
       this.__wechatifiedWecom                        = wechatifyUserModule(WecomImpl)(this as any)
       this.__wechatifiedDouyinOneClickPhoneCollection = wechatifyUserModule(DouyinOneClickPhoneCollectionImpl)(this as any)
       this.__wechatifiedImSpecific                    = wechatifyUserModule(ImSpecificImpl)(this as any)
+      this.__wechatifiedWxxdProduct                   = wechatifyUserModule(WxxdProductImpl)(this as any)
+      this.__wechatifiedWxxdOrder                     = wechatifyUserModule(WxxdOrderImpl)(this as any)
 
       log.verbose('WechatifyUserModuleMixin', 'init() initializing Wechaty User Module (WUM) ... done')
     }
@@ -206,6 +216,8 @@ type ProtectedPropertyWechatifyUserModuleMixin =
   | '__wechatifiedWecom'
   | '__wechatifiedDouyinOneClickPhoneCollection'
   | '__wechatifiedImSpecific'
+  | '__wechatifiedWxxdProduct'
+  | '__wechatifiedWxxdOrder'
 
 export type {
   WechatifyUserModuleMixin,