-import * as fs from 'fs'
import { join } from 'path'
+import { flattenDepth } from 'lodash'
+require('pg').defaults.parseInt8 = true // Avoid BIGINT to be converted to string
import * as Sequelize from 'sequelize'
-import { each } from 'async'
import { CONFIG } from './constants'
// Do not use barrel, we need to load database first
import { logger } from '../helpers/logger'
-import { isTestInstance } from '../helpers/core-utils'
-import {
- ApplicationModel,
- AuthorModel,
- JobModel,
- OAuthClientModel,
- OAuthTokenModel,
- PodModel,
- RequestModel,
- RequestToPodModel,
- RequestVideoEventModel,
- RequestVideoQaduModel,
- TagModel,
- UserModel,
- UserVideoRateModel,
- VideoAbuseModel,
- BlacklistedVideoModel,
- VideoTagModel,
- VideoModel
-} from '../models'
+import { isTestInstance, readdirPromise } from '../helpers/core-utils'
+
+import { VideoModel } from './../models/video/video-interface'
+import { VideoTagModel } from './../models/video/video-tag-interface'
+import { BlacklistedVideoModel } from './../models/video/video-blacklist-interface'
+import { VideoFileModel } from './../models/video/video-file-interface'
+import { VideoAbuseModel } from './../models/video/video-abuse-interface'
+import { VideoChannelModel } from './../models/video/video-channel-interface'
+import { UserModel } from '../models/account/user-interface'
+import { AccountVideoRateModel } from '../models/account/account-video-rate-interface'
+import { AccountFollowModel } from '../models/account/account-follow-interface'
+import { TagModel } from './../models/video/tag-interface'
+import { ServerModel } from '../models/server/server-interface'
+import { OAuthTokenModel } from './../models/oauth/oauth-token-interface'
+import { OAuthClientModel } from './../models/oauth/oauth-client-interface'
+import { JobModel } from './../models/job/job-interface'
+import { AccountModel } from './../models/account/account-interface'
+import { ApplicationModel } from './../models/application/application-interface'
const dbname = CONFIG.DATABASE.DBNAME
const username = CONFIG.DATABASE.USERNAME
const database: {
sequelize?: Sequelize.Sequelize,
- init?: (silent: any, callback: any) => void,
+ init?: (silent: boolean) => Promise<void>,
Application?: ApplicationModel,
- Author?: AuthorModel,
+ Account?: AccountModel,
Job?: JobModel,
OAuthClient?: OAuthClientModel,
OAuthToken?: OAuthTokenModel,
- Pod?: PodModel,
- RequestToPod?: RequestToPodModel,
- RequestVideoEvent?: RequestVideoEventModel,
- RequestVideoQadu?: RequestVideoQaduModel,
- Request?: RequestModel,
+ Server?: ServerModel,
Tag?: TagModel,
- UserVideoRate?: UserVideoRateModel,
+ AccountVideoRate?: AccountVideoRateModel,
+ AccountFollow?: AccountFollowModel,
User?: UserModel,
VideoAbuse?: VideoAbuseModel,
+ VideoChannel?: VideoChannelModel,
+ VideoFile?: VideoFileModel,
BlacklistedVideo?: BlacklistedVideoModel,
VideoTag?: VideoTagModel,
Video?: VideoModel
host: CONFIG.DATABASE.HOSTNAME,
port: CONFIG.DATABASE.PORT,
benchmark: isTestInstance(),
+ isolationLevel: Sequelize.Transaction.ISOLATION_LEVELS.SERIALIZABLE,
+ operatorsAliases: false,
- logging: function (message: string, benchmark: number) {
+ logging: (message: string, benchmark: number) => {
let newMessage = message
- if (benchmark !== undefined) {
+ if (isTestInstance() === true && benchmark !== undefined) {
newMessage += ' | ' + benchmark + 'ms'
}
database.sequelize = sequelize
-database.init = function (silent: boolean, callback: (err: Error) => void) {
+database.init = async (silent: boolean) => {
const modelDirectory = join(__dirname, '..', 'models')
- getModelFiles(modelDirectory, function (err, filePaths) {
- if (err) throw err
+ const filePaths = await getModelFiles(modelDirectory)
- filePaths.forEach(function (filePath) {
+ for (const filePath of filePaths) {
+ try {
const model = sequelize.import(filePath)
database[model['name']] = model
- })
+ } catch (err) {
+ logger.error('Cannot import database model %s.', filePath, err)
+ process.exit(0)
+ }
+ }
- Object.keys(database).forEach(function (modelName) {
- if ('associate' in database[modelName]) {
- database[modelName].associate(database)
- }
- })
+ for (const modelName of Object.keys(database)) {
+ if ('associate' in database[modelName]) {
+ database[modelName].associate(database)
+ }
+ }
- if (!silent) logger.info('Database %s is ready.', dbname)
+ if (!silent) logger.info('Database %s is ready.', dbname)
- return callback(null)
- })
+ return
}
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
-function getModelFiles (modelDirectory: string, callback: (err: Error, filePaths: string[]) => void) {
- fs.readdir(modelDirectory, function (err, files) {
- if (err) throw err
-
- const directories = files.filter(function (directory) {
- // For all models but not utils.js
- if (
- directory === 'index.js' || directory === 'index.ts' ||
- directory === 'utils.js' || directory === 'utils.ts'
- ) return false
-
- return true
- })
+async function getModelFiles (modelDirectory: string) {
+ const files = await readdirPromise(modelDirectory)
+ const directories = files.filter(directory => {
+ // Find directories
+ if (
+ directory.endsWith('.js.map') ||
+ directory === 'index.js' || directory === 'index.ts' ||
+ directory === 'utils.js' || directory === 'utils.ts'
+ ) return false
+
+ return true
+ })
- let modelFilePaths: string[] = []
+ const tasks: Promise<any>[] = []
- // For each directory we read it and append model in the modelFilePaths array
- each(directories, function (directory: string, eachCallback: ErrorCallback<Error>) {
- const modelDirectoryPath = join(modelDirectory, directory)
+ // For each directory we read it and append model in the modelFilePaths array
+ for (const directory of directories) {
+ const modelDirectoryPath = join(modelDirectory, directory)
- fs.readdir(modelDirectoryPath, function (err, files) {
- if (err) return eachCallback(err)
+ const promise = readdirPromise(modelDirectoryPath)
+ .then(files => {
+ const filteredFiles = files
+ .filter(file => {
+ if (
+ file === 'index.js' || file === 'index.ts' ||
+ file === 'utils.js' || file === 'utils.ts' ||
+ file.endsWith('-interface.js') || file.endsWith('-interface.ts') ||
+ file.endsWith('.js.map')
+ ) return false
- const filteredFiles = files.filter(file => {
- if (
- file === 'index.js' || file === 'index.ts' ||
- file === 'utils.js' || file === 'utils.ts' ||
- file.endsWith('-interface.js') || file.endsWith('-interface.ts') ||
- file.endsWith('.js.map')
- ) return false
+ return true
+ })
+ .map(file => join(modelDirectoryPath, file))
- return true
- }).map(file => {
- return join(modelDirectoryPath, file)
- })
+ return filteredFiles
+ })
- modelFilePaths = modelFilePaths.concat(filteredFiles)
+ tasks.push(promise)
+ }
- return eachCallback(null)
- })
- }, function (err: Error) {
- return callback(err, modelFilePaths)
- })
- })
+ const filteredFilesArray: string[][] = await Promise.all(tasks)
+ return flattenDepth<string>(filteredFilesArray, 1)
}
projects / github / Chocobozzz / PeerTube.git / blobdiff