Skip to content

fix: Companion errors crashing backend #4674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chriskari wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Companion errors crashing backend #4674

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 46 additions & 34 deletions backend/companion/companionRouter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,19 +71,19 @@ async function buildApiHeaders(authData, contentType = 'application/json') {
}

async function handlePromptSuggestions(req, res) {
const { namespace, resourceType, groupVersion, resourceName } = JSON.parse(
req.body.toString(),
);
const authData = extractAuthHeaders(req);
const endpointUrl = COMPANION_API_BASE_URL;
const payload = {
resource_kind: resourceType,
resource_api_version: groupVersion,
resource_name: resourceName,
namespace: namespace,
};

try {
const { namespace, resourceType, groupVersion, resourceName } = JSON.parse(
req.body.toString(),
);
const endpointUrl = COMPANION_API_BASE_URL;
const payload = {
resource_kind: resourceType,
resource_api_version: groupVersion,
resource_name: resourceName,
namespace: namespace,
};
const headers = await buildApiHeaders(authData);

const response = await fetch(endpointUrl, {
Expand All @@ -107,29 +107,32 @@ async function handlePromptSuggestions(req, res) {
}

async function handleChatMessage(req, res) {
const { query, namespace, resourceType, groupVersion, resourceName } =
JSON.parse(req.body.toString());

const authData = extractAuthHeaders(req);
const conversationId = authData.sessionId;

const endpointUrl = new URL(
`${encodeURIComponent(conversationId)}/messages`,
COMPANION_API_BASE_URL,
);

const payload = {
query,
resource_kind: resourceType,
resource_api_version: groupVersion,
resource_name: resourceName,
namespace: namespace,
};

try {
const { query, namespace, resourceType, groupVersion, resourceName } =
JSON.parse(req.body.toString());

const endpointUrl = new URL(
`${encodeURIComponent(conversationId)}/messages`,
COMPANION_API_BASE_URL,
);

const payload = {
query,
resource_kind: resourceType,
resource_api_version: groupVersion,
resource_name: resourceName,
namespace: namespace,
};

const uuidPattern = /^[a-f0-9]{32}$/i;
if (!uuidPattern.test(conversationId)) {
throw new Error('Invalid session ID ');
const error = new Error('Invalid session ID');
error.status = 400;
error.error = 'Invalid session ID';
throw error;
}
// Set up headers for streaming response
res.setHeader('Content-Type', 'text/event-stream');
Expand Down Expand Up @@ -167,7 +170,7 @@ async function handleChatMessage(req, res) {
} catch (error) {
req.log.warn(error);
if (!res.headersSent) {
res.status(error.status).json({
res.status(error.status ?? 500).json({
error: error.error,
message: error.message,
});
Expand All @@ -190,12 +193,20 @@ async function handleFollowUpSuggestions(req, res) {
const authData = extractAuthHeaders(req);
const conversationId = authData.sessionId;

const endpointUrl = new URL(
`${encodeURIComponent(conversationId)}/questions`,
COMPANION_API_BASE_URL,
);

try {
const uuidPattern = /^[a-f0-9]{32}$/i;
if (!uuidPattern.test(conversationId)) {
const error = new Error('Invalid session ID');
error.status = 400;
error.error = 'Invalid session ID';
throw error;
}

const endpointUrl = new URL(
`${encodeURIComponent(conversationId)}/questions`,
COMPANION_API_BASE_URL,
);

const headers = await buildApiHeaders(authData);

const response = await fetch(endpointUrl, {
Expand All @@ -209,8 +220,9 @@ async function handleFollowUpSuggestions(req, res) {
conversationId: data?.conversation_id,
});
} catch (error) {
req.log.warn(error);
res
.status(500)
.status(error.status ?? 500)
.json({ error: `Failed to fetch AI chat data: ${error.message}` });
}
}
Expand Down
Loading