re-enable web installer

hotfix/file-verification-download-a-version

package.json

@@ -74,7 +74,8 @@
     },
     "win": {
       "target": [
-        "nsis"
+        "nsis",
+        "nsis-web"
       ],
       "icon": "assets/favicon.ico",
       "certificateSha1": "f3363a89b084f8f6b616babea3c91f9d79e15000"

release/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bs-manager",
-  "version": "1.0.0-alpha.7",
+  "version": "1.0.0",
   "description": "A foundation for scalable desktop apps",
   "main": "./dist/main/main.js",
   "author": {

src/main/ipcs/bs-download-ipcs.ts

@@ -1,6 +1,5 @@
 import { ipcMain } from 'electron';
-import { BSVersion } from 'shared/bs-version.interface';
-import { BSInstallerService, DownloadEventType } from '../services/bs-installer.service';
+import { BSInstallerService, DownloadEventType, DownloadInfo } from '../services/bs-installer.service';
 import { IpcRequest } from 'shared/models/ipc';
 import { InstallationLocationService } from '../services/installation-location.service';
 import { UtilsService } from '../services/utils.service';
@@ -18,13 +17,6 @@ export interface InitDownloadInfoInterface {
   stay: boolean
 }
 
-export interface DownloadInfo {
-  bsVersion: BSVersion,
-  username: string,
-  password?: string,
-  stay?: boolean
-}
-
 ipcMain.on('is-dotnet-6-installed', async (event, request: IpcRequest<void>) => {
     const installer = BSInstallerService.getInstance();
     const utils = UtilsService.getInstance();

src/main/services/bs-installer.service.ts

@@ -86,6 +86,13 @@ export class BSInstallerService{
     if(!(await isOnline({timeout: 1500}))){ throw "no-internet"; }
 
     this.utils.createFolderIfNotExist(this.installLocationService.versionsDirectory);
+
+    const versionPath = await this.localVersionService.getVersionPath(bsVersion)
+
+    const dest = !downloadInfos.isVerification ? this.getPathNotAleardyExist(versionPath) : versionPath;
+
+    const downloadVersion: BSVersion = {...downloadInfos.bsVersion, ...(path.basename(dest) !== downloadInfos.bsVersion.BSVersion && {name: path.basename(dest)})}
+
     this.downloadProcess = spawn(
       this.getDepotDownloaderExePath(),
       [
@@ -93,12 +100,14 @@ export class BSInstallerService{
         `-depot ${BS_DEPOT}`,
         `-manifest ${bsVersion.BSManifest}`,
         `-username ${downloadInfos.username}`,
-        `-dir \"${this.localVersionService.getVersionFolder(bsVersion)}\"`,
+        `-dir \"${this.localVersionService.getVersionFolder(downloadVersion)}\"`,
         (downloadInfos.stay || !downloadInfos.password) && "-remember-password"
       ],
       {shell: true, cwd: this.installLocationService.versionsDirectory}
     );
 
+    this.utils.ipcSend("start-download-version", {success: true, data: downloadVersion});
+
     return new Promise((resolve, reject) => {
 
       this.downloadProcess.stdout.on('data', data => {
@@ -160,22 +169,27 @@ export class BSInstallerService{
     })
   }
 
+    private getPathNotAleardyExist(path: string): string{
+        let destPath = path;
+        let folderExist = this.utils.pathExist(destPath);
+        let i = 0;
+
+        while(folderExist){
+            i++;
+            destPath = `${path} (${i})`;
+            folderExist = this.utils.pathExist(destPath);
+        }
+
+        return destPath
+    }
+
     public async importVersion(path: string): Promise<PartialBSVersion>{
         
         const rawBsVersion = await this.localVersionService.getVersionOfBSFolder(path);
 
         if(!rawBsVersion){ throw new Error("NOT_BS_FOLDER"); }
 
-        const originalPath = await this.localVersionService.getVersionPath(rawBsVersion);
-        let destPath = originalPath;
-        let folderExist = this.utils.pathExist(destPath);
-        let i = 0;
-
-        while(folderExist){
-            i++;
-            destPath = `${originalPath} (${i})`;
-            folderExist = this.utils.pathExist(destPath);
-        }
+        const destPath = this.getPathNotAleardyExist(await this.localVersionService.getVersionPath(rawBsVersion));
 
         await copy(path, destPath, {dereference: true});
 
@@ -192,12 +206,13 @@ export interface DownloadInfo {
   bsVersion: BSVersion,
   username: string,
   password?: string,
-  stay?: boolean
+  stay?: boolean,
+  isVerification: boolean
 }
 
 export interface DownloadEvent{
   type: DownloadEventType,
-  data?: unknown,
+  data?: unknown
 }
 
 export type DownloadEventType = "[Password]" | "[Guard]" | "[2FA]" | "[Progress]" | "[Validated]" | "[Finished]" | "[AlreadyDownloading]" | "[Error]" | "[Warning]" | "[SteamID]" | "[Exit]" | "[NoInternet]";

src/renderer/components/available-versions/available-version-item.component.tsx

@@ -42,7 +42,7 @@ export const AvailableVersionItem = memo(function AvailableVersionItem(props: {v
 
     return (
         <motion.li className="group relative w-72 h-60 transition-transform active:scale-[.98]" onClick={toggleSelect} onHoverStart={() => setHovered(true)} onHoverEnd={() => setHovered(false)}>
-            <GlowEffect visible={hovered} className="absolute"/>
+            <GlowEffect visible={hovered || selected} className="absolute"/>
             <div className={`relative flex flex-col overflow-hidden rounded-md w-72 h-60 cursor-pointer group-hover:shadow-none duration-300 bg-light-main-color-2 dark:bg-main-color-2 ${!selected && "shadow-lg shadow-gray-900"}`}>
                 <BsmImage image={props.version.ReleaseImg ? props.version.ReleaseImg : defaultImage} errorImage={defaultImage} placeholder={defaultImage} className="absolute top-0 right-0 w-full h-full opacity-40 blur-xl object-cover" loading="lazy"/>
                 <BsmImage image={props.version.ReleaseImg ? props.version.ReleaseImg : defaultImage} errorImage={defaultImage} placeholder={defaultImage} className="bg-black w-full h-3/4 object-cover" loading="lazy"/>

src/renderer/components/nav-bar/bsmanager-icon.component.tsx

@@ -36,7 +36,7 @@ export const BsManagerIcon = memo(({className}: {className?: string}) => {
                 <path d="M626.75,485.91l20.82,351.94a35.21,35.21,0,0,1-15.49,31.36L487.37,965.35l-.06,0A35.56,35.56,0,0,1,476,970.12a34.85,34.85,0,0,1-23.51-2.87L136.58,809.9a115.45,115.45,0,0,1-63.75-96.49L52,361.46a35.26,35.26,0,0,1,15.23-31.21l145.05-96.36a35.72,35.72,0,0,1,11.27-4.7,34.87,34.87,0,0,1,23.51,2.87L563,389.42a115.41,115.41,0,0,1,63.75,96.49Z"/>
                 <path filter="brightness(30%)" d="M613.78,486.67l20.82,352a22.34,22.34,0,0,1-32.26,21.31L286.4,702.57A102.43,102.43,0,0,1,229.83,617L209,265a22.35,22.35,0,0,1,32.26-21.32L557.2,401.05A102.42,102.42,0,0,1,613.78,486.67Z"/>
             </g>
-            <g className="text-black dark:text-white" fill="currentColor">
+            <g className="text-white stroke-black stroke-[2px] dark:stroke-0" fill="currentColor">
                 <path d="M718.29,776.48,700,804.18c-40.63,39.5-87.06,67.25-133.81,90.75-87.32,43.9-203.67,77.19-249,90.34a48,48,0,0,1-26.17.16c-64-17.72-188.62-72-236.28-125.49a4.23,4.23,0,0,1,5.3-6.45c35.64,20.87,111.22,57.64,156.37,74.22,49.18,18.06,81.29,8.74,92.28-3.26a4.77,4.77,0,0,1,7.24.21c19.51,24,107.26,4.6,166.64-13C546.91,892.66,668.42,835.1,718.29,776.48Z"/>
                 <path d="M522.09,933.81,374.64,989.49a3.92,3.92,0,0,0,1.44,7.58l54.62-.77a35.63,35.63,0,0,0,19-5.79l76-49.55A4,4,0,0,0,522.09,933.81Z"/>
                 <path d="M218.92,195.56c-21.14.07-33.55,35.86-33.16,89.08.2,28,2.58,92.74,4.79,147.73.23,5.71-8.18,6.48-9,.81L143.13,162.47a4.38,4.38,0,0,1,7.12-4,63.63,63.63,0,0,0,21.93,11.85,4.61,4.61,0,0,0,5.9-3.72c4.2-27.7,16.63-58.74,37.35-88.74a4.36,4.36,0,0,1,7.56.69c10.86,23.87,49,103.8,93.34,152.79a4.65,4.65,0,0,1-5.62,7.22C274.14,219.18,227.7,195.54,218.92,195.56Z"/>

src/renderer/components/nav-bar/nav-bar-items/bs-version-item.component.tsx

@@ -41,11 +41,12 @@ export function BsVersionItem(props: {version: BSVersion}) {
       )
    }
 
-   const cancel = () => {
-      const versionDownload = downloaderService.currentBsVersionDownload$.value;
-      downloaderService.cancelDownload().then(async res => {
-         if(!res.success){ return; }
-         if(!downloaderService.isVerification){
+    const cancel = () => {
+        const versionDownload = downloaderService.currentBsVersionDownload$.value;
+        const wasVerification = downloaderService.isVerification;
+        downloaderService.cancelDownload().then(async res => {
+        if(!res.success){ return; }
+        if(!wasVerification){
             bsUninstallerService.uninstall(versionDownload).then(res => res && verionManagerService.askInstalledVersions());
          }
       });

src/renderer/pages/available-versions-list.components.tsx

@@ -31,7 +31,7 @@ export function AvailableVersionsList() {
 
     const startDownload = () => {
         setDownloading(() => true)
-        bsDownloaderService.download(versionSelected, versionManagerService.isVersionInstalled(versionSelected)).finally(() => {
+        bsDownloaderService.download(versionSelected).finally(() => {
             setDownloading(() => false);
         });
     }
@@ -91,7 +91,7 @@ export function AvailableVersionsList() {
         <AnimatePresence>
             { versionSelected && !downloading && (
                 <motion.div initial={{y:"150%"}} animate={{y:"0%"}} exit={{y:"150%"}} className="absolute bottom-5" onClick={startDownload}>
-                    <BsmButton text={versionManagerService.isVersionInstalled(versionSelected) ? "misc.verify" : "misc.download"} className="relative text-gray-800 dark:text-gray-100 rounded-md text-3xl font-bold italic tracking-wide px-3 pb-2 pt-1 shadow-md shadow-black"/>
+                    <BsmButton text="misc.download" className="relative text-gray-800 dark:text-gray-100 rounded-md text-3xl font-bold italic tracking-wide px-3 pb-2 pt-1 shadow-md shadow-black"/>
                 </motion.div>
             )}
         </AnimatePresence>

src/renderer/services/bs-downloader.service.ts

@@ -1,4 +1,4 @@
-import { DownloadEvent } from 'main/services/bs-installer.service';
+import { DownloadEvent, DownloadInfo } from 'main/services/bs-installer.service';
 import { BehaviorSubject } from 'rxjs';
 import { distinctUntilChanged, filter, throttleTime } from 'rxjs/operators';
 import { IpcResponse } from 'shared/models/ipc';
@@ -71,10 +71,15 @@ export class BsDownloaderService{
          this.ipcService.sendLazy('bs-download.[2FA]', {args: res.data});
       });
 
+      this.ipcService.watch<BSVersion>("start-download-version").subscribe(res => {
+        this.currentBsVersionDownload$.next(res.data);
+      });
+
       this.currentBsVersionDownload$.subscribe(version => {
          if(version){ this.bsVersionManager.setInstalledVersions([...this.bsVersionManager.installedVersions$.value, version]); }
          else{ this.bsVersionManager.askInstalledVersions(); }
       });
+      
     }
 
     private resetDownload(): void{
@@ -111,7 +116,7 @@ export class BsDownloaderService{
       }
 
       this.progressBarService.show(this.downloadProgress$);
-      this._isVerification = !!isVerification;
+      this._isVerification = isVerification;
 
       let promise;
       if(!this.authService.sessionExist()){
@@ -121,14 +126,12 @@ export class BsDownloaderService{
             return {success: false}; 
         }
          this.authService.setSteamSession(res.data.username, res.data.stay);
-         promise = this.ipcService.send<DownloadEvent>('bs-download.start', {args: {bsVersion, username: res.data.username, password: res.data.password, stay: res.data.stay}});
+         promise = this.ipcService.send<DownloadEvent, DownloadInfo>('bs-download.start', {args: {bsVersion, username: res.data.username, password: res.data.password, stay: res.data.stay, isVerification}});
       }
       else{
-         promise = this.ipcService.send<DownloadEvent>('bs-download.start', {args: {bsVersion, username: this.authService.getSteamUsername()}});
+         promise = this.ipcService.send<DownloadEvent, DownloadInfo>('bs-download.start', {args: {bsVersion, username: this.authService.getSteamUsername(), isVerification}});
       }
 
-      this.currentBsVersionDownload$.next(bsVersion);
-
       let res = await promise;
         
       if(res.data?.type === "[Password]"){
@@ -145,13 +148,14 @@ export class BsDownloaderService{
    }
 
    public get isDownloading(): boolean{ return !!this.currentBsVersionDownload$.value; }
-   public get isVerification(): boolean{ return this._isVerification; }
 
    public async getInstallationFolder(): Promise<string>{
       const res = await this.ipcService.send<string>("bs-download.installation-folder");
       return res.success ? res.data : "";
    }
 
+   public get isVerification(): boolean{ return this._isVerification; }
+
    public setInstallationFolder(path: string): Promise<IpcResponse<string>>{
       return this.ipcService.send<string>("bs-download.set-installation-folder", {args: path});
    }