1 files changed, 91 insertions, 49 deletions

diff --git a/server/typings/express/index.d.ts b/server/typings/express/index.d.ts
index cf3e7ae34..55b6e0039 100644
--- a/server/typings/express/index.d.ts
+++ b/server/typings/express/index.d.ts
@@ -19,6 +19,9 @@ import { MPlugin, MServer, MServerBlocklist } from '@server/types/models/server'
 import { MVideoImportDefault } from '@server/types/models/video/video-import'
 import { MVideoPlaylistElement, MVideoPlaylistElementVideoUrlPlaylistPrivacy } from '@server/types/models/video/video-playlist-element'
 import { MAccountVideoRateAccountVideo } from '@server/types/models/video/video-rate'
+import { HttpMethod } from '@shared/core-utils/miscs/http-methods'
+import { VideoCreate } from '@shared/models'
+import { File as UploadXFile, Metadata } from '@uploadx/core'
 import { RegisteredPlugin } from '../../lib/plugins/plugin-manager'
 import {
   MAccountDefault,
@@ -37,86 +40,125 @@ import {
   MVideoThumbnail,
   MVideoWithRights
 } from '../../types/models'
-
 declare module 'express' {
   export interface Request {
     query: any
+    method: HttpMethod
   }
-  interface Response {
-    locals: PeerTubeLocals
+
+  // Upload using multer or uploadx middleware
+  export type MulterOrUploadXFile = UploadXFile | Express.Multer.File
+
+  export type UploadFiles = {
+    [fieldname: string]: MulterOrUploadXFile[]
+  } | MulterOrUploadXFile[]
+
+  // Partial object used by some functions to check the file mimetype/extension
+  export type UploadFileForCheck = {
+    originalname: string
+    mimetype: string
   }
-}
 
-interface PeerTubeLocals {
-  videoAll?: MVideoFullLight
-  onlyImmutableVideo?: MVideoImmutable
-  onlyVideo?: MVideoThumbnail
-  onlyVideoWithRights?: MVideoWithRights
-  videoId?: MVideoIdThumbnail
+  export type UploadFilesForCheck = {
+    [fieldname: string]: UploadFileForCheck[]
+  } | UploadFileForCheck[]
 
-  videoLive?: MVideoLive
+  // Upload file with a duration added by our middleware
+  export type VideoUploadFile = Pick<Express.Multer.File, 'path' | 'filename' | 'size'> & {
+    duration: number
+  }
 
-  videoShare?: MVideoShareActor
+  // Extends Metadata property of UploadX object
+  export type UploadXFileMetadata = Metadata & VideoCreate & {
+    previewfile: Express.Multer.File[]
+    thumbnailfile: Express.Multer.File[]
+  }
 
-  videoFile?: MVideoFile
+  // Our custom UploadXFile object using our custom metadata
+  export type CustomUploadXFile <T extends Metadata> = UploadXFile & { metadata: T }
 
-  videoImport?: MVideoImportDefault
+  export type EnhancedUploadXFile = CustomUploadXFile<UploadXFileMetadata> & {
+    duration: number
+    path: string
+    filename: string
+  }
 
-  videoBlacklist?: MVideoBlacklist
+  // Extends locals property from Response
+  interface Response {
+    locals: {
+      videoAll?: MVideoFullLight
+      onlyImmutableVideo?: MVideoImmutable
+      onlyVideo?: MVideoThumbnail
+      onlyVideoWithRights?: MVideoWithRights
+      videoId?: MVideoIdThumbnail
 
-  videoCaption?: MVideoCaptionVideo
+      videoLive?: MVideoLive
 
-  abuse?: MAbuseReporter
-  abuseMessage?: MAbuseMessage
+      videoShare?: MVideoShareActor
 
-  videoStreamingPlaylist?: MStreamingPlaylist
+      videoFile?: MVideoFile
 
-  videoChannel?: MChannelBannerAccountDefault
+      videoFileResumable?: EnhancedUploadXFile
 
-  videoPlaylistFull?: MVideoPlaylistFull
-  videoPlaylistSummary?: MVideoPlaylistFullSummary
+      videoImport?: MVideoImportDefault
 
-  videoPlaylistElement?: MVideoPlaylistElement
-  videoPlaylistElementAP?: MVideoPlaylistElementVideoUrlPlaylistPrivacy
+      videoBlacklist?: MVideoBlacklist
 
-  accountVideoRate?: MAccountVideoRateAccountVideo
+      videoCaption?: MVideoCaptionVideo
 
-  videoCommentFull?: MCommentOwnerVideoReply
-  videoCommentThread?: MComment
+      abuse?: MAbuseReporter
+      abuseMessage?: MAbuseMessage
 
-  follow?: MActorFollowActorsDefault
-  subscription?: MActorFollowActorsDefaultSubscription
+      videoStreamingPlaylist?: MStreamingPlaylist
 
-  nextOwner?: MAccountDefault
-  videoChangeOwnership?: MVideoChangeOwnershipFull
+      videoChannel?: MChannelBannerAccountDefault
 
-  account?: MAccountDefault
+      videoPlaylistFull?: MVideoPlaylistFull
+      videoPlaylistSummary?: MVideoPlaylistFullSummary
 
-  actorUrl?: MActorUrl
-  actorFull?: MActorFull
+      videoPlaylistElement?: MVideoPlaylistElement
+      videoPlaylistElementAP?: MVideoPlaylistElementVideoUrlPlaylistPrivacy
 
-  user?: MUserDefault
+      accountVideoRate?: MAccountVideoRateAccountVideo
 
-  server?: MServer
+      videoCommentFull?: MCommentOwnerVideoReply
+      videoCommentThread?: MComment
 
-  videoRedundancy?: MVideoRedundancyVideo
+      follow?: MActorFollowActorsDefault
+      subscription?: MActorFollowActorsDefaultSubscription
 
-  accountBlock?: MAccountBlocklist
-  serverBlock?: MServerBlocklist
+      nextOwner?: MAccountDefault
+      videoChangeOwnership?: MVideoChangeOwnershipFull
 
-  oauth?: {
-    token: MOAuthTokenUser
-  }
+      account?: MAccountDefault
 
-  signature?: {
-    actor: MActorAccountChannelId
-  }
+      actorUrl?: MActorUrl
+      actorFull?: MActorFull
+
+      user?: MUserDefault
+
+      server?: MServer
+
+      videoRedundancy?: MVideoRedundancyVideo
 
-  authenticated?: boolean
+      accountBlock?: MAccountBlocklist
+      serverBlock?: MServerBlocklist
 
-  registeredPlugin?: RegisteredPlugin
+      oauth?: {
+        token: MOAuthTokenUser
+      }
 
-  externalAuth?: RegisterServerAuthExternalOptions
+      signature?: {
+        actor: MActorAccountChannelId
+      }
 
-  plugin?: MPlugin
+      authenticated?: boolean
+
+      registeredPlugin?: RegisteredPlugin
+
+      externalAuth?: RegisterServerAuthExternalOptions
+
+      plugin?: MPlugin
+    }
+  }
 }