whio-api-sdk 1.1.1 → 1.1.3

package/dist/src/sdk/modules/base-client.js

@@ -8,6 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { jwtDecode } from 'jwt-decode';
+import axios from 'axios';
 /**
  * Base HTTP client for making authenticated requests
  */
@@ -43,12 +44,14 @@ export class BaseClient {
     }
     fetchConfig(url) {
         return __awaiter(this, void 0, void 0, function* () {
-            const response = yield fetch(url);
-            if (!response.ok) {
+            try {
+                const response = yield axios.get(url);
+                const conf = response.data;
+                this.baseUrl = conf.baseUrl || this.baseUrl;
+            }
+            catch (error) {
                 throw new Error(`Failed to fetch config from ${url}`);
             }
-            const conf = yield response.json();
-            this.baseUrl = conf.baseUrl || this.baseUrl;
         });
     }
     getToken() {
@@ -69,6 +72,7 @@ export class BaseClient {
         });
     }
     request(endpoint, method = 'GET', body, headers = {}, noToken = false) {
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const url = `${this.baseUrl}${endpoint}`;
             const defaultHeaders = {
@@ -81,16 +85,22 @@ export class BaseClient {
                     defaultHeaders['Authorization'] = `Bearer ${token}`;
                 }
             }
-            const response = yield fetch(url, {
-                method,
-                headers: Object.assign(Object.assign({}, defaultHeaders), headers),
-                body: body ? JSON.stringify(body) : undefined,
-            });
-            if (!response.ok) {
-                const errorData = yield response.json().catch(() => ({}));
-                throw new Error(errorData.message || `Request failed with status ${response.status}`);
+            try {
+                const response = yield axios({
+                    url,
+                    method,
+                    headers: Object.assign(Object.assign({}, defaultHeaders), headers),
+                    data: body,
+                    timeout: 5000,
+                });
+                return response.data;
+            }
+            catch (error) {
+                const axiosError = error;
+                const errorMessage = ((_b = (_a = axiosError.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.message) ||
+                    `Request failed with status ${((_c = axiosError.response) === null || _c === void 0 ? void 0 : _c.status) || 'unknown'}`;
+                throw new Error(errorMessage);
             }
-            return response.json();
         });
     }
     fileUploadRequest(endpoint, body, headers = {}, onProgress) {
@@ -150,6 +160,7 @@ export class BaseClient {
         });
     }
     downloadRequest(endpoint) {
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const url = `${this.baseUrl}${endpoint}`;
             const defaultHeaders = {
@@ -159,18 +170,25 @@ export class BaseClient {
             if (token) {
                 defaultHeaders['Authorization'] = `Bearer ${token}`;
             }
-            const response = yield fetch(url, {
-                method: 'GET',
-                headers: defaultHeaders,
-            });
-            if (!response.ok) {
-                const errorData = yield response.json().catch(() => ({}));
-                throw new Error(errorData.message || `Download failed with status ${response.status}`);
+            try {
+                const response = yield axios({
+                    url,
+                    method: 'GET',
+                    headers: defaultHeaders,
+                    responseType: 'blob',
+                });
+                return response.data;
+            }
+            catch (error) {
+                const axiosError = error;
+                const errorMessage = ((_b = (_a = axiosError.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.message) ||
+                    `Download failed with status ${((_c = axiosError.response) === null || _c === void 0 ? void 0 : _c.status) || 'unknown'}`;
+                throw new Error(errorMessage);
             }
-            return response.blob();
         });
     }
     textRequest(endpoint) {
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const url = `${this.baseUrl}${endpoint}`;
             const defaultHeaders = {
@@ -180,15 +198,22 @@ export class BaseClient {
             if (token) {
                 defaultHeaders['Authorization'] = `Bearer ${token}`;
             }
-            const response = yield fetch(url, {
-                method: 'GET',
-                headers: defaultHeaders,
-            });
-            if (!response.ok) {
-                const errorData = yield response.json().catch(() => ({}));
-                throw new Error(errorData.message || `Text request failed with status ${response.status}`);
+            try {
+                const response = yield axios({
+                    url,
+                    method: 'GET',
+                    headers: defaultHeaders,
+                    responseType: 'text',
+                    timeout: 5000,
+                });
+                return response.data;
+            }
+            catch (error) {
+                const axiosError = error;
+                const errorMessage = ((_b = (_a = axiosError.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.message) ||
+                    `Text request failed with status ${((_c = axiosError.response) === null || _c === void 0 ? void 0 : _c.status) || 'unknown'}`;
+                throw new Error(errorMessage);
             }
-            return response.text();
         });
     }
     clearAuth() {
@@ -235,7 +260,7 @@ export class BaseClient {
         });
     }
     isAuthenticated() {
-        return !!this.accessToken && !!this.user;
+        return !!this.accessToken && !!this.user && !this.isTokenExpired(this.accessToken);
     }
     getCurrentUser() {
         return this.user;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whio-api-sdk",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
@@ -10,6 +10,7 @@
     "prepare": "npm run build"
   },
   "dependencies": {
+    "axios": "^1.13.2",
     "jwt-decode": "^4.0.0",
     "socket.io-client": "^4.8.1",
     "typescript": "^4.0.0"

package/src/sdk/modules/base-client.ts

@@ -1,4 +1,5 @@
 import { jwtDecode } from 'jwt-decode';
+import axios, { AxiosError } from 'axios';
 import { SDKConfig, User, LoginResponse } from '../types';
 
 /**
@@ -38,12 +39,13 @@ export class BaseClient {
   }
 
   public async fetchConfig(url: string): Promise<void> {
-    const response = await fetch(url);
-    if (!response.ok) {
+    try {
+      const response = await axios.get(url);
+      const conf = response.data;
+      this.baseUrl = conf.baseUrl || this.baseUrl;
+    } catch (error) {
       throw new Error(`Failed to fetch config from ${url}`);
     }
-    const conf = await response.json();
-    this.baseUrl = conf.baseUrl || this.baseUrl;
   }
 
   protected async getToken() {
@@ -82,20 +84,22 @@ export class BaseClient {
       }
     }
 
-    const response = await fetch(url, {
-      method,
-      headers: { ...defaultHeaders, ...headers },
-      body: body ? JSON.stringify(body) : undefined,
-    });
+    try {
+      const response = await axios({
+        url,
+        method,
+        headers: { ...defaultHeaders, ...headers },
+        data: body,
+        timeout: 5000,
+      });
 
-    if (!response.ok) {
-      const errorData = await response.json().catch(() => ({}));
-      throw new Error(
-        errorData.message || `Request failed with status ${response.status}`
-      );
+      return response.data;
+    } catch (error) {
+      const axiosError = error as AxiosError<{ message?: string }>;
+      const errorMessage = axiosError.response?.data?.message ||
+                          `Request failed with status ${axiosError.response?.status || 'unknown'}`;
+      throw new Error(errorMessage);
     }
-
-    return response.json();
   }
 
   protected async fileUploadRequest<T>(
@@ -175,19 +179,21 @@ export class BaseClient {
       defaultHeaders['Authorization'] = `Bearer ${token}`;
     }
 
-    const response = await fetch(url, {
-      method: 'GET',
-      headers: defaultHeaders,
-    });
+    try {
+      const response = await axios({
+        url,
+        method: 'GET',
+        headers: defaultHeaders,
+        responseType: 'blob',
+      });
 
-    if (!response.ok) {
-      const errorData = await response.json().catch(() => ({}));
-      throw new Error(
-        errorData.message || `Download failed with status ${response.status}`
-      );
+      return response.data;
+    } catch (error) {
+      const axiosError = error as AxiosError<{ message?: string }>;
+      const errorMessage = axiosError.response?.data?.message ||
+                          `Download failed with status ${axiosError.response?.status || 'unknown'}`;
+      throw new Error(errorMessage);
     }
-
-    return response.blob();
   }
 
   protected async textRequest(endpoint: string): Promise<string> {
@@ -202,19 +208,22 @@ export class BaseClient {
       defaultHeaders['Authorization'] = `Bearer ${token}`;
     }
 
-    const response = await fetch(url, {
-      method: 'GET',
-      headers: defaultHeaders,
-    });
+    try {
+      const response = await axios({
+        url,
+        method: 'GET',
+        headers: defaultHeaders,
+        responseType: 'text',
+        timeout: 5000,
+      });
 
-    if (!response.ok) {
-      const errorData = await response.json().catch(() => ({}));
-      throw new Error(
-        errorData.message || `Text request failed with status ${response.status}`
-      );
+      return response.data;
+    } catch (error) {
+      const axiosError = error as AxiosError<{ message?: string }>;
+      const errorMessage = axiosError.response?.data?.message ||
+                          `Text request failed with status ${axiosError.response?.status || 'unknown'}`;
+      throw new Error(errorMessage);
     }
-
-    return response.text();
   }
 
   protected async clearAuth(): Promise<void> {
@@ -268,7 +277,7 @@ export class BaseClient {
   }
 
   public isAuthenticated(): boolean {
-    return !!this.accessToken && !!this.user;
+    return !!this.accessToken && !!this.user && !this.isTokenExpired(this.accessToken);
   }
 
   public getCurrentUser(): User | null {