@dgck81lnn/koishi-plugin-music 0.2.0 → 0.2.2

package/browser/synth.js

@@ -9,32 +9,50 @@ async function synth(notes, { noise } = {}) {
 
   cmp.connect(ctx.destination)
 
-  for (const note of notes) {
-    const osc = ctx.createOscillator()
-    const gain = ctx.createGain()
-
-    osc.setPeriodicWave(wav)
-    osc.frequency.value = note.frequency
+  let noiseBuf
+  const getNoise = () => {
+    if (!noiseBuf) {
+      noiseBuf = ctx.createBuffer(1, Math.min(seconds, 10) * sampleRate, sampleRate)
+      for (let data = noiseBuf.getChannelData(0), i = 0; i < data.length; i++)
+        data[i] = Math.random() * 2 - 1
+    }
+    return noiseBuf
+  }
 
-    osc.connect(gain)
-    gain.connect(cmp)
+  for (const note of notes) {
+    if (!(note.frequency && note.end > note.start && note.gain > 0)) continue
 
-    osc.addEventListener("ended", () => osc.disconnect())
-    osc.start(note.start)
-    osc.stop(note.end)
+    const gain = ctx.createGain()
     gain.gain.setValueAtTime(note.gain, note.start)
     gain.gain.linearRampToValueAtTime(0, note.end)
+    gain.connect(cmp)
+
+    let src
+    if (note.frequency < 0) {
+      src = ctx.createBufferSource()
+      src.buffer = getNoise()
+      src.loop = true
+      src.playbackRate.value = -note.frequency / sampleRate
+      src.connect(gain)
+    } else {
+      src = ctx.createOscillator()
+      src.setPeriodicWave(wav)
+      src.frequency.value = note.frequency
+      src.connect(gain)
+    }
+
+    src.start(note.start)
+    src.stop(note.end)
+    src.addEventListener("ended", () => gain.disconnect())
   }
 
   if (noise) {
     // Add some white noise to avoid QQ's voice message encoding issues
-    const noiseBuf = ctx.createBuffer(1, Math.min(seconds, 10) * sampleRate, sampleRate)
-    for (let data = noiseBuf.getChannelData(0), i = 0; i < data.length; i++)
-      data[i] = Math.random() * 2 - 1
+    getNoise()
     const noiseGain = ctx.createGain()
     noiseGain.gain.value = 0.005
     const noiseSrc = ctx.createBufferSource()
-    noiseSrc.buffer = noiseBuf
+    noiseSrc.buffer = getNoise()
     noiseSrc.loop = true
     noiseSrc.connect(noiseGain)
     noiseGain.connect(ctx.destination)

package/lib/index.js

@@ -45,10 +45,14 @@ const gutterFunc = (f) => {
             this.noteHz(baseFrequency * ratio, beats);
         },
         noteHz(frequency, beats) {
-            notes.push({ start: time, end: (time += (beats / +bpm) * 60), frequency, gain });
+            if (![frequency, beats].every(Number.isFinite))
+                return;
+            notes.push({ start: time, end: (time += (60 / +bpm) * beats), frequency, gain });
         },
         rest(beats) {
-            time += (beats / +bpm) * 60;
+            if (!Number.isFinite(beats))
+                return;
+            time += (60 / +bpm) * beats;
         },
         get bpm() {
             return bpm;
@@ -128,14 +132,18 @@ function apply(ctx, config) {
             return koishi_1.h.text(data);
         }
         const page = await ctx.puppeteer.page();
-        const opt = {
-            noise: session.resolve(config.noise),
-        };
-        ctx.logger.debug("synth options: %o", opt);
-        const base64 = (await page.evaluate(
-        // prettier-ignore
-        `${await synthCode}; synth(${data}, ${JSON.stringify(opt)}).then(encodeWav).then(arrayBufferToBase64)`));
-        page.close().catch(() => { });
-        return koishi_1.h.audio("data:audio/wav;base64," + base64);
+        try {
+            const opt = {
+                noise: session.resolve(config.noise),
+            };
+            ctx.logger.debug("synth options: %o", opt);
+            const base64 = (await page.evaluate(
+            // prettier-ignore
+            `${await synthCode}; synth(${data}, ${JSON.stringify(opt)}).then(encodeWav).then(arrayBufferToBase64)`));
+            return koishi_1.h.audio("data:audio/wav;base64," + base64);
+        }
+        finally {
+            page.close();
+        }
     });
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dgck81lnn/koishi-plugin-music",
   "description": "Synthesize melodies in Koishi",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [