itube-specs 0.0.478 → 0.0.479

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "itube-specs",
   "type": "module",
-  "version": "0.0.478",
+  "version": "0.0.479",
   "main": "./nuxt.config.ts",
   "types": "./types/index.d.ts",
   "scripts": {
     "prepublish": "npm install && npx nuxi prepare",
-    "patch": "npm version patch"
+    "patch": "npm version patch",
+    "eslint fix": "npx eslint . --ext .ts,.vue,.js --fix"
   },
   "exports": {
     ".": {

package/runtime/utils/server/api-helper.ts

@@ -1,41 +1,31 @@
-import type { NitroFetchOptions } from "nitropack/types";
-import { AbortControllerUtil } from '../server/abort-controller';
+import type { NitroFetchOptions } from 'nitropack/types'
 
-/** Хелпер для работы с API */
 export class ApiHelper {
-    /** Метод для получения данных */
-    static async fetch<T>(
-        path: string,
-        fetchOptions: NitroFetchOptions<string>,
-        runtimeConfig?: any,
-    ): Promise<T> {
-        // TODO поменяется апи ендпойнт, после переделать
-        // const apiDomain = useRuntimeConfig()?.public?.apiDomain;
-        const signal = AbortControllerUtil.getSignalAbortController();
+  static async fetch<T>(
+    path: string,
+    options: NitroFetchOptions<string> = {}
+  ): Promise<T> {
+    const config = useRuntimeConfig()
 
-        const _fetchOptions = {
-            ...fetchOptions,
-            headers: {
-                ...(fetchOptions.headers || {}),
-                'x-domain': runtimeConfig.public.xDomain,
-            },
-            body: fetchOptions.body !== undefined
-                ? fetchOptions.body : undefined,
-        };
+    try {
+      const response = await $fetch<{ data: T }>(`/bff${path}`, {
+        retry: 1,
+        headers: {
+          ...(options.headers || {}),
+          'x-domain': config.public.xDomain,
+        },
+        ...options,
+      })
 
-        try {
-            const res = await $fetch(`/bff${path}`, { retry: 0, ..._fetchOptions, signal, });
-
-            if (typeof res === 'string') {
-                return JSON.parse(res).data;
-            } else {
-                return res as T;
-            }
-        } catch (error) {
-            if (signal?.aborted) {
-                throw AbortControllerUtil.createAbortController();
-            }
-            throw error;
-        }
+      return response?.data as T
+    } catch (error: any) {
+      throw createError({
+        statusCode: error?.status || 500,
+        statusMessage:
+          error?.data?.message ||
+          error?.message ||
+          'API request failed',
+      })
     }
+  }
 }

package/runtime/utils/server/server-api-helper.ts

@@ -2,27 +2,23 @@ import type { H3Event } from "h3";
 
 /** Класс для работы с серверным API (бекенд) */
 export class ServerApiHelper {
-  /* Класс для запроса данных на бекенде */
-  public static async fetch<T>(url: string, event: H3Event, requestOptions: RequestInit): Promise<T> {
+  public static async fetch<T>(
+    url: string,
+    event: H3Event,
+    requestOptions: RequestInit = {}
+  ): Promise<T> {
     try {
-      const response = await fetch(url, {
+      const response = await $fetch<{ data: T }>(url, {
         headers: getHeaders(event),
+        retry: 1,
         ...requestOptions,
       });
-      return (await response.json())?.data as T;
-    } catch (error) {
-      throw new Error(`Cannot fetch: ${error.data}`);
+
+      return response?.data as T;
+    } catch (error: any) {
+      throw new Error(
+        `Cannot fetch: ${error?.data?.message || error?.message || 'Unknown error'}`
+      );
     }
   }
-  // TODO проверить а надо ли, если ничего не сломается оставить только один метод
-  public static async fetchNitro<T>(url: string, event: H3Event, requestOptions: RequestInit): Promise<T> {
-    try {
-      return JSON.parse(String(await $fetch(url, {
-        headers: getHeaders(event),
-        ...requestOptions,
-      })));
-    } catch (error) {
-      throw new Error(`Cannot fetch: ${error.data}`);
-    }
-  };
 }