fix multi-instance launch bug #100
This commit is contained in:
Nicolas Constant
parent
da7ddc7f3d
commit
2bc4393488
279
main-electron.js
279
main-electron.js
|
|
@ -9,166 +9,181 @@ const fs = require("fs");
|
||||||
let win;
|
let win;
|
||||||
|
|
||||||
function createWindow() {
|
function createWindow() {
|
||||||
// Create the browser window.
|
// Create the browser window.
|
||||||
win = new BrowserWindow({
|
win = new BrowserWindow({
|
||||||
width: 377,
|
width: 377,
|
||||||
height: 800,
|
height: 800,
|
||||||
title: "Sengi",
|
title: "Sengi",
|
||||||
backgroundColor: "#FFF",
|
backgroundColor: "#FFF",
|
||||||
useContentSize: true
|
useContentSize: true
|
||||||
});
|
});
|
||||||
|
|
||||||
var server = http.createServer(requestHandler).listen(9527);
|
var server = http.createServer(requestHandler).listen(9527);
|
||||||
win.loadURL("http://localhost:9527");
|
win.loadURL("http://localhost:9527");
|
||||||
|
|
||||||
const template = [
|
const template = [
|
||||||
{
|
|
||||||
label: "View",
|
|
||||||
submenu: [
|
|
||||||
{ role: "reload" },
|
|
||||||
{ role: "forcereload" },
|
|
||||||
{ type: "separator" },
|
|
||||||
{ role: "close" },
|
|
||||||
{ role: 'quit' }
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
role: "help",
|
|
||||||
submenu: [
|
|
||||||
{ role: "toggledevtools" },
|
|
||||||
{
|
{
|
||||||
label: "Open GitHub project",
|
label: "View",
|
||||||
click() {
|
submenu: [
|
||||||
require("electron").shell.openExternal(
|
{ role: "reload" },
|
||||||
"https://github.com/NicolasConstant/sengi"
|
{ role: "forcereload" },
|
||||||
);
|
{ type: "separator" },
|
||||||
}
|
{ role: "close" },
|
||||||
|
{ role: 'quit' }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
role: "help",
|
||||||
|
submenu: [
|
||||||
|
{ role: "toggledevtools" },
|
||||||
|
{
|
||||||
|
label: "Open GitHub project",
|
||||||
|
click() {
|
||||||
|
require("electron").shell.openExternal(
|
||||||
|
"https://github.com/NicolasConstant/sengi"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
]
|
];
|
||||||
|
|
||||||
|
const menu = Menu.buildFromTemplate(template);
|
||||||
|
win.setMenu(menu);
|
||||||
|
|
||||||
|
// Check if we are on a MAC
|
||||||
|
if (process.platform === "darwin") {
|
||||||
|
// Create our menu entries so that we can use MAC shortcuts
|
||||||
|
Menu.setApplicationMenu(
|
||||||
|
Menu.buildFromTemplate([
|
||||||
|
{
|
||||||
|
label: "Edit",
|
||||||
|
submenu: [
|
||||||
|
{ role: "undo" },
|
||||||
|
{ role: "redo" },
|
||||||
|
{ type: "separator" },
|
||||||
|
{ role: "cut" },
|
||||||
|
{ role: "copy" },
|
||||||
|
{ role: "paste" },
|
||||||
|
{ role: "pasteandmatchstyle" },
|
||||||
|
{ role: "delete" },
|
||||||
|
{ role: "selectall" },
|
||||||
|
{ type: "separator" },
|
||||||
|
{ role: "close" },
|
||||||
|
{ role: 'quit' }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: "View",
|
||||||
|
submenu: [{ role: "reload" }, { role: "forcereload" }]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
role: "help",
|
||||||
|
submenu: [
|
||||||
|
{ role: "toggledevtools" },
|
||||||
|
{
|
||||||
|
label: "Open GitHub project",
|
||||||
|
click() {
|
||||||
|
require("electron").shell.openExternal(
|
||||||
|
"https://github.com/NicolasConstant/sengi"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
])
|
||||||
|
);
|
||||||
}
|
}
|
||||||
];
|
|
||||||
|
|
||||||
const menu = Menu.buildFromTemplate(template);
|
// Open the DevTools.
|
||||||
win.setMenu(menu);
|
// win.webContents.openDevTools()
|
||||||
|
|
||||||
// Check if we are on a MAC
|
//open external links to browser
|
||||||
if (process.platform === "darwin") {
|
win.webContents.on("new-window", function (event, url) {
|
||||||
// Create our menu entries so that we can use MAC shortcuts
|
event.preventDefault();
|
||||||
Menu.setApplicationMenu(
|
shell.openExternal(url);
|
||||||
Menu.buildFromTemplate([
|
});
|
||||||
{
|
|
||||||
label: "Edit",
|
|
||||||
submenu: [
|
|
||||||
{ role: "undo" },
|
|
||||||
{ role: "redo" },
|
|
||||||
{ type: "separator" },
|
|
||||||
{ role: "cut" },
|
|
||||||
{ role: "copy" },
|
|
||||||
{ role: "paste" },
|
|
||||||
{ role: "pasteandmatchstyle" },
|
|
||||||
{ role: "delete" },
|
|
||||||
{ role: "selectall" },
|
|
||||||
{ type: "separator" },
|
|
||||||
{ role: "close" },
|
|
||||||
{ role: 'quit' }
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "View",
|
|
||||||
submenu: [{ role: "reload" }, { role: "forcereload" }]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
role: "help",
|
|
||||||
submenu: [
|
|
||||||
{ role: "toggledevtools" },
|
|
||||||
{
|
|
||||||
label: "Open GitHub project",
|
|
||||||
click() {
|
|
||||||
require("electron").shell.openExternal(
|
|
||||||
"https://github.com/NicolasConstant/sengi"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
])
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Open the DevTools.
|
// Emitted when the window is closed.
|
||||||
// win.webContents.openDevTools()
|
win.on("closed", () => {
|
||||||
|
// Dereference the window object, usually you would store windows
|
||||||
//open external links to browser
|
// in an array if your app supports multi windows, this is the time
|
||||||
win.webContents.on("new-window", function(event, url) {
|
// when you should delete the corresponding element.
|
||||||
event.preventDefault();
|
win = null;
|
||||||
shell.openExternal(url);
|
});
|
||||||
});
|
|
||||||
|
|
||||||
// Emitted when the window is closed.
|
|
||||||
win.on("closed", () => {
|
|
||||||
// Dereference the window object, usually you would store windows
|
|
||||||
// in an array if your app supports multi windows, this is the time
|
|
||||||
// when you should delete the corresponding element.
|
|
||||||
win = null;
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function requestHandler(req, res) {
|
function requestHandler(req, res) {
|
||||||
var file = req.url == "/" ? "/index.html" : req.url,
|
var file = req.url == "/" ? "/index.html" : req.url,
|
||||||
root = __dirname + "/dist",
|
root = __dirname + "/dist",
|
||||||
page404 = root + "/404.html";
|
page404 = root + "/404.html";
|
||||||
|
|
||||||
if (file.includes("register") || file.includes("home")) file = "/index.html";
|
if (file.includes("register") || file.includes("home")) file = "/index.html";
|
||||||
|
|
||||||
getFile(root + file, res, page404);
|
getFile(root + file, res, page404);
|
||||||
}
|
}
|
||||||
|
|
||||||
function getFile(filePath, res, page404) {
|
function getFile(filePath, res, page404) {
|
||||||
console.warn(`filePath: ${filePath}`);
|
console.warn(`filePath: ${filePath}`);
|
||||||
fs.exists(filePath, function(exists) {
|
fs.exists(filePath, function (exists) {
|
||||||
if (exists) {
|
if (exists) {
|
||||||
fs.readFile(filePath, function(err, contents) {
|
fs.readFile(filePath, function (err, contents) {
|
||||||
if (!err) {
|
if (!err) {
|
||||||
res.end(contents);
|
res.end(contents);
|
||||||
|
} else {
|
||||||
|
console.dir(err);
|
||||||
|
}
|
||||||
|
});
|
||||||
} else {
|
} else {
|
||||||
console.dir(err);
|
fs.readFile(page404, function (err, contents) {
|
||||||
|
if (!err) {
|
||||||
|
res.writeHead(404, { "Content-Type": "text/html" });
|
||||||
|
res.end(contents);
|
||||||
|
} else {
|
||||||
|
console.dir(err);
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} else {
|
|
||||||
fs.readFile(page404, function(err, contents) {
|
|
||||||
if (!err) {
|
|
||||||
res.writeHead(404, { "Content-Type": "text/html" });
|
|
||||||
res.end(contents);
|
|
||||||
} else {
|
|
||||||
console.dir(err);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
app.commandLine.appendSwitch("force-color-profile", "srgb");
|
app.commandLine.appendSwitch("force-color-profile", "srgb");
|
||||||
|
|
||||||
// This method will be called when Electron has finished
|
|
||||||
// initialization and is ready to create browser windows.
|
const gotTheLock = app.requestSingleInstanceLock();
|
||||||
// Some APIs can only be used after this event occurs.
|
|
||||||
app.on("ready", createWindow);
|
if (!gotTheLock) {
|
||||||
|
app.quit();
|
||||||
|
} else {
|
||||||
|
app.on('second-instance', (event, commandLine, workingDirectory) => {
|
||||||
|
// Someone tried to run a second instance, we should focus our window.
|
||||||
|
if (win) {
|
||||||
|
if (win.isMinimized()) win.restore()
|
||||||
|
win.focus()
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// This method will be called when Electron has finished
|
||||||
|
// initialization and is ready to create browser windows.
|
||||||
|
// Some APIs can only be used after this event occurs.
|
||||||
|
app.on("ready", createWindow);
|
||||||
|
}
|
||||||
|
|
||||||
// Quit when all windows are closed.
|
// Quit when all windows are closed.
|
||||||
app.on("window-all-closed", () => {
|
app.on("window-all-closed", () => {
|
||||||
// On macOS it is common for applications and their menu bar
|
// On macOS it is common for applications and their menu bar
|
||||||
// to stay active until the user quits explicitly with Cmd + Q
|
// to stay active until the user quits explicitly with Cmd + Q
|
||||||
if (process.platform !== "darwin") {
|
if (process.platform !== "darwin") {
|
||||||
app.quit();
|
app.quit();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
app.on("activate", () => {
|
app.on("activate", () => {
|
||||||
// On macOS it's common to re-create a window in the app when the
|
// On macOS it's common to re-create a window in the app when the
|
||||||
// dock icon is clicked and there are no other windows open.
|
// dock icon is clicked and there are no other windows open.
|
||||||
if (win === null) {
|
if (win === null) {
|
||||||
createWindow();
|
createWindow();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// In this file you can include the rest of your app's specific main process
|
// In this file you can include the rest of your app's specific main process
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue