16 files changed, 169 insertions, 153 deletions

diff --git a/server/initializers/checker.js b/server/initializers/checker.ts
index aa8dea4bf..370dff2d4 100644
--- a/server/initializers/checker.js
+++ b/server/initializers/checker.ts
@@ -1,17 +1,7 @@
-'use strict'
+import config = require('config')
 
-const config = require('config')
-
-const constants = require('./constants')
 const db = require('./database')
-
-const checker = {
-  checkConfig,
-  checkFFmpeg,
-  checkMissedConfig,
-  clientsExist,
-  usersExist
-}
+import { CONFIG } from './constants'
 
 // Some checks on configuration files
 function checkConfig () {
@@ -50,7 +40,7 @@ function checkFFmpeg (callback) {
 
   Ffmpeg.getAvailableCodecs(function (err, codecs) {
     if (err) return callback(err)
-    if (constants.CONFIG.TRANSCODING.ENABLED === false) return callback(null)
+    if (CONFIG.TRANSCODING.ENABLED === false) return callback(null)
 
     const canEncode = [ 'libx264' ]
     canEncode.forEach(function (codec) {
@@ -85,4 +75,10 @@ function usersExist (callback) {
 
 // ---------------------------------------------------------------------------
 
-module.exports = checker
+export {
+  checkConfig,
+  checkFFmpeg,
+  checkMissedConfig,
+  clientsExist,
+  usersExist
+}
diff --git a/server/initializers/constants.js b/server/initializers/constants.ts
index 87e9c8002..6bdc261ad 100644
--- a/server/initializers/constants.js
+++ b/server/initializers/constants.ts
@@ -1,7 +1,5 @@
-'use strict'
-
-const config = require('config')
-const path = require('path')
+import config = require('config')
+import { join } from 'path'
 
 // ---------------------------------------------------------------------------
 
@@ -36,38 +34,40 @@ const OAUTH_LIFETIME = {
 
 const CONFIG = {
   LISTEN: {
-    PORT: config.get('listen.port')
+    PORT: config.get<number>('listen.port')
   },
   DATABASE: {
-    DBNAME: 'peertube' + config.get('database.suffix'),
-    HOSTNAME: config.get('database.hostname'),
-    PORT: config.get('database.port'),
-    USERNAME: config.get('database.username'),
-    PASSWORD: config.get('database.password')
+    DBNAME: 'peertube' + config.get<string>('database.suffix'),
+    HOSTNAME: config.get<string>('database.hostname'),
+    PORT: config.get<number>('database.port'),
+    USERNAME: config.get<string>('database.username'),
+    PASSWORD: config.get<string>('database.password')
   },
   STORAGE: {
-    CERT_DIR: path.join(__dirname, '..', '..', config.get('storage.certs')),
-    LOG_DIR: path.join(__dirname, '..', '..', config.get('storage.logs')),
-    VIDEOS_DIR: path.join(__dirname, '..', '..', config.get('storage.videos')),
-    THUMBNAILS_DIR: path.join(__dirname, '..', '..', config.get('storage.thumbnails')),
-    PREVIEWS_DIR: path.join(__dirname, '..', '..', config.get('storage.previews')),
-    TORRENTS_DIR: path.join(__dirname, '..', '..', config.get('storage.torrents'))
+    CERT_DIR: join(__dirname, '..', '..', config.get<string>('storage.certs')),
+    LOG_DIR: join(__dirname, '..', '..', config.get<string>('storage.logs')),
+    VIDEOS_DIR: join(__dirname, '..', '..', config.get<string>('storage.videos')),
+    THUMBNAILS_DIR: join(__dirname, '..', '..', config.get<string>('storage.thumbnails')),
+    PREVIEWS_DIR: join(__dirname, '..', '..', config.get<string>('storage.previews')),
+    TORRENTS_DIR: join(__dirname, '..', '..', config.get<string>('storage.torrents'))
   },
   WEBSERVER: {
-    SCHEME: config.get('webserver.https') === true ? 'https' : 'http',
-    WS: config.get('webserver.https') === true ? 'wss' : 'ws',
-    HOSTNAME: config.get('webserver.hostname'),
-    PORT: config.get('webserver.port')
+    SCHEME: config.get<boolean>('webserver.https') === true ? 'https' : 'http',
+    WS: config.get<boolean>('webserver.https') === true ? 'wss' : 'ws',
+    HOSTNAME: config.get<string>('webserver.hostname'),
+    PORT: config.get<number>('webserver.port'),
+    URL: '',
+    HOST: ''
   },
   ADMIN: {
-    EMAIL: config.get('admin.email')
+    EMAIL: config.get<string>('admin.email')
   },
   SIGNUP: {
-    ENABLED: config.get('signup.enabled')
+    ENABLED: config.get<boolean>('signup.enabled')
   },
   TRANSCODING: {
-    ENABLED: config.get('transcoding.enabled'),
-    THREADS: config.get('transcoding.threads')
+    ENABLED: config.get<boolean>('transcoding.enabled'),
+    THREADS: config.get<number>('transcoding.threads')
   }
 }
 CONFIG.WEBSERVER.URL = CONFIG.WEBSERVER.SCHEME + '://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT
@@ -283,12 +283,12 @@ if (isTestInstance() === true) {
   JOBS_FETCHING_INTERVAL = 10000
   REMOTE_SCHEME.HTTP = 'http'
   REMOTE_SCHEME.WS = 'ws'
-  STATIC_MAX_AGE = 0
+  STATIC_MAX_AGE = '0'
 }
 
 // ---------------------------------------------------------------------------
 
-module.exports = {
+export {
   API_VERSION,
   BCRYPT_SALT_SIZE,
   CONFIG,
diff --git a/server/initializers/database.js b/server/initializers/database.ts
index 043152a0e..753a06669 100644
--- a/server/initializers/database.js
+++ b/server/initializers/database.ts
@@ -1,24 +1,23 @@
-'use strict'
+import fs = require('fs')
+import { join } from 'path'
+import Sequelize = require('sequelize')
 
-const fs = require('fs')
-const path = require('path')
-const Sequelize = require('sequelize')
+import { CONFIG } from './constants'
+// Do not use barrel, we need to load database first
+import { logger } from '../helpers/logger'
+import { isTestInstance } from '../helpers/utils'
 
-const constants = require('../initializers/constants')
-const logger = require('../helpers/logger')
-const utils = require('../helpers/utils')
+const dbname = CONFIG.DATABASE.DBNAME
+const username = CONFIG.DATABASE.USERNAME
+const password = CONFIG.DATABASE.PASSWORD
 
-const database = {}
-
-const dbname = constants.CONFIG.DATABASE.DBNAME
-const username = constants.CONFIG.DATABASE.USERNAME
-const password = constants.CONFIG.DATABASE.PASSWORD
+const database: any = {}
 
 const sequelize = new Sequelize(dbname, username, password, {
   dialect: 'postgres',
-  host: constants.CONFIG.DATABASE.HOSTNAME,
-  port: constants.CONFIG.DATABASE.PORT,
-  benchmark: utils.isTestInstance(),
+  host: CONFIG.DATABASE.HOSTNAME,
+  port: CONFIG.DATABASE.PORT,
+  benchmark: isTestInstance(),
 
   logging: function (message, benchmark) {
     let newMessage = message
@@ -31,24 +30,16 @@ const sequelize = new Sequelize(dbname, username, password, {
 })
 
 database.sequelize = sequelize
-database.Sequelize = Sequelize
-database.init = init
-
-// ---------------------------------------------------------------------------
 
-module.exports = database
-
-// ---------------------------------------------------------------------------
-
-function init (silent, callback) {
+database.init = function (silent, callback) {
   if (!callback) {
     callback = silent
     silent = false
   }
 
-  if (!callback) callback = function () {}
+  if (!callback) callback = function () { /* empty */ }
 
-  const modelDirectory = path.join(__dirname, '..', 'models')
+  const modelDirectory = join(__dirname, '..', 'models')
   fs.readdir(modelDirectory, function (err, files) {
     if (err) throw err
 
@@ -59,9 +50,9 @@ function init (silent, callback) {
       return true
     })
     .forEach(function (file) {
-      const model = sequelize.import(path.join(modelDirectory, file))
+      const model = sequelize.import(join(modelDirectory, file))
 
-      database[model.name] = model
+      database[model['name']] = model
     })
 
     Object.keys(database).forEach(function (modelName) {
@@ -75,3 +66,7 @@ function init (silent, callback) {
     return callback(null)
   })
 }
+
+// ---------------------------------------------------------------------------
+
+module.exports = database
diff --git a/server/initializers/index.ts b/server/initializers/index.ts
new file mode 100644
index 000000000..b8400ff84
--- /dev/null
+++ b/server/initializers/index.ts
@@ -0,0 +1,6 @@
+// Constants first, databse in second!
+export * from './constants'
+export * from './database'
+export * from './checker'
+export * from './installer'
+export * from './migrator'
diff --git a/server/initializers/installer.js b/server/initializers/installer.ts
index 837a987dd..cd1404d48 100644
--- a/server/initializers/installer.js
+++ b/server/initializers/installer.ts
@@ -1,21 +1,13 @@
-'use strict'
+import { join } from 'path'
+import config = require('config')
+import { each, series } from 'async'
+import mkdirp = require('mkdirp')
+import passwordGenerator = require('password-generator')
 
-const config = require('config')
-const each = require('async/each')
-const mkdirp = require('mkdirp')
-const passwordGenerator = require('password-generator')
-const path = require('path')
-const series = require('async/series')
-
-const checker = require('./checker')
-const constants = require('./constants')
 const db = require('./database')
-const logger = require('../helpers/logger')
-const peertubeCrypto = require('../helpers/peertube-crypto')
-
-const installer = {
-  installApplication
-}
+import { USER_ROLES, CONFIG, LAST_MIGRATION_VERSION } from './constants'
+import { clientsExist, usersExist } from './checker'
+import { logger, createCertsIfNotExist } from '../helpers'
 
 function installApplication (callback) {
   series([
@@ -29,7 +21,7 @@ function installApplication (callback) {
     },
 
     function createCertificates (callbackAsync) {
-      peertubeCrypto.createCertsIfNotExist(callbackAsync)
+      createCertsIfNotExist(callbackAsync)
     },
 
     function createOAuthClient (callbackAsync) {
@@ -44,7 +36,9 @@ function installApplication (callback) {
 
 // ---------------------------------------------------------------------------
 
-module.exports = installer
+export {
+  installApplication
+}
 
 // ---------------------------------------------------------------------------
 
@@ -53,12 +47,12 @@ function createDirectoriesIfNotExist (callback) {
 
   each(Object.keys(storages), function (key, callbackEach) {
     const dir = storages[key]
-    mkdirp(path.join(__dirname, '..', '..', dir), callbackEach)
+    mkdirp(join(__dirname, '..', '..', dir), callbackEach)
   }, callback)
 }
 
 function createOAuthClientIfNotExist (callback) {
-  checker.clientsExist(function (err, exist) {
+  clientsExist(function (err, exist) {
     if (err) return callback(err)
 
     // Nothing to do, clients already exist
@@ -86,7 +80,7 @@ function createOAuthClientIfNotExist (callback) {
 }
 
 function createOAuthAdminIfNotExist (callback) {
-  checker.usersExist(function (err, exist) {
+  usersExist(function (err, exist) {
     if (err) return callback(err)
 
     // Nothing to do, users already exist
@@ -95,9 +89,9 @@ function createOAuthAdminIfNotExist (callback) {
     logger.info('Creating the administrator.')
 
     const username = 'root'
-    const role = constants.USER_ROLES.ADMIN
-    const email = constants.CONFIG.ADMIN.EMAIL
-    const createOptions = {}
+    const role = USER_ROLES.ADMIN
+    const email = CONFIG.ADMIN.EMAIL
+    const createOptions: { validate?: boolean } = {}
     let password = ''
 
     // Do not generate a random password for tests
@@ -128,7 +122,7 @@ function createOAuthAdminIfNotExist (callback) {
       logger.info('User password: ' + password)
 
       logger.info('Creating Application table.')
-      db.Application.create({ migrationVersion: constants.LAST_MIGRATION_VERSION }).asCallback(callback)
+      db.Application.create({ migrationVersion: LAST_MIGRATION_VERSION }).asCallback(callback)
     })
   })
 }
diff --git a/server/initializers/migrations/0005-email-pod.js b/server/initializers/migrations/0005-email-pod.ts
index 9bbb354bf..a9200c47f 100644
--- a/server/initializers/migrations/0005-email-pod.js
+++ b/server/initializers/migrations/0005-email-pod.ts
@@ -1,9 +1,7 @@
-'use strict'
-
-const waterfall = require('async/waterfall')
+import { waterfall } from 'async'
 
 // utils = { transaction, queryInterface, sequelize, Sequelize }
-exports.up = function (utils, finalCallback) {
+function up (utils, finalCallback) {
   const q = utils.queryInterface
   const Sequelize = utils.Sequelize
 
@@ -36,6 +34,11 @@ exports.up = function (utils, finalCallback) {
   ], finalCallback)
 }
 
-exports.down = function (options, callback) {
+function down (options, callback) {
   throw new Error('Not implemented.')
 }
+
+export {
+  up,
+  down
+}
diff --git a/server/initializers/migrations/0010-email-user.js b/server/initializers/migrations/0010-email-user.ts
index 1ab27133a..4b5d29394 100644
--- a/server/initializers/migrations/0010-email-user.js
+++ b/server/initializers/migrations/0010-email-user.ts
@@ -1,9 +1,7 @@
-'use strict'
-
-const waterfall = require('async/waterfall')
+import { waterfall } from 'async'
 
 // utils = { transaction, queryInterface, sequelize, Sequelize }
-exports.up = function (utils, finalCallback) {
+function up (utils, finalCallback) {
   const q = utils.queryInterface
   const Sequelize = utils.Sequelize
 
@@ -36,6 +34,11 @@ exports.up = function (utils, finalCallback) {
   ], finalCallback)
 }
 
-exports.down = function (options, callback) {
+function down (options, callback) {
   throw new Error('Not implemented.')
 }
+
+export {
+  up,
+  down
+}
diff --git a/server/initializers/migrations/0015-video-views.js b/server/initializers/migrations/0015-video-views.ts
index ae49fe73c..e70869404 100644
--- a/server/initializers/migrations/0015-video-views.js
+++ b/server/initializers/migrations/0015-video-views.ts
@@ -1,7 +1,5 @@
-'use strict'
-
 // utils = { transaction, queryInterface, sequelize, Sequelize }
-exports.up = function (utils, finalCallback) {
+function up (utils, finalCallback) {
   const q = utils.queryInterface
   const Sequelize = utils.Sequelize
 
@@ -14,6 +12,11 @@ exports.up = function (utils, finalCallback) {
   q.addColumn('Videos', 'views', data, { transaction: utils.transaction }).asCallback(finalCallback)
 }
 
-exports.down = function (options, callback) {
+function down (options, callback) {
   throw new Error('Not implemented.')
 }
+
+export {
+  up,
+  down
+}
diff --git a/server/initializers/migrations/0020-video-likes.js b/server/initializers/migrations/0020-video-likes.ts
index 6db62cb90..e435d0657 100644
--- a/server/initializers/migrations/0020-video-likes.js
+++ b/server/initializers/migrations/0020-video-likes.ts
@@ -1,7 +1,5 @@
-'use strict'
-
 // utils = { transaction, queryInterface, sequelize, Sequelize }
-exports.up = function (utils, finalCallback) {
+function up (utils, finalCallback) {
   const q = utils.queryInterface
   const Sequelize = utils.Sequelize
 
@@ -14,6 +12,11 @@ exports.up = function (utils, finalCallback) {
   q.addColumn('Videos', 'likes', data, { transaction: utils.transaction }).asCallback(finalCallback)
 }
 
-exports.down = function (options, callback) {
+function down (options, callback) {
   throw new Error('Not implemented.')
 }
+
+export {
+  up,
+  down
+}
diff --git a/server/initializers/migrations/0025-video-dislikes.js b/server/initializers/migrations/0025-video-dislikes.ts
index 40d2e7351..57e54e904 100644
--- a/server/initializers/migrations/0025-video-dislikes.js
+++ b/server/initializers/migrations/0025-video-dislikes.ts
@@ -1,7 +1,5 @@
-'use strict'
-
 // utils = { transaction, queryInterface, sequelize, Sequelize }
-exports.up = function (utils, finalCallback) {
+function up (utils, finalCallback) {
   const q = utils.queryInterface
   const Sequelize = utils.Sequelize
 
@@ -14,6 +12,11 @@ exports.up = function (utils, finalCallback) {
   q.addColumn('Videos', 'dislikes', data, { transaction: utils.transaction }).asCallback(finalCallback)
 }
 
-exports.down = function (options, callback) {
+function down (options, callback) {
   throw new Error('Not implemented.')
 }
+
+export {
+  up,
+  down
+}
diff --git a/server/initializers/migrations/0030-video-category.js b/server/initializers/migrations/0030-video-category.ts
index ada95b2fe..1073f449c 100644
--- a/server/initializers/migrations/0030-video-category.js
+++ b/server/initializers/migrations/0030-video-category.ts
@@ -1,9 +1,7 @@
-'use strict'
-
-const waterfall = require('async/waterfall')
+import { waterfall } from 'async'
 
 // utils = { transaction, queryInterface, sequelize, Sequelize }
-exports.up = function (utils, finalCallback) {
+function up (utils, finalCallback) {
   const q = utils.queryInterface
   const Sequelize = utils.Sequelize
 
@@ -29,6 +27,11 @@ exports.up = function (utils, finalCallback) {
   ], finalCallback)
 }
 
-exports.down = function (options, callback) {
+function down (options, callback) {
   throw new Error('Not implemented.')
 }
+
+export {
+  up,
+  down
+}
diff --git a/server/initializers/migrations/0035-video-licence.js b/server/initializers/migrations/0035-video-licence.ts
index 9cf75858d..9316b3c37 100644
--- a/server/initializers/migrations/0035-video-licence.js
+++ b/server/initializers/migrations/0035-video-licence.ts
@@ -1,9 +1,7 @@
-'use strict'
-
-const waterfall = require('async/waterfall')
+import { waterfall } from 'async'
 
 // utils = { transaction, queryInterface, sequelize, Sequelize }
-exports.up = function (utils, finalCallback) {
+function up (utils, finalCallback) {
   const q = utils.queryInterface
   const Sequelize = utils.Sequelize
 
@@ -29,6 +27,11 @@ exports.up = function (utils, finalCallback) {
   ], finalCallback)
 }
 
-exports.down = function (options, callback) {
+function down (options, callback) {
   throw new Error('Not implemented.')
 }
+
+export {
+  up,
+  down
+}
diff --git a/server/initializers/migrations/0040-video-nsfw.js b/server/initializers/migrations/0040-video-nsfw.ts
index 7f3692b28..c61f496f1 100644
--- a/server/initializers/migrations/0040-video-nsfw.js
+++ b/server/initializers/migrations/0040-video-nsfw.ts
@@ -1,9 +1,7 @@
-'use strict'
-
-const waterfall = require('async/waterfall')
+import { waterfall } from 'async'
 
 // utils = { transaction, queryInterface, sequelize, Sequelize }
-exports.up = function (utils, finalCallback) {
+function up (utils, finalCallback) {
   const q = utils.queryInterface
   const Sequelize = utils.Sequelize
 
@@ -29,6 +27,11 @@ exports.up = function (utils, finalCallback) {
   ], finalCallback)
 }
 
-exports.down = function (options, callback) {
+function down (options, callback) {
   throw new Error('Not implemented.')
 }
+
+export {
+  up,
+  down
+}
diff --git a/server/initializers/migrations/0045-user-display-nsfw.js b/server/initializers/migrations/0045-user-display-nsfw.ts
index 03624e593..1ca317795 100644
--- a/server/initializers/migrations/0045-user-display-nsfw.js
+++ b/server/initializers/migrations/0045-user-display-nsfw.ts
@@ -1,7 +1,5 @@
-'use strict'
-
 // utils = { transaction, queryInterface, sequelize, Sequelize }
-exports.up = function (utils, finalCallback) {
+function up (utils, finalCallback) {
   const q = utils.queryInterface
   const Sequelize = utils.Sequelize
 
@@ -14,6 +12,11 @@ exports.up = function (utils, finalCallback) {
   q.addColumn('Users', 'displayNSFW', data, { transaction: utils.transaction }).asCallback(finalCallback)
 }
 
-exports.down = function (options, callback) {
+function down (options, callback) {
   throw new Error('Not implemented.')
 }
+
+export {
+  up,
+  down
+}
diff --git a/server/initializers/migrations/0050-video-language.js b/server/initializers/migrations/0050-video-language.ts
index 1c978758d..95d0a473a 100644
--- a/server/initializers/migrations/0050-video-language.js
+++ b/server/initializers/migrations/0050-video-language.ts
@@ -1,7 +1,5 @@
-'use strict'
-
 // utils = { transaction, queryInterface, sequelize, Sequelize }
-exports.up = function (utils, finalCallback) {
+function up (utils, finalCallback) {
   const q = utils.queryInterface
   const Sequelize = utils.Sequelize
 
@@ -14,6 +12,11 @@ exports.up = function (utils, finalCallback) {
   q.addColumn('Videos', 'language', data, { transaction: utils.transaction }).asCallback(finalCallback)
 }
 
-exports.down = function (options, callback) {
+function down (options, callback) {
   throw new Error('Not implemented.')
 }
+
+export {
+  up,
+  down
+}
diff --git a/server/initializers/migrator.js b/server/initializers/migrator.ts
index 9a6415b1a..cfa3220e0 100644
--- a/server/initializers/migrator.js
+++ b/server/initializers/migrator.ts
@@ -1,17 +1,10 @@
-'use strict'
+import { waterfall, eachSeries } from 'async'
+import fs = require('fs')
+import path = require('path')
 
-const waterfall = require('async/waterfall')
-const eachSeries = require('async/eachSeries')
-const fs = require('fs')
-const path = require('path')
-
-const constants = require('./constants')
 const db = require('./database')
-const logger = require('../helpers/logger')
-
-const migrator = {
-  migrate: migrate
-}
+import { LAST_MIGRATION_VERSION } from './constants'
+import { logger } from '../helpers'
 
 function migrate (finalCallback) {
   waterfall([
@@ -46,7 +39,7 @@ function migrate (finalCallback) {
 
     function abortMigrationIfNotNeeded (actualVersion, callback) {
       // No need migrations
-      if (actualVersion >= constants.LAST_MIGRATION_VERSION) return finalCallback(null)
+      if (actualVersion >= LAST_MIGRATION_VERSION) return finalCallback(null)
 
       return callback(null, actualVersion)
     },
@@ -66,7 +59,7 @@ function migrate (finalCallback) {
       }, function (err) {
         if (err) return callback(err)
 
-        logger.info('Migrations finished. New migration version schema: %s', constants.LAST_MIGRATION_VERSION)
+        logger.info('Migrations finished. New migration version schema: %s', LAST_MIGRATION_VERSION)
         return callback(null)
       })
     }
@@ -75,7 +68,9 @@ function migrate (finalCallback) {
 
 // ---------------------------------------------------------------------------
 
-module.exports = migrator
+export {
+  migrate
+}
 
 // ---------------------------------------------------------------------------