@tatil/server-api 0.0.6 → 0.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tatil/server-api",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "Tatilsepeti Server Api for Next.js server-side operations",
   "main": "index.js",
   "publishConfig": {

package/src/utils/tatilsepeti.js

@@ -8,9 +8,9 @@ const { API_URL } = process.env;
 
 class TatilsepetiApi {
   constructor() {
-    this.baseURL = API_URL;
+    this.baseURL = `${API_URL}/api`;
     this.instance = axios.create({
-      baseURL: API_URL,
+      baseURL: this.baseURL,
     });
 
     this.logger = RequestLogger();
@@ -22,45 +22,41 @@ class TatilsepetiApi {
   }
 
   attachInterceptors() {
-    this.instance.interceptors.response.use(
-      (response) => {
-        console.log('[API RESPONSE]', {
-          url: response.config.url,
-          status: response.status,
-          data: response.data,
-        });
-        return response;
+    this.instance.interceptors.request.use(
+      (config) => {
+        const { url, method } = config;
+        console.log(`[API] ${method} ${url}`);
+        return config;
       },
       (error) => {
-        console.error('[API RESPONSE ERROR]', {
-          url: error.config?.url,
-          status: error.response?.status,
-          data: error.response?.data,
-        });
         return Promise.reject(error);
       }
     );
-  }
 
-  joinEndpoint(endpoint) {
-    return endpoint.join('/');
+    this.instance.interceptors.response.use(
+      (response) => response,
+      (error) => {
+        if (error.response) {
+          console.log(`[API ERROR] ${error.response.status} - ${error.config.url}`);
+          return error.response;
+        }
+
+        console.log(`[API ERROR] No response - ${error.config?.url}`);
+        return null;
+      }
+    );
   }
 
-  fullEndpoint(endpoint, version = 'v1') {
-    return `${this.baseURL}/api/${version}/${this.joinEndpoint(endpoint)}`;
+  clearEndpoint(endpoint) {
+    return endpoint.replace(/\/\//g, '/');
   }
 
   buildUrl(endpoint, version = 'v1') {
-
     if (Array.isArray(endpoint)) {
-      return this.fullEndpoint(endpoint, version);
+      return this.clearEndpoint(`/${version}/${endpoint.join('/')}`);
     }
 
-    return `${this.baseURL}/api/${version}${endpoint}`;
-  }
-
-  getEndpointPath(endpoint) {
-    return Array.isArray(endpoint) ? this.joinEndpoint(endpoint) : endpoint;
+    return this.clearEndpoint(`/${version}/${endpoint}`);
   }
 
   setAuthCookies(accessToken, expiresAt) {
@@ -116,9 +112,8 @@ class TatilsepetiApi {
   }
 
   async get(endpoint, params = {}, version = 'v1') {
-    const endpointPath = this.getEndpointPath(endpoint);
-    const logId = this.logger.start(endpointPath, 'GET');
     const url = this.buildUrl(endpoint, version);
+    const logId = this.logger.start(url, 'GET');
 
     const response = await this.instance.get(url, {
       params,
@@ -131,7 +126,17 @@ class TatilsepetiApi {
         response: 'No response from server',
         params,
       });
-      return;
+      return null;
+    }
+
+    if (response.status >= 400) {
+      this.logger.end(logId, {
+        statusCode: response.status,
+        response: response.data || 'Server error',
+        params,
+        error: true,
+      });
+      return null;
     }
 
     if (!response.data) {
@@ -140,7 +145,7 @@ class TatilsepetiApi {
         response: 'No data in response',
         params,
       });
-      return;
+      return null;
     }
 
     const { data } = response;
@@ -155,9 +160,8 @@ class TatilsepetiApi {
   }
 
   async post(endpoint, body = {}, version = 'v1') {
-    const endpointPath = this.getEndpointPath(endpoint);
-    const logId = this.logger.start(endpointPath, 'POST');
     const url = this.buildUrl(endpoint, version);
+    const logId = this.logger.start(url, 'POST');
 
     const response = await this.instance.post(url, body, {
       headers: await this.getAuthHeaders(),
@@ -169,7 +173,17 @@ class TatilsepetiApi {
         response: 'No response from server',
         body,
       });
-      return;
+      return null;
+    }
+
+    if (response.status >= 400) {
+      this.logger.end(logId, {
+        statusCode: response.status,
+        response: response.data || 'Server error',
+        body,
+        error: true,
+      });
+      return null;
     }
 
     if (!response.data) {
@@ -178,7 +192,7 @@ class TatilsepetiApi {
         response: 'No data in response',
         body,
       });
-      return;
+      return null;
     }
 
     const { data } = response;
@@ -195,4 +209,4 @@ class TatilsepetiApi {
 
 const Tatilsepeti = new TatilsepetiApi();
 
-export default Tatilsepeti;
+export default Tatilsepeti;