Compare commits
5 Commits
fix/logs-p
...
feat/wire-
| Author | SHA1 | Date | |
|---|---|---|---|
| 5a759541e4 | |||
| 6eb91c9eba | |||
| e7da4ca25e | |||
| e1e265804a | |||
| d361d00674 |
@@ -62,6 +62,7 @@
|
||||
"discord.js": "^14.25.1",
|
||||
"dockerode": "^4.0.9",
|
||||
"gray-matter": "^4.0.3",
|
||||
"helmet": "^8.1.0",
|
||||
"highlight.js": "^11.11.1",
|
||||
"ioredis": "^5.9.2",
|
||||
"jose": "^6.1.3",
|
||||
|
||||
@@ -106,7 +106,7 @@ export class AuthController {
|
||||
// @SkipCsrf avoids double-protection conflicts.
|
||||
// See: https://www.better-auth.com/docs/reference/security
|
||||
@SkipCsrf()
|
||||
@Throttle({ strict: { limit: 10, ttl: 60000 } })
|
||||
@Throttle({ default: { ttl: 60_000, limit: 5 } })
|
||||
async handleAuth(@Req() req: ExpressRequest, @Res() res: ExpressResponse): Promise<void> {
|
||||
// Extract client IP for logging
|
||||
const clientIp = this.getClientIp(req);
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { NestFactory } from "@nestjs/core";
|
||||
import { RequestMethod, ValidationPipe } from "@nestjs/common";
|
||||
import cookieParser from "cookie-parser";
|
||||
import helmet from "helmet";
|
||||
import { AppModule } from "./app.module";
|
||||
import { getTrustedOrigins } from "./auth/auth.config";
|
||||
import { GlobalExceptionFilter } from "./filters/global-exception.filter";
|
||||
@@ -33,6 +34,14 @@ async function bootstrap() {
|
||||
// Enable cookie parser for session handling
|
||||
app.use(cookieParser());
|
||||
|
||||
// Enable helmet security headers
|
||||
app.use(
|
||||
helmet({
|
||||
contentSecurityPolicy: false, // Let Next.js handle CSP
|
||||
crossOriginEmbedderPolicy: false,
|
||||
})
|
||||
);
|
||||
|
||||
// Enable global validation pipe with transformation
|
||||
app.useGlobalPipes(
|
||||
new ValidationPipe({
|
||||
|
||||
@@ -8,6 +8,7 @@ import {
|
||||
MinLength,
|
||||
MaxLength,
|
||||
Matches,
|
||||
IsUUID,
|
||||
} from "class-validator";
|
||||
|
||||
/**
|
||||
@@ -43,6 +44,10 @@ export class CreateProjectDto {
|
||||
})
|
||||
color?: string;
|
||||
|
||||
@IsOptional()
|
||||
@IsUUID("4", { message: "domainId must be a valid UUID" })
|
||||
domainId?: string;
|
||||
|
||||
@IsOptional()
|
||||
@IsObject({ message: "metadata must be an object" })
|
||||
metadata?: Record<string, unknown>;
|
||||
|
||||
@@ -8,6 +8,7 @@ import {
|
||||
MinLength,
|
||||
MaxLength,
|
||||
Matches,
|
||||
IsUUID,
|
||||
} from "class-validator";
|
||||
|
||||
/**
|
||||
@@ -45,6 +46,10 @@ export class UpdateProjectDto {
|
||||
})
|
||||
color?: string | null;
|
||||
|
||||
@IsOptional()
|
||||
@IsUUID("4", { message: "domainId must be a valid UUID" })
|
||||
domainId?: string | null;
|
||||
|
||||
@IsOptional()
|
||||
@IsObject({ message: "metadata must be an object" })
|
||||
metadata?: Record<string, unknown>;
|
||||
|
||||
@@ -47,6 +47,9 @@ export class ProjectsService {
|
||||
createProjectDto: CreateProjectDto
|
||||
): Promise<ProjectWithRelations> {
|
||||
const data: Prisma.ProjectCreateInput = {
|
||||
...(createProjectDto.domainId
|
||||
? { domain: { connect: { id: createProjectDto.domainId } } }
|
||||
: {}),
|
||||
name: createProjectDto.name,
|
||||
description: createProjectDto.description ?? null,
|
||||
color: createProjectDto.color ?? null,
|
||||
@@ -221,6 +224,18 @@ export class ProjectsService {
|
||||
if (updateProjectDto.startDate !== undefined) updateData.startDate = updateProjectDto.startDate;
|
||||
if (updateProjectDto.endDate !== undefined) updateData.endDate = updateProjectDto.endDate;
|
||||
if (updateProjectDto.color !== undefined) updateData.color = updateProjectDto.color;
|
||||
if (updateProjectDto.domainId !== undefined)
|
||||
updateData.domain = updateProjectDto.domainId
|
||||
? { connect: { id: updateProjectDto.domainId } }
|
||||
: { disconnect: true };
|
||||
if (updateProjectDto.domainId !== undefined)
|
||||
updateData.domain = updateProjectDto.domainId
|
||||
? {
|
||||
connect: {
|
||||
id: updateProjectDto.domainId,
|
||||
},
|
||||
}
|
||||
: { disconnect: true };
|
||||
if (updateProjectDto.metadata !== undefined) {
|
||||
updateData.metadata = updateProjectDto.metadata as unknown as Prisma.InputJsonValue;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
"use client";
|
||||
|
||||
import { useState, useEffect, useCallback, useMemo } from "react";
|
||||
import { useState, useEffect, useCallback, useMemo, useRef } from "react";
|
||||
import type { ReactElement } from "react";
|
||||
import { useSearchParams, useRouter } from "next/navigation";
|
||||
import { DragDropContext, Droppable, Draggable } from "@hello-pangea/dnd";
|
||||
@@ -12,7 +12,7 @@ import type {
|
||||
} from "@hello-pangea/dnd";
|
||||
|
||||
import { MosaicSpinner } from "@/components/ui/MosaicSpinner";
|
||||
import { fetchTasks, updateTask, type TaskFilters } from "@/lib/api/tasks";
|
||||
import { fetchTasks, updateTask, createTask, type TaskFilters } from "@/lib/api/tasks";
|
||||
import { fetchProjects, type Project } from "@/lib/api/projects";
|
||||
import { useWorkspaceId } from "@/lib/hooks";
|
||||
import type { Task } from "@mosaic/shared";
|
||||
@@ -184,9 +184,47 @@ function TaskCard({ task, provided, snapshot, columnAccent }: TaskCardProps): Re
|
||||
interface KanbanColumnProps {
|
||||
config: ColumnConfig;
|
||||
tasks: Task[];
|
||||
onAddTask: (status: TaskStatus, title: string) => Promise<void>;
|
||||
}
|
||||
|
||||
function KanbanColumn({ config, tasks }: KanbanColumnProps): ReactElement {
|
||||
function KanbanColumn({ config, tasks, onAddTask }: KanbanColumnProps): ReactElement {
|
||||
const [showAddForm, setShowAddForm] = useState(false);
|
||||
const [inputValue, setInputValue] = useState("");
|
||||
const [isSubmitting, setIsSubmitting] = useState(false);
|
||||
const inputRef = useRef<HTMLInputElement>(null);
|
||||
|
||||
// Focus input when form is shown
|
||||
useEffect(() => {
|
||||
if (showAddForm && inputRef.current) {
|
||||
inputRef.current.focus();
|
||||
}
|
||||
}, [showAddForm]);
|
||||
|
||||
const handleSubmit = async (e: React.SyntheticEvent): Promise<void> => {
|
||||
e.preventDefault();
|
||||
if (!inputValue.trim() || isSubmitting) {
|
||||
return;
|
||||
}
|
||||
|
||||
setIsSubmitting(true);
|
||||
try {
|
||||
await onAddTask(config.status, inputValue.trim());
|
||||
setInputValue("");
|
||||
setShowAddForm(false);
|
||||
} catch (err) {
|
||||
console.error("[KanbanColumn] Failed to add task:", err);
|
||||
} finally {
|
||||
setIsSubmitting(false);
|
||||
}
|
||||
};
|
||||
|
||||
const handleKeyDown = (e: React.KeyboardEvent<HTMLInputElement>): void => {
|
||||
if (e.key === "Escape") {
|
||||
setShowAddForm(false);
|
||||
setInputValue("");
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<div
|
||||
style={{
|
||||
@@ -268,6 +306,89 @@ function KanbanColumn({ config, tasks }: KanbanColumnProps): ReactElement {
|
||||
</div>
|
||||
)}
|
||||
</Droppable>
|
||||
|
||||
{/* Add Task Form */}
|
||||
{!showAddForm ? (
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => {
|
||||
setShowAddForm(true);
|
||||
}}
|
||||
style={{
|
||||
padding: "10px 16px",
|
||||
border: "none",
|
||||
background: "transparent",
|
||||
color: "var(--muted)",
|
||||
fontSize: "0.8rem",
|
||||
cursor: "pointer",
|
||||
textAlign: "left",
|
||||
transition: "color 0.15s",
|
||||
width: "100%",
|
||||
}}
|
||||
onMouseEnter={(e) => {
|
||||
e.currentTarget.style.color = "var(--text)";
|
||||
}}
|
||||
onMouseLeave={(e) => {
|
||||
e.currentTarget.style.color = "var(--muted)";
|
||||
}}
|
||||
>
|
||||
+ Add task
|
||||
</button>
|
||||
) : (
|
||||
<form
|
||||
onSubmit={handleSubmit}
|
||||
style={{ padding: "8px 12px 12px", borderTop: "1px solid var(--border)" }}
|
||||
>
|
||||
<input
|
||||
ref={inputRef}
|
||||
type="text"
|
||||
value={inputValue}
|
||||
onChange={(e) => {
|
||||
setInputValue(e.target.value);
|
||||
}}
|
||||
onKeyDown={handleKeyDown}
|
||||
placeholder="Task title..."
|
||||
disabled={isSubmitting}
|
||||
style={{
|
||||
width: "100%",
|
||||
padding: "8px 10px",
|
||||
borderRadius: "var(--r)",
|
||||
border: `1px solid ${inputValue ? "var(--primary)" : "var(--border)"}`,
|
||||
background: "var(--surface)",
|
||||
color: "var(--text)",
|
||||
fontSize: "0.85rem",
|
||||
outline: "none",
|
||||
opacity: isSubmitting ? 0.6 : 1,
|
||||
}}
|
||||
autoFocus
|
||||
/>
|
||||
<div style={{ marginTop: 6, fontSize: "0.75rem", color: "var(--muted)" }}>
|
||||
Press{" "}
|
||||
<kbd
|
||||
style={{
|
||||
padding: "2px 4px",
|
||||
background: "var(--bg-mid)",
|
||||
borderRadius: "2px",
|
||||
fontFamily: "var(--mono)",
|
||||
}}
|
||||
>
|
||||
Enter
|
||||
</kbd>{" "}
|
||||
to save,{" "}
|
||||
<kbd
|
||||
style={{
|
||||
padding: "2px 4px",
|
||||
background: "var(--bg-mid)",
|
||||
borderRadius: "2px",
|
||||
fontFamily: "var(--mono)",
|
||||
}}
|
||||
>
|
||||
Escape
|
||||
</kbd>{" "}
|
||||
to cancel
|
||||
</div>
|
||||
</form>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -621,6 +742,24 @@ export default function KanbanPage(): ReactElement {
|
||||
void loadTasks(workspaceId);
|
||||
}
|
||||
|
||||
/* --- add task handler --- */
|
||||
|
||||
const handleAddTask = useCallback(
|
||||
async (status: TaskStatus, title: string) => {
|
||||
try {
|
||||
const wsId = workspaceId ?? undefined;
|
||||
const newTask = await createTask({ title, status }, wsId);
|
||||
// Optimistically add to local state
|
||||
setTasks((prev) => [...prev, newTask]);
|
||||
} catch (err: unknown) {
|
||||
console.error("[Kanban] Failed to create task:", err);
|
||||
// Re-fetch on error to get consistent state
|
||||
void loadTasks(workspaceId);
|
||||
}
|
||||
},
|
||||
[workspaceId, loadTasks]
|
||||
);
|
||||
|
||||
/* --- render --- */
|
||||
|
||||
return (
|
||||
@@ -755,7 +894,12 @@ export default function KanbanPage(): ReactElement {
|
||||
}}
|
||||
>
|
||||
{COLUMNS.map((col) => (
|
||||
<KanbanColumn key={col.status} config={col} tasks={grouped[col.status]} />
|
||||
<KanbanColumn
|
||||
key={col.status}
|
||||
config={col}
|
||||
tasks={grouped[col.status]}
|
||||
onAddTask={handleAddTask}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
</DragDropContext>
|
||||
|
||||
@@ -17,6 +17,8 @@ import {
|
||||
import { fetchProjects, createProject, deleteProject, ProjectStatus } from "@/lib/api/projects";
|
||||
import type { Project, CreateProjectDto } from "@/lib/api/projects";
|
||||
import { useWorkspaceId } from "@/lib/hooks";
|
||||
import { fetchDomains } from "@/lib/api/domains";
|
||||
import type { Domain } from "@mosaic/shared";
|
||||
|
||||
/* ---------------------------------------------------------------------------
|
||||
Status badge helpers
|
||||
@@ -65,11 +67,14 @@ interface ProjectCardProps {
|
||||
project: Project;
|
||||
onDelete: (id: string) => void;
|
||||
onClick: (id: string) => void;
|
||||
domains: Domain[];
|
||||
}
|
||||
|
||||
function ProjectCard({ project, onDelete, onClick }: ProjectCardProps): ReactElement {
|
||||
function ProjectCard({ project, onDelete, onClick, domains }: ProjectCardProps): ReactElement {
|
||||
const [hovered, setHovered] = useState(false);
|
||||
const status = getStatusStyle(project.status);
|
||||
// Find domain if project has a domainId
|
||||
const domain = project.domainId ? domains.find((d) => d.id === project.domainId) : undefined;
|
||||
|
||||
return (
|
||||
<div
|
||||
@@ -204,6 +209,22 @@ function ProjectCard({ project, onDelete, onClick }: ProjectCardProps): ReactEle
|
||||
>
|
||||
{status.label}
|
||||
</span>
|
||||
{domain && (
|
||||
<span
|
||||
style={{
|
||||
display: "inline-block",
|
||||
padding: "2px 10px",
|
||||
borderRadius: "var(--r)",
|
||||
background: "rgba(139,92,246,0.15)",
|
||||
color: "var(--purple)",
|
||||
fontSize: "0.75rem",
|
||||
fontWeight: 500,
|
||||
marginLeft: 8,
|
||||
}}
|
||||
>
|
||||
{domain.name}
|
||||
</span>
|
||||
)}
|
||||
|
||||
{/* Timestamps */}
|
||||
<span
|
||||
@@ -229,6 +250,7 @@ interface CreateDialogProps {
|
||||
onOpenChange: (open: boolean) => void;
|
||||
onSubmit: (data: CreateProjectDto) => Promise<void>;
|
||||
isSubmitting: boolean;
|
||||
domains: Domain[];
|
||||
}
|
||||
|
||||
function CreateProjectDialog({
|
||||
@@ -236,20 +258,24 @@ function CreateProjectDialog({
|
||||
onOpenChange,
|
||||
onSubmit,
|
||||
isSubmitting,
|
||||
domains,
|
||||
}: CreateDialogProps): ReactElement {
|
||||
const [name, setName] = useState("");
|
||||
const [description, setDescription] = useState("");
|
||||
const [formError, setFormError] = useState<string | null>(null);
|
||||
const [domainId, setDomainId] = useState("");
|
||||
|
||||
function resetForm(): void {
|
||||
setName("");
|
||||
setDescription("");
|
||||
setFormError(null);
|
||||
setDomainId("");
|
||||
}
|
||||
|
||||
async function handleSubmit(e: SyntheticEvent): Promise<void> {
|
||||
e.preventDefault();
|
||||
setFormError(null);
|
||||
setDomainId("");
|
||||
|
||||
const trimmedName = name.trim();
|
||||
if (!trimmedName) {
|
||||
@@ -263,6 +289,9 @@ function CreateProjectDialog({
|
||||
if (trimmedDesc) {
|
||||
payload.description = trimmedDesc;
|
||||
}
|
||||
if (domainId) {
|
||||
payload.domainId = domainId;
|
||||
}
|
||||
await onSubmit(payload);
|
||||
resetForm();
|
||||
} catch (err: unknown) {
|
||||
@@ -382,6 +411,47 @@ function CreateProjectDialog({
|
||||
/>
|
||||
</div>
|
||||
|
||||
{/* Domain */}
|
||||
<div style={{ marginBottom: 16 }}>
|
||||
<label
|
||||
htmlFor="project-domain"
|
||||
style={{
|
||||
display: "block",
|
||||
marginBottom: 6,
|
||||
fontSize: "0.85rem",
|
||||
fontWeight: 500,
|
||||
color: "var(--text-2)",
|
||||
}}
|
||||
>
|
||||
Domain (optional)
|
||||
</label>
|
||||
<select
|
||||
id="project-domain"
|
||||
value={domainId}
|
||||
onChange={(e) => {
|
||||
setDomainId(e.target.value);
|
||||
}}
|
||||
style={{
|
||||
width: "100%",
|
||||
padding: "8px 12px",
|
||||
background: "var(--bg)",
|
||||
border: "1px solid var(--border)",
|
||||
borderRadius: "var(--r)",
|
||||
color: "var(--text)",
|
||||
fontSize: "0.9rem",
|
||||
outline: "none",
|
||||
boxSizing: "border-box",
|
||||
}}
|
||||
>
|
||||
<option value="">None</option>
|
||||
{domains.map((d) => (
|
||||
<option key={d.id} value={d.id}>
|
||||
{d.name}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
{/* Form error */}
|
||||
{formError !== null && (
|
||||
<p style={{ color: "var(--danger)", fontSize: "0.85rem", margin: "0 0 12px" }}>
|
||||
@@ -532,6 +602,7 @@ export default function ProjectsPage(): ReactElement {
|
||||
const workspaceId = useWorkspaceId();
|
||||
|
||||
const [projects, setProjects] = useState<Project[]>([]);
|
||||
const [domains, setDomains] = useState<Domain[]>([]);
|
||||
const [isLoading, setIsLoading] = useState(true);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
|
||||
@@ -601,6 +672,33 @@ export default function ProjectsPage(): ReactElement {
|
||||
};
|
||||
}, [workspaceId]);
|
||||
|
||||
// Load domains
|
||||
useEffect(() => {
|
||||
if (!workspaceId) {
|
||||
return;
|
||||
}
|
||||
|
||||
let cancelled = false;
|
||||
const wsId = workspaceId;
|
||||
|
||||
async function loadDomains(): Promise<void> {
|
||||
try {
|
||||
const response = await fetchDomains(undefined, wsId);
|
||||
if (!cancelled) {
|
||||
setDomains(response.data);
|
||||
}
|
||||
} catch (err: unknown) {
|
||||
console.error("[Projects] Failed to fetch domains:", err);
|
||||
}
|
||||
}
|
||||
|
||||
void loadDomains();
|
||||
|
||||
return (): void => {
|
||||
cancelled = true;
|
||||
};
|
||||
}, [workspaceId]);
|
||||
|
||||
function handleRetry(): void {
|
||||
void loadProjects(workspaceId);
|
||||
}
|
||||
@@ -779,6 +877,7 @@ export default function ProjectsPage(): ReactElement {
|
||||
project={project}
|
||||
onDelete={handleDeleteRequest}
|
||||
onClick={handleCardClick}
|
||||
domains={domains}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
@@ -790,6 +889,7 @@ export default function ProjectsPage(): ReactElement {
|
||||
onOpenChange={setCreateOpen}
|
||||
onSubmit={handleCreate}
|
||||
isSubmitting={isCreating}
|
||||
domains={domains}
|
||||
/>
|
||||
|
||||
{/* Delete Confirmation Dialog */}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/**
|
||||
* Chat API client
|
||||
* Handles LLM chat interactions via /api/llm/chat
|
||||
* Handles LLM chat interactions via /api/chat/stream (streaming) and /api/llm/chat (fallback)
|
||||
*/
|
||||
|
||||
import { apiPost, fetchCsrfToken, getCsrfToken } from "./client";
|
||||
@@ -33,9 +33,28 @@ export interface ChatResponse {
|
||||
}
|
||||
|
||||
/**
|
||||
* Parsed SSE data chunk from the LLM stream
|
||||
* Parsed SSE data chunk from OpenAI-compatible stream
|
||||
*/
|
||||
interface SseChunk {
|
||||
interface OpenAiSseChunk {
|
||||
id?: string;
|
||||
object?: string;
|
||||
created?: number;
|
||||
model?: string;
|
||||
choices?: {
|
||||
index: number;
|
||||
delta?: {
|
||||
role?: string;
|
||||
content?: string;
|
||||
};
|
||||
finish_reason?: string | null;
|
||||
}[];
|
||||
error?: string;
|
||||
}
|
||||
|
||||
/**
|
||||
* Parsed SSE data chunk from legacy /api/llm/chat stream
|
||||
*/
|
||||
interface LegacySseChunk {
|
||||
error?: string;
|
||||
message?: {
|
||||
role: string;
|
||||
@@ -46,7 +65,17 @@ interface SseChunk {
|
||||
}
|
||||
|
||||
/**
|
||||
* Send a chat message to the LLM
|
||||
* Parsed SSE data chunk with simple token format
|
||||
*/
|
||||
interface SimpleTokenChunk {
|
||||
token?: string;
|
||||
done?: boolean;
|
||||
error?: string;
|
||||
}
|
||||
|
||||
/**
|
||||
* Send a chat message to the LLM (non-streaming fallback)
|
||||
* Uses /api/llm/chat endpoint which supports both streaming and non-streaming
|
||||
*/
|
||||
export async function sendChatMessage(request: ChatRequest): Promise<ChatResponse> {
|
||||
return apiPost<ChatResponse>("/api/llm/chat", request);
|
||||
@@ -66,11 +95,20 @@ async function ensureCsrfTokenForStream(): Promise<string> {
|
||||
/**
|
||||
* Stream a chat message from the LLM using SSE over fetch.
|
||||
*
|
||||
* The backend accepts stream: true in the request body and responds with
|
||||
* Server-Sent Events:
|
||||
* data: {"message":{"content":"token"},...}\n\n for each token
|
||||
* data: [DONE]\n\n when the stream is complete
|
||||
* data: {"error":"message"}\n\n on error
|
||||
* Uses /api/chat/stream endpoint which proxies to OpenClaw.
|
||||
* The backend responds with Server-Sent Events in one of these formats:
|
||||
*
|
||||
* OpenAI-compatible format:
|
||||
* data: {"choices":[{"delta":{"content":"token"}}],...}\n\n
|
||||
* data: [DONE]\n\n
|
||||
*
|
||||
* Legacy format (from /api/llm/chat):
|
||||
* data: {"message":{"content":"token"},...}\n\n
|
||||
* data: [DONE]\n\n
|
||||
*
|
||||
* Simple token format:
|
||||
* data: {"token":"..."}\n\n
|
||||
* data: {"done":true}\n\n
|
||||
*
|
||||
* @param request - Chat request (stream field will be forced to true)
|
||||
* @param onChunk - Called with each token string as it arrives
|
||||
@@ -89,14 +127,14 @@ export function streamChatMessage(
|
||||
try {
|
||||
const csrfToken = await ensureCsrfTokenForStream();
|
||||
|
||||
const response = await fetch(`${API_BASE_URL}/api/llm/chat`, {
|
||||
const response = await fetch(`${API_BASE_URL}/api/chat/stream`, {
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
"X-CSRF-Token": csrfToken,
|
||||
},
|
||||
credentials: "include",
|
||||
body: JSON.stringify({ ...request, stream: true }),
|
||||
body: JSON.stringify({ messages: request.messages, stream: true }),
|
||||
signal: signal ?? null,
|
||||
});
|
||||
|
||||
@@ -132,6 +170,25 @@ export function streamChatMessage(
|
||||
const trimmed = part.trim();
|
||||
if (!trimmed) continue;
|
||||
|
||||
// Handle event: error format
|
||||
const eventMatch = /^event:\s*(\S+)\n/i.exec(trimmed);
|
||||
const dataMatch = /^data:\s*(.+)$/im.exec(trimmed);
|
||||
|
||||
if (eventMatch?.[1] === "error" && dataMatch?.[1]) {
|
||||
try {
|
||||
const errorData = JSON.parse(dataMatch[1].trim()) as {
|
||||
error?: string;
|
||||
};
|
||||
throw new Error(errorData.error ?? "Stream error occurred");
|
||||
} catch (parseErr) {
|
||||
if (parseErr instanceof SyntaxError) {
|
||||
throw new Error("Stream error occurred");
|
||||
}
|
||||
throw parseErr;
|
||||
}
|
||||
}
|
||||
|
||||
// Standard SSE format: data: {...}
|
||||
for (const line of trimmed.split("\n")) {
|
||||
if (!line.startsWith("data: ")) continue;
|
||||
|
||||
@@ -143,14 +200,39 @@ export function streamChatMessage(
|
||||
}
|
||||
|
||||
try {
|
||||
const parsed = JSON.parse(data) as SseChunk;
|
||||
const parsed: unknown = JSON.parse(data);
|
||||
|
||||
if (parsed.error) {
|
||||
throw new Error(parsed.error);
|
||||
// Handle OpenAI format (from /api/chat/stream via OpenClaw)
|
||||
const openAiChunk = parsed as OpenAiSseChunk;
|
||||
if (openAiChunk.choices?.[0]?.delta?.content) {
|
||||
onChunk(openAiChunk.choices[0].delta.content);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (parsed.message?.content) {
|
||||
onChunk(parsed.message.content);
|
||||
// Handle legacy format (from /api/llm/chat)
|
||||
const legacyChunk = parsed as LegacySseChunk;
|
||||
if (legacyChunk.message?.content) {
|
||||
onChunk(legacyChunk.message.content);
|
||||
continue;
|
||||
}
|
||||
|
||||
// Handle simple token format
|
||||
const simpleChunk = parsed as SimpleTokenChunk;
|
||||
if (simpleChunk.token) {
|
||||
onChunk(simpleChunk.token);
|
||||
continue;
|
||||
}
|
||||
|
||||
// Handle done flag in simple format
|
||||
if (simpleChunk.done === true) {
|
||||
onComplete();
|
||||
return;
|
||||
}
|
||||
|
||||
// Handle error in any format
|
||||
const error = openAiChunk.error ?? legacyChunk.error ?? simpleChunk.error;
|
||||
if (error) {
|
||||
throw new Error(error);
|
||||
}
|
||||
} catch (parseErr) {
|
||||
if (parseErr instanceof SyntaxError) {
|
||||
@@ -162,7 +244,7 @@ export function streamChatMessage(
|
||||
}
|
||||
}
|
||||
|
||||
// Natural end of stream without [DONE]
|
||||
// Natural end of stream without [DONE] or done flag
|
||||
onComplete();
|
||||
} catch (err: unknown) {
|
||||
if (err instanceof DOMException && err.name === "AbortError") {
|
||||
|
||||
@@ -95,6 +95,7 @@ export interface CreateProjectDto {
|
||||
startDate?: string;
|
||||
endDate?: string;
|
||||
color?: string;
|
||||
domainId?: string;
|
||||
metadata?: Record<string, unknown>;
|
||||
}
|
||||
|
||||
@@ -108,6 +109,7 @@ export interface UpdateProjectDto {
|
||||
startDate?: string | null;
|
||||
endDate?: string | null;
|
||||
color?: string | null;
|
||||
domainId?: string | null;
|
||||
metadata?: Record<string, unknown>;
|
||||
}
|
||||
|
||||
|
||||
9
pnpm-lock.yaml
generated
9
pnpm-lock.yaml
generated
@@ -180,6 +180,9 @@ importers:
|
||||
gray-matter:
|
||||
specifier: ^4.0.3
|
||||
version: 4.0.3
|
||||
helmet:
|
||||
specifier: ^8.1.0
|
||||
version: 8.1.0
|
||||
highlight.js:
|
||||
specifier: ^11.11.1
|
||||
version: 11.11.1
|
||||
@@ -5210,6 +5213,10 @@ packages:
|
||||
resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
|
||||
engines: {node: '>= 0.4'}
|
||||
|
||||
helmet@8.1.0:
|
||||
resolution: {integrity: sha512-jOiHyAZsmnr8LqoPGmCjYAaiuWwjAPLgY8ZX2XrmHawt99/u1y6RgrZMTeoPfpUbV96HOalYgz1qzkRbw54Pmg==}
|
||||
engines: {node: '>=18.0.0'}
|
||||
|
||||
highlight.js@11.11.1:
|
||||
resolution: {integrity: sha512-Xwwo44whKBVCYoliBQwaPvtd/2tYFkRQtXDWj1nackaV2JPXx3L0+Jvd8/qCJ2p+ML0/XVkJ2q+Mr+UVdpJK5w==}
|
||||
engines: {node: '>=12.0.0'}
|
||||
@@ -12815,6 +12822,8 @@ snapshots:
|
||||
dependencies:
|
||||
function-bind: 1.1.2
|
||||
|
||||
helmet@8.1.0: {}
|
||||
|
||||
highlight.js@11.11.1: {}
|
||||
|
||||
html-encoding-sniffer@4.0.0:
|
||||
|
||||
Reference in New Issue
Block a user