Update wechaty-puppet-oa

.vscode/launch.json

@@ -18,4 +18,4 @@
       ]
     }
   ]
-}
+}

examples/ding-dong-bot.ts

@@ -22,7 +22,8 @@ import {
   EventScanPayload,
   EventErrorPayload,
   EventMessagePayload,
-  FileBox
+  FileBox,
+  MessageType,
 }                         from 'wechaty-puppet'
 
 import { PuppetOA } from '../src/mod'
@@ -32,7 +33,13 @@ import { PuppetOA } from '../src/mod'
  * 1. Declare your Bot!
  *
  */
-const puppet = new PuppetOA()
+const puppet = new PuppetOA({
+    appId           : '',
+    appSecret       : '',
+    token           : '',
+    webhookProxyUrl : '',
+    // port:8080
+  })
 
 /**
  *
@@ -113,13 +120,30 @@ async function onMessage (payload: EventMessagePayload) {
   console.info('onMessage:', JSON.stringify(msgPayload))
   if (/ding/i.test(msgPayload.text || '')) {
     await puppet.messageSendText(msgPayload.fromId!, 'dong')
-  }
-  else if (/image/i.test(msgPayload.text || '')) {
-    let fileBox = FileBox.fromUrl("https://ss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=1116676390,2305043183&fm=26&gp=0.jpg","ding-dong.jpg")
+  } else if (/hi|hello/i.test(msgPayload.text || '')) {
+    const _userinfo = await puppet.contactRawPayload(msgPayload.fromId!)
+    await puppet.messageSendText(msgPayload.fromId!, 'hello,' + _userinfo.nickname + '. Thanks for your attention')
+  } else if (/image/i.test(msgPayload.text || '')) {
+    const fileBox = FileBox.fromUrl("https://ss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=1116676390,2305043183&fm=26&gp=0.jpg", "ding-dong.jpg")
     if (msgPayload.fromId){
       await puppet.messageSendFile(msgPayload.fromId!, fileBox)
     }
+  } else if (msgPayload.type == MessageType.Image){
+    // const imageFile = await puppet.messageFile(msgPayload.fromId!)
+    const imageFile = FileBox.fromUrl(msgPayload.filename + '.jpg')
+    // console.log(image)
+    if (msgPayload.fromId!){
+      await puppet.messageSendFile(msgPayload.fromId!, imageFile)
+    }
   }
+  // } else if (/获取好友列表/i.test(msgPayload.text || '')) {
+  //   const _contactList = await puppet.contactList()
+  //   if (_contactList != null) {
+  //     for (const i in _contactList) {
+  //       console.info(i)
+  //       await puppet.messageSendText(msgPayload.fromId!, _contactList[i])
+  //     }
+  //   }
 }
 
 /**

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-puppet-official-account",
-  "version": "0.5.46",
+  "version": "0.5.52",
   "description": "Wechaty Puppet for WeChat Official Accounts",
   "directories": {
     "test": "tests"
@@ -54,20 +54,22 @@
     "@types/express": "^4.17.11",
     "@types/express-xml-bodyparser": "^0.3.2",
     "@types/localtunnel": "^2.0.0",
+    "@types/lru-cache": "^5.1.1",
+    "@types/node": "^16.4.1",
     "@types/normalize-package-data": "^2.4.0",
     "@types/quick-lru": "^3.0.0",
     "ci-info": "^3.1.0",
     "pkg-jq": "^0.2.11",
     "shx": "^0.3.3",
+    "ts-node": "^10.1.0",
     "tstest": "^0.4.10",
-    "wechaty": "^0.56.5",
-    "wechaty-puppet": "^0.34.1"
+    "wechaty": "^0.56.6",
+    "wechaty-puppet": "^0.34.3"
   },
   "peerDependencies": {
     "wechaty-puppet": "*"
   },
   "dependencies": {
-    "@types/lru-cache": "^5.1.0",
     "@types/uuid": "^8.3.0",
     "cuid": "^2.1.8",
     "express": "^4.17.1",
@@ -89,5 +91,21 @@
     "scripts": {
       "pre-push": "npx git-scripts-pre-push"
     }
+  },
+  "eslintConfig": {
+    "root": true,
+    "env": {
+      "node": true
+    },
+    "extends": [
+      "plugin:vue/essential",
+      "eslint:recommended"
+    ],
+    "rules": {
+      "no-console": "off"
+    },
+    "parserOptions": {
+      "parser": "babel-eslint"
+    }
   }
 }

src/official-account/official-account.spec.ts

@@ -34,7 +34,6 @@ test('OfficialAccount smoke testing', async (t) => {
     '.localtunnel.chatie.io',
     // '.test.localhost.localdomain',
   ].join('')
-
   const oa = new OfficialAccount({
     ...getOaOptions(),
     webhookProxyUrl : WEBHOOK_PROXY_URL,
@@ -72,7 +71,7 @@ test('OfficialAccount smoke testing', async (t) => {
   try {
     await Promise.race([
       future,
-      new Promise((resolve, reject) => resolve && setTimeout(reject, 15000)),
+      new Promise((resolve, reject) => !!resolve && setTimeout(reject, 15000)),
     ])
     t.pass('should get a message emit event from oa instance')
   } catch (e) {

src/official-account/official-account.ts

@@ -78,6 +78,7 @@ class OfficialAccount extends EventEmitter {
 
     // keep the official account id consist with puppet-oa
     this.oaId = `gh_${options.appId}`
+    // this.oaId = `${options.appId}`
 
     this.webhook = new Webhook({
       personalMode    : !!this.options.personalMode,
@@ -222,7 +223,7 @@ class OfficialAccount extends EventEmitter {
      */
     let timer: undefined | ReturnType<typeof setTimeout>
 
-    const update = () => this.updateAccessToken()
+    const update =  ():any => this.updateAccessToken()
       .then(succeed => succeed
         ? this.accessTokenPayload!.expiresIn - marginSeconds
         : tryAgainSeconds
@@ -399,6 +400,7 @@ class OfficialAccount extends EventEmitter {
     log.verbose('OfficialAccount', 'getContactPayload(%s)', openId)
 
     if (openId && openId.startsWith('gh_')) {
+    // if (openId) {
 
       // wechaty load the SelfContact object, so just return it.
       /* eslint-disable sort-keys */

src/puppet-oa.ts

@@ -79,7 +79,7 @@ class PuppetOA extends Puppet {
     throw new Error('Method not implemented.')
   }
 
-  public static readonly VERSION = VERSION
+  public static override readonly VERSION = VERSION
 
   protected appId            : string
   protected appSecret        : string
@@ -151,7 +151,7 @@ class PuppetOA extends Puppet {
     }
   }
 
-  public async start (): Promise<void> {
+  public override async start (): Promise<void> {
     log.verbose('PuppetOA', 'start()')
     if (this.state.on()) {
       log.warn('PuppetOA', 'start() is called on a ON puppet. await ready(on) and return.')
@@ -192,7 +192,7 @@ class PuppetOA extends Puppet {
     oa.on('logout', _ => this.emit('logout', { contactId: this.id || '', data: 'logout' }))
   }
 
-  public async stop (): Promise<void> {
+  public override async stop (): Promise<void> {
     log.verbose('PuppetOA', 'stop()')
 
     if (this.state.off()) {
@@ -215,13 +215,13 @@ class PuppetOA extends Puppet {
     }
   }
 
-  public login (contactId: string): Promise<void> {
+  public override login (contactId: string): Promise<void> {
     log.verbose('PuppetOA', 'login()')
     // developer can set contactId
     return super.login(contactId)
   }
 
-  public async logout (): Promise<void> {
+  public override async logout (): Promise<void> {
     log.verbose('PuppetOA', 'logout()')
 
     if (!this.id) {
@@ -240,7 +240,7 @@ class PuppetOA extends Puppet {
     setTimeout(() => this.emit('dong', { data: data || '' }), 1000)
   }
 
-  public unref (): void {
+  public override unref (): void {
     log.verbose('PuppetOA', 'unref()')
     super.unref()
   }
@@ -520,6 +520,7 @@ class PuppetOA extends Puppet {
           throw new Error('can"t send personal CustomeMessage')
         }
       } else {
+        // msgId = await this.oa?.autoreplyCustomMessage(payload)
         msgId = await this.oa?.sendCustomMessage(payload)
       }
     } else if (something instanceof FileBox) {
@@ -586,7 +587,7 @@ class PuppetOA extends Puppet {
     // return this.messageSend(conversationId, miniProgram)
   }
 
-  public async messageForward (
+  public override async messageForward (
     conversationId: string,
     messageId : string,
   ): Promise<void> {

tsconfig.json

@@ -2,6 +2,7 @@
   "extends": "@chatie/tsconfig",
   "compilerOptions": {
     "outDir": "dist",
+    "lib": ["DOM","es5", "es2015.promise" ,"es2015", "es2017"]
   },
   "exclude": [
     "node_modules/",