Следующая порция улучшений + исправления security инцидентов

Author: AlexanderDemko

AGENTS.md

@@ -0,0 +1,6 @@
+# Repository instructions
+
+## Versioning and release builds
+
+- Do not bump the application version or build an installer, portable package, or other release artifact unless the user explicitly asks for it.
+- For local testing, rebuild only the required application code and update the changed files in the installed application when appropriate.

Api/Application/ClientApp/package-lock.json

@@ -12,14 +12,14 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "22.0.0",
-    "@angular/common": "22.0.0",
-    "@angular/compiler": "22.0.0",
-    "@angular/core": "22.0.0",
-    "@angular/forms": "22.0.0",
-    "@angular/platform-browser": "22.0.0",
-    "@angular/platform-browser-dynamic": "22.0.0",
-    "@angular/router": "22.0.0",
+    "@angular/animations": "22.1.0",
+    "@angular/common": "22.1.0",
+    "@angular/compiler": "22.1.0",
+    "@angular/core": "22.1.0",
+    "@angular/forms": "22.1.0",
+    "@angular/platform-browser": "22.1.0",
+    "@angular/platform-browser-dynamic": "22.1.0",
+    "@angular/router": "22.1.0",
     "@fortawesome/fontawesome-free": "^7.2.0",
     "bootstrap": "^5.3.8",
     "flatted": "^3.3.1",
@@ -29,19 +29,27 @@
     "zone.js": "^0.16.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "22.0.0",
-    "@angular/cli": "22.0.0",
-    "@angular/compiler-cli": "22.0.0",
+    "@angular-devkit/build-angular": "22.1.2",
+    "@angular/cli": "22.1.2",
+    "@angular/compiler-cli": "22.1.0",
     "@types/jasmine": "^5.1.13",
     "@types/node": "^25.9.1",
     "ajv": "^8.20.0",
     "jasmine-core": "^6.2.0",
     "jasmine-spec-reporter": "^7.0.0",
-    "karma": "~6.3.16",
+    "karma": "^6.4.4",
     "karma-chrome-launcher": "^3.2.0",
     "karma-coverage": "^2.2.1",
     "karma-jasmine": "^5.1.0",
     "karma-jasmine-html-reporter": "^2.1.0",
     "typescript": "6.0.3"
+  },
+  "overrides": {
+    "@hono/node-server": "2.1.0",
+    "@angular/cli": {
+      "@modelcontextprotocol/sdk": "1.30.0"
+    },
+    "uuid": "11.1.1",
+    "ws": "8.21.0"
   }
 }

Api/Application/ClientApp/package.json

@@ -48,6 +48,18 @@ public async Task<ActionResult<OneNoteComContentResponse>> PageContent(string pa
             };
         }
 
+        [HttpGet]
+        public async Task<ActionResult<OneNotePageLinkResponse>> PageLink(string pageId)
+        {
+            if (string.IsNullOrWhiteSpace(pageId))
+                return BadRequest("pageId is required.");
+
+            return new OneNotePageLinkResponse
+            {
+                ClientUrl = await oneNoteApp.GetHyperlinkToObjectAsync(pageId)
+            };
+        }
+
         [HttpPost]
         public async Task<ActionResult<QuickAnalyzeCurrentPageResponse>> QuickAnalyzeCurrentPage()
         {
@@ -71,6 +83,11 @@ public class OneNoteComContentResponse
         public string Xml { get; set; }
     }
 
+    public class OneNotePageLinkResponse
+    {
+        public string ClientUrl { get; set; }
+    }
+
     public class QuickAnalyzeCurrentPageResponse : OneNoteCurrentPageInfo
     {
         public bool PageUpdated { get; set; }

Api/Application/Controllers/OneNoteIntegrationController.cs

@@ -322,6 +322,10 @@ public ActionResult<ParsePageResponse> ParsePage([FromBody] ParsePageRequest req
 
                 using (var parser = documentParserFactory.Create(provider, documentId))
                 {
+                    var defaultBook = TryGetTitleBook(request.Title);
+                    if (defaultBook != null)
+                        parser.SetDefaultBook(defaultBook.BibleBook, defaultBook.ModuleName);
+
                     if (!string.IsNullOrWhiteSpace(request.Html))
                     {
                         updatedHtml = ParseHtml(parser, request.Html, paragraphs, updateHtml);
@@ -381,6 +385,30 @@ public ActionResult<ParsePageResponse> ParsePage([FromBody] ParsePageRequest req
             }
         }
 
+        private Abbreviation TryGetTitleBook(string title)
+        {
+            if (string.IsNullOrWhiteSpace(title))
+                return null;
+
+            var matches = applicationManager.CurrentModuleInfo.BibleStructure.AllAbbreviations.Values
+                .Where(abbreviation => abbreviation.IsFullBookName
+                    && TitleContainsBookName(title, abbreviation.Value))
+                .GroupBy(abbreviation => abbreviation.BibleBook.Index)
+                .Select(group => group.OrderByDescending(abbreviation => abbreviation.Value.Length).First())
+                .ToList();
+
+            return matches.Count == 1 ? matches[0] : null;
+        }
+
+        private static bool TitleContainsBookName(string title, string bookName)
+        {
+            var words = Regex.Split(bookName.Trim(), @"\s+")
+                .Where(word => word.Length > 0)
+                .Select(Regex.Escape);
+            var pattern = @"(?<![\p{L}\p{N}])" + string.Join(@"\s+", words) + @"(?![\p{L}\p{N}])";
+            return Regex.IsMatch(title, pattern, RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
+        }
+
         [HttpGet]
         public ActionResult<VerseTextResponse> VerseText([FromQuery] VerseTextRequest request)
         {

Api/Application/Controllers/VerseParsingController.cs

@@ -12,6 +12,7 @@ public interface IOneNoteAppWrapper : IDisposable
         Task<string> GetHierarchyContentAsync(string hierarchyId, HierarchyScope scope);
         Task<string> GetCurrentPageIdAsync();
         Task<OneNoteCurrentPageInfo> GetCurrentPageInfoAsync();
+        Task<string> GetHyperlinkToObjectAsync(string hierarchyId, string objectId = "");
         Task<string> GetCurrentSectionIdAsync();
         Task UpdatePageContentAsync(XDocument pageDoc);
         Task<OneNoteHierarchyInfo> GetHierarchyInfoAsync(string hierarchyId);

Api/Providers/OneNote/Contracts/IOneNoteAppWrapper.cs

@@ -81,6 +81,18 @@ await UseOneNoteAppInSingleThreadAsync(app =>
             return result;
         }
 
+        public async Task<string> GetHyperlinkToObjectAsync(string hierarchyId, string objectId = "")
+        {
+            string result = null;
+
+            await UseOneNoteAppInSingleThreadAsync(app =>
+            {
+                app.GetHyperlinkToObject(hierarchyId, objectId ?? string.Empty, out result);
+            });
+
+            return result;
+        }
+
         public async Task<string> GetCurrentSectionIdAsync()
         {
             string currentSectionId = null;

Api/Providers/OneNote/Services/OneNoteAppWrapper.cs

@@ -3,6 +3,7 @@
 using BibleNote.Services.VerseParsing.Contracts.ParseContext;
 using BibleNote.Services.VerseParsing.Models;
 using BibleNote.Services.VerseParsing.Models.ParseResult;
+using BibleNote.Services.ModulesManager.Scheme.Module;
 
 namespace BibleNote.Services.VerseParsing.Contracts
 {
@@ -14,6 +15,8 @@ public interface IDocumentParser: IDisposable
 
         ParagraphParseResult ParseParagraph(IXmlNode node);
 
+        void SetDefaultBook(BibleBookInfo book, string moduleName);
+
         DisposeHandler ParseHierarchyElement(ElementType paragraphType);
     }
 }

Api/Services/VerseParsing/Contracts/IDocumentParser.cs

@@ -1,6 +1,7 @@
 using BibleNote.Services.Contracts;
 using BibleNote.Services.VerseParsing.Models;
 using BibleNote.Services.VerseParsing.Models.ParseResult;
+using BibleNote.Services.ModulesManager.Scheme.Module;
 
 namespace BibleNote.Services.VerseParsing.Contracts.ParseContext
 {
@@ -10,6 +11,10 @@ public interface IDocumentParseContext
 
         ChapterEntry TitleChapter { get; }
 
+        BibleBookInfo DefaultBook { get; }
+
+        string DefaultBookModuleName { get; }
+
         IParagraphParseContext CurrentParagraph { get; }
 
         IHierarchyParseContext CurrentHierarchy { get; }        
@@ -25,6 +30,8 @@ public interface IDocumentParseContextEditor : IDocumentParseContext
 
         void SetTitleVerse(ChapterEntry titleChapter);
 
+        void SetDefaultBook(BibleBookInfo book, string moduleName);
+
         DisposeHandler ParseParagraph();
 
         void EnterHierarchyElement(ElementType paragraphType);

Api/Services/VerseParsing/Contracts/ParseContext/IDocumentParseContext.cs

@@ -20,6 +20,8 @@ public interface IHierarchyParseContext : IElementParseContext
 
         void AddHierarchyResult(HierarchyParseResult hierarchyResult);
 
+        void AddStructuralHierarchyResult(HierarchyParseResult hierarchyResult);
+
         void ChangeElementType(ElementType elementType);
 
         ChapterEntry GetPreviousSiblingChapterEntry();