@dignetwork/dig-sdk 0.0.1-alpha.11 → 0.0.1-alpha.13

package/dist/utils/directoryUtils.d.ts

@@ -1,15 +1,3 @@
 import { DataIntegrityTree } from "../DataIntegrityTree";
-/**
- * Recursively add all files in a directory to the Merkle tree, skipping the .dig, .git folders, and files in .gitignore.
- * @param datalayer - The DataStoreManager instance.
- * @param dirPath - The directory path.
- * @param baseDir - The base directory for relative paths.
- */
 export declare const addDirectory: (datalayer: DataIntegrityTree, dirPath: string, baseDir?: string) => Promise<void>;
-/**
- * Calculate the total size of the DIG_FOLDER_PATH
- * @param folderPath - The path of the folder to calculate size.
- * @returns The total size of the folder in bytes.
- */
-export declare const calculateFolderSize: (folderPath: string) => bigint;
 //# sourceMappingURL=directoryUtils.d.ts.map

package/dist/utils/directoryUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"directoryUtils.d.ts","sourceRoot":"","sources":["../../src/utils/directoryUtils.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAUzD;;;;;GAKG;AACH,eAAO,MAAM,YAAY,cACZ,iBAAiB,WACnB,MAAM,YACN,MAAM,KACd,OAAO,CAAC,IAAI,CA0Cd,CAAC;AAGF;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,eAAgB,MAAM,KAAG,MAiBxD,CAAC"}
+{"version":3,"file":"directoryUtils.d.ts","sourceRoot":"","sources":["../../src/utils/directoryUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AA2BzD,eAAO,MAAM,YAAY,cACZ,iBAAiB,WACnB,MAAM,YACN,MAAM,KACd,OAAO,CAAC,IAAI,CA2Cd,CAAC"}

package/dist/utils/directoryUtils.js

@@ -26,48 +26,54 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateFolderSize = exports.addDirectory = void 0;
-const fs = __importStar(require("fs"));
+exports.addDirectory = void 0;
 const path = __importStar(require("path"));
-const util_1 = require("util");
+const fs = __importStar(require("fs"));
 const ignore_1 = __importDefault(require("ignore"));
-const p_limit_1 = __importDefault(require("p-limit"));
-const limit = (0, p_limit_1.default)(10); // Limit the concurrency to 10 (adjust based on your system's file descriptor limit)
-// Promisify fs methods
-const readdir = (0, util_1.promisify)(fs.readdir);
-const stat = (0, util_1.promisify)(fs.stat);
-const readFile = (0, util_1.promisify)(fs.readFile);
-/**
- * Recursively add all files in a directory to the Merkle tree, skipping the .dig, .git folders, and files in .gitignore.
- * @param datalayer - The DataStoreManager instance.
- * @param dirPath - The directory path.
- * @param baseDir - The base directory for relative paths.
- */
+// Custom concurrency handler
+const limitConcurrency = async (concurrencyLimit, tasks) => {
+    const results = [];
+    const executing = [];
+    for (const task of tasks) {
+        const p = task();
+        results.push(p);
+        // Once the limit is reached, wait for one to complete
+        if (executing.length >= concurrencyLimit) {
+            await Promise.race(executing);
+        }
+        // Add the new task to the executing array
+        executing.push(p);
+        // When a task completes, remove it from the executing array
+        p.finally(() => executing.splice(executing.indexOf(p), 1));
+    }
+    // Wait for all remaining tasks to complete
+    return Promise.all(results);
+};
 const addDirectory = async (datalayer, dirPath, baseDir = dirPath) => {
     const ig = (0, ignore_1.default)();
     const gitignorePath = path.join(baseDir, ".gitignore");
     // Load .gitignore rules if the file exists
     if (fs.existsSync(gitignorePath)) {
-        const gitignoreContent = await readFile(gitignorePath, "utf-8");
+        const gitignoreContent = fs.readFileSync(gitignorePath, "utf-8");
         ig.add(gitignoreContent);
     }
-    const files = await readdir(dirPath);
-    // Process each file or directory
-    await Promise.all(files.map(async (file) => {
+    const files = fs.readdirSync(dirPath);
+    const tasks = [];
+    for (const file of files) {
         const filePath = path.join(dirPath, file);
         const relativePath = path.relative(baseDir, filePath).replace(/\\/g, "/");
         // Skip the .dig, .git folders and files or directories ignored by .gitignore
         if (file === ".dig" || file === ".git" || ig.ignores(relativePath)) {
-            return;
+            continue;
         }
-        const fileStat = await stat(filePath);
-        if (fileStat.isDirectory()) {
+        const stat = fs.statSync(filePath);
+        if (stat.isDirectory()) {
             // Recursively process the directory
-            return (0, exports.addDirectory)(datalayer, filePath, baseDir);
+            tasks.push(() => (0, exports.addDirectory)(datalayer, filePath, baseDir));
         }
         else {
-            // Process the file with limited concurrency
-            return limit(() => new Promise((resolve, reject) => {
+            // Add a task for each file to be processed
+            tasks.push(() => new Promise((resolve, reject) => {
                 const stream = fs.createReadStream(filePath);
                 datalayer
                     .upsertKey(stream, Buffer.from(relativePath).toString("hex"))
@@ -75,27 +81,8 @@ const addDirectory = async (datalayer, dirPath, baseDir = dirPath) => {
                     .catch(reject);
             }));
         }
-    }));
-};
-exports.addDirectory = addDirectory;
-/**
- * Calculate the total size of the DIG_FOLDER_PATH
- * @param folderPath - The path of the folder to calculate size.
- * @returns The total size of the folder in bytes.
- */
-const calculateFolderSize = (folderPath) => {
-    let totalSize = BigInt(0);
-    const files = fs.readdirSync(folderPath);
-    for (const file of files) {
-        const filePath = path.join(folderPath, file);
-        const stat = fs.statSync(filePath);
-        if (stat.isDirectory()) {
-            totalSize += (0, exports.calculateFolderSize)(filePath);
-        }
-        else {
-            totalSize += BigInt(stat.size);
-        }
     }
-    return totalSize;
+    // Run tasks with limited concurrency (set the concurrency limit as needed)
+    await limitConcurrency(10, tasks); // Adjust 10 based on your system limits
 };
-exports.calculateFolderSize = calculateFolderSize;
+exports.addDirectory = addDirectory;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dignetwork/dig-sdk",
-  "version": "0.0.1-alpha.11",
+  "version": "0.0.1-alpha.13",
   "description": "",
   "type": "commonjs",
   "main": "./dist/index.js",