server-ts: Port app* services

This commit is contained in:
Elian Doran
2024-02-17 19:09:36 +02:00
parent a06aa9df8a
commit 9826fed905
17 changed files with 35 additions and 34 deletions

View File

@@ -1,12 +1,12 @@
"use strict";
const path = require('path');
const {ELECTRON_APP_ROOT_DIR} = require('./resource_dir');
const log = require('./log');
const os = require('os');
const fs = require('fs');
const config = require('./config');
const utils = require('./utils');
import path = require('path');
import resourceDir = require('./resource_dir');
import log = require('./log');
import os = require('os');
import fs = require('fs');
import config = require('./config');
import utils = require('./utils');
const template = `[Desktop Entry]
Type=Application
@@ -28,7 +28,7 @@ function installLocalAppIcon() {
return;
}
if (!fs.existsSync(path.resolve(ELECTRON_APP_ROOT_DIR, "trilium-portable.sh"))) {
if (!fs.existsSync(path.resolve(resourceDir.ELECTRON_APP_ROOT_DIR, "trilium-portable.sh"))) {
// simple heuristic to detect ".tar.xz" linux build (i.e., not flatpak, not debian)
// only in such case it's necessary to create an icon
return;
@@ -56,16 +56,16 @@ function installLocalAppIcon() {
function getDesktopFileContent() {
return template
.replace("#APP_ROOT_DIR#", escapePath(ELECTRON_APP_ROOT_DIR))
.replace("#APP_ROOT_DIR#", escapePath(resourceDir.ELECTRON_APP_ROOT_DIR))
.replace("#EXE_PATH#", escapePath(getExePath()));
}
function escapePath(path) {
function escapePath(path: string) {
return path.replace(/ /g, "\\ ");
}
function getExePath() {
return path.resolve(ELECTRON_APP_ROOT_DIR, 'trilium');
return path.resolve(resourceDir.ELECTRON_APP_ROOT_DIR, 'trilium');
}
module.exports = {

View File

@@ -1,8 +1,8 @@
"use strict";
const build = require('./build.js');
const packageJson = require('../../package.json');
const {TRILIUM_DATA_DIR} = require('./data_dir');
import build = require('./build');
import packageJson = require('../../package.json');
import dataDir = require('./data_dir');
const APP_DB_VERSION = 228;
const SYNC_VERSION = 32;
@@ -15,7 +15,7 @@ module.exports = {
syncVersion: SYNC_VERSION,
buildDate: build.buildDate,
buildRevision: build.buildRevision,
dataDirectory: TRILIUM_DATA_DIR,
dataDirectory: dataDir.TRILIUM_DATA_DIR,
clipperProtocolVersion: CLIPPER_PROTOCOL_VERSION,
utcDateTime: new Date().toISOString() // for timezone inference
};

View File

@@ -1,6 +0,0 @@
const assetPath = require('./asset_path.js');
const env = require('./env');
module.exports = env.isDev()
? assetPath + "/app"
: assetPath + "/app-dist";

6
src/services/app_path.ts Normal file
View File

@@ -0,0 +1,6 @@
import assetPath = require('./asset_path');
import env = require('./env');
export = env.isDev()
? assetPath + "/app"
: assetPath + "/app-dist";

View File

@@ -1,3 +0,0 @@
const packageJson = require('../../package.json');
module.exports = `assets/v${packageJson.version}`;

View File

@@ -0,0 +1,3 @@
import packageJson = require('../../package.json');
export = `assets/v${packageJson.version}`;

View File

@@ -1 +0,0 @@
module.exports = { buildDate:"2024-01-21T23:49:23+01:00", buildRevision: "4f8073daa7cff1b8b6737ae45792b2e87c2adf33" };

1
src/services/build.ts Normal file
View File

@@ -0,0 +1 @@
export = { buildDate:"2024-01-21T23:49:23+01:00", buildRevision: "4f8073daa7cff1b8b6737ae45792b2e87c2adf33" };