From c795e19663a93c24908a7318975f820bac63164f Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 3 Aug 2022 15:08:36 +0200 Subject: Automatically rebuild native modules on ABI change --- server/helpers/utils.ts | 26 +------------------------- server/helpers/version.ts | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 25 deletions(-) create mode 100644 server/helpers/version.ts (limited to 'server/helpers') diff --git a/server/helpers/utils.ts b/server/helpers/utils.ts index 6b9333b53..5a4fe4fdd 100644 --- a/server/helpers/utils.ts +++ b/server/helpers/utils.ts @@ -4,7 +4,7 @@ import { join } from 'path' import { sha256 } from '@shared/extra-utils' import { ResultList } from '@shared/models' import { CONFIG } from '../initializers/config' -import { execPromise, execPromise2, randomBytesPromise } from './core-utils' +import { randomBytesPromise } from './core-utils' import { logger } from './logger' function deleteFileAndCatch (path: string) { @@ -44,29 +44,6 @@ function getSecureTorrentName (originalName: string) { return sha256(originalName) + '.torrent' } -async function getServerCommit () { - try { - const tag = await execPromise2( - '[ ! -d .git ] || git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || true', - { stdio: [ 0, 1, 2 ] } - ) - - if (tag) return tag.replace(/^v/, '') - } catch (err) { - logger.debug('Cannot get version from git tags.', { err }) - } - - try { - const version = await execPromise('[ ! -d .git ] || git rev-parse --short HEAD') - - if (version) return version.toString().trim() - } catch (err) { - logger.debug('Cannot get version from git HEAD.', { err }) - } - - return '' -} - /** * From a filename like "ede4cba5-742b-46fa-a388-9a6eb3a3aeb3.mp4", returns * only the "ede4cba5-742b-46fa-a388-9a6eb3a3aeb3" part. If the filename does @@ -88,7 +65,6 @@ export { generateRandomString, getFormattedObjects, getSecureTorrentName, - getServerCommit, generateVideoImportTmpPath, getUUIDFromFilename } diff --git a/server/helpers/version.ts b/server/helpers/version.ts new file mode 100644 index 000000000..5b3bf59dd --- /dev/null +++ b/server/helpers/version.ts @@ -0,0 +1,36 @@ +import { execPromise, execPromise2 } from './core-utils' +import { logger } from './logger' + +async function getServerCommit () { + try { + const tag = await execPromise2( + '[ ! -d .git ] || git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || true', + { stdio: [ 0, 1, 2 ] } + ) + + if (tag) return tag.replace(/^v/, '') + } catch (err) { + logger.debug('Cannot get version from git tags.', { err }) + } + + try { + const version = await execPromise('[ ! -d .git ] || git rev-parse --short HEAD') + + if (version) return version.toString().trim() + } catch (err) { + logger.debug('Cannot get version from git HEAD.', { err }) + } + + return '' +} + +function getNodeABIVersion () { + const version = process.versions.modules + + return parseInt(version) +} + +export { + getServerCommit, + getNodeABIVersion +} -- cgit v1.2.3