mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-18 14:43:08 +08:00
0374e19121
# Description _Describe the changes here to communicate to the maintainers why they should accept this pull request. By default - this will become the Commit message after merging and thus define history._ Add provider-backed MachineTool, bundled WMTP, GMS and CranesHoists companions using the existing Machinery/MachineVision fluent, DI and typed-client approach. **The PR is open/non-draft by user choice. Current head `ecc4a7d6ca3e8004cf28ab54da605da302d026bf` is mergeable and has 108 successful checks, six intentionally skipped checks, zero failures and zero pending checks. All five primary workflows completed successfully at that exact head.** | Family | Released specification/model | Packaging | | --- | --- | --- | | MachineTool | OPC 40501-1, 1.02.0 | Model, Server, Client and MCP; normal root versions | | WMTP | OPC 40505, 1.0.0 | Bundled in MachineTool; distinct CLR/wire namespace and independent WMTP-only hosting | | GMS | OPC 40210 reference 1.0.1, normative model 1.0.0 | Model, Server, Client and MCP; normal root versions | | CranesHoists | OPC 40020-1, 1.00 | Model, Server, Client and MCP; all four plus Debug variants forced preview | There are **12 new packable projects**. No separate WMTP package/profile/guide, root version bump, tag, release or package publication is included. Mandatory instance structure is the default; selected optional features require explicit providers. The implementation reuses Machinery results/jobs/files/ProcessValues and Robotics topology, including retained MachineTool Production, defined GMS jobs/parts, modern ISA95/Machinery jobs, shared-owner hosting and isolated instances alongside MachineVision. Runtime and integration fixes preserve raw quality/timestamps, coherent acquisition, namespace ownership, accepted-configuration state, borrowed-resource lifetime, session/node/file cleanup, terminal-value publication, event propagation and endpoint-aware capability publication. Firmware/licence transfer means provider acceptance, not installation/activation. Cancellation does not silently abort another caller's operation. The later upstream MCP expansion is integrated without losing either family set or its default-off privileged/live execution policy. ### Conformance and scope Canonical model inputs are pinned to UA-Nodeset revision `96a08945425d0295edb3607d2a38f6841ef44046`. **GMS upstream exception:** [Annex A.1](https://reference.opcfoundation.org/specs/OPC-40210/annex-a) makes the released NodeSet normative, but §12.3.2.7 requires undefined `GMS_ProductionStatisticsType`. Inherited statistics and defined jobs/parts are implemented without inventing a standard type/NodeId; the complete GMS Production facet is withheld. The requirement ledger records **102 positively evidenced CU rows, 96 directly negative-tested rows and six explicit negative-evidence limitations**. All 648 test-class/name/TRX links were independently resolved to passing cases. The six limitations concern Stacklight, retained legacy PowerOnDuration, Machinery PowerOnDuration, WorkingUnit, Obligation and MaintenanceMode. They are not claims that every invalid-input or hardware-control behavior was tested. The undefined GMS requirement is outside the 102 defined CUs. No external certification claim is made. Retained baseline complete-assembly line coverage, with generated code retained and no source exclusions: | Family | Model | Server | Client | | --- | ---: | ---: | ---: | | MachineTool/WMTP | 83.80% | 91.98% | 84.74% | | GMS | 95.51% | 90.63% | 88.38% | | CranesHoists | 92.76% | 94.45% | 92.24% | These nine measurements predate the later focused review fixes and merges; they are not relabelled as new `ecc4a7d6c` percentages. The current head's separate CI code-coverage check succeeded. No new exclusions or threshold relaxations were introduced. ## Related Issues - Fixes [#4764](https://github.com/OPCFoundation/UA-.NETStandard/issues/4764), the implementation/design and acceptance tracker. ## Checklist _Put an `x` in the boxes that apply. You can complete these step by step after opening the PR._ - [ ] I have signed the [CLA](https://opcfoundation.org/license/cla/ContributorLicenseAgreementv1.0.pdf) and read the [CONTRIBUTING](https://github.com/OPCFoundation/UA-.NETStandard/blob/master/CONTRIBUTING.md) doc. - [x] I have added tests that prove my fix is effective or that my feature works and increased code coverage. - [x] I have added all necessary documentation. - [ ] I have verified that my changes do not introduce (new) build or analyzer warnings. - [ ] I ran **all** tests locally using the **UA.slnx** solution against at least .net **framework** and .net **10**, and all passed. - [ ] I fixed **all** failing and flaky tests in the CI pipelines and **all** CodeQL warnings. - [x] I have addressed **all** PR feedback received.
237 lines
11 KiB
C#
237 lines
11 KiB
C#
/* ========================================================================
|
|
* Copyright (c) 2005-2026 The OPC Foundation, Inc. All rights reserved.
|
|
*
|
|
* OPC Foundation MIT License 1.00
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person
|
|
* obtaining a copy of this software and associated documentation
|
|
* files (the "Software"), to deal in the Software without
|
|
* restriction, including without limitation the rights to use,
|
|
* copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following
|
|
* conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be
|
|
* included in all copies or substantial portions of the Software.
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
|
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
|
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* The complete license agreement can be found here:
|
|
* http://opcfoundation.org/License/MIT/1.00/
|
|
* ======================================================================*/
|
|
|
|
using System;
|
|
using System.IO;
|
|
using Opc.Ua;
|
|
|
|
namespace MachineToolSample.Client
|
|
{
|
|
/// <summary>
|
|
/// Bounds passive workflows and requires a target plus explicit consent before any state-changing request.
|
|
/// </summary>
|
|
internal sealed record ClientOptions
|
|
{
|
|
/// <summary>
|
|
/// Gets the secure discovery endpoint.
|
|
/// </summary>
|
|
public string Endpoint { get; private init; } = "opc.tcp://127.0.0.1:62558/MachineToolServer";
|
|
|
|
/// <summary>
|
|
/// Gets an optional exact application browse name, mandatory for commands.
|
|
/// </summary>
|
|
public string? Target { get; private init; }
|
|
|
|
/// <summary>
|
|
/// Gets the single explicitly selected command; none means strictly passive.
|
|
/// </summary>
|
|
public string Command { get; private init; } = "none";
|
|
|
|
/// <summary>
|
|
/// Gets explicit consent to the selected simulation command.
|
|
/// </summary>
|
|
public bool Consent { get; private init; }
|
|
|
|
/// <summary>
|
|
/// Gets an explicitly selected sensor for configuration.
|
|
/// </summary>
|
|
public string? Sensor { get; private init; }
|
|
|
|
/// <summary>
|
|
/// Gets the requested sensor update interval.
|
|
/// </summary>
|
|
public int? TriggerMilliseconds { get; private init; }
|
|
|
|
/// <summary>
|
|
/// Gets the single explicitly selected work-record index to delete.
|
|
/// </summary>
|
|
public int? DeleteIndex { get; private init; }
|
|
|
|
/// <summary>
|
|
/// Gets the bounded count of generated nonsecret demonstration bytes.
|
|
/// </summary>
|
|
public int? TransferBytes { get; private init; }
|
|
|
|
/// <summary>
|
|
/// Gets whether a second explicit configuration should prove the fresh sample's capacity refusal.
|
|
/// </summary>
|
|
public bool ProveRefusal { get; private init; }
|
|
|
|
/// <summary>
|
|
/// Gets whether to read the bounded, read-only demonstration program through the existing file client.
|
|
/// </summary>
|
|
public bool ReadFiles { get; private init; }
|
|
|
|
/// <summary>
|
|
/// Gets the one-shot observation window; zero skips observation.
|
|
/// </summary>
|
|
public int Seconds { get; private init; } = 5;
|
|
|
|
/// <summary>
|
|
/// Gets the one-shot notification limit.
|
|
/// </summary>
|
|
public int Count { get; private init; } = 5;
|
|
|
|
/// <summary>
|
|
/// Gets the accepted discovery ceiling.
|
|
/// </summary>
|
|
public int MaximumDevices { get; private init; } = 8;
|
|
|
|
/// <summary>
|
|
/// Gets the optional whole-application cancellation timer.
|
|
/// </summary>
|
|
public int? CancelAfterMilliseconds { get; private init; }
|
|
|
|
/// <summary>
|
|
/// Gets whether unknown certificates may be accepted at a loopback endpoint only.
|
|
/// </summary>
|
|
public bool DemoTrust { get; private init; }
|
|
|
|
/// <summary>
|
|
/// Gets the application's separate certificate-store root.
|
|
/// </summary>
|
|
public string PkiRoot { get; private init; } = Path.Combine("artifacts", "machinetool-pki", "client");
|
|
|
|
/// <summary>
|
|
/// Rejects unbounded inputs, remote demo trust, implicit mutation and ambiguous command selection.
|
|
/// </summary>
|
|
internal static ClientOptions Parse(ArrayOf<string> arguments)
|
|
{
|
|
var options = new ClientOptions();
|
|
for (int i = 0; i < arguments.Count; i++)
|
|
{
|
|
options = arguments[i] switch
|
|
{
|
|
"--endpoint" => options with { Endpoint = SampleArguments.ReadValue(arguments, ref i) },
|
|
"--target" => options with { Target = SampleArguments.ReadValue(arguments, ref i) },
|
|
"--command" => options with { Command = SampleArguments.ReadValue(arguments, ref i) },
|
|
"--sensor" => options with { Sensor = SampleArguments.ReadValue(arguments, ref i) },
|
|
"--trigger-ms" => options with
|
|
{
|
|
TriggerMilliseconds = SampleArguments.ReadInteger(arguments, ref i, 1, 60000)
|
|
},
|
|
"--delete-index" => options with
|
|
{
|
|
DeleteIndex = SampleArguments.ReadInteger(arguments, ref i, 1, 3)
|
|
},
|
|
"--transfer-bytes" => options with
|
|
{
|
|
TransferBytes = SampleArguments.ReadInteger(arguments, ref i, 1, 1024)
|
|
},
|
|
"--seconds" => options with { Seconds = SampleArguments.ReadInteger(arguments, ref i, 0, 20) },
|
|
"--count" => options with { Count = SampleArguments.ReadInteger(arguments, ref i, 1, 100) },
|
|
"--maximum-devices" => options with
|
|
{
|
|
MaximumDevices = SampleArguments.ReadInteger(arguments, ref i, 1, 32)
|
|
},
|
|
"--cancel-after-ms" => options with
|
|
{
|
|
CancelAfterMilliseconds = SampleArguments.ReadInteger(arguments, ref i, 1, 60000)
|
|
},
|
|
"--pki" => options with { PkiRoot = SampleArguments.ReadValue(arguments, ref i) },
|
|
"--consent" => options with { Consent = true },
|
|
"--prove-refusal" => options with { ProveRefusal = true },
|
|
"--read-files" => options with { ReadFiles = true },
|
|
"--demo-trust" => options with { DemoTrust = true },
|
|
_ => throw new ArgumentException($"Unknown option '{arguments[i]}'.", nameof(arguments))
|
|
};
|
|
}
|
|
if (!Uri.TryCreate(options.Endpoint, UriKind.Absolute, out Uri? endpoint) ||
|
|
endpoint.Scheme != "opc.tcp" || endpoint.Port < 1)
|
|
{
|
|
throw new ArgumentException(
|
|
"--endpoint must be an absolute opc.tcp URL with a port.", nameof(arguments));
|
|
}
|
|
if (options.DemoTrust && !endpoint.IsLoopback)
|
|
{
|
|
throw new ArgumentException("--demo-trust is restricted to loopback endpoints.", nameof(arguments));
|
|
}
|
|
if (options.Command is not ("none" or "configure" or "calibrate-on" or "calibrate-off" or
|
|
"set-time" or "delete-work" or "abort-work" or "firmware" or "license" or "job-store-start"))
|
|
{
|
|
throw new ArgumentException("Unknown --command; see --help.", nameof(arguments));
|
|
}
|
|
if (options.Command != "none" && (!options.Consent || options.Target == null))
|
|
{
|
|
throw new ArgumentException(
|
|
"A command requires --consent and an explicit --target.", nameof(arguments));
|
|
}
|
|
if (options.Command == "configure" && (options.Sensor == null || !options.TriggerMilliseconds.HasValue))
|
|
{
|
|
throw new ArgumentException("configure requires --sensor and --trigger-ms.", nameof(arguments));
|
|
}
|
|
if (options.Command == "delete-work" && !options.DeleteIndex.HasValue)
|
|
{
|
|
throw new ArgumentException("delete-work requires --delete-index.", nameof(arguments));
|
|
}
|
|
if (options.Command is "firmware" or "license" && !options.TransferBytes.HasValue)
|
|
{
|
|
throw new ArgumentException("A transfer requires --transfer-bytes.", nameof(arguments));
|
|
}
|
|
if (options.ProveRefusal && (options.Command != "configure" || !options.DemoTrust))
|
|
{
|
|
throw new ArgumentException(
|
|
"--prove-refusal requires configure and --demo-trust on a fresh sample.", nameof(arguments));
|
|
}
|
|
if (options.ReadFiles && options.Target == null)
|
|
{
|
|
throw new ArgumentException("--read-files requires an explicit machine --target.", nameof(arguments));
|
|
}
|
|
return options;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Documents the passive default and every implemented opt-in.
|
|
/// </summary>
|
|
internal static void PrintHelp()
|
|
{
|
|
Console.WriteLine("""
|
|
MachineToolClient [--endpoint opc.tcp-URL] [--target browse-name]
|
|
[--seconds 0..20] [--count 1..100] [--maximum-devices 1..32]
|
|
[--pki directory] [--demo-trust] [--read-files]
|
|
[--cancel-after-ms 1..60000]
|
|
Passive by default: discovery, actual capabilities, raw snapshots, nonconsuming records,
|
|
and ONE bounded observation. No calibration, deletion, configuration, abort, transfer or job start.
|
|
Commands REQUIRE --target AND --consent; the server independently authorizes each request:
|
|
--command configure --sensor Temperature --trigger-ms 2000 [--prove-refusal]
|
|
--command calibrate-on|calibrate-off
|
|
--command set-time (current UTC, explicit UTC zone)
|
|
--command delete-work --delete-index 1..3
|
|
--command abort-work (explicit peripheral-scoped abort)
|
|
--command firmware|license --transfer-bytes 1..1024
|
|
--command job-store-start (the documented DemoOrder/DemoWorkMaster)
|
|
Transfers use generated nonsecret DEMO bytes, not installed firmware or activated licenses.
|
|
Job acceptance is NOT execution; only the server's separate --simulate-job models execution.
|
|
--demo-trust is LOOPBACK ONLY; SignAndEncrypt and SHA-256 remain required.
|
|
Work has a 90-second deadline. Exit codes: 0 completed, 1 failure/refusal, 2 cancelled.
|
|
""");
|
|
}
|
|
}
|
|
}
|