Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-07-30 03:32:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

#12: Return a method for app.ts

Browse Source
This commit is contained in:
Elian Doran 2024-05-12 10:37:46 +03:00
parent 981fe3a939
commit 168977a52b
No known key found for this signature in database
2 changed files with 58 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/app.ts
View File

@ -7,6 +7,7 @@ import compression = require('compression');
import sessionParser = require('./routes/session_parser'); import sessionParser = require('./routes/session_parser');
import utils = require('./services/utils'); import utils = require('./services/utils');
function buildApp() {
require('./services/handlers'); require('./services/handlers');
require('./becca/becca_loader'); require('./becca/becca_loader');
@ -57,4 +58,7 @@ if (utils.isElectron()) {
require('@electron/remote/main').initialize(); require('@electron/remote/main').initialize();
} }
export = app; return app;
}
export = buildApp;

10
server/src/www.ts
View File

@ -18,7 +18,7 @@ function exit() {
process.on('SIGINT', exit); process.on('SIGINT', exit);
process.on('SIGTERM', exit); process.on('SIGTERM', exit);
import app = require('./app'); import buildApp = require('./app');
import sessionParser = require('./routes/session_parser'); import sessionParser = require('./routes/session_parser');
import fs = require('fs'); import fs = require('fs');
import http = require('http'); import http = require('http');
@ -27,10 +27,10 @@ import config = require('./services/config');
import log = require('./services/log'); import log = require('./services/log');
import appInfo = require('./services/app_info'); import appInfo = require('./services/app_info');
import ws = require('./services/ws'); import ws = require('./services/ws');
import utils = require('./services/utils');
import port = require('./services/port'); import port = require('./services/port');
import host = require('./services/host'); import host = require('./services/host');
import semver = require('semver'); import semver = require('semver');
import type { Express } from "express";
function startTrilium() { function startTrilium() {
if (!semver.satisfies(process.version, ">=10.5.0")) { if (!semver.satisfies(process.version, ">=10.5.0")) {
@ -40,19 +40,21 @@ function startTrilium() {
log.info(JSON.stringify(appInfo, null, 2)); log.info(JSON.stringify(appInfo, null, 2));
const app = buildApp();
const cpuInfos = require('os').cpus(); const cpuInfos = require('os').cpus();
if (cpuInfos && cpuInfos[0] !== undefined) { // https://github.com/zadam/trilium/pull/3957 if (cpuInfos && cpuInfos[0] !== undefined) { // https://github.com/zadam/trilium/pull/3957
log.info(`CPU model: ${cpuInfos[0].model}, logical cores: ${cpuInfos.length} freq: ${cpuInfos[0].speed} Mhz`); // for perf. issues it's good to know the rough configuration log.info(`CPU model: ${cpuInfos[0].model}, logical cores: ${cpuInfos.length} freq: ${cpuInfos[0].speed} Mhz`); // for perf. issues it's good to know the rough configuration
} }
const httpServer = startHttpServer(); const httpServer = startHttpServer(app);
ws.init(httpServer, sessionParser as any); // TODO: Not sure why session parser is incompatible. ws.init(httpServer, sessionParser as any); // TODO: Not sure why session parser is incompatible.
return app; return app;
} }
function startHttpServer() { function startHttpServer(app: Express) {
app.set('port', port); app.set('port', port);
app.set('host', host); app.set('host', host);