bdware/cm
2
0
Fork 0
mirror of https://gitee.com/BDWare/cm synced 2025-01-10 09:54:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(cm): update event mechanism

Browse Source 
update resultCallback used in contract consumer part of EventBroker.deliverEvent; add exception handling for WSClientConsumer
This commit is contained in:
Frank.R.Wu 2021-11-01 22:24:27 +08:00
parent 6a35a67631
commit f0ca9ab85d
5 changed files with 69 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/bdware/sc/ContractClient.java
View File

@ -217,7 +217,6 @@ public class ContractClient {
public String startProcess(PrintStream ps) { public String startProcess(PrintStream ps) {
isRunning = false; isRunning = false;
port = -1; port = -1;
LOGGER.info("port=" + port);
String darg = "-Djava.library.path="; String darg = "-Djava.library.path=";
String classpath; String classpath;
@ -309,6 +308,7 @@ public class ContractClient {
} }
assert status != null; assert status != null;
port = Integer.parseInt(status.split(" ")[0]); port = Integer.parseInt(status.split(" ")[0]);
LOGGER.debug("port=" + port);
ContractManager.cPort.updateDb(port, true); ContractManager.cPort.updateDb(port, true);
get = new SocketGet("127.0.0.1", port); get = new SocketGet("127.0.0.1", port);
get.syncGet("", "setDBInfo", ContractManager.dbPath); get.syncGet("", "setDBInfo", ContractManager.dbPath);

29
src/main/java/org/bdware/sc/ContractMeta.java
View File

@ -38,12 +38,17 @@ public class ContractMeta implements IDSerializable {
*/ */
// Map<Object,Object>MaskInfo; // Map<Object,Object>MaskInfo;
public ContractMeta() {} public ContractMeta() {
}
public ContractStatusEnum getStatus() { public ContractStatusEnum getStatus() {
return status; return status;
} }
public void setStatus(ContractStatusEnum status) {
this.status = status;
}
public String getID() { public String getID() {
return id; return id;
} }
@ -56,7 +61,9 @@ public class ContractMeta implements IDSerializable {
return exportedFunctions; return exportedFunctions;
} }
public Set<String> getDependentContracts() { return dependentContracts; } public Set<String> getDependentContracts() {
return dependentContracts;
}
public Map<String, REvent.REventSemantics> getEvents() { public Map<String, REvent.REventSemantics> getEvents() {
return declaredEvents; return declaredEvents;
@ -78,6 +85,12 @@ public class ContractMeta implements IDSerializable {
return name; return name;
} }
public void setName(String name) {
this.name = name;
}
// public setMask(){}
public boolean getIsDebug() { public boolean getIsDebug() {
return isDebug; return isDebug;
} }
@ -90,10 +103,6 @@ public class ContractMeta implements IDSerializable {
if (desp != null) funCache.put(action, desp); if (desp != null) funCache.put(action, desp);
return desp; return desp;
} }
// public setMask(){
;
// }
private FunctionDesp seekFunction(String action) { private FunctionDesp seekFunction(String action) {
for (FunctionDesp desp : exportedFunctions) { for (FunctionDesp desp : exportedFunctions) {
@ -108,12 +117,4 @@ public class ContractMeta implements IDSerializable {
status = ContractStatusEnum.HANGED; status = ContractStatusEnum.HANGED;
isDebug = false; isDebug = false;
} }
public void setName(String name) {
this.name = name;
}
public void setStatus(ContractStatusEnum status) {
this.status = status;
}
} }

67
src/main/java/org/bdware/sc/event/EventBroker.java
View File

@ -409,37 +409,35 @@ public class EventBroker {
ContractManager.threadPool.execute(() -> { ContractManager.threadPool.execute(() -> {
ResultCallback cb = new ResultCallback() { ResultCallback cb = new ResultCallback() {
@Override @Override
public void onResult(String str) { public void onResult(String unused) {
// if the delivering fails, unsubscribe the consumer // if the delivering fails, unsubscribe the consumer
if (null != str) { ContractConsumer c = (ContractConsumer) consumer;
ContractConsumer c = (ContractConsumer) consumer; ContractClient client = ContractManager.instance.getClient(c.getContract());
ContractClient client = ContractManager.instance.getClient(c.getContract()); String reqID =
String reqID = ContractManager.instance.nodeCenterConn.getNodeKeyPair().getPublicKeyStr() +
ContractManager.instance.nodeCenterConn.getNodeKeyPair().getPublicKeyStr() + "_" + System.currentTimeMillis();
"_" + System.currentTimeMillis(); REvent unsubEvent =
REvent unsubEvent = new REvent(
new REvent( topic,
topic, UNSUBSCRIBE,
UNSUBSCRIBE, "{\"subscriber\":\"" + cId + "\"}",
"{\"subscriber\":\"" + cId + "\"}", reqID);
reqID); unsubEvent.doSignature(client.getPubkey(), client.getContractKey());
unsubEvent.doSignature(client.getPubkey(), client.getContractKey()); handle(unsubEvent);
handle(unsubEvent);
// if the event is an ONLY_ONCE event, retry publishing // if the event is an ONLY_ONCE event, retry publishing
if (NEED_RETRY.equals(event.getSemantics())) { if (NEED_RETRY.equals(event.getSemantics())) {
REvent newMsg = REvent newMsg =
new REvent( new REvent(
topic.split("\\|")[0], topic.split("\\|")[0],
PUBLISH, PUBLISH,
event.getContent(), event.getContent(),
event.getRequestID()); event.getRequestID());
newMsg.setSemantics(ONLY_ONCE); newMsg.setSemantics(ONLY_ONCE);
newMsg.setHash(event.getHash()); newMsg.setHash(event.getHash());
newMsg.setTxHash(event.getTxHash()); newMsg.setTxHash(event.getTxHash());
newMsg.doSignature(ContractManager.instance.nodeCenterConn.getNodeKeyPair()); newMsg.doSignature(ContractManager.instance.nodeCenterConn.getNodeKeyPair());
handle(newMsg); handle(newMsg);
}
} }
} }
}; };
@ -449,7 +447,7 @@ public class EventBroker {
consumer.competeSub(cEventStr, cb, event.getRequestID(), event.getHash()); consumer.competeSub(cEventStr, cb, event.getRequestID(), event.getHash());
} }
}); });
} else { } else if (consumer instanceof NodeConsumer) {
// node consumer // node consumer
ContractManager.threadPool.execute(() -> { ContractManager.threadPool.execute(() -> {
if (isPub) { if (isPub) {
@ -458,6 +456,15 @@ public class EventBroker {
consumer.competeSub(nEventStr, null); consumer.competeSub(nEventStr, null);
} }
}); });
} else if (isPub) {
// client consumer
ContractManager.threadPool.execute(() ->
consumer.publishEvent(nEventStr, new ResultCallback() {
@Override
public void onResult(String unused) {
unsubInReg(null, consumer, topic2cIds, id2Consumers);
}
}));
} }
} else { } else {
topic2cIds.get(topic).remove(cId); topic2cIds.get(topic).remove(cId);

27
src/main/java/org/bdware/sc/event/clients/ContractConsumer.java
View File

@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger;
*/ */
public class ContractConsumer implements IEventConsumer { public class ContractConsumer implements IEventConsumer {
private static final Logger LOGGER = LogManager.getLogger(ContractConsumer.class); private static final Logger LOGGER = LogManager.getLogger(ContractConsumer.class);
private static final long PERIOD = 2500L;
private static final int TIMEOUT_COUNT = 5; private static final int TIMEOUT_COUNT = 5;
private static final Map<String, ScheduledFuture<?>> scheduledFutures = private static final Map<String, ScheduledFuture<?>> scheduledFutures =
new ConcurrentHashMap<>(); new ConcurrentHashMap<>();
@ -76,7 +75,7 @@ public class ContractConsumer implements IEventConsumer {
cr.setRequestID(options[0]); cr.setRequestID(options[0]);
ContractClient cc = ContractManager.instance.getClient(contract); ContractClient cc = ContractManager.instance.getClient(contract);
if (null == cc) { if (null == cc) {
rc.onResult(""); rc.onResult((String) null);
return; return;
} }
AtomicInteger callCount = new AtomicInteger(0); AtomicInteger callCount = new AtomicInteger(0);
@ -87,19 +86,18 @@ public class ContractConsumer implements IEventConsumer {
boolean ret = true; boolean ret = true;
try { try {
ContractResult result = JsonUtil.fromJson(str, ContractResult.class); ContractResult result = JsonUtil.fromJson(str, ContractResult.class);
if (result.status == ContractResult.Status.Success) { if (!result.status.equals(ContractResult.Status.Success)) {
String retStr = null; if (callCount.get() == TIMEOUT_COUNT ||
rc.onResult(retStr); (result.status == ContractResult.Status.Exception &&
} else if (callCount.get() == TIMEOUT_COUNT || result.result.toString().contains("not exported"))) {
(result.status == ContractResult.Status.Exception && rc.onResult((String) null);
result.result.toString().contains("not exported"))) { } else {
rc.onResult(""); ret = false;
} else { }
ret = false;
} }
} catch (Exception e) { } catch (Exception e) {
LOGGER.warn("receiving event error! " + contract + "." + handler + ": " + e.getMessage()); LOGGER.warn("receiving event error! " + contract + "." + handler + ": " + e.getMessage());
rc.onResult(""); rc.onResult((String) null);
} }
callCount.incrementAndGet(); callCount.incrementAndGet();
if (ret) { if (ret) {
@ -108,16 +106,17 @@ public class ContractConsumer implements IEventConsumer {
// wait for setting scheduledFutures // wait for setting scheduledFutures
flag.wait(500L); flag.wait(500L);
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); LOGGER.error(e.getMessage());
} }
} }
scheduledFutures.get(getId()).cancel(true); scheduledFutures.get(getId()).cancel(true);
scheduledFutures.remove(getId());
} }
} }
}, (reqID, hashStr) -> { }, (reqID, hashStr) -> {
}), }),
500L, 500L,
PERIOD, 2500L,
TimeUnit.MILLISECONDS); TimeUnit.MILLISECONDS);
scheduledFutures.put(getId(), future); scheduledFutures.put(getId(), future);
synchronized (flag) { synchronized (flag) {

3
src/main/java/org/bdware/sc/event/clients/WSClientConsumer.java
View File

@ -36,6 +36,9 @@ public class WSClientConsumer implements IEventConsumer {
@Override @Override
public void publishEvent(String msg, ResultCallback rc, String... options) { public void publishEvent(String msg, ResultCallback rc, String... options) {
if (!channel.isActive()) {
rc.onResult((String) null);
}
JsonObject ret = new JsonObject(); JsonObject ret = new JsonObject();
ret.addProperty("action", "onEvent"); ret.addProperty("action", "onEvent");
ret.add("data", JsonUtil.parseString(msg)); ret.add("data", JsonUtil.parseString(msg));