Skip to content

TagSpaces is an offline, open source, document manager with tagging support

TSN849 - Utilize find free port lib for the WS (#1919)

Stanimirf8b68c992cbc
diff --git a/app/containers/RendererListener.ts b/app/containers/RendererListener.ts
index 19b3f5938..15dd356c1 100644
--- a/app/containers/RendererListener.ts
+++ b/app/containers/RendererListener.ts
@@ -17,6 +17,7 @@
*/
import AppConfig from '-/AppConfig';
+import settings from '-/settings';
export default function listen(props) {
let ipcRenderer;
@@ -137,6 +138,12 @@ export default function listen(props) {
//console.debug('extensions', extensions);
//console.debug('supportedFileTypes', supportedFileTypes);
});
+
+ ipcRenderer.on('start_ws', (event, arg) => {
+ const { port } = arg;
+ console.debug('RendererListener start_ws port:' + port);
+ settings.setUsedWsPort(port);
+ });
}
return ipcRenderer;
}
diff --git a/app/main.dev.ts b/app/main.dev.ts
index 78735cd17..28f62936c 100644
--- a/app/main.dev.ts
+++ b/app/main.dev.ts
@@ -28,11 +28,12 @@ import windowStateKeeper from 'electron-window-state';
import path from 'path';
import fs from 'fs-extra';
import pm2 from '@elife/pm2';
+import fp from 'find-free-port';
import propertiesReader from 'properties-reader';
import i18n from '-/services/i18n'; // '-/i18nBackend';
import buildTrayIconMenu from '-/electron-tray-menu';
import buildDesktopMenu from '-/services/electron-menus';
-import Settings from '-/settings';
+import settings from '-/settings';
import { getExtensions } from '-/utils/extension-utils';
// delete process.env.ELECTRON_ENABLE_SECURITY_WARNINGS;
@@ -40,6 +41,7 @@ import { getExtensions } from '-/utils/extension-utils';
const isMac = process.platform === 'darwin';
let mainWindow = null;
+let usedWsPort = undefined;
// (global as any).splashWorkerWindow = null;
const testMode = process.env.NODE_ENV === 'test';
@@ -420,29 +422,41 @@ async function startWS() {
const properties = propertiesReader(envPath);
const results = await new Promise((resolve, reject) => {
- pm2.start(
- {
- name: 'Tagspaces WS',
- script, // Script to be run
- cwd: filepath, // './node_modules/tagspaces-ws', // './process1', cwd: '/path/to/npm/module/',
- args: ['-p', Settings.wsPort, '-k', properties.get('KEY')],
- restartAt: []
- // log: path.join(process.cwd(), 'thumbGen.log')
- },
- (err, pid) => {
- if (err && pid) {
- if (pid && pid.name) console.error(pid.name, err, pid);
- else console.error(err, pid);
- reject(err);
- } else if (err) {
- reject(err);
- } else {
- resolve(
- `Starting ${pid.name} on ${pid.cwd} - pid (${pid.child.pid})`
- );
- }
+ fp(settings.getInitWsPort(), '127.0.0.1', function(err, freePort) {
+ if (err) {
+ reject(err);
+ } else {
+ pm2.start(
+ {
+ name: 'Tagspaces WS',
+ script, // Script to be run
+ cwd: filepath, // './node_modules/tagspaces-ws', // './process1', cwd: '/path/to/npm/module/',
+ args: ['-p', freePort, '-k', properties.get('KEY')],
+ restartAt: []
+ // log: path.join(process.cwd(), 'thumbGen.log')
+ },
+ (err, pid) => {
+ if (err && pid) {
+ if (pid && pid.name) console.error(pid.name, err, pid);
+ else console.error(err, pid);
+ reject(err);
+ } else if (err) {
+ reject(err);
+ } else {
+ usedWsPort = freePort;
+ if (mainWindow) {
+ mainWindow.webContents.send('start_ws', {
+ port: freePort
+ });
+ }
+ resolve(
+ `Starting ${pid.name} on ${pid.cwd} - pid (${pid.child.pid})`
+ );
+ }
+ }
+ );
}
- );
+ });
});
console.debug(results);
} catch (ex) {
@@ -493,6 +507,10 @@ async function createAppWindow() {
mainWindow.setAutoHideMenuBar(true);
mainWindowState.manage(mainWindow);
+ mainWindow.webContents.send('start_ws', {
+ port: usedWsPort
+ });
+
mainWindow.webContents.on('did-finish-load', () => {
if (!mainWindow) {
throw new Error('"mainWindow" is not defined');
diff --git a/app/package.json b/app/package.json
index 6b5b1bad5..4802029e8 100644
--- a/app/package.json
+++ b/app/package.json
@@ -16,7 +16,7 @@
"@tagspaces/extensions": "1.0.84"
},
"nodeDependencies": {
- "@tagspaces/tagspaces-ws": "2.1.30",
+ "@tagspaces/tagspaces-ws": "2.1.31",
"@tagspaces/extensions": "1.0.84",
"sharp": "0.31.3"
}
diff --git a/app/services/platform-facade.ts b/app/services/platform-facade.ts
index e9742178d..639817ccb 100644
--- a/app/services/platform-facade.ts
+++ b/app/services/platform-facade.ts
@@ -81,6 +81,7 @@ import {
import AppConfig from '-/AppConfig';
import { Pro } from '../pro';
import { TS } from '-/tagspaces.namespace';
+import settings from '-/settings';
let token: string;
@@ -161,7 +162,7 @@ export default class PlatformFacade {
try {
// eslint-disable-next-line global-require
const config = require('-/config/config.json');
- if (platformIsWorkerAvailable()) {
+ if (platformIsWorkerAvailable(settings.getUsedWsPort())) {
token = config.jwt;
}
} catch (e) {
@@ -197,7 +198,8 @@ export default class PlatformFacade {
token,
directoryPath,
extractText,
- ignorePatterns
+ ignorePatterns,
+ settings.getUsedWsPort()
);
};
@@ -207,7 +209,11 @@ export default class PlatformFacade {
if (!PlatformFacade.isWorkerAvailable()) {
return Promise.reject(new Error('no Worker Available!'));
}
- return platformCreateThumbnailsInWorker(token, tmbGenerationList);
+ return platformCreateThumbnailsInWorker(
+ token,
+ tmbGenerationList,
+ settings.getUsedWsPort()
+ );
};
/**
diff --git a/app/settings.ts b/app/settings.ts
index 6ad88689e..fbf4a9792 100644
--- a/app/settings.ts
+++ b/app/settings.ts
@@ -15,8 +15,21 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/
-const Settings = {
- wsPort: 49352 // 14385
-};
+class SettingsSingleton {
+ private usedWsPort?: number;
-export default Settings;
+ getInitWsPort(): number {
+ return 49352;
+ }
+
+ getUsedWsPort(): number | undefined {
+ return this.usedWsPort;
+ }
+
+ setUsedWsPort(port: number): void {
+ this.usedWsPort = port;
+ }
+}
+
+const settings = new SettingsSingleton();
+export default settings;
diff --git a/package-lock.json b/package-lock.json
index 5b58e93f3..67088395f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,7 +7,6 @@
"": {
"name": "tagspaces",
"version": "0.0.0",
- "hasInstallScript": true,
"license": "AGPL-3.0",
"dependencies": {
"@aws-amplify/ui-react": "^1.2.26",
@@ -22,7 +21,7 @@
"@mui/styles": "5.10.15",
"@mui/x-date-pickers": "^5.0.8",
"@tagspaces/tagspaces-md": "2.1.6",
- "@tagspaces/tagspaces-platforms": "2.1.30",
+ "@tagspaces/tagspaces-platforms": "2.1.31",
"aws-amplify": "^4.3.8",
"aws-sdk": "^2.1036.0",
"babel-polyfill": "^6.26.0",
@@ -38,6 +37,7 @@
"electron-window-state": "^5.0.3",
"exif-js": "^2.3.0",
"file-saver": "^2.0.5",
+ "find-free-port": "^2.0.0",
"fs-extra": "^10.0.0",
"fscreen": "^1.2.0",
"fuse.js": "^6.4.6",
@@ -13794,9 +13794,9 @@
}
},
"node_modules/@tagspaces/tagspaces-platforms": {
- "version": "2.1.30",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-platforms/-/tagspaces-platforms-2.1.30.tgz",
- "integrity": "sha512-zKf0TV07c6wqa9bPW2ZnXm8g7t5u1fC7olxOgSCT4LEYJBf/lzC9rB4SuqAgFXmG2GurQkNzO57kl52Z9N47eg==",
+ "version": "2.1.31",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-platforms/-/tagspaces-platforms-2.1.31.tgz",
+ "integrity": "sha512-2KSRlBGqKc47E3t/vcfJkc4hwLe8A7jBARzwVzL/50HV1hwoIliipKL9E72jTgqutIjuFCtEhsHImn+a9lKmtA==",
"hasInstallScript": true
},
"node_modules/@testim/chrome-version": {
@@ -23604,6 +23604,11 @@
"node": ">=6"
}
},
+ "node_modules/find-free-port": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/find-free-port/-/find-free-port-2.0.0.tgz",
+ "integrity": "sha512-J1j8gfEVf5FN4PR5w5wrZZ7NYs2IvqsHcd03cAeQx3Ec/mo+lKceaVNhpsRKoZpZKbId88o8qh+dwUwzBV6WCg=="
+ },
"node_modules/find-root": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
@@ -59658,9 +59663,9 @@
}
},
"@tagspaces/tagspaces-platforms": {
- "version": "2.1.30",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-platforms/-/tagspaces-platforms-2.1.30.tgz",
- "integrity": "sha512-zKf0TV07c6wqa9bPW2ZnXm8g7t5u1fC7olxOgSCT4LEYJBf/lzC9rB4SuqAgFXmG2GurQkNzO57kl52Z9N47eg=="
+ "version": "2.1.31",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-platforms/-/tagspaces-platforms-2.1.31.tgz",
+ "integrity": "sha512-2KSRlBGqKc47E3t/vcfJkc4hwLe8A7jBARzwVzL/50HV1hwoIliipKL9E72jTgqutIjuFCtEhsHImn+a9lKmtA=="
},
"@testim/chrome-version": {
"version": "1.1.3",
@@ -67445,6 +67450,11 @@
"pkg-dir": "^3.0.0"
}
},
+ "find-free-port": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/find-free-port/-/find-free-port-2.0.0.tgz",
+ "integrity": "sha512-J1j8gfEVf5FN4PR5w5wrZZ7NYs2IvqsHcd03cAeQx3Ec/mo+lKceaVNhpsRKoZpZKbId88o8qh+dwUwzBV6WCg=="
+ },
"find-root": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
diff --git a/package.json b/package.json
index a5ee8dae3..d639f5d3b 100644
--- a/package.json
+++ b/package.json
@@ -161,7 +161,7 @@
"@mui/styles": "5.10.15",
"@mui/x-date-pickers": "^5.0.8",
"@tagspaces/tagspaces-md": "2.1.6",
- "@tagspaces/tagspaces-platforms": "2.1.30",
+ "@tagspaces/tagspaces-platforms": "2.1.31",
"aws-amplify": "^4.3.8",
"aws-sdk": "^2.1036.0",
"babel-polyfill": "^6.26.0",
@@ -177,6 +177,7 @@
"electron-window-state": "^5.0.3",
"exif-js": "^2.3.0",
"file-saver": "^2.0.5",
+ "find-free-port": "^2.0.0",
"fs-extra": "^10.0.0",
"fscreen": "^1.2.0",
"fuse.js": "^6.4.6",