diff --git a/apps/tauri/package.json b/apps/tauri/package.json index c2c3cff..bd89438 100644 --- a/apps/tauri/package.json +++ b/apps/tauri/package.json @@ -16,7 +16,9 @@ "build:desktop:raw": "tauri build", "dev:desktop": "if command -v nix >/dev/null 2>&1; then nix develop --command bun dev:desktop:raw; else bun dev:desktop:raw; fi", "build:desktop": "if command -v nix >/dev/null 2>&1; then nix develop --command bun build:desktop:raw; else bun build:desktop:raw; fi", - "gen-icons": "tauri icon ./logo.png" + "gen-icons": "tauri icon ./logo.png", + "format": "bunx prettier --write .", + "lint": "eslint src" }, "dependencies": { "@tauri-apps/api": "^2", diff --git a/apps/tauri/src/windowControls.tsx b/apps/tauri/src/windowControls.tsx index a114dcb..1b23d00 100644 --- a/apps/tauri/src/windowControls.tsx +++ b/apps/tauri/src/windowControls.tsx @@ -1,5 +1,5 @@ import { Maximize, Minus, X } from "lucide-react"; -import { Button, buttonVariants } from "@tensamin/ui/cmp/button"; +import { Button } from "@tensamin/ui/cmp/button"; import { isTauri } from "@tauri-apps/api/core"; import { getCurrentWindow } from "@tauri-apps/api/window"; diff --git a/apps/web/src/components/sidebar.tsx b/apps/web/src/components/sidebar.tsx index 50a54bc..fe45c19 100644 --- a/apps/web/src/components/sidebar.tsx +++ b/apps/web/src/components/sidebar.tsx @@ -12,6 +12,8 @@ import { useIsMobile } from "@tensamin/ui/utils"; import { MobileNavbar } from "./navbar"; import { useLocation } from "@tanstack/react-router"; +import SidebarBox from "@tensamin/call/sidebarBox"; + /** * Renders the conversation sidebar with account summary and conversation list. * @returns Sidebar JSX. @@ -45,6 +47,11 @@ export default function Sidebar() { )} + {!isMobile && ( + + + + )} ); } diff --git a/bun.lock b/bun.lock index c79a9a8..1372191 100644 --- a/bun.lock +++ b/bun.lock @@ -84,6 +84,7 @@ "name": "@tensamin/call", "version": "0.0.0", "dependencies": { + "@livekit/components-react": "^2.9.20", "@tanstack/react-query": "^5.0.0", "@tanstack/react-router": "^1.0.0", "@tanstack/react-virtual": "^3.0.0", @@ -94,6 +95,7 @@ "@tensamin/ttp": "workspace:*", "@tensamin/ui": "workspace:*", "@tensamin/user": "workspace:*", + "livekit-client": "^2.18.1", "lucide-react": "^0.564.0", "react": "^19.2.0", "react-dom": "^19.2.0", @@ -289,6 +291,8 @@ "@base-ui/utils": ["@base-ui/utils@0.2.6", "", { "dependencies": { "@babel/runtime": "^7.28.6", "@floating-ui/utils": "^0.2.11", "reselect": "^5.1.1", "use-sync-external-store": "^1.6.0" }, "peerDependencies": { "@types/react": "^17 || ^18 || ^19", "react": "^17 || ^18 || ^19", "react-dom": "^17 || ^18 || ^19" }, "optionalPeers": ["@types/react"] }, "sha512-yQ+qeuqohwhsNpoYDqqXaLllYAkPCP4vYdDrVo8FQXaAPfHWm1pG/Vm+jmGTA5JFS0BAIjookyapuJFY8F9PIw=="], + "@bufbuild/protobuf": ["@bufbuild/protobuf@1.10.1", "", {}, "sha512-wJ8ReQbHxsAfXhrf9ixl0aYbZorRuOWpBNzm8pL8ftmSxQx/wnJD5Eg861NwJU/czy2VXFIebCeZnZrI9rktIQ=="], + "@codemirror/autocomplete": ["@codemirror/autocomplete@6.20.0", "", { "dependencies": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0" } }, "sha512-bOwvTOIJcG5FVo5gUUupiwYh8MioPLQ4UcqbcRf7UQ98X90tCa9E1kZ3Z7tqwpZxYyOvh1YTYbmZE9RTfTp5hg=="], "@codemirror/commands": ["@codemirror/commands@6.10.2", "", { "dependencies": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.4.0", "@codemirror/view": "^6.27.0", "@lezer/common": "^1.1.0" } }, "sha512-vvX1fsih9HledO1c9zdotZYUZnE4xV0m6i3m25s5DIfXofuprk6cRcLUZvSk3CASUbwjQX21tOGbkY2BH8TpnQ=="], @@ -383,7 +387,7 @@ "@floating-ui/core": ["@floating-ui/core@1.7.5", "", { "dependencies": { "@floating-ui/utils": "^0.2.11" } }, "sha512-1Ih4WTWyw0+lKyFMcBHGbb5U5FtuHJuujoyyr5zTaWS5EYMeT6Jb2AuDeftsCsEuchO+mM2ij5+q9crhydzLhQ=="], - "@floating-ui/dom": ["@floating-ui/dom@1.7.6", "", { "dependencies": { "@floating-ui/core": "^1.7.5", "@floating-ui/utils": "^0.2.11" } }, "sha512-9gZSAI5XM36880PPMm//9dfiEngYoC6Am2izES1FF406YFsjvyBMmeJ2g4SAju3xWwtuynNRFL2s9hgxpLI5SQ=="], + "@floating-ui/dom": ["@floating-ui/dom@1.7.4", "", { "dependencies": { "@floating-ui/core": "^1.7.3", "@floating-ui/utils": "^0.2.10" } }, "sha512-OOchDgh4F2CchOX94cRVqhvy7b3AFb+/rQXyswmzmGakRfkMgoWVjfnLWkRirfLEfuD4ysVW16eXzwt3jHIzKA=="], "@floating-ui/react-dom": ["@floating-ui/react-dom@2.1.8", "", { "dependencies": { "@floating-ui/dom": "^1.7.6" }, "peerDependencies": { "react": ">=16.8.0", "react-dom": ">=16.8.0" } }, "sha512-cC52bHwM/n/CxS87FH0yWdngEZrjdtLW/qVruo68qg+prK7ZQ4YGdut2GyDVpoGeAYe/h899rVeOVm6Oi40k2A=="], @@ -435,6 +439,14 @@ "@lezer/markdown": ["@lezer/markdown@1.6.3", "", { "dependencies": { "@lezer/common": "^1.5.0", "@lezer/highlight": "^1.0.0" } }, "sha512-jpGm5Ps+XErS+xA4urw7ogEGkeZOahVQF21Z6oECF0sj+2liwZopd2+I8uH5I/vZsRuuze3OxBREIANLf6KKUw=="], + "@livekit/components-core": ["@livekit/components-core@0.12.13", "", { "dependencies": { "@floating-ui/dom": "1.7.4", "loglevel": "1.9.1", "rxjs": "7.8.2" }, "peerDependencies": { "livekit-client": "^2.17.2", "tslib": "^2.6.2" } }, "sha512-DQmi84afHoHjZ62wm8y+XPNIDHTwFHAltjd3lmyXj8UZHOY7wcza4vFt1xnghJOD5wLRY58L1dkAgAw59MgWvw=="], + + "@livekit/components-react": ["@livekit/components-react@2.9.20", "", { "dependencies": { "@livekit/components-core": "0.12.13", "clsx": "2.1.1", "events": "^3.3.0", "jose": "^6.0.12", "usehooks-ts": "3.1.1" }, "peerDependencies": { "@livekit/krisp-noise-filter": "^0.2.12 || ^0.3.0", "livekit-client": "^2.17.2", "react": ">=18", "react-dom": ">=18", "tslib": "^2.6.2" }, "optionalPeers": ["@livekit/krisp-noise-filter"] }, "sha512-hjkYOsJj9Jbghb7wM5cI8HoVisKeL6Zcy1VnRWTLm0sqVbto8GJp/17T4Udx85mCPY6Jgh8I1Cv0yVzgz7CQtg=="], + + "@livekit/mutex": ["@livekit/mutex@1.1.1", "", {}, "sha512-EsshAucklmpuUAfkABPxJNhzj9v2sG7JuzFDL4ML1oJQSV14sqrpTYnsaOudMAw9yOaW53NU3QQTlUQoRs4czw=="], + + "@livekit/protocol": ["@livekit/protocol@1.44.0", "", { "dependencies": { "@bufbuild/protobuf": "^1.10.0" } }, "sha512-/vfhDUGcUKO8Q43r6i+5FrDhl5oZjm/X3U4x2Iciqvgn5C8qbj+57YPcWSJ1kyIZm5Cm6AV2nAPjMm3ETD/iyg=="], + "@marijn/find-cluster-break": ["@marijn/find-cluster-break@1.0.2", "", {}, "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g=="], "@modelcontextprotocol/sdk": ["@modelcontextprotocol/sdk@1.27.1", "", { "dependencies": { "@hono/node-server": "^1.19.9", "ajv": "^8.17.1", "ajv-formats": "^3.0.1", "content-type": "^1.0.5", "cors": "^2.8.5", "cross-spawn": "^7.0.5", "eventsource": "^3.0.2", "eventsource-parser": "^3.0.0", "express": "^5.2.1", "express-rate-limit": "^8.2.1", "hono": "^4.11.4", "jose": "^6.1.3", "json-schema-typed": "^8.0.2", "pkce-challenge": "^5.0.0", "raw-body": "^3.0.0", "zod": "^3.25 || ^4.0", "zod-to-json-schema": "^3.25.1" }, "peerDependencies": { "@cfworker/json-schema": "^4.1.1" }, "optionalPeers": ["@cfworker/json-schema"] }, "sha512-sr6GbP+4edBwFndLbM60gf07z0FQ79gaExpnsjMGePXqFcSSb7t6iscpjk9DhFhwd+mTEQrzNafGP8/iGGFYaA=="], @@ -625,6 +637,8 @@ "@types/babel__traverse": ["@types/babel__traverse@7.28.0", "", { "dependencies": { "@babel/types": "^7.28.2" } }, "sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q=="], + "@types/dom-mediacapture-record": ["@types/dom-mediacapture-record@1.0.22", "", {}, "sha512-mUMZLK3NvwRLcAAT9qmcK+9p7tpU2FHdDsntR3YI4+GY88XrgG4XiE7u1Q2LAN2/FZOz/tdMDC3GQCR4T8nFuw=="], + "@types/esrecurse": ["@types/esrecurse@4.3.1", "", {}, "sha512-xJBAbDifo5hpffDBuHl0Y8ywswbiAp/Wi7Y/GtAgSlZyIABppyurxVueOPE8LUQOxdlgi6Zqce7uoEpqNTeiUw=="], "@types/estree": ["@types/estree@1.0.8", "", {}, "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w=="], @@ -835,6 +849,8 @@ "etag": ["etag@1.8.1", "", {}, "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="], + "events": ["events@3.3.0", "", {}, "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="], + "eventsource": ["eventsource@3.0.7", "", { "dependencies": { "eventsource-parser": "^3.0.1" } }, "sha512-CRT1WTyuQoD771GW56XEZFQ/ZoSfWid1alKGDYMmkt2yl8UXrVR4pspqWNEcqKvVIzg6PAltWjxcSSPrboA4iA=="], "eventsource-parser": ["eventsource-parser@3.0.6", "", {}, "sha512-Vo1ab+QXPzZ4tCa8SwIHJFaSzy4R6SHf7BY79rFBDf0idraZWAkYrDjDj8uWaSm3S2TK+hJ7/t1CEmZ7jXw+pg=="], @@ -1041,10 +1057,16 @@ "lines-and-columns": ["lines-and-columns@1.2.4", "", {}, "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="], + "livekit-client": ["livekit-client@2.18.1", "", { "dependencies": { "@livekit/mutex": "1.1.1", "@livekit/protocol": "1.44.0", "events": "^3.3.0", "jose": "^6.1.0", "loglevel": "^1.9.2", "sdp-transform": "^2.15.0", "tslib": "2.8.1", "typed-emitter": "^2.1.0", "webrtc-adapter": "^9.0.1" }, "peerDependencies": { "@types/dom-mediacapture-record": "^1" } }, "sha512-nGjuEEV1mVN01EcAMwGIwG3J1gpBMqwn2V4R6W/8zz9Rah1CaAohIm6AMLG7BdctQpyeh34dfAOLfDodIsWyYA=="], + "locate-path": ["locate-path@6.0.0", "", { "dependencies": { "p-locate": "^5.0.0" } }, "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="], + "lodash.debounce": ["lodash.debounce@4.0.8", "", {}, "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="], + "log-symbols": ["log-symbols@6.0.0", "", { "dependencies": { "chalk": "^5.3.0", "is-unicode-supported": "^1.3.0" } }, "sha512-i24m8rpwhmPIS4zscNzK6MSEhk0DUWa/8iYQWxhffV8jkI4Phvs3F+quL5xvS0gdQR0FyTCMMH33Y78dDTzzIw=="], + "loglevel": ["loglevel@1.9.2", "", {}, "sha512-HgMmCqIJSAKqo68l0rS2AanEWfkxaZ5wNiEFb5ggm08lDs9Xl2KxBlX3PTcaD2chBM1gXAYf491/M2Rv8Jwayg=="], + "lru-cache": ["lru-cache@5.1.1", "", { "dependencies": { "yallist": "^3.0.2" } }, "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="], "lucide-react": ["lucide-react@0.564.0", "", { "peerDependencies": { "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-JJ8GVTQqFwuliifD48U6+h7DXEHdkhJ/E87kksGByII3qHxtPciVb8T8woQONHBQgHVOl7rSMrrip3SeVNy7Fg=="], @@ -1205,10 +1227,16 @@ "run-parallel": ["run-parallel@1.2.0", "", { "dependencies": { "queue-microtask": "^1.2.2" } }, "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="], + "rxjs": ["rxjs@7.8.2", "", { "dependencies": { "tslib": "^2.1.0" } }, "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA=="], + "safer-buffer": ["safer-buffer@2.1.2", "", {}, "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="], "scheduler": ["scheduler@0.27.0", "", {}, "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q=="], + "sdp": ["sdp@3.2.2", "", {}, "sha512-xZocWwfyp4hkbN4hLWxMjmv2Q8aNa9MhmOZ7L9aCZPT+dZsgRr6wZRrSYE3HTdyk/2pZKPSgqI7ns7Een1xMSA=="], + + "sdp-transform": ["sdp-transform@2.15.0", "", { "bin": { "sdp-verify": "checker.js" } }, "sha512-KrOH82c/W+GYQ0LHqtr3caRpM3ITglq3ljGUIb8LTki7ByacJZ9z+piSGiwZDsRyhQbYBOBJgr2k6X4BZXi3Kw=="], + "semver": ["semver@7.7.4", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA=="], "send": ["send@1.2.1", "", { "dependencies": { "debug": "^4.4.3", "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "etag": "^1.8.1", "fresh": "^2.0.0", "http-errors": "^2.0.1", "mime-types": "^3.0.2", "ms": "^2.1.3", "on-finished": "^2.4.1", "range-parser": "^1.2.1", "statuses": "^2.0.2" } }, "sha512-1gnZf7DFcoIcajTjTwjwuDjzuz4PPcY2StKPlsGAQ1+YH20IRVrBaXSWmdjowTJ6u8Rc01PoYOGHXfP1mYcZNQ=="], @@ -1311,6 +1339,8 @@ "type-is": ["type-is@2.0.1", "", { "dependencies": { "content-type": "^1.0.5", "media-typer": "^1.1.0", "mime-types": "^3.0.0" } }, "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw=="], + "typed-emitter": ["typed-emitter@2.1.0", "", { "optionalDependencies": { "rxjs": "*" } }, "sha512-g/KzbYKbH5C2vPkaXGu8DJlHrGKHLsM25Zg9WuC9pMGfuvT+X25tZQWo5fK1BjBm8+UrVE9LDCvaY0CQk+fXDA=="], + "typescript": ["typescript@5.9.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw=="], "typescript-eslint": ["typescript-eslint@8.57.0", "", { "dependencies": { "@typescript-eslint/eslint-plugin": "8.57.0", "@typescript-eslint/parser": "8.57.0", "@typescript-eslint/typescript-estree": "8.57.0", "@typescript-eslint/utils": "8.57.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-W8GcigEMEeB07xEZol8oJ26rigm3+bfPHxHvwbYUlu1fUDsGuQ7Hiskx5xGW/xM4USc9Ephe3jtv7ZYPQntHeA=="], @@ -1331,6 +1361,8 @@ "use-sync-external-store": ["use-sync-external-store@1.6.0", "", { "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w=="], + "usehooks-ts": ["usehooks-ts@3.1.1", "", { "dependencies": { "lodash.debounce": "^4.0.8" }, "peerDependencies": { "react": "^16.8.0 || ^17 || ^18 || ^19 || ^19.0.0-rc" } }, "sha512-I4diPp9Cq6ieSUH2wu+fDAVQO43xwtulo+fKEidHUwZPnYImbtkTjzIJYcDcJqxgmX31GVqNFURodvcgHcW0pA=="], + "util-deprecate": ["util-deprecate@1.0.2", "", {}, "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="], "validate-npm-package-name": ["validate-npm-package-name@7.0.2", "", {}, "sha512-hVDIBwsRruT73PbK7uP5ebUt+ezEtCmzZz3F59BSr2F6OVFnJ/6h8liuvdLrQ88Xmnk6/+xGGuq+pG9WwTuy3A=="], @@ -1345,6 +1377,8 @@ "web-streams-polyfill": ["web-streams-polyfill@3.3.3", "", {}, "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw=="], + "webrtc-adapter": ["webrtc-adapter@9.0.4", "", { "dependencies": { "sdp": "^3.2.0" } }, "sha512-5ZZY1+lGq8LEKuDlg9M2RPJHlH3R7OVwyHqMcUsLKCgd9Wvf+QrFTCItkXXYPmrJn8H6gRLXbSgxLLdexiqHxw=="], + "which": ["which@2.0.2", "", { "dependencies": { "isexe": "^2.0.0" }, "bin": { "node-which": "./bin/node-which" } }, "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="], "word-wrap": ["word-wrap@1.2.5", "", {}, "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA=="], @@ -1389,6 +1423,10 @@ "@eslint/config-helpers/@eslint/core": ["@eslint/core@1.1.0", "", { "dependencies": { "@types/json-schema": "^7.0.15" } }, "sha512-/nr9K9wkr3P1EzFTdFdMoLuo1PmIxjmwvPozwoSodjNBdefGujXQUF93u1DDZpEaTuDvMsIQddsd35BwtrW9Xw=="], + "@floating-ui/react-dom/@floating-ui/dom": ["@floating-ui/dom@1.7.6", "", { "dependencies": { "@floating-ui/core": "^1.7.5", "@floating-ui/utils": "^0.2.11" } }, "sha512-9gZSAI5XM36880PPMm//9dfiEngYoC6Am2izES1FF406YFsjvyBMmeJ2g4SAju3xWwtuynNRFL2s9hgxpLI5SQ=="], + + "@livekit/components-core/loglevel": ["loglevel@1.9.1", "", {}, "sha512-hP3I3kCrDIMuRwAwHltphhDM1r8i55H33GgqjXbrisuJhF4kRhW1dNuxsRklp4bXl8DSdLaNLuiL4A/LWRfxvg=="], + "@modelcontextprotocol/sdk/ajv": ["ajv@8.18.0", "", { "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2" } }, "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A=="], "@tailwindcss/oxide-wasm32-wasi/@emnapi/core": ["@emnapi/core@1.8.1", "", { "dependencies": { "@emnapi/wasi-threads": "1.1.0", "tslib": "^2.4.0" }, "bundled": true }, "sha512-AvT9QFpxK0Zd8J0jopedNm+w/2fIzvtPKPjqyw9jwvBaReTTqPBk9Hixaz7KbjimP+QNz605/XnjFcDAL2pqBg=="], diff --git a/packages/call/package.json b/packages/call/package.json index d999407..e73bbf2 100644 --- a/packages/call/package.json +++ b/packages/call/package.json @@ -6,7 +6,8 @@ "exports": { "./context": "./src/context.tsx", "./screen": "./src/screen.tsx", - "./utils": "./src/utils.ts" + "./utils": "./src/utils.ts", + "./sidebarBox": "./src/components/sidebarBox.tsx" }, "scripts": { "format": "bunx prettier --write .", @@ -14,16 +15,18 @@ "build": "tsc -p tsconfig.json --noEmit" }, "dependencies": { + "@livekit/components-react": "^2.9.20", "@tanstack/react-query": "^5.0.0", "@tanstack/react-router": "^1.0.0", "@tanstack/react-virtual": "^3.0.0", "@tensamin/crypto": "workspace:*", - "@tensamin/ttp": "workspace:*", - "@tensamin/storage": "workspace:*", - "@tensamin/user": "workspace:*", "@tensamin/markdown": "workspace:*", "@tensamin/shared": "workspace:*", + "@tensamin/storage": "workspace:*", + "@tensamin/ttp": "workspace:*", "@tensamin/ui": "workspace:*", + "@tensamin/user": "workspace:*", + "livekit-client": "^2.18.1", "lucide-react": "^0.564.0", "react": "^19.2.0", "react-dom": "^19.2.0", diff --git a/packages/call/src/components/actions.tsx b/packages/call/src/components/actions.tsx new file mode 100644 index 0000000..916098d --- /dev/null +++ b/packages/call/src/components/actions.tsx @@ -0,0 +1,3 @@ +export default function Actions() { + return
Actions
; +} diff --git a/packages/call/src/components/modals/big/user.tsx b/packages/call/src/components/modals/big/user.tsx new file mode 100644 index 0000000..767f911 --- /dev/null +++ b/packages/call/src/components/modals/big/user.tsx @@ -0,0 +1,3 @@ +export default function BigUser() { + return
Big User
; +} diff --git a/packages/call/src/components/modals/big/video.tsx b/packages/call/src/components/modals/big/video.tsx new file mode 100644 index 0000000..5819513 --- /dev/null +++ b/packages/call/src/components/modals/big/video.tsx @@ -0,0 +1,3 @@ +export default function BigVideo() { + return
Big Video
; +} diff --git a/packages/call/src/components/modals/small/user.tsx b/packages/call/src/components/modals/small/user.tsx new file mode 100644 index 0000000..c33ec90 --- /dev/null +++ b/packages/call/src/components/modals/small/user.tsx @@ -0,0 +1,3 @@ +export default function SmallUser() { + return
Small User
; +} diff --git a/packages/call/src/components/modals/small/video.tsx b/packages/call/src/components/modals/small/video.tsx new file mode 100644 index 0000000..2c84969 --- /dev/null +++ b/packages/call/src/components/modals/small/video.tsx @@ -0,0 +1,3 @@ +export default function SmallVideo() { + return
Small Video
; +} diff --git a/packages/call/src/components/sidebarBox.tsx b/packages/call/src/components/sidebarBox.tsx new file mode 100644 index 0000000..05ce0b9 --- /dev/null +++ b/packages/call/src/components/sidebarBox.tsx @@ -0,0 +1,7 @@ +import { useCall } from "../context"; + +export default function SidebarBox() { + const { state } = useCall(); + + return state === "closed" ? null :
Sidebar
; +} diff --git a/packages/call/src/context.tsx b/packages/call/src/context.tsx index 8f08ba8..d77029e 100644 --- a/packages/call/src/context.tsx +++ b/packages/call/src/context.tsx @@ -1,20 +1,25 @@ import { createContext, useContext, useEffect, useState } from "react"; -import { log } from "@tensamin/shared/log"; +import { log, toast } from "@tensamin/shared/log"; import { useNavigate } from "@tanstack/react-router"; +import { useTTP } from "@tensamin/ttp/context"; +import z from "zod"; +import { ttp } from "@tensamin/shared/data"; + +import { LiveKitRoom } from "@livekit/components-react"; export const context = createContext(undefined); export default function Provider(props: { children: React.ReactNode }) { const navigate = useNavigate(); + const { send } = useTTP(); - const [state, setState] = useState<"closed" | "connecting" | "open">( - "closed", - ); + const [state, setState] = useState< + "closed" | "closing" | "connecting" | "open" + >("closed"); const [callId, setCallId] = useState(null); const [callSecret, setCallSecret] = useState(null); - - console.log(callId, callSecret); + const [livekitToken, setLivekitToken] = useState(null); function connect(callId: string, callSecret: string) { setState("connecting"); @@ -25,21 +30,23 @@ export default function Provider(props: { children: React.ReactNode }) { // Master reset function function disconnect() { - setState("closed"); + setState("closing"); setCallId(null); setCallSecret(null); + setLivekitToken(null); } // Utils function joinCall(userId: number, callId?: string) { // get/generate e2ee secret - // go into convs and find call id - // generate shared secret and decrypt enc call secret + /// go into convs and find call id + /// generate shared secret and decrypt enc call secret // check if user is already in call // connect to call connect("", ""); + setView("grid"); // navigate to call page navigate({ to: "/call", search: { userId: userId, callId: callId } }); @@ -48,25 +55,135 @@ export default function Provider(props: { children: React.ReactNode }) { // Event listener for incoming calls useEffect(() => {}, []); + /** + * All of UI + */ + const [view, setView] = useState<"preview" | "focused" | "grid">("preview"); + const [currentCallData, setCurrentCallData] = useState | null>(null); + + // Get current call information for preview view + useEffect(() => { + if (view !== "preview" || !callId) return; + + send("get_call_data", { call_id: callId }) + .then((data) => { + setCurrentCallData(data.data); + }) + .catch((err) => { + log(1, "Call", "red", "Failed to get call data", { + callId, + error: err, + }); + setCurrentCallData({ + someInfo: "Failed", + }); + }); + }, [callId, send, view]); + return ( - {props.children} + { + void room; + }, + setupEngine: async (engine) => { + void engine; + }, + setParticipantCryptorEnabled: async ( + enabled: boolean, + participantIdentity: string, + ) => { + console.log( + `Set participant ${participantIdentity} cryptor enabled: ${enabled}`, + ); + }, + setSifTrailer: async (trailer: Uint8Array) => { + void trailer; + }, + + // Encryption + encryptData: async (data: Uint8Array) => { + console.log(callSecret); + return { + uuid: "", + payload: data, + iv: new Uint8Array(), + keyIndex: 0, + }; + }, + handleEncryptedData: async ( + payload: Uint8Array, + iv: Uint8Array, + participantIdentity: string, + keyIndex: number, + ) => { + void iv; + void participantIdentity; + void keyIndex; + console.log(callSecret); + return { + uuid: crypto.randomUUID(), + payload, + }; + }, + }, + }, + }} + onConnected={() => setState("open")} + onDisconnected={() => setState("closed")} + onError={(error) => log(1, "Call", "red", error.message)} + onMediaDeviceFailure={(failure, kind) => { + log(1, "call", "red", "Media device failure", { failure, kind }); + toast("error", "Media device failure. See console for details."); + }} + onEncryptionError={(error) => { + log(1, "call", "red", "Encryption error", { error }); + toast( + "error", + "Error during call encryption. See console for details.", + ); + }} + > + {props.children} + ); } type contextType = { - state: "closed" | "connecting" | "open"; + state: "closed" | "closing" | "connecting" | "open"; + view: "preview" | "focused" | "grid"; + setView: (view: "preview" | "focused" | "grid") => void; connect: (callId: string, callSecret: string) => void; disconnect: () => void; joinCall: (userId: number, callId?: string) => void; + currentCallData: z.infer | null; }; export function useCall(): contextType { diff --git a/packages/call/src/screen.tsx b/packages/call/src/screen.tsx index 88679f6..59fb3ee 100644 --- a/packages/call/src/screen.tsx +++ b/packages/call/src/screen.tsx @@ -1,3 +1,16 @@ +import { useCall } from "./context"; + +import MainLayout from "./views/main/layout"; +import MainGrid from "./views/main/grid"; +import MainFocused from "./views/main/focused"; +import Preview from "./views/preview"; + export default function Screen() { - return
; + const { view } = useCall(); + + return view === "preview" ? ( + + ) : ( + {view === "grid" ? : } + ); } diff --git a/packages/call/src/views/main/focused.tsx b/packages/call/src/views/main/focused.tsx new file mode 100644 index 0000000..18bb0b4 --- /dev/null +++ b/packages/call/src/views/main/focused.tsx @@ -0,0 +1,3 @@ +export default function View() { + return
Focused
; +} diff --git a/packages/call/src/views/main/grid.tsx b/packages/call/src/views/main/grid.tsx new file mode 100644 index 0000000..515100a --- /dev/null +++ b/packages/call/src/views/main/grid.tsx @@ -0,0 +1,3 @@ +export default function View() { + return
Grid
; +} diff --git a/packages/call/src/views/main/layout.tsx b/packages/call/src/views/main/layout.tsx new file mode 100644 index 0000000..4eb57aa --- /dev/null +++ b/packages/call/src/views/main/layout.tsx @@ -0,0 +1,8 @@ +export default function Layout({ children }: { children: React.ReactNode }) { + return ( +
+ Layout + {children} +
+ ); +} diff --git a/packages/call/src/views/preview.tsx b/packages/call/src/views/preview.tsx new file mode 100644 index 0000000..735e214 --- /dev/null +++ b/packages/call/src/views/preview.tsx @@ -0,0 +1,7 @@ +import { useCall } from "../context"; + +export default function Preview() { + const { currentCallData } = useCall(); + + return
Preview View {currentCallData?.someInfo}
; +} diff --git a/packages/shared/src/data.ts b/packages/shared/src/data.ts index acece20..4a14dbb 100644 --- a/packages/shared/src/data.ts +++ b/packages/shared/src/data.ts @@ -153,6 +153,16 @@ export const ttp = { timestamp: z.number(), }), }, + + // Calls + get_call_data: { + request: z.object({ + call_id: z.string(), + }), + response: z.object({ + someInfo: z.string(), + }), + }, } satisfies Record; export type TTP = typeof ttp; diff --git a/scripts/install-packages.ts b/scripts/install-packages.ts index 1a3a49d..f897f0c 100644 --- a/scripts/install-packages.ts +++ b/scripts/install-packages.ts @@ -1,5 +1,5 @@ import { existsSync, readdirSync, statSync } from "fs"; -import { join } from "path"; +import { join, relative } from "path"; import { execSync } from "child_process"; import { fileURLToPath } from "node:url"; @@ -7,7 +7,8 @@ import { dirname } from "node:path"; const _dirname = dirname(fileURLToPath(import.meta.url)); -const packagesDir = join(_dirname, "..", "packages"); +const rootDir = join(_dirname, ".."); +const targetDirs = [join(rootDir, "packages"), join(rootDir, "apps")]; function getPackageDirs(dir: string): string[] { const entries = readdirSync(dir); @@ -28,17 +29,19 @@ function getPackageDirs(dir: string): string[] { return dirs; } -const packageDirs = getPackageDirs(packagesDir); +for (const targetDir of targetDirs) { + const packageDirs = getPackageDirs(targetDir); -for (const fullPath of packageDirs) { - const entry = fullPath.replace(packagesDir + "/", ""); - console.log(`Installing ${entry}...`); - try { - execSync("bun install", { cwd: fullPath, stdio: "inherit" }); - console.log(`${entry} intalled successfully.`); - } catch { - console.error(`Failed to install ${entry}.`); - process.exit(1); + for (const fullPath of packageDirs) { + const entry = relative(rootDir, fullPath); + console.log(`Installing ${entry}...`); + try { + execSync("bun install", { cwd: fullPath, stdio: "inherit" }); + console.log(`${entry} intalled successfully.`); + } catch { + console.error(`Failed to install ${entry}.`); + process.exit(1); + } } } diff --git a/scripts/lint-packages.ts b/scripts/lint-packages.ts index 54ddaf0..b9abdf2 100644 --- a/scripts/lint-packages.ts +++ b/scripts/lint-packages.ts @@ -1,5 +1,5 @@ import { existsSync, readdirSync, statSync } from "fs"; -import { join } from "path"; +import { join, relative } from "path"; import { execSync } from "child_process"; import { fileURLToPath } from "node:url"; @@ -7,7 +7,8 @@ import { dirname } from "node:path"; const _dirname = dirname(fileURLToPath(import.meta.url)); -const packagesDir = join(_dirname, "..", "packages"); +const rootDir = join(_dirname, ".."); +const targetDirs = [join(rootDir, "packages"), join(rootDir, "apps")]; function getPackageDirs(dir: string): string[] { const entries = readdirSync(dir); @@ -28,17 +29,19 @@ function getPackageDirs(dir: string): string[] { return dirs; } -const packageDirs = getPackageDirs(packagesDir); +for (const targetDir of targetDirs) { + const packageDirs = getPackageDirs(targetDir); -for (const fullPath of packageDirs) { - const entry = fullPath.replace(packagesDir + "/", ""); - console.log(`Linting ${entry}...`); - try { - execSync("bun run lint", { cwd: fullPath, stdio: "inherit" }); - console.log(`${entry} linted successfully.`); - } catch { - console.error(`Failed to lint ${entry}.`); - process.exit(1); + for (const fullPath of packageDirs) { + const entry = relative(rootDir, fullPath); + console.log(`Linting ${entry}...`); + try { + execSync("bun run lint", { cwd: fullPath, stdio: "inherit" }); + console.log(`${entry} linted successfully.`); + } catch { + console.error(`Failed to lint ${entry}.`); + process.exit(1); + } } }