Upgrade server dependencies

pull/245/head
Chocobozzz 2018-01-24 10:25:56 +01:00
parent 95d5969445
commit 1f7ab4f310
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
6 changed files with 733 additions and 456 deletions

View File

@ -83,23 +83,22 @@
"rimraf": "^2.5.4",
"safe-buffer": "^5.0.1",
"scripty": "^1.5.0",
"sequelize": "4.31.2",
"sequelize": "4.32.1",
"sequelize-typescript": "^0.6.1",
"sharp": "^0.18.4",
"ts-node": "^3.3.0",
"sharp": "^0.19.0",
"ts-node": "3.3.0",
"typescript": "^2.5.2",
"uuid": "^3.1.0",
"validator": "^9.0.0",
"webfinger.js": "^2.6.6",
"winston": "3.0.0-rc1",
"ws": "^3.3.2"
"ws": "^4.0.0"
},
"devDependencies": {
"@types/async": "^2.0.40",
"@types/bcrypt": "^1.0.0",
"@types/body-parser": "^1.16.3",
"@types/chai": "^4.0.4",
"@types/commander": "^2.9.1",
"@types/config": "^0.0.33",
"@types/express": "^4.0.35",
"@types/lodash": "^4.14.64",
@ -108,7 +107,7 @@
"@types/mocha": "^2.2.42",
"@types/morgan": "^1.7.32",
"@types/multer": "^1.3.3",
"@types/node": "^8.0.3",
"@types/node": "^9.3.0",
"@types/pem": "^1.9.3",
"@types/request": "^2.0.3",
"@types/sequelize": "^4.0.55",
@ -116,9 +115,9 @@
"@types/supertest": "^2.0.3",
"@types/validator": "^6.2.0",
"@types/webtorrent": "^0.98.4",
"@types/ws": "^3.0.2",
"@types/ws": "^4.0.0",
"chai": "^4.1.1",
"mocha": "^4.0.1",
"mocha": "^5.0.0",
"nodemon": "^1.11.0",
"source-map-support": "^0.5.0",
"standard": "^10.0.0",

View File

@ -79,7 +79,7 @@ async function processCreateVideo (
async function createRates (actorUrls: string[], video: VideoModel, rate: VideoRateType) {
let rateCounts = 0
const tasks: Bluebird<any>[] = []
const tasks: Bluebird<number>[] = []
for (const actorUrl of actorUrls) {
const actor = await getOrCreateActorAndServerAndModel(actorUrl)

View File

@ -2,6 +2,7 @@ import * as Bluebird from 'bluebird'
import { ActivityUpdate } from '../../../../shared/models/activitypub'
import { ActivityPubActor } from '../../../../shared/models/activitypub/activitypub-actor'
import { VideoTorrentObject } from '../../../../shared/models/activitypub/objects'
import { VideoFile } from '../../../../shared/models/videos'
import { retryTransactionWrapper } from '../../../helpers/database-utils'
import { logger } from '../../../helpers/logger'
import { resetSequelizeInstance } from '../../../helpers/utils'
@ -90,7 +91,7 @@ async function updateRemoteVideo (actor: ActorModel, activity: ActivityUpdate) {
await Promise.all(videoFileDestroyTasks)
const videoFileAttributes = videoFileActivityUrlToDBAttributes(videoInstance, videoAttributesToUpdate)
const tasks: Bluebird<any>[] = videoFileAttributes.map(f => VideoFileModel.create(f))
const tasks = videoFileAttributes.map(f => VideoFileModel.create(f))
await Promise.all(tasks)
const tags = videoAttributesToUpdate.tag.map(t => t.name)

View File

@ -163,7 +163,7 @@ async function getOrCreateVideo (videoObject: VideoTorrentObject, channelActor:
throw new Error('Cannot find valid files for video %s ' + videoObject.url)
}
const tasks: Bluebird<any>[] = videoFileAttributes.map(f => VideoFileModel.create(f, { transaction: t }))
const tasks = videoFileAttributes.map(f => VideoFileModel.create(f, { transaction: t }))
await Promise.all(tasks)
const tags = videoObject.tag.map(t => t.name)

View File

@ -3,6 +3,7 @@ import { VideoPrivacy } from '../../../../shared/models/videos'
import { logger } from '../../../helpers/logger'
import { computeResolutionsToTranscode } from '../../../helpers/utils'
import { sequelizeTypescript } from '../../../initializers'
import { JobModel } from '../../../models/job/job'
import { VideoModel } from '../../../models/video/video'
import { shareVideoByServerAndChannel } from '../../activitypub'
import { sendCreateVideo } from '../../activitypub/send'
@ -55,7 +56,7 @@ async function onSuccess (jobId: number, video: VideoModel, jobScheduler: JobSch
if (resolutionsEnabled.length !== 0) {
try {
await sequelizeTypescript.transaction(async t => {
const tasks: Bluebird<any>[] = []
const tasks: Bluebird<JobModel>[] = []
for (const resolution of resolutionsEnabled) {
const dataInput = {

1164
yarn.lock

File diff suppressed because it is too large Load Diff