obsyncd 1.0.0

package/dist/sync/changeDetector.js

@@ -0,0 +1,259 @@
+/**
+ * Change detection using three-way merge algorithm.
+ * Compares source, destination, and base (last sync state) to detect changes.
+ */
+import { promises as fs } from 'fs';
+import path from 'path';
+import { computeFileHash } from '../utils/index.js';
+export class ChangeDetector {
+    sourceAdapter;
+    destAdapter;
+    constructor(sourceAdapter, destAdapter) {
+        this.sourceAdapter = sourceAdapter;
+        this.destAdapter = destAdapter;
+    }
+    /**
+     * Detect all changes between source and destination using three-way merge.
+     * @param sourcePath - Source vault path
+     * @param destPath - Destination vault path
+     * @param sourceManifest - Source manifest (base state)
+     * @param destManifest - Destination manifest (base state)
+     * @param fileList - List of files to check (from vault listing)
+     */
+    async detectChanges(sourcePath, destPath, sourceManifest, destManifest, fileList) {
+        const changes = [];
+        const processedFiles = new Set();
+        // Process all files in current file list
+        for (const relativePath of fileList) {
+            processedFiles.add(relativePath);
+            const sourceFilePath = path.join(sourcePath, relativePath);
+            const destFilePath = path.join(destPath, relativePath);
+            // Get current states
+            const sourceState = await this.getFileState(sourceFilePath, this.sourceAdapter);
+            const destState = await this.getFileState(destFilePath, this.destAdapter);
+            // Get base states from manifests
+            const sourceBaseState = sourceManifest?.files[relativePath] ?? null;
+            const destBaseState = destManifest?.files[relativePath] ?? null;
+            // Determine change type using three-way merge logic
+            const change = this.determineChangeType(relativePath, sourceState, destState, sourceBaseState, destBaseState);
+            if (change) {
+                changes.push(change);
+            }
+        }
+        // Check for deleted files (in manifest but not in current file list)
+        if (sourceManifest) {
+            for (const relativePath of Object.keys(sourceManifest.files)) {
+                if (!processedFiles.has(relativePath)) {
+                    // File was in source before but not now - deleted from source
+                    const destFilePath = path.join(destPath, relativePath);
+                    const destState = await this.getFileState(destFilePath, this.destAdapter);
+                    if (destState) {
+                        // Still exists in destination
+                        const destBaseState = destManifest?.files[relativePath] ?? null;
+                        if (destBaseState && destState.hash !== destBaseState.hash) {
+                            // Conflict: deleted in source, modified in destination
+                            changes.push({
+                                path: relativePath,
+                                type: 'conflict',
+                                sourceState: null,
+                                destinationState: destState,
+                                baseState: sourceManifest.files[relativePath],
+                            });
+                        }
+                        else {
+                            // Deleted in source, unchanged in destination - propagate deletion
+                            changes.push({
+                                path: relativePath,
+                                type: 'deleted',
+                                sourceState: null,
+                                destinationState: destState,
+                                baseState: sourceManifest.files[relativePath],
+                            });
+                        }
+                    }
+                }
+            }
+        }
+        if (destManifest) {
+            for (const relativePath of Object.keys(destManifest.files)) {
+                if (!processedFiles.has(relativePath)) {
+                    // File was in destination before but not now - deleted from destination
+                    const sourceFilePath = path.join(sourcePath, relativePath);
+                    const sourceState = await this.getFileState(sourceFilePath, this.sourceAdapter);
+                    if (sourceState) {
+                        // Still exists in source
+                        const sourceBaseState = sourceManifest?.files[relativePath] ?? null;
+                        if (sourceBaseState && sourceState.hash !== sourceBaseState.hash) {
+                            // Conflict: deleted in destination, modified in source
+                            changes.push({
+                                path: relativePath,
+                                type: 'conflict',
+                                sourceState: sourceState,
+                                destinationState: null,
+                                baseState: destManifest.files[relativePath],
+                            });
+                        }
+                        else {
+                            // Deleted in destination, unchanged in source - propagate deletion
+                            changes.push({
+                                path: relativePath,
+                                type: 'deleted',
+                                sourceState: sourceState,
+                                destinationState: null,
+                                baseState: destManifest.files[relativePath],
+                            });
+                        }
+                    }
+                }
+            }
+        }
+        return changes;
+    }
+    /**
+     * Determine change type using three-way merge algorithm
+     */
+    determineChangeType(relativePath, sourceState, destState, sourceBaseState, destBaseState) {
+        // Both files don't exist - no change
+        if (!sourceState && !destState) {
+            return null;
+        }
+        // File exists in source but not destination
+        if (sourceState && !destState) {
+            if (!sourceBaseState) {
+                // New file in source
+                return {
+                    path: relativePath,
+                    type: 'added',
+                    sourceState,
+                    destinationState: null,
+                };
+            }
+            else {
+                // File was deleted from destination
+                if (sourceState.hash !== sourceBaseState.hash) {
+                    // Modified in source, deleted in destination - CONFLICT
+                    return {
+                        path: relativePath,
+                        type: 'conflict',
+                        sourceState,
+                        destinationState: null,
+                        baseState: sourceBaseState,
+                    };
+                }
+                else {
+                    // Unchanged in source, deleted in destination
+                    return {
+                        path: relativePath,
+                        type: 'deleted',
+                        sourceState,
+                        destinationState: null,
+                        baseState: sourceBaseState,
+                    };
+                }
+            }
+        }
+        // File exists in destination but not source
+        if (!sourceState && destState) {
+            if (!destBaseState) {
+                // New file in destination
+                return {
+                    path: relativePath,
+                    type: 'added',
+                    sourceState: null,
+                    destinationState: destState,
+                };
+            }
+            else {
+                // File was deleted from source
+                if (destState.hash !== destBaseState.hash) {
+                    // Deleted in source, modified in destination - CONFLICT
+                    return {
+                        path: relativePath,
+                        type: 'conflict',
+                        sourceState: null,
+                        destinationState: destState,
+                        baseState: destBaseState,
+                    };
+                }
+                else {
+                    // Deleted in source, unchanged in destination
+                    return {
+                        path: relativePath,
+                        type: 'deleted',
+                        sourceState: null,
+                        destinationState: destState,
+                        baseState: destBaseState,
+                    };
+                }
+            }
+        }
+        // Both files exist - check for modifications
+        if (sourceState && destState) {
+            const sourceChanged = !sourceBaseState || sourceState.hash !== sourceBaseState.hash;
+            const destChanged = !destBaseState || destState.hash !== destBaseState.hash;
+            if (sourceChanged && destChanged) {
+                // Both modified - CONFLICT (unless they converged to same hash)
+                if (sourceState.hash === destState.hash) {
+                    // Converged to same content - no sync needed
+                    return null;
+                }
+                return {
+                    path: relativePath,
+                    type: 'conflict',
+                    sourceState,
+                    destinationState: destState,
+                    baseState: sourceBaseState || destBaseState,
+                };
+            }
+            else if (sourceChanged) {
+                // Only source changed
+                return {
+                    path: relativePath,
+                    type: 'modified',
+                    sourceState,
+                    destinationState: destState,
+                    baseState: sourceBaseState,
+                };
+            }
+            else if (destChanged) {
+                // Only destination changed
+                return {
+                    path: relativePath,
+                    type: 'modified',
+                    sourceState,
+                    destinationState: destState,
+                    baseState: destBaseState,
+                };
+            }
+            else {
+                // Neither changed - no sync needed
+                return null;
+            }
+        }
+        return null;
+    }
+    /**
+     * Get current file state (hash, size, mtime)
+     */
+    async getFileState(filePath, adapter) {
+        try {
+            const exists = await adapter.exists(filePath);
+            if (!exists) {
+                return null;
+            }
+            const content = await adapter.read(filePath);
+            const hash = computeFileHash(content);
+            const stats = await fs.stat(filePath);
+            return {
+                hash,
+                size: stats.size,
+                mtime: stats.mtime.toISOString(),
+            };
+        }
+        catch {
+            // File doesn't exist or can't be read
+            return null;
+        }
+    }
+}
+//# sourceMappingURL=changeDetector.js.map

package/dist/sync/changeDetector.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"changeDetector.js","sourceRoot":"","sources":["../../src/sync/changeDetector.ts"],"names":[],"mappings":"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"}

package/dist/sync/conflictResolver.d.ts

@@ -0,0 +1,29 @@
+/**
+ * Conflict resolution strategies for sync operations.
+ * Resolves conflicts when same file is modified on both sides.
+ */
+import type { FileChange, ConflictStrategy } from './types.js';
+export interface ResolvedConflict {
+    path: string;
+    action: 'use-source' | 'use-destination' | 'skip';
+    reason: string;
+}
+export declare class ConflictResolver {
+    /**
+     * Resolve conflicts using specified strategy
+     */
+    resolveConflicts(conflicts: FileChange[], strategy: ConflictStrategy): Promise<ResolvedConflict[]>;
+    /**
+     * Resolve a single conflict based on strategy
+     */
+    private resolveConflict;
+    /**
+     * Resolve conflict by choosing newest file (by mtime)
+     */
+    private resolveByNewest;
+    /**
+     * Get human-readable summary of conflict resolutions
+     */
+    getSummary(resolutions: ResolvedConflict[]): string;
+}
+//# sourceMappingURL=conflictResolver.d.ts.map

package/dist/sync/conflictResolver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflictResolver.d.ts","sourceRoot":"","sources":["../../src/sync/conflictResolver.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE/D,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,YAAY,GAAG,iBAAiB,GAAG,MAAM,CAAC;IAClD,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,gBAAgB;IAC3B;;OAEG;IACG,gBAAgB,CACpB,SAAS,EAAE,UAAU,EAAE,EACvB,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAW9B;;OAEG;YACW,eAAe;IAuC7B;;OAEG;IACH,OAAO,CAAC,eAAe;IA8CvB;;OAEG;IACH,UAAU,CAAC,WAAW,EAAE,gBAAgB,EAAE,GAAG,MAAM;CAepD"}

package/dist/sync/conflictResolver.js

@@ -0,0 +1,116 @@
+/**
+ * Conflict resolution strategies for sync operations.
+ * Resolves conflicts when same file is modified on both sides.
+ */
+export class ConflictResolver {
+    /**
+     * Resolve conflicts using specified strategy
+     */
+    async resolveConflicts(conflicts, strategy) {
+        const resolved = [];
+        for (const conflict of conflicts) {
+            const resolution = await this.resolveConflict(conflict, strategy);
+            resolved.push(resolution);
+        }
+        return resolved;
+    }
+    /**
+     * Resolve a single conflict based on strategy
+     */
+    async resolveConflict(conflict, strategy) {
+        switch (strategy) {
+            case 'source':
+                return {
+                    path: conflict.path,
+                    action: 'use-source',
+                    reason: 'Strategy: always prefer source',
+                };
+            case 'destination':
+                return {
+                    path: conflict.path,
+                    action: 'use-destination',
+                    reason: 'Strategy: always prefer destination',
+                };
+            case 'newest':
+                return this.resolveByNewest(conflict);
+            case 'skip':
+                return {
+                    path: conflict.path,
+                    action: 'skip',
+                    reason: 'Strategy: skip conflicts',
+                };
+            default:
+                // Default to skip for unknown strategies
+                return {
+                    path: conflict.path,
+                    action: 'skip',
+                    reason: 'Unknown strategy, skipping',
+                };
+        }
+    }
+    /**
+     * Resolve conflict by choosing newest file (by mtime)
+     */
+    resolveByNewest(conflict) {
+        const { sourceState, destinationState } = conflict;
+        // Handle deletion conflicts
+        if (!sourceState || !destinationState) {
+            if (!sourceState) {
+                return {
+                    path: conflict.path,
+                    action: 'use-destination',
+                    reason: 'File exists only in destination',
+                };
+            }
+            else {
+                return {
+                    path: conflict.path,
+                    action: 'use-source',
+                    reason: 'File exists only in source',
+                };
+            }
+        }
+        // Compare modification times
+        const sourceMtime = new Date(sourceState.mtime).getTime();
+        const destMtime = new Date(destinationState.mtime).getTime();
+        if (sourceMtime > destMtime) {
+            return {
+                path: conflict.path,
+                action: 'use-source',
+                reason: `Source is newer (${sourceState.mtime} vs ${destinationState.mtime})`,
+            };
+        }
+        else if (destMtime > sourceMtime) {
+            return {
+                path: conflict.path,
+                action: 'use-destination',
+                reason: `Destination is newer (${destinationState.mtime} vs ${sourceState.mtime})`,
+            };
+        }
+        else {
+            // Same mtime - prefer source as tiebreaker
+            return {
+                path: conflict.path,
+                action: 'use-source',
+                reason: 'Both files have same modification time, preferring source',
+            };
+        }
+    }
+    /**
+     * Get human-readable summary of conflict resolutions
+     */
+    getSummary(resolutions) {
+        const useSource = resolutions.filter((r) => r.action === 'use-source').length;
+        const useDest = resolutions.filter((r) => r.action === 'use-destination').length;
+        const skipped = resolutions.filter((r) => r.action === 'skip').length;
+        const lines = [
+            `Conflict Resolution Summary:`,
+            `  Using source: ${useSource}`,
+            `  Using destination: ${useDest}`,
+            `  Skipped: ${skipped}`,
+            `  Total conflicts: ${resolutions.length}`,
+        ];
+        return lines.join('\n');
+    }
+}
+//# sourceMappingURL=conflictResolver.js.map

package/dist/sync/conflictResolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflictResolver.js","sourceRoot":"","sources":["../../src/sync/conflictResolver.ts"],"names":[],"mappings":"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"}

package/dist/sync/directoryLister.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Simple directory file lister for non-vault destinations.
+ * Used in remote mode when the destination is not an Obsidian vault.
+ */
+export interface DirectoryListerConfig {
+    path: string;
+    excludePatterns?: string[];
+}
+export declare class DirectoryLister {
+    private config;
+    private storage;
+    constructor(config: DirectoryListerConfig);
+    /**
+     * List all files in the directory, applying exclusion patterns
+     */
+    listFiles(): Promise<string[]>;
+}
+//# sourceMappingURL=directoryLister.d.ts.map

package/dist/sync/directoryLister.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"directoryLister.d.ts","sourceRoot":"","sources":["../../src/sync/directoryLister.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;CAC5B;AAUD,qBAAa,eAAe;IAGd,OAAO,CAAC,MAAM;IAF1B,OAAO,CAAC,OAAO,CAAsB;gBAEjB,MAAM,EAAE,qBAAqB;IAIjD;;OAEG;IACG,SAAS,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAgBrC"}

package/dist/sync/directoryLister.js

@@ -0,0 +1,39 @@
+/**
+ * Simple directory file lister for non-vault destinations.
+ * Used in remote mode when the destination is not an Obsidian vault.
+ */
+import picomatch from 'picomatch';
+import { LocalStorageAdapter } from '../storage/index.js';
+const DEFAULT_EXCLUDES = [
+    '.obsync/**',
+    '.DS_Store',
+    '**/.DS_Store',
+    'Thumbs.db',
+    '**/Thumbs.db',
+];
+export class DirectoryLister {
+    config;
+    storage;
+    constructor(config) {
+        this.config = config;
+        this.storage = new LocalStorageAdapter();
+    }
+    /**
+     * List all files in the directory, applying exclusion patterns
+     */
+    async listFiles() {
+        // Check if directory exists first
+        const exists = await this.storage.exists(this.config.path);
+        if (!exists) {
+            return [];
+        }
+        const allFiles = await this.storage.list(this.config.path);
+        const excludePatterns = [
+            ...DEFAULT_EXCLUDES,
+            ...(this.config.excludePatterns || []),
+        ];
+        const excludeMatcher = picomatch(excludePatterns);
+        return allFiles.filter((file) => !excludeMatcher(file));
+    }
+}
+//# sourceMappingURL=directoryLister.js.map

package/dist/sync/directoryLister.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"directoryLister.js","sourceRoot":"","sources":["../../src/sync/directoryLister.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,SAAS,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAO1D,MAAM,gBAAgB,GAAG;IACvB,YAAY;IACZ,WAAW;IACX,cAAc;IACd,WAAW;IACX,cAAc;CACf,CAAC;AAEF,MAAM,OAAO,eAAe;IAGN;IAFZ,OAAO,CAAsB;IAErC,YAAoB,MAA6B;QAA7B,WAAM,GAAN,MAAM,CAAuB;QAC/C,IAAI,CAAC,OAAO,GAAG,IAAI,mBAAmB,EAAE,CAAC;IAC3C,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,SAAS;QACb,kCAAkC;QAClC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3D,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3D,MAAM,eAAe,GAAG;YACtB,GAAG,gBAAgB;YACnB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,IAAI,EAAE,CAAC;SACvC,CAAC;QACF,MAAM,cAAc,GAAG,SAAS,CAAC,eAAe,CAAC,CAAC;QAElD,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1D,CAAC;CACF"}

package/dist/sync/index.d.ts

@@ -0,0 +1,29 @@
+/**
+ * Core synchronization logic for Obsidian vaults.
+ * Handles file comparison, conflict detection, and sync operations.
+ */
+import type { SyncOptions, SyncResult, FileChange } from './types.js';
+export * from './types.js';
+export * from './watcher.js';
+export * from './watchMode.js';
+export * from './directoryLister.js';
+export declare class SyncEngine {
+    private sourceAdapter;
+    private destAdapter;
+    private changeDetector;
+    private conflictResolver;
+    constructor();
+    /**
+     * Synchronize source vault to destination
+     */
+    sync(options: SyncOptions): Promise<SyncResult>;
+    /**
+     * Apply file changes to destination
+     */
+    private applyChanges;
+    /**
+     * Detect changes between source and destination
+     */
+    detectChanges(source: string, destination: string): Promise<FileChange[]>;
+}
+//# sourceMappingURL=index.d.ts.map

package/dist/sync/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/sync/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAWH,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAEtE,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AAErC,qBAAa,UAAU;IACrB,OAAO,CAAC,aAAa,CAAsB;IAC3C,OAAO,CAAC,WAAW,CAAsB;IACzC,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,gBAAgB,CAAmB;;IAS3C;;OAEG;IACG,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;IA+IrD;;OAEG;YACW,YAAY;IA8E1B;;OAEG;IACG,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;CAuBhF"}