From e02643f32e4c97ca307f8fc5b69be79c40d70a3b Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 22 May 2017 20:58:25 +0200 Subject: Type models --- server/initializers/checker.ts | 2 +- server/initializers/constants.ts | 22 ++++++--------- server/initializers/database.ts | 59 ++++++++++++++++++++++++++++++++++------ server/initializers/installer.ts | 9 +++--- server/initializers/migrator.ts | 8 ++++-- 5 files changed, 70 insertions(+), 30 deletions(-) (limited to 'server/initializers') diff --git a/server/initializers/checker.ts b/server/initializers/checker.ts index 370dff2d4..0ee01b0e3 100644 --- a/server/initializers/checker.ts +++ b/server/initializers/checker.ts @@ -1,6 +1,6 @@ import config = require('config') -const db = require('./database') +import { database as db } from './database' import { CONFIG } from './constants' // Some checks on configuration files diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index 6bdc261ad..1072d0de0 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts @@ -1,6 +1,9 @@ import config = require('config') import { join } from 'path' +// Do not use barrels, remain constants as independent as possible +import { root, isTestInstance } from '../helpers/utils' + // --------------------------------------------------------------------------- const LAST_MIGRATION_VERSION = 50 @@ -44,12 +47,12 @@ const CONFIG = { PASSWORD: config.get('database.password') }, STORAGE: { - CERT_DIR: join(__dirname, '..', '..', config.get('storage.certs')), - LOG_DIR: join(__dirname, '..', '..', config.get('storage.logs')), - VIDEOS_DIR: join(__dirname, '..', '..', config.get('storage.videos')), - THUMBNAILS_DIR: join(__dirname, '..', '..', config.get('storage.thumbnails')), - PREVIEWS_DIR: join(__dirname, '..', '..', config.get('storage.previews')), - TORRENTS_DIR: join(__dirname, '..', '..', config.get('storage.torrents')) + CERT_DIR: join(root(), config.get('storage.certs')), + LOG_DIR: join(root(), config.get('storage.logs')), + VIDEOS_DIR: join(root(), config.get('storage.videos')), + THUMBNAILS_DIR: join(root(), config.get('storage.thumbnails')), + PREVIEWS_DIR: join(root(), config.get('storage.previews')), + TORRENTS_DIR: join(root(), config.get('storage.torrents')) }, WEBSERVER: { SCHEME: config.get('webserver.https') === true ? 'https' : 'http', @@ -334,10 +337,3 @@ export { VIDEO_LICENCES, VIDEO_RATE_TYPES } - -// --------------------------------------------------------------------------- - -// This method exists in utils module but we want to let the constants module independent -function isTestInstance () { - return (process.env.NODE_ENV === 'test') -} diff --git a/server/initializers/database.ts b/server/initializers/database.ts index 753a06669..c89a8b23c 100644 --- a/server/initializers/database.ts +++ b/server/initializers/database.ts @@ -6,12 +6,52 @@ import { CONFIG } from './constants' // Do not use barrel, we need to load database first import { logger } from '../helpers/logger' import { isTestInstance } from '../helpers/utils' +import { + ApplicationModel, + AuthorModel, + JobModel, + OAuthClientModel, + OAuthTokenModel, + PodModel, + RequestModel, + RequestToPodModel, + RequestVideoEventModel, + RequestVideoQaduModel, + TagModel, + UserModel, + UserVideoRateModel, + VideoAbuseModel, + BlacklistedVideoModel, + VideoTagModel, + VideoModel +} from '../models' const dbname = CONFIG.DATABASE.DBNAME const username = CONFIG.DATABASE.USERNAME const password = CONFIG.DATABASE.PASSWORD -const database: any = {} +const database: { + sequelize?: Sequelize.Sequelize, + init?: (silent: any, callback: any) => void, + + Application?: ApplicationModel, + Author?: AuthorModel, + Job?: JobModel, + OAuthClient?: OAuthClientModel, + OAuthToken?: OAuthTokenModel, + Pod?: PodModel, + RequestToPod?: RequestToPodModel, + RequestVideoEvent?: RequestVideoEventModel, + RequestVideoQadu?: RequestVideoQaduModel, + Request?: RequestModel, + Tag?: TagModel, + UserVideoRate?: UserVideoRateModel, + User?: UserModel, + VideoAbuse?: VideoAbuseModel, + BlacklistedVideo?: BlacklistedVideoModel, + VideoTag?: VideoTagModel, + Video?: VideoModel +} = {} const sequelize = new Sequelize(dbname, username, password, { dialect: 'postgres', @@ -32,12 +72,6 @@ const sequelize = new Sequelize(dbname, username, password, { database.sequelize = sequelize database.init = function (silent, callback) { - if (!callback) { - callback = silent - silent = false - } - - if (!callback) callback = function () { /* empty */ } const modelDirectory = join(__dirname, '..', 'models') fs.readdir(modelDirectory, function (err, files) { @@ -45,7 +79,12 @@ database.init = function (silent, callback) { files.filter(function (file) { // For all models but not utils.js - if (file === 'utils.js') return false + if ( + file === 'index.js' || + file === 'utils.js' || + file.endsWith('-interface.js') || + file.endsWith('.js.map') + ) return false return true }) @@ -69,4 +108,6 @@ database.init = function (silent, callback) { // --------------------------------------------------------------------------- -module.exports = database +export { + database +} diff --git a/server/initializers/installer.ts b/server/initializers/installer.ts index cd1404d48..467164107 100644 --- a/server/initializers/installer.ts +++ b/server/initializers/installer.ts @@ -4,10 +4,10 @@ import { each, series } from 'async' import mkdirp = require('mkdirp') import passwordGenerator = require('password-generator') -const db = require('./database') +import { database as db } from './database' import { USER_ROLES, CONFIG, LAST_MIGRATION_VERSION } from './constants' import { clientsExist, usersExist } from './checker' -import { logger, createCertsIfNotExist } from '../helpers' +import { logger, createCertsIfNotExist, root } from '../helpers' function installApplication (callback) { series([ @@ -47,7 +47,7 @@ function createDirectoriesIfNotExist (callback) { each(Object.keys(storages), function (key, callbackEach) { const dir = storages[key] - mkdirp(join(__dirname, '..', '..', dir), callbackEach) + mkdirp(join(root(), dir), callbackEach) }, callback) } @@ -65,7 +65,8 @@ function createOAuthClientIfNotExist (callback) { const client = db.OAuthClient.build({ clientId: id, clientSecret: secret, - grants: [ 'password', 'refresh_token' ] + grants: [ 'password', 'refresh_token' ], + redirectUris: null }) client.save().asCallback(function (err, createdClient) { diff --git a/server/initializers/migrator.ts b/server/initializers/migrator.ts index cfa3220e0..d42cb3ccc 100644 --- a/server/initializers/migrator.ts +++ b/server/initializers/migrator.ts @@ -1,10 +1,12 @@ import { waterfall, eachSeries } from 'async' import fs = require('fs') import path = require('path') +import * as Sequelize from 'sequelize' -const db = require('./database') +import { database as db } from './database' import { LAST_MIGRATION_VERSION } from './constants' import { logger } from '../helpers' +import { ApplicationInstance } from '../models' function migrate (finalCallback) { waterfall([ @@ -94,7 +96,7 @@ function getMigrationScripts (callback) { } function executeMigration (actualVersion, entity, callback) { - const versionScript = parseInt(entity.version) + const versionScript = parseInt(entity.version, 10) // Do not execute old migration scripts if (versionScript <= actualVersion) return callback(null) @@ -112,7 +114,7 @@ function executeMigration (actualVersion, entity, callback) { transaction: t, queryInterface: db.sequelize.getQueryInterface(), sequelize: db.sequelize, - Sequelize: db.Sequelize + Sequelize: Sequelize } migrationScript.up(options, function (err) { if (err) { -- cgit v1.2.3