eco-vue-js 0.10.75 → 0.10.77

package/dist/utils/ApiClient.js

@@ -0,0 +1,225 @@
+import { ref } from 'vue';
+import _sfc_main from '../components/Auth/WRouteAuth.vue.js';
+import _sfc_main$1 from '../components/Auth/WRouteAuthNo.vue.js';
+import { removeExpirationDate, getLastRefreshPromise, setRefreshTimestamp, removeRefreshTimestamp, checkExpirationDate, setExpirationDate } from '../components/Auth/utils/utils.js';
+import { encodeQueryParams, ApiError, ApiErrorCancel } from './api.js';
+
+const getURLParams = (params) => {
+  return new URLSearchParams(encodeQueryParams(params)).toString();
+};
+const HEADERS_JSON = {
+  "Content-Type": "application/json",
+  "Access-Control-Allow-Origin": "*"
+};
+const HEADERS_FORMDATA = {
+  "Access-Control-Allow-Origin": "*"
+};
+class ApiClientInstance {
+  constructor(config) {
+    this.config = config;
+  }
+  refreshPromise = null;
+  isAuthFailed = ref(false);
+  get routeNameAuth() {
+    return this.config.routeNameAuth;
+  }
+  get routeNameAuthNo() {
+    return this.config.routeNameAuthNo;
+  }
+  logout() {
+    removeExpirationDate();
+  }
+  async retry(request) {
+    const newRequest = request.clone();
+    const response = await fetch(request);
+    return {
+      data: await response.json(),
+      status: response.status,
+      request: newRequest
+    };
+  }
+  async refresh() {
+    if (!this.refreshPromise) {
+      const refreshTimeoutPromise = getLastRefreshPromise();
+      if (refreshTimeoutPromise) {
+        this.refreshPromise = refreshTimeoutPromise.then(() => {
+          this.refreshPromise = null;
+          this.isAuthFailed.value = false;
+        }).catch(async () => {
+          this.refreshPromise = null;
+          const check = this.checkAuth();
+          if (!check) {
+            if (this.refreshPromise) return this.refreshPromise;
+            if (check === null) {
+              this.isAuthFailed.value = true;
+              return Promise.reject();
+            }
+            return this.refresh();
+          }
+        });
+      } else {
+        setRefreshTimestamp();
+        this.refreshPromise = this.fetch("GET", this.config.refreshUrl, { updateToken: true }).then(() => {
+          this.refreshPromise = null;
+        }).catch((error) => {
+          this.refreshPromise = null;
+          this.isAuthFailed.value = true;
+          return Promise.reject(error);
+        }).finally(removeRefreshTimestamp);
+      }
+    }
+    return this.refreshPromise;
+  }
+  checkAuth() {
+    let result;
+    if (this.config.tokenGetter) result = !!this.config.tokenGetter?.();
+    else result = checkExpirationDate();
+    if (result) this.isAuthFailed.value = false;
+    return result;
+  }
+  fetch(method, url, config, baseUrl) {
+    return new Promise(async (resolve, reject) => {
+      const headers = new Headers(config?.data instanceof FormData ? HEADERS_FORMDATA : HEADERS_JSON);
+      if (!config?.noAuth && !config?.updateToken) {
+        if (this.refreshPromise) await this.refreshPromise;
+        const check = this.checkAuth();
+        if (!check) {
+          if (check === null) {
+            this.isAuthFailed.value = true;
+            return Promise.reject();
+          }
+          if (this.config.refreshUrl) await this.refresh();
+        } else if (this.config.tokenGetter) {
+          const token = this.config.tokenGetter();
+          if (token) headers.append("Authorization", "Bearer " + token);
+          else return Promise.reject();
+        }
+      }
+      const params = config?.params ? "?" + getURLParams(config.params) : "";
+      const request = new Request(
+        (baseUrl ?? this.config.baseUrl) + url + params,
+        {
+          method,
+          mode: "cors",
+          cache: "no-cache",
+          credentials: this.config.credentials ?? "same-origin",
+          headers,
+          redirect: "follow",
+          referrerPolicy: "no-referrer",
+          body: config?.data ? config.data instanceof FormData ? config.data : JSON.stringify(config.data) : void 0,
+          signal: config?.signal
+        }
+      );
+      fetch(request).then((response) => {
+        response.json().catch(() => void 0).then((data) => {
+          if (response.ok) {
+            resolve({
+              data,
+              status: response.status,
+              config,
+              request
+            });
+          } else {
+            if (response.status === 401) {
+              if (this.config.refreshUrl) return this.refresh().then(() => this.retry(request));
+              this.isAuthFailed.value = true;
+            }
+            this.config.onFailure?.(response);
+            reject(new ApiError({
+              data,
+              status: response.status,
+              config,
+              request
+            }));
+          }
+        });
+      }).catch((error) => {
+        if (error instanceof DOMException && error.name === "AbortError") {
+          reject(new ApiErrorCancel({
+            data: void 0,
+            config,
+            request
+          }));
+        }
+        reject(error);
+      }).finally(() => {
+        if (config?.updateToken) setExpirationDate();
+      });
+    });
+  }
+  get baseUrl() {
+    return this.config.baseUrl ?? "";
+  }
+  get(url, config) {
+    return this.fetch("GET", url, config);
+  }
+  post(url, data, config) {
+    return this.fetch("POST", url, { data, ...config });
+  }
+  patch(url, data, config) {
+    return this.fetch("PATCH", url, { data, ...config });
+  }
+  delete(url, config) {
+    return this.fetch("DELETE", url, config);
+  }
+  getRouteAuth() {
+    return {
+      path: "",
+      props: { apiClientInstance: this },
+      component: _sfc_main,
+      beforeEnter: async (to) => {
+        if (to.meta.noAuth) return;
+        if (this.refreshPromise) await this.refreshPromise;
+        if (!this.checkAuth()) {
+          if (this.config.refreshUrl) return this.refresh().catch(() => ({
+            name: this.routeNameAuthNo,
+            query: to.fullPath !== "/" ? { hash: to.fullPath } : void 0
+          }));
+          return { name: this.routeNameAuthNo, query: to.fullPath !== "/" ? { hash: to.fullPath } : void 0 };
+        }
+      },
+      meta: {
+        noAuth: false
+      }
+    };
+  }
+  getRouteAuthNo() {
+    return {
+      path: "",
+      props: { apiClientInstance: this },
+      component: _sfc_main$1,
+      beforeEnter: (to, from) => {
+        if (!this.checkAuth()) {
+          if (!to.query.hash && !from.meta.noAuth && from.fullPath !== "/") {
+            return { ...to, query: { hash: from.fullPath } };
+          }
+          return;
+        }
+        if (typeof to.query.hash === "string") return to.query.hash;
+        else return { name: this.routeNameAuth };
+      },
+      meta: {
+        noAuth: true
+      }
+    };
+  }
+  addInstance(baseUrl) {
+    return {
+      baseUrl,
+      get: (url, config) => {
+        return this.fetch("GET", url, config, baseUrl);
+      },
+      post: (url, data, config) => {
+        return this.fetch("POST", url, { data, ...config }, baseUrl);
+      },
+      patch: (url, data, config) => {
+        return this.fetch("PATCH", url, { data, ...config }, baseUrl);
+      },
+      delete: (url, config) => {
+        return this.fetch("DELETE", url, config, baseUrl);
+      }
+    };
+  }
+}
+
+export { ApiClientInstance, getURLParams };

package/package.json

@@ -4,16 +4,7 @@
     "type": "git",
     "url": "https://github.com/rsmple/eco-vue-js.git"
   },
-  "version": "0.10.75",
-  "scripts": {
-    "build": "run-p type-check \"build-only {@}\" --",
-    "dev": "vite build --mode development --watch",
-    "build-only": "vite build",
-    "type-check": "vue-tsc --build --force",
-    "lint": "eslint .",
-    "lint:fix": "eslint . --fix",
-    "lint:inspect": "npx eslint --inspect-config"
-  },
+  "version": "0.10.77",
   "dependencies": {
     "@stylistic/eslint-plugin": "5.1.0",
     "@tanstack/eslint-plugin-query": "5.81.2",
@@ -110,6 +101,9 @@
     "./dist/utils/api": {
       "import": "./dist/utils/api.js"
     },
+    "./dist/utils/ApiClient": {
+      "import": "./dist/utils/ApiClient.js"
+    },
     "./dist/utils/validate": {
       "import": "./dist/utils/validate.js"
     },
@@ -119,6 +113,12 @@
     "./dist/components/ActionsBar/WActionsBarFilter.vue": {
       "import": "./dist/components/ActionsBar/WActionsBarFilter.vue.js"
     },
+    "./dist/components/Auth/WRouteAuth.vue": {
+      "import": "./dist/components/Auth/WRouteAuth.vue.js"
+    },
+    "./dist/components/Auth/WRouteAuthNo.vue": {
+      "import": "./dist/components/Auth/WRouteAuthNo.vue.js"
+    },
     "./dist/components/BottomSheet/WBottomSheet.vue": {
       "import": "./dist/components/BottomSheet/WBottomSheet.vue.js"
     },