From 981221d599b1c29f93b7057ce21e078ec23f4866 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Fri, 16 Feb 2024 21:03:37 +0200 Subject: [PATCH] server-ts: data_dir.js -> data_dir.ts --- docker_healthcheck.js | 2 +- src/routes/api/backend_log.js | 2 +- src/routes/session_parser.js | 2 +- src/services/anonymization.js | 2 +- src/services/app_info.js | 2 +- src/services/backup.js | 2 +- src/services/config.js | 2 +- src/services/{data_dir.js => data_dir.ts} | 8 ++++---- src/services/log.ts | 6 +++--- src/services/port.js | 2 +- src/services/session_secret.js | 2 +- src/services/sql.js | 2 +- src/share/sql.js | 2 +- tsconfig.json | 4 +++- 14 files changed, 21 insertions(+), 19 deletions(-) rename src/services/{data_dir.js => data_dir.ts} (93%) diff --git a/docker_healthcheck.js b/docker_healthcheck.js index f483d7a87..8da764043 100755 --- a/docker_healthcheck.js +++ b/docker_healthcheck.js @@ -1,7 +1,7 @@ const http = require("http"); const ini = require("ini"); const fs = require("fs"); -const dataDir = require('./src/services/data_dir.js'); +const dataDir = require('./src/services/data_dir.ts'); const config = ini.parse(fs.readFileSync(dataDir.CONFIG_INI_PATH, 'utf-8')); if (config.Network.https) { diff --git a/src/routes/api/backend_log.js b/src/routes/api/backend_log.js index 51d0cc6a6..a3d4cc37b 100644 --- a/src/routes/api/backend_log.js +++ b/src/routes/api/backend_log.js @@ -2,7 +2,7 @@ const fs = require('fs'); const dateUtils = require('../../services/date_utils.js'); -const {LOG_DIR} = require('../../services/data_dir.js'); +const {LOG_DIR} = require('../../services/data_dir.ts'); function getBackendLog() { const file = `${LOG_DIR}/trilium-${dateUtils.localNowDate()}.log`; diff --git a/src/routes/session_parser.js b/src/routes/session_parser.js index 404159b62..3ae48e356 100644 --- a/src/routes/session_parser.js +++ b/src/routes/session_parser.js @@ -1,6 +1,6 @@ const session = require("express-session"); const sessionSecret = require('../services/session_secret.js'); -const dataDir = require('../services/data_dir.js'); +const dataDir = require('../services/data_dir.ts'); const FileStore = require('session-file-store')(session); const sessionParser = session({ diff --git a/src/services/anonymization.js b/src/services/anonymization.js index 3beb1c1d6..8e79cd496 100644 --- a/src/services/anonymization.js +++ b/src/services/anonymization.js @@ -1,6 +1,6 @@ const BUILTIN_ATTRIBUTES = require('./builtin_attributes.js'); const fs = require("fs-extra"); -const dataDir = require('./data_dir.js'); +const dataDir = require('./data_dir.ts'); const dateUtils = require('./date_utils.js'); const Database = require("better-sqlite3"); const sql = require('./sql.js'); diff --git a/src/services/app_info.js b/src/services/app_info.js index 1d9d7f965..52f7dea7e 100644 --- a/src/services/app_info.js +++ b/src/services/app_info.js @@ -2,7 +2,7 @@ const build = require('./build.js'); const packageJson = require('../../package.json'); -const {TRILIUM_DATA_DIR} = require('./data_dir.js'); +const {TRILIUM_DATA_DIR} = require('./data_dir.ts'); const APP_DB_VERSION = 228; const SYNC_VERSION = 32; diff --git a/src/services/backup.js b/src/services/backup.js index 4796da0cf..9580bef84 100644 --- a/src/services/backup.js +++ b/src/services/backup.js @@ -3,7 +3,7 @@ const dateUtils = require('./date_utils.js'); const optionService = require('./options.js'); const fs = require('fs-extra'); -const dataDir = require('./data_dir.js'); +const dataDir = require('./data_dir.ts'); const log = require('./log.ts'); const syncMutexService = require('./sync_mutex.js'); const cls = require('./cls.js'); diff --git a/src/services/config.js b/src/services/config.js index 2968f1248..3349be88a 100644 --- a/src/services/config.js +++ b/src/services/config.js @@ -2,7 +2,7 @@ const ini = require('ini'); const fs = require('fs'); -const dataDir = require('./data_dir.js'); +const dataDir = require('./data_dir.ts'); const path = require('path'); const resourceDir = require('./resource_dir.js'); diff --git a/src/services/data_dir.js b/src/services/data_dir.ts similarity index 93% rename from src/services/data_dir.js rename to src/services/data_dir.ts index 7971eabf4..5608b265f 100644 --- a/src/services/data_dir.js +++ b/src/services/data_dir.ts @@ -8,14 +8,14 @@ * - as a fallback if the previous step fails, we'll use home dir */ -const os = require('os'); -const fs = require('fs'); -const path = require('path'); +import os = require('os'); +import fs = require('fs'); +import path = require('path'); function getAppDataDir() { let appDataDir = os.homedir(); // fallback if OS is not recognized - if (os.platform() === 'win32') { + if (os.platform() === 'win32' && process.env.APPDATA) { appDataDir = process.env.APPDATA; } else if (os.platform() === 'linux') { diff --git a/src/services/log.ts b/src/services/log.ts index fc7e95187..a07e27124 100644 --- a/src/services/log.ts +++ b/src/services/log.ts @@ -1,9 +1,9 @@ "use strict"; import { Request, Response } from "express"; -import * as fs from "fs"; -const dataDir = require('./data_dir.js'); -const cls = require('./cls.js'); +import fs = require("fs"); +import dataDir = require('./data_dir.ts'); +import cls = require('./cls.js'); if (!fs.existsSync(dataDir.LOG_DIR)) { fs.mkdirSync(dataDir.LOG_DIR, 0o700); diff --git a/src/services/port.js b/src/services/port.js index 938eb3324..2ad054e14 100644 --- a/src/services/port.js +++ b/src/services/port.js @@ -1,7 +1,7 @@ const config = require('./config.js'); const utils = require('./utils.js'); const env = require('./env.js'); -const dataDir = require('./data_dir.js'); +const dataDir = require('./data_dir.ts'); function parseAndValidate(portStr, source) { const portNum = parseInt(portStr); diff --git a/src/services/session_secret.js b/src/services/session_secret.js index 009fae565..711255ab1 100644 --- a/src/services/session_secret.js +++ b/src/services/session_secret.js @@ -2,7 +2,7 @@ const fs = require('fs'); const crypto = require('crypto'); -const dataDir = require('./data_dir.js'); +const dataDir = require('./data_dir.ts'); const log = require('./log.ts'); const sessionSecretPath = `${dataDir.TRILIUM_DATA_DIR}/session_secret.txt`; diff --git a/src/services/sql.js b/src/services/sql.js index 171030d6f..53d7d8d45 100644 --- a/src/services/sql.js +++ b/src/services/sql.js @@ -6,7 +6,7 @@ const log = require('./log.ts'); const Database = require('better-sqlite3'); -const dataDir = require('./data_dir.js'); +const dataDir = require('./data_dir.ts'); const cls = require('./cls.js'); const fs = require("fs-extra"); diff --git a/src/share/sql.js b/src/share/sql.js index 07dd2fd85..1dab6d555 100644 --- a/src/share/sql.js +++ b/src/share/sql.js @@ -1,7 +1,7 @@ "use strict"; const Database = require('better-sqlite3'); -const dataDir = require('../services/data_dir.js'); +const dataDir = require('../services/data_dir.ts'); const dbConnection = new Database(dataDir.DOCUMENT_PATH, { readonly: true }); diff --git a/tsconfig.json b/tsconfig.json index aa6994550..07cb010e9 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,7 +4,9 @@ "declaration": true, "sourceMap": true, "outDir": "./build", - "strict": true + "strict": true, + "allowImportingTsExtensions": true, + "noImplicitAny": true }, "include": [ "./src/**/*.js",