From 952db4cfc6b7e1ed7e08fd1e1cb5729e367f293a Mon Sep 17 00:00:00 2001 From: Brian Leighty Date: Tue, 29 Jul 2025 23:05:29 -0400 Subject: [PATCH 1/7] Finish initial version of work for using get app UI --- package-lock.json | 347 ++++++------ package.json | 10 +- src/managers/RtaManager.ts | 43 +- src/managers/WebviewViewProviderManager.ts | 1 + src/viewProviders/BaseRdbViewProvider.ts | 20 +- src/viewProviders/BaseWebviewViewProvider.ts | 6 + src/viewProviders/ViewProviderCommand.ts | 6 +- src/viewProviders/ViewProviderEvent.ts | 7 +- webviews/src/ExtensionIntermediary.ts | 43 +- webviews/src/shared/types.ts | 6 +- webviews/src/utils.ts | 24 + .../RokuDeviceView/RokuDeviceView.svelte | 267 ++++----- .../SceneGraphInspectorView/Branch.svelte | 161 +++--- .../NodeCountByTypePage.svelte | 51 +- .../NodeDetailPage.svelte | 517 +++++++++--------- .../SceneGraphInspectorView.svelte | 281 ++++++---- .../SettingsPage.svelte | 27 - 17 files changed, 974 insertions(+), 843 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9bce478e..015e3256 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,7 @@ "resolve": "^1.22.8", "roku-debug": "^0.21.31", "roku-deploy": "^3.12.4", - "roku-test-automation": "^2.0.10", + "roku-test-automation": "^2.2.0", "semver": "^7.1.3", "source-map": "^0.7.3", "strip-ansi": "^5.2.0", @@ -1296,6 +1296,7 @@ "version": "1.19.5", "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz", "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==", + "license": "MIT", "dependencies": { "@types/connect": "*", "@types/node": "*" @@ -1332,25 +1333,27 @@ "version": "3.4.38", "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz", "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==", + "license": "MIT", "dependencies": { "@types/node": "*" } }, "node_modules/@types/express": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz", - "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@types/express/-/express-5.0.1.tgz", + "integrity": "sha512-UZUw8vjpWFXuDnjFTh7/5c2TWDlQqeXHi6hcN7F2XSVT5P+WmUnnbFS3KA6Jnc6IsEqI2qCVu2bK0R0J4A8ZQQ==", + "license": "MIT", "dependencies": { "@types/body-parser": "*", - "@types/express-serve-static-core": "^4.17.33", - "@types/qs": "*", + "@types/express-serve-static-core": "^5.0.0", "@types/serve-static": "*" } }, "node_modules/@types/express-serve-static-core": { - "version": "4.19.5", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.5.tgz", - "integrity": "sha512-y6W03tvrACO72aijJ5uF02FRq5cgDR9lUxddQ8vyF+GvmjJQqbzDcJngEjURc+ZsG31VI3hODNZJ2URj86pzmg==", + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.6.tgz", + "integrity": "sha512-3xhRnjJPkULekpSzgtoNYYcTWgEZkp4myc+Saevii5JPnHNvHMRlBSHDbs7Bh1iPPoVTERHEZXyhyLbMEsExsA==", + "license": "MIT", "dependencies": { "@types/node": "*", "@types/qs": "*", @@ -1380,12 +1383,14 @@ "node_modules/@types/http-errors": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz", - "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==" + "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==", + "license": "MIT" }, "node_modules/@types/http-proxy": { - "version": "1.17.15", - "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.15.tgz", - "integrity": "sha512-25g5atgiVNTIv0LBDTg1H74Hvayx0ajtJPLLcYE3whFv75J0pWNtOBzaXJQgDTmrX1bx5U9YC2w/n65BN1HwRQ==", + "version": "1.17.16", + "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.16.tgz", + "integrity": "sha512-sdWoUajOB1cd0A8cRRQ1cfyWNbmFKLAqBB89Y8x5iYyG/mkJHc0YUH8pdWBy2omi9qtCpiIgGjuwO0dQST2l5w==", + "license": "MIT", "dependencies": { "@types/node": "*" } @@ -1417,7 +1422,8 @@ "node_modules/@types/mime": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz", - "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==" + "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==", + "license": "MIT" }, "node_modules/@types/minimatch": { "version": "5.1.2", @@ -1459,14 +1465,16 @@ } }, "node_modules/@types/qs": { - "version": "6.9.16", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.16.tgz", - "integrity": "sha512-7i+zxXdPD0T4cKDuxCUXJ4wHcsJLwENa6Z3dCu8cfCK743OGy5Nu1RmAGqDPsoTDINVEcdXKRvR/zre+P2Ku1A==" + "version": "6.9.18", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.18.tgz", + "integrity": "sha512-kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA==", + "license": "MIT" }, "node_modules/@types/range-parser": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz", - "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==" + "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==", + "license": "MIT" }, "node_modules/@types/request": { "version": "2.48.12", @@ -1501,6 +1509,7 @@ "version": "0.17.4", "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz", "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==", + "license": "MIT", "dependencies": { "@types/mime": "^1", "@types/node": "*" @@ -1510,6 +1519,7 @@ "version": "1.15.7", "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz", "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==", + "license": "MIT", "dependencies": { "@types/http-errors": "*", "@types/node": "*", @@ -2210,7 +2220,8 @@ "node_modules/array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" + "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", + "license": "MIT" }, "node_modules/array-from": { "version": "2.1.1", @@ -2321,14 +2332,6 @@ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, - "node_modules/at-least-node": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", - "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", - "engines": { - "node": ">= 4.0.0" - } - }, "node_modules/aws-sign2": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", @@ -2484,6 +2487,7 @@ "version": "1.20.3", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", + "license": "MIT", "dependencies": { "bytes": "3.1.2", "content-type": "~1.0.5", @@ -2507,6 +2511,7 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "license": "MIT", "dependencies": { "ms": "2.0.0" } @@ -2514,12 +2519,14 @@ "node_modules/body-parser/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "license": "MIT" }, "node_modules/body-parser/node_modules/qs": { "version": "6.13.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", + "license": "BSD-3-Clause", "dependencies": { "side-channel": "^1.0.6" }, @@ -2947,15 +2954,11 @@ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "dev": true }, - "node_modules/buffer-shims": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz", - "integrity": "sha512-Zy8ZXMyxIT6RMTeY7OP/bDndfj6bwCan7SS98CEndS6deHwWPpseeHlwarNcBim+etXnF9HBc1non5JgDaJU1g==" - }, "node_modules/bytes": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -3432,6 +3435,7 @@ "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", + "license": "MIT", "dependencies": { "safe-buffer": "5.2.1" }, @@ -3443,6 +3447,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -3457,6 +3462,7 @@ "version": "0.7.1", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -3464,7 +3470,8 @@ "node_modules/cookie-signature": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" + "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", + "license": "MIT" }, "node_modules/core-js-pure": { "version": "3.26.1", @@ -4874,9 +4881,10 @@ } }, "node_modules/express": { - "version": "4.21.1", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", - "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", + "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", + "license": "MIT", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", @@ -4897,7 +4905,7 @@ "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.10", + "path-to-regexp": "0.1.12", "proxy-addr": "~2.0.7", "qs": "6.13.0", "range-parser": "~1.2.1", @@ -4912,12 +4920,17 @@ }, "engines": { "node": ">= 0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/express/node_modules/debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "license": "MIT", "dependencies": { "ms": "2.0.0" } @@ -4926,6 +4939,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -4933,12 +4947,14 @@ "node_modules/express/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "license": "MIT" }, "node_modules/express/node_modules/qs": { "version": "6.13.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", + "license": "BSD-3-Clause", "dependencies": { "side-channel": "^1.0.6" }, @@ -5132,6 +5148,7 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", + "license": "MIT", "dependencies": { "debug": "2.6.9", "encodeurl": "~2.0.0", @@ -5149,6 +5166,7 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "license": "MIT", "dependencies": { "ms": "2.0.0" } @@ -5157,6 +5175,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -5164,7 +5183,8 @@ "node_modules/finalhandler/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "license": "MIT" }, "node_modules/find": { "version": "0.1.7", @@ -5307,6 +5327,7 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -6049,67 +6070,6 @@ "node": ">= 0.8" } }, - "node_modules/http-network-proxy": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/http-network-proxy/-/http-network-proxy-1.0.11.tgz", - "integrity": "sha512-FIslCoJqiqwZIf4vGwjTNSYEr43VpXvM9S0rSjM/kAlVh/Cog+QjbV+qJFSYEhy5zL9qDyWWzE7wr+grP53XFA==", - "dependencies": { - "@types/express": "^4.17.6", - "express": "^4.17.1", - "fast-xml-parser": "^3.17.4", - "fs-extra": "^9.0.1", - "http-proxy-middleware": "^1.0.4", - "portfinder": "^1.0.26", - "rimraf": "^3.0.2", - "stream-array": "^1.1.2", - "typescript": "^3.9.5" - } - }, - "node_modules/http-network-proxy/node_modules/fs-extra": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", - "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/http-network-proxy/node_modules/jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/http-network-proxy/node_modules/typescript": { - "version": "3.9.10", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz", - "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==", - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=4.2.0" - } - }, - "node_modules/http-network-proxy/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "engines": { - "node": ">= 10.0.0" - } - }, "node_modules/http-parser-js": { "version": "0.5.8", "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz", @@ -6120,6 +6080,7 @@ "version": "1.18.1", "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", + "license": "MIT", "dependencies": { "eventemitter3": "^4.0.0", "follow-redirects": "^1.0.0", @@ -6130,24 +6091,53 @@ } }, "node_modules/http-proxy-middleware": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz", - "integrity": "sha512-13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-3.0.5.tgz", + "integrity": "sha512-GLZZm1X38BPY4lkXA01jhwxvDoOkkXqjgVyUzVxiEK4iuRu03PZoYHhHRwxnfhQMDuaxi3vVri0YgSro/1oWqg==", + "license": "MIT", "dependencies": { - "@types/http-proxy": "^1.17.5", + "@types/http-proxy": "^1.17.15", + "debug": "^4.3.6", "http-proxy": "^1.18.1", - "is-glob": "^4.0.1", - "is-plain-obj": "^3.0.0", - "micromatch": "^4.0.2" + "is-glob": "^4.0.3", + "is-plain-object": "^5.0.0", + "micromatch": "^4.0.8" }, "engines": { - "node": ">=8.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/http-proxy-middleware/node_modules/debug": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/http-proxy-middleware/node_modules/is-plain-object": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", + "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" } }, "node_modules/http-proxy/node_modules/eventemitter3": { "version": "4.0.7", "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", - "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==" + "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", + "license": "MIT" }, "node_modules/iconv-lite": { "version": "0.4.24", @@ -6272,6 +6262,7 @@ "version": "1.9.1", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", + "license": "MIT", "engines": { "node": ">= 0.10" } @@ -6456,17 +6447,6 @@ "node": ">=8" } }, - "node_modules/is-plain-obj": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz", - "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/is-plain-object": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", @@ -7262,6 +7242,7 @@ "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -7270,6 +7251,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "license": "MIT", "funding": { "url": "https://github.com/sponsors/sindresorhus" } @@ -7286,6 +7268,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -7356,21 +7339,11 @@ "version": "1.2.7", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz", "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==", + "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "dependencies": { - "minimist": "^1.2.6" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, "node_modules/mkdirp-classic": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", @@ -8407,9 +8380,10 @@ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" }, "node_modules/path-to-regexp": { - "version": "0.1.10", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", - "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==" + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", + "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", + "license": "MIT" }, "node_modules/path-type": { "version": "4.0.0", @@ -8531,16 +8505,39 @@ } }, "node_modules/portfinder": { - "version": "1.0.32", - "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.32.tgz", - "integrity": "sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg==", + "version": "1.0.36", + "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.36.tgz", + "integrity": "sha512-gMKUzCoP+feA7t45moaSx7UniU7PgGN3hA8acAB+3Qn7/js0/lJ07fYZlxt9riE9S3myyxDCyAFzSrLlta0c9g==", + "license": "MIT", "dependencies": { - "async": "^2.6.4", - "debug": "^3.2.7", - "mkdirp": "^0.5.6" + "async": "^3.2.6", + "debug": "^4.3.6" }, "engines": { - "node": ">= 0.12.0" + "node": ">= 10.12" + } + }, + "node_modules/portfinder/node_modules/async": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", + "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==", + "license": "MIT" + }, + "node_modules/portfinder/node_modules/debug": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } } }, "node_modules/postman-request": { @@ -8743,6 +8740,7 @@ "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", + "license": "MIT", "dependencies": { "forwarded": "0.2.0", "ipaddr.js": "1.9.1" @@ -8838,6 +8836,7 @@ "version": "2.5.2", "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", + "license": "MIT", "dependencies": { "bytes": "3.1.2", "http-errors": "2.0.0", @@ -9175,6 +9174,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, "dependencies": { "glob": "^7.1.3" }, @@ -9357,18 +9357,23 @@ } }, "node_modules/roku-test-automation": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/roku-test-automation/-/roku-test-automation-2.0.10.tgz", - "integrity": "sha512-Lf10gqNZNwcN9bwNYnGdH4FDB93fMDncbClsMEHlBFvz4LI7q/ziHjxAlH9N9XY4oD8r5PcpkmZ9Jlg0d6hdog==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/roku-test-automation/-/roku-test-automation-2.2.0.tgz", + "integrity": "sha512-IddXd0NZ7Kf6kx7xzs2En5KohyCmIbDnuncZnJ21ZV075pjtBXG2YfMHnhPV1s4BPvFW9XhVod/RW43n6sexgw==", + "license": "MIT", "dependencies": { "@suitest/types": "^4.6.0", + "@types/express": "^5.0.0", "ajv": "^6.12.6", + "express": "^4.21.2", "fs-extra": "^7.0.1", - "http-network-proxy": "^1.0.11", + "http-proxy-middleware": "^3.0.3", "needle": "^2.9.1", "path": "^0.12.7", + "portfinder": "^1.0.33", "postman-request": "^2.88.1-postman.40", - "roku-deploy": "^3.10.2" + "roku-deploy": "^3.10.2", + "stoppable": "^1.1.0" } }, "node_modules/run-parallel": { @@ -9596,6 +9601,7 @@ "version": "1.16.2", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", + "license": "MIT", "dependencies": { "encodeurl": "~2.0.0", "escape-html": "~1.0.3", @@ -9610,6 +9616,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -10089,6 +10096,16 @@ "node": ">= 0.8" } }, + "node_modules/stoppable": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/stoppable/-/stoppable-1.1.0.tgz", + "integrity": "sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw==", + "license": "MIT", + "engines": { + "node": ">=4", + "npm": ">=6" + } + }, "node_modules/stream": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/stream/-/stream-0.0.2.tgz", @@ -10097,41 +10114,6 @@ "emitter-component": "^1.1.1" } }, - "node_modules/stream-array": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/stream-array/-/stream-array-1.1.2.tgz", - "integrity": "sha512-1yWdVsMEm/btiMa2YyHiC3mDrtAqlmNNaDRylx2F7KHhm3C4tA6kSR2V9mpeMthv+ujvbl8Kamyh5xaHHdFvyQ==", - "dependencies": { - "readable-stream": "~2.1.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/stream-array/node_modules/process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==" - }, - "node_modules/stream-array/node_modules/readable-stream": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz", - "integrity": "sha512-NkXT2AER7VKXeXtJNSaWLpWIhmtSE3K2PguaLEeWr4JILghcIKqoLt1A3wHrnpDC5+ekf8gfk1GKWkFXe4odMw==", - "dependencies": { - "buffer-shims": "^1.0.0", - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "~1.0.0", - "process-nextick-args": "~1.0.6", - "string_decoder": "~0.10.x", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/stream-array/node_modules/string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==" - }, "node_modules/stream-combiner": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz", @@ -10673,6 +10655,7 @@ "version": "1.6.18", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "license": "MIT", "dependencies": { "media-typer": "0.3.0", "mime-types": "~2.1.24" diff --git a/package.json b/package.json index cf585c84..84c891d8 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "resolve": "^1.22.8", "roku-debug": "^0.21.31", "roku-deploy": "^3.12.4", - "roku-test-automation": "^2.0.10", + "roku-test-automation": "^2.2.0", "semver": "^7.1.3", "source-map": "^0.7.3", "strip-ansi": "^5.2.0", @@ -321,17 +321,17 @@ }, { "command": "extension.brightscript.rokuDeviceView.refreshScreenshot", - "when": "view == rokuDeviceView && !brightscript.rokuDeviceView.enableScreenshotCapture", + "when": "view == rokuDeviceView && !brightscript.rokuDeviceView.enableScreenshotCaptureAutoRefresh", "group": "navigation@1" }, { "command": "extension.brightscript.rokuDeviceView.resumeScreenshotCapture", - "when": "view == rokuDeviceView && !brightscript.rokuDeviceView.enableScreenshotCapture && !brightscript.rokuDeviceView.isInspectingNodes", + "when": "view == rokuDeviceView && !brightscript.rokuDeviceView.enableScreenshotCaptureAutoRefresh && !brightscript.rokuDeviceView.isInspectingNodes", "group": "navigation@2" }, { "command": "extension.brightscript.rokuDeviceView.pauseScreenshotCapture", - "when": "view == rokuDeviceView && brightscript.rokuDeviceView.enableScreenshotCapture && !brightscript.rokuDeviceView.isInspectingNodes", + "when": "view == rokuDeviceView && brightscript.rokuDeviceView.enableScreenshotCaptureAutoRefresh", "group": "navigation@2" }, { @@ -351,7 +351,7 @@ }, { "command": "extension.brightscript.disconnectFromDevice", - "when": "view == rokuDeviceView && brightscript.rokuDeviceView.isOnDeviceComponentAvailable", + "when": "view == rokuDeviceView && brightscript.isOnDeviceComponentAvailable", "group": "navigation@5" }, { diff --git a/src/managers/RtaManager.ts b/src/managers/RtaManager.ts index 66ccd8dc..5e7889ae 100644 --- a/src/managers/RtaManager.ts +++ b/src/managers/RtaManager.ts @@ -24,7 +24,7 @@ export class RtaManager { public device?: rta.RokuDevice; private webviewViewProviderManager?: WebviewViewProviderManager; - private lastStoreNodesResponse: Awaited>; + private lastAppUIResponse: rta.AppUIResponse | undefined; public setupRtaWithConfig(config: { host: string; password: string; logLevel?: string; disableScreenSaver?: boolean; injectRdbOnDeviceComponent?: boolean }) { const enableDebugging = ['info', 'debug', 'trace'].includes(config.logLevel); @@ -67,20 +67,7 @@ export class RtaManager { public async sendOdcRequest(requestorId: string, command: string, context: { args: any; options: any }) { const { args, options } = context; - if (command === rta.RequestType.storeNodeReferences) { - this.lastStoreNodesResponse = await rta.odc.storeNodeReferences(args, options); - - const viewIds = []; - if (requestorId === ViewProviderId.rokuDeviceView) { - viewIds.push(ViewProviderId.sceneGraphInspectorView); - } else if (requestorId === ViewProviderId.sceneGraphInspectorView) { - viewIds.push(ViewProviderId.rokuDeviceView); - } - this.webviewViewProviderManager.sendMessageToWebviews(viewIds, { - event: ViewProviderEvent.onStoredNodeReferencesUpdated - }); - return this.lastStoreNodesResponse; - } else if (command === rta.RequestType.writeFile) { + if (command === rta.RequestType.writeFile) { // We can't access files from the webview so we just store the path and access it in node instead const directoryPath = path.dirname(args.destinationPath); // We always try to make the directory. Doesn't fail if it already exists @@ -97,12 +84,30 @@ export class RtaManager { } } - public setWebviewViewProviderManager(manager: WebviewViewProviderManager) { - this.webviewViewProviderManager = manager; + public async getAppUI(requestorId: string) { + await this.sendOdcRequest(requestorId, 'assignElementIdOnAllNodes', { args: {}, options: {} }); + this.lastAppUIResponse = await rta.ecp.getAppUI(); + + const viewIds = []; + if (requestorId === ViewProviderId.rokuDeviceView) { + viewIds.push(ViewProviderId.sceneGraphInspectorView); + } else if (requestorId === ViewProviderId.sceneGraphInspectorView) { + viewIds.push(ViewProviderId.rokuDeviceView); + } + + // We want to notify the other view providers that the app UI has been updated. Not sending actual payload to avoid overhead if they aren't interested in it + this.webviewViewProviderManager.sendMessageToWebviews(viewIds, { + event: ViewProviderEvent.onStoredAppUIUpdated + }); + return this.lastAppUIResponse; + } + + public getStoredAppUI() { + return this.lastAppUIResponse; } - public getStoredNodeReferences() { - return this.lastStoreNodesResponse; + public setWebviewViewProviderManager(manager: WebviewViewProviderManager) { + this.webviewViewProviderManager = manager; } private updateDeviceAvailabilityOnWebViewProviders() { diff --git a/src/managers/WebviewViewProviderManager.ts b/src/managers/WebviewViewProviderManager.ts index 5be61cfd..b0ef97cb 100644 --- a/src/managers/WebviewViewProviderManager.ts +++ b/src/managers/WebviewViewProviderManager.ts @@ -89,6 +89,7 @@ export class WebviewViewProviderManager { // Mainly for communicating between webviews public sendMessageToWebviews(viewIds: string | string[], message) { + // console.log(`WebviewViewProviderManager: sendMessageToWebviews: ${viewIds} ${JSON.stringify(message)}`); if (typeof viewIds === 'string') { viewIds = [viewIds]; } diff --git a/src/viewProviders/BaseRdbViewProvider.ts b/src/viewProviders/BaseRdbViewProvider.ts index b668110f..2bce56e8 100644 --- a/src/viewProviders/BaseRdbViewProvider.ts +++ b/src/viewProviders/BaseRdbViewProvider.ts @@ -48,11 +48,27 @@ export abstract class BaseRdbViewProvider extends BaseWebviewViewProvider { return Promise.resolve(true); }); - this.addMessageCommandCallback(ViewProviderCommand.getStoredNodeReferences, (message) => { - const response = this.dependencies.rtaManager.getStoredNodeReferences(); + this.addMessageCommandCallback(ViewProviderCommand.getStoredAppUI, (message) => { + const response = this.dependencies.rtaManager.getStoredAppUI(); this.postOrQueueMessage(this.createResponseMessage(message, response)); return Promise.resolve(true); }); + + this.addMessageCommandCallback(ViewProviderCommand.getAppUI, async (message) => { + try { + const appUIResponse = await this.dependencies.rtaManager.getAppUI(this.id); + + this.postOrQueueMessage(this.createResponseMessage(message, { + success: true, + response: appUIResponse + })); + } catch (e) { + this.postOrQueueMessage(this.createResponseMessage(message, { + success: false + })); + } + return true; + }); } protected onViewReady() { diff --git a/src/viewProviders/BaseWebviewViewProvider.ts b/src/viewProviders/BaseWebviewViewProvider.ts index a5dd90c5..024e2dac 100644 --- a/src/viewProviders/BaseWebviewViewProvider.ts +++ b/src/viewProviders/BaseWebviewViewProvider.ts @@ -126,6 +126,12 @@ export abstract class BaseWebviewViewProvider implements vscode.WebviewViewProvi } else if (command === ViewProviderCommand.setVscodeContext) { const context = message.context; await vscodeContextManager.set(context.key, context.value); + } else if (command === ViewProviderCommand.getVscodeContext) { + const context = message.context; + const value = vscodeContextManager.get(context.key); + this.postOrQueueMessage(this.createResponseMessage(message, { + value: value + })); } else if (command === ViewProviderCommand.sendMessageToWebviews) { const context = message.context; this.webviewViewProviderManager.sendMessageToWebviews(context.viewIds, context.message); diff --git a/src/viewProviders/ViewProviderCommand.ts b/src/viewProviders/ViewProviderCommand.ts index 879bd1eb..5bcc76d7 100644 --- a/src/viewProviders/ViewProviderCommand.ts +++ b/src/viewProviders/ViewProviderCommand.ts @@ -1,11 +1,13 @@ export enum ViewProviderCommand { deleteRokuFile = 'deleteRokuFile', + getAppUI = 'getAppUI', + getStoredAppUI = 'getStoredAppUI', getScreenshot = 'getScreenshot', - getStoredNodeReferences = 'getStoredNodeReferences', getStoredRokuAppOverlays = 'getStoredRokuAppOverlays', + getVscodeContext = 'getVscodeContext', getWorkspaceState = 'getWorkspaceState', - openRokuFile = 'openRokuFile', loadRokuAppOverlaysThumbnails = 'loadRokuAppOverlaysThumbnails', + openRokuFile = 'openRokuFile', runRokuAutomationConfig = 'runRokuAutomationConfig', sendMessageToWebviews = 'sendMessageToWebviews', sendReplRequest = 'sendReplRequest', diff --git a/src/viewProviders/ViewProviderEvent.ts b/src/viewProviders/ViewProviderEvent.ts index 2ce0b809..d55d5382 100644 --- a/src/viewProviders/ViewProviderEvent.ts +++ b/src/viewProviders/ViewProviderEvent.ts @@ -1,12 +1,13 @@ export enum ViewProviderEvent { - onTreeNodeFocused = 'onTreeNodeFocused', + onNodeFocused = 'onNodeFocused', onDeviceAvailabilityChange = 'onDeviceAvailabilityChange', onVscodeCommandReceived = 'onVscodeCommandReceived', onRegistryUpdated = 'onRegistryUpdated', - onStoredNodeReferencesUpdated = 'onStoredNodeReferencesUpdated', + onStoredAppUIUpdated = 'onStoredAppUIUpdated', onRokuAutomationConfigsLoaded = 'onRokuAutomationConfigsLoaded', onRokuAutomationConfigStepChange = 'onRokuAutomationConfigStepChange', onRokuAutomationKeyPressed = 'onRokuAutomationKeyPressed', onRokuAppOverlayAdded = 'onRokuAppOverlayAdded', - onRokuAppOverlayThumbnailsLoaded = 'onRokuAppOverlayThumbnailsLoaded' + onRokuAppOverlayThumbnailsLoaded = 'onRokuAppOverlayThumbnailsLoaded', + onVscodeContextSet = 'onVscodeContextSet' } diff --git a/webviews/src/ExtensionIntermediary.ts b/webviews/src/ExtensionIntermediary.ts index 40561a2c..92475e9f 100644 --- a/webviews/src/ExtensionIntermediary.ts +++ b/webviews/src/ExtensionIntermediary.ts @@ -2,9 +2,9 @@ import type * as rta from 'roku-test-automation'; import { RequestType } from 'roku-test-automation/client/dist/types/OnDeviceComponent'; import type { VscodeCommand } from '../../src/commands/VscodeCommand'; -import type { ViewProviderEvent } from '../../src/viewProviders/ViewProviderEvent'; +import { ViewProviderEvent } from '../../src/viewProviders/ViewProviderEvent'; import { ViewProviderCommand } from '../../src/viewProviders/ViewProviderCommand'; -import type { DeleteEntireRegistrySectionsArgs, DeleteNodeReferencesArgs, DeleteRegistrySectionsArgs, FindNodesAtLocationArgs, GetFocusedNodeArgs, GetNodesInfoArgs, GetNodesWithPropertiesArgs, GetValueArgs, GetValuesArgs, HasFocusArgs, IsInFocusChainArgs, OnFieldChangeOnceArgs, ReadRegistryArgs, RequestOptions, SetValueArgs, StoreNodeReferencesArgs, WriteRegistryArgs, GetVolumeListArgs, GetDirectoryListingArgs, StatPathArgs, RenameFileArgs, DeleteFileArgs, CreateDirectoryArgs, RemoveNodeArgs, RemoveNodeChildrenArgs, FocusNodeArgs } from 'roku-test-automation'; +import type { DeleteEntireRegistrySectionsArgs, DeleteRegistrySectionsArgs, FindNodesAtLocationArgs, GetFocusedNodeArgs, GetNodesInfoArgs, GetNodesWithPropertiesArgs, GetValueArgs, GetValuesArgs, HasFocusArgs, IsInFocusChainArgs, OnFieldChangeOnceArgs, ReadRegistryArgs, RequestOptions, SetValueArgs, WriteRegistryArgs, GetVolumeListArgs, GetDirectoryListingArgs, StatPathArgs, RenameFileArgs, DeleteFileArgs, CreateDirectoryArgs, RemoveNodeArgs, RemoveNodeChildrenArgs, FocusNodeArgs, AppUIResponse, ConvertKeyPathToSceneKeyPathArgs } from 'roku-test-automation'; class ExtensionIntermediary { private inflightRequests = {}; @@ -90,11 +90,23 @@ class ExtensionIntermediary { }); } - public setVscodeContext(key: string, value: boolean | number | string) { + public setVscodeContext(key: string, value: boolean | number | string, notifyViewIds: string | string[] = []) { this.postMessage(this.createCommandMessage(ViewProviderCommand.setVscodeContext, { key: key, value: value })); + + const message = intermediary.createEventMessage(ViewProviderEvent.onVscodeContextSet, { + key: key, + value: value + }); + intermediary.sendMessageToWebviews(notifyViewIds, message); + } + + public getVscodeContext(key: string) { + return this.sendCommand(ViewProviderCommand.getVscodeContext, { + key: key + }); } public updateWorkspaceState(key: string, value: any) { @@ -111,8 +123,13 @@ class ExtensionIntermediary { }); } - public async getStoredNodeReferences() { - return this.sendCommand>(ViewProviderCommand.getStoredNodeReferences); + public async getStoredAppUI() { + return this.sendCommand(ViewProviderCommand.getStoredAppUI); + } + + public async getAppUI() { + const { response } = await this.sendCommand(ViewProviderCommand.getAppUI); + return response as AppUIResponse; } public observeEvent(eventName: string, callback: ObserverCallback) { @@ -126,6 +143,10 @@ class ExtensionIntermediary { } public sendMessageToWebviews(viewIds: string | string[], message) { + if (!viewIds || (Array.isArray(viewIds) && viewIds.length === 0)) { + return; + } + this.postMessage(this.createCommandMessage(ViewProviderCommand.sendMessageToWebviews, { viewIds: viewIds, message: message @@ -201,14 +222,6 @@ class ODCIntermediary { return this.sendOdcMessage>(RequestType.deleteEntireRegistry, args, options); } - public async storeNodeReferences(args?: StoreNodeReferencesArgs, options?: RequestOptions) { - return this.sendOdcMessage>(RequestType.storeNodeReferences, args, options); - } - - public async deleteNodeReferences(args: DeleteNodeReferencesArgs, options?: RequestOptions) { - return this.sendOdcMessage>(RequestType.deleteNodeReferences, args, options); - } - public async getNodesWithProperties(args: GetNodesWithPropertiesArgs, options?: RequestOptions) { return this.sendOdcMessage>(RequestType.getNodesWithProperties, args, options); } @@ -256,6 +269,10 @@ class ODCIntermediary { public async focusNode(args: FocusNodeArgs, options?: RequestOptions) { return this.sendOdcMessage>(RequestType.focusNode, args, options); } + + public async convertKeyPathToSceneKeyPath(args: ConvertKeyPathToSceneKeyPathArgs, options?: RequestOptions) { + return this.sendOdcMessage>(RequestType.convertKeyPathToSceneKeyPath, args, options); + } } type ObserverCallback = (message) => void; diff --git a/webviews/src/shared/types.ts b/webviews/src/shared/types.ts index 1633a358..21208e60 100644 --- a/webviews/src/shared/types.ts +++ b/webviews/src/shared/types.ts @@ -1,11 +1,11 @@ import type { odc } from '../ExtensionIntermediary'; -import type { TreeNode, BaseType } from 'roku-test-automation'; +import type { AppUIResponseChild } from 'roku-test-automation'; export type PathContentsInfo = Omit>>, 'type'> & { name: string; path: string; type?: 'file' | 'directory' | 'fileSystem'; }; -export type TreeNodeWithBase = Partial & { - base?: keyof typeof BaseType; +export type AppUIResponseChildWithAppUIKeyPath = AppUIResponseChild & { + appUIKeyPath?: string; }; diff --git a/webviews/src/utils.ts b/webviews/src/utils.ts index 92bfeebc..f17eb997 100644 --- a/webviews/src/utils.ts +++ b/webviews/src/utils.ts @@ -1,3 +1,6 @@ +import { odc } from './ExtensionIntermediary'; +import type { AppUIResponseChildWithAppUIKeyPath } from './shared/types'; + type AllowedStorageTypes = string | number | boolean | Record; class Utils { @@ -62,6 +65,27 @@ class Utils { delete this.storage[key]; this.getVscodeApi().setState(JSON.stringify(this.storage)); } + + /** + * Helps improve performance by removing the children from the AppUIResponseChild object to make the object being passed around much smaller + */ + public getShallowCloneOfAppUIResponseChild(appUIResponseChild: AppUIResponseChildWithAppUIKeyPath) { + return { ...appUIResponseChild, children: [] }; + } + + /** Provides a central spot to convert key path to be scene based to avoid extra appUI calls */ + public async convertAppUIKeyPathToSceneKeyPath(child: AppUIResponseChildWithAppUIKeyPath) { + const { keyPath } = await odc.convertKeyPathToSceneKeyPath({ + base: child.base, + keyPath: child.keyPath + }); + + // Keeping existing appUI key path to allow more fallback options if needed + child.appUIKeyPath = child.keyPath; + + child.base = 'scene'; + child.keyPath = keyPath; + } } const utils = new Utils(); diff --git a/webviews/src/views/RokuDeviceView/RokuDeviceView.svelte b/webviews/src/views/RokuDeviceView/RokuDeviceView.svelte index e54fe612..4506a763 100644 --- a/webviews/src/views/RokuDeviceView/RokuDeviceView.svelte +++ b/webviews/src/views/RokuDeviceView/RokuDeviceView.svelte @@ -1,12 +1,12 @@ @@ -280,22 +285,22 @@ {/if} - {treeNode.subtype}{#if treeNode.id.length > 0} id: {treeNode.id}{/if} + {appUIResponseChild?.subtype}{#if appUIResponseChild && appUIResponseChild.id && appUIResponseChild.id.length > 0} id: {appUIResponseChild.id}{/if}
- {#if treeNode.parentRef >= 0} + {#if appUIResponseChild.keyPath} {/if} - {#if treeNode.visible !== undefined} + {#if appUIResponseChild.visible !== undefined} {/if} - {#if treeNode.translation !== undefined} + {#if appUIResponseChild.translation !== undefined} {/if} - {#if treeNode.visible !== undefined} - - {#if treeNode.visible}{:else}{/if} + {#if appUIResponseChild.visible !== undefined} + + {#if appUIResponseChild.visible}{:else}{/if} {/if}
- {#each treeNode.children as treeNodeChild} - - {/each} + {#if hasChildren} + {#each appUIResponseChild.children as appUIResponseChildChild} + + {/each} + {/if}
diff --git a/webviews/src/views/SceneGraphInspectorView/NodeCountByTypePage.svelte b/webviews/src/views/SceneGraphInspectorView/NodeCountByTypePage.svelte index 1f5b8c97..c07857c0 100644 --- a/webviews/src/views/SceneGraphInspectorView/NodeCountByTypePage.svelte +++ b/webviews/src/views/SceneGraphInspectorView/NodeCountByTypePage.svelte @@ -1,21 +1,20 @@