5
5
RequestError ,
6
6
RequestAbortErrorType ,
7
7
SegmentWithStream ,
8
+ Segment ,
8
9
} from "../types.js" ;
9
10
import * as StreamUtils from "../utils/stream.js" ;
10
11
import * as Utils from "../utils/utils.js" ;
@@ -52,6 +53,17 @@ export type RequestStatus =
52
53
| "failed"
53
54
| "aborted" ;
54
55
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
+
55
67
export class Request {
56
68
private currentAttempt ?: RequestAttempt ;
57
69
private _failedAttempts = new FailedRequestAttempts ( ) ;
@@ -187,7 +199,7 @@ export class Request {
187
199
) ;
188
200
189
201
this . onSegmentStart ( {
190
- segment : this . segment ,
202
+ segment : mapSegmentWithStreamToSegment ( this . segment ) ,
191
203
downloadSource : requestData . downloadSource ,
192
204
peerId :
193
205
requestData . downloadSource === "p2p" ? requestData . peerId : undefined ,
@@ -209,7 +221,7 @@ export class Request {
209
221
) ;
210
222
this . _abortRequestCallback ?.( new RequestError ( "abort" ) ) ;
211
223
this . onSegmentAbort ( {
212
- segment : this . segment ,
224
+ segment : mapSegmentWithStreamToSegment ( this . segment ) ,
213
225
downloadSource : this . currentAttempt ?. downloadSource ,
214
226
peerId :
215
227
this . currentAttempt ?. downloadSource === "p2p"
@@ -237,7 +249,7 @@ export class Request {
237
249
error,
238
250
} ) ;
239
251
this . onSegmentError ( {
240
- segment : this . segment ,
252
+ segment : mapSegmentWithStreamToSegment ( this . segment ) ,
241
253
error,
242
254
downloadSource : this . currentAttempt . downloadSource ,
243
255
peerId :
@@ -264,7 +276,7 @@ export class Request {
264
276
error,
265
277
} ) ;
266
278
this . onSegmentError ( {
267
- segment : this . segment ,
279
+ segment : mapSegmentWithStreamToSegment ( this . segment ) ,
268
280
error,
269
281
downloadSource : this . currentAttempt . downloadSource ,
270
282
peerId :
0 commit comments