Merge pull request #725 from NativeScript/pete/network-agent

DevTools Network Agent implementation

Author: petekanev

build-artifacts/project-template-gradle/src/main/java/com/tns/RuntimeHelper.java

@@ -124,14 +124,18 @@ public static Runtime initRuntime(Application app) {
                 e.printStackTrace();
             }
 
+            boolean isDebuggable = Util.isDebuggableApp(app);
             StaticConfiguration config = new StaticConfiguration(logger, appName, nativeLibDir, rootDir,
-                    appDir, classLoader, dexDir, dexThumb, appConfig);
+                    appDir, classLoader, dexDir, dexThumb, appConfig, isDebuggable);
 
             runtime = Runtime.initializeRuntimeWithConfiguration(config);
-            if (Util.isDebuggableApp(app)) {
+            if (isDebuggable) {
                 try {
                     v8Inspector = new AndroidJsV8Inspector(app, logger);
                     v8Inspector.start();
+
+                    // the following snippet is used as means to notify the VSCode extension
+                    // debugger that the debugger agent has started
                     File debugBreakFile = new File("/data/local/tmp", app.getPackageName() + "-debugger-started");
                     if (debugBreakFile.exists() && !debugBreakFile.isDirectory() && debugBreakFile.length() == 0) {
                         java.io.FileWriter fileWriter = new java.io.FileWriter(debugBreakFile);

runtime/src/main/java/com/tns/Runtime.java

@@ -31,7 +31,7 @@
 import com.tns.bindings.ProxyGenerator;
 
 public class Runtime {
-    private native void initNativeScript(int runtimeId, String filesPath, String nativeLibDir, boolean verboseLoggingEnabled, String packageName, Object[] v8Options, String callingDir);
+    private native void initNativeScript(int runtimeId, String filesPath, String nativeLibDir, boolean verboseLoggingEnabled, boolean isDebuggable, String packageName, Object[] v8Options, String callingDir);
 
     private native void runModule(int runtimeId, String filePath) throws NativeScriptException;
 
@@ -441,10 +441,10 @@ private boolean isInitializedImpl() {
     }
 
     public void init() {
-        init(config.logger, config.appName, config.nativeLibDir, config.rootDir, config.appDir, config.classLoader, config.dexDir, config.dexThumb, config.appConfig, dynamicConfig.callingJsDir);
+        init(config.logger, config.appName, config.nativeLibDir, config.rootDir, config.appDir, config.classLoader, config.dexDir, config.dexThumb, config.appConfig, dynamicConfig.callingJsDir, config.isDebuggable);
     }
 
-    private void init(Logger logger, String appName, String nativeLibDir, File rootDir, File appDir, ClassLoader classLoader, File dexDir, String dexThumb, AppConfig appConfig, String callingJsDir) throws RuntimeException {
+    private void init(Logger logger, String appName, String nativeLibDir, File rootDir, File appDir, ClassLoader classLoader, File dexDir, String dexThumb, AppConfig appConfig, String callingJsDir, boolean isDebuggable) throws RuntimeException {
         if (initialized) {
             throw new RuntimeException("NativeScriptApplication already initialized");
         }
@@ -463,7 +463,7 @@ private void init(Logger logger, String appName, String nativeLibDir, File rootD
             throw new RuntimeException("Fail to initialize Require class", ex);
         }
 
-        initNativeScript(getRuntimeId(), Module.getApplicationFilesPath(), nativeLibDir, logger.isEnabled(), appName, appConfig.getAsArray(), callingJsDir);
+        initNativeScript(getRuntimeId(), Module.getApplicationFilesPath(), nativeLibDir, logger.isEnabled(), isDebuggable, appName, appConfig.getAsArray(), callingJsDir);
 
         clearStartupData(getRuntimeId()); // It's safe to delete the data after the V8 debugger is initialized
 

runtime/src/main/java/com/tns/StaticConfiguration.java

@@ -12,10 +12,11 @@ public class StaticConfiguration {
     public final File dexDir;
     public final String dexThumb;
     public final AppConfig appConfig;
+    public final boolean isDebuggable;
 
     public StaticConfiguration(Logger logger,
                                String appName, String nativeLibDir, File rootDir, File appDir, ClassLoader classLoader,
-                               File dexDir, String dexThumb, AppConfig appConfig) {
+                               File dexDir, String dexThumb, AppConfig appConfig, boolean isDebuggable) {
         this.logger = logger;
         this.appName = appName;
         this.nativeLibDir = nativeLibDir;
@@ -25,5 +26,6 @@ public StaticConfiguration(Logger logger,
         this.dexDir = dexDir;
         this.dexThumb = dexThumb;
         this.appConfig = appConfig;
+        this.isDebuggable = isDebuggable;
     }
 }

runtime/src/main/jni/JsV8InspectorClient.cpp

@@ -6,6 +6,7 @@
 #include "NativeScriptException.h"
 
 #include "ArgConverter.h"
+#include "NetworkDomainCallbackHandlers.h"
 
 using namespace std;
 using namespace tns;
@@ -19,7 +20,8 @@ JsV8InspectorClient::JsV8InspectorClient(v8::Isolate* isolate)
       session_(nullptr),
       connection(nullptr),
       context_(),
-      running_nested_loop_(false) {
+      running_nested_loop_(false),
+      isConnected(false) {
     JEnv env;
 
     inspectorClass = env.FindClass("com/tns/AndroidJsV8Inspector");
@@ -38,6 +40,7 @@ JsV8InspectorClient::JsV8InspectorClient(v8::Isolate* isolate)
 void JsV8InspectorClient::connect(jobject connection) {
     JEnv env;
     this->connection = env.NewGlobalRef(connection);
+    this->isConnected = true;
 }
 
 void JsV8InspectorClient::createInspectorSession(v8::Isolate* isolate, const v8::Local<v8::Context>& context) {
@@ -58,6 +61,7 @@ void JsV8InspectorClient::disconnect() {
     JEnv env;
     env.DeleteGlobalRef(this->connection);
     this->connection = nullptr;
+    this->isConnected = false;
 
     this->createInspectorSession(isolate_, JsV8InspectorClient::PersistentToLocal(isolate_, context_));
 }
@@ -133,7 +137,6 @@ void JsV8InspectorClient::sendProtocolNotification(const v8_inspector::StringVie
     v8_inspector::String16 msg = ToString16(message);
 
     JEnv env;
-    const char* msss = msg.utf8().c_str();
     JniLocalRef str(env.NewStringUTF(msg.utf8().c_str()));
     env.CallStaticVoidMethod(inspectorClass, sendMethod, this->connection, (jstring) str);
 }
@@ -257,11 +260,27 @@ void MessageHandler(v8::Local<v8::Message> message, v8::Local<v8::Value> excepti
 //                               inspector->createStackTrace(stack), script_id);
 }
 
+void JsV8InspectorClient::attachInspectorCallbacks(Isolate* isolate,
+        Local<ObjectTemplate>& globalObjectTemplate) {
+    v8::HandleScope scope(isolate);
+
+    auto inspectorJSObject = ObjectTemplate::New(isolate);
+
+    inspectorJSObject->Set(ArgConverter::ConvertToV8String(isolate, "responseReceived"), FunctionTemplate::New(isolate, NetworkDomainCallbackHandlers::ResponseReceivedCallback));
+    inspectorJSObject->Set(ArgConverter::ConvertToV8String(isolate, "requestWillBeSent"), FunctionTemplate::New(isolate, NetworkDomainCallbackHandlers::RequestWillBeSentCallback));
+    inspectorJSObject->Set(ArgConverter::ConvertToV8String(isolate, "dataForRequestId"), FunctionTemplate::New(isolate, NetworkDomainCallbackHandlers::DataForRequestIdCallback));
+    inspectorJSObject->Set(ArgConverter::ConvertToV8String(isolate, "loadingFinished"), FunctionTemplate::New(isolate, NetworkDomainCallbackHandlers::LoadingFinishedCallback));
+    inspectorJSObject->SetAccessor(ArgConverter::ConvertToV8String(isolate, "isConnected"), JsV8InspectorClient::InspectorIsConnectedGetterCallback);
+
+    globalObjectTemplate->Set(ArgConverter::ConvertToV8String(isolate, "__inspector"), inspectorJSObject);
+}
+
+void JsV8InspectorClient::InspectorIsConnectedGetterCallback(v8::Local<v8::String> property, const v8::PropertyCallbackInfo<v8::Value>& info) {
+    info.GetReturnValue().Set(JsV8InspectorClient::GetInstance()->isConnected);
+}
+
 JsV8InspectorClient* JsV8InspectorClient::instance = nullptr;
 jclass JsV8InspectorClient::inspectorClass = nullptr;
 jmethodID JsV8InspectorClient::sendMethod = nullptr;
 jmethodID JsV8InspectorClient::sendToDevToolsConsoleMethod = nullptr;
 jmethodID JsV8InspectorClient::getInspectorMessageMethod = nullptr;
-
-
-

runtime/src/main/jni/JsV8InspectorClient.h

@@ -11,7 +11,6 @@
 #include "src/inspector/protocol/Forward.h"
 #include "src/inspector/string-16.h"
 
-
 using namespace v8_inspector;
 
 namespace tns {
@@ -39,6 +38,13 @@ class JsV8InspectorClient : V8InspectorClient, v8_inspector::V8Inspector::Channe
         void quitMessageLoopOnPause() override;
         v8::Local<v8::Context> ensureDefaultContextInGroup(int contextGroupId) override;
 
+        static void attachInspectorCallbacks(v8::Isolate* isolate, v8::Local<v8::ObjectTemplate>& globalObjectTemplate);
+        static void InspectorIsConnectedGetterCallback(v8::Local<v8::String> property, const v8::PropertyCallbackInfo<v8::Value>& info);
+
+        std::unique_ptr<V8Inspector> inspector_;
+        v8::Isolate* isolate_;
+        bool isConnected;
+
     private:
         JsV8InspectorClient(v8::Isolate* isolate);
 
@@ -48,9 +54,7 @@ class JsV8InspectorClient : V8InspectorClient, v8_inspector::V8Inspector::Channe
         static jmethodID getInspectorMessageMethod;
         static jmethodID sendToDevToolsConsoleMethod;
 
-        v8::Isolate* isolate_;
         v8::Persistent<v8::Context> context_;
-        std::unique_ptr<V8Inspector> inspector_;
         std::unique_ptr<V8InspectorSession> session_;
         jobject connection;
         bool running_nested_loop_;