Spaces:

yasarefe
/

AIStudioToApp2-apk-builder

Runtime error

App Files Files Community

yasarefe commited on Mar 20

Commit

0396645

1 Parent(s): 766f6d6

Add async API with job tracking for APK builds

Browse files

Files changed (3) hide show

Dockerfile +8 -1
app.js +92 -44
package.json +2 -1

Dockerfile CHANGED Viewed

@@ -3,9 +3,16 @@ FROM node:20
 # Install Java and basic tools
 RUN apt-get update && apt-get install -y openjdk-17-jdk wget unzip
-# Set Android environment
 ENV ANDROID_HOME=/opt/android-sdk
 ENV PATH=${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/platform-tools
 # Copy app
 COPY . /app

 # Install Java and basic tools
 RUN apt-get update && apt-get install -y openjdk-17-jdk wget unzip
+# Install Android SDK
 ENV ANDROID_HOME=/opt/android-sdk
 ENV PATH=${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/platform-tools
+RUN mkdir -p ${ANDROID_HOME}/cmdline-tools && \
+    cd ${ANDROID_HOME}/cmdline-tools && \
+    wget -q https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip -O cmdline-tools.zip && \
+    unzip -q cmdline-tools.zip && \
+    mv cmdline-tools cmdline-tools-latest && \
+    rm -f cmdline-tools.zip && \
+    yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --licenses
 # Copy app
 COPY . /app

app.js CHANGED Viewed

@@ -2,10 +2,17 @@ const express = require('express');
 const { exec } = require('child_process');
 const fs = require('fs');
 const path = require('path');
 const app = express();
 const PORT = 7860;
 // Web arayüzü
 app.get('/', (req, res) => {
   res.send(`
@@ -19,26 +26,10 @@ app.get('/', (req, res) => {
         </style>
       </head>
       <body>
-        <h1>APK Build Service</h1>
-        <p>Web uygulamanızı APK'ya dönüştürün.</p>
-        <button onclick="startBuild()">APK Build Başlat</button>
-        <div id="status"></div>
-        <script>
-          function startBuild() {
-            document.getElementById('status').innerHTML = 'Build başlatılıyor...';
-            fetch('/build', { method: 'POST' })
-              .then(response => response.json())
-              .then(data => {
-                document.getElementById('status').innerHTML = data.message;
-                if (data.success) {
-                  document.getElementById('status').innerHTML += '<br><a href="/download">APK İndir</a>';
-                }
-              })
-              .catch(error => {
-                document.getElementById('status').innerHTML = 'Hata: ' + error;
-              });
-          }
-        </script>
       </body>
     </html>
   `);
@@ -46,11 +37,72 @@ app.get('/', (req, res) => {
 // Build endpoint
 app.post('/build', (req, res) => {
-  console.log('Build başlatıldı');
-  // GitHub'dan web uygulamasını çek
-  const repoUrl = 'https://github.com/nyx47rd/AIStudioToApp2.git';
-  const buildDir = '/tmp/build';
   // Temizle
   if (fs.existsSync(buildDir)) {
@@ -58,47 +110,43 @@ app.post('/build', (req, res) => {
   }
   // Klonla
-  exec(`git clone ${repoUrl} ${buildDir}`, (error, stdout, stderr) => {
     if (error) {
       console.error('Klonlama hatası:', error);
-      return res.json({ success: false, message: 'Repo klonlanamadı: ' + error.message });
     }
     // Build işlemi
-    exec('npm install && npm run build && npx cap init "AIStudioToApp2" "com.example.aistudiotoapp2" --web-dir dist && npx cap add android && npx cap sync android && cd android && chmod +x gradlew && ./gradlew assembleDebug',
-      { cwd: buildDir },
       (error, stdout, stderr) => {
         if (error) {
           console.error('Build hatası:', error);
-          return res.json({ success: false, message: 'Build başarısız: ' + error.message });
         }
         // APK'yı kopyala
         const apkPath = path.join(buildDir, 'android/app/build/outputs/apk/debug/app-debug.apk');
-        const destPath = '/tmp/app-debug.apk';
         if (fs.existsSync(apkPath)) {
           fs.copyFileSync(apkPath, destPath);
           console.log('APK oluşturuldu:', destPath);
-          res.json({ success: true, message: 'APK başarıyla oluşturuldu!' });
         } else {
-          res.json({ success: false, message: 'APK dosyası bulunamadı.' });
         }
       }
     );
   });
-});
-// APK indirme endpoint
-app.get('/download', (req, res) => {
-  const apkPath = '/tmp/app-debug.apk';
-  if (fs.existsSync(apkPath)) {
-    res.download(apkPath, 'app-debug.apk');
-  } else {
-    res.status(404).send('APK dosyası bulunamadı. Önce build yapın.');
-  }
-});
 app.listen(PORT, () => {
-  console.log(`Sunucu ${PORT} portunda çalışıyor`);
 });

 const { exec } = require('child_process');
 const fs = require('fs');
 const path = require('path');
+const { v4: uuidv4 } = require('uuid');
 const app = express();
 const PORT = 7860;
+// JSON body parser
+app.use(express.json());
+// Job storage
+const jobs = {};
 // Web arayüzü
 app.get('/', (req, res) => {
   res.send(`
         </style>
       </head>
       <body>
+        <h1>APK Build Service API</h1>
+        <p>POST /build - Build başlat (appName, packageId, repoUrl)</p>
+        <p>GET /status/:jobId - Durum sorgula</p>
+        <p>GET /download/:jobId - APK indir</p>
       </body>
     </html>
   `);
 // Build endpoint
 app.post('/build', (req, res) => {
+  const { appName, packageId, repoUrl } = req.body;
+  if (!appName || !packageId || !repoUrl) {
+    return res.status(400).json({ success: false, message: 'appName, packageId ve repoUrl gerekli' });
+  }
+  const jobId = uuidv4();
+  jobs[jobId] = {
+    status: 'pending',
+    appName,
+    packageId,
+    repoUrl,
+    createdAt: new Date(),
+    apkPath: null
+  };
+  // Build işlemini arka planda başlat
+  buildAPK(jobId);
+  res.json({ success: true, jobId, message: 'Build başlatıldı' });
+});
+// Durum sorgulama
+app.get('/status/:jobId', (req, res) => {
+  const { jobId } = req.params;
+  const job = jobs[jobId];
+  if (!job) {
+    return res.status(404).json({ success: false, message: 'Job bulunamadı' });
+  }
+  res.json({
+    success: true,
+    jobId,
+    status: job.status,
+    appName: job.appName,
+    createdAt: job.createdAt
+  });
+});
+// APK indirme
+app.get('/download/:jobId', (req, res) => {
+  const { jobId } = req.params;
+  const job = jobs[jobId];
+  if (!job) {
+    return res.status(404).json({ success: false, message: 'Job bulunamadı' });
+  }
+  if (job.status !== 'completed') {
+    return res.status(400).json({ success: false, message: 'APK henüz hazır değil' });
+  }
+  if (job.apkPath && fs.existsSync(job.apkPath)) {
+    res.download(job.apkPath, `${job.appName}-debug.apk`);
+  } else {
+    res.status(404).json({ success: false, message: 'APK dosyası bulunamadı' });
+  }
+});
+// Build fonksiyonu
+function buildAPK(jobId) {
+  const job = jobs[jobId];
+  job.status = 'building';
+  const buildDir = `/tmp/build-${jobId}`;
   // Temizle
   if (fs.existsSync(buildDir)) {
   }
   // Klonla
+  exec(`git clone ${job.repoUrl} ${buildDir}`, (error, stdout, stderr) => {
     if (error) {
       console.error('Klonlama hatası:', error);
+      job.status = 'failed';
+      job.error = error.message;
+      return;
     }
     // Build işlemi
+    exec(`npm install && npm run build && npx cap init "${job.appName}" "${job.packageId}" --web-dir dist && npx cap add android && npx cap sync android && cd android && chmod +x gradlew && ./gradlew assembleDebug`,
+      { cwd: buildDir, timeout: 600000 }, // 10 dakika timeout
       (error, stdout, stderr) => {
         if (error) {
           console.error('Build hatası:', error);
+          job.status = 'failed';
+          job.error = error.message;
+          return;
         }
         // APK'yı kopyala
         const apkPath = path.join(buildDir, 'android/app/build/outputs/apk/debug/app-debug.apk');
+        const destPath = `/tmp/${job.appName}-${jobId}-debug.apk`;
         if (fs.existsSync(apkPath)) {
           fs.copyFileSync(apkPath, destPath);
           console.log('APK oluşturuldu:', destPath);
+          job.status = 'completed';
+          job.apkPath = destPath;
         } else {
+          job.status = 'failed';
+          job.error = 'APK dosyası bulunamadı';
         }
       }
     );
   });
+}
 app.listen(PORT, () => {
+  console.log(`APK Build Service ${PORT} portunda çalışıyor`);
 });

package.json CHANGED Viewed

@@ -7,6 +7,7 @@
     "start": "node app.js"
   },
   "dependencies": {
-    "express": "^4.18.2"
   }
 }

     "start": "node app.js"
   },
   "dependencies": {
+    "express": "^4.18.2",
+    "uuid": "^9.0.0"
   }
 }