Skip to content

Commit

Permalink
Update from RunOnFlux/flux@68f384f
Browse files Browse the repository at this point in the history
  • Loading branch information
@RunOnFluxBot
RunOnFluxBot committed Oct 23, 2024
1 parent 0817362 commit 8c63f24
Show file tree
Hide file tree
Showing 6 changed files with 75 additions and 144 deletions.
3 changes: 1 addition & 2 deletions services/benchmarkService.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ let response = messageHelper.createErrorMessage();
let benchdClient = null;

async function buildBenchdClient() {
const homeDirPath = path.join(__dirname, '../../../../');
const fluxbenchdPath = path.join(homeDirPath, '.fluxbenchmark');
const fluxbenchdPath = '/dat/usr/lib/fluxbenchd';

const exists = await fs.stat(fluxbenchdPath).catch(() => false);

Expand Down
61 changes: 19 additions & 42 deletions services/fluxService.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const dockerService = require('./dockerService');

// for streamChain endpoint
const zlib = require('node:zlib');
const tar = require('tar/create');
const tar = require('tar-fs');
// use non promises stream for node 14.x compatibility
// const stream = require('node:stream/promises');
const stream = require('node:stream');
Expand All @@ -37,13 +37,6 @@ const stream = require('node:stream');
*/
let lock = false;

/**
* For testing
*/
function getStreamLock() {
return lock;
}

/**
* For testing
*/
Expand Down Expand Up @@ -1608,16 +1601,17 @@ async function streamChain(req, res) {
lock = true;

/**
* Use the remote address here, don't need to worry about x-forwarded-for headers as
* we only allow the local network. Also, using the remote address is fine as FluxOS
* won't confirm if the upstream is natting behind a private address. I.e public
* connections coming in via a private address. (Flux websockets need the remote address
* or they think there is only one inbound connnection)
*/
* Use the remote address here, don't need to worry about x-forwarded-for headers as
* we only allow the local network. Also, using the remote address is fine as FluxOS
* won't confirm if the upstream is natting behind a private address. I.e public
* connections coming in via a private address. (Flux websockets need the remote address
* or they think there is only one inbound connnection)
*/
let ip = req.socket.remoteAddress;
if (!ip) {
res.statusMessage = 'Socket closed.';
res.status(400).end();
lock = false;
return;
}

Expand All @@ -1627,6 +1621,7 @@ async function streamChain(req, res) {
if (!serviceHelper.isPrivateAddress(ip)) {
res.statusMessage = 'Request must be from an address on the same private network as the host.';
res.status(403).end();
lock = false;
return;
}

Expand All @@ -1635,11 +1630,10 @@ async function streamChain(req, res) {
const homeDir = os.homedir();
const base = path.join(homeDir, '.flux');

// the order can matter when doing the stream live, the level db's can be volatile
const folders = [
'determ_zelnodes',
'chainstate',
'blocks',
'chainstate',
'determ_zelnodes',
];

const folderPromises = folders.map(async (f) => {
Expand All @@ -1657,6 +1651,7 @@ async function streamChain(req, res) {
if (!chainExists) {
res.statusMessage = 'Unable to find chain at $HOME/.flux';
res.status(500).end();
lock = false;
return;
}

Expand All @@ -1674,6 +1669,7 @@ async function streamChain(req, res) {
if (!safe && compress) {
res.statusMessage = 'Unable to compress blockchain in unsafe mode, it will corrupt new db.';
res.status(422).end();
lock = false;
return;
}

Expand All @@ -1685,33 +1681,15 @@ async function streamChain(req, res) {
if (safe && fluxdRunning) {
res.statusMessage = 'Flux daemon still running, unable to clone blockchain.';
res.status(503).end();
lock = false;
return;
}

const infoPromises = folders.map(
(f) => serviceHelper.dirInfo(path.join(base, f), { padFiles: 512 }),
);
const info = await Promise.all(infoPromises).catch(() => [{ count: 0, size: 0 }]);

const { count, size } = info.reduce((prev, current) => (
{ count: prev.count + current.count, size: prev.size + current.size }), { count: 0, size: 0 });

const tarHeaderSize = count * 512;
// if we get an error getting size, just set eof to 0, which will make totalSize 0
const tarEof = size ? 512 * 2 : 0;

const totalSize = size + tarHeaderSize + tarEof;

// We can't set this as the actual content length. As it can change slightly during transfer.
// However we need to set some size, so that the image installer can get a rought idea
// how log the transfer will take.
res.setHeader('Approx-Content-Length', totalSize.toString());

const workflow = [];

const readStream = tar.create({ cwd: base }, folders);

workflow.push(readStream);
workflow.push(tar.pack(base, {
entries: folders,
}));

if (compress) {
log.info('Compression requested... adding gzip. This can be 10-20x slower than sending uncompressed');
Expand Down Expand Up @@ -1766,6 +1744,7 @@ module.exports = {
hardUpdateFlux,
installFluxWatchTower,
isStaticIPapi,
lockStreamLock,
rebuildHome,
reindexDaemon,
restartBenchmark,
Expand All @@ -1782,13 +1761,11 @@ module.exports = {
tailFluxErrorLog,
tailFluxInfoLog,
tailFluxWarnLog,
unlockStreamLock,
updateBenchmark,
updateDaemon,
updateFlux,
// Exports for testing purposes
fluxLog,
getStreamLock,
lockStreamLock,
tailFluxLog,
unlockStreamLock,
};
43 changes: 0 additions & 43 deletions services/serviceHelper.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
const util = require('node:util');
const path = require('node:path');
const fs = require('node:fs/promises');
const execFile = util.promisify(require('node:child_process').execFile);

const axios = require('axios').default;
Expand Down Expand Up @@ -453,54 +451,13 @@ function minVersionSatisfy(targetVersion, minimumVersion) {
return true;
}

/**
* Recursively sum size of directory and children, in bytes
* @param {string} dir The directory we want the size of
* @param {{padFiles?: number}} options If the files are to be padded to size
* @returns {Promise<number>}
*/
async function dirInfo(dir, options = {}) {
const padFiles = options.padFiles || null;

const files = await fs.readdir(dir, { withFileTypes: true });

const pathPromises = files.map(async (file) => {
const targetpath = path.join(dir, file.name);

if (file.isDirectory()) return dirInfo(targetpath, options);

if (file.isFile()) {
const { size } = await fs.stat(targetpath);

return size;
}

return 0;
});

const paths = await Promise.all(pathPromises);

const response = paths.flat(Infinity).reduce((prev, current) => {
// the paths are either a number, i.e. a file, or a directory, with a count and aggregate size
const { count, size } = typeof current === 'number' ? { count: 1, size: current } : current;

// we only pad if it's a file (a dir has already been padded)
const padding = padFiles && count > 1 ? size % 512 : 0;

return { count: prev.count + count, size: prev.size + size + padding };
}, { count: 0, size: 0 });

return response;
}

module.exports = {
axiosGet,
axiosPost,
commandStringToArray,
axiosInstance,
delay,
deleteLoginPhrase,
dirInfo,
dockerBufferToString,
ensureBoolean,
ensureNumber,
Expand Down
98 changes: 47 additions & 51 deletions services/syncthingService.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,38 +51,39 @@ const stc = new FluxController();
* @returns {Promise<(string | null)>} config gile (XML).
*/
async function getConfigFile() {
const homedir = os.homedir();
const configDir = path.join(homedir, '.config');
const syncthingDir = path.join(configDir, 'syncthing');
const configFile = path.join(syncthingDir, 'config.xml');
// const homedir = os.homedir();
// const configDir = path.join(homedir, '.config');
// const syncthingDir = path.join(configDir, 'syncthing');
// const configFile = path.join(syncthingDir, 'config.xml');
const configFile = '/dat/usr/lib/syncthing/config.xml';

const user = os.userInfo().username;
const owner = `${user}:${user}`;
// const user = os.userInfo().username;
// const owner = `${user}:${user}`;

// As syncthing is running as root, we need to change owenership to running user
const { error: chownConfigDirError } = await serviceHelper.runCommand('chown', {
runAsRoot: true,
logError: false,
params: [owner, configDir],
});
// const { error: chownConfigDirError } = await serviceHelper.runCommand('chown', {
// runAsRoot: true,
// logError: false,
// params: [owner, configDir],
// });

if (chownConfigDirError) return null;
// if (chownConfigDirError) return null;

const { error: chownSyncthingError } = await serviceHelper.runCommand('chown', {
runAsRoot: true,
logError: false,
params: [owner, syncthingDir],
});
// const { error: chownSyncthingError } = await serviceHelper.runCommand('chown', {
// runAsRoot: true,
// logError: false,
// params: [owner, syncthingDir],
// });

if (chownSyncthingError) return null;
// if (chownSyncthingError) return null;

const { error: chmodError } = await serviceHelper.runCommand('chmod', {
runAsRoot: true,
logError: false,
params: ['644', configFile],
});
// const { error: chmodError } = await serviceHelper.runCommand('chmod', {
// runAsRoot: true,
// logError: false,
// params: ['644', configFile],
// });

if (chmodError) return null;
// if (chmodError) return null;

let result = null;
// this should never reject as chown would error first but just in case
Expand Down Expand Up @@ -2494,10 +2495,11 @@ async function runSyncthingSentinel() {
log.error('Unable to get syncthing deviceId. Reconfiguring syncthing.');
await stopSyncthing();
await installSyncthingIdempotently();
await configureDirectories();
// await configureDirectories();

const homedir = os.homedir();
const syncthingHome = path.join(homedir, '.config/syncthing');
// const homedir = os.homedir();
// const syncthingHome = path.join(homedir, '.config/syncthing');
const syncthingHome = '/dat/usr/lib/syncthing';
const logFile = path.join(syncthingHome, 'syncthing.log');

if (stc.aborted) return 0;
Expand All @@ -2515,32 +2517,26 @@ async function runSyncthingSentinel() {
// adding old spawn with shell in the interim.

childProcess.spawn(
`sudo nohup syncthing --logfile ${logFile} --logflags=3 --log-max-old-files=2 --log-max-size=26214400 --allow-newer-config --no-browser --home ${syncthingHome} >/dev/null 2>&1 </dev/null &`,
{ shell: true },
'nohup',
[
'syncthing',
'--logfile',
logFile,
'--logflags=3',
'--log-max-old-files=2',
'--log-max-size=26214400',
'--allow-newer-config',
'--no-browser',
'--home',
syncthingHome,
],
{
detached: true,
stdio: 'ignore',
env: { HOME: syncthingHome },
},
).unref();

// childProcess.spawn(
// 'sudo',
// [
// 'nohup',
// 'syncthing',
// '--logfile',
// logFile,
// '--logflags=3',
// '--log-max-old-files=2',
// '--log-max-size=26214400',
// '--allow-newer-config',
// '--no-browser',
// '--home',
// syncthingHome,
// ],
// {
// detached: true,
// stdio: 'ignore',
// // uid: 0,
// },
// ).unref();

// let syncthing set itself up
await stc.sleep(5 * 1000);
}
Expand Down
6 changes: 5 additions & 1 deletion services/systemService.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,11 @@ async function mongoDBConfig() {
log.info('MongoDB file config verification...');
try {
const hashCurrent = hash(await fs.readFile('/etc/mongod.conf'));
const vailidHashes = ['4646c649230b8125c7894d618313039f20d1901b', '1b20cbacf63c4400d0bf90188615db78b9a7602e'];
const vailidHashes = [
'cdf6ed6515ac061f5e6b6084af91767f42cd79d7',
'4646c649230b8125c7894d618313039f20d1901b',
'1b20cbacf63c4400d0bf90188615db78b9a7602e',
];
if (vailidHashes.indexOf(hashCurrent) !== -1) {
log.info('MongoDB config verification passed.');
return;
Expand Down
8 changes: 3 additions & 5 deletions services/utils/daemonConfig.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ const os = require('node:os');
class DaemonConfig {
static daemonConfigPaths = {
linux: {
zelPath: '.zelcash/zelcash.conf',
fluxPath: '.flux/flux.conf',
zelPath: 'flux.conf',
fluxPath: 'flux.conf',
},
darwin: {
zelPath: 'Zelcash/zelcash.conf',
Expand All @@ -24,16 +24,14 @@ class DaemonConfig {

platform = process.platform;

homedir = os.homedir();

raw = '';

configElements = {};

constructor() {
switch (this.platform) {
case 'linux':
this.baseDir = os.homedir();
this.baseDir = '/dat/var/lib/fluxd';
break;
case 'darwin':
this.baseDir = path.join(os.homedir(), 'Library/Application Support');
Expand Down

0 comments on commit 8c63f24

Please sign in to comment.