Upgrade server dependencies

package.json

@@ -74,9 +74,6 @@
     "client-report": "bash ./scripts/client-report.sh",
     "swagger-cli": "swagger-cli"
   },
-  "resolutions": {
-    "jpeg-js": "0.4.4"
-  },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.190.0",
     "@aws-sdk/lib-storage": "^3.190.0",
@@ -84,18 +81,17 @@
     "@babel/parser": "^7.17.8",
     "@node-oauth/oauth2-server": "^4.2.0",
     "@opentelemetry/api": "^1.1.0",
-    "@opentelemetry/api-metrics": "^0.32.0",
     "@opentelemetry/exporter-jaeger": "^1.3.1",
-    "@opentelemetry/exporter-prometheus": "~0.32.0",
-    "@opentelemetry/instrumentation": "^0.32.0",
+    "@opentelemetry/exporter-prometheus": "~0.34.0",
+    "@opentelemetry/instrumentation": "^0.34.0",
     "@opentelemetry/instrumentation-dns": "^0.30.0",
     "@opentelemetry/instrumentation-express": "^0.31.0",
     "@opentelemetry/instrumentation-fs": "^0.5.0",
-    "@opentelemetry/instrumentation-http": "^0.32.0",
-    "@opentelemetry/instrumentation-pg": "^0.31.0",
-    "@opentelemetry/instrumentation-redis-4": "^0.32.0",
+    "@opentelemetry/instrumentation-http": "^0.34.0",
+    "@opentelemetry/instrumentation-ioredis": "^0.32.2",
+    "@opentelemetry/instrumentation-pg": "^0.32.0",
     "@opentelemetry/resources": "^1.3.1",
-    "@opentelemetry/sdk-metrics": "^0.32.0",
+    "@opentelemetry/sdk-metrics": "^1.8.0",
     "@opentelemetry/sdk-trace-base": "^1.3.1",
     "@opentelemetry/sdk-trace-node": "^1.3.1",
     "@opentelemetry/semantic-conventions": "^1.3.1",
@@ -104,7 +100,7 @@
     "@uploadx/core": "^6.0.0",
     "async-lru": "^1.1.1",
     "async-mutex": "^0.4.0",
-    "bcrypt": "5.0.1",
+    "bcrypt": "5.1.0",
     "bencode": "^2.0.2",
     "bittorrent-tracker": "^9.0.0",
     "bluebird": "^3.5.0",
@@ -134,7 +130,7 @@
     "ipaddr.js": "2.0.1",
     "is-cidr": "^4.0.0",
     "iso-639-3": "2.2.0",
-    "jimp": "^0.16.0",
+    "jimp": "^0.16.2",
     "js-yaml": "^4.0.0",
     "jsonld": "~8.1.0",
     "lodash": "^4.17.10",
@@ -148,8 +144,8 @@
     "multer": "^1.4.5-lts.1",
     "node-media-server": "^2.1.4",
     "nodemailer": "^6.0.0",
-    "opentelemetry-instrumentation-sequelize": "^0.29.0",
-    "otpauth": "^8.0.3",
+    "opentelemetry-instrumentation-sequelize": "^0.32.0",
+    "otpauth": "^9.0.2",
     "p-queue": "^6",
     "parse-torrent": "^9.1.0",
     "password-generator": "^2.0.2",
@@ -160,12 +156,12 @@
     "pug": "^3.0.0",
     "reflect-metadata": "^0.1.12",
     "sanitize-html": "2.x",
-    "sequelize": "6.21.6",
+    "sequelize": "6.25.5",
     "sequelize-typescript": "^2.0.0-beta.1",
     "short-uuid": "^4.2.0",
     "sitemap": "^7.0.0",
     "socket.io": "^4.0.1",
-    "sql-formatter": "^10.6.0",
+    "sql-formatter": "^12.0.1",
     "srt-to-vtt": "^1.1.2",
     "tsconfig-paths": "^4.0.0",
     "tslib": "^2.0.0",
@@ -196,7 +192,7 @@
     "@types/maildev": "^0.0.3",
     "@types/memoizee": "^0.4.2",
     "@types/mkdirp": "^1.0.0",
-    "@types/mocha": "^9.0.0",
+    "@types/mocha": "^10.0.0",
     "@types/morgan": "^1.7.32",
     "@types/multer": "^1.3.3",
     "@types/node": "^14.14.31",
@@ -215,7 +211,7 @@
     "concurrently": "^7.0.0",
     "depcheck": "^1.4.2",
     "eslint": "^8.0.0",
-    "eslint-config-standard-with-typescript": "^22.0.0",
+    "eslint-config-standard-with-typescript": "^23.0.0",
     "eslint-plugin-import": "^2.20.1",
     "eslint-plugin-n": "^15.2.4",
     "eslint-plugin-node": "^11.0.0",

server/lib/opentelemetry/metric-helpers/job-queue-observers-builder.ts

@@ -1,4 +1,4 @@
-import { Meter } from '@opentelemetry/api-metrics'
+import { Meter } from '@opentelemetry/api'
 import { JobQueue } from '@server/lib/job-queue'
 
 export class JobQueueObserversBuilder {

server/lib/opentelemetry/metric-helpers/lives-observers-builder.ts

@@ -1,4 +1,4 @@
-import { Meter } from '@opentelemetry/api-metrics'
+import { Meter } from '@opentelemetry/api'
 import { VideoModel } from '@server/models/video/video'
 
 export class LivesObserversBuilder {

server/lib/opentelemetry/metric-helpers/nodejs-observers-builder.ts

@@ -1,7 +1,7 @@
 import { readdir } from 'fs-extra'
 import { constants, PerformanceObserver } from 'perf_hooks'
 import * as process from 'process'
-import { Meter, ObservableResult } from '@opentelemetry/api-metrics'
+import { Meter, ObservableResult } from '@opentelemetry/api'
 import { ExplicitBucketHistogramAggregation } from '@opentelemetry/sdk-metrics'
 import { View } from '@opentelemetry/sdk-metrics/build/src/view/View'
 import { logger } from '@server/helpers/logger'

server/lib/opentelemetry/metric-helpers/playback-metrics.ts

@@ -1,4 +1,4 @@
-import { Counter, Meter } from '@opentelemetry/api-metrics'
+import { Counter, Meter } from '@opentelemetry/api'
 import { MVideoImmutable } from '@server/types/models'
 import { PlaybackMetricCreate } from '@shared/models'
 

server/lib/opentelemetry/metric-helpers/stats-observers-builder.ts

@@ -1,5 +1,5 @@
 import memoizee from 'memoizee'
-import { Meter } from '@opentelemetry/api-metrics'
+import { Meter } from '@opentelemetry/api'
 import { MEMOIZE_TTL } from '@server/initializers/constants'
 import { buildAvailableActivities } from '@server/lib/activitypub/activity'
 import { StatsManager } from '@server/lib/stat-manager'

server/lib/opentelemetry/metric-helpers/viewers-observers-builder.ts

@@ -1,4 +1,4 @@
-import { Meter } from '@opentelemetry/api-metrics'
+import { Meter } from '@opentelemetry/api'
 import { VideoScope, ViewerScope } from '@server/lib/views/shared'
 import { VideoViewsManager } from '@server/lib/views/video-views-manager'
 

server/lib/opentelemetry/tracing.ts

@@ -6,8 +6,8 @@ import { DnsInstrumentation } from '@opentelemetry/instrumentation-dns'
 import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express'
 import FsInstrumentation from '@opentelemetry/instrumentation-fs'
 import { HttpInstrumentation } from '@opentelemetry/instrumentation-http'
+import { IORedisInstrumentation } from '@opentelemetry/instrumentation-ioredis'
 import { PgInstrumentation } from '@opentelemetry/instrumentation-pg'
-import { RedisInstrumentation } from '@opentelemetry/instrumentation-redis-4'
 import { Resource } from '@opentelemetry/resources'
 import { BatchSpanProcessor } from '@opentelemetry/sdk-trace-base'
 import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node'
@@ -58,7 +58,7 @@ function registerOpentelemetryTracing () {
       new DnsInstrumentation(),
       new HttpInstrumentation(),
       new ExpressInstrumentation(),
-      new RedisInstrumentation({
+      new IORedisInstrumentation({
         dbStatementSerializer: function (cmdName, cmdArgs) {
           return [ cmdName, ...cmdArgs ].join(' ')
         }