@dgck81lnn/koishi-plugin-music 0.1.6 → 0.2.1

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.d.ts

@@ -1,8 +1,9 @@
 import { Computed, Context, Schema } from "koishi";
-export declare const name = "music";
+export declare const name = "musicjs";
 export declare const inject: string[];
 export interface Config {
-    evalCommand: "glot" | "eval";
+    evalCommand: string;
+    evalReturnMethod: "expr" | "process.stdout";
     noise: Computed<boolean>;
 }
 export declare const Config: Schema<Config>;

package/lib/index.js

@@ -3,14 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Config = exports.inject = exports.name = void 0;
 exports.apply = apply;
 const koishi_1 = require("koishi");
+const promises_1 = require("fs/promises");
 const path_1 = require("path");
-const url_1 = require("url");
-exports.name = "music";
+exports.name = "musicjs";
 exports.inject = ["puppeteer"];
 exports.Config = koishi_1.Schema.object({
-    evalCommand: koishi_1.Schema.union(["glot", "eval"])
-        .default("glot")
+    evalCommand: koishi_1.Schema.string()
+        .role("textarea")
+        .default("glot --language=javascript")
         .description("用于安全执行 js 代码的指令。"),
+    evalReturnMethod: koishi_1.Schema.union([
+        koishi_1.Schema.from("process.stdout").description("process.stdout.write()（适用 glot 等指令）"),
+        koishi_1.Schema.from("expr").description("表达式（适用 eval 等指令）"),
+    ])
+        .default("process.stdout")
+        .description("在 js 代码执行指令中返回结果的方式。"),
     noise: koishi_1.Schema.computed(Boolean)
         .default(true)
         .description("是否添加白噪音来尝试规避 QQ 的语音编码杂音问题。"),
@@ -38,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;
@@ -88,6 +99,7 @@ const gutterFunc = (f) => {
 };
 function apply(ctx, config) {
     ctx.i18n.define("zh", require("./locales/zh"));
+    const synthCode = (0, promises_1.readFile)((0, path_1.resolve)(__dirname, "../browser/synth.js"), "utf-8");
     ctx
         .command("musicjs <code:rawtext>", { strictOptions: true })
         .action(async ({ session }, code) => {
@@ -100,9 +112,9 @@ function apply(ctx, config) {
             return koishi_1.h.text(String(e));
         }
         let gutteredCode = `(${gutterFunc})(function($){with($){\n${code}\n}})`;
-        if (config.evalCommand !== "eval")
+        if (config.evalReturnMethod === "process.stdout")
             gutteredCode = `process.stdout.write(${gutteredCode})`;
-        ctx.logger.debug(config.evalCommand, gutteredCode);
+        ctx.logger.debug("%o (%s) %o", config.evalCommand, config.evalReturnMethod, gutteredCode);
         const evalArgv = koishi_1.Argv.parse(config.evalCommand);
         evalArgv.tokens.push({
             content: koishi_1.h.escape(gutteredCode),
@@ -120,12 +132,18 @@ function apply(ctx, config) {
             return koishi_1.h.text(data);
         }
         const page = await ctx.puppeteer.page();
-        await page.goto((0, url_1.pathToFileURL)((0, path_1.resolve)(__dirname, "../browser/index.html")).href);
-        const opt = {
-            noise: session.resolve(config.noise),
-        };
-        const base64 = (await page.evaluate(`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.1.6",
+  "version": "0.2.1",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/browser/index.html

@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-</head>
-<body>
-<script src="synth.js"></script>
-</body>
-</html>