X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Fdatabase.ts;h=ade72b62f0941df889813420aaf48ab190fd3332;hb=f5028693a896a3076dd286ac0030e3d8f78f5ebf;hp=0ab9e98dbcbbd9473eb4a16b060fc5770b90b28a;hpb=1840c2f7c91f5f89602a3683d85b0a9df1454855;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/initializers/database.ts b/server/initializers/database.ts
index 0ab9e98db..ade72b62f 100644
--- a/server/initializers/database.ts
+++ b/server/initializers/database.ts
@@ -1,30 +1,33 @@
-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 * as Bluebird from 'bluebird'
 
 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/user/user-interface'
+import { UserVideoRateModel } from './../models/user/user-video-rate-interface'
+import { TagModel } from './../models/video/tag-interface'
+import { RequestModel } from './../models/request/request-interface'
+import { RequestVideoQaduModel } from './../models/request/request-video-qadu-interface'
+import { RequestVideoEventModel } from './../models/request/request-video-event-interface'
+import { RequestToPodModel } from './../models/request/request-to-pod-interface'
+import { PodModel } from './../models/pod/pod-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 { AuthorModel } from './../models/video/author-interface'
+import { ApplicationModel } from './../models/application/application-interface'
 
 const dbname = CONFIG.DATABASE.DBNAME
 const username = CONFIG.DATABASE.USERNAME
@@ -32,7 +35,7 @@ const password = CONFIG.DATABASE.PASSWORD
 
 const database: {
   sequelize?: Sequelize.Sequelize,
-  init?: (silent: any, callback: any) => void,
+  init?: (silent: boolean) => Promise<void>,
 
   Application?: ApplicationModel,
   Author?: AuthorModel,
@@ -48,6 +51,8 @@ const database: {
   UserVideoRate?: UserVideoRateModel,
   User?: UserModel,
   VideoAbuse?: VideoAbuseModel,
+  VideoChannel?: VideoChannelModel,
+  VideoFile?: VideoFileModel,
   BlacklistedVideo?: BlacklistedVideoModel,
   VideoTag?: VideoTagModel,
   Video?: VideoModel
@@ -58,10 +63,11 @@ const sequelize = new Sequelize(dbname, username, password, {
   host: CONFIG.DATABASE.HOSTNAME,
   port: CONFIG.DATABASE.PORT,
   benchmark: isTestInstance(),
+  isolationLevel: Sequelize.Transaction.ISOLATION_LEVELS.SERIALIZABLE,
 
-  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'
     }
 
@@ -71,39 +77,26 @@ const sequelize = new Sequelize(dbname, username, password, {
 
 database.sequelize = sequelize
 
-database.init = function (silent: boolean, callback: (err: Error) => void) {
-
+database.init = async (silent: boolean) => {
   const modelDirectory = join(__dirname, '..', 'models')
-  fs.readdir(modelDirectory, function (err, files) {
-    if (err) throw err
-
-    files.filter(function (file) {
-      // For all models but not utils.js
-      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
-    })
-    .forEach(function (file) {
-      const model = sequelize.import(join(modelDirectory, file))
-
-      database[model['name']] = model
-    })
-
-    Object.keys(database).forEach(function (modelName) {
-      if ('associate' in database[modelName]) {
-        database[modelName].associate(database)
-      }
-    })
-
-    if (!silent) logger.info('Database %s is ready.', dbname)
-
-    return callback(null)
-  })
+
+  const filePaths = await getModelFiles(modelDirectory)
+
+  for (const filePath of filePaths) {
+    const model = sequelize.import(filePath)
+
+    database[model['name']] = model
+  }
+
+  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)
+
+  return undefined
 }
 
 // ---------------------------------------------------------------------------
@@ -111,3 +104,49 @@ database.init = function (silent: boolean, callback: (err: Error) => void) {
 export {
   database
 }
+
+// ---------------------------------------------------------------------------
+
+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
+  })
+
+  const tasks: Bluebird<any>[] = []
+
+  // For each directory we read it and append model in the modelFilePaths array
+  for (const directory of directories) {
+    const modelDirectoryPath = join(modelDirectory, directory)
+
+    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
+
+            return true
+          })
+          .map(file => join(modelDirectoryPath, file))
+
+        return filteredFiles
+      })
+
+    tasks.push(promise)
+  }
+
+  const filteredFilesArray: string[][] = await Promise.all(tasks)
+  return flattenDepth<string>(filteredFilesArray, 1)
+}