aird 0.4.23.dev18__tar.gz → 0.4.23.dev20__tar.gz

{aird-0.4.23.dev18/aird.egg-info → aird-0.4.23.dev20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aird
-Version: 0.4.23.dev18
+Version: 0.4.23.dev20
 Summary: Aird - A lightweight web-based file browser, editor, and streamer with real-time capabilities
 Home-page: https://github.com/blinkerbit/aird
 Author: Viswantha Srinivas P

{aird-0.4.23.dev18 → aird-0.4.23.dev20}/aird/constants/__init__.py

@@ -63,7 +63,7 @@ UPLOAD_CONFIG = {
 
 # File operation constants (derived from UPLOAD_CONFIG at startup)
 MAX_FILE_SIZE = UPLOAD_CONFIG["max_file_size_mb"] * 1024 * 1024
-# HTTP /upload body limit (browser uploads stream POST /upload; CLI may POST whole file)
+# HTTP /upload body limit (browser uploads use WebSocket; CLI may POST whole file)
 UPLOAD_REQUEST_MAX_BODY_SIZE = MAX_FILE_SIZE + (1024 * 1024)
 MAX_READABLE_FILE_SIZE = 50 * 1024 * 1024  # 50 MB
 

{aird-0.4.23.dev18 → aird-0.4.23.dev20}/aird/handlers/file_op_handlers.py

@@ -349,7 +349,7 @@ def _process_bulk_action(
 
 @tornado.web.stream_request_body
 class UploadHandler(BaseHandler):
-    """Streamed HTTP upload (browser, CLI, reverse proxy, or direct origin)."""
+    """Single-request HTTP upload (CLI / direct origin). Browser uses WebSocket."""
 
     def check_xsrf_cookie(self) -> None:
         """Streamed uploads send raw body; accept X-XSRFToken header or ?_xsrf= query param."""

{aird-0.4.23.dev18 → aird-0.4.23.dev20}/aird/static/js/browse/app.js

@@ -258,7 +258,7 @@
       const raw = (err && err.message) ? String(err.message).trim() : "";
       if (!raw || raw === "cancelled") return raw;
       const lower = raw.toLowerCase();
-      if (lower.includes("network") || lower.includes("websocket") || lower.includes("http")) {
+      if (lower.includes("network") || lower.includes("websocket")) {
         return "Upload interrupted. Check your connection and try again.";
       }
       if (lower.includes("403") || lower.includes("access denied")) {
@@ -271,15 +271,15 @@
     }
 
     async function uploadFile(item) {
-      const FT = globalThis.AirdFileTransfer;
-      if (!FT?.uploadFile) {
-        throw new Error("Upload unavailable. Hard-refresh the page.");
+      const FTW = globalThis.AirdFileTransferWs;
+      if (!FTW?.uploadFile) {
+        throw new Error("WebSocket upload unavailable. Hard-refresh the page.");
       }
       const dir = item.uploadDir ?? document.getElementById('currentPath')?.value ?? '';
       const fname = item.uploadName ?? item.file.name;
       item.uploadSignal = { aborted: false };
       const cancelFn = () => abortActiveUploads(item);
-      await FT.uploadFile(item.file, {
+      await FTW.uploadFile(item.file, {
         uploadDir: dir,
         filename: fname,
         signal: item.uploadSignal,

{aird-0.4.23.dev18 → aird-0.4.23.dev20}/aird/static/js/download-manager.js

@@ -59,19 +59,9 @@
 
     cancelOne(item) {
       if (!item) return;
-      if (item.status === 'downloading' && item.cancelSignal) {
+      if (item.status === 'downloading' || item.status === 'queued') {
         item.cancelSignal.aborted = true;
         item.status = 'cancelled';
-        if (item.ttId != null) {
-          global.AirdTransferTracker?.failTransfer(item.ttId, 'Cancelled');
-        }
-        return;
-      }
-      if (item.status !== 'queued') return;
-      item.status = 'cancelled';
-      item.cancelSignal.aborted = true;
-      if (item.ttId != null) {
-        global.AirdTransferTracker?.failTransfer(item.ttId, 'Cancelled');
       }
     }
 
@@ -103,9 +93,14 @@
         if (item.ws && FTW?.downloadFile) {
           item.status = 'downloading';
           item.downloadStart = Date.now();
+          const onCancel = () => {
+            item.cancelSignal.aborted = true;
+            item.status = 'cancelled';
+          };
           try {
             const result = await FTW.downloadFile(item.path, {
               signal: item.cancelSignal,
+              onCancel: onCancel,
             });
             if (item.cancelSignal?.aborted || this.cancelled) {
               item.status = 'cancelled';

{aird-0.4.23.dev18 → aird-0.4.23.dev20}/aird/static/js/file-transfer-ws.js

@@ -155,22 +155,30 @@
 
   /**
    * @param {string} path relative file path
-   * @param {{ onProgress?: (loaded: number, total: number) => void, signal?: { aborted: boolean } }} options
+   * @param {{ onProgress?: (loaded: number, total: number) => void, signal?: { aborted: boolean }, onCancel?: Function }} options
    */
   async function downloadFile(path, options) {
     options = options || {};
     const onProgress = options.onProgress || function () {};
-    const signal = options.signal;
+    const signal = options.signal || { aborted: false };
     const ws = await openSocket();
     const chunks = [];
     let meta = null;
+    let settled = false;
+    let abortPoll = null;
 
     const TT = global.AirdTransferTracker;
     const fname = path.split('/').pop() || path;
-    const ttId = TT ? TT.addTransfer(fname, 0, 'download') : null;
+    const ttId = TT
+      ? TT.addTransfer(fname, 0, 'download', { onCancel: options.onCancel })
+      : null;
 
     return new Promise((resolve, reject) => {
       function cleanup() {
+        if (abortPoll !== null) {
+          clearInterval(abortPoll);
+          abortPoll = null;
+        }
         ws.removeEventListener('message', onMessage);
         try {
           ws.close();
@@ -179,11 +187,38 @@
         }
       }
 
+      function finishCancel() {
+        if (settled) return;
+        settled = true;
+        signal.aborted = true;
+        try {
+          ws.send(JSON.stringify({ action: 'cancel' }));
+        } catch {
+          /* ignore */
+        }
+        cleanup();
+        if (TT && ttId) TT.failTransfer(ttId, 'Cancelled');
+        reject(new Error('cancelled'));
+      }
+
+      if (TT && ttId) {
+        TT.setCancelHandler(ttId, function () {
+          if (typeof options.onCancel === 'function') {
+            options.onCancel();
+          }
+          finishCancel();
+        });
+      }
+
+      if (signal) {
+        abortPoll = setInterval(() => {
+          if (signal.aborted) finishCancel();
+        }, 100);
+      }
+
       function onMessage(ev) {
-        if (signal && signal.aborted) {
-          cleanup();
-          if (TT && ttId) TT.failTransfer(ttId, 'Cancelled');
-          reject(new Error('cancelled'));
+        if (signal.aborted) {
+          finishCancel();
           return;
         }
         if (typeof ev.data === 'string') {
@@ -194,6 +229,8 @@
             return;
           }
           if (msg.type === 'error') {
+            if (settled) return;
+            settled = true;
             cleanup();
             if (TT && ttId) TT.failTransfer(ttId, msg.message);
             reject(new Error(msg.message || 'download failed'));
@@ -205,6 +242,8 @@
             return;
           }
           if (msg.type === 'download_end') {
+            if (settled) return;
+            settled = true;
             cleanup();
             if (TT && ttId) TT.completeTransfer(ttId);
             const blob = new Blob(chunks, {
@@ -229,6 +268,8 @@
 
       ws.addEventListener('message', onMessage);
       ws.addEventListener('error', () => {
+        if (settled) return;
+        settled = true;
         cleanup();
         if (TT && ttId) TT.failTransfer(ttId, 'WebSocket error');
         reject(new Error('WebSocket error'));

{aird-0.4.23.dev18 → aird-0.4.23.dev20}/aird/static/js/transfer-tracker.js

@@ -278,6 +278,12 @@
     }, 8000);
   }
 
+  function removeTransfer(id) {
+    if (_items.delete(id)) {
+      _render();
+    }
+  }
+
   function completeByExternalId(externalId) {
     var id = _findByExternalId(externalId);
     if (id != null) completeTransfer(id);
@@ -305,6 +311,7 @@
     setCancelHandler: setCancelHandler,
     completeTransfer: completeTransfer,
     failTransfer: failTransfer,
+    removeTransfer: removeTransfer,
     completeByExternalId: completeByExternalId,
     failByExternalId: failByExternalId,
     updateProgressByExternalId: updateProgressByExternalId,

{aird-0.4.23.dev18 → aird-0.4.23.dev20}/aird/templates/browse.html

@@ -342,8 +342,6 @@
   <input type="hidden" id="currentPath" value="{{ current_path or '' }}" />
   <script src="/static/js/aird-core.js?v={{ static_version }}"></script>
   <script src="/static/js/file-transfer-ws.js?v={{ static_version }}"></script>
-  <script src="/static/js/file-transfer-http.js?v={{ static_version }}"></script>
-  <script src="/static/js/file-transfer.js?v={{ static_version }}"></script>
   <script src="/static/js/download-manager.js?v={{ static_version }}"></script>
   <script src="/static/js/components/folder-picker.js?v={{ static_version }}"></script>
   <script nonce="{{ csp_nonce }}">

{aird-0.4.23.dev18 → aird-0.4.23.dev20/aird.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aird
-Version: 0.4.23.dev18
+Version: 0.4.23.dev20
 Summary: Aird - A lightweight web-based file browser, editor, and streamer with real-time capabilities
 Home-page: https://github.com/blinkerbit/aird
 Author: Viswantha Srinivas P

{aird-0.4.23.dev18 → aird-0.4.23.dev20}/aird.egg-info/SOURCES.txt

@@ -102,9 +102,7 @@ aird/static/js/aird-core.js
 aird/static/js/bg-canvas.js
 aird/static/js/download-manager.js
 aird/static/js/feature-flags-live.js
-aird/static/js/file-transfer-http.js
 aird/static/js/file-transfer-ws.js
-aird/static/js/file-transfer.js
 aird/static/js/folder-size-scan.js
 aird/static/js/login-ui.js
 aird/static/js/media-view.js

{aird-0.4.23.dev18 → aird-0.4.23.dev20}/setup.py

@@ -16,7 +16,7 @@ install_requires = [
 
 setup(
     name="aird",
-    version="0.4.23.dev18",
+    version="0.4.23.dev20",
     packages=find_packages(),
     include_package_data=True,
     package_data={"aird": [

aird-0.4.23.dev18/aird/static/js/file-transfer-http.js

@@ -1,98 +0,0 @@
-/**
- * HTTP streaming upload (POST /upload). Works via Cloudflare HTTP/3 or direct to origin.
- */
-(function (global) {
-  'use strict';
-
-  function getXSRFToken() {
-    if (global.AirdCore?.getXSRFToken) {
-      return global.AirdCore.getXSRFToken();
-    }
-    const match = document.cookie.match(/\b_xsrf=([^;]*)/);
-    return match ? decodeURIComponent(match[1]) : '';
-  }
-
-  /**
-   * @param {File|Blob} file
-   * @param {{ uploadDir?: string, filename?: string, onProgress?: Function, signal?: { aborted: boolean }, onCancel?: Function }} options
-   */
-  function uploadFile(file, options) {
-    options = options || {};
-    const uploadDir = options.uploadDir ?? '';
-    const filename = options.filename ?? (file.name || 'upload');
-    const onProgress = options.onProgress || function () {};
-    const signal = options.signal;
-    const totalSize = file.size;
-
-    const TT = global.AirdTransferTracker;
-    const ttId = TT
-      ? TT.addTransfer(filename, totalSize, 'upload', { onCancel: options.onCancel })
-      : null;
-    if (TT && ttId && options.onCancel) {
-      TT.setCancelHandler(ttId, options.onCancel);
-    }
-
-    return new Promise((resolve, reject) => {
-      const xhr = new XMLHttpRequest();
-      let abortPoll = null;
-
-      function cleanup() {
-        if (abortPoll !== null) {
-          clearInterval(abortPoll);
-          abortPoll = null;
-        }
-      }
-
-      function fail(err, httpStatus) {
-        cleanup();
-        const msg = err?.message || String(err);
-        const error = err instanceof Error ? err : new Error(msg);
-        error.httpStatus = httpStatus ?? 0;
-        if (TT && ttId) TT.failTransfer(ttId, msg);
-        reject(error);
-      }
-
-      xhr.upload.addEventListener('progress', (ev) => {
-        if (!ev.lengthComputable) return;
-        const loaded = ev.loaded;
-        const pct = totalSize > 0 ? Math.round((loaded / totalSize) * 100) : 0;
-        onProgress(pct, loaded, totalSize);
-        if (TT && ttId) TT.updateProgress(ttId, loaded, totalSize);
-      });
-
-      xhr.addEventListener('load', () => {
-        cleanup();
-        if (xhr.status >= 200 && xhr.status < 300) {
-          onProgress(100, totalSize, totalSize);
-          if (TT && ttId) TT.completeTransfer(ttId);
-          resolve({ message: xhr.responseText || 'Upload successful' });
-          return;
-        }
-        const body = (xhr.responseText || '').trim();
-        fail(new Error(body || `Upload failed (HTTP ${xhr.status})`), xhr.status);
-      });
-
-      xhr.addEventListener('error', () => fail(new Error('Network error during upload'), 0));
-      xhr.addEventListener('abort', () => fail(new Error('cancelled'), 0));
-
-      if (signal) {
-        abortPoll = setInterval(() => {
-          if (signal.aborted) {
-            xhr.abort();
-          }
-        }, 100);
-      }
-
-      xhr.open('POST', '/upload');
-      xhr.setRequestHeader('X-Upload-Dir', uploadDir);
-      xhr.setRequestHeader('X-Upload-Filename', filename);
-      xhr.setRequestHeader('X-XSRFToken', getXSRFToken());
-      xhr.setRequestHeader('Content-Type', 'application/octet-stream');
-      xhr.send(file);
-    });
-  }
-
-  global.AirdFileTransferHttp = {
-    uploadFile: uploadFile,
-  };
-})(typeof globalThis !== 'undefined' ? globalThis : window);

aird-0.4.23.dev18/aird/static/js/file-transfer.js

@@ -1,55 +0,0 @@
-/**
- * Upload facade: HTTP first (CF or direct origin), WebSocket fallback when needed.
- */
-(function (global) {
-  'use strict';
-
-  function isCancelled(err) {
-    const msg = (err && err.message) ? String(err.message).toLowerCase() : '';
-    return msg === 'cancelled';
-  }
-
-  /** Use WS when HTTP is blocked, proxied limits apply, or the connection failed. */
-  function shouldFallbackToWs(err) {
-    if (!err || isCancelled(err)) return false;
-    const status = err.httpStatus ?? 0;
-    if (status === 401 || status === 403 || status === 400) return false;
-    if (status === 413 || status === 0 || status === 502 || status === 503 || status === 504) {
-      return true;
-    }
-    const msg = String(err.message || '').toLowerCase();
-    return msg.includes('network error');
-  }
-
-  /**
-   * @param {File|Blob} file
-   * @param {object} options passed to HTTP/WS upload helpers
-   */
-  async function uploadFile(file, options) {
-    options = options || {};
-    const http = global.AirdFileTransferHttp;
-    const ws = global.AirdFileTransferWs;
-
-    if (http?.uploadFile) {
-      try {
-        return await http.uploadFile(file, options);
-      } catch (err) {
-        if (ws?.uploadFile && shouldFallbackToWs(err)) {
-          return ws.uploadFile(file, options);
-        }
-        throw err;
-      }
-    }
-
-    if (ws?.uploadFile) {
-      return ws.uploadFile(file, options);
-    }
-    throw new Error('No upload transport available. Hard-refresh the page.');
-  }
-
-  global.AirdFileTransfer = {
-    uploadFile: uploadFile,
-    saveBlob: global.AirdFileTransferWs?.saveBlob,
-    downloadFile: global.AirdFileTransferWs?.downloadFile,
-  };
-})(typeof globalThis !== 'undefined' ? globalThis : window);