Type functions

5 files changed, 16 insertions, 15 deletions

diff --git a/server/initializers/checker.ts b/server/initializers/checker.ts
index 8c3d64b60..7007f2c0b 100644
--- a/server/initializers/checker.ts
+++ b/server/initializers/checker.ts
@@ -23,7 +23,7 @@ function checkMissedConfig () {
     'storage.certs', 'storage.videos', 'storage.logs', 'storage.thumbnails', 'storage.previews',
     'admin.email', 'signup.enabled', 'transcoding.enabled', 'transcoding.threads'
   ]
-  const miss = []
+  const miss: string[] = []
 
   for (const key of required) {
     if (!config.has(key)) {
@@ -35,7 +35,7 @@ function checkMissedConfig () {
 }
 
 // Check the available codecs
-function checkFFmpeg (callback) {
+function checkFFmpeg (callback: (err: Error) => void) {
   const Ffmpeg = require('fluent-ffmpeg')
 
   Ffmpeg.getAvailableCodecs(function (err, codecs) {
@@ -57,7 +57,7 @@ function checkFFmpeg (callback) {
   })
 }
 
-function clientsExist (callback) {
+function clientsExist (callback: (err: Error, clientsExist?: boolean) => void) {
   db.OAuthClient.countTotal(function (err, totalClients) {
     if (err) return callback(err)
 
@@ -65,7 +65,7 @@ function clientsExist (callback) {
   })
 }
 
-function usersExist (callback) {
+function usersExist (callback: (err: Error, usersExist?: boolean) => void) {
   db.User.countTotal(function (err, totalUsers) {
     if (err) return callback(err)
 
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index 7ab019f44..6dcb4bb91 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -202,7 +202,7 @@ const REQUEST_ENDPOINTS = {
   VIDEOS: 'videos'
 }
 
-const REQUEST_ENDPOINT_ACTIONS = {}
+const REQUEST_ENDPOINT_ACTIONS: { [ id: string ]: any } = {}
 REQUEST_ENDPOINT_ACTIONS[REQUEST_ENDPOINTS.VIDEOS] = {
   ADD: 'add',
   UPDATE: 'update',
diff --git a/server/initializers/database.ts b/server/initializers/database.ts
index b0f47876e..78ca5ab84 100644
--- a/server/initializers/database.ts
+++ b/server/initializers/database.ts
@@ -59,7 +59,7 @@ const sequelize = new Sequelize(dbname, username, password, {
   port: CONFIG.DATABASE.PORT,
   benchmark: isTestInstance(),
 
-  logging: function (message, benchmark) {
+  logging: function (message: string, benchmark: number) {
     let newMessage = message
     if (benchmark !== undefined) {
       newMessage += ' | ' + benchmark + 'ms'
@@ -71,7 +71,7 @@ const sequelize = new Sequelize(dbname, username, password, {
 
 database.sequelize = sequelize
 
-database.init = function (silent, callback) {
+database.init = function (silent: boolean, callback: (err: Error) => void) {
 
   const modelDirectory = join(__dirname, '..', 'models')
   fs.readdir(modelDirectory, function (err, files) {
diff --git a/server/initializers/installer.ts b/server/initializers/installer.ts
index 2f9b58991..f105c8292 100644
--- a/server/initializers/installer.ts
+++ b/server/initializers/installer.ts
@@ -9,7 +9,7 @@ import { USER_ROLES, CONFIG, LAST_MIGRATION_VERSION } from './constants'
 import { clientsExist, usersExist } from './checker'
 import { logger, createCertsIfNotExist, root } from '../helpers'
 
-function installApplication (callback) {
+function installApplication (callback: (err: Error) => void) {
   series([
     function createDatabase (callbackAsync) {
       db.sequelize.sync().asCallback(callbackAsync)
@@ -42,7 +42,7 @@ export {
 
 // ---------------------------------------------------------------------------
 
-function createDirectoriesIfNotExist (callback) {
+function createDirectoriesIfNotExist (callback: (err: Error) => void) {
   const storages = config.get('storage')
 
   each(Object.keys(storages), function (key, callbackEach) {
@@ -51,7 +51,7 @@ function createDirectoriesIfNotExist (callback) {
   }, callback)
 }
 
-function createOAuthClientIfNotExist (callback) {
+function createOAuthClientIfNotExist (callback: (err: Error) => void) {
   clientsExist(function (err, exist) {
     if (err) return callback(err)
 
@@ -80,7 +80,7 @@ function createOAuthClientIfNotExist (callback) {
   })
 }
 
-function createOAuthAdminIfNotExist (callback) {
+function createOAuthAdminIfNotExist (callback: (err: Error) => void) {
   usersExist(function (err, exist) {
     if (err) return callback(err)
 
diff --git a/server/initializers/migrator.ts b/server/initializers/migrator.ts
index 379d43af5..d72c60638 100644
--- a/server/initializers/migrator.ts
+++ b/server/initializers/migrator.ts
@@ -8,7 +8,7 @@ import { LAST_MIGRATION_VERSION } from './constants'
 import { logger } from '../helpers'
 import { ApplicationInstance } from '../models'
 
-function migrate (finalCallback) {
+function migrate (finalCallback: (err: Error) => void) {
   waterfall([
 
     function checkApplicationTableExists (callback) {
@@ -56,7 +56,7 @@ function migrate (finalCallback) {
     },
 
     function doMigrations (actualVersion, migrationScripts, callback) {
-      eachSeries(migrationScripts, function (entity, callbackEach) {
+      eachSeries(migrationScripts, function (entity: any, callbackEach) {
         executeMigration(actualVersion, entity, callbackEach)
       }, function (err) {
         if (err) return callback(err)
@@ -76,7 +76,8 @@ export {
 
 // ---------------------------------------------------------------------------
 
-function getMigrationScripts (callback) {
+type GetMigrationScriptsCallback = (err: Error, filesToMigrate?: { version: string, script: string }[]) => void
+function getMigrationScripts (callback: GetMigrationScriptsCallback) {
   fs.readdir(path.join(__dirname, 'migrations'), function (err, files) {
     if (err) return callback(err)
 
@@ -95,7 +96,7 @@ function getMigrationScripts (callback) {
   })
 }
 
-function executeMigration (actualVersion, entity, callback) {
+function executeMigration (actualVersion: number, entity: { version: string, script: string }, callback: (err: Error) => void) {
   const versionScript = parseInt(entity.version, 10)
 
   // Do not execute old migration scripts