pinme 1.1.1-alpha.2 → 1.1.1-alpha.4

package/dist/index.js

@@ -1485,7 +1485,7 @@ var import_chalk6 = __toESM(require("chalk"));
 var import_figlet3 = __toESM(require("figlet"));
 
 // package.json
-var version = "1.1.1-alpha.2";
+var version = "1.1.1-alpha.4";
 
 // bin/upload.ts
 var import_path5 = __toESM(require("path"));
@@ -4370,7 +4370,7 @@ var import_chalk2 = __toESM(require("chalk"));
 // bin/utils/uploadLimits.ts
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
-var FILE_SIZE_LIMIT = parseInt("20", 10) * 1024 * 1024;
+var FILE_SIZE_LIMIT = parseInt("500", 10) * 1024 * 1024;
 var DIRECTORY_SIZE_LIMIT = parseInt("500", 10) * 1024 * 1024;
 function checkFileSizeLimit(filePath) {
   const stats = import_fs.default.statSync(filePath);
@@ -4527,7 +4527,7 @@ var pollInterval = parseInt(process.env.POLL_INTERVAL_SECONDS || "2") * 1e3;
 var pollTimeout = parseInt(process.env.POLL_TIMEOUT_SECONDS || "10") * 1e3;
 async function pollUploadStatus(traceId, deviceId, smartProgress, startTime) {
   let consecutiveErrors = 0;
-  const maxConsecutiveErrors = 3;
+  let stopProgressUpdates = false;
   while (Date.now() - startTime < maxPollTime) {
     try {
       const response = await axios_default.get(
@@ -4545,11 +4545,12 @@ async function pollUploadStatus(traceId, deviceId, smartProgress, startTime) {
       const { code, msg, data } = response.data;
       if (code === 200) {
         consecutiveErrors = 0;
+        stopProgressUpdates = false;
         if (data.is_ready) {
           smartProgress.complete(traceId);
           return data;
         } else {
-          smartProgress.update();
+          smartProgress.updateDisplay();
         }
       } else {
         console.log(import_chalk2.default.yellow(`Warning: ${msg}`));
@@ -4557,15 +4558,17 @@ async function pollUploadStatus(traceId, deviceId, smartProgress, startTime) {
     } catch (error) {
       consecutiveErrors++;
       console.log(import_chalk2.default.yellow(`Polling error: ${error.message}`));
-      if (consecutiveErrors >= maxConsecutiveErrors) {
-        console.log(import_chalk2.default.red(`Too many consecutive polling errors (${consecutiveErrors}), stopping progress updates`));
-        break;
+      if (stopProgressUpdates) {
+        smartProgress.updateTimeOnly();
       }
     }
     await new Promise((resolve) => setTimeout(resolve, pollInterval));
   }
   const maxPollTimeMinutes = Math.floor(maxPollTime / (60 * 1e3));
-  smartProgress.fail(`Upload timeout after ${maxPollTimeMinutes} minutes`, traceId);
+  smartProgress.fail(
+    `Upload timeout after ${maxPollTimeMinutes} minutes`,
+    traceId
+  );
   return null;
 }
 function diagnoseDirectoryUploadError(directoryName, resData, expectedName) {
@@ -4607,7 +4610,7 @@ function handleMultipartError(error, context) {
   return `Upload error: ${error.message}`;
 }
 var ERROR_CODES = {
-  "30001": `File too large, single file max size: ${"20"}MB,single folder max size: ${"500"}MB`,
+  "30001": `File too large, single file max size: ${"500"}MB,single folder max size: ${"500"}MB`,
   "30002": `Max storage quorum ${Number("1000") / 1e3} GB reached`
 };
 function loadFilesToArrRecursively(directoryPath, dist, basePath) {
@@ -4617,13 +4620,8 @@ function loadFilesToArrRecursively(directoryPath, dist, basePath) {
     const parentDir = import_path4.default.dirname(directoryPath);
     basePath = parentDir.endsWith(sep) ? parentDir : parentDir + sep;
   }
-  console.log(import_chalk2.default.blue("\n\u{1F4C1} Directory Structure Analysis:"));
-  console.log(import_chalk2.default.gray(`  Upload directory: ${directoryPath}`));
-  console.log(import_chalk2.default.gray(`  Base path: ${basePath}`));
-  console.log(import_chalk2.default.gray(`  Directory name: ${dist}`));
   if (import_fs_extra3.default.statSync(directoryPath).isDirectory()) {
     const files = import_fs_extra3.default.readdirSync(directoryPath);
-    console.log(import_chalk2.default.gray(`  Files found in directory: ${files.length}`));
     files.forEach((file) => {
       const filePath = import_path4.default.join(directoryPath, file);
       if (import_fs_extra3.default.statSync(filePath).isFile()) {
@@ -4637,25 +4635,22 @@ function loadFilesToArrRecursively(directoryPath, dist, basePath) {
         }
         const relativePath = filePath.replace(basePath, "");
         const encodedPath = relativePath.replaceAll(sep, "%2F");
-        console.log(import_chalk2.default.cyan(`  \u{1F4C4} File: ${file}`));
-        console.log(import_chalk2.default.gray(`    Full path: ${filePath}`));
-        console.log(import_chalk2.default.gray(`    Relative path: ${relativePath}`));
-        console.log(import_chalk2.default.gray(`    Encoded path: ${encodedPath}`));
         filesArr.push({
           name: encodedPath,
           path: filePath
         });
       } else if (import_fs_extra3.default.statSync(filePath).isDirectory()) {
-        console.log(import_chalk2.default.yellow(`  \u{1F4C2} Subdirectory: ${file}`));
-        console.log(import_chalk2.default.gray(`    Path: ${filePath}`));
-        const recursiveFiles = loadFilesToArrRecursively(filePath, dist, basePath);
+        const recursiveFiles = loadFilesToArrRecursively(
+          filePath,
+          dist,
+          basePath
+        );
         filesArr.push(...recursiveFiles);
       }
     });
   } else {
     console.error("Error: path must be a directory");
   }
-  console.log(import_chalk2.default.green(`  \u2705 Total files processed: ${filesArr.length}`));
   return filesArr;
 }
 function countFilesInDirectory(directoryPath) {
@@ -4688,15 +4683,10 @@ async function uploadDirectory(directoryPath, deviceId) {
   const files = loadFilesToArrRecursively(directoryPath, dist);
   const totalFiles = files.length;
   if (totalFiles === 0) {
-    throw new Error(`Directory ${directoryPath} is empty or contains no valid files`);
+    throw new Error(
+      `Directory ${directoryPath} is empty or contains no valid files`
+    );
   }
-  console.log(import_chalk2.default.blue("\n\u{1F4CB} Final Upload File List:"));
-  console.log(import_chalk2.default.gray(`  Upload root directory: ${dist}`));
-  files.forEach((file, index) => {
-    console.log(import_chalk2.default.gray(`  ${index + 1}. ${file.name}`));
-  });
-  console.log(import_chalk2.default.green(`  Total files to upload: ${totalFiles}
-`));
   files.forEach((file) => {
     if (!import_fs_extra3.default.existsSync(file.path)) {
       throw new Error(`File not found: ${file.path}`);
@@ -4719,9 +4709,17 @@ async function uploadDirectory(directoryPath, deviceId) {
     } catch (error) {
     }
   });
-  const smartProgress = new SmartProgressBar(dist, totalFiles, totalSize, spinner);
+  const smartProgress = new SmartProgressBar(
+    dist,
+    totalFiles,
+    totalSize,
+    spinner
+  );
+  const timeInterval = setInterval(() => {
+    smartProgress.updateTime();
+  }, 1e3);
   const progressInterval = setInterval(() => {
-    smartProgress.update();
+    smartProgress.updateProgress();
   }, 200);
   try {
     smartProgress.startUpload();
@@ -4741,9 +4739,10 @@ async function uploadDirectory(directoryPath, deviceId) {
     const { trace_id } = response.data.data;
     if (!trace_id) {
       smartProgress.fail("No request id received from server");
+      clearInterval(timeInterval);
       return null;
     }
-    smartProgress.update();
+    smartProgress.updateDisplay();
     const uploadResult = await pollUploadStatus(
       trace_id,
       deviceId,
@@ -4751,6 +4750,7 @@ async function uploadDirectory(directoryPath, deviceId) {
       startTime
     );
     if (!uploadResult) {
+      clearInterval(timeInterval);
       return null;
     }
     const directoryItem = uploadResult.upload_rst;
@@ -4767,6 +4767,7 @@ async function uploadDirectory(directoryPath, deviceId) {
         shortUrl: directoryItem.ShortUrl || null
       };
       saveUploadHistory(uploadData);
+      clearInterval(timeInterval);
       return {
         hash: directoryItem.Hash,
         shortUrl: directoryItem.ShortUrl
@@ -4777,7 +4778,7 @@ async function uploadDirectory(directoryPath, deviceId) {
       uploadResult.upload_rst,
       dist
     );
-    smartProgress.fail("Directory hash not found in response", trace_id);
+    smartProgress.fail("Directory hash not found in response");
     console.log(
       import_chalk2.default.red(
         `
@@ -4790,18 +4791,22 @@ async function uploadDirectory(directoryPath, deviceId) {
     console.log(import_chalk2.default.blue(`
 \u{1F527} Solutions:`));
     console.log(
-      import_chalk2.default.gray(
-        `  1. Ensure directory is not empty and contains valid files`
-      )
+      import_chalk2.default.gray(`  1. Ensure directory is not empty and contains valid files`)
     );
     console.log(import_chalk2.default.gray(`  2. Check network connection stability`));
     console.log(
       import_chalk2.default.gray(`  3. Try uploading a smaller directory for testing`)
     );
+    clearInterval(timeInterval);
+    return null;
   } catch (error) {
     clearInterval(progressInterval);
+    clearInterval(timeInterval);
     if (error.message && error.message.includes("multipart")) {
-      const errorMessage = handleMultipartError(error, `Directory upload: ${dist}`);
+      const errorMessage = handleMultipartError(
+        error,
+        `Directory upload: ${dist}`
+      );
       smartProgress.fail(errorMessage);
       console.log(import_chalk2.default.red(`
 \u274C ${errorMessage}`));
@@ -4810,7 +4815,9 @@ async function uploadDirectory(directoryPath, deviceId) {
     if (error.response && error.response.data && error.response.data.code) {
       const errorCode = error.response.data.code.toString();
       if (ERROR_CODES[errorCode]) {
-        smartProgress.fail(`Error: ${ERROR_CODES[errorCode]} (Code: ${errorCode})`);
+        smartProgress.fail(
+          `Error: ${ERROR_CODES[errorCode]} (Code: ${errorCode})`
+        );
         console.log(
           import_chalk2.default.red(`Error: ${ERROR_CODES[errorCode]} (Code: ${errorCode})`)
         );
@@ -4855,8 +4862,11 @@ async function uploadFile(filePath, deviceId) {
   } catch (error) {
   }
   const smartProgress = new SmartProgressBar(fileName, 1, totalSize, spinner);
+  const timeInterval = setInterval(() => {
+    smartProgress.updateTime();
+  }, 1e3);
   const progressInterval = setInterval(() => {
-    smartProgress.update();
+    smartProgress.updateProgress();
   }, 200);
   try {
     smartProgress.startUpload();
@@ -4881,9 +4891,10 @@ async function uploadFile(filePath, deviceId) {
     const trace_id = response.data.data.trace_id;
     if (!trace_id) {
       smartProgress.fail("No request id received from server");
+      clearInterval(timeInterval);
       return null;
     }
-    smartProgress.update();
+    smartProgress.updateDisplay();
     const uploadResult = await pollUploadStatus(
       trace_id,
       deviceId,
@@ -4891,6 +4902,7 @@ async function uploadFile(filePath, deviceId) {
       startTime
     );
     if (!uploadResult) {
+      clearInterval(timeInterval);
       return null;
     }
     const fileItem = uploadResult.upload_rst;
@@ -4907,12 +4919,13 @@ async function uploadFile(filePath, deviceId) {
       };
       saveUploadHistory(uploadData);
       smartProgress.complete(trace_id);
+      clearInterval(timeInterval);
       return {
         hash: fileItem.Hash,
         shortUrl: fileItem.ShortUrl
       };
     }
-    smartProgress.fail("File hash not found in response", trace_id);
+    smartProgress.fail("File hash not found in response");
     console.log(
       import_chalk2.default.red(`
 \u274C File upload failed: File hash not found in response`)
@@ -4921,19 +4934,23 @@ async function uploadFile(filePath, deviceId) {
 \u{1F4CB} Error diagnosis information:`));
     console.log(import_chalk2.default.gray(`  - File name: ${fileName}`));
     console.log(
-      import_chalk2.default.gray(
-        `  - Name returned by IPFS: ${uploadResult.upload_rst.Name}`
-      )
+      import_chalk2.default.gray(`  - Name returned by IPFS: ${uploadResult.upload_rst.Name}`)
     );
     console.log(import_chalk2.default.blue(`
 \u{1F527} Solutions:`));
     console.log(import_chalk2.default.gray(`  1. Check if file is corrupted or unreadable`));
     console.log(import_chalk2.default.gray(`  2. Check network connection stability`));
     console.log(import_chalk2.default.gray(`  3. Try uploading a smaller file for testing`));
+    clearInterval(timeInterval);
+    return null;
   } catch (error) {
     clearInterval(progressInterval);
+    clearInterval(timeInterval);
     if (error.message && error.message.includes("multipart")) {
-      const errorMessage = handleMultipartError(error, `File upload: ${fileName}`);
+      const errorMessage = handleMultipartError(
+        error,
+        `File upload: ${fileName}`
+      );
       smartProgress.fail(errorMessage);
       console.log(import_chalk2.default.red(`
 \u274C ${errorMessage}`));
@@ -4942,7 +4959,9 @@ async function uploadFile(filePath, deviceId) {
     if (error.response && error.response.data && error.response.data.code) {
       const errorCode = error.response.data.code.toString();
       if (ERROR_CODES[errorCode]) {
-        smartProgress.fail(`Error: ${ERROR_CODES[errorCode]} (Code: ${errorCode})`);
+        smartProgress.fail(
+          `Error: ${ERROR_CODES[errorCode]} (Code: ${errorCode})`
+        );
         console.log(
           import_chalk2.default.red(`Error: ${ERROR_CODES[errorCode]} (Code: ${errorCode})`)
         );
@@ -5024,6 +5043,56 @@ var SmartProgressBar = class {
     const fileInfo = this.fileCount > 1 ? `${this.fileName} (${this.fileCount} files)` : this.fileName;
     this.spinner.text = `Uploading ${fileInfo} ${progressBar} ${duration} (${status})`;
   }
+  // Update time display only (called every second)
+  updateTime() {
+    if (this.isCompleted) {
+      return;
+    }
+    const elapsed = Math.floor((Date.now() - this.startTime) / 1e3);
+    const duration = this.formatDuration(elapsed);
+    const progress = this.calculateProgress();
+    const progressBar = this.createProgressBar(progress);
+    let status = "";
+    if (this.isUploading) {
+      status = "uploading";
+    } else if (this.isPolling) {
+      status = "processing";
+    } else {
+      status = "preparing";
+    }
+    const fileInfo = this.fileCount > 1 ? `${this.fileName} (${this.fileCount} files)` : this.fileName;
+    this.spinner.text = `Uploading ${fileInfo} ${progressBar} ${duration} (${status})`;
+  }
+  // Update progress bar only (called every 200ms)
+  updateProgress() {
+    if (this.isCompleted) {
+      return;
+    }
+    const progress = this.calculateProgress();
+    const elapsed = Math.floor((Date.now() - this.startTime) / 1e3);
+    const progressBar = this.createProgressBar(progress);
+    const duration = this.formatDuration(elapsed);
+    let status = "";
+    if (this.isUploading) {
+      status = "uploading";
+    } else if (this.isPolling) {
+      status = "processing";
+    } else {
+      status = "preparing";
+    }
+    const fileInfo = this.fileCount > 1 ? `${this.fileName} (${this.fileCount} files)` : this.fileName;
+    this.spinner.text = `Uploading ${fileInfo} ${progressBar} ${duration} (${status})`;
+  }
+  // Update display (for manual updates)
+  updateDisplay() {
+    this.updateTime();
+  }
+  // Update progress display only (no progress bar)
+  updateTimeOnly() {
+    const elapsed = Math.floor((Date.now() - this.startTime) / 1e3);
+    const duration = this.formatDuration(elapsed);
+    this.spinner.text = `Uploading ${this.fileName} ${duration}`;
+  }
   // Complete progress
   complete(traceId) {
     if (this.isCompleted) {
@@ -5032,8 +5101,7 @@ var SmartProgressBar = class {
     const progressBar = this.createProgressBar(1);
     const elapsed = Math.floor((Date.now() - this.startTime) / 1e3);
     const duration = this.formatDuration(elapsed);
-    const traceInfo = traceId ? ` (trace_id: ${traceId})` : "";
-    this.spinner.succeed(`Upload completed ${progressBar} ${duration}${traceInfo}`);
+    this.spinner.succeed(`Upload completed ${progressBar} ${duration}`);
     this.isCompleted = true;
   }
   // Fail progress
@@ -5043,8 +5111,7 @@ var SmartProgressBar = class {
     }
     const elapsed = Math.floor((Date.now() - this.startTime) / 1e3);
     const duration = this.formatDuration(elapsed);
-    const traceInfo = traceId ? ` (trace_id: ${traceId})` : "";
-    this.spinner.fail(`${message} ${duration}${traceInfo}`);
+    this.spinner.fail(`${message} ${duration}`);
     this.isCompleted = true;
   }
   // Create visual progress bar

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinme",
-  "version": "1.1.1-alpha.2",
+  "version": "1.1.1-alpha.4",
   "publishConfig": {
     "access": "public"
   },