+
Addon folder name should start with "ofx" (got "${name}").`); + event.sender.send('cloneAddonDone'); + return; + } + + const destDir = path.join(addonsDir, name); + if (fs.existsSync(destDir)) { + event.sender.send('sendUIMessage', `\nError...
${name} already exists in your addons folder.`); + event.sender.send('cloneAddonDone'); + return; + } + + event.sender.send('consoleMessage', `
Cloning ${url} into ${destDir}...
`); + + const child = spawn('git', ['clone', '--recursive', url, destDir], { cwd: addonsDir, windowsHide: true }); + let stderr = ''; + child.stdout.on('data', (chunk) => event.sender.send('consoleMessage', chunk.toString())); + child.stderr.on('data', (chunk) => { + stderr += chunk.toString(); + event.sender.send('consoleMessage', chunk.toString()); + }); + + child.on('error', (error) => { + event.sender.send('sendUIMessage', `\nError...
Could not run git. Make sure git is installed and on PATH.
${error.message}`); + event.sender.send('cloneAddonDone'); + }); + + child.on('close', (code) => { + if (code !== 0) { + event.sender.send('sendUIMessage', `\nError...
git clone failed (exit code ${code}).
`);
+ event.sender.send('cloneAddonDone');
+ return;
+ }
+
+ const finish = () => {
+ refreshAddonList(event, ofPath);
+ event.sender.send('sendUIMessage', `\nSuccess!
Added addon ${name}.`); + event.sender.send('cloneAddonDone'); + }; + + if (ref) { + const checkout = spawn('git', ['checkout', ref], { cwd: destDir, windowsHide: true }); + checkout.stdout.on('data', (chunk) => event.sender.send('consoleMessage', chunk.toString())); + checkout.stderr.on('data', (chunk) => event.sender.send('consoleMessage', chunk.toString())); + checkout.on('close', (checkoutCode) => { + if (checkoutCode !== 0) { + event.sender.send('consoleMessage', `
Warning: cloned ${name} but could not check out "${ref}"
`); + } + finish(); + }); + } else { + finish(); + } + }); +}); + ipcMain.on('refreshTemplateList', (event, arg) => { console.log("refreshTemplateList"); const { selectedPlatforms, ofPath, bMulti } = arg; @@ -827,20 +882,18 @@ ipcMain.on('getRandomSketchName', (event, projectPath) => { // event.sender.send('setGenerateMode', 'createMode'); // it's a new sketch name, we are in create mode }); +// raw executable path, no quoting - always launched via execFile/spawn argv, never a shell function getPgPath() { let pgApp = ""; try { if (hostplatform == "linux" || hostplatform == "linux64") { // ???: when appear there linux64? pgApp = path.join(defaultOfPath, "apps/projectGenerator/commandLine/bin/projectGenerator"); - //pgApp = "projectGenerator"; } else { pgApp = path.normalize(path.join(__dirname, "app", "projectGenerator")); } - if (hostplatform == 'osx' || hostplatform == 'linux' || hostplatform == 'linux64') { - pgApp = pgApp.replace(/ /g, '\\ '); - } else { - pgApp = "\"" + pgApp + "\""; + if (hostplatform == "windows") { + pgApp += ".exe"; } } catch (error) { console.error("Error determining project generator path:", error); @@ -849,6 +902,55 @@ function getPgPath() { return pgApp; } +// runs PG via argv (no shell), streaming stdout/stderr to the console panel as it arrives +function runPG(args, event, callback) { + const pgApp = getPgPath(); + const displayCommand = [pgApp, ...args].join(' '); + + let child; + try { + child = spawn(pgApp, args, { windowsHide: true }); + } catch (error) { + callback(error, '', error.message); + return; + } + + let stdout = ''; + let stderr = ''; + + child.stdout.on('data', (chunk) => { + const text = chunk.toString(); + stdout += text; + if (event && event.sender && !event.sender.isDestroyed()) { + event.sender.send('consoleMessage', text); + } + }); + + child.stderr.on('data', (chunk) => { + const text = chunk.toString(); + stderr += text; + if (event && event.sender && !event.sender.isDestroyed()) { + event.sender.send('consoleMessage', text); + } + }); + + child.on('error', (error) => { + callback(error, stdout, stderr || error.message); + }); + + child.on('close', (code) => { + if (event && event.sender && !event.sender.isDestroyed()) { + event.sender.send('consoleMessage', `
(command used: ${displayCommand})
`); + } + if (code === 0) { + callback(null, stdout, stderr); + } else { + const error = new Error(stderr || `projectGenerator exited with code ${code}`); + callback(error, stdout, stderr); + } + }); +} + /** @typedef {{ * updatePath: string, @@ -866,13 +968,6 @@ function getPgPath() { function updateFunction(event, update) { console.log(update); - let updatePathString = ""; - let pathString = ""; - let platformString = ""; - let templateString = ""; - let recursiveString = ""; - let verboseString = ""; - const { updatePath, platformList, @@ -882,68 +977,51 @@ function updateFunction(event, update) { verbose } = update; - if (updatePath != null) { - updatePathString = `"${updatePath}"`; - } + const args = []; - if (platformList != null) { - platformString = `-p"${platformList.join(",")}"`; + if (updateRecursive == true) { + args.push('-r'); } - if (templateList != null) { - const uniqueTemplates = [...new Set(templateList)]; - templateString = `-t"${uniqueTemplates.join(",")}"`; + if (verbose == true) { + args.push('-v'); } if (ofPath != null) { - pathString = `-o"${ofPath}"`; + args.push(`-o${ofPath}`); } - if (updateRecursive == true) { - recursiveString = "-r"; + if (platformList != null) { + args.push(`-p${platformList.join(",")}`); } - if (verbose == true) { - verboseString = "-v"; + if (templateList != null) { + const uniqueTemplates = [...new Set(templateList)]; + args.push(`-t${uniqueTemplates.join(",")}`); } - const pgApp = getPgPath(); - - const wholeString = [ - pgApp, - recursiveString, - verboseString, - pathString, - platformString, - templateString, - updatePathString - ].join(" "); - - exec(wholeString, { maxBuffer : Infinity }, (error, stdout, stderr) => { + if (updatePath != null) { + args.push(updatePath); + } + + runPG(args, event, (error, stdout, stderr) => { if (error === null) { - event.sender.send('consoleMessage', "" + wholeString + "
" + stdout); event.sender.send('sendUIMessage', 'Success!
' + 'Updating your project was successful! ' + updatePath + '
' + '
' + - '
'
+ '
'
);
-
- //
event.sender.send('updateCompleted', true);
} else {
- event.sender.send('consoleMessage', "" + wholeString + "
" + error.message); event.sender.send('sendUIMessage', 'Error...
' + 'There was a problem updating your project... ' + updatePath + '' + - '
'
+ '
'
);
}
+ event.sender.send('updateMultipleDone');
});
-
- console.log(wholeString);
-
- //console.log(__dirname);
}
ipcMain.on('update', updateFunction);
@@ -964,14 +1042,6 @@ ipcMain.on('update', updateFunction);
* @param {GenerateArgument} generate
*/
function generateFunction(event, generate) {
- let projectString = "";
- let pathString = "";
- let addonString = "";
- let platformString = "";
- let templateString = "";
- let verboseString = "";
- let sourceExtraString = "";
-
const {
platformList,
templateList,
@@ -983,74 +1053,58 @@ function generateFunction(event, generate) {
projectName,
} = generate;
- if (platformList != null) {
- platformString = `-p"${platformList.join(",")}"`;
+ const args = [];
+
+ if (verbose === true) {
+ args.push('-v');
}
- if (templateList != null) {
- templateString = `-t"${templateList.join(",")}"`;
+ if (ofPath != null) {
+ args.push(`-o${ofPath}`);
}
- if (addonList != null &&
- Array.isArray(addonList) &&
- addonList.length > 0)
- {
- addonString = `-a"${addonList.join(",")}"`;
+ if (addonList != null && Array.isArray(addonList) && addonList.length > 0) {
+ args.push(`-a${addonList.join(",")}`);
} else {
- addonString = '-a" "';
+ args.push('-a ');
}
- if (ofPath != null) {
- pathString = `-o"${ofPath}"`;
+ if (platformList != null) {
+ args.push(`-p${platformList.join(",")}`);
}
-
+
if (sourcePath != null && sourcePath.length > 0) {
- sourceExtraString = `-s"${sourcePath}"`;
+ args.push(`-s${sourcePath}`);
}
- if (verbose === true) {
- verboseString = "-v";
+ if (templateList != null) {
+ args.push(`-t${templateList.join(",")}`);
}
if (projectName != null && projectPath != null) {
- projectString = `"${path.join(projectPath, projectName)}"`;
+ args.push(path.join(projectPath, projectName));
}
- const pgApp = getPgPath();
- const wholeString = [
- pgApp,
- verboseString,
- pathString,
- addonString,
- platformString,
- sourceExtraString,
- templateString,
- projectString
- ].join(' ');
-
- exec(wholeString, { maxBuffer : Infinity }, (error, stdout, stderr) => {
- const text = stdout; //Big text with many line breaks
- const lines = text.split(os.EOL); //Will return an array of lines on every OS node works
+ const fullPath = path.join(projectPath, projectName);
+
+ runPG(args, event, (error, stdout, stderr) => {
+ const lines = stdout.split(os.EOL);
const wasError = lines.some(line => (line.indexOf("Result:") > -1 && line.indexOf("error") > -1));
-
+
// wasError = did the PG spit out an error (like a bad path, etc)
// error = did node have an error running this command line app
- const fullPath = path.join(projectPath, projectName);
if (error === null && wasError === false) {
- event.sender.send('consoleMessage', `${wholeString}
${stdout}`); event.sender.send('sendUIMessage', 'Success!
' + 'Your can now find your project in ' + fullPath + '
' + '
' - + ''
+ + '
'
);
event.sender.send('generateCompleted', true);
} else if (error !== null) {
- event.sender.send('consoleMessage', `${wholeString}
+
+
+
+
+
+
@@ -307,11 +326,17 @@
-
+
+
+
+
-
-
-
-
diff --git a/frontend/index.js b/frontend/index.js
index c57fff85..753e2087 100644
--- a/frontend/index.js
+++ b/frontend/index.js
@@ -1,9 +1,10 @@
const fs = require('fs');
const path = require('path');
+const http = require('http');
const moniker = require('moniker');
const process = require('process');
const os = require("os");
-const exec = require('child_process').exec;
+const { execFile, spawn } = require('child_process');
const {
app,
@@ -50,6 +51,7 @@ let settings = {};
/** @type Settings */
const templateSettings = {
defaultOfPath: "",
+ emsdkPath: "",
advancedMode: false,
defaultPlatform: '',
showConsole: false,
@@ -196,18 +198,6 @@ console.log(`Operating system platform: ${platform}`);
// }
// });
-// Execute a shell command using exec
-exec('ls', (error, stdout, stderr) => {
- if (error) {
- console.error(`Error executing command: ${error.message}`);
- return;
- }
- if (stderr) {
- console.error(`Error in command output: ${stderr}`);
- return;
- }
- console.log(`Command output: ${stdout}`);
-});
// hide some addons, per https://github.com/openframeworks/projectGenerator/issues/62
const addonsToSkip = [
@@ -325,9 +315,10 @@ app.on('ready', () => {
resizable: true, // TODO: fix to false, true for debug
frame: false,
webPreferences: {
- //preload: path.join(__dirname, 'preload.js'),
- nodeIntegration: true,
- contextIsolation: false,
+ preload: path.join(__dirname, 'preload.js'),
+ nodeIntegration: false,
+ contextIsolation: true,
+ sandbox: true,
}
});
@@ -347,6 +338,7 @@ app.on('ready', () => {
mainWindow.webContents.send('cwd', __dirname);
mainWindow.webContents.send('cwd', process.resourcesPath);
mainWindow.webContents.send('setStartingProject', startingProject);
+ mainWindow.webContents.send('setGuiVersion', app.getVersion());
mainWindow.webContents.send('setDefaults', settings);
mainWindow.webContents.send('setup', '');
mainWindow.webContents.send('checkOfPathAfterSetup', '');
@@ -764,6 +756,69 @@ ipcMain.on('refreshAddonList', refreshAddonList);
ipcMain.on('refreshPlatformList', refreshPlatformList);
+ipcMain.on('cloneAddon', (event, { ofPath, url, ref }) => {
+ if (!url) return;
+
+ const addonsDir = path.join(ofPath, 'addons');
+ const name = path.basename(url, '.git');
+
+ if (!/^ofx/i.test(name) || name.includes('/') || name.includes('\\')) {
+ event.sender.send('sendUIMessage', `\nError...
+
+
+ Addon folder name should start with "ofx" (got "${name}").`); + event.sender.send('cloneAddonDone'); + return; + } + + const destDir = path.join(addonsDir, name); + if (fs.existsSync(destDir)) { + event.sender.send('sendUIMessage', `\nError...
${name} already exists in your addons folder.`); + event.sender.send('cloneAddonDone'); + return; + } + + event.sender.send('consoleMessage', `
Cloning ${url} into ${destDir}...
`); + + const child = spawn('git', ['clone', '--recursive', url, destDir], { cwd: addonsDir, windowsHide: true }); + let stderr = ''; + child.stdout.on('data', (chunk) => event.sender.send('consoleMessage', chunk.toString())); + child.stderr.on('data', (chunk) => { + stderr += chunk.toString(); + event.sender.send('consoleMessage', chunk.toString()); + }); + + child.on('error', (error) => { + event.sender.send('sendUIMessage', `\nError...
Could not run git. Make sure git is installed and on PATH.
${error.message}`); + event.sender.send('cloneAddonDone'); + }); + + child.on('close', (code) => { + if (code !== 0) { + event.sender.send('sendUIMessage', `\nError...
git clone failed (exit code ${code}).
Added addon ${name}.`); + event.sender.send('cloneAddonDone'); + }; + + if (ref) { + const checkout = spawn('git', ['checkout', ref], { cwd: destDir, windowsHide: true }); + checkout.stdout.on('data', (chunk) => event.sender.send('consoleMessage', chunk.toString())); + checkout.stderr.on('data', (chunk) => event.sender.send('consoleMessage', chunk.toString())); + checkout.on('close', (checkoutCode) => { + if (checkoutCode !== 0) { + event.sender.send('consoleMessage', `
Warning: cloned ${name} but could not check out "${ref}"
`); + } + finish(); + }); + } else { + finish(); + } + }); +}); + ipcMain.on('refreshTemplateList', (event, arg) => { console.log("refreshTemplateList"); const { selectedPlatforms, ofPath, bMulti } = arg; @@ -827,20 +882,18 @@ ipcMain.on('getRandomSketchName', (event, projectPath) => { // event.sender.send('setGenerateMode', 'createMode'); // it's a new sketch name, we are in create mode }); +// raw executable path, no quoting - always launched via execFile/spawn argv, never a shell function getPgPath() { let pgApp = ""; try { if (hostplatform == "linux" || hostplatform == "linux64") { // ???: when appear there linux64? pgApp = path.join(defaultOfPath, "apps/projectGenerator/commandLine/bin/projectGenerator"); - //pgApp = "projectGenerator"; } else { pgApp = path.normalize(path.join(__dirname, "app", "projectGenerator")); } - if (hostplatform == 'osx' || hostplatform == 'linux' || hostplatform == 'linux64') { - pgApp = pgApp.replace(/ /g, '\\ '); - } else { - pgApp = "\"" + pgApp + "\""; + if (hostplatform == "windows") { + pgApp += ".exe"; } } catch (error) { console.error("Error determining project generator path:", error); @@ -849,6 +902,55 @@ function getPgPath() { return pgApp; } +// runs PG via argv (no shell), streaming stdout/stderr to the console panel as it arrives +function runPG(args, event, callback) { + const pgApp = getPgPath(); + const displayCommand = [pgApp, ...args].join(' '); + + let child; + try { + child = spawn(pgApp, args, { windowsHide: true }); + } catch (error) { + callback(error, '', error.message); + return; + } + + let stdout = ''; + let stderr = ''; + + child.stdout.on('data', (chunk) => { + const text = chunk.toString(); + stdout += text; + if (event && event.sender && !event.sender.isDestroyed()) { + event.sender.send('consoleMessage', text); + } + }); + + child.stderr.on('data', (chunk) => { + const text = chunk.toString(); + stderr += text; + if (event && event.sender && !event.sender.isDestroyed()) { + event.sender.send('consoleMessage', text); + } + }); + + child.on('error', (error) => { + callback(error, stdout, stderr || error.message); + }); + + child.on('close', (code) => { + if (event && event.sender && !event.sender.isDestroyed()) { + event.sender.send('consoleMessage', `
(command used: ${displayCommand})
`); + } + if (code === 0) { + callback(null, stdout, stderr); + } else { + const error = new Error(stderr || `projectGenerator exited with code ${code}`); + callback(error, stdout, stderr); + } + }); +} + /** @typedef {{ * updatePath: string, @@ -866,13 +968,6 @@ function getPgPath() { function updateFunction(event, update) { console.log(update); - let updatePathString = ""; - let pathString = ""; - let platformString = ""; - let templateString = ""; - let recursiveString = ""; - let verboseString = ""; - const { updatePath, platformList, @@ -882,68 +977,51 @@ function updateFunction(event, update) { verbose } = update; - if (updatePath != null) { - updatePathString = `"${updatePath}"`; - } + const args = []; - if (platformList != null) { - platformString = `-p"${platformList.join(",")}"`; + if (updateRecursive == true) { + args.push('-r'); } - if (templateList != null) { - const uniqueTemplates = [...new Set(templateList)]; - templateString = `-t"${uniqueTemplates.join(",")}"`; + if (verbose == true) { + args.push('-v'); } if (ofPath != null) { - pathString = `-o"${ofPath}"`; + args.push(`-o${ofPath}`); } - if (updateRecursive == true) { - recursiveString = "-r"; + if (platformList != null) { + args.push(`-p${platformList.join(",")}`); } - if (verbose == true) { - verboseString = "-v"; + if (templateList != null) { + const uniqueTemplates = [...new Set(templateList)]; + args.push(`-t${uniqueTemplates.join(",")}`); } - const pgApp = getPgPath(); - - const wholeString = [ - pgApp, - recursiveString, - verboseString, - pathString, - platformString, - templateString, - updatePathString - ].join(" "); - - exec(wholeString, { maxBuffer : Infinity }, (error, stdout, stderr) => { + if (updatePath != null) { + args.push(updatePath); + } + + runPG(args, event, (error, stdout, stderr) => { if (error === null) { - event.sender.send('consoleMessage', "" + wholeString + "
" + stdout); event.sender.send('sendUIMessage', 'Success!
' + 'Updating your project was successful! ' + updatePath + '
' + '
' + - '
" + error.message); event.sender.send('sendUIMessage', 'Error...
' + 'There was a problem updating your project... ' + updatePath + '' + - '
${stdout}`); event.sender.send('sendUIMessage', 'Success!
' + 'Your can now find your project in ' + fullPath + '
' + '
' - + '
${error.message}`); // note: stderr mostly seems to be also included in error.message - // also available: error.code, error.killed, error.signal, error.cmd - // info: error.code=127 means commandLinePG was not found + // info: error.code=ENOENT means commandLinePG was not found event.sender.send('sendUIMessage', 'Error...
' + 'There was a problem generating your project... ' + fullPath + '' @@ -1058,18 +1112,15 @@ function generateFunction(event, generate) { + '