@gcorevideo/player 2.20.4 → 2.20.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/assets/error-screen/error_screen.ejs +3 -1
- package/dist/core.js +407 -205
- package/dist/index.css +1238 -1238
- package/dist/index.js +542 -383
- package/dist/plugins/index.css +993 -993
- package/dist/plugins/index.js +113 -159
- package/lib/Player.d.ts.map +1 -1
- package/lib/Player.js +2 -2
- package/lib/playback/BasePlayback.d.ts +11 -0
- package/lib/playback/BasePlayback.d.ts.map +1 -0
- package/lib/playback/BasePlayback.js +33 -0
- package/lib/playback/dash-playback/DashPlayback.d.ts +3 -2
- package/lib/playback/dash-playback/DashPlayback.d.ts.map +1 -1
- package/lib/playback/dash-playback/DashPlayback.js +7 -7
- package/lib/playback/hls-playback/HlsPlayback.d.ts +2 -2
- package/lib/playback/hls-playback/HlsPlayback.d.ts.map +1 -1
- package/lib/playback/hls-playback/HlsPlayback.js +8 -5
- package/lib/playback/utils.d.ts +2 -0
- package/lib/playback/utils.d.ts.map +1 -0
- package/lib/playback/utils.js +1 -0
- package/lib/playback.types.d.ts +10 -3
- package/lib/playback.types.d.ts.map +1 -1
- package/lib/playback.types.js +3 -3
- package/lib/plugins/context-menu/ContextMenu.d.ts.map +1 -1
- package/lib/plugins/context-menu/ContextMenu.js +1 -2
- package/lib/plugins/error-screen/ErrorScreen.d.ts +39 -24
- package/lib/plugins/error-screen/ErrorScreen.d.ts.map +1 -1
- package/lib/plugins/error-screen/ErrorScreen.js +70 -136
- package/lib/plugins/media-control/MediaControl.d.ts +1 -1
- package/lib/plugins/media-control/MediaControl.d.ts.map +1 -1
- package/lib/plugins/media-control/MediaControl.js +7 -5
- package/lib/plugins/multi-camera/MultiCamera.d.ts.map +1 -1
- package/lib/plugins/multi-camera/MultiCamera.js +2 -3
- package/lib/plugins/poster/Poster.js +1 -1
- package/lib/plugins/source-controller/SourceController.d.ts +2 -1
- package/lib/plugins/source-controller/SourceController.d.ts.map +1 -1
- package/lib/plugins/source-controller/SourceController.js +12 -6
- package/lib/plugins/spinner-three-bounce/SpinnerThreeBounce.d.ts +2 -1
- package/lib/plugins/spinner-three-bounce/SpinnerThreeBounce.d.ts.map +1 -1
- package/lib/plugins/spinner-three-bounce/SpinnerThreeBounce.js +19 -3
- package/lib/testUtils.d.ts +66 -2
- package/lib/testUtils.d.ts.map +1 -1
- package/lib/testUtils.js +95 -2
- package/package.json +2 -2
- package/src/Player.ts +2 -2
- package/src/__tests__/Player.test.ts +2 -3
- package/src/playback/BasePlayback.ts +41 -0
- package/src/playback/dash-playback/DashPlayback.ts +11 -15
- package/src/playback/hls-playback/HlsPlayback.ts +7 -5
- package/src/playback/utils.ts +2 -0
- package/src/playback.types.ts +11 -3
- package/src/plugins/context-menu/ContextMenu.ts +1 -2
- package/src/plugins/error-screen/ErrorScreen.ts +121 -195
- package/src/plugins/error-screen/__tests__/ErrorScreen.test.ts +113 -0
- package/src/plugins/error-screen/__tests__/__snapshots__/ErrorScreen.test.ts.snap +20 -0
- package/src/plugins/level-selector/__tests__/LevelSelector.test.ts +32 -57
- package/src/plugins/media-control/MediaControl.ts +8 -5
- package/src/plugins/multi-camera/MultiCamera.ts +2 -3
- package/src/plugins/poster/Poster.ts +1 -1
- package/src/plugins/source-controller/SourceController.ts +20 -14
- package/src/plugins/source-controller/__tests__/SourceController.test.ts +29 -46
- package/src/plugins/spinner-three-bounce/SpinnerThreeBounce.ts +20 -3
- package/src/testUtils.ts +100 -3
- package/tsconfig.tsbuildinfo +1 -1
package/dist/plugins/index.js
CHANGED
|
@@ -32649,7 +32649,7 @@ const volumeOffIcon = "<svg width=\"24\" height=\"24\" viewBox=\"0 0 24 24\" fil
|
|
|
32649
32649
|
|
|
32650
32650
|
const pluginHtml$7 = "<div class=\"big-mute-icon-wrapper\" data-big-mute>\n <div class=\"big-mute-icon gcore-skin-border-color\" data-big-mute-icon></div>\n</div>\n";
|
|
32651
32651
|
|
|
32652
|
-
const T$
|
|
32652
|
+
const T$a = 'plugins.big_mute_button';
|
|
32653
32653
|
// TODO rewrite as a container plugin
|
|
32654
32654
|
/**
|
|
32655
32655
|
* Displays a big mute button over the video when it's muted.
|
|
@@ -32691,7 +32691,7 @@ class BigMuteButton extends UICorePlugin {
|
|
|
32691
32691
|
this.listenTo(this.core, Events$1.CORE_READY, this.onCoreReady);
|
|
32692
32692
|
this.listenTo(this.core, 'core:advertisement:start', this.onStartAd);
|
|
32693
32693
|
this.listenTo(this.core, 'core:advertisement:finish', this.onFinishAd);
|
|
32694
|
-
trace(`${T$
|
|
32694
|
+
trace(`${T$a} bindEvents`, {
|
|
32695
32695
|
mediacontrol: !!this.core.mediaControl,
|
|
32696
32696
|
});
|
|
32697
32697
|
this.listenTo(this.core.mediaControl, Events$1.MEDIACONTROL_RENDERED, this.mediaControlRendered);
|
|
@@ -32748,7 +32748,7 @@ class BigMuteButton extends UICorePlugin {
|
|
|
32748
32748
|
*/
|
|
32749
32749
|
render() {
|
|
32750
32750
|
if (this.shouldRender()) {
|
|
32751
|
-
trace(`${T$
|
|
32751
|
+
trace(`${T$a} render`, {
|
|
32752
32752
|
el: !!this.$el,
|
|
32753
32753
|
});
|
|
32754
32754
|
this.$el.html(BigMuteButton.template());
|
|
@@ -35958,7 +35958,7 @@ class ClipsPlugin extends UICorePlugin {
|
|
|
35958
35958
|
|
|
35959
35959
|
const templateHtml$1 = "<ul class=\"context-menu-list\">\n <% if(options) { %>\n <% for (var i = 0; i < options.length; i++) { %>\n <li class=\"context-menu-list-item <%= options[i].class %>\"\n data-<%= options[i].name %>><%= options[i].label %></li>\n <% } %>\n <% } %>\n</ul>\n";
|
|
35960
35960
|
|
|
35961
|
-
var version$1 = "2.20.
|
|
35961
|
+
var version$1 = "2.20.5";
|
|
35962
35962
|
|
|
35963
35963
|
var packages = {
|
|
35964
35964
|
"node_modules/@clappr/core": {
|
|
@@ -36040,7 +36040,7 @@ class ContextMenu extends UIContainerPlugin {
|
|
|
36040
36040
|
this._url = this.options.contextMenu.url;
|
|
36041
36041
|
}
|
|
36042
36042
|
this.render();
|
|
36043
|
-
this.
|
|
36043
|
+
$('body').on('click', this.hideOnBodyClick);
|
|
36044
36044
|
}
|
|
36045
36045
|
/**
|
|
36046
36046
|
* @internal
|
|
@@ -36048,7 +36048,6 @@ class ContextMenu extends UIContainerPlugin {
|
|
|
36048
36048
|
bindEvents() {
|
|
36049
36049
|
this.listenTo(this.container, Events$1.CONTAINER_CONTEXTMENU, this.toggleContextMenu);
|
|
36050
36050
|
this.listenTo(this.container, Events$1.CONTAINER_CLICK, this.hide);
|
|
36051
|
-
$('body').on('click', this.hideOnBodyClick);
|
|
36052
36051
|
}
|
|
36053
36052
|
/**
|
|
36054
36053
|
* @internal
|
|
@@ -36217,178 +36216,114 @@ class DvrControls extends UICorePlugin {
|
|
|
36217
36216
|
|
|
36218
36217
|
const reloadIcon = "<svg fill=\"#FFFFFF\" height=\"24\" viewBox=\"0 0 24 24\" width=\"24\" xmlns=\"http://www.w3.org/2000/svg\">\n <path d=\"M17.65 6.35C16.2 4.9 14.21 4 12 4c-4.42 0-7.99 3.58-7.99 8s3.57 8 7.99 8c3.73 0 6.84-2.55 7.73-6h-2.08c-.82 2.33-3.04 4-5.65 4-3.31 0-6-2.69-6-6s2.69-6 6-6c1.66 0 3.14.69 4.22 1.78L13 11h7V4l-2.35 2.35z\"/>\n <path d=\"M0 0h24v24H0z\" fill=\"none\"/>\n</svg>";
|
|
36219
36218
|
|
|
36220
|
-
const templateHtml = "<div class=\"player-error-screen__content\" data-error-screen>\n <% if (icon) { %>\n <div class=\"player-error-screen__icon\" data-error-screen><%= icon %></div>\n <% } %>\n <div class=\"player-error-screen__title\" data-error-screen><%= title %></div>\n <% if (message) { %>\n <div class=\"player-error-screen__message\" data-error-screen><%= message %></div>\n <% } %>\n <% if (code) { %>\n <div class=\"player-error-screen__code\" data-error-screen>Error code: <%= code %></div>\n <% } %>\n <div class=\"player-error-screen__reload\" data-error-screen><%= reloadIcon %></div>\n</div>\n";
|
|
36219
|
+
const templateHtml = "<div class=\"player-error-screen__content\" data-error-screen>\n <% if (icon) { %>\n <div class=\"player-error-screen__icon\" data-error-screen><%= icon %></div>\n <% } %>\n <div class=\"player-error-screen__title\" data-error-screen><%= title %></div>\n <% if (message) { %>\n <div class=\"player-error-screen__message\" data-error-screen><%= message %></div>\n <% } %>\n <% if (code) { %>\n <div class=\"player-error-screen__code\" data-error-screen>Error code: <%= code %></div>\n <% } %>\n <% if (reloadIcon) { %>\n <div class=\"player-error-screen__reload\" data-error-screen><%= reloadIcon %></div>\n <% } %>\n</div>\n";
|
|
36221
36220
|
|
|
36222
|
-
const
|
|
36223
|
-
const MAX_RETRY = 10;
|
|
36221
|
+
const T$9 = 'plugins.error_screen';
|
|
36224
36222
|
/**
|
|
36225
|
-
* Displays
|
|
36223
|
+
* Displays an error nicely in the overlay on top of the player.
|
|
36226
36224
|
* @beta
|
|
36227
36225
|
*/
|
|
36228
36226
|
class ErrorScreen extends UICorePlugin {
|
|
36229
|
-
_retry = 0;
|
|
36230
36227
|
err = null;
|
|
36231
|
-
|
|
36232
|
-
|
|
36233
|
-
|
|
36228
|
+
/**
|
|
36229
|
+
* @internal
|
|
36230
|
+
*/
|
|
36234
36231
|
get name() {
|
|
36235
|
-
return '
|
|
36232
|
+
return 'error_screen';
|
|
36236
36233
|
}
|
|
36234
|
+
/**
|
|
36235
|
+
* @internal
|
|
36236
|
+
*/
|
|
36237
36237
|
get supportedVersion() {
|
|
36238
36238
|
return { min: CLAPPR_VERSION };
|
|
36239
36239
|
}
|
|
36240
|
-
|
|
36241
|
-
|
|
36242
|
-
|
|
36243
|
-
|
|
36244
|
-
return this.core.activeContainer;
|
|
36245
|
-
}
|
|
36240
|
+
static template = tmpl(templateHtml);
|
|
36241
|
+
/**
|
|
36242
|
+
* @internal
|
|
36243
|
+
*/
|
|
36246
36244
|
get attributes() {
|
|
36247
36245
|
return {
|
|
36248
|
-
|
|
36246
|
+
class: 'player-error-screen',
|
|
36249
36247
|
'data-error-screen': '',
|
|
36250
36248
|
};
|
|
36251
36249
|
}
|
|
36250
|
+
/**
|
|
36251
|
+
* @internal
|
|
36252
|
+
*/
|
|
36252
36253
|
bindEvents() {
|
|
36253
36254
|
this.listenTo(this.core, Events$1.ERROR, this.onError);
|
|
36254
|
-
this.listenTo(this.core, Events$1.
|
|
36255
|
-
this.listenTo(this.core, 'core:advertisement:start', this.onStartAd);
|
|
36256
|
-
this.listenTo(this.core, 'core:advertisement:finish', this.onFinishAd);
|
|
36257
|
-
this.listenTo(this.core.mediaControl, Events$1.MEDIACONTROL_CONTAINERCHANGED, this.onContainerChanged);
|
|
36258
|
-
}
|
|
36259
|
-
onCoreReady() {
|
|
36260
|
-
if (this.core.activePlayback) {
|
|
36261
|
-
this.listenTo(this.core.activePlayback, Events$1.PLAYBACK_PLAY, this.onPlay);
|
|
36262
|
-
}
|
|
36255
|
+
this.listenTo(this.core, Events$1.CORE_ACTIVE_CONTAINER_CHANGED, this.onActiveContainerChanged);
|
|
36263
36256
|
}
|
|
36264
36257
|
onPlay() {
|
|
36265
|
-
this.
|
|
36258
|
+
this.unmount();
|
|
36266
36259
|
}
|
|
36267
|
-
|
|
36268
|
-
this._retry = 0;
|
|
36260
|
+
unmount() {
|
|
36269
36261
|
this.err = null;
|
|
36270
|
-
|
|
36271
|
-
|
|
36272
|
-
this.timeout = null;
|
|
36273
|
-
}
|
|
36274
|
-
this.$el.hide();
|
|
36262
|
+
this.$el.empty();
|
|
36263
|
+
// this.$el.hide();
|
|
36275
36264
|
}
|
|
36276
|
-
|
|
36277
|
-
|
|
36278
|
-
|
|
36279
|
-
|
|
36280
|
-
|
|
36281
|
-
|
|
36282
|
-
|
|
36283
|
-
}
|
|
36284
|
-
bindReload() {
|
|
36285
|
-
this.reloadButton = this.$el.find('.player-error-screen__reload');
|
|
36286
|
-
this.reloadButton && this.reloadButton.on('click', this.reload.bind(this));
|
|
36265
|
+
/**
|
|
36266
|
+
* @internal
|
|
36267
|
+
*/
|
|
36268
|
+
get events() {
|
|
36269
|
+
return {
|
|
36270
|
+
'click .player-error-screen__reload': 'reload',
|
|
36271
|
+
};
|
|
36287
36272
|
}
|
|
36288
36273
|
reload() {
|
|
36289
|
-
|
|
36290
|
-
|
|
36291
|
-
|
|
36292
|
-
|
|
36293
|
-
|
|
36294
|
-
|
|
36295
|
-
|
|
36296
|
-
}
|
|
36297
|
-
unbindReload() {
|
|
36298
|
-
this.reloadButton && this.reloadButton.off('click');
|
|
36274
|
+
setTimeout(() => {
|
|
36275
|
+
this.core.configure({
|
|
36276
|
+
reloading: true,
|
|
36277
|
+
source: this.core.options.source,
|
|
36278
|
+
sources: this.core.options.sources,
|
|
36279
|
+
});
|
|
36280
|
+
}, 0);
|
|
36299
36281
|
}
|
|
36300
|
-
|
|
36282
|
+
onActiveContainerChanged() {
|
|
36283
|
+
trace(`${T$9} onActiveContainerChanged`, {
|
|
36284
|
+
reloading: this.core.options.reloading,
|
|
36285
|
+
});
|
|
36301
36286
|
this.err = null;
|
|
36302
|
-
|
|
36303
|
-
|
|
36304
|
-
|
|
36305
|
-
|
|
36306
|
-
|
|
36307
|
-
|
|
36308
|
-
|
|
36309
|
-
|
|
36310
|
-
|
|
36311
|
-
this.hide();
|
|
36312
|
-
}
|
|
36313
|
-
}
|
|
36314
|
-
onFinishAd() {
|
|
36315
|
-
this.hideValue = false;
|
|
36316
|
-
if (this.err) {
|
|
36317
|
-
this.container.disableMediaControl();
|
|
36318
|
-
this.container.stop();
|
|
36319
|
-
this.show();
|
|
36287
|
+
this.listenTo(this.core.activeContainer.playback, Events$1.PLAYBACK_PLAY, this.onPlay);
|
|
36288
|
+
if (this.core.options.reloading) {
|
|
36289
|
+
setTimeout(() => {
|
|
36290
|
+
this.core.options.reloading = false;
|
|
36291
|
+
this.unmount();
|
|
36292
|
+
this.core.activeContainer.play({
|
|
36293
|
+
reloading: true,
|
|
36294
|
+
});
|
|
36295
|
+
}, 0);
|
|
36320
36296
|
}
|
|
36321
36297
|
}
|
|
36322
36298
|
onError(err) {
|
|
36323
|
-
if (err.
|
|
36324
|
-
err
|
|
36325
|
-
|
|
36299
|
+
if (err.UI) {
|
|
36300
|
+
if (this.err) {
|
|
36301
|
+
this.unmount();
|
|
36302
|
+
}
|
|
36326
36303
|
this.err = {
|
|
36327
|
-
title:
|
|
36328
|
-
message:
|
|
36329
|
-
code:
|
|
36330
|
-
|
|
36331
|
-
icon: '',
|
|
36332
|
-
reloadIcon,
|
|
36304
|
+
title: err.UI.title,
|
|
36305
|
+
message: err.UI.message,
|
|
36306
|
+
code: err.code,
|
|
36307
|
+
icon: err.UI.icon,
|
|
36333
36308
|
};
|
|
36334
|
-
|
|
36335
|
-
return;
|
|
36336
|
-
}
|
|
36337
|
-
if (this.options.errorScreen?.neverStopToRetry) {
|
|
36338
|
-
this._retry = 0;
|
|
36339
|
-
}
|
|
36340
|
-
if (this._retry >= MAX_RETRY) {
|
|
36341
|
-
this.drying();
|
|
36342
|
-
return;
|
|
36343
|
-
}
|
|
36344
|
-
const ctp = this.container.getPlugin('click_to_pause_custom');
|
|
36345
|
-
const toggleCTP = !!ctp?.enabled;
|
|
36346
|
-
if (toggleCTP) {
|
|
36347
|
-
// clickToPausePlugin.afterEnabled = true;
|
|
36348
|
-
ctp.disable();
|
|
36349
|
-
}
|
|
36350
|
-
this.timeout = setTimeout(() => {
|
|
36351
|
-
if (toggleCTP) {
|
|
36352
|
-
ctp.enable();
|
|
36353
|
-
}
|
|
36354
|
-
this.reload();
|
|
36355
|
-
}, TIME_FOR_UPDATE);
|
|
36356
|
-
const spinnerPlugin = this.container.getPlugin('spinner');
|
|
36357
|
-
if (spinnerPlugin) {
|
|
36358
|
-
spinnerPlugin.show(); // TODO remove?
|
|
36359
|
-
setTimeout(() => spinnerPlugin.show(), 0);
|
|
36360
|
-
}
|
|
36361
|
-
}
|
|
36362
|
-
}
|
|
36363
|
-
drying() {
|
|
36364
|
-
const spinnerPlugin = this.container.getPlugin('spinner');
|
|
36365
|
-
spinnerPlugin?.hide();
|
|
36366
|
-
this._retry = 0;
|
|
36367
|
-
if (!this.hideValue) {
|
|
36368
|
-
this.container.disableMediaControl();
|
|
36369
|
-
this.container.stop();
|
|
36370
|
-
this.show();
|
|
36371
|
-
}
|
|
36372
|
-
}
|
|
36373
|
-
show(err) {
|
|
36374
|
-
if (err) {
|
|
36375
|
-
this.err = err;
|
|
36309
|
+
this.render();
|
|
36376
36310
|
}
|
|
36377
|
-
// TODO use container.disableMediaControl() instead
|
|
36378
|
-
this.core.mediaControl.disable();
|
|
36379
|
-
this.render();
|
|
36380
|
-
this.$el.show();
|
|
36381
|
-
}
|
|
36382
|
-
hide() {
|
|
36383
|
-
this.$el.hide();
|
|
36384
36311
|
}
|
|
36312
|
+
/**
|
|
36313
|
+
* @internal
|
|
36314
|
+
*/
|
|
36385
36315
|
render() {
|
|
36386
36316
|
if (!this.err) {
|
|
36387
36317
|
return this;
|
|
36388
36318
|
}
|
|
36389
|
-
this.$el.html(
|
|
36390
|
-
|
|
36391
|
-
|
|
36319
|
+
this.$el.html(ErrorScreen.template({
|
|
36320
|
+
...this.err,
|
|
36321
|
+
reloadIcon: this.options.errorScreen?.noReload ? null : reloadIcon,
|
|
36322
|
+
}));
|
|
36323
|
+
// TODO append to container instead of core?
|
|
36324
|
+
if (!this.el.parentElement) {
|
|
36325
|
+
this.core.$el.append(this.el);
|
|
36326
|
+
}
|
|
36392
36327
|
return this;
|
|
36393
36328
|
}
|
|
36394
36329
|
}
|
|
@@ -37587,7 +37522,7 @@ class MediaControl extends UICorePlugin {
|
|
|
37587
37522
|
}
|
|
37588
37523
|
}
|
|
37589
37524
|
/**
|
|
37590
|
-
*
|
|
37525
|
+
* Hides the media control UI
|
|
37591
37526
|
*/
|
|
37592
37527
|
disable() {
|
|
37593
37528
|
this.userDisabled = true;
|
|
@@ -38275,13 +38210,13 @@ class MediaControl extends UICorePlugin {
|
|
|
38275
38210
|
destroy() {
|
|
38276
38211
|
$(document).unbind('mouseup', this.stopDrag);
|
|
38277
38212
|
$(document).unbind('mousemove', this.updateDrag);
|
|
38213
|
+
$(document).unbind('touchend', this.stopDrag);
|
|
38214
|
+
$(document).unbind('touchmove', this.updateDrag);
|
|
38278
38215
|
this.unbindKeyEvents();
|
|
38279
|
-
// @ts-ignore
|
|
38280
|
-
this.stopListening();
|
|
38281
38216
|
return super.destroy();
|
|
38282
38217
|
}
|
|
38283
38218
|
configure() {
|
|
38284
|
-
this.advertisementPlaying ? this.disable() : this.enable()
|
|
38219
|
+
// this.advertisementPlaying ? this.disable() : this.enable()
|
|
38285
38220
|
this.trigger(Events$1.MEDIACONTROL_OPTIONS_CHANGE);
|
|
38286
38221
|
}
|
|
38287
38222
|
/**
|
|
@@ -38673,13 +38608,12 @@ class MultiCamera extends UICorePlugin {
|
|
|
38673
38608
|
}
|
|
38674
38609
|
catch (error) {
|
|
38675
38610
|
}
|
|
38676
|
-
// TODO
|
|
38677
|
-
this.core.getPlugin('
|
|
38611
|
+
// TODO trigger error instead
|
|
38612
|
+
this.core.getPlugin('error_screen')?.show({
|
|
38678
38613
|
title: this.core.i18n.t('source_offline'),
|
|
38679
38614
|
message: '',
|
|
38680
38615
|
code: '',
|
|
38681
38616
|
icon: '',
|
|
38682
|
-
reloadIcon: '',
|
|
38683
38617
|
});
|
|
38684
38618
|
}
|
|
38685
38619
|
hideError() {
|
|
@@ -39140,7 +39074,7 @@ class Poster extends UIContainerPlugin {
|
|
|
39140
39074
|
}
|
|
39141
39075
|
static template = tmpl(posterHTML);
|
|
39142
39076
|
get shouldRender() {
|
|
39143
|
-
if (!this.enabled) {
|
|
39077
|
+
if (!this.enabled || this.options.reloading) {
|
|
39144
39078
|
return false;
|
|
39145
39079
|
}
|
|
39146
39080
|
const showForNoOp = !!this.options.poster?.showForNoOp;
|
|
@@ -39740,15 +39674,15 @@ var PlaybackErrorCode;
|
|
|
39740
39674
|
/**
|
|
39741
39675
|
* An unknown or uncategorised error.
|
|
39742
39676
|
*/
|
|
39743
|
-
PlaybackErrorCode[
|
|
39677
|
+
PlaybackErrorCode["Generic"] = "GENERIC_ERROR";
|
|
39744
39678
|
/**
|
|
39745
39679
|
* The media source is not available. Typically a network error.
|
|
39746
39680
|
*/
|
|
39747
|
-
PlaybackErrorCode[
|
|
39681
|
+
PlaybackErrorCode["MediaSourceUnavailable"] = "MEDIA_SOURCE_UNAVAILABLE";
|
|
39748
39682
|
/**
|
|
39749
39683
|
* The media source is not accessible due to some protection policy.
|
|
39750
39684
|
*/
|
|
39751
|
-
PlaybackErrorCode[
|
|
39685
|
+
PlaybackErrorCode["MediaSourceAccessDenied"] = "MEDIA_SOURCE_ACCESS_DENIED";
|
|
39752
39686
|
})(PlaybackErrorCode || (PlaybackErrorCode = {}));
|
|
39753
39687
|
|
|
39754
39688
|
const spinnerHTML = "<div data-bounce1></div>\n<div data-bounce2></div>\n<div data-bounce3></div>\n";
|
|
@@ -39796,6 +39730,7 @@ class SpinnerThreeBounce extends UIContainerPlugin {
|
|
|
39796
39730
|
'class': 'spinner-three-bounce'
|
|
39797
39731
|
};
|
|
39798
39732
|
}
|
|
39733
|
+
hideTimeout = null;
|
|
39799
39734
|
showTimeout = null;
|
|
39800
39735
|
template = tmpl(spinnerHTML);
|
|
39801
39736
|
hasFatalError = false;
|
|
@@ -39849,8 +39784,17 @@ class SpinnerThreeBounce extends UIContainerPlugin {
|
|
|
39849
39784
|
/**
|
|
39850
39785
|
* Shows the spinner
|
|
39851
39786
|
*/
|
|
39852
|
-
show() {
|
|
39853
|
-
this.showTimeout
|
|
39787
|
+
show(delay = 300) {
|
|
39788
|
+
if (this.showTimeout === null) {
|
|
39789
|
+
if (this.hideTimeout !== null) {
|
|
39790
|
+
clearTimeout(this.hideTimeout);
|
|
39791
|
+
this.hideTimeout = null;
|
|
39792
|
+
}
|
|
39793
|
+
this.showTimeout = setTimeout(() => {
|
|
39794
|
+
this.showTimeout = null;
|
|
39795
|
+
this.$el.show();
|
|
39796
|
+
}, delay);
|
|
39797
|
+
}
|
|
39854
39798
|
}
|
|
39855
39799
|
/**
|
|
39856
39800
|
* Hides the spinner
|
|
@@ -39860,7 +39804,12 @@ class SpinnerThreeBounce extends UIContainerPlugin {
|
|
|
39860
39804
|
clearTimeout(this.showTimeout);
|
|
39861
39805
|
this.showTimeout = null;
|
|
39862
39806
|
}
|
|
39863
|
-
this
|
|
39807
|
+
this.hideTimeout = setTimeout(() => {
|
|
39808
|
+
this.hideTimeout = null;
|
|
39809
|
+
if (this.showTimeout === null) {
|
|
39810
|
+
this.$el.hide();
|
|
39811
|
+
}
|
|
39812
|
+
}, 0);
|
|
39864
39813
|
}
|
|
39865
39814
|
/**
|
|
39866
39815
|
* @internal
|
|
@@ -39981,10 +39930,14 @@ class SourceController extends CorePlugin {
|
|
|
39981
39930
|
*/
|
|
39982
39931
|
bindEvents() {
|
|
39983
39932
|
super.bindEvents();
|
|
39984
|
-
this.listenTo(this.core, Events$1.
|
|
39933
|
+
this.listenTo(this.core, Events$1.CORE_READY, this.onCoreReady);
|
|
39934
|
+
this.listenTo(this.core, Events$1.CORE_ACTIVE_CONTAINER_CHANGED, this.onActiveContainerChanged);
|
|
39985
39935
|
}
|
|
39986
|
-
|
|
39987
|
-
|
|
39936
|
+
onCoreReady() {
|
|
39937
|
+
this.core.getPlugin('error_screen')?.disable(); // TODO test
|
|
39938
|
+
}
|
|
39939
|
+
onActiveContainerChanged() {
|
|
39940
|
+
trace(`${T$3} onActiveContainerChanged`, {
|
|
39988
39941
|
retrying: this.active,
|
|
39989
39942
|
currentSource: this.sourcesList[this.currentSourceIndex],
|
|
39990
39943
|
});
|
|
@@ -40000,7 +39953,7 @@ class SourceController extends CorePlugin {
|
|
|
40000
39953
|
this.bindContainerEventListeners();
|
|
40001
39954
|
if (this.active) {
|
|
40002
39955
|
this.core.activeContainer?.getPlugin('poster_custom')?.disable();
|
|
40003
|
-
spinner?.show();
|
|
39956
|
+
spinner?.show(0);
|
|
40004
39957
|
}
|
|
40005
39958
|
}
|
|
40006
39959
|
bindContainerEventListeners() {
|
|
@@ -40017,7 +39970,7 @@ class SourceController extends CorePlugin {
|
|
|
40017
39970
|
switch (error.code) {
|
|
40018
39971
|
case PlaybackErrorCode.MediaSourceUnavailable:
|
|
40019
39972
|
this.core.activeContainer?.getPlugin('poster_custom')?.disable();
|
|
40020
|
-
this.retryPlayback();
|
|
39973
|
+
setTimeout(() => this.retryPlayback(), 0);
|
|
40021
39974
|
break;
|
|
40022
39975
|
}
|
|
40023
39976
|
});
|
|
@@ -40044,6 +39997,7 @@ class SourceController extends CorePlugin {
|
|
|
40044
39997
|
currentSource: this.sourcesList[this.currentSourceIndex],
|
|
40045
39998
|
});
|
|
40046
39999
|
this.active = true;
|
|
40000
|
+
this.core.activeContainer?.getPlugin('spinner')?.show(0);
|
|
40047
40001
|
this.getNextMediaSource().then((nextSource) => {
|
|
40048
40002
|
const rnd = RETRY_DELAY_BLUR * Math.random();
|
|
40049
40003
|
this.sync(() => {
|
package/lib/Player.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Player.d.ts","sourceRoot":"","sources":["../src/Player.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EACV,aAAa,EAEb,uBAAuB,EACxB,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAGtD,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAEjE;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,WAAW,IACjD,CAAC,SAAS,WAAW,CAAC,IAAI,GACtB,CAAC,MAAM,CAAC,GACR,CAAC,SAAS,WAAW,CAAC,YAAY,GAClC,CAAC,MAAM,CAAC,GACR,CAAC,SAAS,WAAW,CAAC,UAAU,GAChC,CAAC,YAAY,CAAC,GACd,CAAC,SAAS,WAAW,CAAC,MAAM,GAC5B,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,GACnC,CAAC,SAAS,WAAW,CAAC,UAAU,GAChC,CAAC,OAAO,CAAC,GACT,CAAC,SAAS,WAAW,CAAC,KAAK,GAC3B,CAAC,aAAa,CAAC,GACf,EAAE,CAAA;AAER;;;;GAIG;AACH,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,WAAW,IAAI,CACtD,GAAG,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,KAC1B,IAAI,CAAA;AAeT;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,KAAK,GAAG,aAAa,CAAA;AAI3D;;;;;;;GAOG;AACH,qBAAa,MAAM;IACjB,OAAO,CAAC,MAAM,CAAgC;IAE9C,OAAO,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"Player.d.ts","sourceRoot":"","sources":["../src/Player.ts"],"names":[],"mappings":"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"}
|
package/lib/Player.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Browser, Events as ClapprEvents, Log, Player as PlayerClappr, $, Loader, } from '@clappr/core';
|
|
2
2
|
import { reportError, trace } from '@gcorevideo/utils';
|
|
3
3
|
import assert from 'assert';
|
|
4
|
-
import
|
|
4
|
+
import EventEmitter from 'eventemitter3';
|
|
5
5
|
import { PlayerEvent } from './types.js';
|
|
6
6
|
import { buildMediaSourcesList, wrapSource } from './utils/mediaSources.js';
|
|
7
7
|
import { registerPlaybacks } from './playback/index.js';
|
|
@@ -26,7 +26,7 @@ const DEFAULT_OPTIONS = {
|
|
|
26
26
|
*/
|
|
27
27
|
export class Player {
|
|
28
28
|
config = DEFAULT_OPTIONS;
|
|
29
|
-
emitter = new
|
|
29
|
+
emitter = new EventEmitter();
|
|
30
30
|
player = null;
|
|
31
31
|
ready = false;
|
|
32
32
|
rootNode = null;
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { ErrorOptions, HTML5Video } from '@clappr/core';
|
|
2
|
+
/**
|
|
3
|
+
* This class adds common behaviors to all playback modules.
|
|
4
|
+
* @internal
|
|
5
|
+
* TODO use custom HTML5Video playback with this layer applied
|
|
6
|
+
*/
|
|
7
|
+
export declare class BasePlayback extends HTML5Video {
|
|
8
|
+
createError(errorData: any, options?: ErrorOptions): Error;
|
|
9
|
+
_onProgress(): void;
|
|
10
|
+
}
|
|
11
|
+
//# sourceMappingURL=BasePlayback.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"BasePlayback.d.ts","sourceRoot":"","sources":["../../src/playback/BasePlayback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAU,UAAU,EAAe,MAAM,cAAc,CAAA;AAI5E;;;;GAIG;AACH,qBAAa,YAAa,SAAQ,UAAU;IAC1C,WAAW,CAAC,SAAS,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,YAAY;IA0BzC,WAAW;CAIrB"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import { Events, HTML5Video, PlayerError } from '@clappr/core';
|
|
2
|
+
import { PlaybackErrorCode } from '../playback.types.js';
|
|
3
|
+
/**
|
|
4
|
+
* This class adds common behaviors to all playback modules.
|
|
5
|
+
* @internal
|
|
6
|
+
* TODO use custom HTML5Video playback with this layer applied
|
|
7
|
+
*/
|
|
8
|
+
export class BasePlayback extends HTML5Video {
|
|
9
|
+
createError(errorData, options) {
|
|
10
|
+
const i18n = this.i18n ||
|
|
11
|
+
// @ts-ignore
|
|
12
|
+
(this.core && this.core.i18n) ||
|
|
13
|
+
// @ts-ignore
|
|
14
|
+
(this.container && this.container.i18n);
|
|
15
|
+
if (i18n &&
|
|
16
|
+
!errorData.UI &&
|
|
17
|
+
errorData.code === PlaybackErrorCode.MediaSourceUnavailable) {
|
|
18
|
+
const defaultUI = {
|
|
19
|
+
title: i18n.t('no_broadcast'),
|
|
20
|
+
message: '',
|
|
21
|
+
};
|
|
22
|
+
errorData.UI = defaultUI;
|
|
23
|
+
}
|
|
24
|
+
if (errorData.level === PlayerError.Levels.FATAL) {
|
|
25
|
+
this.trigger(Events.PLAYBACK_MEDIACONTROL_DISABLE);
|
|
26
|
+
}
|
|
27
|
+
return super.createError(errorData, options);
|
|
28
|
+
}
|
|
29
|
+
_onProgress() {
|
|
30
|
+
super._onProgress();
|
|
31
|
+
this.trigger(Events.PLAYBACK_MEDIACONTROL_ENABLE);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Playback } from '@clappr/core';
|
|
2
2
|
import DASHJS, { type BitrateInfo as DashBitrateInfo, IManifestInfo } from 'dashjs';
|
|
3
3
|
import { QualityLevel, TimePosition, TimeValue } from '../../playback.types.js';
|
|
4
|
+
import { BasePlayback } from '../BasePlayback.js';
|
|
4
5
|
type PlaybackType = typeof Playback.VOD | typeof Playback.LIVE | typeof Playback.AOD | typeof Playback.NO_OP;
|
|
5
6
|
type PlaylistType = string;
|
|
6
7
|
type LocalTimeCorrelation = {
|
|
7
8
|
local: number;
|
|
8
9
|
remote: number;
|
|
9
10
|
};
|
|
10
|
-
export default class DashPlayback extends
|
|
11
|
+
export default class DashPlayback extends BasePlayback {
|
|
11
12
|
_levels: QualityLevel[] | null;
|
|
12
13
|
_currentLevel: number | null;
|
|
13
14
|
_durationExcludesAfterLiveSyncPoint: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DashPlayback.d.ts","sourceRoot":"","sources":["../../../src/playback/dash-playback/DashPlayback.ts"],"names":[],"mappings":"AAIA,OAAO,
|
|
1
|
+
{"version":3,"file":"DashPlayback.d.ts","sourceRoot":"","sources":["../../../src/playback/dash-playback/DashPlayback.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,18 @@
|
|
|
1
1
|
// Copyright 2014 Globo.com Player authors. All rights reserved.
|
|
2
2
|
// Use of this source code is governed by a BSD-style
|
|
3
3
|
// license that can be found in the LICENSE file.
|
|
4
|
-
import { Events,
|
|
4
|
+
import { Events, Log, Playback, PlayerError, Utils, $ } from '@clappr/core';
|
|
5
5
|
import { trace } from '@gcorevideo/utils';
|
|
6
6
|
import assert from 'assert';
|
|
7
7
|
import DASHJS from 'dashjs';
|
|
8
8
|
import { PlaybackErrorCode, } from '../../playback.types.js';
|
|
9
9
|
import { isDashSource } from '../../utils/mediaSources.js';
|
|
10
|
+
import { BasePlayback } from '../BasePlayback.js';
|
|
10
11
|
const AUTO = -1;
|
|
11
12
|
const { now } = Utils;
|
|
12
13
|
const T = 'playback.dash';
|
|
13
14
|
// @ts-expect-error
|
|
14
|
-
export default class DashPlayback extends
|
|
15
|
+
export default class DashPlayback extends BasePlayback {
|
|
15
16
|
_levels = null;
|
|
16
17
|
_currentLevel = null;
|
|
17
18
|
// true when the actual duration is longer than hlsjs's live sync point
|
|
@@ -318,11 +319,10 @@ export default class DashPlayback extends HTML5Video {
|
|
|
318
319
|
};
|
|
319
320
|
triggerError(error) {
|
|
320
321
|
trace(`${T} triggerError`, { error });
|
|
321
|
-
this
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
});
|
|
322
|
+
// this triggers Events.ERROR to be handled by the UI
|
|
323
|
+
this.trigger(Events.PLAYBACK_ERROR, this.createError(error, {
|
|
324
|
+
useCodePrefix: false,
|
|
325
|
+
}));
|
|
326
326
|
// only reset the dash player in 10ms async, so that the rest of the
|
|
327
327
|
// calling function finishes
|
|
328
328
|
setTimeout(() => {
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { HTML5Video } from '@clappr/core';
|
|
2
1
|
import HLSJS, { Events as HlsEvents, type ErrorData as HlsErrorData, type FragChangedData, type FragLoadedData, type FragParsingMetadataData, type LevelSwitchingData } from 'hls.js';
|
|
3
2
|
import { PlaybackError, QualityLevel } from '../../playback.types.js';
|
|
4
3
|
import { PlaybackType } from '../../types.js';
|
|
5
|
-
|
|
4
|
+
import { BasePlayback } from '../BasePlayback.js';
|
|
5
|
+
export default class HlsPlayback extends BasePlayback {
|
|
6
6
|
private _ccIsSetup;
|
|
7
7
|
private _ccTracksUpdated;
|
|
8
8
|
private _currentFragment;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HlsPlayback.d.ts","sourceRoot":"","sources":["../../../src/playback/hls-playback/HlsPlayback.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"HlsPlayback.d.ts","sourceRoot":"","sources":["../../../src/playback/hls-playback/HlsPlayback.ts"],"names":[],"mappings":"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"}
|