diff --git a/package.json b/package.json index f6ef440..97ca8a3 100644 --- a/package.json +++ b/package.json @@ -11,30 +11,30 @@ }, "private": true, "dependencies": { - "@babel/runtime": "^7.7.6", - "bcrypt": "^3.0.7", + "@babel/runtime": "^7.10.1", + "bcrypt": "^4.0.1", "bluebird": "^3.7.2", "body-parser": "^1.19.0", - "connect-redis": "^3.4.2", + "connect-redis": "^4.0.4", "express": "^4.17.1", "express-async-errors": "^3.1.1", - "express-session": "^1.17.0", + "express-session": "^1.17.1", "fluent-ffmpeg": "^2.1.2", - "fs-extra": "^7.0.1", + "fs-extra": "^9.0.0", "oauth-libre": "^0.9.17", - "redis": "^2.8.0", - "request": "^2.88.0", + "redis": "^3.0.2", + "request": "^2.88.2", "request-promise-native": "^1.0.8", "socket.io": "^2.3.0", - "sqlite": "^3.0.3", - "sqlite3": "^4.1.1", - "xml2js": "^0.4.22" + "sqlite": "^4.0.9", + "sqlite3": "^4.2.0", + "xml2js": "^0.4.23" }, "devDependencies": { - "@babel/cli": "^7.7.5", - "@babel/core": "^7.7.5", - "@babel/plugin-transform-runtime": "^7.7.6", - "@babel/preset-env": "^7.7.6", - "morgan": "^1.9.1" + "@babel/cli": "^7.10.1", + "@babel/core": "^7.10.1", + "@babel/plugin-transform-runtime": "^7.10.1", + "@babel/preset-env": "^7.10.1", + "morgan": "^1.10.0" } } diff --git a/src/database.js b/src/database.js index 5813ea7..538399a 100644 --- a/src/database.js +++ b/src/database.js @@ -1,11 +1,12 @@ import path from 'path' -import sqlite from 'sqlite' -import Promise from 'bluebird' +import { open } from 'sqlite' +import sqlite3 from 'sqlite3' const values = require(path.join(process.cwd(), 'values.json')) -const dbPromise = Promise.resolve() - .then(() => sqlite.open(path.join(process.cwd(), values.database), { Promise, cache: true })) - .then(db => db.migrate()) +const dbPromise = open({ + filename: path.join(process.cwd(), values.database), + driver: sqlite3.cached.Database +}) export { dbPromise } diff --git a/src/server.js b/src/server.js index 8601fb0..6096c7d 100644 --- a/src/server.js +++ b/src/server.js @@ -370,6 +370,8 @@ app.use('/', express.static(path.join(process.cwd(), 'public'))) const host = process.env.NODE_ENV === 'development' ? '0.0.0.0' : '127.0.0.1' -server.listen(port, host, function () { +server.listen(port, host, async function () { + const db = await dbPromise + await db.migrate() console.log(`app running on port ${port}`) })