@equinor/roma-framework 0.0.7-BETA.4 → 0.0.7-BETA.6

package/dev-portal/lib/api/roma/use-client.d.ts

@@ -18,7 +18,7 @@ export type HttpErrorServerResponse = {
 export type HttpErrorResponse = {
     status: number;
     statusText: string;
-    message: HttpErrorServerResponse;
+    message: unknown;
     ok: boolean;
     headers: Headers;
     url: string;

package/dev-portal/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@equinor/roma-framework",
-  "version": "0.0.7-BETA.4",
+  "version": "0.0.7-BETA.6",
   "repository": "https://github.com/equinor/tops-roma",
   "types": "./index.d.ts",
   "private": false,

package/dev-portal/roma-framework.umd.js

@@ -59931,7 +59931,7 @@ var __privateMethod = (obj, member, method) => {
   }
   const CACHED_ITEMS_MAX = 300;
   const setupEventSource = async (config2, subject, abort) => {
-    const token2 = await config2.options.accessTokenFactory();
+    let token2 = await config2.options.accessTokenFactory();
     fetchEventSource(config2.url, {
       headers: {
         Authorization: `Bearer ${token2}`
@@ -59942,6 +59942,8 @@ var __privateMethod = (obj, member, method) => {
         const data = eventSourceMessage.data;
         try {
           const parsed = JSON.parse(data);
+          if (parsed.subject === "keep-alive")
+            return;
           const values = subject.getValue();
           subject.next(
             [
@@ -59953,14 +59955,18 @@ var __privateMethod = (obj, member, method) => {
           console.error("Failed to parse message: ", ex);
         }
       },
-      onclose: () => {
-        if (config2.options.reconnect) {
-          throw new Error("Connection closed, reconnecting.");
-        }
+      onerror: (err) => {
+        throw err;
       }
     }).then(() => {
+      config2.options.accessTokenFactory().then((t2) => token2 = t2);
+      if (config2.options.reconnect) {
+        setTimeout(() => setupEventSource(config2, subject, abort), 200);
+      }
+    }).catch((err) => {
+      config2.options.accessTokenFactory().then((t2) => token2 = t2);
       if (config2.options.reconnect) {
-        setTimeout(() => setupEventSource(config2, subject, abort), 5e3);
+        setTimeout(() => setupEventSource(config2, subject, abort), 200);
       }
     });
     return {

package/lib/api/roma/use-client.d.ts

@@ -18,7 +18,7 @@ export type HttpErrorServerResponse = {
 export type HttpErrorResponse = {
     status: number;
     statusText: string;
-    message: HttpErrorServerResponse;
+    message: unknown;
     ok: boolean;
     headers: Headers;
     url: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@equinor/roma-framework",
-  "version": "0.0.7-BETA.4",
+  "version": "0.0.7-BETA.6",
   "repository": "https://github.com/equinor/tops-roma",
   "types": "./index.d.ts",
   "private": false,

package/roma-framework.mjs

@@ -5274,13 +5274,13 @@ const createUrlParamsFromObject = (obj) => {
   });
   return params;
 };
-class HttpError extends Error {
+let HttpError$1 = class HttpError extends Error {
   constructor(message, response) {
     super(message);
     this.message = message;
     this.response = response;
   }
-}
+};
 const handleJsonRequest = async (req) => {
   if (req.status >= 400) {
     let msg;
@@ -5303,7 +5303,7 @@ const handleJsonRequest = async (req) => {
       headers: req.headers,
       url: req.url
     };
-    throw new HttpError(req.statusText, error);
+    throw new HttpError$1(req.statusText, error);
   }
   return await req.json();
 };
@@ -5375,12 +5375,36 @@ const useCustomClient = () => {
         // Add body if data is provided
       }
     );
+    let value;
     if (response.headers.get("content-length") === "0" || response.status === 204) {
-      return response.text();
+      value = await response.text();
+    } else {
+      value = await response.json();
     }
-    return response.json();
+    if (response.status >= 400) {
+      const error = {
+        status: response.status,
+        statusText: response.statusText,
+        ok: false,
+        headers: response.headers,
+        url: response.url,
+        message: value
+      };
+      throw new HttpError2(
+        typeof value === "string" ? value : error.statusText,
+        error
+      );
+    }
+    return value;
   };
 };
+class HttpError2 extends Error {
+  constructor(message, response) {
+    super(message);
+    this.message = message;
+    this.response = response;
+  }
+}
 const useGetSettingByUserAndIdHook = () => {
   const getSettingByUserAndId = useCustomClient();
   return (userId, id, signal) => {