Skip to content

Commit d8ed3f2

Browse files
committed
test: fs.watchAsync and fs.unwatchAsync integ tests
1 parent 53b7de6 commit d8ed3f2

10 files changed

Lines changed: 523 additions & 154 deletions

File tree

dist/phoenix-fs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ function _watch(ws, metadata) {
336336
});
337337
const eventEmitterID = generateRandomId();
338338
watcher.eventEmitterID = eventEmitterID;
339-
watchersMap[watcher.eventEmitterID] = watcher;
339+
watchersMap[eventEmitterID] = watcher;
340340
watcher.on('ready', () => {
341341
if(readySent){
342342
return;

dist/virtualfs.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/virtualfs.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src-tauri/node-src/phoenix-fs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ function _watch(ws, metadata) {
336336
});
337337
const eventEmitterID = generateRandomId();
338338
watcher.eventEmitterID = eventEmitterID;
339-
watchersMap[watcher.eventEmitterID] = watcher;
339+
watchersMap[eventEmitterID] = watcher;
340340
watcher.on('ready', () => {
341341
if(readySent){
342342
return;

src/fslib.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,13 @@ const fileSystemLib = {
356356
MOUNT_POINT_ROOT: Constants.MOUNT_POINT_ROOT,
357357
TAURI_ROOT: Constants.TAURI_ROOT,
358358
ERR_CODES: {},
359+
WATCH_EVENTS: {
360+
ADD_FILE: "add",
361+
ADD_DIR: "addDir",
362+
CHANGE: "change",
363+
UNLINK_FILE: "unlink",
364+
UNLINK_DIR: "unlinkDir"
365+
},
359366
isEncodingSupported: function (encoding) {
360367
if(encoding.toLowerCase() === Constants.BYTE_ARRAY_ENCODING){
361368
return true;

src/fslib_node_ws.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,9 @@ function removeNodeEventListener(eventEmitter) {
205205
function _processEvent(metadata, bufferData) {
206206
const eventEmitter = _eventEmitter[metadata.eventEmitterID];
207207
if(eventEmitter){
208+
if(metadata.data.path){
209+
metadata.data.path = Utils.getTauriVirtualPath(metadata.data.path);
210+
}
208211
eventEmitter.emit(metadata.eventName, metadata.data, bufferData);
209212
} else {
210213
console.error("FS: Received stray event: ", metadata);

test/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@
8686

8787
<script src="testInit.js"></script>
8888
<script src="test-node.browser.js"></script>
89+
<script src="test-watcher.browser.js"></script>
8990
<script src="test-dir.browser.js"></script>
9091
<script src="test-file.browser.js"></script>
9192
<script src="test-copy.browser.js"></script>

0 commit comments

Comments
 (0)