pinme 1.1.3 → 1.1.4-alpha.1

package/dist/index.js

@@ -1485,7 +1485,7 @@ var import_chalk5 = __toESM(require("chalk"));
 var import_figlet3 = __toESM(require("figlet"));
 
 // package.json
-var version = "1.1.3";
+var version = "1.1.4-alpha.1";
 
 // bin/upload.ts
 var import_path5 = __toESM(require("path"));
@@ -4360,7 +4360,7 @@ var {
   mergeConfig: mergeConfig2
 } = axios_default;
 
-// bin/utils/uploadToIpfs2.ts
+// bin/utils/uploadToIpfsSplit.ts
 var import_fs_extra3 = __toESM(require("fs-extra"));
 var import_path4 = __toESM(require("path"));
 var import_form_data2 = __toESM(require("form-data"));
@@ -4520,7 +4520,7 @@ function getDeviceId() {
   return deviceId;
 }
 
-// bin/utils/uploadToIpfs2.ts
+// bin/utils/uploadToIpfsSplit.ts
 var IPFS_API_URL = "https://pinme.dev/api/v3";
 var MAX_RETRIES = parseInt(process.env.MAX_RETRIES || "2");
 var RETRY_DELAY = parseInt(process.env.RETRY_DELAY_MS || "1000");
@@ -4529,7 +4529,7 @@ var MAX_POLL_TIME = parseInt("5") * 60 * 1e3;
 var POLL_INTERVAL = parseInt(process.env.POLL_INTERVAL_SECONDS || "2") * 1e3;
 var PROGRESS_UPDATE_INTERVAL = 200;
 var EXPECTED_UPLOAD_TIME = 6e4;
-var MAX_PROGRESS = 0.95;
+var MAX_PROGRESS = 0.9;
 var StepProgressBar = class {
   spinner;
   fileName;
@@ -4537,6 +4537,8 @@ var StepProgressBar = class {
   currentStep = 0;
   stepStartTime = 0;
   progressInterval = null;
+  isSimulatingProgress = false;
+  simulationStartTime = 0;
   constructor(fileName, isDirectory = false) {
     this.fileName = fileName;
     this.spinner = (0, import_ora.default)(`Preparing to upload ${fileName}...`).start();
@@ -4552,6 +4554,15 @@ var StepProgressBar = class {
   }
   completeStep() {
   }
+  // 开始模拟进度，用于在90%后继续显示进度
+  startSimulatingProgress() {
+    this.isSimulatingProgress = true;
+    this.simulationStartTime = Date.now();
+  }
+  // 停止模拟进度
+  stopSimulatingProgress() {
+    this.isSimulatingProgress = false;
+  }
   failStep(error) {
     this.stopProgress();
     this.spinner.fail(`Upload failed: ${error}`);
@@ -4570,7 +4581,14 @@ var StepProgressBar = class {
   startProgress() {
     this.progressInterval = setInterval(() => {
       const elapsed = Date.now() - this.startTime;
-      const progress = this.calculateProgress(elapsed);
+      let progress;
+      if (this.isSimulatingProgress) {
+        const simulationElapsed = Date.now() - this.simulationStartTime;
+        const simulationProgress = Math.min(simulationElapsed / 6e4, 1);
+        progress = 0.9 + simulationProgress * 0.09;
+      } else {
+        progress = this.calculateProgress(elapsed);
+      }
       const duration = this.formatDuration(Math.floor(elapsed / 1e3));
       const progressBar = this.createProgressBar(progress);
       this.spinner.text = `Uploading ${this.fileName}... ${progressBar} ${Math.round(progress * 100)}% (${duration})`;
@@ -4839,29 +4857,41 @@ async function getChunkStatus(sessionId, deviceId) {
     throw error;
   }
 }
-async function monitorChunkProgress(traceId, deviceId) {
+async function monitorChunkProgress(traceId, deviceId, progressBar) {
   let consecutiveErrors = 0;
   const startTime = Date.now();
-  while (Date.now() - startTime < MAX_POLL_TIME) {
-    try {
-      const status = await getChunkStatus(traceId, deviceId);
-      consecutiveErrors = 0;
-      if (status.is_ready && status.upload_rst.Hash) {
-        return {
-          hash: status.upload_rst.Hash,
-          shortUrl: status.upload_rst.ShortUrl
-        };
-      }
-    } catch (error) {
-      consecutiveErrors++;
-      if (consecutiveErrors > 10) {
-        throw new Error(`Polling failed: ${error.message}`);
+  if (progressBar) {
+    progressBar.startSimulatingProgress();
+  }
+  try {
+    while (Date.now() - startTime < MAX_POLL_TIME) {
+      try {
+        const status = await getChunkStatus(traceId, deviceId);
+        consecutiveErrors = 0;
+        if (status.is_ready && status.upload_rst.Hash) {
+          if (progressBar) {
+            progressBar.stopSimulatingProgress();
+          }
+          return {
+            hash: status.upload_rst.Hash,
+            shortUrl: status.upload_rst.ShortUrl
+          };
+        }
+      } catch (error) {
+        consecutiveErrors++;
+        if (consecutiveErrors > 10) {
+          throw new Error(`Polling failed: ${error.message}`);
+        }
       }
+      await new Promise((resolve) => setTimeout(resolve, POLL_INTERVAL));
+    }
+    const maxPollTimeMinutes = Math.floor(MAX_POLL_TIME / (60 * 1e3));
+    throw new Error(`Polling timeout after ${maxPollTimeMinutes} minutes`);
+  } finally {
+    if (progressBar) {
+      progressBar.stopSimulatingProgress();
     }
-    await new Promise((resolve) => setTimeout(resolve, POLL_INTERVAL));
   }
-  const maxPollTimeMinutes = Math.floor(MAX_POLL_TIME / (60 * 1e3));
-  throw new Error(`Polling timeout after ${maxPollTimeMinutes} minutes`);
 }
 async function uploadDirectoryInChunks(directoryPath, deviceId) {
   const sizeCheck = checkDirectorySizeLimit(directoryPath);
@@ -4892,7 +4922,7 @@ async function uploadDirectoryInChunks(directoryPath, deviceId) {
     const traceId = await completeChunkUpload(sessionInfo.session_id, deviceId);
     progressBar.completeStep();
     progressBar.startStep(4, "Waiting for processing");
-    const result = await monitorChunkProgress(traceId, deviceId);
+    const result = await monitorChunkProgress(traceId, deviceId, progressBar);
     progressBar.completeStep();
     try {
       import_fs_extra3.default.unlinkSync(compressedPath);
@@ -4945,7 +4975,7 @@ async function uploadFileInChunks(filePath, deviceId) {
     const traceId = await completeChunkUpload(sessionInfo.session_id, deviceId);
     progressBar.completeStep();
     progressBar.startStep(3, "Waiting for processing");
-    const result = await monitorChunkProgress(traceId, deviceId);
+    const result = await monitorChunkProgress(traceId, deviceId, progressBar);
     progressBar.completeStep();
     const uploadData = {
       path: filePath,
@@ -4968,7 +4998,7 @@ async function uploadFileInChunks(filePath, deviceId) {
     throw error;
   }
 }
-async function uploadToIpfs2_default(filePath) {
+async function uploadToIpfsSplit_default(filePath) {
   const deviceId = getDeviceId();
   if (!deviceId) {
     throw new Error("Device ID not found");
@@ -5039,7 +5069,7 @@ var upload_default = async (options) => {
       }
       console.log(import_chalk2.default.blue(`uploading ${absolutePath} to ipfs...`));
       try {
-        const result = await uploadToIpfs2_default(absolutePath);
+        const result = await uploadToIpfsSplit_default(absolutePath);
         if (result) {
           const encryptedCID = encryptHash(result.contentHash, secretKey);
           console.log(
@@ -5071,7 +5101,7 @@ var upload_default = async (options) => {
       }
       console.log(import_chalk2.default.blue(`uploading ${absolutePath} to ipfs...`));
       try {
-        const result = await uploadToIpfs2_default(absolutePath);
+        const result = await uploadToIpfsSplit_default(absolutePath);
         if (result) {
           const encryptedCID = encryptHash(result.contentHash, secretKey);
           console.log(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinme",
-  "version": "1.1.3",
+  "version": "1.1.4-alpha.1",
   "publishConfig": {
     "access": "public"
   },
@@ -59,6 +59,6 @@
     "rollup-plugin-terser": "^7.0.2"
   },
   "engines": {
-    "node": ">= 14.18.0"
+    "node": ">= 16.13.0"
   }
 }