librechat-data-provider 0.2.0 → 0.2.1

package/dist/index.es.js

@@ -94,49 +94,59 @@ var processQueue = function (error, token) {
     });
     failedQueue = [];
 };
-axios.interceptors.response.use(function (response) { return response; }, function (error) {
-    var originalRequest = error.config;
-    if (error.response.status === 401 && !originalRequest._retry) {
-        if (isRefreshing) {
-            return new Promise(function (resolve, reject) {
-                failedQueue.push({ resolve: resolve, reject: reject });
-            })
-                .then(function (token) {
+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) {
+            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;
+            case 1:
+                _a.trys.push([1, 4, , 6]);
+                return [4 /*yield*/, new Promise(function (resolve, reject) {
+                        failedQueue.push({ resolve: resolve, reject: reject });
+                    })];
+            case 2:
+                token = _a.sent();
                 originalRequest.headers['Authorization'] = 'Bearer ' + token;
-                return axios(originalRequest);
-            })
-                .catch(function (err) {
-                return Promise.reject(err);
-            });
+                return [4 /*yield*/, axios(originalRequest)];
+            case 3: return [2 /*return*/, _a.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;
+                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)];
         }
-        originalRequest._retry = true;
-        isRefreshing = true;
-        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;
-            });
-        });
-    }
-    return Promise.reject(error);
-});
+    });
+}); });
 function _get(url, options) {
     return __awaiter(this, void 0, void 0, function () {
         var response;
@@ -350,9 +360,11 @@ var searchConversations = function (q, pageNumber) { return __awaiter(void 0, vo
 var getAIEndpoints = function () {
     return request.get(aiEndpoints());
 };
-var getModels = function () {
-    return request.get(models());
-};
+var getModels = function () { return __awaiter(void 0, void 0, void 0, function () {
+    return __generator(this, function (_a) {
+        return [2 /*return*/, request.get(models())];
+    });
+}); };
 var updateTokenCount = function (text) {
     return request.post(tokenizer(), { arg: text });
 };
@@ -702,7 +714,7 @@ var getResponseSender = function (endpointOption) {
 
 var QueryKeys;
 (function (QueryKeys) {
-    QueryKeys["messages"] = "messsages";
+    QueryKeys["messages"] = "messages";
     QueryKeys["allConversations"] = "allConversations";
     QueryKeys["conversation"] = "conversation";
     QueryKeys["searchEnabled"] = "searchEnabled";
@@ -822,12 +834,8 @@ var useGetEndpointsQuery = function () {
         refetchOnMount: false,
     });
 };
-var useGetModelsQuery = function () {
-    return useQuery([QueryKeys.models], function () { return getModels(); }, {
-        refetchOnWindowFocus: false,
-        refetchOnReconnect: false,
-        refetchOnMount: false,
-    });
+var useGetModelsQuery = function (config) {
+    return useQuery([QueryKeys.models], function () { return getModels(); }, __assign({ refetchOnWindowFocus: false, refetchOnReconnect: false, refetchOnMount: false }, config));
 };
 var useCreatePresetMutation = function () {
     var queryClient = useQueryClient();
@@ -1205,4 +1213,4 @@ function createPayload(submission) {
     return { server: server, payload: payload };
 }
 
-export { EModelEndpoint, QueryKeys, SSE, abortRequestWithMessage, anthropicSchema, bingAISchema, chatGPTBrowserSchema, clearAllConversations, createPayload, createPreset, deleteConversation, deletePreset, eModelEndpointSchema, getAIEndpoints, getAvailablePlugins, getConversationById, getConversations, getLoginGoogle, getMessagesByConvoId, getModels, getPresets, getResponseSender, getSearchEnabled, getStartupConfig, getUser, getUserBalance, googleSchema, gptPluginsSchema, login, logout, openAISchema, parseConvo, refreshToken, register, requestPasswordReset, resetPassword, revokeAllUserKeys, revokeUserKey, searchConversations, setAcceptLanguageHeader, setTokenHeader, tAgentOptionsSchema, tConversationSchema, tExampleSchema, tMessageSchema, tPluginAuthConfigSchema, tPluginSchema, tPresetSchema, updateConversation, updateMessage, updatePreset, updateTokenCount, updateUserKey, updateUserPlugins, useAbortRequestWithMessage, useAvailablePluginsQuery, useClearConversationsMutation, useCreatePresetMutation, useDeleteConversationMutation, useDeletePresetMutation, useGetConversationByIdMutation, useGetConversationByIdQuery, useGetConversationsQuery, useGetEndpointsQuery, useGetMessagesByConvoId, useGetModelsQuery, useGetPresetsQuery, useGetSearchEnabledQuery, useGetStartupConfig, useGetUserBalance, useGetUserQuery, useLoginUserMutation, useLogoutUserMutation, useRefreshTokenMutation, useRegisterUserMutation, useRequestPasswordResetMutation, useResetPasswordMutation, useRevokeAllUserKeysMutation, useRevokeUserKeyMutation, useSearchQuery, useUpdateConversationMutation, useUpdateMessageMutation, useUpdatePresetMutation, useUpdateTokenCountMutation, useUpdateUserKeysMutation, useUpdateUserPluginsMutation, useUserKeyQuery, userKeyQuery };
+export { EModelEndpoint, QueryKeys, SSE, abortRequestWithMessage, anthropicSchema, bingAISchema, chatGPTBrowserSchema, clearAllConversations, createPayload, createPreset, deleteConversation, deletePreset, eModelEndpointSchema, getAIEndpoints, getAvailablePlugins, getConversationById, getConversations, getLoginGoogle, getMessagesByConvoId, getModels, getPresets, getResponseSender, getSearchEnabled, getStartupConfig, getUser, getUserBalance, googleSchema, gptPluginsSchema, login, logout, openAISchema, parseConvo, refreshToken, register, request, requestPasswordReset, resetPassword, revokeAllUserKeys, revokeUserKey, searchConversations, setAcceptLanguageHeader, setTokenHeader, tAgentOptionsSchema, tConversationSchema, tExampleSchema, tMessageSchema, tPluginAuthConfigSchema, tPluginSchema, tPresetSchema, updateConversation, updateMessage, updatePreset, updateTokenCount, updateUserKey, updateUserPlugins, useAbortRequestWithMessage, useAvailablePluginsQuery, useClearConversationsMutation, useCreatePresetMutation, useDeleteConversationMutation, useDeletePresetMutation, useGetConversationByIdMutation, useGetConversationByIdQuery, useGetConversationsQuery, useGetEndpointsQuery, useGetMessagesByConvoId, useGetModelsQuery, useGetPresetsQuery, useGetSearchEnabledQuery, useGetStartupConfig, useGetUserBalance, useGetUserQuery, useLoginUserMutation, useLogoutUserMutation, useRefreshTokenMutation, useRegisterUserMutation, useRequestPasswordResetMutation, useResetPasswordMutation, useRevokeAllUserKeysMutation, useRevokeUserKeyMutation, useSearchQuery, useUpdateConversationMutation, useUpdateMessageMutation, useUpdatePresetMutation, useUpdateTokenCountMutation, useUpdateUserKeysMutation, useUpdateUserPluginsMutation, useUserKeyQuery, userKeyQuery };

package/dist/index.js

@@ -96,49 +96,59 @@ var processQueue = function (error, token) {
     });
     failedQueue = [];
 };
-axios.interceptors.response.use(function (response) { return response; }, function (error) {
-    var originalRequest = error.config;
-    if (error.response.status === 401 && !originalRequest._retry) {
-        if (isRefreshing) {
-            return new Promise(function (resolve, reject) {
-                failedQueue.push({ resolve: resolve, reject: reject });
-            })
-                .then(function (token) {
+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) {
+            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;
+            case 1:
+                _a.trys.push([1, 4, , 6]);
+                return [4 /*yield*/, new Promise(function (resolve, reject) {
+                        failedQueue.push({ resolve: resolve, reject: reject });
+                    })];
+            case 2:
+                token = _a.sent();
                 originalRequest.headers['Authorization'] = 'Bearer ' + token;
-                return axios(originalRequest);
-            })
-                .catch(function (err) {
-                return Promise.reject(err);
-            });
+                return [4 /*yield*/, axios(originalRequest)];
+            case 3: return [2 /*return*/, _a.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;
+                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)];
         }
-        originalRequest._retry = true;
-        isRefreshing = true;
-        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;
-            });
-        });
-    }
-    return Promise.reject(error);
-});
+    });
+}); });
 function _get(url, options) {
     return __awaiter(this, void 0, void 0, function () {
         var response;
@@ -352,9 +362,11 @@ var searchConversations = function (q, pageNumber) { return __awaiter(void 0, vo
 var getAIEndpoints = function () {
     return request.get(aiEndpoints());
 };
-var getModels = function () {
-    return request.get(models());
-};
+var getModels = function () { return __awaiter(void 0, void 0, void 0, function () {
+    return __generator(this, function (_a) {
+        return [2 /*return*/, request.get(models())];
+    });
+}); };
 var updateTokenCount = function (text) {
     return request.post(tokenizer(), { arg: text });
 };
@@ -704,7 +716,7 @@ var getResponseSender = function (endpointOption) {
 
 exports.QueryKeys = void 0;
 (function (QueryKeys) {
-    QueryKeys["messages"] = "messsages";
+    QueryKeys["messages"] = "messages";
     QueryKeys["allConversations"] = "allConversations";
     QueryKeys["conversation"] = "conversation";
     QueryKeys["searchEnabled"] = "searchEnabled";
@@ -824,12 +836,8 @@ var useGetEndpointsQuery = function () {
         refetchOnMount: false,
     });
 };
-var useGetModelsQuery = function () {
-    return reactQuery.useQuery([exports.QueryKeys.models], function () { return getModels(); }, {
-        refetchOnWindowFocus: false,
-        refetchOnReconnect: false,
-        refetchOnMount: false,
-    });
+var useGetModelsQuery = function (config) {
+    return reactQuery.useQuery([exports.QueryKeys.models], function () { return getModels(); }, __assign({ refetchOnWindowFocus: false, refetchOnReconnect: false, refetchOnMount: false }, config));
 };
 var useCreatePresetMutation = function () {
     var queryClient = reactQuery.useQueryClient();
@@ -1239,6 +1247,7 @@ exports.openAISchema = openAISchema;
 exports.parseConvo = parseConvo;
 exports.refreshToken = refreshToken;
 exports.register = register;
+exports.request = request;
 exports.requestPasswordReset = requestPasswordReset;
 exports.resetPassword = resetPassword;
 exports.revokeAllUserKeys = revokeAllUserKeys;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "librechat-data-provider",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "data services for librechat apps",
   "main": "dist/index.js",
   "module": "dist/index.es.js",

package/src/data-service.ts

@@ -105,7 +105,7 @@ export const getAIEndpoints = () => {
   return request.get(endpoints.aiEndpoints());
 };
 
-export const getModels = () => {
+export const getModels = async (): Promise<t.TModelsConfig> => {
   return request.get(endpoints.models());
 };
 

package/src/index.ts

@@ -1,5 +1,5 @@
 export * from './data-service';
-export * from './request';
+export { default as request } from './request';
 export * from './types';
 export * from './react-query-service';
 export * from './headers-helpers';

package/src/react-query-service.ts

@@ -11,7 +11,7 @@ import * as s from './schemas';
 import * as dataService from './data-service';
 
 export enum QueryKeys {
-  messages = 'messsages',
+  messages = 'messages',
   allConversations = 'allConversations',
   conversation = 'conversation',
   searchEnabled = 'searchEnabled',
@@ -238,11 +238,14 @@ export const useGetEndpointsQuery = (): QueryObserverResult<t.TEndpointsConfig>
   });
 };
 
-export const useGetModelsQuery = (): QueryObserverResult<t.TModelsConfig> => {
-  return useQuery([QueryKeys.models], () => dataService.getModels(), {
+export const useGetModelsQuery = (
+  config?: UseQueryOptions<t.TModelsConfig>,
+): QueryObserverResult<t.TModelsConfig> => {
+  return useQuery<t.TModelsConfig>([QueryKeys.models], () => dataService.getModels(), {
     refetchOnWindowFocus: false,
     refetchOnReconnect: false,
     refetchOnMount: false,
+    ...config,
   });
 };
 

package/src/request.ts

@@ -21,20 +21,19 @@ const processQueue = (error: AxiosError | null, token: string | null = null) =>
 
 axios.interceptors.response.use(
   (response) => response,
-  (error) => {
+  async (error) => {
     const originalRequest = error.config;
     if (error.response.status === 401 && !originalRequest._retry) {
       if (isRefreshing) {
-        return new Promise(function (resolve, reject) {
-          failedQueue.push({ resolve, reject });
-        })
-          .then((token) => {
-            originalRequest.headers['Authorization'] = 'Bearer ' + token;
-            return axios(originalRequest);
-          })
-          .catch((err) => {
-            return Promise.reject(err);
+        try {
+          const token = await new Promise(function (resolve, reject) {
+            failedQueue.push({ resolve, reject });
           });
+          originalRequest.headers['Authorization'] = 'Bearer ' + token;
+          return await axios(originalRequest);
+        } catch (err) {
+          return await Promise.reject(err);
+        }
       }
 
       originalRequest._retry = true;

package/types/data-service.d.ts

@@ -20,7 +20,7 @@ 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 getModels: () => Promise<unknown>;
+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>;

package/types/index.d.ts

@@ -1,5 +1,5 @@
 export * from './data-service';
-export * from './request';
+export { default as request } from './request';
 export * from './types';
 export * from './react-query-service';
 export * from './headers-helpers';

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

@@ -2,7 +2,7 @@ import { UseQueryOptions, UseMutationResult, QueryObserverResult } from '@tansta
 import * as t from './types';
 import * as s from './schemas';
 export declare enum QueryKeys {
-    messages = "messsages",
+    messages = "messages",
     allConversations = "allConversations",
     conversation = "conversation",
     searchEnabled = "searchEnabled",
@@ -37,7 +37,7 @@ export declare const useRevokeAllUserKeysMutation: () => UseMutationResult<unkno
 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 useGetModelsQuery: () => QueryObserverResult<t.TModelsConfig>;
+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>;
 export declare const useGetPresetsQuery: (config?: UseQueryOptions<s.TPreset[]>) => QueryObserverResult<s.TPreset[], unknown>;