v1.12.3

.gitignore

@@ -64,3 +64,4 @@ typings/
 .DS_Store
 t/
 t.*
+cache/*

README.md

@@ -57,20 +57,23 @@ Puppet|xp👍|
 支持账号|个人微信|
 **<消息>**|
 接收文本|✅
-发送文本|✅
-发送图片|✅
 接收图片|✅
-发送文件|✅
 接收文件|✅
 接收动图|✅
+接收表情|✅
+接收小程序卡片|✅
+接收联系人卡片|✅
+接收位置卡片|✅
+发送文本|✅
+发送图片|✅
+发送文件|✅
 发送动图|✅（以文件形式发送）
-转发文本|✅
-转发图片|✅
 **<群组>**|
 @群成员|✅
 群列表|✅
 群成员列表|✅
 群详情|✅
+进群提示|✅
 **<联系人>**|
 好友列表|✅
 好友详情|✅

examples/ripe-wechaty.ts

@@ -53,18 +53,30 @@ async function onMessage (msg: Message) {
     const thumbFile = await img.thumbnail()
     log.info('thumbFile', thumbFile.name)
     await thumbFile.toFile(`${process.cwd()}/cache/${thumbFile.name}`, true)
-    await timersPromise.setTimeout(1000)
 
+    // await timersPromise.setTimeout(3000)
     // console.info(img)
     const hdFile = await img.hd()
     log.info('hdFile', hdFile.name)
     await hdFile.toFile(`${process.cwd()}/cache/${hdFile.name}`, true)
-    setTimeout(msg.wechaty.wrapAsync(
-      async function () {
-        const imginfo = await msg.toFileBox()
-        console.info(imginfo)
-      },
-    ), 500)
+    // setTimeout(msg.wechaty.wrapAsync(
+    //   async function () {
+    //     const imginfo = await msg.toFileBox()
+    //     console.info(imginfo)
+    //   },
+    // ), 500)
+  }
+  if (msg.type() === types.Message.Emoticon) {
+    const emoticon = await msg.toFileBox()
+    await emoticon.toFile(`${process.cwd()}/cache/${emoticon.name}`, true)
+    await timersPromise.setTimeout(1000)
+    console.info(emoticon)
+    // setTimeout(msg.wechaty.wrapAsync(
+    //   async function () {
+    //     const imginfo = await msg.toFileBox()
+    //     console.info(imginfo)
+    //   },
+    // ), 500)
   }
   if (msg.text() === 'file') {
     const newpath = 'C:\\Users\\wechaty\\Documents\\GitHub\\wechat-openai-qa-bot\\cache\\data1652178575294.xls'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-puppet-xp",
-  "version": "1.12.2",
+  "version": "1.12.3",
   "description": "Puppet XP for Wechaty",
   "type": "module",
   "exports": {
@@ -76,7 +76,8 @@
   "dependencies": {
     "cuid": "^2.1.8",
     "sidecar": "^0.17.8",
-    "xml2js": "^0.4.23"
+    "xml2js": "^0.4.23",
+    "xmlreader": "^0.2.3"
   },
   "files": [
     "bin/",
@@ -89,10 +90,5 @@
   "publishConfig": {
     "access": "public",
     "tag": "next"
-  },
-  "git": {
-    "scripts": {
-      "pre-push": "npx git-scripts-pre-push"
-    }
   }
 }

src/agents/agent-script-3.6.0.18.js

@@ -24,7 +24,7 @@ const offset = {
   handle_offset: 0x4c,
   send_txt_call_offset: 0x4BE7B0,//0x3e3b80
   hook_point: 0x4E94F2,//0x4E9464,//3.3.0.115 = 0x40d3b1
-  chatroom_node_offset: 0xb08,
+  chatroom_node_offset: 0xad8,
   nickname_offset: 0x222EBB4,
   wxid_offset: 0x222F020,
   head_img_url_offset: 0x222EE94,
@@ -292,26 +292,22 @@ const getOldTest = ( (wxid) => {//personal detail
 
 })
 
-const writeLogNativeCallback = (() => {
-
-  const nativeCallback = new NativeCallback(() => { }, 'void', [])
-  const nativeCallFunction = new NativeFunction(nativeCallback, 'void', [])
-
-  Interceptor.attach(
-    moduleBaseAddress.add(0x7008A4),
-    {
-      onEnter() {
-        const addr = this.context.eax//.sub(0x114)//0xc30-0x08
-        if(addr >0){
-
-          const log = ptr(addr).readAnsiString()
-          //console.log(log)
-        }
-        //setImmediate(() => nativeativeFunction())
-      }
-    })
-  return nativeCallback
-})()
+// const writeLogNativeCallback = (() => {
+//   const nativeCallback = new NativeCallback(() => { }, 'void', [])
+//   const nativeCallFunction = new NativeFunction(nativeCallback, 'void', [])
+
+//   Interceptor.attach(
+//     moduleBaseAddress.add(0x7008A4),
+//     {
+//       onEnter() {
+//         const addr = this.context.eax//.sub(0x114)//0xc30-0x08
+//         if(addr >0){
+//           const log = ptr(addr).readAnsiString()
+//         }
+//       }
+//     })
+//   return nativeCallback
+// })()
 
 /**
  * test call
@@ -496,7 +492,7 @@ const getHeaderNodeAddress = (() => {
 
 // 005
 const getChatroomNodeAddress = (() => {
-  const baseAddress = getBaseNodeAddress()
+  const baseAddress= moduleBaseAddress.add(0x222f3fc).readPointer()
   if (baseAddress.isNull()) {
     return baseAddress
   }
@@ -1313,7 +1309,7 @@ const getChatroomMemberNickInfoFunction = ((memberId, roomId) => {
   nativeativeFunction()
 
   const nickname = readWideString(nickBuff);
-  console.log('--------nickname',nickname)
+  // console.log('--------nickname',nickname)
   return readWideString(nickBuff);
   //return readWideString(nickRetAddr.readPointer())
 

src/index.d.ts

@@ -0,0 +1 @@
+declare module 'xmlreader'

src/init-agent-script.js

@@ -1309,7 +1309,7 @@ const getChatroomMemberNickInfoFunction = ((memberId, roomId) => {
   nativeativeFunction()
 
   const nickname = readWideString(nickBuff);
-  console.log('--------nickname',nickname)
+  // console.log('--------nickname',nickname)
   return readWideString(nickBuff);
   //return readWideString(nickRetAddr.readPointer())