[M5] mxaccess-asb: F25 step 10 — PublishWriteComplete + DeleteMonitoredItems
Closes out the F25 operation matrix. AsbClient now wraps every
IASBIDataV2 operation:
Lifecycle: connect / disconnect / send_end / send_preamble / keep_alive
Items: register_items / unregister_items / read / write
Subscriptions:create_subscription / add_monitored_items / publish
/ delete_monitored_items / delete_subscription
Write cb: publish_write_complete
API additions:
* `build_publish_write_complete_request_body()` — empty wrapper
per `AsbContracts.cs:204-205`. No body fields beyond inherited
ConnectionValidator.
* `decode_publish_write_complete_response` — returns count of
`<ItemWriteComplete>` elements observed. Per-element decode
(Status + WriteHandle) deferred to a later iteration since
ItemWriteComplete is regular WCF DataContract rather than the
binary fast-path.
* `build_delete_monitored_items_request_body` — same MonitoredItem
shape as AddMonitoredItems but omits RequireId per `cs:268-277`.
* `decode_delete_monitored_items_response` — per-item Status array.
* Client wrappers: `publish_write_complete()`,
`delete_monitored_items(subscription_id, items)`.
6 new tests:
* `publish_write_complete_body_is_empty_wrapper` — body shape.
* `publish_write_complete_response_counts_item_write_complete_elements`
— counts 2 / 0 elements correctly.
* `publish_write_complete_response_zero_when_no_callbacks`.
* `delete_monitored_items_body_carries_subscription_id_and_items`.
* `delete_monitored_items_body_omits_require_id_field`.
* `delete_monitored_items_response_round_trip`.
Workspace: 701 tests pass (was 695, +6).
Stubbed for future iterations:
* ItemWriteComplete per-element decode (Status + WriteHandle) once
a live capture confirms the WCF DataContract XML wire form.
* Optional MonitoredItem fields (Active / TimeDeadband /
ValueDeadband / UserData) — same wire-byte uncertainty.
* Optional WriteValue fields (Comment / Timestamp / etc.).
All wire-byte caveats trace back to live-probe reconciliation
against an actual AVEVA VM.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -56,15 +56,18 @@ use crate::contracts::{ItemIdentity, ItemStatus};
|
||||
use crate::envelope::{ConnectionValidator, EnvelopeError, SoapEnvelope};
|
||||
use crate::operations::{
|
||||
AddMonitoredItemsResponse, ConnectResponse, CreateSubscriptionResponse,
|
||||
DeleteSubscriptionResponse, MinimalMonitoredItem, MinimalWriteValue, OperationError,
|
||||
PublishResponse, ReadResponse, RegisterItemsResponse, UnregisterItemsResponse, WriteResponse,
|
||||
DeleteMonitoredItemsResponse, DeleteSubscriptionResponse, MinimalMonitoredItem,
|
||||
MinimalWriteValue, OperationError, PublishResponse, PublishWriteCompleteResponse, ReadResponse,
|
||||
RegisterItemsResponse, UnregisterItemsResponse, WriteResponse,
|
||||
build_add_monitored_items_request_body, build_authenticate_me_request_body,
|
||||
build_connect_request_body, build_create_subscription_request_body,
|
||||
build_delete_subscription_request_body, build_disconnect_request_body,
|
||||
build_keep_alive_request_body, build_publish_request_body, build_read_request_body,
|
||||
build_delete_monitored_items_request_body, build_delete_subscription_request_body,
|
||||
build_disconnect_request_body, build_keep_alive_request_body, build_publish_request_body,
|
||||
build_publish_write_complete_request_body, build_read_request_body,
|
||||
build_register_items_request_body, build_unregister_items_request_body,
|
||||
build_write_request_body, decode_add_monitored_items_response, decode_connect_response,
|
||||
decode_create_subscription_response, decode_publish_response, decode_read_response,
|
||||
decode_create_subscription_response, decode_delete_monitored_items_response,
|
||||
decode_publish_response, decode_publish_write_complete_response, decode_read_response,
|
||||
decode_register_items_response, decode_unregister_items_response, decode_write_response,
|
||||
};
|
||||
use crate::{actions, decode_envelope, encode_envelope};
|
||||
@@ -341,6 +344,40 @@ impl<T: AsyncRead + AsyncWrite + Unpin + Send> AsbClient<T> {
|
||||
Ok(decode_read_response(&response.body_tokens)?)
|
||||
}
|
||||
|
||||
/// `PublishWriteComplete` operation — long-poll the
|
||||
/// write-completion-callback queue. Mirrors the
|
||||
/// `[OperationContract(Action = "...:publishWriteCompleteIn")]`
|
||||
/// at `AsbContracts.cs:42`. Returns a count of completed writes
|
||||
/// (per-element decode is deferred to a later iteration once a
|
||||
/// live capture confirms the WCF DataContract XML shape).
|
||||
pub async fn publish_write_complete(
|
||||
&mut self,
|
||||
) -> Result<PublishWriteCompleteResponse, ClientError> {
|
||||
let body = build_publish_write_complete_request_body();
|
||||
let response = self
|
||||
.send_signed_envelope(actions::PUBLISH_WRITE_COMPLETE, body, false)
|
||||
.await?;
|
||||
Ok(decode_publish_write_complete_response(
|
||||
&response.body_tokens,
|
||||
)?)
|
||||
}
|
||||
|
||||
/// `DeleteMonitoredItems` operation — removes items from a
|
||||
/// subscription. Returns the per-item Status array.
|
||||
pub async fn delete_monitored_items(
|
||||
&mut self,
|
||||
subscription_id: i64,
|
||||
items: &[MinimalMonitoredItem],
|
||||
) -> Result<DeleteMonitoredItemsResponse, ClientError> {
|
||||
let body = build_delete_monitored_items_request_body(subscription_id, items);
|
||||
let response = self
|
||||
.send_signed_envelope(actions::DELETE_MONITORED_ITEMS, body, false)
|
||||
.await?;
|
||||
Ok(decode_delete_monitored_items_response(
|
||||
&response.body_tokens,
|
||||
)?)
|
||||
}
|
||||
|
||||
/// `Write` operation — sends a signed `WriteIn` SOAP envelope and
|
||||
/// decodes the `WriteResponse` (per-item Status array).
|
||||
///
|
||||
|
||||
Reference in New Issue
Block a user