Fix stopOnEntry bug with deep links.

Fix dns resolving for deep links
rokucommunity · Aug 19, 2022 · e45e39c · e45e39c
1 parent 8113fa4
commit e45e39c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/debugSession/BrightScriptDebugSession.ts b/src/debugSession/BrightScriptDebugSession.ts
@@ -379,9 +379,11 @@ export class BrightScriptDebugSession extends BaseDebugSession {
             await this.rokuAdapter.continue();
             //kill the app on the roku
             await this.rokuDeploy.pressHomeButton(this.launchConfiguration.host, this.launchConfiguration.remotePort);
+            //convert a hostname to an ip address
+            const deepLinkUrl = await util.resolveUrl(this.launchConfiguration.deepLinkUrl);
             //send the deep link http request
             await new Promise((resolve, reject) => {
-                request.post(this.launchConfiguration.deepLinkUrl, (err, response) => {
+                request.post(deepLinkUrl, (err, response) => {
                     return err ? reject(err) : resolve(response);
                 });
             });
@@ -1184,7 +1186,7 @@ export class BrightScriptDebugSession extends BaseDebugSession {
     public async handleEntryBreakpoint() {
         if (!this.enableDebugProtocol) {
             this.entryBreakpointWasHandled = true;
-            if (this.launchConfiguration.stopOnEntry) {
+            if (this.launchConfiguration.stopOnEntry || this.launchConfiguration.deepLinkUrl) {
                 await this.projectManager.registerEntryBreakpoint(this.projectManager.mainProject.stagingFolderPath);
             }
         }

diff --git a/src/util.ts b/src/util.ts
@@ -324,6 +324,19 @@ class Util {
         }
     }
 
+    /**
+     * Given a full URL, convert any dns name into its IP address and then return the full URL with the name replaced
+     */
+    public async resolveUrl(url: string, skipCache = false) {
+        //https://regex101.com/r/cSkoTx/1
+        const [, protocol, host] = /^((?:http[s]?|ftp):\/\/)?([^:\/\s]+)(:\d+)?([^?#]+)?(\?[^#]+)?(#.*)?$/.exec(url) ?? [];
+        if (host) {
+            const ipAddress = await this.dnsLookup(host);
+            url = protocol + ipAddress + url.substring(protocol.length + host.length);
+        }
+        return url;
+    }
+
     /*
      * Look up the ip address for a hostname. This is cached for the lifetime of the app, or bypassed with the `skipCache` parameter
      * @param host