wechaty-puppet-matrix 0.0.12 → 0.0.14

package/src/matrix/service/request.ts

@@ -392,20 +392,23 @@ async function getImageInfo (imageUrl: string) {
       '.wechaty',
       'puppet-matrix-cache',
       path.sep,
-      'temp_image_' + Date.now() + path.extname(imageUrl),
-      path.sep,
     )
     const baseDirExist = await fs.pathExists(tempFilePath)
     if (!baseDirExist) {
       await fs.mkdirp(tempFilePath)
     }
-    await fs.writeFile(tempFilePath, response.data)
+    const finalFilePath = path.join(
+      tempFilePath,
+      'temp_image_' + Date.now() + path.extname(imageUrl),
+    )
+
+    await fs.writeFile(finalFilePath, response.data)
 
     // 4. 获取图片宽高
-    const dimensions = imageSize(tempFilePath)
+    const dimensions = imageSize(finalFilePath)
 
     // 5. 删除临时文件
-    await fs.unlink(tempFilePath)
+    await fs.unlink(finalFilePath)
 
     return {
       file_size: fileSize, // 文件大小（字节）
@@ -419,59 +422,81 @@ async function getImageInfo (imageUrl: string) {
   }
 }
 
-const genTextSnsXml = (wxid: string, content: string): string => {
+function splitAddress (address = '') {
+  if (!address) {
+    return { province: '', city: '', area: '' }
+  }
+
+  let province: any = ''
+  let city: any = ''
+  let area: any = ''
+
+  // 省级行政区划
+  const provinceRegex = /^(.*?(省|自治区|市))|^(.*?)(北京|天津|上海|重庆)市?$/
+  const provinceMatch = address.match(provinceRegex)
+  if (provinceMatch) {
+    province = provinceMatch[1] || provinceMatch[3]
+    address = address.replace(province, '')
+  }
+
+  // 市级行政区划
+  const cityRegex = /^(.*?(市|自治州|地区|盟))|^([^\u4e00-\u9fa5]*)(北京|天津|上海|重庆)$/
+  const cityMatch = address.match(cityRegex)
+  if (cityMatch) {
+    city = cityMatch[1] || cityMatch[3]
+    address = address.replace(city, '')
+  }
+
+  // 区/县级行政区划
+  const areaRegex = /^(.*?(区|县|市|旗|自治县|林区|特区))|^(.*?(街道|镇|乡))|^([^\u4e00-\u9fa5]*)/
+  const areaMatch = address.match(areaRegex)
+  if (areaMatch) {
+    area = areaMatch[1] || areaMatch[3] || areaMatch[4]
+    address = address.replace(area, '')
+  }
+
+  return { province, city, area }
+}
+
+const genTextPosSnsXml = (wxid: string, content: string, location: any): string => {
+  const addressInfo: any = location ? splitAddress(location.address) : {}
   const xmlTemplate = `
     <TimelineObject>
-      <id><![CDATA[0]]></id>
-      <username><![CDATA[${wxid}]]></username>
-      <createTime><![CDATA[${Math.floor(Date.now() / 1000)}]]></createTime>
-      <contentDescShowType>0</contentDescShowType>
-      <contentDescScene>0</contentDescScene>
-      <private><![CDATA[0]]></private>
-      <contentDesc><![CDATA[${content}]]></contentDesc>
-      <contentattr><![CDATA[0]]></contentattr>
-      <sourceUserName></sourceUserName>
-      <sourceNickName></sourceNickName>
-      <statisticsData></statisticsData>
-      <weappInfo>
-        <appUserName></appUserName>
-        <pagePath></pagePath>
-        <version><![CDATA[0]]></version>
-        <isHidden>0</isHidden>
-        <debugMode><![CDATA[0]]></debugMode>
-        <shareActionId></shareActionId>
-        <isGame><![CDATA[0]]></isGame>
-        <messageExtraData></messageExtraData>
-        <subType><![CDATA[0]]></subType>
-        <preloadResources></preloadResources>
-      </weappInfo>
-      <canvasInfoXml></canvasInfoXml>
-      <ContentObject>
-        <contentStyle><![CDATA[2]]></contentStyle>
-        <contentSubStyle><![CDATA[0]]></contentSubStyle>
-        <title></title>
-        <description></description>
-        <contentUrl></contentUrl>
-      </ContentObject>
-      <actionInfo>
-        <appMsg>
-          <mediaTagName></mediaTagName>
-          <messageExt></messageExt>
-          <messageAction></messageAction>
-        </appMsg>
-      </actionInfo>
-      <appInfo><id></id></appInfo>
-      <publicUserName></publicUserName>
-      <streamvideo>
-        <streamvideourl></streamvideourl>
-        <streamvideothumburl></streamvideothumburl>
-        <streamvideoweburl></streamvideoweburl>
-      </streamvideo>
-    </TimelineObject>`.replace(/\s+/g, '')
+  <id>0</id>
+  <username><![CDATA[${wxid}]]></username>
+  <createTime><![CDATA[${Math.floor(Date.now() / 1000)}]]></createTime>
+  <contentDesc><![CDATA[${content}]]></contentDesc>
+  <contentDescShowType>0</contentDescShowType>
+  <contentDescScene>3</contentDescScene>
+  <private>0</private>
+  <sightFolded>0</sightFolded>
+  <showFlag>0</showFlag>${location ? `<location city="${addressInfo.city}" longitude="${location.longitude}" latitude="${location.latitude}" poiName="${location.name}" poiAddress="${location.address}" poiScale="11.000000" poiInfoUrl="" poiClassifyId="${location.poiId}" poiClassifyType="1" poiClickableStatus="0" buildingId="0" floorName=""/>` : ''}
+  <appInfo>
+    <id/>
+    <version/>
+    <appName/>
+    <installUrl/>
+    <fromUrl/>
+    <isForceUpdate>0</isForceUpdate>
+    <isHidden>0</isHidden>
+  </appInfo>
+  <sourceUserName/>
+  <sourceNickName/>
+  <statisticsData/>
+  <statExtStr/>
+  <ContentObject>
+    <contentStyle>2</contentStyle>
+    <title/>
+    <description/>
+    <mediaList/>
+  </ContentObject>
+</TimelineObject>`
   return xmlTemplate
 }
 
-const genVideoSnsXml = (wxid: string, content: string, media: Media): string => {
+const genVideoSnsXml = (wxid: string, content: string, media: Media, location: any): string => {
+  const addressInfo: any = location ? splitAddress(location.address) : {}
+
   const xmlTemplate = `
     <TimelineObject>
       <id>0</id>
@@ -482,7 +507,7 @@ const genVideoSnsXml = (wxid: string, content: string, media: Media): string =>
       <contentDescScene>0</contentDescScene>
       <private>0</private>
       <sightFolded>0</sightFolded>
-      <showFlag>0</showFlag>
+      <showFlag>0</showFlag>${location ? `<location city="${addressInfo.city}" longitude="${location.longitude}" latitude="${location.latitude}" poiName="${location.name}" poiAddress="${location.address}" poiScale="11.000000" poiInfoUrl="" poiClassifyId="${location.poiId}" poiClassifyType="1" poiClickableStatus="0" buildingId="0" floorName=""/>` : ''}
       <appInfo>
         <id></id>
         <version></version>
@@ -505,23 +530,24 @@ const genVideoSnsXml = (wxid: string, content: string, media: Media): string =>
             <id>0</id>
             <type>6</type>
             <title></title>
-            <description>测试</description>
+            <description>${content}</description>
             <private>0</private>
             <userData></userData>
             <subType>0</subType>
             <videoSize width="${media.video_width}" height="${media.video_height}"/>
-            <url type="1" md5="951a7d7864d685a92fd2624155794bf9" videomd5="577f55635faf44f595a69ded26d87bcc">${media.file_url}</url>
-            <thumb type="1">${media.thumb_url}</thumb>
+            <url type="1" md5="951a7d7864d685a92fd2624155794bf9" videomd5="577f55635faf44f595a69ded26d87bcc">${media.file_url.replaceAll('&', '&amp;')}</url>
+            <thumb type="1">${media.thumb_url.replaceAll('&', '&amp;')}</thumb>
             <size width="${media.thumb_width}.000000" height="${media.thumb_height}.000000" totalSize="${media.file_size}"/>
             <videoDuration>${media.video_duration}.000000</videoDuration>
           </media>
         </mediaList>
+        <contentUrl>https://support.weixin.qq.com/cgi-bin/mmsupport-bin/readtemplate?t=page/common_page__upgrade&amp;v=1</contentUrl>
       </ContentObject>
     </TimelineObject>`
   return xmlTemplate
 }
 
-const genImageSnsXml = (wxid: string, contentDesc: string, mediaList: Media[]): string => {
+const genImageSnsXml = (wxid: string, contentDesc: string, mediaList: Media[], location: any): string => {
   const mediaTemplate = (media: Media) => `
     <media>
       <id><![CDATA[0]]></id>
@@ -536,7 +562,7 @@ const genImageSnsXml = (wxid: string, contentDesc: string, mediaList: Media[]):
     </media>`
 
   const mediaString = mediaList.map(media => mediaTemplate(media)).join('')
-
+  const addressInfo: any = location ? splitAddress(location.address) : {}
   const xmlTemplate = `
     <TimelineObject>
       <id><![CDATA[0]]></id>
@@ -563,6 +589,7 @@ const genImageSnsXml = (wxid: string, contentDesc: string, mediaList: Media[]):
         <preloadResources></preloadResources>
       </weappInfo>
       <canvasInfoXml></canvasInfoXml>
+      ${location ? `<location city="${addressInfo.city}" longitude="${location.longitude}" latitude="${location.latitude}" poiName="${location.name}" poiAddress="${location.address}" poiScale="11.000000" poiInfoUrl="" poiClassifyId="${location.poiId}" poiClassifyType="1" poiClickableStatus="0" buildingId="0" floorName=""/>` : ''}
       <ContentObject>
         <contentStyle><![CDATA[1]]></contentStyle>
         <contentSubStyle><![CDATA[0]]></contentSubStyle>
@@ -2240,6 +2267,33 @@ class Client extends EventEmitter {
     })
   }
 
+  /**
+   *
+   * @returns
+   */
+  public async creatRoom (contactIdList: string[], topic: string): Promise<string> {
+    try {
+      const res = await this.postData({
+        path: '/room/create_chatroom',
+        data: {
+          username_list: contactIdList,
+        },
+      })
+      if (res?.baseResponse?.ret) {
+        log.error('creatRoom error: %s', JSON.stringify(res.baseResponse))
+      }
+      const roomId = res.chatRoomName.string
+      if (topic) {
+        void this.setGroupName(roomId, topic)
+      }
+      return roomId
+
+    } catch (error) {
+      log.error(PRE, 'sendContactCard(%s, %s): %s', contactIdList, topic, error)
+      return ''
+    }
+  }
+
   /**
    * 修改群名
    * @param groupId 群id
@@ -2366,7 +2420,7 @@ class Client extends EventEmitter {
           url,
         },
       })
-      log.info('uploadSnsVideo result:%s', res.data)
+      log.verbose('uploadSnsVideo result: %s', JSON.stringify(res))
       if (res?.errcode !== 0) {
         log.error('uploadSnsVideo error: %s', JSON.stringify(res))
       }
@@ -2397,17 +2451,18 @@ class Client extends EventEmitter {
             const imageBaseInfo = await getImageInfo(image)
             imageInfo.push({ ...res, ...imageBaseInfo })
           }
-          xmlContent = genImageSnsXml(wxid, momentInfo.content, imageInfo)
+          xmlContent = genImageSnsXml(wxid, momentInfo.content, imageInfo, momentInfo.location)
 
         }
       } else if (momentInfo.videoUrl) {
         const mediaInfo: any = await this.uploadSnsVideo(momentInfo.videoUrl)
         if (mediaInfo) {
           const thumbInfo = await getImageInfo(mediaInfo.thumb_url)
-          xmlContent = genVideoSnsXml(wxid, momentInfo.content, { ...mediaInfo, ...thumbInfo })
+          xmlContent = genVideoSnsXml(wxid, momentInfo.content, { ...mediaInfo, ...thumbInfo }, momentInfo.location)
         }
       } else {
-        xmlContent = genTextSnsXml(wxid, momentInfo.content)
+        xmlContent = genTextPosSnsXml(wxid, momentInfo.content, momentInfo.location)
+
       }
       return await this.sendMoment(xmlContent)
     } catch (error) {

package/src/puppet-matrix.ts

@@ -21,6 +21,7 @@ import { parseEmotionMessagePayload } from './matrix/messages/message-emotion.js
 import { ImageMessagePayload, parseImageMessagePayload } from './matrix/messages/message-image.js'
 import { parseAudioMessagePayload, AudioMessagePayload } from './matrix/messages/message-audio.js'
 import { parseVideoMessagePayload, VideoMessagePayload } from './matrix/messages/message-video.js'
+import { parseLocationMessagePayload } from './matrix/messages/message-location.js'
 import { CachedPromiseFunc } from './matrix/utils/cached-promise.js'
 import { engineMessageToWechaty } from './matrix/schema-mapper/message.js'
 import { engineContactToWechaty } from './matrix/schema-mapper/contact.js'
@@ -758,6 +759,23 @@ class PuppetMatrix extends PUPPET.Puppet {
     }
   }
 
+  /**
+   * 解析h5链接
+   * @param messageId
+   */
+  override async messageLocation (messageId: string)  : Promise<PUPPET.payloads.Location> {
+    const rawPayload = await this.messageRawPayload(messageId)
+    const payload = await this.messageRawPayloadParser(rawPayload)
+
+    if (payload.type !== PUPPET.types.Message.Location) {
+      throw new Error('Can not get location from non location payload')
+    }
+
+    // FIXME: thumb may not in appPayload.thumburl, but in appPayload.appAttachPayload
+    const locationPayload = await parseLocationMessagePayload(rawPayload.msg) as PUPPET.payloads.Location
+    return locationPayload
+  }
+
   /****************************************************************************
    * send message
    ***************************************************************************/
@@ -974,12 +992,12 @@ class PuppetMatrix extends PUPPET.Puppet {
     }
   }
 
-  // 创建群聊 暂不支持
+  // 创建群聊
   override async roomCreate (
     contactIdList : string[],
     topic         : string,
   ): Promise<string> {
-    return PUPPET.throwUnsupportedError(contactIdList, topic)
+    return this._client?.creatRoom(contactIdList, topic) || ''
   }
 
   // 删除群聊 暂不支持
@@ -1000,7 +1018,7 @@ class PuppetMatrix extends PUPPET.Puppet {
     return PUPPET.throwUnsupportedError(roomId)
   }
 
-  // 机器人退出群聊 暂不支持
+  // 机器人退出群聊
   override async roomQuit (roomId: string): Promise<void> {
     return this._client?.roomQuit(roomId)
   }
@@ -1209,7 +1227,7 @@ class PuppetMatrix extends PUPPET.Puppet {
             if (fileBox.mediaType.startsWith('image/')) {
               momentInfo.imageUrls.push(fileUrl)
             } else if (fileType.includes('video/mp4') ||  fileType.includes('.mp4')) {
-              momentInfo.videoInfo = fileUrl
+              momentInfo.videoUrl = fileUrl
             }
           }
           break