html2apk 0.2.0 → 0.4.0

package/src/desktop/main.js

@@ -1,10 +1,11 @@
 "use strict";
 
+const nodeFs = require("fs");
 const fs = require("fs/promises");
 const path = require("path");
 const { spawn } = require("child_process");
 const { app, BrowserWindow, dialog, ipcMain, screen, shell } = require("electron");
-const { buildApk } = require("../core/build-apk");
+const { buildApk, runDebugUsb } = require("../core/build-apk");
 const {
   REQUIRED_ANDROID_BUILD_TOOLS,
   REQUIRED_ANDROID_PLATFORM,
@@ -13,6 +14,9 @@ const {
 const { runDoctor, formatDoctorReport } = require("../runtime-manager/doctor");
 
 let mainWindow = null;
+let projectWatcher = null;
+let projectWatchTimer = null;
+let watchedProjectRoot = null;
 const smokeTest = process.env.HTML2APK_DESKTOP_SMOKE === "1";
 const APP_ID = "dev.caiomultiversando.html2apk";
 const APP_NAME = "html2apk";
@@ -22,6 +26,7 @@ const WINDOW_BACKGROUNDS = {
 };
 
 app.commandLine.appendSwitch("disable-crash-reporter");
+process.title = APP_NAME;
 app.setName(APP_NAME);
 
 if (process.platform === "win32") {
@@ -134,6 +139,90 @@ async function inspectProject(projectRoot) {
   };
 }
 
+function shouldIgnoreProjectWatchPath(fileName) {
+  const normalized = String(fileName || "").replace(/\\/g, "/");
+  return normalized
+    && (normalized.includes(".html2apk-doctor-")
+    || normalized.startsWith("dist/")
+    || normalized === "dist"
+    || normalized.startsWith("node_modules/")
+    || normalized === "node_modules"
+    || normalized.startsWith(".git/")
+    || normalized === ".git");
+}
+
+function stopProjectWatcher() {
+  if (projectWatchTimer) {
+    clearTimeout(projectWatchTimer);
+    projectWatchTimer = null;
+  }
+
+  if (projectWatcher) {
+    projectWatcher.close();
+    projectWatcher = null;
+  }
+
+  watchedProjectRoot = null;
+}
+
+function startProjectWatcher(projectRoot, sender) {
+  stopProjectWatcher();
+  watchedProjectRoot = projectRoot;
+
+  try {
+    projectWatcher = nodeFs.watch(projectRoot, { recursive: true }, (eventType, fileName) => {
+      if (shouldIgnoreProjectWatchPath(fileName)) {
+        return;
+      }
+
+      const changedPath = path.join(projectRoot, String(fileName || ""));
+      if (projectWatchTimer) {
+        clearTimeout(projectWatchTimer);
+      }
+
+      projectWatchTimer = setTimeout(async () => {
+        projectWatchTimer = null;
+        try {
+          if (watchedProjectRoot !== projectRoot) {
+            return;
+          }
+
+          const project = await inspectProject(projectRoot);
+          sender.send("project:changed", {
+            eventType,
+            changedPath,
+            project,
+            time: new Date().toISOString()
+          });
+        } catch (error) {
+          sender.send("project:watch-error", {
+            message: error.message,
+            time: new Date().toISOString()
+          });
+        }
+      }, 350);
+    });
+
+    projectWatcher.on("error", (error) => {
+      sender.send("project:watch-error", {
+        message: error.message,
+        time: new Date().toISOString()
+      });
+    });
+
+    return {
+      ok: true,
+      projectRoot
+    };
+  } catch (error) {
+    stopProjectWatcher();
+    return {
+      ok: false,
+      message: error.message
+    };
+  }
+}
+
 function cleanBuildOptions(options = {}) {
   const output = {
     projectRoot: options.projectRoot,
@@ -141,7 +230,7 @@ function cleanBuildOptions(options = {}) {
     release: Boolean(options.release)
   };
 
-  for (const key of ["mode", "appName", "packageId", "version", "icon", "androidPlatform", "minSdkVersion", "themeColor", "orientation", "permissions"]) {
+  for (const key of ["mode", "appName", "packageId", "version", "icon", "androidPlatform", "minSdkVersion", "themeColor", "themeMode", "theme", "oneSignalAppId", "orientation", "permissions", "deepLinks"]) {
     if (Array.isArray(options[key]) || options[key]) {
       output[key] = options[key];
     }
@@ -350,6 +439,10 @@ async function installWithWingetAndroidCli(sender) {
 }
 
 app.whenReady().then(() => {
+  app.setName(APP_NAME);
+  if (process.platform === "win32") {
+    app.setAppUserModelId(APP_ID);
+  }
   createWindow();
 
   app.on("activate", () => {
@@ -360,6 +453,7 @@ app.whenReady().then(() => {
 });
 
 app.on("window-all-closed", () => {
+  stopProjectWatcher();
   if (process.platform !== "darwin") {
     app.quit();
   }
@@ -435,6 +529,15 @@ ipcMain.handle("project:inspect", async (_event, projectRoot) => {
   return inspectProject(projectRoot);
 });
 
+ipcMain.handle("project:watch", async (event, projectRoot) => {
+  return startProjectWatcher(projectRoot, event.sender);
+});
+
+ipcMain.handle("project:unwatch", async () => {
+  stopProjectWatcher();
+  return { ok: true };
+});
+
 ipcMain.handle("doctor:run", async (_event, projectRoot) => {
   const report = await runDoctor({ projectRoot });
   return {
@@ -512,6 +615,39 @@ ipcMain.handle("build:run", async (event, options) => {
   }
 });
 
+ipcMain.handle("build:run-usb-debug", async (event, options) => {
+  const buildOptions = cleanBuildOptions(options);
+  const sendLog = (line, kind = "raw") => {
+    event.sender.send("build:log", {
+      line,
+      kind,
+      time: new Date().toISOString()
+    });
+  };
+
+  try {
+    sendLog("Starting html2apk USB debug build.", "system");
+    const result = await runDebugUsb({
+      ...buildOptions,
+      release: false,
+      onLog: (line) => sendLog(line)
+    });
+    sendLog(`USB debug installed on device: ${result.device?.id || "Android device"}`, "success");
+    return {
+      ok: true,
+      result
+    };
+  } catch (error) {
+    sendLog(error.message, "error");
+    return {
+      ok: false,
+      message: error.message,
+      logs: error.logs || [],
+      buildDir: error.buildDir || null
+    };
+  }
+});
+
 ipcMain.handle("shell:open-path", async (_event, targetPath) => {
   if (!targetPath) {
     return false;
@@ -527,3 +663,17 @@ ipcMain.handle("shell:show-item", async (_event, targetPath) => {
   shell.showItemInFolder(targetPath);
   return true;
 });
+
+ipcMain.handle("shell:open-external", async (_event, targetUrl) => {
+  if (!targetUrl) {
+    return false;
+  }
+
+  const url = new URL(String(targetUrl));
+  if (!["https:", "http:"].includes(url.protocol)) {
+    return false;
+  }
+
+  await shell.openExternal(url.toString());
+  return true;
+});

package/src/desktop/preload.js

@@ -7,11 +7,15 @@ contextBridge.exposeInMainWorld("html2apkDesktop", {
   selectFolder: () => ipcRenderer.invoke("dialog:select-folder"),
   selectIcon: () => ipcRenderer.invoke("dialog:select-icon"),
   inspectProject: (projectRoot) => ipcRenderer.invoke("project:inspect", projectRoot),
+  watchProject: (projectRoot) => ipcRenderer.invoke("project:watch", projectRoot),
+  unwatchProject: () => ipcRenderer.invoke("project:unwatch"),
   runDoctor: (projectRoot) => ipcRenderer.invoke("doctor:run", projectRoot),
   installAndroidRequirements: () => ipcRenderer.invoke("install:android-requirements"),
   runBuild: (options) => ipcRenderer.invoke("build:run", options),
+  runUsbDebugBuild: (options) => ipcRenderer.invoke("build:run-usb-debug", options),
   openPath: (targetPath) => ipcRenderer.invoke("shell:open-path", targetPath),
   showItem: (targetPath) => ipcRenderer.invoke("shell:show-item", targetPath),
+  openExternalUrl: (targetUrl) => ipcRenderer.invoke("shell:open-external", targetUrl),
   minimizeWindow: () => ipcRenderer.invoke("window:minimize"),
   toggleMaximizeWindow: () => ipcRenderer.invoke("window:toggle-maximize"),
   closeWindow: () => ipcRenderer.invoke("window:close"),
@@ -26,5 +30,15 @@ contextBridge.exposeInMainWorld("html2apkDesktop", {
     const handler = (_event, payload) => listener(payload);
     ipcRenderer.on("install:log", handler);
     return () => ipcRenderer.removeListener("install:log", handler);
+  },
+  onProjectChanged: (listener) => {
+    const handler = (_event, payload) => listener(payload);
+    ipcRenderer.on("project:changed", handler);
+    return () => ipcRenderer.removeListener("project:changed", handler);
+  },
+  onProjectWatchError: (listener) => {
+    const handler = (_event, payload) => listener(payload);
+    ipcRenderer.on("project:watch-error", handler);
+    return () => ipcRenderer.removeListener("project:watch-error", handler);
   }
 });

package/src/desktop/renderer/index.html

@@ -176,6 +176,13 @@
             <span>cordova-android</span>
             <input id="androidPlatformInput" type="text" placeholder="android@15.0.0">
           </label>
+          <label class="field">
+            <span data-i18n="themeMode">Tema do APK</span>
+            <select id="themeModeInput">
+              <option value="fixed" data-i18n="themeModeFixed">Cor fixa</option>
+              <option value="auto" data-i18n="themeModeAuto">Automatico pela tela</option>
+            </select>
+          </label>
           <label class="field color-field">
             <span data-i18n="appThemeColor">Cor do tema do app</span>
             <div class="color-picker">
@@ -183,6 +190,11 @@
               <input id="themeColorTextInput" type="text" value="#126fff" maxlength="7">
             </div>
           </label>
+          <label class="field onesignal-field">
+            <span data-i18n="oneSignalAppId">OneSignal App ID</span>
+            <input id="oneSignalAppIdInput" type="text" placeholder="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx">
+            <small data-i18n="oneSignalAppIdHint">Opcional. Use o App ID do OneSignal, nao a REST API Key.</small>
+          </label>
           <div class="field icon-field">
             <span data-i18n="appIcon">Icone do app</span>
             <div class="icon-picker">
@@ -275,6 +287,7 @@
         </div>
         <section class="action-strip">
           <button id="buildButton" class="primary-action" type="button" disabled data-i18n="startBuild">Gerar APK</button>
+          <button id="usbDebugButton" class="secondary-action" type="button" disabled data-i18n="startUsbDebug">Testar no USB</button>
         </section>
         <div id="resultPanel" class="result-panel hidden">
           <div>
@@ -292,8 +305,8 @@
         <div class="success-panel">
           <img src="../../../html2apk.png" alt="" class="success-icon">
           <p class="eyebrow" data-i18n="successEyebrow">Concluido</p>
-          <h1 data-i18n="successTitle">APK gerado com sucesso</h1>
-          <p data-i18n="successText">Seu arquivo Android esta pronto na pasta dist.</p>
+          <h1 id="successTitle" data-i18n="successTitle">APK gerado com sucesso</h1>
+          <p id="successText" data-i18n="successText">Seu arquivo Android esta pronto na pasta dist.</p>
           <code id="successApkPath">-</code>
           <div class="result-actions">
             <button id="successOpenDistButton" class="secondary-action" type="button" data-i18n="openDist">Abrir dist</button>
@@ -345,6 +358,11 @@
             <strong data-i18n="helpDepsTitle">Dependencias no EXE</strong>
             <p data-i18n="helpDeps">O executavel empacota html2apk, a interface e dependencias Node/Cordova. JDK e Android SDK ainda precisam existir na maquina por tamanho e licenca.</p>
           </article>
+          <article class="creator-card">
+            <strong data-i18n="helpCreatorTitle">Criador</strong>
+            <p data-i18n="helpCreatorText">Conheca o Dev Caio Multiversando, criador desta linda aplicacao html2apk.</p>
+            <button id="devInstagramButton" class="secondary-action instagram-action" type="button" data-i18n="openInstagram">Conhecer o dev</button>
+          </article>
         </div>
       </section>
     </main>