Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2026-05-07 16:07:04 +02:00
Code Issues Packages Projects Releases Activity

chore(core): integrate scripting routes

Browse Source
This commit is contained in:
Elian Doran
2026-03-28 12:57:53 +02:00
parent b02e9ba52b
commit 3bd6777070
3 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/server/src/routes/routes.ts
View File

@@ -28,7 +28,6 @@ import loginApiRoute from "./api/login.js";
import metricsRoute from "./api/metrics.js";
import passwordApiRoute from "./api/password.js";
import recoveryCodes from './api/recovery_codes.js';
import scriptRoute from "./api/script.js";
import senderRoute from "./api/sender.js";
import systemInfoRoute from "./api/system_info.js";
import totp from './api/totp.js';
@@ -177,14 +176,6 @@ function register(app: express.Application) {
apiRoute(GET, "/api/database/check-integrity", databaseRoute.checkIntegrity);
asyncRoute(PST, "/api/script/exec", [auth.checkApiAuth, csrfMiddleware], scriptRoute.exec, apiResultHandler);
apiRoute(PST, "/api/script/run/:noteId", scriptRoute.run);
apiRoute(GET, "/api/script/startup", scriptRoute.getStartupBundles);
apiRoute(GET, "/api/script/widgets", scriptRoute.getWidgetBundles);
apiRoute(PST, "/api/script/bundle/:noteId", scriptRoute.getBundle);
apiRoute(GET, "/api/script/relation/:noteId/:relationName", scriptRoute.getRelationBundles);
// no CSRF since this is called from android app
route(PST, "/api/sender/login", [loginRateLimiter], loginApiRoute.token, apiResultHandler);
asyncRoute(PST, "/api/sender/image", [auth.checkEtapiToken, uploadMiddlewareWithErrorHandling], senderRoute.uploadImage, apiResultHandler);

18
apps/server/src/routes/api/script.ts → packages/trilium-core/src/routes/api/script.ts
View File

@@ -5,9 +5,9 @@ import type { Request } from "express";
import becca from "../../becca/becca.js";
import attributeService from "../../services/attributes.js";
import scriptService, { type Bundle } from "../../services/script.js";
import sql from "../../services/sql.js";
import syncService from "../../services/sync.js";
import { safeExtractMessageAndStackFromError } from "../../services/utils.js";
import { safeExtractMessageAndStackFromError } from "../../services/utils/index.js";
import { getSql } from "../../services/sql/index.js";
interface ScriptBody {
script: string;
@@ -28,7 +28,7 @@ async function exec(req: Request) {
const execute = (body: ScriptBody) => scriptService.executeScript(body.script, body.params, body.startNoteId, body.currentNoteId, body.originEntityName, body.originEntityId);
const result = body.transactional ? sql.transactional(() => execute(body)) : await execute(body);
const result = body.transactional ? getSql().transactional(() => execute(body)) : await execute(body);
return {
success: true,
@@ -72,20 +72,20 @@ function getStartupBundles(req: Request) {
if (!process.env.TRILIUM_SAFE_MODE) {
if (req.query.mobile === "true") {
return getBundlesWithLabel("run", "mobileStartup");
}
}
return getBundlesWithLabel("run", "frontendStartup");
}
}
return [];
}
function getWidgetBundles() {
if (!process.env.TRILIUM_SAFE_MODE) {
return getBundlesWithLabel("widget");
}
}
return [];
}
function getRelationBundles(req: Request<{ noteId: string, relationName: string }>) {

11
packages/trilium-core/src/routes/index.ts
View File

@@ -27,6 +27,7 @@ import setupApiRoute from "./api/setup";
import filesRoute from "./api/files";
import importRoute from "./api/import";
import exportRoute from "./api/export";
import scriptRoute from "./api/script";
// TODO: Deduplicate with routes.ts
const GET = "get",
@@ -217,6 +218,16 @@ export function buildSharedApiRoutes({ route, asyncRoute, apiRoute, asyncApiRout
// this "hacky" path is used for easier referencing of CSS resources
route(GET, "/api/attachments/download/:attachmentId", [checkApiAuthOrElectron], filesRoute.downloadAttachment);
//#endregion
//#region Export
asyncRoute(PST, "/api/script/exec", [checkApiAuth, csrfMiddleware], scriptRoute.exec, apiResultHandler);
apiRoute(PST, "/api/script/run/:noteId", scriptRoute.run);
apiRoute(GET, "/api/script/startup", scriptRoute.getStartupBundles);
apiRoute(GET, "/api/script/widgets", scriptRoute.getWidgetBundles);
apiRoute(PST, "/api/script/bundle/:noteId", scriptRoute.getBundle);
apiRoute(GET, "/api/script/relation/:noteId/:relationName", scriptRoute.getRelationBundles);
//#endregion
}
/** Handling common patterns. If entity is not caught, serialization to JSON will fail */