memory-card and stateswitch

examples/pom.xml

@@ -33,6 +33,18 @@
             <artifactId>wechaty</artifactId>
             <version>${wechaty.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.github.wechaty</groupId>
+            <artifactId>wechaty-puppet-hostie</artifactId>
+            <version>${wechaty.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.github.wechaty</groupId>
+            <artifactId>java-wechaty-plugin-contrib</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
@@ -62,11 +74,7 @@
             <version>1.7.30</version>
         </dependency>
 
-        <dependency>
-            <groupId>io.github.wechaty</groupId>
-            <artifactId>java-wechaty-plugin-contrib</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-        </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>

examples/src/main/java/io/github/wechaty/example/Main.java

@@ -2,6 +2,7 @@
 
 
 import io.github.wechaty.Wechaty;
+import io.github.wechaty.user.Contact;
 import io.github.wechaty.user.Room;
 import io.github.wechaty.utils.QrcodeUtils;
 import okhttp3.OkHttpClient;
@@ -16,37 +17,24 @@ public class Main {
     public static void main(String[] args){
 
         Wechaty bot = Wechaty.instance("your_token")
-            .onScan((qrcode, statusScanStatus, data) -> System.out.println(QrcodeUtils.getQr(qrcode)))
-            .onLogin(user -> System.out.println(user))
+            .onScan((qrcode, statusScanStatus, data) -> {
+                System.out.println(QrcodeUtils.getQr(qrcode));
+                System.out.println("Online Image: https://wechaty.github.io/qrcode/" + qrcode);
+            })
+            .onLogin(user -> System.out.println(user.name() + "login"))
             .onMessage(message -> {
                 Room room = message.room();
                 String text = message.text();
-                if (StringUtils.equals(text, "#ding")) {
+                Contact from = message.from();
+                if (StringUtils.equals(text, "ding")) {
                     if (room != null) {
                         room.say("dong");
                     }
+                    else {
+                        // say something to from contact
+                        from.say("hello:" + from.name());
+                    }
                 }
             }).start(true);
-
-//    }
-
-//        Room room = bot.room();
-//
-//        RoomQueryFilter roomQueryFilter = new RoomQueryFilter();
-//
-//        roomQueryFilter.setTopic("ChatOps - Donut");
-//
-//        Future<List<Room>> all = room.findAll(roomQueryFilter);
-//
-//        List<Room> rooms = all.get();
-//
-//        Room room1 = rooms.get(0);
-//
-//        FileBox fileBox = FileBox.fromFile("dong.jpg", "dong.jpg");
-//
-//        room1.say(fileBox).get();
-
     }
-
-
 }

wechaty-puppet-hostie/pom.xml

@@ -62,7 +62,6 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
-
     </dependencies>
 
     <build>

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

@@ -389,7 +389,6 @@ class GrpcPuppet(puppetOptions: PuppetOptions) : Puppet(puppetOptions) {
     }
 
     override fun contactRawPayload(contractId: String): Future<ContactPayload> {
-
         val request = Contact.ContactPayloadRequest.newBuilder()
             .setId(contractId)
             .build()

wechaty-puppet/aaaa.memory-card.json

@@ -0,0 +1 @@
+{"a":"b","\rparent\nmap":{"a":1,"b":2},"\rparent\nlist":["1","2","3"]}

wechaty-puppet/default.memory-card.json

@@ -0,0 +1 @@
+{"a":"b"}

wechaty-puppet/parent.memory-card.json

@@ -0,0 +1 @@
+{"a":"b","\rparent\nmap":{"a":1,"b":2},"\rparent\nlist":["1","2","3"]}

wechaty-puppet/pom.xml

@@ -21,7 +21,11 @@
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.jetbrains.kotlinx</groupId>
+            <artifactId>kotlinx-coroutines-core</artifactId>
+            <version>1.3.7</version>
+        </dependency>
         <!-- https://mvnrepository.com/artifact/com.github.ben-manes.caffeine/caffeine -->
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
@@ -40,15 +44,11 @@
             <artifactId>commons-lang3</artifactId>
         </dependency>
 
-<!--        &lt;!&ndash;log4j2核心包&ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>org.apache.logging.log4j</groupId>-->
-<!--            <artifactId>log4j-api</artifactId>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>org.apache.logging.log4j</groupId>-->
-<!--            <artifactId>log4j-core</artifactId>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-s3</artifactId>
+            <version>1.11.636</version>
+        </dependency>
 
 <!--        &lt;!&ndash;用于与slf4j保持桥接&ndash;&gt;-->
 <!--        <dependency>-->
@@ -105,7 +105,22 @@
             <artifactId>okhttp</artifactId>
         </dependency>
 
-
+        <!-- https://mvnrepository.com/artifact/com.huaweicloud/esdk-obs-java -->
+        <dependency>
+            <groupId>com.huaweicloud</groupId>
+            <artifactId>esdk-obs-java</artifactId>
+            <version>3.19.7</version>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>3.10.2</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <scm>

wechaty-puppet/src/main/kotlin/Puppet.kt

@@ -14,9 +14,11 @@ import io.github.wechaty.io.github.wechaty.watchdag.WatchDog
 import io.github.wechaty.io.github.wechaty.watchdag.WatchdogFood
 import io.github.wechaty.io.github.wechaty.watchdag.WatchdogListener
 import io.github.wechaty.listener.*
+import io.github.wechaty.memorycard.MemoryCard
 import io.github.wechaty.schemas.*
 import io.github.wechaty.utils.FutureUtils
 import io.github.wechaty.utils.JsonUtils
+import okhttp3.internal.toImmutableList
 import org.apache.commons.collections4.CollectionUtils
 import org.apache.commons.lang3.StringUtils
 import org.slf4j.LoggerFactory
@@ -42,7 +44,7 @@ abstract class Puppet : EventEmitter {
     private val HEARTBEAT_COUNTER = AtomicLong()
     private val HOSTIE_KEEPALIVE_TIMEOUT = 15 * 1000L
     private val DEFAULT_WATCHDOG_TIMEOUT = 60L
-//    private var memory: MemoryCard
+    private var memory: MemoryCard
 
     private val executorService = Executors.newSingleThreadScheduledExecutor()
 
@@ -61,15 +63,20 @@ abstract class Puppet : EventEmitter {
     /**
      *
      */
-
     constructor(puppetOptions: PuppetOptions) {
 
         count.addAndGet(1)
         this.puppetOptions = puppetOptions
 
-//        this.memory = MemoryCard()
-//        this.memory.load()
-
+        // for test
+        this.memory = MemoryCard()
+        try {
+            this.memory.load()
+            log.debug("Puppet, constructor() memory.load() done")
+        }
+        catch (e: Exception) {
+            log.warn("Puppet, constructor() memory.load() rejection: {}", e)
+        }
 
         val timeOut = puppetOptions.timeout ?: DEFAULT_WATCHDOG_TIMEOUT
         watchDog = WatchDog(1000 * timeOut, "puppet")
@@ -441,13 +448,13 @@ abstract class Puppet : EventEmitter {
 
             if (StringUtils.isNotBlank(query.id)) {
                 stream = stream?.filter {
-                    StringUtils.equals(query.alias, it.alias)
+                    StringUtils.equals(query.id, it.id)
                 }
             }
 
             if (StringUtils.isNotBlank(query.weixin)) {
                 stream = stream?.filter {
-                    StringUtils.equals(query.alias, it.alias)
+                    StringUtils.equals(query.weixin, it.weixin)
                 }
             }
 
@@ -700,8 +707,46 @@ abstract class Puppet : EventEmitter {
 
     }
 
-    protected fun messageQueryFilterFactory(query: MessageQueryFilter) {
-        TODO()
+    protected fun messageQueryFilterFactory(query: MessageQueryFilter): MessagePayloadFilterFunction {
+        val clz = query::class.java
+        val fields = clz.fields
+        val list = fields.map {
+            it.name to it.get(query)
+        }
+
+        var filterFunctionList = ArrayList<MessagePayloadFilterFunction>()
+
+        list.forEach { pair ->
+            if (StringUtils.isNotEmpty(pair.second.toString())) {
+                val filterFunction = if (StringUtils.equals(pair.first.toString(), "textReg")) {
+                    {
+                        payload: MessagePayload -> Boolean
+                        val clazz = payload::class.java
+                        val field = clazz.getField(pair.first)
+                        val realValue = field.get(payload).toString()
+                        Regex(pair.second.toString()).matches(realValue)
+                    }
+                }
+                else {
+                    {
+                        payload: MessagePayload -> Boolean
+                        val clazz = payload::class.java
+                        val field = clazz.getField(pair.first)
+                        val realValue = field.get(payload).toString()
+                        StringUtils.equals(realValue, pair.second.toString())
+                    }
+                }
+                filterFunctionList.add(filterFunction)
+            }
+        }
+        val allFilterFunction: MessagePayloadFilterFunction = {
+            payload: MessagePayload ->
+            filterFunctionList.all {
+                func -> func(payload)
+            }
+        }
+        return allFilterFunction
+
     }
 
     fun messageForward(conversationId: String, messageId: String): Future<String?> {
@@ -819,37 +864,36 @@ abstract class Puppet : EventEmitter {
     abstract fun roomMemberList(roomId: String): Future<List<String>>
 
     fun roomMemberSearch(roomId: String, query: RoomMemberQueryFilter): Future<List<String>> {
-        TODO()
-    }
-
-    fun roomReach(query: RoomQueryFilter?): Future<List<String>> {
-        TODO()
-    }
+        return CompletableFuture.supplyAsync {
+            val roomMemberIdList = roomMemberList(roomId).get()
 
-    fun roomValidate(roomId: String): Future<Boolean> {
-        return CompletableFuture.completedFuture(true)
-    }
+            val contactQuery = if (query.name != null || query.contactAlias != null) {
+                val contactQueryFilter = ContactQueryFilter()
+                contactQueryFilter.name = query.name
+                contactQueryFilter
+            }
+            else {
+                val contactQueryFilter = ContactQueryFilter()
+                contactQueryFilter.alias = query.contactAlias
+                contactQueryFilter
+            }
 
-    fun roomPayloadCache(roomId: String): RoomPayload? {
-        return cacheRoomPayload.getIfPresent(roomId)
-    }
+            var idList = ArrayList(contactSearch(contactQuery, roomMemberIdList).get())
 
+            val memberPayloadList = roomMemberIdList.mapNotNull { x -> roomMemberPayload(roomId, x).get() }
 
-    fun roomPayload(roomId: String): Future<RoomPayload> {
-        return CompletableFuture.supplyAsync {
-            return@supplyAsync cacheRoomPayload.get(roomId) { t: String ->
-                val get = roomRawPayload(t).get()
-                return@get roomRawPayloadParser(get).get()
+            if (query.roomAlias != null) {
+                val result = memberPayloadList.filter { payload ->
+                    payload.roomAlias === query.roomAlias
+                }.map { payload ->
+                    payload.id
+                }
+                idList.addAll(result)
             }
+            return@supplyAsync idList;
         }
     }
 
-    fun roomPayloadDirty(roomId: String): Future<Void> {
-        cacheRoomPayload.invalidate(roomId)
-        return CompletableFuture.completedFuture(null)
-    }
-
-
     fun roomSearch(query: RoomQueryFilter): Future<List<String>> {
         return CompletableFuture.supplyAsync {
             val allRoomList = roomList().get()
@@ -879,6 +923,30 @@ abstract class Puppet : EventEmitter {
         }
     }
 
+    fun roomValidate(roomId: String): Future<Boolean> {
+        return CompletableFuture.completedFuture(true)
+    }
+
+    fun roomPayloadCache(roomId: String): RoomPayload? {
+        return cacheRoomPayload.getIfPresent(roomId)
+    }
+
+
+    fun roomPayload(roomId: String): Future<RoomPayload> {
+        return CompletableFuture.supplyAsync {
+            return@supplyAsync cacheRoomPayload.get(roomId) { t: String ->
+                val get = roomRawPayload(t).get()
+                return@get roomRawPayloadParser(get).get()
+            }
+        }
+    }
+
+    fun roomPayloadDirty(roomId: String): Future<Void> {
+        cacheRoomPayload.invalidate(roomId)
+        return CompletableFuture.completedFuture(null)
+    }
+
+
     /**
      * Concat roomId & contactId to one string
      */
@@ -912,13 +980,15 @@ abstract class Puppet : EventEmitter {
         }
     }
 
-//    fun setMemory(memoryCard: MemoryCard){
-//        this.memory = memoryCard
-//    }
+    fun setMemory(memoryCard: MemoryCard) {
+        log.debug("Puppet, setMemory()")
 
-//    fun getEventBus(): EventBus {
-//        return eb
-//    }
+        this.memory = memoryCard
+    }
+
+    override fun toString(): String {
+        return "Puppet#${count}<${this.puppetOptions?.name}>(${this.memory.getName()})"
+    }
 
     companion object {
         private val log = LoggerFactory.getLogger(Puppet::class.java)