Merge pull request #57 from WillTDA/3.0.5

WillTDA · web-flow · commit 32471dbd830a · 2026-02-11T19:15:38.000Z
3.0.5 - Fix progess calculation in core, update web UI and client cor…
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -56,7 +56,7 @@ body:
     attributes:
       label: Server Version
       description: The Dropgate server version (shown in /api/info or the footer).
-      placeholder: e.g. 3.0.4
+      placeholder: e.g. 3.0.5
 
   - type: input
     id: browser
diff --git a/client/README.md b/client/README.md
@@ -9,7 +9,7 @@
 <div align="center">
 
 ![license](https://img.shields.io/badge/license-GPL--3.0-blue?style=flat-square)
-![version](https://img.shields.io/badge/version-3.0.4-brightgreen?style=flat-square)
+![version](https://img.shields.io/badge/version-3.0.5-brightgreen?style=flat-square)
 ![platform](https://img.shields.io/badge/platform-Windows%20%7C%20macOS%20%7C%20Linux-lightgrey?style=flat-square)
 
 [![discord](https://img.shields.io/discord/667479986214666272?logo=discord\&logoColor=white\&style=flat-square)](https://diamonddigital.dev/discord)
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dropgate-client",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "description": "A self-hostable, privacy-first file sharing system with both hosted upload and direct P2P transfer capabilities.",
   "main": "src/main.js",
   "funding": {
diff --git a/client/src/dropgate-core.js b/client/src/dropgate-core.js
diff --git a/packages/dropgate-core/README.md b/packages/dropgate-core/README.md
@@ -9,7 +9,7 @@
 <div align="center">
 
 ![license](https://img.shields.io/badge/license-Apache--2.0-blue?style=flat-square)
-![version](https://img.shields.io/badge/version-3.0.4-brightgreen?style=flat-square)
+![version](https://img.shields.io/badge/version-3.0.5-brightgreen?style=flat-square)
 ![typescript](https://img.shields.io/badge/TypeScript-5.0+-blue?style=flat-square)
 
 [![discord](https://img.shields.io/discord/667479986214666272?logo=discord&logoColor=white&style=flat-square)](https://diamonddigital.dev/discord)
@@ -55,7 +55,7 @@ All operations go through a single `DropgateClient` instance. Server connection
 import { DropgateClient } from '@dropgate/core';
 
 const client = new DropgateClient({
-  clientVersion: '3.0.4',
+  clientVersion: '3.0.5',
   server: 'https://dropgate.link', // URL string or { host, port?, secure? }
   fallbackToHttp: true,             // auto-retry HTTP if HTTPS fails (optional)
 });
@@ -422,7 +422,7 @@ For browser environments, you can use the IIFE bundle:
 <script src="/path/to/dropgate-core.browser.js"></script>
 <script>
   const { DropgateClient } = DropgateCore;
-  const client = new DropgateClient({ clientVersion: '3.0.4', server: location.origin });
+  const client = new DropgateClient({ clientVersion: '3.0.5', server: location.origin });
   // ...
 </script>
 ```
@@ -432,7 +432,7 @@ Or as an ES module:
 ```html
 <script type="module">
   import { DropgateClient } from '/path/to/dropgate-core.js';
-  const client = new DropgateClient({ clientVersion: '3.0.4', server: location.origin });
+  const client = new DropgateClient({ clientVersion: '3.0.5', server: location.origin });
   // ...
 </script>
 ```
diff --git a/packages/dropgate-core/package.json b/packages/dropgate-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dropgate/core",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "description": "Headless Dropgate client library for file uploads and P2P transfers.",
   "type": "module",
   "main": "./dist/index.cjs",
diff --git a/packages/dropgate-core/src/client/DropgateClient.ts b/packages/dropgate-core/src/client/DropgateClient.ts
@@ -1373,8 +1373,6 @@ export class DropgateClient {
 
           pendingChunks.push(value);
           pendingLength += value.length;
-          receivedBytes += value.length;
-          if (onBytesReceived) onBytesReceived(receivedBytes);
 
           while (pendingLength >= ENCRYPTED_CHUNK_SIZE) {
             const buffer = flushPending();
@@ -1385,13 +1383,17 @@ export class DropgateClient {
             }
 
             const decryptedBuffer = await decryptChunk(this.cryptoObj, encryptedChunk, cryptoKey);
+            receivedBytes += decryptedBuffer.byteLength;
+            if (onBytesReceived) onBytesReceived(receivedBytes);
             if (onChunk) await onChunk(new Uint8Array(decryptedBuffer));
           }
         }
 
         if (pendingLength > 0) {
           const buffer = flushPending();
           const decryptedBuffer = await decryptChunk(this.cryptoObj, buffer, cryptoKey);
+          receivedBytes += decryptedBuffer.byteLength;
+          if (onBytesReceived) onBytesReceived(receivedBytes);
           if (onChunk) await onChunk(new Uint8Array(decryptedBuffer));
         }
       } else {
diff --git a/server/README.md b/server/README.md
@@ -9,7 +9,7 @@
 <div align="center">
 
 ![license](https://img.shields.io/badge/license-AGPL--3.0-blue?style=flat-square)
-![version](https://img.shields.io/badge/version-3.0.4-brightgreen?style=flat-square)
+![version](https://img.shields.io/badge/version-3.0.5-brightgreen?style=flat-square)
 ![docker](https://img.shields.io/badge/docker-supported-blue?style=flat-square)
 
 [![discord](https://img.shields.io/discord/667479986214666272?logo=discord&logoColor=white&style=flat-square)](https://diamonddigital.dev/discord)
@@ -138,7 +138,7 @@ Example response:
 ```json
 {
   "name": "Dropgate Server",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "logLevel": "INFO",
   "capabilities": {
     "upload": {
diff --git a/server/package.json b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dropgate-server",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "description": "A self-hostable, privacy-first file sharing system with both hosted upload and direct P2P transfer capabilities.",
   "main": "server.js",
   "funding": {
diff --git a/server/public/js/download-bundle.js b/server/public/js/download-bundle.js
@@ -21,7 +21,7 @@ const iconContainer = document.getElementById('icon-container');
 const card = document.getElementById('status-card');
 const encryptionStatement = document.getElementById('encryption-statement');
 
-const client = new DropgateClient({ clientVersion: '3.0.4', server: location.origin });
+const client = new DropgateClient({ clientVersion: '3.0.5', server: location.origin });
 
 const bundleState = {
   bundleId: null,
diff --git a/server/public/js/download-p2p.js b/server/public/js/download-p2p.js
@@ -131,7 +131,7 @@ const showError = (title, message) => {
   elBar.parentElement.hidden = true;
 };
 
-const client = new DropgateClient({ clientVersion: '3.0.4', server: location.origin });
+const client = new DropgateClient({ clientVersion: '3.0.5', server: location.origin });
 
 async function loadPeerJS() {
   if (globalThis.Peer) return globalThis.Peer;
diff --git a/server/public/js/download-standard.js b/server/public/js/download-standard.js
@@ -17,7 +17,7 @@ const card = document.getElementById('status-card');
 const trustStatement = document.getElementById('trust-statement');
 const encryptionStatement = document.getElementById('encryption-statement');
 
-const client = new DropgateClient({ clientVersion: '3.0.4', server: location.origin });
+const client = new DropgateClient({ clientVersion: '3.0.5', server: location.origin });
 
 const downloadState = {
   fileId: null,
diff --git a/server/public/js/dropgate-core.js b/server/public/js/dropgate-core.js
diff --git a/server/public/js/webui-main.js b/server/public/js/webui-main.js
@@ -129,7 +129,16 @@ document.addEventListener('visibilitychange', () => {
   }
 });
 
-const coreClient = new DropgateClient({ clientVersion: '3.0.4', server: location.origin });
+const coreClient = new DropgateClient({ clientVersion: '3.0.5', server: location.origin });
+
+function isFile(file) {
+  return new Promise((resolve) => {
+    if (file.type !== '') return resolve(true);
+    const reader = new FileReader();
+    reader.onloadend = () => resolve(!reader.error);
+    reader.readAsArrayBuffer(file);
+  });
+}
 
 function formatBytes(bytes) {
   if (!Number.isFinite(bytes)) return '0 bytes';
@@ -287,8 +296,18 @@ function handleFileSelection(files) {
   if (!files || files.length === 0) {
     state.files = [];
   } else {
+    const incoming = Array.from(files);
+
+    // Filter out empty (0-byte) files
+    const valid = incoming.filter(f => f.size > 0);
+    const skipped = incoming.length - valid.length;
+    if (skipped > 0) {
+      showToast(`Skipped ${skipped} empty (0 byte) file${skipped > 1 ? 's' : ''}.`, 'warning');
+    }
+    if (valid.length === 0) return;
+
     // Append new files to existing selection
-    state.files = [...state.files, ...Array.from(files)];
+    state.files = [...state.files, ...valid];
   }
   updateFileUI();
 
@@ -1048,10 +1067,22 @@ function wireUI() {
       els.dropzone.classList.remove('dragover');
     });
   });
-  els.dropzone?.addEventListener('drop', (e) => {
+  els.dropzone?.addEventListener('drop', async (e) => {
     const fileList = e.dataTransfer?.files;
     if (!fileList || !fileList.length) return;
-    handleFileSelection(fileList);
+
+    // Filter out directories
+    const validFiles = [];
+    for (const f of Array.from(fileList)) {
+      if (await isFile(f)) validFiles.push(f);
+    }
+
+    if (validFiles.length === 0) {
+      showToast('Folders cannot be uploaded.', 'warning');
+      return;
+    }
+
+    handleFileSelection(validFiles);
   });
 
   // Mode toggles

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "dropgate-client",`
`3`		`- "version": "3.0.4",`
	`3`	`+ "version": "3.0.5",`
`4`	`4`	`"description": "A self-hostable, privacy-first file sharing system with both hosted upload and direct P2P transfer capabilities.",`
`5`	`5`	`"main": "src/main.js",`
`6`	`6`	`"funding": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@dropgate/core",`
`3`		`- "version": "3.0.4",`
	`3`	`+ "version": "3.0.5",`
`4`	`4`	`"description": "Headless Dropgate client library for file uploads and P2P transfers.",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"main": "./dist/index.cjs",`
Original file line number	Diff line number	Diff line change
`@@ -1373,8 +1373,6 @@ export class DropgateClient {`
`1373`	`1373`
`1374`	`1374`	`pendingChunks.push(value);`
`1375`	`1375`	`pendingLength += value.length;`
`1376`		`- receivedBytes += value.length;`
`1377`		`- if (onBytesReceived) onBytesReceived(receivedBytes);`
`1378`	`1376`
`1379`	`1377`	`while (pendingLength >= ENCRYPTED_CHUNK_SIZE) {`
`1380`	`1378`	`const buffer = flushPending();`
`@@ -1385,13 +1383,17 @@ export class DropgateClient {`
`1385`	`1383`	`}`
`1386`	`1384`
`1387`	`1385`	`const decryptedBuffer = await decryptChunk(this.cryptoObj, encryptedChunk, cryptoKey);`
	`1386`	`+ receivedBytes += decryptedBuffer.byteLength;`
	`1387`	`+ if (onBytesReceived) onBytesReceived(receivedBytes);`
`1388`	`1388`	`if (onChunk) await onChunk(new Uint8Array(decryptedBuffer));`
`1389`	`1389`	`}`
`1390`	`1390`	`}`
`1391`	`1391`
`1392`	`1392`	`if (pendingLength > 0) {`
`1393`	`1393`	`const buffer = flushPending();`
`1394`	`1394`	`const decryptedBuffer = await decryptChunk(this.cryptoObj, buffer, cryptoKey);`
	`1395`	`+ receivedBytes += decryptedBuffer.byteLength;`
	`1396`	`+ if (onBytesReceived) onBytesReceived(receivedBytes);`
`1395`	`1397`	`if (onChunk) await onChunk(new Uint8Array(decryptedBuffer));`
`1396`	`1398`	`}`
`1397`	`1399`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "dropgate-server",`
`3`		`- "version": "3.0.4",`
	`3`	`+ "version": "3.0.5",`
`4`	`4`	`"description": "A self-hostable, privacy-first file sharing system with both hosted upload and direct P2P transfer capabilities.",`
`5`	`5`	`"main": "server.js",`
`6`	`6`	`"funding": {`