From 1f65764310dabd1d1910e42a33dbc655bdc41d3c Mon Sep 17 00:00:00 2001
From: DBotThePony <dbotthepony@yandex.ru>
Date: Thu, 28 Mar 2024 18:46:31 +0700
Subject: [PATCH] MailboxExecutor#exceptionHandler

---
 gradle.properties                             |  2 +-
 .../kommons/util/MailboxExecutorService.kt    | 25 +++++++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 3e241b7..35b080c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ kotlin.code.style=official
 specifyKotlinAsDependency=false
 
 projectGroup=ru.dbotthepony.kommons
-projectVersion=2.10.3
+projectVersion=2.11.0
 
 guavaDepVersion=33.0.0
 gsonDepVersion=2.8.9
diff --git a/src/main/kotlin/ru/dbotthepony/kommons/util/MailboxExecutorService.kt b/src/main/kotlin/ru/dbotthepony/kommons/util/MailboxExecutorService.kt
index e6e790b..a0a36f9 100644
--- a/src/main/kotlin/ru/dbotthepony/kommons/util/MailboxExecutorService.kt
+++ b/src/main/kotlin/ru/dbotthepony/kommons/util/MailboxExecutorService.kt
@@ -1,9 +1,11 @@
 package ru.dbotthepony.kommons.util
 
+import java.lang.Thread.UncaughtExceptionHandler
 import java.util.LinkedList
 import java.util.concurrent.Callable
 import java.util.concurrent.ConcurrentLinkedQueue
 import java.util.concurrent.Delayed
+import java.util.concurrent.ExecutionException
 import java.util.concurrent.Future
 import java.util.concurrent.FutureTask
 import java.util.concurrent.RejectedExecutionException
@@ -12,6 +14,7 @@ import java.util.concurrent.ScheduledFuture
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.locks.LockSupport
 import java.util.concurrent.locks.ReentrantLock
+import java.util.function.Consumer
 import kotlin.concurrent.withLock
 
 private fun <E : Comparable<E>> LinkedList<E>.enqueue(value: E) {
@@ -59,6 +62,8 @@ class MailboxExecutorService(thread: Thread = Thread.currentThread()) : Schedule
 
 	private val timeOrigin = JVMTimeSource()
 
+	var exceptionHandler: Consumer<Throwable>? = null
+
 	private inner class Timer<T>(task: Callable<T>, val executeAt: Long) : FutureTask<T>(task), ScheduledFuture<T> {
 		override fun compareTo(other: Delayed): Int {
 			return getDelay(TimeUnit.NANOSECONDS).compareTo(other.getDelay(TimeUnit.NANOSECONDS))
@@ -155,6 +160,13 @@ class MailboxExecutorService(thread: Thread = Thread.currentThread()) : Schedule
 			if (isTerminated) return
 			next.run()
 			Thread.interrupted()
+
+			try {
+				next.get()
+			} catch (err: ExecutionException) {
+				exceptionHandler?.accept(err)
+			}
+
 			next = futureQueue.poll()
 		}
 
@@ -167,6 +179,13 @@ class MailboxExecutorService(thread: Thread = Thread.currentThread()) : Schedule
 			} else if (first.executeAt <= timeOrigin.nanos) {
 				first.run()
 				Thread.interrupted()
+
+				try {
+					first.get()
+				} catch (err: ExecutionException) {
+					exceptionHandler?.accept(err)
+				}
+
 				timers.removeFirst()
 			} else {
 				break
@@ -183,8 +202,10 @@ class MailboxExecutorService(thread: Thread = Thread.currentThread()) : Schedule
 				if (first.isDone) {
 					repeatableTimers.removeFirst()
 				} else if (first.next <= timeOrigin.nanos) {
-					first.runAndReset()
-					executed.add(first)
+					if (first.runAndReset()) {
+						executed.add(first)
+					}
+
 					repeatableTimers.removeFirst()
 				} else {
 					break