Improved error management and reporting

ybizeul · Aug 30, 2023 · 964542d · 964542d
1 parent 7669fc3
commit 964542d
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 28 deletions.
diff --git a/web/ui/src/YBFeed/YBFeedComponent.tsx b/web/ui/src/YBFeed/YBFeedComponent.tsx
@@ -112,19 +112,20 @@ export function FeedComponent() {
     useEffect(
         () => {
             const interval = window.setInterval(update,2000)
-
             const secret = searchParams.get("secret")
             if (secret) {
+                console.log("test")
                 connection.AuthenticateFeed(feedParam,secret)
-                .then(() => {
-                    setGoTo("/" + feedParam)
-                    update()
-                })
-                .catch((e) => {
-                    console.log(e)
-                    message.error(e.message)
-                    setAuthenticated(false)
-                })
+                    .then(() => {
+                        console.log("then")
+                        setGoTo("/" + feedParam)
+                        update()
+                    })
+                    .catch((e) => {
+                        console.log(e.message)
+                        message.error(e.message)
+                        setAuthenticated(false)
+                    })
             }
             else {
                 update()

diff --git a/web/ui/src/YBFeed/index.ts b/web/ui/src/YBFeed/index.ts
@@ -31,26 +31,44 @@ export class FeedConnector {
         return "/api/feed/"+encodeURIComponent(feedName)
     }
     async GetFeed(feedName: string): Promise<Feed|null> { 
-        var f = await fetch(this.feedUrl(feedName),{
-                credentials: "include"
-            })
-        if (f.status !== 200) {
-            throw new YBFeedError(f.status, f.statusText)
-        }
-        const j = await f.json()
-        for (var i=0;i<j.items.length;i++) {
-            j.items[i].feed = j
-        }
-        return j
+        return new Promise((resolve, reject) => {
+            fetch(this.feedUrl(feedName),{
+                    credentials: "include"
+                })
+                .then((f) => {
+                    if (f.status !== 200) {
+                        f.text()
+                        .then(text => {
+                            reject(new YBFeedError(f.status, text))
+                        })
+                    }
+                    f.json()
+                    .then(j => {
+                        for (var i=0;i<j.items.length;i++) {
+                            j.items[i].feed = j
+                        }
+                        resolve(j)
+                    })
+                })
+
+        })
     }
     async AuthenticateFeed(feedName: string, secret: string): Promise<boolean> {
-        var f = await fetch(this.feedUrl(feedName)+"?secret="+encodeURIComponent(secret),{
-            credentials: "include"
+        return new Promise((resolve, reject) => {
+            fetch(this.feedUrl(feedName)+"?secret="+encodeURIComponent(secret),{
+                credentials: "include"
+            })
+            .then(f => {
+                if (f.status !== 200) {
+                    f.text()
+                    .then(text => {
+                        reject(new YBFeedError(f.status, text))
+                    })
+                } else {
+                    resolve(true)
+                }
+            })
         })
-        if (f.status !== 200) {
-            throw new YBFeedError(f.status, f.statusText)
-        }
-        return true
     }
     async SetPIN(feedName: string, pin: string): Promise<boolean> {
         return fetch(this.feedUrl(feedName),{
@@ -60,7 +78,9 @@ export class FeedConnector {
           })
           .then((f) => {
             if (f.status !== 200) {
-                throw new YBFeedError(f.status, f.statusText)
+                f.text().then((b) => {
+                    throw new YBFeedError(f.status, b)
+                })
             }
             return true
           })