add import nodeset files

.gitignore

@@ -1,2 +1,5 @@
 tmp
 pkg
+cert/cert*
+*.so
+.vscode

README.md

@@ -63,6 +63,35 @@ sudo ldconfig # update libs
 sudo ldconfig -p | grep libopen62541 # check if its there
 ```
 
+or on 64-bit systems:
+
+```sh
+sudo echo "/usr/local/lib64" > /etc/ld.so.conf.d/local.conf # add to libs path
+sudo ldconfig # update libs
+sudo ldconfig -p | grep libopen62541 # check if its there
+```
+
+## Development
+
+Use rake to build c bindings:
+
+```sh
+rake
+```
+
+Run server with verbose:
+
+```sh
+ruby example/server_import_nodeset.rb -v restart
+```
+
+Use relative paths to ruby libraries:
+
+```rb
+#require 'opcua/server'
+require_relative '../lib/opcua/server'
+```
+
 ## EXAMPLES
 
 ### Server

example/bug5.rb → example/client/bug5.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/ruby
-require_relative '../lib/opcua/server'
+require_relative '../../lib/opcua/server'
 
 Daemonite.new do
   server = OPCUA::Server.new

example/client_get_sync.rb → example/client/client_get_sync.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/ruby
-require_relative '../lib/opcua/client'
+require_relative '../../lib/opcua/client'
 #require 'opcua/client'
 
 ### username & pass in url (e.g. siemens)

example/client_get_value.rb → example/client/client_get_value.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/ruby
-require_relative '../lib/opcua/client'
+require_relative '../../lib/opcua/client'
 #require 'opcua/client'
 
 ### username & pass in url (e.g. siemens)

example/client_method.rb → example/client/client_method.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/ruby
-require_relative '../lib/opcua/client'
+require_relative '../../lib/opcua/client'
 #require 'opcua/client'
 
 ### username & pass in url (e.g. siemens)

example/client_set_value.rb → example/client/client_set_value.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/ruby
-require_relative '../lib/opcua/client'
+require_relative '../../lib/opcua/client'
 #require 'opcua/client'
 
 ### username & pass in url (e.g. siemens)

example/client_subscription.rb → example/client/client_subscription.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/ruby
-require_relative '../lib/opcua/client'
+require_relative '../../lib/opcua/client'
 #require 'opcua/client'
 
 ### username & pass in url (e.g. siemens)

example/nodeset/server_import_nodeset.rb

@@ -0,0 +1,139 @@
+#!/usr/bin/ruby
+# require 'opcua/server'
+require_relative '../../lib/opcua/server'
+
+Daemonite.new do
+  on startup do |opts|
+    srv = opts['server'] = OPCUA::Server.new
+
+    def err(message)
+      puts "\e[31m#{message}\e[0m"
+    end
+    def highlight(message)
+      puts "\e[36m#{message}\e[0m"
+    end
+
+    srv.import_ua # import small nodeset --> faster and contains most necessary stuff
+    #srv.import_ua_full # import full nodeset
+
+    highlight "Imported OPC UA Nodeset"
+
+    # Tests:
+    err "UA::HasSubtype not found" unless UA::HasSubtype.to_s == "ns=0;i=45"
+    err "UA::LocalizedText not found" unless UA::LocalizedText.to_s == "ns=0;i=21"
+
+    srv.add_nodeset File.read('Opc.Ua.Di.1.2.NodeSet2.xml'), :DI                               # https://opcfoundation.org/UA/schemas/DI/1.2/Opc.Ua.Di.NodeSet2.xml
+    highlight "Imported DI Nodeset"
+    srv.add_nodeset File.read('Opc.Ua.AutoID.1.0.NodeSet2.xml'), :AutoId, :DI                  # https://opcfoundation.org/UA/schemas/AutoID/1.0/Opc.Ua.AutoID.NodeSet2.xml
+    highlight "Imported AutoID Nodeset"
+    srv.add_nodeset File.read('Example.Reference.1.0.NodeSet2.xml'), :Testing, :DI, :Robotics  # Really weird local testing nodeset with references to DI and Robotics
+    highlight "Imported Testing Nodeset"
+    ex = srv.add_namespace 'http://example.org/'
+
+    # Tests:
+    err "Server known Nodes: #{srv.nodes.length} changed?" unless srv.nodes.length == 597 || srv.nodes.length == 218 # depends on UA full or tiny
+    err "add_object_type Error" unless srv.add_object_type("TestType","ns=#{ex};i=77777", UA::BaseObjectType, UA::HasSubtype).to_s == "ns=#{ex};i=77777"
+    err "add_data_type Error" unless srv.add_data_type("TestDataType","ns=#{ex};i=77778", UA::Structure, UA::HasSubtype).to_s == "ns=#{ex};i=77778"
+    err "add_object Error" unless srv.add_object("TestDevice", "ns=#{ex};i=31243", srv.objects, UA::Organizes, AutoId::OpticalReaderDeviceType).to_s == "ns=#{ex};i=31243"
+
+    tt = srv.add_object_type(:TestComponentType, "ns=#{ex};i=77900", DI::ComponentType, UA::HasSubtype).tap{ |t|
+      t.add_variable :Matrix_2x2
+      t.add_variable :Matrix_2x3x2
+      t.add_variable :Array
+      # ERROR almost always: (Error should have something to do with server_add_object_type)
+      #t.add_method :Puts, input1: OPCUA::TYPES::STRING do |node, input1|
+      #  highlight input1
+      #end
+    }
+
+    # ERROR sometimes:
+    #tt.add_method :Puts, input1: OPCUA::TYPES::STRING do |node, input1|
+    #  highlight input1
+    #end
+
+    srv.objects.manifest(:MatrixTest, tt)
+
+    v0 = srv.get "ns=#{ex};s=/MatrixTest/Matrix_2x2"
+    v1 = srv.get "ns=#{ex};s=/MatrixTest/Matrix_2x3x2"
+    v2 = srv.get "ns=#{ex};s=/MatrixTest/Array"
+
+    v0.datatype = UA::Double
+    v0.rank = 2 # just as example, will be automatically set when defining a matrix
+    v0.dimensions = [2, 2] # 2x2 Matrix
+    v0.value = [
+      11, 12, 
+      21, 22
+    ]
+    v1.datatype = UA::Double
+    v1.rank = 2
+    v1.dimensions = [2, 3, 2] # 2x3x2 Matrix
+    v1.value = [
+      0, 1, 10, 11, 20, 21,
+      100, 101, 110, 111, 120, 121
+    ] # filling upward from low to high
+    #v2.datatype = UA::Double
+    #v2.rank = 1
+    #v2.dimensions = [4] # don't set this stuff, because it is already defined in the array:
+    v2.value = [1, 2, 3, 4]
+
+    err "v0 false DataType" unless v0.datatype.name == "Double"
+    err "v0 false ValueRank" unless v0.rank == 2
+    err "v0 false Dimensions" unless v0.dimensions == [2, 2]
+    err "v0 false Value" unless v0.value[0] == [11, 12, 21, 22]
+    err "v1 false ValueRank" unless v1.rank == 3
+    err "v1 false Dimensions" unless v1.dimensions == [2, 3, 2]
+    err "v1 false Value" unless v1.value[0] == [0, 1, 10, 11, 20, 21, 100, 101, 110, 111, 120, 121]
+    err "v2 false DataType at the node itself is not automatically set: #{v2.datatype.name}" unless v2.datatype.name == "Double"
+    err "v2 false ValueRank" unless v2.rank == 1
+    err "v2 false Dimensions" unless v2.dimensions == [4]
+    err "v2 false Value" unless v2.value[0] == [1, 2, 3, 4]
+    v2.value = [1, 2, 3, 4, 5, 6, 7, 8, 9]
+    err "v2 false Value when changing array size" unless v2.value[0] == [1, 2, 3, 4, 5, 6, 7, 8, 9]
+
+
+    err "DI import Error @TopologyElement->ComponentType" unless DI::ComponentType.follow_inverse(UA::HasSubtype).first.name == "TopologyElementType"
+    err "DI DeviceType not found" unless DI::ComponentType.follow(UA::HasSubtype).select{ |n| n.name == "DeviceType" }.length == 1
+    err "UA HasChild references missing or new added" unless UA::HasChild.follow_all(UA::HasSubtype).select{ |n| n.name == "Aggregates" || n.name == "HasSubtype" }.length == 2
+
+    node = UA::HasComponent
+    path = ""
+    until node.nil?
+      path += "->#{node.name}"
+      node = node.follow_inverse(UA::HasSubtype).first
+    end
+    err "Parents of UA::HasComponent false: #{path}" unless path == "->HasComponent->Aggregates->HasChild->HierarchicalReferences->References"
+
+
+
+
+
+
+
+
+
+    puts "\e[32mFinished\e[0m"
+
+  rescue => e
+    puts "=====================ERROR====================="
+    puts e.message
+    puts e.backtrace
+    puts "======================END======================"
+  end
+
+  counter = 0
+  run do |opts|
+    GC.start
+    sleep opts['server'].run
+    if counter % 40 == 0
+      #raise "exit"
+    end
+    counter += 1
+  rescue => e
+    if e.message == "exit"
+      puts "\n\n\-->exit"
+      break
+    end
+  end
+end.loop!
+
+exit

example/nodeset/small_nodeset.rb

@@ -0,0 +1,34 @@
+require 'nokogiri'
+
+def is_necessary(node)
+  necessary = [
+    "StateMachineType"
+  ]
+  find_follow(node)
+  false
+end
+
+def find_follow(node)
+  follow = [
+    "HasComponent",
+    "HasSubtype"
+  ]
+  node.xpath('xmlns:References/xmlns:Reference').each do |ref|
+    node.xpath("parent::*/*[@NodeId='#{ref.content}']").each do |fnode|
+      puts "lol"
+    end if follow.include? ref['ReferenceType']
+  end
+  false
+end
+
+nodeset = Nokogiri::XML(File.read(File.join(File.dirname(__FILE__), "../../lib/opcua/Opc.Ua.1.04.NodeSet2.xml")))
+
+nodeset.xpath("/*/*").each do |node|
+  unless node.name == 'UAReferenceType'
+    if node['NodeId'] =~ /i=(.*)/ && $1.to_i > 1000
+      node.remove unless is_necessary node
+    end
+  end
+end
+
+File.write(File.join(File.dirname(__FILE__), "../../lib/opcua/Opc.Ua.thin.NodeSet2.xml"), nodeset.to_xml)

example/server.rb → example/server/server.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/ruby
-require_relative '../lib/opcua/server'
+require_relative '../../lib/opcua/server'
 #require 'opcua/server'
 
 Daemonite.new do

example/server_deep.rb → example/server/server_deep.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/ruby
-require_relative '../lib/opcua/server'
+require_relative '../../lib/opcua/server'
+# require 'opcua/server'
 
 Daemonite.new do
   server = OPCUA::Server.new

example/server_values.rb → example/server/server_values.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/ruby
-require_relative '../lib/opcua/server'
+require_relative '../../lib/opcua/server'
 #require 'opcua/server'
 
 Daemonite.new do

ext/opcua/client/client.c

@@ -329,6 +329,29 @@ static VALUE client_init(VALUE self,VALUE url,VALUE user,VALUE pass) { //{{{
 
   return self;
 } //}}}
+static VALUE client_get_node(VALUE self, UA_NodeId nodeid)
+{ //{{{
+  client_struct *pss;
+  Data_Get_Struct(self, client_struct, pss);
+  if (!pss->started) rb_raise(rb_eRuntimeError, "Client disconnected.");
+
+  UA_NodeClass nc;UA_NodeClass_init(&nc);
+  UA_Client_readNodeClassAttribute(pss->master, nodeid, &nc);
+
+  VALUE node;
+  if (nc == UA_NODECLASS_VARIABLE) {
+    node = node_wrap(cVarNode,node_alloc(pss, nodeid));
+  } else if (nc == UA_NODECLASS_METHOD) {
+    node = node_wrap(cMethodNode,node_alloc(pss, nodeid));
+  } else if (nc == UA_NODECLASS_UNSPECIFIED) {
+    node = Qnil;
+  } else {
+    node = node_wrap(cNode,node_alloc(pss, nodeid));
+  }
+  UA_NodeClass_clear(&nc);
+
+  return node;
+} //}}}
 static VALUE client_get(int argc, VALUE* argv, VALUE self) { //{{{
   if (argc > 2 || argc < 1) { // there should only be 1 or 2 arguments
     rb_raise(rb_eArgError, "wrong number of arguments");
@@ -364,22 +387,19 @@ static VALUE client_get(int argc, VALUE* argv, VALUE self) { //{{{
     it = UA_NODEID_STRING(NUM2INT(ns), nstr);
   }
 
-  UA_NodeClass nc;UA_NodeClass_init(&nc);
-  UA_Client_readNodeClassAttribute(pss->master, it, &nc);
-
-  VALUE node;
-  if (nc == UA_NODECLASS_VARIABLE) {
-    node = node_wrap(cVarNode,node_alloc(pss, it));
-  } else if (nc == UA_NODECLASS_METHOD) {
-    node = node_wrap(cMethodNode,node_alloc(pss, it));
-  } else if (nc == UA_NODECLASS_UNSPECIFIED) {
-    node = Qnil;
-  } else {
-    node = node_wrap(cNode,node_alloc(pss, it));
-  }
-  UA_NodeClass_clear(&nc);
-
-  return node;
+  return client_get_node(self, it);
+} //}}}
+static VALUE client_types(VALUE self)
+{ //{{{
+  return client_get_node(self, UA_NODEID_NUMERIC(0, UA_NS0ID_BASEOBJECTTYPE));
+} //}}}
+static VALUE client_references(VALUE self)
+{ //{{{
+  return client_get_node(self, UA_NODEID_NUMERIC(0, UA_NS0ID_NONHIERARCHICALREFERENCES));
+} //}}}
+static VALUE client_objects(VALUE self)
+{ //{{{
+  return client_get_node(self, UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER));
 } //}}}
 static VALUE client_subscription_interval(VALUE self) { //{{{
   client_struct *pss;
@@ -643,6 +663,9 @@ void Init_client(void) {
   rb_define_method(cClient, "default_ns", client_default_ns, 0);
   rb_define_method(cClient, "default_ns=", client_default_ns_set, 1);
   rb_define_method(cClient, "namespaces", client_namespaces, 0);
+  rb_define_method(cClient, "types", client_types, 0);
+  rb_define_method(cClient, "references", client_references, 0);
+  rb_define_method(cClient, "objects", client_objects, 0);
   rb_define_method(cClient, "debug", client_debug, 0);
   rb_define_method(cClient, "debug=", client_debug_set, 1);