feat: tweak the socket io conn

jiangxiaoqiang · jiangxiaoqiang · commit 5a70fd1f0ce2 · 2025-05-25T17:44:22.000+08:00
diff --git a/src/component/common/editor/main/CollarCodeEditor.tsx b/src/component/common/editor/main/CollarCodeEditor.tsx
@@ -82,7 +82,6 @@ const CollarCodeEditor: React.FC<EditorProps> = (props: EditorProps) => {
 
   React.useEffect(() => {
     if (!BaseMethods.isNull(curSubYDoc)) {
-      curSubYDoc.load();
       console.log("curSubYDoc", curSubYDoc);
       let ytext = curSubYDoc.getText(curSubYDoc.guid);
       const undoManager = new Y.UndoManager(ytext);
@@ -107,6 +106,7 @@ const CollarCodeEditor: React.FC<EditorProps> = (props: EditorProps) => {
       if (activeEditorView && !BaseMethods.isNull(activeEditorView)) {
         activeEditorView?.destroy();
       }
+      curSubYDoc.load();
       setEditorInstance(editorView);
       if (curEditorRootDoc) {
         debugger;
@@ -115,7 +115,6 @@ const CollarCodeEditor: React.FC<EditorProps> = (props: EditorProps) => {
           .set(curSubYDoc.guid, curSubYDoc);
         setCurRootYDoc(curEditorRootDoc);
       }
-      curSubYDoc.load();
     }
   }, [curSubYDoc]);
 
diff --git a/src/component/common/projtree/main/ProjectTreeHandler.ts b/src/component/common/projtree/main/ProjectTreeHandler.ts
@@ -70,6 +70,7 @@ export function handleFileSelected(
     if (!subdoc || subdoc !== "subdoc") {
       return;
     }
+    debugger
     let subDocs: Y.Map<Y.Doc> = curRootYDoc.getMap("texhubsubdoc");
     if (oldSelectedFile && !BaseMethods.isNull(oldSelectedFile)) {
       // destroy the legacy select file
diff --git a/src/service/editor/CollarEditorService.ts b/src/service/editor/CollarEditorService.ts
@@ -4,18 +4,15 @@ import * as Y from "rdyjs";
 import * as random from "rdlib0/random";
 import { createExtensions } from "@/component/common/editor/foundation/extensions/extensions";
 import { Compartment, EditorState } from "@codemirror/state";
-import {
-  BaseMethods,
-  UserModel,
-} from "rdjs-wheel";
+import { BaseMethods } from "rdjs-wheel";
 import { EditorAttr } from "@/model/proj/config/EditorAttr";
 import { RefObject } from "react";
-import { projHasFile } from "../project/ProjectService";
 import { Metadata } from "@/component/common/editor/foundation/extensions/language";
 import {
   setCurRootYDoc,
   setEditorInstance,
 } from "../project/editor/EditorService";
+import { doSocketIOConn } from "./CollarEditorSocketIOService";
 
 export const usercolors = [
   { color: "#30bced", light: "#30bced33" },
@@ -30,28 +27,6 @@ export const usercolors = [
 export const themeConfig = new Compartment();
 export const userColor = usercolors[random.uint32() % usercolors.length];
 
-const doWsConn = (ydoc: any, editorAttr: EditorAttr): any => {
-  let contains = projHasFile(editorAttr.docId, editorAttr.projectId);
-  if (!contains) {
-    console.error("initial the file do not belong the project");
-  }
-  const wsProvider = null;
-  const uInfo = localStorage.getItem("userInfo");
-  if (!uInfo) {
-    console.error("user info is null", uInfo);
-    return wsProvider;
-  }
-  const user: UserModel = JSON.parse(uInfo);
-  const ydocUser = {
-    name: user.nickname,
-    color: userColor.color,
-    colorLight: userColor.light,
-  };
-  const permanentUserData = new Y.PermanentUserData(ydoc);
-  permanentUserData.setUserMapping(ydoc, ydoc.clientID, ydocUser.name);
-  return wsProvider;
-};
-
 let history: Uint8Array[] = [];
 var ydoc: Y.Doc;
 export function saveHistory(docId: string) {
@@ -111,7 +86,7 @@ export function initEditor(
   setCurRootYDoc(ydoc);
   const ytext: Y.Text = ydoc.getText(editorAttr.docId);
   const undoManager = new Y.UndoManager(ytext);
-  let wsProvider: any = doWsConn(ydoc, editorAttr);
+  let wsProvider: any = doSocketIOConn(ydoc, editorAttr, false);
   const texEditorState = EditorState.create({
     doc: ytext.toString(),
     extensions: createExtensions({
@@ -134,4 +109,4 @@ export function initEditor(
     parent: edContainer.current!,
   });
   setEditorInstance(editorView);
-}
+}
diff --git a/src/service/editor/CollarEditorSocketIOService.ts b/src/service/editor/CollarEditorSocketIOService.ts
@@ -78,7 +78,7 @@ const handleWsAuth = (
   }
 };
 
-const doSocketIOConn = (
+export const doSocketIOConn = (
   rootYDoc: Y.Doc,
   editorAttr: EditorAttr,
   enableSubDoc: boolean

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ export function handleFileSelected(`
`70`	`70`	`if (!subdoc \|\| subdoc !== "subdoc") {`
`71`	`71`	`return;`
`72`	`72`	`}`
	`73`	`+ debugger`
`73`	`74`	`let subDocs: Y.Map<Y.Doc> = curRootYDoc.getMap("texhubsubdoc");`
`74`	`75`	`if (oldSelectedFile && !BaseMethods.isNull(oldSelectedFile)) {`
`75`	`76`	`// destroy the legacy select file`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ const handleWsAuth = (`
`78`	`78`	`}`
`79`	`79`	`};`
`80`	`80`
`81`		`-const doSocketIOConn = (`
	`81`	`+export const doSocketIOConn = (`
`82`	`82`	`rootYDoc: Y.Doc,`
`83`	`83`	`editorAttr: EditorAttr,`
`84`	`84`	`enableSubDoc: boolean`