Merge pull request #500 from FalkorDB/merge-main-to-staging

Update dependencies and improve test configurations

Author: Naseem77

.github/workflows/nextjs.yml

@@ -53,7 +53,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: "20"
+          node-version: "24"
           cache: ${{ steps.detect-package-manager.outputs.manager }}
       - name: Restore cache
         uses: actions/cache@v3

.github/workflows/playwright.yml

@@ -8,6 +8,10 @@ jobs:
   test:
     timeout-minutes: 60
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        shard: [1, 2]
     services:
       falkordb:
         image: falkordb/falkordb:latest
@@ -17,7 +21,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
       with:
-        node-version: lts/*
+        node-version: 24
     - name: Install dependencies
       run: npm ci
     - name: Install Playwright Browsers
@@ -32,21 +36,21 @@ jobs:
       run: |
         npm install
         npm run build
-        NEXTAUTH_SECRET=SECRET npm start & npx playwright test --reporter=dot,list
+        NEXTAUTH_SECRET=SECRET npm start & npx playwright test --shard=${{ matrix.shard }}/2 --reporter=dot,list
     - name: Ensure required directories exist
       run: |
         mkdir -p playwright-report
         mkdir -p playwright-report/artifacts
     - uses: actions/upload-artifact@v4
       if: always()
       with:
-        name: playwright-report
+        name: playwright-report-shard-${{ matrix.shard }}
         path: playwright-report/
         retention-days: 30
     - name: Upload failed test screenshots
       if: always()
       uses: actions/upload-artifact@v4
       with:
-        name: failed-test-screenshots
+        name: failed-test-screenshots-shard-${{ matrix.shard }}
         path: playwright-report/artifacts/
         retention-days: 30

Dockerfile

@@ -1,5 +1,5 @@
 # Use a Node.js base image
-FROM node:22
+FROM node:24
 
 # Set working directory
 WORKDIR /app

README.md

@@ -92,8 +92,9 @@ curl -X POST http://127.0.0.1:5000/analyze_folder \
     -d '{"path": "<PATH_TO_LOCAL_REPO>", "ignore": ["./.github", "./sbin", "./.git", "./deps", "./bin", "./build"]}'
 ```
 
-**Note:** Currently, Code-Graph supports analyzing C and Python source files.  
-Support for additional languages (e.g., JavaScript, Go, Java) is planned.  
+Note: At the moment code-graph can analyze both the Java & Python source files.
+Support for additional languages e.g. C, JavaScript, Go is planned to be added
+in the future.
 
 ### 5. Access the Web Interface  
 

app/api/repo/route.ts

@@ -22,7 +22,7 @@ export async function GET() {
 		return NextResponse.json({ result: repositories }, { status: 200 })
 	} catch (err) {
 		console.error(err)
-		return NextResponse.json((err as Error).message, { status: 400 })
+		return NextResponse.json(err instanceof Error ? err.message : String(err), { status: 400 })
 	}
 }
 
@@ -57,6 +57,6 @@ export async function POST(request: NextRequest) {
 		return NextResponse.json({ message: "success" }, { status: 200 });
 	} catch (err) {
 		console.error(err)
-		return NextResponse.json((err as Error).message, { status: 400 });
+		return NextResponse.json(err instanceof Error ? err.message : String(err), { status: 400 });
 	}
 }

app/components/ForceGraph.tsx

@@ -0,0 +1,212 @@
+"use client"
+
+import { useCallback, useEffect, useState } from "react"
+import type { Data, GraphLink, GraphNode } from "@falkordb/canvas"
+import { GraphRef, PATH_COLOR } from "@/lib/utils"
+import { GraphData, Link, Node } from "./model"
+
+interface Props {
+    id: "desktop" | "mobile"
+    data: GraphData
+    canvasRef: GraphRef
+    onNodeClick: (node: Node, event: MouseEvent) => void
+    onNodeHover: (node: Node | null) => void
+    onNodeRightClick: (node: Node, event: MouseEvent) => void
+    isNodeSelected: (node: GraphNode) => boolean
+    onLinkClick: (link: Link, event: MouseEvent) => void
+    onLinkHover: (link: Link | null) => void
+    onLinkRightClick: (link: Link, event: MouseEvent) => void
+    isLinkSelected: (link: GraphLink) => boolean
+    onBackgroundClick: (event: MouseEvent) => void
+    onBackgroundRightClick: (event: MouseEvent) => void
+    nodeCanvasObject: (node: GraphNode, ctx: CanvasRenderingContext2D) => void
+    nodePointerAreaPaint: (node: GraphNode, color: string, ctx: CanvasRenderingContext2D) => void
+    linkLineDash: (link: any) => number[] | null
+    onZoom: () => void
+    onEngineStop: () => void
+    cooldownTicks: number | undefined
+    backgroundColor?: string
+    foregroundColor?: string
+}
+
+const convertToCanvasData = (graphData: GraphData): Data => ({
+    nodes: graphData.nodes.filter(n => n.visible).map(({ id, category, color, visible, isPath, isPathSelected, data }) => ({
+        id,
+        labels: [category],
+        color,
+        visible,
+        data: { ...data, isPath, isPathSelected }
+    })),
+    links: graphData.links.filter(l => l.visible).map(({ id, label, color, visible, source, target, isPath, isPathSelected, data }) => ({
+        id,
+        relationship: label,
+        color: isPath ? PATH_COLOR : color,
+        visible,
+        source,
+        target,
+        data: { ...data, isPath, isPathSelected }
+    }))
+});
+
+export default function ForceGraph({
+    id,
+    data,
+    canvasRef,
+    onNodeClick,
+    onNodeHover,
+    onNodeRightClick,
+    isNodeSelected,
+    onLinkClick,
+    onLinkHover,
+    onLinkRightClick,
+    isLinkSelected,
+    onBackgroundClick,
+    onBackgroundRightClick,
+    onZoom,
+    onEngineStop,
+    nodeCanvasObject,
+    nodePointerAreaPaint,
+    linkLineDash,
+    cooldownTicks,
+    backgroundColor = "#FFFFFF",
+    foregroundColor = "#000000"
+}: Props) {
+    const [canvasLoaded, setCanvasLoaded] = useState(false)
+
+    // Load falkordb-canvas dynamically (client-only)
+    useEffect(() => {
+        import('@falkordb/canvas').then(() => {
+            setCanvasLoaded(true)
+        })
+    }, [])
+
+    useEffect(() => {
+        const canvas = canvasRef.current
+
+        if (!canvas) return
+
+        (window as any)[id === "desktop" ? "graphDesktop" : "graphMobile"] = () => canvas.getGraphData();
+    }, [canvasRef, id])
+
+    // Update canvas colors
+    useEffect(() => {
+        if (!canvasRef.current || !canvasLoaded) return
+        canvasRef.current.setBackgroundColor(backgroundColor)
+        canvasRef.current.setForegroundColor(foregroundColor)
+    }, [canvasRef, backgroundColor, foregroundColor, canvasLoaded])
+
+    // Update cooldown ticks
+    useEffect(() => {
+        if (!canvasRef.current || !canvasLoaded) return
+
+        canvasRef.current.setCooldownTicks(cooldownTicks === -1 ? undefined : cooldownTicks)
+    }, [canvasRef, cooldownTicks, canvasLoaded])
+
+    // Map node click handler
+    const handleNodeClick = useCallback((node: GraphNode, event: MouseEvent) => {
+        const originalNode = data.nodes.find(n => n.id === node.id)
+        if (originalNode) onNodeClick(originalNode, event)
+    }, [onNodeClick, data.nodes])
+
+    // Map node hover handler
+    const handleNodeHover = useCallback((node: GraphNode | null) => {
+        if (!node) {
+            onNodeHover(null)
+            return
+        }
+        
+        const originalNode = data.nodes.find(n => n.id === node.id)
+        
+        if (originalNode) onNodeHover(originalNode)
+    }, [onNodeHover, data.nodes])
+
+    // Map node right click handler
+    const handleNodeRightClick = useCallback((node: GraphNode, event: MouseEvent) => {
+        const originalNode = data.nodes.find(n => n.id === node.id)
+        if (originalNode) onNodeRightClick(originalNode, event)
+    }, [onNodeRightClick, data.nodes])
+
+    // Map link click handler
+    const handleLinkClick = useCallback((link: GraphLink, event: MouseEvent) => {
+        const originalLink = data.links.find(l => l.id === link.id)
+        if (originalLink) onLinkClick(originalLink, event)
+    }, [onLinkClick, data.links])
+
+    // Map link hover handler
+    const handleLinkHover = useCallback((link: GraphLink | null) => {
+        if (!link) {
+            onLinkHover(null)
+            return
+        }
+        
+        const originalLink = data.links.find(l => l.id === link.id)
+        
+        if (originalLink) onLinkHover(originalLink)
+    }, [onLinkHover, data.links])
+
+    // Map link right click handler
+    const handleLinkRightClick = useCallback((link: GraphLink, event: MouseEvent) => {
+        const originalLink = data.links.find(l => l.id === link.id)
+        if (originalLink) onLinkRightClick(originalLink, event)
+    }, [onLinkRightClick, data.links])
+
+    // Handle engine stop and set window.graph
+    const handleEngineStop = useCallback(() => {
+        onEngineStop()
+    }, [canvasRef, onEngineStop])
+
+    // Update event handlers
+    useEffect(() => {
+        if (!canvasRef.current || !canvasLoaded) return
+        canvasRef.current.setConfig({
+            autoStopOnSettle: false,
+            // nodes will display node.data.captionsKeys in the canvas
+            captionsKeys: ["name", "title"],
+            onNodeClick: handleNodeClick,
+            onNodeRightClick: handleNodeRightClick,
+            onNodeHover: handleNodeHover,
+            isNodeSelected: isNodeSelected,
+            onLinkClick: handleLinkClick,
+            onLinkRightClick: handleLinkRightClick,
+            onLinkHover: handleLinkHover,
+            isLinkSelected: isLinkSelected,
+            onBackgroundClick,
+            onBackgroundRightClick,
+            onEngineStop: handleEngineStop,
+            node: { nodeCanvasObject, nodePointerAreaPaint },
+            linkLineDash,
+            onZoom
+        })
+    }, [
+        handleNodeClick,
+        handleNodeRightClick,
+        handleNodeHover,
+        handleLinkClick,
+        handleLinkRightClick,
+        handleLinkHover,
+        isNodeSelected,
+        isLinkSelected,
+        onBackgroundClick,
+        onBackgroundRightClick,
+        handleEngineStop,
+        nodeCanvasObject,
+        nodePointerAreaPaint,
+        linkLineDash,
+        onZoom,
+        canvasRef,
+        canvasLoaded
+    ])
+
+    // Update canvas data
+    useEffect(() => {
+        const canvas = canvasRef.current
+        if (!canvas || !canvasLoaded) return
+
+        const canvasData = convertToCanvasData(data)
+        canvas.setData(canvasData)
+    }, [canvasRef, data, canvasLoaded])
+
+    return (
+        <falkordb-canvas ref={canvasRef} node-mode="replace" />
+    )
+}