commit da0d3614a3f985f08cf8ce1510d59619240c58ca Author: BlubbFish Date: Tue Aug 4 14:37:19 2026 +0200 first commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ca55b99 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.vs +ConnectorStorageJson/bin +ConnectorStorageJson/obj \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..20ec6e2 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,92 @@ +# Contributing + +When contributing to this repository, please first discuss the change you wish to make via issue, +email, or any other method with the owners of this repository before making a change. + +Please note we have a code of conduct, please follow it in all your interactions with the project. + +## Pull Request Process + +1. Ensure any install or build dependencies are removed before the end of the layer when doing a + build. +2. Update the README.md with details of changes to the interface, this includes new environment + variables, exposed ports, useful file locations and container parameters. +3. Increase the version numbers in any examples files and the README.md to the new version that this + Pull Request would represent. The versioning scheme we use is [SemVer](http://semver.org/). +4. You may merge the Pull Request in once you have the sign-off of two other developers, or if you + do not have permission to do that, you may request the second reviewer to merge it for you. + +## Code of Conduct + +### Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, gender identity and expression, level of experience, +nationality, personal appearance, race, religion, or sexual identity and +orientation. + +### Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or +advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +### Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem inappropriate, +threatening, offensive, or harmful. + +### Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +### Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team at git ATTTT blubbfish.net. All +complaints will be reviewed and investigated and will result in a response that +is deemed necessary and appropriate to the circumstances. The project team is +obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership. + +### Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, +available at [http://contributor-covenant.org/version/1/4][version] + +[homepage]: http://contributor-covenant.org +[version]: http://contributor-covenant.org/version/1/4/ \ No newline at end of file diff --git a/Changelog.md b/Changelog.md new file mode 100644 index 0000000..5a7281b --- /dev/null +++ b/Changelog.md @@ -0,0 +1,37 @@ +# Changelog + +## 1.4.0 - 2022-01-09 - Cleanup +### New Features +* On first startup, not try to disconnect first +### Bugfixes +* Fixing nullpointer exception +### Changes +* Cleanup project and fixes version numbers + +## 1.3.0 - 2021-01-09 - Default netcore +### New Features +* Create toString, so in logfiles the used Server is visible +* add changelog.md +### Bugfixes +### Changes +* Netcore is now the default projekt + +## 1.2.0 - 2019-11-28 - Add netcore +### New Features +* add Licence, readme.md and contribute.md +* add netcore version +### Bugfixes +### Changes +* Using newer C# language version + +## 1.1.0 - 2019-05-27 - Rewrite Module to reconnect itselfs, so you dont need to watch over the the state of the connection +### New Features +* Keep the connection alive and reconnect internally +### Bugfixes +### Changes + +## 1.0.0.0 - 2019-02-14 - Init +### New Features +* Init release +### Bugfixes +### Changes \ No newline at end of file diff --git a/ConnectorStorageJson.sln b/ConnectorStorageJson.sln new file mode 100644 index 0000000..04d9253 --- /dev/null +++ b/ConnectorStorageJson.sln @@ -0,0 +1,43 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31112.23 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorStorageJson", "ConnectorStorageJson\ConnectorStorageJson.csproj", "{7004C8AC-BD58-4E78-9ACC-94120A90E965}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utils-IoT", "..\Utils-IoT\Utils-IoT\Utils-IoT.csproj", "{F1B42A3E-E8E4-41A9-87C3-A8E4080898BB}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utils", "..\Utils\Utils\Utils.csproj", "{472C8EC7-6D20-4968-AB30-381996442678}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "litjson", "..\..\Librarys\litjson\litjson\litjson.csproj", "{DB1EBE09-537F-4C87-AA73-57612FA94D1D}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7004C8AC-BD58-4E78-9ACC-94120A90E965}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7004C8AC-BD58-4E78-9ACC-94120A90E965}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7004C8AC-BD58-4E78-9ACC-94120A90E965}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7004C8AC-BD58-4E78-9ACC-94120A90E965}.Release|Any CPU.Build.0 = Release|Any CPU + {F1B42A3E-E8E4-41A9-87C3-A8E4080898BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F1B42A3E-E8E4-41A9-87C3-A8E4080898BB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F1B42A3E-E8E4-41A9-87C3-A8E4080898BB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F1B42A3E-E8E4-41A9-87C3-A8E4080898BB}.Release|Any CPU.Build.0 = Release|Any CPU + {472C8EC7-6D20-4968-AB30-381996442678}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {472C8EC7-6D20-4968-AB30-381996442678}.Debug|Any CPU.Build.0 = Debug|Any CPU + {472C8EC7-6D20-4968-AB30-381996442678}.Release|Any CPU.ActiveCfg = Release|Any CPU + {472C8EC7-6D20-4968-AB30-381996442678}.Release|Any CPU.Build.0 = Release|Any CPU + {DB1EBE09-537F-4C87-AA73-57612FA94D1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DB1EBE09-537F-4C87-AA73-57612FA94D1D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DB1EBE09-537F-4C87-AA73-57612FA94D1D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DB1EBE09-537F-4C87-AA73-57612FA94D1D}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {BE16498F-FCD1-45E6-A1A3-035B24FB0DD3} + EndGlobalSection +EndGlobal diff --git a/ConnectorStorageJson/AJsonDatatype.cs b/ConnectorStorageJson/AJsonDatatype.cs new file mode 100644 index 0000000..7a11306 --- /dev/null +++ b/ConnectorStorageJson/AJsonDatatype.cs @@ -0,0 +1,57 @@ +using System; +using System.Collections.Generic; +using System.Reflection; +using System.Text; + +using LitJson; + +namespace BlubbFish.Utils.IoT.Connector.Storage { + public abstract class AJsonDatatype { + public static Boolean CheckJson(JsonData json, Type t) { + try { + foreach(PropertyInfo p_info in t.GetProperties()) { + if(p_info.Name == "Item") { + continue; + } + if(p_info.CanRead) { + if(p_info.PropertyType == typeof(String)) { + if(!(json.ContainsKey(p_info.Name) && json[p_info.Name] != null && json[p_info.Name].IsString)) { + return false; + } + } else if(p_info.PropertyType == typeof(DateTime)) { + if(!(json.ContainsKey(p_info.Name) && json[p_info.Name] != null && json[p_info.Name].IsString)) { + return false; + } + } else if(p_info.PropertyType == typeof(Boolean)) { + if(!(json.ContainsKey(p_info.Name) && json[p_info.Name] != null && json[p_info.Name].IsBoolean)) { + return false; + } + } else if(p_info.PropertyType == typeof(Double)) { + if(!(json.ContainsKey(p_info.Name) && json[p_info.Name] != null && (json[p_info.Name].IsInt || json[p_info.Name].IsDouble || json[p_info.Name].IsLong))) { + return false; + } + } else if(p_info.PropertyType.BaseType == typeof(AJsonDatatype)) { + if(json.ContainsKey(p_info.Name) && (json[p_info.Name] == null || json[p_info.Name].IsObject)) { + if(json[p_info.Name] != null && !CheckJson(json[p_info.Name], p_info.PropertyType)) { + return false; + } + } + } else { + return false; + } + } + } + return true; + } catch { + return false; + } + } + + public AJsonDatatype ParseJson(JsonData item) { + foreach(String datakey in item.Keys) { + this.SetProperty(datakey, item[datakey].ToString()); + } + return this; + } + } +} diff --git a/ConnectorStorageJson/ConnectorStorageJson.csproj b/ConnectorStorageJson/ConnectorStorageJson.csproj new file mode 100644 index 0000000..b87e92a --- /dev/null +++ b/ConnectorStorageJson/ConnectorStorageJson.csproj @@ -0,0 +1,42 @@ + + + + netcoreapp3.1 + BlubbFish.Utils.IoT.Connector.Storage + ConnectorStorageJson + BlubbFish + BlubbFish + 1.0.0 + Copyright © BlubbFish 2024 - 20.01.2024 + AStorageBackend Connector that stores Objects as Json + LICENSE + http://git.blubbfish.net/vs_utils/ConnectorStorageJson + http://git.blubbfish.net/vs_utils/ConnectorStorageJson.git + git + + 1.0.0 Init + + de-DE + Json.Storage.Connector.IoT.Utils.BlubbFish + + + + + + + + + + + + + + + + + True + + + + + diff --git a/ConnectorStorageJson/Json.cs b/ConnectorStorageJson/Json.cs new file mode 100644 index 0000000..c151971 --- /dev/null +++ b/ConnectorStorageJson/Json.cs @@ -0,0 +1,75 @@ +using System; +using System.Collections.Generic; +using System.IO; + +using LitJson; + +namespace BlubbFish.Utils.IoT.Connector.Storage { + public class Json : AStorageBackend, IDisposable where O : AJsonDatatype, new() { + private readonly SortedDictionary _dict = new SortedDictionary(); + private readonly Boolean _loaded = false; + + public Json(Dictionary settings) : base(settings) { + if(!settings.ContainsKey("path")) { + Helper.WriteError("path is missing in settings.conf"); + throw new ArgumentException("path is missing in settings.conf"); + } + this.ParseStorage(this.LoadFromFile()); + this._loaded = true; + } + + private void ParseStorage(JsonData jsonData) { + if(jsonData.IsObject) { + foreach(String key in jsonData.Keys) { + JsonData item = jsonData[key]; + if(item.IsObject && AJsonDatatype.CheckJson(item, typeof(O))) { + this._dict.Add(key, (O)new O().ParseJson(item)); + } + } + } + } + + private JsonData LoadFromFile() { + String path = this.settings["path"]; + try { + if(!File.Exists(path)) { + File.WriteAllText(path, "{}"); + } + return JsonMapper.ToObject(File.ReadAllText(path)); + } catch (Exception e) { + Helper.WriteError("Could not load " + path + ": " + e); + throw new ArgumentException("Could not load " + path); + } + } + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0017:Initialisierung von Objekten vereinfachen", Justification = "")] + private Boolean SafeToFile() { + String path = this.settings["path"]; + try { + JsonWriter m = new JsonWriter(); + m.PrettyPrint = true; + JsonMapper.ToJson(this._dict, m); + File.WriteAllText(path, m.ToString()); + return true; + } catch(Exception e) { + Helper.WriteError("Could not write " + path + ": " + e); + return false; + } + } + + public override Boolean IsConnected => this._loaded; + + + public override Dictionary Get() => new Dictionary(this._dict); + public override O Get(String key) => this._dict.ContainsKey(key) ? this._dict[key] : null; + public override Boolean Put(O param, String key) { + if(this._dict.ContainsKey(key)) { + return false; + } + this._dict.Add(key, param); + return this.SafeToFile(); + } + + public override void Dispose() => throw new NotImplementedException(); + } +} diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f0156c5 --- /dev/null +++ b/LICENSE @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..e86fbf3 --- /dev/null +++ b/README.md @@ -0,0 +1,11 @@ +# BlubbFish.Utils.IoT.Connector.Data.Mqtt (ConnectorDataMqtt) +Library that connects to Mqtt using M2Mqtt + +Maybe you find this Repo on Github. This is a mirror from [here](https://git.blubbfish.net/vs_utils/ConnectorDataMqtt). + +## Linking to +### Internal +* BlubbFish.Utils.IoT ([Utils-IoT](http://git.blubbfish.net/vs_utils/Utils-IoT)) + +### External +* M2Mqtt ([Used Fork](https://github.com/blubbfish/mqtt), [Original](https://github.com/eclipse/paho.mqtt.m2mqtt)) \ No newline at end of file