ota-manager 1.0.14 → 1.0.16

package/lib/ota-build.cjs

@@ -49,6 +49,44 @@ if (fs.existsSync(envPath)) {
     });
 }
 
+function isBase64(str) {
+    if (!str) return false;
+    const clean = str.replace(/\s+/g, '');
+    if (clean.length === 0) return false;
+    const regex = /^[A-Za-z0-9+/=]+$/;
+    return regex.test(clean);
+}
+
+function getBase64OrFileContent(val) {
+    if (!val) return '';
+    try {
+        if (fs.existsSync(val)) {
+            const fileContent = fs.readFileSync(val);
+            const textContent = fileContent.toString('utf8').trim();
+            
+            if (textContent.includes('=')) {
+                const match = textContent.match(/^\s*[\w.-]+\s*=\s*(.*)?\s*$/);
+                if (match && match[1]) {
+                    const cleanVal = match[1].trim();
+                    if (isBase64(cleanVal)) {
+                        return cleanVal;
+                    }
+                }
+            }
+            
+            if (isBase64(textContent)) {
+                return textContent;
+            }
+            
+            return fileContent.toString('base64');
+        }
+    } catch (e) {
+        console.warn(`⚠️ Warning: Error reading file at "${val}":`, e.message);
+    }
+    return val;
+}
+
+
 const rawArgs = process.argv.slice(2).map(a => a.toLowerCase());
 const hasNv = rawArgs.includes('-nv') || rawArgs.includes('--nv') || rawArgs.includes('--no-version') || rawArgs.includes('nover') || rawArgs.includes('no-ver') || rawArgs.includes('-no') || rawArgs.includes('--no') || rawArgs.includes('no') || rawArgs.includes('-norev') || rawArgs.includes('--norev') || rawArgs.includes('norev');
 
@@ -244,15 +282,28 @@ async function buildIos() {
         try {
             execSync('git add .', { stdio: 'ignore' });
             const status = execSync('git status --porcelain').toString();
+
+            let remoteName = 'origin';
+            try {
+                const remotes = execSync('git remote').toString().trim().split(/\s+/);
+                if (!remotes.includes('origin')) {
+                    if (remotes.includes('github')) {
+                        remoteName = 'github';
+                    } else if (remotes.length > 0 && remotes[0]) {
+                        remoteName = remotes[0];
+                    }
+                }
+            } catch (err) {}
+
             if (status) {
-                console.log('📤 Pushing changes to GitHub...');
+                console.log(`📤 Pushing changes to ${remoteName}...`);
                 execSync('git commit -m "chore: automated build sync"', { stdio: 'ignore' });
-                execSync(`git push origin ${branch}`, { stdio: 'ignore' });
+                execSync(`git push ${remoteName} ${branch}`, { stdio: 'ignore' });
                 console.log('✅ Changes pushed!');
                 await sleep(2000);
             } else {
-                console.log('✅ No local file changes. Ensuring active branch ref is pushed to remote...');
-                execSync(`git push origin ${branch}`, { stdio: 'ignore' });
+                console.log(`✅ No local file changes. Ensuring active branch ref is pushed to remote on ${remoteName}...`);
+                execSync(`git push ${remoteName} ${branch}`, { stdio: 'ignore' });
             }
         } catch (e) {
             console.log('⚠️ Git push skipped or branch already up to date on remote.');
@@ -261,13 +312,24 @@ async function buildIos() {
         console.log('🚀 Triggering GitHub Action...');
         try {
             const payload = { ref: branch };
-            if (activeWorkflowId === 'ios-build.yml') {
-                payload.inputs = {
-                    channel: process.env.PUBLIC_APP_CHANNEL || 'training',
-                    api_url: process.env.PUBLIC_API_URL || '',
-                    github_ota_pat: process.env.PUBLIC_GITHUB_OTA_PAT || '',
-                    ota_update_url: process.env.PUBLIC_OTA_UPDATE_URL || ''
-                };
+            payload.inputs = {
+                channel: process.env.PUBLIC_APP_CHANNEL || 'training',
+                api_url: process.env.PUBLIC_API_URL || '',
+                github_ota_pat: process.env.PUBLIC_GITHUB_OTA_PAT || '',
+                ota_update_url: process.env.PUBLIC_OTA_UPDATE_URL || ''
+            };
+            if (activeWorkflowId === 'ios-release.yml') {
+                const certVal = process.env.APPLE_BUILD_CERTIFICATE_BASE64 || '';
+                const provVal = process.env.APPLE_BUILD_PROVISION_PROFILE_BASE64 || '';
+                const apiKeyVal = process.env.APP_STORE_CONNECT_API_KEY_BASE64 || '';
+
+                payload.inputs.apple_build_certificate_base64 = getBase64OrFileContent(certVal);
+                payload.inputs.apple_build_provision_profile_base64 = getBase64OrFileContent(provVal);
+                payload.inputs.app_store_connect_api_key_base64 = getBase64OrFileContent(apiKeyVal);
+                payload.inputs.app_store_connect_api_key_id = process.env.APP_STORE_CONNECT_API_KEY_ID || '';
+                payload.inputs.app_store_connect_api_issuer = process.env.APP_STORE_CONNECT_API_ISSUER || '';
+                payload.inputs.apple_p12_password = process.env.APPLE_P12_PASSWORD || '';
+                payload.inputs.apple_keychain_password = process.env.APPLE_KEYCHAIN_PASSWORD || '';
             }
             await githubApi(`/repos/${REPO}/actions/workflows/${activeWorkflowId}/dispatches`, 'POST', payload);
             console.log('✅ Trigger Success! Waiting for run to start...');

package/lib/ota-security.js

@@ -114,7 +114,8 @@ async function runSecurityAudit() {
         
         if (content.includes('"version"')) {
             const data = JSON.parse(content);
-            console.log(`✅ Read Successful! Current Remote Version: v${data.version}`);
+            const remoteVer = data.version || data[channel]?.version || (data.live?.version || data.training?.version);
+            console.log(`✅ Read Successful! Current Remote Version: v${remoteVer}`);
         } else {
             console.log(`❌ Raw Response: ${content.substring(0, 100)}...`);
             throw new Error("Invalid content");

package/lib/verify-dist.cjs

@@ -4,7 +4,7 @@ const path = require('path');
 const distDir = path.join(process.cwd(), 'dist');
 const filesToVerify = ['splash.html', 'index.html', 'home.html'];
 
-console.log('🔍 MEMULAI VERIFIKASI OTA ZIP (Pre-Flight Check)...\n');
+console.log('🔍 STARTING OTA ZIP VERIFICATION (Pre-Flight Check)...\n');
 
 if (!fs.existsSync(distDir)) {
     console.log(`❌ Error: dist/ directory not found in ${process.cwd()}`);
@@ -16,70 +16,70 @@ let totalErrors = 0;
 filesToVerify.forEach(filename => {
     const filePath = path.join(distDir, filename);
     if (!fs.existsSync(filePath)) {
-        console.log(`⚠️  WARNING: File utama ${filename} tidak ditemukan di dist/`);
+        console.log(`⚠️  WARNING: Main file ${filename} not found in dist/`);
         return;
     }
 
-    console.log(`📄 Memeriksa: ${filename}`);
+    console.log(`📄 Verifying: ${filename}`);
     const content = fs.readFileSync(filePath, 'utf8');
 
-    // Regex untuk mencari src="..." atau href="..."
+    // Regex to search for src="..." or href="..."
     const regex = /(?:src|href)=["']([^"']+)["']/g;
     let match;
 
     while ((match = regex.exec(content)) !== null) {
         const assetPath = match[1];
 
-        // Abaikan link eksternal atau base64
+        // Ignore external links or base64
         if (assetPath.startsWith('http') || assetPath.startsWith('data:')) continue;
 
         let hasError = false;
 
-        // CEK 1: Garis Miring Ilegal khusus untuk folder assets
+        // CHECK 1: Illegal slashes specifically for assets folder
         if (assetPath.startsWith('/assets') || assetPath.startsWith('.//')) {
-            console.log(`   ❌ ERROR JALUR: Ditemukan path ilegal -> "${assetPath}"`);
+            console.log(`   ❌ PATH ERROR: Illegal path found -> "${assetPath}"`);
             hasError = true;
             totalErrors++;
         }
 
-        // Abaikan validasi file fisik untuk navigasi HTML atau anchor SVG
+        // Ignore physical file validation for HTML navigation or SVG anchors
         if (assetPath.endsWith('.html') || assetPath.startsWith('#')) continue;
 
-        // CEK 2: Apakah filenya benar-benar ada secara fisik?
-        // Karena path kita harusnya relatif (misal: assets/file.css), 
-        // kita gabungkan dengan root folder dist/
+        // CHECK 2: Does the file physically exist?
+        // Since our paths must be relative (e.g., assets/file.css),
+        // we join them with the root dist/ folder
         const physicalPath = path.join(distDir, assetPath);
         if (!fs.existsSync(physicalPath)) {
-            console.log(`   ❌ ERROR FILE HILANG: File tidak ditemukan di -> "${assetPath}"`);
+            console.log(`   ❌ MISSING FILE ERROR: File not found at -> "${assetPath}"`);
             hasError = true;
             totalErrors++;
         }
     }
-    console.log(`   ✅ ${filename} selesai diperiksa.`);
+    console.log(`   ✅ ${filename} verification complete.`);
 });
 
-// Verifikasi isi folder dist/assets/
+// Verify contents of dist/assets/ folder
 const assetsDir = path.join(distDir, 'assets');
 if (fs.existsSync(assetsDir)) {
-    console.log('\n📁 Memeriksa file JS di folder dist/assets/...');
+    console.log('\n📁 Verifying JS files in dist/assets/...');
     const jsFiles = fs.readdirSync(assetsDir).filter(f => f.endsWith('.js'));
     
     jsFiles.forEach(f => {
         const content = fs.readFileSync(path.join(assetsDir, f), 'utf8');
         if (content.includes('return"/"+e') || content.includes('return "/" + e')) {
-            console.log(`   ❌ ERROR VITE PRELOAD: Ditemukan path absolut di file JS -> "${f}"`);
+            console.log(`   ❌ VITE PRELOAD ERROR: Absolute dynamic path found in JS file -> "${f}"`);
             totalErrors++;
         }
     });
-    console.log('   ✅ Verifikasi file JS di dist/assets/ selesai.');
+    console.log('   ✅ JS file verification in dist/assets/ complete.');
 }
 
 console.log('\n------------------------------------');
 if (totalErrors === 0) {
-    console.log('🎉 VERIFIKASI SUKSES! Semua path relatif murni dan file fisik terdeteksi.');
-    console.log('Bungkusan OTA ini 100% AMAN untuk dikirim.\n');
+    console.log('🎉 VERIFICATION SUCCESS! All paths are purely relative and physical files detected.');
+    console.log('This OTA bundle is 100% SAFE to deploy.\n');
 } else {
-    console.log(`💥 VERIFIKASI GAGAL! Ditemukan ${totalErrors} error pada struktur path atau file.`);
-    console.log('💡 WAJIB PERBAIKI sebelum mengirim OTA untuk menghindari blank screen di HP user!\n');
+    console.log(`💥 VERIFICATION FAILED! Found ${totalErrors} error(s) in path structure or files.`);
+    console.log('💡 MUST FIX before deploying OTA to avoid blank screens on users\' devices!\n');
     process.exit(1);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ota-manager",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "description": "Multi-provider OTA update manager for Astro and static web projects.",
   "type": "module",
   "main": "index.js",