mirror of
https://github.com/esiur/esiur-dart.git
synced 2025-05-06 12:02:57 +00:00
Fix AsyncReply
This commit is contained in:
parent
8479fe59c9
commit
aab6c2bebd
@ -63,36 +63,41 @@ class AsyncReply<T> implements Future<T> {
|
||||
}
|
||||
|
||||
AsyncReply<R> then<R>(FutureOr<R> onValue(T value), {Function? onError}) {
|
||||
if (onError != null) {}
|
||||
|
||||
_callbacks.add(onValue);
|
||||
|
||||
if (onError != null) {
|
||||
_errorCallbacks.add(onError);
|
||||
//print("On ERROR $onError ${this.hashCode}");
|
||||
|
||||
}
|
||||
|
||||
if (_resultReady) onValue(result as T);
|
||||
|
||||
// if (R == Null)
|
||||
// return null;
|
||||
//else
|
||||
//if (R == T)
|
||||
return AsyncReply<R>();
|
||||
//if (R == Null)
|
||||
return AsyncReply<R>();
|
||||
//else if (R == T) return (AsyncReply<R>)this;
|
||||
}
|
||||
|
||||
AsyncReply<T> whenComplete(FutureOr action()) {
|
||||
@override
|
||||
Future<T> whenComplete(FutureOr action()) {
|
||||
return this;
|
||||
//_callbacks.add(action);
|
||||
}
|
||||
|
||||
// AsyncReply<T> whenComplete(FutureOr action()) {
|
||||
// return this;
|
||||
// //_callbacks.add(action);
|
||||
// }
|
||||
|
||||
Stream<T> asStream() {
|
||||
return Stream.empty();
|
||||
//return null;
|
||||
}
|
||||
|
||||
// Future<T> catchError(Function onError, {bool test(Object error)?});
|
||||
|
||||
AsyncReply<T> catchError(Function onError, {bool test(Object error)?}) {
|
||||
///return this.error(onError);
|
||||
|
||||
@override
|
||||
AsyncReply<T> catchError(Function onError,
|
||||
{bool Function(Object error)? test}) {
|
||||
_errorCallbacks.add(onError);
|
||||
|
||||
if (_exception != null) {
|
||||
@ -152,9 +157,6 @@ class AsyncReply<T> implements Future<T> {
|
||||
else
|
||||
_exception = AsyncException.toAsyncException(exception);
|
||||
|
||||
///lock (callbacksLock)
|
||||
//{
|
||||
|
||||
if (this._errorCallbacks.length == 0)
|
||||
throw _exception as AsyncException;
|
||||
else
|
||||
@ -167,6 +169,10 @@ class AsyncReply<T> implements Future<T> {
|
||||
x();
|
||||
} else if (x is Function(Object, StackTrace)) {
|
||||
x(_exception as Object, StackTrace.current);
|
||||
} else if (x is Function(AsyncException)) {
|
||||
x(_exception!);
|
||||
} else {
|
||||
throw Exception("Unknown error handler $x");
|
||||
}
|
||||
//x(_exception as AsyncException);
|
||||
});
|
||||
|
@ -260,6 +260,7 @@ class DistributedConnection extends NetworkConnection with IStore {
|
||||
throw AsyncException(ErrorType.Exception, 0, "Connection in progress");
|
||||
|
||||
_openReply = new AsyncReply<bool>();
|
||||
//print("_openReply hash ${_openReply.hashCode}");
|
||||
|
||||
if (hostname != null) {
|
||||
_session =
|
||||
@ -288,12 +289,14 @@ class DistributedConnection extends NetworkConnection with IStore {
|
||||
if (_hostname == null) throw Exception("Host not specified.");
|
||||
|
||||
if (socket != null) {
|
||||
socket.connect(_hostname as String, _port).then<dynamic>((x) {
|
||||
assign(socket as ISocket);
|
||||
}).error((x) {
|
||||
_openReply?.triggerError(x);
|
||||
_openReply = null;
|
||||
});
|
||||
socket.connect(_hostname as String, _port)
|
||||
..then((x) {
|
||||
assign(socket as ISocket);
|
||||
})
|
||||
..error((x) {
|
||||
_openReply?.triggerError(x);
|
||||
_openReply = null;
|
||||
});
|
||||
}
|
||||
|
||||
return _openReply as AsyncReply<bool>;
|
||||
@ -1566,16 +1569,17 @@ class DistributedConnection extends NetworkConnection with IStore {
|
||||
null; //Activator.CreateInstance(type, args) as IResource;
|
||||
|
||||
Warehouse.put<IResource>(
|
||||
name, resource as IResource, store, parent)
|
||||
.then<dynamic>((ok) {
|
||||
sendReply(IIPPacketAction.CreateResource, callback)
|
||||
..addUint32((resource.instance as Instance).id)
|
||||
..done();
|
||||
}).error((ex) {
|
||||
// send some error
|
||||
sendError(ErrorType.Management, callback,
|
||||
ExceptionCode.AddToStoreFailed.index);
|
||||
});
|
||||
name, resource as IResource, store, parent)
|
||||
..then((ok) {
|
||||
sendReply(IIPPacketAction.CreateResource, callback)
|
||||
..addUint32((resource.instance as Instance).id)
|
||||
..done();
|
||||
})
|
||||
..error((ex) {
|
||||
// send some error
|
||||
sendError(ErrorType.Management, callback,
|
||||
ExceptionCode.AddToStoreFailed.index);
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
@ -2185,11 +2189,13 @@ class DistributedConnection extends NetworkConnection with IStore {
|
||||
Codec.parse(data, 0, this, null, dataType).reply.then((value) {
|
||||
if (r is DistributedResource) {
|
||||
// propagation
|
||||
(r as DistributedResource).set(index, value).then<dynamic>((x) {
|
||||
sendReply(IIPPacketAction.SetProperty, callback).done();
|
||||
}).error((x) {
|
||||
sendError(x.type, callback, x.code, x.message);
|
||||
});
|
||||
(r as DistributedResource).set(index, value)
|
||||
..then((x) {
|
||||
sendReply(IIPPacketAction.SetProperty, callback).done();
|
||||
})
|
||||
..error((x) {
|
||||
sendError(x.type, callback, x.code, x.message);
|
||||
});
|
||||
} else {
|
||||
/*
|
||||
#if NETSTANDARD1_5
|
||||
@ -2473,9 +2479,10 @@ class DistributedConnection extends NetworkConnection with IStore {
|
||||
AsyncReply<List<IResource?>> getChildren(IResource resource) {
|
||||
var rt = new AsyncReply<List<IResource?>>();
|
||||
|
||||
sendRequest(IIPPacketAction.ResourceChildren)
|
||||
..addUint32(resource.instance?.id as int)
|
||||
..done().then<dynamic>((ar) {
|
||||
(sendRequest(IIPPacketAction.ResourceChildren)
|
||||
..addUint32(resource.instance?.id as int))
|
||||
.done()
|
||||
..then((ar) {
|
||||
if (ar != null) {
|
||||
TransmissionType dataType = ar[0] as TransmissionType;
|
||||
DC data = ar[1] as DC;
|
||||
@ -2487,7 +2494,7 @@ class DistributedConnection extends NetworkConnection with IStore {
|
||||
} else {
|
||||
rt.triggerError(Exception("Null response"));
|
||||
}
|
||||
});
|
||||
}).error((ex) => rt.triggerError(ex));
|
||||
|
||||
return rt;
|
||||
}
|
||||
@ -2496,9 +2503,10 @@ class DistributedConnection extends NetworkConnection with IStore {
|
||||
AsyncReply<List<IResource?>> getParents(IResource resource) {
|
||||
var rt = new AsyncReply<List<IResource?>>();
|
||||
|
||||
sendRequest(IIPPacketAction.ResourceParents)
|
||||
..addUint32((resource.instance as Instance).id)
|
||||
..done().then<dynamic>((ar) {
|
||||
(sendRequest(IIPPacketAction.ResourceParents)
|
||||
..addUint32((resource.instance as Instance).id))
|
||||
.done()
|
||||
..then((ar) {
|
||||
if (ar != null) {
|
||||
TransmissionType dataType = ar[0] as TransmissionType;
|
||||
DC data = ar[1] as DC;
|
||||
@ -2509,7 +2517,8 @@ class DistributedConnection extends NetworkConnection with IStore {
|
||||
} else {
|
||||
rt.triggerError(Exception("Null response"));
|
||||
}
|
||||
});
|
||||
})
|
||||
..error((ex) => rt.triggerError(ex));
|
||||
|
||||
return rt;
|
||||
}
|
||||
@ -2531,7 +2540,7 @@ class DistributedConnection extends NetworkConnection with IStore {
|
||||
..addInt32(attrs.length)
|
||||
..addDC(attrs))
|
||||
.done()
|
||||
..then<dynamic>((ar) => rt.trigger(true))
|
||||
..then((ar) => rt.trigger(true))
|
||||
..error((ex) => rt.triggerError(ex));
|
||||
}
|
||||
|
||||
@ -2543,14 +2552,14 @@ class DistributedConnection extends NetworkConnection with IStore {
|
||||
[bool clearAttributes = false]) {
|
||||
var rt = new AsyncReply<bool>();
|
||||
|
||||
sendRequest(clearAttributes
|
||||
? IIPPacketAction.UpdateAllAttributes
|
||||
: IIPPacketAction.UpdateAttributes)
|
||||
..addUint32(resource.instance?.id as int)
|
||||
..addDC(Codec.compose(attributes, this))
|
||||
..done()
|
||||
.then<dynamic>((ar) => rt.trigger(true))
|
||||
.error((ex) => rt.triggerError(ex));
|
||||
(sendRequest(clearAttributes
|
||||
? IIPPacketAction.UpdateAllAttributes
|
||||
: IIPPacketAction.UpdateAttributes)
|
||||
..addUint32(resource.instance?.id as int)
|
||||
..addDC(Codec.compose(attributes, this)))
|
||||
.done()
|
||||
..then((ar) => rt.trigger(true))
|
||||
..error((ex) => rt.triggerError(ex));
|
||||
|
||||
return rt;
|
||||
}
|
||||
@ -2629,11 +2638,12 @@ class DistributedConnection extends NetworkConnection with IStore {
|
||||
var reply =
|
||||
new AsyncReply<KeyList<PropertyTemplate, List<PropertyValue>>>();
|
||||
|
||||
sendRequest(IIPPacketAction.ResourceHistory)
|
||||
..addUint32(dr.distributedResourceInstanceId as int)
|
||||
..addDateTime(fromDate)
|
||||
..addDateTime(toDate)
|
||||
..done().then<dynamic>((rt) {
|
||||
(sendRequest(IIPPacketAction.ResourceHistory)
|
||||
..addUint32(dr.distributedResourceInstanceId as int)
|
||||
..addDateTime(fromDate)
|
||||
..addDateTime(toDate))
|
||||
.done()
|
||||
..then((rt) {
|
||||
if (rt != null) {
|
||||
var content = rt[0] as DC;
|
||||
|
||||
@ -2643,7 +2653,8 @@ class DistributedConnection extends NetworkConnection with IStore {
|
||||
} else {
|
||||
reply.triggerError(Exception("Null response"));
|
||||
}
|
||||
}).error((ex) => reply.triggerError(ex));
|
||||
})
|
||||
..error((ex) => reply.triggerError(ex));
|
||||
|
||||
return reply;
|
||||
} else
|
||||
@ -2661,10 +2672,11 @@ class DistributedConnection extends NetworkConnection with IStore {
|
||||
var str = DC.stringToBytes(path);
|
||||
var reply = new AsyncReply<List<IResource?>>();
|
||||
|
||||
sendRequest(IIPPacketAction.QueryLink)
|
||||
..addUint16(str.length)
|
||||
..addDC(str)
|
||||
..done().then<dynamic>((ar) {
|
||||
(sendRequest(IIPPacketAction.QueryLink)
|
||||
..addUint16(str.length)
|
||||
..addDC(str))
|
||||
.done()
|
||||
..then((ar) {
|
||||
if (ar != null) {
|
||||
TransmissionType dataType = ar[0] as TransmissionType;
|
||||
DC data = ar[1] as DC;
|
||||
@ -2675,7 +2687,8 @@ class DistributedConnection extends NetworkConnection with IStore {
|
||||
} else {
|
||||
reply.triggerError(Exception("Null response"));
|
||||
}
|
||||
}).error((ex) => reply.triggerError(ex));
|
||||
})
|
||||
..error((ex) => reply.triggerError(ex));
|
||||
|
||||
return reply;
|
||||
}
|
||||
|
@ -442,9 +442,9 @@ class TemplateGenerator {
|
||||
|
||||
rt.writeln("var rt = AsyncReply<$rtTypeName>();");
|
||||
rt.writeln("internal_invoke(${f.index}, args)");
|
||||
rt.writeln(".then<dynamic>((x) => rt.trigger(x))");
|
||||
rt.writeln(".error((x) => rt.triggerError(x))");
|
||||
rt.writeln(".chunk((x) => rt.triggerChunk(x));");
|
||||
rt.writeln("..then((x) => rt.trigger(x))");
|
||||
rt.writeln("..error((x) => rt.triggerError(x))");
|
||||
rt.writeln("..chunk((x) => rt.triggerChunk(x));");
|
||||
rt.writeln("return rt; }");
|
||||
});
|
||||
|
||||
|
@ -454,20 +454,24 @@ class Warehouse {
|
||||
_resources[(resource.instance as Instance).id] = resource;
|
||||
|
||||
if (_warehouseIsOpen) {
|
||||
resource.trigger(ResourceTrigger.Initialize).then<dynamic>((value) {
|
||||
if (resource is IStore)
|
||||
resource.trigger(ResourceTrigger.Open).then<dynamic>((value) {
|
||||
resource.trigger(ResourceTrigger.Initialize)
|
||||
..then((value) {
|
||||
if (resource is IStore)
|
||||
resource.trigger(ResourceTrigger.Open)
|
||||
..then((value) {
|
||||
rt.trigger(resource);
|
||||
})
|
||||
..error((ex) {
|
||||
Warehouse.remove(resource);
|
||||
rt.triggerError(ex);
|
||||
});
|
||||
else
|
||||
rt.trigger(resource);
|
||||
}).error((ex) {
|
||||
Warehouse.remove(resource);
|
||||
rt.triggerError(ex);
|
||||
});
|
||||
else
|
||||
rt.trigger(resource);
|
||||
}).error((ex) {
|
||||
Warehouse.remove(resource);
|
||||
rt.triggerError(ex);
|
||||
});
|
||||
})
|
||||
..error((ex) {
|
||||
Warehouse.remove(resource);
|
||||
rt.triggerError(ex);
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
@ -475,15 +479,17 @@ class Warehouse {
|
||||
_stores.add(resource);
|
||||
initResource();
|
||||
} else {
|
||||
store?.put(resource).then<dynamic>((value) {
|
||||
if (value)
|
||||
initResource();
|
||||
else
|
||||
rt.trigger(null);
|
||||
}).error((ex) {
|
||||
Warehouse.remove(resource);
|
||||
rt.triggerError(ex);
|
||||
});
|
||||
store?.put(resource)
|
||||
?..then((value) {
|
||||
if (value)
|
||||
initResource();
|
||||
else
|
||||
rt.trigger(null);
|
||||
})
|
||||
..error((ex) {
|
||||
Warehouse.remove(resource);
|
||||
rt.triggerError(ex);
|
||||
});
|
||||
}
|
||||
|
||||
// return new name
|
||||
|
Loading…
x
Reference in New Issue
Block a user