fix bug

Author: diaozxin007

examples/pom.xml

@@ -1,14 +1,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-    <parent>
-        <groupId>io.github.wechaty</groupId>
-        <artifactId>wechaty-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
+
     <modelVersion>4.0.0</modelVersion>
+    <groupId>io.github.wechaty</groupId>
     <artifactId>wechaty-example</artifactId>
     <packaging>jar</packaging>
+    <version>1.0.0-SNAPSHOT</version>
 
     <properties>
         <kotlin.version>1.3.72</kotlin.version>

pom.xml

@@ -30,8 +30,8 @@
         <module>wechaty</module>
         <module>wechaty-puppet</module>
         <module>wechaty-puppet-hostie</module>
-        <module>examples</module>
         <module>wechaty-puppet-mock</module>
+        <module>examples</module>
     </modules>
 
     <dependencyManagement>

wechaty-puppet-hostie/src/main/kotlin/io/github/wechaty/grpc/GrpcPuppet.kt

@@ -946,7 +946,7 @@ class GrpcPuppet(puppetOptions: PuppetOptions) : Puppet(puppetOptions) {
             log.debug("PuppetHostie $type payload $payload")
 
             if (type != Event.EventType.EVENT_TYPE_HEARTBEAT) {
-                emit(EventEnum.HEART_BEAT, EventHeartbeatPayload("heartbeat"))
+                emit(EventEnum.HEART_BEAT, EventHeartbeatPayload("heartbeat",6000))
             }
 
             when (type) {

wechaty-puppet/src/main/kotlin/io/github/wechaty/schemas/Event.kt

@@ -135,7 +135,8 @@ data class EventResetPayload(
 }
 
 data class EventHeartbeatPayload(
-        var data:String
+        var data:String,
+        var timeout:Long
 ) {
     override fun toString(): String {
         return "EventHeartbeatPayload(data='$data')"

wechaty/src/main/kotlin/io/github/wechaty/user/Room.kt

@@ -285,6 +285,7 @@ class Room(wechaty: Wechaty, val id: String) : Accessory(wechaty), Sayable {
 
         return CompletableFuture.supplyAsync {
             try {
+                val newTop = puppet.roomTopic(id, newTopic).get()
                 return@supplyAsync puppet.roomTopic(id, newTopic).get()
             } catch (e: Exception) {
                 log.warn("Room topic(newTopic=$newTopic) exception:$e")

wechaty/src/main/kotlin/io/github/wechaty/user/manager/PuppetManager.kt

@@ -29,10 +29,15 @@ class PuppetManager {
                 throw java.lang.RuntimeException("expect one puppet,but can not found any one.")
             }
 
-            if (subTypes.size > 1) {
+            val filterPuppet = subTypes.filter {
+                val clazz = it as Class<*>
+                clazz.name == wechatyOptions.puppet
+            }
+
+            if (filterPuppet.size > 1) {
                 throw RuntimeException("expect one puppet,but found ${subTypes.size}")
             }
-            val clazz = subTypes.first() as Class<*>
+            val clazz = filterPuppet.first() as Class<*>
             val declaredConstructor = clazz.getDeclaredConstructor(PuppetOptions::class.java)
             return CompletableFuture.completedFuture(declaredConstructor.newInstance(wechatyOptions.puppetOptions!!) as Puppet)
         }