feat(watchers): Improve write stabilization and ignore temporary editor files
This commit is contained in:
@@ -1,5 +1,14 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 2025-12-08 - 5.1.0 - feat(watchers)
|
||||||
|
Improve write stabilization and ignore temporary editor files
|
||||||
|
|
||||||
|
- Add maxWaitTime option (ms) to IWatcherOptions and WriteStabilizer to cap how long stabilization will wait (default: 1000ms).
|
||||||
|
- WriteStabilizer: reduce default stabilityThreshold from 300ms to 100ms and track write start time to enforce maxWaitTime and avoid indefinite polling.
|
||||||
|
- Node and Deno watchers: detect and ignore common temporary/editor files (e.g. *.tmp.*, *.swp, *.swx, trailing ~, .#*) to prevent spurious events from atomic saves.
|
||||||
|
- Node watcher: treat rename (atomic-save) events as already-complete files and emit add/change immediately without stabilization.
|
||||||
|
- Deno watcher: use the configured maxWaitTime and polling-based stabilization for modify events to ensure consistent behavior across runtimes.
|
||||||
|
|
||||||
## 2025-11-30 - 5.0.0 - BREAKING CHANGE(@push.rocks/smartwatch)
|
## 2025-11-30 - 5.0.0 - BREAKING CHANGE(@push.rocks/smartwatch)
|
||||||
Rename package and update branding/docs: switch from @push.rocks/smartchok to @push.rocks/smartwatch, update repository/homepage/bugs URLs and author, and refresh README examples and install instructions.
|
Rename package and update branding/docs: switch from @push.rocks/smartchok to @push.rocks/smartwatch, update repository/homepage/bugs URLs and author, and refresh README examples and install instructions.
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,6 @@
|
|||||||
*/
|
*/
|
||||||
export const commitinfo = {
|
export const commitinfo = {
|
||||||
name: '@push.rocks/smartwatch',
|
name: '@push.rocks/smartwatch',
|
||||||
version: '5.0.0',
|
version: '5.1.0',
|
||||||
description: 'A cross-runtime file watcher with glob pattern support for Node.js, Deno, and Bun.'
|
description: 'A cross-runtime file watcher with glob pattern support for Node.js, Deno, and Bun.'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -132,8 +132,9 @@ export class Smartwatch {
|
|||||||
basePaths: watchPaths,
|
basePaths: watchPaths,
|
||||||
depth: 4,
|
depth: 4,
|
||||||
followSymlinks: false,
|
followSymlinks: false,
|
||||||
stabilityThreshold: 300,
|
stabilityThreshold: 100,
|
||||||
pollInterval: 100
|
pollInterval: 100,
|
||||||
|
maxWaitTime: 1000
|
||||||
});
|
});
|
||||||
|
|
||||||
// Subscribe to watcher events and dispatch to appropriate subjects
|
// Subscribe to watcher events and dispatch to appropriate subjects
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import * as fs from 'fs';
|
|||||||
interface IPendingWrite {
|
interface IPendingWrite {
|
||||||
lastSize: number;
|
lastSize: number;
|
||||||
lastChange: number;
|
lastChange: number;
|
||||||
|
startTime: number;
|
||||||
timeoutId: ReturnType<typeof setTimeout>;
|
timeoutId: ReturnType<typeof setTimeout>;
|
||||||
resolve: (stats: fs.Stats) => void;
|
resolve: (stats: fs.Stats) => void;
|
||||||
reject: (error: Error) => void;
|
reject: (error: Error) => void;
|
||||||
@@ -16,8 +17,9 @@ export class WriteStabilizer {
|
|||||||
private pendingWrites = new Map<string, IPendingWrite>();
|
private pendingWrites = new Map<string, IPendingWrite>();
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private stabilityThreshold: number = 300,
|
private stabilityThreshold: number = 100,
|
||||||
private pollInterval: number = 100
|
private pollInterval: number = 100,
|
||||||
|
private maxWaitTime: number = 1000
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -28,6 +30,8 @@ export class WriteStabilizer {
|
|||||||
this.cancel(filePath);
|
this.cancel(filePath);
|
||||||
|
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
|
const startTime = Date.now();
|
||||||
|
|
||||||
const poll = async () => {
|
const poll = async () => {
|
||||||
try {
|
try {
|
||||||
const stats = await fs.promises.stat(filePath);
|
const stats = await fs.promises.stat(filePath);
|
||||||
@@ -40,6 +44,13 @@ export class WriteStabilizer {
|
|||||||
|
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
|
|
||||||
|
// Check if we've exceeded max wait time - emit with current stats
|
||||||
|
if (now - pending.startTime >= this.maxWaitTime) {
|
||||||
|
this.pendingWrites.delete(filePath);
|
||||||
|
resolve(stats);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (stats.size !== pending.lastSize) {
|
if (stats.size !== pending.lastSize) {
|
||||||
// Size changed - file is still being written, reset timer
|
// Size changed - file is still being written, reset timer
|
||||||
pending.lastSize = stats.size;
|
pending.lastSize = stats.size;
|
||||||
@@ -66,7 +77,8 @@ export class WriteStabilizer {
|
|||||||
|
|
||||||
this.pendingWrites.set(filePath, {
|
this.pendingWrites.set(filePath, {
|
||||||
lastSize: -1,
|
lastSize: -1,
|
||||||
lastChange: Date.now(),
|
lastChange: startTime,
|
||||||
|
startTime: startTime,
|
||||||
timeoutId: setTimeout(poll, this.pollInterval),
|
timeoutId: setTimeout(poll, this.pollInterval),
|
||||||
resolve,
|
resolve,
|
||||||
reject
|
reject
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ export const defaultWatcherOptions: IWatcherOptions = {
|
|||||||
basePaths: [],
|
basePaths: [],
|
||||||
depth: 4,
|
depth: 4,
|
||||||
followSymlinks: false,
|
followSymlinks: false,
|
||||||
stabilityThreshold: 300,
|
stabilityThreshold: 100,
|
||||||
pollInterval: 100
|
pollInterval: 100,
|
||||||
|
maxWaitTime: 1000
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -30,6 +30,8 @@ export interface IWatcherOptions {
|
|||||||
stabilityThreshold: number;
|
stabilityThreshold: number;
|
||||||
/** Poll interval for write detection (ms) */
|
/** Poll interval for write detection (ms) */
|
||||||
pollInterval: number;
|
pollInterval: number;
|
||||||
|
/** Maximum time to wait for write stabilization (ms) */
|
||||||
|
maxWaitTime: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -74,6 +74,19 @@ export class DenoWatcher implements IWatcher {
|
|||||||
|
|
||||||
constructor(private options: IWatcherOptions) {}
|
constructor(private options: IWatcherOptions) {}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if a file is a temporary file created by editors
|
||||||
|
*/
|
||||||
|
private isTemporaryFile(filePath: string): boolean {
|
||||||
|
const basename = filePath.split('/').pop() || '';
|
||||||
|
// Editor temp files: *.tmp.*, *.swp, *.swx, *~, .#*
|
||||||
|
if (basename.includes('.tmp.')) return true;
|
||||||
|
if (basename.endsWith('.swp') || basename.endsWith('.swx')) return true;
|
||||||
|
if (basename.endsWith('~')) return true;
|
||||||
|
if (basename.startsWith('.#')) return true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
get isWatching(): boolean {
|
get isWatching(): boolean {
|
||||||
return this._isWatching;
|
return this._isWatching;
|
||||||
}
|
}
|
||||||
@@ -162,6 +175,11 @@ export class DenoWatcher implements IWatcher {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Skip temporary files created by editors (atomic saves)
|
||||||
|
if (this.isTemporaryFile(filePath)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Throttle duplicate events
|
// Throttle duplicate events
|
||||||
if (!this.shouldEmit(filePath, kind)) {
|
if (!this.shouldEmit(filePath, kind)) {
|
||||||
return;
|
return;
|
||||||
@@ -169,19 +187,15 @@ export class DenoWatcher implements IWatcher {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
if (kind === 'create') {
|
if (kind === 'create') {
|
||||||
|
// Create events (atomic saves) don't need stabilization - file is already complete
|
||||||
const stats = await this.statSafe(filePath);
|
const stats = await this.statSafe(filePath);
|
||||||
if (stats) {
|
if (stats) {
|
||||||
// Wait for write to stabilize
|
|
||||||
await this.waitForWriteFinish(filePath);
|
|
||||||
const finalStats = await this.statSafe(filePath);
|
|
||||||
|
|
||||||
if (finalStats) {
|
|
||||||
this.watchedFiles.add(filePath);
|
this.watchedFiles.add(filePath);
|
||||||
const eventType: TWatchEventType = finalStats.isDirectory() ? 'addDir' : 'add';
|
const eventType: TWatchEventType = stats.isDirectory() ? 'addDir' : 'add';
|
||||||
this.events$.next({ type: eventType, path: filePath, stats: finalStats });
|
this.events$.next({ type: eventType, path: filePath, stats });
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} else if (kind === 'modify') {
|
} else if (kind === 'modify') {
|
||||||
|
// Modify events are in-place writes - use stabilization
|
||||||
const stats = await this.statSafe(filePath);
|
const stats = await this.statSafe(filePath);
|
||||||
if (stats && !stats.isDirectory()) {
|
if (stats && !stats.isDirectory()) {
|
||||||
// Wait for write to stabilize
|
// Wait for write to stabilize
|
||||||
@@ -212,6 +226,7 @@ export class DenoWatcher implements IWatcher {
|
|||||||
return new Promise((resolve) => {
|
return new Promise((resolve) => {
|
||||||
let lastSize = -1;
|
let lastSize = -1;
|
||||||
let lastChange = Date.now();
|
let lastChange = Date.now();
|
||||||
|
const startTime = Date.now();
|
||||||
|
|
||||||
const poll = async () => {
|
const poll = async () => {
|
||||||
try {
|
try {
|
||||||
@@ -222,6 +237,14 @@ export class DenoWatcher implements IWatcher {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
|
|
||||||
|
// Check if we've exceeded max wait time - resolve immediately
|
||||||
|
if (now - startTime >= this.options.maxWaitTime) {
|
||||||
|
this.pendingWrites.delete(filePath);
|
||||||
|
resolve();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (stats.size !== lastSize) {
|
if (stats.size !== lastSize) {
|
||||||
lastSize = stats.size;
|
lastSize = stats.size;
|
||||||
lastChange = now;
|
lastChange = now;
|
||||||
|
|||||||
@@ -20,10 +20,24 @@ export class NodeWatcher implements IWatcher {
|
|||||||
constructor(private options: IWatcherOptions) {
|
constructor(private options: IWatcherOptions) {
|
||||||
this.writeStabilizer = new WriteStabilizer(
|
this.writeStabilizer = new WriteStabilizer(
|
||||||
options.stabilityThreshold,
|
options.stabilityThreshold,
|
||||||
options.pollInterval
|
options.pollInterval,
|
||||||
|
options.maxWaitTime
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if a file is a temporary file created by editors
|
||||||
|
*/
|
||||||
|
private isTemporaryFile(filePath: string): boolean {
|
||||||
|
const basename = path.basename(filePath);
|
||||||
|
// Editor temp files: *.tmp.*, *.swp, *.swx, *~, .#*
|
||||||
|
if (basename.includes('.tmp.')) return true;
|
||||||
|
if (basename.endsWith('.swp') || basename.endsWith('.swx')) return true;
|
||||||
|
if (basename.endsWith('~')) return true;
|
||||||
|
if (basename.startsWith('.#')) return true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
get isWatching(): boolean {
|
get isWatching(): boolean {
|
||||||
return this._isWatching;
|
return this._isWatching;
|
||||||
}
|
}
|
||||||
@@ -114,6 +128,11 @@ export class NodeWatcher implements IWatcher {
|
|||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
const fullPath = path.join(basePath, filename);
|
const fullPath = path.join(basePath, filename);
|
||||||
|
|
||||||
|
// Skip temporary files created by editors (atomic saves)
|
||||||
|
if (this.isTemporaryFile(fullPath)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Throttle duplicate events
|
// Throttle duplicate events
|
||||||
if (!this.shouldEmit(fullPath, eventType)) {
|
if (!this.shouldEmit(fullPath, eventType)) {
|
||||||
return;
|
return;
|
||||||
@@ -132,23 +151,14 @@ export class NodeWatcher implements IWatcher {
|
|||||||
this.events$.next({ type: 'addDir', path: fullPath, stats });
|
this.events$.next({ type: 'addDir', path: fullPath, stats });
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Wait for write to stabilize before emitting
|
// Rename events (atomic saves) don't need stabilization - file is already complete
|
||||||
try {
|
|
||||||
const stableStats = await this.writeStabilizer.waitForWriteFinish(fullPath);
|
|
||||||
const wasWatched = this.watchedFiles.has(fullPath);
|
const wasWatched = this.watchedFiles.has(fullPath);
|
||||||
this.watchedFiles.add(fullPath);
|
this.watchedFiles.add(fullPath);
|
||||||
this.events$.next({
|
this.events$.next({
|
||||||
type: wasWatched ? 'change' : 'add',
|
type: wasWatched ? 'change' : 'add',
|
||||||
path: fullPath,
|
path: fullPath,
|
||||||
stats: stableStats
|
stats
|
||||||
});
|
});
|
||||||
} catch {
|
|
||||||
// File was deleted during stabilization
|
|
||||||
if (this.watchedFiles.has(fullPath)) {
|
|
||||||
this.watchedFiles.delete(fullPath);
|
|
||||||
this.events$.next({ type: 'unlink', path: fullPath });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// File doesn't exist - it was deleted
|
// File doesn't exist - it was deleted
|
||||||
@@ -162,7 +172,7 @@ export class NodeWatcher implements IWatcher {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (eventType === 'change') {
|
} else if (eventType === 'change') {
|
||||||
// File was modified
|
// File was modified in-place - use stabilization for streaming writes
|
||||||
if (stats && !stats.isDirectory()) {
|
if (stats && !stats.isDirectory()) {
|
||||||
try {
|
try {
|
||||||
const stableStats = await this.writeStabilizer.waitForWriteFinish(fullPath);
|
const stableStats = await this.writeStabilizer.waitForWriteFinish(fullPath);
|
||||||
|
|||||||
Reference in New Issue
Block a user