Skip to content

Commit e7478ae

Browse files
Bump @fishjam-cloud/react-client (#7)
* Bump @fishjam-cloud/react-client * Use Fishjam ID * Format
1 parent e0bd62e commit e7478ae

File tree

7 files changed

+21
-59
lines changed

7 files changed

+21
-59
lines changed

.github/workflows/deploy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
run: yarn
3636
- name: Build project
3737
env:
38-
VITE_ROOM_MANAGER_URL: ${{ secrets.ROOM_MANAGER_URL }}
38+
VITE_FISHJAM_ID: ${{ vars.FISHJAM_ID }}
3939
run: yarn build
4040
- name: Copy files to deployment server
4141
uses: appleboy/scp-action@v1

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"preview": "vite preview"
1313
},
1414
"dependencies": {
15-
"@fishjam-cloud/react-client": "^0.17.0",
15+
"@fishjam-cloud/react-client": "^0.24.0",
1616
"@mediapipe/tasks-vision": "^0.10.22-rc.20250304",
1717
"@radix-ui/react-alert-dialog": "^1.1.14",
1818
"@radix-ui/react-separator": "^1.1.7",

src/App.tsx

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import { useConnection } from "@fishjam-cloud/react-client";
1+
import { useConnection, useSandbox } from "@fishjam-cloud/react-client";
22
import RoomView from "./views/RoomView";
33
import { useParams } from "react-router";
44
import { useEffect, useMemo } from "react";
5-
import useRoomCredentials from "./hooks/useRoomCredentials";
65
import TitleBar from "./components/TitleBar";
76
import Footer from "./components/Footer";
87
import { Toaster } from "./components/ui/sonner";
@@ -11,12 +10,14 @@ function App() {
1110
const { joinRoom } = useConnection();
1211
const { room } = useParams();
1312
const peer = useMemo(() => crypto.randomUUID(), []);
14-
const creds = useRoomCredentials(room, peer);
13+
const { getSandboxPeerToken } = useSandbox();
1514

1615
useEffect(() => {
17-
if (!creds) return;
18-
joinRoom({ ...creds, peerMetadata: { name: peer } });
19-
}, [joinRoom, creds, peer]);
16+
if (!room) return;
17+
getSandboxPeerToken(room, peer).then((peerToken) =>
18+
joinRoom({ peerToken, peerMetadata: { name: peer } }),
19+
);
20+
}, [joinRoom, getSandboxPeerToken, room, peer]);
2021

2122
return (
2223
<>

src/hooks/useRoomCredentials.tsx

Lines changed: 0 additions & 39 deletions
This file was deleted.

src/main.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ setWasmBundleUrl("/assets/smelter.wasm");
1212

1313
createRoot(document.getElementById("root")!).render(
1414
<StrictMode>
15-
<FishjamProvider>
15+
<FishjamProvider fishjamId={import.meta.env.VITE_FISHJAM_ID}>
1616
<SmelterProvider>
1717
<BrowserRouter>
1818
<Routes>

src/vite-env.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ interface ViteTypeOptions {
55
}
66

77
interface ImportMetaEnv {
8-
readonly VITE_ROOM_MANAGER_URL: string;
8+
readonly VITE_FISHJAM_ID: string;
99
}
1010

1111
interface ImportMeta {

yarn.lock

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -325,27 +325,27 @@ __metadata:
325325
languageName: node
326326
linkType: hard
327327

328-
"@fishjam-cloud/react-client@npm:^0.17.0":
329-
version: 0.17.0
330-
resolution: "@fishjam-cloud/react-client@npm:0.17.0"
328+
"@fishjam-cloud/react-client@npm:^0.24.0":
329+
version: 0.24.0
330+
resolution: "@fishjam-cloud/react-client@npm:0.24.0"
331331
dependencies:
332-
"@fishjam-cloud/ts-client": "npm:0.17.0"
332+
"@fishjam-cloud/ts-client": "npm:0.24.0"
333333
events: "npm:3.3.0"
334334
lodash.isequal: "npm:4.5.0"
335-
checksum: 10c0/48c1a9c4f51079d80156cec40eb11867b5af9a568699b76a26909a351445e2bf94835c657a50b68805c01cb8b4e3ec1ffcd8be8ef877dfcd6814a3582e956586
335+
checksum: 10c0/d58e5fd8eee08417f09013de04daf4c707fbb3a75412aa4eb8b50fd7896d1902b065f5f3abc162a7ddb70778ab0e207d2eb72e79973d64ec12200db2e7cf7499
336336
languageName: node
337337
linkType: hard
338338

339-
"@fishjam-cloud/ts-client@npm:0.17.0":
340-
version: 0.17.0
341-
resolution: "@fishjam-cloud/ts-client@npm:0.17.0"
339+
"@fishjam-cloud/ts-client@npm:0.24.0":
340+
version: 0.24.0
341+
resolution: "@fishjam-cloud/ts-client@npm:0.24.0"
342342
dependencies:
343343
"@binbat/whip-whep": "npm:^1.1.1-sdp-trickle-throw"
344344
"@bufbuild/protobuf": "npm:^2.2.3"
345345
events: "npm:^3.3.0"
346346
typed-emitter: "npm:^2.1.0"
347347
uuid: "npm:^11.1.0"
348-
checksum: 10c0/936386b326a69a1a98265020b92d3ba68f7e1a7bced2e72f54efc846e1aa99d1269a59060b24cc2ea85ddd59d6a473609efde269adf26d5c4719b6e9989b9d13
348+
checksum: 10c0/b637bff32bdc89354bbbf828dfbbb4d4fbd7fd87b953d2d3c2b6d36b2c06d7cdb64330d6d10a38d4786d2da4a06c97dcb7a2e407701b8c9edb7bccb2b8972717
349349
languageName: node
350350
linkType: hard
351351

@@ -2394,7 +2394,7 @@ __metadata:
23942394
resolution: "gesture-recognition@workspace:."
23952395
dependencies:
23962396
"@eslint/js": "npm:^9.22.0"
2397-
"@fishjam-cloud/react-client": "npm:^0.17.0"
2397+
"@fishjam-cloud/react-client": "npm:^0.24.0"
23982398
"@mediapipe/tasks-vision": "npm:^0.10.22-rc.20250304"
23992399
"@radix-ui/react-alert-dialog": "npm:^1.1.14"
24002400
"@radix-ui/react-separator": "npm:^1.1.7"

0 commit comments

Comments
 (0)