koishi-plugin-starfx-bot 0.26.3 → 0.26.4

package/assets/songRoom.ejs

@@ -265,9 +265,27 @@
         setup() {
             const roomId = "<%= roomId %>"
             const songs = ref([])
-            const lastHash = ref("")
+            const EMPTY_HASH = "EMPTY_LIST_HASH"; // 与后端 getHash 函数中的占位符一致
+            const lastHash = ref(EMPTY_HASH)
             const isDragging = ref(false)
             const form = ref({ title: '', url: '' })
+            const pathSegments = window.location.pathname.split('/').filter(Boolean);
+            // 找到 roomId 在路径中的索引位置
+            const roomIdx = pathSegments.indexOf(roomId);
+
+            let apiRoot;
+            if (roomIdx !== -1) {
+                // 取 roomId 之前的所有部分，重新拼起来
+                // 如果是 ["songRoom", "1145"] -> prefix 就是 "/songRoom"
+                // 如果是 ["1145"] -> prefix 就是 ""
+                const prefix = pathSegments.slice(0, roomIdx).join('/');
+                const slash = prefix ? '/' : '';
+                apiRoot = `${slash}${prefix}/api/${roomId}`;
+            } else {
+                // 兜底逻辑：如果路径里竟然没找到 roomId，回退到最简单的相对路径
+                apiRoot = `api/${roomId}`;
+            }
+
 
             // 1. 修改 commitOp，防止前端标记传给后端导致 500 错误
             const commitOp = async (opData) => {
@@ -279,7 +297,7 @@
                 }
 
                 try {
-                    const res = await fetch(`api/${roomId}`, {
+                    const res = await fetch(apiRoot, {
                         method: 'POST',
                         headers: { 'Content-Type': 'application/json' },
                         body: JSON.stringify({
@@ -290,10 +308,11 @@
                     }).then(r => r.json());
 
                     if (res.success) {
-                        lastHash.value = res.hash; // 得到包含新 title/url 的新 Hash
+                        lastHash.value = res.hash;
                         return true;
                     } else if (res.code === 'REJECT') {
-                        lastHash.value = ""; // Hash 冲突，强制 load 最新数据
+                        // 如果被拒绝，说明前端 Hash 过时或列表已空但前端不知道
+                        lastHash.value = EMPTY_HASH; // 强制重置为初始状态
                         await load();
                     }
                 } catch (e) {
@@ -406,12 +425,19 @@
             const load = async () => {
                 if (isDragging.value) return;
                 try {
-                    const url = `api/${roomId}?lastHash=${lastHash.value}`;
+                    const url = `${apiRoot}?lastHash=${lastHash.value}`;
                     const res = await fetch(url).then(r => r.json());
 
                     if (res.changed) {
                         const oldSongs = [...songs.value];
-                        const newSongsData = res.list;
+                        const newSongsData = res.list || []; // 防御性处理空返回
+
+                        // 如果新数据就是空的，直接赋值并更新 Hash，跳过后续复杂的 LIS 计算
+                        if (newSongsData.length === 0) {
+                            songs.value = [];
+                            lastHash.value = res.hash || EMPTY_HASH;
+                            return;
+                        }
 
                         // 1. 计算 ID 映射
                         const oldIdMap = new Map();

package/lib/index.js

@@ -65,7 +65,7 @@ var package_default = {
   contributors: [
     "StarFreedomX <starfreedomx@outlook.com>"
   ],
-  version: "0.26.2",
+  version: "0.26.3",
   main: "lib/index.js",
   typings: "lib/index.d.ts",
   files: [
@@ -1650,8 +1650,9 @@ function apply(ctx, cfg) {
   }
   if (cfg.ktvServer && ctx.server) {
     let getHash = function(songs) {
-      const content = songs.map((s) => `${s.id}|${s.title}|${s.url}`).join(",");
-      return crypto.createHash("md5").update(content).digest("hex");
+      if (!songs || songs.length === 0) return "EMPTY_LIST_HASH";
+      const str = songs.map((s) => `${s.id}:${s.title}`).join("|");
+      return crypto.createHash("md5").update(str).digest("hex");
     }, songOperation = function(nowSongs, songIdArray, ops) {
       const latestSongMap = /* @__PURE__ */ new Map();
       if (Array.isArray(nowSongs)) {
@@ -1754,26 +1755,27 @@ function apply(ctx, cfg) {
     ctx.server.get("/songRoom/api/:roomId", async (koaCtx) => {
       const { roomId } = koaCtx.params;
       const { lastHash: clientHash } = koaCtx.query;
-      if (!roomSongsCache[roomId]?.length) {
-        roomSongsCache[roomId] = await ctx.cache.get("ktv_room", roomId) || [];
+      if (!roomSongsCache[roomId]) {
+        const dbData = await ctx.cache.get("ktv_room", roomId);
+        roomSongsCache[roomId] = dbData || [];
       }
-      const serverHash = getHash(roomSongsCache[roomId]);
-      if (!roomOpCache[roomId]) {
+      const currentSongs = roomSongsCache[roomId];
+      const serverHash = getHash(currentSongs);
+      if (!roomOpCache[roomId] || roomOpCache[roomId].length === 0) {
         roomOpCache[roomId] = [{
-          idArray: roomSongsCache[roomId].map((s) => s.id),
-          // 顺序校验仍用 ID
+          idArray: currentSongs.map((s) => s.id),
           hash: serverHash,
           song: null,
           toIndex: -1,
           timestamp: Date.now()
         }];
       }
-      if (clientHash === serverHash) {
+      if (clientHash && clientHash === serverHash) {
         return koaCtx.body = { changed: false, hash: serverHash };
       }
       koaCtx.body = {
         changed: true,
-        list: roomSongsCache[roomId],
+        list: currentSongs,
         hash: serverHash
       };
     });
@@ -1781,30 +1783,49 @@ function apply(ctx, cfg) {
       const { roomId } = koaCtx.params;
       const body = koaCtx.request["body"];
       const { idArrayHash, song, toIndex } = body;
-      const logs = roomOpCache[roomId] || [];
+      if (!roomSongsCache[roomId]) {
+        roomSongsCache[roomId] = await ctx.cache.get("ktv_room", roomId) || [];
+      }
+      if (!roomOpCache[roomId]) {
+        roomOpCache[roomId] = [{
+          idArray: roomSongsCache[roomId].map((s) => s.id),
+          hash: getHash(roomSongsCache[roomId]),
+          song: null,
+          toIndex: -1,
+          timestamp: Date.now()
+        }];
+      }
+      const logs = roomOpCache[roomId];
       const hitIdx = logs.findIndex((l) => l.hash === idArrayHash);
-      if (hitIdx === -1) return koaCtx.body = { success: false, code: "REJECT" };
+      if (hitIdx === -1) {
+        return koaCtx.body = { success: false, code: "REJECT" };
+      }
       const baseLog = logs[hitIdx];
       const spotIds = [...baseLog.idArray];
-      const nowSongs = roomSongsCache[roomId] || [];
+      const nowSongs = [...roomSongsCache[roomId]];
       const currentOp = {
         idArray: [],
-        // 此时 finalIdArray 还没算出，后面补上
         hash: "",
         song,
         toIndex,
         timestamp: Date.now()
       };
       const laterOps = [...logs.slice(hitIdx + 1), currentOp];
-      const finalSongs = songOperation(nowSongs, spotIds, laterOps);
-      const finalIds = finalSongs.map((s) => s.id);
-      const finalHash = getHash(finalSongs);
-      currentOp.idArray = finalIds;
-      currentOp.hash = finalHash;
-      logs.push(currentOp);
-      roomSongsCache[roomId] = finalSongs;
-      await ctx.cache.set(`ktv_room`, roomId, finalSongs);
-      koaCtx.body = { success: true, hash: finalHash };
+      try {
+        const finalSongs = songOperation(nowSongs, spotIds, laterOps);
+        const finalIds = finalSongs.map((s) => s.id);
+        const finalHash = getHash(finalSongs);
+        currentOp.idArray = finalIds;
+        currentOp.hash = finalHash;
+        logs.push(currentOp);
+        if (logs.length > 50) logs.shift();
+        roomSongsCache[roomId] = finalSongs;
+        await ctx.cache.set(`ktv_room`, roomId, finalSongs);
+        koaCtx.body = { success: true, hash: finalHash };
+      } catch (e) {
+        console.error("Operation re-run failed:", e);
+        koaCtx.body = { success: false, code: "REJECT" };
+      }
     });
     ctx.server.get("/songRoom/:roomId", async (koaCtx) => {
       const { roomId } = koaCtx.params;
@@ -1858,9 +1879,18 @@ function apply(ctx, cfg) {
             function joinRoom() {
                 const id = document.getElementById('roomInput').value.trim();
                 if (id) {
-                    window.location.href = \`\${id}\`;
+                    // 1. 获取当前页面的基础路径 (例如 "/songRoom" 或 "/")
+                    // 2. 移除末尾可能存在的斜杠
+                    const currentPath = window.location.pathname.replace(/\\/$/, '');
+
+                    // 3. 拼接房间号实现跳转
+                    // 这样：
+                    // 如果是 127.0.0.1:5140/songRoom -> 会跳到 /songRoom/1145
+                    // 如果是 a.b.c -> 会跳到 /1145
+                    window.location.href = \`\${currentPath}/\${id}\`;
                 }
             }
+
             // 支持回车键跳转
             document.getElementById('roomInput').addEventListener('keypress', (e) => {
                 if (e.key === 'Enter') joinRoom();

package/package.json

@@ -4,7 +4,7 @@
   "contributors": [
     "StarFreedomX <starfreedomx@outlook.com>"
   ],
-  "version": "0.26.3",
+  "version": "0.26.4",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [