Updates

dist/index.d.ts

@@ -1,2 +1,5 @@
 #!/usr/bin/env node
+declare global {
+    var SYNCING: boolean;
+}
 export {};

dist/index.js

@@ -8,6 +8,7 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const child_process_1 = require("child_process");
 const env_1 = __importDefault(require("./utils/env"));
+global.SYNCING = false;
 const confFileProvidedPath = process.argv[process.argv.length - 1];
 if (confFileProvidedPath === "--version" || confFileProvidedPath === "-v") {
     try {
@@ -47,7 +48,6 @@ try {
     if (!configJSON)
         throw new Error("Config JSON could not be resolved. Please check your files.");
     const parsedConfigJSON = (0, env_1.default)({ json: configJSON });
-    /** @type {import(".").TurboSyncConfigArray} */
     const configArray = JSON.parse(parsedConfigJSON);
     for (let i = 0; i < configArray.length; i++) {
         const config = configArray[i];

dist/lib/sync.js

@@ -7,6 +7,7 @@ const child_process_1 = require("child_process");
 const files_1 = __importDefault(require("./watch/files"));
 const folders_1 = __importDefault(require("./watch/folders"));
 const confFileProvidedJSON = process.argv[process.argv.length - 1];
+global.SYNCING = false;
 try {
     const configFileObject = JSON.parse(confFileProvidedJSON);
     console.log(`Running '${configFileObject.title}' ...`);

dist/lib/watch/files.js

@@ -70,13 +70,16 @@ function watchFiles(_a) {
                     sync({ options, filePath, files });
                     yield (0, delay_1.default)();
                     fs_1.default.watchFile(filePath, {
-                        interval: interval || 500,
+                        interval: interval || 200,
                     }, (curr, prev) => {
+                        if (global.SYNCING)
+                            return;
                         const INTERVAL = (options === null || options === void 0 ? void 0 : options.interval)
                             ? options.interval
                             : UPDATE_TIMEOUT;
                         clearTimeout(timeout);
                         timeout = setTimeout(() => {
+                            global.SYNCING = true;
                             sync({ options, filePath, files });
                             process.exit(1);
                         }, INTERVAL);

dist/lib/watch/folders.js

@@ -18,7 +18,7 @@ const path_1 = __importDefault(require("path"));
 const child_process_1 = require("child_process");
 const delay_1 = __importDefault(require("../../utils/delay"));
 let timeout;
-const UPDATE_TIMEOUT = 2000;
+const UPDATE_TIMEOUT = 200;
 function watchFolders(_a) {
     return __awaiter(this, arguments, void 0, function* ({ folders, options, }) {
         try {
@@ -79,8 +79,11 @@ function watchFolders(_a) {
                     sync({ dirPath, dirs, options });
                     yield (0, delay_1.default)();
                     fs_1.default.watch(dirPath, { recursive: true }, (evt, fileName) => {
+                        if (global.SYNCING)
+                            return;
                         clearTimeout(timeout);
                         timeout = setTimeout(() => {
+                            global.SYNCING = true;
                             sync({ dirPath, dirs, options });
                             process.exit(1);
                         }, INTERVAL);

dist/test/test-1/folder-1/test-file-2.d.ts

@@ -0,0 +1 @@
+export {};

dist/test/test-1/folder-1/test-file-2.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

dist/test/test-1/folder-1/test.d.ts

@@ -0,0 +1 @@
+export {};

dist/test/test-1/folder-1/test.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

dist/test/test-1/folder-2/test-file-2.d.ts

@@ -0,0 +1 @@
+export {};

dist/test/test-1/folder-2/test-file-2.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

dist/test/test-1/folder-2/test.d.ts

@@ -0,0 +1 @@
+export {};

dist/test/test-1/folder-2/test.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

dist/types/index.d.ts

@@ -1,8 +1,8 @@
 export type TurboSyncConfigArray = TurboSyncConfigObject[];
 export interface TurboSyncConfigObject {
     title?: string;
-    files?: string[] | TurboSyncFileObject[];
+    files?: (string | TurboSyncFileObject)[];
-    folders?: string[] | TurboSyncFileObject[];
+    folders?: (string | TurboSyncFileObject)[];
     options?: TurboSyncOptions;
 }
 export interface TurboSyncFileObject {
@@ -18,20 +18,20 @@ export interface TurboSyncOptions {
     interval?: number;
 }
 export interface SyncFilesFnParams {
-    files: string[] | TurboSyncFileObject[];
+    files: (string | TurboSyncFileObject)[];
     options: TurboSyncOptions | undefined;
 }
 export interface SyncFilesSyncFnParams {
-    files: string[] | TurboSyncFileObject[];
+    files: (string | TurboSyncFileObject)[];
     options: TurboSyncOptions | undefined;
     filePath: string;
 }
 export interface SyncFoldersFnParams {
-    folders: string[] | TurboSyncFileObject[];
+    folders: (string | TurboSyncFileObject)[];
     options: TurboSyncOptions | undefined;
 }
 export interface SyncFoldersSyncFnParams {
-    dirs: string[] | TurboSyncFileObject[];
+    dirs: (string | TurboSyncFileObject)[];
     options: TurboSyncOptions | undefined;
     dirPath: string;
     init?: boolean;

dist/utils/delay.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = delay;
 function delay() {
-    return __awaiter(this, arguments, void 0, function* (time = 500) {
+    return __awaiter(this, arguments, void 0, function* (time = 200) {
         return new Promise((resolve) => {
             setTimeout(() => {
                 resolve(true);

index.ts

@@ -4,6 +4,13 @@ import fs from "fs";
 import path from "path";
 import { spawn } from "child_process";
 import handleEnvVars from "./utils/env";
+import { TurboSyncConfigArray } from "./types";
+
+declare global {
+    var SYNCING: boolean;
+}
+
+global.SYNCING = false;
 
 const confFileProvidedPath = process.argv[process.argv.length - 1];
 
@@ -71,8 +78,7 @@ try {
 
     const parsedConfigJSON = handleEnvVars({ json: configJSON });
 
-    /** @type {import(".").TurboSyncConfigArray} */
+    const configArray = JSON.parse(parsedConfigJSON) as TurboSyncConfigArray;
-    const configArray = JSON.parse(parsedConfigJSON);
 
     for (let i = 0; i < configArray.length; i++) {
         const config = configArray[i];

lib/sync.ts

@@ -4,6 +4,8 @@ import watchFolders from "./watch/folders";
 
 const confFileProvidedJSON = process.argv[process.argv.length - 1];
 
+global.SYNCING = false;
+
 try {
     const configFileObject = JSON.parse(confFileProvidedJSON);
 

lib/watch/files.ts

@@ -69,9 +69,11 @@ export default async function watchFiles({
                 fs.watchFile(
                     filePath,
                     {
-                        interval: interval || 500,
+                        interval: interval || 200,
                     },
                     (curr, prev) => {
+                        if (global.SYNCING) return;
+
                         const INTERVAL = options?.interval
                             ? options.interval
                             : UPDATE_TIMEOUT;
@@ -79,6 +81,7 @@ export default async function watchFiles({
                         clearTimeout(timeout);
 
                         timeout = setTimeout(() => {
+                            global.SYNCING = true;
                             sync({ options, filePath, files });
                             process.exit(1);
                         }, INTERVAL);

lib/watch/folders.ts

@@ -5,7 +5,7 @@ import delay from "../../utils/delay";
 import { SyncFoldersFnParams, SyncFoldersSyncFnParams } from "../../types";
 
 let timeout: any;
-const UPDATE_TIMEOUT = 2000;
+const UPDATE_TIMEOUT = 200;
 
 export default async function watchFolders({
     folders,
@@ -85,9 +85,11 @@ export default async function watchFolders({
                 await delay();
 
                 fs.watch(dirPath, { recursive: true }, (evt, fileName) => {
+                    if (global.SYNCING) return;
                     clearTimeout(timeout);
 
                     timeout = setTimeout(() => {
+                        global.SYNCING = true;
                         sync({ dirPath, dirs, options });
                         process.exit(1);
                     }, INTERVAL);

package.json

@@ -1,12 +1,12 @@
 {
     "name": "@moduletrace/turbosync",
-    "version": "1.0.2",
+    "version": "1.0.4",
     "module": "dist/index.js",
     "scripts": {
         "start": "node dist/index.js",
         "build": "tsc",
         "compile": "bun build index.ts --compile --outfile bin/turbosync",
-        "dev": "node index.js --watch"
+        "dev": "tsc --watch"
     },
     "bin": {
         "turbosync": "./dist/index.js"

schema/turbosync.config.schema.json

@@ -0,0 +1,32 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "type": "array",
+    "items": {
+        "type": "object",
+        "properties": {
+            "title": {
+                "type": "string"
+            },
+            "options": {
+                "type": "object",
+                "properties": {
+                    "delete": {
+                        "type": "boolean"
+                    }
+                },
+                "required": ["delete"],
+                "additionalProperties": false
+            },
+            "folders": {
+                "type": "array",
+                "items": {
+                    "type": "string",
+                    "format": "uri-reference"
+                },
+                "minItems": 1
+            }
+        },
+        "required": ["title", "options", "folders"],
+        "additionalProperties": false
+    }
+}

schema/turbosync.config.test.json

@@ -0,0 +1,10 @@
+[
+    {
+        "title": "Sync Title",
+        "options": {
+            "delete": true
+        },
+        "folders": ["/home/user/folder-1", "/home/user/folder-2"],
+        "files": ["/home/user/file-1.txt", "/home/user/file-2.txt"]
+    }
+]

types/index.ts

@@ -2,8 +2,8 @@ export type TurboSyncConfigArray = TurboSyncConfigObject[];
 
 export interface TurboSyncConfigObject {
     title?: string;
-    files?: string[] | TurboSyncFileObject[];
+    files?: (string | TurboSyncFileObject)[];
-    folders?: string[] | TurboSyncFileObject[];
+    folders?: (string | TurboSyncFileObject)[];
     options?: TurboSyncOptions;
 }
 
@@ -22,23 +22,23 @@ export interface TurboSyncOptions {
 }
 
 export interface SyncFilesFnParams {
-    files: string[] | TurboSyncFileObject[];
+    files: (string | TurboSyncFileObject)[];
     options: TurboSyncOptions | undefined;
 }
 
 export interface SyncFilesSyncFnParams {
-    files: string[] | TurboSyncFileObject[];
+    files: (string | TurboSyncFileObject)[];
     options: TurboSyncOptions | undefined;
     filePath: string;
 }
 
 export interface SyncFoldersFnParams {
-    folders: string[] | TurboSyncFileObject[];
+    folders: (string | TurboSyncFileObject)[];
     options: TurboSyncOptions | undefined;
 }
 
 export interface SyncFoldersSyncFnParams {
-    dirs: string[] | TurboSyncFileObject[];
+    dirs: (string | TurboSyncFileObject)[];
     options: TurboSyncOptions | undefined;
     dirPath: string;
     init?: boolean;

utils/delay.ts

@@ -1,4 +1,4 @@
-export default async function delay(time: number = 500) {
+export default async function delay(time: number = 200) {
     return new Promise((resolve) => {
         setTimeout(() => {
             resolve(true);