@tatil/server-api 0.0.7 → 0.0.8

package/package.json

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

package/src/utils/tatilsepeti.js

@@ -8,22 +8,55 @@ const { API_URL } = process.env;
 
 class TatilsepetiApi {
   constructor() {
+    this.baseURL = `${API_URL}/api`;
     this.instance = axios.create({
-      baseURL: `${API_URL}/api`,
+      baseURL: this.baseURL,
     });
 
     this.logger = RequestLogger();
     this.defaultHeaders = {
       'Content-Type': 'application/json',
     };
+
+    this.attachInterceptors();
+  }
+
+  attachInterceptors() {
+    this.instance.interceptors.request.use(
+      (config) => {
+        const { url, method } = config;
+        console.log(`[API] ${method} ${url}`);
+        return config;
+      },
+      (error) => {
+        return Promise.reject(error);
+      }
+    );
+
+    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;
+      }
+    );
+  }
+
+  clearEndpoint(endpoint) {
+    return endpoint.replace(/\/\//g, '/');
   }
 
   buildUrl(endpoint, version = 'v1') {
     if (Array.isArray(endpoint)) {
-      return `/${version}/${endpoint.join('/')}`;
+      return this.clearEndpoint(`/${version}/${endpoint.join('/')}`);
     }
 
-    return `/${version}/${endpoint}`;
+    return this.clearEndpoint(`/${version}/${endpoint}`);
   }
 
   setAuthCookies(accessToken, expiresAt) {
@@ -93,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) {
@@ -102,7 +145,7 @@ class TatilsepetiApi {
         response: 'No data in response',
         params,
       });
-      return;
+      return null;
     }
 
     const { data } = response;
@@ -118,12 +161,6 @@ class TatilsepetiApi {
 
   async post(endpoint, body = {}, version = 'v1') {
     const url = this.buildUrl(endpoint, version);
-
-
-    console.log(url, "urlurlurlurlurlurlurlurlurlurl");
-
-
-
     const logId = this.logger.start(url, 'POST');
 
     const response = await this.instance.post(url, body, {
@@ -136,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) {
@@ -145,7 +192,7 @@ class TatilsepetiApi {
         response: 'No data in response',
         body,
       });
-      return;
+      return null;
     }
 
     const { data } = response;
@@ -162,4 +209,4 @@ class TatilsepetiApi {
 
 const Tatilsepeti = new TatilsepetiApi();
 
-export default Tatilsepeti;
+export default Tatilsepeti;