wx2tg-puppet 2.1.5 → 2.1.7

package/dist/action/common.js

@@ -21,6 +21,7 @@ const EMOJI_1 = require("../core/EMOJI");
 const VOICE_1 = require("../core/VOICE");
 const ToolsApi_1 = require("../api/ToolsApi");
 const Message_1 = require("../core/Message");
+const audioUtil_1 = require("../utils/audioUtil");
 // 检查是否是 Contact 类组成的数组
 function isArrayOfContact(arr) {
     // 先判断是否是数组
@@ -185,9 +186,18 @@ const say = (content, toWxid, ats) => __awaiter(void 0, void 0, void 0, function
             if (res.data.Code !== 0) {
                 throw new Error(`发送视频失败: ${res.data.Message}`);
             }
-            return new Message_1.ResponseMsg(res.data.Data.List[0]);
+            return new Message_1.ResponseMsg(res.data.Data);
         }
         else if (content instanceof VOICE_1.Voice) {
+            if (content.type === 2) {
+                const fileName = new Date().getDate();
+                const fb = file_box_1.FileBox.fromBase64(content.voiceBase64);
+                yield fb.toFile(fileName + '.mp3');
+                yield new audioUtil_1.SilkToMp3Converter().convertToSilk(fileName + '.mp3', fileName + '.silk');
+                const fbResult = file_box_1.FileBox.fromFile(fileName + '.silk');
+                content.voiceBase64 = yield fbResult.toBase64();
+                content.type = 4;
+            }
             const res = yield MsgApi_1.msgApi.SendVoice({
                 "Base64": content.voiceBase64,
                 "ToWxid": toWxid,
@@ -198,7 +208,7 @@ const say = (content, toWxid, ats) => __awaiter(void 0, void 0, void 0, function
             if (res.data.Code !== 0) {
                 throw new Error(`发送语音失败: ${res.data.Message}`);
             }
-            return new Message_1.ResponseMsg(res.data.Data.List[0]);
+            return new Message_1.ResponseMsg(res.data.Data);
         }
         //   }else if(content instanceof MiniApp){
         //     return SendMiniApp({

package/dist/core/Message.js

@@ -614,7 +614,7 @@ class ResponseMsg {
     constructor(obj) {
         var _a, _b;
         this.newMsgId = (obj.NewMsgId || obj.newMsgId || obj.Newmsgid) + '';
-        this.msgId = (obj.ClientMsgid || obj.clientMsgId || obj.Msgid || obj.msgId) ? (obj.ClientMsgid || obj.clientMsgId || obj.Msgid || obj.msgId) + '' : '';
+        this.msgId = (obj.ClientMsgid || obj.clientMsgId || obj.ClientMsgId || obj.Msgid || obj.msgId) ? (obj.ClientMsgid || obj.clientMsgId || obj.ClientMsgId || obj.Msgid || obj.msgId) + '' : '';
         this.createTime = obj.Createtime || obj.createTime || obj.CreateTime;
         this.toWxid = ((_a = obj.ToUsetName) === null || _a === void 0 ? void 0 : _a.string) || ((_b = obj.ToUserName) === null || _b === void 0 ? void 0 : _b.string) || obj.toUserName;
     }

package/dist/utils/audioUtil.d.ts

@@ -6,4 +6,11 @@ export declare class SilkToMp3Converter {
      * @returns A promise that resolves when the conversion is complete.
      */
     convertToMp3(inputFilePath: string, outputFilePath: string): Promise<void>;
+    /**
+     * Converts a Silk file to MP3 format.
+     * @param inputFilePath - The path to the Silk file.
+     * @param outputFilePath - The desired path for the MP3 file.
+     * @returns A promise that resolves when the conversion is complete.
+     */
+    convertToSilk(inputFilePath: string, outputFilePath: string): Promise<void>;
 }

package/dist/utils/audioUtil.js

@@ -15,5 +15,18 @@ class SilkToMp3Converter {
             voice.decode(inputFilePath, outputFilePath, { format: "mp3" }, (file) => resolve());
         });
     }
+    /**
+     * Converts a Silk file to MP3 format.
+     * @param inputFilePath - The path to the Silk file.
+     * @param outputFilePath - The desired path for the MP3 file.
+     * @returns A promise that resolves when the conversion is complete.
+     */
+    convertToSilk(inputFilePath, outputFilePath) {
+        return new Promise((resolve, reject) => {
+            const WxVoice = require('wx-voice');
+            const voice = new WxVoice();
+            voice.encode(inputFilePath, outputFilePath, { format: "silk" }, (file) => resolve());
+        });
+    }
 }
 exports.SilkToMp3Converter = SilkToMp3Converter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wx2tg-puppet",
-  "version": "2.1.5",
+  "version": "2.1.7",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [