Merge branch 'dev' of https://github.com/boostcampwm-2024/web33-Nocta …

…into Feature/#140_로그인_회원가입_API_연결

@noctaCrdt/Crdt.ts

@@ -2,8 +2,10 @@ import { LinkedList } from "./LinkedList";
 import { CharId, BlockId, NodeId } from "./NodeId";
 import { Node, Char, Block } from "./Node";
 import {
-  RemoteDeleteOperation,
-  RemoteInsertOperation,
+  RemoteBlockDeleteOperation,
+  RemoteCharDeleteOperation,
+  RemoteBlockInsertOperation,
+  RemoteCharInsertOperation,
   SerializedProps,
   RemoteReorderOperation,
 } from "./Interfaces";
@@ -19,18 +21,50 @@ export class CRDT<T extends Node<NodeId>> {
     this.LinkedList = new LinkedList<T>();
   }
 
-  localInsert(index: number, value: string): RemoteInsertOperation {
-    const id =
-      this instanceof BlockCRDT
-        ? new CharId(this.clock + 1, this.client)
-        : new BlockId(this.clock + 1, this.client);
+  localInsert(index: number, value: string, blockId?: BlockId) {}
 
+  localDelete(index: number, blockId?: BlockId) {}
+
+  remoteInsert(operation: RemoteBlockInsertOperation | RemoteCharInsertOperation) {}
+
+  remoteDelete(operation: RemoteBlockDeleteOperation | RemoteCharDeleteOperation) {}
+
+  read(): string {
+    return this.LinkedList.stringify();
+  }
+
+  spread(): T[] {
+    return this.LinkedList.spread();
+  }
+
+  serialize(): SerializedProps<T> {
+    return {
+      clock: this.clock,
+      client: this.client,
+      LinkedList: {
+        head: this.LinkedList.head,
+        nodeMap: this.LinkedList.nodeMap || {},
+      },
+    };
+  }
+}
+
+export class EditorCRDT extends CRDT<Block> {
+  currentBlock: Block | null;
+
+  constructor(client: number) {
+    super(client);
+    this.currentBlock = null;
+  }
+
+  localInsert(index: number, value: string): RemoteBlockInsertOperation {
+    const id = new BlockId(this.clock + 1, this.client);
     const remoteInsertion = this.LinkedList.insertAtIndex(index, value, id);
     this.clock += 1;
-    return { node: remoteInsertion.node };
+    return { node: remoteInsertion.node } as RemoteBlockInsertOperation;
   }
 
-  localDelete(index: number): RemoteDeleteOperation {
+  localDelete(index: number): RemoteBlockDeleteOperation {
     if (index < 0 || index >= this.LinkedList.spread().length) {
       throw new Error(`Invalid index: ${index}`);
     }
@@ -40,7 +74,7 @@ export class CRDT<T extends Node<NodeId>> {
       throw new Error(`Node not found at index: ${index}`);
     }
 
-    const operation: RemoteDeleteOperation = {
+    const operation: RemoteBlockDeleteOperation = {
       targetId: nodeToDelete.id,
       clock: this.clock + 1,
     };
@@ -51,12 +85,15 @@ export class CRDT<T extends Node<NodeId>> {
     return operation;
   }
 
-  remoteInsert(operation: RemoteInsertOperation): void {
-    const NodeIdClass = this instanceof BlockCRDT ? CharId : BlockId;
-    const NodeClass = this instanceof BlockCRDT ? Char : Block;
+  remoteUpdate(block: Block) {
+    this.LinkedList.nodeMap[JSON.stringify(block.id)] = block;
+    return { remoteUpdateOperation: block };
+  }
+
+  remoteInsert(operation: RemoteBlockInsertOperation): void {
+    const newNodeId = new BlockId(operation.node.id.clock, operation.node.id.client);
+    const newNode = new Block(operation.node.value, newNodeId);
 
-    const newNodeId = new NodeIdClass(operation.node.id.clock, operation.node.id.client);
-    const newNode = new NodeClass(operation.node.value, newNodeId) as T;
     newNode.next = operation.node.next;
     newNode.prev = operation.node.prev;
 
@@ -67,7 +104,7 @@ export class CRDT<T extends Node<NodeId>> {
     }
   }
 
-  remoteDelete(operation: RemoteDeleteOperation): void {
+  remoteDelete(operation: RemoteBlockDeleteOperation): void {
     const { targetId, clock } = operation;
     if (targetId) {
       this.LinkedList.deleteNode(targetId);
@@ -78,9 +115,9 @@ export class CRDT<T extends Node<NodeId>> {
   }
 
   localReorder(params: {
-    targetId: NodeId;
-    beforeId: NodeId | null;
-    afterId: NodeId | null;
+    targetId: BlockId;
+    beforeId: BlockId | null;
+    afterId: BlockId | null;
   }): RemoteReorderOperation {
     const operation: RemoteReorderOperation = {
       ...params,
@@ -107,41 +144,72 @@ export class CRDT<T extends Node<NodeId>> {
       this.clock = clock + 1;
     }
   }
+}
 
-  read(): string {
-    return this.LinkedList.stringify();
-  }
+export class BlockCRDT extends CRDT<Char> {
+  currentCaret: number;
 
-  spread(): T[] {
-    return this.LinkedList.spread();
+  constructor(client: number) {
+    super(client);
+    this.currentCaret = 0;
   }
 
-  serialize(): SerializedProps<T> {
-    return {
-      clock: this.clock,
-      client: this.client,
-      LinkedList: {
-        head: this.LinkedList.head,
-        nodeMap: this.LinkedList.nodeMap || {},
-      },
+  localInsert(index: number, value: string, blockId: BlockId): RemoteCharInsertOperation {
+    const id = new CharId(this.clock + 1, this.client);
+    const { node } = this.LinkedList.insertAtIndex(index, value, id);
+    this.clock += 1;
+    const operation: RemoteCharInsertOperation = {
+      node,
+      blockId,
     };
+
+    return operation;
   }
-}
 
-export class EditorCRDT extends CRDT<Block> {
-  currentBlock: Block | null;
+  localDelete(index: number, blockId: BlockId): RemoteCharDeleteOperation {
+    if (index < 0 || index >= this.LinkedList.spread().length) {
+      throw new Error(`Invalid index: ${index}`);
+    }
 
-  constructor(client: number) {
-    super(client);
-    this.currentBlock = null;
+    const nodeToDelete = this.LinkedList.findByIndex(index);
+    if (!nodeToDelete) {
+      throw new Error(`Node not found at index: ${index}`);
+    }
+
+    const operation: RemoteCharDeleteOperation = {
+      targetId: nodeToDelete.id,
+      clock: this.clock + 1,
+      blockId,
+    };
+
+    this.LinkedList.deleteNode(nodeToDelete.id);
+    this.clock += 1;
+
+    return operation;
   }
-}
 
-export class BlockCRDT extends CRDT<Char> {
-  currentCaret: number;
+  remoteInsert(operation: RemoteCharInsertOperation): void {
+    const newNodeId = new CharId(operation.node.id.clock, operation.node.id.client);
+    const newNode = new Char(operation.node.value, newNodeId);
 
-  constructor(client: number) {
-    super(client);
-    this.currentCaret = 0;
+    newNode.next = operation.node.next;
+    newNode.prev = operation.node.prev;
+
+    this.LinkedList.insertById(newNode);
+
+    if (this.clock <= newNode.id.clock) {
+      this.clock = newNode.id.clock + 1;
+    }
+  }
+
+  remoteDelete(operation: RemoteCharDeleteOperation): void {
+    const { targetId, clock } = operation;
+    if (targetId) {
+      const targetNodeId = new CharId(operation.targetId.clock, operation.targetId.client);
+      this.LinkedList.deleteNode(targetNodeId);
+    }
+    if (this.clock <= clock) {
+      this.clock = clock + 1;
+    }
   }
 }

@noctaCrdt/Interfaces.ts

@@ -12,15 +12,29 @@ export interface DeleteOperation {
   clock: number;
 }
 
-export interface RemoteInsertOperation {
-  node: Block | Char;
+export interface RemoteBlockUpdateOperation {
+  node: Block;
+}
+export interface RemoteBlockInsertOperation {
+  node: Block;
+}
+
+export interface RemoteCharInsertOperation {
+  node: Char;
+  blockId: BlockId;
 }
 
-export interface RemoteDeleteOperation {
-  targetId: NodeId;
+export interface RemoteBlockDeleteOperation {
+  targetId: BlockId;
   clock: number;
 }
 
+export interface RemoteCharDeleteOperation {
+  targetId: CharId;
+  clock: number;
+  blockId?: BlockId;
+}
+
 export interface CursorPosition {
   clientId: number;
   position: number;
@@ -43,9 +57,9 @@ export interface ReorderNodesProps {
 }
 
 export interface RemoteReorderOperation {
-  targetId: NodeId;
-  beforeId: NodeId | null;
-  afterId: NodeId | null;
+  targetId: BlockId;
+  beforeId: BlockId | null;
+  afterId: BlockId | null;
   clock: number;
   client: number;
 }