feat(PeerStorage): add usePolling option

Peer.ts

@@ -1,9 +1,9 @@
 import { join as joinPosix } from "https://deno.land/std@0.203.0/path/posix.ts";
-import { FileInfo } from "./lib/src/DirectFileManipulator.ts";
-import { FilePathWithPrefix, LOG_LEVEL, LOG_LEVEL_DEBUG, LOG_LEVEL_INFO } from "./lib/src/types.ts";
+import { FileInfo } from "./lib/src/API/DirectFileManipulator.ts";
+import { FilePathWithPrefix, LOG_LEVEL, LOG_LEVEL_DEBUG, LOG_LEVEL_INFO } from "./lib/src/common/types.ts";
 import { PeerConf, FileData } from "./types.ts";
-import { Logger } from "./lib/src/logger.ts";
-import { LRUCache } from "./lib/src/LRUCache.ts";
+import { Logger } from "./lib/src/common/logger.ts";
+import { LRUCache } from "./lib/src/memory/LRUCache.ts";
 import { computeHash } from "./util.ts";
 
 export type DispatchFun = (source: Peer, path: string, data: FileData | false) => Promise<void>;

PeerCouchDB.ts

@@ -1,10 +1,10 @@
-import { DirectFileManipulator, FileInfo, MetaEntry, ReadyEntry } from "./lib/src/DirectFileManipulator.ts";
-import { FilePathWithPrefix, LOG_LEVEL_NOTICE, MILSTONE_DOCID } from "./lib/src/types.ts";
+import { DirectFileManipulator, FileInfo, MetaEntry, ReadyEntry } from "./lib/src/API/DirectFileManipulator.ts";
+import { FilePathWithPrefix, LOG_LEVEL_NOTICE, MILSTONE_DOCID } from "./lib/src/common/types.ts";
 import { PeerCouchDBConf, FileData } from "./types.ts";
-import { decodeBinary } from "./lib/src/strbin.ts";
-import { isPlainText } from "./lib/src/path.ts";
+import { decodeBinary } from "./lib/src/string_and_binary/convert.ts";
+import { isPlainText } from "./lib/src/string_and_binary/path.ts";
 import { DispatchFun, Peer } from "./Peer.ts";
-import { createBinaryBlob, createTextBlob, isDocContentSame } from "./lib/src/utils.ts";
+import { createBinaryBlob, createTextBlob, isDocContentSame } from "./lib/src/common/utils.ts";
 
 // export class PeerInstance()
 

PeerStorage.ts

@@ -1,15 +1,15 @@
 import { dirname, resolve } from "https://deno.land/std@0.203.0/path/mod.ts";
-import { LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "./lib/src/types.ts";
+import { LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "./lib/src/common/types.ts";
 import { PeerStorageConf, FileData } from "./types.ts";
-import { Logger } from "./lib/src/logger.ts";
-import { delay, getDocData } from "./lib/src/utils.ts";
-import { isPlainText } from "./lib/src/path.ts";
+import { Logger } from "./lib/src/common/logger.ts";
+import { delay, getDocData } from "./lib/src/common/utils.ts";
+import { isPlainText } from "./lib/src/string_and_binary/path.ts";
 import { posixParse } from "https://deno.land/std@0.203.0/path/_parse.ts";
 import { relative } from "https://deno.land/std@0.203.0/path/relative.ts";
 import { format } from "https://deno.land/std@0.203.0/path/format.ts";
 import { parse } from "https://deno.land/std@0.203.0/path/parse.ts";
 import { posixFormat } from "https://deno.land/std@0.203.0/path/_format.ts";
-import { scheduleOnceIfDuplicated } from "./lib/src/lock.ts";
+import { scheduleOnceIfDuplicated } from "./lib/src/concurrency/lock.ts";
 import { DispatchFun, Peer } from "./Peer.ts";
 
 import chokidar from "npm:chokidar";
@@ -242,6 +242,7 @@ export class PeerStorage extends Peer {
                 awaitWriteFinish: {
                     stabilityThreshold: 500,
                 },
+                usePolling: this.config.usePolling,
             });
 
         this.watcher.on("change",async (path)=>{

dat/config.sample.json

@@ -56,7 +56,8 @@
                     "$mode"
                 ]
             },
-            "scanOfflineChanges": true
+            "scanOfflineChanges": true,
+            "usePolling": true
         }
     ]
-}
+}

main.ts

@@ -1,5 +1,5 @@
-import { defaultLoggerEnv } from "./lib/src/logger.ts";
-import { LOG_LEVEL_DEBUG } from "./lib/src/types.ts";
+import { defaultLoggerEnv } from "./lib/src/common/logger.ts";
+import { LOG_LEVEL_DEBUG } from "./lib/src/common/types.ts";
 import { Hub } from "./Hub.ts";
 import { Config } from "./types.ts";
 import { parse } from "https://deno.land/std@0.202.0/flags/mod.ts";
@@ -27,4 +27,4 @@ try {
 }
 console.log("LiveSync Bridge is now started!");
 const hub = new Hub(config);
-hub.start();
+hub.start();

readme.md

@@ -101,6 +101,7 @@ The configuration file consists of the following structure.
         // $filename and $mode have been set also in environment variables.
       },
       "scanOfflineChanges": true,
+      "usePolling": false // Optional. Use polling instead of inotify to watch file changes.
     }
   ]
 }

types.ts

@@ -1,4 +1,4 @@
-import { DirectFileManipulatorOptions } from "./lib/src/DirectFileManipulator.ts";
+import { DirectFileManipulatorOptions } from "./lib/src/API/DirectFileManipulator.ts";
 
 export interface Config {
     peers: PeerConf[];
@@ -11,6 +11,7 @@ export interface PeerStorageConf {
     group?: string;
     name: string;
     baseDir: string;
+    usePolling?: boolean;
     processor?: {
         cmd: string,
         args: string[]
@@ -44,4 +45,4 @@ export type FileData = {
     size: number;
     data: string[] | Uint8Array
     deleted?: boolean;
-}
+}

util.ts

@@ -1,5 +1,5 @@
-import { uint8ArrayToHexString } from "./lib/src/strbin.ts";
-import { createTextBlob } from "./lib/src/utils.ts";
+import { uint8ArrayToHexString } from "./lib/src/string_and_binary/convert.ts";
+import { createTextBlob } from "./lib/src/common/utils.ts";
 export async function computeHashUInt8Array(key: Uint8Array) {
     const digest = await crypto.subtle.digest('SHA-256', key);
     return uint8ArrayToHexString(new Uint8Array(digest));
@@ -20,4 +20,4 @@ export function makeUniqueString() {
         .map((e) => randomStrSrc[e])
         .join("");
     return `${Date.now()}-${temp}`;
-}
+}