koishi-plugin-noah 2.2.1 → 2.2.3

package/lib/index.cjs

@@ -5028,7 +5028,7 @@ var SDVXService = class _SDVXService {
     const refid = await this.getRefid(ctx, url, model, cardId);
     const requestUrl = `?model=KFC:J:G:A:${model}&f=message.get`;
     const xmlRequestBody = `<call model="KFC:J:G:A:${model}" srcid="00010203040506070809">
-    <game method="sv6_load" ver="0">
+    <game method="sv7_load" ver="0">
         <dataid __type="str">${refid}</dataid>
         <cardid __type="str">${cardId}</cardid>
         <refid __type="str">${refid}</refid>
@@ -5049,7 +5049,7 @@ var SDVXService = class _SDVXService {
     const refid = await this.getRefid(ctx, url, model, cardId);
     const requestUrl = `?model=KFC:J:G:A:${model}&f=message.get`;
     const xmlRequestBody = `<call model="KFC:J:G:A:${model}" srcid="00010203040506070809">
-    <game method="sv6_load_m" ver="0">
+    <game method="sv7_load_m" ver="0">
         <dataid __type="str">${refid}</dataid>
         <cardid __type="str">${cardId}</cardid>
         <refid __type="str">${refid}</refid>
@@ -5226,17 +5226,73 @@ var SDVXService2 = class _SDVXService {
     );
     return resp?.code === 0 && resp?.data?.password === pin;
   }
-  async uploadScore(ctx, url, cardId, scorePayload) {
-    const baseURL = "https://maomani.cn";
-    const userName = await this.getUserName(ctx, url, cardId);
+  clearTypeToNum(clearType) {
+    switch (clearType) {
+      case "MC":
+        return 6;
+      case "PUC":
+      case "S-PUC":
+        return 5;
+      case "UC":
+        return 4;
+      case "HC":
+        return 3;
+      case "NC":
+        return 2;
+      case "PLAYED":
+        return 1;
+      default:
+        return 0;
+    }
+  }
+  diffNameToMusicType(diffName) {
+    switch (diffName.toUpperCase()) {
+      case "NOV":
+        return 0;
+      case "ADV":
+        return 1;
+      case "EXH":
+        return 2;
+      case "INF":
+      case "GRV":
+      case "HVN":
+      case "VVD":
+      case "XCD":
+        return 3;
+      case "MXM":
+        return 4;
+      case "ULT":
+        return 5;
+      default:
+        return 0;
+    }
+  }
+  async uploadScore(ctx, url, cardId, scores) {
+    const apiKey = ctx.globalConfig.maoApiKey;
+    if (!apiKey) {
+      this.logger.warn("maoApiKey not configured");
+      return false;
+    }
+    const payload = scores.filter((s) => {
+      const musicId = Number(s.music.music_id);
+      return musicId > 0 && s.music.music_diff_name;
+    }).map((s) => ({
+      music_id: Number(s.music.music_id),
+      music_type: this.diffNameToMusicType(s.music.music_diff_name),
+      score: s.music.score,
+      exscore: s.music.exscore,
+      clear_type: this.clearTypeToNum(s.music.clear_type)
+    }));
+    if (payload.length === 0) return false;
     const resp = await ctx.http.post(
-      `/api/logs/upload?name=${encodeURIComponent(`${userName}`)}&pw=logs`,
-      scorePayload,
+      "/bot/v2/sdvx/upload",
+      { card: cardId, scores: payload },
       {
-        baseURL
+        baseURL: ctx.globalConfig.maoServerUrl,
+        headers: { "X-API-Key": apiKey }
       }
     );
-    return resp === "Logs-573sdvx-json-导入成功";
+    return resp?.code === 0;
   }
   async getAllScore(ctx, url, cardId, config) {
     try {
@@ -6125,10 +6181,9 @@ function sync(ctx, config, logger5) {
     if (!scoreList || scoreList.length === 0) {
       return session.text(".no-scores");
     }
-    const syncPayload = buildSyncPayload(scoreList);
     await session.send(
       session.text(".confirm-sync", {
-        score_count: syncPayload.length
+        score_count: scoreList.length
       })
     );
     const confirm = await session.prompt();
@@ -6139,7 +6194,7 @@ function sync(ctx, config, logger5) {
         ctx,
         maoServer.baseUrl,
         targetCard.code,
-        syncPayload
+        scoreList
       );
       if (!ok) {
         logger5.warn("Mao SDVX uploadScore returned falsy result");
@@ -6154,61 +6209,11 @@ function sync(ctx, config, logger5) {
       source_server_type: sourceServer.type,
       source_card_name: sourceCard.name,
       target_card_name: targetCard.name,
-      score_count: syncPayload.length
+      score_count: scoreList.length
     });
   });
 }
 __name(sync, "sync");
-function clearTypeToMark(clearType) {
-  switch (clearType) {
-    case "S-PUC":
-      return "spuc";
-    case "PUC":
-      return "puc";
-    case "UC":
-      return "uc";
-    case "MC":
-      return "mc";
-    case "HC":
-      return "hc";
-    case "NC":
-      return "nc";
-    case "PLAYED":
-      return "played";
-    case "NO PLAY":
-      return "noplay";
-    default:
-      return "noplay";
-  }
-}
-__name(clearTypeToMark, "clearTypeToMark");
-function buildSyncPayload(scoreList) {
-  const payloadMap = /* @__PURE__ */ new Map();
-  for (const score of scoreList) {
-    const musicIdRaw = String(score.music.music_id);
-    if (!/^\d+$/.test(musicIdRaw)) continue;
-    const musicId = musicIdRaw;
-    let diffName = score.music.music_diff_name;
-    if (!diffName) continue;
-    const upperDiff = diffName.toUpperCase();
-    if (["GRV", "HVN", "VVD", "XCD"].includes(upperDiff)) {
-      diffName = "INF";
-    } else {
-      diffName = upperDiff;
-    }
-    if (!payloadMap.has(musicId)) {
-      payloadMap.set(musicId, { music_id: musicId, difficulties: {} });
-    }
-    const entry = payloadMap.get(musicId);
-    entry.difficulties[diffName] = {
-      score: score.music.score,
-      mark: clearTypeToMark(score.music.clear_type),
-      grade: score.music.score_grade
-    };
-  }
-  return Array.from(payloadMap.values());
-}
-__name(buildSyncPayload, "buildSyncPayload");
 
 // src/games/sdvx/commands/vf.ts
 var fs4 = __toESM(require("fs"), 1);

package/lib/servers/Mao/services/sdvx-service.d.ts

@@ -30,14 +30,9 @@ export declare class SDVXService implements ISDVXService {
      * @returns 验证是否通过
      */
     verifyPin(ctx: Context, url: string, cardId: string, pin: string): Promise<boolean>;
-    uploadScore(ctx: Context, url: string, cardId: string, scorePayload: {
-        music_id: string;
-        difficulties: Record<string, {
-            score: number;
-            mark: string;
-            grade: string;
-        }>;
-    }[]): Promise<boolean>;
+    private clearTypeToNum;
+    private diffNameToMusicType;
+    uploadScore(ctx: Context, url: string, cardId: string, scores: SDVXScore[]): Promise<boolean>;
     getAllScore(ctx: Context, url: string, cardId: string, config: SDVXConfig): Promise<SDVXScore[]>;
     getScore(ctx: Context, url: string, cardId: string, musicId: number, config: SDVXConfig): Promise<SDVXScore>;
     getRecentScores(ctx: Context, url: string, cardId: string, config: SDVXConfig, count?: number): Promise<SDVXScore[]>;

package/lib/types/index.d.ts

@@ -79,14 +79,7 @@ export interface SDVXService extends GameService {
      * @param scorePayload - 待上传的分数数据
      * @returns 上传是否成功
      */
-    uploadScore?(ctx: Context, url: string, cardId: string, scorePayload: {
-        music_id: string;
-        difficulties: Record<string, {
-            score: number;
-            mark: string;
-            grade: string;
-        }>;
-    }[]): Promise<boolean>;
+    uploadScore?(ctx: Context, url: string, cardId: string, scores: SDVXScore[]): Promise<boolean>;
 }
 /**
  * 服务器接口

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "koishi-plugin-noah",
-    "version": "2.2.1",
+    "version": "2.2.3",
     "contributors": [
         "Logthm <logthm@outlook.com>"
     ],