Update server dependencies
This commit is contained in:
parent
8349c20c08
commit
6eda5c36f4
|
@ -1,4 +1,4 @@
|
||||||
process.env.ESBK_TSCONFIG_PATH = './packages/tests/tsconfig.json'
|
process.env.TSX_TSCONFIG_PATH = './packages/tests/tsconfig.json'
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
"node-option": [
|
"node-option": [
|
||||||
|
|
58
package.json
58
package.json
|
@ -88,18 +88,18 @@
|
||||||
"@aws-sdk/lib-storage": "^3.190.0",
|
"@aws-sdk/lib-storage": "^3.190.0",
|
||||||
"@aws-sdk/s3-request-presigner": "^3.345.0",
|
"@aws-sdk/s3-request-presigner": "^3.345.0",
|
||||||
"@babel/parser": "^7.17.8",
|
"@babel/parser": "^7.17.8",
|
||||||
"@commander-js/extra-typings": "^11.0.0",
|
"@commander-js/extra-typings": "^12.0.0",
|
||||||
"@node-oauth/oauth2-server": "^4.2.0",
|
"@node-oauth/oauth2-server": "^5.1.0",
|
||||||
"@opentelemetry/api": "^1.1.0",
|
"@opentelemetry/api": "^1.1.0",
|
||||||
"@opentelemetry/exporter-jaeger": "^1.15.1",
|
"@opentelemetry/exporter-jaeger": "^1.15.1",
|
||||||
"@opentelemetry/exporter-prometheus": "~0.44.0",
|
"@opentelemetry/exporter-prometheus": "~0.48.0",
|
||||||
"@opentelemetry/instrumentation": "^0.44.0",
|
"@opentelemetry/instrumentation": "^0.48.0",
|
||||||
"@opentelemetry/instrumentation-dns": "^0.32.0",
|
"@opentelemetry/instrumentation-dns": "^0.33.0",
|
||||||
"@opentelemetry/instrumentation-express": "^0.33.0",
|
"@opentelemetry/instrumentation-express": "^0.35.0",
|
||||||
"@opentelemetry/instrumentation-fs": "^0.8.0",
|
"@opentelemetry/instrumentation-fs": "^0.9.0",
|
||||||
"@opentelemetry/instrumentation-http": "^0.44.0",
|
"@opentelemetry/instrumentation-http": "^0.48.0",
|
||||||
"@opentelemetry/instrumentation-ioredis": "^0.35.0",
|
"@opentelemetry/instrumentation-ioredis": "^0.37.0",
|
||||||
"@opentelemetry/instrumentation-pg": "^0.36.0",
|
"@opentelemetry/instrumentation-pg": "^0.38.0",
|
||||||
"@opentelemetry/resources": "^1.15.1",
|
"@opentelemetry/resources": "^1.15.1",
|
||||||
"@opentelemetry/sdk-metrics": "^1.15.1",
|
"@opentelemetry/sdk-metrics": "^1.15.1",
|
||||||
"@opentelemetry/sdk-trace-base": "^1.15.1",
|
"@opentelemetry/sdk-trace-base": "^1.15.1",
|
||||||
|
@ -113,12 +113,12 @@
|
||||||
"async-mutex": "^0.4.0",
|
"async-mutex": "^0.4.0",
|
||||||
"bcrypt": "5.1.1",
|
"bcrypt": "5.1.1",
|
||||||
"bencode": "^4.0.0",
|
"bencode": "^4.0.0",
|
||||||
"bittorrent-tracker": "^10.0.12",
|
"bittorrent-tracker": "^11.0.1",
|
||||||
"bluebird": "^3.5.0",
|
"bluebird": "^3.5.0",
|
||||||
"bullmq": "^4.12.3",
|
"bullmq": "^5.3.0",
|
||||||
"bytes": "^3.0.0",
|
"bytes": "^3.0.0",
|
||||||
"chokidar": "^3.4.2",
|
"chokidar": "^3.4.2",
|
||||||
"commander": "^11.0.0",
|
"commander": "^12.0.0",
|
||||||
"config": "^3.0.0",
|
"config": "^3.0.0",
|
||||||
"cookie-parser": "^1.4.3",
|
"cookie-parser": "^1.4.3",
|
||||||
"cors": "^2.8.1",
|
"cors": "^2.8.1",
|
||||||
|
@ -147,17 +147,17 @@
|
||||||
"lodash-es": "^4.17.21",
|
"lodash-es": "^4.17.21",
|
||||||
"lru-cache": "^10.0.1",
|
"lru-cache": "^10.0.1",
|
||||||
"magnet-uri": "^7.0.5",
|
"magnet-uri": "^7.0.5",
|
||||||
"markdown-it": "^13.0.1",
|
"markdown-it": "^14.0.0",
|
||||||
"markdown-it-emoji": "^2.0.0",
|
"markdown-it-emoji": "^3.0.0",
|
||||||
"maxmind": "^4.3.6",
|
"maxmind": "^4.3.6",
|
||||||
"memoizee": "^0.4.14",
|
"memoizee": "^0.4.14",
|
||||||
"morgan": "^1.5.3",
|
"morgan": "^1.5.3",
|
||||||
"multer": "^1.4.5-lts.1",
|
"multer": "^1.4.5-lts.1",
|
||||||
"node-media-server": "^2.1.4",
|
"node-media-server": "^2.1.4",
|
||||||
"nodemailer": "^6.0.0",
|
"nodemailer": "^6.0.0",
|
||||||
"opentelemetry-instrumentation-sequelize": "^0.39.1",
|
"opentelemetry-instrumentation-sequelize": "^0.40.0",
|
||||||
"otpauth": "^9.0.2",
|
"otpauth": "^9.0.2",
|
||||||
"p-queue": "^7.3.4",
|
"p-queue": "^8.0.1",
|
||||||
"parse-torrent": "^11.0.14",
|
"parse-torrent": "^11.0.14",
|
||||||
"password-generator": "^2.0.2",
|
"password-generator": "^2.0.2",
|
||||||
"pg": "^8.2.1",
|
"pg": "^8.2.1",
|
||||||
|
@ -165,14 +165,14 @@
|
||||||
"prompt": "^1.0.0",
|
"prompt": "^1.0.0",
|
||||||
"proxy-addr": "^2.0.7",
|
"proxy-addr": "^2.0.7",
|
||||||
"pug": "^3.0.0",
|
"pug": "^3.0.0",
|
||||||
"reflect-metadata": "^0.1.12",
|
"reflect-metadata": "^0.2.1",
|
||||||
"sanitize-html": "2.x",
|
"sanitize-html": "2.x",
|
||||||
"sequelize": "6.33.0",
|
"sequelize": "6.33.0",
|
||||||
"sequelize-typescript": "^2.0.0-beta.1",
|
"sequelize-typescript": "^2.0.0-beta.1",
|
||||||
"short-uuid": "^4.2.0",
|
"short-uuid": "^4.2.0",
|
||||||
"sitemap": "^7.0.0",
|
"sitemap": "^7.0.0",
|
||||||
"socket.io": "^4.5.4",
|
"socket.io": "^4.5.4",
|
||||||
"sql-formatter": "^13.0.0",
|
"sql-formatter": "^15.2.0",
|
||||||
"srt-to-vtt": "^1.1.2",
|
"srt-to-vtt": "^1.1.2",
|
||||||
"tslib": "^2.0.0",
|
"tslib": "^2.0.0",
|
||||||
"useragent": "^2.3.0",
|
"useragent": "^2.3.0",
|
||||||
|
@ -181,7 +181,7 @@
|
||||||
"webtorrent": "^2.1.27",
|
"webtorrent": "^2.1.27",
|
||||||
"winston": "3.11.0",
|
"winston": "3.11.0",
|
||||||
"ws": "^8.0.0",
|
"ws": "^8.0.0",
|
||||||
"yauzl": "^2.10.0"
|
"yauzl": "^3.1.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@peertube/maildev": "^1.2.0",
|
"@peertube/maildev": "^1.2.0",
|
||||||
|
@ -204,7 +204,7 @@
|
||||||
"@types/jsonwebtoken": "^9.0.5",
|
"@types/jsonwebtoken": "^9.0.5",
|
||||||
"@types/lodash-es": "^4.17.8",
|
"@types/lodash-es": "^4.17.8",
|
||||||
"@types/magnet-uri": "^5.1.1",
|
"@types/magnet-uri": "^5.1.1",
|
||||||
"@types/maildev": "^0.0.4",
|
"@types/maildev": "^0.0.7",
|
||||||
"@types/memoizee": "^0.4.2",
|
"@types/memoizee": "^0.4.2",
|
||||||
"@types/mocha": "^10.0.0",
|
"@types/mocha": "^10.0.0",
|
||||||
"@types/morgan": "^1.7.32",
|
"@types/morgan": "^1.7.32",
|
||||||
|
@ -213,21 +213,21 @@
|
||||||
"@types/nodemailer": "^6.2.0",
|
"@types/nodemailer": "^6.2.0",
|
||||||
"@types/oauth2-server": "^3.0.8",
|
"@types/oauth2-server": "^3.0.8",
|
||||||
"@types/request": "^2.0.3",
|
"@types/request": "^2.0.3",
|
||||||
"@types/supertest": "^2.0.3",
|
"@types/supertest": "^6.0.2",
|
||||||
"@types/validator": "^13.9.0",
|
"@types/validator": "^13.9.0",
|
||||||
"@types/webtorrent": "^0.109.0",
|
"@types/webtorrent": "^0.109.0",
|
||||||
"@types/ws": "^8.2.0",
|
"@types/ws": "^8.2.0",
|
||||||
"@types/yauzl": "^2.10.3",
|
"@types/yauzl": "^2.10.3",
|
||||||
"@typescript-eslint/eslint-plugin": "^6.7.5",
|
"@typescript-eslint/eslint-plugin": "^7.0.2",
|
||||||
"autocannon": "^7.0.4",
|
"autocannon": "^7.0.4",
|
||||||
"chai": "^4.1.1",
|
"chai": "^5.1.0",
|
||||||
"chai-json-schema": "^1.5.0",
|
"chai-json-schema": "^1.5.0",
|
||||||
"chai-xml": "^0.4.0",
|
"chai-xml": "^0.4.0",
|
||||||
"concurrently": "^8.0.1",
|
"concurrently": "^8.0.1",
|
||||||
"depcheck": "^1.4.2",
|
"depcheck": "^1.4.2",
|
||||||
"esbuild": "^0.19.0",
|
"esbuild": "^0.20.1",
|
||||||
"eslint": "8.51.0",
|
"eslint": "8.56.0",
|
||||||
"eslint-config-standard-with-typescript": "39.1.1",
|
"eslint-config-standard-with-typescript": "43.0.1",
|
||||||
"eslint-plugin-import": "^2.20.1",
|
"eslint-plugin-import": "^2.20.1",
|
||||||
"eslint-plugin-n": "^16.0.0",
|
"eslint-plugin-n": "^16.0.0",
|
||||||
"eslint-plugin-node": "^11.0.0",
|
"eslint-plugin-node": "^11.0.0",
|
||||||
|
@ -243,8 +243,8 @@
|
||||||
"supertest": "^6.0.1",
|
"supertest": "^6.0.1",
|
||||||
"swagger-cli": "^4.0.2",
|
"swagger-cli": "^4.0.2",
|
||||||
"tsc-watch": "^6.0.0",
|
"tsc-watch": "^6.0.0",
|
||||||
"tsx": "^3.12.7",
|
"tsx": "^4.7.1",
|
||||||
"typescript": "~5.2.2"
|
"typescript": "~5.3.3"
|
||||||
},
|
},
|
||||||
"bundlewatch": {
|
"bundlewatch": {
|
||||||
"files": [
|
"files": [
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import MarkdownItClass from 'markdown-it'
|
import MarkdownItClass from 'markdown-it'
|
||||||
import markdownItEmoji from 'markdown-it-emoji/light.js'
|
import markdownItEmoji from 'markdown-it-emoji/lib/light.mjs'
|
||||||
import sanitizeHtml from 'sanitize-html'
|
import sanitizeHtml from 'sanitize-html'
|
||||||
import { getDefaultSanitizeOptions, getTextOnlySanitizeOptions, TEXT_WITH_HTML_RULES } from '@peertube/peertube-core-utils'
|
import { getDefaultSanitizeOptions, getTextOnlySanitizeOptions, TEXT_WITH_HTML_RULES } from '@peertube/peertube-core-utils'
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ import { getInternalUrl } from '../urls.js'
|
||||||
import { getClient } from './client.js'
|
import { getClient } from './client.js'
|
||||||
import { lTags } from './logger.js'
|
import { lTags } from './logger.js'
|
||||||
|
|
||||||
import type { _Object, CompleteMultipartUploadCommandOutput, PutObjectCommandInput, S3Client } from '@aws-sdk/client-s3'
|
import type { _Object, CompleteMultipartUploadCommandOutput, ObjectCannedACL, PutObjectCommandInput, S3Client } from '@aws-sdk/client-s3'
|
||||||
|
|
||||||
type BucketInfo = {
|
type BucketInfo = {
|
||||||
BUCKET_NAME: string
|
BUCKET_NAME: string
|
||||||
|
@ -377,6 +377,6 @@ async function applyOnPrefix (options: {
|
||||||
|
|
||||||
function getACL (isPrivate: boolean) {
|
function getACL (isPrivate: boolean) {
|
||||||
return isPrivate
|
return isPrivate
|
||||||
? CONFIG.OBJECT_STORAGE.UPLOAD_ACL.PRIVATE
|
? CONFIG.OBJECT_STORAGE.UPLOAD_ACL.PRIVATE as ObjectCannedACL
|
||||||
: CONFIG.OBJECT_STORAGE.UPLOAD_ACL.PUBLIC
|
: CONFIG.OBJECT_STORAGE.UPLOAD_ACL.PUBLIC as ObjectCannedACL
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue