@zwa73/utils 1.0.159 → 1.0.160

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/UtilFfmpegTools.js +17 -6
  2. package/package.json +1 -1
  3. package/src/UtilFfmpegTools.ts +17 -6
package/dist/UtilFfmpegTools.js CHANGED
@@ -72,11 +72,16 @@ class SFfmpegTool {
72
72
  static async flac2ogg(inputFlacFile, outputOggPath, quality = 10) {
73
73
  let wavPath = pathe_1.default.join(pathe_1.default.dirname(inputFlacFile), `tmp_${pathe_1.default.basename(inputFlacFile, ".flac")}.wav`);
74
74
  await new Promise((resolve, reject) => {
75
- (0, fluent_ffmpeg_1.default)(inputFlacFile)
75
+ const ins = (0, fluent_ffmpeg_1.default)(inputFlacFile)
76
76
  .audioCodec("pcm_s16le")
77
77
  .save(wavPath)
78
- .on("end", function () {
79
- resolve(null);
78
+ .on("end", () => {
79
+ resolve(true);
80
+ ins.kill('SIGTERM');
81
+ })
82
+ .on("error", (err) => {
83
+ reject(err);
84
+ ins.kill('SIGTERM');
80
85
  });
81
86
  });
82
87
  await SFfmpegTool.wav2ogg(wavPath, outputOggPath, quality);
@@ -100,12 +105,18 @@ class SFfmpegTool {
100
105
  //.audioChannels(channels)
101
106
  //.noMetadata()
102
107
  return new Promise((resolve, reject) => {
103
- (0, fluent_ffmpeg_1.default)(inputWavPath)
108
+ const ins = (0, fluent_ffmpeg_1.default)(inputWavPath)
104
109
  .audioQuality(quality)
105
110
  .audioCodec("libvorbis")
106
111
  .save(outputOggPath)
107
- .on("end", () => resolve(true))
108
- .on("error", (err) => reject(err));
112
+ .on("end", () => {
113
+ resolve(true);
114
+ ins.kill('SIGTERM');
115
+ })
116
+ .on("error", (err) => {
117
+ reject(err);
118
+ ins.kill('SIGTERM');
119
+ });
109
120
  });
110
121
  }
111
122
  /**剪切音频
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zwa73/utils",
3
- "version": "1.0.159",
3
+ "version": "1.0.160",
4
4
  "description": "my utils",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/src/UtilFfmpegTools.ts CHANGED
@@ -58,11 +58,16 @@ class SFfmpegTool {
58
58
  `tmp_${path.basename(inputFlacFile, ".flac")}.wav`
59
59
  );
60
60
  await new Promise((resolve, reject) => {
61
- fluentFfmpeg(inputFlacFile)
61
+ const ins = fluentFfmpeg(inputFlacFile)
62
62
  .audioCodec("pcm_s16le")
63
63
  .save(wavPath)
64
- .on("end", function () {
65
- resolve(null);
64
+ .on("end", () => {
65
+ resolve(true);
66
+ ins.kill('SIGTERM');
67
+ })
68
+ .on("error", (err) => {
69
+ reject(err);
70
+ ins.kill('SIGTERM');
66
71
  });
67
72
  });
68
73
  await SFfmpegTool.wav2ogg(wavPath, outputOggPath, quality);
@@ -89,12 +94,18 @@ class SFfmpegTool {
89
94
  //.audioChannels(channels)
90
95
  //.noMetadata()
91
96
  return new Promise((resolve, reject) => {
92
- fluentFfmpeg(inputWavPath)
97
+ const ins = fluentFfmpeg(inputWavPath)
93
98
  .audioQuality(quality)
94
99
  .audioCodec("libvorbis")
95
100
  .save(outputOggPath)
96
- .on("end", () => resolve(true))
97
- .on("error", (err) => reject(err));
101
+ .on("end", () => {
102
+ resolve(true);
103
+ ins.kill('SIGTERM');
104
+ })
105
+ .on("error", (err) => {
106
+ reject(err);
107
+ ins.kill('SIGTERM');
108
+ });
98
109
  });
99
110
  }
100
111
  /**剪切音频