Remove Plex Transcoder. Fixes chrisbenincasa#441 (chrisbenincasa#452)

* remove plex transcoder checkpoint

* Forgot to push this file

* Remove usages of plex transcoder on backend. Forces direct play and allows Tunarr to own all normalization logic

* Capitalizing class files

* Remove plex transcode settings from UI

server/src/api/channelsApi.ts

@@ -18,7 +18,7 @@ import duration from 'dayjs/plugin/duration.js';
 import { compact, isError, isNil, map, omit, sortBy } from 'lodash-es';
 import z from 'zod';
 import { GlobalScheduler } from '../services/scheduler.js';
-import { UpdateXmlTvTask } from '../tasks/updateXmlTvTask.js';
+import { UpdateXmlTvTask } from '../tasks/UpdateXmlTvTask.js';
 import { RouterPluginAsyncCallback } from '../types/serverType.js';
 import { attempt, mapAsyncSeq } from '../util/index.js';
 import { LoggerFactory } from '../util/logging/LoggerFactory.js';

server/src/api/debugApi.ts

@@ -12,7 +12,7 @@ import {
   isContentBackedLineupIteam,
 } from '../dao/derived_types/StreamLineup.js';
 import { Channel } from '../dao/entities/Channel.js';
-import { PlexPlayer } from '../stream/plex/plexPlayer.js';
+import { PlexPlayer } from '../stream/plex/PlexPlayer.js';
 import { PlexTranscoder } from '../stream/plex/plexTranscoder.js';
 import { FillerPicker } from '../services/FillerPicker.js';
 import { StreamContextChannel } from '../stream/types.js';

server/src/api/index.ts

@@ -10,7 +10,7 @@ import { Plex } from '../external/plex.js';
 import { FFMPEGInfo } from '../ffmpeg/ffmpegInfo.js';
 import { serverOptions } from '../globals.js';
 import { GlobalScheduler } from '../services/scheduler.js';
-import { UpdateXmlTvTask } from '../tasks/updateXmlTvTask.js';
+import { UpdateXmlTvTask } from '../tasks/UpdateXmlTvTask.js';
 import { RouterPluginAsyncCallback } from '../types/serverType.js';
 import { fileExists } from '../util/fsUtil.js';
 import { LoggerFactory } from '../util/logging/LoggerFactory.js';

server/src/api/plexServersApi.ts

@@ -10,7 +10,7 @@ import z from 'zod';
 import { PlexServerSettings } from '../dao/entities/PlexServerSettings.js';
 import { Plex, PlexApiFactory } from '../external/plex.js';
 import { GlobalScheduler } from '../services/scheduler.js';
-import { UpdateXmlTvTask } from '../tasks/updateXmlTvTask.js';
+import { UpdateXmlTvTask } from '../tasks/UpdateXmlTvTask.js';
 import { RouterPluginAsyncCallback } from '../types/serverType.js';
 import { firstDefined, wait } from '../util/index.js';
 import { LoggerFactory } from '../util/logging/LoggerFactory.js';

server/src/api/videoApi.ts

@@ -224,7 +224,7 @@ export const videoRouter: RouterPluginAsyncCallback = async (fastify) => {
         querystring: StreamQueryStringSchema,
       },
       onError(req, _, e) {
-        logger.error('Error on /stream: %s. %O', req.raw.url, e);
+        logger.error(e, 'Error on /stream: %s. %O', req.raw.url);
       },
     },
     async (req, res) => {

server/src/api/xmltvSettingsApi.ts

@@ -5,7 +5,7 @@ import { z } from 'zod';
 import { defaultXmlTvSettings } from '../dao/settings.js';
 import { serverOptions } from '../globals.js';
 import { GlobalScheduler } from '../services/scheduler.js';
-import { UpdateXmlTvTask } from '../tasks/updateXmlTvTask.js';
+import { UpdateXmlTvTask } from '../tasks/UpdateXmlTvTask.js';
 import { RouterPluginCallback } from '../types/serverType.js';
 import { firstDefined } from '../util/index.js';
 import { LoggerFactory } from '../util/logging/LoggerFactory.js';

server/src/dao/derived_types/StreamLineup.ts

@@ -59,6 +59,8 @@ export type LoadingStreamLineupItem = z.infer<
   typeof LoadingStreamLineupItemSchema
 >;
 
+const ProgramTypeEnum = z.enum(['movie', 'episode', 'track']);
+
 const BaseContentBackedStreamLineupItemSchema =
   baseStreamLineupItemSchema.extend({
     programId: z.string().uuid(),
@@ -67,6 +69,7 @@ const BaseContentBackedStreamLineupItemSchema =
     externalSourceId: z.string(),
     filePath: z.string(),
     externalKey: z.string(),
+    programType: ProgramTypeEnum,
   });
 
 const CommercialStreamLineupItemSchema =

server/src/external/plex.ts

@@ -1,6 +1,12 @@
 import { EntityDTO } from '@mikro-orm/core';
 import { DefaultPlexHeaders } from '@tunarr/shared/constants';
-import { PlexDvr, PlexDvrsResponse, PlexResource } from '@tunarr/types/plex';
+import {
+  PlexDvr,
+  PlexDvrsResponse,
+  PlexMedia,
+  PlexMediaContainerResponseSchema,
+  PlexResource,
+} from '@tunarr/types/plex';
 import axios, {
   AxiosInstance,
   AxiosRequestConfig,
@@ -9,7 +15,7 @@ import axios, {
   isAxiosError,
 } from 'axios';
 import { XMLParser } from 'fast-xml-parser';
-import { flatMap, forEach, isNil, isUndefined, map } from 'lodash-es';
+import { first, flatMap, forEach, isNil, isUndefined, map } from 'lodash-es';
 import NodeCache from 'node-cache';
 import querystring, { ParsedUrlQueryInput } from 'querystring';
 import { MarkOptional } from 'ts-essentials';
@@ -20,6 +26,7 @@ import {
 } from '../types/plexApiTypes.js';
 import { Maybe } from '../types/util.js';
 import { Logger, LoggerFactory } from '../util/logging/LoggerFactory.js';
+import { z } from 'zod';
 
 type AxiosConfigWithMetadata = InternalAxiosRequestConfig & {
   metadata: {
@@ -162,7 +169,7 @@ export class Plex {
     };
 
     if (this.accessToken === '') {
-      throw Error(
+      throw new Error(
         'No Plex token provided. Please use the SignIn method or provide a X-Plex-Token in the Plex constructor.',
       );
     }
@@ -171,9 +178,54 @@ export class Plex {
     if (!res?.MediaContainer) {
       this.logger.error(res, 'Expected MediaContainer, got %O');
     }
+
     return res?.MediaContainer;
   }
 
+  async doTypeCheckedGet<T extends z.ZodTypeAny, Out = z.infer<T>>(
+    path: string,
+    schema: T,
+    optionalHeaders: RawAxiosRequestHeaders = {},
+  ): Promise<Maybe<Out>> {
+    const req: AxiosRequestConfig = {
+      method: 'get',
+      url: path,
+      headers: optionalHeaders,
+    };
+
+    if (this.accessToken === '') {
+      throw new Error(
+        'No Plex token provided. Please use the SignIn method or provide a X-Plex-Token in the Plex constructor.',
+      );
+    }
+
+    const response = await this.doRequest<unknown>(req);
+
+    const parsed = await schema.safeParseAsync(response);
+
+    if (parsed.success) {
+      return parsed.data as Out;
+    }
+
+    this.logger.error(
+      parsed.error,
+      'Unable to parse schema from Plex response. Path: %s',
+      path,
+    );
+    return;
+  }
+
+  async getItemMetadata(key: string): Promise<Maybe<PlexMedia>> {
+    const parsedResponse = await this.doTypeCheckedGet(
+      `/library/metadata/${key}`,
+      PlexMediaContainerResponseSchema,
+    );
+    if (!isUndefined(parsedResponse)) {
+      return first(parsedResponse.MediaContainer.Metadata);
+    }
+    return;
+  }
+
   doPut(
     path: string,
     query: ParsedUrlQueryInput | URLSearchParams = {},

server/src/ffmpeg/ffmpeg.ts

@@ -5,7 +5,7 @@ import { isEmpty, isNil, isString, isUndefined, merge, round } from 'lodash-es';
 import path from 'path';
 import { DeepReadonly, DeepRequired } from 'ts-essentials';
 import { serverOptions } from '../globals.js';
-import { VideoStats } from '../stream/plex/plexTranscoder.js';
+import { StreamDetails } from '../stream/plex/plexTranscoder.js';
 import { StreamContextChannel } from '../stream/types.js';
 import { Maybe } from '../types/util.js';
 import { TypedEventEmitter } from '../types/eventEmitter.js';
@@ -310,12 +310,10 @@ export class FFMPEG extends (events.EventEmitter as new () => TypedEventEmitter<
 
   spawnStream(
     streamUrl: string,
-    streamStats: Maybe<VideoStats>,
+    streamStats: Maybe<StreamDetails>,
     startTime: Maybe<number>,
     duration: Maybe<string>,
     enableIcon: Maybe<Watermark>,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    _: string, //LineupItem[type]
   ) {
     return this.spawn(
       streamUrl,
@@ -342,7 +340,7 @@ export class FFMPEG extends (events.EventEmitter as new () => TypedEventEmitter<
       duration = MAXIMUM_ERROR_DURATION_MS;
     }
     duration = Math.min(MAXIMUM_ERROR_DURATION_MS, duration);
-    const streamStats: VideoStats = {
+    const streamStats: StreamDetails = {
       videoWidth: this.wantedW,
       videoHeight: this.wantedH,
       duration: duration,
@@ -376,7 +374,7 @@ export class FFMPEG extends (events.EventEmitter as new () => TypedEventEmitter<
 
   spawn(
     streamUrl: string | { errorTitle: string; subtitle?: string },
-    streamStats: Maybe<VideoStats>,
+    streamStats: Maybe<StreamDetails>,
     startTime: Maybe<number>,
     duration: Maybe<string>,
     limitRead: boolean,
@@ -566,7 +564,12 @@ export class FFMPEG extends (events.EventEmitter as new () => TypedEventEmitter<
         currentAudio = '[audiox]';
       }
       currentVideo = '[videox]';
+    } else {
+      // HACK: We know these will be defined already if we get this far
+      iW = iW!;
+      iH = iH!;
     }
+
     if (doOverlay && !isNil(watermark?.url)) {
       if (watermark.animated) {
         ffmpegArgs.push('-ignore_loop', '0');

server/src/server.ts

@@ -31,7 +31,7 @@ import { ServerRequestContext, serverContext } from './serverContext.js';
 import { GlobalScheduler, scheduleJobs } from './services/scheduler.js';
 import { initPersistentStreamCache } from './stream/channelCache.js';
 import { runFixers } from './tasks/fixers/index.js';
-import { UpdateXmlTvTask } from './tasks/updateXmlTvTask.js';
+import { UpdateXmlTvTask } from './tasks/UpdateXmlTvTask.js';
 import { filename, isProduction, run } from './util/index.js';
 import { LoggerFactory } from './util/logging/LoggerFactory.js';
 

server/src/services/scheduler.ts

@@ -7,9 +7,9 @@ import { OneOffTask } from '../tasks/OneOffTask.js';
 import { ReconcileProgramDurationsTask } from '../tasks/ReconcileProgramDurationsTask.js';
 import { ScheduledTask } from '../tasks/ScheduledTask.js';
 import { Task, TaskId } from '../tasks/Task.js';
-import { CleanupSessionsTask } from '../tasks/cleanupSessionsTask.js';
-import { ScheduleDynamicChannelsTask } from '../tasks/scheduleDynamicChannelsTask.js';
-import { UpdateXmlTvTask } from '../tasks/updateXmlTvTask.js';
+import { CleanupSessionsTask } from '../tasks/CleanupSessionsTask.js';
+import { ScheduleDynamicChannelsTask } from '../tasks/ScheduleDynamicChannelsTask.js';
+import { UpdateXmlTvTask } from '../tasks/UpdateXmlTvTask.js';
 import { typedProperty } from '../types/path.js';
 import { Maybe } from '../types/util.js';
 import { LoggerFactory } from '../util/logging/LoggerFactory.js';

server/src/stream/StreamProgramCalculator.ts

@@ -34,10 +34,7 @@ export type ProgramAndTimeElapsed = {
 };
 
 function programHasRequiredStreamingFields(program: Loaded<ProgramEntity>) {
-  return every(
-    [program.plexFilePath, program.plexRatingKey, program.filePath],
-    negate(isNil),
-  );
+  return every([program.plexFilePath, program.filePath], negate(isNil));
 }
 
 // any channel thing used here should be added to channel context
@@ -161,6 +158,7 @@ export class StreamProgramCalculator {
           programId: backingItem.uuid,
           title: backingItem.title,
           id: backingItem.uuid,
+          programType: backingItem.type,
         };
       }
     } else if (isOfflineItem(lineupItem)) {
@@ -289,6 +287,7 @@ export class StreamProgramCalculator {
           beginningOffset: beginningOffset,
           externalSourceId: filler.externalSourceId,
           plexFilePath: filler.plexFilePath!,
+          programType: filler.type,
         };
       }
       // pick the offline screen