From bf0c946c523ec00ba79816c55fca0c345f47df2b Mon Sep 17 00:00:00 2001 From: Christian Basler Date: Wed, 13 Sep 2017 08:06:06 +0200 Subject: [PATCH] Different improvements - catch all kinds of errors when selector binding fails - pimped DefaultLabeler to support listeners - added pagination capabilities to AbstractMessageRepository --- build.gradle | 2 +- .../ports/AbstractMessageRepository.kt | 57 +++++++++++-------- .../dissem/bitmessage/ports/DefaultLabeler.kt | 42 ++++++++++---- .../networking/nio/NioNetworkHandler.kt | 8 ++- .../repository/JdbcMessageRepository.kt | 35 ++++++------ 5 files changed, 91 insertions(+), 53 deletions(-) diff --git a/build.gradle b/build.gradle index 33583e4..7f046d8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.1.4-2' + ext.kotlin_version = '1.1.4-3' repositories { mavenCentral() } diff --git a/core/src/main/kotlin/ch/dissem/bitmessage/ports/AbstractMessageRepository.kt b/core/src/main/kotlin/ch/dissem/bitmessage/ports/AbstractMessageRepository.kt index d426dac..495180d 100644 --- a/core/src/main/kotlin/ch/dissem/bitmessage/ports/AbstractMessageRepository.kt +++ b/core/src/main/kotlin/ch/dissem/bitmessage/ports/AbstractMessageRepository.kt @@ -60,52 +60,58 @@ abstract class AbstractMessageRepository : MessageRepository, InternalContext.Co } override fun getMessage(iv: InventoryVector): Plaintext? { - return single(find("iv=X'" + Strings.hex(iv.hash) + "'")) + return single(find("iv=X'${Strings.hex(iv.hash)}'")) } override fun getMessage(initialHash: ByteArray): Plaintext? { - return single(find("initial_hash=X'" + Strings.hex(initialHash) + "'")) + return single(find("initial_hash=X'${Strings.hex(initialHash)}'")) } override fun getMessageForAck(ackData: ByteArray): Plaintext? { - return single(find("ack_data=X'" + Strings.hex(ackData) + "' AND status='" + Plaintext.Status.SENT + "'")) + return single(find("ack_data=X'${Strings.hex(ackData)}' AND status='${Plaintext.Status.SENT}'")) } - override fun findMessages(label: Label?): List { - if (label == null) { - return find("id NOT IN (SELECT message_id FROM Message_Label)") - } else { - return find("id IN (SELECT message_id FROM Message_Label WHERE label_id=" + label.id + ")") - } + /** + * Finds messages that have a specific label, with optional offset and limit. If the limit is set to 0, + * offset and limit are ignored. + */ + open fun findMessages(label: Label?, offset: Int = 0, limit: Int = 0) = if (label == null) { + find("id NOT IN (SELECT message_id FROM Message_Label)", offset, limit) + } else { + find("id IN (SELECT message_id FROM Message_Label WHERE label_id=" + label.id + ")", offset, limit) + } + + override fun findMessages(label: Label?) = if (label == null) { + find("id NOT IN (SELECT message_id FROM Message_Label)") + } else { + find("id IN (SELECT message_id FROM Message_Label WHERE label_id=${label.id})") } override fun findMessages(status: Plaintext.Status, recipient: BitmessageAddress): List<Plaintext> { - return find("status='" + status.name + "' AND recipient='" + recipient.address + "'") + return find("status='${status.name}' AND recipient='${recipient.address}'") } override fun findMessages(status: Plaintext.Status): List<Plaintext> { - return find("status='" + status.name + "'") + return find("status='${status.name}'") } override fun findMessages(sender: BitmessageAddress): List<Plaintext> { - return find("sender='" + sender.address + "'") + return find("sender='${sender.address}'") } override fun findMessagesToResend(): List<Plaintext> { - return find("status='" + Plaintext.Status.SENT.name + "'" + - " AND next_try < " + UnixTime.now) + return find("status='${Plaintext.Status.SENT.name}' AND next_try < ${UnixTime.now}") } override fun findResponses(parent: Plaintext): List<Plaintext> { if (parent.inventoryVector == null) { return emptyList() } - return find("iv IN (SELECT child FROM Message_Parent" - + " WHERE parent=X'" + Strings.hex(parent.inventoryVector!!.hash) + "')") + return find("iv IN (SELECT child FROM Message_Parent WHERE parent=X'${Strings.hex(parent.inventoryVector!!.hash)}')") } override fun getConversation(conversationId: UUID): List<Plaintext> { - return find("conversation=X'" + conversationId.toString().replace("-", "") + "'") + return find("conversation=X'${conversationId.toString().replace("-", "")}'") } override fun getLabels(): List<Label> { @@ -113,20 +119,23 @@ abstract class AbstractMessageRepository : MessageRepository, InternalContext.Co } override fun getLabels(vararg types: Label.Type): List<Label> { - return findLabels("type IN (" + join(*types) + ")") + return findLabels("type IN (${join(*types)})") } protected abstract fun findLabels(where: String): List<Label> protected fun <T> single(collection: Collection<T>): T? { - when (collection.size) { - 0 -> return null - 1 -> return collection.iterator().next() - else -> throw ApplicationException("This shouldn't happen, found " + collection.size + - " items, one or none was expected") + return when (collection.size) { + 0 -> null + 1 -> collection.iterator().next() + else -> throw ApplicationException("This shouldn't happen, found ${collection.size} items, one or none was expected") } } - protected abstract fun find(where: String): List<Plaintext> + /** + * Finds messages that mach the given where statement, with optional offset and limit. If the limit is set to 0, + * offset and limit are ignored. + */ + protected abstract fun find(where: String, offset: Int = 0, limit: Int = 0): List<Plaintext> } diff --git a/core/src/main/kotlin/ch/dissem/bitmessage/ports/DefaultLabeler.kt b/core/src/main/kotlin/ch/dissem/bitmessage/ports/DefaultLabeler.kt index cc55db9..32ed6fa 100644 --- a/core/src/main/kotlin/ch/dissem/bitmessage/ports/DefaultLabeler.kt +++ b/core/src/main/kotlin/ch/dissem/bitmessage/ports/DefaultLabeler.kt @@ -25,22 +25,29 @@ import ch.dissem.bitmessage.entity.valueobject.Label open class DefaultLabeler : Labeler, InternalContext.ContextHolder { private lateinit var ctx: InternalContext + var listener: ((message: Plaintext, added: Collection<Label>, removed: Collection<Label>) -> Unit)? = null + override fun setContext(context: InternalContext) { ctx = context } override fun setLabels(msg: Plaintext) { msg.status = RECEIVED - if (msg.type == BROADCAST) { - msg.addLabels(ctx.messageRepository.getLabels(Label.Type.INBOX, Label.Type.BROADCAST, Label.Type.UNREAD)) - } else { - msg.addLabels(ctx.messageRepository.getLabels(Label.Type.INBOX, Label.Type.UNREAD)) - } + val labelsToAdd = + if (msg.type == BROADCAST) { + ctx.messageRepository.getLabels(Label.Type.INBOX, Label.Type.BROADCAST, Label.Type.UNREAD) + } else { + ctx.messageRepository.getLabels(Label.Type.INBOX, Label.Type.UNREAD) + } + msg.addLabels(labelsToAdd) + listener?.invoke(msg, labelsToAdd, emptyList()) } override fun markAsDraft(msg: Plaintext) { msg.status = DRAFT - msg.addLabels(ctx.messageRepository.getLabels(Label.Type.DRAFT)) + val labelsToAdd = ctx.messageRepository.getLabels(Label.Type.DRAFT) + msg.addLabels(labelsToAdd) + listener?.invoke(msg, labelsToAdd, emptyList()) } override fun markAsSending(msg: Plaintext) { @@ -49,14 +56,20 @@ open class DefaultLabeler : Labeler, InternalContext.ContextHolder { } else { msg.status = DOING_PROOF_OF_WORK } + val labelsToRemove = msg.labels.filter { it.type == Label.Type.DRAFT } msg.removeLabel(Label.Type.DRAFT) - msg.addLabels(ctx.messageRepository.getLabels(Label.Type.OUTBOX)) + val labelsToAdd = ctx.messageRepository.getLabels(Label.Type.OUTBOX) + msg.addLabels(labelsToAdd) + listener?.invoke(msg, labelsToAdd, labelsToRemove) } override fun markAsSent(msg: Plaintext) { msg.status = SENT + val labelsToRemove = msg.labels.filter { it.type == Label.Type.OUTBOX } msg.removeLabel(Label.Type.OUTBOX) - msg.addLabels(ctx.messageRepository.getLabels(Label.Type.SENT)) + val labelsToAdd = ctx.messageRepository.getLabels(Label.Type.SENT) + msg.addLabels(labelsToAdd) + listener?.invoke(msg, labelsToAdd, labelsToRemove) } override fun markAsAcknowledged(msg: Plaintext) { @@ -64,19 +77,28 @@ open class DefaultLabeler : Labeler, InternalContext.ContextHolder { } override fun markAsRead(msg: Plaintext) { + val labelsToRemove = msg.labels.filter { it.type == Label.Type.UNREAD } msg.removeLabel(Label.Type.UNREAD) + listener?.invoke(msg, emptyList(), labelsToRemove) } override fun markAsUnread(msg: Plaintext) { - msg.addLabels(ctx.messageRepository.getLabels(Label.Type.UNREAD)) + val labelsToAdd = ctx.messageRepository.getLabels(Label.Type.UNREAD) + msg.addLabels(labelsToAdd) + listener?.invoke(msg, labelsToAdd, emptyList()) } override fun delete(msg: Plaintext) { + val labelsToRemove = msg.labels.filterNot { it.type == Label.Type.TRASH } msg.labels.clear() - msg.addLabels(ctx.messageRepository.getLabels(Label.Type.TRASH)) + val labelsToAdd = ctx.messageRepository.getLabels(Label.Type.TRASH) + msg.addLabels(labelsToAdd) + listener?.invoke(msg, labelsToAdd, labelsToRemove) } override fun archive(msg: Plaintext) { + val labelsToRemove = msg.labels.toSet() msg.labels.clear() + listener?.invoke(msg, emptyList(), labelsToRemove) } } diff --git a/networking/src/main/kotlin/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.kt b/networking/src/main/kotlin/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.kt index 2bf4c18..39df52e 100644 --- a/networking/src/main/kotlin/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.kt +++ b/networking/src/main/kotlin/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.kt @@ -318,7 +318,13 @@ class NioNetworkHandler : NetworkHandler, InternalContext.ContextHolder { } } selector.close() - } catch (_: ClosedSelectorException) { + } catch (e: Exception) { + // There are various exceptions that may occur when the selector can't be bound: + // ClosedSelectorException, BindException, NullPointerException, SocketException, + // ClosedChannelException + // I'm not sure if I give a damn, or what to do about it. Crashing the application + // isn't nice though. + LOG.error(e.message, e) } }) } diff --git a/repositories/src/main/kotlin/ch/dissem/bitmessage/repository/JdbcMessageRepository.kt b/repositories/src/main/kotlin/ch/dissem/bitmessage/repository/JdbcMessageRepository.kt index 7ecfbf8..6936d97 100644 --- a/repositories/src/main/kotlin/ch/dissem/bitmessage/repository/JdbcMessageRepository.kt +++ b/repositories/src/main/kotlin/ch/dissem/bitmessage/repository/JdbcMessageRepository.kt @@ -126,14 +126,15 @@ class JdbcMessageRepository(private val config: JdbcConfig) : AbstractMessageRep return 0 } - override fun find(where: String): List<Plaintext> { + override fun find(where: String, offset: Int, limit: Int): List<Plaintext> { val result = LinkedList<Plaintext>() + val limit = if (limit == 0) "" else "LIMIT $limit OFFSET $offset" try { config.getConnection().use { connection -> connection.createStatement().use { stmt -> stmt.executeQuery( """SELECT id, iv, type, sender, recipient, data, ack_data, sent, received, initial_hash, status, ttl, retries, next_try, conversation - FROM Message WHERE $where""").use { rs -> + FROM Message WHERE $where $limit""").use { rs -> while (rs.next()) { val iv = rs.getBytes("iv") val data = rs.getBinaryStream("data") @@ -224,7 +225,8 @@ class JdbcMessageRepository(private val config: JdbcConfig) : AbstractMessageRep } private fun updateParents(connection: Connection, message: Plaintext) { - if (message.inventoryVector == null || message.parents.isEmpty()) { + val childIV = message.inventoryVector?.hash + if (childIV == null || message.parents.isEmpty()) { // There are no parents to save yet (they are saved in the extended data, that's enough for now) return } @@ -233,19 +235,19 @@ class JdbcMessageRepository(private val config: JdbcConfig) : AbstractMessageRep ps.setBytes(1, message.initialHash) ps.executeUpdate() } - val childIV = message.inventoryVector!!.hash // save new parents var order = 0 connection.prepareStatement("INSERT INTO Message_Parent VALUES (?, ?, ?, ?)").use { ps -> for (parentIV in message.parents) { - val parent = getMessage(parentIV) - mergeConversations(connection, parent!!.conversationId, message.conversationId) - order++ - ps.setBytes(1, parentIV.hash) - ps.setBytes(2, childIV) - ps.setInt(3, order) // FIXME: this might not be necessary - ps.setObject(4, message.conversationId) - ps.executeUpdate() + getMessage(parentIV)?.let { parent -> + mergeConversations(connection, parent.conversationId, message.conversationId) + order++ + ps.setBytes(1, parentIV.hash) + ps.setBytes(2, childIV) + ps.setInt(3, order) // FIXME: this might not be necessary + ps.setObject(4, message.conversationId) + ps.executeUpdate() + } } } } @@ -334,18 +336,17 @@ class JdbcMessageRepository(private val config: JdbcConfig) : AbstractMessageRep } override fun findConversations(label: Label?): List<UUID> { - val where: String - if (label == null) { - where = "id NOT IN (SELECT message_id FROM Message_Label)" + val where = if (label == null) { + "id NOT IN (SELECT message_id FROM Message_Label)" } else { - where = "id IN (SELECT message_id FROM Message_Label WHERE label_id=" + label.id + ")" + "id IN (SELECT message_id FROM Message_Label WHERE label_id=${label.id})" } val result = LinkedList<UUID>() try { config.getConnection().use { connection -> connection.createStatement().use { stmt -> stmt.executeQuery( - "SELECT DISTINCT conversation FROM Message WHERE " + where).use { rs -> + "SELECT DISTINCT conversation FROM Message WHERE $where").use { rs -> while (rs.next()) { result.add(rs.getObject(1) as UUID) }