From 747b165e776d279784d7942479641cd9578f6fcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BB=9D=E5=B0=98?= <237809796@qq.com>
Date: Sat, 21 Oct 2023 13:00:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9Atrylock=20=E5=B0=9D?=
 =?UTF-8?q?=E8=AF=95=E8=8E=B7=E5=8F=96=E9=94=81=EF=BC=8C=E5=B9=B6=E7=AB=8B?=
 =?UTF-8?q?=E5=8D=B3=E8=BF=94=E5=9B=9E=E5=8A=A0=E9=94=81=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/net/tccn/zhub/Lock.java       | 13 +++--
 src/main/java/net/tccn/zhub/ZHubClient.java | 57 +++++++++++++--------
 2 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/src/main/java/net/tccn/zhub/Lock.java b/src/main/java/net/tccn/zhub/Lock.java
index 516a670..8d05535 100644
--- a/src/main/java/net/tccn/zhub/Lock.java
+++ b/src/main/java/net/tccn/zhub/Lock.java
@@ -2,10 +2,11 @@ package net.tccn.zhub;
 
 // ================================================== lock ==================================================
 public class Lock {
-    private String name;
-    private String uuid;
-    private int duration;
-    private ZHubClient hubClient;
+    protected String name;
+    protected String uuid;
+    protected int duration;
+    protected boolean success;
+    protected ZHubClient hubClient;
 
     protected Lock(String name, String uuid, int duration, ZHubClient hubClient) {
         this.name = name;
@@ -17,4 +18,8 @@ public class Lock {
     public void unLock() {
         hubClient.send("unlock", name, uuid);
     }
+
+    public boolean success() {
+        return success;
+    }
 }
diff --git a/src/main/java/net/tccn/zhub/ZHubClient.java b/src/main/java/net/tccn/zhub/ZHubClient.java
index 702e209..3ce64a2 100644
--- a/src/main/java/net/tccn/zhub/ZHubClient.java
+++ b/src/main/java/net/tccn/zhub/ZHubClient.java
@@ -18,10 +18,7 @@ import java.io.OutputStream;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.net.SocketException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -162,11 +159,24 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
                                 Lock lock = lockTag.get(value);
                                 if (lock != null) {
                                     synchronized (lock) {
+                                        lock.success = true;
                                         lock.notifyAll();
                                     }
                                 }
                                 continue;
                             }
+                            // trylock msg
+                            if ("trylock".equals(topic)) {
+                                Lock lock = lockTag.get(value);
+                                if (lock != null) {
+                                    synchronized (lock) {
+                                        lock.success = false;
+                                        lock.notifyAll();
+                                    }
+                                }
+                                continue;
+                            }
+
                             // rpc back msg
                             if (APP_NAME.equals(topic)) {
                                 rpcBackQueue.add(Event.of(topic, value));
@@ -422,7 +432,7 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
                 send("auth", auth);
                 send("groupid " + groupid);
 
-                StringBuffer buf = new StringBuffer("subscribe lock");
+                StringBuffer buf = new StringBuffer("subscribe lock trylock");
                 if (mainHub.containsValue(this)) {
                     buf.append(" " + APP_NAME);
                 }
@@ -527,32 +537,35 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
     // ================================================== lock ==================================================
     private Map<String, Lock> lockTag = new ConcurrentHashMap<>();
 
+    /**
+     * 尝试加锁，立即返回，
+     *
+     * @param key
+     * @param duration
+     * @return Lock: lock.success 锁定是否成功标识
+     */
     public Lock tryLock(String key, int duration) {
-        String uuid = Utility.uuid();
-        Lock lock = new Lock(key, uuid, duration, this);
-        lockTag.put(uuid, lock);
-
-        try {
-            // c.send("lock", key, uuid, strconv.Itoa(duration))
-            send("lock", key, uuid, String.valueOf(duration));
-            synchronized (lock) {
-                lock.wait();
-            }
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        return lock;
+        return lock("trylock", key, duration);
     }
 
-    // 为替换 tryLock 方法做过度准确
     public Lock lock(String key, int duration) {
-        String uuid = Utility.uuid();
+        return lock("lock", key, duration);
+    }
+
+    /**
+     * @param cmd      lock|trylock
+     * @param key      加锁 key
+     * @param duration 锁定时长
+     * @return
+     */
+    private Lock lock(String cmd, String key, int duration) {
+        String uuid = UUID.randomUUID().toString().replaceAll("-", "");
         Lock lock = new Lock(key, uuid, duration, this);
         lockTag.put(uuid, lock);
 
         try {
             // c.send("lock", key, uuid, strconv.Itoa(duration))
-            send("lock", key, uuid, String.valueOf(duration));
+            send(cmd, key, uuid, String.valueOf(duration));
             synchronized (lock) {
                 lock.wait();
             }