Partially implemented downloadPackage as part of CliProviderImpl

src/cli/CliProvider.ts

@@ -29,25 +29,25 @@ export type CliStateCallback = {
 
 export interface CliProvider {
 
-    isPackageInCache: (packageName: string, version: VersionNumber) => boolean;
-    hasPackageExtractedSuccessfully: (packageName: string, version: VersionNumber) => boolean;
+    isPackageInCache: (packageName: string, version: VersionNumber) => Promise<boolean>;
+    hasPackageExtractedSuccessfully: (packageName: string, version: VersionNumber) => Promise<boolean>;
     // Returns an array of package full names to install
     // EG: author-modname-1.2.3
-    getRequiredPackageUpdates: (profile: Profile) => string[];
+    getRequiredPackageUpdates: (profile: Profile) => Promise<string[]>;
 
     downloadPackage: (
         packageName: string,
         version: VersionNumber,
         downloadEventManager: EventManager<CliProgressCallback>,
-        writeToDiskEventManager: () => EventManager<CliProgressCallback>,
-        successStateManager: () => EventManager<CliStateCallback>
-    ) => void;
+        writeToDiskEventManager: EventManager<CliProgressCallback>,
+        successStateManager: EventManager<CliStateCallback>
+    ) => Promise<void>;
 
     installPackage: (
         packageName: string,
         version: VersionNumber,
         writeToDiskEventManager: () => EventManager<CliProgressCallback>,
         successStateManager: () => EventManager<CliStateCallback>
-    ) => void;
+    ) => Promise<void>;
 
 }

src/cli/CliProviderImpl.ts

@@ -0,0 +1,34 @@
+import { CliProgressCallback, CliProvider, CliStateCallback } from 'src/cli/CliProvider';
+import VersionNumber from 'src/model/VersionNumber';
+import { EventManager } from 'src/cli/EventManager';
+import Profile from 'src/model/Profile';
+
+export default class CliProviderImpl implements CliProvider {
+
+    downloadPackage(packageName: string, version: VersionNumber, downloadEventManager: EventManager<CliProgressCallback>, writeToDiskEventManager: EventManager<CliProgressCallback>, successStateManager: EventManager<CliStateCallback>): Promise<void> {
+        return Promise.reject("Not yet implemented");
+    }
+
+    getRequiredPackageUpdates(profile: Profile): Promise<string[]> {
+        return Promise.reject("Not yet implemented");
+    }
+
+    hasPackageExtractedSuccessfully(packageName: string, version: VersionNumber): Promise<boolean> {
+        return Promise.reject("Not yet implemented");
+    }
+
+    installPackage(
+        packageName: string,
+        version: VersionNumber,
+        writeToDiskEventManager: () => EventManager<CliProgressCallback>,
+        successStateManager: () => EventManager<CliStateCallback>)
+        : Promise<void>
+    {
+        return Promise.reject("Not yet implemented");
+    }
+
+    isPackageInCache(packageName: string, version: VersionNumber): Promise<boolean> {
+        return Promise.reject("Not yet implemented");
+    }
+
+}

src/cli/PackageDownloader.ts

@@ -0,0 +1,54 @@
+import VersionNumber from 'src/model/VersionNumber';
+import { EventManager } from 'src/cli/EventManager';
+import { CliProgressCallback, CliStateCallback } from 'src/cli/CliProvider';
+import ThunderstorePackages from 'src/r2mm/data/ThunderstorePackages';
+import R2Error from 'src/model/errors/R2Error';
+import axios from 'axios';
+
+export default class PackageDownloader {
+
+    public downloadPackage(
+        packageName: string,
+        version: VersionNumber,
+        downloadEventManager: EventManager<CliProgressCallback>,
+        writeToDiskEventManager: EventManager<CliProgressCallback>,
+        successStateManager: EventManager<CliStateCallback>)
+        : void {
+
+        const packageMap = ThunderstorePackages.PACKAGES_MAP;
+        if (!packageMap.has(packageName)) {
+            successStateManager.publish({
+                finished: false,
+                error: new R2Error(`${packageName} not found`, `Unable to find package ${packageName}`, 'Refresh the mod list via the settings screen or try again later')
+            } as CliStateCallback);
+            return;
+        }
+
+        const pkg = packageMap.get(packageName)!;
+        const pkgVersion = pkg.getVersions()
+            .find(pv => pv.getVersionNumber().isEqualTo(version));
+
+        if (pkgVersion === undefined) {
+            successStateManager.publish({
+                finished: false,
+                error: new R2Error(`${packageName}-${version.toString()} not found`, `No version of ${packageName} matching ${version.toString()} was found`, 'Refresh the mod list via the settings screen or try again later')
+            } as CliStateCallback);
+            return;
+        }
+
+        axios.get(pkgVersion.getDownloadUrl(), {
+            onDownloadProgress: progress => {
+                downloadEventManager.publish({
+                    currentBytes: progress.loaded,
+                    totalBytes: progress.total
+                } as CliProgressCallback);
+            },
+            responseType: 'arraybuffer',
+            headers: {
+                'Content-Type': 'application/zip',
+                'Access-Control-Allow-Origin': '*'
+            }
+        })
+    }
+
+}

src/pages/Manager.vue

@@ -175,6 +175,7 @@ import LocalFileImportModal from '../components/importing/LocalFileImportModal.v
 import { PackageLoader } from '../model/installing/PackageLoader';
 import GameInstructions from '../r2mm/launching/instructions/GameInstructions';
 import CategoryFilterModal from '../components/modals/CategoryFilterModal.vue';
+import ThunderstorePackages from 'src/r2mm/data/ThunderstorePackages';
 
 @Component({
 		components: {
@@ -671,6 +672,8 @@ import CategoryFilterModal from '../components/modals/CategoryFilterModal.vue';
                     .catch(this.showError);
             });
 
+            console.log("TS package map", ThunderstorePackages.PACKAGES_MAP);
+
 			this.isManagerUpdateAvailable();
 		}
 	}