Add installed/portable detection

Author: Sploder-Saptarshi

.github/workflows/build.yml

@@ -62,12 +62,12 @@ jobs:
             restore-keys: |
               ${{ runner.os }}-electron-
 
-        - name: Run build script
+        - name: Run build script for installers
           run: npx yarn dist -- --url ${{ secrets.SITE_URL }}
 
-        - name: Zip portable builds
+        - name: Run build script for portable
           if: runner.os == 'Windows'
-          run: Compress-Archive -Path .\dist\win-unpacked\* -DestinationPath .\dist\Sploder-Portable-x64.zip && Compress-Archive -Path .\dist\win-ia32-unpacked\* -DestinationPath .\dist\Sploder-Portable-ia32.zip
+          run: npx yarn dist -- --url ${{ secrets.SITE_URL }} --portable
 
         - name: Upload .exe files
           if: runner.os == 'Windows'

package.json

@@ -25,7 +25,16 @@
     "yarn": "1.22.22"
   },
   "build": {
-    "asar": true, "files": [ "./dist/main/*" ], "win": {},
+    "asar": true, 
+    "files": [ "./dist/main/*" ], 
+    "win": {
+      "target": [
+        {
+          "target": "nsis",
+          "arch": ["x64", "ia32"]
+        }
+      ]
+    },
     "publish": null,
     "appId": "com.sploder",
     "productName": "Sploder",

scripts/build.js

@@ -10,13 +10,22 @@ const path = require('path');
 // Parse command line arguments
 const args = process.argv.slice(2);
 const urlArgIndex = args.indexOf('--url');
+const portableArgIndex = args.indexOf('--portable');
 let customUrl = null;
+let isPortable = false;
 
 if (urlArgIndex !== -1 && args[urlArgIndex + 1]) {
   customUrl = args[urlArgIndex + 1];
   console.log(`\x1b[36mCustom URL detected: ${customUrl}\x1b[0m`);
 }
 
+if (portableArgIndex !== -1) {
+  isPortable = true;
+  console.log(`\x1b[36mBuilding portable version\x1b[0m`);
+} else {
+  console.log(`\x1b[36mBuilding installed version\x1b[0m`);
+}
+
 // Update config if URL is provided
 if (customUrl) {
   try {
@@ -41,7 +50,42 @@ if (customUrl) {
   }
 }
 
-// Run the compilation step
+// Inject build configuration into the main process file
+try {
+  const mainPath = path.join(__dirname, '..', 'src', 'main', 'index.js');
+  console.log(`\x1b[36mInjecting build configuration into: ${mainPath}\x1b[0m`);
+  
+  // Read the main file
+  let mainContent = fs.readFileSync(mainPath, 'utf8');
+  
+  // Remove any existing injected build configuration
+  mainContent = mainContent.replace(
+    /\/\/ Injected build configuration\nconst BUILD_CONFIG = .*?;\n\n/g,
+    ''
+  );
+  
+  // Define build configuration
+  const buildConfig = {
+    packagingMethod: isPortable ? 'portable' : 'installed'
+  };
+  
+  // Inject BUILD_CONFIG before the main logic
+  const buildConfigInjection = `// Injected build configuration
+const BUILD_CONFIG = ${JSON.stringify(buildConfig)};
+
+`;
+  
+  // Add it at the beginning of the file (after requires)
+  const requiresEndPattern = /const isDev = !app\.isPackaged;/;
+  mainContent = mainContent.replace(requiresEndPattern, `${buildConfigInjection}const isDev = !app.isPackaged;`);
+  
+  // Write the updated main file back
+  fs.writeFileSync(mainPath, mainContent, 'utf8');
+  console.log(`\x1b[32mBuild configuration injected: ${JSON.stringify(buildConfig)}\x1b[0m`);
+} catch (error) {
+  console.error(`\x1b[31mError injecting build configuration: ${error.message}\x1b[0m`);
+  process.exit(1);
+}// Run the compilation step
 console.log('\x1b[36mCompiling the application...\x1b[0m');
 try {
   execSync('yarn compile', { stdio: 'inherit' });
@@ -53,17 +97,30 @@ try {
 // Run the appropriate electron-builder command based on the platform
 console.log('\x1b[36mBuilding distributable packages...\x1b[0m');
 try {
-  // Pass all original arguments (except --url and the URL) to electron-builder
+  // Pass all original arguments (except --url, --portable and their values) to electron-builder
   const filteredArgs = args.filter((arg, index) => {
-    return index !== urlArgIndex && index !== urlArgIndex + 1;
+    return index !== urlArgIndex && index !== urlArgIndex + 1 && index !== portableArgIndex;
   }).join(' ');
 
-  if (process.platform === 'win32') {
-    execSync(`npx yarn electron-builder --ia32 --x64 ${filteredArgs}`, { stdio: 'inherit' });
-  } else if (process.platform === 'darwin') {
-    execSync(`electron-builder --mac --x64 ${filteredArgs}`, { stdio: 'inherit' });
+  if (isPortable) {
+    // Build only portable versions
+    if (process.platform === 'win32') {
+      execSync(`npx yarn electron-builder --win zip --ia32 --x64 -c.win.artifactName="Sploder-Portable-\${arch}.\${ext}" ${filteredArgs}`, { stdio: 'inherit' });
+    } else if (process.platform === 'darwin') {
+      execSync(`electron-builder --mac zip --x64 -c.mac.artifactName="Sploder-Portable-\${arch}.\${ext}" ${filteredArgs}`, { stdio: 'inherit' });
+    } else {
+      // For Linux, we'll use the unpacked directory as "portable"
+      execSync(`electron-builder --linux dir ${filteredArgs}`, { stdio: 'inherit' });
+    }
   } else {
-    execSync(`electron-builder --linux appimage snap deb rpm pacman ${filteredArgs}`, { stdio: 'inherit' });
+    // Build installer versions (default)
+    if (process.platform === 'win32') {
+      execSync(`npx yarn electron-builder --win nsis --ia32 --x64 ${filteredArgs}`, { stdio: 'inherit' });
+    } else if (process.platform === 'darwin') {
+      execSync(`electron-builder --mac --x64 ${filteredArgs}`, { stdio: 'inherit' });
+    } else {
+      execSync(`electron-builder --linux appimage snap deb rpm pacman ${filteredArgs}`, { stdio: 'inherit' });
+    }
   }
 
   console.log('\x1b[32mBuild completed successfully!\x1b[0m');

src/config.js

@@ -4,11 +4,17 @@
  */
 
 // Create configuration factory function
-function createConfig(isDev = false) {
+function createConfig(isDev = false, buildConfig = {}) {
   return {
     // Base URL for the application
     baseUrl: "https://www.sploder.net",
 
+    // Build-time configuration
+    build: {
+      packagingMethod: buildConfig.packagingMethod || 'portable', // 'portable' or 'installed'
+      ...buildConfig
+    },
+    
     // Specific endpoints
     endpoints: {
       update: isDev ? "/" : "/update",
@@ -17,7 +23,27 @@ function createConfig(isDev = false) {
 
     // Generate a full URL for an endpoint
     getUrl: function(endpoint) {
-      return this.baseUrl + (this.endpoints[endpoint] || endpoint);
+      const baseUrl = this.baseUrl + (this.endpoints[endpoint] || endpoint);
+      
+      // Add parameters for update endpoint
+      if (endpoint === 'update') {
+        const params = new URLSearchParams();
+        
+        // Add OS information
+        params.append('os', process.platform);
+        
+        // Add architecture information
+        params.append('arch', process.arch);
+        
+        // Add packaging method from build configuration (Windows only)
+        if (process.platform === 'win32') {
+          params.append('method', this.build.packagingMethod);
+        }
+        
+        return `${baseUrl}?${params.toString()}`;
+      }
+      
+      return baseUrl;
     }
   };
 }

src/main/index.js

@@ -18,10 +18,15 @@ if (process.platform == "win32") {
 }
 let win;
 let pluginName;
+// Injected build configuration
+const BUILD_CONFIG = {"packagingMethod":"installed"};
+
 const isDev = !app.isPackaged;
 
-// Create configuration with proper isDev detection
-const config = createConfig(isDev);
+// Create configuration with proper isDev detection and build config
+// BUILD_CONFIG will be replaced during build process
+const buildConfig = typeof BUILD_CONFIG !== 'undefined' ? BUILD_CONFIG : {};
+const config = createConfig(isDev, buildConfig);
 
 let rendererPath, preloadPath;
 if(isDev) {