make getByDataHash() take a hash as argument

Author: iTrooz

mclib/src/finder/LocalSolutionFinder.test.ts

@@ -41,13 +41,12 @@ class MockRepository implements IRepository {
     }
 
     async hashModData(modData: Uint8Array): Promise<string> {
-        return Array.from(modData.slice(0, 8)).join('-'); // Simple hash for testing
+        // For testing, we'll use a simple key based on the first few bytes
+        return Array.from(modData.slice(0, 8)).join('-');
     }
 
-    async getByDataHash(modData: Uint8Array): Promise<ModRepoMetadata | null> {
-        // For testing, we'll use a simple key based on the first few bytes
-        const key = await this.hashModData(modData);
-        return this.dataHashes[key] || null;
+    async getByDataHash(hash: string): Promise<ModRepoMetadata | null> {
+        return this.dataHashes[hash] || null;
     }
 
     getRepositoryName(): ModRepositoryName {

mclib/src/query/ModQueryService.ts

@@ -88,7 +88,7 @@ export class ModQueryService implements IModQueryService {
         for (const repo of this.repositories) {
             logger.debug("getModByDataHash(size = %s, %s)", modData.length, repo.getRepositoryName())
             try {
-                const result = await repo.getByDataHash(modData);
+                const result = await repo.getByDataHash(await repo.hashModData(modData));
                 if (result) {
                     logger.debug("getModByDataHash(size = %s, %s) = %s (%s)", modData.length, repo.getRepositoryName(), result.id, result.name);
                     results.push(result);

mclib/src/repos/CurseForgeRepository.ts

@@ -97,21 +97,15 @@ export class CurseForgeRepository implements IRepository {
         return (await modResp.json()).data as ModInfoData;
     }
 
-    async getByDataHash(modData: Uint8Array): Promise<ModRepoMetadata | null> {
-        // Calculate CurseForge fingerprint
-        const start = Date.now();
-        const fingerprint: number = cf_fingerprint(modData);
-        const duration = Date.now() - start;
-        logger.debug(`cf_fingerprint(${modData.length} bytes): ${duration}ms`);
-
+    async getByDataHash(hash: string): Promise<ModRepoMetadata | null> {
         // Use the CurseForge API to get file info by fingerprint
         const resp = await this.fetchClient(`${CurseForgeRepository.BASE_URL}/fingerprints`, {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/json',
             },
             body: JSON.stringify({
-                fingerprints: [fingerprint]
+                fingerprints: [parseInt(hash)]
             })
         });
 
@@ -141,7 +135,11 @@ export class CurseForgeRepository implements IRepository {
     }
 
     async hashModData(modData: Uint8Array): Promise<string> {
-        return cf_fingerprint(modData).toString();
+        const start = Date.now();
+        const fingerprint: number = cf_fingerprint(modData);
+        const duration = Date.now() - start;
+        logger.debug(`cf_fingerprint(${modData.length} bytes): ${duration}ms`);
+        return fingerprint.toString();
     }
 
     getRepositoryName(): ModRepositoryName {

mclib/src/repos/IRepository.ts

@@ -27,10 +27,10 @@ export interface IRepository {
 
     /**
      * Get mod information by file hash/fingerprint from mod file bytes.
-     * @param modData The complete mod file data as bytes.
+     * @param hash The hash provided by hashModData().
      * @returns A promise resolving to mod search metadata, or null if not found.
      */
-    getByDataHash(modData: Uint8Array): Promise<ModRepoMetadata | null>;
+    getByDataHash(hash: string): Promise<ModRepoMetadata | null>;
 
     /**
      * Returns the repository name (ModRepositoryName enum value)

mclib/src/repos/ModrinthRepository.ts

@@ -81,10 +81,7 @@ export class ModrinthRepository implements IRepository {
         }));
     }
 
-    async getByDataHash(modData: Uint8Array): Promise<ModRepoMetadata | null> {
-        // Calculate SHA-1 hash of the mod data for Modrinth
-        const hash = await this.calculateSHA1(modData);
-
+    async getByDataHash(hash: string): Promise<ModRepoMetadata | null> {
         // Get version info using the hash
         const versionResp = await this.fetchClient(`https://api.modrinth.com/v2/version_file/${hash}`);
         if (!versionResp.ok) return null;

web/src/components/FileDropZone.svelte

@@ -70,7 +70,7 @@
 			// Try to identify the mod using each repository
 			for (const repo of repositories) {
 				try {
-					const modInfo = await repo.getByDataHash(modData);
+					const modInfo = await repo.getByDataHash(await repo.hashModData(modData));
 					if (modInfo) {
 						console.log(`Found mod: ${modInfo.name} from ${repo.getRepositoryName()}`);
 						add_mod_to_list(modInfo);