@dgck81lnn/koishi-plugin-music 0.1.5 → 0.2.0

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 的语音编码杂音问题。"),
@@ -88,11 +95,12 @@ 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) => {
         if (!code)
-            return session.text(".require-code");
+            return session.i18n(".require-code");
         try {
             new Function(code);
         }
@@ -100,9 +108,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),
@@ -112,7 +120,7 @@ function apply(ctx, config) {
         });
         const data = (0, koishi_1.h)("", await session.execute(evalArgv, true)).toString(true);
         if (!data)
-            session.text(".no-note");
+            return session.i18n(".no-note");
         try {
             ctx.logger.debug(JSON.parse(data));
         }
@@ -120,11 +128,13 @@ 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)`));
+        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);
     });

package/lib/locales/zh.json

@@ -1 +1 @@
-{"commands":{"musicjs":{"description":"用 JavaScript 代码演奏旋律","usage":"函数及其参数说明：\n    note(tone: number, beats: number, temperament = 12)  创建平均律音符\n        tone  音符相对于基准音的偏移（默认情况下，单位为半音）\n        beats  音符时长（拍）\n        temperament  平均律的音阶数；决定了多少 tone 为一个八度\n    noteJust(ratio: number, beats: number)  创建纯律音符\n        ratio  音符音高与基准音频率的比值\n        beats  音符时长（拍）\n    noteHz(frequency: number, beats: number)  创建指定频率音高的音符\n        frequency  频率（赫兹）\n        beats  音符时长（拍）\n    rest(beats: number)  休止\n        beats  休止时长（拍）\n变量说明——修改这些变量会影响后续创建音符的属性：\n    bpm: Number = 120  每分钟拍数\n        由于兼容原因，除非给该变量赋过值，否则读取该变量得到的是一个可以被隐式转换成数字的函数。\n    baseFrequency = 440  基准音频率\n    gain = 0.5  音量\n    time = 0  当前时间（秒）\n        调用 note、rest 等函数后此变量的值会自动增加。\n        修改此值后再添加音符可以使不同音符同时播放。","messages":{"require-code":"缺少代码。","no-note":"未定义任何音符。"}}}}
+{"commands":{"musicjs":{"description":"用 JavaScript 代码演奏旋律","usage":"函数及其参数说明：\n    note(tone: number, beats: number, temperament = 12)  创建平均律音符\n        tone  音符相对于基准音的偏移（默认情况下，单位为半音）\n        beats  音符时长（拍）\n        temperament  平均律的音阶数；决定了多少 tone 为一个八度\n    noteJust(ratio: number, beats: number)  创建纯律音符\n        ratio  音符音高与基准音频率的比值\n        beats  音符时长（拍）\n    noteHz(frequency: number, beats: number)  创建指定频率音高的音符\n        frequency  频率（赫兹）\n        beats  音符时长（拍）\n    rest(beats: number)  休止\n        beats  休止时长（拍）\n变量说明——修改这些变量会影响后续创建音符的属性：\n    bpm: Number = 120  每分钟拍数\n        由于历史原因，该变量的初始值是一个可以被隐式转换成数字的函数；\n        对其进行有效的赋值后，才会变成普通数字。\n    baseFrequency = 440  基准音频率\n    gain = 0.5  音量\n    time = 0  当前时间（秒）\n        调用 note、rest 等函数后此变量的值会自动增加。\n        手动减少此值后再添加音符，可以使不同音符同时播放。","messages":{"require-code":"缺少代码。","no-note":"未定义任何音符。"}}}}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dgck81lnn/koishi-plugin-music",
   "description": "Synthesize melodies in Koishi",
-  "version": "0.1.5",
+  "version": "0.2.0",
   "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>