Fix client compilation

[github/Chocobozzz/PeerTube.git] / server.ts

diff --git a/server.ts b/server.ts
index 119c0c61df17a516612dd271b2e04b17f3dc0a36..60045865d12e3ad6645eea0a4344244028d89571 100644 (file)
--- a/server.ts
+++ b/server.ts
@@ -1,11 +1,19 @@
+import { isTestInstance } from './server/helpers/core-utils'
+
+if (isTestInstance()) {
+  require('source-map-support').install()
+}
+
 // ----------- Node modules -----------
-import bodyParser = require('body-parser')
-import express = require('express')
+import * as bodyParser from 'body-parser'
+import * as express from 'express'
+// FIXME: cannot import express-validator
 const expressValidator = require('express-validator')
-import http = require('http')
-import morgan = require('morgan')
-import path = require('path')
-import bittorrentTracker = require('bittorrent-tracker')
+import * as http from 'http'
+import * as morgan from 'morgan'
+import * as path from 'path'
+import * as bittorrentTracker from 'bittorrent-tracker'
+import * as cors from 'cors'
 import { Server as WebSocketServer } from 'ws'
 
 const TrackerServer = bittorrentTracker.Server
@@ -20,8 +28,8 @@ const app = express()
 import { logger } from './server/helpers/logger'
 import { API_VERSION, CONFIG } from './server/initializers/constants'
 // Initialize database and models
-const db = require('./server/initializers/database')
-db.init(onDatabaseInitDone)
+import { database as db } from './server/initializers/database'
+db.init(false, onDatabaseInitDone)
 
 // ----------- Checker -----------
 import { checkMissedConfig, checkFFmpeg, checkConfig } from './server/initializers/checker'
@@ -51,8 +59,18 @@ import { apiRouter, clientsRouter, staticRouter } from './server/controllers'
 
 // ----------- App -----------
 
+// Enable cors for develop
+if (isTestInstance()) {
+  app.use(cors({
+    origin: 'http://localhost:3000',
+    credentials: true
+  }))
+}
+
 // For the logger
-// app.use(morgan('combined', { stream: logger.stream }))
+app.use(morgan('combined', {
+  stream: { write: logger.info }
+}))
 // For body requests
 app.use(bodyParser.json({ limit: '500kb' }))
 app.use(bodyParser.urlencoded({ extended: false }))
@@ -75,7 +93,7 @@ app.use('/', staticRouter)
 
 // Always serve index client page (the client is a single page application, let it handle routing)
 app.use('/*', function (req, res, next) {
-  res.sendFile(path.join(__dirname, './client/dist/index.html'))
+  res.sendFile(path.join(__dirname, '../client/dist/index.html'))
 })
 
 // ----------- Tracker -----------