LEAN-3843-test

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@manuscripts/api",
-  "version": "1.13.20",
+  "version": "1.13.21-LEAN-3843-test.10",
   "description": "Manuscripts API server",
   "license": "Apache-2.0",
   "main": "dist/index",

src/Controller/V2/Document/DocumentController.ts

@@ -89,6 +89,24 @@ export class DocumentController extends BaseController {
     )
     return await DIContainer.sharedContainer.authorityService.getEvents(manuscriptID, versionID)
   }
+  async processSteps({
+    projectID,
+    manuscriptID,
+    payload,
+    user,
+  }: {
+    projectID: string
+    manuscriptID: string
+    payload: any
+    user: any
+  }): Promise<any> {
+    const result = await this.receiveSteps(projectID, manuscriptID, payload, user)
+
+    // Broadcast steps to other connected clients
+    this.broadcastSteps(manuscriptID, result)
+
+    return result
+  }
 
   async receiveSteps(
     projectID: string,

src/Controller/V2/Document/DocumentRoute.ts

@@ -141,18 +141,42 @@ export class DocumentRoute extends BaseRoute {
     await this.documentController.deleteDocument(projectID, manuscriptID, user)
     res.sendStatus(StatusCodes.OK).end()
   }
-  private async receiveSteps(req: Request, res: Response) {
-    const { manuscriptID, projectID } = req.params
-    const user = req.user
-    const payload = req.body
+  private async processSteps({
+    projectID,
+    manuscriptID,
+    payload,
+    user,
+  }: {
+    projectID: string
+    manuscriptID: string
+    payload: any
+    user: any
+  }): Promise<any> {
     const result = await this.documentController.receiveSteps(
       projectID,
       manuscriptID,
       payload,
       user
     )
+
+    // Broadcast steps to other connected clients
     this.documentController.broadcastSteps(manuscriptID, result)
-    res.status(StatusCodes.OK).send(result)
+
+    return result
+  }
+
+  private async receiveSteps(req: Request, res: Response) {
+    const { manuscriptID, projectID } = req.params
+    const user = req.user
+    const payload = req.body
+    console.log('received steps', user)
+    try {
+      const result = await this.processSteps({ projectID, manuscriptID, payload, user })
+      res.status(StatusCodes.OK).send(result)
+    } catch (error) {
+      console.error('Error processing steps:', error)
+      res.status(StatusCodes.INTERNAL_SERVER_ERROR).send({ error: error.message })
+    }
   }
 
   private async stepsSince(req: Request, res: Response) {

src/DomainServices/DocumentService.ts

@@ -16,8 +16,9 @@
 
 import { IncomingMessage } from 'http'
 import { Duplex } from 'stream'
-import { ErrorEvent, WebSocket, WebSocketServer } from 'ws'
+import { ErrorEvent, MessageEvent, WebSocket, WebSocketServer } from 'ws'
 
+import { DocumentController } from '../Controller/V2/Document/DocumentController'
 import { DIContainer } from '../DIContainer/DIContainer'
 import { MissingManuscriptError, RoleDoesNotPermitOperationError } from '../Errors'
 import { ProjectUserRole } from '../Models/ProjectModels'
@@ -39,6 +40,7 @@ export interface SnapshotLabelResult {
 const EMPTY_PERMISSIONS = new Set<DocumentPermission>()
 export class DocumentService {
   constructor(private readonly socketsService: SocketsService) {}
+  private documentController = new DocumentController()
 
   async getPermissions(
     projectID: string,
@@ -126,6 +128,12 @@ export class DocumentService {
   private attachListeners(_stream: Duplex, ws: WebSocket, manuscriptID: string) {
     ws.onerror = (error) => this.onError(ws, error)
     ws.onclose = () => this.onClose(ws, manuscriptID)
+    // Wrap the async method in a synchronous event handler
+    ws.onmessage = (event: MessageEvent) => {
+      this.onMessage(ws, event).catch((error) => {
+        console.error('Unhandled error in WebSocket message handler', error)
+      })
+    }
   }
 
   private onError(ws: WebSocket, error: ErrorEvent) {
@@ -136,6 +144,33 @@ export class DocumentService {
     log.info(`connection closed for ${manuscriptID}`)
     this.closeSocket(ws, manuscriptID)
   }
+  private async onMessage(ws: WebSocket, event: MessageEvent): Promise<void> {
+    try {
+      // Parse message data (ensure it conforms to your expected structure)
+      const { projectID, manuscriptID, payload, token } = JSON.parse(event.data as string)
+      const valid = validateToken(token)
+      const user = await DIContainer.sharedContainer.userClient.findByID(valid.userID)
+      console.log('received steps', user)
+      const result = await this.documentController.processSteps({
+        projectID,
+        manuscriptID,
+        payload,
+        user,
+      })
+      // Acknowledge success
+      ws.send(JSON.stringify({ status: 'success', result }))
+    } catch (error) {
+      console.error('Error processing WebSocket message:', error)
+
+      // Notify the client about the error
+      ws.send(
+        JSON.stringify({
+          status: 'error',
+          message: error instanceof Error ? error.message : String(error),
+        })
+      )
+    }
+  }
 
   private closeSocket(ws: WebSocket, manuscriptID?: string) {
     try {