Skip to content

Commit 8e3b613

Browse files
fix: improve type handling for onSegment events (#457)
1 parent e53acf8 commit 8e3b613

File tree

1 file changed

+16
-4
lines changed
  • packages/p2p-media-loader-core/src/requests

1 file changed

+16
-4
lines changed

packages/p2p-media-loader-core/src/requests/request.ts

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
RequestError,
66
RequestAbortErrorType,
77
SegmentWithStream,
8+
Segment,
89
} from "../types.js";
910
import * as StreamUtils from "../utils/stream.js";
1011
import * as Utils from "../utils/utils.js";
@@ -52,6 +53,17 @@ export type RequestStatus =
5253
| "failed"
5354
| "aborted";
5455

56+
function mapSegmentWithStreamToSegment(segment: SegmentWithStream): Segment {
57+
return {
58+
runtimeId: segment.runtimeId,
59+
externalId: segment.externalId,
60+
url: segment.url,
61+
byteRange: segment.byteRange,
62+
startTime: segment.startTime,
63+
endTime: segment.endTime,
64+
};
65+
}
66+
5567
export class Request {
5668
private currentAttempt?: RequestAttempt;
5769
private _failedAttempts = new FailedRequestAttempts();
@@ -187,7 +199,7 @@ export class Request {
187199
);
188200

189201
this.onSegmentStart({
190-
segment: this.segment,
202+
segment: mapSegmentWithStreamToSegment(this.segment),
191203
downloadSource: requestData.downloadSource,
192204
peerId:
193205
requestData.downloadSource === "p2p" ? requestData.peerId : undefined,
@@ -209,7 +221,7 @@ export class Request {
209221
);
210222
this._abortRequestCallback?.(new RequestError("abort"));
211223
this.onSegmentAbort({
212-
segment: this.segment,
224+
segment: mapSegmentWithStreamToSegment(this.segment),
213225
downloadSource: this.currentAttempt?.downloadSource,
214226
peerId:
215227
this.currentAttempt?.downloadSource === "p2p"
@@ -237,7 +249,7 @@ export class Request {
237249
error,
238250
});
239251
this.onSegmentError({
240-
segment: this.segment,
252+
segment: mapSegmentWithStreamToSegment(this.segment),
241253
error,
242254
downloadSource: this.currentAttempt.downloadSource,
243255
peerId:
@@ -264,7 +276,7 @@ export class Request {
264276
error,
265277
});
266278
this.onSegmentError({
267-
segment: this.segment,
279+
segment: mapSegmentWithStreamToSegment(this.segment),
268280
error,
269281
downloadSource: this.currentAttempt.downloadSource,
270282
peerId:

0 commit comments

Comments
 (0)