Dev3 laser keepupdating

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/SendCursorPositionPubMsgHdlr.scala

@@ -17,7 +17,7 @@ trait SendCursorPositionPubMsgHdlr extends RightsManagementTrait {
       val envelope = BbbCoreEnvelope(SendCursorPositionEvtMsg.NAME, routing)
       val header = BbbClientMsgHeader(SendCursorPositionEvtMsg.NAME, liveMeeting.props.meetingProp.intId, msg.header.userId)
 
-      val body = SendCursorPositionEvtMsgBody(msg.body.whiteboardId, userIsViewer, msg.body.xPercent, msg.body.yPercent)
+      val body = SendCursorPositionEvtMsgBody(msg.body.whiteboardId, userIsViewer, msg.body.xPercent, msg.body.yPercent, msg.body.laserType)
       val event = SendCursorPositionEvtMsg(header, body)
       val msgEvent = BbbCommonEnvCoreMsg(envelope, event)
       bus.outGW.send(msgEvent)

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/db/PresPageCursorDAO.scala

@@ -8,24 +8,26 @@ case class PresPageCursorDbModel(
     userId:        String,
     xPercent:      Double,
     yPercent:      Double,
+    laserType:     String,
     lastUpdatedAt: java.sql.Timestamp = new java.sql.Timestamp(System.currentTimeMillis())
 )
 
 class PresPageCursorDbTableDef(tag: Tag) extends Table[PresPageCursorDbModel](tag, None, "pres_page_cursor") {
   override def * = (
-    pageId, meetingId, userId, xPercent, yPercent, lastUpdatedAt
+    pageId, meetingId, userId, xPercent, yPercent, laserType, lastUpdatedAt
   ) <> (PresPageCursorDbModel.tupled, PresPageCursorDbModel.unapply)
   val pageId = column[String]("pageId", O.PrimaryKey)
   val meetingId = column[String]("meetingId", O.PrimaryKey)
   val userId = column[String]("userId", O.PrimaryKey)
   val xPercent = column[Double]("xPercent")
   val yPercent = column[Double]("yPercent")
+  val laserType = column[String]("laserType")
   val lastUpdatedAt = column[java.sql.Timestamp]("lastUpdatedAt")
 }
 
 object PresPageCursorDAO {
 
-  def insertOrUpdate(pageId: String, meetingId: String, userId: String, xPercent: Double, yPercent: Double) = {
+  def insertOrUpdate(pageId: String, meetingId: String, userId: String, xPercent: Double, yPercent: Double, laserType: String) = {
     DatabaseConnection.enqueue(
       TableQuery[PresPageCursorDbTableDef].insertOrUpdate(
         PresPageCursorDbModel(
@@ -34,6 +36,7 @@ object PresPageCursorDAO {
           userId = userId,
           xPercent = xPercent,
           yPercent = yPercent,
+          laserType = laserType,
           lastUpdatedAt = new java.sql.Timestamp(System.currentTimeMillis()),
         )
       )

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/record/events/WhiteboardCursorMoveRecordEvent.scala

@@ -35,10 +35,15 @@ class WhiteboardCursorMoveRecordEvent extends AbstractWhiteboardRecordEvent {
   def setYPercent(percent: Double) {
     eventMap.put(Y_OFFSET, percent.toString)
   }
+
+  def setLaserType(laserType: String) {
+    eventMap.put(LASER_TYPE, laserType)
+  }
 }
 
 object WhiteboardCursorMoveRecordEvent {
   protected final val USER_ID = "userId"
   protected final val X_OFFSET = "xOffset"
   protected final val Y_OFFSET = "yOffset"
-}
+  protected final val LASER_TYPE = "laserType"
+}

akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala

@@ -377,6 +377,7 @@ class RedisRecorderActor(
     ev.setUserId(msg.header.userId)
     ev.setXPercent(msg.body.xPercent)
     ev.setYPercent(msg.body.yPercent)
+    ev.setLaserType(msg.body.laserType)
 
     record(msg.header.meetingId, ev.toMap.asJava)
   }

bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/WhiteboardMsgs.scala

@@ -40,7 +40,7 @@ case class GetWhiteboardAnnotationsReqMsgBody(whiteboardId: String)
 
 object SendCursorPositionPubMsg { val NAME = "SendCursorPositionPubMsg" }
 case class SendCursorPositionPubMsg(header: BbbClientMsgHeader, body: SendCursorPositionPubMsgBody) extends StandardMsg
-case class SendCursorPositionPubMsgBody(whiteboardId: String, xPercent: Double, yPercent: Double)
+case class SendCursorPositionPubMsgBody(whiteboardId: String, xPercent: Double, yPercent: Double, laserType: String)
 
 object SendWhiteboardAnnotationsPubMsg { val NAME = "SendWhiteboardAnnotationsPubMsg" }
 case class SendWhiteboardAnnotationsPubMsg(header: BbbClientMsgHeader, body: SendWhiteboardAnnotationsPubMsgBody) extends StandardMsg
@@ -70,7 +70,7 @@ case class GetWhiteboardAnnotationsRespMsgBody(whiteboardId: String, annotations
 
 object SendCursorPositionEvtMsg { val NAME = "SendCursorPositionEvtMsg" }
 case class SendCursorPositionEvtMsg(header: BbbClientMsgHeader, body: SendCursorPositionEvtMsgBody) extends BbbCoreMsg
-case class SendCursorPositionEvtMsgBody(whiteboardId: String, userIsViewer: Boolean, xPercent: Double, yPercent: Double)
+case class SendCursorPositionEvtMsgBody(whiteboardId: String, userIsViewer: Boolean, xPercent: Double, yPercent: Double, laserType: String)
 
 object SendWhiteboardAnnotationsEvtMsg { val NAME = "SendWhiteboardAnnotationsEvtMsg" }
 case class SendWhiteboardAnnotationsEvtMsg(header: BbbClientMsgHeader, body: SendWhiteboardAnnotationsEvtMsgBody) extends BbbCoreMsg

bbb-graphql-actions/src/actions/presentationPublishCursor.ts

@@ -7,6 +7,7 @@ export default function buildRedisMessage(sessionVariables: Record<string, unkno
         {name: 'whiteboardId', type: 'string', required: true},
         {name: 'xPercent', type: 'number', required: true},
         {name: 'yPercent', type: 'number', required: true},
+        {name: 'laserType', type: 'string', required: true},
       ]
   )
 
@@ -27,6 +28,7 @@ export default function buildRedisMessage(sessionVariables: Record<string, unkno
     whiteboardId: input.whiteboardId,
     xPercent: input.xPercent,
     yPercent: input.yPercent,
+    laserType: input.laserType,
   };
 
   return { eventName, routing, header, body };

bbb-graphql-middleware/internal/streaming_server/presPageCursorStream.go

@@ -18,10 +18,12 @@ func HandleSendCursorPositionEvtMsg(receivedMessage common.RedisMessage, browser
 	receivedCursorIsFromViewer := receivedMessage.Core.Body["userIsViewer"].(bool)
 	xPercent := receivedMessage.Core.Body["xPercent"].(float64)
 	yPercent := receivedMessage.Core.Body["yPercent"].(float64)
+	laserType := receivedMessage.Core.Body["laserType"].(string)
 
 	item := map[string]any{
 		"xPercent":   xPercent,
 		"yPercent":   yPercent,
+		"laserType":  laserType,
 		"userId":     receivedMessage.Core.Header.UserId,
 		"__typename": "pres_page_cursor",
 	}

bbb-graphql-server/bbb_schema.sql

@@ -1674,6 +1674,7 @@ CREATE UNLOGGED TABLE "pres_page_cursor" (
     "userId" varchar(50),
     "xPercent" numeric,
     "yPercent" numeric,
+	"laserType" varchar(50),
     "lastUpdatedAt" timestamp with time zone DEFAULT now(),
     CONSTRAINT "pres_page_cursor_pkey" PRIMARY KEY ("pageId","meetingId","userId"),
     FOREIGN KEY ("meetingId", "userId") REFERENCES "user"("meetingId","userId") ON DELETE CASCADE

bbb-graphql-server/metadata/actions.graphql

@@ -443,6 +443,7 @@ type Mutation {
     whiteboardId: String!
     xPercent: Float!
     yPercent: Float!
+    laserType: String!
   ): Boolean
 }
 

bbb-graphql-server/metadata/databases/BigBlueButton/tables/public_v_pres_page_cursor.yaml

@@ -29,6 +29,7 @@ select_permissions:
         - userId
         - xPercent
         - yPercent
+        - laserType
       filter:
         _and:
           - meetingId:

bigbluebutton-html5/imports/ui/Types/meetingClientSettings.ts

@@ -745,6 +745,8 @@ export interface Whiteboard {
   annotationsQueueProcessInterval: number
   cursorInterval: number
   pointerDiameter: number
+  laserRadiusSmall: number
+  laserRadiusLarge: number
   maxStickyNoteLength: number
   maxNumberOfAnnotations: number
   maxNumberOfActiveUsers: number

bigbluebutton-html5/imports/ui/components/presentation/mutations.jsx

@@ -92,11 +92,12 @@ export const PRES_ANNOTATION_SUBMIT = gql`
 `;
 
 export const PRESENTATION_PUBLISH_CURSOR = gql`
-  mutation PresentationPublishCursor($whiteboardId: String!, $xPercent: Float!, $yPercent: Float!) {
+  mutation PresentationPublishCursor($whiteboardId: String!, $xPercent: Float!, $yPercent: Float!, $laserType: String!) {
     presentationPublishCursor(
       whiteboardId: $whiteboardId,
       xPercent: $xPercent,
       yPercent: $yPercent,
+      laserType: $laserType,
     )
   }
 `;