sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

server-ts: Address requested changes

pull/13/head
Elian Doran 2024-03-30 10:49:40 +07:00
parent 5e5add7e47
commit 3eb7ed5dda
No known key found for this signature in database
11 changed files with 40 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
db/migrations/0220__migrate_images_to_attachments.js
Unescape Escape View File

@ -1,6 +1,6 @@
module.exports = () => { module.exports = () => {
const beccaLoader = require('../../src/becca/becca_loader.js'); const beccaLoader = require('../../src/becca/becca_loader.js');
const becca = require('../../src/becca/becca.js'); const becca = require('../../src/becca/becca');
const cls = require('../../src/services/cls'); const cls = require('../../src/services/cls');
const log = require('../../src/services/log'); const log = require('../../src/services/log');
const sql = require('../../src/services/sql'); const sql = require('../../src/services/sql');
@ -13,7 +13,7 @@ module.exports = () => {
for (const note of Object.values(becca.notes)) { for (const note of Object.values(becca.notes)) {
try { try {
const attachment = note.convertToParentAttachment({autoConversion: true}); const attachment = note.convertToParentAttachment({ autoConversion: true });
if (attachment) { if (attachment) {
log.info(`Auto-converted note '${note.noteId}' into attachment '${attachment.attachmentId}'.`); log.info(`Auto-converted note '${note.noteId}' into attachment '${attachment.attachmentId}'.`);

8
dump-db/inc/dump.js
Unescape Escape View File

@ -1,6 +1,6 @@
const fs = require("fs"); const fs = require("fs");
const sanitize = require("sanitize-filename"); const sanitize = require("sanitize-filename");
const sql = require('./sql'); const sql = require('./sql.js');
const decryptService = require('./decrypt.js'); const decryptService = require('./decrypt.js');
const dataKeyService = require('./data_key.js'); const dataKeyService = require('./data_key.js');
const extensionService = require('./extension.js'); const extensionService = require('./extension.js');
@ -74,7 +74,7 @@ function dumpDocument(documentPath, targetPath, options) {
return; return;
} }
let {content} = sql.getRow("SELECT content FROM blobs WHERE blobId = ?", [noteRow.blobId]); let { content } = sql.getRow("SELECT content FROM blobs WHERE blobId = ?", [noteRow.blobId]);
if (content !== null && noteRow.isProtected && dataKey) { if (content !== null && noteRow.isProtected && dataKey) {
content = decryptService.decrypt(dataKey, content); content = decryptService.decrypt(dataKey, content);
@ -108,7 +108,7 @@ function dumpDocument(documentPath, targetPath, options) {
} }
try { try {
fs.mkdirSync(childTargetPath, {recursive: true}); fs.mkdirSync(childTargetPath, { recursive: true });
} }
catch (e) { catch (e) {
console.error(`DUMPERROR: Creating directory ${childTargetPath} failed with error '${e.message}'`); console.error(`DUMPERROR: Creating directory ${childTargetPath} failed with error '${e.message}'`);
@ -157,7 +157,7 @@ function validatePaths(documentPath, targetPath) {
} }
if (!fs.existsSync(targetPath)) { if (!fs.existsSync(targetPath)) {
const ret = fs.mkdirSync(targetPath, {recursive: true}); const ret = fs.mkdirSync(targetPath, { recursive: true });
if (!ret) { if (!ret) {
console.error(`Target path '${targetPath}' could not be created. Run with --help to see usage.`); console.error(`Target path '${targetPath}' could not be created. Run with --help to see usage.`);

8
package-lock.json generated
Unescape Escape View File

@ -1,19 +1,18 @@
{ {
"name": "trilium", "name": "trilium",
"version": "0.63.3", "version": "0.63.5",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "trilium", "name": "trilium",
"version": "0.63.3", "version": "0.63.5",
"hasInstallScript": true, "hasInstallScript": true,
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
"dependencies": { "dependencies": {
"@braintree/sanitize-url": "6.0.4", "@braintree/sanitize-url": "6.0.4",
"@electron/remote": "2.1.2", "@electron/remote": "2.1.2",
"@excalidraw/excalidraw": "0.17.3", "@excalidraw/excalidraw": "0.17.3",
"@types/cls-hooked": "^4.3.8",
"archiver": "7.0.0", "archiver": "7.0.0",
"async-mutex": "0.4.1", "async-mutex": "0.4.1",
"axios": "1.6.7", "axios": "1.6.7",
@ -90,6 +89,7 @@
}, },
"devDependencies": { "devDependencies": {
"@types/better-sqlite3": "^7.6.9", "@types/better-sqlite3": "^7.6.9",
"@types/cls-hooked": "^4.3.8",
"@types/escape-html": "^1.0.4", "@types/escape-html": "^1.0.4",
"@types/express": "^4.17.21", "@types/express": "^4.17.21",
"@types/ini": "^4.1.0", "@types/ini": "^4.1.0",
@ -1201,6 +1201,7 @@
"version": "4.3.8", "version": "4.3.8",
"resolved": "https://registry.npmjs.org/@types/cls-hooked/-/cls-hooked-4.3.8.tgz", "resolved": "https://registry.npmjs.org/@types/cls-hooked/-/cls-hooked-4.3.8.tgz",
"integrity": "sha512-tf/7H883gFA6MPlWI15EQtfNZ+oPL0gLKkOlx9UHFrun1fC/FkuyNBpTKq1B5E3T4fbvjId6WifHUdSGsMMuPg==", "integrity": "sha512-tf/7H883gFA6MPlWI15EQtfNZ+oPL0gLKkOlx9UHFrun1fC/FkuyNBpTKq1B5E3T4fbvjId6WifHUdSGsMMuPg==",
"dev": true,
"dependencies": { "dependencies": {
"@types/node": "*" "@types/node": "*"
} }
@ -13991,6 +13992,7 @@
"version": "4.3.8", "version": "4.3.8",
"resolved": "https://registry.npmjs.org/@types/cls-hooked/-/cls-hooked-4.3.8.tgz", "resolved": "https://registry.npmjs.org/@types/cls-hooked/-/cls-hooked-4.3.8.tgz",
"integrity": "sha512-tf/7H883gFA6MPlWI15EQtfNZ+oPL0gLKkOlx9UHFrun1fC/FkuyNBpTKq1B5E3T4fbvjId6WifHUdSGsMMuPg==", "integrity": "sha512-tf/7H883gFA6MPlWI15EQtfNZ+oPL0gLKkOlx9UHFrun1fC/FkuyNBpTKq1B5E3T4fbvjId6WifHUdSGsMMuPg==",
"dev": true,
"requires": { "requires": {
"@types/node": "*" "@types/node": "*"
} }

2
package.json
Unescape Escape View File

@ -37,7 +37,6 @@
"@braintree/sanitize-url": "6.0.4", "@braintree/sanitize-url": "6.0.4",
"@electron/remote": "2.1.2", "@electron/remote": "2.1.2",
"@excalidraw/excalidraw": "0.17.3", "@excalidraw/excalidraw": "0.17.3",
"@types/cls-hooked": "^4.3.8",
"archiver": "7.0.0", "archiver": "7.0.0",
"async-mutex": "0.4.1", "async-mutex": "0.4.1",
"axios": "1.6.7", "axios": "1.6.7",
@ -111,6 +110,7 @@
}, },
"devDependencies": { "devDependencies": {
"@types/better-sqlite3": "^7.6.9", "@types/better-sqlite3": "^7.6.9",
"@types/cls-hooked": "^4.3.8",
"@types/escape-html": "^1.0.4", "@types/escape-html": "^1.0.4",
"@types/express": "^4.17.21", "@types/express": "^4.17.21",
"@types/ini": "^4.1.0", "@types/ini": "^4.1.0",

12
src/becca/becca-interface.ts
Unescape Escape View File

@ -11,6 +11,7 @@ import BAttachment = require('./entities/battachment');
import { AttachmentRow, RevisionRow } from './entities/rows'; import { AttachmentRow, RevisionRow } from './entities/rows';
import BBlob = require('./entities/bblob'); import BBlob = require('./entities/bblob');
import BRecentNote = require('./entities/brecent_note'); import BRecentNote = require('./entities/brecent_note');
import AbstractBeccaEntity = require('./entities/abstract_becca_entity');
interface AttachmentOpts { interface AttachmentOpts {
includeContentLength?: boolean; includeContentLength?: boolean;
@ -95,7 +96,7 @@ class Becca {
return this.notes[noteId]; return this.notes[noteId];
} }
getNoteOrThrow(noteId: string): BNote | null { getNoteOrThrow(noteId: string): BNote {
const note = this.notes[noteId]; const note = this.notes[noteId];
if (!note) { if (!note) {
throw new NotFoundError(`Note '${noteId}' doesn't exist.`); throw new NotFoundError(`Note '${noteId}' doesn't exist.`);
@ -190,7 +191,11 @@ class Becca {
.map(row => new BAttachment(row)); .map(row => new BAttachment(row));
} }
getBlob(entity: { blobId: string }): BBlob | null { getBlob(entity: { blobId?: string }): BBlob | null {
if (!entity.blobId) {
return null;
}
const row = sql.getRow("SELECT *, LENGTH(content) AS contentLength FROM blobs WHERE blobId = ?", [entity.blobId]); const row = sql.getRow("SELECT *, LENGTH(content) AS contentLength FROM blobs WHERE blobId = ?", [entity.blobId]);
const BBlob = require('./entities/bblob'); // avoiding circular dependency problems const BBlob = require('./entities/bblob'); // avoiding circular dependency problems
@ -209,8 +214,7 @@ class Becca {
return this.etapiTokens[etapiTokenId]; return this.etapiTokens[etapiTokenId];
} }
/** @returns {AbstractBeccaEntity|null} */ getEntity<T extends AbstractBeccaEntity<T>>(entityName: string, entityId: string): AbstractBeccaEntity<T> | null {
getEntity(entityName: string, entityId: string) {
if (!entityName || !entityId) { if (!entityName || !entityId) {
return null; return null;
} }

8
src/becca/becca_loader.js
Unescape Escape View File

@ -18,7 +18,7 @@ const beccaLoaded = new Promise((res, rej) => {
cls.init(() => { cls.init(() => {
load(); load();
require('../services/options_init').initStartupOptions(); require('../services/options_init.js').initStartupOptions();
res(); res();
}); });
@ -74,7 +74,7 @@ function reload(reason) {
require('../services/ws').reloadFrontend(reason || "becca reloaded"); require('../services/ws').reloadFrontend(reason || "becca reloaded");
} }
eventService.subscribeBeccaLoader([eventService.ENTITY_CHANGE_SYNCED], ({entityName, entityRow}) => { eventService.subscribeBeccaLoader([eventService.ENTITY_CHANGE_SYNCED], ({ entityName, entityRow }) => {
if (!becca.loaded) { if (!becca.loaded) {
return; return;
} }
@ -97,7 +97,7 @@ eventService.subscribeBeccaLoader([eventService.ENTITY_CHANGE_SYNCED], ({entity
postProcessEntityUpdate(entityName, entityRow); postProcessEntityUpdate(entityName, entityRow);
}); });
eventService.subscribeBeccaLoader(eventService.ENTITY_CHANGED, ({entityName, entity}) => { eventService.subscribeBeccaLoader(eventService.ENTITY_CHANGED, ({ entityName, entity }) => {
if (!becca.loaded) { if (!becca.loaded) {
return; return;
} }
@ -124,7 +124,7 @@ function postProcessEntityUpdate(entityName, entityRow) {
} }
} }
eventService.subscribeBeccaLoader([eventService.ENTITY_DELETED, eventService.ENTITY_DELETE_SYNCED], ({entityName, entityId}) => { eventService.subscribeBeccaLoader([eventService.ENTITY_DELETED, eventService.ENTITY_DELETE_SYNCED], ({ entityName, entityId }) => {
if (!becca.loaded) { if (!becca.loaded) {
return; return;
} }

16
src/becca/entities/abstract_becca_entity.ts
Unescape Escape View File

@ -18,6 +18,10 @@ interface ContentOpts {
forceFrontendReload?: boolean; forceFrontendReload?: boolean;
} }
/**
* This interface contains the data that is shared across all the objects of a given derived class of {@link AbstractBeccaEntity}.
* For example, all BAttributes will share their content, but all BBranches will have another set of this data.
*/
interface ConstructorData<T extends AbstractBeccaEntity<T>> { interface ConstructorData<T extends AbstractBeccaEntity<T>> {
primaryKeyName: string; primaryKeyName: string;
entityName: string; entityName: string;
@ -26,6 +30,8 @@ interface ConstructorData<T extends AbstractBeccaEntity<T>> {
/** /**
* Base class for all backend entities. * Base class for all backend entities.
*
* @type T the same entity type needed for self-reference in {@link ConstructorData}.
*/ */
abstract class AbstractBeccaEntity<T extends AbstractBeccaEntity<T>> { abstract class AbstractBeccaEntity<T extends AbstractBeccaEntity<T>> {
@ -33,10 +39,10 @@ abstract class AbstractBeccaEntity<T extends AbstractBeccaEntity<T>> {
protected utcDateModified?: string; protected utcDateModified?: string;
protected dateCreated?: string; protected dateCreated?: string;
protected dateModified?: string; protected dateModified?: string;
protected isProtected?: boolean;
protected isSynced?: boolean;
protected blobId?: string; isProtected?: boolean;
isSynced?: boolean;
blobId?: string;
protected beforeSaving() { protected beforeSaving() {
const constructorData = (this.constructor as unknown as ConstructorData<T>); const constructorData = (this.constructor as unknown as ConstructorData<T>);
@ -45,7 +51,7 @@ abstract class AbstractBeccaEntity<T extends AbstractBeccaEntity<T>> {
} }
} }
protected getUtcDateChanged() { getUtcDateChanged() {
return this.utcDateModified || this.utcDateCreated; return this.utcDateModified || this.utcDateCreated;
} }
@ -69,7 +75,7 @@ abstract class AbstractBeccaEntity<T extends AbstractBeccaEntity<T>> {
}); });
} }
protected generateHash(isDeleted: boolean): string { generateHash(isDeleted?: boolean): string {
const constructorData = (this.constructor as unknown as ConstructorData<T>); const constructorData = (this.constructor as unknown as ConstructorData<T>);
let contentToHash = ""; let contentToHash = "";

2
src/becca/entities/battachment.ts
Unescape Escape View File

@ -131,7 +131,7 @@ class BAttachment extends AbstractBeccaEntity<BAttachment> {
return this._getContent(); return this._getContent();
} }
setContent(content: any, opts: ContentOpts) { setContent(content: string | Buffer, opts: ContentOpts) {
this._setContent(content, opts); this._setContent(content, opts);
} }

2
src/becca/entities/brevision.ts
Unescape Escape View File

@ -115,7 +115,7 @@ class BRevision extends AbstractBeccaEntity<BRevision> {
} }
} }
setContent(content: any, opts: ContentOpts = {}) { setContent(content: string | Buffer, opts: ContentOpts = {}) {
this._setContent(content, opts); this._setContent(content, opts);
} }

2
src/services/blob.ts
Unescape Escape View File

@ -20,7 +20,7 @@ function getBlobPojo(entityName: string, entityId: string) {
if (!entity.hasStringContent()) { if (!entity.hasStringContent()) {
pojo.content = null; pojo.content = null;
} else { } else {
pojo.content = processContent(pojo.content, entity.isProtected, true); pojo.content = processContent(pojo.content, !!entity.isProtected, true);
} }
return pojo; return pojo;

4
tsconfig.json
Unescape Escape View File

@ -3,10 +3,10 @@
"moduleResolution": "Node", "moduleResolution": "Node",
"declaration": false, "declaration": false,
"sourceMap": true, "sourceMap": true,
"outDir": "./build", "outDir": "./dist",
"strict": true, "strict": true,
"noImplicitAny": true, "noImplicitAny": true,
"lib": ["ES2021"] "lib": ["ES2022"]
}, },
"include": [ "include": [
"./src/**/*.js", "./src/**/*.js",