Merge branch 'main' into feature/dial-cast-poc

iBicha · Feb 5, 2024 · be8f3e3 · be8f3e3
2 parents 8cf9df0 + f3aeb58
commit be8f3e3
Show file tree

Hide file tree

Showing 14 changed files with 132 additions and 120 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,14 +3,14 @@
     "version": "0.19.1",
     "description": "Unofficial Youtube client for Roku",
     "devDependencies": {
-        "@rokucommunity/bslint": "^0.8.16",
+        "@rokucommunity/bslint": "^0.8.17",
         "@types/crypto-js": "^4.2.2",
         "@types/fs-extra": "^11.0.4",
-        "@types/node": "^20.11.7",
+        "@types/node": "^20.11.16",
         "@types/xml2js": "^0.4.14",
         "argparse": "^2.0.1",
-        "brighterscript": "0.65.18",
-        "brighterscript-formatter": "^1.6.39",
+        "brighterscript": "0.65.21",
+        "brighterscript-formatter": "^1.6.40",
         "convert-svg-to-png": "^0.6.4",
         "cross-fetch": "^4.0.0",
         "crypto-js": "^4.2.0",
@@ -21,9 +21,9 @@
         "imap": "^0.8.19",
         "ip": "^1.1.8",
         "json5": "^2.2.3",
-        "mailparser": "^3.6.6",
+        "mailparser": "^3.6.7",
         "roku-deploy": "^3.11.2",
-        "rooibos-roku": "^5.10.0",
+        "rooibos-roku": "^5.11.0",
         "semver": "^7.5.4",
         "shelljs": "^0.8.5",
         "ts-node": "^10.9.2",

diff --git a/playlet-lib/src/components/MainScene.transpiled.xml b/playlet-lib/src/components/MainScene.transpiled.xml
@@ -8,6 +8,7 @@
     </interface>
     <script type="text/brightscript" uri="pkg:/components/parts/AutoBind/AutoBind.part.brs" />
     <script type="text/brightscript" uri="pkg:/components/MainScene_bindings.brs" />
+    <script type="text/brightscript" uri="pkg:/source/utils/NodePathUtils.brs" />
     <script type="text/brightscript" uri="pkg:/components/MainScene.brs" />
     <script type="text/brightscript" uri="pkg:/source/utils/LoadingScreen.brs" />
     <script type="text/brightscript" uri="pkg:/components/parts/AutoBind/OnNodeReadyNoOp.brs" />

diff --git a/playlet-lib/src/components/Services/Dash/DashManifest.bs b/playlet-lib/src/components/Services/Dash/DashManifest.bs
@@ -73,11 +73,10 @@ class DashManifest
                     end if
 
                     if xml.Node("AdaptationSet", adaptationSetAttributes)
-                        xml.Node("Role", {
+                        xml.EmptyNode("Role", {
                             "schemeIdUri": "urn:mpeg:dash:role:2011"
                             "value": audioSet.acont = "original" ? "main" : "alternate"
                         })
-                        xml.End()
 
                         for i = 0 to audioStreams.Count() - 1
                             stream = audioStreams[i]
@@ -100,31 +99,23 @@ class DashManifest
                                     "bandwidth": stream.bitrate
                                 })
 
-                                xml.Node("AudioChannelConfiguration", {
+                                xml.EmptyNode("AudioChannelConfiguration", {
                                     "schemeIdUri": "urn:mpeg:dash:23003:3:audio_channel_configuration:2011"
                                     "value": `${stream.audioChannels}`
                                 })
-                                xml.End()
 
-                                if xml.Node("BaseURL")
-                                    xml.Text(stream.url)
-                                    xml.End()
-                                end if
+                                xml.TextNode("BaseURL", stream.url)
+
+                                if xml.Node("SegmentBase", { "indexRange": stream.index })
+                                    xml.EmptyNode("Initialization", { "range": stream.init })
 
-                                if xml.Node("SegmentBase", {
-                                        "indexRange": stream.index
-                                    })
-                                    if xml.Node("Initialization", {
-                                            "range": stream.init
-                                        })
-                                        xml.End()
-                                    end if
                                     xml.End()
                                 end if
 
                                 xml.End()
                             end if
                         end for
+
                         xml.End()
                     end if
 
@@ -178,14 +169,9 @@ class DashManifest
                                     xml.End()
                                 end if
 
-                                if xml.Node("SegmentBase", {
-                                        "indexRange": stream.index
-                                    })
-                                    if xml.Node("Initialization", {
-                                            "range": stream.init
-                                        })
-                                        xml.End()
-                                    end if
+                                if xml.Node("SegmentBase", { "indexRange": stream.index })
+                                    xml.EmptyNode("Initialization", { "range": stream.init })
+
                                     xml.End()
                                 end if
 
@@ -249,12 +235,11 @@ class DashManifest
                             "mimeType": "image/jpeg"
                             "contentType": "image"
                         })
-                        xml.Node("SegmentTemplate", {
+                        xml.EmptyNode("SegmentTemplate", {
                             "media": url
                             "duration": duration
                             "startNumber": 0
                         })
-                        xml.End()
 
                         if xml.Node("Representation", {
                                 "id": `thumbnails_${id}`
@@ -263,11 +248,10 @@ class DashManifest
                                 "height": storyboardHeightInPixels
                             })
 
-                            xml.Node("EssentialProperty", {
+                            xml.EmptyNode("EssentialProperty", {
                                 "schemeIdUri": "http://dashif.org/guidelines/thumbnail_tile"
                                 "value": `${storyboardWidth}x${storyboardHeight}`
                             })
-                            xml.End()
 
                             xml.End()
                         end if
@@ -399,11 +383,10 @@ class DashManifest
         if videoStream.colorInfo.primaries <> invalid
             primaries = m.colorInfo.primaries[videoStream.colorInfo.primaries]
             if primaries <> invalid
-                xml.Node("EssentialProperty", {
+                xml.EmptyNode("EssentialProperty", {
                     "schemeIdUri": "urn:mpeg:mpegB:cicp:ColourPrimaries"
                     "value": primaries
                 })
-                xml.End()
             else
                 LogWarn("Unknown colorInfo.primaries:", videoStream.colorInfo.primaries)
             end if
@@ -412,11 +395,10 @@ class DashManifest
         if videoStream.colorInfo.transferCharacteristics <> invalid
             transferCharacteristics = m.colorInfo.transferCharacteristics[videoStream.colorInfo.transferCharacteristics]
             if transferCharacteristics <> invalid
-                xml.Node("EssentialProperty", {
+                xml.EmptyNode("EssentialProperty", {
                     "schemeIdUri": "urn:mpeg:mpegB:cicp:TransferCharacteristics"
                     "value": transferCharacteristics
                 })
-                xml.End()
             else
                 LogWarn("Unknown colorInfo.transferCharacteristics:", videoStream.colorInfo.transferCharacteristics)
             end if
@@ -425,11 +407,10 @@ class DashManifest
         if videoStream.colorInfo.matrixCoefficients <> invalid
             matrixCoefficients = m.colorInfo.matrixCoefficients[videoStream.colorInfo.matrixCoefficients]
             if matrixCoefficients <> invalid
-                xml.Node("EssentialProperty", {
+                xml.EmptyNode("EssentialProperty", {
                     "schemeIdUri": "urn:mpeg:mpegB:cicp:MatrixCoefficients"
                     "value": matrixCoefficients
                 })
-                xml.End()
             else
                 LogWarn("Unknown colorInfo.matrixCoefficients:", videoStream.colorInfo.matrixCoefficients)
             end if

diff --git a/playlet-lib/src/components/Services/Invidious/InvidiousService.bs b/playlet-lib/src/components/Services/Invidious/InvidiousService.bs
@@ -505,14 +505,22 @@ We apologize for the inconvenience.`
         function VerifyTokenScope(token as string) as boolean
             tokenObject = ParseJson(token)
             if tokenObject = invalid
+                LogWarn("Failed to json parse token:", token)
                 return false
             end if
             if not IsArray(tokenObject.scopes)
+                LogWarn("Token scopes are not an array:", tokenObject.scopes)
                 return false
             end if
 
             scopes = tokenObject.scopes.join(",")
-            return scopes = Invidious.AUTH_SCOPES
+            expectedScopes = Invidious.AUTH_SCOPES
+            validScopes = expectedScopes = scopes
+
+            if not validScopes
+                LogWarn(`Token scopes do not match expected scopes. Expected: "${expectedScopes}", got: "${scopes}"`)
+            end if
+            return validScopes
         end function
 
         function DeleteAuthToken()

diff --git a/playlet-lib/src/components/Web/WebServer/Http/HttpResponse.bs b/playlet-lib/src/components/Web/WebServer/Http/HttpResponse.bs
@@ -58,11 +58,11 @@ namespace Http
             m.http_code = errcode
 
             buffer = `<html><head><title>${errcode} ${errname}</title></head><body>
-            <h1>${errname}</h1>
-            ${reason}
-            <hr>
-            ${m.GeneratedBy()}
-            </body></html>`
+<h1>${errname}</h1>
+${reason}
+<hr>
+${m.GeneratedBy()}
+</body></html>`
 
             m.SetBodyDataString(buffer)
             m.ContentType("text/html")