-
Notifications
You must be signed in to change notification settings - Fork 349
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Handle room metadata updates from the room_metadata component (#…
…1139) * ref: Remove unused class. * feat: Handle updates from the room_metadata component. As opposed to reloading the MUC config form.
- Loading branch information
Showing
5 changed files
with
123 additions
and
66 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 0 additions & 59 deletions
59
jicofo/src/main/kotlin/org/jitsi/jicofo/util/QueueExecutor.kt
This file was deleted.
Oops, something went wrong.
107 changes: 107 additions & 0 deletions
107
jicofo/src/main/kotlin/org/jitsi/jicofo/xmpp/RoomMetadataHandler.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,107 @@ | ||
/* | ||
* Jicofo, the Jitsi Conference Focus. | ||
* | ||
* Copyright @ 2024-Present 8x8, Inc. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.jitsi.jicofo.xmpp | ||
|
||
import org.jitsi.jicofo.ConferenceStore | ||
import org.jitsi.jicofo.TaskPools | ||
import org.jitsi.jicofo.xmpp.muc.RoomMetadata | ||
import org.jitsi.utils.OrderedJsonObject | ||
import org.jitsi.utils.logging2.createLogger | ||
import org.jitsi.utils.queue.PacketQueue | ||
import org.jitsi.xmpp.extensions.jitsimeet.JsonMessageExtension | ||
import org.jivesoftware.smack.StanzaListener | ||
import org.jivesoftware.smack.filter.MessageTypeFilter | ||
import org.jivesoftware.smack.packet.Stanza | ||
import org.jxmpp.jid.DomainBareJid | ||
import org.jxmpp.jid.impl.JidCreate | ||
|
||
class RoomMetadataHandler( | ||
private val xmppProvider: XmppProvider, | ||
private val conferenceStore: ConferenceStore | ||
) : XmppProvider.Listener, StanzaListener { | ||
private var componentAddress: DomainBareJid? = null | ||
private val logger = createLogger() | ||
|
||
/** Queue to process requests in order in the IO pool */ | ||
private val queue = PacketQueue<JsonMessageExtension>( | ||
Integer.MAX_VALUE, | ||
false, | ||
"room_metadata queue", | ||
{ | ||
doProcess(it) | ||
return@PacketQueue true | ||
}, | ||
TaskPools.ioPool | ||
) | ||
|
||
init { | ||
xmppProvider.xmppConnection.addSyncStanzaListener(this, MessageTypeFilter.NORMAL) | ||
xmppProvider.addListener(this) | ||
registrationChanged(xmppProvider.registered) | ||
componentsChanged(xmppProvider.components) | ||
} | ||
|
||
val debugState: OrderedJsonObject | ||
get() = OrderedJsonObject().apply { | ||
this["address"] = componentAddress.toString() | ||
} | ||
|
||
private fun doProcess(jsonMessage: JsonMessageExtension) { | ||
try { | ||
val conferenceJid = JidCreate.entityBareFrom(jsonMessage.getAttribute("room")?.toString()) | ||
val roomMetadata = RoomMetadata.parse(jsonMessage.json) | ||
|
||
val conference = conferenceStore.getConference(conferenceJid) | ||
?: throw IllegalStateException("Conference $conferenceJid does not exist.") | ||
val chatRoom = conference.chatRoom | ||
?: throw IllegalStateException("Conference has no associated chatRoom.") | ||
|
||
chatRoom.setRoomMetadata(roomMetadata) | ||
} catch (e: Exception) { | ||
logger.warn("Failed to process room_metadata request: $jsonMessage", e) | ||
} | ||
} | ||
|
||
override fun processStanza(stanza: Stanza) { | ||
if (stanza.from != componentAddress) { | ||
return | ||
} | ||
|
||
val jsonMessage = stanza.getExtension(JsonMessageExtension::class.java) ?: return Unit.also { | ||
logger.warn("Skip processing stanza without JsonMessageExtension.") | ||
} | ||
|
||
queue.add(jsonMessage) | ||
} | ||
|
||
override fun componentsChanged(components: Set<XmppProvider.Component>) { | ||
val address = components.find { it.type == "room_metadata" }?.address | ||
|
||
componentAddress = if (address == null) { | ||
logger.info("No room_metadata component discovered.") | ||
null | ||
} else { | ||
logger.info("Using room_metadata component at $address.") | ||
JidCreate.domainBareFrom(address) | ||
} | ||
} | ||
|
||
fun shutdown() { | ||
xmppProvider.xmppConnection.removeSyncStanzaListener(this) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters