refactor(server): integrate entity types changes into commons

apps/server/src/routes/api/sync.ts

@@ -12,11 +12,10 @@ import syncOptions from "../../services/sync_options.js";
 import utils, { safeExtractMessageAndStackFromError } from "../../services/utils.js";
 import ws from "../../services/ws.js";
 import type { Request } from "express";
-import type { EntityChange } from "../../services/entity_changes_interface.js";
 import ValidationError from "../../errors/validation_error.js";
 import consistencyChecksService from "../../services/consistency_checks.js";
 import { t } from "i18next";
-import { SyncTestResponse } from "@triliumnext/commons";
+import { SyncTestResponse, type EntityChange } from "@triliumnext/commons";
 
 async function testSync(): Promise<SyncTestResponse> {
     try {

apps/server/src/services/cls.ts

@@ -1,5 +1,5 @@
 import clsHooked from "cls-hooked";
-import type { EntityChange } from "./entity_changes_interface.js";
+import type { EntityChange } from "@triliumnext/commons";
 const namespace = clsHooked.createNamespace("trilium");
 
 type Callback = (...args: any[]) => any;

apps/server/src/services/consistency_checks.ts

@@ -15,7 +15,7 @@ import eraseService from "../services/erase.js";
 import sanitizeAttributeName from "./sanitize_attribute_name.js";
 import noteTypesService from "../services/note_types.js";
 import type { BranchRow } from "@triliumnext/commons";
-import type { EntityChange } from "./entity_changes_interface.js";
+import type { EntityChange } from "@triliumnext/commons";
 import becca_loader from "../becca/becca_loader.js";
 const noteTypes = noteTypesService.getNoteTypeNames();
 

apps/server/src/services/entity_changes.ts

@@ -6,7 +6,7 @@ import { randomString } from "./utils.js";
 import instanceId from "./instance_id.js";
 import becca from "../becca/becca.js";
 import blobService from "../services/blob.js";
-import type { EntityChange } from "./entity_changes_interface.js";
+import type { EntityChange } from "@triliumnext/commons";
 import type { Blob } from "./blob-interface.js";
 import eventService from "./events.js";
 

apps/server/src/services/entity_changes_interface.ts

@@ -1,27 +0,0 @@
-export interface EntityChange {
-    id?: number | null;
-    noteId?: string;
-    entityName: string;
-    entityId: string;
-    entity?: any;
-    positions?: Record<string, number>;
-    hash: string;
-    utcDateChanged?: string;
-    utcDateModified?: string;
-    utcDateCreated?: string;
-    isSynced: boolean | 1 | 0;
-    isErased: boolean | 1 | 0;
-    componentId?: string | null;
-    changeId?: string | null;
-    instanceId?: string | null;
-}
-
-export interface EntityRow {
-    isDeleted?: boolean;
-    content?: Buffer | string;
-}
-
-export interface EntityChangeRecord {
-    entityChange: EntityChange;
-    entity?: EntityRow;
-}

apps/server/src/services/erase.ts

@@ -5,7 +5,7 @@ import optionService from "./options.js";
 import dateUtils from "./date_utils.js";
 import sqlInit from "./sql_init.js";
 import cls from "./cls.js";
-import type { EntityChange } from "./entity_changes_interface.js";
+import type { EntityChange } from "@triliumnext/commons";
 
 function eraseNotes(noteIdsToErase: string[]) {
     if (noteIdsToErase.length === 0) {

apps/server/src/services/sync.ts

@@ -17,7 +17,7 @@ import ws from "./ws.js";
 import entityChangesService from "./entity_changes.js";
 import entityConstructor from "../becca/entity_constructor.js";
 import becca from "../becca/becca.js";
-import type { EntityChange, EntityChangeRecord, EntityRow } from "./entity_changes_interface.js";
+import type { EntityChange, EntityChangeRecord, EntityRow } from "@triliumnext/commons";
 import type { CookieJar, ExecOpts } from "./request_interface.js";
 import setupService from "./setup.js";
 import consistency_checks from "./consistency_checks.js";

apps/server/src/services/sync_update.ts

@@ -4,7 +4,7 @@ import entityChangesService from "./entity_changes.js";
 import eventService from "./events.js";
 import entityConstructor from "../becca/entity_constructor.js";
 import ws from "./ws.js";
-import type { EntityChange, EntityChangeRecord, EntityRow } from "./entity_changes_interface.js";
+import type { EntityChange, EntityChangeRecord, EntityRow } from "@triliumnext/commons";
 
 interface UpdateContext {
     alreadyErased: number;

apps/server/src/services/ws.ts

@@ -10,7 +10,7 @@ import becca from "../becca/becca.js";
 import AbstractBeccaEntity from "../becca/entities/abstract_becca_entity.js";
 
 import type { IncomingMessage, Server as HttpServer } from "http";
-import type { EntityChange } from "./entity_changes_interface.js";
+import { WebSocketMessage, type EntityChange } from "@triliumnext/commons";
 
 let webSocketServer!: WebSocketServer;
 let lastSyncedPush: number | null = null;

packages/commons/src/lib/server_api.ts

@@ -242,3 +242,31 @@ export interface SchemaResponse {
         type: string;
     }[];
 }
+
+export interface EntityChange {
+    id?: number | null;
+    noteId?: string;
+    entityName: string;
+    entityId: string;
+    entity?: any;
+    positions?: Record<string, number>;
+    hash: string;
+    utcDateChanged?: string;
+    utcDateModified?: string;
+    utcDateCreated?: string;
+    isSynced: boolean | 1 | 0;
+    isErased: boolean | 1 | 0;
+    componentId?: string | null;
+    changeId?: string | null;
+    instanceId?: string | null;
+}
+
+export interface EntityRow {
+    isDeleted?: boolean;
+    content?: Buffer | string;
+}
+
+export interface EntityChangeRecord {
+    entityChange: EntityChange;
+    entity?: EntityRow;
+}