wechaty-puppet-matrix 0.0.12 → 0.0.14

package/dist/esm/src/matrix/service/request.js

@@ -99,14 +99,15 @@ async function getImageInfo(imageUrl) {
             responseType: 'arraybuffer',
         });
         const fileSize = response.data.length;
-        const tempFilePath = path.join(os.homedir(), path.sep, '.wechaty', 'puppet-matrix-cache', path.sep, 'temp_image_' + Date.now() + path.extname(imageUrl), path.sep);
+        const tempFilePath = path.join(os.homedir(), path.sep, '.wechaty', 'puppet-matrix-cache', path.sep);
         const baseDirExist = await fs.pathExists(tempFilePath);
         if (!baseDirExist) {
             await fs.mkdirp(tempFilePath);
         }
-        await fs.writeFile(tempFilePath, response.data);
-        const dimensions = imageSize(tempFilePath);
-        await fs.unlink(tempFilePath);
+        const finalFilePath = path.join(tempFilePath, 'temp_image_' + Date.now() + path.extname(imageUrl));
+        await fs.writeFile(finalFilePath, response.data);
+        const dimensions = imageSize(finalFilePath);
+        await fs.unlink(finalFilePath);
         return {
             file_size: fileSize,
             image_width: dimensions.width,
@@ -119,58 +120,70 @@ async function getImageInfo(imageUrl) {
         throw error;
     }
 }
-const genTextSnsXml = (wxid, content) => {
+function splitAddress(address = '') {
+    if (!address) {
+        return { province: '', city: '', area: '' };
+    }
+    let province = '';
+    let city = '';
+    let area = '';
+    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, content, location) => {
+    const addressInfo = 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, content, media) => {
+const genVideoSnsXml = (wxid, content, media, location) => {
+    const addressInfo = location ? splitAddress(location.address) : {};
     const xmlTemplate = `
     <TimelineObject>
       <id>0</id>
@@ -181,7 +194,7 @@ const genVideoSnsXml = (wxid, content, media) => {
       <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>
@@ -204,22 +217,23 @@ const genVideoSnsXml = (wxid, content, media) => {
             <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, contentDesc, mediaList) => {
+const genImageSnsXml = (wxid, contentDesc, mediaList, location) => {
     const mediaTemplate = (media) => `
     <media>
       <id><![CDATA[0]]></id>
@@ -233,6 +247,7 @@ const genImageSnsXml = (wxid, contentDesc, mediaList) => {
       <size totalSize="${media.file_size}" width="${media.image_width}" height="${media.image_height}"></size>
     </media>`;
     const mediaString = mediaList.map(media => mediaTemplate(media)).join('');
+    const addressInfo = location ? splitAddress(location.address) : {};
     const xmlTemplate = `
     <TimelineObject>
       <id><![CDATA[0]]></id>
@@ -259,6 +274,7 @@ const genImageSnsXml = (wxid, contentDesc, mediaList) => {
         <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>
@@ -1545,6 +1561,28 @@ class Client extends EventEmitter {
             },
         });
     }
+    async creatRoom(contactIdList, topic) {
+        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 '';
+        }
+    }
     async setGroupName(groupId, name) {
         await this.postData({
             path: '/room/modify_chatroom_name',
@@ -1629,7 +1667,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));
             }
@@ -1654,18 +1692,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 = 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);
         }

package/dist/esm/src/puppet-matrix.d.ts

@@ -62,6 +62,7 @@ declare class PuppetMatrix extends PUPPET.Puppet {
     messageImage(messageId: string): Promise<FileBoxInterface>;
     messageMiniProgram(messageId: string): Promise<PUPPET.payloads.MiniProgram>;
     messageUrl(messageId: string): Promise<PUPPET.payloads.UrlLink>;
+    messageLocation(messageId: string): Promise<PUPPET.payloads.Location>;
     messageSendContact(toUserId: string, contactId: string): Promise<void | string>;
     messageSendFile(conversationId: string, fileBox: FileBoxInterface): Promise<string | void>;
     messageSendMiniProgram(toUserName: string, mpPayload: PUPPET.payloads.MiniProgram): Promise<void | string>;

package/dist/esm/src/puppet-matrix.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"puppet-matrix.d.ts","sourceRoot":"","sources":["../../../src/puppet-matrix.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"puppet-matrix.d.ts","sourceRoot":"","sources":["../../../src/puppet-matrix.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAe,sBAAsB,CAAA;AACvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAKhD,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAExE,OAAO,MAAM,MAAM,6BAA6B,CAAA;AA4BhD,QAAA,MAAM,OAAO,QAAiC,CAAA;AAK9C,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,aAAa,GAAG;IACvD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,GAAG,CAAA;CACb,CAAA;AAED,cAAM,YAAa,SAAQ,MAAM,CAAC,MAAM;IAkBT,OAAO,EAAE,mBAAmB;IAhBzD,OAAO,CAAC,SAAS,CAAC,CAAc;IAChC,OAAO,CAAC,OAAO,CAAC,CAAQ;IACxB,OAAO,CAAC,KAAK,CAAC,CAA4B;IAC1C,OAAO,CAAC,aAAa,CAA2B;IAChD,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,eAAe,CAAC,CAA+B;IACvD,OAAO,CAAC,eAAe,CAAC,CAAuC;IAC/D,OAAO,CAAC,eAAe,CAAC,CAAuC;IAC/D,OAAO,CAAC,sBAAsB,CAAC,CAAuC;IACtE,gBAAiC,OAAO,SAAU;gBAOrB,OAAO,GAAE,mBAA+C;IAmBrF,IAAW,MAAM,uBAEhB;IAEc,OAAO,IAAK,OAAO,CAAC,IAAI,CAAC;YAS1B,YAAY;YA0GZ,YAAY;IAqB1B,OAAO,CAAC,eAAe;YAOT,UAAU;IA6CT,eAAe,CAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAS1D,aAAa;YA4Cb,OAAO;IAiCR,KAAK,IAAK,OAAO,CAAC,IAAI,CAAC;IAoBvB,MAAM,IAAK,OAAO,CAAC,IAAI,CAAC;YAIvB,WAAW;IAaV,MAAM,CAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAU7C,IAAI,CAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI;IAkBpB,eAAe,CAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7C,iBAAiB,IAAK,OAAO,CAAC,MAAM,CAAC;IAKrC,oBAAoB,CAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKvD,YAAY,CAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAK1E,YAAY,CAAE,SAAS,EAAE,MAAM,GAAyB,OAAO,CAAC,MAAM,CAAC;IACvE,YAAY,CAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IA8B/D,aAAa,CAAE,SAAS,EAAE,MAAM,GAA6B,OAAO,CAAC,gBAAgB,CAAC;IACtF,aAAa,CAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,GAAK,OAAO,CAAC,IAAI,CAAC;IAa1E,WAAW,IAAK,OAAO,CAAC,MAAM,EAAE,CAAC;IAKjC,wBAAwB,CAAE,SAAS,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,IAAI;IAK7E,kBAAkB,CAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI;IAKjE,aAAa,CAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWhD,gBAAgB,CAAE,MAAM,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxE,mBAAmB,CAAE,MAAM,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAK3E,YAAY,CAAE,SAAS,EAAE,MAAM,EAAE,GAAI,OAAO,CAAC,IAAI,CAAC;IAKlD,iBAAiB,CAAE,SAAS,CAAC,EAAE,MAAM,GAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAW1D,gBAAgB,CAAE,YAAY,EAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBvD,aAAa,CAAE,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IAoD5F,qBAAqB,CAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC;IAQ7D,sBAAsB,CAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC;YAU5D,iBAAiB;YAmBjB,kBAAkB;IAuBjB,cAAc,CAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAMnD,WAAW,CAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAsC1D,YAAY,CAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAS3D,kBAAkB,CAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC;IAe5E,UAAU,CAAE,SAAS,EAAE,MAAM,GAAK,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;IAsBlE,eAAe,CAAE,SAAS,EAAE,MAAM,GAAK,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC;IAiBxE,kBAAkB,CAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC;IA8BhF,eAAe,CAAE,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IA0C3F,sBAAsB,CAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,WAAW,GAAG,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC;IAwB3G,eAAe,CAAE,cAAc,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAkBxG,cAAc,CAAE,cAAc,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAsBxG,eAAe,CAAE,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAW1F,aAAa,CAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IASnD,cAAc,CAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkCrE,OAAO,CAAE,MAAM,EAAM,MAAM,EAAE,SAAS,EAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAY/D,UAAU,CAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAWtD,UAAU,CACvB,aAAa,EAAG,MAAM,EAAE,EACxB,KAAK,EAAW,MAAM,GACrB,OAAO,CAAC,MAAM,CAAC;IAKH,OAAO,CACpB,MAAM,EAAM,MAAM,EAClB,SAAS,EAAG,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC;IAKD,QAAQ,IAAK,OAAO,CAAC,MAAM,EAAE,CAAC;IAK9B,UAAU,CAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAK5C,QAAQ,CAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxC,SAAS,CAAE,MAAM,EAAE,MAAM,GAAmB,OAAO,CAAC,MAAM,CAAC;IAC3D,SAAS,CAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAI,OAAO,CAAC,IAAI,CAAC;IAUzD,YAAY,CAAE,MAAM,EAAE,MAAM,GAAmB,OAAO,CAAC,MAAM,CAAC;IAC9D,YAAY,CAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAK,OAAO,CAAC,IAAI,CAAC;IAW5D,cAAc,CAAE,MAAM,EAAE,MAAM,GAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAMnD,oBAAoB,CAAE,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAS9D,uBAAuB,CAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;IAKnF,iBAAiB,CAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAsBnE,uBAAuB,CAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;IAQnF,iBAAiB,CAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAavD,oBAAoB,CAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;IAQ7E,cAAc,CAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAC,SAAS,CAAC;IAc9D,oBAAoB,CAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAcjF,0BAA0B,CAAE,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC;IAQ5F,wBAAwB,CAAE,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAQjE,8BAA8B,CAAE,UAAU,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC;IAQzF,0BAA0B,CAAE,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC;IAQxG,oBAAoB,CAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC;IAiBtE,WAAW,CAAE,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC;IAiEnE,aAAa,CAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMzC,cAAc,CAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC;IAKnE,kBAAkB,CAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;IAKxF,oBAAoB,CAAE,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;IAMnF,GAAG,CAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,UAAO,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAY1F,QAAQ;YAWA,kBAAkB;YAkClB,mBAAmB;YAgCnB,iBAAiB;IAYlB,WAAW,CAAE,MAAM,EAAC,MAAM;YAgBzB,cAAc;YAcd,cAAc;YA4Dd,eAAe;YAcf,iBAAiB;IAa/B,OAAO,CAAC,gBAAgB;YAeV,uBAAuB;YASvB,uBAAuB;YASvB,uBAAuB;YAgBvB,sBAAsB;IAuBvB,WAAW;CAQzB;AAED,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,CAAA;AAEhC,eAAe,YAAY,CAAA"}

package/dist/esm/src/puppet-matrix.js

@@ -13,6 +13,7 @@ import { parseEmotionMessagePayload } from './matrix/messages/message-emotion.js
 import { parseImageMessagePayload } from './matrix/messages/message-image.js';
 import { parseAudioMessagePayload } from './matrix/messages/message-audio.js';
 import { parseVideoMessagePayload } 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';
@@ -568,6 +569,15 @@ class PuppetMatrix extends PUPPET.Puppet {
             url: appPayload.url,
         };
     }
+    async messageLocation(messageId) {
+        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');
+        }
+        const locationPayload = await parseLocationMessagePayload(rawPayload.msg);
+        return locationPayload;
+    }
     async messageSendContact(toUserId, contactId) {
         log.verbose('PuppetWeChat', 'messageSend("%s", %s)', toUserId, contactId);
         const contactPayload = await this.contactRawPayload(contactId);
@@ -740,7 +750,7 @@ class PuppetMatrix extends PUPPET.Puppet {
         }
     }
     async roomCreate(contactIdList, topic) {
-        return PUPPET.throwUnsupportedError(contactIdList, topic);
+        return this._client?.creatRoom(contactIdList, topic) || '';
     }
     async roomDel(roomId, contactId) {
         return PUPPET.throwUnsupportedError(roomId, contactId);
@@ -870,7 +880,7 @@ class PuppetMatrix extends PUPPET.Puppet {
                             momentInfo.imageUrls.push(fileUrl);
                         }
                         else if (fileType.includes('video/mp4') || fileType.includes('.mp4')) {
-                            momentInfo.videoInfo = fileUrl;
+                            momentInfo.videoUrl = fileUrl;
                         }
                     }
                     break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-puppet-matrix",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "description": "Puppet matrix for Wechaty",
   "type": "module",
   "typings": "./dist/esm/src/mod.d.ts",

package/src/matrix/messages/message-location.ts

@@ -0,0 +1,46 @@
+/* eslint-disable @typescript-eslint/no-unnecessary-condition */
+import { xmlToJson } from '../utils/xml-to-json.js'
+
+interface LocationXmlSchema {
+  msg: {
+    location: {
+      $: {
+        x: string;
+        y: string;
+        scale: string;
+        label: string;
+        maptype: string;
+        poiname: string;
+        poiid: string;
+        buildingId: string;
+        floorName: string;
+        poiCategoryTips?: string;
+        poiBusinessHour?: string;
+        poiPhone?: string;
+        poiPriceTips?: string;
+        isFromPoiList?: string;
+        adcode?: string;
+        cityname?: string;
+      };
+    };
+  };
+}
+
+export async function parseLocationMessagePayload (
+  messageContent: string,
+): Promise<any> {
+  const appMsgXml: LocationXmlSchema = await xmlToJson(messageContent)
+  const { x, y, label, cityname, poiname, poiid, buildingId }
+    = appMsgXml?.msg.location.$
+
+  return {
+    accuracy: 0,
+    address: label || 'No Address',
+    latitude: x,
+    longitude: y,
+    name: poiname || 'No Name',
+    city: cityname || 'No City',
+    poiId: poiid || '',
+    buildingId: buildingId || '',
+  }
+}