@juzi/wechaty 1.0.0 → 1.0.3

package/dist/esm/src/wechaty-mixins/wechatify-user-module-mixin.js.map

@@ -1 +1 @@
-{"version":3,"file":"wechatify-user-module-mixin.js","sourceRoot":"","sources":["../../../../src/wechaty-mixins/wechatify-user-module-mixin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wechatify-user-module-mixin.js","sourceRoot":"","sources":["../../../../src/wechaty-mixins/wechatify-user-module-mixin.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@juzi/wechaty",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "description": "Wechaty is a RPA SDK for Chatbot Makers.",
   "type": "module",
   "exports": {
@@ -124,8 +124,8 @@
     "rx-queue": "^1.0.5",
     "state-switch": "^1.6.3",
     "uuid": "^8.3.2",
-    "@juzi/wechaty-puppet": "1.0.0",
-    "@juzi/wechaty-puppet-service": "1.0.0",
+    "@juzi/wechaty-puppet": "1.0.1",
+    "@juzi/wechaty-puppet-service": "1.0.2",
     "wechaty-puppet-wechat4u": "^1.11.1",
     "wechaty-token": "^1.1.1",
     "ws": "^8.5.0"

package/src/cli/gateway.ts

@@ -9,7 +9,7 @@ import {
 
 import {
   log,
-}                 from 'wechaty-puppet'
+}                 from '@juzi/wechaty-puppet'
 import { WechatyToken } from 'wechaty-token'
 import getPort from 'get-port'
 

package/src/config.ts

@@ -21,7 +21,7 @@
 
 import {
   log,
-}                   from 'wechaty-puppet'
+}                   from '@juzi/wechaty-puppet'
 import { FileBox } from 'file-box'
 import type {
   FileBoxInterface,

package/src/doctor.ts

@@ -25,7 +25,7 @@ import { spawnSync as spawn } from 'child_process'
 
 import {
   log,
-}                   from 'wechaty-puppet'
+}                   from '@juzi/wechaty-puppet'
 
 export class Doctor {
 

package/src/io-client.ts

@@ -21,7 +21,7 @@ import { StateSwitch } from 'state-switch'
 import {
   PuppetServer,
   PuppetServerOptions,
-}                       from 'wechaty-puppet-service'
+}                       from '@juzi/wechaty-puppet-service'
 
 import type { MessageInterface }  from './user-modules/mod.js'
 import type { WechatyInterface }  from './wechaty/mod.js'

package/src/io-peer/io-peer.spec.ts

@@ -20,7 +20,7 @@
  */
 import { test }  from 'tstest'
 
-import jsonRpcPeer from 'json-rpc-peer'
+import jsonRpcPeer, { Peer, format, parse } from 'json-rpc-peer'
 
 import {
   getPeer,
@@ -31,7 +31,7 @@ test('getPeer()', async t => {
   const server = getPeer({
     serviceGrpcPort: EXPECTED_PORT,
   })
-  const client = new jsonRpcPeer.Peer()
+  const client = new Peer()
   /**
    * FIXME: Huan(202108): remove `any` to fix the typing
    */
@@ -55,10 +55,10 @@ test('exec()', async t => {
    * Huan(202101) Need to be fixed by new IO Bus system.
    *  See: https://github.com/wechaty/wechaty-puppet-service/issues/118
    */
-  const request = jsonRpcPeer.format.request(42, 'getHostieGrpcPort')
+  const request = format.request(42, 'getHostieGrpcPort')
   const response = await server.exec(request) as string
   // console.info('response: ', response)
 
-  const obj = jsonRpcPeer.parse(response) as jsonRpcPeer.JsonRpcPayloadResponse
+  const obj = parse(response) as jsonRpcPeer.JsonRpcPayloadResponse
   t.equal(obj.result, EXPECTED_PORT, 'should get the right port from payload')
 })

package/src/io-peer/io-peer.ts

@@ -1,5 +1,5 @@
 /// <reference path="json-rpc-peer.d.ts"/>
-import jsonRpcPeer from 'json-rpc-peer'
+import jsonRpcPeer, { Peer, MethodNotFound } from 'json-rpc-peer'
 
 // // https://stackoverflow.com/a/50375286/1123955
 // type UnionToIntersection<U> =
@@ -50,7 +50,7 @@ const getPeer = (options: IoPeerOptions) => {
           return serviceImpl[serviceMethodName]()
 
         default:
-          throw new jsonRpcPeer.MethodNotFound(serviceMethodName)
+          throw new MethodNotFound(serviceMethodName)
       }
     } else if (isJsonRpcResponse(message)) {
       // NOOP: we are server
@@ -64,7 +64,7 @@ const getPeer = (options: IoPeerOptions) => {
     console.info(JSON.stringify(message))
   }
 
-  const ioPeer = new jsonRpcPeer.Peer(onMessage)
+  const ioPeer = new Peer(onMessage)
 
   return ioPeer
 }

package/src/io.ts

@@ -19,7 +19,7 @@
  */
 import WebSocket        from 'ws'
 
-import type * as PUPPET from 'wechaty-puppet'
+import type * as PUPPET from '@juzi/wechaty-puppet'
 import { StateSwitch } from 'state-switch'
 
 import * as jsonRpcPeer from 'json-rpc-peer'

package/src/mods/impls.ts

@@ -47,6 +47,7 @@ export {
   DelayImpl,
   TagImpl,
   UrlLinkImpl,
+  ChannelImpl,
 }                             from '../user-modules/mod.js'
 
 // export {
@@ -85,6 +86,7 @@ export type {
   RoomInvitationInterface,
   TagInterface,
   UrlLinkInterface,
+  ChannelInterface,
 }                               from '../user-modules/mod.js'
 
 export type {
@@ -104,6 +106,7 @@ export type {
   RoomInvitationConstructor,
   TagConstructor,
   UrlLinkConstructor,
+  ChannelConstructor,
 }                               from '../user-modules/mod.js'
 
 export {

package/src/mods/users.ts

@@ -41,4 +41,5 @@ export type {
   RoomInvitationInterface as RoomInvitation,
   TagInterface            as Tag,
   UrlLinkInterface        as UrlLink,
+  ChannelInterface        as Channel,
 }                                               from '../user-modules/mod.js'

package/src/package-json.ts

@@ -4,10 +4,10 @@
  */
 import type { PackageJsonWechaty } from './config'
 
-export const GIT_COMMIT_HASH: string = '8302b201b9d77f9e190fe696b3170b7bb3b5e328'
+export const GIT_COMMIT_HASH: string = 'd38cb69c3f9c7c2abf74bde57eacd6183f8e4170'
 export const packageJson: PackageJsonWechaty = {
   "name": "@juzi/wechaty",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "description": "Wechaty is a RPA SDK for Chatbot Makers.",
   "type": "module",
   "exports": {
@@ -131,8 +131,8 @@ export const packageJson: PackageJsonWechaty = {
     "rx-queue": "^1.0.5",
     "state-switch": "^1.6.3",
     "uuid": "^8.3.2",
-    "@juzi/wechaty-puppet": "1.0.0",
-    "@juzi/wechaty-puppet-service": "1.0.0",
+    "@juzi/wechaty-puppet": "1.0.1",
+    "@juzi/wechaty-puppet-service": "1.0.2",
     "wechaty-puppet-wechat4u": "^1.11.1",
     "wechaty-token": "^1.1.1",
     "ws": "^8.5.0"

package/src/plugin.spec.ts

@@ -45,7 +45,7 @@ test('Wechaty Plugin uninstaller should be called after wechaty.stop()', async t
   const spyPluginInstall    = sinon.spy()
   const spyPluginUninstall  = sinon.spy()
 
-  const bot = WechatyBuilder.build({ puppet: new PuppetMock() })
+  const bot = WechatyBuilder.build({ puppet: new PuppetMock() as any })
 
   const plugin: WechatyPlugin = (_bot: Wechaty) => {
     spyPluginInstall()

package/src/puppet-config.ts

@@ -71,6 +71,8 @@ const OFFICIAL_PUPPET_DEPENDENCIES = {
    */
   '@juzibot/wechaty-puppet-donut'  : '*',   // https://www.npmjs.com/package/wechaty-puppet-donut (to be published)
   '@juzibot/wechaty-puppet-wxwork' : '*',   // https://www.npmjs.com/package/wechaty-puppet-wxwork (to be published)
+
+  '@juzi/wechaty-puppet-service': '*',  // https://www.npmjs.com/package/@juzi/wechaty-puppet-service
 }
 
 type OfficialPuppetNpmName = keyof typeof OFFICIAL_PUPPET_DEPENDENCIES

package/src/pure-functions/retry-policy.ts

@@ -4,7 +4,7 @@ import {
 }                 from 'cockatiel'
 import {
   log,
-}                 from 'wechaty-puppet'
+}                 from '@juzi/wechaty-puppet'
 
 /**
  * Create a retry policy that'll try whatever function we execute 3

package/src/raven.ts

@@ -4,7 +4,7 @@ import os from 'os'
 
 import {
   log,
-}           from 'wechaty-puppet'
+}           from '@juzi/wechaty-puppet'
 import type { GError } from 'gerror'
 
 import {

package/src/sayable/deliver-sayable.ts

@@ -1,4 +1,4 @@
-import type * as PUPPET from 'wechaty-puppet'
+import type * as PUPPET from '@juzi/wechaty-puppet'
 import { FileBox } from 'file-box'
 
 import {
@@ -9,6 +9,7 @@ import {
   MiniProgramImpl,
   PostImpl,
   LocationImpl,
+  ChannelImpl,
 }                     from '../user-modules/mod.js'
 
 import type { Sayable } from './types.js'
@@ -95,6 +96,11 @@ const deliverSayableConversationPuppet = (puppet: PUPPET.impls.PuppetInterface)
       conversationId,
       sayable.payload,
     )
+  } else if (ChannelImpl.validInstance(sayable)) {
+    msgId = await puppet.messageSendChannel(
+      conversationId,
+      sayable.payload,
+    )
   } else {
     throw new Error('unsupported arg: ' + sayable)
   }

package/src/sayable/message-to-sayable.ts

@@ -1,5 +1,5 @@
-import * as PUPPET from 'wechaty-puppet'
-import { log } from 'wechaty-puppet'
+import * as PUPPET from '@juzi/wechaty-puppet'
+import { log } from '@juzi/wechaty-puppet'
 
 import type {
   MessageInterface,
@@ -40,6 +40,9 @@ async function messageToSayable (
     case PUPPET.types.Message.Post:
       return message.toPost()
 
+    case PUPPET.types.Message.Channel:
+      return message.toChannel()
+
     default:
       log.warn('Wechaty',
         'toSayable() can not convert not re-sayable type: %s(%s) for %s\n%s',

package/src/sayable/payload-to-sayable.ts

@@ -1,5 +1,5 @@
-import * as PUPPET from 'wechaty-puppet'
-import { log }  from 'wechaty-puppet'
+import * as PUPPET from '@juzi/wechaty-puppet'
+import { log }  from '@juzi/wechaty-puppet'
 
 import type { WechatyInterface } from '../wechaty/wechaty-impl.js'
 
@@ -41,6 +41,9 @@ const payloadToSayableWechaty: (w: WechatyInterface) => (p: PUPPET.payloads.Saya
     case PUPPET.types.Sayable.Post:
       return new wechaty.Post(sayable.payload)
 
+    case PUPPET.types.Sayable.Channel:
+      return new wechaty.Channel(sayable.payload)
+
     default:
       throw new Error('payloadToSayable() not support payload: ' + JSON.stringify(sayable))
   }

package/src/sayable/sayable-to-payload.ts

@@ -1,5 +1,5 @@
-import * as PUPPET from 'wechaty-puppet'
-import { log }  from 'wechaty-puppet'
+import * as PUPPET from '@juzi/wechaty-puppet'
+import { log }  from '@juzi/wechaty-puppet'
 import { FileBox } from 'file-box'
 
 import {

package/src/sayable/types.ts

@@ -29,6 +29,7 @@ import type {
   MiniProgramInterface,
   PostInterface,
   UrlLinkInterface,
+  ChannelInterface,
 }                           from '../user-modules/mod.js'
 
 import type {
@@ -46,6 +47,7 @@ type Sayable =
   | PostInterface
   | string
   | UrlLinkInterface
+  | ChannelInterface
 
 interface SayableSayer {
   id      : string,

package/src/schemas/wechaty-events.ts

@@ -2,7 +2,7 @@ import { EventEmitter }         from 'events'
 import type TypedEventEmitter   from 'typed-emitter'
 
 import type { GError }  from 'gerror'
-import * as PUPPET      from 'wechaty-puppet'
+import * as PUPPET      from '@juzi/wechaty-puppet'
 
 import type {
   FriendshipInterface,

package/src/schemas/wechaty-options.ts

@@ -1,4 +1,4 @@
-import type * as PUPPET from 'wechaty-puppet'
+import type * as PUPPET from '@juzi/wechaty-puppet'
 import type {
   MemoryCard,
 }                       from 'memory-card'

package/src/user-mixins/poolify.ts

@@ -3,7 +3,7 @@
  * https://lit.dev/docs/composition/mixins/
  */
 import type { Constructor } from 'clone-class'
-import { log } from 'wechaty-puppet'
+import { log } from '@juzi/wechaty-puppet'
 
 interface PoolifyMixin<T> {
   new (...args: any[]): T

package/src/user-mixins/validation.ts

@@ -4,7 +4,7 @@ import {
 }                           from 'clone-class'
 import type { Constructor } from 'clone-class'
 
-import { log }              from 'wechaty-puppet'
+import { log }              from '@juzi/wechaty-puppet'
 
 const validationMixin = <MixinBase extends Constructor> (mixinBase: MixinBase) => <T>() => {
   log.verbose('ValidationMixin', 'validationMixin(%s)', mixinBase.name)

package/src/user-mixins/wechatify.ts

@@ -1,4 +1,4 @@
-import { log }              from 'wechaty-puppet'
+import { log }              from '@juzi/wechaty-puppet'
 import type { Constructor } from 'clone-class'
 
 import type { WechatyInterface } from '../wechaty/mod.js'

package/src/user-modules/channel.ts

@@ -0,0 +1,95 @@
+import type * as PUPPET from '@juzi/wechaty-puppet'
+
+import type { Constructor } from 'clone-class'
+import { log } from '../config.js'
+
+import { validationMixin } from '../user-mixins/validation.js'
+
+import {
+  wechatifyMixinBase,
+} from '../user-mixins/wechatify.js'
+
+class ChannelMixin extends wechatifyMixinBase() {
+
+  /**
+   *
+   * Create
+   *
+   */
+  static async create (): Promise<ChannelInterface> {
+    log.verbose('Channel', 'create()')
+
+    // TODO: get appid and username from wechat
+    const payload: PUPPET.payloads.Channel = {
+      avatar: 'todo',
+      coverUrl: 'todo',
+      desc: 'todo',
+      extras: 'todo',
+      feedType: 4,
+      nickname: 'todo',
+      thumbUrl: 'todo',
+      url: 'todo',
+    }
+
+    return new this(payload)
+  }
+
+  /*
+   * @hideconstructor
+   */
+  constructor (
+    public readonly payload: PUPPET.payloads.Channel,
+  ) {
+    super()
+    log.verbose('Channel', 'constructor()')
+  }
+
+  avatar (): undefined | string {
+    return this.payload.avatar
+  }
+
+  coverUrl (): undefined | string {
+    return this.payload.coverUrl
+  }
+
+  desc (): undefined | string {
+    return this.payload.desc
+  }
+
+  extras (): undefined | string {
+    return this.payload.extras
+  }
+
+  feedType (): undefined | number {
+    return this.payload.feedType
+  }
+
+  nickname (): undefined | string {
+    return this.payload.nickname
+  }
+
+  thumbUrl (): undefined | string {
+    return this.payload.thumbUrl
+  }
+
+  url (): undefined | string {
+    return this.payload.url
+  }
+
+}
+
+class ChannelImpl extends validationMixin(ChannelMixin)<ChannelInterface>() { }
+interface ChannelInterface extends ChannelImpl { }
+
+type ChannelConstructor = Constructor<
+  ChannelInterface,
+  typeof ChannelImpl
+>
+
+export type {
+  ChannelConstructor,
+  ChannelInterface,
+}
+export {
+  ChannelImpl,
+}

package/src/user-modules/contact-self.ts

@@ -17,10 +17,10 @@
  *   limitations under the License.
  *
  */
-import type * as PUPPET from 'wechaty-puppet'
+import type * as PUPPET from '@juzi/wechaty-puppet'
 import {
   log,
-}                             from 'wechaty-puppet'
+}                             from '@juzi/wechaty-puppet'
 import type {
   FileBoxInterface,
 }                             from 'file-box'

package/src/user-modules/contact.spec.ts

@@ -33,7 +33,7 @@ import {
 test('findAll()', async t => {
   const EXPECTED_NAME = 'TestingBot'
 
-  const puppet = new PuppetMock()
+  const puppet = new PuppetMock() as any
   const wechaty = WechatyBuilder.build({ puppet })
 
   const mockContact = puppet.mocker.createContact({ name: EXPECTED_NAME })

package/src/user-modules/contact.ts

@@ -17,7 +17,7 @@
  *   limitations under the License.
  *
  */
-import * as PUPPET      from 'wechaty-puppet'
+import * as PUPPET      from '@juzi/wechaty-puppet'
 import type {
   FileBoxInterface,
 }                       from 'file-box'

package/src/user-modules/favorite.ts

@@ -17,7 +17,7 @@
  *   limitations under the License.
  *
  */
-import { log }        from 'wechaty-puppet'
+import { log }        from '@juzi/wechaty-puppet'
 import type { Constructor } from 'clone-class'
 import { validationMixin } from '../user-mixins/validation.js'
 

package/src/user-modules/friendship.ts

@@ -18,8 +18,8 @@
  *
  */
 import { EventEmitter }     from 'events'
-import * as PUPPET          from 'wechaty-puppet'
-import { log }              from 'wechaty-puppet'
+import * as PUPPET          from '@juzi/wechaty-puppet'
+import { log }              from '@juzi/wechaty-puppet'
 import type { Constructor } from 'clone-class'
 
 import {

package/src/user-modules/image.ts

@@ -17,7 +17,7 @@
  *   limitations under the License.
  *
  */
-import * as PUPPET          from 'wechaty-puppet'
+import * as PUPPET          from '@juzi/wechaty-puppet'
 import type {
   FileBoxInterface,
 }                   from 'file-box'

package/src/user-modules/location.ts

@@ -17,7 +17,7 @@
  *   limitations under the License.
  *
  */
-import type * as PUPPET          from 'wechaty-puppet'
+import type * as PUPPET          from '@juzi/wechaty-puppet'
 import type { Constructor } from 'clone-class'
 import { log } from '../config.js'
 

package/src/user-modules/message.spec.ts

@@ -24,7 +24,7 @@ import {
   sinon,
 }             from 'tstest'
 
-import * as PUPPET        from 'wechaty-puppet'
+import * as PUPPET        from '@juzi/wechaty-puppet'
 import { PuppetMock }     from 'wechaty-puppet-mock'
 import { WechatyBuilder } from '../wechaty-builder.js'
 import type {
@@ -44,7 +44,7 @@ test('recalled()', async t => {
 
   const sandbox = sinon.createSandbox()
 
-  const puppet = new PuppetMock()
+  const puppet = new PuppetMock() as any
   const wechaty = WechatyBuilder.build({ puppet })
 
   await wechaty.start()

package/src/user-modules/message.ts

@@ -18,7 +18,7 @@
  *
  */
 import { EventEmitter }   from 'events'
-import * as PUPPET        from 'wechaty-puppet'
+import * as PUPPET        from '@juzi/wechaty-puppet'
 import type {
   FileBoxInterface,
 }                         from 'file-box'
@@ -69,6 +69,9 @@ import {
   LocationInterface,
   LocationImpl,
 }                       from './location.js'
+import type {
+  ChannelInterface,
+}                       from './channel.js'
 
 import { validationMixin } from '../user-mixins/validation.js'
 import type { ContactSelfImpl } from './contact-self.js'
@@ -1078,6 +1081,21 @@ class MessageMixin extends MixinBase implements SayableSayer {
     return post
   }
 
+  public async toChannel (): Promise<ChannelInterface> {
+    log.verbose('Message', 'toChannel()')
+
+    if (!this.payload) {
+      throw new Error('no payload')
+    }
+
+    if (this.type() !== PUPPET.types.Message.Channel) {
+      throw new Error('message not a Channel')
+    }
+
+    const channelPayload = await this.wechaty.puppet.messageChannel(this.id)
+    return new this.wechaty.Channel(channelPayload)
+  }
+
   async toSayable (): Promise<undefined | Sayable> {
     log.verbose('Message', 'toSayable()')
     return messageToSayable(this)

package/src/user-modules/mini-program.ts

@@ -17,7 +17,7 @@
  *   limitations under the License.
  *
  */
-import type * as PUPPET  from 'wechaty-puppet'
+import type * as PUPPET  from '@juzi/wechaty-puppet'
 
 import type { Constructor } from 'clone-class'
 import { log } from '../config.js'

package/src/user-modules/mod.ts

@@ -97,6 +97,11 @@ import {
   DelayInterface,
   DelayConstructor,
 }                           from './delay.js'
+import {
+  ChannelImpl,
+  ChannelInterface,
+  ChannelConstructor,
+}                           from './channel.js'
 
 import { wechatifyUserModule } from '../user-mixins/wechatify.js'
 
@@ -117,6 +122,7 @@ export type {
   TagInterface,
   DelayInterface,
   UrlLinkInterface,
+  ChannelInterface,
 }
 
 export type {
@@ -136,6 +142,7 @@ export type {
   DelayConstructor,
   TagConstructor,
   UrlLinkConstructor,
+  ChannelConstructor,
 }
 
 export {
@@ -157,4 +164,5 @@ export {
   DelayImpl,
   TagImpl,
   UrlLinkImpl,
+  ChannelImpl,
 }

package/src/user-modules/moment.ts

@@ -17,7 +17,7 @@
  *   limitations under the License.
  *
  */
-import { log } from 'wechaty-puppet'
+import { log } from '@juzi/wechaty-puppet'
 import type { Constructor } from 'clone-class'
 
 import type { ContactInterface } from './contact.js'