From 3d0ec848cd5495a2f965625cf4e048192e35bf10 Mon Sep 17 00:00:00 2001 From: Luan Date: Sat, 15 Feb 2025 20:39:13 -0300 Subject: [PATCH] chore(protos): Add all possible `onesie_proxy_status` enum values --- examples/onesie-request/main.ts | 2 +- .../video_streaming/onesie_player_response.ts | 113 +++++++++++++++++- .../video_streaming/onesie_request.ts | 22 +++- .../onesie_player_response.proto | 19 ++- protos/video_streaming/onesie_request.proto | 1 + src/utils/Protos.ts | 2 +- 6 files changed, 151 insertions(+), 8 deletions(-) diff --git a/examples/onesie-request/main.ts b/examples/onesie-request/main.ts index 1a94acb..f16c36c 100644 --- a/examples/onesie-request/main.ts +++ b/examples/onesie-request/main.ts @@ -227,7 +227,7 @@ async function getBasicInfo(innertube: Innertube, videoId: string): Promise = { break; } - message.onesieProxyStatus = reader.int32(); + message.onesieProxyStatus = reader.int32() as any; continue; case 2: if (tag !== 16) { @@ -84,7 +189,7 @@ export const OnesiePlayerResponse: MessageFns = { fromJSON(object: any): OnesiePlayerResponse { return { - onesieProxyStatus: isSet(object.onesieProxyStatus) ? globalThis.Number(object.onesieProxyStatus) : 0, + onesieProxyStatus: isSet(object.onesieProxyStatus) ? onesieProxyStatusFromJSON(object.onesieProxyStatus) : 0, httpStatus: isSet(object.httpStatus) ? globalThis.Number(object.httpStatus) : 0, headers: globalThis.Array.isArray(object?.headers) ? object.headers.map((e: any) => HttpHeader.fromJSON(e)) : [], body: isSet(object.body) ? bytesFromBase64(object.body) : new Uint8Array(0), @@ -94,7 +199,7 @@ export const OnesiePlayerResponse: MessageFns = { toJSON(message: OnesiePlayerResponse): unknown { const obj: any = {}; if (message.onesieProxyStatus !== undefined && message.onesieProxyStatus !== 0) { - obj.onesieProxyStatus = Math.round(message.onesieProxyStatus); + obj.onesieProxyStatus = onesieProxyStatusToJSON(message.onesieProxyStatus); } if (message.httpStatus !== undefined && message.httpStatus !== 0) { obj.httpStatus = Math.round(message.httpStatus); diff --git a/protos/generated/video_streaming/onesie_request.ts b/protos/generated/video_streaming/onesie_request.ts index cd0771f..0ec59ba 100644 --- a/protos/generated/video_streaming/onesie_request.ts +++ b/protos/generated/video_streaming/onesie_request.ts @@ -20,7 +20,11 @@ export interface OnesieRequest { onesieUstreamerConfig?: Uint8Array | undefined; maxVp9Height?: number | undefined; clientDisplayHeight?: number | undefined; - streamerContext?: StreamerContext | undefined; + streamerContext?: + | StreamerContext + | undefined; + /** MLOnesieRequestTarget */ + requestTarget?: number | undefined; bufferedRanges: BufferedRange[]; } @@ -33,6 +37,7 @@ function createBaseOnesieRequest(): OnesieRequest { maxVp9Height: 0, clientDisplayHeight: 0, streamerContext: undefined, + requestTarget: 0, bufferedRanges: [], }; } @@ -60,6 +65,9 @@ export const OnesieRequest: MessageFns = { if (message.streamerContext !== undefined) { StreamerContext.encode(message.streamerContext, writer.uint32(82).fork()).join(); } + if (message.requestTarget !== undefined && message.requestTarget !== 0) { + writer.uint32(104).int32(message.requestTarget); + } for (const v of message.bufferedRanges) { BufferedRange.encode(v!, writer.uint32(114).fork()).join(); } @@ -122,6 +130,13 @@ export const OnesieRequest: MessageFns = { message.streamerContext = StreamerContext.decode(reader, reader.uint32()); continue; + case 13: + if (tag !== 104) { + break; + } + + message.requestTarget = reader.int32(); + continue; case 14: if (tag !== 114) { break; @@ -149,6 +164,7 @@ export const OnesieRequest: MessageFns = { maxVp9Height: isSet(object.maxVp9Height) ? globalThis.Number(object.maxVp9Height) : 0, clientDisplayHeight: isSet(object.clientDisplayHeight) ? globalThis.Number(object.clientDisplayHeight) : 0, streamerContext: isSet(object.streamerContext) ? StreamerContext.fromJSON(object.streamerContext) : undefined, + requestTarget: isSet(object.requestTarget) ? globalThis.Number(object.requestTarget) : 0, bufferedRanges: globalThis.Array.isArray(object?.bufferedRanges) ? object.bufferedRanges.map((e: any) => BufferedRange.fromJSON(e)) : [], @@ -178,6 +194,9 @@ export const OnesieRequest: MessageFns = { if (message.streamerContext !== undefined) { obj.streamerContext = StreamerContext.toJSON(message.streamerContext); } + if (message.requestTarget !== undefined && message.requestTarget !== 0) { + obj.requestTarget = Math.round(message.requestTarget); + } if (message.bufferedRanges?.length) { obj.bufferedRanges = message.bufferedRanges.map((e) => BufferedRange.toJSON(e)); } @@ -202,6 +221,7 @@ export const OnesieRequest: MessageFns = { message.streamerContext = (object.streamerContext !== undefined && object.streamerContext !== null) ? StreamerContext.fromPartial(object.streamerContext) : undefined; + message.requestTarget = object.requestTarget ?? 0; message.bufferedRanges = object.bufferedRanges?.map((e) => BufferedRange.fromPartial(e)) || []; return message; }, diff --git a/protos/video_streaming/onesie_player_response.proto b/protos/video_streaming/onesie_player_response.proto index 6e60cf2..4ae400c 100644 --- a/protos/video_streaming/onesie_player_response.proto +++ b/protos/video_streaming/onesie_player_response.proto @@ -3,8 +3,25 @@ package video_streaming; import "misc/common.proto"; +enum OnesieProxyStatus { + ONESIE_PROXY_STATUS_UNKNOWN = 0; + ONESIE_PROXY_STATUS_OK = 1; + ONESIE_PROXY_STATUS_DECRYPTION_FAILED = 2; + ONESIE_PROXY_STATUS_PARSING_FAILED = 3; + ONESIE_PROXY_STATUS_MISSING_X_FORWARDED_FOR = 4; + ONESIE_PROXY_STATUS_INVALID_X_FORWARDED_FOR = 5; + ONESIE_PROXY_STATUS_INVALID_CONTENT_TYPE = 6; + ONESIE_PROXY_STATUS_BACKEND_ERROR = 7; + ONESIE_PROXY_STATUS_CLIENT_ERROR = 8; + ONESIE_PROXY_STATUS_MISSING_CRYPTER = 9; + ONESIE_PROXY_STATUS_RESPONSE_JSON_SERIALIZATION_FAILED = 10; + ONESIE_PROXY_STATUS_DECOMPRESSION_FAILED = 11; + ONESIE_PROXY_STATUS_JSON_PARSING_FAILED = 12; + ONESIE_PROXY_STATUS_UNKNOWN_COMPRESSION_TYPE = 13; +} + message OnesiePlayerResponse { - optional int32 onesie_proxy_status = 1; + optional OnesieProxyStatus onesie_proxy_status = 1; optional int32 http_status = 2; repeated .misc.HttpHeader headers = 3; optional bytes body = 4; diff --git a/protos/video_streaming/onesie_request.proto b/protos/video_streaming/onesie_request.proto index bb10932..8f8030e 100644 --- a/protos/video_streaming/onesie_request.proto +++ b/protos/video_streaming/onesie_request.proto @@ -14,5 +14,6 @@ message OnesieRequest { optional int32 max_vp9_height = 5; optional int32 client_display_height = 6; optional StreamerContext streamer_context = 10; + optional int32 request_target = 13; // MLOnesieRequestTarget repeated BufferedRange buffered_ranges = 14; } \ No newline at end of file diff --git a/src/utils/Protos.ts b/src/utils/Protos.ts index bbe86b2..af54fdc 100644 --- a/src/utils/Protos.ts +++ b/src/utils/Protos.ts @@ -14,7 +14,7 @@ export { EncryptedPlayerRequest } from '../../protos/generated/video_streaming/e export { OnesieHeader } from '../../protos/generated/video_streaming/onesie_header.js'; export { OnesieHeaderType } from '../../protos/generated/video_streaming/onesie_header_type.js'; export { OnesiePlayerRequest } from '../../protos/generated/video_streaming/onesie_player_request.js'; -export { OnesiePlayerResponse } from '../../protos/generated/video_streaming/onesie_player_response.js'; +export { OnesiePlayerResponse, OnesieProxyStatus } from '../../protos/generated/video_streaming/onesie_player_response.js'; export { ClientAbrState } from '../../protos/generated/video_streaming/client_abr_state.js'; export { StreamerContext } from '../../protos/generated/video_streaming/streamer_context.js'; export { ProxyStatus } from '../../protos/generated/video_streaming/proxy_status.js';