fix: always log console messages and uncomment live sync

Author: vmutafov

test-app/app/src/main/java/com/tns/RuntimeHelper.java

@@ -162,7 +162,7 @@ public static Runtime initRuntime(Context context) {
                         appDir, classLoader, dexDir, dexThumb, appConfig, isDebuggable);
 
                 runtime = Runtime.initializeRuntimeWithConfiguration(config);
-//                if (isDebuggable) {
+                if (isDebuggable) {
 //                    try {
 //                        v8Inspector = new AndroidJsV8Inspector(context.getFilesDir().getAbsolutePath(), context.getPackageName());
 //                        v8Inspector.start();
@@ -198,10 +198,10 @@ public static Runtime initRuntime(Context context) {
 //
 //                    // if app is in debuggable mode run livesync service
 //                    // runtime needs to be initialized before the NativeScriptSyncService is enabled because it uses runtime.runScript(...)
-//                    initLiveSync(runtime, logger, context);
-//
-//                    waitForLiveSync(context);
-//                }
+                    initLiveSync(runtime, logger, context);
+
+                    waitForLiveSync(context);
+                }
 
                 runtime.runScript(new File(appDir, "internal/ts_helpers.js"));
 

test-app/runtime/src/main/cpp/Runtime.cpp

@@ -711,16 +711,17 @@ Isolate* Runtime::PrepareV8Runtime(const string& filesPath, const string& native
     CallbackHandlers::CreateGlobalCastFunctions(isolate, globalTemplate);
 
     Local<Context> context = Context::New(isolate, nullptr, globalTemplate);
-    m_weakRef.Init(isolate,context, context->Global(), m_objectManager);
+
+    auto global = context->Global();
+
+    m_weakRef.Init(isolate,context, global, m_objectManager);
 
     context->Enter();
 
     m_objectManager->Init(isolate);
 
     m_module.Init(isolate, callingDir);
 
-    auto global = context->Global();
-
     Local<Value> gcFunc;
     global->Get(context, ArgConverter::ConvertToV8String(isolate, "gc")).ToLocal(&gcFunc);
     if (!gcFunc.IsEmpty() && gcFunc->IsFunction()) {

test-app/runtime/src/main/cpp/console/Console.cpp

@@ -18,7 +18,6 @@ namespace tns {
 v8::Local<v8::Object> Console::createConsole(v8::Local<v8::Context> context, ConsoleCallback callback, const int maxLogcatObjectSize, const bool forceLog) {
     m_callback = callback;
     m_maxLogcatObjectSize = maxLogcatObjectSize;
-    m_forceLog = forceLog;
     v8::Context::Scope contextScope(context);
     v8::Isolate* isolate = context->GetIsolate();
 
@@ -167,9 +166,6 @@ const std::string buildLogString(const v8::FunctionCallbackInfo<v8::Value>& info
 }
 
 void Console::assertCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
-    if (!shouldLog()) {
-        return;
-    }
     try {
         auto isolate = info.GetIsolate();
 
@@ -206,9 +202,6 @@ void Console::assertCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
 }
 
 void Console::errorCallback(const v8::FunctionCallbackInfo <v8::Value>& info) {
-    if (!shouldLog()) {
-        return;
-    }
     try {
         std::string log = buildLogString(info);
 
@@ -228,9 +221,6 @@ void Console::errorCallback(const v8::FunctionCallbackInfo <v8::Value>& info) {
 }
 
 void Console::infoCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
-    if (!shouldLog()) {
-        return;
-    }
     try {
         std::string log = buildLogString(info);
 
@@ -250,9 +240,6 @@ void Console::infoCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
 }
 
 void Console::logCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
-    if (!shouldLog()) {
-        return;
-    }
     try {
         std::string log = buildLogString(info);
 
@@ -272,9 +259,6 @@ void Console::logCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
 }
 
 void Console::warnCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
-    if (!shouldLog()) {
-        return;
-    }
     try {
         std::string log = buildLogString(info);
 
@@ -294,9 +278,6 @@ void Console::warnCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
 }
 
 void Console::dirCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
-    if (!shouldLog()) {
-        return;
-    }
     try {
         auto isolate = info.GetIsolate();
         auto context = isolate->GetCurrentContext();
@@ -411,9 +392,6 @@ const std::string buildStacktraceFrameMessage(v8::Local<v8::StackFrame> frame) {
 }
 
 void Console::traceCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
-    if (!shouldLog()) {
-        return;
-    }
     try {
         auto isolate = info.GetIsolate();
         std::stringstream ss;
@@ -457,9 +435,6 @@ void Console::traceCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
 }
 
 void Console::timeCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
-    if (!shouldLog()) {
-        return;
-    }
     try {
         auto isolate = info.GetIsolate();
 
@@ -496,9 +471,6 @@ void Console::timeCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
 }
 
 void Console::timeEndCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
-    if (!shouldLog()) {
-        return;
-    }
     try {
         auto isolate = info.GetIsolate();
 
@@ -563,11 +535,4 @@ const char* Console::LOG_TAG = "JS";
 std::map<v8::Isolate*, std::map<std::string, double>> Console::s_isolateToConsoleTimersMap;
 ConsoleCallback Console::m_callback = nullptr;
 int Console::m_maxLogcatObjectSize;
-bool Console::m_forceLog;
-
-#ifdef APPLICATION_IN_DEBUG
-bool Console::isApplicationInDebug = true;
-#else
-bool Console::isApplicationInDebug = false;
-#endif
 }

test-app/runtime/src/main/cpp/console/Console.h

@@ -32,16 +32,10 @@ class Console {
 
     private:
         static int m_maxLogcatObjectSize;
-        static bool m_forceLog;
         static ConsoleCallback m_callback;
         static const char* LOG_TAG;
         static std::map<v8::Isolate*, std::map<std::string, double>> s_isolateToConsoleTimersMap;
 
-        static bool isApplicationInDebug;
-        static bool shouldLog() {
-            return m_forceLog || isApplicationInDebug;
-        }
-
         // heavily inspired by 'createBoundFunctionProperty' of V8's v8-console.h
         static void bindFunctionProperty(v8::Local<v8::Context> context,
                                          v8::Local<v8::Object> consoleInstance,