fix console logging implementation to print out a message on circular references JSON.stringify fails to resolve

Author: petekanev

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

@@ -58,13 +58,6 @@ void CallbackHandlers::Init(Isolate* isolate) {
 
     assert(INIT_WORKER_METHOD_ID != nullptr);
 
-    Local<Object> json = isolate->GetCurrentContext()->Global()->Get(String::NewFromUtf8(isolate, "JSON"))->ToObject();
-    Local<Function> stringify = json->Get(String::NewFromUtf8(isolate, "stringify")).As<Function>();
-
-    auto persistentStringify = new Persistent<Function>(isolate, stringify);
-
-    isolateToJsonStringify.insert({isolate, persistentStringify});
-
     MetadataNode::Init(isolate);
 
     MethodCache::Init();
@@ -1381,8 +1374,6 @@ void CallbackHandlers::TerminateWorkerThread(Isolate* isolate) {
 int CallbackHandlers::nextWorkerId = 0;
 std::map<int, Persistent<Object>*> CallbackHandlers::id2WorkerMap;
 
-std::map<Isolate*, Persistent<Function>*> CallbackHandlers::isolateToJsonStringify;
-
 short CallbackHandlers::MAX_JAVA_STRING_ARRAY_LENGTH = 100;
 jclass CallbackHandlers::RUNTIME_CLASS = nullptr;
 jclass CallbackHandlers::JAVA_LANG_STRING = nullptr;

test-app/runtime/src/main/cpp/CallbackHandlers.h

@@ -26,8 +26,6 @@ class CallbackHandlers {
          */
         static std::map<int, v8::Persistent<v8::Object>*> id2WorkerMap;
 
-        static std::map<v8::Isolate*, v8::Persistent<v8::Function>*> isolateToJsonStringify;
-
         static int nextWorkerId;
 
         static void Init(v8::Isolate* isolate);

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

@@ -19,17 +19,22 @@ string tns::ConvertToString(const Local<v8::String>& s) {
 }
 
 Local<String> tns::JsonStringifyObject(Isolate* isolate, Handle<v8::Value> value) {
+    v8::HandleScope scope(isolate);
+
     if (value.IsEmpty()) {
         return String::Empty(isolate);
     }
 
-    auto stringifyFunction = CallbackHandlers::isolateToJsonStringify.find(isolate)->second;
-    auto func = Local<Function>::New(isolate, *stringifyFunction);
-    Local<Value> args[] = { value };
+    v8::Local<v8::String> resultString;
+    v8::TryCatch tc;
+    auto success = v8::JSON::Stringify(isolate->GetCurrentContext(), value->ToObject(isolate)).ToLocal(&resultString);
 
-    auto result = func->Call(Undefined(isolate), 1, args);
+    if (!success && tc.HasCaught()) {
+        auto message = tc.Message()->Get();
+        resultString = v8::String::Concat(ArgConverter::ConvertToV8String(isolate, "Couldn't convert object to a JSON string: "), message);
+    }
 
-    return result->ToString(isolate);
+    return resultString;
 }
 
 jstring tns::ConvertToJavaString(const Local<Value>& value) {

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

@@ -188,9 +188,14 @@ void Console::dirCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
                 if (propIsFunction) {
                     ss << "()";
                 } else if (propertyValue->IsObject()) {
-                    ss << ": " << ArgConverter::ConvertToString(JsonStringifyObject(isolate, propertyValue));
+                    std::string jsonStringifiedObject = ArgConverter::ConvertToString(JsonStringifyObject(isolate, propertyValue));
+                    // if object prints out as the error string for circular references, replace with #CR instead for brevity
+                    if (jsonStringifiedObject.find("circular structure") != std::string::npos) {
+                        jsonStringifiedObject = "#CR";
+                    }
+                    ss << ": " << jsonStringifiedObject;
                 } else {
-                    ss << ": " << ArgConverter::ConvertToString(propertyValue->ToDetailString(isolate));
+                    ss << ": \"" << ArgConverter::ConvertToString(propertyValue->ToDetailString(isolate)) << "\"";
                 }
 
                 ss << std::endl;