librechat-data-provider 0.1.7 → 0.1.8

package/dist/index.es.js

@@ -73,6 +73,70 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
+function setAcceptLanguageHeader(value) {
+    axios.defaults.headers.common['Accept-Language'] = value;
+}
+function setTokenHeader(token) {
+    axios.defaults.headers.common['Authorization'] = 'Bearer ' + token;
+}
+
+var isRefreshing = false;
+var failedQueue = [];
+var processQueue = function (error, token) {
+    if (token === void 0) { token = null; }
+    failedQueue.forEach(function (prom) {
+        if (error) {
+            prom.reject(error);
+        }
+        else {
+            prom.resolve(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) {
+                originalRequest.headers['Authorization'] = 'Bearer ' + token;
+                return axios(originalRequest);
+            })
+                .catch(function (err) {
+                return Promise.reject(err);
+            });
+        }
+        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;
@@ -368,6 +432,7 @@ var tMessageSchema = z.object({
     sender: z.string(),
     text: z.string(),
     generation: z.string().nullable().optional(),
+    isEdited: z.boolean().optional(),
     isCreatedByUser: z.boolean(),
     error: z.boolean(),
     createdAt: z
@@ -515,14 +580,14 @@ var anthropicSchema = tConversationSchema
 })
     .transform(function (obj) {
     var _a, _b, _c, _d, _e, _f, _g;
-    return (__assign(__assign({}, obj), { model: (_a = obj.model) !== null && _a !== void 0 ? _a : 'claude-1', modelLabel: (_b = obj.modelLabel) !== null && _b !== void 0 ? _b : null, promptPrefix: (_c = obj.promptPrefix) !== null && _c !== void 0 ? _c : null, temperature: (_d = obj.temperature) !== null && _d !== void 0 ? _d : 1, maxOutputTokens: (_e = obj.maxOutputTokens) !== null && _e !== void 0 ? _e : 1024, topP: (_f = obj.topP) !== null && _f !== void 0 ? _f : 0.7, topK: (_g = obj.topK) !== null && _g !== void 0 ? _g : 5 }));
+    return (__assign(__assign({}, obj), { model: (_a = obj.model) !== null && _a !== void 0 ? _a : 'claude-1', modelLabel: (_b = obj.modelLabel) !== null && _b !== void 0 ? _b : null, promptPrefix: (_c = obj.promptPrefix) !== null && _c !== void 0 ? _c : null, temperature: (_d = obj.temperature) !== null && _d !== void 0 ? _d : 1, maxOutputTokens: (_e = obj.maxOutputTokens) !== null && _e !== void 0 ? _e : 4000, topP: (_f = obj.topP) !== null && _f !== void 0 ? _f : 0.7, topK: (_g = obj.topK) !== null && _g !== void 0 ? _g : 5 }));
 })
     .catch(function () { return ({
     model: 'claude-1',
     modelLabel: null,
     promptPrefix: null,
     temperature: 1,
-    maxOutputTokens: 1024,
+    maxOutputTokens: 4000,
     topP: 0.7,
     topK: 5,
 }); });
@@ -842,19 +907,13 @@ var useGetStartupConfig = function () {
     });
 };
 
-function setAcceptLanguageHeader(value) {
-    axios.defaults.headers.common['Accept-Language'] = value;
-}
-function setTokenHeader(token) {
-    axios.defaults.headers.common['Authorization'] = 'Bearer ' + token;
-}
-
 /* eslint-disable */
 /**
  * Copyright (C) 2016 Maxime Petazzoni <maxime.petazzoni@bulix.org>.
  * All rights reserved.
  */
 
+
 var SSE = function (url, options) {
   if (!(this instanceof SSE)) {
     return new SSE(url, options);
@@ -953,12 +1012,27 @@ var SSE = function (url, options) {
     this.close();
   };
 
-  this._onStreamProgress = function (e) {
+  this._onStreamProgress = async function (e) {
     if (!this.xhr) {
       return;
     }
 
-    if (this.xhr.status !== 200) {
+    if (this.xhr.status === 401 && !this._retry) {
+      this._retry = true;
+      try {
+        const refreshResponse = await refreshToken();
+        this.headers = {
+          'Content-Type': 'application/json',
+          Authorization: `Bearer ${refreshResponse.token}`,
+        };
+        setTokenHeader(refreshResponse.token);
+        window.dispatchEvent(new CustomEvent('tokenUpdated', { detail: refreshResponse.token }));
+        this.stream();
+      } catch (err) {
+        this._onStreamFailure(e);
+        return;
+      }
+    } else if (this.xhr.status !== 200) {
       this._onStreamFailure(e);
       return;
     }

package/dist/index.js

@@ -75,6 +75,70 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
+function setAcceptLanguageHeader(value) {
+    axios.defaults.headers.common['Accept-Language'] = value;
+}
+function setTokenHeader(token) {
+    axios.defaults.headers.common['Authorization'] = 'Bearer ' + token;
+}
+
+var isRefreshing = false;
+var failedQueue = [];
+var processQueue = function (error, token) {
+    if (token === void 0) { token = null; }
+    failedQueue.forEach(function (prom) {
+        if (error) {
+            prom.reject(error);
+        }
+        else {
+            prom.resolve(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) {
+                originalRequest.headers['Authorization'] = 'Bearer ' + token;
+                return axios(originalRequest);
+            })
+                .catch(function (err) {
+                return Promise.reject(err);
+            });
+        }
+        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;
@@ -370,6 +434,7 @@ var tMessageSchema = zod.z.object({
     sender: zod.z.string(),
     text: zod.z.string(),
     generation: zod.z.string().nullable().optional(),
+    isEdited: zod.z.boolean().optional(),
     isCreatedByUser: zod.z.boolean(),
     error: zod.z.boolean(),
     createdAt: zod.z
@@ -517,14 +582,14 @@ var anthropicSchema = tConversationSchema
 })
     .transform(function (obj) {
     var _a, _b, _c, _d, _e, _f, _g;
-    return (__assign(__assign({}, obj), { model: (_a = obj.model) !== null && _a !== void 0 ? _a : 'claude-1', modelLabel: (_b = obj.modelLabel) !== null && _b !== void 0 ? _b : null, promptPrefix: (_c = obj.promptPrefix) !== null && _c !== void 0 ? _c : null, temperature: (_d = obj.temperature) !== null && _d !== void 0 ? _d : 1, maxOutputTokens: (_e = obj.maxOutputTokens) !== null && _e !== void 0 ? _e : 1024, topP: (_f = obj.topP) !== null && _f !== void 0 ? _f : 0.7, topK: (_g = obj.topK) !== null && _g !== void 0 ? _g : 5 }));
+    return (__assign(__assign({}, obj), { model: (_a = obj.model) !== null && _a !== void 0 ? _a : 'claude-1', modelLabel: (_b = obj.modelLabel) !== null && _b !== void 0 ? _b : null, promptPrefix: (_c = obj.promptPrefix) !== null && _c !== void 0 ? _c : null, temperature: (_d = obj.temperature) !== null && _d !== void 0 ? _d : 1, maxOutputTokens: (_e = obj.maxOutputTokens) !== null && _e !== void 0 ? _e : 4000, topP: (_f = obj.topP) !== null && _f !== void 0 ? _f : 0.7, topK: (_g = obj.topK) !== null && _g !== void 0 ? _g : 5 }));
 })
     .catch(function () { return ({
     model: 'claude-1',
     modelLabel: null,
     promptPrefix: null,
     temperature: 1,
-    maxOutputTokens: 1024,
+    maxOutputTokens: 4000,
     topP: 0.7,
     topK: 5,
 }); });
@@ -844,19 +909,13 @@ var useGetStartupConfig = function () {
     });
 };
 
-function setAcceptLanguageHeader(value) {
-    axios.defaults.headers.common['Accept-Language'] = value;
-}
-function setTokenHeader(token) {
-    axios.defaults.headers.common['Authorization'] = 'Bearer ' + token;
-}
-
 /* eslint-disable */
 /**
  * Copyright (C) 2016 Maxime Petazzoni <maxime.petazzoni@bulix.org>.
  * All rights reserved.
  */
 
+
 var SSE = function (url, options) {
   if (!(this instanceof SSE)) {
     return new SSE(url, options);
@@ -955,12 +1014,27 @@ var SSE = function (url, options) {
     this.close();
   };
 
-  this._onStreamProgress = function (e) {
+  this._onStreamProgress = async function (e) {
     if (!this.xhr) {
       return;
     }
 
-    if (this.xhr.status !== 200) {
+    if (this.xhr.status === 401 && !this._retry) {
+      this._retry = true;
+      try {
+        const refreshResponse = await refreshToken();
+        this.headers = {
+          'Content-Type': 'application/json',
+          Authorization: `Bearer ${refreshResponse.token}`,
+        };
+        setTokenHeader(refreshResponse.token);
+        window.dispatchEvent(new CustomEvent('tokenUpdated', { detail: refreshResponse.token }));
+        this.stream();
+      } catch (err) {
+        this._onStreamFailure(e);
+        return;
+      }
+    } else if (this.xhr.status !== 200) {
       this._onStreamFailure(e);
       return;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "librechat-data-provider",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "data services for librechat apps",
   "main": "dist/index.js",
   "module": "dist/index.es.js",
@@ -11,7 +11,9 @@
     "build:watch": "rollup -c -w",
     "test": "jest --coverage --watch",
     "test:ci": "jest --coverage --ci",
-    "verify": "npm run test:ci"
+    "verify": "npm run test:ci",
+    "b:clean": "bun run rimraf dist",
+    "b:build": "bun run b:clean && bun run rollup -c --silent --bundleConfigAsCjs"
   },
   "repository": {
     "type": "git",

package/src/request.ts

@@ -1,4 +1,69 @@
-import axios, { AxiosRequestConfig } from 'axios';
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import axios, { AxiosRequestConfig, AxiosError } from 'axios';
+// eslint-disable-next-line import/no-cycle
+import { refreshToken } from './data-service';
+import { setTokenHeader } from './headers-helpers';
+
+let isRefreshing = false;
+let failedQueue: { resolve: (value?: any) => void; reject: (reason?: any) => void }[] = [];
+
+const processQueue = (error: AxiosError | null, token: string | null = null) => {
+  failedQueue.forEach((prom) => {
+    if (error) {
+      prom.reject(error);
+    } else {
+      prom.resolve(token);
+    }
+  });
+  failedQueue = [];
+};
+
+axios.interceptors.response.use(
+  (response) => response,
+  (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);
+          });
+      }
+
+      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;
+          });
+      });
+    }
+    return Promise.reject(error);
+  },
+);
 
 async function _get<T>(url: string, options?: AxiosRequestConfig): Promise<T> {
   const response = await axios.get(url, { ...options });

package/src/schemas.ts

@@ -77,6 +77,7 @@ export const tMessageSchema = z.object({
   sender: z.string(),
   text: z.string(),
   generation: z.string().nullable().optional(),
+  isEdited: z.boolean().optional(),
   isCreatedByUser: z.boolean(),
   error: z.boolean(),
   createdAt: z
@@ -266,7 +267,7 @@ export const anthropicSchema = tConversationSchema
     modelLabel: obj.modelLabel ?? null,
     promptPrefix: obj.promptPrefix ?? null,
     temperature: obj.temperature ?? 1,
-    maxOutputTokens: obj.maxOutputTokens ?? 1024,
+    maxOutputTokens: obj.maxOutputTokens ?? 4000,
     topP: obj.topP ?? 0.7,
     topK: obj.topK ?? 5,
   }))
@@ -275,7 +276,7 @@ export const anthropicSchema = tConversationSchema
     modelLabel: null,
     promptPrefix: null,
     temperature: 1,
-    maxOutputTokens: 1024,
+    maxOutputTokens: 4000,
     topP: 0.7,
     topK: 5,
   }));

package/src/sse.js

@@ -4,6 +4,9 @@
  * All rights reserved.
  */
 
+import { refreshToken } from './data-service';
+import { setTokenHeader } from './headers-helpers';
+
 var SSE = function (url, options) {
   if (!(this instanceof SSE)) {
     return new SSE(url, options);
@@ -102,12 +105,27 @@ var SSE = function (url, options) {
     this.close();
   };
 
-  this._onStreamProgress = function (e) {
+  this._onStreamProgress = async function (e) {
     if (!this.xhr) {
       return;
     }
 
-    if (this.xhr.status !== 200) {
+    if (this.xhr.status === 401 && !this._retry) {
+      this._retry = true;
+      try {
+        const refreshResponse = await refreshToken();
+        this.headers = {
+          'Content-Type': 'application/json',
+          Authorization: `Bearer ${refreshResponse.token}`,
+        };
+        setTokenHeader(refreshResponse.token);
+        window.dispatchEvent(new CustomEvent('tokenUpdated', { detail: refreshResponse.token }));
+        this.stream();
+      } catch (err) {
+        this._onStreamFailure(e);
+        return;
+      }
+    } else if (this.xhr.status !== 200) {
       this._onStreamFailure(e);
       return;
     }

package/types/createPayload.d.ts

@@ -24,6 +24,7 @@ export default function createPayload(submission: TSubmission): {
         bg?: string | null | undefined;
         title?: string | null | undefined;
         generation?: string | null | undefined;
+        isEdited?: boolean | undefined;
         createdAt?: string | undefined;
         updatedAt?: string | undefined;
         current?: boolean | undefined;

package/types/schemas.d.ts

@@ -141,6 +141,7 @@ export declare const tMessageSchema: z.ZodObject<{
     sender: z.ZodString;
     text: z.ZodString;
     generation: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+    isEdited: z.ZodOptional<z.ZodBoolean>;
     isCreatedByUser: z.ZodBoolean;
     error: z.ZodBoolean;
     createdAt: z.ZodDefault<z.ZodOptional<z.ZodString>>;
@@ -167,6 +168,7 @@ export declare const tMessageSchema: z.ZodObject<{
     model?: string | null | undefined;
     title?: string | null | undefined;
     generation?: string | null | undefined;
+    isEdited?: boolean | undefined;
     current?: boolean | undefined;
     unfinished?: boolean | undefined;
     submitting?: boolean | undefined;
@@ -187,6 +189,7 @@ export declare const tMessageSchema: z.ZodObject<{
     model?: string | null | undefined;
     title?: string | null | undefined;
     generation?: string | null | undefined;
+    isEdited?: boolean | undefined;
     createdAt?: string | undefined;
     updatedAt?: string | undefined;
     current?: boolean | undefined;