librechat-data-provider 0.2.1 → 0.2.5

package/dist/index.es.js

@@ -95,55 +95,58 @@ var processQueue = function (error, token) {
     failedQueue = [];
 };
 axios.interceptors.response.use(function (response) { return response; }, function (error) { return __awaiter(void 0, void 0, void 0, function () {
-    var originalRequest, token, err_1;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var originalRequest, token, err_1, token, err_2;
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
                 originalRequest = error.config;
-                if (!(error.response.status === 401 && !originalRequest._retry)) return [3 /*break*/, 7];
-                if (!isRefreshing) return [3 /*break*/, 6];
-                _a.label = 1;
+                if (!(error.response.status === 401 && !originalRequest._retry)) return [3 /*break*/, 13];
+                originalRequest._retry = true;
+                if (!isRefreshing) return [3 /*break*/, 5];
+                _b.label = 1;
             case 1:
-                _a.trys.push([1, 4, , 6]);
+                _b.trys.push([1, 4, , 5]);
                 return [4 /*yield*/, new Promise(function (resolve, reject) {
                         failedQueue.push({ resolve: resolve, reject: reject });
                     })];
             case 2:
-                token = _a.sent();
+                token = _b.sent();
                 originalRequest.headers['Authorization'] = 'Bearer ' + token;
                 return [4 /*yield*/, axios(originalRequest)];
-            case 3: return [2 /*return*/, _a.sent()];
+            case 3: return [2 /*return*/, _b.sent()];
             case 4:
-                err_1 = _a.sent();
-                return [4 /*yield*/, Promise.reject(err_1)];
-            case 5: return [2 /*return*/, _a.sent()];
-            case 6:
-                originalRequest._retry = true;
+                err_1 = _b.sent();
+                return [2 /*return*/, Promise.reject(err_1)];
+            case 5:
                 isRefreshing = true;
-                return [2 /*return*/, new Promise(function (resolve, reject) {
-                        refreshToken()
-                            .then(function (_a) {
-                            var token = _a.token;
-                            if (token) {
-                                originalRequest.headers['Authorization'] = 'Bearer ' + token;
-                                setTokenHeader(token);
-                                window.dispatchEvent(new CustomEvent('tokenUpdated', { detail: token }));
-                                processQueue(null, token);
-                                resolve(axios(originalRequest));
-                            }
-                            else {
-                                window.location.href = '/login';
-                            }
-                        })
-                            .catch(function (err) {
-                            processQueue(err, null);
-                            reject(err);
-                        })
-                            .then(function () {
-                            isRefreshing = false;
-                        });
-                    })];
-            case 7: return [2 /*return*/, Promise.reject(error)];
+                _b.label = 6;
+            case 6:
+                _b.trys.push([6, 11, 12, 13]);
+                return [4 /*yield*/, refreshToken(
+                    // Handle edge case where we get a blank screen if the initial 401 error is from a refresh token request
+                    ((_a = originalRequest.url) === null || _a === void 0 ? void 0 : _a.includes('api/auth/refresh')) ? true : false)];
+            case 7:
+                token = (_b.sent()).token;
+                if (!token) return [3 /*break*/, 9];
+                originalRequest.headers['Authorization'] = 'Bearer ' + token;
+                setTokenHeader(token);
+                window.dispatchEvent(new CustomEvent('tokenUpdated', { detail: token }));
+                processQueue(null, token);
+                return [4 /*yield*/, axios(originalRequest)];
+            case 8: return [2 /*return*/, _b.sent()];
+            case 9:
+                window.location.href = '/login';
+                _b.label = 10;
+            case 10: return [3 /*break*/, 13];
+            case 11:
+                err_2 = _b.sent();
+                processQueue(err_2, null);
+                return [2 /*return*/, Promise.reject(err_2)];
+            case 12:
+                isRefreshing = false;
+                return [7 /*endfinally*/];
+            case 13: return [2 /*return*/, Promise.reject(error)];
         }
     });
 }); });
@@ -283,7 +286,7 @@ var login$1 = function () { return '/api/auth/login'; };
 var logout$1 = function () { return '/api/auth/logout'; };
 var register$1 = function () { return '/api/auth/register'; };
 var loginGoogle = function () { return '/api/auth/google'; };
-var refreshToken$1 = function () { return '/api/auth/refresh'; };
+var refreshToken$1 = function (retry) { return "/api/auth/refresh".concat(retry ? '?retry=true' : ''); };
 var requestPasswordReset$1 = function () { return '/api/auth/requestPasswordReset'; };
 var resetPassword$1 = function () { return '/api/auth/resetPassword'; };
 var plugins = function () { return '/api/plugins'; };
@@ -377,7 +380,7 @@ var logout = function () {
 var register = function (payload) {
     return request.post(register$1(), payload);
 };
-var refreshToken = function () { return request.post(refreshToken$1()); };
+var refreshToken = function (retry) { return request.post(refreshToken$1(retry)); };
 var userKeyQuery = function (name) {
     return request.get(userKeyQuery$1(name));
 };
@@ -827,12 +830,8 @@ var useGetConversationsQuery = function (pageNumber, config) {
 var useGetSearchEnabledQuery = function (config) {
     return useQuery([QueryKeys.searchEnabled], function () { return getSearchEnabled(); }, __assign({ refetchOnWindowFocus: false, refetchOnReconnect: false, refetchOnMount: false }, config));
 };
-var useGetEndpointsQuery = function () {
-    return useQuery([QueryKeys.endpoints], function () { return getAIEndpoints(); }, {
-        refetchOnWindowFocus: false,
-        refetchOnReconnect: false,
-        refetchOnMount: false,
-    });
+var useGetEndpointsQuery = function (config) {
+    return useQuery([QueryKeys.endpoints], function () { return getAIEndpoints(); }, __assign({ refetchOnWindowFocus: false, refetchOnReconnect: false, refetchOnMount: false }, config));
 };
 var useGetModelsQuery = function (config) {
     return useQuery([QueryKeys.models], function () { return getModels(); }, __assign({ refetchOnWindowFocus: false, refetchOnReconnect: false, refetchOnMount: false }, config));

package/dist/index.js

@@ -97,55 +97,58 @@ var processQueue = function (error, token) {
     failedQueue = [];
 };
 axios.interceptors.response.use(function (response) { return response; }, function (error) { return __awaiter(void 0, void 0, void 0, function () {
-    var originalRequest, token, err_1;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var originalRequest, token, err_1, token, err_2;
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
                 originalRequest = error.config;
-                if (!(error.response.status === 401 && !originalRequest._retry)) return [3 /*break*/, 7];
-                if (!isRefreshing) return [3 /*break*/, 6];
-                _a.label = 1;
+                if (!(error.response.status === 401 && !originalRequest._retry)) return [3 /*break*/, 13];
+                originalRequest._retry = true;
+                if (!isRefreshing) return [3 /*break*/, 5];
+                _b.label = 1;
             case 1:
-                _a.trys.push([1, 4, , 6]);
+                _b.trys.push([1, 4, , 5]);
                 return [4 /*yield*/, new Promise(function (resolve, reject) {
                         failedQueue.push({ resolve: resolve, reject: reject });
                     })];
             case 2:
-                token = _a.sent();
+                token = _b.sent();
                 originalRequest.headers['Authorization'] = 'Bearer ' + token;
                 return [4 /*yield*/, axios(originalRequest)];
-            case 3: return [2 /*return*/, _a.sent()];
+            case 3: return [2 /*return*/, _b.sent()];
             case 4:
-                err_1 = _a.sent();
-                return [4 /*yield*/, Promise.reject(err_1)];
-            case 5: return [2 /*return*/, _a.sent()];
-            case 6:
-                originalRequest._retry = true;
+                err_1 = _b.sent();
+                return [2 /*return*/, Promise.reject(err_1)];
+            case 5:
                 isRefreshing = true;
-                return [2 /*return*/, new Promise(function (resolve, reject) {
-                        refreshToken()
-                            .then(function (_a) {
-                            var token = _a.token;
-                            if (token) {
-                                originalRequest.headers['Authorization'] = 'Bearer ' + token;
-                                setTokenHeader(token);
-                                window.dispatchEvent(new CustomEvent('tokenUpdated', { detail: token }));
-                                processQueue(null, token);
-                                resolve(axios(originalRequest));
-                            }
-                            else {
-                                window.location.href = '/login';
-                            }
-                        })
-                            .catch(function (err) {
-                            processQueue(err, null);
-                            reject(err);
-                        })
-                            .then(function () {
-                            isRefreshing = false;
-                        });
-                    })];
-            case 7: return [2 /*return*/, Promise.reject(error)];
+                _b.label = 6;
+            case 6:
+                _b.trys.push([6, 11, 12, 13]);
+                return [4 /*yield*/, refreshToken(
+                    // Handle edge case where we get a blank screen if the initial 401 error is from a refresh token request
+                    ((_a = originalRequest.url) === null || _a === void 0 ? void 0 : _a.includes('api/auth/refresh')) ? true : false)];
+            case 7:
+                token = (_b.sent()).token;
+                if (!token) return [3 /*break*/, 9];
+                originalRequest.headers['Authorization'] = 'Bearer ' + token;
+                setTokenHeader(token);
+                window.dispatchEvent(new CustomEvent('tokenUpdated', { detail: token }));
+                processQueue(null, token);
+                return [4 /*yield*/, axios(originalRequest)];
+            case 8: return [2 /*return*/, _b.sent()];
+            case 9:
+                window.location.href = '/login';
+                _b.label = 10;
+            case 10: return [3 /*break*/, 13];
+            case 11:
+                err_2 = _b.sent();
+                processQueue(err_2, null);
+                return [2 /*return*/, Promise.reject(err_2)];
+            case 12:
+                isRefreshing = false;
+                return [7 /*endfinally*/];
+            case 13: return [2 /*return*/, Promise.reject(error)];
         }
     });
 }); });
@@ -285,7 +288,7 @@ var login$1 = function () { return '/api/auth/login'; };
 var logout$1 = function () { return '/api/auth/logout'; };
 var register$1 = function () { return '/api/auth/register'; };
 var loginGoogle = function () { return '/api/auth/google'; };
-var refreshToken$1 = function () { return '/api/auth/refresh'; };
+var refreshToken$1 = function (retry) { return "/api/auth/refresh".concat(retry ? '?retry=true' : ''); };
 var requestPasswordReset$1 = function () { return '/api/auth/requestPasswordReset'; };
 var resetPassword$1 = function () { return '/api/auth/resetPassword'; };
 var plugins = function () { return '/api/plugins'; };
@@ -379,7 +382,7 @@ var logout = function () {
 var register = function (payload) {
     return request.post(register$1(), payload);
 };
-var refreshToken = function () { return request.post(refreshToken$1()); };
+var refreshToken = function (retry) { return request.post(refreshToken$1(retry)); };
 var userKeyQuery = function (name) {
     return request.get(userKeyQuery$1(name));
 };
@@ -829,12 +832,8 @@ var useGetConversationsQuery = function (pageNumber, config) {
 var useGetSearchEnabledQuery = function (config) {
     return reactQuery.useQuery([exports.QueryKeys.searchEnabled], function () { return getSearchEnabled(); }, __assign({ refetchOnWindowFocus: false, refetchOnReconnect: false, refetchOnMount: false }, config));
 };
-var useGetEndpointsQuery = function () {
-    return reactQuery.useQuery([exports.QueryKeys.endpoints], function () { return getAIEndpoints(); }, {
-        refetchOnWindowFocus: false,
-        refetchOnReconnect: false,
-        refetchOnMount: false,
-    });
+var useGetEndpointsQuery = function (config) {
+    return reactQuery.useQuery([exports.QueryKeys.endpoints], function () { return getAIEndpoints(); }, __assign({ refetchOnWindowFocus: false, refetchOnReconnect: false, refetchOnMount: false }, config));
 };
 var useGetModelsQuery = function (config) {
     return reactQuery.useQuery([exports.QueryKeys.models], function () { return getModels(); }, __assign({ refetchOnWindowFocus: false, refetchOnReconnect: false, refetchOnMount: false }, config));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "librechat-data-provider",
-  "version": "0.2.1",
+  "version": "0.2.5",
   "description": "data services for librechat apps",
   "main": "dist/index.js",
   "module": "dist/index.es.js",
@@ -28,7 +28,7 @@
   "dependencies": {
     "@tanstack/react-query": "^4.28.0",
     "axios": "^1.3.4",
-    "openai": "^4.11.1",
+    "openai": "4.11.1",
     "zod": "^3.22.4"
   },
   "devDependencies": {

package/src/api-endpoints.ts

@@ -52,7 +52,7 @@ export const loginFacebook = () => '/api/auth/facebook';
 
 export const loginGoogle = () => '/api/auth/google';
 
-export const refreshToken = () => '/api/auth/refresh';
+export const refreshToken = (retry?: boolean) => `/api/auth/refresh${retry ? '?retry=true' : ''}`;
 
 export const requestPasswordReset = () => '/api/auth/requestPasswordReset';
 

package/src/data-service.ts

@@ -101,7 +101,7 @@ export const searchConversations = async (
   return request.get(endpoints.search(q, pageNumber));
 };
 
-export const getAIEndpoints = () => {
+export const getAIEndpoints = (): Promise<t.TEndpointsConfig> => {
   return request.get(endpoints.aiEndpoints());
 };
 
@@ -125,7 +125,7 @@ export const register = (payload: t.TRegisterUser) => {
   return request.post(endpoints.register(), payload);
 };
 
-export const refreshToken = () => request.post(endpoints.refreshToken());
+export const refreshToken = (retry?: boolean) => request.post(endpoints.refreshToken(retry));
 
 export const userKeyQuery = (name: string): Promise<t.TCheckUserKeyResponse> =>
   request.get(endpoints.userKeyQuery(name));

package/src/react-query-service.ts

@@ -230,12 +230,19 @@ export const useGetSearchEnabledQuery = (
   });
 };
 
-export const useGetEndpointsQuery = (): QueryObserverResult<t.TEndpointsConfig> => {
-  return useQuery([QueryKeys.endpoints], () => dataService.getAIEndpoints(), {
-    refetchOnWindowFocus: false,
-    refetchOnReconnect: false,
-    refetchOnMount: false,
-  });
+export const useGetEndpointsQuery = <TData = t.TEndpointsConfig>(
+  config?: UseQueryOptions<t.TEndpointsConfig, unknown, TData>,
+): QueryObserverResult<TData> => {
+  return useQuery<t.TEndpointsConfig, unknown, TData>(
+    [QueryKeys.endpoints],
+    () => dataService.getAIEndpoints(),
+    {
+      refetchOnWindowFocus: false,
+      refetchOnReconnect: false,
+      refetchOnMount: false,
+      ...config,
+    },
+  );
 };
 
 export const useGetModelsQuery = (

package/src/request.ts

@@ -23,44 +23,47 @@ axios.interceptors.response.use(
   (response) => response,
   async (error) => {
     const originalRequest = error.config;
+
     if (error.response.status === 401 && !originalRequest._retry) {
+      originalRequest._retry = true;
+
       if (isRefreshing) {
         try {
-          const token = await new Promise(function (resolve, reject) {
+          const token = await new Promise((resolve, reject) => {
             failedQueue.push({ resolve, reject });
           });
           originalRequest.headers['Authorization'] = 'Bearer ' + token;
           return await axios(originalRequest);
         } catch (err) {
-          return await Promise.reject(err);
+          return Promise.reject(err);
         }
       }
 
-      originalRequest._retry = true;
       isRefreshing = true;
 
-      return new Promise(function (resolve, reject) {
-        refreshToken()
-          .then(({ token }) => {
-            if (token) {
-              originalRequest.headers['Authorization'] = 'Bearer ' + token;
-              setTokenHeader(token);
-              window.dispatchEvent(new CustomEvent('tokenUpdated', { detail: token }));
-              processQueue(null, token);
-              resolve(axios(originalRequest));
-            } else {
-              window.location.href = '/login';
-            }
-          })
-          .catch((err) => {
-            processQueue(err, null);
-            reject(err);
-          })
-          .then(() => {
-            isRefreshing = false;
-          });
-      });
+      try {
+        const { token } = await refreshToken(
+          // Handle edge case where we get a blank screen if the initial 401 error is from a refresh token request
+          originalRequest.url?.includes('api/auth/refresh') ? true : false,
+        );
+
+        if (token) {
+          originalRequest.headers['Authorization'] = 'Bearer ' + token;
+          setTokenHeader(token);
+          window.dispatchEvent(new CustomEvent('tokenUpdated', { detail: token }));
+          processQueue(null, token);
+          return await axios(originalRequest);
+        } else {
+          window.location.href = '/login';
+        }
+      } catch (err) {
+        processQueue(err as AxiosError, null);
+        return Promise.reject(err);
+      } finally {
+        isRefreshing = false;
+      }
     }
+
     return Promise.reject(error);
   },
 );

package/src/types.ts

@@ -120,7 +120,7 @@ export type TConfig = {
   availableModels?: [];
   userProvide?: boolean | null;
   availableTools?: [];
-  plugins?: [];
+  plugins?: Record<string, string>;
   azure?: boolean;
 };
 
@@ -181,6 +181,7 @@ export type TStartupConfig = {
   socialLoginEnabled: boolean;
   emailEnabled: boolean;
   checkBalance: boolean;
+  customFooter?: string;
 };
 
 export type TRefreshTokenResponse = {

package/types/api-endpoints.d.ts

@@ -23,7 +23,7 @@ export declare const logout: () => string;
 export declare const register: () => string;
 export declare const loginFacebook: () => string;
 export declare const loginGoogle: () => string;
-export declare const refreshToken: () => string;
+export declare const refreshToken: (retry?: boolean) => string;
 export declare const requestPasswordReset: () => string;
 export declare const resetPassword: () => string;
 export declare const plugins: () => string;

package/types/data-service.d.ts

@@ -19,13 +19,13 @@ export declare function getSearchEnabled(): Promise<boolean>;
 export declare function getUser(): Promise<t.TUser>;
 export declare function getUserBalance(): Promise<string>;
 export declare const searchConversations: (q: string, pageNumber: string) => Promise<t.TSearchResults>;
-export declare const getAIEndpoints: () => Promise<unknown>;
+export declare const getAIEndpoints: () => Promise<t.TEndpointsConfig>;
 export declare const getModels: () => Promise<t.TModelsConfig>;
 export declare const updateTokenCount: (text: string) => Promise<any>;
 export declare const login: (payload: t.TLoginUser) => Promise<any>;
 export declare const logout: () => Promise<any>;
 export declare const register: (payload: t.TRegisterUser) => Promise<any>;
-export declare const refreshToken: () => Promise<any>;
+export declare const refreshToken: (retry?: boolean) => Promise<any>;
 export declare const userKeyQuery: (name: string) => Promise<t.TCheckUserKeyResponse>;
 export declare const getLoginGoogle: () => Promise<unknown>;
 export declare const requestPasswordReset: (payload: t.TRequestPasswordReset) => Promise<t.TRequestPasswordResetResponse>;

package/types/react-query-service.d.ts

@@ -36,7 +36,7 @@ export declare const useRevokeUserKeyMutation: (name: string) => UseMutationResu
 export declare const useRevokeAllUserKeysMutation: () => UseMutationResult<unknown>;
 export declare const useGetConversationsQuery: (pageNumber: string, config?: UseQueryOptions<t.TGetConversationsResponse>) => QueryObserverResult<t.TGetConversationsResponse>;
 export declare const useGetSearchEnabledQuery: (config?: UseQueryOptions<boolean>) => QueryObserverResult<boolean>;
-export declare const useGetEndpointsQuery: () => QueryObserverResult<t.TEndpointsConfig>;
+export declare const useGetEndpointsQuery: <TData = t.TEndpointsConfig>(config?: UseQueryOptions<t.TEndpointsConfig, unknown, TData, import("@tanstack/react-query").QueryKey> | undefined) => QueryObserverResult<TData>;
 export declare const useGetModelsQuery: (config?: UseQueryOptions<t.TModelsConfig>) => QueryObserverResult<t.TModelsConfig>;
 export declare const useCreatePresetMutation: () => UseMutationResult<s.TPreset[], unknown, s.TPreset, unknown>;
 export declare const useUpdatePresetMutation: () => UseMutationResult<s.TPreset[], unknown, s.TPreset, unknown>;

package/types/types.d.ts

@@ -101,7 +101,7 @@ export type TConfig = {
     availableModels?: [];
     userProvide?: boolean | null;
     availableTools?: [];
-    plugins?: [];
+    plugins?: Record<string, string>;
     azure?: boolean;
 };
 export type TModelsConfig = Record<string, string[]>;
@@ -150,6 +150,7 @@ export type TStartupConfig = {
     socialLoginEnabled: boolean;
     emailEnabled: boolean;
     checkBalance: boolean;
+    customFooter?: string;
 };
 export type TRefreshTokenResponse = {
     token: string;