fix(striker-ui-api): draft screenshot patch to align with new fetch process

main
Tsu-ba-me 1 year ago
parent b1562e0301
commit 672f5e5422
  1. 5
      striker-ui-api/src/lib/consts/SERVER_PATHS.ts
  2. 73
      striker-ui-api/src/lib/request_handlers/server/getServerDetail.ts

@ -10,6 +10,11 @@ const EMPTY_SERVER_PATHS: ServerPath = {
incoming: {}, incoming: {},
}, },
}, },
opt: {
alteeve: {
screenshots: {},
},
},
tmp: {}, tmp: {},
usr: { usr: {
bin: { bin: {

@ -1,12 +1,31 @@
import assert from 'assert'; import assert from 'assert';
import { execSync } from 'child_process';
import { RequestHandler } from 'express'; import { RequestHandler } from 'express';
import { readFileSync, readdirSync } from 'fs';
import path from 'path';
import { REP_UUID, SERVER_PATHS } from '../../consts'; import { P_UUID, REP_UUID, SERVER_PATHS } from '../../consts';
import { getVncinfo } from '../../accessModule'; import { getVncinfo } from '../../accessModule';
import { sanitize } from '../../sanitize'; import { sanitize } from '../../sanitize';
import { stderr, stdout } from '../../shell'; import { stderr, stdout, stdoutVar } from '../../shell';
type ServerSsMeta = {
name: string;
timestamp: number;
uuid: string;
};
const disassembleServerSsName = (name: string): ServerSsMeta => {
const csv = name.replace(
new RegExp(`^server-uuid_(${P_UUID})_timestamp-(\\d+)`),
'$1,$2',
);
const [uuid, t] = csv.split(',', 2);
const timestamp = Number(t);
return { name, timestamp, uuid };
};
export const getServerDetail: RequestHandler< export const getServerDetail: RequestHandler<
ServerDetailParamsDictionary, ServerDetailParamsDictionary,
@ -38,20 +57,54 @@ export const getServerDetail: RequestHandler<
} }
if (ss) { if (ss) {
const rsbody: ServerDetailScreenshot = { screenshot: '' }; const rsBody: ServerDetailScreenshot = { screenshot: '' };
const ssDir = SERVER_PATHS.opt.alteeve.screenshots.self;
let ssNames: string[];
try { try {
rsbody.screenshot = execSync( ssNames = readdirSync(SERVER_PATHS.opt.alteeve.screenshots.self, {
`${SERVER_PATHS.usr.sbin['anvil-get-server-screenshot'].self} --convert --resize 500x500 --server-uuid '${serverUuid}'`, encoding: 'utf-8',
{ encoding: 'utf-8' }, });
);
} catch (error) { } catch (error) {
stderr(`Failed to server ${serverUuid} screenshot; CAUSE: ${error}`); stderr(
`Failed to list server ${serverUuid} screenshots; CAUSE: ${error}`,
);
return response.status(500).send(); return response.status(500).send();
} }
return response.send(rsbody); const ssMetas = ssNames
.reduce<ServerSsMeta[]>((previous, name) => {
const meta = disassembleServerSsName(name);
if (meta.uuid === serverUuid) {
previous.push(meta);
}
return previous;
}, [])
.sort((a, b) => {
if (a.timestamp === b.timestamp) return 0;
return a.timestamp > b.timestamp ? 1 : -1;
});
stdoutVar(ssMetas, `Server screenshots: `);
const ssMetaLatest = ssMetas.pop();
if (ssMetaLatest) {
const { name } = ssMetaLatest;
const ssLatest = readFileSync(path.join(ssDir, name), {
encoding: 'base64',
});
rsBody.screenshot = ssLatest;
}
return response.send(rsBody);
} else if (vnc) { } else if (vnc) {
let rsbody: ServerDetailVncInfo; let rsbody: ServerDetailVncInfo;

Loading…
Cancel
Save