extracted connectionManager from site.js

new module ServerConnections for ConnectionManager
all code adapted to this new module
removed Events and ConnectionManager from eslintrc
This commit is contained in:
vitorsemeano
2020-10-17 19:08:56 +01:00
parent 923d53bb71
commit 5071aedcea
81 changed files with 446 additions and 397 deletions
@@ -1,4 +1,4 @@
import { ConnectionManager, Events } from 'jellyfin-apiclient';
import { Events } from 'jellyfin-apiclient';
import { playbackManager } from '../playback/playbackmanager';
import syncPlayManager from './syncPlayManager';
import loading from '../loading/loading';
@@ -6,6 +6,7 @@ import toast from '../toast/toast';
import actionsheet from '../actionSheet/actionSheet';
import globalize from '../../scripts/globalize';
import playbackPermissionManager from './playbackPermissionManager';
import ServerConnections from '../ServerConnections';
/**
* Gets active player id.
@@ -171,8 +172,8 @@ export default function show (button) {
});
});
const apiClient = window.ConnectionManager.currentApiClient();
ConnectionManager.user(apiClient).then((user) => {
const apiClient = ServerConnections.currentApiClient();
ServerConnections.user(apiClient).then((user) => {
if (syncPlayEnabled) {
showLeaveGroupSelection(button, user, apiClient);
} else {
+6 -5
View File
@@ -3,11 +3,12 @@
* @module components/syncPlay/syncPlayManager
*/
import { ConnectionManager, Events } from 'jellyfin-apiclient';
import { Events } from 'jellyfin-apiclient';
import { playbackManager } from '../playback/playbackmanager';
import timeSyncManager from './timeSyncManager';
import toast from '../toast/toast';
import globalize from '../../scripts//globalize';
import ServerConnections from '../ServerConnections';
/**
* Waits for an event to be triggered on an object. An optional timeout can specified after which the promise is rejected.
@@ -127,7 +128,7 @@ class SyncPlayManager {
// Report ping
if (this.syncEnabled) {
const apiClient = window.ConnectionManager.currentApiClient();
const apiClient = ServerConnections.currentApiClient();
const sessionId = getActivePlayerId();
if (!sessionId) {
@@ -659,7 +660,7 @@ class SyncPlayManager {
* Overrides PlaybackManager's unpause method.
*/
playRequest (player) {
const apiClient = ConnectionManager.currentApiClient();
const apiClient = ServerConnections.currentApiClient();
apiClient.requestSyncPlayStart();
}
@@ -667,7 +668,7 @@ class SyncPlayManager {
* Overrides PlaybackManager's pause method.
*/
pauseRequest (player) {
const apiClient = ConnectionManager.currentApiClient();
const apiClient = ServerConnections.currentApiClient();
apiClient.requestSyncPlayPause();
// Pause locally as well, to give the user some little control
playbackManager._localUnpause(player);
@@ -677,7 +678,7 @@ class SyncPlayManager {
* Overrides PlaybackManager's seek method.
*/
seekRequest (PositionTicks, player) {
const apiClient = ConnectionManager.currentApiClient();
const apiClient = ServerConnections.currentApiClient();
apiClient.requestSyncPlaySeek({
PositionTicks: PositionTicks
});
+3 -2
View File
@@ -3,7 +3,8 @@
* @module components/syncPlay/timeSyncManager
*/
import { ConnectionManager, Events } from 'jellyfin-apiclient';
import { Events } from 'jellyfin-apiclient';
import ServerConnections from '../ServerConnections';
/**
* Time estimation
@@ -113,7 +114,7 @@ class TimeSyncManager {
if (!this.poller) {
this.poller = setTimeout(() => {
this.poller = null;
const apiClient = window.ConnectionManager.currentApiClient();
const apiClient = ServerConnections.currentApiClient();
const requestSent = new Date();
apiClient.getServerTime().then((response) => {
const responseReceived = new Date();