Fix build

diff --git a/client/src/app/shared/shared-video-miniature/video-filters.model.ts b/client/src/app/shared/shared-video-miniature/video-filters.model.ts
index 982880b0e7c5b5af556b7a5930ae597317853038..8ad2fcd5d69392733cea535181cac05f677c2423 100644 (file)
--- a/client/src/app/shared/shared-video-miniature/video-filters.model.ts
+++ b/client/src/app/shared/shared-video-miniature/video-filters.model.ts
@@ -1,5 +1,6 @@
 import { intoArray, toBoolean } from '@app/helpers'
-import { AttributesOnly, getAllPrivacies } from '@shared/core-utils'
+import { getAllPrivacies } from '@shared/core-utils'
+import { AttributesOnly } from '@shared/typescript-utils'
 import { BooleanBothQuery, NSFWPolicyType, VideoInclude, VideoPrivacy, VideoSortField } from '@shared/models'
 
 type VideoFiltersKeys = {

diff --git a/client/tsconfig.json b/client/tsconfig.json
index d68b3058e6f41662916117a42d08519d3fff961b..41814d0362500499541f63ca38016613a5117877 100644 (file)
--- a/client/tsconfig.json
+++ b/client/tsconfig.json
@@ -35,6 +35,8 @@
       "@shared/models": [ "../shared/models" ],
       "@shared/core-utils": [ "../shared/core-utils" ],
       "@shared/core-utils/*": [ "../shared/core-utils/*" ],
+      "@shared/typescript-utils": [ "../shared/typescript-utils" ],
+      "@shared/typescript-utils/*": [ "../shared/typescript-utils/*" ],
       "@root-helpers/*": [ "src/root-helpers/*" ],
       "fs": [ "src/shims/noop.ts" ],
       "http": [ "src/shims/http.ts" ],

diff --git a/server/helpers/peertube-crypto.ts b/server/helpers/peertube-crypto.ts
index 66a353204a20d71555c33e41846f6dd9227d030d..b8f7c782ae7b88ba88463d14f156d43d65a9dec1 100644 (file)
--- a/server/helpers/peertube-crypto.ts
+++ b/server/helpers/peertube-crypto.ts
@@ -2,9 +2,9 @@ import { compare, genSalt, hash } from 'bcrypt'
 import { createSign, createVerify } from 'crypto'
 import { Request } from 'express'
 import { cloneDeep } from 'lodash'
+import { sha256 } from '@shared/extra-utils'
 import { BCRYPT_SALT_SIZE, HTTP_SIGNATURE, PRIVATE_RSA_KEY_SIZE } from '../initializers/constants'
 import { MActor } from '../types/models'
-import { sha256 } from '@shared/core-utils/common/crypto'
 import { createPrivateKey, getPublicKey, promisify1, promisify2 } from './core-utils'
 import { jsonld } from './custom-jsonld-signature'
 import { logger } from './logger'

diff --git a/server/helpers/utils.ts b/server/helpers/utils.ts
index d6a3dae9555ed3682cb2be7bab7d0f837bf31a7b..bd85eaa561b02a6ee40e4dec6b90255c5fadacf5 100644 (file)
--- a/server/helpers/utils.ts
+++ b/server/helpers/utils.ts
@@ -1,9 +1,9 @@
 import { remove } from 'fs-extra'
 import { Instance as ParseTorrent } from 'parse-torrent'
 import { join } from 'path'
+import { sha256 } from '@shared/extra-utils'
 import { ResultList } from '../../shared'
 import { CONFIG } from '../initializers/config'
-import { sha256 } from '@shared/core-utils/common/crypto'
 import { execPromise, execPromise2, randomBytesPromise } from './core-utils'
 import { logger } from './logger'
 

diff --git a/server/helpers/webtorrent.ts b/server/helpers/webtorrent.ts
index 03663d73c46c9857c4ce19e481bf048f468f5bdb..68d532c48995a2f5efde250c233aec100f800594 100644 (file)
--- a/server/helpers/webtorrent.ts
+++ b/server/helpers/webtorrent.ts
@@ -13,9 +13,9 @@ import { VideoPathManager } from '@server/lib/video-path-manager'
 import { MVideo } from '@server/types/models/video/video'
 import { MVideoFile, MVideoFileRedundanciesOpt } from '@server/types/models/video/video-file'
 import { MStreamingPlaylistVideo } from '@server/types/models/video/video-streaming-playlist'
+import { sha1 } from '@shared/extra-utils'
 import { CONFIG } from '../initializers/config'
 import { promisify2 } from './core-utils'
-import { sha1 } from '@shared/core-utils/common/crypto'
 import { logger } from './logger'
 import { generateVideoImportTmpPath } from './utils'
 import { extractVideo } from './video'

diff --git a/server/lib/auth/oauth.ts b/server/lib/auth/oauth.ts
index dc0022852dbc10100653a3f919adfcf273f38e4f..2bf7a63617e935b105d6b0039486c396084a884e 100644 (file)
--- a/server/lib/auth/oauth.ts
+++ b/server/lib/auth/oauth.ts
@@ -8,9 +8,9 @@ import {
   UnauthorizedClientError,
   UnsupportedGrantTypeError
 } from 'oauth2-server'
-import { sha1 } from '@shared/core-utils/common/crypto'
 import { randomBytesPromise } from '@server/helpers/core-utils'
 import { MOAuthClient } from '@server/types/models'
+import { sha1 } from '@shared/extra-utils'
 import { OAUTH_LIFETIME } from '../../initializers/constants'
 import { BypassLogin, getClient, getRefreshToken, getUser, revokeToken, saveToken } from './oauth-model'
 

diff --git a/server/lib/client-html.ts b/server/lib/client-html.ts
index 91708839bb840b4f6de92a7b22a8ac7961c61502..e7e439bfe4bee38fbc00eb38c77fbb329efbe5ec 100644 (file)
--- a/server/lib/client-html.ts
+++ b/server/lib/client-html.ts
@@ -4,12 +4,12 @@ import { join } from 'path'
 import validator from 'validator'
 import { toCompleteUUID } from '@server/helpers/custom-validators/misc'
 import { escapeHTML } from '@shared/core-utils/renderer'
+import { sha256 } from '@shared/extra-utils'
 import { HTMLServerConfig } from '@shared/models'
 import { buildFileLocale, getDefaultLocale, is18nLocale, POSSIBLE_LOCALES } from '../../shared/core-utils/i18n/i18n'
 import { HttpStatusCode } from '../../shared/models/http/http-error-codes'
 import { VideoPlaylistPrivacy, VideoPrivacy } from '../../shared/models/videos'
 import { isTestInstance } from '../helpers/core-utils'
-import { sha256 } from '@shared/core-utils/common/crypto'
 import { logger } from '../helpers/logger'
 import { mdToPlainText } from '../helpers/markdown'
 import { CONFIG } from '../initializers/config'

diff --git a/server/lib/hls.ts b/server/lib/hls.ts
index e4904be5f3aae64ad93a4e57392f8a6cd63b9b3a..1574ff27bac29401a2e5731a9f3804819ca9cf8a 100644 (file)
--- a/server/lib/hls.ts
+++ b/server/lib/hls.ts
@@ -2,7 +2,7 @@ import { close, ensureDir, move, open, outputJSON, read, readFile, remove, stat,
 import { flatten, uniq } from 'lodash'
 import { basename, dirname, join } from 'path'
 import { MStreamingPlaylistFilesVideo, MVideo, MVideoUUID } from '@server/types/models'
-import { sha256 } from '@shared/core-utils/common/crypto'
+import { sha256 } from '@shared/extra-utils'
 import { getAudioStreamCodec, getVideoStreamCodec, getVideoStreamSize } from '../helpers/ffprobe-utils'
 import { logger } from '../helpers/logger'
 import { doRequest, doRequestAndSaveToFile } from '../helpers/requests'

diff --git a/server/models/video/video-streaming-playlist.ts b/server/models/video/video-streaming-playlist.ts
index 7b410f8eea4ac00b26d18935ffead63d11b25ac5..9957ffee3c3b3d1a4dea8bef5ed6338769ad615a 100644 (file)
--- a/server/models/video/video-streaming-playlist.ts
+++ b/server/models/video/video-streaming-playlist.ts
@@ -18,10 +18,10 @@ import {
 import { getHLSPublicFileUrl } from '@server/lib/object-storage'
 import { VideoFileModel } from '@server/models/video/video-file'
 import { MStreamingPlaylist, MVideo } from '@server/types/models'
-import { AttributesOnly } from '@shared/typescript-utils'
+import { sha1 } from '@shared/extra-utils'
 import { VideoStorage } from '@shared/models'
+import { AttributesOnly } from '@shared/typescript-utils'
 import { VideoStreamingPlaylistType } from '../../../shared/models/videos/video-streaming-playlist.type'
-import { sha1 } from '@shared/core-utils/common/crypto'
 import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc'
 import { isArrayOf } from '../../helpers/custom-validators/misc'
 import { isVideoFileInfoHashValid } from '../../helpers/custom-validators/videos'

diff --git a/server/tests/shared/streaming-playlists.ts b/server/tests/shared/streaming-playlists.ts
index 738dc90e136549fa59dfb6e6d0b8a957655bdaa5..7ca707f2eff002c9c01669a12e8952e221661b1d 100644 (file)
--- a/server/tests/shared/streaming-playlists.ts
+++ b/server/tests/shared/streaming-playlists.ts
@@ -1,7 +1,7 @@
 import { expect } from 'chai'
 import { basename } from 'path'
 import { removeFragmentedMP4Ext } from '@shared/core-utils'
-import { sha256 } from '@shared/core-utils/common/crypto'
+import { sha256 } from '@shared/extra-utils'
 import { HttpStatusCode, VideoStreamingPlaylist } from '@shared/models'
 import { PeerTubeServer } from '@shared/server-commands'
 

diff --git a/server/tests/shared/tracker.ts b/server/tests/shared/tracker.ts
index 699895d5f327fcbc6d02631f3b7bbd513aa440f4..9c1f0246a3448c0219f75318c2dea6b62ff5baf9 100644 (file)
--- a/server/tests/shared/tracker.ts
+++ b/server/tests/shared/tracker.ts
@@ -1,5 +1,5 @@
 import { expect } from 'chai'
-import { sha1 } from '@shared/core-utils'
+import { sha1 } from '@shared/extra-utils'
 import { makeGetRequest } from '@shared/server-commands'
 
 async function hlsInfohashExist (serverUrl: string, masterPlaylistUrl: string, fileNumber: number) {

diff --git a/server/tools/peertube-import-videos.ts b/server/tools/peertube-import-videos.ts
index 8314551f64c03905a47ee5b47047f62a80055aa5..44c42bad6a4736d6ddbef2b8b87eb34005b111f1 100644 (file)
--- a/server/tools/peertube-import-videos.ts
+++ b/server/tools/peertube-import-videos.ts
@@ -5,7 +5,7 @@ import { program } from 'commander'
 import { accessSync, constants } from 'fs'
 import { remove } from 'fs-extra'
 import { join } from 'path'
-import { sha256 } from '@shared/core-utils/crypto'
+import { sha256, wait } from '@shared/core-utils'
 import { doRequestAndSaveToFile } from '../helpers/requests'
 import {
   assignToken,
@@ -15,7 +15,6 @@ import {
   getLogger,
   getServerCredentials
 } from './cli'
-import { wait } from '@shared/server-commands'
 import { YoutubeDLCLI, YoutubeDLInfo, YoutubeDLInfoBuilder } from '@server/helpers/youtube-dl'
 import prompt = require('prompt')
 

diff --git a/shared/core-utils/common/index.ts b/shared/core-utils/common/index.ts
index f9ba10d5e0d2ace55f42bc2549ca6b414c825a6a..720977ead63dafa733d0dc748e96d88d768cd2d8 100644 (file)
--- a/shared/core-utils/common/index.ts
+++ b/shared/core-utils/common/index.ts
@@ -1,5 +1,5 @@
 export * from './array'
-export * from './crypto'
+export * from './random'
 export * from './date'
 export * from './env'
 export * from './object'

diff --git a/shared/core-utils/common/random.ts b/shared/core-utils/common/random.ts
new file mode 100644 (file)
index 0000000..705735d
--- /dev/null
+++ b/shared/core-utils/common/random.ts
@@ -0,0 +1,8 @@
+// high excluded
+function randomInt (low: number, high: number) {
+  return Math.floor(Math.random() * (high - low) + low)
+}
+
+export {
+  randomInt
+}

diff --git a/shared/core-utils/common/crypto.ts b/shared/extra-utils/crypto.ts
similarity index 100%
rename from shared/core-utils/common/crypto.ts
rename to shared/extra-utils/crypto.ts

diff --git a/shared/extra-utils/index.ts b/shared/extra-utils/index.ts
index 38303cf1fa7521fedf7cc52a59e4e21d88b5cbb5..373d27cb4925925a8596fd21a509ee149134641b 100644 (file)
--- a/shared/extra-utils/index.ts
+++ b/shared/extra-utils/index.ts
@@ -1,2 +1,3 @@
+export * from './crypto'
 export * from './ffprobe'
 export * from './file'