aquamai install mirror

Author: clansty

AquaMai

@@ -313,7 +313,7 @@ private static bool VerifyBinary(byte[] data, string sign, string key)
         return ecdsa.VerifyData(data, signature, HashAlgorithmName.SHA256, DSASignatureFormat.Rfc3279DerSequence);
     }
 
-    public record InstallAquaMaiOnlineDto(string Url, string Type, string Sign);
+    public record InstallAquaMaiOnlineDto(string[] Urls, string Type, string Sign);
 
     [HttpPost]
     public async Task InstallAquaMaiOnline(InstallAquaMaiOnlineDto req)
@@ -326,16 +326,32 @@ public async Task InstallAquaMaiOnline(InstallAquaMaiOnlineDto req)
         };
         // Download from url
         using var client = new HttpClient();
-        var data = await client.GetByteArrayAsync(req.Url);
-
-        if (!VerifyBinary(data, req.Sign, key))
+        client.Timeout = TimeSpan.FromSeconds(15);
+        Exception? lastException = null;
+        foreach (var url in req.Urls)
         {
-            throw new InvalidOperationException("Invalid signature");
-        }
+            byte[] data;
+            try
+            {
+                data = await client.GetByteArrayAsync(url);
 
-        // Save to Mods folder
-        var dest = Path.Combine(StaticSettings.GamePath, @"Mods\AquaMai.dll");
-        Directory.CreateDirectory(Path.GetDirectoryName(dest));
-        await System.IO.File.WriteAllBytesAsync(dest, data);
+                if (!VerifyBinary(data, req.Sign, key))
+                {
+                    throw new InvalidOperationException("Invalid signature");
+                }
+            }
+            catch (Exception e)
+            {
+                logger.LogError(e, "Failed to download AquaMai from {Url}", url);
+                lastException = e;
+                continue;
+            }
+            // Save to Mods folder
+            var dest = Path.Combine(StaticSettings.GamePath, @"Mods\AquaMai.dll");
+            Directory.CreateDirectory(Path.GetDirectoryName(dest));
+            await System.IO.File.WriteAllBytesAsync(dest, data);
+            return;
+        }
+        throw new InvalidOperationException("Failed to download AquaMai from all urls", lastException);
     }
 }

MaiChartManager/Controllers/ModController.cs

@@ -16,7 +16,7 @@ export default (new Api({
 })).maiChartManagerServlet
 
 export const aquaMaiVersionConfig = new AquaMaiVersionConfigApi({
-  baseUrl: 'https://aquamai-version-config.init.ink',
+  baseUrl: 'https://aquamai-version-config.mumur.net',
   baseApiParams: {
     headers: {
       accept: 'application/json',

MaiChartManager/Front/src/client/api.ts

@@ -208,7 +208,7 @@ export interface ImportChartResult {
 }
 
 export interface InstallAquaMaiOnlineDto {
-  url?: string | null;
+  urls?: string[] | null;
   type?: string | null;
   sign?: string | null;
 }

MaiChartManager/Front/src/client/apiGen.ts

@@ -241,6 +241,8 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
           type: "builtin" | "release" | "ci";
           /** @format uri */
           url?: string;
+          /** @format uri */
+          url2?: string;
           sign?: string;
           /** @default false */
           default?: boolean;
@@ -270,6 +272,8 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
           type: "builtin" | "release" | "ci";
           /** @format uri */
           url?: string;
+          /** @format uri */
+          url2?: string;
           sign?: string;
           /** @default false */
           default?: boolean;

MaiChartManager/Front/src/client/aquaMaiVersionConfigApiGen.ts

@@ -24,9 +24,13 @@ export default defineComponent({
           if (!version) {
             throw new Error('未找到对应版本');
           }
+          const urls = [version.url!];
+          if (version.url2) {
+            urls.push(version.url2);
+          }
           await api.InstallAquaMaiOnline({
             type,
-            url: version.url,
+            urls,
             sign: version.sign,
           });
         }

MaiChartManager/Front/src/components/ModManager/ModInstallDropdown.tsx

@@ -1,23 +1,22 @@
 import { computed, defineComponent, PropType } from "vue";
-import { AquaMaiTouchSensitivityConfig } from "@/client/apiGen";
 import styles from "./TouchSensitivityDisplay.module.sass";
 
 const CLASS_NOT_SELECTED = styles.region;
 const CLASS_SELECTED = `${styles.region} ${styles.selected}`;
 export default defineComponent({
   props: {
-    currentSelected: String as PropType<keyof AquaMaiTouchSensitivityConfig>,
-    config: {type: Object as PropType<AquaMaiTouchSensitivityConfig>, required: true},
+    currentSelected: String,
+    config: {type: Object, required: true},
   },
   setup(props, {emit}) {
     const currentSelected = computed({
       get: () => props.currentSelected,
       set: (val) => emit('update:currentSelected', val)
     })
-    const onRegionClick = (region: keyof AquaMaiTouchSensitivityConfig) => {
+    const onRegionClick = (region: string) => {
       currentSelected.value = region
     }
-    const regionClick = (region: keyof AquaMaiTouchSensitivityConfig) => () => onRegionClick(region)
+    const regionClick = (region: string) => () => onRegionClick(region)
     return () => <svg
       width="30em"
       height="30em"

MaiChartManager/Front/src/components/ModManager/sectionPanelOverride/GameSettings.TouchSensitivity/TouchSensitivityDisplay.tsx

@@ -88,12 +88,19 @@ export const updateModInfo = async () => {
 
 export const updateModUpdateInfo = async () => {
   try {
-    const ret = await aquaMaiVersionConfig.getGetConfig();
-    if (ret.error) {
-      console.error('Failed to get mod update info:', ret.error);
-      return;
-    }
-    modUpdateInfo.value = ret.data;
+    modUpdateInfo.value = await Promise.any([
+      (async () => {
+        const res = await aquaMaiVersionConfig.getGetConfig();
+        return res.data;
+      })(),
+      (async () => {
+        const res = await fetch('https://munet-version-config-1251600285.cos.ap-shanghai.myqcloud.com/aquamai.json');
+        if (!res.ok) {
+          throw new Error(`Failed to fetch mod update info: ${res.status} ${res.statusText}`);
+        }
+        return await res.json();
+      })(),
+    ]);
   } catch (e) {
     console.error('Failed to get mod update info:', e);
   }