@readium/navigator-html-injectables 2.3.1-alpha.2 → 2.4.0-beta.1

package/src/modules/Peripherals.ts

@@ -1,20 +1,20 @@
-import { Comms } from "../comms/comms";
-import { Module } from "./Module";
-import { ReadiumWindow, nearestInteractiveElement } from "../helpers/dom";
-import { BulkCopyProtector, BulkCopyProtectionOptions } from "../protection/BulkCopyProtector";
-import { SelectionAnalyzer, SelectionAnalyzerOptions } from "../protection/SelectionAnalyzer";
-import { 
-    KeyboardPeripheral 
-} from "../protection";
-import { SuspiciousActivityType } from "../comms";
-import { BULK_COPY_CONFIG, SELECTION_ANALYZER_CONFIG } from "../protection/config";
-import { 
-    KeyCombinationManager, 
+import { Comms } from "../comms/comms.ts";
+import { Module } from "./Module.ts";
+import { ReadiumWindow, nearestInteractiveElement } from "../helpers/dom.ts";
+import { BulkCopyProtector, BulkCopyProtectionOptions } from "../protection/BulkCopyProtector.ts";
+import { SelectionAnalyzer, SelectionAnalyzerOptions } from "../protection/SelectionAnalyzer.ts";
+import {
+    KeyboardPeripheral
+} from "../protection/index.ts";
+import { SuspiciousActivityType } from "../comms/index.ts";
+import { BULK_COPY_CONFIG, SELECTION_ANALYZER_CONFIG } from "../protection/config.ts";
+import {
+    KeyCombinationManager,
     ActivityEventDispatcher,
     KeyboardPeripheralEvent
-} from "../protection/KeyCombinationManager";
-import { SuspiciousScrollingEvent } from "./snapper/ScrollSnapper";
-import { SuspiciousSnappingEvent } from "./snapper/ColumnSnapper";
+} from "../protection/KeyCombinationManager.ts";
+import { SuspiciousScrollingEvent } from "./snapper/ScrollSnapper.ts";
+import { SuspiciousSnappingEvent } from "./snapper/ColumnSnapper.ts";
 
 export interface FrameClickEvent {
     defaultPrevented: boolean;
@@ -108,7 +108,7 @@ export interface ContextMenuEvent extends Omit<BaseSuspiciousActivityEvent, "typ
     selectedText?: Omit<BasicTextSelection, "targetFrameSrc">;
 }
 
-export type SuspiciousActivityEvent = 
+export type SuspiciousActivityEvent =
     | DeveloperToolsEvent
     | SelectAllEvent
     | BulkCopyEvent
@@ -141,20 +141,20 @@ export class Peripherals extends Module {
     // State management
     private cleanupCallbacks: (() => void)[] = [];
     private pointerMoved = false;
-    
+
     // Feature flags
     private isContextMenuEnabled = false;
     private isDragAndDropEnabled = false;
     private isSelectionMonitoringEnabled = false;
     private isBulkCopyProtectionEnabled = false;
-    
+
     // Selection analysis
     private selectionAnalyzer: SelectionAnalyzer | null = null;
     private currentSelection: string | null = null;
-    
+
     // Bulk copy protection
     private bulkCopyProtector: BulkCopyProtector | null = null;
-    
+
     // Key combination manager
     private keyManager = new KeyCombinationManager();
 
@@ -173,6 +173,7 @@ export class Peripherals extends Module {
     private addDragAndDropPrevention(): void {
         if (this.isDragAndDropEnabled || !this.wnd) return;
         this.wnd.document.addEventListener("dragstart", this.onDragStart);
+        this.wnd.document.addEventListener("dragover", this.onDragOver);
         this.wnd.document.addEventListener("drop", this.onDrop);
         this.isDragAndDropEnabled = true;
     }
@@ -180,6 +181,7 @@ export class Peripherals extends Module {
     private removeDragAndDropPrevention(): void {
         if (!this.isDragAndDropEnabled || !this.wnd) return;
         this.wnd.document.removeEventListener("dragstart", this.onDragStart);
+        this.wnd.document.removeEventListener("dragover", this.onDragOver);
         this.wnd.document.removeEventListener("drop", this.onDrop);
         this.isDragAndDropEnabled = false;
     }
@@ -189,15 +191,15 @@ export class Peripherals extends Module {
     private enableKeyboardPeripherals(shortcuts: KeyboardPeripheral[] = []): void {
         // Clear any existing state
         this.disableKeyboardPeripherals();
-        
+
         // Create activity event dispatcher
         const dispatcher: ActivityEventDispatcher = (activityEvent) => {
             this.comms?.send("keyboard_peripherals", activityEvent);
         };
-        
+
         // Create unified handler using centralized KeyCombinationManager
         this.keyDownHandler = this.keyManager.createUnifiedHandler(this.wnd.location.href, shortcuts, dispatcher, this.wnd);
-        
+
         // Add the event listener
         if (this.wnd) {
             this.wnd.document.addEventListener("keydown", this.keyDownHandler, {
@@ -205,7 +207,7 @@ export class Peripherals extends Module {
             });
         }
     }
-    
+
     private disableKeyboardPeripherals(): void {
         if (this.wnd && this.keyDownHandler) {
             this.wnd.document.removeEventListener("keydown", this.keyDownHandler, {
@@ -217,11 +219,11 @@ export class Peripherals extends Module {
 
     private addBulkCopyProtection(options: Partial<BulkCopyProtectionOptions> = {}): void {
         if (this.isBulkCopyProtectionEnabled || !this.wnd) return;
-        
+
         const defaultOptions = BULK_COPY_CONFIG;
-        
+
         const finalOptions = options ? { ...defaultOptions, ...options } : defaultOptions;
-        
+
         this.bulkCopyProtector = new BulkCopyProtector(this.wnd, finalOptions);
         this.wnd.document.addEventListener("copy", this.preventBulkCopy, true);
         this.wnd.document.addEventListener("cut", this.preventBulkCopy, true);
@@ -230,7 +232,7 @@ export class Peripherals extends Module {
 
     private removeBulkCopyProtection(): void {
         if (!this.isBulkCopyProtectionEnabled || !this.wnd) return;
-        
+
         this.wnd.document.removeEventListener("copy", this.preventBulkCopy, true);
         this.wnd.document.removeEventListener("cut", this.preventBulkCopy, true);
         this.bulkCopyProtector?.destroy();
@@ -242,15 +244,15 @@ export class Peripherals extends Module {
         if (!this.isBulkCopyProtectionEnabled || !this.bulkCopyProtector) {
             return true;
         }
-        
+
         if (!this.bulkCopyProtector.shouldAllowCopy(event)) {
             event.preventDefault();
-            
+
             const selection = this.wnd.getSelection();
             const selectedText = selection?.toString() || '';
             const domRectList = selectedText ? selection?.getRangeAt(0)?.getClientRects() : null;
             const rect = domRectList?.[0];
-            
+
             const activityEvent: BulkCopyEvent = {
                 type: "bulk_copy",
                 timestamp: Date.now(),
@@ -276,18 +278,18 @@ export class Peripherals extends Module {
         if (!this.isSelectionMonitoringEnabled || !this.wnd || !this.selectionAnalyzer) {
             return;
         }
-        
+
         const selection = this.wnd.getSelection();
         if (selection) {
             this.currentSelection = selection.toString();
             const isSuspicious = this.selectionAnalyzer.analyze(selection);
-            
+
             if (isSuspicious && this.currentSelection) {
                 const selection = this.wnd.getSelection();
                 const selectedText = selection?.toString() || '';
                 const domRectList = (selectedText && selection?.rangeCount) ? selection.getRangeAt(0)?.getClientRects() : null;
                 const rect = domRectList?.[0];
-                
+
                 const activityEvent: SuspiciousSelectionEvent = {
                     type: "suspicious_selection",
                     timestamp: Date.now(),
@@ -311,25 +313,32 @@ export class Peripherals extends Module {
 
     private addSelectionMonitoring(options?: SelectionAnalyzerOptions): void {
         if (this.isSelectionMonitoringEnabled || !this.wnd) return;
-        
+
         // Use provided options or fall back to default config
         const analyzerOptions = options || SELECTION_ANALYZER_CONFIG;
         this.selectionAnalyzer = new SelectionAnalyzer(analyzerOptions);
         this.wnd.document.addEventListener("selectionchange", this.handleSelection);
         this.isSelectionMonitoringEnabled = true;
     }
-    
+
     private removeSelectionMonitoring(): void {
         if (!this.isSelectionMonitoringEnabled || !this.wnd) {
             return;
         }
-        
+
         this.wnd.document.removeEventListener("selectionchange", this.handleSelection);
         this.selectionAnalyzer?.clear();
         this.selectionAnalyzer = null;
         this.isSelectionMonitoringEnabled = false;
     }
 
+    private onDragOver = (event: DragEvent) => {
+        if (this.isDragAndDropEnabled) {
+            event.preventDefault();
+            event.stopPropagation();
+        }
+    };
+
     private onDragStart = (event: DragEvent) => {
         if (this.isDragAndDropEnabled) {
             // Drag and drop protection is enabled - prevent it
@@ -374,7 +383,7 @@ export class Peripherals extends Module {
             const selectedText = selection?.toString() || '';
             const domRectList = (selectedText && selection?.rangeCount) ? selection.getRangeAt(0)?.getClientRects() : null;
             const rect = domRectList?.[0];
-            
+
             const activityEvent: ContextMenuEvent = {
                 timestamp: Date.now(),
                 clientX: event.clientX,
@@ -484,20 +493,20 @@ export class Peripherals extends Module {
         // Single handler for all content protection features
         this.comms?.register("peripherals_protection", Peripherals.moduleName, (data: unknown, ack) => {
             const config = data as ContentProtectionConfig;
-            
+
             // Apply config only on first call, then ignore subsequent calls (immutable)
             if (!this.configApplied) {
                 this.configApplied = true;
-                
+
                 // Selection monitoring with optional configuration
                 if (config.monitorSelection) {
-                    const options = typeof config.monitorSelection === "boolean" 
-                        ? undefined 
+                    const options = typeof config.monitorSelection === "boolean"
+                        ? undefined
                         : config.monitorSelection;
                     this.addSelectionMonitoring(options);
                     this.comms?.log("Selection monitoring enabled");
                 }
-                
+
                 // Copy
                 if (typeof config.protectCopy === "object") {
                     // Limited copying with custom thresholds
@@ -508,40 +517,40 @@ export class Peripherals extends Module {
                     this.comms?.log("Copy protection enabled (limited)");
                 } else if (config.protectCopy === true) {
                     // Block all copying
-                    this.addBulkCopyProtection({ 
-                        enabled: true, 
-                        maxSelectionPercent: 0, 
-                        minThreshold: 0, 
-                        absoluteMaxChars: 0 
+                    this.addBulkCopyProtection({
+                        enabled: true,
+                        maxSelectionPercent: 0,
+                        minThreshold: 0,
+                        absoluteMaxChars: 0
                     });
                     this.comms?.log("Copy protection enabled");
                 }
-                
+
                 // Context menu
                 if (config.disableContextMenu) {
                     this.addContextMenuPrevention();
                     this.comms?.log("Context menu protection enabled");
                 }
-                
+
                 // Drag and drop
                 if (config.disableDragAndDrop) {
                     this.addDragAndDropPrevention();
                     this.comms?.log("Drag and drop protection enabled");
                 }
             }
-            
+
             ack(true);
         });
 
         // Separate handler for keyboard peripherals
         this.comms?.register("keyboard_peripherals", Peripherals.moduleName, (data: unknown, ack) => {
             const keyboardPeripherals = data as KeyboardPeripheral[];
-            
+
             if (keyboardPeripherals && keyboardPeripherals.length > 0) {
                 this.enableKeyboardPeripherals(keyboardPeripherals);
                 this.comms?.log(`Keyboard peripherals enabled: ${keyboardPeripherals.map(p => p.type).join(", ")}`);
             }
-            
+
             ack(true);
         });
     }
@@ -549,10 +558,10 @@ export class Peripherals extends Module {
     mount(wnd: ReadiumWindow, comms: Comms): boolean {
         this.wnd = wnd;
         this.comms = comms;
-        
+
         // Register protection handlers
         this.registerProtectionHandlers();
-        
+
         // Core event listeners (always active)
         wnd.document.addEventListener("pointerdown", this.onPointerDown);
         wnd.document.addEventListener("pointerup", this.onPointerUp);
@@ -570,24 +579,24 @@ export class Peripherals extends Module {
         this.removeContextMenuPrevention();
         this.removeDragAndDropPrevention();
         this.disableKeyboardPeripherals();
-        
+
         // Clean up event listeners
         this.cleanupCallbacks.forEach(cleanup => cleanup());
         this.cleanupCallbacks = [];
-        
+
         // Remove core event listeners
         wnd.document.removeEventListener("pointerdown", this.onPointerDown);
         wnd.document.removeEventListener("pointerup", this.onPointerUp);
         wnd.document.removeEventListener("pointermove", this.onPointerMove);
         wnd.document.removeEventListener("click", this.onClicker);
-        
+
         // Unregister all handlers
         comms.unregisterAll(Peripherals.moduleName);
-        
+
         // Reset config applied flag for fresh instances
         this.configApplied = false;
-        
+
         comms.log("Peripherals Unmounted");
         return true;
     }
-}
+}

package/src/modules/index.ts

@@ -1,4 +1,4 @@
-export * from './Decorator';
-export * from './Module';
-export * from './ModuleLibrary';
-export * from './Peripherals';
+export * from './Decorator.ts';
+export * from './Module.ts';
+export * from './ModuleLibrary.ts';
+export * from './Peripherals.ts';

package/src/modules/setup/FixedSetup.ts

@@ -1,8 +1,8 @@
-import { Comms } from "../../comms/comms";
-import { Setup } from "./Setup";
-import { removeProperty, setProperty } from "../../helpers/css";
-import { ModuleName } from "../ModuleLibrary";
-import { ReadiumWindow, deselect } from "../../helpers/dom";
+import { Comms } from "../../comms/comms.ts";
+import { Setup } from "./Setup.ts";
+import { removeProperty, setProperty } from "../../helpers/css.ts";
+import { ModuleName } from "../ModuleLibrary.ts";
+import { ReadiumWindow, deselect } from "../../helpers/dom.ts";
 
 const FIXED_STYLE_ID = "readium-fixed-style";
 
@@ -72,4 +72,4 @@ export class FixedSetup extends Setup {
         comms.log("FixedSetup Unmounted");
         return super.unmount(wnd, comms);
     }
-}
+}

package/src/modules/setup/ReflowableSetup.ts

@@ -1,7 +1,7 @@
-import { Comms } from "../../comms/comms";
-import { Setup } from "./Setup";
-import { getProperties, removeProperty, setProperty, updateProperties } from "../../helpers/css";
-import { ReadiumWindow } from "../../helpers/dom";
+import { Comms } from "../../comms/comms.ts";
+import { Setup } from "./Setup.ts";
+import { getProperties, removeProperty, setProperty, updateProperties } from "../../helpers/css.ts";
+import { ReadiumWindow } from "../../helpers/dom.ts";
 
 const VIEWPORT_META_TAG_ID = "readium-viewport";
 
@@ -40,7 +40,7 @@ export class ReflowableSetup extends Setup {
             ack(true);
         });
         comms.register("update_properties", ReflowableSetup.moduleName, (data, ack) => {
-            // In order to keep the viewport width that is added in the setup itself, 
+            // In order to keep the viewport width that is added in the setup itself,
             // and don’t have EpubNavigator concerned with this, we need to add it there
             (data as { [key: string]: string })["--RS__viewportWidth"] = `${ wnd.innerWidth }px`;
             updateProperties(wnd, data as { [key: string]: string });
@@ -73,4 +73,4 @@ export class ReflowableSetup extends Setup {
         comms.log("ReflowableSetup Unmounted");
         return super.unmount(wnd, comms);
     }
-}
+}

package/src/modules/setup/Setup.ts

@@ -1,7 +1,7 @@
-import { Comms } from "../../comms/comms";
-import { ReadiumWindow, EPUBReadingSystem } from "../../helpers/dom";
-import { Module } from "../Module";
-import { ModuleName } from "../ModuleLibrary";
+import { Comms } from "../../comms/comms.ts";
+import { ReadiumWindow, EPUBReadingSystem } from "../../helpers/dom.ts";
+import { Module } from "../Module.ts";
+import { ModuleName } from "../ModuleLibrary.ts";
 
 export abstract class Setup extends Module {
     static readonly moduleName: ModuleName = "setup";
@@ -157,4 +157,4 @@ export abstract class Setup extends Module {
         comms.log("Setup Unmounted");
         return true;
     }
-}
+}

package/src/modules/setup/WebPubSetup.ts

@@ -1,7 +1,7 @@
-import { Comms } from "../../comms/comms";
-import { ReadiumWindow } from "../../helpers/dom";
-import { Module } from "../Module";
-import { getProperties, removeProperty, setProperty, updateProperties } from "../../helpers/css";
+import { Comms } from "../../comms/comms.ts";
+import { ReadiumWindow } from "../../helpers/dom.ts";
+import { Module } from "../Module.ts";
+import { getProperties, removeProperty, setProperty, updateProperties } from "../../helpers/css.ts";
 
 export class WebPubSetup extends Module {
     static readonly moduleName = "webpub_setup";
@@ -61,4 +61,4 @@ export class WebPubSetup extends Module {
         comms.log("WebPubSetup Unmounted");
         return true;
     }
-}
+}