Add UtilityMixin

The mixin contains code which is shared by the implementations of r2
and Thunderstore mod managers.

Updating the game and profile specific mod lists were split to separate
methods since as far as I could tell, one doesn't affect the other.

Refs TS-1140

src/App.vue

@@ -24,8 +24,7 @@
 </template>
 
 <script lang="ts">
-import Vue from 'vue';
-import Component from 'vue-class-component';
+import Component, { mixins } from 'vue-class-component';
 import 'bulma-steps/dist/js/bulma-steps.min.js';
 import R2Error from './model/errors/R2Error';
 import ManagerSettings from './r2mm/manager/ManagerSettings';
@@ -57,10 +56,6 @@ import AdmZipProvider from './providers/generic/zip/AdmZipProvider';
 import ManagerSettingsMigration from './r2mm/manager/ManagerSettingsMigration';
 import BindLoaderImpl from './providers/components/loaders/bind_impls/BindLoaderImpl';
 import GameManager from './model/game/GameManager';
-import ThunderstorePackages from './r2mm/data/ThunderstorePackages';
-import ProfileModList from './r2mm/mods/ProfileModList';
-import Profile from './model/Profile';
-import ManifestV2 from './model/ManifestV2';
 import PlatformInterceptorProvider from './providers/generic/game/platform_interceptor/PlatformInterceptorProvider';
 import PlatformInterceptorImpl from './providers/generic/game/platform_interceptor/PlatformInterceptorImpl';
 import ProfileInstallerProvider from './providers/ror2/installing/ProfileInstallerProvider';
@@ -69,10 +64,10 @@ import InstallationRuleApplicator from './r2mm/installing/default_installation_r
 import GenericProfileInstaller from './r2mm/installing/profile_installers/GenericProfileInstaller';
 import ConnectionProviderImpl from './r2mm/connection/ConnectionProviderImpl';
 import ConnectionProvider from './providers/generic/connection/ConnectionProvider';
-import ApiCacheUtils from './utils/ApiCacheUtils';
+import UtilityMixin from './components/mixins/UtilityMixin.vue';
 
 @Component
-export default class App extends Vue {
+export default class App extends mixins(UtilityMixin) {
 
  private errorMessage: string = '';
  private errorStack: string = '';
@@ -100,7 +95,8 @@ export default class App extends Vue {
  const riskOfRain2Game = GameManager.gameList.find(value => value.displayName === "Risk of Rain 2")!;
  GameManager.activeGame = riskOfRain2Game;
 
- this.hookModListRefresh();
+ this.hookThunderstoreModListRefresh();
+ this.hookProfileModListRefresh();
 
  const settings = await ManagerSettings.getSingleton(riskOfRain2Game);
  this.settings = settings;
@@ -169,23 +165,5 @@ export default class App extends Vue {
  BindLoaderImpl.bind();
  }
 
- private hookModListRefresh() {
- setInterval(() => {
- ThunderstorePackages.update(GameManager.activeGame)
- .then(async (response) => {
- await ApiCacheUtils.storeLastRequest(response.data);
- await this.$store.dispatch("updateThunderstoreModList", ThunderstorePackages.PACKAGES);
- // Ignore the warning. If no profile is selected on game selection then getActiveProfile will return undefined.
- if (Profile.getActiveProfile() !== undefined) {
- ProfileModList.getModList(Profile.getActiveProfile()).then((value: ManifestV2[] | R2Error) => {
- if (!(value instanceof R2Error)) {
- this.$store.dispatch("updateModList", value);
- }
- });
- }
- });
- }, 5 * 60 * 1000);
- }
-
 }
 </script>

src/components/mixins/UtilityMixin.vue

@@ -0,0 +1,45 @@
+<script lang='ts'>
+import Vue from 'vue';
+import Component from 'vue-class-component';
+
+import R2Error from '../../model/errors/R2Error';
+import GameManager from '../../model/game/GameManager';
+import Profile from '../../model/Profile';
+import ThunderstorePackages from '../../r2mm/data/ThunderstorePackages';
+import ProfileModList from '../../r2mm/mods/ProfileModList';
+import ApiCacheUtils from '../../utils/ApiCacheUtils';
+
+@Component
+export default class UtilityMixin extends Vue {
+ readonly REFRESH_INTERVAL = 5 * 60 * 1000;
+
+ hookProfileModListRefresh() {
+ setInterval(this.refreshProfileModList, this.REFRESH_INTERVAL);
+ }
+
+ hookThunderstoreModListRefresh() {
+ setInterval(this.refreshThunderstoreModList, this.REFRESH_INTERVAL);
+ }
+
+ async refreshProfileModList() {
+ const profile = Profile.getActiveProfile();
+
+ // If no profile is selected on game selection then getActiveProfile will return undefined.
+ if (profile === undefined) {
+ return;
+ }
+
+ const modList = await ProfileModList.getModList(profile);
+
+ if (!(modList instanceof R2Error)) {
+ this.$store.dispatch("updateModList", modList);
+ }
+ }
+
+ async refreshThunderstoreModList() {
+ const response = await ThunderstorePackages.update(GameManager.activeGame);
+ await ApiCacheUtils.storeLastRequest(response.data);
+ await this.$store.dispatch("updateThunderstoreModList", ThunderstorePackages.PACKAGES);
+ }
+}
+</script>