Move server connections to lib

src/apps/dashboard/controllers/dashboard.js

@@ -17,12 +17,12 @@ import imageHelper from 'utils/image';
 import indicators from 'components/indicators/indicators';
 import taskButton from 'scripts/taskbutton';
 import Dashboard from 'utils/dashboard';
-import ServerConnections from 'components/ServerConnections';
 import alert from 'components/alert';
 import confirm from 'components/confirm/confirm';
 import { getDefaultBackgroundClass } from 'components/cardbuilder/cardBuilderUtils';
 
 import { getSystemInfoQuery } from 'hooks/useSystemInfo';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import { toApi } from 'utils/jellyfin-apiclient/compat';
 import { queryClient } from 'utils/query/queryClient';
 

src/apps/dashboard/routes/branding/index.tsx

@@ -18,10 +18,10 @@ import { getBrandingOptionsQuery, QUERY_KEY, useBrandingOptions } from 'apps/das
 import Loading from 'components/loading/LoadingComponent';
 import Image from 'components/Image';
 import Page from 'components/Page';
-import ServerConnections from 'components/ServerConnections';
 import { SPLASHSCREEN_URL } from 'constants/branding';
 import { useApi } from 'hooks/useApi';
 import globalize from 'lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import { queryClient } from 'utils/query/queryClient';
 import { ActionData } from 'types/actionData';
 

src/apps/dashboard/routes/libraries/display.tsx

@@ -12,11 +12,11 @@ import TextField from '@mui/material/TextField';
 import Typography from '@mui/material/Typography';
 import Loading from 'components/loading/LoadingComponent';
 import Page from 'components/Page';
-import ServerConnections from 'components/ServerConnections';
 import { getConfigurationApi } from '@jellyfin/sdk/lib/utils/api/configuration-api';
 import { QUERY_KEY as CONFIG_QUERY_KEY, useConfiguration } from 'hooks/useConfiguration';
 import { QUERY_KEY as NAMED_CONFIG_QUERY_KEY, NamedConfiguration, useNamedConfiguration } from 'hooks/useNamedConfiguration';
 import globalize from 'lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import { type ActionFunctionArgs, Form, useActionData, useNavigation } from 'react-router-dom';
 import { ActionData } from 'types/actionData';
 import { queryClient } from 'utils/query/queryClient';

src/apps/dashboard/routes/libraries/metadata.tsx

@@ -12,9 +12,9 @@ import { useCultures } from 'apps/dashboard/features/libraries/api/useCultures';
 import { getImageResolutionOptions } from 'apps/dashboard/features/libraries/utils/metadataOptions';
 import Loading from 'components/loading/LoadingComponent';
 import Page from 'components/Page';
-import ServerConnections from 'components/ServerConnections';
 import { QUERY_KEY, useConfiguration } from 'hooks/useConfiguration';
 import globalize from 'lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import React from 'react';
 import { type ActionFunctionArgs, Form, useActionData, useNavigation } from 'react-router-dom';
 import { ActionData } from 'types/actionData';

src/apps/dashboard/routes/libraries/nfo.tsx

@@ -12,11 +12,11 @@ import TextField from '@mui/material/TextField';
 import Typography from '@mui/material/Typography';
 import Loading from 'components/loading/LoadingComponent';
 import Page from 'components/Page';
-import ServerConnections from 'components/ServerConnections';
 import SimpleAlert from 'components/SimpleAlert';
 import { QUERY_KEY, useNamedConfiguration } from 'hooks/useNamedConfiguration';
 import { useUsers } from 'hooks/useUsers';
 import globalize from 'lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import React, { useCallback, useState } from 'react';
 import { type ActionFunctionArgs, Form, useActionData, useNavigation } from 'react-router-dom';
 import { ActionData } from 'types/actionData';

src/apps/dashboard/routes/logs/index.tsx

@@ -3,6 +3,7 @@ import { getConfigurationApi } from '@jellyfin/sdk/lib/utils/api/configuration-a
 import Loading from 'components/loading/LoadingComponent';
 import Page from 'components/Page';
 import globalize from 'lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import Alert from '@mui/material/Alert';
 import Box from '@mui/material/Box';
 import Button from '@mui/material/Button';
@@ -12,7 +13,6 @@ import Checkbox from '@mui/material/Checkbox';
 import TextField from '@mui/material/TextField';
 import Typography from '@mui/material/Typography';
 import { type ActionFunctionArgs, Form, useActionData, useNavigation } from 'react-router-dom';
-import ServerConnections from 'components/ServerConnections';
 import { useServerLogs } from 'apps/dashboard/features/logs/api/useServerLogs';
 import { useConfiguration } from 'hooks/useConfiguration';
 import type { ServerConfiguration } from '@jellyfin/sdk/lib/generated-client/models/server-configuration';

src/apps/dashboard/routes/playback/resume.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import Page from 'components/Page';
 import globalize from 'lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import Alert from '@mui/material/Alert';
 import Box from '@mui/material/Box';
 import Button from '@mui/material/Button';
@@ -11,7 +12,6 @@ import { type ActionFunctionArgs, Form, useActionData, useNavigation } from 'rea
 import { ActionData } from 'types/actionData';
 import { QUERY_KEY, useConfiguration } from 'hooks/useConfiguration';
 import Loading from 'components/loading/LoadingComponent';
-import ServerConnections from 'components/ServerConnections';
 import { getConfigurationApi } from '@jellyfin/sdk/lib/utils/api/configuration-api';
 import { queryClient } from 'utils/query/queryClient';
 

src/apps/dashboard/routes/playback/streaming.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import Page from 'components/Page';
 import globalize from 'lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import Alert from '@mui/material/Alert';
 import Box from '@mui/material/Box';
 import Button from '@mui/material/Button';
@@ -8,7 +9,6 @@ import Stack from '@mui/material/Stack';
 import TextField from '@mui/material/TextField';
 import Typography from '@mui/material/Typography';
 import { type ActionFunctionArgs, Form, useActionData, useNavigation } from 'react-router-dom';
-import ServerConnections from 'components/ServerConnections';
 import { getConfigurationApi } from '@jellyfin/sdk/lib/utils/api/configuration-api';
 import { QUERY_KEY, useConfiguration } from 'hooks/useConfiguration';
 import Loading from 'components/loading/LoadingComponent';

src/apps/dashboard/routes/playback/trickplay.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 
 import globalize from 'lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import { type ActionFunctionArgs, Form, useActionData, useNavigation } from 'react-router-dom';
 import { QUERY_KEY, useConfiguration } from 'hooks/useConfiguration';
 import Page from 'components/Page';
@@ -16,7 +17,6 @@ import MenuItem from '@mui/material/MenuItem';
 import TextField from '@mui/material/TextField';
 import Button from '@mui/material/Button';
 import Alert from '@mui/material/Alert';
-import ServerConnections from 'components/ServerConnections';
 import { getConfigurationApi } from '@jellyfin/sdk/lib/utils/api/configuration-api';
 import { TrickplayScanBehavior } from '@jellyfin/sdk/lib/generated-client/models/trickplay-scan-behavior';
 import { ProcessPriorityClass } from '@jellyfin/sdk/lib/generated-client/models/process-priority-class';

src/apps/dashboard/routes/settings/index.tsx

@@ -11,6 +11,7 @@ import Page from 'components/Page';
 import { QUERY_KEY, useConfiguration } from 'hooks/useConfiguration';
 import { useSystemInfo } from 'hooks/useSystemInfo';
 import globalize from 'lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import React, { useCallback, useEffect, useState } from 'react';
 import { type ActionFunctionArgs, Form, useActionData, useNavigation } from 'react-router-dom';
 import SearchIcon from '@mui/icons-material/Search';
@@ -21,7 +22,6 @@ import Checkbox from '@mui/material/Checkbox';
 import Button from '@mui/material/Button';
 import Link from '@mui/material/Link';
 import DirectoryBrowser from 'components/directorybrowser/directorybrowser';
-import ServerConnections from 'components/ServerConnections';
 import { getConfigurationApi } from '@jellyfin/sdk/lib/utils/api/configuration-api';
 import { queryClient } from 'utils/query/queryClient';
 import { ActionData } from 'types/actionData';

src/apps/dashboard/routes/users/parentalcontrol.tsx

@@ -17,7 +17,7 @@ import CheckBoxElement from '../../../../elements/CheckBoxElement';
 import SelectElement from '../../../../elements/SelectElement';
 import Page from '../../../../components/Page';
 import prompt from '../../../../components/prompt/prompt';
-import ServerConnections from 'components/ServerConnections';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 
 type NamedItem = {
     name: string;

src/apps/stable/features/playback/utils/image.ts

@@ -1,7 +1,7 @@
 import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
 import { ImageType } from '@jellyfin/sdk/lib/generated-client/models/image-type';
 
-import ServerConnections from 'components/ServerConnections';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import type { ItemDto } from 'types/base/models/item-dto';
 
 interface ImageOptions {

src/apps/stable/features/playback/utils/mediaSegmentManager.ts

@@ -4,8 +4,8 @@ import { MediaSegmentType } from '@jellyfin/sdk/lib/generated-client/models/medi
 import { getMediaSegmentsApi } from '@jellyfin/sdk/lib/utils/api/media-segments-api';
 
 import type { PlaybackManager } from 'components/playback/playbackmanager';
-import ServerConnections from 'components/ServerConnections';
 import { TICKS_PER_MILLISECOND, TICKS_PER_SECOND } from 'constants/time';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import { currentSettings as userSettings } from 'scripts/settings/userSettings';
 import type { PlayerState } from 'types/playbackStopInfo';
 import type { Event } from 'utils/events';

src/apps/wizard/controllers/finish/index.js

@@ -1,5 +1,5 @@
 import loading from 'components/loading/loading';
-import ServerConnections from 'components/ServerConnections';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 
 function onFinish() {
     loading.show();

src/apps/wizard/controllers/library.js

@@ -3,8 +3,8 @@ import escapeHtml from 'escape-html';
 import { getDefaultBackgroundClass } from 'components/cardbuilder/cardBuilderUtils';
 import confirm from 'components/confirm/confirm';
 import loading from 'components/loading/loading';
-import ServerConnections from 'components/ServerConnections';
 import globalize from 'lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import dom from 'scripts/dom';
 import taskButton from 'scripts/taskbutton';
 import Dashboard, { pageClassOn, pageIdOn } from 'utils/dashboard';

src/apps/wizard/controllers/remote/index.js

@@ -1,5 +1,5 @@
 import loading from 'components/loading/loading';
-import ServerConnections from 'components/ServerConnections';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import Dashboard from 'utils/dashboard';
 
 import 'elements/emby-checkbox/emby-checkbox';

src/apps/wizard/controllers/settings/index.js

@@ -1,5 +1,5 @@
 import loading from 'components/loading/loading';
-import ServerConnections from 'components/ServerConnections';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import Dashboard from 'utils/dashboard';
 
 import 'elements/emby-button/emby-button';

src/apps/wizard/controllers/start/index.js

@@ -1,5 +1,5 @@
 import loading from 'components/loading/loading';
-import ServerConnections from 'components/ServerConnections';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import Dashboard from 'utils/dashboard';
 import dom from 'scripts/dom';
 

src/apps/wizard/controllers/user/index.js

@@ -1,7 +1,7 @@
 import loading from 'components/loading/loading';
-import ServerConnections from 'components/ServerConnections';
 import toast from 'components/toast/toast';
 import globalize from 'lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import Dashboard from 'utils/dashboard';
 
 import 'styles/dashboard.scss';

src/components/ConnectionRequired.tsx

@@ -4,10 +4,10 @@ import type { ApiClient, ConnectResponse } from 'jellyfin-apiclient';
 
 import globalize from 'lib/globalize';
 import { ConnectionState } from 'lib/jellyfin-apiclient/connectionState';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 
 import alert from './alert';
 import Loading from './loading/LoadingComponent';
-import ServerConnections from './ServerConnections';
 
 enum AccessLevel {
     /** Requires a user with administrator access */

src/components/ServerContentPage.tsx

@@ -1,10 +1,10 @@
 import { FunctionComponent, useEffect } from 'react';
 import { useLocation } from 'react-router-dom';
 
-import ServerConnections from './ServerConnections';
 import viewManager from './viewManager/viewManager';
-import globalize from '../lib/globalize';
-import type { RestoreViewFailResponse } from '../types/viewManager';
+import globalize from 'lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
+import type { RestoreViewFailResponse } from 'types/viewManager';
 
 interface ServerContentPageProps {
     view: string

src/components/activitylog.js

@@ -1,12 +1,12 @@
 import escapeHtml from 'escape-html';
 import Events from '../utils/events.ts';
 import globalize from '../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import dom from '../scripts/dom';
 import { formatRelative } from 'date-fns';
 import serverNotifications from '../scripts/serverNotifications';
 import '../elements/emby-button/emby-button';
 import './listview/listview.scss';
-import ServerConnections from './ServerConnections';
 import alert from './alert';
 import { getLocale } from '../utils/dateFnsLocale.ts';
 import { toBoolean } from '../utils/string.ts';

src/components/backdrop/backdrop.js

@@ -1,9 +1,9 @@
 import isEqual from 'lodash-es/isEqual';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import browser from '../../scripts/browser';
 import { playbackManager } from '../playback/playbackmanager';
 import dom from '../../scripts/dom';
 import * as userSettings from '../../scripts/settings/userSettings';
-import ServerConnections from '../ServerConnections';
 
 import './backdrop.scss';
 

src/components/cardbuilder/cardBuilder.js

@@ -12,6 +12,7 @@ import browser from 'scripts/browser';
 import datetime from 'scripts/datetime';
 import dom from 'scripts/dom';
 import globalize from 'lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import { getBackdropShape, getPortraitShape, getSquareShape } from 'utils/card';
 import { getItemTypeIcon, getLibraryIcon } from 'utils/image';
 
@@ -22,7 +23,6 @@ import itemHelper from '../itemHelper';
 import layoutManager from '../layoutManager';
 import { playbackManager } from '../playback/playbackmanager';
 import { appRouter } from '../router/appRouter';
-import ServerConnections from '../ServerConnections';
 import itemShortcuts from '../shortcuts';
 
 import 'elements/emby-button/paper-icon-button-light';

src/components/cardbuilder/chaptercardbuilder.js

@@ -5,11 +5,12 @@
  */
 
 import escapeHtml from 'escape-html';
+
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import datetime from '../../scripts/datetime';
 import imageLoader from '../images/imageLoader';
 import layoutManager from '../layoutManager';
 import browser from '../../scripts/browser';
-import ServerConnections from '../ServerConnections';
 
 const enableFocusTransform = !browser.slow && !browser.edge;
 

src/components/channelMapper/channelMapper.js

@@ -3,6 +3,7 @@ import dom from '../../scripts/dom';
 import dialogHelper from '../dialogHelper/dialogHelper';
 import loading from '../loading/loading';
 import globalize from '../../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import actionsheet from '../actionSheet/actionSheet';
 import '../../elements/emby-input/emby-input';
 import '../../elements/emby-button/paper-icon-button-light';
@@ -10,7 +11,6 @@ import '../../elements/emby-button/emby-button';
 import '../listview/listview.scss';
 import 'material-design-icons-iconfont';
 import '../formdialog.scss';
-import ServerConnections from '../ServerConnections';
 
 export default class ChannelMapper {
     constructor(options) {

src/components/collectionEditor/collectionEditor.js

@@ -5,6 +5,7 @@ import loading from '../loading/loading';
 import layoutManager from '../layoutManager';
 import { appRouter } from '../router/appRouter';
 import globalize from '../../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import '../../elements/emby-button/emby-button';
 import '../../elements/emby-button/paper-icon-button-light';
 import '../../elements/emby-checkbox/emby-checkbox';
@@ -13,7 +14,6 @@ import '../../elements/emby-select/emby-select';
 import 'material-design-icons-iconfont';
 import '../formdialog.scss';
 import '../../styles/flexstyles.scss';
-import ServerConnections from '../ServerConnections';
 import toast from '../toast/toast';
 
 let currentServerId;

src/components/displaySettings/displaySettings.js

@@ -6,6 +6,7 @@ import { appHost } from '../apphost';
 import focusManager from '../focusManager';
 import datetime from '../../scripts/datetime';
 import globalize from '../../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import loading from '../loading/loading';
 import skinManager from '../../scripts/themeManager';
 import { PluginType } from '../../types/plugin.ts';
@@ -14,7 +15,6 @@ import '../../elements/emby-select/emby-select';
 import '../../elements/emby-checkbox/emby-checkbox';
 import '../../elements/emby-button/emby-button';
 import '../../elements/emby-textarea/emby-textarea';
-import ServerConnections from '../ServerConnections';
 import toast from '../toast/toast';
 import template from './displaySettings.template.html';
 

src/components/filterdialog/filterdialog.js

@@ -1,12 +1,12 @@
 import dom from '../../scripts/dom';
 import dialogHelper from '../dialogHelper/dialogHelper';
 import globalize from '../../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import union from 'lodash-es/union';
 import Events from '../../utils/events.ts';
 import '../../elements/emby-checkbox/emby-checkbox';
 import '../../elements/emby-collapse/emby-collapse';
 import './style.scss';
-import ServerConnections from '../ServerConnections';
 import template from './filterdialog.template.html';
 import { stopMultiSelect } from '../../components/multiSelect/multiSelect';
 

src/components/filtermenu/filtermenu.js

@@ -5,6 +5,7 @@ import dialogHelper from '../dialogHelper/dialogHelper';
 import inputManager from '../../scripts/inputManager';
 import layoutManager from '../layoutManager';
 import globalize from '../../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import * as userSettings from '../../scripts/settings/userSettings';
 import '../../elements/emby-checkbox/emby-checkbox';
 import '../../elements/emby-input/emby-input';
@@ -14,7 +15,6 @@ import '../../elements/emby-select/emby-select';
 import 'material-design-icons-iconfont';
 import '../formdialog.scss';
 import '../../styles/flexstyles.scss';
-import ServerConnections from '../ServerConnections';
 import template from './filtermenu.template.html';
 
 function onSubmit(e) {

src/components/groupedcards.js

@@ -1,7 +1,7 @@
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import dom from '../scripts/dom';
 import { appRouter } from './router/appRouter';
 import Dashboard from '../utils/dashboard';
-import ServerConnections from './ServerConnections';
 
 function onGroupedCardClick(e, card) {
     const itemId = card.getAttribute('data-id');

src/components/guide/guide.js

@@ -2,6 +2,7 @@ import escapeHtml from 'escape-html';
 import inputManager from '../../scripts/inputManager';
 import browser from '../../scripts/browser';
 import globalize from '../../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import Events from '../../utils/events.ts';
 import scrollHelper from '../../scripts/scrollHelper';
 import serverNotifications from '../../scripts/serverNotifications';
@@ -25,7 +26,6 @@ import '../../elements/emby-tabs/emby-tabs';
 import '../../elements/emby-scroller/emby-scroller';
 import '../../styles/flexstyles.scss';
 import 'webcomponents.js/webcomponents-lite';
-import ServerConnections from '../ServerConnections';
 import template from './tvguide.template.html';
 
 function showViewSettings(instance) {

src/components/homeScreenSettings/homeScreenSettings.js

@@ -2,6 +2,7 @@
 import escapeHtml from 'escape-html';
 
 import { getUserViewsQuery } from 'hooks/useUserViews';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import { toApi } from 'utils/jellyfin-apiclient/compat';
 import { queryClient } from 'utils/query/queryClient';
 
@@ -15,7 +16,6 @@ import dom from '../../scripts/dom';
 import '../listview/listview.scss';
 import '../../elements/emby-select/emby-select';
 import '../../elements/emby-checkbox/emby-checkbox';
-import ServerConnections from '../ServerConnections';
 import toast from '../toast/toast';
 import template from './homeScreenSettings.template.html';
 import { LibraryTab } from '../../types/libraryTab.ts';

src/components/homesections/sections/activeRecordings.ts

@@ -1,9 +1,9 @@
 import type { BaseItemDto } from '@jellyfin/sdk/lib/generated-client/models/base-item-dto';
 import type { ApiClient } from 'jellyfin-apiclient';
 
-import ServerConnections from 'components/ServerConnections';
 import cardBuilder from 'components/cardbuilder/cardBuilder';
 import globalize from 'lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 
 import type { SectionContainerElement, SectionOptions } from './section';
 

src/components/homesections/sections/liveTv.ts

@@ -5,8 +5,8 @@ import type { ApiClient } from 'jellyfin-apiclient';
 import { appRouter } from 'components/router/appRouter';
 import cardBuilder from 'components/cardbuilder/cardBuilder';
 import layoutManager from 'components/layoutManager';
-import ServerConnections from 'components/ServerConnections';
 import globalize from 'lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import { getBackdropShape } from 'utils/card';
 
 import type { SectionContainerElement, SectionOptions } from './section';

src/components/homesections/sections/nextUp.ts

@@ -4,8 +4,8 @@ import type { ApiClient } from 'jellyfin-apiclient';
 import cardBuilder from 'components/cardbuilder/cardBuilder';
 import layoutManager from 'components/layoutManager';
 import { appRouter } from 'components/router/appRouter';
-import ServerConnections from 'components/ServerConnections';
 import globalize from 'lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import type { UserSettings } from 'scripts/settings/userSettings';
 import { getBackdropShape } from 'utils/card';
 

src/components/homesections/sections/recentlyAdded.ts

@@ -5,11 +5,11 @@ import { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collec
 import escapeHtml from 'escape-html';
 import type { ApiClient } from 'jellyfin-apiclient';
 
+import cardBuilder from 'components/cardbuilder/cardBuilder';
 import layoutManager from 'components/layoutManager';
 import { appRouter } from 'components/router/appRouter';
 import globalize from 'lib/globalize';
-import ServerConnections from 'components/ServerConnections';
-import cardBuilder from 'components/cardbuilder/cardBuilder';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import { getBackdropShape, getPortraitShape, getSquareShape } from 'utils/card';
 
 import type { SectionContainerElement, SectionOptions } from './section';

src/components/homesections/sections/resume.ts

@@ -2,9 +2,9 @@ import type { BaseItemDto } from '@jellyfin/sdk/lib/generated-client/models/base
 import type { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
 import type { ApiClient } from 'jellyfin-apiclient';
 
-import ServerConnections from 'components/ServerConnections';
 import cardBuilder from 'components/cardbuilder/cardBuilder';
 import globalize from 'lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import type { UserSettings } from 'scripts/settings/userSettings';
 import { getBackdropShape, getPortraitShape } from 'utils/card';
 

src/components/imageDownloader/imageDownloader.js

@@ -7,12 +7,12 @@ import browser from '../../scripts/browser';
 import layoutManager from '../layoutManager';
 import scrollHelper from '../../scripts/scrollHelper';
 import globalize from '../../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import '../../elements/emby-checkbox/emby-checkbox';
 import '../../elements/emby-button/paper-icon-button-light';
 import '../../elements/emby-button/emby-button';
 import '../formdialog.scss';
 import '../cardbuilder/card.scss';
-import ServerConnections from '../ServerConnections';
 import template from './imageDownloader.template.html';
 
 const enableFocusTransform = !browser.slow && !browser.edge;

src/components/imageUploader/imageUploader.js

@@ -10,11 +10,12 @@ import loading from '../loading/loading';
 import scrollHelper from '../../scripts/scrollHelper';
 import layoutManager from '../layoutManager';
 import globalize from '../../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
+
 import '../../elements/emby-button/emby-button';
 import '../../elements/emby-select/emby-select';
 import '../formdialog.scss';
 import './style.scss';
-import ServerConnections from '../ServerConnections';
 import toast from '../toast/toast';
 import template from './imageUploader.template.html';
 

src/components/imageeditor/imageeditor.js

@@ -4,6 +4,7 @@ import dom from '../../scripts/dom';
 import layoutManager from '../layoutManager';
 import focusManager from '../focusManager';
 import globalize from '../../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import scrollHelper from '../../scripts/scrollHelper';
 import imageLoader from '../images/imageLoader';
 import browser from '../../scripts/browser';
@@ -13,7 +14,6 @@ import '../formdialog.scss';
 import '../../elements/emby-button/emby-button';
 import '../../elements/emby-button/paper-icon-button-light';
 import './imageeditor.scss';
-import ServerConnections from '../ServerConnections';
 import alert from '../alert';
 import confirm from '../confirm/confirm';
 import template from './imageeditor.template.html';

src/components/itemContextMenu.js

@@ -2,12 +2,12 @@ import browser from '../scripts/browser';
 import { copy } from '../scripts/clipboard';
 import dom from '../scripts/dom';
 import globalize from '../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import actionsheet from './actionSheet/actionSheet';
 import { appHost } from './apphost';
 import { appRouter } from './router/appRouter';
 import itemHelper, { canEditPlaylist } from './itemHelper';
 import { playbackManager } from './playback/playbackmanager';
-import ServerConnections from './ServerConnections';
 import toast from './toast/toast';
 import * as userSettings from '../scripts/settings/userSettings';
 import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';

src/components/itemHelper.js

@@ -7,7 +7,7 @@ import { getPlaylistsApi } from '@jellyfin/sdk/lib/utils/api/playlists-api';
 
 import { appHost } from './apphost';
 import globalize from 'lib/globalize';
-import ServerConnections from './ServerConnections';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import { toApi } from 'utils/jellyfin-apiclient/compat';
 
 export function getDisplayName(item, options = {}) {

src/components/itemMediaInfo/itemMediaInfo.js

@@ -11,6 +11,7 @@ import toast from '../toast/toast';
 import { copy } from '../../scripts/clipboard';
 import dom from '../../scripts/dom';
 import globalize from '../../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import itemHelper from '../../components/itemHelper';
 import loading from '../loading/loading';
 import '../../elements/emby-select/emby-select';
@@ -20,7 +21,6 @@ import '../../elements/emby-button/paper-icon-button-light';
 import '../formdialog.scss';
 import 'material-design-icons-iconfont';
 import '../../styles/flexstyles.scss';
-import ServerConnections from '../ServerConnections';
 import template from './itemMediaInfo.template.html';
 
 // Do not add extra spaces between tags - they will be copied into the result

src/components/itemidentifier/itemidentifier.js

@@ -8,6 +8,7 @@ import escapeHtml from 'escape-html';
 import dialogHelper from '../dialogHelper/dialogHelper';
 import loading from '../loading/loading';
 import globalize from '../../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import scrollHelper from '../../scripts/scrollHelper';
 import layoutManager from '../layoutManager';
 import focusManager from '../focusManager';
@@ -18,7 +19,6 @@ import '../../elements/emby-button/paper-icon-button-light';
 import '../formdialog.scss';
 import 'material-design-icons-iconfont';
 import '../cardbuilder/card.scss';
-import ServerConnections from '../ServerConnections';
 import toast from '../toast/toast';
 import template from './itemidentifier.template.html';
 import datetime from '../../scripts/datetime';

src/components/listview/listview.js

@@ -10,12 +10,12 @@ import mediaInfo from '../mediainfo/mediainfo';
 import indicators from '../indicators/indicators';
 import layoutManager from '../layoutManager';
 import globalize from '../../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import datetime from '../../scripts/datetime';
 import cardBuilder from '../cardbuilder/cardBuilder';
 import './listview.scss';
 import '../../elements/emby-ratingbutton/emby-ratingbutton';
 import '../../elements/emby-playstatebutton/emby-playstatebutton';
-import ServerConnections from '../ServerConnections';
 import { getDefaultBackgroundClass } from '../cardbuilder/cardBuilderUtils';
 import markdownIt from 'markdown-it';
 import DOMPurify from 'dompurify';

src/components/lyricseditor/lyricseditor.js

@@ -5,6 +5,7 @@ import { toApi } from 'utils/jellyfin-apiclient/compat';
 import dialogHelper from '../dialogHelper/dialogHelper';
 import layoutManager from '../layoutManager';
 import globalize from 'lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import loading from '../loading/loading';
 import focusManager from '../focusManager';
 import dom from '../../scripts/dom';
@@ -16,7 +17,6 @@ import 'material-design-icons-iconfont';
 import './lyricseditor.scss';
 import '../../elements/emby-button/emby-button';
 import '../../styles/flexstyles.scss';
-import ServerConnections from '../ServerConnections';
 import toast from '../toast/toast';
 import template from './lyricseditor.template.html';
 import templatePreview from './lyricspreview.template.html';

src/components/lyricsuploader/lyricsuploader.js

@@ -3,12 +3,12 @@ import escapeHtml from 'escape-html';
 import { getLyricsApi } from '@jellyfin/sdk/lib/utils/api/lyrics-api';
 import { toApi } from 'utils/jellyfin-apiclient/compat';
 import dialogHelper from '../../components/dialogHelper/dialogHelper';
-import ServerConnections from '../ServerConnections';
 import dom from '../../scripts/dom';
 import loading from '../../components/loading/loading';
 import scrollHelper from '../../scripts/scrollHelper';
 import layoutManager from '../layoutManager';
 import globalize from 'lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import template from './lyricsuploader.template.html';
 import toast from '../toast/toast';
 import '../../elements/emby-button/emby-button';

src/components/metadataEditor/metadataEditor.js

@@ -6,6 +6,8 @@ import datetime from '../../scripts/datetime';
 import loading from '../loading/loading';
 import focusManager from '../focusManager';
 import globalize from '../../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
+
 import '../../elements/emby-checkbox/emby-checkbox';
 import '../../elements/emby-input/emby-input';
 import '../../elements/emby-select/emby-select';
@@ -17,7 +19,6 @@ import '../formdialog.scss';
 import '../../styles/clearbutton.scss';
 import '../../styles/flexstyles.scss';
 import './style.scss';
-import ServerConnections from '../ServerConnections';
 import toast from '../toast/toast';
 import { appRouter } from '../router/appRouter';
 import template from './metadataEditor.template.html';

src/components/multiSelect/multiSelect.js

@@ -2,9 +2,9 @@ import browser from '../../scripts/browser';
 import { appHost } from '../apphost';
 import loading from '../loading/loading';
 import globalize from '../../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import dom from '../../scripts/dom';
 import './multiSelect.scss';
-import ServerConnections from '../ServerConnections';
 import alert from '../alert';
 import confirm from '../confirm/confirm';
 import itemHelper from '../itemHelper';

src/components/notifications/notifications.js

@@ -2,8 +2,8 @@ import serverNotifications from '../../scripts/serverNotifications';
 import { playbackManager } from '../playback/playbackmanager';
 import Events from '../../utils/events.ts';
 import globalize from '../../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import { getItems } from '../../utils/jellyfin-apiclient/getItems.ts';
-import ServerConnections from '../../components/ServerConnections';
 
 import NotificationIcon from './notificationicon.png';
 

src/components/nowPlayingBar/nowPlayingBar.js

@@ -1,6 +1,7 @@
 import { getImageUrl } from 'apps/stable/features/playback/utils/image';
 import { getItemTextLines } from 'apps/stable/features/playback/utils/itemText';
 import { appRouter, isLyricsPage } from 'components/router/appRouter';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 
 import datetime from '../../scripts/datetime';
 import Events from '../../utils/events.ts';
@@ -14,7 +15,6 @@ import globalize from 'lib/globalize';
 import itemContextMenu from '../itemContextMenu';
 import '../../elements/emby-button/paper-icon-button-light';
 import '../../elements/emby-ratingbutton/emby-ratingbutton';
-import ServerConnections from '../ServerConnections';
 import appFooter from '../appFooter/appFooter';
 import itemShortcuts from '../shortcuts';
 import './nowPlayingBar.scss';

src/components/playback/displayMirrorManager.ts

@@ -1,5 +1,5 @@
-import ServerConnections from 'components/ServerConnections';
 import { getItemQuery } from 'hooks/useItem';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import { toApi } from 'utils/jellyfin-apiclient/compat';
 import { queryClient } from 'utils/query/queryClient';
 

src/components/playback/playbackmanager.js

@@ -1,3 +1,4 @@
+import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind.js';
 import { PlaybackErrorCode } from '@jellyfin/sdk/lib/generated-client/models/playback-error-code.js';
 import { getMediaInfoApi } from '@jellyfin/sdk/lib/utils/api/media-info-api';
 import { MediaType } from '@jellyfin/sdk/lib/generated-client/models/media-type';
@@ -14,7 +15,6 @@ import * as userSettings from '../../scripts/settings/userSettings';
 import globalize from '../../lib/globalize';
 import loading from '../loading/loading';
 import { appHost } from '../apphost';
-import ServerConnections from '../ServerConnections';
 import alert from '../alert';
 import { PluginType } from '../../types/plugin.ts';
 import { includesAny } from '../../utils/container.ts';
@@ -24,10 +24,10 @@ import { getItemBackdropImageUrl } from '../../utils/jellyfin-apiclient/backdrop
 import { PlayerEvent } from 'apps/stable/features/playback/constants/playerEvent';
 import { bindMediaSegmentManager } from 'apps/stable/features/playback/utils/mediaSegmentManager';
 import { bindMediaSessionSubscriber } from 'apps/stable/features/playback/utils/mediaSessionSubscriber';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import { MediaError } from 'types/mediaError';
 import { getMediaError } from 'utils/mediaError';
 import { toApi } from 'utils/jellyfin-apiclient/compat';
-import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind.js';
 import { bindSkipSegment } from './skipsegment.ts';
 
 const UNLIMITED_ITEMS = -1;

src/components/playback/playersettingsmenu.js

@@ -1,8 +1,8 @@
 import actionsheet from '../actionSheet/actionSheet';
 import { playbackManager } from '../playback/playbackmanager';
-import globalize from '../../lib/globalize';
+import globalize from 'lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import qualityoptions from '../qualityOptions';
-import ServerConnections from '../ServerConnections';
 
 function showQualityMenu(player, btn) {
     const videoStream = playbackManager.currentMediaSource(player).MediaStreams.filter(function (stream) {

src/components/playbackSettings/playbackSettings.js

@@ -3,6 +3,7 @@ import escapeHTML from 'escape-html';
 
 import { MediaSegmentAction } from 'apps/stable/features/playback/constants/mediaSegmentAction';
 import { getId, getMediaSegmentAction } from 'apps/stable/features/playback/utils/mediaSegmentSettings';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 
 import appSettings from '../../scripts/settings/appSettings';
 import { appHost } from '../apphost';
@@ -12,7 +13,6 @@ import qualityoptions from '../qualityOptions';
 import globalize from '../../lib/globalize';
 import loading from '../loading/loading';
 import Events from '../../utils/events.ts';
-import ServerConnections from '../ServerConnections';
 import toast from '../toast/toast';
 import template from './playbackSettings.template.html';
 

src/components/playerstats/playerstats.js

@@ -1,13 +1,14 @@
 import '../../elements/emby-button/paper-icon-button-light';
 import globalize from '../../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import Events from '../../utils/events.ts';
 import layoutManager from '../layoutManager';
 import { playbackManager } from '../playback/playbackmanager';
 import playMethodHelper from '../playback/playmethodhelper';
 import { pluginManager } from '../pluginManager';
 import { PluginType } from '../../types/plugin.ts';
+
 import './playerstats.scss';
-import ServerConnections from '../ServerConnections';
 
 function init(instance) {
     const parent = document.createElement('div');

src/components/playlisteditor/playlisteditor.ts

@@ -8,6 +8,7 @@ import escapeHtml from 'escape-html';
 import toast from 'components/toast/toast';
 import dom from 'scripts/dom';
 import globalize from 'lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import { currentSettings as userSettings } from 'scripts/settings/userSettings';
 import { PluginType } from 'types/plugin';
 import { toApi } from 'utils/jellyfin-apiclient/compat';
@@ -19,7 +20,6 @@ import layoutManager from '../layoutManager';
 import { playbackManager } from '../playback/playbackmanager';
 import { pluginManager } from '../pluginManager';
 import { appRouter } from '../router/appRouter';
-import ServerConnections from '../ServerConnections';
 
 import 'elements/emby-button/emby-button';
 import 'elements/emby-input/emby-input';

src/components/pluginManager.js

@@ -8,8 +8,8 @@ import { appRouter } from './router/appRouter';
 import * as inputManager from '../scripts/inputManager';
 import toast from '../components/toast/toast';
 import confirm from '../components/confirm/confirm';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import * as dashboard from '../utils/dashboard';
-import ServerConnections from '../components/ServerConnections';
 
 // TODO: replace with each plugin version
 const cacheParam = new Date().getTime();

src/components/recordingcreator/recordingbutton.js

@@ -1,9 +1,10 @@
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import dom from '../../scripts/dom';
 import recordingHelper from './recordinghelper';
+
 import '../../elements/emby-button/paper-icon-button-light';
 import '../../elements/emby-button/emby-button';
 import './recordingfields.scss';
-import ServerConnections from '../ServerConnections';
 
 function onRecordingButtonClick() {
     const item = this.item;

src/components/recordingcreator/recordingcreator.js

@@ -1,5 +1,6 @@
 import dialogHelper from '../dialogHelper/dialogHelper';
 import globalize from '../../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import layoutManager from '../layoutManager';
 import mediaInfo from '../mediainfo/mediainfo';
 import loading from '../loading/loading';
@@ -8,6 +9,7 @@ import datetime from '../../scripts/datetime';
 import imageLoader from '../images/imageLoader';
 import RecordingFields from './recordingfields';
 import Events from '../../utils/events.ts';
+
 import '../../elements/emby-button/emby-button';
 import '../../elements/emby-button/paper-icon-button-light';
 import '../../elements/emby-checkbox/emby-checkbox';
@@ -16,7 +18,6 @@ import '../../elements/emby-input/emby-input';
 import '../formdialog.scss';
 import './recordingcreator.scss';
 import 'material-design-icons-iconfont';
-import ServerConnections from '../ServerConnections';
 import { playbackManager } from '../playback/playbackmanager';
 import template from './recordingcreator.template.html';
 

src/components/recordingcreator/recordingeditor.js

@@ -1,9 +1,11 @@
 
 import dialogHelper from '../dialogHelper/dialogHelper';
 import globalize from '../../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import layoutManager from '../layoutManager';
 import loading from '../loading/loading';
 import scrollHelper from '../../scripts/scrollHelper';
+
 import '../../styles/scrollstyles.scss';
 import '../../elements/emby-button/emby-button';
 import '../../elements/emby-collapse/emby-collapse';
@@ -13,7 +15,6 @@ import '../formdialog.scss';
 import './recordingcreator.scss';
 import 'material-design-icons-iconfont';
 import '../../styles/flexstyles.scss';
-import ServerConnections from '../ServerConnections';
 import template from './recordingeditor.template.html';
 
 let currentDialog;

src/components/recordingcreator/recordingfields.js

@@ -1,14 +1,15 @@
 import globalize from '../../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import Events from '../../utils/events.ts';
 import serverNotifications from '../../scripts/serverNotifications';
 import loading from '../loading/loading';
 import dom from '../../scripts/dom';
 import recordingHelper from './recordinghelper';
+
 import '../../elements/emby-button/emby-button';
 import '../../elements/emby-button/paper-icon-button-light';
 import './recordingfields.scss';
 import '../../styles/flexstyles.scss';
-import ServerConnections from '../ServerConnections';
 import toast from '../toast/toast';
 import template from './recordingfields.template.html';
 

src/components/recordingcreator/recordinghelper.js

@@ -1,6 +1,6 @@
-import globalize from '../../lib/globalize';
+import globalize from 'lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import loading from '../loading/loading';
-import ServerConnections from '../ServerConnections';
 import toast from '../toast/toast';
 import confirm from '../confirm/confirm';
 import dialog from '../dialog/dialog';

src/components/recordingcreator/seriesrecordingeditor.js

@@ -1,9 +1,11 @@
 import dialogHelper from '../dialogHelper/dialogHelper';
 import globalize from '../../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import layoutManager from '../layoutManager';
 import loading from '../loading/loading';
 import scrollHelper from '../../scripts/scrollHelper';
 import datetime from '../../scripts/datetime';
+
 import '../../styles/scrollstyles.scss';
 import '../../elements/emby-button/emby-button';
 import '../../elements/emby-checkbox/emby-checkbox';
@@ -14,7 +16,6 @@ import '../formdialog.scss';
 import './recordingcreator.scss';
 import 'material-design-icons-iconfont';
 import '../../styles/flexstyles.scss';
-import ServerConnections from '../ServerConnections';
 import template from './seriesrecordingeditor.template.html';
 
 let currentDialog;

src/components/refreshdialog/refreshdialog.js

@@ -3,6 +3,8 @@ import dialogHelper from '../dialogHelper/dialogHelper';
 import loading from '../loading/loading';
 import layoutManager from '../layoutManager';
 import globalize from '../../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
+
 import '../../elements/emby-input/emby-input';
 import '../../elements/emby-button/emby-button';
 import '../../elements/emby-button/paper-icon-button-light';
@@ -10,7 +12,6 @@ import '../../elements/emby-checkbox/emby-checkbox';
 import '../../elements/emby-select/emby-select';
 import 'material-design-icons-iconfont';
 import '../formdialog.scss';
-import ServerConnections from '../ServerConnections';
 import toast from '../toast/toast';
 
 function getEditorHtml() {

src/components/remotecontrol/remotecontrol.js

@@ -11,9 +11,11 @@ import { playbackManager } from '../playback/playbackmanager';
 import Events from '../../utils/events.ts';
 import { appHost } from '../apphost';
 import globalize from '../../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import layoutManager from '../layoutManager';
 import * as userSettings from '../../scripts/settings/userSettings';
 import itemContextMenu from '../itemContextMenu';
+
 import '../cardbuilder/card.scss';
 import '../../elements/emby-button/emby-button';
 import '../../elements/emby-button/paper-icon-button-light';
@@ -21,7 +23,6 @@ import '../../elements/emby-itemscontainer/emby-itemscontainer';
 import './remotecontrol.scss';
 import '../../elements/emby-ratingbutton/emby-ratingbutton';
 import '../../elements/emby-slider/emby-slider';
-import ServerConnections from '../ServerConnections';
 import toast from '../toast/toast';
 import { appRouter } from '../router/appRouter';
 import { getDefaultBackgroundClass } from '../cardbuilder/cardBuilderUtils';

src/components/router/appRouter.js

@@ -4,12 +4,12 @@ import { setBackdropTransparency } from '../backdrop/backdrop';
 import globalize from '../../lib/globalize';
 import itemHelper from '../itemHelper';
 import loading from '../loading/loading';
-import ServerConnections from '../ServerConnections';
 import alert from '../alert';
 
-import { queryClient } from 'utils/query/queryClient';
 import { getItemQuery } from 'hooks/useItem';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import { toApi } from 'utils/jellyfin-apiclient/compat';
+import { queryClient } from 'utils/query/queryClient';
 import { history } from 'RootAppRouter';
 
 /** Pages of "no return" (when "Go back" should behave differently, probably quitting the application). */

src/components/shortcuts.js

@@ -8,9 +8,9 @@ import { playbackManager } from './playback/playbackmanager';
 import inputManager from '../scripts/inputManager';
 import { appRouter } from './router/appRouter';
 import globalize from '../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import dom from '../scripts/dom';
 import recordingHelper from './recordingcreator/recordinghelper';
-import ServerConnections from './ServerConnections';
 import toast from './toast/toast';
 import * as userSettings from '../scripts/settings/userSettings';
 import { toApi } from 'utils/jellyfin-apiclient/compat';

src/components/slideshow/slideshow.js

@@ -3,16 +3,17 @@
  * @module components/slideshow/slideshow
  */
 import dialogHelper from '../dialogHelper/dialogHelper';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import inputManager from '../../scripts/inputManager';
 import layoutManager from '../layoutManager';
 import focusManager from '../focusManager';
 import browser from '../../scripts/browser';
 import { appHost } from '../apphost';
 import dom from '../../scripts/dom';
+
 import './style.scss';
 import 'material-design-icons-iconfont';
 import '../../elements/emby-button/paper-icon-button-light';
-import ServerConnections from '../ServerConnections';
 import screenfull from 'screenfull';
 import { randomInt } from '../../utils/number.ts';
 

src/components/subtitleeditor/subtitleeditor.js

@@ -3,10 +3,12 @@ import { appHost } from '../apphost';
 import dialogHelper from '../dialogHelper/dialogHelper';
 import layoutManager from '../layoutManager';
 import globalize from '../../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import * as userSettings from '../../scripts/settings/userSettings';
 import loading from '../loading/loading';
 import focusManager from '../focusManager';
 import dom from '../../scripts/dom';
+
 import '../../elements/emby-select/emby-select';
 import '../listview/listview.scss';
 import '../../elements/emby-button/paper-icon-button-light';
@@ -15,7 +17,6 @@ import 'material-design-icons-iconfont';
 import './subtitleeditor.scss';
 import '../../elements/emby-button/emby-button';
 import '../../styles/flexstyles.scss';
-import ServerConnections from '../ServerConnections';
 import toast from '../toast/toast';
 import confirm from '../confirm/confirm';
 import template from './subtitleeditor.template.html';

src/components/subtitlesettings/subtitlesettings.js

@@ -1,4 +1,5 @@
 import globalize from '../../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import { appHost } from '../apphost';
 import appSettings from '../../scripts/settings/appSettings';
 import focusManager from '../focusManager';
@@ -8,6 +9,7 @@ import subtitleAppearanceHelper from './subtitleappearancehelper';
 import settingsHelper from '../settingshelper';
 import dom from '../../scripts/dom';
 import Events from '../../utils/events.ts';
+
 import '../listview/listview.scss';
 import '../../elements/emby-select/emby-select';
 import '../../elements/emby-slider/emby-slider';
@@ -15,7 +17,6 @@ import '../../elements/emby-input/emby-input';
 import '../../elements/emby-checkbox/emby-checkbox';
 import '../../styles/flexstyles.scss';
 import './subtitlesettings.scss';
-import ServerConnections from '../ServerConnections';
 import toast from '../toast/toast';
 import template from './subtitlesettings.template.html';
 

src/components/subtitleuploader/subtitleuploader.js

@@ -3,14 +3,15 @@ import escapeHtml from 'escape-html';
 import { getSubtitleApi } from '@jellyfin/sdk/lib/utils/api/subtitle-api';
 import { toApi } from 'utils/jellyfin-apiclient/compat';
 import dialogHelper from '../../components/dialogHelper/dialogHelper';
-import ServerConnections from '../ServerConnections';
 import dom from '../../scripts/dom';
 import loading from '../../components/loading/loading';
 import scrollHelper from '../../scripts/scrollHelper';
 import layoutManager from '../layoutManager';
 import globalize from '../../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import template from './subtitleuploader.template.html';
 import toast from '../toast/toast';
+
 import '../../elements/emby-button/emby-button';
 import '../../elements/emby-select/emby-select';
 import '../formdialog.scss';

src/components/themeMediaPlayer.js

@@ -3,6 +3,7 @@ import { MediaType } from '@jellyfin/sdk/lib/generated-client/models/media-type'
 import { getLibraryApi } from '@jellyfin/sdk/lib/utils/api/library-api';
 
 import { getItemQuery } from 'hooks/useItem';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import { currentSettings as userSettings } from 'scripts/settings/userSettings';
 import { ItemKind } from 'types/base/models/item-kind';
 import Events from 'utils/events.ts';
@@ -10,7 +11,6 @@ import { toApi } from 'utils/jellyfin-apiclient/compat';
 import { queryClient } from 'utils/query/queryClient';
 
 import { playbackManager } from './playback/playbackmanager';
-import ServerConnections from './ServerConnections';
 
 let currentOwnerId;
 let currentThemeIds = [];

src/components/upnextdialog/upnextdialog.js

@@ -5,8 +5,9 @@ import mediaInfo from '../mediainfo/mediainfo';
 import layoutManager from '../layoutManager';
 import focusManager from '../focusManager';
 import globalize from '../../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import itemHelper from '../itemHelper';
-import ServerConnections from '../ServerConnections';
+
 import './upnextdialog.scss';
 import '../../elements/emby-button/emby-button';
 import '../../styles/flexstyles.scss';

src/components/userdatabuttons/userdatabuttons.js

@@ -1,11 +1,12 @@
 import globalize from '../../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import dom from '../../scripts/dom';
 import itemHelper from '../itemHelper';
+
 import '../../elements/emby-button/paper-icon-button-light';
 import 'material-design-icons-iconfont';
 import '../../elements/emby-button/emby-button';
 import './userdatabuttons.scss';
-import ServerConnections from '../ServerConnections';
 
 const userDataMethods = {
     markPlayed: markPlayed,

src/controllers/favorites.js

@@ -2,9 +2,9 @@ import cardBuilder from 'components/cardbuilder/cardBuilder';
 import focusManager from 'components/focusManager';
 import layoutManager from 'components/layoutManager';
 import { appRouter } from 'components/router/appRouter';
-import ServerConnections from 'components/ServerConnections';
 import dom from 'scripts/dom';
 import globalize from 'lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import { getBackdropShape, getPortraitShape, getSquareShape } from 'utils/card';
 import { ItemSortBy } from '@jellyfin/sdk/lib/generated-client/models/item-sort-by';
 

src/controllers/hometab.js

@@ -2,8 +2,9 @@ import * as userSettings from '../scripts/settings/userSettings';
 import loading from '../components/loading/loading';
 import focusManager from '../components/focusManager';
 import homeSections from '../components/homesections/homesections';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
+
 import '../elements/emby-itemscontainer/emby-itemscontainer';
-import ServerConnections from '../components/ServerConnections';
 
 class HomeTab {
     constructor(view, params) {

src/controllers/itemDetails/index.js

@@ -21,12 +21,12 @@ import loading from 'components/loading/loading';
 import { playbackManager } from 'components/playback/playbackmanager';
 import { appRouter } from 'components/router/appRouter';
 import itemShortcuts from 'components/shortcuts';
-import ServerConnections from 'components/ServerConnections';
+import globalize from 'lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import browser from 'scripts/browser';
 import datetime from 'scripts/datetime';
 import dom from 'scripts/dom';
 import { download } from 'scripts/fileDownloader';
-import globalize from 'lib/globalize';
 import libraryMenu from 'scripts/libraryMenu';
 import * as userSettings from 'scripts/settings/userSettings';
 import { getPortraitShape, getSquareShape } from 'utils/card';
@@ -1379,7 +1379,6 @@ function renderChildren(page, item) {
         if (item.Type == 'MusicAlbum') {
             let showArtist = false;
             for (const track of result.Items) {
-                // eslint-disable-next-line sonarjs/no-alphabetical-sort
                 if (!isEqual(track.ArtistItems.map(x => x.Id).sort(), track.AlbumArtists.map(x => x.Id).sort())) {
                     showArtist = true;
                     break;

src/controllers/list.js

@@ -8,9 +8,9 @@ import AlphaNumericShortcuts from '../scripts/alphanumericshortcuts';
 import libraryBrowser from '../scripts/libraryBrowser';
 import { playbackManager } from '../components/playback/playbackmanager';
 import AlphaPicker from '../components/alphaPicker/alphaPicker';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import '../elements/emby-itemscontainer/emby-itemscontainer';
 import '../elements/emby-scroller/emby-scroller';
-import ServerConnections from '../components/ServerConnections';
 import LibraryMenu from '../scripts/libraryMenu';
 import { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
 import { ItemSortBy } from '@jellyfin/sdk/lib/generated-client/models/item-sort-by';

src/controllers/lyrics.js

@@ -4,12 +4,12 @@ import autoFocuser from 'components/autoFocuser';
 import { appRouter } from '../components/router/appRouter';
 import layoutManager from 'components/layoutManager';
 import { playbackManager } from '../components/playback/playbackmanager';
-import ServerConnections from '../components/ServerConnections';
 import scrollManager from 'components/scrollManager';
 import focusManager from 'components/focusManager';
 
 import keyboardNavigation from 'scripts/keyboardNavigation';
 import globalize from 'lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import LibraryMenu from 'scripts/libraryMenu';
 import Events from 'utils/events';
 

src/controllers/playback/video/index.js

@@ -19,10 +19,10 @@ import '../../../elements/emby-slider/emby-slider';
 import '../../../elements/emby-button/paper-icon-button-light';
 import '../../../elements/emby-ratingbutton/emby-ratingbutton';
 import '../../../styles/videoosd.scss';
-import ServerConnections from '../../../components/ServerConnections';
 import shell from '../../../scripts/shell';
 import SubtitleSync from '../../../components/subtitlesync/subtitlesync';
 import { appRouter } from '../../../components/router/appRouter';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import LibraryMenu from '../../../scripts/libraryMenu';
 import { setBackdropTransparency, TRANSPARENCY_LEVEL } from '../../../components/backdrop/backdrop';
 import { pluginManager } from '../../../components/pluginManager';

src/controllers/session/addServer/index.js

@@ -1,10 +1,11 @@
-import appSettings from '../../../scripts/settings/appSettings';
-import loading from '../../../components/loading/loading';
-import globalize from '../../../lib/globalize';
-import '../../../elements/emby-button/emby-button';
-import Dashboard from '../../../utils/dashboard';
-import ServerConnections from '../../../components/ServerConnections';
-import { ConnectionState } from '../../../lib/jellyfin-apiclient/connectionState';
+import loading from 'components/loading/loading';
+import globalize from 'lib/globalize';
+import { ConnectionState } from 'lib/jellyfin-apiclient/connectionState';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
+import appSettings from 'scripts/settings/appSettings';
+import Dashboard from 'utils/dashboard';
+
+import 'elements/emby-button/emby-button';
 
 function handleConnectionResult(page, result) {
     loading.hide();

src/controllers/session/login/index.js

@@ -11,12 +11,13 @@ import globalize from '../../../lib/globalize';
 import '../../../components/cardbuilder/card.scss';
 import '../../../elements/emby-checkbox/emby-checkbox';
 import Dashboard from '../../../utils/dashboard';
-import ServerConnections from '../../../components/ServerConnections';
 import toast from '../../../components/toast/toast';
 import dialogHelper from '../../../components/dialogHelper/dialogHelper';
 import baseAlert from '../../../components/alert';
-import './login.scss';
 import { getDefaultBackgroundClass } from '../../../components/cardbuilder/cardBuilderUtils';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
+
+import './login.scss';
 
 const enableFocusTransform = !browser.slow && !browser.edge;
 

src/controllers/session/selectServer/index.js

@@ -17,10 +17,10 @@ import '../../../elements/emby-itemscontainer/emby-itemscontainer';
 import '../../../components/cardbuilder/card.scss';
 import '../../../elements/emby-button/emby-button';
 import Dashboard from '../../../utils/dashboard';
-import ServerConnections from '../../../components/ServerConnections';
 import alert from '../../../components/alert';
-import { ConnectionState } from '../../../lib/jellyfin-apiclient/connectionState';
 import { getDefaultBackgroundClass } from '../../../components/cardbuilder/cardBuilderUtils';
+import { ConnectionState } from 'lib/jellyfin-apiclient/connectionState';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 
 const enableFocusTransform = !browser.slow && !browser.edge;
 

src/elements/emby-itemscontainer/emby-itemscontainer.js

@@ -1,3 +1,6 @@
+import 'webcomponents.js/webcomponents-lite';
+import Sortable from 'sortablejs';
+
 import itemShortcuts from '../../components/shortcuts';
 import inputManager from '../../scripts/inputManager';
 import { playbackManager } from '../../components/playback/playbackmanager';
@@ -7,11 +10,9 @@ import browser from '../../scripts/browser';
 import dom from '../../scripts/dom';
 import loading from '../../components/loading/loading';
 import focusManager from '../../components/focusManager';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import serverNotifications from '../../scripts/serverNotifications';
 import Events from '../../utils/events.ts';
-import 'webcomponents.js/webcomponents-lite';
-import ServerConnections from '../../components/ServerConnections';
-import Sortable from 'sortablejs';
 
 const ItemsContainerPrototype = Object.create(HTMLDivElement.prototype);
 

src/elements/emby-playstatebutton/emby-playstatebutton.js

@@ -1,8 +1,8 @@
 import serverNotifications from '../../scripts/serverNotifications';
 import globalize from '../../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import Events from '../../utils/events.ts';
 import EmbyButtonPrototype from '../../elements/emby-button/emby-button';
-import ServerConnections from '../../components/ServerConnections';
 
 function addNotificationEvent(instance, name, handler) {
     const localHandler = handler.bind(instance);

src/elements/emby-ratingbutton/emby-ratingbutton.js

@@ -1,8 +1,8 @@
 import serverNotifications from '../../scripts/serverNotifications';
 import globalize from '../../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import Events from '../../utils/events.ts';
 import EmbyButtonPrototype from '../emby-button/emby-button';
-import ServerConnections from '../../components/ServerConnections';
 
 function addNotificationEvent(instance, name, handler) {
     const localHandler = handler.bind(instance);

src/hooks/useApi.tsx

@@ -3,9 +3,9 @@ import type { UserDto } from '@jellyfin/sdk/lib/generated-client';
 import type { ApiClient, Event } from 'jellyfin-apiclient';
 import React, { type FC, type PropsWithChildren, createContext, useContext, useEffect, useMemo, useState } from 'react';
 
-import ServerConnections from '../components/ServerConnections';
-import events from '../utils/events';
-import { toApi } from '../utils/jellyfin-apiclient/compat';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
+import events from 'utils/events';
+import { toApi } from 'utils/jellyfin-apiclient/compat';
 
 export interface JellyfinApiContext {
     __legacyApiClient__?: ApiClient

src/index.jsx

@@ -5,7 +5,7 @@ import React from 'react';
 import { createRoot } from 'react-dom/client';
 
 // NOTE: We need to import this first to initialize the connection
-import ServerConnections from './components/ServerConnections';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 
 import { appHost } from './components/apphost';
 import autoFocuser from './components/autoFocuser';
@@ -23,7 +23,6 @@ import { pageClassOn, serverAddress } from './utils/dashboard';
 import Events from './utils/events';
 
 import RootApp from './RootApp';
-import { history } from 'RootAppRouter';
 
 // Import the button webcomponent for use throughout the site
 // NOTE: This is a bit of a hack, files should ensure the component is imported before use
@@ -206,7 +205,7 @@ async function renderApp() {
 
     const root = createRoot(container);
     root.render(
-        <RootApp history={history} />
+        <RootApp />
     );
 }
 

src/lib/jellyfin-apiclient/ServerConnections.js

@@ -3,12 +3,12 @@
 import { Api } from '@jellyfin/sdk';
 import { Credentials, ApiClient } from 'jellyfin-apiclient';
 
-import { appHost } from './apphost';
+import { appHost } from 'components/apphost';
 import ConnectionManager from 'lib/jellyfin-apiclient/connectionManager';
-import Dashboard from '../utils/dashboard';
-import Events from '../utils/events.ts';
-import { setUserInfo } from '../scripts/settings/userSettings';
-import appSettings from '../scripts/settings/appSettings';
+import appSettings from 'scripts/settings/appSettings';
+import { setUserInfo } from 'scripts/settings/userSettings';
+import Dashboard from 'utils/dashboard';
+import Events from 'utils/events.ts';
 import { toApi } from 'utils/jellyfin-apiclient/compat';
 
 const normalizeImageOptions = options => {

src/plugins/backdropScreensaver/plugin.js

@@ -1,7 +1,7 @@
 
-import ServerConnections from '../../components/ServerConnections';
-import { PluginType } from '../../types/plugin.ts';
-import * as userSettings from '../../scripts/settings/userSettings';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
+import * as userSettings from 'scripts/settings/userSettings';
+import { PluginType } from 'types/plugin.ts';
 
 class BackdropScreensaver {
     constructor() {

src/plugins/bookPlayer/plugin.js

@@ -3,10 +3,10 @@ import 'material-design-icons-iconfont';
 import loading from '../../components/loading/loading';
 import keyboardnavigation from '../../scripts/keyboardNavigation';
 import dialogHelper from '../../components/dialogHelper/dialogHelper';
-import ServerConnections from '../../components/ServerConnections';
 import Screenfull from 'screenfull';
 import TableOfContents from './tableOfContents';
 import { translateHtml } from '../../lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import browser from 'scripts/browser';
 import * as userSettings from '../../scripts/settings/userSettings';
 import TouchHelper from 'scripts/touchHelper';

src/plugins/chromecastPlayer/plugin.js

@@ -3,8 +3,8 @@ import * as userSettings from '../../scripts/settings/userSettings';
 import { playbackManager } from '../../components/playback/playbackmanager';
 import globalize from '../../lib/globalize';
 import CastSenderApi from './castSenderApi';
-import ServerConnections from '../../components/ServerConnections';
 import alert from '../../components/alert';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import { PluginType } from '../../types/plugin.ts';
 import Events from '../../utils/events.ts';
 import { getItems } from '../../utils/jellyfin-apiclient/getItems.ts';

src/plugins/comicsPlayer/plugin.js

@@ -3,7 +3,7 @@ import loading from '../../components/loading/loading';
 import dialogHelper from '../../components/dialogHelper/dialogHelper';
 import keyboardnavigation from '../../scripts/keyboardNavigation';
 import { appRouter } from '../../components/router/appRouter';
-import ServerConnections from '../../components/ServerConnections';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import * as userSettings from '../../scripts/settings/userSettings';
 import { PluginType } from '../../types/plugin.ts';
 

src/plugins/htmlVideoPlayer/plugin.js

@@ -29,7 +29,7 @@ import {
 import itemHelper from '../../components/itemHelper';
 import Screenfull from 'screenfull';
 import globalize from '../../lib/globalize';
-import ServerConnections from '../../components/ServerConnections';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import profileBuilder, { canPlaySecondaryAudio } from '../../scripts/browserDeviceProfile';
 import { getIncludeCorsCredentials } from '../../scripts/settings/webSettings';
 import { setBackdropTransparency, TRANSPARENCY_LEVEL } from '../../components/backdrop/backdrop';

src/plugins/pdfPlayer/plugin.js

@@ -1,9 +1,9 @@
-import ServerConnections from '../../components/ServerConnections';
 import loading from '../../components/loading/loading';
 import keyboardnavigation from '../../scripts/keyboardNavigation';
 import dialogHelper from '../../components/dialogHelper/dialogHelper';
 import dom from '../../scripts/dom';
 import { appRouter } from '../../components/router/appRouter';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import { PluginType } from '../../types/plugin.ts';
 import Events from '../../utils/events.ts';
 

src/plugins/photoPlayer/plugin.js

@@ -1,5 +1,5 @@
-import ServerConnections from '../../components/ServerConnections';
-import { PluginType } from '../../types/plugin.ts';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
+import { PluginType } from 'types/plugin.ts';
 
 export default class PhotoPlayer {
     constructor() {

src/plugins/playAccessValidation/plugin.js

@@ -1,7 +1,7 @@
-import globalize from '../../lib/globalize';
-import ServerConnections from '../../components/ServerConnections';
-import alert from '../../components/alert';
-import { PluginType } from '../../types/plugin.ts';
+import alert from 'components/alert';
+import globalize from 'lib/globalize';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
+import { PluginType } from 'types/plugin.ts';
 
 function showErrorMessage() {
     return alert(globalize.translate('MessagePlayAccessRestricted'));

src/plugins/sessionPlayer/plugin.js

@@ -1,6 +1,6 @@
 import { playbackManager } from '../../components/playback/playbackmanager';
+import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections';
 import serverNotifications from '../../scripts/serverNotifications';
-import ServerConnections from '../../components/ServerConnections';
 import { PluginType } from '../../types/plugin.ts';
 import Events from '../../utils/events.ts';
 import isEqual from 'lodash-es/isEqual';