fix: dest.end is not a function (#501)

This commit is contained in:
Louis 2023-10-31 15:21:18 +07:00 committed by GitHub
parent f35c97b6c3
commit 1efe2cbd1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 12 deletions

View File

@ -19,7 +19,7 @@ const progress = require("request-progress");
const { autoUpdater } = require("electron-updater"); const { autoUpdater } = require("electron-updater");
const Store = require("electron-store"); const Store = require("electron-store");
const requiredModules: Record<string, any> = {}; let requiredModules: Record<string, any> = {};
let mainWindow: BrowserWindow | undefined = undefined; let mainWindow: BrowserWindow | undefined = undefined;
app app
@ -39,12 +39,12 @@ app
}); });
app.on("window-all-closed", () => { app.on("window-all-closed", () => {
dispose(requiredModules); clearImportedModules();
app.quit(); app.quit();
}); });
app.on("quit", () => { app.on("quit", () => {
dispose(requiredModules); clearImportedModules();
app.quit(); app.quit();
}); });
@ -226,7 +226,7 @@ function handleIPCs() {
* @param url - The URL to reload. * @param url - The URL to reload.
*/ */
ipcMain.handle("relaunch", async (_event, url) => { ipcMain.handle("relaunch", async (_event, url) => {
dispose(requiredModules); clearImportedModules();
if (app.isPackaged) { if (app.isPackaged) {
app.relaunch(); app.relaunch();
@ -255,7 +255,7 @@ function handleIPCs() {
rmdir(fullPath, { recursive: true }, function (err) { rmdir(fullPath, { recursive: true }, function (err) {
if (err) console.log(err); if (err) console.log(err);
dispose(requiredModules); clearImportedModules();
// just relaunch if packaged, should launch manually in development mode // just relaunch if packaged, should launch manually in development mode
if (app.isPackaged) { if (app.isPackaged) {
@ -394,3 +394,8 @@ function setupPlugins() {
pluginsPath: join(app.getPath("userData"), "plugins"), pluginsPath: join(app.getPath("userData"), "plugins"),
}); });
} }
function clearImportedModules() {
dispose(requiredModules);
requiredModules = {};
}

View File

@ -3,7 +3,7 @@ const { app } = require("electron");
const { spawn } = require("child_process"); const { spawn } = require("child_process");
const fs = require("fs"); const fs = require("fs");
const tcpPortUsed = require("tcp-port-used"); const tcpPortUsed = require("tcp-port-used");
const { killPortProcess } = require("kill-port-process"); const kill = require("kill-port");
const PORT = 3928; const PORT = 3928;
let subprocess = null; let subprocess = null;
@ -99,7 +99,7 @@ function killSubprocess() {
subprocess = null; subprocess = null;
console.log("Subprocess terminated."); console.log("Subprocess terminated.");
} else { } else {
killPortProcess(PORT); kill(PORT, "tcp").then(console.log).catch(console.log);
console.error("No subprocess is currently running."); console.error("No subprocess is currently running.");
} }
} }

View File

@ -29,15 +29,11 @@
}, },
"dependencies": { "dependencies": {
"@janhq/core": "^0.1.6", "@janhq/core": "^0.1.6",
"kill-port-process": "^3.2.0", "kill-port": "^2.0.1",
"rxjs": "^7.8.1", "rxjs": "^7.8.1",
"tcp-port-used": "^1.0.2", "tcp-port-used": "^1.0.2",
"ts-loader": "^9.5.0" "ts-loader": "^9.5.0"
}, },
"bundledDependencies": [
"tcp-port-used",
"kill-port-process"
],
"engines": { "engines": {
"node": ">=18.0.0" "node": ">=18.0.0"
}, },
@ -45,5 +41,9 @@
"dist/*", "dist/*",
"package.json", "package.json",
"README.md" "README.md"
],
"bundleDependencies": [
"tcp-port-used",
"kill-port"
] ]
} }

View File

@ -30,5 +30,8 @@ module.exports = {
resolve: { resolve: {
extensions: [".ts", ".js"], extensions: [".ts", ".js"],
}, },
optimization: {
minimize: false,
},
// Add loaders and other configuration as needed for your project // Add loaders and other configuration as needed for your project
}; };

View File

@ -29,5 +29,8 @@ module.exports = {
resolve: { resolve: {
extensions: [".ts", ".js"], extensions: [".ts", ".js"],
}, },
optimization: {
minimize: false,
},
// Add loaders and other configuration as needed for your project // Add loaders and other configuration as needed for your project
}; };