django-spire 0.23.5__py3-none-any.whl → 0.23.6__py3-none-any.whl

django_spire/consts.py

@@ -1,4 +1,4 @@
-__VERSION__ = '0.23.5'
+__VERSION__ = '0.23.6'
 
 MAINTENANCE_MODE_SETTINGS_NAME = 'MAINTENANCE_MODE'
 

django_spire/contrib/progress/static/django_spire/js/contrib/progress/progress.js

@@ -1,7 +1,9 @@
 class ProgressStream {
     constructor(url, config = {}) {
         this.url = url;
-        this.event_source = null;
+        this.controller = null;
+        this.is_running = false;
+
         this.config = {
             on_update: config.on_update || (() => {}),
             on_complete: config.on_complete || (() => {}),
@@ -11,52 +13,119 @@ class ProgressStream {
         };
     }
 
-    start() {
-        this.event_source = new EventSource(this.url);
+    async start() {
+        if (this.is_running) return;
+
+        this.is_running = true;
+        this.controller = new AbortController();
+
+        try {
+            let response = await this._fetch();
+
+            if (!response.ok) {
+                throw new Error(`HTTP ${response.status}`);
+            }
 
-        this.event_source.onmessage = (event) => {
-            const data = JSON.parse(event.data);
+            await this._read_stream(response);
+        } catch (error) {
+            this._handle_error(error);
+        }
+    }
 
-            this.config.on_update(data);
+    stop() {
+        if (!this.is_running) return;
 
-            if (data.step === 'error') {
-                this.config.on_error(data);
-                this.stop();
+        this.is_running = false;
 
-                return;
+        if (this.controller) {
+            this.controller.abort();
+            this.controller = null;
+        }
+    }
+
+    async _fetch() {
+        return fetch(this.url, {
+            method: 'POST',
+            signal: this.controller.signal,
+            headers: {
+                'X-CSRFToken': get_cookie('csrftoken'),
             }
+        });
+    }
+
+    async _read_stream(response) {
+        let reader = response.body.getReader();
+        let decoder = new TextDecoder();
+        let buffer = '';
 
-            if (data.progress >= 100) {
-                this.config.on_complete(data);
-                this.stop();
+        while (this.is_running) {
+            let { done, value } = await reader.read();
 
-                if (this.config.redirect_on_complete) {
-                    setTimeout(() => {
-                        window.location.href = this.config.redirect_on_complete;
-                    }, this.config.redirect_delay);
-                }
+            if (done) break;
+
+            buffer += decoder.decode(value, { stream: true });
+            buffer = this._process_buffer(buffer);
+        }
+    }
+
+    _process_buffer(buffer) {
+        let lines = buffer.split('\n');
+        let remainder = lines.pop();
+
+        for (let line of lines) {
+            if (line.startsWith('data: ')) {
+                this._handle_message(line.slice(6));
             }
-        };
+        }
+
+        return remainder;
+    }
 
-        this.event_source.onerror = (error) => {
-            console.error('ProgressStream error:', error);
+    _handle_message(json_string) {
+        let data;
+
+        try {
+            data = JSON.parse(json_string);
+        } catch {
+            return;
+        }
 
-            this.config.on_error({
-                step: 'error',
-                message: 'Connection error',
-                progress: 0
-            });
+        this.config.on_update(data);
 
+        if (data.step === 'error') {
+            this.config.on_error(data);
             this.stop();
-        };
-    }
+            return;
+        }
 
-    stop() {
-        if (this.event_source) {
-            this.event_source.close();
-            this.event_source = null;
+        if (data.progress >= 100) {
+            this.config.on_complete(data);
+            this.stop();
+            this._redirect();
         }
     }
+
+    _handle_error(error) {
+        if (error.name === 'AbortError') return;
+
+        console.error('ProgressStream error:', error);
+
+        this.config.on_error({
+            step: 'error',
+            message: 'Connection error',
+            progress: 0
+        });
+
+        this.stop();
+    }
+
+    _redirect() {
+        if (!this.config.redirect_on_complete) return;
+
+        setTimeout(() => {
+            window.location.href = this.config.redirect_on_complete;
+        }, this.config.redirect_delay);
+    }
 }
 
 window.ProgressStream = ProgressStream;

{django_spire-0.23.5.dist-info → django_spire-0.23.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-spire
-Version: 0.23.5
+Version: 0.23.6
 Summary: A project for Django Spire
 Author-email: Brayden Carlson <braydenc@stratusadv.com>, Nathan Johnson <nathanj@stratusadv.com>
 License: Copyright (c) 2024 Stratus Advanced Technologies and Contributors.

{django_spire-0.23.5.dist-info → django_spire-0.23.6.dist-info}/RECORD

@@ -1,6 +1,6 @@
 django_spire/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_spire/conf.py,sha256=c5Hs-7lk9T15254tOasiQ2ZTFLQIVJof9_QJDfm1PAI,933
-django_spire/consts.py,sha256=YR9sX6FXBUPmKDLHD7b1mDlQp6jwxIOoAF39q4rJoiM,171
+django_spire/consts.py,sha256=01VQ7ErZIkZ3Hafkfrhc-evimRsJsp0GWrFmDpULkDI,171
 django_spire/exceptions.py,sha256=L5ndRO5ftMmh0pHkO2z_NG3LSGZviJ-dDHNT73SzTNw,48
 django_spire/settings.py,sha256=B4GPqBGt_dmkt0Ay0j-IP-SZ6mY44m2Ap5kVSON5YLA,1005
 django_spire/urls.py,sha256=mKeZszb5U4iIGqddMb5Tt5fRC72U2wABEOi6mvOfEBU,656
@@ -357,7 +357,7 @@ django_spire/contrib/progress/task.py,sha256=4pMbzOsjRRNqPKNohh08D39DRFpC3QomTCH
 django_spire/contrib/progress/tracker.py,sha256=xjGlEyKe5aiKW_KC8NKZ8F0BjQdFpLUqHz5Gr_C7jws,6490
 django_spire/contrib/progress/views.py,sha256=CwJu-L09tTiCpsjVuqzvMEKVqp6-etLDi7L9ibmlq8U,1694
 django_spire/contrib/progress/static/django_spire/css/contrib/progress/progress.css,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-django_spire/contrib/progress/static/django_spire/js/contrib/progress/progress.js,sha256=2Zuwiu1nWJpghzU-6fmf6s4qKLLyiZUcAJwB9-v5xWI,1701
+django_spire/contrib/progress/static/django_spire/js/contrib/progress/progress.js,sha256=cfXUp-Kr-J9zxW1WZnCIY9G7e3IUBwR9ISzviSs2F4o,3109
 django_spire/contrib/progress/templates/django_spire/contrib/progress/card/card.html,sha256=2Ajv0UBJEGwc4InVe69aLe2u4K56yh2JAuvO6uH24j8,3353
 django_spire/contrib/progress/templates/django_spire/contrib/progress/modal/content.html,sha256=Qxer-q4GBC5h8onzno2NUlPrXluw_tO1kWlGComQ98E,5232
 django_spire/contrib/queryset/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -1201,8 +1201,8 @@ django_spire/theme/urls/page_urls.py,sha256=S8nkKkgbhG3XHI3uMUL-piOjXIrRkuY2UlM_
 django_spire/theme/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_spire/theme/views/json_views.py,sha256=PWwVTaty0BVGbj65L5cxex6JNhc-xVAI_rEYjbJWqEM,1893
 django_spire/theme/views/page_views.py,sha256=WenjOa6Welpu3IMolY56ZwBjy4aK9hpbiMNuygjAl1A,3922
-django_spire-0.23.5.dist-info/licenses/LICENSE.md,sha256=tlTbOtgKoy-xAQpUk9gPeh9O4oRXCOzoWdW3jJz0wnA,1091
-django_spire-0.23.5.dist-info/METADATA,sha256=NsK-z_MdElXotF4ZnWMERuHNpLZODw6_kRI_lO7bt-Q,5127
-django_spire-0.23.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-django_spire-0.23.5.dist-info/top_level.txt,sha256=xf3QV1e--ONkVpgMDQE9iqjQ1Vg4--_6C8wmO-KxPHQ,13
-django_spire-0.23.5.dist-info/RECORD,,
+django_spire-0.23.6.dist-info/licenses/LICENSE.md,sha256=tlTbOtgKoy-xAQpUk9gPeh9O4oRXCOzoWdW3jJz0wnA,1091
+django_spire-0.23.6.dist-info/METADATA,sha256=bXPb2DXsbOugY9gvJ_l1mLKlYLxEuijjQSQk2VBETd8,5127
+django_spire-0.23.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+django_spire-0.23.6.dist-info/top_level.txt,sha256=xf3QV1e--ONkVpgMDQE9iqjQ1Vg4--_6C8wmO-KxPHQ,13
+django_spire-0.23.6.dist-info/RECORD,,