Update connection logic
This commit is contained in:
parent
279b848039
commit
4ceffef67a
@ -4,10 +4,10 @@
|
||||
"cell_type": "code",
|
||||
"execution_count": null,
|
||||
"metadata": {
|
||||
"tags": [],
|
||||
"pycharm": {
|
||||
"is_executing": true
|
||||
},
|
||||
"tags": []
|
||||
}
|
||||
},
|
||||
"outputs": [],
|
||||
"source": [
|
||||
|
@ -148,9 +148,12 @@ private fun CoroutineScope.collectChange(
|
||||
|
||||
/**
|
||||
* Generate a flow of changes of this vision and its children
|
||||
*
|
||||
* @param sendInitial if true, send the initial vision state as first change
|
||||
*/
|
||||
public fun Vision.flowChanges(
|
||||
collectionDuration: Duration,
|
||||
sendInitial: Boolean = false
|
||||
): Flow<VisionChange> = flow {
|
||||
val manager = manager ?: error("Orphan vision could not collect changes")
|
||||
coroutineScope {
|
||||
@ -158,9 +161,11 @@ public fun Vision.flowChanges(
|
||||
val mutex = Mutex()
|
||||
collectChange(Name.EMPTY, this@flowChanges, mutex, collector)
|
||||
|
||||
if(sendInitial) {
|
||||
//Send initial vision state
|
||||
val initialChange = VisionChange(vision = deepCopy(manager))
|
||||
emit(initialChange)
|
||||
}
|
||||
|
||||
while (true) {
|
||||
//Wait for changes to accumulate
|
||||
|
@ -45,7 +45,7 @@ public class VisionClient : AbstractPlugin() {
|
||||
return attribute?.value
|
||||
}
|
||||
|
||||
private val renderers by lazy { context.gather<ElementVisionRenderer>(ElementVisionRenderer.TYPE).values }
|
||||
internal val renderers by lazy { context.gather<ElementVisionRenderer>(ElementVisionRenderer.TYPE).values }
|
||||
|
||||
private fun findRendererFor(vision: Vision): ElementVisionRenderer? = renderers.mapNotNull {
|
||||
val rating = it.rateVision(vision)
|
||||
@ -71,13 +71,13 @@ public class VisionClient : AbstractPlugin() {
|
||||
changeCollector.setChild(name, child)
|
||||
}
|
||||
|
||||
private fun renderVision(name: String, element: Element, vision: Vision?, outputMeta: Meta) {
|
||||
if (vision != null) {
|
||||
private fun renderVision(element: Element, vision: Vision, outputMeta: Meta) {
|
||||
vision.setAsRoot(visionManager)
|
||||
val renderer = findRendererFor(vision)
|
||||
?: error("Could not find renderer for ${vision::class}")
|
||||
val renderer = findRendererFor(vision) ?: error("Could not find renderer for ${vision::class}")
|
||||
renderer.render(element, vision, outputMeta)
|
||||
}
|
||||
|
||||
private fun updateVision(name: String, element: Element, vision: Vision?, outputMeta: Meta) {
|
||||
element.attributes[OUTPUT_CONNECT_ATTRIBUTE]?.let { attr ->
|
||||
val wsUrl = if (attr.value.isBlank() || attr.value == VisionTagConsumer.AUTO_DATA_ATTRIBUTE) {
|
||||
val endpoint = resolveEndpoint(element)
|
||||
@ -104,14 +104,16 @@ public class VisionClient : AbstractPlugin() {
|
||||
stringData
|
||||
)
|
||||
|
||||
if (change.vision != null) {
|
||||
renderer.render(element, vision, outputMeta)
|
||||
// If change contains root vision replacement, do it
|
||||
change.vision?.let { vision ->
|
||||
renderVision(element, vision, outputMeta)
|
||||
}
|
||||
|
||||
logger.debug { "Got update $change for output with name $name" }
|
||||
if (vision == null) error("Can't update vision because it is not loaded.")
|
||||
vision.update(change)
|
||||
} else {
|
||||
console.error("WebSocket message data is not a string")
|
||||
logger.error { "WebSocket message data is not a string" }
|
||||
}
|
||||
}
|
||||
|
||||
@ -130,17 +132,16 @@ public class VisionClient : AbstractPlugin() {
|
||||
changeCollector.reset()
|
||||
}
|
||||
}
|
||||
console.info("WebSocket update channel established for output '$name'")
|
||||
logger.info { "WebSocket update channel established for output '$name'" }
|
||||
}
|
||||
|
||||
onclose = {
|
||||
feedbackJob?.cancel()
|
||||
console.info("WebSocket update channel closed for output '$name'")
|
||||
logger.info { "WebSocket update channel closed for output '$name'" }
|
||||
}
|
||||
onerror = {
|
||||
feedbackJob?.cancel()
|
||||
console.error("WebSocket update channel error for output '$name'")
|
||||
}
|
||||
logger.error { "WebSocket update channel error for output '$name'" }
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -164,17 +165,8 @@ public class VisionClient : AbstractPlugin() {
|
||||
VisionManager.defaultJson.decodeFromString(MetaSerializer, it)
|
||||
} ?: Meta.EMPTY
|
||||
|
||||
//Trying to render embedded vision
|
||||
val embeddedVision = element.getEmbeddedData(VisionTagConsumer.OUTPUT_DATA_CLASS)?.let {
|
||||
visionManager.decodeFromString(it)
|
||||
}
|
||||
|
||||
when {
|
||||
embeddedVision != null -> {
|
||||
logger.info { "Found embedded vision for output with name $name" }
|
||||
renderVision(name, element, embeddedVision, outputMeta)
|
||||
}
|
||||
|
||||
// fetch data if path is provided
|
||||
element.attributes[OUTPUT_FETCH_ATTRIBUTE] != null -> {
|
||||
val attr = element.attributes[OUTPUT_FETCH_ATTRIBUTE]!!
|
||||
|
||||
@ -195,7 +187,8 @@ public class VisionClient : AbstractPlugin() {
|
||||
if (response.ok) {
|
||||
response.text().then { text ->
|
||||
val vision = visionManager.decodeFromString(text)
|
||||
renderVision(name, element, vision, outputMeta)
|
||||
renderVision(element, vision, outputMeta)
|
||||
updateVision(name, element, vision, outputMeta)
|
||||
}
|
||||
} else {
|
||||
logger.error { "Failed to fetch initial vision state from $fetchUrl" }
|
||||
@ -203,6 +196,22 @@ public class VisionClient : AbstractPlugin() {
|
||||
}
|
||||
}
|
||||
|
||||
// use embedded data if it is available
|
||||
element.getElementsByClassName(VisionTagConsumer.OUTPUT_DATA_CLASS).length > 0 -> {
|
||||
//Getting embedded vision data
|
||||
val embeddedVision = element.getEmbeddedData(VisionTagConsumer.OUTPUT_DATA_CLASS)!!.let {
|
||||
visionManager.decodeFromString(it)
|
||||
}
|
||||
logger.info { "Found embedded vision for output with name $name" }
|
||||
renderVision(element, embeddedVision, outputMeta)
|
||||
updateVision(name, element, embeddedVision, outputMeta)
|
||||
}
|
||||
|
||||
//Try to load vision via websocket
|
||||
element.attributes[OUTPUT_CONNECT_ATTRIBUTE] != null -> {
|
||||
updateVision(name, element, null, outputMeta)
|
||||
}
|
||||
|
||||
else -> error("No embedded vision data / fetch url for $name")
|
||||
}
|
||||
element.setAttribute(OUTPUT_RENDERED, "true")
|
||||
@ -237,7 +246,7 @@ private fun whenDocumentLoaded(block: Document.() -> Unit): Unit {
|
||||
*/
|
||||
public fun VisionClient.renderAllVisionsIn(element: Element) {
|
||||
val elements = element.getElementsByClassName(VisionTagConsumer.OUTPUT_CLASS)
|
||||
console.info("Finished search for outputs. Found ${elements.length} items")
|
||||
logger.info { "Finished search for outputs. Found ${elements.length} items" }
|
||||
elements.asList().forEach { child ->
|
||||
renderVisionIn(child)
|
||||
}
|
||||
@ -251,7 +260,7 @@ public fun VisionClient.renderAllVisionsById(id: String): Unit = whenDocumentLoa
|
||||
if (element != null) {
|
||||
renderAllVisionsIn(element)
|
||||
} else {
|
||||
console.warn("Element with id $id not found")
|
||||
logger.warn { "Element with id $id not found" }
|
||||
}
|
||||
}
|
||||
|
||||
@ -268,7 +277,14 @@ public class VisionClientApplication(public val context: Context) : Application
|
||||
private val client = context.fetch(VisionClient)
|
||||
|
||||
override fun start(document: Document, state: Map<String, Any>) {
|
||||
console.info("Starting Vision Client")
|
||||
context.logger.info {
|
||||
"Starting VisionClient with renderers: ${
|
||||
client.renderers.joinToString(
|
||||
prefix = "\n\t",
|
||||
separator = "\n\t"
|
||||
) { it.name.toString() }
|
||||
}"
|
||||
}
|
||||
val element = document.body ?: error("Document does not have a body")
|
||||
client.renderAllVisionsIn(element)
|
||||
}
|
||||
@ -279,7 +295,7 @@ public class VisionClientApplication(public val context: Context) : Application
|
||||
* Create a vision client context and render all visions on the page.
|
||||
*/
|
||||
public fun runVisionClient(contextBuilder: ContextBuilder.() -> Unit) {
|
||||
console.info("Starting VisionForge context")
|
||||
Global.logger.info { "Starting VisionForge context" }
|
||||
|
||||
val context = Context("VisionForge") {
|
||||
plugin(VisionClient)
|
||||
|
Loading…
Reference in New Issue
Block a user