aird 0.4.23.dev17__tar.gz → 0.4.23.dev20__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aird
-Version: 0.4.23.dev17
+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
@@ -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.dev20/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.dev20}/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.dev20}/aird/static/js/browse/app.js

@@ -278,7 +278,6 @@
       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, {
         uploadDir: dir,

{aird-0.4.23.dev17 → 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.dev17 → 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.dev17 → 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.dev17 → aird-0.4.23.dev20/aird.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aird
-Version: 0.4.23.dev17
+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
@@ -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.dev20}/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

{aird-0.4.23.dev17 → aird-0.4.23.dev20}/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.dev20}/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.dev20",
     packages=find_packages(),
     include_package_data=True,
     package_data={"aird": [