aird 0.4.23.dev17__tar.gz → 0.4.23.dev18__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aird
-Version: 0.4.23.dev17
+Version: 0.4.23.dev18
 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
@@ -13,6 +13,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: tornado>=6.5.1
+Requires-Dist: uvloop>=0.19.0; sys_platform == "linux"
 Requires-Dist: ldap3>=2.9.1
 Requires-Dist: aiofiles>=23.0.0
 Requires-Dist: argon2-cffi>=23.1.0

{aird-0.4.23.dev17 → aird-0.4.23.dev18}/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 use WebSocket; CLI may POST whole file)
+# HTTP /upload body limit (browser uploads stream POST /upload; 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/event_loop.py

@@ -0,0 +1,34 @@
+"""Optional asyncio event loop tuning (Linux uvloop)."""
+
+from __future__ import annotations
+
+import logging
+import sys
+
+logger = logging.getLogger(__name__)
+
+_uvloop_installed = False
+
+
+def install_uvloop_if_linux() -> bool:
+    """Use libuv-backed asyncio on Linux when uvloop is installed."""
+    global _uvloop_installed
+    if _uvloop_installed:
+        return True
+    if not sys.platform.startswith("linux"):
+        return False
+    try:
+        import asyncio
+
+        import uvloop
+
+        asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
+        _uvloop_installed = True
+        logger.info("Using uvloop event loop (Linux)")
+        return True
+    except ImportError:
+        logger.debug("uvloop not installed; using default asyncio loop")
+        return False
+    except Exception:
+        logger.warning("Failed to enable uvloop; using default asyncio loop", exc_info=True)
+        return False

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

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

{aird-0.4.23.dev17 → aird-0.4.23.dev18}/aird/main.py

@@ -595,6 +595,10 @@ def _start_server(ssl_options, port: int, hostname: str, worker_count: int) -> N
 
 
 def main():
+    from aird.event_loop import install_uvloop_if_linux
+
+    install_uvloop_if_linux()
+
     print_banner()
     config.init_config()
 

{aird-0.4.23.dev17 → aird-0.4.23.dev18}/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")) {
+      if (lower.includes("network") || lower.includes("websocket") || lower.includes("http")) {
         return "Upload interrupted. Check your connection and try again.";
       }
       if (lower.includes("403") || lower.includes("access denied")) {
@@ -271,16 +271,15 @@
     }
 
     async function uploadFile(item) {
-      const FTW = globalThis.AirdFileTransferWs;
-      if (!FTW?.uploadFile) {
-        throw new Error("WebSocket upload unavailable. Hard-refresh the page.");
+      const FT = globalThis.AirdFileTransfer;
+      if (!FT?.uploadFile) {
+        throw new Error("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 TT = globalThis.AirdTransferTracker;
       const cancelFn = () => abortActiveUploads(item);
-      await FTW.uploadFile(item.file, {
+      await FT.uploadFile(item.file, {
         uploadDir: dir,
         filename: fname,
         signal: item.uploadSignal,

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

@@ -0,0 +1,98 @@
+/**
+ * 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

@@ -0,0 +1,55 @@
+/**
+ * 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);

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

@@ -342,6 +342,8 @@
   <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.dev17 → aird-0.4.23.dev18/aird.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aird
-Version: 0.4.23.dev17
+Version: 0.4.23.dev18
 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
@@ -13,6 +13,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: tornado>=6.5.1
+Requires-Dist: uvloop>=0.19.0; sys_platform == "linux"
 Requires-Dist: ldap3>=2.9.1
 Requires-Dist: aiofiles>=23.0.0
 Requires-Dist: argon2-cffi>=23.1.0

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

@@ -6,6 +6,7 @@ aird/__init__.py
 aird/__main__.py
 aird/app_context.py
 aird/config.py
+aird/event_loop.py
 aird/main.py
 aird/network_share_manager.py
 aird/server_runtime.py
@@ -101,7 +102,9 @@ 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.dev17 → aird-0.4.23.dev18}/aird.egg-info/requires.txt

@@ -10,3 +10,6 @@ pyasn1>=0.6.2
 
 [:python_version >= "3.13"]
 pysmbserver>=0.1.0
+
+[:sys_platform == "linux"]
+uvloop>=0.19.0

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

@@ -2,6 +2,7 @@ from setuptools import setup, find_packages
 
 install_requires = [
     "tornado>=6.5.1",
+    "uvloop>=0.19.0; sys_platform == 'linux'",
     "ldap3>=2.9.1",
     "aiofiles>=23.0.0",
     "argon2-cffi>=23.1.0",
@@ -15,7 +16,7 @@ install_requires = [
 
 setup(
     name="aird",
-    version="0.4.23.dev17",
+    version="0.4.23.dev18",
     packages=find_packages(),
     include_package_data=True,
     package_data={"aird": [