Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"@emotion/react": "^11.14.0",
"@emotion/styled": "^11.14.1",
"@fn-sphere/filter": "^1.3.0",
"@hocuspocus/provider": "^3.4.4",
"@mui/material": "^7.3.8",
"@radix-ui/react-dialog": "^1.1.15",
"@radix-ui/react-dropdown-menu": "^2.1.16",
Expand Down
47 changes: 47 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 32 additions & 2 deletions src/components/connect-dialog.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { BlocksuiteWebsocketProvider } from "@/providers/blocksuite/provider";
import { HocuspocusConnectProvider } from "@/providers/hocuspocus";
import { WebSocketConnectProvider } from "@/providers/websocket";
import { RocketIcon, TriangleAlert } from "lucide-react";
import { useState } from "react";
Expand Down Expand Up @@ -31,6 +32,7 @@ import { Switch } from "./ui/switch";
// See https://github.com/toeverything/blocksuite/blob/db6e9d278e4d821e1d5aea912681e8fd1692b39e/packages/playground/apps/default/utils/collection.ts#L66
const BLOCKSUITE_PLAYGROUND_DOC_GUID = "collabPlayground";
const BLOCKSUITE_NAME = "Blocksuite Playground";
const HOCUSPOCUS_NAME = "hocuspocus";

const dailyRoomSuffix = new Date().toLocaleDateString("en-CA");
const createDailyRoom = (prefix: string) => `${prefix}-${dailyRoomSuffix}`;
Expand Down Expand Up @@ -92,6 +94,7 @@ export function ConnectDialog({
const [room, setRoom] = useState(() => createDailyRoom("quill-demo"));
const [provider, setProvider] = useState("Quill");
const [needCreateNewDoc, setNeedCreateNewDoc] = useState(true);
const [token, setToken] = useState("");
const officialDemo = officialDemos.find((demo) => demo.name === provider);

return (
Expand Down Expand Up @@ -150,8 +153,8 @@ export function ConnectDialog({
<SelectItem value="liveblocks" disabled>
LiveblocksProvider (coming soon)
</SelectItem>
<SelectItem value="hocuspocus" disabled>
HocuspocusProvider (coming soon)
<SelectItem value={HOCUSPOCUS_NAME}>
HocuspocusProvider
</SelectItem>
</SelectGroup>
</SelectContent>
Expand Down Expand Up @@ -186,6 +189,22 @@ export function ConnectDialog({
/>
</div>

{provider === HOCUSPOCUS_NAME && (
<div className="grid grid-cols-4 items-center gap-4">
<Label htmlFor="token-input" className="text-right">
Token
</Label>
<Input
id="token-input"
type="password"
className="col-span-3"
value={token}
onInput={(e) => setToken(e.currentTarget.value)}
placeholder="Optional authentication token"
/>
</div>
)}

<div className="grid grid-cols-4 items-center gap-4">
<Switch
id="create-new-doc"
Expand Down Expand Up @@ -252,6 +271,17 @@ export function ConnectDialog({
return;
}

if (provider === HOCUSPOCUS_NAME) {
const connectProvider = new HocuspocusConnectProvider(
url,
room,
doc,
token || undefined,
);
onConnect(connectProvider);
return;
}

const connectProvider = new WebSocketConnectProvider(
url,
room,
Expand Down
44 changes: 44 additions & 0 deletions src/providers/hocuspocus.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import { HocuspocusProvider } from "@hocuspocus/provider";
import * as Y from "yjs";
import { ConnectProvider } from "./types";

export class HocuspocusConnectProvider implements ConnectProvider {
doc: Y.Doc;
private provider: HocuspocusProvider;

constructor(
url: string,
name: string,
doc: Y.Doc,
token?: string | (() => string) | (() => Promise<string>),
) {
this.doc = doc;
this.provider = new HocuspocusProvider({
url,
name,
document: doc,
token: token ?? null,
});
}

connect() {
this.provider.connect();
}

disconnect() {
this.provider.destroy();
}

async waitForSynced() {
if (this.provider.isSynced) {
return;
}
return new Promise<void>((resolve) => {
const handler = () => {
this.provider.off("synced", handler);
resolve();
};
this.provider.on("synced", handler);
});
}
}