ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2025-06-16 05:48:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support bundled ubridge, Ref: #314

Browse Source
This commit is contained in:
ziajka
2019-03-05 10:43:31 +01:00
parent c40767879f
commit b7b2bd4592
5 changed files with 61 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
local-server.js
View File

@ -11,19 +11,13 @@ const isWin = /^win/.test(process.platform);
let runningServers = {};
exports.getLocalServerPath = async () => {
const lookupDirectories = [
__dirname,
path.dirname(app.getPath('exe'))
];
let binary = isWin ? 'gns3server.exe': 'gns3server';
return findBinary('exe.', binary);
}
for(var directory of lookupDirectories) {
const serverPath = await findLocalServerPath(directory);
if(serverPath !== undefined) {
return serverPath;
}
}
return;
exports.getUbridgePath = async () => {
let binary = isWin ? 'ubridge.exe': 'ubridge';
return findBinary('ubridge', binary);
}
exports.startLocalServer = async (server) => {
@ -44,7 +38,21 @@ exports.stopAllLocalServers = async () => {
return await stopAll();
}
async function findLocalServerPath(baseDirectory) {
async function findBinary(binaryDirectory, filename) {
const lookupDirectories = [
__dirname,
path.dirname(app.getPath('exe'))
];
for(var directory of lookupDirectories) {
const serverPath = await findBinaryInDirectory(directory, binaryDirectory, filename);
if(serverPath !== undefined) {
return serverPath;
}
}
}
async function findBinaryInDirectory(baseDirectory, binaryDirectory, filename) {
const distDirectory = path.join(baseDirectory, 'dist');
if (!fs.existsSync(distDirectory)) {
@ -53,26 +61,22 @@ async function findLocalServerPath(baseDirectory) {
const files = fs.readdirSync(distDirectory);
let serverPath = null;
let binaryPath = null;
files.forEach((directory) => {
if(directory.startsWith('exe.')) {
if (isWin) {
serverPath = path.join(baseDirectory, 'dist', directory, 'gns3server.exe');
}
else {
serverPath = path.join(baseDirectory, 'dist', directory, 'gns3server');
}
if(directory.startsWith(binaryDirectory)) {
binaryPath = path.join(baseDirectory, 'dist', directory, filename);
}
});
if(serverPath !== null && fs.existsSync(serverPath)) {
return serverPath;
if(binaryPath !== null && fs.existsSync(binaryPath)) {
return binaryPath;
}
return;
}
function getServerArguments(server, overrides, configPath) {
let serverArguments = [];
if(server.host) {
@ -183,6 +187,9 @@ async function configure(configPath, server) {
if(server.port) {
config.port = server.port;
}
if(server.ubridge_path) {
config.ubridge_path = server.ubridge_path;
}
fs.writeFileSync(configPath, ini.stringify(config, { section: 'Server' }));
}