Merge pull request #1151 from ebkr/profile-performance

Use caching to improve performance of large profiles
ebkr · Jan 22, 2024 · 64acae7 · 64acae7
2 parents de4fca1 + 5f66820
commit 64acae7
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 12 deletions.
diff --git a/src/components/views/LocalModList.vue b/src/components/views/LocalModList.vue
@@ -339,7 +339,7 @@ import SearchUtils from '../../utils/SearchUtils';
         }
 
         getThunderstoreModFromMod(mod: ManifestV2) {
-            return ModBridge.getThunderstoreModFromMod(mod, this.thunderstorePackages);
+            return ModBridge.getCachedThunderstoreModFromMod(mod);
         }
 
         async moveUp(vueMod: any) {
@@ -372,8 +372,8 @@ import SearchUtils from '../../utils/SearchUtils';
             this.filterModList();
         }
 
-        isLatest(vueMod: any): boolean {
-            return ModBridge.isLatestVersion(vueMod);
+        isLatest(mod: ManifestV2): boolean {
+            return ModBridge.isCachedLatestVersion(mod);
         }
 
         getMissingDependencies(vueMod: any): string[] {

diff --git a/src/model/VersionNumber.ts b/src/model/VersionNumber.ts
@@ -64,4 +64,8 @@ export default class VersionNumber implements ReactiveObjectConverterInterface {
         const patchCompare = Math.sign(this.patch - version.patch);
         return (majorCompare === 0 && minorCompare === 0 && patchCompare === 0);
     }
+
+    public isEqualOrNewerThan(version: VersionNumber): boolean {
+        return this.isEqualTo(version) || this.isNewerThan(version);
+    }
 }
diff --git a/src/r2mm/data/ThunderstorePackages.ts b/src/r2mm/data/ThunderstorePackages.ts
@@ -2,6 +2,7 @@ import ThunderstoreMod from '../../model/ThunderstoreMod';
 import Game from '../../model/game/Game';
 import ApiResponse from '../../model/api/ApiResponse';
 import ConnectionProvider from '../../providers/generic/connection/ConnectionProvider';
+import ModBridge from '../mods/ModBridge';
 
 export default class ThunderstorePackages {
 
@@ -29,6 +30,8 @@ export default class ThunderstorePackages {
             .map(ThunderstoreMod.parseFromThunderstoreData)
             .filter((mod) => !ThunderstorePackages.EXCLUSIONS.includes(mod.getFullName()));
 
+        ModBridge.clearCache();
+
         ThunderstorePackages.PACKAGES_MAP = ThunderstorePackages.PACKAGES.reduce((map, pkg) => {
             map.set(pkg.getFullName(), pkg);
             return map;

diff --git a/src/r2mm/mods/ModBridge.ts b/src/r2mm/mods/ModBridge.ts
@@ -3,20 +3,25 @@ import ThunderstoreVersion from '../../model/ThunderstoreVersion';
 import ManifestV2 from '../../model/ManifestV2';
 import ThunderstorePackages from '../data/ThunderstorePackages';
 
+interface CachedMod {
+    tsMod: ThunderstoreMod | undefined;
+    isLatest: boolean;
+}
+
+interface ModCache {
+    [key: string]: CachedMod;
+}
+
 export default class ModBridge {
+    private static CACHE: ModCache = {}
 
-    public static getLatestVersion(mod: ManifestV2, modList: ThunderstoreMod[]): ThunderstoreVersion | void {
+    public static getLatestVersion(mod: ManifestV2, modList: ThunderstoreMod[]): ThunderstoreVersion | undefined {
         const matchingMod: ThunderstoreMod | undefined = modList.find((tsMod: ThunderstoreMod) => tsMod.getFullName() === mod.getName());
         if (matchingMod === undefined) {
             return;
         }
         // Compare version numbers and reduce.
-        return matchingMod.getVersions().reduce((v1: ThunderstoreVersion, v2: ThunderstoreVersion) => {
-            if (v1.getVersionNumber().isNewerThan(v2.getVersionNumber())) {
-                return v1;
-            }
-            return v2;
-        });
+        return matchingMod.getVersions().reduce(reduceToNewestVersion);
     }
 
     public static getThunderstoreModFromMod(mod: ManifestV2, modList: ThunderstoreMod[]): ThunderstoreMod | undefined {
@@ -27,10 +32,45 @@ export default class ModBridge {
         const mod: ManifestV2 = new ManifestV2().fromReactive(vueMod);
         const latestVersion: ThunderstoreVersion | void = ModBridge.getLatestVersion(mod, ThunderstorePackages.PACKAGES);
         if (latestVersion instanceof ThunderstoreVersion) {
-            return mod.getVersionNumber()
-                .isEqualTo(latestVersion.getVersionNumber()) || mod.getVersionNumber().isNewerThan(latestVersion.getVersionNumber());
+            return mod.getVersionNumber().isEqualOrNewerThan(latestVersion.getVersionNumber());
         }
         return true;
     }
 
+    private static getCached(mod: ManifestV2): CachedMod {
+        const cacheKey = `${mod.getName()}-${mod.getVersionNumber()}`;
+
+        if (ModBridge.CACHE[cacheKey] === undefined) {
+            const tsMod = ThunderstorePackages.PACKAGES.find((tsMod) => tsMod.getFullName() === mod.getName());
+
+            if (tsMod === undefined) {
+                ModBridge.CACHE[cacheKey] = { tsMod: undefined, isLatest: true };
+            } else {
+                const latestVersion = tsMod.getVersions().reduce(reduceToNewestVersion);
+                const isLatest = mod.getVersionNumber().isEqualOrNewerThan(latestVersion.getVersionNumber());
+                ModBridge.CACHE[cacheKey] = { tsMod, isLatest };
+            }
+        }
+
+        return ModBridge.CACHE[cacheKey];
+    }
+
+    public static getCachedThunderstoreModFromMod(mod: ManifestV2): ThunderstoreMod | undefined {
+        return ModBridge.getCached(mod).tsMod;
+    }
+
+    public static isCachedLatestVersion(mod: ManifestV2): boolean {
+        return ModBridge.getCached(mod).isLatest;
+    }
+
+    public static clearCache() {
+        ModBridge.CACHE = {};
+    }
 }
+
+const reduceToNewestVersion = (v1: ThunderstoreVersion, v2: ThunderstoreVersion) => {
+    if (v1.getVersionNumber().isNewerThan(v2.getVersionNumber())) {
+        return v1;
+    }
+    return v2;
+};