Merge pull request #527 from mtconnect/main-dev

Author: wsobel

.github/workflows/build-docker-image.yml

@@ -32,6 +32,9 @@ on:
 jobs:
   # this workflow contains a single job called "build"
   build:
+    # Do not build if it is an RC build
+    if: ${{ ! contains(github.ref_name, "RC") }}
+    
     # the type of runner that the job will run on
     runs-on: ubuntu-latest
     strategy:

CMakeLists.txt

@@ -1,8 +1,8 @@
 # The version number.
 set(AGENT_VERSION_MAJOR 2)
-set(AGENT_VERSION_MINOR 4)
+set(AGENT_VERSION_MINOR 5)
 set(AGENT_VERSION_PATCH 0)
-set(AGENT_VERSION_BUILD 9)
+set(AGENT_VERSION_BUILD 1)
 set(AGENT_VERSION_RC "")
 
 # This minimum version is to support Visual Studio 2019 and C++ feature checking and FetchContent

README.md

@@ -1,5 +1,5 @@
 
-MTConnect C++ Agent Version 2.3
+MTConnect C++ Agent Version 2.5
 --------
 [![Build MTConnect C++ Agent](https://github.com/mtconnect/cppagent/actions/workflows/build.yml/badge.svg)](https://github.com/mtconnect/cppagent/actions/workflows/build.yml)
 
@@ -13,6 +13,10 @@ the devices and the location of the adapter.
 
 Pre-built binary releases for Windows are available from [Releases](https://github.com/mtconnect/cppagent/releases) for those who do not want to build the agent themselves. For *NIX users, you will need libxml2, cppunit, and cmake as well as build essentials.
 
+Version 2.5.0 Support for version 2.5. Added validation of observations in the stream and WebSockets support.
+
+Version 2.4.0 Added support for version 2.4
+
 Version 2.3.0 Support for all Version 2.3 standard changes and JSON ingress to MQTT adapter.
 
 Version 2.2.0 Support for all Version 2.2 standard changes and dynamic configuration from adapters. Upgrade to conan 2.
@@ -667,6 +671,10 @@ Configuration Parameters
 * `VersionDeviceXml` - Create a new versioned file every time the Device.xml file changes from an external source.
 
     *Default*: `false`
+    
+* `Validation` - Turns on validation of model components and observations
+
+    *Default*: `false`
 
 * `WorkerThreads` - The number of operating system threads dedicated to the Agent
 
@@ -741,14 +749,12 @@ These can be overridden on a per-adapter basis
 
 * `HttpHeaders`     - Additional headers to add to the HTTP Response for CORS Security
 
-    Example: 
-	```
-    HttpHeaders {
-		Access-Control-Allow-Origin = *
-		Access-Control-Allow-Methods = GET
-		Access-Control-Allow-Headers = Content-Type
-    }
-	```
+    > Example: ```
+    > HttpHeaders {
+    >   Access-Control-Allow-Origin = *
+    >   Access-Control-Allow-Methods = GET
+    >   Access-Control-Allow-Headers = Content-Type
+    > }```
 
 * `Port`	- The port number the agent binds to for requests.
 
@@ -1036,6 +1042,9 @@ Sinks {
 
     *Default*: Auto-generated
 
+	> **⚠️Note:** Mqtt Sinks and Mqtt Adapters create separate connections to their respective brokers, but currently use the same client ID by default. Because of this, when using a single broker for source and sink, best practice is to explicitly specify their respective `MqttClientId`
+	>
+
 	Example mqtt adapter block:
 	```json
 	mydevice {

agent/cppagent.cpp

@@ -1,5 +1,5 @@
 //
-// Copyright Copyright 2009-2022, AMT – The Association For Manufacturing Technology (“AMT”)
+// Copyright Copyright 2009-2024, AMT – The Association For Manufacturing Technology (“AMT”)
 // All rights reserved.
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");

agent_lib/CMakeLists.txt

@@ -25,6 +25,9 @@ set(AGENT_SOURCES
         "${SOURCE_DIR}/asset/raw_material.hpp"
         "${SOURCE_DIR}/asset/qif_document.hpp"
         "${SOURCE_DIR}/asset/component_configuration_parameters.hpp"
+        "${SOURCE_DIR}/asset/physical_asset.hpp"
+        "${SOURCE_DIR}/asset/fixture.hpp"
+        "${SOURCE_DIR}/asset/pallet.hpp"
 
 # src/asset SOURCE_FILES_ONLY
 
@@ -34,6 +37,9 @@ set(AGENT_SOURCES
         "${SOURCE_DIR}/asset/raw_material.cpp"
         "${SOURCE_DIR}/asset/qif_document.cpp"
         "${SOURCE_DIR}/asset/component_configuration_parameters.cpp"
+        "${SOURCE_DIR}/asset/physical_asset.cpp"
+        "${SOURCE_DIR}/asset/fixture.cpp"
+        "${SOURCE_DIR}/asset/pallet.cpp"
 
 # src/buffer HEADER_FILES_ONLY
 
@@ -183,6 +189,7 @@ set(AGENT_SOURCES
         "${SOURCE_DIR}/pipeline/topic_mapper.hpp"
         "${SOURCE_DIR}/pipeline/transform.hpp"
         "${SOURCE_DIR}/pipeline/upcase_value.hpp"
+        "${SOURCE_DIR}/pipeline/validator.hpp"       
 
 # src/pipeline SOURCE_FILES_ONLY
 
@@ -243,13 +250,11 @@ set(AGENT_SOURCES
 
 # src/sink/mqtt_sink HEADER_FILE_ONLY
 
-        "${SOURCE_DIR}/sink/mqtt_sink/mqtt_service.hpp"
-		"${SOURCE_DIR}/sink/mqtt_sink/mqtt2_service.hpp"
+	"${SOURCE_DIR}/sink/mqtt_sink/mqtt_service.hpp"
 
 #src/sink/mqtt_sink SOURCE_FILES_ONLY
 
-        "${SOURCE_DIR}/sink/mqtt_sink/mqtt_service.cpp"
-		"${SOURCE_DIR}/sink/mqtt_sink/mqtt2_service.cpp"
+	"${SOURCE_DIR}/sink/mqtt_sink/mqtt_service.cpp"
 
 # src/sink/rest_sink HEADER_FILE_ONLY
 
@@ -264,13 +269,21 @@ set(AGENT_SOURCES
         "${SOURCE_DIR}/sink/rest_sink/session.hpp"
         "${SOURCE_DIR}/sink/rest_sink/session_impl.hpp"
         "${SOURCE_DIR}/sink/rest_sink/tls_dector.hpp"
+        "${SOURCE_DIR}/sink/rest_sink/websocket_session.hpp"
 
 # src/sink/rest_sink SOURCE_FILES_ONLY
 
         "${SOURCE_DIR}/sink/rest_sink/file_cache.cpp"
         "${SOURCE_DIR}/sink/rest_sink/rest_service.cpp"
         "${SOURCE_DIR}/sink/rest_sink/server.cpp"
         "${SOURCE_DIR}/sink/rest_sink/session_impl.cpp"
+
+ # validation HEADER_FILES_ONLY
+        "${SOURCE_DIR}/validation/observations.hpp"
+        "${SOURCE_DIR}/validation/observation_validations.hpp"
+       
+ # validation SOURCE_FILES_ONLY
+        "${SOURCE_DIR}/validation/observations.cpp"
   )
 
 if(WITH_RUBY)
@@ -325,7 +338,6 @@ if(MSVC)
   # The modules including Beast required the /bigobj option in Windows
   set_property(SOURCE    
     "${SOURCE_DIR}/sink/mqtt_sink/mqtt_service.cpp"
-    "${SOURCE_DIR}/sink/mqtt_sink/mqtt2_service.cpp"
     "${SOURCE_DIR}/sink/rest_sink/session_impl.cpp"
     "${SOURCE_DIR}/source/adapter/mqtt/mqtt_adapter.cpp"
     "${SOURCE_DIR}/source/adapter/agent_adapter/agent_adapter.cpp"

conan/profiles/vs32

@@ -8,4 +8,5 @@ compiler.runtime=static
 compiler.runtime_type=Release
 build_type=Release
 
-
+[options]
+winver=0x0600

conan/profiles/vs32debug

@@ -8,3 +8,5 @@ compiler.runtime=static
 compiler.runtime_type=Debug
 build_type=Debug
 
+[options]
+winver=0x0600

conan/profiles/vs32shared

@@ -11,3 +11,4 @@ build_type=Release
 
 [options]
 shared=True
+winver=0x0600

conanfile.py

@@ -9,7 +9,7 @@
 
 class MTConnectAgentConan(ConanFile):
     name = "mtconnect_agent"
-    version = "2.4"
+    version = "2.5"
     url = "https://github.com/mtconnect/cppagent.git"
     license = "Apache License 2.0"
     settings = "os", "compiler", "arch", "build_type"
@@ -143,6 +143,9 @@ def configure(self):
         if is_msvc(self):
             self.options["boost/*"].extra_b2_flags = ("define=BOOST_USE_WINAPI_VERSION=" + str(self.options.winver))
 
+        if is_msvc(self):
+            self.options["boost/*"].extra_b2_flags = ("define=BOOST_USE_WINAPI_VERSION=" + str(self.options.winver))
+            
         # Make sure shared builds use shared boost
         if is_msvc(self) and self.options.shared:
             print("**** Making boost, libxml2, gtest, and openssl shared")

docker/ubuntu/Dockerfile

@@ -63,7 +63,7 @@ RUN  apt-get update \
        rake \
        ruby \
   && rm -rf /var/lib/apt/lists/* \
-    && pip install conan
+  && pip install conan
 
 # make an agent directory and cd into it
 WORKDIR /root/agent