Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-07-27 18:12:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(edit-demo): get it to actually start

Browse Source
This commit is contained in:
Elian Doran 2025-05-27 18:32:00 +03:00
parent 76bc3d858c
commit 7cb4cc8469
No known key found for this signature in database
3 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/edit-docs/src/edit-demo.ts
View File

@ -7,11 +7,14 @@ import { join } from "path";
const DEMO_ZIP_PATH = join(__dirname, "../../server/src/assets/db/demo.zip"); const DEMO_ZIP_PATH = join(__dirname, "../../server/src/assets/db/demo.zip");
async function main() { async function main() {
const initializedPromise = startElectron(() => {
// Wait for the import to be finished and the application to be loaded before we listen to changes.
setTimeout(() => registerHandlers(), 10_000);
});
await initializeTranslations(); await initializeTranslations();
await initializeDatabase(false); await initializeDatabase(false);
initializedPromise.resolve();
await startElectron();
await registerHandlers();
} }
async function registerHandlers() { async function registerHandlers() {

18
apps/edit-docs/src/edit-docs.ts
View File

@ -6,16 +6,13 @@ import { initializeTranslations } from "@triliumnext/server/src/services/i18n.js
import archiver, { type Archiver } from "archiver"; import archiver, { type Archiver } from "archiver";
import type { WriteStream } from "fs"; import type { WriteStream } from "fs";
import debounce from "@triliumnext/client/src/services/debounce.js"; import debounce from "@triliumnext/client/src/services/debounce.js";
import { extractZip, initializeDatabase } from "./utils.js"; import { extractZip, initializeDatabase, startElectron } from "./utils.js";
import cls from "@triliumnext/server/src/services/cls.js"; import cls from "@triliumnext/server/src/services/cls.js";
import type { AdvancedExportOptions } from "@triliumnext/server/src/services/export/zip.js"; import type { AdvancedExportOptions } from "@triliumnext/server/src/services/export/zip.js";
import TaskContext from "@triliumnext/server/src/services/task_context.js"; import TaskContext from "@triliumnext/server/src/services/task_context.js";
import { deferred } from "@triliumnext/server/src/services/utils.js";
import { parseNoteMetaFile } from "@triliumnext/server/src/services/in_app_help.js"; import { parseNoteMetaFile } from "@triliumnext/server/src/services/in_app_help.js";
import { resolve } from "path"; import { resolve } from "path";
import type NoteMeta from "@triliumnext/server/src/services/meta/note_meta.js"; import type NoteMeta from "@triliumnext/server/src/services/meta/note_meta.js";
import electron from "electron";
import windowService from "@triliumnext/server/src/services/window.js";
interface NoteMapping { interface NoteMapping {
rootNoteId: string; rootNoteId: string;
@ -56,18 +53,7 @@ const NOTE_MAPPINGS: NoteMapping[] = [
]; ];
async function main() { async function main() {
const initializedPromise = deferred<void>(); const initializedPromise = startElectron(() => {
electron.app.on("ready", async () => {
await initializedPromise;
console.log("Electron is ready!");
// Start the server.
await import("@triliumnext/server/src/main.js");
// Create the main window.
await windowService.createMainWindow(electron.app);
// Wait for the import to be finished and the application to be loaded before we listen to changes. // Wait for the import to be finished and the application to be loaded before we listen to changes.
setTimeout(() => registerHandlers(), 10_000); setTimeout(() => registerHandlers(), 10_000);
}); });

29
apps/edit-docs/src/utils.ts
View File

@ -2,6 +2,9 @@ import cls from "@triliumnext/server/src/services/cls.js";
import fs from "fs/promises"; import fs from "fs/promises";
import fsExtra from "fs-extra"; import fsExtra from "fs-extra";
import path from "path"; import path from "path";
import electron from "electron";
import { deferred, type DeferredPromise } from "@triliumnext/server/src/services/utils.js";
import windowService from "@triliumnext/server/src/services/window.js";
export function initializeDatabase(skipDemoDb: boolean) { export function initializeDatabase(skipDemoDb: boolean) {
return new Promise<void>(async (resolve) => { return new Promise<void>(async (resolve) => {
@ -15,8 +18,30 @@ export function initializeDatabase(skipDemoDb: boolean) {
}); });
} }
export async function startElectron() { /**
await import("@triliumnext/desktop/src/electron-main.js"); * Electron has a behaviour in which the "ready" event must have a listener attached before it gets to initialize.
* If async tasks are awaited before the "ready" event is bound, then the window will never shown.
* This method works around by creating a deferred promise. It will immediately bind to the "ready" event and wait for that promise to be resolved externally.
*
* @param callback a method to be called after the server and Electron is initialized.
* @returns the deferred promise that must be resolved externally before the Electron app is started.
*/
export function startElectron(callback: () => void): DeferredPromise<void> {
const initializedPromise = deferred<void>();
electron.app.on("ready", async () => {
await initializedPromise;
console.log("Electron is ready!");
// Start the server.
await import("@triliumnext/server/src/main.js");
// Create the main window.
await windowService.createMainWindow(electron.app);
callback();
});
return initializedPromise;
} }
export async function extractZip(zipFilePath: string, outputPath: string, ignoredFiles?: Set<string>) { export async function extractZip(zipFilePath: string, outputPath: string, ignoredFiles?: Set<string>) {