@worktango/ai-assistant 0.0.37 → 0.0.39

package/dist/express.js

@@ -6485,9 +6485,9 @@ var require_fix_request_body = __commonJS({
   "../../node_modules/http-proxy-middleware/dist/handlers/fix-request-body.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.fixRequestBody = fixRequestBody;
+    exports.fixRequestBody = fixRequestBody2;
     var querystring = require("querystring");
-    function fixRequestBody(proxyReq, req) {
+    function fixRequestBody2(proxyReq, req) {
       if (req.readableLength !== 0) {
         return;
       }
@@ -11191,28 +11191,33 @@ function setupAiAssistantRoutes(args) {
   const routePath = args.route ?? "/ai-assistant";
   const port = args.targetPort ?? 80;
   const protocol = "http";
+  args.app.use(routePath, (req, res, next) => {
+    args.getBearerToken(req.headers).then((bearerToken) => {
+      req.headers.Authorization = `Bearer ${bearerToken}`;
+      next();
+    }).catch((error) => {
+      logger.error("Error getting bearer token:", error);
+      next(error);
+    });
+  });
   const proxyOptions = {
     target: `${protocol}://${args.targetHost}:${port}`,
     changeOrigin: true,
     pathRewrite: (path, req) => {
-      return args.getTargetPath(req.url || path);
+      const expressRequest = req;
+      return args.getTargetPath(expressRequest.originalUrl || path);
     },
     on: {
-      proxyReq: async (proxyReq, req) => {
-        try {
-          const bearerToken = await args.getBearerToken(req.headers);
-          proxyReq.setHeader("Authorization", `Bearer ${bearerToken}`);
-        } catch (error) {
-          logger.error("Error getting bearer token:", error);
-          throw error;
+      proxyReq: import_http_proxy_middleware.fixRequestBody,
+      proxyRes: (proxyRes, req, res) => {
+        if (req.headers.accept === "text/event-stream") {
+          res.writeHead(res.statusCode, {
+            "Content-Type": "text/event-stream",
+            "Cache-Control": "no-transform",
+            Connection: "keep-alive"
+          });
         }
       },
-      proxyRes: (proxyRes) => {
-        logger.debug("Proxy response received", {
-          status: proxyRes.statusCode,
-          headers: proxyRes.headers
-        });
-      },
       error: (err, req, res) => {
         logger.error("Proxy error:", err);
         if ("headersSent" in res && !res.headersSent) {
@@ -11221,8 +11226,7 @@ function setupAiAssistantRoutes(args) {
           res.end();
         }
       }
-    },
-    logger
+    }
   };
   const proxy = (0, import_http_proxy_middleware.createProxyMiddleware)(proxyOptions);
   args.app.use(routePath, ...coalesce(args.preflightMiddlewares, []), proxy);

package/express.d.ts

@@ -7,7 +7,9 @@ export function setupAiAssistantRoutes(args: {
    * back-channel request proxying. This should be a JWT token that can be
    * decoded on the `kazoo-web` application to authenticate the request.
    */
-  getBearerToken: (req: Request) => Promise<string>;
+  getBearerToken: (
+    headers: Record<string, undefined | string | string[]>
+  ) => Promise<string>;
   /**
    * The host of the application to proxy requests to.
    */
@@ -31,8 +33,15 @@ export function setupAiAssistantRoutes(args: {
   preflightMiddlewares?: RequestHandler[];
   /**
    * A function that should return the target path for the proxy request, based
-   * on the incoming request object. The path returned will be appended to the
+   * on the incoming full path. The path returned will be appended to the
    * target host and port to form the final URL.
+   *
+   * @example
+   * ```ts
+   *   getTargetPath: (fullPath) => {
+   *     return fullPath;
+   *   }
+   * ```
    */
-  getTargetPath: (req: Request) => string;
+  getTargetPath: (fullPath: string) => string;
 }): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@worktango/ai-assistant",
-  "version": "0.0.37",
+  "version": "0.0.39",
   "files": [
     "dist",
     "express.d.ts",