Compare commits

..

12 Commits

4 changed files with 551 additions and 397 deletions

View File

@ -114,12 +114,12 @@ export default {
.select() .select()
.from(sandbox) .from(sandbox)
.where(eq(sandbox.userId, userId)) .where(eq(sandbox.userId, userId))
.all(); .all()
if (userSandboxes.length >= 8) { if (userSandboxes.length >= 8) {
return new Response("You reached the maximum # of sandboxes.", { return new Response("You reached the maximum # of sandboxes.", {
status: 400, status: 400,
}); })
} }
const sb = await db const sb = await db

View File

@ -31,7 +31,7 @@ export const sandbox = sqliteTable("sandbox", {
createdAt: integer("createdAt", { mode: "timestamp_ms" }), createdAt: integer("createdAt", { mode: "timestamp_ms" }),
userId: text("user_id") userId: text("user_id")
.notNull() .notNull()
.references(() => user.id, { onDelete: "cascade" }), .references(() => user.id),
}); });
export type Sandbox = typeof sandbox.$inferSelect; export type Sandbox = typeof sandbox.$inferSelect;

View File

@ -49,11 +49,15 @@ const terminals: Record<string, Terminal> = {};
const dirName = "/home/user"; const dirName = "/home/user";
const moveFile = async (filesystem: FilesystemManager, filePath: string, newFilePath: string) => { const moveFile = async (
const fileContents = await filesystem.readBytes(filePath) filesystem: FilesystemManager,
filePath: string,
newFilePath: string
) => {
const fileContents = await filesystem.readBytes(filePath);
await filesystem.writeBytes(newFilePath, fileContents); await filesystem.writeBytes(newFilePath, fileContents);
await filesystem.remove(filePath); await filesystem.remove(filePath);
} };
io.use(async (socket, next) => { io.use(async (socket, next) => {
const handshakeSchema = z.object({ const handshakeSchema = z.object({
@ -109,6 +113,7 @@ io.use(async (socket, next) => {
const lockManager = new LockManager(); const lockManager = new LockManager();
io.on("connection", async (socket) => { io.on("connection", async (socket) => {
try {
if (inactivityTimeout) clearTimeout(inactivityTimeout); if (inactivityTimeout) clearTimeout(inactivityTimeout);
const data = socket.data as { const data = socket.data as {
@ -132,10 +137,14 @@ io.on("connection", async (socket) => {
if (!containers[data.sandboxId]) { if (!containers[data.sandboxId]) {
containers[data.sandboxId] = await Sandbox.create(); containers[data.sandboxId] = await Sandbox.create();
console.log("Created container ", data.sandboxId); console.log("Created container ", data.sandboxId);
io.emit("previewURL", "https://" + containers[data.sandboxId].getHostname(5173)); io.emit(
"previewURL",
"https://" + containers[data.sandboxId].getHostname(5173)
);
} }
} catch (error) { } catch (e: any) {
console.error("Error creating container ", data.sandboxId, error); console.error(`Error creating container ${data.sandboxId}:`, e);
io.emit("error", `Error: container creation. ${e.message ?? e}`);
} }
}); });
@ -144,12 +153,14 @@ io.on("connection", async (socket) => {
await containers[data.sandboxId].process.startAndWait( await containers[data.sandboxId].process.startAndWait(
`sudo chown -R user "${path.join(dirName, "projects", data.sandboxId)}"` `sudo chown -R user "${path.join(dirName, "projects", data.sandboxId)}"`
); );
} };
const sandboxFiles = await getSandboxFiles(data.sandboxId); const sandboxFiles = await getSandboxFiles(data.sandboxId);
sandboxFiles.fileData.forEach(async (file) => { sandboxFiles.fileData.forEach(async (file) => {
const filePath = path.join(dirName, file.id); const filePath = path.join(dirName, file.id);
await containers[data.sandboxId].filesystem.makeDir(path.dirname(filePath)); await containers[data.sandboxId].filesystem.makeDir(
path.dirname(filePath)
);
await containers[data.sandboxId].filesystem.write(filePath, file.data); await containers[data.sandboxId].filesystem.write(filePath, file.data);
}); });
fixPermissions(); fixPermissions();
@ -157,43 +168,65 @@ io.on("connection", async (socket) => {
socket.emit("loaded", sandboxFiles.files); socket.emit("loaded", sandboxFiles.files);
socket.on("getFile", (fileId: string, callback) => { socket.on("getFile", (fileId: string, callback) => {
console.log(fileId);
try {
const file = sandboxFiles.fileData.find((f) => f.id === fileId); const file = sandboxFiles.fileData.find((f) => f.id === fileId);
if (!file) return; if (!file) return;
callback(file.data); callback(file.data);
} catch (e: any) {
console.error("Error getting file:", e);
io.emit("error", `Error: get file. ${e.message ?? e}`);
}
}); });
socket.on("getFolder", async (folderId: string, callback) => { socket.on("getFolder", async (folderId: string, callback) => {
try {
const files = await getFolder(folderId); const files = await getFolder(folderId);
callback(files); callback(files);
} catch (e: any) {
console.error("Error getting folder:", e);
io.emit("error", `Error: get folder. ${e.message ?? e}`);
}
}); });
// todo: send diffs + debounce for efficiency // todo: send diffs + debounce for efficiency
socket.on("saveFile", async (fileId: string, body: string) => { socket.on("saveFile", async (fileId: string, body: string) => {
try { try {
await saveFileRL.consume(data.userId, 1);
if (Buffer.byteLength(body, "utf-8") > MAX_BODY_SIZE) { if (Buffer.byteLength(body, "utf-8") > MAX_BODY_SIZE) {
socket.emit( socket.emit(
"rateLimit", "error",
"Rate limited: file size too large. Please reduce the file size." "Error: file size too large. Please reduce the file size."
); );
return; return;
} }
try {
await saveFileRL.consume(data.userId, 1);
await saveFile(fileId, body);
} catch (e) {
io.emit("error", "Rate limited: file saving. Please slow down.");
return;
}
const file = sandboxFiles.fileData.find((f) => f.id === fileId); const file = sandboxFiles.fileData.find((f) => f.id === fileId);
if (!file) return; if (!file) return;
file.data = body; file.data = body;
await containers[data.sandboxId].filesystem.write(path.join(dirName, file.id), body); await containers[data.sandboxId].filesystem.write(
path.join(dirName, file.id),
body
);
fixPermissions(); fixPermissions();
await saveFile(fileId, body); } catch (e: any) {
} catch (e) { console.error("Error saving file:", e);
io.emit("rateLimit", "Rate limited: file saving. Please slow down."); io.emit("error", `Error: file saving. ${e.message ?? e}`);
} }
}); });
socket.on("moveFile", async (fileId: string, folderId: string, callback) => { socket.on(
"moveFile",
async (fileId: string, folderId: string, callback) => {
try {
const file = sandboxFiles.fileData.find((f) => f.id === fileId); const file = sandboxFiles.fileData.find((f) => f.id === fileId);
if (!file) return; if (!file) return;
@ -204,16 +237,20 @@ io.on("connection", async (socket) => {
containers[data.sandboxId].filesystem, containers[data.sandboxId].filesystem,
path.join(dirName, fileId), path.join(dirName, fileId),
path.join(dirName, newFileId) path.join(dirName, newFileId)
) );
fixPermissions(); fixPermissions();
file.id = newFileId; file.id = newFileId;
await renameFile(fileId, newFileId, file.data); await renameFile(fileId, newFileId, file.data);
const newFiles = await getSandboxFiles(data.sandboxId); const newFiles = await getSandboxFiles(data.sandboxId);
callback(newFiles.files); callback(newFiles.files);
}); } catch (e: any) {
console.error("Error moving file:", e);
io.emit("error", `Error: file moving. ${e.message ?? e}`);
}
}
);
socket.on("createFile", async (name: string, callback) => { socket.on("createFile", async (name: string, callback) => {
try { try {
@ -221,17 +258,26 @@ io.on("connection", async (socket) => {
// limit is 200mb // limit is 200mb
if (size > 200 * 1024 * 1024) { if (size > 200 * 1024 * 1024) {
io.emit( io.emit(
"rateLimit", "error",
"Rate limited: project size exceeded. Please delete some files." "Rate limited: project size exceeded. Please delete some files."
); );
callback({ success: false }); callback({ success: false });
return;
} }
try {
await createFileRL.consume(data.userId, 1); await createFileRL.consume(data.userId, 1);
} catch (e) {
io.emit("error", "Rate limited: file creation. Please slow down.");
return;
}
const id = `projects/${data.sandboxId}/${name}`; const id = `projects/${data.sandboxId}/${name}`;
await containers[data.sandboxId].filesystem.write(path.join(dirName, id), ""); await containers[data.sandboxId].filesystem.write(
path.join(dirName, id),
""
);
fixPermissions(); fixPermissions();
sandboxFiles.files.push({ sandboxFiles.files.push({
@ -248,28 +294,42 @@ io.on("connection", async (socket) => {
await createFile(id); await createFile(id);
callback({ success: true }); callback({ success: true });
} catch (e) { } catch (e: any) {
io.emit("rateLimit", "Rate limited: file creation. Please slow down."); console.error("Error creating file:", e);
io.emit("error", `Error: file creation. ${e.message ?? e}`);
} }
}); });
socket.on("createFolder", async (name: string, callback) => { socket.on("createFolder", async (name: string, callback) => {
try {
try { try {
await createFolderRL.consume(data.userId, 1); await createFolderRL.consume(data.userId, 1);
} catch (e) {
io.emit("error", "Rate limited: folder creation. Please slow down.");
return;
}
const id = `projects/${data.sandboxId}/${name}`; const id = `projects/${data.sandboxId}/${name}`;
await containers[data.sandboxId].filesystem.makeDir(path.join(dirName, id)); await containers[data.sandboxId].filesystem.makeDir(
path.join(dirName, id)
);
callback(); callback();
} catch (e) { } catch (e: any) {
io.emit("rateLimit", "Rate limited: folder creation. Please slow down."); console.error("Error creating folder:", e);
io.emit("error", `Error: folder creation. ${e.message ?? e}`);
} }
}); });
socket.on("renameFile", async (fileId: string, newName: string) => { socket.on("renameFile", async (fileId: string, newName: string) => {
try {
try { try {
await renameFileRL.consume(data.userId, 1); await renameFileRL.consume(data.userId, 1);
} catch (e) {
io.emit("error", "Rate limited: file renaming. Please slow down.");
return;
}
const file = sandboxFiles.fileData.find((f) => f.id === fileId); const file = sandboxFiles.fileData.find((f) => f.id === fileId);
if (!file) return; if (!file) return;
@ -279,27 +339,33 @@ io.on("connection", async (socket) => {
const newFileId = const newFileId =
parts.slice(0, parts.length - 1).join("/") + "/" + newName; parts.slice(0, parts.length - 1).join("/") + "/" + newName;
await moveFile( await moveFile(
containers[data.sandboxId].filesystem, containers[data.sandboxId].filesystem,
path.join(dirName, fileId), path.join(dirName, fileId),
path.join(dirName, newFileId) path.join(dirName, newFileId)
) );
fixPermissions(); fixPermissions();
await renameFile(fileId, newFileId, file.data); await renameFile(fileId, newFileId, file.data);
} catch (e) { } catch (e: any) {
io.emit("rateLimit", "Rate limited: file renaming. Please slow down."); console.error("Error renaming folder:", e);
return; io.emit("error", `Error: folder renaming. ${e.message ?? e}`);
} }
}); });
socket.on("deleteFile", async (fileId: string, callback) => { socket.on("deleteFile", async (fileId: string, callback) => {
try {
try { try {
await deleteFileRL.consume(data.userId, 1); await deleteFileRL.consume(data.userId, 1);
} catch (e) {
io.emit("error", "Rate limited: file deletion. Please slow down.");
}
const file = sandboxFiles.fileData.find((f) => f.id === fileId); const file = sandboxFiles.fileData.find((f) => f.id === fileId);
if (!file) return; if (!file) return;
await containers[data.sandboxId].filesystem.remove(path.join(dirName, fileId)); await containers[data.sandboxId].filesystem.remove(
path.join(dirName, fileId)
);
sandboxFiles.fileData = sandboxFiles.fileData.filter( sandboxFiles.fileData = sandboxFiles.fileData.filter(
(f) => f.id !== fileId (f) => f.id !== fileId
); );
@ -308,8 +374,9 @@ io.on("connection", async (socket) => {
const newFiles = await getSandboxFiles(data.sandboxId); const newFiles = await getSandboxFiles(data.sandboxId);
callback(newFiles.files); callback(newFiles.files);
} catch (e) { } catch (e: any) {
io.emit("rateLimit", "Rate limited: file deletion. Please slow down."); console.error("Error deleting file:", e);
io.emit("error", `Error: file deletion. ${e.message ?? e}`);
} }
}); });
@ -318,11 +385,14 @@ io.on("connection", async (socket) => {
// }); // });
socket.on("deleteFolder", async (folderId: string, callback) => { socket.on("deleteFolder", async (folderId: string, callback) => {
try {
const files = await getFolder(folderId); const files = await getFolder(folderId);
await Promise.all( await Promise.all(
files.map(async (file) => { files.map(async (file) => {
await containers[data.sandboxId].filesystem.remove(path.join(dirName, file)); await containers[data.sandboxId].filesystem.remove(
path.join(dirName, file)
);
sandboxFiles.fileData = sandboxFiles.fileData.filter( sandboxFiles.fileData = sandboxFiles.fileData.filter(
(f) => f.id !== file (f) => f.id !== file
@ -335,9 +405,14 @@ io.on("connection", async (socket) => {
const newFiles = await getSandboxFiles(data.sandboxId); const newFiles = await getSandboxFiles(data.sandboxId);
callback(newFiles.files); callback(newFiles.files);
} catch (e: any) {
console.error("Error deleting folder:", e);
io.emit("error", `Error: folder deletion. ${e.message ?? e}`);
}
}); });
socket.on("createTerminal", async (id: string, callback) => { socket.on("createTerminal", async (id: string, callback) => {
try {
if (terminals[id] || Object.keys(terminals).length >= 4) { if (terminals[id] || Object.keys(terminals).length >= 4) {
return; return;
} }
@ -351,36 +426,53 @@ io.on("connection", async (socket) => {
size: { cols: 80, rows: 20 }, size: { cols: 80, rows: 20 },
onExit: () => console.log("Terminal exited", id), onExit: () => console.log("Terminal exited", id),
}); });
await terminals[id].sendData(`cd "${path.join(dirName, "projects", data.sandboxId)}"\r`) await terminals[id].sendData(
`cd "${path.join(dirName, "projects", data.sandboxId)}"\r`
);
await terminals[id].sendData("export PS1='user> '\rclear\r"); await terminals[id].sendData("export PS1='user> '\rclear\r");
console.log("Created terminal", id); console.log("Created terminal", id);
} catch (error) { } catch (e: any) {
console.error("Error creating terminal ", id, error); console.error(`Error creating terminal ${id}:`, e);
io.emit("error", `Error: terminal creation. ${e.message ?? e}`);
} }
}); });
callback(); callback();
} catch (e: any) {
console.error(`Error creating terminal ${id}:`, e);
io.emit("error", `Error: terminal creation. ${e.message ?? e}`);
}
}); });
socket.on("resizeTerminal", (dimensions: { cols: number; rows: number }) => { socket.on(
"resizeTerminal",
(dimensions: { cols: number; rows: number }) => {
try {
Object.values(terminals).forEach((t) => { Object.values(terminals).forEach((t) => {
t.resize(dimensions); t.resize(dimensions);
}); });
}); } catch (e: any) {
console.error("Error resizing terminal:", e);
io.emit("error", `Error: terminal resizing. ${e.message ?? e}`);
}
}
);
socket.on("terminalData", (id: string, data: string) => { socket.on("terminalData", (id: string, data: string) => {
try {
if (!terminals[id]) { if (!terminals[id]) {
return; return;
} }
try {
terminals[id].sendData(data); terminals[id].sendData(data);
} catch (e) { } catch (e: any) {
console.log("Error writing to terminal", e); console.error("Error writing to terminal:", e);
io.emit("error", `Error: writing to terminal. ${e.message ?? e}`);
} }
}); });
socket.on("closeTerminal", async (id: string, callback) => { socket.on("closeTerminal", async (id: string, callback) => {
try {
if (!terminals[id]) { if (!terminals[id]) {
return; return;
} }
@ -389,6 +481,10 @@ io.on("connection", async (socket) => {
delete terminals[id]; delete terminals[id];
callback(); callback();
} catch (e: any) {
console.error("Error closing terminal:", e);
io.emit("error", `Error: closing terminal. ${e.message ?? e}`);
}
}); });
socket.on( socket.on(
@ -400,6 +496,7 @@ io.on("connection", async (socket) => {
instructions: string, instructions: string,
callback callback
) => { ) => {
try {
const fetchPromise = fetch( const fetchPromise = fetch(
`${process.env.DATABASE_WORKER_URL}/api/sandbox/generate`, `${process.env.DATABASE_WORKER_URL}/api/sandbox/generate`,
{ {
@ -433,10 +530,15 @@ io.on("connection", async (socket) => {
const json = await generateCodeResponse.json(); const json = await generateCodeResponse.json();
callback({ response: json.response, success: true }); callback({ response: json.response, success: true });
} catch (e: any) {
console.error("Error generating code:", e);
io.emit("error", `Error: code generation. ${e.message ?? e}`);
}
} }
); );
socket.on("disconnect", async () => { socket.on("disconnect", async () => {
try {
if (data.isOwner) { if (data.isOwner) {
connections[data.sandboxId]--; connections[data.sandboxId]--;
} }
@ -483,7 +585,15 @@ io.on("connection", async (socket) => {
// } else { // } else {
// console.log("number of sockets", sockets.length); // console.log("number of sockets", sockets.length);
// } // }
} catch (e: any) {
console.log("Error disconnecting:", e);
io.emit("error", `Error: disconnecting. ${e.message ?? e}`);
}
}); });
} catch (e: any) {
console.error("Error connecting:", e);
io.emit("error", `Error: connection. ${e.message ?? e}`);
}
}); });
httpServer.listen(port, () => { httpServer.listen(port, () => {

View File

@ -46,7 +46,7 @@ export default function CodeEditor({
// Initialize socket connection if it doesn't exist // Initialize socket connection if it doesn't exist
if (!socketRef.current) { if (!socketRef.current) {
socketRef.current = io( socketRef.current = io(
`http://localhost:${process.env.NEXT_PUBLIC_SERVER_PORT}?userId=${userData.id}&sandboxId=${sandboxData.id}`, `${window.location.protocol}//${window.location.hostname}:${process.env.NEXT_PUBLIC_SERVER_PORT}?userId=${userData.id}&sandboxId=${sandboxData.id}`,
{ {
timeout: 2000, timeout: 2000,
} }
@ -105,6 +105,16 @@ export default function CodeEditor({
const [provider, setProvider] = useState<TypedLiveblocksProvider>() const [provider, setProvider] = useState<TypedLiveblocksProvider>()
const userInfo = useSelf((me) => me.info) const userInfo = useSelf((me) => me.info)
// Liveblocks providers map to prevent reinitializing providers
type ProviderData = {
provider: LiveblocksProvider<never, never, never, never>;
yDoc: Y.Doc;
yText: Y.Text;
binding?: MonacoBinding;
onSync: (isSynced: boolean) => void;
};
const providersMap = useRef(new Map<string, ProviderData>());
// Refs for libraries / features // Refs for libraries / features
const editorContainerRef = useRef<HTMLDivElement>(null) const editorContainerRef = useRef<HTMLDivElement>(null)
const monacoRef = useRef<typeof monaco | null>(null) const monacoRef = useRef<typeof monaco | null>(null)
@ -332,10 +342,15 @@ export default function CodeEditor({
if (!editorRef || !tab || !model) return if (!editorRef || !tab || !model) return
const yDoc = new Y.Doc() let providerData: ProviderData;
const yText = yDoc.getText(tab.id)
const yProvider: any = new LiveblocksProvider(room, yDoc)
// When a file is opened for the first time, create a new provider and store in providersMap.
if (!providersMap.current.has(tab.id)) {
const yDoc = new Y.Doc();
const yText = yDoc.getText(tab.id);
const yProvider = new LiveblocksProvider(room, yDoc);
// Inserts the file content into the editor once when the tab is changed.
const onSync = (isSynced: boolean) => { const onSync = (isSynced: boolean) => {
if (isSynced) { if (isSynced) {
const text = yText.toString() const text = yText.toString()
@ -353,22 +368,51 @@ export default function CodeEditor({
yProvider.on("sync", onSync) yProvider.on("sync", onSync)
setProvider(yProvider) // Save the provider to the map.
providerData = { provider: yProvider, yDoc, yText, onSync };
providersMap.current.set(tab.id, providerData);
} else {
// When a tab is opened that has been open before, reuse the existing provider.
providerData = providersMap.current.get(tab.id)!;
}
const binding = new MonacoBinding( const binding = new MonacoBinding(
yText, providerData.yText,
model, model,
new Set([editorRef]), new Set([editorRef]),
yProvider.awareness as Awareness providerData.provider.awareness as unknown as Awareness
) );
providerData.binding = binding;
setProvider(providerData.provider);
return () => { return () => {
yDoc.destroy() // Cleanup logic
yProvider.destroy() if (binding) {
binding.destroy() binding.destroy();
yProvider.off("sync", onSync)
} }
}, [editorRef, room, activeFileContent]) if (providerData.binding) {
providerData.binding = undefined;
}
};
}, [room, activeFileContent]);
// Added this effect to clean up when the component unmounts
useEffect(() => {
return () => {
// Clean up all providers when the component unmounts
providersMap.current.forEach((data) => {
if (data.binding) {
data.binding.destroy();
}
data.provider.disconnect();
data.yDoc.destroy();
});
providersMap.current.clear();
};
}, []);
// Connection/disconnection effect // Connection/disconnection effect
useEffect(() => { useEffect(() => {
@ -391,7 +435,7 @@ export default function CodeEditor({
setFiles(files) setFiles(files)
} }
const onRateLimit = (message: string) => { const onError = (message: string) => {
toast.error(message) toast.error(message)
} }
@ -413,7 +457,7 @@ export default function CodeEditor({
socketRef.current?.on("connect", onConnect) socketRef.current?.on("connect", onConnect)
socketRef.current?.on("disconnect", onDisconnect) socketRef.current?.on("disconnect", onDisconnect)
socketRef.current?.on("loaded", onLoadedEvent) socketRef.current?.on("loaded", onLoadedEvent)
socketRef.current?.on("rateLimit", onRateLimit) socketRef.current?.on("error", onError)
socketRef.current?.on("terminalResponse", onTerminalResponse) socketRef.current?.on("terminalResponse", onTerminalResponse)
socketRef.current?.on("disableAccess", onDisableAccess) socketRef.current?.on("disableAccess", onDisableAccess)
socketRef.current?.on("previewURL", setPreviewURL) socketRef.current?.on("previewURL", setPreviewURL)
@ -422,7 +466,7 @@ export default function CodeEditor({
socketRef.current?.off("connect", onConnect) socketRef.current?.off("connect", onConnect)
socketRef.current?.off("disconnect", onDisconnect) socketRef.current?.off("disconnect", onDisconnect)
socketRef.current?.off("loaded", onLoadedEvent) socketRef.current?.off("loaded", onLoadedEvent)
socketRef.current?.off("rateLimit", onRateLimit) socketRef.current?.off("error", onError)
socketRef.current?.off("terminalResponse", onTerminalResponse) socketRef.current?.off("terminalResponse", onTerminalResponse)
socketRef.current?.off("disableAccess", onDisableAccess) socketRef.current?.off("disableAccess", onDisableAccess)
socketRef.current?.off("previewURL", setPreviewURL) socketRef.current?.off("previewURL", setPreviewURL)