Add anchor tag fallback

rokucommunity · Oct 9, 2024 · c4fc5cf · c4fc5cf
1 parent 0c6b0a6
commit c4fc5cf
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/RokuDeploy.spec.ts b/src/RokuDeploy.spec.ts
@@ -1473,6 +1473,16 @@ describe('index', () => {
         });
 
         it('should return created pkg on success', async () => {
+            let body = `var pkgDiv = document.createElement('div');
+                        pkgDiv.innerHTML = '<label>Currently Packaged Application:</label><div><font face="Courier"><a href="pkgs//P6953175d5df120c0069c53de12515b9a.pkg">P6953175d5df120c0069c53de12515b9a.pkg</a> <br> package file (7360 bytes)</font></div>';
+                        node.appendChild(pkgDiv);`;
+            mockDoPostRequest(body);
+
+            let pkgPath = await rokuDeploy.signExistingPackage(options);
+            expect(pkgPath).to.equal('pkgs//P6953175d5df120c0069c53de12515b9a.pkg');
+        });
+
+        it('should return created pkg from SD card on success', async () => {
             mockDoPostRequest(fakePluginPackageResponse);
 
             let pkgPath = await rokuDeploy.signExistingPackage(options);

diff --git a/src/RokuDeploy.ts b/src/RokuDeploy.ts
@@ -623,7 +623,13 @@ export class RokuDeploy {
             throw new errors.FailedDeviceResponseError(failedSearchMatches[1], results);
         }
 
-        let pkgSearchMatches = /"pkgPath"\s*:\s*"([a-zA-Z0-9\\/\_]+\.pkg)"/.exec(results.body);
+        //grab the package url from the JSON on the page if it exists (https://regex101.com/r/1HUXgk/1)
+        let pkgSearchMatches = /"pkgPath"\s*:\s*"(.*?)"/.exec(results.body);
+        if (pkgSearchMatches) {
+            return pkgSearchMatches[1];
+        }
+        //for some reason we couldn't find the pkgPath from json, look in the <a> tag
+        pkgSearchMatches = /<a href="(pkgs\/[^\.]+\.pkg)">/.exec(results.body);
         if (pkgSearchMatches) {
             return pkgSearchMatches[1];
         }