5 files changed, 39 insertions, 0 deletions

diff --git a/server/types/express.d.ts b/server/types/express.d.ts
index a992a9926..a8aeabb3a 100644
--- a/server/types/express.d.ts
+++ b/server/types/express.d.ts
@@ -44,6 +44,7 @@ import {
   MVideoShareActor,
   MVideoThumbnail
 } from './models'
+import { MRunner, MRunnerJobRunner, MRunnerRegistrationToken } from './models/runners'
 import { MVideoSource } from './models/video/video-source'
 
 declare module 'express' {
@@ -102,6 +103,8 @@ declare module 'express' {
       instance?: string
 
       data?: PeerTubeProblemDocumentData
+
+      tags?: string[]
     }) => void
 
     locals: {
@@ -203,6 +206,9 @@ declare module 'express' {
 
       localViewerFull?: MLocalVideoViewerWithWatchSections
 
+      runner?: MRunner
+      runnerRegistrationToken?: MRunnerRegistrationToken
+      runnerJob?: MRunnerJobRunner
     }
   }
 }
diff --git a/server/types/models/runners/index.ts b/server/types/models/runners/index.ts
new file mode 100644
index 000000000..e94d4794e
--- /dev/null
+++ b/server/types/models/runners/index.ts
@@ -0,0 +1,3 @@
+export * from './runner'
+export * from './runner-job'
+export * from './runner-registration-token'
diff --git a/server/types/models/runners/runner-job.ts b/server/types/models/runners/runner-job.ts
new file mode 100644
index 000000000..ec983ba32
--- /dev/null
+++ b/server/types/models/runners/runner-job.ts
@@ -0,0 +1,20 @@
+import { RunnerJobModel } from '@server/models/runner/runner-job'
+import { PickWith } from '@shared/typescript-utils'
+import { MRunner } from './runner'
+
+type Use<K extends keyof RunnerJobModel, M> = PickWith<RunnerJobModel, K, M>
+
+// ############################################################################
+
+export type MRunnerJob = Omit<RunnerJobModel, 'Runner' | 'DependsOnRunnerJob'>
+
+// ############################################################################
+
+export type MRunnerJobRunner =
+  MRunnerJob &
+  Use<'Runner', MRunner>
+
+export type MRunnerJobRunnerParent =
+  MRunnerJob &
+  Use<'Runner', MRunner> &
+  Use<'DependsOnRunnerJob', MRunnerJob>
diff --git a/server/types/models/runners/runner-registration-token.ts b/server/types/models/runners/runner-registration-token.ts
new file mode 100644
index 000000000..83b8614ad
--- /dev/null
+++ b/server/types/models/runners/runner-registration-token.ts
@@ -0,0 +1,5 @@
+import { RunnerRegistrationTokenModel } from '@server/models/runner/runner-registration-token'
+
+// ############################################################################
+
+export type MRunnerRegistrationToken = Omit<RunnerRegistrationTokenModel, 'Runners'>
diff --git a/server/types/models/runners/runner.ts b/server/types/models/runners/runner.ts
new file mode 100644
index 000000000..d35356378
--- /dev/null
+++ b/server/types/models/runners/runner.ts
@@ -0,0 +1,5 @@
+import { RunnerModel } from '@server/models/runner/runner'
+
+// ############################################################################
+
+export type MRunner = Omit<RunnerModel, 'RunnerRegistrationToken'>