more fixes

Author: gmaclennan

src/reader-watch.js

@@ -5,27 +5,29 @@ import { Reader } from 'styled-map-package'
 
 import { noop } from './utils.js'
 
+const isWin = process.platform === 'win32'
+
 /**
  * Returns a function to get a reader instance that will change when file at the given filepath is changed.
  *
  * @param {string} filePath Path to the SMP file
  * @param {Object} [options]
  * @param {AbortSignal} [options.signal] Optional AbortSignal to close the reader when aborted
- * @returns {(() => Reader) & { close: () => Promise<void> }} Function that returns the current Reader instance, with a close() method to clean up the watcher and reader
+ * @returns {(() => Promise<Reader>) & { close: () => Promise<void> }} Function that returns the current Reader instance, with a close() method to clean up the watcher and reader
  */
 export function createReaderWatch(filePath, { signal } = {}) {
 	const dir = path.dirname(filePath)
 	let { reader, readerClose } = initializeReader()
 	const watcher = fs.watch(
 		dir,
 		{ signal, persistent: false },
-		async (_, filename) => {
+		(_, filename) => {
 			console.log(`File change '${_}' detected: ${filename}`)
 			// If filename is null (which can happen on some platforms), or if the
 			// changed file is the one we're watching, then we re-create the reader
 			if (filename && filename !== path.basename(filePath)) return
 			signal?.removeEventListener('abort', readerClose)
-			await readerClose()
+			readerClose()
 			;({ reader, readerClose } = initializeReader())
 		},
 	)
@@ -38,7 +40,14 @@ export function createReaderWatch(filePath, { signal } = {}) {
 	}
 
 	return Object.assign(
-		function getReader() {
+		async function getReader() {
+			if (isWin) {
+				try {
+					await fs.promises.access(filePath, fs.constants.F_OK)
+				} catch {
+					;({ reader, readerClose } = initializeReader())
+				}
+			}
 			return reader
 		},
 		{

test/reader-watch.test.js

@@ -15,15 +15,14 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url))
 const FIXTURE1_PATH = path.join(__dirname, 'fixtures', 'demotiles-z2.smp')
 const FIXTURE2_PATH = path.join(__dirname, 'fixtures', 'osm-bright-z6.smp')
 
-/** @param {import('node:test').TestContext} t */
 function tempDir() {
 	return fs.mkdtempSync(path.join(tmpdir(), 'comapeo-map-server-'))
 }
 
 test('createReaderWatch - valid smp file', async (t) => {
 	const getReader = createReaderWatch(FIXTURE1_PATH)
 	t.after(getReader.close)
-	const reader = getReader()
+	const reader = await getReader()
 	const style = await reader.getStyle('/')
 	assert(style, 'Style should be returned')
 	const tile = await reader.getResource('s/1/0/0/0.mvt.gz')
@@ -41,7 +40,7 @@ test('createReaderWatch - file does not exist initially', async (t) => {
 		await getReader.close()
 		await rmDir(dir)
 	})
-	const reader1 = getReader()
+	const reader1 = await getReader()
 	// Attempting to read from non-existent file should throw
 	await assert.rejects(
 		async () => await reader1.getStyle(),
@@ -50,7 +49,7 @@ test('createReaderWatch - file does not exist initially', async (t) => {
 	)
 	fs.copyFileSync(FIXTURE1_PATH, nonExistentPath)
 	await syncDir(dir) // Ensure copy is flushed and directory is synced
-	const reader2 = getReader()
+	const reader2 = await getReader()
 	// Now the reader should point to the new file
 	const style = await reader2.getStyle()
 	assert(style, 'Style should be readable after file is created')
@@ -71,15 +70,15 @@ test('createReaderWatch - file is replaced with different file', async (t) => {
 	})
 
 	// Read from initial file
-	const reader1 = getReader()
+	const reader1 = await getReader()
 	const style1 = await reader1.getStyle()
 	assert.equal(style1.name, 'MapLibre', 'Expected style name from fixture 1')
 
 	fs.copyFileSync(FIXTURE2_PATH, targetPath)
 	await syncDir(dir)
 
 	// The reader should be recreated
-	const reader2 = getReader()
+	const reader2 = await getReader()
 	const style2 = await reader2.getStyle()
 	assert.equal(style2.name, 'OSM Bright', 'Expected style name from fixture 2')
 })
@@ -96,7 +95,7 @@ test('createReaderWatch - file is deleted', async (t) => {
 		await rmDir(dir)
 	})
 
-	const reader1 = getReader()
+	const reader1 = await getReader()
 	const style1 = await reader1.getStyle()
 	assert.equal(
 		style1.name,
@@ -108,7 +107,7 @@ test('createReaderWatch - file is deleted', async (t) => {
 	fs.rmSync(targetPath, { force: true, maxRetries: 5 })
 	await syncDir(dir)
 
-	const reader2 = getReader()
+	const reader2 = await getReader()
 	try {
 		await reader2.getStyle()
 		console.log('Style read succeeded unexpectedly after file deletion')
@@ -137,7 +136,7 @@ test('createReaderWatch - invalid file (non-smp file)', async (t) => {
 		await rmDir(dir)
 	})
 
-	const reader = getReader()
+	const reader = await getReader()
 	assert(reader, 'Reader instance should be returned even for invalid file')
 
 	// Attempting to read from invalid file should throw
@@ -149,7 +148,7 @@ test('createReaderWatch - invalid file (non-smp file)', async (t) => {
 	fs.copyFileSync(FIXTURE1_PATH, invalidPath)
 	await syncDir(dir)
 
-	const reader2 = getReader()
+	const reader2 = await getReader()
 	const style = await reader2.getStyle()
 	assert.equal(
 		style.name,
@@ -169,7 +168,7 @@ test('createReaderWatch - close() cleans up watcher', async (t) => {
 		await rmDir(dir)
 	})
 
-	const reader1 = getReader()
+	const reader1 = await getReader()
 	const style = await reader1.getStyle()
 	assert.equal(style.name, 'MapLibre', 'Should be able to read before closing')
 
@@ -180,7 +179,7 @@ test('createReaderWatch - close() cleans up watcher', async (t) => {
 	fs.copyFileSync(FIXTURE2_PATH, targetPath)
 	await syncDir(dir)
 
-	const reader2 = getReader()
+	const reader2 = await getReader()
 	// The reader should still be the old instance
 	assert.strictEqual(
 		reader1,
@@ -210,7 +209,7 @@ test('createReaderWatch - AbortSignal integration', async (t) => {
 		await rmDir(dir)
 	})
 
-	const reader = getReader()
+	const reader = await getReader()
 	const style = await reader.getStyle()
 	assert(style, 'Should be able to read with AbortSignal')
 
@@ -221,7 +220,7 @@ test('createReaderWatch - AbortSignal integration', async (t) => {
 	await syncDir(dir)
 
 	// reader should still be same instance because watcher is closed
-	const reader2 = getReader()
+	const reader2 = await getReader()
 	assert.strictEqual(
 		reader,
 		reader2,
@@ -247,7 +246,7 @@ test('createReaderWatch - watcher only recreates reader for target file changes'
 
 	const getReader = createReaderWatch(targetPath)
 
-	const reader1 = getReader()
+	const reader1 = await getReader()
 	t.after(async () => {
 		await getReader.close()
 		await rmDir(dir)
@@ -263,7 +262,7 @@ test('createReaderWatch - watcher only recreates reader for target file changes'
 	await syncDir(dir)
 
 	// reader should be same instance (not changed because of file watcher)
-	const reader2 = getReader()
+	const reader2 = await getReader()
 	assert.strictEqual(
 		reader1,
 		reader2,
@@ -274,8 +273,8 @@ test('createReaderWatch - watcher only recreates reader for target file changes'
 test('createReaderWatch - getReader returns current reader instance', async (t) => {
 	const getReader = createReaderWatch(FIXTURE1_PATH)
 	t.after(getReader.close)
-	const reader1 = getReader()
-	const reader2 = getReader()
+	const reader1 = await getReader()
+	const reader2 = await getReader()
 
 	// Before any file changes, should return the same instance
 	assert.strictEqual(