dsh-mobile-plugin 0.1.76 → 0.1.78

package/lib/mobile/uploads.js

@@ -44,9 +44,43 @@ const STAGING_TTL_MS = 24 * 60 * 60 * 1000;
 /** 分片必须是标准 base64：Node 的 Buffer.from 会静默丢弃非法字符，光靠解码判不出坏片。 */
 const BASE64_RE = /^[A-Za-z0-9+/]*={0,2}$/;
 
-/** 进行中的上传：uploadId → { name, stagingPath, received, bytes }。 */
+/** 进行中的上传：uploadId → { name, stagingPath, received, bytes, expiresAt, expiryTimer }。 */
 const uploads = new Map();
 
+function removeUpload(uploadId, job) {
+  if (uploads.get(uploadId) !== job) return false;
+  uploads.delete(uploadId);
+  if (job.expiryTimer) clearTimeout(job.expiryTimer);
+  job.expiryTimer = null;
+  return true;
+}
+
+async function expireUpload(uploadId, job) {
+  if (uploads.get(uploadId) !== job) return;
+  const remaining = job.expiresAt - Date.now();
+  if (remaining > 0) {
+    job.expiryTimer = setTimeout(() => { void expireUpload(uploadId, job); }, remaining);
+    job.expiryTimer.unref?.();
+    return;
+  }
+  if (!removeUpload(uploadId, job)) return;
+  try { await fsp.unlink(job.stagingPath); } catch { /* 暂存文件可能已由磁盘清扫移除 */ }
+}
+
+function scheduleUploadExpiry(uploadId, job) {
+  if (job.expiryTimer) clearTimeout(job.expiryTimer);
+  job.expiryTimer = setTimeout(() => { void expireUpload(uploadId, job); }, Math.max(0, job.expiresAt - Date.now()));
+  job.expiryTimer.unref?.();
+}
+
+/** 清理过期上传状态及其暂存文件；传入 now 便于测试 TTL 边界。 */
+async function sweepExpiredUploads(now = Date.now()) {
+  await Promise.all([...uploads].map(async ([uploadId, job]) => {
+    if (job.expiresAt > now || !removeUpload(uploadId, job)) return;
+    try { await fsp.unlink(job.stagingPath); } catch { /* 暂存文件可能已由磁盘清扫移除 */ }
+  }));
+}
+
 /** 收件根目录。每次取用都重算，好让测试用环境变量分派。 */
 function inboxRoot() {
   const override = process.env.DSH_MOBILE_INBOX;
@@ -129,6 +163,7 @@ async function handleUploadBegin(_ctx, req, res) {
     return fail(res, 500, 'inbox-unavailable', `收件目录不可用：${error.message}`);
   }
   void sweepStaging(stagingDir);
+  void sweepExpiredUploads();
 
   const uploadId = crypto.randomUUID();
   const stagingPath = path.join(stagingDir, `${uploadId}.part`);
@@ -137,12 +172,16 @@ async function handleUploadBegin(_ctx, req, res) {
   } catch (error) {
     return fail(res, 500, 'inbox-unavailable', `无法建立暂存文件：${error.message}`);
   }
-  uploads.set(uploadId, {
+  const job = {
     name: sanitizeName(body.name),
     stagingPath,
     received: 0,
     bytes: 0,
-  });
+    expiresAt: Date.now() + STAGING_TTL_MS,
+    expiryTimer: null,
+  };
+  uploads.set(uploadId, job);
+  scheduleUploadExpiry(uploadId, job);
   sendJson(res, 200, { ok: true, uploadId, chunkSize: CHUNK_BYTES });
 }
 
@@ -169,11 +208,13 @@ async function handleUploadChunk(_ctx, req, res) {
   try {
     await fsp.appendFile(job.stagingPath, chunk);
   } catch (error) {
-    uploads.delete(String(body.uploadId));
+    removeUpload(String(body.uploadId), job);
     return fail(res, 500, 'inbox-unavailable', `写入暂存文件失败：${error.message}`);
   }
   job.received += 1;
   job.bytes += chunk.length;
+  job.expiresAt = Date.now() + STAGING_TTL_MS;
+  scheduleUploadExpiry(String(body.uploadId), job);
   sendJson(res, 200, { ok: true, received: job.received });
 }
 
@@ -183,7 +224,7 @@ async function handleUploadFinish(_ctx, req, res) {
   const uploadId = String((body && body.uploadId) || '');
   const job = uploads.get(uploadId);
   if (!job) return fail(res, 404, 'unknown-upload', '上传会话不存在或已结束');
-  uploads.delete(uploadId);
+  removeUpload(uploadId, job);
 
   const dir = path.join(inboxRoot(), today());
   try {
@@ -203,7 +244,7 @@ async function handleUploadAbort(_ctx, req, res) {
   const uploadId = String((body && body.uploadId) || '');
   const job = uploads.get(uploadId);
   if (job) {
-    uploads.delete(uploadId);
+    removeUpload(uploadId, job);
     try { await fsp.unlink(job.stagingPath); } catch { /* 已经不在了 */ }
   }
   sendJson(res, 200, { ok: true });
@@ -216,5 +257,6 @@ module.exports = {
   handleUploadAbort,
   sanitizeName,
   inboxRoot,
+  sweepExpiredUploads,
   CHUNK_BYTES,
 };