chore(main): release 10.4.0 (#721)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

.eslintignore

@@ -1,9 +0,0 @@
-.git
-.github
-test/
-cache/
-src/proto/youtube.ts
-coverage/
-node_modules/
-dist/
-src/proto/generated/

.eslintrc.yml

@@ -1,92 +0,0 @@
-plugins:
-  [ '@typescript-eslint', 'eslint-plugin-tsdoc' ]
-env:
-  commonjs: true
-  es2021: true
-  node: true
-extends: [ eslint:recommended, 'plugin:@typescript-eslint/recommended' ]
-parser: '@typescript-eslint/parser'
-parserOptions:
-  ecmaVersion: latest
-  project:
-    - tsconfig.json
-overrides:
-  - 
-    files:
-      - '**/*.js'
-    rules:
-      'tsdoc/syntax': 'off'
-rules:
-  max-len:
-    - error
-    -
-      code: 200
-      ignoreComments: true
-      ignoreTrailingComments: true
-      ignoreStrings: true
-      ignoreTemplateLiterals: true
-      ignoreRegExpLiterals: true
-
-  quotes: [error, single] 
-
-  '@typescript-eslint/ban-types': 'off'
-  'tsdoc/syntax': 'warn'
-  '@typescript-eslint/no-explicit-any': 'off'
-  '@typescript-eslint/consistent-type-imports': 'error'
-  '@typescript-eslint/consistent-type-exports': 'error'
-
-  no-template-curly-in-string: error
-  no-unreachable-loop: error
-  no-unused-private-class-members: 'off'
-  no-prototype-builtins: 'off'
-  no-async-promise-executor: 'off'
-  no-case-declarations: 'off'
-  no-return-assign: 'off'
-  no-floating-decimal: error
-  no-implied-eval: error
-  arrow-spacing: error
-  no-invalid-this: error
-  no-lone-blocks: 'off'
-  no-new-func: error
-  no-new-wrappers: error
-  no-new: error
-  no-void: error
-  no-octal-escape: error
-  no-self-compare: error
-  no-sequences: error
-  no-throw-literal: error
-  no-unmodified-loop-condition: error
-  no-useless-call: error
-  no-useless-concat: error
-  no-useless-escape: error
-  no-useless-return: error
-  no-else-return: error
-  no-lonely-if: error
-  no-undef-init: error
-  no-unneeded-ternary: error
-  no-var: error
-  no-multi-spaces: error
-  no-multiple-empty-lines: ["error", { "max": 2, "maxEOF": 0 }]
-  no-tabs: error
-  no-trailing-spaces: error
- 
-  brace-style: error
-  new-parens: error
-  space-infix-ops: error
-  template-curly-spacing: error
-  wrap-regex: error
-  capitalized-comments: error
-  prefer-template: error
-
-  keyword-spacing: ["error", { "before": true } ]
-  object-curly-spacing: ["warn", "always"]
-  array-bracket-spacing: ["error", "always"]
-  arrow-parens: ["error", "always"]
-  comma-dangle: ["error", "never"]
-  comma-spacing: ["error", { "before": false, "after": true }]
-  computed-property-spacing: ["error", "never"]
-  func-call-spacing: ["error", "never"]
-  indent: ["error", 2, { "SwitchCase": 1 }]
-  key-spacing: ["error", { "beforeColon": false }]
-  semi: ["error", "always"]
-  operator-assignment: ["error", "always"]

.github/workflows/lint.yml

@@ -13,6 +13,6 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 16
+          node-version: 20
       - run: npm ci
       - run: npm run lint

.github/workflows/stale.yml

@@ -13,5 +13,6 @@ jobs:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.'
         stale-pr-message: 'This PR has been automatically marked as stale because it has not had recent activity. Remove the stale label or comment or this will be closed in 2 days'
+        any-of-issue-labels: 'needs-more-info,cannot-reproduce,question,help-wanted'
         days-before-stale: 60
         days-before-close: 4

.github/workflows/test.yml

@@ -13,6 +13,6 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 16
+          node-version: 20
       - run: npm ci
       - run: npm run test

.gitignore

@@ -56,6 +56,7 @@ pnpm-lock.yaml
 
 # Downloaded assets
 *.mp4
+*.m4a
 *.webm
 *.mkv
 
@@ -75,3 +76,5 @@ deno/
 
 # MacOS
 .DS_Store
+
+*.bin

CHANGELOG.md

@@ -1,5 +1,169 @@
 # Changelog
 
+## [10.4.0](https://github.com/LuanRT/YouTube.js/compare/v10.3.0...v10.4.0) (2024-08-27)
+
+
+### Features
+
+* **parser:** Add `VideoAttributesSectionView` node ([#732](https://github.com/LuanRT/YouTube.js/issues/732)) ([4b60b97](https://github.com/LuanRT/YouTube.js/commit/4b60b97132b0ee42b41838f3336c582a7f7f7aec))
+* **Player:** Add support for Proof of Identity tokens ([#708](https://github.com/LuanRT/YouTube.js/issues/708)) ([c9f0ddd](https://github.com/LuanRT/YouTube.js/commit/c9f0ddd573de297c0b384e422e6c1737454926e2))
+* **Utils:** Add `UMP` parser ([261f2ac](https://github.com/LuanRT/YouTube.js/commit/261f2ac12b6a9a5bd5f7a43557018de333f7bec3))
+
+
+### Bug Fixes
+
+* **examples:** Use BgUtils to generate pot [skip ci] ([d89909a](https://github.com/LuanRT/YouTube.js/commit/d89909a19a1486bee7e3275014725b4e3dc2cbe2))
+* **FormatOptions:** `client` missing some values ([fcd00b0](https://github.com/LuanRT/YouTube.js/commit/fcd00b0fb0f88a16c27da1ed89e9a2c4887e5c52))
+* **PlayerEndpoint:** Don't set `undefined` fields ([0e91a08](https://github.com/LuanRT/YouTube.js/commit/0e91a08ae2194a07defc4b1e12ff3edbe13b72df))
+* **Search:** Fix it occasionally returning only a small number of results ([#720](https://github.com/LuanRT/YouTube.js/issues/720)) ([2c0bb23](https://github.com/LuanRT/YouTube.js/commit/2c0bb237e1d0eb160dc3f879f5cab2022d9b5b04))
+* **Session:** `PoToken` not being set correctly ([#729](https://github.com/LuanRT/YouTube.js/issues/729)) ([bb6e647](https://github.com/LuanRT/YouTube.js/commit/bb6e647b8c88753669acde43d0d648aaf11caba6))
+* **Session:** Fix remote visitor data not gettting used ([#731](https://github.com/LuanRT/YouTube.js/issues/731)) ([7afc3da](https://github.com/LuanRT/YouTube.js/commit/7afc3da80ee3b5aa6edd2a899be82c1a21e03556))
+* **Session:** Visitor data not being used properly ([f1973c1](https://github.com/LuanRT/YouTube.js/commit/f1973c11d9a492898b5e72b1f2b79291b674e229))
+* **ThumbnailOverlayResumePlayback:** Update `percent_duration_watched` type ([#737](https://github.com/LuanRT/YouTube.js/issues/737)) ([f9ccba4](https://github.com/LuanRT/YouTube.js/commit/f9ccba4af5268d67d8610a1a5d623964f56d170d))
+
+## [10.3.0](https://github.com/LuanRT/YouTube.js/compare/v10.2.0...v10.3.0) (2024-08-01)
+
+
+### Features
+
+* **parser:** Add `EomSettingsDisclaimer` node ([#703](https://github.com/LuanRT/YouTube.js/issues/703)) ([a9bf225](https://github.com/LuanRT/YouTube.js/commit/a9bf225a62108e47a50316235a83a814c682d745))
+* **PlaylistManager:** Add ability to remove videos by set ID ([#715](https://github.com/LuanRT/YouTube.js/issues/715)) ([d85fbc5](https://github.com/LuanRT/YouTube.js/commit/d85fbc56cf0fd7367b182ae36e65c1701bc5e62d))
+
+
+### Bug Fixes
+
+* **HTTPClient:** Adjust more context fields for the iOS client ([#705](https://github.com/LuanRT/YouTube.js/issues/705)) ([3153375](https://github.com/LuanRT/YouTube.js/commit/3153375bcaa6c03afba9da8474e6a9d37471ed29))
+
+## [10.2.0](https://github.com/LuanRT/YouTube.js/compare/v10.1.0...v10.2.0) (2024-07-25)
+
+
+### Features
+
+* **Format:** Add `is_secondary` for detecting secondary audio tracks ([#697](https://github.com/LuanRT/YouTube.js/issues/697)) ([a352dde](https://github.com/LuanRT/YouTube.js/commit/a352ddeb9db001e99f49025048ad0942d84f1b3e))
+* **parser:** add classdata to unhandled parse errors ([#691](https://github.com/LuanRT/YouTube.js/issues/691)) ([090539b](https://github.com/LuanRT/YouTube.js/commit/090539b28f9bc3387d01e37325ba5741b33b1765))
+* **proto:** Add `comment_id` to commentSectionParams ([#693](https://github.com/LuanRT/YouTube.js/issues/693)) ([a5f6209](https://github.com/LuanRT/YouTube.js/commit/a5f62093a18705fc822abd86beaa81788b6535ce))
+
+
+### Bug Fixes
+
+* **parser:** ignore MiniGameCardView node ([#692](https://github.com/LuanRT/YouTube.js/issues/692)) ([6d0bc89](https://github.com/LuanRT/YouTube.js/commit/6d0bc89be18f27a8ce74517f5cab5020d6790328))
+* **parser:** ThumbnailView background color ([#686](https://github.com/LuanRT/YouTube.js/issues/686)) ([0f8f92a](https://github.com/LuanRT/YouTube.js/commit/0f8f92a28a5b6143e890626b22ce570730a0cf09))
+* **Player:** Bump cache version ([#702](https://github.com/LuanRT/YouTube.js/issues/702)) ([6765f4e](https://github.com/LuanRT/YouTube.js/commit/6765f4e0d791c657fc7411e9cdd2c0f9284e9982))
+* **Player:** Fix extracting the n-token decipher algorithm again ([#701](https://github.com/LuanRT/YouTube.js/issues/701)) ([3048f70](https://github.com/LuanRT/YouTube.js/commit/3048f70f60756884bd7b591d770f7b6343cfa259))
+
+## [10.1.0](https://github.com/LuanRT/YouTube.js/compare/v10.0.0...v10.1.0) (2024-07-10)
+
+
+### Features
+
+* **Session:** Add `configInfo` to InnerTube context ([5a8fd3a](https://github.com/LuanRT/YouTube.js/commit/5a8fd3ad37bce1decad28ec3727453ddd430a561))
+* **toDash:** Add option to include WebVTT or TTML captions ([#673](https://github.com/LuanRT/YouTube.js/issues/673)) ([bd9f6ac](https://github.com/LuanRT/YouTube.js/commit/bd9f6ac64ca9ba96e856aabe5fcc175fd9c294dc))
+* **toDash:** Add the "dub" role to translated captions ([#677](https://github.com/LuanRT/YouTube.js/issues/677)) ([858cdd1](https://github.com/LuanRT/YouTube.js/commit/858cdd197cb2bb1e1d7a7285966cb56043ad8961))
+
+
+### Bug Fixes
+
+* **FormatUtils:** Throw an error if download requests fails ([a19511d](https://github.com/LuanRT/YouTube.js/commit/a19511de24bb82007aab072844efe64bbb8698da))
+* **InfoPanelContent:** Update InfoPanelContent node to also support `paragraphs` ([4cbaa79](https://github.com/LuanRT/YouTube.js/commit/4cbaa7983f35a82b9907197769672ac3b300bfbe))
+* **Player:** Fix extracting the n-token decipher algorithm ([#682](https://github.com/LuanRT/YouTube.js/issues/682)) ([142a7d0](https://github.com/LuanRT/YouTube.js/commit/142a7d042885188605bdc0655d3733502d1e20fa))
+* **proto:** Update `Context` message ([62ac2f6](https://github.com/LuanRT/YouTube.js/commit/62ac2f6f32d35fec3c31b5f5d556bd4569fa49f9)), closes [#681](https://github.com/LuanRT/YouTube.js/issues/681)
+* **Session:** Round UTC offset minutes ([84f90aa](https://github.com/LuanRT/YouTube.js/commit/84f90aaf2908ecacb9dfb6ce5497c4c4d14a72c3))
+* **toDash:** Fix image representations not being spec compliant ([#672](https://github.com/LuanRT/YouTube.js/issues/672)) ([e5aab9a](https://github.com/LuanRT/YouTube.js/commit/e5aab9a9b35f0752cd5ca50bfa25936dce4718c6))
+* **YTMusic:** Add support for new header layouts ([14c3a06](https://github.com/LuanRT/YouTube.js/commit/14c3a06d402989e98a9d32c79b2dc26f74fb0219))
+
+## [10.0.0](https://github.com/LuanRT/YouTube.js/compare/v9.4.0...v10.0.0) (2024-06-09)
+
+
+### ⚠ BREAKING CHANGES
+
+* **Innertube#getPlaylists:** Return a `Feed` instance instead of items
+* **OAuth2:** Rewrite auth module ([#661](https://github.com/LuanRT/YouTube.js/issues/661))
+
+### Features
+
+* **Format:** Add `is_drc` ([#656](https://github.com/LuanRT/YouTube.js/issues/656)) ([6bb2086](https://github.com/LuanRT/YouTube.js/commit/6bb2086875d089f47c5f86ce94db9e32cb051319))
+* **Platform:** Add support for `react-native` platform ([#593](https://github.com/LuanRT/YouTube.js/issues/593)) ([2980a60](https://github.com/LuanRT/YouTube.js/commit/2980a608b67f18416d7f73f1bdbcf4b897307b26))
+* **Session:** Add `enable_session_cache` option ([#664](https://github.com/LuanRT/YouTube.js/issues/664)) ([7953296](https://github.com/LuanRT/YouTube.js/commit/795329658033652625d2d61b275ccf703573a437))
+* **toDash:** Add support for stable volume/DRC ([#662](https://github.com/LuanRT/YouTube.js/issues/662)) ([031ffb6](https://github.com/LuanRT/YouTube.js/commit/031ffb696e3b7e160779e8b55a49b0cfa9f95620))
+
+
+### Bug Fixes
+
+* **ButtonView:** Rename `type` property to `button_type` ([15f3b5f](https://github.com/LuanRT/YouTube.js/commit/15f3b5fdba17f11cddada168de268546875e48f9))
+* **Cache:** Use `TextEncoder` to encode compressed data ([384b80e](https://github.com/LuanRT/YouTube.js/commit/384b80ee41d7547a00d8dc17c50c8542629264b5))
+* **FlexibleActionsView:** Update actions array type to include `ToggleButtonView` ([040a091](https://github.com/LuanRT/YouTube.js/commit/040a09163903b914f546d5083dbfdeab7175b24c))
+* **InfoPanelContainer:** Use new attributed text prop ([5cdb9e1](https://github.com/LuanRT/YouTube.js/commit/5cdb9e1e2fa4ad5abdb3659bb35d0b3edc60123c))
+* **ItemSection:** Fix `target_id` not being set because of a typo. ([#655](https://github.com/LuanRT/YouTube.js/issues/655)) ([8106654](https://github.com/LuanRT/YouTube.js/commit/810665407e91b2890a8e555fd759d67ccd800379))
+* **MusicResponsiveHeader:** Add `Text` import ([583fd9f](https://github.com/LuanRT/YouTube.js/commit/583fd9f8d70735d071b34bd1d68faa62eeac593a))
+
+
+### Performance Improvements
+
+* **general:** Add session cache and LZW compression ([#663](https://github.com/LuanRT/YouTube.js/issues/663)) ([cf29664](https://github.com/LuanRT/YouTube.js/commit/cf29664d376ff792602400ef9a4ac301c676735c))
+
+
+### Code Refactoring
+
+* **Innertube#getPlaylists:** Return a `Feed` instance instead of items ([7660450](https://github.com/LuanRT/YouTube.js/commit/766045049d7154866e6fe32f6d965025d736d77d))
+* **OAuth2:** Rewrite auth module ([#661](https://github.com/LuanRT/YouTube.js/issues/661)) ([b6ce5f9](https://github.com/LuanRT/YouTube.js/commit/b6ce5f903fa2285cb381d73aedf02cc5e2712478))
+
+## [9.4.0](https://github.com/LuanRT/YouTube.js/compare/v9.3.0...v9.4.0) (2024-04-29)
+
+
+### Features
+
+* **Format:** Add `projection_type` and `stereo_layout` ([#643](https://github.com/LuanRT/YouTube.js/issues/643)) ([064436c](https://github.com/LuanRT/YouTube.js/commit/064436cef30e892d8f569d4f7b146557fd72b09f))
+* **Format:** Add `spatial_audio_type` ([#647](https://github.com/LuanRT/YouTube.js/issues/647)) ([0ba8c54](https://github.com/LuanRT/YouTube.js/commit/0ba8c54257b068d7e4518c982396acb42f1dd41d))
+* **Parser:** Add `MusicResponsiveHeader` node ([ea82bea](https://github.com/LuanRT/YouTube.js/commit/ea82beaa10f6c877d6dd3102e10f6ae382560e0f))
+
+## [9.3.0](https://github.com/LuanRT/YouTube.js/compare/v9.2.1...v9.3.0) (2024-04-11)
+
+
+### Features
+
+* **CommentView:** Implement comment interaction methods ([1c08bfe](https://github.com/LuanRT/YouTube.js/commit/1c08bfe113804c69fbc4e49b42442d9a63d73be6))
+
+
+### Bug Fixes
+
+* **CommentThread:** Replies not being parsed correctly ([66e34f9](https://github.com/LuanRT/YouTube.js/commit/66e34f9388429a2088d5c5835d19eebdc881c957))
+
+## [9.2.1](https://github.com/LuanRT/YouTube.js/compare/v9.2.0...v9.2.1) (2024-04-09)
+
+
+### Bug Fixes
+
+* **toDash:** Add missing transfer characteristics for h264 streams ([#631](https://github.com/LuanRT/YouTube.js/issues/631)) ([0107049](https://github.com/LuanRT/YouTube.js/commit/010704929fa4b737f68a5a1f10bf0b166cfbf905))
+
+## [9.2.0](https://github.com/LuanRT/YouTube.js/compare/v9.1.0...v9.2.0) (2024-03-31)
+
+
+### Features
+
+* add support of cloudflare workers ([#596](https://github.com/LuanRT/YouTube.js/issues/596)) ([2029aec](https://github.com/LuanRT/YouTube.js/commit/2029aec90de3c0fdb022094d7b704a2feed4133b))
+* **parser:** Support CommentView nodes ([#614](https://github.com/LuanRT/YouTube.js/issues/614)) ([900f557](https://github.com/LuanRT/YouTube.js/commit/900f5572021d348e7012909f2080e52eac06adae))
+* **parser:** Support LockupView and it's child nodes ([#609](https://github.com/LuanRT/YouTube.js/issues/609)) ([7ca2a0c](https://github.com/LuanRT/YouTube.js/commit/7ca2a0c3e43ebd4b9443e69b7432f302b09e9c7a))
+* **Text:** Support formatting and emojis in `fromAttributed` ([#615](https://github.com/LuanRT/YouTube.js/issues/615)) ([e6f1f07](https://github.com/LuanRT/YouTube.js/commit/e6f1f078a828f8ea5db1fe7aec9f677bc53694e3))
+
+
+### Bug Fixes
+
+* **Cache:** handle the value read from the db correctly according to its type ([#620](https://github.com/LuanRT/YouTube.js/issues/620)) ([3170659](https://github.com/LuanRT/YouTube.js/commit/317065988007c860bf6173b0ac3c3d685ed81d20))
+* **PlayerEndpoint:** Workaround for "The following content is not available on this app" (Android) ([#624](https://github.com/LuanRT/YouTube.js/issues/624)) ([d589365](https://github.com/LuanRT/YouTube.js/commit/d589365ea27f540ff36e33a65362c932cd28c274))
+
+## [9.1.0](https://github.com/LuanRT/YouTube.js/compare/v9.0.2...v9.1.0) (2024-02-23)
+
+
+### Features
+
+* **Format:** Support caption tracks in adaptive formats ([#598](https://github.com/LuanRT/YouTube.js/issues/598)) ([bff65f8](https://github.com/LuanRT/YouTube.js/commit/bff65f8889c32813ec05bd187f3a4386fc6127c0))
+
+
+### Bug Fixes
+
+* **Playlist:** `items` getter failing if a playlist contains Shorts ([89fa3b2](https://github.com/LuanRT/YouTube.js/commit/89fa3b27a839d98aaf8bd70dd75220ee309c2bea))
+* **Session:** Don't try to extract api version from service worker ([2068dfb](https://github.com/LuanRT/YouTube.js/commit/2068dfb73eefc0e40157421d4e5b4096c0c8429c))
+
 ## [9.0.2](https://github.com/LuanRT/YouTube.js/compare/v9.0.1...v9.0.2) (2024-01-31)
 
 

README.md

@@ -10,82 +10,55 @@
 [twitter]: https://twitter.com/thesciencephile
 [discord]: https://discord.gg/syDu7Yks54
 
-<h1 align=center>YouTube.js</h1>
-
-<p align=center>A full-featured wrapper around the InnerTube API</p>
-
 <div align="center">
+  <br/>
+  <p>
+    <a href="https://github.com/LuanRT/YouTube.js"><img src="https://luanrt.github.io/assets/img/ytjs.svg" title="youtube.js" alt="YouTube.js' Github Page" width="200" /></a>
+  </p>
+  <p align="center">A full-featured wrapper around the InnerTube API</p>
 
+  [![Discord](https://img.shields.io/badge/discord-online-brightgreen.svg)][discord]
   [![CI](https://github.com/LuanRT/YouTube.js/actions/workflows/test.yml/badge.svg)][actions]
   [![NPM Version](https://img.shields.io/npm/v/youtubei.js?color=%2335C757)][versions]
-  [![Codefactor](https://www.codefactor.io/repository/github/luanrt/youtube.js/badge)][codefactor]
   [![Downloads](https://img.shields.io/npm/dt/youtubei.js)][npm]
-  [![Discord](https://img.shields.io/badge/discord-online-brightgreen.svg)][discord]
+  [![Codefactor](https://www.codefactor.io/repository/github/luanrt/youtube.js/badge)][codefactor]
+
+  <h5>
+  Sponsored by&nbsp;&nbsp;&nbsp;&nbsp;<a href="https://serpapi.com"><img src="https://luanrt.github.io/assets/img/serpapi.svg" alt="SerpApi - API to get search engine results with ease." height=35 valign="middle"></a>
+  </h5>
   <br>
-  [![Donate](https://img.shields.io/badge/donate-30363D?style=for-the-badge&logo=GitHub-Sponsors&logoColor=#white)][collaborators]
- 
 </div>
 
-<div align="center">
-  <p>
-    <sup>Special thanks to:</sup>
-    <br>
-    <br>
-    <a href="https://serpapi.com" target="_blank">
-      <img width="80" alt="SerpApi" src="https://luanrt.github.io/assets/img/serpapi.svg" />
-      <br>
-      <sub>
-        API to get search engine results with ease.
-      </sub>
-    </a>
-  </p>
-</div>
-<br>
-<hr>
-<br>
+InnerTube is an API used by all YouTube clients. It was created to simplify the deployment of new features and experiments across the platform [^1]. This library manages all low-level communication with InnerTube, providing a simple and efficient way to interact with YouTube programmatically. Its design aims to closely emulate an actual client, including the parsing of API responses.
 
-## Table of Contents
+If you have any questions or need help, feel free to reach out to us on our [Discord server][discord] or open an issue [here](https://github.com/LuanRT/YouTube.js/issues).
+
+### Table of Contents
 <ol>
-   <li>
-      <a href="#description">Description</a>
-   </li>
-   <li>
-      <a href="#getting-started">Getting Started</a>
-      <ul>
-         <li><a href="#prerequisites">Prerequisites</a></li>
-         <li><a href="#installation">Installation</a></li>
-      </ul>
-   </li>
+   <li><a href="#prerequisites">Prerequisites</a></li>
+   <li><a href="#installation">Installation</a></li>
    <li>
       <a href="#usage">Usage</a>
       <ul>
          <li><a href="#browser-usage">Browser Usage</a></li>
          <li><a href="#caching">Caching</a></li>
          <li><a href="#api">API</a></li>
+         <li><a href="#extending-the-library">Extending the library</a></li>
       </ul>
    </li>
-   <li><a href="#extending-the-library">Extending the library</a></li>
    <li><a href="#contributing">Contributing</a></li>
    <li><a href="#contact">Contact</a></li>
    <li><a href="#disclaimer">Disclaimer</a></li>
    <li><a href="#license">License</a></li>
 </ol>
 
-## Description
-
-InnerTube is an API used by all YouTube clients. It was created to simplify the deployment of new features and experiments across the platform [^1]. This library manages all low-level communication with InnerTube, providing a simple and efficient way to interact with YouTube programmatically. Its design aims to closely emulate an actual client, including the parsing of API responses.
-
-If you have any questions or need help, feel free to reach out to us on our [Discord server][discord] or open an issue [here](https://github.com/LuanRT/YouTube.js/issues).
-
-## Getting Started
-
 ### Prerequisites
 YouTube.js runs on Node.js, Deno, and modern browsers.
 
 It requires a runtime with the following features:
 - [`fetch`](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API)
   - On Node, we use [undici](https://github.com/nodejs/undici)'s fetch implementation, which requires Node.js 16.8+. If you need to use an older version, you may provide your own fetch implementation. See [providing your own fetch implementation](#custom-fetch) for more information. 
-  - The `Response` object returned by fetch must thus be spec compliant and return a `ReadableStream` object if you want to use the `VideoInfo#download` method. (Implementations like `node-fetch` returns a non-standard `Readable` object.)
+  - The `Response` object returned by fetch must thus be spec compliant and return a `ReadableStream` object if you want to use the `VideoInfo#download` method. (Implementations like `node-fetch` return a non-standard `Readable` object.)
 - [`EventTarget`](https://developer.mozilla.org/en-US/docs/Web/API/EventTarget) and [`CustomEvent`](https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent) are required.
 
 ### Installation
@@ -114,7 +87,7 @@ import { Innertube } from 'youtubei.js';
 const youtube = await Innertube.create(/* options */);
 ```
 
-### Initialization Options
+### Options
 <details>
 <summary>Click to expand</summary>
 
@@ -124,19 +97,22 @@ const youtube = await Innertube.create(/* options */);
 | `location` | `string` | Geolocation. | `US` |
 | `account_index` | `number` | The account index to use. This is useful if you have multiple accounts logged in. **NOTE:** Only works if you are signed in with cookies. | `0` |
 | `visitor_data` | `string` | Setting this to a valid and persistent visitor data string will allow YouTube to give this session tailored content even when not logged in. A good way to get a valid one is by either grabbing it from a browser or calling InnerTube's `/visitor_id` endpoint. | `undefined` |
+| `po_token` | `string` | Proof of Origin Token. This is an attestation token generated by BotGuard/DroidGuard. It is used to confirm that the request is coming from a genuine client. Valid tokens can be generated using [BgUtils](https://github.com/LuanRT/BgUtils) or  [Invidious' tool](https://github.com/iv-org/youtube-trusted-session-generator). | `undefined` |
 | `retrieve_player` | `boolean` | Specifies whether to retrieve the JS player. Disabling this will make session creation faster. **NOTE:** Deciphering formats is not possible without the JS player. | `true` |
 | `enable_safety_mode` | `boolean` | Specifies whether to enable safety mode. This will prevent the session from loading any potentially unsafe content. | `false` |
-| `generate_session_locally` | `boolean` | Specifies whether to generate the session data locally or retrieve it from YouTube. This can be useful if you need more performance. | `false` |
+| `generate_session_locally` | `boolean` | Specifies whether to generate the session data locally or retrieve it from YouTube. This can be useful if you need more performance. **NOTE:** If you are using the cache option and a session has already been generated, this will be ignored. If you want to force a new session to be generated, you must clear the cache or disable session caching. | `false` |
+| `enable_session_cache` | `boolean` | Specifies whether to cache the session data. | `true` |
 | `device_category` | `DeviceCategory` | Platform to use for the session. | `DESKTOP` |
-| `client_type` | `ClientType` | InnerTube client type. | `WEB` |
+| `client_type` | `ClientType` | InnerTube client type. It is not recommended to change this unless you know what you are doing. | `WEB` |
 | `timezone` | `string` | The time zone. | `*` |
-| `cache` | `ICache` | Used to cache the deciphering functions from the JS player. | `undefined` |
+| `cache` | `ICache` | Used to cache algorithms, session data, and OAuth2 tokens. | `undefined` |
 | `cookie` | `string` | YouTube cookies. | `undefined` |
 | `fetch` | `FetchFunction` | Fetch function to use. | `fetch` |
 
+
 </details>
 
-## Browser Usage
+### Browser Usage
 To use YouTube.js in the browser, you must proxy requests through your own server. You can see our simple reference implementation in Deno at [`examples/browser/proxy/deno.ts`](https://github.com/LuanRT/YouTube.js/tree/main/examples/browser/proxy/deno.ts).
 
 You may provide your own fetch implementation to be used by YouTube.js, which we will use to modify and send the requests through a proxy. See [`examples/browser/web`](https://github.com/LuanRT/YouTube.js/tree/main/examples/browser/web) for a simple example using [Vite](https://vitejs.dev/).
@@ -195,7 +171,7 @@ A fully working example can be found in [`examples/browser/web`](https://github.
 
 <a name="custom-fetch"></a>
 
-## Providing your own fetch implementation
+### Providing your own fetch implementation
 You may provide your own fetch implementation to be used by YouTube.js. This can be useful in some cases to modify the requests before they are sent and transform the responses before they are returned (eg. for proxies).
 ```ts
 // provide a fetch implementation
@@ -212,7 +188,7 @@ const yt = await Innertube.create({
 
 <a name="caching"></a>
 
-## Caching
+### Caching
 Caching the transformed player instance can greatly improve the performance. Our `UniversalCache` implementation uses different caching methods depending on the environment.
 
 In Node.js, we use the `node:fs` module, `Deno.writeFile()` in Deno, and `indexedDB` in browsers.
@@ -237,7 +213,7 @@ const yt = await Innertube.create({
 });
 ```
 
-## API
+### API
 
 * `Innertube`
 
@@ -295,7 +271,7 @@ Retrieves video info.
 | Param | Type | Description |
 | --- | --- | --- |
 | target | `string` \| `NavigationEndpoint` | If `string`, the id of the video. If `NavigationEndpoint`, the endpoint of watchable elements such as `Video`, `Mix` and `Playlist`. To clarify, valid endpoints have payloads containing at least `videoId` and optionally `playlistId`, `params` and `index`. |
-| client? | `InnerTubeClient` | `WEB`, `ANDROID`, `YTMUSIC`, `YTMUSIC_ANDROID` or `TV_EMBEDDED` |
+| client? | `InnerTubeClient` | InnerTube client to use. |
 
 <details>
 <summary>Methods & Getters</summary>
@@ -362,7 +338,7 @@ Suitable for cases where you only need basic video metadata. Also, it is faster
 | Param | Type | Description |
 | --- | --- | --- |
 | video_id | `string` | The id of the video |
-| client? | `InnerTubeClient` | `WEB`, `ANDROID`, `YTMUSIC_ANDROID`, `YTMUSIC`, `TV_EMBEDDED` |
+| client? | `InnerTubeClient` | InnerTube client to use. |
 
 <a name="search"></a>
 ### `search(query, filters?)`
@@ -697,7 +673,7 @@ Utility to call navigation endpoints.
 | endpoint | `NavigationEndpoint` | The target endpoint |
 | args? | `object` | Additional payload arguments |
  
-## Extending the library
+### Extending the library
 
 YouTube.js is modular and easy to extend. Most of the methods, classes, and utilities used internally are exposed and can be used to implement your own extensions without having to modify the library's source code.
 
@@ -712,7 +688,7 @@ import { Innertube } from 'youtubei.js';
     const videoInfo = await yt.actions.execute('/player', {
       // You can add any additional payloads here, and they'll merge with the default payload sent to InnerTube.
       videoId,
-      client: 'YTMUSIC', // InnerTube client options: ANDROID, YTMUSIC, YTMUSIC_ANDROID, WEB, or TV_EMBEDDED.
+      client: 'YTMUSIC', // InnerTube client to use.
       parse: true // tells YouTube.js to parse the response (not sent to InnerTube).
     });
 
@@ -805,6 +781,6 @@ As such, any usage of trademarks to refer to such services is considered nominat
 ## License
 Distributed under the [MIT](https://choosealicense.com/licenses/mit/) License.
 
-<p align=" right">
+<p align="right">
 (<a href="#top">back to top</a>)
 </p>

dev-scripts/gen-parser-map.mjs

@@ -1,4 +1,4 @@
-import glob from "glob";
+import glob from 'glob';
 import path from 'path';
 import fs from 'fs';
 import url from 'url';

eslint.config.js

@@ -0,0 +1,111 @@
+import globals from "globals";
+import pluginJs from "@eslint/js";
+import tseslint from "typescript-eslint";
+
+export default [
+  pluginJs.configs.recommended,
+  ...tseslint.configs.recommended,
+  {
+    ignores: [
+      "**/dist/",
+      "**/test/",
+      "**/cache/",
+      "**/bundle/",
+      "**/examples/",
+      "**/src/proto/generated/",
+      "**/*.{js,mjs,cjs}",
+      "**/*.d.ts",
+      "*.ts",
+    ],
+  }, {
+    languageOptions: {
+      parserOptions: {
+        projectService: true,
+        tsconfigRootDir: import.meta.dirname,
+      },
+      globals: {
+        ...globals.node,
+        ...globals.browser,
+      }
+    },
+    rules: {
+      "max-len": ["error", {
+        code: 200,
+        ignoreComments: true,
+        ignoreTrailingComments: true,
+        ignoreStrings: true,
+        ignoreTemplateLiterals: true,
+        ignoreRegExpLiterals: true,
+      }], quotes: ["error", "single"],
+      "@typescript-eslint/ban-types": "off",
+      "@typescript-eslint/no-explicit-any": "off",
+      "@typescript-eslint/consistent-type-imports": "error",
+      "@typescript-eslint/consistent-type-exports": "error",
+      'no-sparse-arrays': 'off',
+      "no-template-curly-in-string": "error",
+      "no-unreachable-loop": "error",
+      "no-unused-private-class-members": "off",
+      "no-prototype-builtins": "off",
+      "no-async-promise-executor": "off",
+      "no-case-declarations": "off",
+      "no-return-assign": "off",
+      "no-floating-decimal": "error",
+      "no-implied-eval": "error",
+      "arrow-spacing": "error",
+      "no-invalid-this": "error",
+      "no-lone-blocks": "off",
+      "no-new-func": "off",
+      "no-new-wrappers": "error",
+      "no-new": "error",
+      "no-void": "error",
+      "no-octal-escape": "error",
+      "no-self-compare": "error",
+      "no-sequences": "error",
+      "no-throw-literal": "error",
+      "no-unmodified-loop-condition": "error",
+      "no-useless-call": "error",
+      "no-useless-concat": "error",
+      "no-useless-escape": "error",
+      "no-useless-return": "error",
+      "no-else-return": "error",
+      "no-lonely-if": "error",
+      "no-undef-init": "error",
+      "no-unneeded-ternary": "error",
+      "no-var": "error",
+      "no-multi-spaces": "error",
+      "no-multiple-empty-lines": ["error", {
+        max: 1,
+        maxEOF: 0,
+      }],
+      "no-tabs": "error",
+      "brace-style": "error",
+      "new-parens": "error",
+      "space-infix-ops": "error",
+      "template-curly-spacing": "error",
+      "wrap-regex": "error",
+      "capitalized-comments": "error",
+      "prefer-template": "error",
+      "keyword-spacing": ["error", {
+        before: true,
+      }],
+      "object-curly-spacing": ["warn", "always"],
+      "array-bracket-spacing": ["error", "always"],
+      "arrow-parens": ["error", "always"],
+      "comma-dangle": ["error", "never"],
+      "comma-spacing": ["error", {
+        before: false,
+        after: true,
+      }],
+      "computed-property-spacing": ["error", "never"],
+      "func-call-spacing": ["error", "never"],
+      indent: ["error", 2, {
+        SwitchCase: 1,
+      }],
+      "key-spacing": ["error", {
+        beforeColon: false,
+      }],
+      semi: ["error", "always"],
+      "operator-assignment": ["error", "always"],
+    },
+  }
+];

examples/auth/README.md

@@ -8,22 +8,21 @@ Just like the official Data API, YouTube.js supports using your own OAuth2 crede
 The library supports signing in using YouTube TV's client id. This is the recommended way to sign in as it doesn't require you to create your own OAuth2 credentials.
 
 ```js
-// 'auth-pending' is fired with the info needed to sign in via OAuth.
+
+// Fired when waiting for the user to authorize the sign in attempt.
 yt.session.on('auth-pending', (data) => {
-    // data.verification_url contains the URL to visit to authenticate.
-    // data.user_code contains the code to enter on the website.
+  // data.verification_url contains the authorization URL.
+  // data.user_code contains the code to enter on the website.
 });
 
-// 'auth' is fired once the authentication is complete
+// Fired when authentication is successful.
 yt.session.on('auth', ({ credentials }) => {
-  // do something with the credentials, eg; save them in a database.
+  // Do something with the credentials, eg; save them in a database.
   console.log('Sign in successful');
 });
 
-// 'update-credentials' is fired when the access token expires, if you do not save the updated credentials any subsequent request will fail 
-yt.session.on('update-credentials', ({ credentials }) => {
-  // do something with the updated credentials
-});
+// Fired when the access token expires.
+yt.session.on('update-credentials', ({ credentials }) => { /** do something with the updated credentials. */ });
   
 await yt.session.signIn(/* credentials */);
 ```
@@ -56,7 +55,7 @@ await yt.session.oauth.removeCache();
 # Cookies
 
 > **Note**
-> This is not as reliable as OAuth2 as cookies expire and can be completely revoked at any time.
+> This is not as reliable as OAuth2. Cookies can expire and are not very secure.
 
 ```js
 const yt = await Innertube.create({

examples/auth/custom-oauth2-creds/index.ts

@@ -111,9 +111,11 @@ app.get('/login', async (req, res) => {
     await innertube.session.signIn({
       access_token: tokens.access_token,
       refresh_token: tokens.refresh_token,
-      expires: new Date(tokens.expiry_date),
-      client_id: clientId,
-      client_secret: clientSecret,
+      expiry_date: new Date(tokens.expiry_date).toISOString(),
+      client: {
+        client_id: clientId,
+        client_secret: clientSecret
+      }
     });
 
     await innertube.session.oauth.cacheCredentials();

examples/auth/yttv-oauth2.js

@@ -6,17 +6,17 @@ import { Innertube, UniversalCache } from  'youtubei.js';
     cache: new UniversalCache(false)
   });
 
-  // 'auth-pending' is fired with the info needed to sign in via OAuth.
+  // Fired when waiting for the user to authorize the sign in attempt.
   yt.session.on('auth-pending', (data) => {
     console.log(`Go to ${data.verification_url} in your browser and enter code ${data.user_code} to authenticate.`);
   });
 
-  // 'auth' is fired once the authentication is complete
+  // Fired when authentication is successful.
   yt.session.on('auth', ({ credentials }) => {
     console.log('Sign in successful:', credentials);
   });
 
-  // 'update-credentials' is fired when the access token expires, if you do not save the updated credentials any subsequent request will fail 
+  // Fired when the access token expires.
   yt.session.on('update-credentials', async ({ credentials }) => {
     console.log('Credentials updated:', credentials);
     await yt.session.oauth.cacheCredentials();

examples/browser/README.md

@@ -1,61 +1,19 @@
-# Browser Usage Example
-
-YouTube.js works in the browser!
-
-## Usage
-
+# Browser Usage
 To use YouTube.js in the browser you must proxy requests through your own server. You can see our simple reference implementation in Deno in `examples/browser/proxy/deno.ts`.
 
-We'll use our own fetch implementation to proxy requests through our server. This is a simple example, but you can use any fetch implementation you want.
+## Example
+**NOTE**: Build the library before running the examples.
 
-```ts
-import { Innertube } from "youtubei.js/web.bundle.min";
+Web application:
 
-const yt = await Innertube.create({
-    fetch: async (input, init) => {
-        // url
-        const url = typeof input === 'string'
-            ? new URL(input)
-            : input instanceof URL
-            ? input
-            : new URL(input.url);
-
-        // transform the url for use with our proxy
-        url.searchParams.set('__host', url.host);
-        url.host = 'localhost:8080';
-        url.protocol = 'http';
-
-        const headers = init?.headers
-            ? new Headers(init.headers)
-            : input instanceof Request
-            ? input.headers
-            : new Headers();
-
-        // now serialize the headers
-        url.searchParams.set('__headers', JSON.stringify([...headers]));
-
-        // copy over the request
-        const request = new Request(
-            url,
-            input instanceof Request ? input : undefined,
-        );
-
-        headers.delete('user-agent');
-
-        // fetch the url
-        return fetch(request, init ? {
-            ...init,
-            headers
-        } : {
-            headers
-        });
-    },
-    cache: new UniversalCache(),
-});
+```shell
+cd examples/browser/web
+npm install
+npm run dev
 ```
 
-After that, you can use the library as normal.
-
-## Example
-
-We've got a full example in `examples/browser/web` using vite.
+Proxy:
+  
+```shell
+deno run --allow-net --allow-read examples/browser/proxy/deno.ts
+```

examples/browser/proxy/deno.ts

@@ -10,7 +10,7 @@ function copyHeader(headerName: string, to: Headers, from: Headers) {
 }
 
 const handler = async (request: Request): Promise<Response> => {
-  // if options send do CORS preflight
+  // If options send do CORS preflight
   if (request.method === 'OPTIONS') {
     const response = new Response('', {
       status: 200,
@@ -18,19 +18,19 @@ const handler = async (request: Request): Promise<Response> => {
         'Access-Control-Allow-Origin': request.headers.get('origin') || '*',
         'Access-Control-Allow-Methods': '*',
         'Access-Control-Allow-Headers':
-          'Origin, X-Requested-With, Content-Type, Accept, Authorization, x-goog-visitor-id, x-origin, x-youtube-client-version, Accept-Language, Range, Referer',
+          'Origin, X-Requested-With, Content-Type, Accept, Authorization, x-goog-visitor-id, x-goog-api-key, x-origin, x-youtube-client-version, x-youtube-client-name, x-goog-api-format-version, x-user-agent, Accept-Language, Range, Referer',
         'Access-Control-Max-Age': '86400',
-        'Access-Control-Allow-Credentials': 'true',
-      }),
+        'Access-Control-Allow-Credentials': 'true'
+      })
     });
     return response;
   }
 
-  const url = new URL(request.url, `http://localhost/`);
+  const url = new URL(request.url, 'http://localhost/');
   if (!url.searchParams.has('__host')) {
     return new Response(
       'Request is formatted incorrectly. Please include __host in the query string.',
-      { status: 400 },
+      { status: 400 }
     );
   }
 
@@ -42,33 +42,36 @@ const handler = async (request: Request): Promise<Response> => {
 
   // Copy headers from the request to the new request
   const request_headers = new Headers(
-    JSON.parse(url.searchParams.get('__headers') || '{}'),
+    JSON.parse(url.searchParams.get('__headers') || '{}')
   );
   copyHeader('range', request_headers, request.headers);
-  !request_headers.has('user-agent') && copyHeader('user-agent', request_headers, request.headers);
+
+  if (!request_headers.has('user-agent'))
+    copyHeader('user-agent', request_headers, request.headers);
+
   url.searchParams.delete('__headers');
 
   // Make the request to YouTube
   const fetchRes = await fetch(url, {
     method: request.method,
     headers: request_headers,
-    body: request.body,
+    body: request.body
   });
 
   // Construct the return headers
   const headers = new Headers();
 
-  // copy content headers
+  // Copy content headers
   copyHeader('content-length', headers, fetchRes.headers);
   copyHeader('content-type', headers, fetchRes.headers);
   copyHeader('content-disposition', headers, fetchRes.headers);
   copyHeader('accept-ranges', headers, fetchRes.headers);
   copyHeader('content-range', headers, fetchRes.headers);
 
-  // add cors headers
+  // Add cors headers
   headers.set(
     'Access-Control-Allow-Origin',
-    request.headers.get('origin') || '*',
+    request.headers.get('origin') || '*'
   );
   headers.set('Access-Control-Allow-Headers', '*');
   headers.set('Access-Control-Allow-Methods', '*');
@@ -77,8 +80,8 @@ const handler = async (request: Request): Promise<Response> => {
   // Return the proxied response
   return new Response(fetchRes.body, {
     status: fetchRes.status,
-    headers: headers,
+    headers: headers
   });
 };
 
-await serve(handler, { port });
+await serve(handler, { port });

examples/browser/web/package-lock.json

@@ -0,0 +1,298 @@
+{
+  "name": "web",
+  "version": "0.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "web",
+      "version": "0.0.0",
+      "dependencies": {
+        "bgutils-js": "^1.1.0",
+        "shaka-player": "^4.3.8"
+      },
+      "devDependencies": {
+        "typescript": "^4.6.4",
+        "vite": "^3.2.10"
+      }
+    },
+    "node_modules/bgutils-js": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/bgutils-js/-/bgutils-js-1.1.0.tgz",
+      "integrity": "sha512-+v+MWO02VAfSKuuh9gpjxBTllFGkIiqzZT7ELwScOtm2UWk6MOm7lqkVtzctcjCrG0sgRZccfEbgaEWHozXLSQ==",
+      "funding": [
+        "https://github.com/sponsors/LuanRT"
+      ]
+    },
+    "node_modules/eme-encryption-scheme-polyfill": {
+      "version": "2.1.1",
+      "license": "Apache-2.0"
+    },
+    "node_modules/esbuild": {
+      "version": "0.15.18",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/android-arm": "0.15.18",
+        "@esbuild/linux-loong64": "0.15.18",
+        "esbuild-android-64": "0.15.18",
+        "esbuild-android-arm64": "0.15.18",
+        "esbuild-darwin-64": "0.15.18",
+        "esbuild-darwin-arm64": "0.15.18",
+        "esbuild-freebsd-64": "0.15.18",
+        "esbuild-freebsd-arm64": "0.15.18",
+        "esbuild-linux-32": "0.15.18",
+        "esbuild-linux-64": "0.15.18",
+        "esbuild-linux-arm": "0.15.18",
+        "esbuild-linux-arm64": "0.15.18",
+        "esbuild-linux-mips64le": "0.15.18",
+        "esbuild-linux-ppc64le": "0.15.18",
+        "esbuild-linux-riscv64": "0.15.18",
+        "esbuild-linux-s390x": "0.15.18",
+        "esbuild-netbsd-64": "0.15.18",
+        "esbuild-openbsd-64": "0.15.18",
+        "esbuild-sunos-64": "0.15.18",
+        "esbuild-windows-32": "0.15.18",
+        "esbuild-windows-64": "0.15.18",
+        "esbuild-windows-arm64": "0.15.18"
+      }
+    },
+    "node_modules/esbuild-windows-64": {
+      "version": "0.15.18",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/hasown": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.13.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hasown": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.7",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/picocolors": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/postcss": {
+      "version": "8.4.33",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "nanoid": "^3.3.7",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.0.2"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/resolve": {
+      "version": "1.22.8",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/rollup": {
+      "version": "2.79.1",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "rollup": "dist/bin/rollup"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/shaka-player": {
+      "version": "4.7.7",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "eme-encryption-scheme-polyfill": "^2.1.1"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.0.2",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "4.9.5",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    },
+    "node_modules/vite": {
+      "version": "3.2.10",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-3.2.10.tgz",
+      "integrity": "sha512-Dx3olBo/ODNiMVk/cA5Yft9Ws+snLOXrhLtrI3F4XLt4syz2Yg8fayZMWScPKoz12v5BUv7VEmQHnsfpY80fYw==",
+      "dev": true,
+      "dependencies": {
+        "esbuild": "^0.15.9",
+        "postcss": "^8.4.18",
+        "resolve": "^1.22.1",
+        "rollup": "^2.79.1"
+      },
+      "bin": {
+        "vite": "bin/vite.js"
+      },
+      "engines": {
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      },
+      "peerDependencies": {
+        "@types/node": ">= 14",
+        "less": "*",
+        "sass": "*",
+        "stylus": "*",
+        "sugarss": "*",
+        "terser": "^5.4.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "less": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "stylus": {
+          "optional": true
+        },
+        "sugarss": {
+          "optional": true
+        },
+        "terser": {
+          "optional": true
+        }
+      }
+    }
+  }
+}

examples/browser/web/package.json

@@ -10,9 +10,10 @@
   },
   "devDependencies": {
     "typescript": "^4.6.4",
-    "vite": "^3.0.0"
+    "vite": "^3.2.10"
   },
   "dependencies": {
+    "bgutils-js": "^1.1.0",
     "shaka-player": "^4.3.8"
   }
-}
+}

examples/browser/web/src/main.ts

@@ -1,8 +1,8 @@
-import { Innertube, UniversalCache } from '../../../../bundle/browser';
+import { Innertube, Proto, UniversalCache, Utils } from '../../../../bundle/browser';
+import BG from 'bgutils-js';
 
 // @ts-ignore - Shaka's TS support is not the best.
 import shaka from 'shaka-player/dist/shaka-player.ui.js';
-
 import "shaka-player/dist/controls.css";
 
 const title = document.getElementById('title') as HTMLHeadingElement;
@@ -11,51 +11,17 @@ const metadata = document.getElementById('metadata') as HTMLDivElement;
 const loader = document.getElementById('loader') as HTMLDivElement;
 const form = document.querySelector('form') as HTMLFormElement;
 
+
 async function main() {
+  const visitorData = Proto.encodeVisitorData(Utils.generateRandomString(11), Math.floor(Date.now() / 1000));
+  const poToken = await getPo(visitorData);
+
   const yt = await Innertube.create({
+    po_token: poToken,
+    visitor_data: visitorData,
     generate_session_locally: true,
-    fetch: async (input: RequestInfo | URL, init?: RequestInit) => {
-      const url = typeof input === 'string'
-        ? new URL(input)
-        : input instanceof URL
-          ? input
-          : new URL(input.url);
-
-      // Transform the url for use with our proxy.
-      url.searchParams.set('__host', url.host);
-      url.host = 'localhost:8080';
-      url.protocol = 'http';
-
-      const headers = init?.headers
-        ? new Headers(init.headers)
-        : input instanceof Request
-          ? input.headers
-          : new Headers();
-
-      // Now serialize the headers.
-      url.searchParams.set('__headers', JSON.stringify([...headers]));
-
-      if (input instanceof Request) {
-        // @ts-ignore
-        input.duplex = 'half';
-      }
-
-      // Copy over the request.
-      const request = new Request(
-        url,
-        input instanceof Request ? input : undefined,
-      );
-
-      headers.delete('user-agent');
-
-      return fetch(request, init ? {
-        ...init,
-        headers
-      } : {
-        headers
-      });
-    },
-    cache: new UniversalCache(false),
+    fetch: fetchFn,
+    cache: new UniversalCache(true),
   });
 
   form.animate({ opacity: [0, 1] }, { duration: 300, easing: 'ease-in-out' });
@@ -141,7 +107,8 @@ async function main() {
       if (shaka.Player.isBrowserSupported()) {
         videoEl.poster = info.basic_info.thumbnail![0].url;
 
-        player = new shaka.Player(videoEl);
+        player = new shaka.Player();
+        await player.attach(videoEl);
         ui = new shaka.ui.Overlay(player, shakaContainer, videoEl);
 
         const config = {
@@ -194,6 +161,7 @@ async function main() {
               request.headers = {};
               url.searchParams.set("range", headers.Range.split("=")[1]);
               url.searchParams.set("alr", "yes");
+              delete headers.Range;
             }
           }
 
@@ -207,14 +175,12 @@ async function main() {
 
         player.getNetworkingEngine()?.registerResponseFilter(async (type: any, response: any) => {
           const dataView = new DataView(response.data);
-          
+
           if (response.data.byteLength < 4 ||
             dataView.getUint32(0) != HTTP_IN_HEX) {
-            // This doesn't start with "http", so it is not an ALR.
             return;
           }
 
-          // Interpret the response data as a URL string.
           const response_as_string = shaka.util.StringUtils.fromUTF8(response.data);
 
           let retry_parameters;
@@ -258,6 +224,80 @@ async function main() {
   });
 }
 
+async function getPo(identity: string): Promise<string | undefined> {
+  const requestKey = 'O43z0dpjhgX20SCx4KAo';
+
+  const bgConfig = {
+    fetch: fetchFn,
+    globalObj: window,
+    requestKey,
+    identity
+  };
+
+  const challenge = await BG.Challenge.create(bgConfig);
+
+  if (!challenge)
+    throw new Error('Could not get challenge');
+
+  if (challenge.script) {
+    const script = challenge.script.find((sc) => sc !== null);
+    if (script)
+      new Function(script)();
+  } else {
+    console.warn('Unable to load VM.');
+  }
+
+  const poToken = await BG.PoToken.generate({
+    program: challenge.challenge,
+    globalName: challenge.globalName,
+    bgConfig
+  });
+
+  return poToken;
+}
+
+function fetchFn(input: RequestInfo | URL, init?: RequestInit) {
+  const url = typeof input === 'string'
+    ? new URL(input)
+    : input instanceof URL
+      ? input
+      : new URL(input.url);
+
+  // Transform the url for use with our proxy.
+  url.searchParams.set('__host', url.host);
+  url.host = 'localhost:8080';
+  url.protocol = 'http';
+
+  const headers = init?.headers
+    ? new Headers(init.headers)
+    : input instanceof Request
+      ? input.headers
+      : new Headers();
+
+  // Now serialize the headers.
+  url.searchParams.set('__headers', JSON.stringify([...headers]));
+
+  if (input instanceof Request) {
+    // @ts-expect-error - x
+    input.duplex = 'half';
+  }
+
+  // Copy over the request.
+  const request = new Request(
+    url,
+    input instanceof Request ? input : undefined
+  );
+
+  headers.delete('user-agent');
+
+  return fetch(request, init ? {
+    ...init,
+    headers
+  } : {
+    headers
+  });
+}
+
 function showUI(args: { hidePlayer?: boolean } = {
   hidePlayer: true,
 }) {

examples/cloudflare-worker/package.json

@@ -0,0 +1,18 @@
+{
+  "name": "cf-worker",
+  "version": "0.0.0",
+  "private": true,
+  "scripts": {
+    "deploy": "wrangler deploy",
+    "dev": "wrangler dev",
+    "start": "wrangler dev"
+  },
+  "devDependencies": {
+    "@cloudflare/workers-types": "^4.20240208.0",
+    "typescript": "^5.0.4",
+    "wrangler": "^3.0.0"
+  },
+  "dependencies": {
+    "youtubei.js": "latest"
+  }
+}

examples/cloudflare-worker/src/index.ts

@@ -0,0 +1,19 @@
+import { Innertube } from "youtubei.js/cf-worker";
+
+export interface Env {}
+
+export default {
+  async fetch(
+    request: Request,
+    env: Env,
+    ctx: ExecutionContext
+  ): Promise<Response> {
+    // cannot initialize Innertube in global scope as it makes fetch requests
+    const yt = await Innertube.create();
+
+    const video = await yt.getInfo("jNQXAC9IVRw");
+    console.log("Video title is", video.basic_info.title);
+
+    return new Response("Hello World!");
+  },
+};

examples/cloudflare-worker/tsconfig.json

@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "target": "es2021",
+    "lib": ["es2021"],
+    "jsx": "react",
+    "module": "es2022",
+    "moduleResolution": "node",
+    "types": ["@cloudflare/workers-types/2023-07-01"],
+    "resolveJsonModule": true,
+    "allowJs": true,
+    "checkJs": false,
+    "noEmit": true,
+    "isolatedModules": true,
+    "allowSyntheticDefaultImports": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "skipLibCheck": true
+  }
+}

examples/cloudflare-worker/wrangler.toml

@@ -0,0 +1,3 @@
+name = "cf-worker-youtubei"
+main = "src/index.ts"
+compatibility_date = "2024-02-08"

examples/comments/CommentThread.md

@@ -5,8 +5,8 @@ A `CommentThread` represents a top-level comment and its replies.
 ## API
 
 * CommentThread
-  * [.comment](#comment) ⇒ `Comment`
-  * [.replies](#replies) ⇒ `Comment[]`
+  * [.comment](#comment) ⇒ `Comment | CommentView`
+  * [.replies](#replies) ⇒ `(Comment | CommentView)[]`
   * [.getReplies](#getreplies) ⇒ `function`
   * [.getContinuation](#getcontinuation) ⇒ `function`
   * [.has_continuation](#hascontinuation) ⇒ `boolean`
@@ -14,7 +14,7 @@ A `CommentThread` represents a top-level comment and its replies.
 
 <a name="comment"></a>
 ### comment
-The top-level comment. **Note:** More about `Comment` [here](./Comment.md).
+The top-level comment. **Note:** More about the `Comment` node [here](./Comment.md) (OUTDATED! `Comment` has been replaced by [`CommentView`](./CommentView.md) nodes).
 
 **Type:** [`Comment`](../../src/parser/classes/comments/Comment.ts)
 
@@ -22,7 +22,7 @@ The top-level comment. **Note:** More about `Comment` [here](./Comment.md).
 ### replies
 An array of replies to the top-level comment. (not populated until [`getReplies()`](#getreplies) is called).
 
-**Type:** [`Comment[]`](../../src/parser/classes/comments/Comment.ts)
+**Type:** [`(Comment | CommentView)[]`](../../src/parser/classes/comments/Comment.ts)
 
 <a name="getreplies"></a>
 ### getReplies()

examples/comments/CommentView.md

@@ -0,0 +1,48 @@
+## CommentView
+Contains information about a single comment. A [`CommentView`](../../src/parser/classes/comments/CommentView.ts) can be a top-level comment or a reply to a top-level comment.
+
+## API
+
+* Comment
+  * [.like](#like) ⇒ `function`
+  * [.unlike](#like) ⇒ `function`
+  * [.dislike](#dislike) ⇒ `function`
+  * [.undislike](#dislike) ⇒ `function`
+  * [.reply](#reply) ⇒ `function`
+  * [.translate](#translate) ⇒ `function`
+
+<a name="like"></a>
+### like()
+Likes the comment.
+
+**Returns:** `Promise.<ApiResponse>`
+
+<a name="unlike"></a>
+### unlike()
+Unlikes the comment.
+
+**Returns:** `Promise.<ApiResponse>`
+
+<a name="dislike"></a>
+### dislike()
+Dislikes the comment.
+
+**Returns:** `Promise.<ApiResponse>`
+
+<a name="undislike"></a>
+### undislike()
+Undislikes the comment.
+
+**Returns:** `Promise.<ApiResponse>`
+
+<a name="reply"></a>
+### reply(comment_text: string)
+Replies to the comment.
+
+**Returns:** `Promise.<ApiResponse>`
+
+<a name="translate"></a>
+### translate(target_language: string)
+Translates the comment to the given language.
+
+**Returns:** `Promise.<ApiResponse & { content?: string }>`

examples/comments/README.md

@@ -59,7 +59,4 @@ Returns whether there are more comments to be fetched.
 ### page
 Returns original InnerTube response (sanitized).
 
-**Returns:** `ParsedResponse`
-
-## Example
-See [`index.ts`]('./index.ts').
+**Returns:** `ParsedResponse`

examples/comments/index.ts

@@ -1,45 +0,0 @@
-import { Innertube, UniversalCache } from 'youtubei.js';
-
-(async () => {
-  const yt = await Innertube.create({ cache: new UniversalCache(false), generate_session_locally: true });
-
-  const comment_section = await yt.getComments('a-rqu-hjobc');
-
-  console.info(`This video has ${comment_section.header?.comments_count.toString() || 'N/A'} comments.\n`);
-
-  for (const thread of comment_section.contents) {
-    const comment = thread.comment;
-
-    if (comment) {
-      console.info(
-        `${comment.is_pinned ? '[Pinned]' : ''}`,
-        `${comment.is_member ? `${comment.sponsor_comment_badge?.tooltip}` : ''}`,
-        `${comment.author.name} • ${comment.published}\n`,
-        `${comment.content.toString()}`, '\n',
-        `Likes: ${comment.vote_count}`, '\n'
-      );
-
-      if (thread.has_replies) {
-        console.info('Replies:', '\n');
-
-        let comment_thread = await thread.getReplies();
-
-        while (true) {
-          for (const reply of comment_thread?.replies || []) {
-            console.info(
-              `> ${reply.author.name} • ${reply.published}\n`,
-              `${reply.content.toString()}`, '\n',
-              `Likes: ${reply.vote_count}`, '\n'
-            );
-          }
-
-          try {
-            comment_thread = await comment_thread.getContinuation();
-          } catch { break; };
-        }
-      }
-    }
-
-    console.log('\n');
-  }
-})();

examples/download/index.ts

@@ -14,13 +14,14 @@ import { existsSync, mkdirSync, createWriteStream } from 'fs';
   if (!album.contents)
     throw new Error('Album appears to be empty');
 
-  console.info(`Album "${album.header?.title.toString()}" by ${album.header?.author?.name}`, '\n');
+  console.info(`Album "${album.header?.title.toString()}"`, '\n');
 
   for (const song of album.contents) {
     const stream = await yt.download(song.id as string, {
       type: 'audio', // audio, video or video+audio
       quality: 'best', // best, bestefficiency, 144p, 240p, 480p, 720p and so on.
-      format: 'mp4' // media container format 
+      format: 'mp4', // media container format,
+      client: 'YTMUSIC'
     });
 
     console.info(`Downloading ${song.title} (${song.id})`);
@@ -40,5 +41,5 @@ import { existsSync, mkdirSync, createWriteStream } from 'fs';
     console.info(`${song.id} - Done!`, '\n');
   }
 
-  console.info(`Downloaded ${album.header?.song_count}!`);
+  console.info(`Done!`);
 })();

examples/livechat/README.md

@@ -109,4 +109,4 @@ Sends a message.
 **Returns:** `Promise<ObservedArray<AddChatItemAction>>`
 
 ## Example
-See [`index.ts`]('./index.ts').
+See [`index.ts`](./index.ts).

examples/livechat/index.ts

@@ -1,15 +1,14 @@
-import { Innertube, UniversalCache, YTNodes, LiveChatContinuation } from 'youtubei.js';
-import { ChatAction, LiveMetadata } from 'youtubei.js/dist/src/parser/youtube/LiveChat';
+import { Innertube, UniversalCache, YTNodes } from 'youtubei.js';
 
 (async () => {
-  const yt = await Innertube.create({ cache: new UniversalCache(false), generate_session_locally: true });
+  const yt = await Innertube.create({ cache: new UniversalCache(false) });
 
   const search = await yt.search('lofi hip hop radio - beats to relax/study to');
   const info = await yt.getInfo(search.videos[0].as(YTNodes.Video).id);
 
   const livechat = info.getLiveChat();
 
-  livechat.on('start', (initial_data: LiveChatContinuation) => {
+  livechat.on('start', (initial_data) => {
     /**
      * Initial info is what you see when you first open a a live chat — this is; initial actions (pinned messages, top donations..), account's info and so forth.
      */
@@ -32,7 +31,7 @@ import { ChatAction, LiveMetadata } from 'youtubei.js/dist/src/parser/youtube/Li
 
   livechat.on('end', () => console.info('This live stream has ended.'));
 
-  livechat.on('chat-update', (action: ChatAction) => {
+  livechat.on('chat-update', (action) => {
     /**
      * An action represents what is being added to
      * the live chat. All actions have a `type` property,
@@ -94,7 +93,7 @@ import { ChatAction, LiveMetadata } from 'youtubei.js/dist/src/parser/youtube/Li
     }
   });
 
-  livechat.on('metadata-update', (metadata: LiveMetadata) => {
+  livechat.on('metadata-update', (metadata) => {
     console.info(`
       VIEWS: ${metadata.views?.view_count.toString()}
       LIKES: ${metadata.likes?.default_text}

jest.config.js

@@ -1,17 +1,10 @@
-
-
+/** @type {import('ts-jest').JestConfigWithTsJest} */
 export default {
-  projects: [
-    {
-      displayName: 'node',
-      roots: [ '<rootDir>/test' ],
-      testTimeout: 10000,
-      transform: {
-        "^.+\\.(ts|tsx)$": "ts-jest",
-      },
-      moduleFileExtensions: ["ts", "tsx", "js"],
-      testMatch: [ '**/*.test.ts' ],
-      setupFiles: []
-    }
-  ]
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  transform: { '^.+\\.(ts|tsx)$': 'ts-jest' },
+  testTimeout: 30000,
+  moduleFileExtensions: [ 'ts', 'tsx', 'js' ],
+  testMatch: [ '**/*.test.ts' ],
+  setupFiles: []
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "youtubei.js",
-  "version": "9.0.2",
+  "version": "10.4.0",
   "description": "A wrapper around YouTube's private API. Supports YouTube, YouTube Music, YouTube Kids and YouTube Studio (WIP).",
   "type": "module",
   "types": "./dist/src/platform/lib.d.ts",
@@ -12,11 +12,17 @@
       "web": [
         "./dist/src/platform/lib.d.ts"
       ],
+      "react-native": [
+        "./dist/src/platform/lib.d.ts"
+      ],
       "web.bundle": [
         "./dist/src/platform/lib.d.ts"
       ],
       "web.bundle.min": [
         "./dist/src/platform/lib.d.ts"
+      ],
+      "cf-worker": [
+        "./dist/src/platform/lib.d.ts"
       ]
     }
   },
@@ -29,6 +35,7 @@
       "deno": "./dist/src/platform/deno.js",
       "types": "./dist/src/platform/lib.d.ts",
       "browser": "./dist/src/platform/web.js",
+      "react-native": "./dist/src/platform/react-native.js",
       "default": "./dist/src/platform/web.js"
     },
     "./agnostic": {
@@ -39,6 +46,10 @@
       "types": "./dist/src/platform/lib.d.ts",
       "default": "./dist/src/platform/web.js"
     },
+    "./react-native": {
+      "types": "./dist/src/platform/lib.d.ts",
+      "default": "./dist/src/platform/react-native.js"
+    },
     "./web.bundle": {
       "types": "./dist/src/platform/lib.d.ts",
       "default": "./bundle/browser.js"
@@ -46,6 +57,10 @@
     "./web.bundle.min": {
       "types": "./dist/src/platform/lib.d.ts",
       "default": "./bundle/browser.min.js"
+    },
+    "./cf-worker": {
+      "types": "./dist/src/platform/lib.d.ts",
+      "default": "./dist/src/platform/cf-worker.js"
     }
   },
   "author": "LuanRT <luan.lrt4@gmail.com> (https://github.com/LuanRT)",
@@ -59,23 +74,21 @@
     "akkadaska (https://github.com/akkadaska)",
     "Absidue (https://github.com/absidue)"
   ],
-  "directories": {
-    "test": "./test",
-    "examples": "./examples",
-    "dist": "./dist"
-  },
   "scripts": {
     "test": "npx jest --verbose",
     "lint": "npx eslint ./src",
     "lint:fix": "npx eslint --fix ./src",
-    "build": "npm run build:parser-map && npm run build:proto && npm run build:esm && npm run bundle:node && npm run bundle:browser && npm run bundle:browser:prod",
-    "build:parser-map": "node ./scripts/gen-parser-map.mjs",
+    "clean": "npx rimraf ./dist/src ./dist/package.json ./bundle/browser.js ./bundle/browser.js.map ./bundle/browser.min.js ./bundle/browser.min.js.map ./bundle/node.cjs ./bundle/node.cjs.map ./bundle/cf-worker.js ./bundle/cf-worker.js.map ./bundle/react-native.js ./bundle/react-native.js.map ./deno",
+    "build": "npm run clean && npm run build:parser-map && npm run build:proto && npm run build:esm && npm run bundle:node && npm run bundle:browser && npm run bundle:browser:prod && npm run bundle:cf-worker && npm run bundle:react-native",
+    "build:parser-map": "node ./dev-scripts/gen-parser-map.mjs",
     "build:proto": "npx pb-gen-ts --entry-path=\"src/proto\" --out-dir=\"src/proto/generated\" --ext-in-import=\".js\"",
     "build:esm": "npx tspc",
     "build:deno": "npx cpy ./src ./deno && npx esbuild ./src/utils/DashManifest.tsx --keep-names --format=esm --platform=neutral --target=es2020 --outfile=./deno/src/utils/DashManifest.js && npx cpy ./package.json ./deno && npx replace \".js';\" \".ts';\" ./deno -r && npx replace '.js\";' '.ts\";' ./deno -r && npx replace \"'./DashManifest.ts';\" \"'./DashManifest.js';\" ./deno -r && npx replace \"'jintr';\" \"'https://esm.sh/jintr';\" ./deno -r",
     "bundle:node": "npx esbuild ./dist/src/platform/node.js --bundle --target=node10 --keep-names --format=cjs --platform=node --outfile=./bundle/node.cjs --external:jintr --external:undici --external:linkedom --external:tslib --sourcemap --banner:js=\"/* eslint-disable */\"",
     "bundle:browser": "npx esbuild ./dist/src/platform/web.js --banner:js=\"/* eslint-disable */\" --bundle --target=chrome58 --keep-names --format=esm --sourcemap --define:global=globalThis --conditions=module --outfile=./bundle/browser.js --platform=browser",
+    "bundle:react-native": "npx esbuild ./dist/src/platform/react-native.js --bundle --target=es2020 --keep-names --format=esm --platform=neutral --sourcemap --define:global=globalThis --conditions=module --outfile=./bundle/react-native.js",
     "bundle:browser:prod": "npm run bundle:browser -- --outfile=./bundle/browser.min.js --minify",
+    "bundle:cf-worker": "npx esbuild ./dist/src/platform/cf-worker.js --banner:js=\"/* eslint-disable */\" --bundle --target=es2020 --keep-names --format=esm --sourcemap --define:global=globalThis --conditions=module --outfile=./bundle/cf-worker.js --platform=node",
     "prepare": "npm run build",
     "watch": "npx tsc --watch"
   },
@@ -85,7 +98,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "jintr": "^1.1.0",
+    "jintr": "^2.1.1",
     "tslib": "^2.5.0",
     "undici": "^5.19.1"
   },
@@ -93,23 +106,23 @@
     "typescript": "^5.0.0"
   },
   "devDependencies": {
+    "@eslint/js": "^9.9.0",
     "@types/glob": "^8.1.0",
     "@types/jest": "^28.1.7",
     "@types/node": "^17.0.45",
-    "@typescript-eslint/eslint-plugin": "^5.30.6",
-    "@typescript-eslint/parser": "^5.30.6",
     "cpy-cli": "^4.2.0",
     "esbuild": "^0.14.49",
-    "eslint": "^8.19.0",
-    "eslint-plugin-tsdoc": "^0.2.16",
+    "eslint": "^9.9.0",
     "glob": "^8.0.3",
-    "jest": "^28.1.3",
+    "globals": "^15.9.0",
+    "jest": "^29.7.0",
     "pbkit": "^0.0.59",
     "replace": "^1.2.2",
-    "ts-jest": "^28.0.8",
+    "ts-jest": "^29.1.4",
     "ts-patch": "^3.0.2",
     "ts-transformer-inline-file": "^0.2.0",
-    "typescript": "^5.0.0"
+    "typescript": "^5.0.0",
+    "typescript-eslint": "^8.2.0"
   },
   "bugs": {
     "url": "https://github.com/LuanRT/YouTube.js/issues"

src/Innertube.ts

@@ -29,7 +29,7 @@ import {
   VideoInfo
 } from './parser/youtube/index.js';
 
-import { VideoInfo as ShortsVideoInfo } from './parser/ytshorts/index.js';
+import { ShortFormVideoInfo } from './parser/ytshorts/index.js';
 
 import NavigationEndpoint from './parser/classes/NavigationEndpoint.js';
 
@@ -37,26 +37,12 @@ import * as Proto from './proto/index.js';
 import * as Constants from './utils/Constants.js';
 import { InnertubeError, generateRandomString, throwIfMissing } from './utils/Utils.js';
 
-
 import type { ApiResponse } from './core/Actions.js';
-import type { INextRequest } from './types/index.js';
+import type { InnerTubeConfig, InnerTubeClient, SearchFilters, INextRequest } from './types/index.js';
 import type { IBrowseResponse, IParsedResponse } from './parser/types/index.js';
 import type { DownloadOptions, FormatOptions } from './types/FormatUtils.js';
-import type { SessionOptions } from './core/Session.js';
 import type Format from './parser/classes/misc/Format.js';
 
-export type InnertubeConfig = SessionOptions;
-
-export type InnerTubeClient = 'WEB' | 'iOS' | 'ANDROID' | 'YTMUSIC_ANDROID' | 'YTMUSIC' | 'YTSTUDIO_ANDROID' | 'TV_EMBEDDED' | 'YTKIDS';
-
-export type SearchFilters = Partial<{
-  upload_date: 'all' | 'hour' | 'today' | 'week' | 'month' | 'year';
-  type: 'all' | 'video' | 'channel' | 'playlist' | 'movie';
-  duration: 'all' | 'short' | 'medium' | 'long';
-  sort_by: 'relevance' | 'rating' | 'upload_date' | 'view_count';
-  features: ('hd' | 'subtitles' | 'creative_commons' | '3d' | 'live' | 'purchased' | '4k' | '360' | 'location' | 'hdr' | 'vr180')[];
-}>;
-
 /**
  * Provides access to various services and modules in the YouTube API.
  */
@@ -67,17 +53,12 @@ export default class Innertube {
     this.#session = session;
   }
 
-  static async create(config: InnertubeConfig = {}): Promise<Innertube> {
+  static async create(config: InnerTubeConfig = {}): Promise<Innertube> {
     return new Innertube(await Session.create(config));
   }
 
-  /**
-   * Retrieves video info.
-   * @param target - The video id or `NavigationEndpoint`.
-   * @param client - The client to use.
-   */
   async getInfo(target: string | NavigationEndpoint, client?: InnerTubeClient): Promise<VideoInfo> {
-    throwIfMissing({ target });
+    throwIfMissing({ target: target });
 
     let next_payload: INextRequest;
 
@@ -93,7 +74,7 @@ export default class Innertube {
         video_id: target
       });
     } else {
-      throw new InnertubeError('Invalid target, expected either a video id or a valid NavigationEndpoint', target);
+      throw new InnertubeError('Invalid target. Expected a video id or NavigationEndpoint.', target);
     }
 
     if (!next_payload.videoId)
@@ -103,7 +84,8 @@ export default class Innertube {
       video_id: next_payload.videoId,
       playlist_id: next_payload?.playlistId,
       client: client,
-      sts: this.#session.player?.sts
+      sts: this.#session.player?.sts,
+      po_token: this.#session.po_token
     });
 
     const player_response = this.actions.execute(PlayerEndpoint.PATH, player_payload);
@@ -115,11 +97,6 @@ export default class Innertube {
     return new VideoInfo(response, this.actions, cpn);
   }
 
-  /**
-   * Retrieves basic video info.
-   * @param video_id - The video id.
-   * @param client - The client to use.
-   */
   async getBasicInfo(video_id: string, client?: InnerTubeClient): Promise<VideoInfo> {
     throwIfMissing({ video_id });
 
@@ -127,7 +104,8 @@ export default class Innertube {
       PlayerEndpoint.PATH, PlayerEndpoint.build({
         video_id: video_id,
         client: client,
-        sts: this.#session.player?.sts
+        sts: this.#session.player?.sts,
+        po_token: this.#session.po_token
       })
     );
 
@@ -136,37 +114,26 @@ export default class Innertube {
     return new VideoInfo([ response ], this.actions, cpn);
   }
 
-  /**
-   * Retrieves shorts info.
-   * @param short_id - The short id.
-   * @param client - The client to use.
-   */
-  async getShortsWatchItem(short_id: string, client?: InnerTubeClient): Promise<ShortsVideoInfo> {
-    throwIfMissing({ short_id });
+  async getShortsVideoInfo(video_id: string, client?: InnerTubeClient): Promise<ShortFormVideoInfo> {
+    throwIfMissing({ video_id });
 
-    const watchResponse = this.actions.execute(
-      Reel.WatchEndpoint.PATH, Reel.WatchEndpoint.build({
-        short_id: short_id,
-        client: client
+    const watch_response = this.actions.execute(
+      Reel.ReelItemWatchEndpoint.PATH, Reel.ReelItemWatchEndpoint.build({ video_id, client })
+    );
+
+    const sequence_response = this.actions.execute(
+      Reel.ReelWatchSequenceEndpoint.PATH, Reel.ReelWatchSequenceEndpoint.build({
+        sequence_params: Proto.encodeReelSequence(video_id)
       })
     );
 
-    const sequenceResponse = this.actions.execute(
-      Reel.WatchSequenceEndpoint.PATH, Reel.WatchSequenceEndpoint.build({
-        sequenceParams: Proto.encodeReelSequence(short_id)
-      })
-    );
+    const response = await Promise.all([ watch_response, sequence_response ]);
 
-    const response = await Promise.all([ watchResponse, sequenceResponse ]);
+    const cpn = generateRandomString(16);
 
-    return new ShortsVideoInfo(response, this.actions);
+    return new ShortFormVideoInfo([ response[0] ], this.actions, cpn, response[1]);
   }
 
-  /**
-   * Searches a given query.
-   * @param query - The search query.
-   * @param filters - Search filters.
-   */
   async search(query: string, filters: SearchFilters = {}): Promise<Search> {
     throwIfMissing({ query });
 
@@ -179,10 +146,6 @@ export default class Innertube {
     return new Search(this.actions, response);
   }
 
-  /**
-   * Retrieves search suggestions for a given query.
-   * @param query - The search query.
-   */
   async getSearchSuggestions(query: string): Promise<string[]> {
     throwIfMissing({ query });
 
@@ -204,11 +167,6 @@ export default class Innertube {
     return suggestions;
   }
 
-  /**
-   * Retrieves comments for a video.
-   * @param video_id - The video id.
-   * @param sort_by - Sorting options.
-   */
   async getComments(video_id: string, sort_by?: 'TOP_COMMENTS' | 'NEWEST_FIRST'): Promise<Comments> {
     throwIfMissing({ video_id });
 
@@ -223,9 +181,6 @@ export default class Innertube {
     return new Comments(this.actions, response.data);
   }
 
-  /**
-   * Retrieves YouTube's home feed (aka recommendations).
-   */
   async getHomeFeed(): Promise<HomeFeed> {
     const response = await this.actions.execute(
       BrowseEndpoint.PATH, BrowseEndpoint.build({ browse_id: 'FEwhat_to_watch' })
@@ -241,9 +196,6 @@ export default class Innertube {
     return new Guide(response.data);
   }
 
-  /**
-   * Returns the account's library.
-   */
   async getLibrary(): Promise<Library> {
     const response = await this.actions.execute(
       BrowseEndpoint.PATH, BrowseEndpoint.build({ browse_id: 'FElibrary' })
@@ -251,10 +203,6 @@ export default class Innertube {
     return new Library(this.actions, response);
   }
 
-  /**
-   * Retrieves watch history.
-   * Which can also be achieved with {@link getLibrary}.
-   */
   async getHistory(): Promise<History> {
     const response = await this.actions.execute(
       BrowseEndpoint.PATH, BrowseEndpoint.build({ browse_id: 'FEhistory' })
@@ -262,9 +210,6 @@ export default class Innertube {
     return new History(this.actions, response);
   }
 
-  /**
-   * Retrieves Trending content.
-   */
   async getTrending(): Promise<TabbedFeed<IBrowseResponse>> {
     const response = await this.actions.execute(
       BrowseEndpoint.PATH, { ...BrowseEndpoint.build({ browse_id: 'FEtrending' }), parse: true }
@@ -272,9 +217,6 @@ export default class Innertube {
     return new TabbedFeed(this.actions, response);
   }
 
-  /**
-   * Retrieves Subscriptions feed.
-   */
   async getSubscriptionsFeed(): Promise<Feed<IBrowseResponse>> {
     const response = await this.actions.execute(
       BrowseEndpoint.PATH, { ...BrowseEndpoint.build({ browse_id: 'FEsubscriptions' }), parse: true }
@@ -282,9 +224,6 @@ export default class Innertube {
     return new Feed(this.actions, response);
   }
 
-  /**
-   * Retrieves Channels feed.
-   */
   async getChannelsFeed(): Promise<Feed<IBrowseResponse>> {
     const response = await this.actions.execute(
       BrowseEndpoint.PATH, { ...BrowseEndpoint.build({ browse_id: 'FEchannels' }), parse: true }
@@ -292,10 +231,6 @@ export default class Innertube {
     return new Feed(this.actions, response);
   }
 
-  /**
-   * Retrieves contents for a given channel.
-   * @param id - Channel id
-   */
   async getChannel(id: string): Promise<Channel> {
     throwIfMissing({ id });
     const response = await this.actions.execute(
@@ -304,9 +239,6 @@ export default class Innertube {
     return new Channel(this.actions, response);
   }
 
-  /**
-   * Retrieves notifications.
-   */
   async getNotifications(): Promise<NotificationsMenu> {
     const response = await this.actions.execute(
       GetNotificationMenuEndpoint.PATH, GetNotificationMenuEndpoint.build({
@@ -316,19 +248,22 @@ export default class Innertube {
     return new NotificationsMenu(this.actions, response);
   }
 
-  /**
-   * Retrieves unseen notifications count.
-   */
   async getUnseenNotificationsCount(): Promise<number> {
     const response = await this.actions.execute(Notification.GetUnseenCountEndpoint.PATH);
-    // TODO: properly parse this
+    // FIXME: properly parse this.
     return response.data?.unseenCount || response.data?.actions?.[0].updateNotificationsUnseenCountAction?.unseenCount || 0;
   }
 
   /**
-   * Retrieves playlist contents.
-   * @param id - Playlist id
+   * Retrieves the user's playlists.
    */
+  async getPlaylists(): Promise<Feed<IBrowseResponse>> {
+    const response = await this.actions.execute(
+      BrowseEndpoint.PATH, { ...BrowseEndpoint.build({ browse_id: 'FEplaylist_aggregation' }), parse: true }
+    );
+    return new Feed(this.actions, response);
+  }
+
   async getPlaylist(id: string): Promise<Playlist> {
     throwIfMissing({ id });
 
@@ -343,10 +278,6 @@ export default class Innertube {
     return new Playlist(this.actions, response);
   }
 
-  /**
-   * Retrieves a given hashtag's page.
-   * @param hashtag - The hashtag to fetch.
-   */
   async getHashtag(hashtag: string): Promise<HashtagFeed> {
     throwIfMissing({ hashtag });
 
@@ -370,11 +301,15 @@ export default class Innertube {
    */
   async getStreamingData(video_id: string, options: FormatOptions = {}): Promise<Format> {
     const info = await this.getBasicInfo(video_id);
-    return info.chooseFormat(options);
+
+    const format = info.chooseFormat(options);
+    format.url = format.decipher(this.#session.player);
+
+    return format;
   }
 
   /**
-   * Downloads a given video. If you only need the direct download link see {@link getStreamingData}.
+   * Downloads a given video. If all you need the direct download link, see {@link getStreamingData}.
    * If you wish to retrieve the video info too, have a look at {@link getBasicInfo} or {@link getInfo}.
    * @param video_id - The video id.
    * @param options - Download options.
@@ -392,6 +327,10 @@ export default class Innertube {
     const response = await this.actions.execute(
       ResolveURLEndpoint.PATH, { ...ResolveURLEndpoint.build({ url }), parse: true }
     );
+
+    if (!response.endpoint)
+      throw new InnertubeError('Failed to resolve URL. Expected a NavigationEndpoint but got undefined', response);
+
     return response.endpoint;
   }
 

src/core/Actions.ts

@@ -29,14 +29,10 @@ export type ParsedResponse<T> =
   IParsedResponse;
 
 export default class Actions {
-  #session: Session;
+  session: Session;
 
   constructor(session: Session) {
-    this.#session = session;
-  }
-
-  get session(): Session {
-    return this.#session;
+    this.session = session;
   }
 
   /**
@@ -69,7 +65,7 @@ export default class Actions {
       s_url.searchParams.set(key, params[key]);
     }
 
-    const response = await this.#session.http.fetch(s_url);
+    const response = await this.session.http.fetch(s_url);
 
     return response;
   }
@@ -88,7 +84,7 @@ export default class Actions {
       data = { ...args };
 
       if (Reflect.has(data, 'browseId')) {
-        if (this.#needsLogin(data.browseId) && !this.#session.logged_in)
+        if (this.#needsLogin(data.browseId) && !this.session.logged_in)
           throw new InnertubeError('You must be signed in to perform this operation.');
       }
 
@@ -131,7 +127,7 @@ export default class Actions {
 
     const target_endpoint = Reflect.has(args || {}, 'override_endpoint') ? args?.override_endpoint : endpoint;
 
-    const response = await this.#session.http.fetch(target_endpoint, {
+    const response = await this.session.http.fetch(target_endpoint, {
       method: 'POST',
       body: args?.protobuf ? data : JSON.stringify((data || {})),
       headers: {
@@ -168,6 +164,7 @@ export default class Actions {
       'FEhistory',
       'FEsubscriptions',
       'FEchannels',
+      'FEplaylist_aggregation',
       'FEmusic_listening_review',
       'FEmusic_library_landing',
       'SPaccount_overview',

src/core/OAuth.ts

@@ -1,303 +0,0 @@
-import { Log, Constants } from '../utils/index.js';
-import { OAuthError, Platform } from '../utils/Utils.js';
-import type Session from './Session.js';
-
-/**
- * Represents the credentials used for authentication.
- */
-export interface Credentials {
-  /**
-   * Token used to sign in.
-   */
-  access_token: string;
-  /**
-   * Token used to get a new access token.
-   */
-  refresh_token: string;
-  /**
-   * Access token's expiration date, which is usually 24hrs-ish.
-   */
-  expires: Date;
-  /**
-   * Optional client ID.
-   */
-  client_id?: string;
-  /**
-   * Optional client secret.
-   */
-  client_secret?: string;
-}
-
-// TODO: actual type info for this.
-export type OAuthAuthPendingData = any;
-
-export type OAuthAuthEventHandler = (data: {
-  credentials: Credentials;
-  status: 'SUCCESS';
-}) => any;
-
-export type OAuthAuthPendingEventHandler = (data: OAuthAuthPendingData) => any;
-export type OAuthAuthErrorEventHandler = (err: OAuthError) => any;
-
-export type OAuthClientIdentity = {
-  client_id: string;
-  client_secret: string;
-};
-
-export default class OAuth {
-  static TAG = 'OAuth';
-
-  #identity?: Record<string, string>;
-  #session: Session;
-  #credentials?: Credentials;
-  #polling_interval = 5;
-
-  constructor(session: Session) {
-    this.#session = session;
-  }
-
-  /**
-   * Starts the auth flow in case no valid credentials are available.
-   */
-  async init(credentials?: Credentials): Promise<void> {
-    this.#credentials = credentials;
-
-    if (this.validateCredentials()) {
-      if (!this.has_access_token_expired)
-        this.#session.emit('auth', {
-          credentials: this.#credentials,
-          status: 'SUCCESS'
-        });
-    } else if (!(await this.#loadCachedCredentials())) {
-      await this.#getUserCode();
-    }
-  }
-
-  async cacheCredentials(): Promise<void> {
-    const encoder = new TextEncoder();
-    const data = encoder.encode(JSON.stringify(this.#credentials));
-    await this.#session.cache?.set('youtubei_oauth_credentials', data.buffer);
-  }
-
-  async #loadCachedCredentials(): Promise<boolean> {
-    const data = await this.#session.cache?.get('youtubei_oauth_credentials');
-    if (!data) return false;
-
-    const decoder = new TextDecoder();
-    const credentials = JSON.parse(decoder.decode(data));
-
-    this.#credentials = {
-      access_token: credentials.access_token,
-      refresh_token: credentials.refresh_token,
-      client_id: credentials.client_id,
-      client_secret: credentials.client_secret,
-      expires: new Date(credentials.expires)
-    };
-
-    this.#session.emit('auth', {
-      credentials: this.#credentials,
-      status: 'SUCCESS'
-    });
-
-    return true;
-  }
-
-  async removeCache(): Promise<void> {
-    await this.#session.cache?.remove('youtubei_oauth_credentials');
-  }
-
-  /**
-   * Asks the server for a user code and verification URL.
-   */
-  async #getUserCode(): Promise<void> {
-    this.#identity = await this.#getClientIdentity();
-
-    const data = {
-      client_id: this.#identity.client_id,
-      scope: Constants.OAUTH.SCOPE,
-      device_id: Platform.shim.uuidv4(),
-      device_model: Constants.OAUTH.MODEL_NAME
-    };
-
-    const response = await this.#session.http.fetch_function(new URL('/o/oauth2/device/code', Constants.URLS.YT_BASE), {
-      body: JSON.stringify(data),
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json'
-      }
-    });
-
-    const response_data = await response.json();
-
-    this.#session.emit('auth-pending', response_data);
-    this.#polling_interval = response_data.interval;
-    this.#startPolling(response_data.device_code);
-  }
-
-  /**
-   * Polls the authorization server until access is granted by the user.
-   */
-  #startPolling(device_code: string): void {
-    const poller = setInterval(async () => {
-      const data = {
-        ...this.#identity,
-        code: device_code,
-        grant_type: Constants.OAUTH.GRANT_TYPE
-      };
-
-      try {
-        const response = await this.#session.http.fetch_function(new URL('/o/oauth2/token', Constants.URLS.YT_BASE), {
-          body: JSON.stringify(data),
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json'
-          }
-        });
-
-        const response_data = await response.json();
-
-        if (response_data.error) {
-          switch (response_data.error) {
-            case 'access_denied':
-              this.#session.emit('auth-error', new OAuthError('Access was denied.', { status: 'ACCESS_DENIED' }));
-              break;
-            case 'expired_token':
-              this.#session.emit('auth-error', new OAuthError('The device code has expired, restarting auth flow.', { status: 'DEVICE_CODE_EXPIRED' }));
-              clearInterval(poller);
-              this.#getUserCode();
-              break;
-            default:
-              break;
-          }
-          return;
-        }
-
-        const expiration_date = new Date(new Date().getTime() + response_data.expires_in * 1000);
-
-        this.#credentials = {
-          access_token: response_data.access_token,
-          refresh_token: response_data.refresh_token,
-          client_id: this.#identity?.client_id,
-          client_secret: this.#identity?.client_secret,
-          expires: expiration_date
-        };
-
-        this.#session.emit('auth', {
-          credentials: this.#credentials,
-          status: 'SUCCESS'
-        });
-
-        clearInterval(poller);
-      } catch (err) {
-        clearInterval(poller);
-        return this.#session.emit('auth-error', new OAuthError('Could not obtain user code.', { status: 'FAILED', error: err }));
-      }
-    }, this.#polling_interval * 1000);
-  }
-
-  /**
-   * Refresh access token if the same has expired.
-   */
-  async refreshIfRequired(): Promise<void> {
-    if (this.has_access_token_expired) {
-      await this.#refreshAccessToken();
-    }
-  }
-
-  async #refreshAccessToken(): Promise<void> {
-    if (!this.#credentials) return;
-    this.#identity = await this.#getClientIdentity();
-
-    const data = {
-      ...this.#identity,
-      refresh_token: this.#credentials.refresh_token,
-      grant_type: 'refresh_token'
-    };
-
-    const response = await this.#session.http.fetch_function(new URL('/o/oauth2/token', Constants.URLS.YT_BASE), {
-      body: JSON.stringify(data),
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json'
-      }
-    });
-
-    const response_data = await response.json();
-    const expiration_date = new Date(new Date().getTime() + response_data.expires_in * 1000);
-
-    this.#credentials = {
-      access_token: response_data.access_token,
-      refresh_token: response_data.refresh_token || this.#credentials.refresh_token,
-      client_id: this.#identity.client_id,
-      client_secret: this.#identity.client_secret,
-      expires: expiration_date
-    };
-
-    this.#session.emit('update-credentials', {
-      credentials: this.#credentials,
-      status: 'SUCCESS'
-    });
-  }
-
-  async revokeCredentials(): Promise<Response | undefined> {
-    if (!this.#credentials) return;
-    await this.removeCache();
-    return this.#session.http.fetch_function(new URL(`/o/oauth2/revoke?token=${encodeURIComponent(this.#credentials.access_token)}`, Constants.URLS.YT_BASE), {
-      method: 'post'
-    });
-  }
-
-  /**
-   * Retrieves client identity from YouTube TV.
-   */
-  async #getClientIdentity(): Promise<OAuthClientIdentity> {
-    if (this.#credentials?.client_id && this.credentials?.client_secret) {
-      Log.info(OAuth.TAG, 'Using custom OAuth2 credentials.\n');
-      return {
-        client_id: this.#credentials.client_id,
-        client_secret: this.credentials.client_secret
-      };
-    }
-
-    const response = await this.#session.http.fetch_function(new URL('/tv', Constants.URLS.YT_BASE), { headers: Constants.OAUTH.HEADERS });
-
-    const response_data = await response.text();
-    const url_body = Constants.OAUTH.REGEX.AUTH_SCRIPT.exec(response_data)?.[1];
-
-    if (!url_body)
-      throw new OAuthError('Could not obtain script url.', { status: 'FAILED' });
-
-    Log.info(OAuth.TAG, `Got YouTubeTV script URL (${url_body})`);
-
-    const script = await this.#session.http.fetch(url_body, { baseURL: Constants.URLS.YT_BASE });
-
-    const client_identity = (await script.text())
-      .replace(/\n/g, '')
-      .match(Constants.OAUTH.REGEX.CLIENT_IDENTITY);
-
-    const groups = client_identity?.groups as OAuthClientIdentity | null;
-
-    if (!groups)
-      throw new OAuthError('Could not obtain client identity.', { status: 'FAILED' });
-
-    Log.info(OAuth.TAG, 'OAuth2 credentials retrieved.\n', groups);
-
-    return groups;
-  }
-
-  get credentials(): Credentials | undefined {
-    return this.#credentials;
-  }
-
-  get has_access_token_expired(): boolean {
-    const timestamp = this.#credentials ? new Date(this.#credentials.expires).getTime() : -Infinity;
-    return new Date().getTime() > timestamp;
-  }
-
-  validateCredentials(): this is this & { credentials: Credentials } {
-    return this.#credentials &&
-      Reflect.has(this.#credentials, 'access_token') &&
-      Reflect.has(this.#credentials, 'refresh_token') &&
-      Reflect.has(this.#credentials, 'expires') || false;
-  }
-}

src/core/OAuth2.ts

@@ -0,0 +1,338 @@
+import { OAuth2Error, Platform } from '../utils/Utils.js';
+import { Log, Constants } from '../utils/index.js';
+import type Session from './Session.js';
+
+const TAG = 'OAuth2';
+
+export type OAuth2ClientID = {
+  client_id: string;
+  client_secret: string;
+};
+
+export type OAuth2Tokens = {
+  access_token: string;
+  expiry_date: string;
+  expires_in?: number;
+  refresh_token: string;
+  scope?: string;
+  token_type?: string;
+  client?: OAuth2ClientID;
+};
+
+export type DeviceAndUserCode = {
+  device_code: string;
+  expires_in: number;
+  interval: number;
+  user_code: string;
+  verification_url: string;
+  error_code?: string;
+};
+
+export type OAuth2AuthEventHandler = (data: { credentials: OAuth2Tokens; }) => void;
+export type OAuth2AuthPendingEventHandler = (data: DeviceAndUserCode) => void;
+export type OAuth2AuthErrorEventHandler = (err: OAuth2Error) => void;
+
+export default class OAuth2 {
+  #session: Session;
+
+  YTTV_URL: URL;
+  AUTH_SERVER_CODE_URL: URL;
+  AUTH_SERVER_TOKEN_URL: URL;
+  AUTH_SERVER_REVOKE_TOKEN_URL: URL;
+
+  client_id: OAuth2ClientID | undefined;
+  oauth2_tokens: OAuth2Tokens | undefined;
+
+  constructor(session: Session) {
+    this.#session = session;
+    this.YTTV_URL = new URL('/tv', Constants.URLS.YT_BASE);
+    this.AUTH_SERVER_CODE_URL = new URL('/o/oauth2/device/code', Constants.URLS.YT_BASE);
+    this.AUTH_SERVER_TOKEN_URL = new URL('/o/oauth2/token', Constants.URLS.YT_BASE);
+    this.AUTH_SERVER_REVOKE_TOKEN_URL = new URL('/o/oauth2/revoke', Constants.URLS.YT_BASE);
+  }
+
+  async init(tokens?: OAuth2Tokens): Promise<void> {
+    if (tokens) {
+      this.setTokens(tokens);
+
+      if (this.shouldRefreshToken()) {
+        await this.refreshAccessToken();
+      }
+
+      this.#session.emit('auth', { credentials: this.oauth2_tokens });
+
+      return;
+    }
+
+    const loaded_from_cache = await this.#loadFromCache();
+
+    if (loaded_from_cache) {
+      Log.info(TAG, 'Loaded OAuth2 tokens from cache.', this.oauth2_tokens);
+      return;
+    }
+
+    if (!this.client_id)
+      this.client_id = await this.getClientID();
+
+    // Initialize OAuth2 flow
+    const device_and_user_code = await this.getDeviceAndUserCode();
+
+    this.#session.emit('auth-pending', device_and_user_code);
+
+    this.pollForAccessToken(device_and_user_code);
+  }
+
+  setTokens(tokens: OAuth2Tokens): void {
+    const tokensMod = tokens;
+
+    // Convert access token remaining lifetime to ISO string
+    if (tokensMod.expires_in) {
+      tokensMod.expiry_date = new Date(Date.now() + tokensMod.expires_in * 1000).toISOString();
+      delete tokensMod.expires_in; // We don't need this anymore
+    }
+
+    if (!this.validateTokens(tokensMod))
+      throw new OAuth2Error('Invalid tokens provided.');
+
+    this.oauth2_tokens = tokensMod;
+
+    if (tokensMod.client) {
+      Log.info(TAG, 'Using provided client id and secret.');
+      this.client_id = tokensMod.client;
+    }
+  }
+
+  async cacheCredentials(): Promise<void> {
+    const encoder = new TextEncoder();
+    const data = encoder.encode(JSON.stringify(this.oauth2_tokens));
+    await this.#session.cache?.set('youtubei_oauth_credentials', data.buffer);
+  }
+
+  async #loadFromCache(): Promise<boolean> {
+    const data = await this.#session.cache?.get('youtubei_oauth_credentials');
+    if (!data)
+      return false;
+
+    const decoder = new TextDecoder();
+    const credentials = JSON.parse(decoder.decode(data));
+
+    this.setTokens(credentials);
+
+    this.#session.emit('auth', { credentials });
+
+    return true;
+  }
+
+  async removeCache(): Promise<void> {
+    await this.#session.cache?.remove('youtubei_oauth_credentials');
+  }
+
+  async pollForAccessToken(device_and_user_code: DeviceAndUserCode): Promise<void> {
+    if (!this.client_id)
+      throw new OAuth2Error('Client ID is missing.');
+
+    const { device_code, interval } = device_and_user_code;
+    const { client_id, client_secret } = this.client_id;
+
+    const payload = {
+      client_id,
+      client_secret,
+      code: device_code,
+      grant_type: 'http://oauth.net/grant_type/device/1.0'
+    };
+
+    const connInterval = setInterval(async () => {
+      const response = await this.#http.fetch_function(this.AUTH_SERVER_TOKEN_URL, {
+        body: JSON.stringify(payload),
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        }
+      });
+
+      const response_data = await response.json();
+
+      if (response_data.error) {
+        switch (response_data.error) {
+          case 'access_denied':
+            this.#session.emit('auth-error', new OAuth2Error('Access was denied.', response_data));
+            clearInterval(connInterval);
+            break;
+          case 'expired_token':
+            this.#session.emit('auth-error', new OAuth2Error('The device code has expired.', response_data));
+            clearInterval(connInterval);
+            break;
+          case 'authorization_pending':
+          case 'slow_down':
+            Log.info(TAG, 'Polling for access token...');
+            break;
+          default:
+            this.#session.emit('auth-error', new OAuth2Error('Server returned an unexpected error.', response_data));
+            clearInterval(connInterval);
+            break;
+        }
+        return;
+      }
+
+      this.setTokens(response_data);
+
+      this.#session.emit('auth', { credentials: this.oauth2_tokens });
+
+      clearInterval(connInterval);
+    }, interval * 1000);
+  }
+
+  async revokeCredentials(): Promise<Response | undefined> {
+    if (!this.oauth2_tokens)
+      throw new OAuth2Error('Access token not found');
+
+    await this.removeCache();
+
+    const url = this.AUTH_SERVER_REVOKE_TOKEN_URL;
+    url.searchParams.set('token', this.oauth2_tokens.access_token);
+
+    return this.#session.http.fetch_function(url, { method: 'POST' });
+  }
+
+  async refreshAccessToken(): Promise<void> {
+    if (!this.client_id)
+      this.client_id = await this.getClientID();
+
+    if (!this.oauth2_tokens)
+      throw new OAuth2Error('No tokens available to refresh.');
+
+    const { client_id, client_secret } = this.client_id;
+    const { refresh_token } = this.oauth2_tokens;
+
+    const payload = {
+      client_id,
+      client_secret,
+      refresh_token,
+      grant_type: 'refresh_token'
+    };
+
+    const response = await this.#http.fetch_function(this.AUTH_SERVER_TOKEN_URL, {
+      body: JSON.stringify(payload),
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+
+    if (!response.ok)
+      throw new OAuth2Error(`Failed to refresh access token: ${response.status}`);
+
+    const response_data = await response.json();
+
+    if (response_data.error_code)
+      throw new OAuth2Error('Authorization server returned an error', response_data);
+
+    this.oauth2_tokens.access_token = response_data.access_token;
+    this.oauth2_tokens.expiry_date = new Date(Date.now() + response_data.expires_in * 1000).toISOString();
+
+    this.#session.emit('update-credentials', { credentials: this.oauth2_tokens });
+  }
+
+  async getDeviceAndUserCode(): Promise<DeviceAndUserCode> {
+    if (!this.client_id)
+      throw new OAuth2Error('Client ID is missing.');
+
+    const { client_id } = this.client_id;
+
+    const payload = {
+      client_id,
+      scope: 'http://gdata.youtube.com https://www.googleapis.com/auth/youtube-paid-content',
+      device_id: Platform.shim.uuidv4(),
+      device_model: 'ytlr::'
+    };
+
+    const response = await this.#http.fetch_function(this.AUTH_SERVER_CODE_URL, {
+      body: JSON.stringify(payload),
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+
+    if (!response.ok)
+      throw new OAuth2Error(`Failed to get device/user code: ${response.status}`);
+
+    const response_data = await response.json();
+
+    if (response_data.error_code)
+      throw new OAuth2Error('Authorization server returned an error', response_data);
+
+    return response_data;
+  }
+
+  async getClientID(): Promise<OAuth2ClientID> {
+    const yttv_response = await this.#http.fetch_function(this.YTTV_URL, {
+      headers: {
+        'User-Agent': 'Mozilla/5.0 (ChromiumStylePlatform) Cobalt/Version',
+        'Referer': 'https://www.youtube.com/tv',
+        'Accept-Language': 'en-US'
+      }
+    });
+
+    if (!yttv_response.ok)
+      throw new OAuth2Error(`Failed to get client ID: ${yttv_response.status}`);
+
+    const yttv_response_data = await yttv_response.text();
+
+    let script_url_body: RegExpExecArray | null;
+
+    if ((script_url_body = Constants.OAUTH.REGEX.TV_SCRIPT.exec(yttv_response_data)) !== null) {
+      Log.info(TAG, `Got YouTubeTV script URL (${script_url_body[1]})`);
+
+      const script_response = await this.#http.fetch(script_url_body[1], { baseURL: Constants.URLS.YT_BASE });
+
+      if (!script_response.ok)
+        throw new OAuth2Error(`TV script request failed with status code ${script_response.status}`);
+
+      const script_response_data = await script_response.text();
+
+      const client_identity = script_response_data
+        .match(Constants.OAUTH.REGEX.CLIENT_IDENTITY);
+
+      if (!client_identity || !client_identity.groups)
+        throw new OAuth2Error('Could not obtain client ID.');
+
+      const { client_id, client_secret } = client_identity.groups;
+
+      Log.info(TAG, `Client identity retrieved (clientId=${client_id}, clientSecret=${client_secret}).`);
+
+      return {
+        client_id,
+        client_secret
+      };
+    }
+
+    throw new OAuth2Error('Could not obtain script URL.');
+  }
+
+  shouldRefreshToken(): boolean {
+    if (!this.oauth2_tokens)
+      return false;
+    return Date.now() > new Date(this.oauth2_tokens.expiry_date).getTime();
+  }
+
+  validateTokens(tokens: OAuth2Tokens): boolean {
+    const propertiesAreValid = (
+      Boolean(tokens.access_token) &&
+      Boolean(tokens.expiry_date) &&
+      Boolean(tokens.refresh_token)
+    );
+
+    const typesAreValid = (
+      typeof tokens.access_token === 'string' &&
+      typeof tokens.expiry_date === 'string' &&
+      typeof tokens.refresh_token === 'string'
+    );
+
+    return typesAreValid && propertiesAreValid;
+  }
+
+  get #http() {
+    return this.#session.http;
+  }
+}

src/core/Player.ts

@@ -1,26 +1,27 @@
-import { Log, Constants } from '../utils/index.js';
-import { Platform, getRandomUserAgent, getStringBetweenStrings, PlayerError } from '../utils/Utils.js';
+import { Log, LZW, Constants } from '../utils/index.js';
+import { Platform, getRandomUserAgent, getStringBetweenStrings, findFunction, PlayerError } from '../utils/Utils.js';
 import type { ICache, FetchFunction } from '../types/index.js';
 
+const TAG = 'Player';
+
 /**
  * Represents YouTube's player script. This is required to decipher signatures.
  */
 export default class Player {
-  static TAG = 'Player';
+  player_id: string;
+  sts: number;
+  nsig_sc?: string;
+  sig_sc?: string;
+  po_token?: string;
 
-  #nsig_sc;
-  #sig_sc;
-  #sig_sc_timestamp;
-  #player_id;
-
-  constructor(signature_timestamp: number, sig_sc: string, nsig_sc: string, player_id: string) {
-    this.#nsig_sc = nsig_sc;
-    this.#sig_sc = sig_sc;
-    this.#sig_sc_timestamp = signature_timestamp;
-    this.#player_id = player_id;
+  constructor(player_id: string, signature_timestamp: number, sig_sc?: string, nsig_sc?: string) {
+    this.player_id = player_id;
+    this.sts = signature_timestamp;
+    this.nsig_sc = nsig_sc;
+    this.sig_sc = sig_sc;
   }
 
-  static async create(cache: ICache | undefined, fetch: FetchFunction = Platform.shim.fetch): Promise<Player> {
+  static async create(cache: ICache | undefined, fetch: FetchFunction = Platform.shim.fetch, po_token?: string): Promise<Player> {
     const url = new URL('/iframe_api', Constants.URLS.YT_BASE);
     const res = await fetch(url);
 
@@ -31,22 +32,24 @@ export default class Player {
 
     const player_id = getStringBetweenStrings(js, 'player\\/', '\\/');
 
-    Log.info(Player.TAG, `Got player id (${player_id}). Checking for cached players..`);
+    Log.info(TAG, `Got player id (${player_id}). Checking for cached players..`);
 
     if (!player_id)
       throw new PlayerError('Failed to get player id');
 
     // We have the player id, now we can check if we have a cached player.
     if (cache) {
-      Log.info(Player.TAG, 'Found a cached player.');
       const cached_player = await Player.fromCache(cache, player_id);
-      if (cached_player)
+      if (cached_player) {
+        Log.info(TAG, 'Found up-to-date player data in cache.');
+        cached_player.po_token = po_token;
         return cached_player;
+      }
     }
 
     const player_url = new URL(`/s/player/${player_id}/player_ias.vflset/en_US/base.js`, Constants.URLS.YT_BASE);
 
-    Log.info(Player.TAG, `Could not find any cached player. Will download a new player from ${player_url}.`);
+    Log.info(TAG, `Could not find any cached player. Will download a new player from ${player_url}.`);
 
     const player_res = await fetch(player_url, {
       headers: {
@@ -64,9 +67,12 @@ export default class Player {
     const sig_sc = this.extractSigSourceCode(player_js);
     const nsig_sc = this.extractNSigSourceCode(player_js);
 
-    Log.info(Player.TAG, `Got signature timestamp (${sig_timestamp}) and algorithms needed to decipher signatures.`);
+    Log.info(TAG, `Got signature timestamp (${sig_timestamp}) and algorithms needed to decipher signatures.`);
 
-    return await Player.fromSource(cache, sig_timestamp, sig_sc, nsig_sc, player_id);
+    const player = await Player.fromSource(player_id, sig_timestamp, cache, sig_sc, nsig_sc);
+    player.po_token = po_token;
+
+    return player;
   }
 
   decipher(url?: string, signature_cipher?: string, cipher?: string, this_response_nsig_cache?: Map<string, string>): string {
@@ -78,42 +84,44 @@ export default class Player {
     const args = new URLSearchParams(url);
     const url_components = new URL(args.get('url') || url);
 
-    if (signature_cipher || cipher) {
-      const signature = Platform.shim.eval(this.#sig_sc, {
+    if (this.sig_sc && (signature_cipher || cipher)) {
+      const signature = Platform.shim.eval(this.sig_sc, {
         sig: args.get('s')
       });
 
-      Log.info(Player.TAG, `Transformed signature ${args.get('s')} to ${signature}.`);
+      Log.info(TAG, `Transformed signature from ${args.get('s')} to ${signature}.`);
 
       if (typeof signature !== 'string')
         throw new PlayerError('Failed to decipher signature');
 
       const sp = args.get('sp');
 
-      sp ?
-        url_components.searchParams.set(sp, signature) :
+      if (sp) {
+        url_components.searchParams.set(sp, signature);
+      } else {
         url_components.searchParams.set('signature', signature);
+      }
     }
 
     const n = url_components.searchParams.get('n');
 
-    if (n) {
+    if (this.nsig_sc && n) {
       let nsig;
 
       if (this_response_nsig_cache && this_response_nsig_cache.has(n)) {
         nsig = this_response_nsig_cache.get(n) as string;
       } else {
-        nsig = Platform.shim.eval(this.#nsig_sc, {
+        nsig = Platform.shim.eval(this.nsig_sc, {
           nsig: n
         });
 
-        Log.info(Player.TAG, `Transformed nsig ${n} to ${nsig}.`);
+        Log.info(TAG, `Transformed n signature from ${n} to ${nsig}.`);
 
         if (typeof nsig !== 'string')
           throw new PlayerError('Failed to decipher nsig');
 
         if (nsig.startsWith('enhanced_except_')) {
-          Log.warn(Player.TAG, 'Could not transform nsig, download may be throttled.\nChanging the InnerTube client to "ANDROID" might help!');
+          Log.warn(TAG, 'Could not transform nsig, download may be throttled.');
         } else if (this_response_nsig_cache) {
           this_response_nsig_cache.set(n, nsig);
         }
@@ -122,6 +130,10 @@ export default class Player {
       url_components.searchParams.set('n', nsig);
     }
 
+    // @NOTE: SABR requests should include the PoToken (not base64d, but as bytes!) in the payload.
+    if (url_components.searchParams.get('sabr') !== '1' && this.po_token)
+      url_components.searchParams.set('pot', this.po_token);
+
     const client = url_components.searchParams.get('c');
 
     switch (client) {
@@ -147,7 +159,7 @@ export default class Player {
 
     const result = url_components.toString();
 
-    Log.info(Player.TAG, `Full deciphered URL: ${result}`);
+    Log.info(TAG, `Deciphered URL: ${result}`);
 
     return url_components.toString();
   }
@@ -170,39 +182,38 @@ export default class Player {
     const sig_buf = buffer.slice(12, 12 + sig_len);
     const nsig_buf = buffer.slice(12 + sig_len);
 
-    const decoder = new TextDecoder();
+    const sig_sc = LZW.decompress(new TextDecoder().decode(sig_buf));
+    const nsig_sc = LZW.decompress(new TextDecoder().decode(nsig_buf));
 
-    const sig_sc = decoder.decode(sig_buf);
-    const nsig_sc = decoder.decode(nsig_buf);
-
-    return new Player(sig_timestamp, sig_sc, nsig_sc, player_id);
+    return new Player(player_id, sig_timestamp, sig_sc, nsig_sc);
   }
 
-  static async fromSource(cache: ICache | undefined, sig_timestamp: number, sig_sc: string, nsig_sc: string, player_id: string): Promise<Player> {
-    const player = new Player(sig_timestamp, sig_sc, nsig_sc, player_id);
+  static async fromSource(player_id: string, sig_timestamp: number, cache?: ICache, sig_sc?: string, nsig_sc?: string): Promise<Player> {
+    const player = new Player(player_id, sig_timestamp, sig_sc, nsig_sc);
     await player.cache(cache);
     return player;
   }
 
   async cache(cache?: ICache): Promise<void> {
-    if (!cache) return;
+    if (!cache || !this.sig_sc || !this.nsig_sc)
+      return;
 
     const encoder = new TextEncoder();
 
-    const sig_buf = encoder.encode(this.#sig_sc);
-    const nsig_buf = encoder.encode(this.#nsig_sc);
+    const sig_buf = encoder.encode(LZW.compress(this.sig_sc));
+    const nsig_buf = encoder.encode(LZW.compress(this.nsig_sc));
 
     const buffer = new ArrayBuffer(12 + sig_buf.byteLength + nsig_buf.byteLength);
     const view = new DataView(buffer);
 
     view.setUint32(0, Player.LIBRARY_VERSION, true);
-    view.setUint32(4, this.#sig_sc_timestamp, true);
+    view.setUint32(4, this.sts, true);
     view.setUint32(8, sig_buf.byteLength, true);
 
     new Uint8Array(buffer).set(sig_buf, 12);
     new Uint8Array(buffer).set(nsig_buf, 12 + sig_buf.byteLength);
 
-    await cache.set(this.#player_id, new Uint8Array(buffer));
+    await cache.set(this.player_id, new Uint8Array(buffer));
   }
 
   static extractSigTimestamp(data: string): number {
@@ -215,37 +226,23 @@ export default class Player {
     const functions = getStringBetweenStrings(data, `var ${obj_name}={`, '};');
 
     if (!functions || !calls)
-      Log.warn(Player.TAG, 'Failed to extract signature decipher algorithm.');
+      Log.warn(TAG, 'Failed to extract signature decipher algorithm.');
 
     return `function descramble_sig(a) { a = a.split(""); let ${obj_name}={${functions}}${calls} return a.join("") } descramble_sig(sig);`;
   }
 
-  static extractNSigSourceCode(data: string): string {
-    const sc = `function descramble_nsig(a) { let b=a.split("")${getStringBetweenStrings(data, 'b=a.split("")', '}return b.join("")}')}} return b.join(""); } descramble_nsig(nsig)`;
-
-    if (!sc)
-      Log.warn(Player.TAG, 'Failed to extract n-token decipher algorithm');
-
-    return sc;
+  static extractNSigSourceCode(data: string): string | undefined {
+    const nsig_function = findFunction(data, { includes: 'enhanced_except' });
+    if (nsig_function) {
+      return `${nsig_function.result} ${nsig_function.name}(nsig);`;
+    }
   }
 
   get url(): string {
-    return new URL(`/s/player/${this.#player_id}/player_ias.vflset/en_US/base.js`, Constants.URLS.YT_BASE).toString();
-  }
-
-  get sts(): number {
-    return this.#sig_sc_timestamp;
-  }
-
-  get nsig_sc(): string {
-    return this.#nsig_sc;
-  }
-
-  get sig_sc(): string {
-    return this.#sig_sc;
+    return new URL(`/s/player/${this.player_id}/player_ias.vflset/en_US/base.js`, Constants.URLS.YT_BASE).toString();
   }
 
   static get LIBRARY_VERSION(): number {
-    return 2;
+    return 11;
   }
-}
+}

src/core/Session.ts

@@ -1,5 +1,5 @@
-import OAuth from './OAuth.js';
-import { Log, EventEmitter, HTTPClient } from '../utils/index.js';
+import OAuth2 from './OAuth2.js';
+import { Log, EventEmitter, HTTPClient, LZW } from '../utils/index.js';
 import * as Constants from '../utils/Constants.js';
 import * as Proto from '../proto/index.js';
 import Actions from './Actions.js';
@@ -12,10 +12,7 @@ import {
 
 import type { DeviceCategory } from '../utils/Utils.js';
 import type { FetchFunction, ICache } from '../types/index.js';
-import type {
-  Credentials, OAuthAuthErrorEventHandler,
-  OAuthAuthEventHandler, OAuthAuthPendingEventHandler
-} from './OAuth.js';
+import type { OAuth2Tokens, OAuth2AuthErrorEventHandler, OAuth2AuthPendingEventHandler, OAuth2AuthEventHandler } from './OAuth2.js';
 
 export enum ClientType {
   WEB = 'WEB',
@@ -28,33 +25,43 @@ export enum ClientType {
   TV_EMBEDDED = 'TVHTML5_SIMPLY_EMBEDDED_PLAYER'
 }
 
-export interface Context {
+export type Context = {
   client: {
     hl: string;
     gl: string;
     remoteHost?: string;
-    screenDensityFloat: number;
-    screenHeightPoints: number;
-    screenPixelDensity: number;
-    screenWidthPoints: number;
-    visitorData: string;
+    screenDensityFloat?: number;
+    screenHeightPoints?: number;
+    screenPixelDensity?: number;
+    screenWidthPoints?: number;
+    visitorData?: string;
     clientName: string;
     clientVersion: string;
     clientScreen?: string,
-    androidSdkVersion?: string;
+    androidSdkVersion?: number;
     osName: string;
     osVersion: string;
     platform: string;
     clientFormFactor: string;
-    userInterfaceTheme: string;
+    userInterfaceTheme?: string;
     timeZone: string;
     userAgent?: string;
     browserName?: string;
     browserVersion?: string;
-    originalUrl: string;
+    originalUrl?: string;
     deviceMake: string;
     deviceModel: string;
     utcOffsetMinutes: number;
+    mainAppWebInfo?: {
+      graftUrl: string;
+      pwaInstallabilityStatus: string;
+      webDisplayMode: string;
+      isWebNativeShareAvailable: boolean;
+    };
+    memoryTotalKbytes?: string;
+    configInfo?: {
+      appInstallData: string;
+    },
     kidsAppInfo?: {
       categorySettings: {
         enabledCategories: string[];
@@ -73,9 +80,33 @@ export interface Context {
   thirdParty?: {
     embedUrl: string;
   };
+  request?: {
+    useSsl: boolean;
+    internalExperimentFlags: any[];
+  };
 }
 
-export interface SessionOptions {
+type ContextData = {
+  hl: string;
+  gl: string;
+  remote_host?: string;
+  visitor_data: string;
+  client_name: string;
+  client_version: string;
+  os_name: string;
+  os_version: string;
+  device_category: string;
+  time_zone: string;
+  enable_safety_mode: boolean;
+  browser_name?: string;
+  browser_version?: string;
+  app_install_data?: string;
+  device_make: string;
+  device_model: string;
+  on_behalf_of_user?: string;
+}
+
+export type SessionOptions = {
   /**
    * Language.
    */
@@ -86,8 +117,8 @@ export interface SessionOptions {
   location?: string;
   /**
    * The account index to use. This is useful if you have multiple accounts logged in.
-   * **NOTE:**
-   * Only works if you are signed in with cookies.
+   *
+   * **NOTE:** Only works if you are signed in with cookies.
    */
   account_index?: number;
   /**
@@ -96,6 +127,7 @@ export interface SessionOptions {
   on_behalf_of_user?: string;
   /**
    * Specifies whether to retrieve the JS player. Disabling this will make session creation faster.
+   *
    * **NOTE:** Deciphering formats is not possible without the JS player.
    */
   retrieve_player?: boolean;
@@ -106,8 +138,15 @@ export interface SessionOptions {
   /**
    * Specifies whether to generate the session data locally or retrieve it from YouTube.
    * This can be useful if you need more performance.
+   *
+   * **NOTE:** If you are using the cache option and a session has already been generated, this will be ignored.
+   * If you want to force a new session to be generated, you must clear the cache or disable session caching.
    */
   generate_session_locally?: boolean;
+  /**
+   * Specifies whether the session data should be cached.
+   */
+  enable_session_cache?: boolean;
   /**
    * Platform to use for the session.
    */
@@ -121,7 +160,7 @@ export interface SessionOptions {
    */
   timezone?: string;
   /**
-   * Used to cache the deciphering functions from the JS player.
+   * Used to cache algorithms, session data, and OAuth2 tokens.
    */
   cache?: ICache;
   /**
@@ -137,14 +176,24 @@ export interface SessionOptions {
    * Fetch function to use.
    */
   fetch?: FetchFunction;
+  /**
+   * Proof of Origin Token. This is an attestation token generated by BotGuard/DroidGuard. It is used to confirm that the request is coming from a genuine client.
+   */
+  po_token?: string;
 }
 
-export interface SessionData {
+export type SessionData = {
   context: Context;
   api_key: string;
   api_version: string;
 }
 
+export type SWSessionData = {
+  context_data: ContextData;
+  api_key: string;
+  api_version: string;
+}
+
 export type SessionArgs = {
   lang: string;
   location: string;
@@ -156,50 +205,51 @@ export type SessionArgs = {
   on_behalf_of_user: string | undefined;
 }
 
+const TAG = 'Session';
+
 /**
  * Represents an InnerTube session. This holds all the data needed to make requests to YouTube.
  */
 export default class Session extends EventEmitter {
-  static TAG = 'Session';
-
-  #api_version: string;
-  #key: string;
-  #context: Context;
-  #account_index: number;
-  #player?: Player;
-
-  oauth: OAuth;
+  context: Context;
+  player?: Player;
+  oauth: OAuth2;
   http: HTTPClient;
   logged_in: boolean;
   actions: Actions;
   cache?: ICache;
+  key: string;
+  api_version: string;
+  account_index: number;
+  po_token?: string;
 
-  constructor(context: Context, api_key: string, api_version: string, account_index: number, player?: Player, cookie?: string, fetch?: FetchFunction, cache?: ICache) {
+  constructor(context: Context, api_key: string, api_version: string, account_index: number, player?: Player, cookie?: string, fetch?: FetchFunction, cache?: ICache, po_token?: string) {
     super();
-    this.#context = context;
-    this.#account_index = account_index;
-    this.#key = api_key;
-    this.#api_version = api_version;
-    this.#player = player;
     this.http = new HTTPClient(this, cookie, fetch);
     this.actions = new Actions(this);
-    this.oauth = new OAuth(this);
+    this.oauth = new OAuth2(this);
     this.logged_in = !!cookie;
     this.cache = cache;
+    this.account_index = account_index;
+    this.key = api_key;
+    this.api_version = api_version;
+    this.context = context;
+    this.player = player;
+    this.po_token = po_token;
   }
 
-  on(type: 'auth', listener: OAuthAuthEventHandler): void;
-  on(type: 'auth-pending', listener: OAuthAuthPendingEventHandler): void;
-  on(type: 'auth-error', listener: OAuthAuthErrorEventHandler): void;
-  on(type: 'update-credentials', listener: OAuthAuthEventHandler): void;
+  on(type: 'auth', listener: OAuth2AuthEventHandler): void;
+  on(type: 'auth-pending', listener: OAuth2AuthPendingEventHandler): void;
+  on(type: 'auth-error', listener: OAuth2AuthErrorEventHandler): void;
+  on(type: 'update-credentials', listener: OAuth2AuthEventHandler): void;
 
   on(type: string, listener: (...args: any[]) => void): void {
     super.on(type, listener);
   }
 
-  once(type: 'auth', listener: OAuthAuthEventHandler): void;
-  once(type: 'auth-pending', listener: OAuthAuthPendingEventHandler): void;
-  once(type: 'auth-error', listener: OAuthAuthErrorEventHandler): void;
+  once(type: 'auth', listener: OAuth2AuthEventHandler): void;
+  once(type: 'auth-pending', listener: OAuth2AuthPendingEventHandler): void;
+  once(type: 'auth-error', listener: OAuth2AuthErrorEventHandler): void;
 
   once(type: string, listener: (...args: any[]) => void): void {
     super.once(type, listener);
@@ -217,16 +267,60 @@ export default class Session extends EventEmitter {
       options.client_type,
       options.timezone,
       options.fetch,
-      options.on_behalf_of_user
+      options.on_behalf_of_user,
+      options.cache,
+      options.enable_session_cache,
+      options.po_token
     );
 
     return new Session(
       context, api_key, api_version, account_index,
-      options.retrieve_player === false ? undefined : await Player.create(options.cache, options.fetch),
-      options.cookie, options.fetch, options.cache
+      options.retrieve_player === false ? undefined : await Player.create(options.cache, options.fetch, options.po_token),
+      options.cookie, options.fetch, options.cache, options.po_token
     );
   }
 
+  /**
+   * Retrieves session data from cache.
+   * @param cache - A valid cache implementation.
+   * @param session_args - User provided session arguments.
+   */
+  static async fromCache(cache: ICache, session_args: SessionArgs): Promise<SessionData | null> {
+    const buffer = await cache.get('innertube_session_data');
+
+    if (!buffer)
+      return null;
+
+    const data = new TextDecoder().decode(buffer.slice(4));
+
+    try {
+      const result = JSON.parse(LZW.decompress(data)) as SessionData;
+
+      if (session_args.visitor_data) {
+        result.context.client.visitorData = session_args.visitor_data;
+      }
+
+      if (session_args.lang)
+        result.context.client.hl = session_args.lang;
+
+      if (session_args.location)
+        result.context.client.gl = session_args.location;
+
+      if (session_args.on_behalf_of_user)
+        result.context.user.onBehalfOfUser = session_args.on_behalf_of_user;
+
+      result.context.client.timeZone = session_args.time_zone;
+      result.context.client.platform = session_args.device_category.toUpperCase();
+      result.context.client.clientName = session_args.client_name;
+      result.context.user.enableSafetyMode = session_args.enable_safety_mode;
+
+      return result;
+    } catch (error) {
+      Log.error(TAG, 'Failed to parse session data from cache.', error);
+      return null;
+    }
+  }
+
   static async getSessionData(
     lang = '',
     location = '',
@@ -238,53 +332,102 @@ export default class Session extends EventEmitter {
     client_name: ClientType = ClientType.WEB,
     tz: string = Intl.DateTimeFormat().resolvedOptions().timeZone,
     fetch: FetchFunction = Platform.shim.fetch,
-    on_behalf_of_user?: string
+    on_behalf_of_user?: string,
+    cache?: ICache,
+    enable_session_cache = true,
+    po_token?: string
   ) {
-    let session_data: SessionData;
+    const session_args = { lang, location, time_zone: tz, device_category, client_name, enable_safety_mode, visitor_data, on_behalf_of_user, po_token };
 
-    const session_args = { lang, location, time_zone: tz, device_category, client_name, enable_safety_mode, visitor_data, on_behalf_of_user };
+    let session_data: SessionData | undefined;
 
-    Log.info(Session.TAG, 'Retrieving InnerTube session.');
-
-    if (generate_session_locally) {
-      session_data = this.#generateSessionData(session_args);
-    } else {
-      try {
-        // This can fail if the data changes or the request is blocked for some reason.
-        session_data = await this.#retrieveSessionData(session_args, fetch);
-      } catch (err) {
-        Log.error(Session.TAG, 'Failed to retrieve session data from server. Will try to generate it locally.');
-        session_data = this.#generateSessionData(session_args);
+    if (cache && enable_session_cache) {
+      const cached_session_data = await this.fromCache(cache, session_args);
+      if (cached_session_data) {
+        Log.info(TAG, 'Found session data in cache.');
+        session_data = cached_session_data;
       }
     }
 
-    Log.info(Session.TAG, 'Got session data.\n', session_data);
+    if (!session_data) {
+      Log.info(TAG, 'Generating session data.');
+
+      let api_key = Constants.CLIENTS.WEB.API_KEY;
+      let api_version = Constants.CLIENTS.WEB.API_VERSION;
+
+      let context_data: ContextData = {
+        hl: lang || 'en',
+        gl: location || 'US',
+        remote_host: '',
+        visitor_data: visitor_data || Proto.encodeVisitorData(generateRandomString(11), Math.floor(Date.now() / 1000)),
+        client_name: client_name,
+        client_version: Constants.CLIENTS.WEB.VERSION,
+        device_category: device_category.toUpperCase(),
+        os_name: 'Windows',
+        os_version: '10.0',
+        time_zone: tz,
+        browser_name: 'Chrome',
+        browser_version: '125.0.0.0',
+        device_make: '',
+        device_model: '',
+        enable_safety_mode: enable_safety_mode
+      };
+
+      if (!generate_session_locally) {
+        try {
+          const sw_session_data = await this.#getSessionData(session_args, fetch);
+          api_key = sw_session_data.api_key;
+          api_version = sw_session_data.api_version;
+          context_data = sw_session_data.context_data;
+        } catch (error) {
+          Log.error(TAG, 'Failed to retrieve session data from server. Session data generated locally will be used instead.', error);
+        }
+      }
+
+      session_data = {
+        api_key,
+        api_version,
+        context: this.#buildContext(context_data)
+      };
+
+      if (enable_session_cache)
+        await this.#storeSession(session_data, cache);
+    }
+
+    Log.debug(TAG, 'Session data:', session_data);
 
     return { ...session_data, account_index };
   }
 
-  static #getVisitorID(visitor_data: string) {
-    const decoded_visitor_data = Proto.decodeVisitorData(visitor_data);
-    Log.info(Session.TAG, 'Custom visitor data decoded successfully.\n', decoded_visitor_data);
-    return decoded_visitor_data.id;
+  static async #storeSession(session_data: SessionData, cache?: ICache) {
+    if (!cache) return;
+
+    Log.info(TAG, 'Compressing and caching session data.');
+
+    const compressed_session_data = new TextEncoder().encode(LZW.compress(JSON.stringify(session_data)));
+
+    const buffer = new ArrayBuffer(4 + compressed_session_data.byteLength);
+    new DataView(buffer).setUint32(0, compressed_session_data.byteLength, true); // (Luan) XX: Leave this here for debugging purposes
+    new Uint8Array(buffer).set(compressed_session_data, 4);
+
+    await cache.set('innertube_session_data', new Uint8Array(buffer));
   }
 
-  static async #retrieveSessionData(options: SessionArgs, fetch: FetchFunction = Platform.shim.fetch): Promise<SessionData> {
-    const url = new URL('/sw.js_data', Constants.URLS.YT_BASE);
-
+  static async #getSessionData(options: SessionArgs, fetch: FetchFunction = Platform.shim.fetch): Promise<SWSessionData> {
     let visitor_id = generateRandomString(11);
 
-    if (options.visitor_data) {
+    if (options.visitor_data)
       visitor_id = this.#getVisitorID(options.visitor_data);
-    }
+
+    const url = new URL('/sw.js_data', Constants.URLS.YT_BASE);
 
     const res = await fetch(url, {
       headers: {
-        'accept-language': options.lang || 'en-US',
-        'user-agent': getRandomUserAgent('desktop'),
-        'accept': '*/*',
-        'referer': 'https://www.youtube.com/sw.js',
-        'cookie': `PREF=tz=${options.time_zone.replace('/', '.')};VISITOR_INFO1_LIVE=${visitor_id};`
+        'Accept-Language': options.lang || 'en-US',
+        'User-Agent': getRandomUserAgent('desktop'),
+        'Accept': '*/*',
+        'Referer': `${Constants.URLS.YT_BASE}/sw.js`,
+        'Cookie': `PREF=tz=${options.time_zone.replace('/', '.')};VISITOR_INFO1_LIVE=${visitor_id};`
       }
     });
 
@@ -292,113 +435,114 @@ export default class Session extends EventEmitter {
       throw new SessionError(`Failed to retrieve session data: ${res.status}`);
 
     const text = await res.text();
+
+    if (!text.startsWith(')]}\''))
+      throw new SessionError('Invalid JSPB response');
+
     const data = JSON.parse(text.replace(/^\)\]\}'/, ''));
 
     const ytcfg = data[0][2];
 
-    const api_version = `v${ytcfg[0][0][6]}`;
+    const api_version = Constants.CLIENTS.WEB.API_VERSION;
 
     const [ [ device_info ], api_key ] = ytcfg;
 
-    const context: Context = {
-      client: {
-        hl: device_info[0],
-        gl: options.location || device_info[2],
-        remoteHost: device_info[3],
-        screenDensityFloat: 1,
-        screenHeightPoints: 1080,
-        screenPixelDensity: 1,
-        screenWidthPoints: 1920,
-        visitorData: device_info[13],
-        clientName: options.client_name,
-        clientVersion: device_info[16],
-        osName: device_info[17],
-        osVersion: device_info[18],
-        platform: options.device_category.toUpperCase(),
-        clientFormFactor: 'UNKNOWN_FORM_FACTOR',
-        userInterfaceTheme: 'USER_INTERFACE_THEME_LIGHT',
-        timeZone: device_info[79] || options.time_zone,
-        browserName: device_info[86],
-        browserVersion: device_info[87],
-        originalUrl: Constants.URLS.YT_BASE,
-        deviceMake: device_info[11],
-        deviceModel: device_info[12],
-        utcOffsetMinutes: -new Date().getTimezoneOffset()
-      },
-      user: {
-        enableSafetyMode: options.enable_safety_mode,
-        lockedSafetyMode: false,
-        onBehalfOfUser: options.on_behalf_of_user
-      }
+    const config_info = device_info[61];
+    const app_install_data = config_info[config_info.length - 1];
+
+    const context_info = {
+      hl: options.lang || device_info[0],
+      gl: options.location || device_info[2],
+      remote_host: device_info[3],
+      visitor_data: options.visitor_data || device_info[13],
+      client_name: options.client_name,
+      client_version: device_info[16],
+      os_name: device_info[17],
+      os_version: device_info[18],
+      time_zone: device_info[79] || options.time_zone,
+      device_category: options.device_category,
+      browser_name: device_info[86],
+      browser_version: device_info[87],
+      device_make: device_info[11],
+      device_model: device_info[12],
+      app_install_data: app_install_data,
+      enable_safety_mode: options.enable_safety_mode
     };
 
-    return { context, api_key, api_version };
+    return { context_data: context_info, api_key, api_version };
   }
 
-  static #generateSessionData(options: SessionArgs): SessionData {
-    let visitor_id = generateRandomString(11);
-
-    if (options.visitor_data) {
-      visitor_id = this.#getVisitorID(options.visitor_data);
-    }
-
+  static #buildContext(args: ContextData) {
     const context: Context = {
       client: {
-        hl: options.lang || 'en',
-        gl: options.location || 'US',
+        hl: args.hl,
+        gl: args.gl,
+        remoteHost: args.remote_host,
         screenDensityFloat: 1,
-        screenHeightPoints: 1080,
+        screenHeightPoints: 1440,
         screenPixelDensity: 1,
-        screenWidthPoints: 1920,
-        visitorData: Proto.encodeVisitorData(visitor_id, Math.floor(Date.now() / 1000)),
-        clientName: options.client_name,
-        clientVersion: Constants.CLIENTS.WEB.VERSION,
-        osName: 'Windows',
-        osVersion: '10.0',
-        platform: options.device_category.toUpperCase(),
+        screenWidthPoints: 2560,
+        visitorData: args.visitor_data,
+        clientName: args.client_name,
+        clientVersion: args.client_version,
+        osName: args.os_name,
+        osVersion: args.os_version,
+        platform: args.device_category.toUpperCase(),
         clientFormFactor: 'UNKNOWN_FORM_FACTOR',
         userInterfaceTheme: 'USER_INTERFACE_THEME_LIGHT',
-        timeZone: options.time_zone,
+        timeZone: args.time_zone,
         originalUrl: Constants.URLS.YT_BASE,
-        deviceMake: '',
-        deviceModel: '',
-        utcOffsetMinutes: -new Date().getTimezoneOffset()
-      },
-      user: {
-        enableSafetyMode: options.enable_safety_mode,
-        lockedSafetyMode: false,
-        onBehalfOfUser: options.on_behalf_of_user
-      }
-    };
-
-    return { context, api_key: Constants.CLIENTS.WEB.API_KEY, api_version: Constants.CLIENTS.WEB.API_VERSION };
-  }
-
-  async signIn(credentials?: Credentials): Promise<void> {
-    return new Promise(async (resolve, reject) => {
-      const error_handler: OAuthAuthErrorEventHandler = (err) => reject(err);
-
-      this.once('auth', (data) => {
-        this.off('auth-error', error_handler);
-
-        if (data.status === 'SUCCESS') {
-          this.logged_in = true;
-          resolve();
+        deviceMake: args.device_make,
+        deviceModel: args.device_model,
+        browserName: args.browser_name,
+        browserVersion: args.browser_version,
+        utcOffsetMinutes: -Math.floor((new Date()).getTimezoneOffset()),
+        memoryTotalKbytes: '8000000',
+        mainAppWebInfo: {
+          graftUrl: Constants.URLS.YT_BASE,
+          pwaInstallabilityStatus: 'PWA_INSTALLABILITY_STATUS_UNKNOWN',
+          webDisplayMode: 'WEB_DISPLAY_MODE_BROWSER',
+          isWebNativeShareAvailable: true
         }
+      },
+      user: {
+        enableSafetyMode: args.enable_safety_mode,
+        lockedSafetyMode: false
+      },
+      request: {
+        useSsl: true,
+        internalExperimentFlags: []
+      }
+    };
 
-        reject(data);
-      });
+    if (args.app_install_data)
+      context.client.configInfo = { appInstallData: args.app_install_data };
+
+    if (args.on_behalf_of_user)
+      context.user.onBehalfOfUser = args.on_behalf_of_user;
+
+    return context;
+  }
+
+  static #getVisitorID(visitor_data: string) {
+    const decoded_visitor_data = Proto.decodeVisitorData(visitor_data);
+    return decoded_visitor_data.id;
+  }
+
+  async signIn(credentials?: OAuth2Tokens): Promise<void> {
+    return new Promise(async (resolve, reject) => {
+      const error_handler: OAuth2AuthErrorEventHandler = (err) => reject(err);
 
       this.once('auth-error', error_handler);
 
+      this.once('auth', () => {
+        this.off('auth-error', error_handler);
+        this.logged_in = true;
+        resolve();
+      });
+
       try {
         await this.oauth.init(credentials);
-
-        if (this.oauth.validateCredentials()) {
-          await this.oauth.refreshIfRequired();
-          this.logged_in = true;
-          resolve();
-        }
       } catch (err) {
         reject(err);
       }
@@ -418,41 +562,15 @@ export default class Session extends EventEmitter {
     return response;
   }
 
-  /**
-   * InnerTube API key.
-   */
-  get key(): string {
-    return this.#key;
-  }
-
-  /**
-   * InnerTube API version.
-   */
-  get api_version(): string {
-    return this.#api_version;
-  }
-
   get client_version(): string {
-    return this.#context.client.clientVersion;
+    return this.context.client.clientVersion;
   }
 
   get client_name(): string {
-    return this.#context.client.clientName;
-  }
-
-  get account_index(): number {
-    return this.#account_index;
-  }
-
-  get context(): Context {
-    return this.#context;
-  }
-
-  get player(): Player | undefined {
-    return this.#player;
+    return this.context.client.clientName;
   }
 
   get lang(): string {
-    return this.#context.client.hl;
+    return this.context.client.hl;
   }
-}
+}

src/core/clients/Music.ts

@@ -9,7 +9,6 @@ import {
 
 import AutomixPreviewVideo from '../../parser/classes/AutomixPreviewVideo.js';
 import Message from '../../parser/classes/Message.js';
-import MusicCarouselShelf from '../../parser/classes/MusicCarouselShelf.js';
 import MusicDescriptionShelf from '../../parser/classes/MusicDescriptionShelf.js';
 import MusicQueue from '../../parser/classes/MusicQueue.js';
 import MusicTwoRowItem from '../../parser/classes/MusicTwoRowItem.js';
@@ -278,7 +277,7 @@ export default class Music {
    * Retrieves related content.
    * @param video_id - The video id.
    */
-  async getRelated(video_id: string): Promise<ObservedArray<MusicCarouselShelf | MusicDescriptionShelf>> {
+  async getRelated(video_id: string): Promise<SectionList | Message> {
     throwIfMissing({ video_id });
 
     const response = await this.#actions.execute(
@@ -297,9 +296,9 @@ export default class Music {
     if (!page.contents)
       throw new InnertubeError('Unexpected response', page);
 
-    const shelves = page.contents.item().as(SectionList).contents.as(MusicCarouselShelf, MusicDescriptionShelf);
+    const contents = page.contents.item().as(SectionList, Message);
 
-    return shelves;
+    return contents;
   }
 
   /**

src/core/clients/Studio.ts

@@ -3,7 +3,7 @@ import { Constants } from '../../utils/index.js';
 import { InnertubeError, MissingParamError, Platform } from '../../utils/Utils.js';
 import { CreateVideoEndpoint } from '../endpoints/upload/index.js';
 
-import type { UpdateVideoMetadataOptions, UploadedVideoMetadataOptions } from '../../types/Clients.js';
+import type { UpdateVideoMetadataOptions, UploadedVideoMetadataOptions } from '../../types/Misc.js';
 import type { ApiResponse, Session } from '../index.js';
 
 interface UploadResult {

src/core/endpoints/PlayerEndpoint.ts

@@ -8,12 +8,7 @@ export const PATH = '/player';
  * @returns The payload.
  */
 export function build(opts: PlayerEndpointOptions): IPlayerRequest {
-  const is_android =
-    opts.client === 'ANDROID' ||
-    opts.client === 'YTMUSIC_ANDROID' ||
-    opts.client === 'YTSTUDIO_ANDROID';
-
-  return {
+  const payload: IPlayerRequest = {
     playbackContext: {
       contentPlaybackContext: {
         vis: 0,
@@ -38,12 +33,22 @@ export function build(opts: PlayerEndpointOptions): IPlayerRequest {
     },
     racyCheckOk: true,
     contentCheckOk: true,
-    videoId: opts.video_id,
-    ...{
-      client: opts.client,
-      playlistId: opts.playlist_id,
-      // Workaround streaming URLs returning 403 or getting throttled when using Android based clients.
-      params: is_android ? '2AMBCgIQBg' : opts.params
-    }
+    videoId: opts.video_id
   };
+
+  if (opts.client)
+    payload.client = opts.client;
+
+  if (opts.playlist_id)
+    payload.playlistId = opts.playlist_id;
+
+  if (opts.params)
+    payload.params = opts.params;
+
+  if (opts.po_token)
+    payload.serviceIntegrityDimensions = {
+      poToken: opts.po_token
+    };
+
+  return payload;
 }

src/core/endpoints/music/GetSearchSuggestionsEndpoint.ts

@@ -1,6 +1,5 @@
 import type { IMusicGetSearchSuggestionsRequest, MusicGetSearchSuggestionsEndpointOptions } from '../../../types/index.js';
 
-
 export const PATH = '/music/get_search_suggestions';
 
 /**

src/core/endpoints/reel/ReelItemWatchEndpoint.ts

@@ -0,0 +1,20 @@
+import type { IReelItemWatchRequest, ReelItemWatchEndpointOptions } from '../../../types/index.js';
+
+export const PATH = '/reel/reel_item_watch';
+
+/**
+ * Builds a `/reel/reel_watch_sequence` request payload.
+ * @param opts - The options to use.
+ * @returns The payload.
+ */
+export function build(opts: ReelItemWatchEndpointOptions): IReelItemWatchRequest {
+  return {
+    disablePlayerResponse: false,
+    playerRequest: {
+      videoId: opts.video_id,
+      params: opts.params ?? 'CAUwAg%3D%3D'
+    },
+    params: opts.params ?? 'CAUwAg%3D%3D',
+    client: opts.client
+  };
+}

src/core/endpoints/reel/ReelWatchSequenceEndpoint.ts

@@ -1,4 +1,4 @@
-import type { IReelSequenceRequest, ReelWatchSequenceEndpointOptions } from '../../../types/index.js';
+import type { IReelWatchSequenceRequest, ReelWatchSequenceEndpointOptions } from '../../../types/index.js';
 
 export const PATH = '/reel/reel_watch_sequence';
 
@@ -7,8 +7,8 @@ export const PATH = '/reel/reel_watch_sequence';
  * @param opts - The options to use.
  * @returns The payload.
  */
-export function build(opts: ReelWatchSequenceEndpointOptions): IReelSequenceRequest {
+export function build(opts: ReelWatchSequenceEndpointOptions): IReelWatchSequenceRequest {
   return {
-    sequenceParams: opts.sequenceParams
+    sequenceParams: opts.sequence_params
   };
 }

src/core/endpoints/reel/WatchEndpoint.ts

@@ -1,18 +0,0 @@
-import type { IReelWatchRequest, ReelWatchEndpointOptions } from '../../../types/index.js';
-
-export const PATH = '/reel/reel_item_watch';
-
-/**
- * Builds a `/reel/reel_watch_sequence` request payload.
- * @param opts - The options to use.
- * @returns The payload.
- */
-export function build(opts: ReelWatchEndpointOptions): IReelWatchRequest {
-  return {
-    playerRequest: {
-      videoId: opts.short_id,
-      params: opts.params ?? 'CAUwAg%3D%3D'
-    },
-    params: opts.params ?? 'CAUwAg%3D%3D'
-  };
-}

src/core/endpoints/reel/index.ts

@@ -1,2 +1,2 @@
-export * as WatchEndpoint from './WatchEndpoint.js';
-export * as WatchSequenceEndpoint from './WatchSequenceEndpoint.js';
+export * as ReelItemWatchEndpoint from './ReelItemWatchEndpoint.js';
+export * as ReelWatchSequenceEndpoint from './ReelWatchSequenceEndpoint.js';

src/core/index.ts

@@ -7,8 +7,8 @@ export * from './Actions.js';
 export { default as Player } from './Player.js';
 export * from './Player.js';
 
-export { default as OAuth } from './OAuth.js';
-export * from './OAuth.js';
+export { default as OAuth2 } from './OAuth2.js';
+export * from './OAuth2.js';
 
 export * as Clients from './clients/index.js';
 export * as Endpoints from './endpoints/index.js';

src/core/managers/PlaylistManager.ts

@@ -96,8 +96,9 @@ export default class PlaylistManager {
    * Removes videos from a given playlist.
    * @param playlist_id - The playlist ID.
    * @param video_ids - An array of video IDs to remove from the playlist.
+   * @param use_set_video_ids - Option to remove videos using set video IDs.
    */
-  async removeVideos(playlist_id: string, video_ids: string[]): Promise<{ playlist_id: string; action_result: any }> {
+  async removeVideos(playlist_id: string, video_ids: string[], use_set_video_ids = false): Promise<{ playlist_id: string; action_result: any }> {
     throwIfMissing({ playlist_id, video_ids });
 
     if (!this.#actions.session.logged_in)
@@ -115,7 +116,8 @@ export default class PlaylistManager {
     const payload: EditPlaylistEndpointOptions = { playlist_id, actions: [] };
 
     const getSetVideoIds = async (pl: Feed): Promise<void> => {
-      const videos = pl.videos.filter((video) => video_ids.includes(video.key('id').string()));
+      const key_id = use_set_video_ids ? 'set_video_id' : 'id';
+      const videos = pl.videos.filter((video) => video_ids.includes(video.key(key_id).string()));
 
       videos.forEach((video) =>
         payload.actions.push({

src/core/mixins/Feed.ts

@@ -8,6 +8,7 @@ import CompactVideo from '../../parser/classes/CompactVideo.js';
 import GridChannel from '../../parser/classes/GridChannel.js';
 import GridPlaylist from '../../parser/classes/GridPlaylist.js';
 import GridVideo from '../../parser/classes/GridVideo.js';
+import LockupView from '../../parser/classes/LockupView.js';
 import Playlist from '../../parser/classes/Playlist.js';
 import PlaylistPanelVideo from '../../parser/classes/PlaylistPanelVideo.js';
 import PlaylistVideo from '../../parser/classes/PlaylistVideo.js';
@@ -88,7 +89,18 @@ export default class Feed<T extends IParsedResponse = IParsedResponse> {
    * Get all playlists on a given page via memo
    */
   static getPlaylistsFromMemo(memo: Memo) {
-    return memo.getType(Playlist, GridPlaylist);
+    const playlists: ObservedArray<Playlist | GridPlaylist | LockupView> = memo.getType(Playlist, GridPlaylist);
+
+    const lockup_views = memo.getType(LockupView)
+      .filter((lockup) => {
+        return [ 'PLAYLIST', 'ALBUM', 'PODCAST' ].includes(lockup.content_type);
+      });
+
+    if (lockup_views.length > 0) {
+      playlists.push(...lockup_views);
+    }
+
+    return playlists;
   }
 
   /**

src/core/mixins/MediaInfo.ts

@@ -5,27 +5,43 @@ import { getStreamingInfo } from '../../utils/StreamingInfo.js';
 import { Parser } from '../../parser/index.js';
 import { TranscriptInfo } from '../../parser/youtube/index.js';
 import ContinuationItem from '../../parser/classes/ContinuationItem.js';
+import PlayerMicroformat from '../../parser/classes/PlayerMicroformat.js';
+import MicroformatData from '../../parser/classes/MicroformatData.js';
 
 import type { ApiResponse, Actions } from '../index.js';
-import type { INextResponse, IPlayerConfig, IPlayerResponse } from '../../parser/index.js';
+import type { INextResponse, IPlayabilityStatus, IPlaybackTracking, IPlayerConfig, IPlayerResponse, IStreamingData } from '../../parser/index.js';
 import type { DownloadOptions, FormatFilter, FormatOptions, URLTransformer } from '../../types/FormatUtils.js';
 import type Format from '../../parser/classes/misc/Format.js';
 import type { DashOptions } from '../../types/DashOptions.js';
+import type { ObservedArray } from '../../parser/helpers.js';
+
+import type CardCollection from '../../parser/classes/CardCollection.js';
+import type Endscreen from '../../parser/classes/Endscreen.js';
+import type PlayerAnnotationsExpanded from '../../parser/classes/PlayerAnnotationsExpanded.js';
+import type PlayerCaptionsTracklist from '../../parser/classes/PlayerCaptionsTracklist.js';
+import type PlayerLiveStoryboardSpec from '../../parser/classes/PlayerLiveStoryboardSpec.js';
+import type PlayerStoryboardSpec from '../../parser/classes/PlayerStoryboardSpec.js';
 
 export default class MediaInfo {
   #page: [IPlayerResponse, INextResponse?];
   #actions: Actions;
   #cpn: string;
-  #playback_tracking;
-  streaming_data;
-  playability_status;
-  player_config: IPlayerConfig;
+  #playback_tracking?: IPlaybackTracking;
+  basic_info;
+  annotations?: ObservedArray<PlayerAnnotationsExpanded>;
+  storyboards?: PlayerStoryboardSpec | PlayerLiveStoryboardSpec;
+  endscreen?: Endscreen;
+  captions?: PlayerCaptionsTracklist;
+  cards?: CardCollection;
+  streaming_data?: IStreamingData;
+  playability_status?: IPlayabilityStatus;
+  player_config?: IPlayerConfig;
 
   constructor(data: [ApiResponse, ApiResponse?], actions: Actions, cpn: string) {
     this.#actions = actions;
 
-    const info = Parser.parseResponse<IPlayerResponse>(data[0].data);
-    const next = data?.[1]?.data ? Parser.parseResponse<INextResponse>(data[1].data) : undefined;
+    const info = Parser.parseResponse<IPlayerResponse>(data[0].data.playerResponse ? data[0].data.playerResponse : data[0].data);
+    const next = data[1]?.data ? Parser.parseResponse<INextResponse>(data[1].data) : undefined;
 
     this.#page = [ info, next ];
     this.#cpn = cpn;
@@ -33,6 +49,38 @@ export default class MediaInfo {
     if (info.playability_status?.status === 'ERROR')
       throw new InnertubeError('This video is unavailable', info.playability_status);
 
+    if (info.microformat && !info.microformat?.is(PlayerMicroformat, MicroformatData))
+      throw new InnertubeError('Unsupported microformat', info.microformat);
+
+    this.basic_info = { // This type is inferred so no need for an explicit type
+      ...info.video_details,
+      /**
+       * Microformat is a bit redundant, so only
+       * a few things there are interesting to us.
+       */
+      ...{
+        embed: info.microformat?.is(PlayerMicroformat) ? info.microformat?.embed : null,
+        channel: info.microformat?.is(PlayerMicroformat) ? info.microformat?.channel : null,
+        is_unlisted: info.microformat?.is_unlisted,
+        is_family_safe: info.microformat?.is_family_safe,
+        category: info.microformat?.is(PlayerMicroformat) ? info.microformat?.category : null,
+        has_ypc_metadata: info.microformat?.is(PlayerMicroformat) ? info.microformat?.has_ypc_metadata : null,
+        start_timestamp: info.microformat?.is(PlayerMicroformat) ? info.microformat.start_timestamp : null,
+        end_timestamp: info.microformat?.is(PlayerMicroformat) ? info.microformat.end_timestamp : null,
+        view_count: info.microformat?.is(PlayerMicroformat) && isNaN(info.video_details?.view_count as number) ? info.microformat.view_count : info.video_details?.view_count,
+        url_canonical: info.microformat?.is(MicroformatData) ? info.microformat?.url_canonical : null,
+        tags: info.microformat?.is(MicroformatData) ? info.microformat?.tags : null
+      },
+      like_count: undefined as number | undefined,
+      is_liked: undefined as boolean | undefined,
+      is_disliked: undefined as boolean | undefined
+    };
+
+    this.annotations = info.annotations;
+    this.storyboards = info.storyboards;
+    this.endscreen = info.endscreen;
+    this.captions = info.captions;
+    this.cards = info.cards;
     this.streaming_data = info.streaming_data;
     this.playability_status = info.playability_status;
     this.player_config = info.player_config;
@@ -54,12 +102,28 @@ export default class MediaInfo {
     }
 
     let storyboards;
+    let captions;
 
     if (options.include_thumbnails && player_response.storyboards) {
       storyboards = player_response.storyboards;
     }
 
-    return FormatUtils.toDash(this.streaming_data, this.page[0].video_details?.is_post_live_dvr, url_transformer, format_filter, this.#cpn, this.#actions.session.player, this.#actions, storyboards);
+    if (typeof options.captions_format === 'string' && player_response.captions?.caption_tracks) {
+      captions = player_response.captions.caption_tracks;
+    }
+
+    return FormatUtils.toDash(
+      this.streaming_data,
+      this.page[0].video_details?.is_post_live_dvr,
+      url_transformer,
+      format_filter,
+      this.#cpn,
+      this.#actions.session.player,
+      this.#actions,
+      storyboards,
+      captions,
+      options
+    );
   }
 
   /**

src/parser/classes/ButtonView.ts

@@ -10,7 +10,7 @@ export default class ButtonView extends YTNode {
   accessibility_text: string;
   style: string;
   is_full_width: boolean;
-  type: string;
+  button_type: string;
   button_size: string;
   on_tap: NavigationEndpoint;
 
@@ -21,7 +21,7 @@ export default class ButtonView extends YTNode {
     this.accessibility_text = data.accessibilityText;
     this.style = data.style;
     this.is_full_width = data.isFullWidth;
-    this.type = data.type;
+    this.button_type = data.type;
     this.button_size = data.buttonSize;
     this.on_tap = new NavigationEndpoint(data.onTap);
   }

src/parser/classes/ChipBarView.ts

@@ -0,0 +1,14 @@
+import { YTNode, type ObservedArray } from '../helpers.js';
+import { Parser, type RawNode } from '../index.js';
+import ChipView from './ChipView.js';
+
+export default class ChipBarView extends YTNode {
+  static type = 'ChipBarView';
+
+  chips: ObservedArray<ChipView> | null;
+
+  constructor(data: RawNode) {
+    super();
+    this.chips = Parser.parseArray(data.chips, ChipView);
+  }
+}

src/parser/classes/ChipView.ts

@@ -0,0 +1,20 @@
+import { YTNode } from '../helpers.js';
+import { type RawNode } from '../index.js';
+import NavigationEndpoint from './NavigationEndpoint.js';
+
+export default class ChipView extends YTNode {
+  static type = 'ChipView';
+
+  text: string;
+  display_type: string;
+  endpoint: NavigationEndpoint;
+  chip_entity_key: string;
+
+  constructor(data: RawNode) {
+    super();
+    this.text = data.text;
+    this.display_type = data.displayType;
+    this.endpoint = new NavigationEndpoint(data.tapCommand);
+    this.chip_entity_key = data.chipEntityKey;
+  }
+}

src/parser/classes/CollectionThumbnailView.ts

@@ -0,0 +1,25 @@
+import { YTNode } from '../helpers.js';
+import { Parser, type RawNode } from '../index.js';
+import ThumbnailView from './ThumbnailView.js';
+
+export default class CollectionThumbnailView extends YTNode {
+  static type = 'CollectionThumbnailView';
+
+  primary_thumbnail: ThumbnailView | null;
+  stack_color?: {
+    light_theme: number;
+    dark_theme: number;
+  };
+
+  constructor(data: RawNode) {
+    super();
+
+    this.primary_thumbnail = Parser.parseItem(data.primaryThumbnail, ThumbnailView);
+    if (data.stackColor) {
+      this.stack_color = {
+        light_theme: data.stackColor.lightTheme,
+        dark_theme: data.stackColor.darkTheme
+      };
+    }
+  }
+}

src/parser/classes/Command.ts

@@ -1,14 +0,0 @@
-import { YTNode } from '../helpers.js';
-import type { RawNode } from '../index.js';
-import NavigationEndpoint from './NavigationEndpoint.js';
-
-export default class Command extends YTNode {
-  static type = 'Command';
-
-  endpoint: NavigationEndpoint;
-
-  constructor(data: RawNode) {
-    super();
-    this.endpoint = new NavigationEndpoint(data);
-  }
-}

src/parser/classes/CompactVideo.ts

@@ -1,5 +1,5 @@
 import { timeToSeconds } from '../../utils/Utils.js';
-import { YTNode, type ObservedArray, type SuperParsedResult } from '../helpers.js';
+import { YTNode, type ObservedArray } from '../helpers.js';
 import { Parser, type RawNode } from '../index.js';
 import Menu from './menus/Menu.js';
 import MetadataBadge from './MetadataBadge.js';
@@ -13,7 +13,7 @@ export default class CompactVideo extends YTNode {
 
   id: string;
   thumbnails: Thumbnail[];
-  rich_thumbnail?: SuperParsedResult<YTNode>;
+  rich_thumbnail?: YTNode;
   title: Text;
   author: Author;
   view_count: Text;
@@ -36,7 +36,7 @@ export default class CompactVideo extends YTNode {
     this.thumbnails = Thumbnail.fromResponse(data.thumbnail) || null;
 
     if (Reflect.has(data, 'richThumbnail')) {
-      this.rich_thumbnail = Parser.parse(data.richThumbnail);
+      this.rich_thumbnail = Parser.parseItem(data.richThumbnail);
     }
 
     this.title = new Text(data.title);

src/parser/classes/ContentMetadataView.ts

@@ -3,7 +3,7 @@ import type { RawNode } from '../index.js';
 import { Text } from '../misc.js';
 
 export type MetadataRow = {
-  metadata_parts: {
+  metadata_parts?: {
     text: Text;
   }[];
 };
@@ -17,7 +17,7 @@ export default class ContentMetadataView extends YTNode {
   constructor(data: RawNode) {
     super();
     this.metadata_rows = data.metadataRows.map((row: RawNode) => ({
-      metadata_parts: row.metadataParts.map((part: RawNode) => ({
+      metadata_parts: row.metadataParts?.map((part: RawNode) => ({
         text: Text.fromAttributed(part.text)
       }))
     }));

src/parser/classes/EomSettingsDisclaimer.ts

@@ -0,0 +1,22 @@
+import Text from './misc/Text.js';
+import { YTNode } from '../helpers.js';
+import { type RawNode } from '../index.js';
+
+export default class EomSettingsDisclaimer extends YTNode {
+  static type = 'EomSettingsDisclaimer';
+
+  disclaimer: Text;
+  info_icon: {
+    icon_type: string
+  };
+  usage_scenario: string;
+
+  constructor(data: RawNode) {
+    super();
+    this.disclaimer = new Text(data.disclaimer);
+    this.info_icon = {
+      icon_type: data.infoIcon.iconType
+    };
+    this.usage_scenario = data.usageScenario;
+  }
+}

src/parser/classes/Factoid.ts

@@ -7,7 +7,7 @@ export default class Factoid extends YTNode {
 
   label: Text;
   value: Text;
-  accessibility_text: String;
+  accessibility_text: string;
 
   constructor(data: RawNode) {
     super();

src/parser/classes/FlexibleActionsView.ts

@@ -1,9 +1,10 @@
 import { type ObservedArray, YTNode } from '../helpers.js';
 import { Parser, type RawNode } from '../index.js';
 import ButtonView from './ButtonView.js';
+import ToggleButtonView from './ToggleButtonView.js';
 
 export type ActionRow = {
-  actions: ObservedArray<ButtonView>;
+  actions: ObservedArray<ButtonView | ToggleButtonView>;
 };
 
 export default class FlexibleActionsView extends YTNode {
@@ -15,7 +16,7 @@ export default class FlexibleActionsView extends YTNode {
   constructor(data: RawNode) {
     super();
     this.actions_rows = data.actionsRows.map((row: RawNode) => ({
-      actions: Parser.parseArray(row.actions, ButtonView)
+      actions: Parser.parseArray(row.actions, [ ButtonView, ToggleButtonView ])
     }));
     this.style = data.style;
   }

src/parser/classes/InfoPanelContainer.ts

@@ -3,6 +3,7 @@ import { Parser, type RawNode } from '../index.js';
 import InfoPanelContent from './InfoPanelContent.js';
 import Menu from './menus/Menu.js';
 import Text from './misc/Text.js';
+import NavigationEndpoint from './NavigationEndpoint.js';
 
 export default class InfoPanelContainer extends YTNode {
   static type = 'InfoPanelContainer';
@@ -10,7 +11,9 @@ export default class InfoPanelContainer extends YTNode {
   title: Text;
   menu: Menu | null;
   content: InfoPanelContent | null;
+  header_endpoint?: NavigationEndpoint;
   background: string;
+  title_style?: string;
   icon_type?: string;
 
   constructor(data: RawNode) {
@@ -18,7 +21,12 @@ export default class InfoPanelContainer extends YTNode {
     this.title = new Text(data.title);
     this.menu = Parser.parseItem(data.menu, Menu);
     this.content = Parser.parseItem(data.content, InfoPanelContent);
+
+    if (data.headerEndpoint)
+      this.header_endpoint = new NavigationEndpoint(data.headerEndpoint);
+
     this.background = data.background;
+    this.title_style = data.titleStyle;
 
     if (Reflect.has(data, 'icon')) {
       this.icon_type = data.icon?.iconType;

src/parser/classes/InfoPanelContent.ts

@@ -1,5 +1,6 @@
 import { YTNode } from '../helpers.js';
 import type { RawNode } from '../index.js';
+import type { AttributedText } from './misc/Text.js';
 import Text from './misc/Text.js';
 import Thumbnail from './misc/Thumbnail.js';
 import NavigationEndpoint from './NavigationEndpoint.js';
@@ -9,7 +10,8 @@ export default class InfoPanelContent extends YTNode {
 
   title: Text;
   source: Text;
-  paragraphs: Text[];
+  paragraphs?: Text[];
+  attributed_paragraphs?: Text[];
   thumbnail: Thumbnail[];
   source_endpoint: NavigationEndpoint;
   truncate_paragraphs: boolean;
@@ -20,7 +22,13 @@ export default class InfoPanelContent extends YTNode {
     super();
     this.title = new Text(data.title);
     this.source = new Text(data.source);
-    this.paragraphs = data.paragraphs.map((p: RawNode) => new Text(p));
+
+    if (Reflect.has(data, 'paragraphs'))
+      this.paragraphs = data.paragraphs.map((p: RawNode) => new Text(p));
+
+    if (Reflect.has(data, 'attributedParagraphs'))
+      this.attributed_paragraphs = data.attributedParagraphs.map((p: AttributedText) => Text.fromAttributed(p));
+
     this.thumbnail = Thumbnail.fromResponse(data.thumbnail);
     this.source_endpoint = new NavigationEndpoint(data.sourceEndpoint);
     this.truncate_paragraphs = !!data.truncateParagraphs;

src/parser/classes/InfoRow.ts

@@ -8,7 +8,7 @@ export default class InfoRow extends YTNode {
   title: Text;
   default_metadata?: Text;
   expanded_metadata?: Text;
-  info_row_expand_status_key?: String;
+  info_row_expand_status_key?: string;
 
   constructor(data: RawNode) {
     super();

src/parser/classes/ItemSection.ts

@@ -19,7 +19,7 @@ export default class ItemSection extends YTNode {
     this.contents = Parser.parseArray(data.contents);
 
     if (data.targetId || data.sectionIdentifier) {
-      this.target_id = data.target_id || data.sectionIdentifier;
+      this.target_id = data.targetId || data.sectionIdentifier;
     }
 
     if (data.continuations) {

src/parser/classes/LockupMetadataView.ts

@@ -0,0 +1,18 @@
+import { YTNode } from '../helpers.js';
+import { Parser, type RawNode } from '../index.js';
+import ContentMetadataView from './ContentMetadataView.js';
+import Text from './misc/Text.js';
+
+export default class LockupMetadataView extends YTNode {
+  static type = 'LockupMetadataView';
+
+  title: Text;
+  metadata: ContentMetadataView | null;
+
+  constructor(data: RawNode) {
+    super();
+
+    this.title = Text.fromAttributed(data.title);
+    this.metadata = Parser.parseItem(data.metadata, ContentMetadataView);
+  }
+}

src/parser/classes/LockupView.ts

@@ -0,0 +1,25 @@
+import { YTNode } from '../helpers.js';
+import { Parser, type RawNode } from '../index.js';
+import CollectionThumbnailView from './CollectionThumbnailView.js';
+import LockupMetadataView from './LockupMetadataView.js';
+import NavigationEndpoint from './NavigationEndpoint.js';
+
+export default class LockupView extends YTNode {
+  static type = 'LockupView';
+
+  content_image: CollectionThumbnailView | null;
+  metadata: LockupMetadataView | null;
+  content_id: string;
+  content_type: 'SOURCE' | 'PLAYLIST' | 'ALBUM' | 'PODCAST' | 'SHOPPING_COLLECTION' | 'SHORT' | 'GAME' | 'PRODUCT';
+  on_tap_endpoint: NavigationEndpoint;
+
+  constructor(data: RawNode) {
+    super();
+
+    this.content_image = Parser.parseItem(data.contentImage, CollectionThumbnailView);
+    this.metadata = Parser.parseItem(data.metadata, LockupMetadataView);
+    this.content_id = data.contentId;
+    this.content_type = data.contentType.replace('LOCKUP_CONTENT_TYPE_', '');
+    this.on_tap_endpoint = new NavigationEndpoint(data.rendererContext.commandContext.onTap);
+  }
+}

src/parser/classes/MusicEditablePlaylistDetailHeader.ts

@@ -5,11 +5,13 @@ export default class MusicEditablePlaylistDetailHeader extends YTNode {
   static type = 'MusicEditablePlaylistDetailHeader';
 
   header: YTNode;
+  edit_header: YTNode;
+  playlist_id: string;
 
   constructor(data: RawNode) {
     super();
     this.header = Parser.parseItem(data.header);
-
-    // TODO: Parse data.editHeader.musicPlaylistEditHeaderRenderer.
+    this.edit_header = Parser.parseItem(data.editHeader);
+    this.playlist_id = data.playlistId;
   }
 }

src/parser/classes/MusicPlaylistEditHeader.ts

@@ -0,0 +1,28 @@
+import { Parser, type RawNode } from '../index.js';
+import { YTNode } from '../helpers.js';
+import NavigationEndpoint from './NavigationEndpoint.js';
+import Dropdown from './Dropdown.js';
+import Text from './misc/Text.js';
+
+export default class MusicPlaylistEditHeader extends YTNode {
+  static type = 'MusicPlaylistEditHeader';
+
+  title: Text;
+  edit_title: Text;
+  edit_description: Text;
+  privacy: string;
+  playlist_id: string;
+  endpoint: NavigationEndpoint;
+  privacy_dropdown: Dropdown | null;
+
+  constructor(data: RawNode) {
+    super();
+    this.title = new Text(data.title);
+    this.edit_title = new Text(data.editTitle);
+    this.edit_description = new Text(data.editDescription);
+    this.privacy = data.privacy;
+    this.playlist_id = data.playlistId;
+    this.endpoint = new NavigationEndpoint(data.collaborationSettingsCommand);
+    this.privacy_dropdown = Parser.parseItem(data.privacyDropdown, Dropdown);
+  }
+}

src/parser/classes/MusicResponsiveHeader.ts

@@ -0,0 +1,46 @@
+import { Parser, type RawNode } from '../index.js';
+import { YTNode } from '../helpers.js';
+import MusicThumbnail from './MusicThumbnail.js';
+import MusicDescriptionShelf from './MusicDescriptionShelf.js';
+import MusicInlineBadge from './MusicInlineBadge.js';
+import MusicPlayButton from './MusicPlayButton.js';
+import ToggleButton from './ToggleButton.js';
+import Menu from './menus/Menu.js';
+import Text from './misc/Text.js';
+import Button from './Button.js';
+import DownloadButton from './DownloadButton.js';
+
+import type { ObservedArray } from '../helpers.js';
+
+export default class MusicResponsiveHeader extends YTNode {
+  static type = 'MusicResponsiveHeader';
+
+  thumbnail: MusicThumbnail | null;
+  buttons: ObservedArray<DownloadButton | ToggleButton | MusicPlayButton | Button | Menu>;
+  title: Text;
+  subtitle: Text;
+  strapline_text_one: Text;
+  strapline_thumbnail: MusicThumbnail | null;
+  second_subtitle: Text;
+  subtitle_badge?: ObservedArray<MusicInlineBadge> | null;
+  description?: MusicDescriptionShelf | null;
+
+  constructor(data: RawNode) {
+    super();
+    this.thumbnail = Parser.parseItem(data.thumbnail, MusicThumbnail);
+    this.buttons = Parser.parseArray(data.buttons, [ DownloadButton, ToggleButton, MusicPlayButton, Button, Menu ]);
+    this.title = new Text(data.title);
+    this.subtitle = new Text(data.subtitle);
+    this.strapline_text_one = new Text(data.straplineTextOne);
+    this.strapline_thumbnail = Parser.parseItem(data.straplineThumbnail, MusicThumbnail);
+    this.second_subtitle = new Text(data.secondSubtitle);
+
+    if (Reflect.has(data, 'subtitleBadge')) {
+      this.subtitle_badge = Parser.parseArray(data.subtitleBadge, MusicInlineBadge);
+    }
+
+    if (Reflect.has(data, 'description')) {
+      this.description = Parser.parseItem(data.description, MusicDescriptionShelf);
+    }
+  }
+}

src/parser/classes/MusicResponsiveListItem.ts

@@ -4,6 +4,7 @@ import { YTNode } from '../helpers.js';
 import { isTextRun, timeToSeconds } from '../../utils/Utils.js';
 import type { ObservedArray } from '../helpers.js';
 import type { RawNode } from '../index.js';
+import type TextRun from './misc/TextRun.js';
 
 import { Parser } from '../index.js';
 import MusicItemThumbnailOverlay from './MusicItemThumbnailOverlay.js';
@@ -25,7 +26,7 @@ export default class MusicResponsiveListItem extends YTNode {
   };
 
   endpoint?: NavigationEndpoint;
-  item_type: 'album' | 'playlist' | 'artist' | 'library_artist' | 'non_music_track' | 'video' | 'song' | 'endpoint' | 'unknown' | undefined;
+  item_type: 'album' | 'playlist' | 'artist' | 'library_artist' | 'non_music_track' | 'video' | 'song' | 'endpoint' | 'unknown' | 'podcast_show' | undefined;
   index?: Text;
   thumbnail?: MusicThumbnail | null;
   badges;
@@ -120,6 +121,10 @@ export default class MusicResponsiveListItem extends YTNode {
         this.item_type = 'non_music_track';
         this.#parseNonMusicTrack();
         break;
+      case 'MUSIC_PAGE_TYPE_PODCAST_SHOW_DETAIL_PAGE':
+        this.item_type = 'podcast_show';
+        this.#parsePodcastShow();
+        break;
       default:
         if (this.flex_columns[1]) {
           this.#parseVideoOrSong();
@@ -160,13 +165,19 @@ export default class MusicResponsiveListItem extends YTNode {
   }
 
   #parseVideoOrSong() {
-    const is_video = this.flex_columns.at(1)?.title.runs?.some((run) => run.text.match(/(.*?) views/));
-    if (is_video) {
-      this.item_type = 'video';
-      this.#parseVideo();
-    } else {
-      this.item_type = 'song';
-      this.#parseSong();
+    const music_video_type = (this.flex_columns.at(0)?.title.runs?.at(0) as TextRun)?.endpoint?.payload?.watchEndpointMusicSupportedConfigs?.watchEndpointMusicConfig?.musicVideoType;
+    switch (music_video_type) {
+      case 'MUSIC_VIDEO_TYPE_UGC':
+      case 'MUSIC_VIDEO_TYPE_OMV':
+        this.item_type = 'video';
+        this.#parseVideo();
+        break;
+      case 'MUSIC_VIDEO_TYPE_ATV':
+        this.item_type = 'song';
+        this.#parseSong();
+        break;
+      default:
+        this.#parseOther();
     }
   }
 
@@ -267,6 +278,11 @@ export default class MusicResponsiveListItem extends YTNode {
     this.title = this.flex_columns.first().title.toString();
   }
 
+  #parsePodcastShow() {
+    this.id = this.endpoint?.payload?.browseId;
+    this.title = this.flex_columns.first().title.toString();
+  }
+
   #parseAlbum() {
     this.id = this.endpoint?.payload?.browseId;
     this.title = this.flex_columns.first().title.toString();

src/parser/classes/NavigationEndpoint.ts

@@ -27,8 +27,8 @@ export default class NavigationEndpoint extends YTNode {
   constructor(data: RawNode) {
     super();
 
-    if (Reflect.has(data || {}, 'innertubeCommand'))
-      data = data.innertubeCommand;
+    if (data && (data.innertubeCommand || data.command))
+      data = data.innertubeCommand || data.command;
 
     if (Reflect.has(data || {}, 'openPopupAction'))
       this.open_popup = new OpenPopupAction(data.openPopupAction);
@@ -92,13 +92,14 @@ export default class NavigationEndpoint extends YTNode {
       case 'browseEndpoint':
         return '/browse';
       case 'watchEndpoint':
+      case 'reelWatchEndpoint':
         return '/player';
       case 'searchEndpoint':
         return '/search';
       case 'watchPlaylistEndpoint':
         return '/next';
       case 'liveChatItemContextMenuEndpoint':
-        return 'live_chat/get_item_context_menu';
+        return '/live_chat/get_item_context_menu';
     }
   }
 

src/parser/classes/PlayerCaptionsTracklist.ts

@@ -2,17 +2,19 @@ import Text from './misc/Text.js';
 import { YTNode } from '../helpers.js';
 import type { RawNode } from '../index.js';
 
+export interface CaptionTrackData {
+  base_url: string;
+  name: Text;
+  vss_id: string;
+  language_code: string;
+  kind?: 'asr' | 'frc';
+  is_translatable: boolean;
+}
+
 export default class PlayerCaptionsTracklist extends YTNode {
   static type = 'PlayerCaptionsTracklist';
 
-  caption_tracks?: {
-    base_url: string;
-    name: Text;
-    vss_id: string;
-    language_code: string;
-    kind?: 'asr' | 'frc';
-    is_translatable: boolean;
-  }[];
+  caption_tracks?: CaptionTrackData[];
 
   audio_tracks?: {
     audio_track_id: string;

src/parser/classes/ReelPlayerOverlay.ts

@@ -6,6 +6,7 @@ import InfoPanelContainer from './InfoPanelContainer.js';
 import LikeButton from './LikeButton.js';
 import ReelPlayerHeader from './ReelPlayerHeader.js';
 import PivotButton from './PivotButton.js';
+import SubscribeButton from './SubscribeButton.js';
 
 export default class ReelPlayerOverlay extends YTNode {
   static type = 'ReelPlayerOverlay';
@@ -29,7 +30,7 @@ export default class ReelPlayerOverlay extends YTNode {
     this.menu = Parser.parseItem(data.menu, Menu);
     this.next_item_button = Parser.parseItem(data.nextItemButton, Button);
     this.prev_item_button = Parser.parseItem(data.prevItemButton, Button);
-    this.subscribe_button_renderer = Parser.parseItem(data.subscribeButtonRenderer, Button);
+    this.subscribe_button_renderer = Parser.parseItem(data.subscribeButtonRenderer, [ Button, SubscribeButton ]);
     this.style = data.style;
     this.view_comments_button = Parser.parseItem(data.viewCommentsButton, Button);
     this.share_button = Parser.parseItem(data.shareButton, Button);

src/parser/classes/StructuredDescriptionContent.ts

@@ -8,6 +8,7 @@ import VideoDescriptionMusicSection from './VideoDescriptionMusicSection.js';
 import VideoDescriptionTranscriptSection from './VideoDescriptionTranscriptSection.js';
 import VideoDescriptionCourseSection from './VideoDescriptionCourseSection.js';
 import ReelShelf from './ReelShelf.js';
+import VideoAttributesSectionView from './VideoAttributesSectionView.js';
 
 export default class StructuredDescriptionContent extends YTNode {
   static type = 'StructuredDescriptionContent';
@@ -15,7 +16,7 @@ export default class StructuredDescriptionContent extends YTNode {
   items: ObservedArray<
     VideoDescriptionHeader | ExpandableVideoDescriptionBody | VideoDescriptionMusicSection |
     VideoDescriptionInfocardsSection | VideoDescriptionTranscriptSection | VideoDescriptionTranscriptSection |
-    VideoDescriptionCourseSection | HorizontalCardList | ReelShelf
+    VideoDescriptionCourseSection | HorizontalCardList | ReelShelf | VideoAttributesSectionView
   >;
 
   constructor(data: RawNode) {
@@ -23,7 +24,7 @@ export default class StructuredDescriptionContent extends YTNode {
     this.items = Parser.parseArray(data.items, [
       VideoDescriptionHeader, ExpandableVideoDescriptionBody, VideoDescriptionMusicSection,
       VideoDescriptionInfocardsSection, VideoDescriptionCourseSection, VideoDescriptionTranscriptSection,
-      VideoDescriptionTranscriptSection, HorizontalCardList, ReelShelf
+      VideoDescriptionTranscriptSection, HorizontalCardList, ReelShelf, VideoAttributesSectionView
     ]);
   }
 }

src/parser/classes/ThumbnailBadgeView.ts

@@ -0,0 +1,28 @@
+import { YTNode } from '../helpers.js';
+import type { RawNode } from '../index.js';
+
+export default class ThumbnailBadgeView extends YTNode {
+  static type = 'ThumbnailBadgeView';
+
+  icon_name: string;
+  text: string;
+  badge_style: string;
+  background_color?: {
+    light_theme: number;
+    dark_theme: number;
+  };
+
+  constructor(data: RawNode) {
+    super();
+
+    this.icon_name = data.icon.sources[0].clientResource.imageName;
+    this.text = data.text;
+    this.badge_style = data.badgeStyle;
+    if (data.backgroundColor) {
+      this.background_color = {
+        light_theme: data.backgroundColor.lightTheme,
+        dark_theme: data.backgroundColor.darkTheme
+      };
+    }
+  }
+}

src/parser/classes/ThumbnailHoverOverlayView.ts

@@ -0,0 +1,19 @@
+import { YTNode } from '../helpers.js';
+import type { RawNode } from '../index.js';
+import Text from './misc/Text.js';
+
+export default class ThumbnailHoverOverlayView extends YTNode {
+  static type = 'ThumbnailHoverOverlayView';
+
+  icon_name: string;
+  text: Text;
+  style: string;
+
+  constructor(data: RawNode) {
+    super();
+
+    this.icon_name = data.icon.sources[0].clientResource.imageName;
+    this.text = Text.fromAttributed(data.text);
+    this.style = data.style;
+  }
+}

src/parser/classes/ThumbnailOverlayBadgeView.ts

@@ -0,0 +1,17 @@
+import { YTNode } from '../helpers.js';
+import { Parser, type RawNode } from '../index.js';
+import ThumbnailBadgeView from './ThumbnailBadgeView.js';
+
+export default class ThumbnailOverlayBadgeView extends YTNode {
+  static type = 'ThumbnailOverlayBadgeView';
+
+  badges: ThumbnailBadgeView[];
+  position: string;
+
+  constructor(data: RawNode) {
+    super();
+
+    this.badges = Parser.parseArray(data.thumbnailBadges, ThumbnailBadgeView);
+    this.position = data.position;
+  }
+}

src/parser/classes/ThumbnailOverlayResumePlayback.ts

@@ -4,10 +4,10 @@ import type { RawNode } from '../index.js';
 export default class ThumbnailOverlayResumePlayback extends YTNode {
   static type = 'ThumbnailOverlayResumePlayback';
 
-  percent_duration_watched: string; // TODO: is this a number?
+  percent_duration_watched: number;
 
   constructor(data: RawNode) {
     super();
     this.percent_duration_watched = data.percentDurationWatched;
   }
-}
+}

src/parser/classes/ThumbnailOverlayToggleButton.ts

@@ -17,8 +17,8 @@ export default class ThumbnailOverlayToggleButton extends YTNode {
     untoggled: string;
   };
 
-  toggled_endpoint: NavigationEndpoint;
-  untoggled_endpoint: NavigationEndpoint;
+  toggled_endpoint?: NavigationEndpoint;
+  untoggled_endpoint?: NavigationEndpoint;
 
   constructor(data: RawNode) {
     super();
@@ -36,7 +36,10 @@ export default class ThumbnailOverlayToggleButton extends YTNode {
       untoggled: data.untoggledTooltip
     };
 
-    this.toggled_endpoint = new NavigationEndpoint(data.toggledServiceEndpoint);
-    this.untoggled_endpoint = new NavigationEndpoint(data.untoggledServiceEndpoint);
+    if (data.toggledServiceEndpoint)
+      this.toggled_endpoint = new NavigationEndpoint(data.toggledServiceEndpoint);
+
+    if (data.untoggledServiceEndpoint)
+      this.untoggled_endpoint = new NavigationEndpoint(data.untoggledServiceEndpoint);
   }
 }

src/parser/classes/ThumbnailView.ts

@@ -0,0 +1,29 @@
+import { YTNode } from '../helpers.js';
+import { Parser, type RawNode } from '../index.js';
+import ThumbnailHoverOverlayView from './ThumbnailHoverOverlayView.js';
+import ThumbnailOverlayBadgeView from './ThumbnailOverlayBadgeView.js';
+import Thumbnail from './misc/Thumbnail.js';
+
+export default class ThumbnailView extends YTNode {
+  static type = 'ThumbnailView';
+
+  image: Thumbnail[];
+  overlays: (ThumbnailOverlayBadgeView | ThumbnailHoverOverlayView)[];
+  background_color?: {
+    light_theme: number;
+    dark_theme: number;
+  };
+
+  constructor(data: RawNode) {
+    super();
+
+    this.image = Thumbnail.fromResponse(data.image);
+    this.overlays = Parser.parseArray(data.overlays, [ ThumbnailOverlayBadgeView, ThumbnailHoverOverlayView ]);
+    if (data.backgroundColor) {
+      this.background_color = {
+        light_theme: data.backgroundColor.lightTheme,
+        dark_theme: data.backgroundColor.darkTheme
+      };
+    }
+  }
+}

src/parser/classes/VideoAttributesSectionView.ts

@@ -0,0 +1,24 @@
+import { Parser, type RawNode } from '../index.js';
+import { YTNode, type ObservedArray } from '../helpers.js';
+
+import ButtonView from './ButtonView.js';
+import VideoAttributeView from './VideoAttributeView.js';
+
+export default class VideoAttributesSectionView extends YTNode {
+  static type = 'VideoAttributesSectionView';
+
+  header_title: string;
+  header_subtitle: string;
+  video_attributes: ObservedArray<VideoAttributeView>;
+  previous_button: ButtonView | null;
+  next_button: ButtonView | null;
+
+  constructor(data: RawNode) {
+    super();
+    this.header_title = data.headerTitle;
+    this.header_subtitle = data.headerSubtitle;
+    this.video_attributes = Parser.parseArray(data.videoAttributeViewModels, VideoAttributeView);
+    this.previous_button = Parser.parseItem(data.previousButton, ButtonView);
+    this.next_button = Parser.parseItem(data.nextButton, ButtonView);
+  }
+}

src/parser/classes/comments/AuthorCommentBadge.ts

@@ -20,9 +20,10 @@ export default class AuthorCommentBadge extends YTNode {
     this.tooltip = data.iconTooltip;
 
     // *** For consistency
-    this.tooltip === 'Verified' &&
-      (this.style = 'BADGE_STYLE_TYPE_VERIFIED') &&
-      (data.style = 'BADGE_STYLE_TYPE_VERIFIED');
+    if (this.tooltip === 'Verified') {
+      this.style = 'BADGE_STYLE_TYPE_VERIFIED';
+      data.style = 'BADGE_STYLE_TYPE_VERIFIED';
+    }
 
     this.#data = data;
   }

src/parser/classes/comments/CommentThread.ts

@@ -2,6 +2,7 @@ import { Parser } from '../../index.js';
 import Button from '../Button.js';
 import ContinuationItem from '../ContinuationItem.js';
 import Comment from './Comment.js';
+import CommentView from './CommentView.js';
 import CommentReplies from './CommentReplies.js';
 
 import { InnertubeError } from '../../../utils/Utils.js';
@@ -17,15 +18,20 @@ export default class CommentThread extends YTNode {
   #actions?: Actions;
   #continuation?: ContinuationItem;
 
-  comment: Comment | null;
-  replies?: ObservedArray<Comment>;
+  comment: Comment | CommentView | null;
+  replies?: ObservedArray<Comment | CommentView>;
   comment_replies_data: CommentReplies | null;
   is_moderated_elq_comment: boolean;
   has_replies: boolean;
 
   constructor(data: RawNode) {
     super();
-    this.comment = Parser.parseItem(data.comment, Comment);
+
+    if (Reflect.has(data, 'commentViewModel')) {
+      this.comment = Parser.parseItem(data.commentViewModel, CommentView);
+    } else {
+      this.comment = Parser.parseItem(data.comment, Comment);
+    }
     this.comment_replies_data = Parser.parseItem(data.replies, CommentReplies);
     this.is_moderated_elq_comment = data.isModeratedElqComment;
     this.has_replies = !!this.comment_replies_data;
@@ -51,7 +57,7 @@ export default class CommentThread extends YTNode {
     if (!response.on_response_received_endpoints_memo)
       throw new InnertubeError('Unexpected response.', response);
 
-    this.replies = observe(response.on_response_received_endpoints_memo.getType(Comment).map((comment) => {
+    this.replies = observe(response.on_response_received_endpoints_memo.getType(Comment, CommentView).map((comment) => {
       comment.setActions(this.#actions);
       return comment;
     }));
@@ -84,7 +90,7 @@ export default class CommentThread extends YTNode {
     if (!response.on_response_received_endpoints_memo)
       throw new InnertubeError('Unexpected response.', response);
 
-    this.replies = observe(response.on_response_received_endpoints_memo.getType(Comment).map((comment) => {
+    this.replies = observe(response.on_response_received_endpoints_memo.getType(Comment, CommentView).map((comment) => {
       comment.setActions(this.#actions);
       return comment;
     }));

src/parser/classes/comments/CommentView.ts

@@ -0,0 +1,239 @@
+import { YTNode } from '../../helpers.js';
+import NavigationEndpoint from '../NavigationEndpoint.js';
+import Author from '../misc/Author.js';
+import Text from '../misc/Text.js';
+import CommentReplyDialog from './CommentReplyDialog.js';
+import { InnertubeError } from '../../../utils/Utils.js';
+import * as Proto from '../../../proto/index.js';
+
+import type Actions from '../../../core/Actions.js';
+import type { ApiResponse } from '../../../core/Actions.js';
+import type { RawNode } from '../../index.js';
+
+export default class CommentView extends YTNode {
+  static type = 'CommentView';
+
+  #actions?: Actions;
+
+  like_command?: NavigationEndpoint;
+  dislike_command?: NavigationEndpoint;
+  unlike_command?: NavigationEndpoint;
+  undislike_command?: NavigationEndpoint;
+  reply_command?: NavigationEndpoint;
+
+  comment_id: string;
+  is_pinned: boolean;
+  keys: {
+    comment: string;
+    comment_surface: string;
+    toolbar_state: string;
+    toolbar_surface: string;
+    shared: string;
+  };
+
+  content?: Text;
+  published_time?: string;
+  author_is_channel_owner?: boolean;
+  like_count?: string;
+  reply_count?: string;
+  is_member?: boolean;
+  member_badge?: {
+    url: string,
+    a11y: string;
+  };
+  author?: Author;
+
+  is_liked?: boolean;
+  is_disliked?: boolean;
+  is_hearted?: boolean;
+
+  constructor(data: RawNode) {
+    super();
+
+    this.comment_id = data.commentId;
+    this.is_pinned = !!data.pinnedText;
+
+    this.keys = {
+      comment: data.commentKey,
+      comment_surface: data.commentSurfaceKey,
+      toolbar_state: data.toolbarStateKey,
+      toolbar_surface: data.toolbarSurfaceKey,
+      shared: data.sharedKey
+    };
+  }
+
+  applyMutations(comment?: RawNode, toolbar_state?: RawNode, toolbar_surface?: RawNode) {
+    if (comment) {
+      this.content = Text.fromAttributed(comment.properties.content);
+      this.published_time = comment.properties.publishedTime;
+      this.author_is_channel_owner = !!comment.author.isCreator;
+
+      this.like_count = comment.toolbar.likeCountNotliked ? comment.toolbar.likeCountNotliked : '0';
+      this.reply_count = comment.toolbar.replyCount ? comment.toolbar.replyCount : '0';
+
+      this.is_member = !!comment.author.sponsorBadgeUrl;
+
+      if (Reflect.has(comment.author, 'sponsorBadgeUrl')) {
+        this.member_badge = {
+          url: comment.author.sponsorBadgeUrl,
+          a11y: comment.author.A11y
+        };
+      }
+
+      this.author = new Author({
+        simpleText: comment.author.displayName,
+        navigationEndpoint: comment.avatar.endpoint
+      }, comment.author, comment.avatar.image, comment.author.channelId);
+    }
+
+    if (toolbar_state) {
+      this.is_hearted = toolbar_state.heartState === 'TOOLBAR_HEART_STATE_HEARTED';
+      this.is_liked = toolbar_state.likeState === 'TOOLBAR_LIKE_STATE_LIKED';
+      this.is_disliked = toolbar_state.likeState === 'TOOLBAR_LIKE_STATE_DISLIKED';
+    }
+
+    if (toolbar_surface && !Reflect.has(toolbar_surface, 'prepareAccountCommand')) {
+      this.like_command = new NavigationEndpoint(toolbar_surface.likeCommand);
+      this.dislike_command = new NavigationEndpoint(toolbar_surface.dislikeCommand);
+      this.unlike_command = new NavigationEndpoint(toolbar_surface.unlikeCommand);
+      this.undislike_command = new NavigationEndpoint(toolbar_surface.undislikeCommand);
+      this.reply_command = new NavigationEndpoint(toolbar_surface.replyCommand);
+    }
+  }
+
+  /**
+   * Likes the comment.
+   * @returns A promise that resolves to the API response.
+   * @throws If the Actions instance is not set for this comment or if the like command is not found.
+   */
+  async like(): Promise<ApiResponse> {
+    if (!this.#actions)
+      throw new InnertubeError('Actions instance not set for this comment.');
+
+    if (!this.like_command)
+      throw new InnertubeError('Like command not found.');
+
+    if (this.is_liked)
+      throw new InnertubeError('This comment is already liked.', { comment_id: this.comment_id });
+
+    return this.like_command.call(this.#actions);
+  }
+
+  /**
+   * Dislikes the comment.
+   * @returns A promise that resolves to the API response.
+   * @throws If the Actions instance is not set for this comment or if the dislike command is not found.
+   */
+  async dislike(): Promise<ApiResponse> {
+    if (!this.#actions)
+      throw new InnertubeError('Actions instance not set for this comment.');
+
+    if (!this.dislike_command)
+      throw new InnertubeError('Dislike command not found.');
+
+    if (this.is_disliked)
+      throw new InnertubeError('This comment is already disliked.', { comment_id: this.comment_id });
+
+    return this.dislike_command.call(this.#actions);
+  }
+
+  /**
+   * Unlikes the comment.
+   * @returns A promise that resolves to the API response.
+   * @throws If the Actions instance is not set for this comment or if the unlike command is not found.
+   */
+  async unlike(): Promise<ApiResponse> {
+    if (!this.#actions)
+      throw new InnertubeError('Actions instance not set for this comment.');
+
+    if (!this.unlike_command)
+      throw new InnertubeError('Unlike command not found.');
+
+    if (!this.is_liked)
+      throw new InnertubeError('This comment is not liked.', { comment_id: this.comment_id });
+
+    return this.unlike_command.call(this.#actions);
+  }
+
+  /**
+   * Undislikes the comment.
+   * @returns A promise that resolves to the API response.
+   * @throws If the Actions instance is not set for this comment or if the undislike command is not found.
+   */
+  async undislike(): Promise<ApiResponse> {
+    if (!this.#actions)
+      throw new InnertubeError('Actions instance not set for this comment.');
+
+    if (!this.undislike_command)
+      throw new InnertubeError('Undislike command not found.');
+
+    if (!this.is_disliked)
+      throw new InnertubeError('This comment is not disliked.', { comment_id: this.comment_id });
+
+    return this.undislike_command.call(this.#actions);
+  }
+
+  /**
+   * Replies to the comment.
+   * @param comment_text - The text of the reply.
+   * @returns A promise that resolves to the API response.
+   * @throws If the Actions instance is not set for this comment or if the reply command is not found.
+   */
+  async reply(comment_text: string): Promise<ApiResponse> {
+    if (!this.#actions)
+      throw new InnertubeError('Actions instance not set for this comment.');
+
+    if (!this.reply_command)
+      throw new InnertubeError('Reply command not found.');
+
+    const dialog = this.reply_command.dialog?.as(CommentReplyDialog);
+
+    if (!dialog)
+      throw new InnertubeError('Reply dialog not found.');
+
+    const reply_button = dialog.reply_button;
+
+    if (!reply_button)
+      throw new InnertubeError('Reply button not found in the dialog.');
+
+    if (!reply_button.endpoint)
+      throw new InnertubeError('Reply button endpoint not found.');
+
+    return reply_button.endpoint.call(this.#actions, { commentText: comment_text });
+  }
+
+  /**
+   * Translates the comment to the specified target language.
+   * @param target_language - The target language to translate the comment to, e.g. 'en', 'ja'.
+   * @returns A Promise that resolves to an ApiResponse object with the translated content, if available.
+   * @throws if the Actions instance is not set for this comment or if the comment content is not found.
+   */
+  async translate(target_language: string): Promise<ApiResponse & { content?: string }> {
+    if (!this.#actions)
+      throw new InnertubeError('Actions instance not set for this comment.');
+
+    if (!this.content)
+      throw new InnertubeError('Comment content not found.', { comment_id: this.comment_id });
+
+    // Emojis must be removed otherwise InnerTube throws a 400 status code at us.
+    const text = this.content.toString().replace(/[^\p{L}\p{N}\p{P}\p{Z}]/gu, '');
+
+    const payload = {
+      text,
+      target_language
+    };
+
+    const action = Proto.encodeCommentActionParams(22, payload);
+    const response = await this.#actions.execute('comment/perform_comment_action', { action, client: 'ANDROID' });
+
+    // XXX: Should move this to Parser#parseResponse
+    const mutations = response.data.frameworkUpdates?.entityBatchUpdate?.mutations;
+    const content = mutations?.[0]?.payload?.commentEntityPayload?.translatedContent?.content;
+
+    return { ...response, content };
+  }
+
+  setActions(actions: Actions | undefined) {
+    this.#actions = actions;
+  }
+}

src/parser/classes/livechat/UpdateToggleButtonTextAction.ts

@@ -1,7 +1,8 @@
 import Text from '../misc/Text.js';
 import { YTNode } from '../../helpers.js';
 import type { RawNode } from '../../index.js';
-class UpdateToggleButtonTextAction extends YTNode {
+
+export default class UpdateToggleButtonTextAction extends YTNode {
   static type = 'UpdateToggleButtonTextAction';
 
   default_text: string;
@@ -14,6 +15,4 @@ class UpdateToggleButtonTextAction extends YTNode {
     this.toggled_text = new Text(data.toggledText).toString();
     this.button_id = data.buttonId;
   }
-}
-
-export default UpdateToggleButtonTextAction;
+}

src/parser/classes/livechat/UpdateViewershipAction.ts

@@ -7,7 +7,7 @@ export default class UpdateViewershipAction extends YTNode {
 
   view_count: Text;
   extra_short_view_count: Text;
-  original_view_count: Number;
+  original_view_count: number;
   unlabeled_view_count_value: Text;
   is_live: boolean;
 

src/parser/classes/menus/MultiPageMenu.ts

@@ -1,18 +1,19 @@
-import { YTNode, type SuperParsedResult } from '../../helpers.js';
+import type { ObservedArray } from '../../helpers.js';
+import { YTNode } from '../../helpers.js';
 import type { RawNode } from '../../index.js';
 import { Parser } from '../../index.js';
 
 export default class MultiPageMenu extends YTNode {
   static type = 'MultiPageMenu';
 
-  header: SuperParsedResult<YTNode>;
-  sections: SuperParsedResult<YTNode>;
+  header: YTNode;
+  sections: ObservedArray<YTNode>;
   style: string;
 
   constructor(data: RawNode) {
     super();
-    this.header = Parser.parse(data.header);
-    this.sections = Parser.parse(data.sections);
+    this.header = Parser.parseItem(data.header);
+    this.sections = Parser.parseArray(data.sections);
     this.style = data.style;
   }
 }

src/parser/classes/menus/SimpleMenuHeader.ts

@@ -1,19 +1,19 @@
-import type { SuperParsedResult } from '../../helpers.js';
+import type { ObservedArray } from '../../helpers.js';
 import { YTNode } from '../../helpers.js';
 import type { RawNode } from '../../index.js';
 import { Parser } from '../../index.js';
+import Button from '../Button.js';
 import Text from '../misc/Text.js';
 
 export default class SimpleMenuHeader extends YTNode {
   static type = 'SimpleMenuHeader';
 
   title: Text;
-  buttons: SuperParsedResult<YTNode>;
+  buttons: ObservedArray<Button>;
 
   constructor(data: RawNode) {
     super();
     this.title = new Text(data.title);
-    // @TODO: Check if this is of type `Button`.
-    this.buttons = Parser.parse(data.buttons);
+    this.buttons = Parser.parseArray(data.buttons, Button);
   }
 }

src/parser/classes/misc/Author.ts

@@ -25,10 +25,21 @@ export default class Author {
     this.name = nav_text?.text || 'N/A';
     this.thumbnails = thumbs ? Thumbnail.fromResponse(thumbs) : [];
     this.endpoint = ((nav_text?.runs?.[0] as TextRun) as TextRun)?.endpoint || nav_text?.endpoint;
-    this.badges = Array.isArray(badges) ? Parser.parseArray(badges) : observe([] as YTNode[]);
-    this.is_moderator = this.badges?.some((badge: any) => badge.icon_type == 'MODERATOR');
-    this.is_verified = this.badges?.some((badge: any) => badge.style == 'BADGE_STYLE_TYPE_VERIFIED');
-    this.is_verified_artist = this.badges?.some((badge: any) => badge.style == 'BADGE_STYLE_TYPE_VERIFIED_ARTIST');
+
+    if (badges) {
+      if (Array.isArray(badges)) {
+        this.badges = Parser.parseArray(badges);
+        this.is_moderator = this.badges?.some((badge: any) => badge.icon_type == 'MODERATOR');
+        this.is_verified = this.badges?.some((badge: any) => badge.style == 'BADGE_STYLE_TYPE_VERIFIED');
+        this.is_verified_artist = this.badges?.some((badge: any) => badge.style == 'BADGE_STYLE_TYPE_VERIFIED_ARTIST');
+      } else {
+        this.badges = observe([] as YTNode[]);
+        this.is_verified = !!badges.isVerified;
+        this.is_verified_artist = !!badges.isArtist;
+      }
+    } else {
+      this.badges = observe([] as YTNode[]);
+    }
 
     // @TODO: Refactor this mess.
     this.url =

src/parser/classes/misc/EmojiRun.ts

@@ -16,6 +16,7 @@ export default class EmojiRun implements Run {
     this.text =
       data.emoji?.emojiId ||
       data.emoji?.shortcuts?.[0] ||
+      data.text ||
       '';
 
     this.emoji = {

src/parser/classes/misc/Format.ts

@@ -6,55 +6,71 @@ export default class Format {
   #this_response_nsig_cache?: Map<string, string>;
 
   itag: number;
+  url?: string;
+  width?: number;
+  height?: number;
+  last_modified: Date;
+  content_length?: number;
+  quality?: string;
+  xtags?: string;
+  drm_families?: string[];
+  fps?: number;
+  quality_label?: string;
+  projection_type?: 'RECTANGULAR' | 'EQUIRECTANGULAR' | 'EQUIRECTANGULAR_THREED_TOP_BOTTOM' | 'MESH';
+  average_bitrate?: number;
+  bitrate: number;
+  spatial_audio_type?: 'AMBISONICS_5_1' | 'AMBISONICS_QUAD' | 'FOA_WITH_NON_DIEGETIC';
+  target_duration_dec?: number;
+  fair_play_key_uri?: string;
+  stereo_layout?: 'LEFT_RIGHT' | 'TOP_BOTTOM';
+  max_dvr_duration_sec?: number;
+  high_replication?: boolean;
+  audio_quality?: string;
+  approx_duration_ms: number;
+  audio_sample_rate?: number;
+  audio_channels?: number;
+  loudness_db?: number;
+  signature_cipher?: string;
+  is_drc?: boolean;
+  drm_track_type?: string;
+  distinct_params?: string;
+  track_absolute_loudness_lkfs?: number;
   mime_type: string;
   is_type_otf: boolean;
-  bitrate: number;
-  average_bitrate?: number;
-  width: number;
-  height: number;
-
   init_range?: {
     start: number;
     end: number;
   };
-
   index_range?: {
     start: number;
     end: number;
   };
-
-  last_modified: Date;
-  content_length?: number;
-  quality?: string;
-  quality_label?: string;
-  fps?: number;
-  url?: string;
   cipher?: string;
-  signature_cipher?: string;
-  audio_quality?: string;
   audio_track?: {
     audio_is_default: boolean;
     display_name: string;
     id: string;
   };
-  approx_duration_ms: number;
-  audio_sample_rate?: number;
-  audio_channels?: number;
-  loudness_db?: number;
-  max_dvr_duration_sec?: number;
-  target_duration_dec?: number;
   has_audio: boolean;
   has_video: boolean;
+  has_text: boolean;
   language?: string | null;
   is_dubbed?: boolean;
   is_descriptive?: boolean;
+  is_secondary?: boolean;
   is_original?: boolean;
-
   color_info?: {
     primaries?: string;
     transfer_characteristics?: string;
     matrix_coefficients?: string;
   };
+  caption_track?: {
+    display_name: string;
+    vss_id: string;
+    language_code: string;
+    kind?: 'asr' | 'frc';
+    id: string;
+  };
 
   constructor(data: RawNode, this_response_nsig_cache?: Map<string, string>) {
     if (this_response_nsig_cache) {
@@ -66,62 +82,145 @@ export default class Format {
     this.is_type_otf = data.type === 'FORMAT_STREAM_TYPE_OTF';
     this.bitrate = data.bitrate;
     this.average_bitrate = data.averageBitrate;
-    this.width = data.width;
-    this.height = data.height;
 
-    this.init_range = data.initRange ? {
-      start: parseInt(data.initRange.start),
-      end: parseInt(data.initRange.end)
-    } : undefined;
+    if (Reflect.has(data, 'width') && Reflect.has(data, 'height')) {
+      this.width = parseInt(data.width);
+      this.height = parseInt(data.height);
+    }
 
-    this.index_range = data.indexRange ? {
-      start: parseInt(data.indexRange.start),
-      end: parseInt(data.indexRange.end)
-    } : undefined;
+    if (Reflect.has(data, 'projectionType'))
+      this.projection_type = data.projectionType;
+
+    if (Reflect.has(data, 'stereoLayout'))
+      this.stereo_layout = data.stereoLayout?.replace('STEREO_LAYOUT_', '');
+
+    if (Reflect.has(data, 'initRange'))
+      this.init_range = {
+        start: parseInt(data.initRange.start),
+        end: parseInt(data.initRange.end)
+      };
+
+    if (Reflect.has(data, 'indexRange'))
+      this.index_range = {
+        start: parseInt(data.indexRange.start),
+        end: parseInt(data.indexRange.end)
+      };
 
     this.last_modified = new Date(Math.floor(parseInt(data.lastModified) / 1000));
-    this.content_length = parseInt(data.contentLength);
-    this.quality = data.quality;
-    this.quality_label = data.qualityLabel;
-    this.fps = data.fps;
-    this.url = data.url;
-    this.cipher = data.cipher;
-    this.signature_cipher = data.signatureCipher;
-    this.audio_quality = data.audioQuality;
+
+    if (Reflect.has(data, 'contentLength'))
+      this.content_length = parseInt(data.contentLength);
+
+    if (Reflect.has(data, 'quality'))
+      this.quality = data.quality;
+
+    if (Reflect.has(data, 'qualityLabel'))
+      this.quality_label = data.qualityLabel;
+
+    if (Reflect.has(data, 'fps'))
+      this.fps = data.fps;
+
+    if (Reflect.has(data, 'url'))
+      this.url = data.url;
+
+    if (Reflect.has(data, 'cipher'))
+      this.cipher = data.cipher;
+
+    if (Reflect.has(data, 'signatureCipher'))
+      this.signature_cipher = data.signatureCipher;
+
+    if (Reflect.has(data, 'audioQuality'))
+      this.audio_quality = data.audioQuality;
+
     this.approx_duration_ms = parseInt(data.approxDurationMs);
-    this.audio_sample_rate = parseInt(data.audioSampleRate);
-    this.audio_channels = data.audioChannels;
-    this.loudness_db = data.loudnessDb;
-    this.max_dvr_duration_sec = data.maxDvrDurationSec;
-    this.target_duration_dec = data.targetDurationSec;
+
+    if (Reflect.has(data, 'audioSampleRate'))
+      this.audio_sample_rate = parseInt(data.audioSampleRate);
+
+    if (Reflect.has(data, 'audioChannels'))
+      this.audio_channels = data.audioChannels;
+
+    if (Reflect.has(data, 'loudnessDb'))
+      this.loudness_db = data.loudnessDb;
+
+    if (Reflect.has(data, 'spatialAudioType'))
+      this.spatial_audio_type = data.spatialAudioType?.replace('SPATIAL_AUDIO_TYPE_', '');
+
+    if (Reflect.has(data, 'maxDvrDurationSec'))
+      this.max_dvr_duration_sec = data.maxDvrDurationSec;
+
+    if (Reflect.has(data, 'targetDurationSec'))
+      this.target_duration_dec = data.targetDurationSec;
+
     this.has_audio = !!data.audioBitrate || !!data.audioQuality;
     this.has_video = !!data.qualityLabel;
+    this.has_text = !!data.captionTrack;
 
-    this.color_info = data.colorInfo ? {
-      primaries: data.colorInfo.primaries?.replace('COLOR_PRIMARIES_', ''),
-      transfer_characteristics: data.colorInfo.transferCharacteristics?.replace('COLOR_TRANSFER_CHARACTERISTICS_', ''),
-      matrix_coefficients: data.colorInfo.matrixCoefficients?.replace('COLOR_MATRIX_COEFFICIENTS_', '')
-    } : undefined;
+    if (Reflect.has(data, 'xtags'))
+      this.xtags = data.xtags;
 
-    if (this.has_audio) {
+    if (Reflect.has(data, 'fairPlayKeyUri'))
+      this.fair_play_key_uri = data.fairPlayKeyUri;
+
+    if (Reflect.has(data, 'drmFamilies'))
+      this.drm_families = data.drmFamilies;
+
+    if (Reflect.has(data, 'drmTrackType'))
+      this.drm_track_type = data.drmTrackType;
+
+    if (Reflect.has(data, 'distinctParams'))
+      this.distinct_params = data.distinctParams;
+
+    if (Reflect.has(data, 'trackAbsoluteLoudnessLkfs'))
+      this.track_absolute_loudness_lkfs = data.trackAbsoluteLoudnessLkfs;
+
+    if (Reflect.has(data, 'highReplication'))
+      this.high_replication = data.highReplication;
+
+    if (Reflect.has(data, 'colorInfo'))
+      this.color_info = {
+        primaries: data.colorInfo.primaries?.replace('COLOR_PRIMARIES_', ''),
+        transfer_characteristics: data.colorInfo.transferCharacteristics?.replace('COLOR_TRANSFER_CHARACTERISTICS_', ''),
+        matrix_coefficients: data.colorInfo.matrixCoefficients?.replace('COLOR_MATRIX_COEFFICIENTS_', '')
+      };
+
+    if (Reflect.has(data, 'audioTrack'))
+      this.audio_track = {
+        audio_is_default: data.audioTrack.audioIsDefault,
+        display_name: data.audioTrack.displayName,
+        id: data.audioTrack.id
+      };
+
+    if (Reflect.has(data, 'captionTrack'))
+      this.caption_track = {
+        display_name: data.captionTrack.displayName,
+        vss_id: data.captionTrack.vssId,
+        language_code: data.captionTrack.languageCode,
+        kind: data.captionTrack.kind,
+        id: data.captionTrack.id
+      };
+
+    if (this.has_audio || this.has_text) {
       const args = new URLSearchParams(this.cipher || this.signature_cipher);
       const url_components = new URLSearchParams(args.get('url') || this.url);
 
       const xtags = url_components.get('xtags')?.split(':');
 
-      const audio_content = xtags?.find((x) => x.startsWith('acont='))?.split('=')[1];
-
       this.language = xtags?.find((x: string) => x.startsWith('lang='))?.split('=')[1] || null;
-      this.is_dubbed = audio_content === 'dubbed';
-      this.is_descriptive = audio_content === 'descriptive';
-      this.is_original = audio_content === 'original' || (!this.is_dubbed && !this.is_descriptive);
 
-      if (Reflect.has(data, 'audioTrack')) {
-        this.audio_track = {
-          audio_is_default: data.audioTrack.audioIsDefault,
-          display_name: data.audioTrack.displayName,
-          id: data.audioTrack.id
-        };
+      if (this.has_audio) {
+        this.is_drc = !!data.isDrc || !!xtags?.includes('drc=1');
+
+        const audio_content = xtags?.find((x) => x.startsWith('acont='))?.split('=')[1];
+        this.is_dubbed = audio_content === 'dubbed';
+        this.is_descriptive = audio_content === 'descriptive';
+        this.is_secondary = audio_content === 'secondary';
+        this.is_original = audio_content === 'original' || (!this.is_dubbed && !this.is_descriptive && !this.is_secondary && !this.is_drc);
+      }
+
+      // Some text tracks don't have xtags while others do
+      if (this.has_text && !this.language && this.caption_track) {
+        this.language = this.caption_track.language_code;
       }
     }
   }

src/parser/classes/misc/Text.ts

@@ -1,3 +1,4 @@
+import { Log } from '../../../utils/index.js';
 import type { RawNode } from '../../index.js';
 import NavigationEndpoint from '../NavigationEndpoint.js';
 import EmojiRun from './EmojiRun.js';
@@ -18,6 +19,10 @@ export function escape(text: string) {
     .replace(/'/g, ''');
 }
 
+// Place this here, instead of in a private static property,
+// To avoid the performance penalty of the private field polyfill
+const TAG = 'Text';
+
 export default class Text {
   text?: string;
   runs?: (EmojiRun | TextRun)[];
@@ -46,73 +51,132 @@ export default class Text {
     }
   }
 
-  static fromAttributed(data: RawNode): Text {
-    const runs: {
-      text: string,
-      navigationEndpoint?: RawNode,
-      attachment?: RawNode
-    }[] = [];
+  static fromAttributed(data: AttributedText) {
+    const {
+      content,
+      styleRuns: style_runs,
+      commandRuns: command_runs,
+      attachmentRuns: attachment_runs
+    } = data;
 
-    const content = data.content;
-    const command_runs = data.commandRuns;
+    const runs: RawRun[] = [
+      {
+        text: content,
+        startIndex: 0
+      }
+    ];
 
-    // Haven't found an actually useful one yet, but they look like this:
-    // [ { startIndex: 0, length: 19 } ] (for a string that is 19 characters long)
-    // Const style_runs = data.styleRuns;
+    if (style_runs || command_runs || attachment_runs) {
+      if (style_runs) {
+        for (const style_run of style_runs) {
+          if (
+            style_run.italic ||
+            style_run.strikethrough === 'LINE_STYLE_SINGLE' ||
+            style_run.weightLabel === 'FONT_WEIGHT_MEDIUM' ||
+            style_run.weightLabel === 'FONT_WEIGHT_BOLD'
+          ) {
+            const matching_run = findMatchingRun(runs, style_run);
 
-    let last_end_index = 0;
+            if (!matching_run) {
+              Log.warn(TAG, 'Unable to find matching run for style run. Skipping...', {
+                style_run,
+                input_data: data,
+                // For performance reasons, web browser consoles only expand an object, when the user clicks on it,
+                // So if we log the original runs object, it might have changed by the time the user looks at it.
+                // Deep clone, so that we log the exact state of the runs at this point.
+                parsed_runs: JSON.parse(JSON.stringify(runs))
+              });
 
-    if (command_runs) {
-      for (const item of command_runs) {
-        const length: number = item.length;
-        const start_index: number = item.startIndex;
-
-        if (start_index > last_end_index) {
-          runs.push({
-            text: content.slice(last_end_index, start_index)
-          });
-        }
-
-        if (Reflect.has(item, 'onTap')) {
-          let attachment = null;
-
-          if (Reflect.has(data, 'attachmentRuns')) {
-            const attachment_runs = data.attachmentRuns;
-
-            for (const attatchment_run of attachment_runs) {
-              if ((attatchment_run.startIndex - 2) == start_index) {
-                attachment = attatchment_run;
-                break;
-              }
+              continue;
             }
-          }
 
-          if (attachment) {
-            runs.push({
-              text: content.slice(start_index, start_index + length),
-              navigationEndpoint: item.onTap,
-              attachment
+            // Comments use MEDIUM for bold text and video descriptions use BOLD for bold text
+            insertSubRun(runs, matching_run, style_run, {
+              bold: style_run.weightLabel === 'FONT_WEIGHT_MEDIUM' || style_run.weightLabel === 'FONT_WEIGHT_BOLD',
+              italics: style_run.italic,
+              strikethrough: style_run.strikethrough === 'LINE_STYLE_SINGLE'
             });
           } else {
-            runs.push({
-              text: content.slice(start_index, start_index + length),
-              navigationEndpoint: item.onTap
+            Log.debug(TAG, 'Skipping style run as it is doesn\'t have any information that we parse.', {
+              style_run,
+              input_data: data
             });
           }
         }
-
-        last_end_index = start_index + length;
       }
 
-      if (last_end_index < content.length) {
-        runs.push({
-          text: content.slice(last_end_index)
-        });
+      if (command_runs) {
+        for (const command_run of command_runs) {
+          if (command_run.onTap) {
+            const matching_run = findMatchingRun(runs, command_run);
+
+            if (!matching_run) {
+              Log.warn(TAG, 'Unable to find matching run for command run. Skipping...', {
+                command_run,
+                input_data: data,
+                // For performance reasons, web browser consoles only expand an object, when the user clicks on it,
+                // So if we log the original runs object, it might have changed by the time the user looks at it.
+                // Deep clone, so that we log the exact state of the runs at this point.
+                parsed_runs: JSON.parse(JSON.stringify(runs))
+              });
+
+              continue;
+            }
+
+            insertSubRun(runs, matching_run, command_run, {
+              navigationEndpoint: command_run.onTap
+            });
+          } else {
+            Log.debug(TAG, 'Skipping command run as it is missing the "doTap" property.', {
+              command_run,
+              input_data: data
+            });
+          }
+        }
+      }
+
+      if (attachment_runs) {
+        for (const attachment_run of attachment_runs) {
+          const matching_run = findMatchingRun(runs, attachment_run);
+
+          if (!matching_run) {
+            Log.warn(TAG, 'Unable to find matching run for attachment run. Skipping...', {
+              attachment_run,
+              input_data: data,
+              // For performance reasons, web browser consoles only expand an object, when the user clicks on it,
+              // So if we log the original runs object, it might have changed by the time the user looks at it.
+              // Deep clone, so that we log the exact state of the runs at this point.
+              parsed_runs: JSON.parse(JSON.stringify(runs))
+            });
+
+            continue;
+          }
+
+          if (attachment_run.length === 0) {
+            matching_run.attachment = attachment_run;
+          } else {
+            const offset_start_index = attachment_run.startIndex - matching_run.startIndex;
+
+            const text = matching_run.text.substring(offset_start_index, offset_start_index + attachment_run.length);
+
+            const is_custom_emoji = (/^:[^:]+:$/).test(text);
+
+            if (attachment_run.element?.type?.imageType?.image && (is_custom_emoji || (/^(?:\p{Emoji}|\u200d)+$/u).test(text))) {
+              const emoji = {
+                image: attachment_run.element.type.imageType.image,
+                isCustomEmoji: is_custom_emoji,
+                shortcuts: is_custom_emoji ? [ text ] : undefined
+              };
+
+              insertSubRun(runs, matching_run, attachment_run, { emoji });
+            } else {
+              insertSubRun(runs, matching_run, attachment_run, {
+                attachment: attachment_run
+              });
+            }
+          }
+        }
       }
-    } else {
-      runs.push({
-        text: content
-      });
     }
 
     return new Text({ runs });
@@ -141,4 +205,100 @@ export default class Text {
   toString(): string {
     return this.text || 'N/A';
   }
+}
+
+function findMatchingRun(runs: RawRun[], response_run: ResponseRun) {
+  return runs.find((run) => {
+    return run.startIndex <= response_run.startIndex &&
+      response_run.startIndex + response_run.length <= run.startIndex + run.text.length;
+  });
+}
+
+function insertSubRun(runs: RawRun[], original_run: RawRun, response_run: ResponseRun, properties_to_add: Omit<RawRun, 'text' | 'startIndex'>) {
+  const replace_index = runs.indexOf(original_run);
+  const replacement_runs = [];
+
+  const offset_start_index = response_run.startIndex - original_run.startIndex;
+
+  // Stuff before the run
+  if (response_run.startIndex > original_run.startIndex) {
+    replacement_runs.push({
+      ...original_run,
+      text: original_run.text.substring(0, offset_start_index)
+    });
+  }
+
+  replacement_runs.push({
+    ...original_run,
+    text: original_run.text.substring(offset_start_index, offset_start_index + response_run.length),
+    startIndex: response_run.startIndex,
+    ...properties_to_add
+  });
+
+  // Stuff after the run
+  if (response_run.startIndex + response_run.length < original_run.startIndex + original_run.text.length) {
+    replacement_runs.push({
+      ...original_run,
+      text: original_run.text.substring(offset_start_index + response_run.length),
+      startIndex: response_run.startIndex + response_run.length
+    });
+  }
+
+  runs.splice(replace_index, 1, ...replacement_runs);
+}
+
+interface RawRun {
+  text: string,
+  bold?: boolean;
+  italics?: boolean;
+  strikethrough?: boolean;
+  navigationEndpoint?: RawNode;
+  attachment?: RawNode;
+  emoji?: RawNode;
+  startIndex: number;
+}
+
+export interface AttributedText {
+  content: string;
+  styleRuns?: StyleRun[];
+  commandRuns?: CommandRun[];
+  attachmentRuns?: AttachmentRun[];
+  decorationRuns?: ResponseRun[];
+}
+
+interface ResponseRun {
+  startIndex: number;
+  length: number;
+}
+
+interface StyleRun extends ResponseRun {
+  italic?: boolean;
+  weightLabel?: string;
+  strikethrough?: string;
+  fontFamilyName?: string;
+  styleRunExtensions?: {
+    styleRunColorMapExtension?: {
+      colorMap?: {
+        key: string,
+        value: number
+      }[]
+    }
+  }
+}
+
+interface CommandRun extends ResponseRun {
+  onTap?: RawNode;
+}
+
+interface AttachmentRun extends ResponseRun {
+  alignment?: string;
+  element?: {
+    type?: {
+      imageType?: {
+        image: RawNode,
+        playbackState?: string;
+      }
+    };
+    properties?: RawNode
+  };
 }

src/parser/helpers.ts

@@ -154,7 +154,7 @@ export class Maybe {
     return this.#checkPrimative('object');
   }
 
-  /* eslint-ignore */
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
   function(): Function {
     return this.#assertPrimative('function');
   }
@@ -352,7 +352,6 @@ export class SuperParsedResult<T extends YTNode = YTNode> {
   }
 }
 
-
 export type ObservedArray<T extends YTNode = YTNode> = Array<T> & {
     /**
      * Returns the first object to match the rule.
@@ -442,7 +441,6 @@ export function observe<T extends YTNode>(obj: Array<T>): ObservedArray<T> {
         };
       }
 
-
       if (prop == 'firstOfType') {
         return (...types: YTNodeConstructor<YTNode>[]) => {
           return target.find((node: YTNode) => {

src/parser/index.ts

@@ -1,6 +1,4 @@
 export * as Parser from './parser.js';
-export * from './continuations.js';
-export * from './types/index.js';
 export * as Misc from './misc.js';
 export * as YTNodes from './nodes.js';
 export * as YT from './youtube/index.js';
@@ -8,4 +6,9 @@ export * as YTMusic from './ytmusic/index.js';
 export * as YTKids from './ytkids/index.js';
 export * as YTShorts from './ytshorts/index.js';
 export * as Helpers from './helpers.js';
-export * as Generator from './generator.js';
+export * as Generator from './generator.js';
+export * as APIResponseTypes from './types/index.js';
+export * from './continuations.js';
+
+// @TODO: Remove this when files are updated to use APIResponseTypes or /types/index.js directly.
+export * from './types/index.js';

src/parser/nodes.ts

@@ -55,8 +55,10 @@ export { default as ChannelThumbnailWithLink } from './classes/ChannelThumbnailW
 export { default as ChannelVideoPlayer } from './classes/ChannelVideoPlayer.js';
 export { default as Chapter } from './classes/Chapter.js';
 export { default as ChildVideo } from './classes/ChildVideo.js';
+export { default as ChipBarView } from './classes/ChipBarView.js';
 export { default as ChipCloud } from './classes/ChipCloud.js';
 export { default as ChipCloudChip } from './classes/ChipCloudChip.js';
+export { default as ChipView } from './classes/ChipView.js';
 export { default as ClipAdState } from './classes/ClipAdState.js';
 export { default as ClipCreation } from './classes/ClipCreation.js';
 export { default as ClipCreationScrubber } from './classes/ClipCreationScrubber.js';
@@ -64,7 +66,7 @@ export { default as ClipCreationTextInput } from './classes/ClipCreationTextInpu
 export { default as ClipSection } from './classes/ClipSection.js';
 export { default as CollaboratorInfoCardContent } from './classes/CollaboratorInfoCardContent.js';
 export { default as CollageHeroImage } from './classes/CollageHeroImage.js';
-export { default as Command } from './classes/Command.js';
+export { default as CollectionThumbnailView } from './classes/CollectionThumbnailView.js';
 export { default as AuthorCommentBadge } from './classes/comments/AuthorCommentBadge.js';
 export { default as Comment } from './classes/comments/Comment.js';
 export { default as CommentActionButtons } from './classes/comments/CommentActionButtons.js';
@@ -77,6 +79,7 @@ export { default as CommentsHeader } from './classes/comments/CommentsHeader.js'
 export { default as CommentSimplebox } from './classes/comments/CommentSimplebox.js';
 export { default as CommentsSimplebox } from './classes/comments/CommentsSimplebox.js';
 export { default as CommentThread } from './classes/comments/CommentThread.js';
+export { default as CommentView } from './classes/comments/CommentView.js';
 export { default as CreatorHeart } from './classes/comments/CreatorHeart.js';
 export { default as EmojiPicker } from './classes/comments/EmojiPicker.js';
 export { default as PdgCommentChip } from './classes/comments/PdgCommentChip.js';
@@ -116,6 +119,7 @@ export { default as EndScreenPlaylist } from './classes/EndScreenPlaylist.js';
 export { default as EndScreenVideo } from './classes/EndScreenVideo.js';
 export { default as EngagementPanelSectionList } from './classes/EngagementPanelSectionList.js';
 export { default as EngagementPanelTitleHeader } from './classes/EngagementPanelTitleHeader.js';
+export { default as EomSettingsDisclaimer } from './classes/EomSettingsDisclaimer.js';
 export { default as ExpandableMetadata } from './classes/ExpandableMetadata.js';
 export { default as ExpandableTab } from './classes/ExpandableTab.js';
 export { default as ExpandableVideoDescriptionBody } from './classes/ExpandableVideoDescriptionBody.js';
@@ -210,6 +214,8 @@ export { default as LiveChatItemList } from './classes/LiveChatItemList.js';
 export { default as LiveChatMessageInput } from './classes/LiveChatMessageInput.js';
 export { default as LiveChatParticipant } from './classes/LiveChatParticipant.js';
 export { default as LiveChatParticipantsList } from './classes/LiveChatParticipantsList.js';
+export { default as LockupMetadataView } from './classes/LockupMetadataView.js';
+export { default as LockupView } from './classes/LockupView.js';
 export { default as MacroMarkersInfoItem } from './classes/MacroMarkersInfoItem.js';
 export { default as MacroMarkersList } from './classes/MacroMarkersList.js';
 export { default as MacroMarkersListItem } from './classes/MacroMarkersListItem.js';
@@ -255,8 +261,10 @@ export { default as MusicLargeCardItemCarousel } from './classes/MusicLargeCardI
 export { default as MusicMultiRowListItem } from './classes/MusicMultiRowListItem.js';
 export { default as MusicNavigationButton } from './classes/MusicNavigationButton.js';
 export { default as MusicPlayButton } from './classes/MusicPlayButton.js';
+export { default as MusicPlaylistEditHeader } from './classes/MusicPlaylistEditHeader.js';
 export { default as MusicPlaylistShelf } from './classes/MusicPlaylistShelf.js';
 export { default as MusicQueue } from './classes/MusicQueue.js';
+export { default as MusicResponsiveHeader } from './classes/MusicResponsiveHeader.js';
 export { default as MusicResponsiveListItem } from './classes/MusicResponsiveListItem.js';
 export { default as MusicResponsiveListItemFixedColumn } from './classes/MusicResponsiveListItemFixedColumn.js';
 export { default as MusicResponsiveListItemFlexColumn } from './classes/MusicResponsiveListItemFlexColumn.js';
@@ -367,7 +375,10 @@ export { default as Tab } from './classes/Tab.js';
 export { default as Tabbed } from './classes/Tabbed.js';
 export { default as TabbedSearchResults } from './classes/TabbedSearchResults.js';
 export { default as TextHeader } from './classes/TextHeader.js';
+export { default as ThumbnailBadgeView } from './classes/ThumbnailBadgeView.js';
+export { default as ThumbnailHoverOverlayView } from './classes/ThumbnailHoverOverlayView.js';
 export { default as ThumbnailLandscapePortrait } from './classes/ThumbnailLandscapePortrait.js';
+export { default as ThumbnailOverlayBadgeView } from './classes/ThumbnailOverlayBadgeView.js';
 export { default as ThumbnailOverlayBottomPanel } from './classes/ThumbnailOverlayBottomPanel.js';
 export { default as ThumbnailOverlayEndorsement } from './classes/ThumbnailOverlayEndorsement.js';
 export { default as ThumbnailOverlayHoverText } from './classes/ThumbnailOverlayHoverText.js';
@@ -380,6 +391,7 @@ export { default as ThumbnailOverlayResumePlayback } from './classes/ThumbnailOv
 export { default as ThumbnailOverlaySidePanel } from './classes/ThumbnailOverlaySidePanel.js';
 export { default as ThumbnailOverlayTimeStatus } from './classes/ThumbnailOverlayTimeStatus.js';
 export { default as ThumbnailOverlayToggleButton } from './classes/ThumbnailOverlayToggleButton.js';
+export { default as ThumbnailView } from './classes/ThumbnailView.js';
 export { default as TimedMarkerDecoration } from './classes/TimedMarkerDecoration.js';
 export { default as TitleAndButtonListHeader } from './classes/TitleAndButtonListHeader.js';
 export { default as ToggleButton } from './classes/ToggleButton.js';
@@ -403,6 +415,7 @@ export { default as UpsellDialog } from './classes/UpsellDialog.js';
 export { default as VerticalList } from './classes/VerticalList.js';
 export { default as VerticalWatchCardList } from './classes/VerticalWatchCardList.js';
 export { default as Video } from './classes/Video.js';
+export { default as VideoAttributesSectionView } from './classes/VideoAttributesSectionView.js';
 export { default as VideoAttributeView } from './classes/VideoAttributeView.js';
 export { default as VideoCard } from './classes/VideoCard.js';
 export { default as VideoDescriptionCourseSection } from './classes/VideoDescriptionCourseSection.js';

src/parser/parser.ts

@@ -25,6 +25,8 @@ import MusicMultiSelectMenuItem from './classes/menus/MusicMultiSelectMenuItem.j
 import Format from './classes/misc/Format.js';
 import VideoDetails from './classes/misc/VideoDetails.js';
 import NavigationEndpoint from './classes/NavigationEndpoint.js';
+import CommentView from './classes/comments/CommentView.js';
+import MusicThumbnail from './classes/MusicThumbnail.js';
 
 import type { KeyInfo } from './generator.js';
 import type { ObservedArray, YTNodeConstructor, YTNode } from './helpers.js';
@@ -43,7 +45,8 @@ export type ParserError = {
   classdata: RawNode,
   error: unknown
 } | {
-  error_type: 'mutation_data_missing'
+  error_type: 'mutation_data_missing',
+  classname: string
 } | {
   error_type: 'mutation_data_invalid',
   total: number,
@@ -74,7 +77,8 @@ const IGNORED_LIST = new Set([
   'BrandVideoSingleton',
   'StatementBanner',
   'GuideSigninPromo',
-  'AdsEngagementPanelContent'
+  'AdsEngagementPanelContent',
+  'MiniGameCardView'
 ]);
 
 const RUNTIME_NODES = new Map<string, YTNodeConstructor>(Object.entries(YTNodes));
@@ -91,7 +95,8 @@ let ERROR_HANDLER: ParserErrorHandler = ({ classname, ...context }: ParserError)
           new InnertubeError(
             `Something went wrong at ${classname}!\n` +
             `This is a bug, please report it at ${Platform.shim.info.bugs_url}`, {
-              stack: context.error.stack
+              stack: context.error.stack,
+              classdata: JSON.stringify(context.classdata, null, 2)
             }
           )
         );
@@ -108,7 +113,7 @@ let ERROR_HANDLER: ParserErrorHandler = ({ classname, ...context }: ParserError)
     case 'mutation_data_missing':
       Log.warn(TAG,
         new InnertubeError(
-          'Mutation data required for processing MusicMultiSelectMenuItems, but none found.\n' +
+          `Mutation data required for processing ${classname}, but none found.\n` +
           `This is a bug, please report it at ${Platform.shim.info.bugs_url}`
         )
       );
@@ -306,16 +311,12 @@ export function parseResponse<T extends IParsedResponse = IParsedResponse>(data:
   }
   _clearMemo();
 
-  _createMemo();
-  const entries = parse(data.entries);
-  if (entries) {
-    parsed_data.entries = entries;
-    parsed_data.entries_memo = _getMemo();
-  }
-  _clearMemo();
-
   applyMutations(contents_memo, data.frameworkUpdates?.entityBatchUpdate?.mutations);
 
+  if (on_response_received_endpoints_memo) {
+    applyCommentsMutations(on_response_received_endpoints_memo, data.frameworkUpdates?.entityBatchUpdate?.mutations);
+  }
+
   const continuation = data.continuation ? parseC(data.continuation) : null;
   if (continuation) {
     parsed_data.continuation = continuation;
@@ -361,6 +362,11 @@ export function parseResponse<T extends IParsedResponse = IParsedResponse>(data:
     parsed_data.player_overlays = player_overlays;
   }
 
+  const background = parseItem(data.background, MusicThumbnail);
+  if (background) {
+    parsed_data.background = background;
+  }
+
   const playback_tracking = data.playbackTracking ? {
     videostats_watchtime_url: data.playbackTracking.videostatsWatchtimeUrl.baseUrl,
     videostats_playback_url: data.playbackTracking.videostatsPlaybackUrl.baseUrl
@@ -467,6 +473,29 @@ export function parseResponse<T extends IParsedResponse = IParsedResponse>(data:
     parsed_data.engagement_panels = engagement_panels;
   }
 
+  if (data.playerResponse) {
+    const player_response = parseResponse(data.playerResponse);
+    parsed_data.player_response = player_response;
+  }
+
+  if (data.watchNextResponse) {
+    const watch_next_response = parseResponse(data.watchNextResponse);
+    parsed_data.watch_next_response = watch_next_response;
+  }
+
+  if (data.cpnInfo) {
+    const cpn_info = {
+      cpn: data.cpnInfo.cpn,
+      cpn_source: data.cpnInfo.cpnSource
+    };
+
+    parsed_data.cpn_info = cpn_info;
+  }
+
+  if (data.entries) {
+    parsed_data.entries = data.entries.map((entry) => new NavigationEndpoint(entry));
+  }
+
   return parsed_data;
 }
 
@@ -683,3 +712,31 @@ export function applyMutations(memo: Memo, mutations: RawNode[]) {
     }
   }
 }
+
+export function applyCommentsMutations(memo: Memo, mutations: RawNode[]) {
+  const comment_view_items = memo.getType(CommentView);
+
+  if (comment_view_items.length > 0) {
+    if (!mutations) {
+      ERROR_HANDLER({
+        error_type: 'mutation_data_missing',
+        classname: 'CommentView'
+      });
+    }
+
+    for (const comment_view of comment_view_items) {
+      const comment_mutation = mutations
+        .find((mutation) => mutation.payload?.commentEntityPayload?.key === comment_view.keys.comment)
+        ?.payload?.commentEntityPayload;
+
+      const toolbar_state_mutation = mutations
+        .find((mutation) => mutation.payload?.engagementToolbarStateEntityPayload?.key === comment_view.keys.toolbar_state)
+        ?.payload?.engagementToolbarStateEntityPayload;
+
+      const engagement_toolbar = mutations.find((mutation) => mutation.entityKey === comment_view.keys.toolbar_surface)
+        ?.payload?.engagementToolbarSurfaceEntityPayload;
+
+      comment_view.applyMutations(comment_mutation, toolbar_state_mutation, engagement_toolbar);
+    }
+  }
+}

src/parser/types/ParsedResponse.ts

@@ -1,11 +1,11 @@
 import type { Memo, ObservedArray, SuperParsedResult, YTNode } from '../helpers.js';
-
 import type {
   ReloadContinuationItemsCommand, Continuation, GridContinuation,
   ItemSectionContinuation, LiveChatContinuation, MusicPlaylistShelfContinuation, MusicShelfContinuation,
   PlaylistPanelContinuation, SectionListContinuation, ContinuationCommand
 } from '../index.js';
 
+import type { CpnSource } from './RawResponse.js';
 import type PlayerCaptionsTracklist from '../classes/PlayerCaptionsTracklist.js';
 import type CardCollection from '../classes/CardCollection.js';
 import type Endscreen from '../classes/Endscreen.js';
@@ -19,9 +19,10 @@ import type AlertWithButton from '../classes/AlertWithButton.js';
 import type NavigationEndpoint from '../classes/NavigationEndpoint.js';
 import type PlayerAnnotationsExpanded from '../classes/PlayerAnnotationsExpanded.js';
 import type EngagementPanelSectionList from '../classes/EngagementPanelSectionList.js';
-import type { AppendContinuationItemsAction } from '../nodes.js';
+import type { AppendContinuationItemsAction, MusicThumbnail } from '../nodes.js';
 
 export interface IParsedResponse {
+  background?: MusicThumbnail;
   actions?: SuperParsedResult<YTNode>;
   actions_memo?: Memo;
   contents?: SuperParsedResult<YTNode>;
@@ -50,10 +51,7 @@ export interface IParsedResponse {
   refinements?: string[];
   estimated_results?: number;
   player_overlays?: SuperParsedResult<YTNode>;
-  playback_tracking?: {
-    videostats_watchtime_url: string;
-    videostats_playback_url: string;
-  };
+  playback_tracking?: IPlaybackTracking;
   playability_status?: IPlayabilityStatus;
   streaming_data?: IStreamingData;
   player_config?: IPlayerConfig;
@@ -65,11 +63,29 @@ export interface IParsedResponse {
   storyboards?: PlayerStoryboardSpec | PlayerLiveStoryboardSpec;
   endscreen?: Endscreen;
   cards?: CardCollection;
+  cpn_info?: {
+    cpn: string;
+    cpn_source: CpnSource;
+  },
   engagement_panels?: ObservedArray<EngagementPanelSectionList>;
   items?: SuperParsedResult<YTNode>;
-  entries?: SuperParsedResult<YTNode>;
+  entries?: NavigationEndpoint[];
   entries_memo?: Memo;
   continuation_endpoint?: YTNode;
+  player_response?: IPlayerResponse;
+  watch_next_response?: INextResponse;
+}
+
+export interface IPlaybackTracking {
+  videostats_watchtime_url: string;
+  videostats_playback_url: string;
+}
+export interface IPlayabilityStatus {
+  status: string;
+  error_screen: YTNode | null;
+  audio_only_playablility: AudioOnlyPlayability | null;
+  embeddable: boolean;
+  reason: string;
 }
 
 export interface IPlayerConfig {
@@ -98,94 +114,12 @@ export interface IStreamingData {
   hls_manifest_url: string | null;
 }
 
-export interface IPlayerResponse {
-  captions?: PlayerCaptionsTracklist;
-  cards?: CardCollection;
-  endscreen?: Endscreen;
-  microformat?: YTNode;
-  annotations?: ObservedArray<PlayerAnnotationsExpanded>;
-  playability_status: IPlayabilityStatus;
-  streaming_data?: IStreamingData;
-  player_config: IPlayerConfig;
-  playback_tracking?: {
-    videostats_watchtime_url: string;
-    videostats_playback_url: string;
-  };
-  storyboards?: PlayerStoryboardSpec | PlayerLiveStoryboardSpec;
-  video_details?: VideoDetails;
-}
-
-export interface IPlayabilityStatus {
-  status: string;
-  error_screen: YTNode | null;
-  audio_only_playablility: AudioOnlyPlayability | null;
-  embeddable: boolean;
-  reason: string;
-}
-
-export interface INextResponse {
-  contents?: SuperParsedResult<YTNode>;
-  contents_memo?: Memo;
-  current_video_endpoint?: NavigationEndpoint;
-  on_response_received_endpoints?: ObservedArray<ReloadContinuationItemsCommand | AppendContinuationItemsAction>;
-  on_response_received_endpoints_memo?: Memo;
-  player_overlays?: SuperParsedResult<YTNode>;
-  engagement_panels?: ObservedArray<EngagementPanelSectionList>;
-}
-
-export interface IBrowseResponse {
-  continuation_contents?: ItemSectionContinuation | SectionListContinuation | LiveChatContinuation | MusicPlaylistShelfContinuation |
-  MusicShelfContinuation | GridContinuation | PlaylistPanelContinuation;
-  continuation_contents_memo?: Memo;
-  on_response_received_actions: ObservedArray<ReloadContinuationItemsCommand | AppendContinuationItemsAction>;
-  on_response_received_actions_memo: Memo;
-  on_response_received_endpoints?: ObservedArray<ReloadContinuationItemsCommand | AppendContinuationItemsAction>;
-  on_response_received_endpoints_memo?: Memo;
-  contents?: SuperParsedResult<YTNode>;
-  contents_memo?: Memo;
-  header?: SuperParsedResult<YTNode>;
-  header_memo?: Memo;
-  metadata?: SuperParsedResult<YTNode>;
-  microformat?: YTNode;
-  alerts?: ObservedArray<Alert | AlertWithButton>;
-  sidebar?: YTNode;
-  sidebar_memo?: Memo;
-}
-
-export interface ISearchResponse {
-  header?: SuperParsedResult<YTNode>;
-  header_memo?: Memo;
-  contents?: SuperParsedResult<YTNode>;
-  contents_memo?: Memo;
-  on_response_received_commands?: ObservedArray<ReloadContinuationItemsCommand | AppendContinuationItemsAction>;
-  continuation_contents?: ItemSectionContinuation | SectionListContinuation | LiveChatContinuation | MusicPlaylistShelfContinuation |
-  MusicShelfContinuation | GridContinuation | PlaylistPanelContinuation;
-  continuation_contents_memo?: Memo;
-  refinements?: string[];
-  estimated_results: number;
-}
-
-export interface IResolveURLResponse {
-  endpoint: NavigationEndpoint;
-}
-
-export interface IGetTranscriptResponse {
-  actions: SuperParsedResult<YTNode>;
-  actions_memo: Memo;
-}
-
-export interface IGetNotificationsMenuResponse {
-  actions: SuperParsedResult<YTNode>;
-  actions_memo: Memo;
-}
-
-export interface IUpdatedMetadataResponse {
-  actions: SuperParsedResult<YTNode>;
-  actions_memo: Memo;
-  continuation?: Continuation;
-}
-
-export interface IGuideResponse {
-  items: SuperParsedResult<YTNode>;
-  items_memo: Memo;
-}
+export type IPlayerResponse = Pick<IParsedResponse, 'captions' | 'cards' | 'endscreen' | 'microformat' | 'annotations' | 'playability_status' | 'streaming_data' | 'player_config' | 'playback_tracking' | 'storyboards' | 'video_details'>;
+export type INextResponse = Pick<IParsedResponse, 'contents' | 'contents_memo' | 'current_video_endpoint' | 'on_response_received_endpoints' | 'on_response_received_endpoints_memo' | 'player_overlays' | 'engagement_panels'>
+export type IBrowseResponse = Pick<IParsedResponse, 'background' | 'continuation_contents' | 'continuation_contents_memo' | 'on_response_received_actions' | 'on_response_received_actions_memo' | 'on_response_received_endpoints' | 'on_response_received_endpoints_memo' | 'contents' | 'contents_memo' | 'header' | 'header_memo' | 'metadata' | 'microformat' | 'alerts' | 'sidebar' | 'sidebar_memo'>
+export type ISearchResponse = Pick<IParsedResponse, 'header' | 'header_memo' | 'contents' | 'contents_memo' | 'on_response_received_commands' | 'continuation_contents' | 'continuation_contents_memo' | 'refinements' | 'estimated_results'>;
+export type IResolveURLResponse = Pick<IParsedResponse, 'endpoint'>;
+export type IGetTranscriptResponse = Pick<IParsedResponse, 'actions' | 'actions_memo'>
+export type IGetNotificationsMenuResponse = Pick<IParsedResponse, 'actions' | 'actions_memo'>
+export type IUpdatedMetadataResponse = Pick<IParsedResponse, 'actions' | 'actions_memo' | 'continuation'>
+export type IGuideResponse = Pick<IParsedResponse, 'items' | 'items_memo'>

src/parser/types/RawResponse.ts

@@ -1,6 +1,21 @@
 export type RawNode = Record<string, any>;
 export type RawData = RawNode | RawNode[];
 
+export type CpnSource = 'CPN_SOURCE_TYPE_CLIENT' | 'CPN_SOURCE_TYPE_WATCH_SERVER';
+
+export interface IServiceTrackingParams {
+  service: string;
+  params?: {
+    key: string;
+    value: string;
+  }[];
+}
+
+export interface IResponseContext {
+  serviceTrackingParams: IServiceTrackingParams[];
+  maxAgeSeconds: number;
+}
+
 export interface IRawPlayerConfig {
   audioConfig: {
     loudnessDb?: number;
@@ -20,6 +35,8 @@ export interface IRawPlayerConfig {
 }
 
 export interface IRawResponse {
+  responseContext?: IResponseContext;
+  background?: RawNode;
   contents?: RawData;
   onResponseReceivedActions?: RawNode[];
   onResponseReceivedEndpoints?: RawNode[];
@@ -60,6 +77,8 @@ export interface IRawResponse {
     hlsManifestUrl?: string;
   };
   playerConfig?: IRawPlayerConfig;
+  playerResponse?: IRawResponse;
+  watchNextResponse?: IRawResponse;
   currentVideoEndpoint?: RawNode;
   unseenCount?: number;
   playlistId?: string;
@@ -70,8 +89,13 @@ export interface IRawResponse {
   storyboards?: RawNode;
   endscreen?: RawNode;
   cards?: RawNode;
+  cpnInfo?: {
+    cpn: string;
+    cpnSource: CpnSource;
+  },
   items?: RawNode[];
   frameworkUpdates?: any;
-  engagementPanels: RawNode[];
+  engagementPanels?: RawNode[];
+  entries?: RawNode[];
   [key: string]: any;
 }

src/parser/youtube/AccountInfo.ts

@@ -7,7 +7,7 @@ import type { IParsedResponse } from '../types/index.js';
 import type AccountItemSection from '../classes/AccountItemSection.js';
 import type AccountChannel from '../classes/AccountChannel.js';
 
-class AccountInfo {
+export default class AccountInfo {
   #page: IParsedResponse;
 
   contents: AccountItemSection | null;
@@ -31,6 +31,4 @@ class AccountInfo {
   get page(): IParsedResponse {
     return this.#page;
   }
-}
-
-export default AccountInfo;
+}