Electron App launching implement

Ironically, Electron JS Runtime was not able to execute Electron Web App,
but only able to run Tizen Web app.
From this patch, if Electron App is packaged as wgt, JS Runtime will parse xml
then will launch Electron App from its own entry point.

Change-Id: Iec5df77495063e129d99a8e1dd21bc8f489b8ffe
Signed-off-by: ws29.jung <ws29.jung@samsung.com>

diff --git a/atom/app/ui_runtime.cc b/atom/app/ui_runtime.cc
index 7091bff27231c9c3a14324864c38702a6106536d..959e4ace873481918ac954f0d13f54d6a773b30d 100644 (file)
--- a/atom/app/ui_runtime.cc
+++ b/atom/app/ui_runtime.cc
@@ -55,6 +55,7 @@ bool UiRuntime::OnCreate() {
 }
 
 void UiRuntime::OnTerminate() {
+  LOG(ERROR) << "OnTerminate()";
   atom::Browser *browser_model = atom::Browser::Get();
 }
 
@@ -99,7 +100,6 @@ int UiRuntime::Exec() {
 
   // onCreate
   ops.create = [](void* data) -> bool {
-
     LOG(ERROR) << "Create Tizen App.";
     UiRuntime *runtime = (UiRuntime*)data;
     content::ContentMain(*runtime->_params);

diff --git a/atom/browser/api/atom_api_pwrt.cc b/atom/browser/api/atom_api_pwrt.cc
index b63ef511edb9a9f283346684f1b24bca665ca242..30213c55a7349a5906a1bfa28080b5d5691b3826 100644 (file)
--- a/atom/browser/api/atom_api_pwrt.cc
+++ b/atom/browser/api/atom_api_pwrt.cc
@@ -52,6 +52,10 @@ bool PWRT::isTizenWebApp() {
   }
 }
 
+bool PWRT::isElectronLaunch() {
+  return Browser::Get()->is_electron_launch();
+}
+
 void PWRT::Log(const std::string& message) {
   std::string output = "[JS LOG] " + message;
   dlog_print(DLOG_ERROR, "WRT", output.c_str());
@@ -73,6 +77,7 @@ void PWRT::BuildPrototype(
     .SetMethod("getMessage", &PWRT::GetMessage)
     .SetMethod("getPath", &PWRT::GetPath)
     .SetMethod("isTizenWebApp", &PWRT::isTizenWebApp)
+    .SetMethod("isElectronLaunch", &PWRT::isElectronLaunch)
     .SetMethod("log", &PWRT::Log);
 }
 

diff --git a/atom/browser/api/atom_api_pwrt.h b/atom/browser/api/atom_api_pwrt.h
index 647a5ae1735d015cb761716e0729bcff1d433302..8b67cc23d335a556ed16ecdf893c585f5629b11b 100644 (file)
--- a/atom/browser/api/atom_api_pwrt.h
+++ b/atom/browser/api/atom_api_pwrt.h
@@ -19,6 +19,7 @@ class PWRT : public mate::TrackableObject<PWRT> {
   std::string GetMessage();
   std::string GetPath();
   bool isTizenWebApp();
+  bool isElectronLaunch();
   void Log(const std::string& message);
 
  protected:

diff --git a/atom/browser/browser.cc b/atom/browser/browser.cc
index dea0bf267acfe4d4c729ac8893667349d1e7050d..771cbeeb75c13c5ee6fb923b199a2d1f865e3da5 100644 (file)
--- a/atom/browser/browser.cc
+++ b/atom/browser/browser.cc
@@ -21,6 +21,9 @@ namespace atom {
 
 Browser::Browser()
     : is_quiting_(false),
+#if defined(OS_TIZEN)
+      is_electron_launch_(false),
+#endif
       is_exiting_(false),
       is_ready_(false),
       is_shutdown_(false),
@@ -100,6 +103,22 @@ void Browser::Shutdown() {
   }
 }
 
+#if defined(OS_TIZEN)
+void Browser::SetElectronAppLaunch() {
+  if (!is_electron_launch_) {
+    common::CommandLine* runtime_cmd = common::CommandLine::ForCurrentProcess();
+    std::string appid = runtime_cmd->GetAppIdFromCommandLine("/usr/bin/electron");
+    auto appdata_manager = common::ApplicationDataManager::GetInstance();
+    common::ApplicationData* app_data = appdata_manager->GetApplicationData(appid);
+    if (!strcmp(app_data->content_info()->src().c_str(), "package.json")) {
+      is_electron_launch_ = true;
+    }
+  } else {
+    is_electron_launch_ = false;
+  }
+}
+#endif
+
 std::string Browser::GetVersion() const {
   if (version_override_.empty()) {
     std::string version = GetExecutableFileVersion();
@@ -151,6 +170,9 @@ void Browser::Activate(bool has_visible_windows) {
 }
 
 void Browser::WillFinishLaunching() {
+#if defined(OS_TIZEN)
+  SetElectronAppLaunch();
+#endif
   for (BrowserObserver& observer : observers_)
     observer.OnWillFinishLaunching();
 }

diff --git a/atom/browser/browser.h b/atom/browser/browser.h
index 286ba2961607412bf57cdae057835523e0782eaf..dfc48312fcbfc2c1c9ba70f27b5c31675658d170 100644 (file)
--- a/atom/browser/browser.h
+++ b/atom/browser/browser.h
@@ -222,6 +222,9 @@ class Browser : public WindowListObserver {
   bool is_shutting_down() const { return is_shutdown_; }
   bool is_quiting() const { return is_quiting_; }
   bool is_ready() const { return is_ready_; }
+#if defined(OS_TIZEN)
+  bool is_electron_launch() const { return is_electron_launch_; }
+#endif
 
  protected:
   // Returns the version of application bundle or executable file.
@@ -245,6 +248,10 @@ class Browser : public WindowListObserver {
   void OnWindowCloseCancelled(NativeWindow* window) override;
   void OnWindowAllClosed() override;
 
+#if defined(OS_TIZEN)
+  void SetElectronAppLaunch();
+#endif
+
   // Observers of the browser.
   base::ObserverList<BrowserObserver> observers_;
 
@@ -257,6 +264,10 @@ class Browser : public WindowListObserver {
   // The browser is being shutdown.
   bool is_shutdown_;
 
+#if defined(OS_TIZEN)
+  bool is_electron_launch_;
+#endif
+
   std::string version_override_;
   std::string name_override_;
 

diff --git a/wrt/src/runtime.js b/wrt/src/runtime.js
index d6c855db1119edb5d4b415f08814b174ffbd1ee2..0bdaa493cbb0feda34513aac2141e25130ccb6fc 100644 (file)
--- a/wrt/src/runtime.js
+++ b/wrt/src/runtime.js
@@ -1,5 +1,5 @@
 'use strict';
-const {app, ipcMain} = require('electron');
+const {app, ipcMain, pwrt} = require('electron');
 const IPC_MESSAGE = require('./ipc_message');
 const WAS_EVENT = require('./was_event');
 const WebApplication = require('./web_application');
@@ -13,6 +13,7 @@ class Runtime {
         this.quitting = false;
         this.handleWasEvents();
         this.handleIpcMessages();
+        this.isLaunched = false;
 
         var _this = this;
         app.on('before-quit', function(event) {
@@ -40,8 +41,24 @@ class Runtime {
         app.on('window-all-closed', function(event) {
             return runtime_debug('window-all-closed');
         });
+        app.on('will-finish-launching', function(event) {
+            runtime_debug('will-finish-launching');
+            if (pwrt.isElectronLaunch()) {
+                console.log("Electron App launch");
+                let filePath = pwrt.getPath();
+                let pkgJson = require(filePath.substr(7, filePath.length - 12));
+                let mainJsPath = filePath.substr(7, filePath.length - 19) +
+                                                (pkgJson.main || 'index.js');
+
+                const Module = require('module');
+                Module._load(mainJsPath, Module, true);
+             }
+        });
         app.on('ready', function(event) {
             runtime_debug('ready');
+            if (pwrt.isElectronLaunch()) {
+                return;
+            }
             this.webApplication = new WebApplication(options);
         });
     }