From c5561530ec68582c83b7aa7dced08d95dcce39f9 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Thu, 18 Jul 2024 22:59:39 +0300
Subject: [PATCH] server-esm: Fix import to session-file-store

---
 package-lock.json             | 21 +++++++++++++++++++++
 package.json                  |  1 +
 src/becca/entities/bbranch.ts |  2 +-
 src/routes/session_parser.ts  |  3 ++-
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fe6c25356..2ea73be6b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -110,6 +110,7 @@
         "@types/sax": "^1.2.7",
         "@types/semver": "^7.5.8",
         "@types/serve-favicon": "^2.5.7",
+        "@types/session-file-store": "^1.2.5",
         "@types/stream-throttle": "^0.1.4",
         "@types/tmp": "^0.2.6",
         "@types/turndown": "^5.0.4",
@@ -1708,6 +1709,16 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/session-file-store": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/@types/session-file-store/-/session-file-store-1.2.5.tgz",
+      "integrity": "sha512-xjIyh40IznXLrvbAY/nmxu5cMcPcE3ZoDrSDvd02m6p8UjUgOtZAGI7Os5DDd6THuxClLWNhFo/awy1tYp64Bg==",
+      "dev": true,
+      "dependencies": {
+        "@types/express": "*",
+        "@types/express-session": "*"
+      }
+    },
     "node_modules/@types/stream-throttle": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/@types/stream-throttle/-/stream-throttle-0.1.4.tgz",
@@ -14734,6 +14745,16 @@
         "@types/node": "*"
       }
     },
+    "@types/session-file-store": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/@types/session-file-store/-/session-file-store-1.2.5.tgz",
+      "integrity": "sha512-xjIyh40IznXLrvbAY/nmxu5cMcPcE3ZoDrSDvd02m6p8UjUgOtZAGI7Os5DDd6THuxClLWNhFo/awy1tYp64Bg==",
+      "dev": true,
+      "requires": {
+        "@types/express": "*",
+        "@types/express-session": "*"
+      }
+    },
     "@types/stream-throttle": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/@types/stream-throttle/-/stream-throttle-0.1.4.tgz",
diff --git a/package.json b/package.json
index 05299ace3..d26655876 100644
--- a/package.json
+++ b/package.json
@@ -132,6 +132,7 @@
     "@types/sax": "^1.2.7",
     "@types/semver": "^7.5.8",
     "@types/serve-favicon": "^2.5.7",
+    "@types/session-file-store": "^1.2.5",
     "@types/stream-throttle": "^0.1.4",
     "@types/tmp": "^0.2.6",
     "@types/turndown": "^5.0.4",
diff --git a/src/becca/entities/bbranch.ts b/src/becca/entities/bbranch.ts
index 363fb86f2..b0222f115 100644
--- a/src/becca/entities/bbranch.ts
+++ b/src/becca/entities/bbranch.ts
@@ -8,6 +8,7 @@ import TaskContext from "../../services/task_context.js";
 import cls from "../../services/cls.js";
 import log from "../../services/log.js";
 import { BranchRow } from './rows';
+import handlers from "../../services/handlers.js";
 
 /**
  * Branch represents a relationship between a child note and its parent note. Trilium allows a note to have multiple
@@ -157,7 +158,6 @@ class BBranch extends AbstractBeccaEntity<BBranch> {
 
             if (parentBranches.length === 1 && parentBranches[0] === this) {
                 // needs to be run before branches and attributes are deleted and thus attached relations disappear
-                const handlers = require('../../services/handlers');
                 handlers.runAttachedRelations(note, 'runOnNoteDeletion', note);
             }
         }
diff --git a/src/routes/session_parser.ts b/src/routes/session_parser.ts
index b880a8915..ee9918152 100644
--- a/src/routes/session_parser.ts
+++ b/src/routes/session_parser.ts
@@ -1,7 +1,8 @@
 import session from "express-session";
+import sessionFileStore from "session-file-store";
 import sessionSecret from "../services/session_secret.js";
 import dataDir from "../services/data_dir.js";
-const FileStore = require('session-file-store')(session);
+const FileStore = sessionFileStore(session);
 
 const sessionParser = session({
     secret: sessionSecret,