mirror of
https://github.com/tobspr/shapez.io.git
synced 2025-12-13 18:21:51 +00:00
Modify Electron wrapper
Minimal set of changes, not a refactor yet. Make shapez store all of its data in a single directory whose path is provided by Electron APIs. Useless checks and web preferences are removed and app.isPackaged is used to detect whether the app should try to load a localhost URL.
This commit is contained in:
parent
7bc48c1f28
commit
a2e192f610
@ -10,27 +10,17 @@ const windowStateKeeper = require("electron-window-state");
|
|||||||
app.commandLine.appendSwitch("disable-features", "HardwareMediaKeyHandling");
|
app.commandLine.appendSwitch("disable-features", "HardwareMediaKeyHandling");
|
||||||
|
|
||||||
const isDev = app.commandLine.hasSwitch("dev");
|
const isDev = app.commandLine.hasSwitch("dev");
|
||||||
const isLocal = app.commandLine.hasSwitch("local");
|
|
||||||
const safeMode = app.commandLine.hasSwitch("safe-mode");
|
const safeMode = app.commandLine.hasSwitch("safe-mode");
|
||||||
const externalMod = app.commandLine.getSwitchValue("load-mod");
|
const externalMod = app.commandLine.getSwitchValue("load-mod");
|
||||||
|
|
||||||
const roamingFolder =
|
app.setName("shapez-ce");
|
||||||
process.env.APPDATA ||
|
const userData = app.getPath("userData");
|
||||||
(process.platform == "darwin"
|
|
||||||
? process.env.HOME + "/Library/Preferences"
|
|
||||||
: process.env.HOME + "/.local/share");
|
|
||||||
|
|
||||||
let storePath = path.join(roamingFolder, "shapez.io", "saves");
|
const storePath = path.join(userData, "saves");
|
||||||
let modsPath = path.join(roamingFolder, "shapez.io", "mods");
|
const modsPath = path.join(userData, "mods");
|
||||||
|
|
||||||
if (!fs.existsSync(storePath)) {
|
fs.mkdirSync(storePath, { recursive: true });
|
||||||
// No try-catch by design
|
fs.mkdirSync(modsPath, { recursive: true });
|
||||||
fs.mkdirSync(storePath, { recursive: true });
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!fs.existsSync(modsPath)) {
|
|
||||||
fs.mkdirSync(modsPath, { recursive: true });
|
|
||||||
}
|
|
||||||
|
|
||||||
/** @type {BrowserWindow} */
|
/** @type {BrowserWindow} */
|
||||||
let win = null;
|
let win = null;
|
||||||
@ -63,24 +53,14 @@ function createWindow() {
|
|||||||
// fullscreen: true,
|
// fullscreen: true,
|
||||||
autoHideMenuBar: !isDev,
|
autoHideMenuBar: !isDev,
|
||||||
webPreferences: {
|
webPreferences: {
|
||||||
nodeIntegration: false,
|
|
||||||
nodeIntegrationInWorker: false,
|
|
||||||
nodeIntegrationInSubFrames: false,
|
|
||||||
contextIsolation: true,
|
|
||||||
enableRemoteModule: false,
|
|
||||||
disableBlinkFeatures: "Auxclick",
|
disableBlinkFeatures: "Auxclick",
|
||||||
|
|
||||||
webSecurity: true,
|
|
||||||
sandbox: true,
|
|
||||||
preload: path.join(__dirname, "preload.js"),
|
preload: path.join(__dirname, "preload.js"),
|
||||||
experimentalFeatures: false,
|
|
||||||
},
|
},
|
||||||
allowRunningInsecureContent: false,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
mainWindowState.manage(win);
|
mainWindowState.manage(win);
|
||||||
|
|
||||||
if (isLocal) {
|
if (!app.isPackaged) {
|
||||||
win.loadURL("http://localhost:3005");
|
win.loadURL("http://localhost:3005");
|
||||||
} else {
|
} else {
|
||||||
win.loadURL(
|
win.loadURL(
|
||||||
@ -123,30 +103,6 @@ function createWindow() {
|
|||||||
contentsEvent.preventDefault();
|
contentsEvent.preventDefault();
|
||||||
});
|
});
|
||||||
|
|
||||||
// Filter loading any module via remote;
|
|
||||||
// you shouldn't be using remote at all, though
|
|
||||||
// https://electronjs.org/docs/tutorial/security#16-filter-the-remote-module
|
|
||||||
app.on("remote-require", (event, webContents, moduleName) => {
|
|
||||||
event.preventDefault();
|
|
||||||
});
|
|
||||||
|
|
||||||
// built-ins are modules such as "app"
|
|
||||||
app.on("remote-get-builtin", (event, webContents, moduleName) => {
|
|
||||||
event.preventDefault();
|
|
||||||
});
|
|
||||||
|
|
||||||
app.on("remote-get-global", (event, webContents, globalName) => {
|
|
||||||
event.preventDefault();
|
|
||||||
});
|
|
||||||
|
|
||||||
app.on("remote-get-current-window", (event, webContents) => {
|
|
||||||
event.preventDefault();
|
|
||||||
});
|
|
||||||
|
|
||||||
app.on("remote-get-current-web-contents", (event, webContents) => {
|
|
||||||
event.preventDefault();
|
|
||||||
});
|
|
||||||
|
|
||||||
//// END SECURITY
|
//// END SECURITY
|
||||||
|
|
||||||
win.webContents.on("will-navigate", (event, pth) => {
|
win.webContents.on("will-navigate", (event, pth) => {
|
||||||
@ -313,7 +269,7 @@ async function writeFileSafe(filename, contents) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ipcMain.handle("fs-job", async (event, job) => {
|
ipcMain.handle("fs-job", async (event, job) => {
|
||||||
const filenameSafe = job.filename.replace(/[^a-z\.\-_0-9]/gi, "_");
|
const filenameSafe = job.filename.replace(/[^a-z.\-_0-9]/gi, "_");
|
||||||
const fname = path.join(storePath, filenameSafe);
|
const fname = path.join(storePath, filenameSafe);
|
||||||
switch (job.type) {
|
switch (job.type) {
|
||||||
case "read": {
|
case "read": {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user