node-opcua-address-space 2.169.0 → 2.172.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/source/address_space_ts.d.ts +13 -13
- package/dist/source/address_space_ts.js +4 -0
- package/dist/source/address_space_ts.js.map +1 -1
- package/dist/source/continuation_points/continuation_point_manager.d.ts +6 -3
- package/dist/source/continuation_points/continuation_point_manager.js +4 -4
- package/dist/source/continuation_points/continuation_point_manager.js.map +1 -1
- package/dist/source/helpers/adjust_browse_direction.d.ts +1 -1
- package/dist/source/helpers/argument_list.d.ts +13 -11
- package/dist/source/helpers/argument_list.js +24 -15
- package/dist/source/helpers/argument_list.js.map +1 -1
- package/dist/source/helpers/call_helpers.d.ts +6 -3
- package/dist/source/helpers/call_helpers.js +5 -6
- package/dist/source/helpers/call_helpers.js.map +1 -1
- package/dist/source/helpers/coerce_enum_value.d.ts +2 -2
- package/dist/source/helpers/coerce_enum_value.js +2 -2
- package/dist/source/helpers/coerce_enum_value.js.map +1 -1
- package/dist/source/helpers/dump_tools.d.ts +3 -3
- package/dist/source/helpers/dump_tools.js +2 -2
- package/dist/source/helpers/dump_tools.js.map +1 -1
- package/dist/source/helpers/ensure_secure_access.d.ts +1 -1
- package/dist/source/helpers/ensure_secure_access.js +1 -1
- package/dist/source/helpers/ensure_secure_access.js.map +1 -1
- package/dist/source/helpers/make_optionals_map.js +0 -5
- package/dist/source/helpers/make_optionals_map.js.map +1 -1
- package/dist/source/helpers/multiform_func.d.ts +1 -1
- package/dist/source/helpers/resolve_opaque_on_address_space.d.ts +1 -1
- package/dist/source/helpers/resolve_opaque_on_address_space.js +1 -1
- package/dist/source/helpers/resolve_opaque_on_address_space.js.map +1 -1
- package/dist/source/index.d.ts +38 -38
- package/dist/source/index.js +53 -54
- package/dist/source/index.js.map +1 -1
- package/dist/source/interfaces/alarms_and_conditions/condition_info_i.d.ts +3 -3
- package/dist/source/interfaces/alarms_and_conditions/condition_snapshot.d.ts +11 -11
- package/dist/source/interfaces/alarms_and_conditions/deviation_stuff.d.ts +6 -6
- package/dist/source/interfaces/alarms_and_conditions/install_setpoint_options.d.ts +3 -3
- package/dist/source/interfaces/alarms_and_conditions/instantiate_alarm_condition_options.d.ts +4 -4
- package/dist/source/interfaces/alarms_and_conditions/instantiate_condition_options.d.ts +2 -2
- package/dist/source/interfaces/alarms_and_conditions/instantiate_exclusive_deviation_alarm_options.d.ts +2 -2
- package/dist/source/interfaces/alarms_and_conditions/instantiate_exclusive_limit_alarm_options.d.ts +2 -2
- package/dist/source/interfaces/alarms_and_conditions/instantiate_limit_alarm_options.d.ts +4 -3
- package/dist/source/interfaces/alarms_and_conditions/instantiate_non_exclusive_deviation_alarm_options.d.ts +2 -2
- package/dist/source/interfaces/alarms_and_conditions/instantiate_non_exclusive_limit_alarm_options.d.ts +2 -2
- package/dist/source/interfaces/alarms_and_conditions/instantiate_off_normal_alarm_options.d.ts +3 -3
- package/dist/source/interfaces/alarms_and_conditions/ua_acknowledgeable_condition_ex.d.ts +10 -13
- package/dist/source/interfaces/alarms_and_conditions/ua_alarm_condition_ex.d.ts +11 -11
- package/dist/source/interfaces/alarms_and_conditions/ua_base_event_ex.d.ts +11 -0
- package/dist/source/interfaces/alarms_and_conditions/ua_base_event_ex.js +3 -0
- package/dist/source/interfaces/alarms_and_conditions/ua_base_event_ex.js.map +1 -0
- package/dist/source/interfaces/alarms_and_conditions/ua_certificate_expiration_alarm_ex.d.ts +5 -5
- package/dist/source/interfaces/alarms_and_conditions/ua_condition_ex.d.ts +21 -29
- package/dist/source/interfaces/alarms_and_conditions/ua_discrete_alarm_ex.d.ts +3 -7
- package/dist/source/interfaces/alarms_and_conditions/ua_discrete_alarm_ex.js +0 -23
- package/dist/source/interfaces/alarms_and_conditions/ua_discrete_alarm_ex.js.map +1 -1
- package/dist/source/interfaces/alarms_and_conditions/ua_exclusive_deviation_alarm_ex.d.ts +3 -3
- package/dist/source/interfaces/alarms_and_conditions/ua_exclusive_limit_alarm_ex.d.ts +8 -10
- package/dist/source/interfaces/alarms_and_conditions/ua_limit_alarm_ex.d.ts +4 -6
- package/dist/source/interfaces/alarms_and_conditions/ua_non_exclusive_deviation_alarm_ex.d.ts +5 -5
- package/dist/source/interfaces/alarms_and_conditions/ua_non_exclusive_limit_alarm_ex.d.ts +3 -3
- package/dist/source/interfaces/data_access/ua_multistate_discrete_ex.d.ts +7 -7
- package/dist/source/interfaces/data_access/ua_multistate_value_discrete_ex.d.ts +5 -8
- package/dist/source/interfaces/data_access/ua_two_state_discrete_ex.d.ts +5 -5
- package/dist/source/interfaces/data_access/ua_y_array_item_ex.d.ts +3 -3
- package/dist/source/interfaces/extension_object_constructor.d.ts +3 -3
- package/dist/source/interfaces/state_machine/ua_exclusive_limit_state_machine_type_ex.d.ts +3 -3
- package/dist/source/interfaces/state_machine/ua_finite_state_machine_type.d.ts +2 -2
- package/dist/source/interfaces/state_machine/ua_program_state_machine_type.d.ts +3 -3
- package/dist/source/interfaces/state_machine/ua_shelved_state_machine_ex.d.ts +6 -6
- package/dist/source/interfaces/state_machine/ua_state_machine_type.d.ts +7 -6
- package/dist/source/interfaces/state_machine/ua_state_machine_type.js +4 -0
- package/dist/source/interfaces/state_machine/ua_state_machine_type.js.map +1 -1
- package/dist/source/interfaces/state_machine/ua_transition_ex.d.ts +2 -2
- package/dist/source/interfaces/ua_subscription_diagnostics_variable_ex.d.ts +2 -2
- package/dist/source/interfaces/ua_subscription_diagnostics_variable_ex.js +3 -0
- package/dist/source/interfaces/ua_subscription_diagnostics_variable_ex.js.map +1 -1
- package/dist/source/loader/decode_xml_extension_object.d.ts +4 -4
- package/dist/source/loader/decode_xml_extension_object.js +3 -3
- package/dist/source/loader/decode_xml_extension_object.js.map +1 -1
- package/dist/source/loader/ensure_datatype_extracted.d.ts +2 -2
- package/dist/source/loader/ensure_datatype_extracted.js +5 -5
- package/dist/source/loader/ensure_datatype_extracted.js.map +1 -1
- package/dist/source/loader/generateAddressSpaceRaw.d.ts +3 -3
- package/dist/source/loader/generateAddressSpaceRaw.js +6 -6
- package/dist/source/loader/generateAddressSpaceRaw.js.map +1 -1
- package/dist/source/loader/load_nodeset2.js.map +1 -1
- package/dist/source/loader/make_xml_extension_object_parser.d.ts +2 -2
- package/dist/source/loader/make_xml_extension_object_parser.js +19 -19
- package/dist/source/loader/make_xml_extension_object_parser.js.map +1 -1
- package/dist/source/loader/namespace_post_step.d.ts +1 -1
- package/dist/source/loader/namespace_post_step.js.map +1 -1
- package/dist/source/loader/parsers/extension_object_parser.d.ts +4 -4
- package/dist/source/loader/parsers/extension_object_parser.js +22 -23
- package/dist/source/loader/parsers/extension_object_parser.js.map +1 -1
- package/dist/source/loader/parsers/localized_text_parser.d.ts +2 -2
- package/dist/source/loader/parsers/localized_text_parser.js.map +1 -1
- package/dist/source/loader/parsers/nodeid_parser.d.ts +1 -1
- package/dist/source/loader/parsers/nodeid_parser.js.map +1 -1
- package/dist/source/loader/parsers/qualified_name_parser.d.ts +3 -3
- package/dist/source/loader/parsers/qualified_name_parser.js.map +1 -1
- package/dist/source/loader/parsers/variant_parser.d.ts +5 -5
- package/dist/source/loader/parsers/variant_parser.js +13 -13
- package/dist/source/loader/parsers/variant_parser.js.map +1 -1
- package/dist/source/loader/register_node_promoter.d.ts +1 -1
- package/dist/source/loader/register_node_promoter.js.map +1 -1
- package/dist/source/namespace.d.ts +4 -4
- package/dist/source/namespace_alarm_and_condition.d.ts +22 -21
- package/dist/source/namespace_data_access.d.ts +11 -11
- package/dist/source/namespace_machine_state.d.ts +4 -4
- package/dist/source/pseudo_session.d.ts +8 -5
- package/dist/source/pseudo_session.js +28 -28
- package/dist/source/pseudo_session.js.map +1 -1
- package/dist/source/session_context.js +1 -1
- package/dist/source/session_context.js.map +1 -1
- package/dist/source/set_namespace_meta_data.d.ts +1 -1
- package/dist/source/set_namespace_meta_data.js +1 -1
- package/dist/source/set_namespace_meta_data.js.map +1 -1
- package/dist/source/ua_addin.d.ts +3 -3
- package/dist/source/ua_addin.js +1 -1
- package/dist/source/ua_addin.js.map +1 -1
- package/dist/source/ua_interface.d.ts +2 -3
- package/dist/source/ua_interface.js +13 -33
- package/dist/source/ua_interface.js.map +1 -1
- package/dist/source/ua_root_folder.d.ts +1 -1
- package/dist/source/ua_two_state_variable_ex.d.ts +5 -5
- package/dist/src/_instantiate_helpers.d.ts +1 -1
- package/dist/src/_instantiate_helpers.js +32 -9
- package/dist/src/_instantiate_helpers.js.map +1 -1
- package/dist/src/_mandatory_child_or_requested_optional_filter.d.ts +2 -2
- package/dist/src/_mandatory_child_or_requested_optional_filter.js +9 -10
- package/dist/src/_mandatory_child_or_requested_optional_filter.js.map +1 -1
- package/dist/src/address_space.d.ts +2 -2
- package/dist/src/address_space.js +13 -15
- package/dist/src/address_space.js.map +1 -1
- package/dist/src/address_space_change_event_tools.d.ts +3 -3
- package/dist/src/address_space_change_event_tools.js +8 -10
- package/dist/src/address_space_change_event_tools.js.map +1 -1
- package/dist/src/address_space_private.d.ts +11 -11
- package/dist/src/address_space_private.js +3 -0
- package/dist/src/address_space_private.js.map +1 -1
- package/dist/src/alarms_and_conditions/condition.js.map +1 -1
- package/dist/src/alarms_and_conditions/condition_info_impl.d.ts +6 -6
- package/dist/src/alarms_and_conditions/condition_info_impl.js +6 -15
- package/dist/src/alarms_and_conditions/condition_info_impl.js.map +1 -1
- package/dist/src/alarms_and_conditions/condition_snapshot_impl.d.ts +10 -10
- package/dist/src/alarms_and_conditions/condition_snapshot_impl.js +77 -48
- package/dist/src/alarms_and_conditions/condition_snapshot_impl.js.map +1 -1
- package/dist/src/alarms_and_conditions/deviation_alarm_helper.d.ts +8 -5
- package/dist/src/alarms_and_conditions/deviation_alarm_helper.js +15 -9
- package/dist/src/alarms_and_conditions/deviation_alarm_helper.js.map +1 -1
- package/dist/src/alarms_and_conditions/index.d.ts +3 -3
- package/dist/src/alarms_and_conditions/index.js +3 -3
- package/dist/src/alarms_and_conditions/index.js.map +1 -1
- package/dist/src/alarms_and_conditions/ua_acknowledgeable_condition_impl.d.ts +21 -14
- package/dist/src/alarms_and_conditions/ua_acknowledgeable_condition_impl.js +26 -21
- package/dist/src/alarms_and_conditions/ua_acknowledgeable_condition_impl.js.map +1 -1
- package/dist/src/alarms_and_conditions/ua_alarm_condition_impl.d.ts +6 -7
- package/dist/src/alarms_and_conditions/ua_alarm_condition_impl.js +30 -28
- package/dist/src/alarms_and_conditions/ua_alarm_condition_impl.js.map +1 -1
- package/dist/src/alarms_and_conditions/ua_base_event_impl.d.ts +9 -11
- package/dist/src/alarms_and_conditions/ua_base_event_impl.js +10 -10
- package/dist/src/alarms_and_conditions/ua_base_event_impl.js.map +1 -1
- package/dist/src/alarms_and_conditions/ua_certificate_expiration_alarm_impl.d.ts +3 -1
- package/dist/src/alarms_and_conditions/ua_certificate_expiration_alarm_impl.js +6 -5
- package/dist/src/alarms_and_conditions/ua_certificate_expiration_alarm_impl.js.map +1 -1
- package/dist/src/alarms_and_conditions/ua_condition_impl.d.ts +16 -42
- package/dist/src/alarms_and_conditions/ua_condition_impl.js +100 -82
- package/dist/src/alarms_and_conditions/ua_condition_impl.js.map +1 -1
- package/dist/src/alarms_and_conditions/ua_discrete_alarm_impl.d.ts +12 -7
- package/dist/src/alarms_and_conditions/ua_discrete_alarm_impl.js +9 -8
- package/dist/src/alarms_and_conditions/ua_discrete_alarm_impl.js.map +1 -1
- package/dist/src/alarms_and_conditions/ua_exclusive_deviation_alarm_impl.d.ts +18 -18
- package/dist/src/alarms_and_conditions/ua_exclusive_deviation_alarm_impl.js +16 -18
- package/dist/src/alarms_and_conditions/ua_exclusive_deviation_alarm_impl.js.map +1 -1
- package/dist/src/alarms_and_conditions/ua_exclusive_level_alarm_impl.d.ts +4 -4
- package/dist/src/alarms_and_conditions/ua_exclusive_level_alarm_impl.js +2 -2
- package/dist/src/alarms_and_conditions/ua_exclusive_level_alarm_impl.js.map +1 -1
- package/dist/src/alarms_and_conditions/ua_exclusive_limit_alarm_impl.d.ts +10 -9
- package/dist/src/alarms_and_conditions/ua_exclusive_limit_alarm_impl.js +20 -19
- package/dist/src/alarms_and_conditions/ua_exclusive_limit_alarm_impl.js.map +1 -1
- package/dist/src/alarms_and_conditions/ua_exclusive_rate_of_change_alarm_impl.d.ts +2 -4
- package/dist/src/alarms_and_conditions/ua_exclusive_rate_of_change_alarm_impl.js.map +1 -1
- package/dist/src/alarms_and_conditions/ua_limit_alarm_impl.d.ts +12 -38
- package/dist/src/alarms_and_conditions/ua_limit_alarm_impl.js +50 -65
- package/dist/src/alarms_and_conditions/ua_limit_alarm_impl.js.map +1 -1
- package/dist/src/alarms_and_conditions/ua_non_exclusive_deviation_alarm_impl.d.ts +15 -17
- package/dist/src/alarms_and_conditions/ua_non_exclusive_deviation_alarm_impl.js +15 -11
- package/dist/src/alarms_and_conditions/ua_non_exclusive_deviation_alarm_impl.js.map +1 -1
- package/dist/src/alarms_and_conditions/ua_non_exclusive_limit_alarm_impl.d.ts +22 -15
- package/dist/src/alarms_and_conditions/ua_non_exclusive_limit_alarm_impl.js +35 -24
- package/dist/src/alarms_and_conditions/ua_non_exclusive_limit_alarm_impl.js.map +1 -1
- package/dist/src/alarms_and_conditions/ua_off_normal_alarm_impl.d.ts +15 -16
- package/dist/src/alarms_and_conditions/ua_off_normal_alarm_impl.js +19 -14
- package/dist/src/alarms_and_conditions/ua_off_normal_alarm_impl.js.map +1 -1
- package/dist/src/alarms_and_conditions/ua_system_off_normal_alarm_impl.d.ts +4 -4
- package/dist/src/alarms_and_conditions/ua_system_off_normal_alarm_impl.js +1 -1
- package/dist/src/alarms_and_conditions/ua_system_off_normal_alarm_impl.js.map +1 -1
- package/dist/src/apply_condition_refresh.d.ts +4 -4
- package/dist/src/apply_condition_refresh.js +1 -1
- package/dist/src/apply_condition_refresh.js.map +1 -1
- package/dist/src/base_node_impl.d.ts +5 -7
- package/dist/src/base_node_impl.js +3 -3
- package/dist/src/base_node_impl.js.map +1 -1
- package/dist/src/base_node_private.d.ts +10 -7
- package/dist/src/base_node_private.js +73 -50
- package/dist/src/base_node_private.js.map +1 -1
- package/dist/src/check_value_rank_compatibility.js +11 -7
- package/dist/src/check_value_rank_compatibility.js.map +1 -1
- package/dist/src/data_access/add_dataItem_stuff.d.ts +1 -1
- package/dist/src/data_access/add_dataItem_stuff.js +2 -22
- package/dist/src/data_access/add_dataItem_stuff.js.map +1 -1
- package/dist/src/data_access/adjust_datavalue_status_code.d.ts +6 -3
- package/dist/src/data_access/adjust_datavalue_status_code.js +3 -3
- package/dist/src/data_access/adjust_datavalue_status_code.js.map +1 -1
- package/dist/src/data_access/ua_multistate_discrete_impl.d.ts +13 -11
- package/dist/src/data_access/ua_multistate_discrete_impl.js +28 -23
- package/dist/src/data_access/ua_multistate_discrete_impl.js.map +1 -1
- package/dist/src/data_access/ua_multistate_value_discrete_impl.d.ts +19 -23
- package/dist/src/data_access/ua_multistate_value_discrete_impl.js +31 -31
- package/dist/src/data_access/ua_multistate_value_discrete_impl.js.map +1 -1
- package/dist/src/data_access/ua_two_state_discrete_impl.d.ts +10 -16
- package/dist/src/data_access/ua_two_state_discrete_impl.js +18 -14
- package/dist/src/data_access/ua_two_state_discrete_impl.js.map +1 -1
- package/dist/src/event_data.d.ts +8 -21
- package/dist/src/event_data.js +24 -19
- package/dist/src/event_data.js.map +1 -1
- package/dist/src/extension_object_array_node.d.ts +5 -2
- package/dist/src/extension_object_array_node.js +21 -24
- package/dist/src/extension_object_array_node.js.map +1 -1
- package/dist/src/get_basic_datatype.d.ts +2 -2
- package/dist/src/get_basic_datatype.js.map +1 -1
- package/dist/src/historical_access/address_space_historical_data_node.d.ts +3 -3
- package/dist/src/historical_access/address_space_historical_data_node.js +24 -17
- package/dist/src/historical_access/address_space_historical_data_node.js.map +1 -1
- package/dist/src/idx_iterator.js +1 -1
- package/dist/src/idx_iterator.js.map +1 -1
- package/dist/src/index_current.d.ts +31 -31
- package/dist/src/index_current.js +45 -45
- package/dist/src/index_current.js.map +1 -1
- package/dist/src/namespace_impl.d.ts +4 -3
- package/dist/src/namespace_impl.js +17 -14
- package/dist/src/namespace_impl.js.map +1 -1
- package/dist/src/namespace_private.js.map +1 -1
- package/dist/src/nodeid_manager.d.ts +3 -3
- package/dist/src/nodeid_manager.js +19 -16
- package/dist/src/nodeid_manager.js.map +1 -1
- package/dist/src/nodeset_tools/adjust_namespace_array.d.ts +1 -1
- package/dist/src/nodeset_tools/construct_namespace_dependency.d.ts +2 -2
- package/dist/src/nodeset_tools/construct_namespace_dependency.js +7 -7
- package/dist/src/nodeset_tools/construct_namespace_dependency.js.map +1 -1
- package/dist/src/nodeset_tools/dump_to_bsd.d.ts +1 -1
- package/dist/src/nodeset_tools/dump_to_bsd.js +15 -11
- package/dist/src/nodeset_tools/dump_to_bsd.js.map +1 -1
- package/dist/src/nodeset_tools/nodeset_to_xml.d.ts +5 -3
- package/dist/src/nodeset_tools/nodeset_to_xml.js +64 -67
- package/dist/src/nodeset_tools/nodeset_to_xml.js.map +1 -1
- package/dist/src/private_namespace.d.ts +2 -2
- package/dist/src/private_namespace.js.map +1 -1
- package/dist/src/reference_impl.d.ts +2 -2
- package/dist/src/reference_impl.js +9 -11
- package/dist/src/reference_impl.js.map +1 -1
- package/dist/src/role_permissions.d.ts +1 -1
- package/dist/src/role_permissions.js.map +1 -1
- package/dist/src/state_machine/finite_state_machine.d.ts +11 -14
- package/dist/src/state_machine/finite_state_machine.js +36 -30
- package/dist/src/state_machine/finite_state_machine.js.map +1 -1
- package/dist/src/state_machine/ua_shelving_state_machine_ex.d.ts +8 -6
- package/dist/src/state_machine/ua_shelving_state_machine_ex.js +16 -18
- package/dist/src/state_machine/ua_shelving_state_machine_ex.js.map +1 -1
- package/dist/src/state_machine/ua_two_state_variable.d.ts +12 -11
- package/dist/src/state_machine/ua_two_state_variable.js +24 -29
- package/dist/src/state_machine/ua_two_state_variable.js.map +1 -1
- package/dist/src/tool_isSubtypeOf.d.ts +5 -5
- package/dist/src/tool_isSubtypeOf.js +21 -18
- package/dist/src/tool_isSubtypeOf.js.map +1 -1
- package/dist/src/ua_condition_type.d.ts +1 -1
- package/dist/src/ua_data_type_impl.js.map +1 -1
- package/dist/src/ua_method_impl.d.ts +9 -5
- package/dist/src/ua_method_impl.js +1 -1
- package/dist/src/ua_method_impl.js.map +1 -1
- package/dist/src/ua_object_impl.d.ts +10 -7
- package/dist/src/ua_object_impl.js +43 -15
- package/dist/src/ua_object_impl.js.map +1 -1
- package/dist/src/ua_object_type_impl.d.ts +7 -5
- package/dist/src/ua_object_type_impl.js +6 -7
- package/dist/src/ua_object_type_impl.js.map +1 -1
- package/dist/src/ua_reference_type_impl.d.ts +6 -8
- package/dist/src/ua_reference_type_impl.js +16 -14
- package/dist/src/ua_reference_type_impl.js.map +1 -1
- package/dist/src/ua_variable_impl.d.ts +44 -45
- package/dist/src/ua_variable_impl.js +177 -83
- package/dist/src/ua_variable_impl.js.map +1 -1
- package/dist/src/ua_variable_impl_ext_obj.d.ts +3 -3
- package/dist/src/ua_variable_impl_ext_obj.js +37 -29
- package/dist/src/ua_variable_impl_ext_obj.js.map +1 -1
- package/dist/src/ua_variable_type_impl.d.ts +11 -11
- package/dist/src/ua_variable_type_impl.js +13 -21
- package/dist/src/ua_variable_type_impl.js.map +1 -1
- package/dist/src/ua_view_impl.d.ts +3 -4
- package/dist/src/ua_view_impl.js +5 -6
- package/dist/src/ua_view_impl.js.map +1 -1
- package/dist/src/validate_data_type_correctness.d.ts +2 -2
- package/dist/src/validate_data_type_correctness.js +12 -3
- package/dist/src/validate_data_type_correctness.js.map +1 -1
- package/dist/tsconfig_base.tsbuildinfo +1 -1
- package/distHelpers/add_event_generator_object.d.ts +5 -2
- package/distHelpers/add_event_generator_object.js +2 -2
- package/distHelpers/add_event_generator_object.js.map +1 -1
- package/distHelpers/alarms_and_conditions_demo.d.ts +1 -1
- package/distHelpers/alarms_and_conditions_demo.js +4 -6
- package/distHelpers/alarms_and_conditions_demo.js.map +1 -1
- package/distHelpers/assertHasMatchingReference.d.ts +1 -1
- package/distHelpers/assertHasMatchingReference.js +2 -2
- package/distHelpers/assertHasMatchingReference.js.map +1 -1
- package/distHelpers/boiler_system.d.ts +6 -3
- package/distHelpers/boiler_system.js +44 -42
- package/distHelpers/boiler_system.js.map +1 -1
- package/distHelpers/create_minimalist_address_space_nodeset.d.ts +1 -1
- package/distHelpers/create_minimalist_address_space_nodeset.js +25 -27
- package/distHelpers/create_minimalist_address_space_nodeset.js.map +1 -1
- package/distHelpers/get_address_space_fixture.js +15 -15
- package/distHelpers/get_address_space_fixture.js.map +1 -1
- package/distHelpers/index.d.ts +2 -2
- package/distHelpers/index.js +2 -2
- package/distHelpers/index.js.map +1 -1
- package/distHelpers/mock_session.d.ts +7 -7
- package/distHelpers/mock_session.js +4 -4
- package/distHelpers/mock_session.js.map +1 -1
- package/distNodeJS/generate_address_space.d.ts +2 -2
- package/distNodeJS/generate_address_space.js +2 -2
- package/distNodeJS/generate_address_space.js.map +1 -1
- package/package.json +36 -36
- package/source/address_space_ts.ts +29 -30
- package/source/continuation_points/continuation_point_manager.ts +8 -7
- package/source/helpers/adjust_browse_direction.ts +1 -1
- package/source/helpers/argument_list.ts +37 -25
- package/source/helpers/call_helpers.ts +10 -15
- package/source/helpers/coerce_enum_value.ts +4 -4
- package/source/helpers/dump_tools.ts +6 -11
- package/source/helpers/ensure_secure_access.ts +2 -2
- package/source/helpers/make_optionals_map.ts +3 -10
- package/source/helpers/multiform_func.ts +1 -1
- package/source/helpers/resolve_opaque_on_address_space.ts +2 -2
- package/source/index.ts +44 -54
- package/source/interfaces/alarms_and_conditions/condition_info_i.ts +3 -4
- package/source/interfaces/alarms_and_conditions/condition_snapshot.ts +13 -13
- package/source/interfaces/alarms_and_conditions/deviation_stuff.ts +8 -10
- package/source/interfaces/alarms_and_conditions/install_setpoint_options.ts +4 -5
- package/source/interfaces/alarms_and_conditions/instantiate_alarm_condition_options.ts +4 -6
- package/source/interfaces/alarms_and_conditions/instantiate_condition_options.ts +3 -3
- package/source/interfaces/alarms_and_conditions/instantiate_exclusive_deviation_alarm_options.ts +2 -2
- package/source/interfaces/alarms_and_conditions/instantiate_exclusive_limit_alarm_options.ts +2 -2
- package/source/interfaces/alarms_and_conditions/instantiate_limit_alarm_options.ts +6 -3
- package/source/interfaces/alarms_and_conditions/instantiate_non_exclusive_deviation_alarm_options.ts +2 -2
- package/source/interfaces/alarms_and_conditions/instantiate_non_exclusive_limit_alarm_options.ts +2 -2
- package/source/interfaces/alarms_and_conditions/instantiate_off_normal_alarm_options.ts +11 -11
- package/source/interfaces/alarms_and_conditions/ua_acknowledgeable_condition_ex.ts +11 -25
- package/source/interfaces/alarms_and_conditions/ua_alarm_condition_ex.ts +16 -13
- package/source/interfaces/alarms_and_conditions/ua_base_event_ex.ts +12 -0
- package/source/interfaces/alarms_and_conditions/ua_certificate_expiration_alarm_ex.ts +5 -5
- package/source/interfaces/alarms_and_conditions/ua_condition_ex.ts +30 -54
- package/source/interfaces/alarms_and_conditions/ua_discrete_alarm_ex.ts +3 -34
- package/source/interfaces/alarms_and_conditions/ua_exclusive_deviation_alarm_ex.ts +18 -22
- package/source/interfaces/alarms_and_conditions/ua_exclusive_limit_alarm_ex.ts +8 -15
- package/source/interfaces/alarms_and_conditions/ua_limit_alarm_ex.ts +4 -7
- package/source/interfaces/alarms_and_conditions/ua_non_exclusive_deviation_alarm_ex.ts +5 -6
- package/source/interfaces/alarms_and_conditions/ua_non_exclusive_limit_alarm_ex.ts +3 -3
- package/source/interfaces/data_access/ua_multistate_discrete_ex.ts +9 -16
- package/source/interfaces/data_access/ua_multistate_value_discrete_ex.ts +5 -8
- package/source/interfaces/data_access/ua_two_state_discrete_ex.ts +5 -5
- package/source/interfaces/data_access/ua_y_array_item_ex.ts +3 -3
- package/source/interfaces/extension_object_constructor.ts +3 -4
- package/source/interfaces/i_condition_variable_type_setter_options.ts +1 -3
- package/source/interfaces/state_machine/ua_exclusive_limit_state_machine_type_ex.ts +3 -3
- package/source/interfaces/state_machine/ua_finite_state_machine_type.ts +2 -2
- package/source/interfaces/state_machine/ua_program_state_machine_type.ts +3 -3
- package/source/interfaces/state_machine/ua_shelved_state_machine_ex.ts +10 -7
- package/source/interfaces/state_machine/ua_state_machine_type.ts +11 -8
- package/source/interfaces/state_machine/ua_transition_ex.ts +2 -2
- package/source/interfaces/ua_subscription_diagnostics_variable_ex.ts +3 -2
- package/source/loader/decode_xml_extension_object.ts +7 -7
- package/source/loader/ensure_datatype_extracted.ts +14 -19
- package/source/loader/generateAddressSpaceRaw.ts +12 -13
- package/source/loader/load_nodeset2.ts +3 -3
- package/source/loader/make_xml_extension_object_parser.ts +55 -39
- package/source/loader/namespace_post_step.ts +3 -4
- package/source/loader/parsers/extension_object_parser.ts +63 -62
- package/source/loader/parsers/localized_text_parser.ts +3 -3
- package/source/loader/parsers/nodeid_parser.ts +2 -3
- package/source/loader/parsers/qualified_name_parser.ts +6 -7
- package/source/loader/parsers/variant_parser.ts +48 -55
- package/source/loader/register_node_promoter.ts +2 -2
- package/source/namespace.ts +4 -4
- package/source/namespace_alarm_and_condition.ts +22 -22
- package/source/namespace_data_access.ts +12 -13
- package/source/namespace_machine_state.ts +10 -5
- package/source/pseudo_session.ts +53 -50
- package/source/session_context.ts +1 -1
- package/source/set_namespace_meta_data.ts +3 -3
- package/source/ua_addin.ts +10 -11
- package/source/ua_interface.ts +27 -38
- package/source/ua_root_folder.ts +1 -1
- package/source/ua_two_state_variable_ex.ts +5 -5
- package/source_nodejs/generate_address_space.ts +5 -9
- package/src/_instantiate_helpers.ts +78 -25
- package/src/_mandatory_child_or_requested_optional_filter.ts +20 -19
- package/src/address_space.ts +36 -45
- package/src/address_space_change_event_tools.ts +25 -30
- package/src/address_space_private.ts +20 -21
- package/src/alarms_and_conditions/condition.ts +0 -2
- package/src/alarms_and_conditions/condition_info_impl.ts +11 -19
- package/src/alarms_and_conditions/condition_snapshot_impl.ts +109 -85
- package/src/alarms_and_conditions/deviation_alarm_helper.ts +20 -15
- package/src/alarms_and_conditions/index.ts +3 -3
- package/src/alarms_and_conditions/ua_acknowledgeable_condition_impl.ts +44 -32
- package/src/alarms_and_conditions/ua_alarm_condition_impl.ts +35 -34
- package/src/alarms_and_conditions/ua_base_event_impl.ts +15 -19
- package/src/alarms_and_conditions/ua_certificate_expiration_alarm_impl.ts +6 -2
- package/src/alarms_and_conditions/ua_condition_impl.ts +140 -130
- package/src/alarms_and_conditions/ua_discrete_alarm_impl.ts +20 -12
- package/src/alarms_and_conditions/ua_exclusive_deviation_alarm_impl.ts +40 -43
- package/src/alarms_and_conditions/ua_exclusive_level_alarm_impl.ts +7 -7
- package/src/alarms_and_conditions/ua_exclusive_limit_alarm_impl.ts +28 -30
- package/src/alarms_and_conditions/ua_exclusive_rate_of_change_alarm_impl.ts +3 -6
- package/src/alarms_and_conditions/ua_limit_alarm_impl.ts +59 -90
- package/src/alarms_and_conditions/ua_non_exclusive_deviation_alarm_impl.ts +31 -27
- package/src/alarms_and_conditions/ua_non_exclusive_limit_alarm_impl.ts +57 -36
- package/src/alarms_and_conditions/ua_off_normal_alarm_impl.ts +31 -27
- package/src/alarms_and_conditions/ua_system_off_normal_alarm_impl.ts +6 -6
- package/src/apply_condition_refresh.ts +7 -8
- package/src/base_node_impl.ts +64 -45
- package/src/base_node_private.ts +171 -139
- package/src/check_value_rank_compatibility.ts +19 -15
- package/src/data_access/add_dataItem_stuff.ts +3 -4
- package/src/data_access/adjust_datavalue_status_code.ts +7 -7
- package/src/data_access/ua_multistate_discrete_impl.ts +44 -28
- package/src/data_access/ua_multistate_value_discrete_impl.ts +77 -66
- package/src/data_access/ua_two_state_discrete_impl.ts +29 -36
- package/src/event_data.ts +29 -26
- package/src/extension_object_array_node.ts +27 -28
- package/src/get_basic_datatype.ts +4 -5
- package/src/historical_access/address_space_historical_data_node.ts +65 -50
- package/src/idx_iterator.ts +4 -12
- package/src/index_current.ts +33 -45
- package/src/namespace_impl.ts +75 -62
- package/src/namespace_private.ts +2 -8
- package/src/nodeid_manager.ts +30 -27
- package/src/nodeset_tools/adjust_namespace_array.ts +1 -1
- package/src/nodeset_tools/construct_namespace_dependency.ts +15 -16
- package/src/nodeset_tools/dump_to_bsd.ts +27 -22
- package/src/nodeset_tools/nodeset_to_xml.ts +95 -114
- package/src/private_namespace.ts +3 -6
- package/src/reference_impl.ts +11 -14
- package/src/role_permissions.ts +1 -1
- package/src/state_machine/finite_state_machine.ts +60 -61
- package/src/state_machine/ua_shelving_state_machine_ex.ts +23 -23
- package/src/state_machine/ua_two_state_variable.ts +34 -31
- package/src/tool_isSubtypeOf.ts +48 -33
- package/src/ua_condition_type.ts +1 -1
- package/src/ua_data_type_impl.ts +12 -13
- package/src/ua_method_impl.ts +17 -12
- package/src/ua_object_impl.ts +73 -39
- package/src/ua_object_type_impl.ts +25 -25
- package/src/ua_reference_type_impl.ts +19 -19
- package/src/ua_variable_impl.ts +316 -219
- package/src/ua_variable_impl_ext_obj.ts +63 -50
- package/src/ua_variable_type_impl.ts +43 -49
- package/src/ua_view_impl.ts +5 -5
- package/src/validate_data_type_correctness.ts +17 -8
|
@@ -3,17 +3,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.UATwoStateDiscreteImpl = void 0;
|
|
6
|
+
exports.UATwoStateDiscreteImpl = exports.UATwoStateDiscreteImplBase = void 0;
|
|
7
7
|
exports.promoteToTwoStateDiscrete = promoteToTwoStateDiscrete;
|
|
8
8
|
exports._addTwoStateDiscrete = _addTwoStateDiscrete;
|
|
9
9
|
const node_opcua_assert_1 = __importDefault(require("node-opcua-assert"));
|
|
10
|
+
const node_opcua_constants_1 = require("node-opcua-constants");
|
|
10
11
|
const node_opcua_data_model_1 = require("node-opcua-data-model");
|
|
11
12
|
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
12
|
-
const node_opcua_constants_1 = require("node-opcua-constants");
|
|
13
|
-
const ua_variable_impl_1 = require("../ua_variable_impl");
|
|
14
13
|
const register_node_promoter_1 = require("../../source/loader/register_node_promoter");
|
|
14
|
+
const ua_variable_impl_1 = require("../ua_variable_impl");
|
|
15
15
|
const add_dataItem_stuff_1 = require("./add_dataItem_stuff");
|
|
16
|
-
class
|
|
16
|
+
class UATwoStateDiscreteImplBase extends ua_variable_impl_1.UAVariableImpl {
|
|
17
|
+
get $5() {
|
|
18
|
+
return this;
|
|
19
|
+
}
|
|
17
20
|
/*
|
|
18
21
|
* @private
|
|
19
22
|
*/
|
|
@@ -26,16 +29,16 @@ class UATwoStateDiscreteImpl extends ua_variable_impl_1.UAVariableImpl {
|
|
|
26
29
|
if (falseState) {
|
|
27
30
|
falseState.on("value_changed", handler);
|
|
28
31
|
}
|
|
29
|
-
/* c8 ignore next */
|
|
30
32
|
else {
|
|
33
|
+
/* c8 ignore next */
|
|
31
34
|
console.warn("warning: UATwoStateDiscrete -> a FalseState property is mandatory ", this.browseName.toString(), this.nodeId.toString());
|
|
32
35
|
}
|
|
33
36
|
const trueState = this.getPropertyByName("TrueState");
|
|
34
37
|
if (trueState) {
|
|
35
38
|
trueState.on("value_changed", handler);
|
|
36
39
|
}
|
|
37
|
-
/* c8 ignore next */
|
|
38
40
|
else {
|
|
41
|
+
/* c8 ignore next */
|
|
39
42
|
console.warn("waring: UATwoStateDiscrete -> a TrueState property is mandatory", this.browseName.toString(), this.nodeId.toString());
|
|
40
43
|
}
|
|
41
44
|
}
|
|
@@ -52,7 +55,7 @@ class UATwoStateDiscreteImpl extends ua_variable_impl_1.UAVariableImpl {
|
|
|
52
55
|
this.setValue(false, options);
|
|
53
56
|
}
|
|
54
57
|
else {
|
|
55
|
-
throw new Error(
|
|
58
|
+
throw new Error(`setValue invalid value ${value}`);
|
|
56
59
|
}
|
|
57
60
|
}
|
|
58
61
|
}
|
|
@@ -68,10 +71,10 @@ class UATwoStateDiscreteImpl extends ua_variable_impl_1.UAVariableImpl {
|
|
|
68
71
|
}
|
|
69
72
|
}
|
|
70
73
|
getTrueStateAsString() {
|
|
71
|
-
return this.trueState.readValue().value.value.text || "";
|
|
74
|
+
return this.$5.trueState.readValue().value.value.text || "";
|
|
72
75
|
}
|
|
73
76
|
getFalseStateAsString() {
|
|
74
|
-
return this.falseState.readValue().value.value.text || "";
|
|
77
|
+
return this.$5.falseState.readValue().value.value.text || "";
|
|
75
78
|
}
|
|
76
79
|
clone(options1, optionalFilter, extraInfo) {
|
|
77
80
|
const variable1 = ua_variable_impl_1.UAVariableImpl.prototype.clone.call(this, options1, optionalFilter, extraInfo);
|
|
@@ -79,13 +82,14 @@ class UATwoStateDiscreteImpl extends ua_variable_impl_1.UAVariableImpl {
|
|
|
79
82
|
return variable1;
|
|
80
83
|
}
|
|
81
84
|
}
|
|
82
|
-
exports.
|
|
85
|
+
exports.UATwoStateDiscreteImplBase = UATwoStateDiscreteImplBase;
|
|
86
|
+
exports.UATwoStateDiscreteImpl = UATwoStateDiscreteImplBase;
|
|
83
87
|
function promoteToTwoStateDiscrete(node) {
|
|
84
|
-
if (node instanceof UATwoStateDiscreteImpl) {
|
|
88
|
+
if (node instanceof exports.UATwoStateDiscreteImpl) {
|
|
85
89
|
return node; // already promoted
|
|
86
90
|
}
|
|
87
|
-
Object.setPrototypeOf(node, UATwoStateDiscreteImpl.prototype);
|
|
88
|
-
(0, node_opcua_assert_1.default)(node instanceof UATwoStateDiscreteImpl, "should now be a UATwoStateDiscrete");
|
|
91
|
+
Object.setPrototypeOf(node, exports.UATwoStateDiscreteImpl.prototype);
|
|
92
|
+
(0, node_opcua_assert_1.default)(node instanceof exports.UATwoStateDiscreteImpl, "should now be a UATwoStateDiscrete");
|
|
89
93
|
const _node = node;
|
|
90
94
|
_node._post_initialize();
|
|
91
95
|
return _node;
|
|
@@ -93,7 +97,7 @@ function promoteToTwoStateDiscrete(node) {
|
|
|
93
97
|
(0, register_node_promoter_1.registerNodePromoter)(node_opcua_constants_1.VariableTypeIds.TwoStateDiscreteType, promoteToTwoStateDiscrete);
|
|
94
98
|
function _addTwoStateDiscrete(namespace, options) {
|
|
95
99
|
const addressSpace = namespace.addressSpace;
|
|
96
|
-
(0, node_opcua_assert_1.default)(!Object.
|
|
100
|
+
(0, node_opcua_assert_1.default)(!Object.hasOwn(options, "ValuePrecision"));
|
|
97
101
|
const twoStateDiscreteType = addressSpace.findVariableType("TwoStateDiscreteType");
|
|
98
102
|
if (!twoStateDiscreteType) {
|
|
99
103
|
throw new Error("expecting TwoStateDiscreteType to be defined , check nodeset xml file");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ua_two_state_discrete_impl.js","sourceRoot":"","sources":["../../../src/data_access/ua_two_state_discrete_impl.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"ua_two_state_discrete_impl.js","sourceRoot":"","sources":["../../../src/data_access/ua_two_state_discrete_impl.ts"],"names":[],"mappings":"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"}
|
package/dist/src/event_data.d.ts
CHANGED
|
@@ -1,31 +1,18 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @module node-opcua-address-space.Private
|
|
3
|
+
*/
|
|
4
|
+
import type { BaseNode, IEventData } from "node-opcua-address-space-base";
|
|
1
5
|
import { NodeId } from "node-opcua-nodeid";
|
|
2
|
-
import { BrowsePath, BrowsePathResult } from "node-opcua-types";
|
|
3
|
-
import { Variant, VariantLike } from "node-opcua-variant";
|
|
4
|
-
import { BaseNode, IEventData } from "node-opcua-address-space-base";
|
|
5
|
-
type NodeIdString = string;
|
|
6
|
-
type FullBrowsePath = string;
|
|
6
|
+
import { type BrowsePath, BrowsePathResult } from "node-opcua-types";
|
|
7
|
+
import { Variant, type VariantLike } from "node-opcua-variant";
|
|
7
8
|
/**
|
|
8
9
|
*/
|
|
9
10
|
export declare class EventData implements IEventData {
|
|
11
|
+
#private;
|
|
10
12
|
eventId: NodeId;
|
|
11
|
-
$eventDataSource: BaseNode;
|
|
12
|
-
$cache: {
|
|
13
|
-
__values: {
|
|
14
|
-
[key: NodeIdString]: Variant;
|
|
15
|
-
};
|
|
16
|
-
__nodeIdToNode: {
|
|
17
|
-
[key: NodeIdString]: BaseNode;
|
|
18
|
-
};
|
|
19
|
-
__pathToNodeId: {
|
|
20
|
-
[key: FullBrowsePath]: NodeId;
|
|
21
|
-
};
|
|
22
|
-
__nodeIdToFullPath: {
|
|
23
|
-
[key: NodeIdString]: FullBrowsePath;
|
|
24
|
-
};
|
|
25
|
-
};
|
|
26
13
|
constructor(eventTypeNode: BaseNode);
|
|
14
|
+
getEventDataSource(): BaseNode;
|
|
27
15
|
_createValue(fullBrowsePath: string, node: BaseNode, variant: VariantLike): void;
|
|
28
16
|
_browse(browsePath: BrowsePath): BrowsePathResult | null;
|
|
29
17
|
_readValue(nodeId: NodeId): Variant | null;
|
|
30
18
|
}
|
|
31
|
-
export {};
|
package/dist/src/event_data.js
CHANGED
|
@@ -1,60 +1,65 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.EventData = void 0;
|
|
4
2
|
/**
|
|
5
3
|
* @module node-opcua-address-space.Private
|
|
6
4
|
*/
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.EventData = void 0;
|
|
7
7
|
const node_opcua_assert_1 = require("node-opcua-assert");
|
|
8
8
|
const node_opcua_nodeid_1 = require("node-opcua-nodeid");
|
|
9
9
|
const node_opcua_status_code_1 = require("node-opcua-status-code");
|
|
10
10
|
const node_opcua_types_1 = require("node-opcua-types");
|
|
11
|
-
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
12
11
|
const node_opcua_utils_1 = require("node-opcua-utils");
|
|
12
|
+
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
13
13
|
/**
|
|
14
14
|
*/
|
|
15
15
|
class EventData {
|
|
16
16
|
eventId;
|
|
17
|
-
|
|
18
|
-
|
|
17
|
+
#eventDataSource;
|
|
18
|
+
#cache;
|
|
19
19
|
constructor(eventTypeNode) {
|
|
20
|
-
this
|
|
20
|
+
this.#cache = {
|
|
21
21
|
__values: {},
|
|
22
22
|
__nodeIdToNode: {},
|
|
23
23
|
__pathToNodeId: {},
|
|
24
24
|
__nodeIdToFullPath: {}
|
|
25
25
|
};
|
|
26
26
|
this.eventId = new node_opcua_nodeid_1.NodeId();
|
|
27
|
-
this
|
|
27
|
+
this.#eventDataSource = eventTypeNode;
|
|
28
|
+
}
|
|
29
|
+
getEventDataSource() {
|
|
30
|
+
return this.#eventDataSource;
|
|
28
31
|
}
|
|
29
32
|
_createValue(fullBrowsePath, node, variant) {
|
|
30
33
|
const eventData = this;
|
|
31
|
-
(0, node_opcua_assert_1.assert)(!eventData[fullBrowsePath],
|
|
34
|
+
(0, node_opcua_assert_1.assert)(!eventData[fullBrowsePath], `already exists ${fullBrowsePath}`);
|
|
32
35
|
const lowerName = fullBrowsePath.split(".").map(node_opcua_utils_1.lowerFirstLetter).join(".");
|
|
33
36
|
eventData[lowerName] = node_opcua_variant_1.Variant.coerce(variant);
|
|
34
|
-
this
|
|
35
|
-
this
|
|
36
|
-
this
|
|
37
|
-
this
|
|
37
|
+
this.#cache.__pathToNodeId[fullBrowsePath] = node.nodeId;
|
|
38
|
+
this.#cache.__nodeIdToNode[node.nodeId.toString()] = node;
|
|
39
|
+
this.#cache.__nodeIdToFullPath[node.nodeId.toString()] = fullBrowsePath;
|
|
40
|
+
this.#cache.__values[node.nodeId.toString()] = eventData[lowerName];
|
|
38
41
|
}
|
|
39
42
|
_browse(browsePath) {
|
|
40
|
-
if (!(0, node_opcua_nodeid_1.sameNodeId)(browsePath.startingNode, this
|
|
43
|
+
if (!(0, node_opcua_nodeid_1.sameNodeId)(browsePath.startingNode, this.#eventDataSource.nodeId)) {
|
|
41
44
|
return null;
|
|
42
45
|
}
|
|
43
|
-
const fullBrowsePath = (browsePath.relativePath.elements || []).map((b => b.targetName.toString())
|
|
44
|
-
const nodeId = this
|
|
46
|
+
const fullBrowsePath = (browsePath.relativePath.elements || []).map((b) => b.targetName.toString()).join(".");
|
|
47
|
+
const nodeId = this.#cache.__pathToNodeId[fullBrowsePath];
|
|
45
48
|
if (!nodeId)
|
|
46
49
|
return null;
|
|
47
50
|
return new node_opcua_types_1.BrowsePathResult({
|
|
48
51
|
statusCode: node_opcua_status_code_1.StatusCodes.Good,
|
|
49
|
-
targets: [
|
|
52
|
+
targets: [
|
|
53
|
+
{
|
|
50
54
|
remainingPathIndex: 0,
|
|
51
|
-
targetId: (0, node_opcua_nodeid_1.coerceExpandedNodeId)(nodeId)
|
|
52
|
-
}
|
|
55
|
+
targetId: (0, node_opcua_nodeid_1.coerceExpandedNodeId)(nodeId)
|
|
56
|
+
}
|
|
57
|
+
]
|
|
53
58
|
});
|
|
54
59
|
}
|
|
55
60
|
_readValue(nodeId) {
|
|
56
61
|
const key = nodeId.toString();
|
|
57
|
-
const cached_value = this
|
|
62
|
+
const cached_value = this.#cache.__values[key];
|
|
58
63
|
if (cached_value) {
|
|
59
64
|
return cached_value;
|
|
60
65
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event_data.js","sourceRoot":"","sources":["../../src/event_data.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"event_data.js","sourceRoot":"","sources":["../../src/event_data.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAGH,yDAA2C;AAC3C,yDAA6E;AAC7E,mEAAqD;AACrD,uDAAqE;AACrE,uDAAoD;AACpD,2DAA+D;AAK/D;GACG;AACH,MAAa,SAAS;IACX,OAAO,CAAS;IACvB,gBAAgB,CAAW;IAC3B,MAAM,CAKJ;IAEF,YAAY,aAAuB;QAC/B,IAAI,CAAC,MAAM,GAAG;YACV,QAAQ,EAAE,EAAE;YACZ,cAAc,EAAE,EAAE;YAClB,cAAc,EAAE,EAAE;YAClB,kBAAkB,EAAE,EAAE;SACzB,CAAC;QAEF,IAAI,CAAC,OAAO,GAAG,IAAI,0BAAM,EAAE,CAAC;QAC5B,IAAI,CAAC,gBAAgB,GAAG,aAAa,CAAC;IAC1C,CAAC;IAEM,kBAAkB;QACrB,OAAO,IAAI,CAAC,gBAAgB,CAAC;IACjC,CAAC;IACM,YAAY,CAAC,cAAsB,EAAE,IAAc,EAAE,OAAoB;QAC5E,MAAM,SAAS,GAAG,IAA+B,CAAC;QAClD,IAAA,0BAAM,EAAC,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,kBAAkB,cAAc,EAAE,CAAC,CAAC;QAEvE,MAAM,SAAS,GAAG,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,mCAAgB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE5E,SAAS,CAAC,SAAS,CAAC,GAAG,4BAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAE/C,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;QACzD,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,GAAG,IAAI,CAAC;QAC1D,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,GAAG,cAAc,CAAC;QACxE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,GAAG,SAAS,CAAC,SAAS,CAAY,CAAC;IACnF,CAAC;IAEM,OAAO,CAAC,UAAsB;QACjC,IAAI,CAAC,IAAA,8BAAU,EAAC,UAAU,CAAC,YAAY,EAAE,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC;YACrE,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,MAAM,cAAc,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9G,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAC1D,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QACzB,OAAO,IAAI,mCAAgB,CAAC;YACxB,UAAU,EAAE,oCAAW,CAAC,IAAI;YAC5B,OAAO,EAAE;gBACL;oBACI,kBAAkB,EAAE,CAAC;oBACrB,QAAQ,EAAE,IAAA,wCAAoB,EAAC,MAAM,CAAC;iBACzC;aACJ;SACJ,CAAC,CAAC;IACP,CAAC;IAEM,UAAU,CAAC,MAAc;QAC5B,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QAC9B,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC/C,IAAI,YAAY,EAAE,CAAC;YACf,OAAO,YAAY,CAAC;QACxB,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAjED,8BAiEC"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
|
-
|
|
1
|
+
/**
|
|
2
|
+
* @module node-opcua-address-space.Private
|
|
3
|
+
*/
|
|
4
|
+
import type { UADynamicVariableArray, UAObject, UAVariable } from "node-opcua-address-space-base";
|
|
2
5
|
import { ExtensionObject } from "node-opcua-extension-object";
|
|
3
|
-
import {
|
|
6
|
+
import type { NodeId } from "node-opcua-nodeid";
|
|
4
7
|
import { UAVariableImpl } from "./ua_variable_impl";
|
|
5
8
|
/**
|
|
6
9
|
*
|
|
@@ -1,22 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* @module node-opcua-address-space.Private
|
|
4
|
+
*/
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.createExtObjArrayNode = createExtObjArrayNode;
|
|
4
7
|
exports.bindExtObjArrayNode = bindExtObjArrayNode;
|
|
5
8
|
exports.addElement = addElement;
|
|
6
9
|
exports.removeElement = removeElement;
|
|
7
|
-
/**
|
|
8
|
-
* @module node-opcua-address-space.Private
|
|
9
|
-
*/
|
|
10
10
|
const node_opcua_assert_1 = require("node-opcua-assert");
|
|
11
11
|
const node_opcua_data_model_1 = require("node-opcua-data-model");
|
|
12
12
|
const node_opcua_debug_1 = require("node-opcua-debug");
|
|
13
|
-
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
14
|
-
const node_opcua_variant_2 = require("node-opcua-variant");
|
|
15
|
-
const node_opcua_variant_3 = require("node-opcua-variant");
|
|
16
13
|
const node_opcua_extension_object_1 = require("node-opcua-extension-object");
|
|
14
|
+
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
17
15
|
const ua_variable_impl_1 = require("./ua_variable_impl");
|
|
18
|
-
const
|
|
19
|
-
const
|
|
16
|
+
const _doDebug = (0, node_opcua_debug_1.checkDebugFlag)(__filename);
|
|
17
|
+
const _debugLog = (0, node_opcua_debug_1.make_debugLog)(__filename);
|
|
20
18
|
const errorLog = (0, node_opcua_debug_1.make_errorLog)(__filename);
|
|
21
19
|
const warningLog = (0, node_opcua_debug_1.make_warningLog)(__filename);
|
|
22
20
|
/*
|
|
@@ -26,8 +24,8 @@ const warningLog = (0, node_opcua_debug_1.make_warningLog)(__filename);
|
|
|
26
24
|
*/
|
|
27
25
|
function getExtObjArrayNodeValue() {
|
|
28
26
|
return new node_opcua_variant_1.Variant({
|
|
29
|
-
arrayType:
|
|
30
|
-
dataType:
|
|
27
|
+
arrayType: node_opcua_variant_1.VariantArrayType.Array,
|
|
28
|
+
dataType: node_opcua_variant_1.DataType.ExtensionObject,
|
|
31
29
|
value: this.$$extensionObjectArray
|
|
32
30
|
});
|
|
33
31
|
}
|
|
@@ -95,31 +93,30 @@ function createExtObjArrayNode(parentFolder, options) {
|
|
|
95
93
|
browseName: options.browseName,
|
|
96
94
|
dataType: dataType.nodeId,
|
|
97
95
|
typeDefinition: complexVariableType.nodeId,
|
|
98
|
-
value: { dataType:
|
|
96
|
+
value: { dataType: node_opcua_variant_1.DataType.ExtensionObject, value: [], arrayType: node_opcua_variant_1.VariantArrayType.Array },
|
|
99
97
|
valueRank: 1
|
|
100
98
|
};
|
|
101
99
|
const uaArrayVariableNode = namespace.addVariable(inner_options);
|
|
102
100
|
bindExtObjArrayNode(uaArrayVariableNode, options.variableType, options.indexPropertyName);
|
|
103
101
|
return uaArrayVariableNode;
|
|
104
102
|
}
|
|
105
|
-
function _getElementBrowseName(extObj,
|
|
103
|
+
function _getElementBrowseName(extObj, _index) {
|
|
106
104
|
const indexPropertyName1 = this.$$indexPropertyName;
|
|
107
|
-
if (!Object.
|
|
105
|
+
if (!Object.hasOwn(extObj, indexPropertyName1)) {
|
|
108
106
|
warningLog(" extension object does not have ", indexPropertyName1, extObj);
|
|
109
107
|
}
|
|
110
108
|
// assert(extObj.constructor === addressSpace.constructExtensionObject(dataType));
|
|
111
|
-
(0, node_opcua_assert_1.assert)(Object.
|
|
109
|
+
(0, node_opcua_assert_1.assert)(Object.hasOwn(extObj, indexPropertyName1));
|
|
112
110
|
const browseName = extObj[indexPropertyName1].toString();
|
|
113
111
|
return browseName;
|
|
114
112
|
}
|
|
115
|
-
;
|
|
116
113
|
function bindExtObjArrayNode(uaArrayVariableNode, variableTypeNodeId, indexPropertyName) {
|
|
117
114
|
(0, node_opcua_assert_1.assert)(uaArrayVariableNode.valueRank === 1, "expecting a one dimension array");
|
|
118
115
|
const addressSpace = uaArrayVariableNode.addressSpace;
|
|
119
116
|
const variableType = addressSpace.findVariableType(variableTypeNodeId);
|
|
120
117
|
// c8 ignore next
|
|
121
118
|
if (!variableType || variableType.nodeId.isEmpty()) {
|
|
122
|
-
throw new Error(
|
|
119
|
+
throw new Error(`Cannot find VariableType ${variableTypeNodeId.toString()}`);
|
|
123
120
|
}
|
|
124
121
|
const structure = addressSpace.findDataType("Structure");
|
|
125
122
|
// c8 ignore next
|
|
@@ -129,21 +126,21 @@ function bindExtObjArrayNode(uaArrayVariableNode, variableTypeNodeId, indexPrope
|
|
|
129
126
|
let dataType = addressSpace.findDataType(variableType.dataType);
|
|
130
127
|
// c8 ignore next
|
|
131
128
|
if (!dataType) {
|
|
132
|
-
throw new Error(
|
|
129
|
+
throw new Error(`Cannot find DataType ${variableType.dataType.toString()}`);
|
|
133
130
|
}
|
|
134
131
|
(0, node_opcua_assert_1.assert)(dataType.isSubtypeOf(structure), "expecting a structure (= ExtensionObject) here ");
|
|
135
132
|
(0, node_opcua_assert_1.assert)(!uaArrayVariableNode.$$variableType, "uaArrayVariableNode has already been bound !");
|
|
136
133
|
uaArrayVariableNode.$$variableType = variableType;
|
|
137
134
|
// verify that an object with same doesn't already exist
|
|
138
135
|
dataType = addressSpace.findDataType(variableType.dataType);
|
|
139
|
-
(0, node_opcua_assert_1.assert)(dataType
|
|
136
|
+
(0, node_opcua_assert_1.assert)(dataType?.isSubtypeOf(structure), "expecting a structure (= ExtensionObject) here ");
|
|
140
137
|
(0, node_opcua_assert_1.assert)(!uaArrayVariableNode.$$extensionObjectArray, "UAVariable ExtensionObject array already bounded");
|
|
141
138
|
uaArrayVariableNode.$$dataType = dataType;
|
|
142
139
|
uaArrayVariableNode.$$extensionObjectArray = [];
|
|
143
140
|
uaArrayVariableNode.$$indexPropertyName = indexPropertyName;
|
|
144
141
|
uaArrayVariableNode.$$getElementBrowseName = _getElementBrowseName;
|
|
145
142
|
uaArrayVariableNode.$dataValue.value.value = uaArrayVariableNode.$$extensionObjectArray;
|
|
146
|
-
uaArrayVariableNode.$dataValue.value.arrayType =
|
|
143
|
+
uaArrayVariableNode.$dataValue.value.arrayType = node_opcua_variant_1.VariantArrayType.Array;
|
|
147
144
|
const bindOptions = {
|
|
148
145
|
get: getExtObjArrayNodeValue,
|
|
149
146
|
set: undefined // readonly
|
|
@@ -196,7 +193,7 @@ function addElement(options, uaArrayVariableNode) {
|
|
|
196
193
|
elVar = uaArrayVariableNode.$$variableType.instantiate({
|
|
197
194
|
browseName,
|
|
198
195
|
componentOf: uaArrayVariableNode.nodeId,
|
|
199
|
-
value: { dataType:
|
|
196
|
+
value: { dataType: node_opcua_variant_1.DataType.ExtensionObject, value: extensionObject }
|
|
200
197
|
});
|
|
201
198
|
elVar.bindExtensionObject(extensionObject, { force: true });
|
|
202
199
|
}
|
|
@@ -228,10 +225,10 @@ function removeElement(uaArrayVariableNode, element) {
|
|
|
228
225
|
// find element by functor
|
|
229
226
|
elementIndex = _array.findIndex(element);
|
|
230
227
|
}
|
|
231
|
-
else if (element
|
|
228
|
+
else if (element?.nodeClass) {
|
|
232
229
|
// find element by name
|
|
233
|
-
const browseNameToFind = element.browseName.name
|
|
234
|
-
elementIndex = _array.findIndex((obj,
|
|
230
|
+
const browseNameToFind = element.browseName.name?.toString();
|
|
231
|
+
elementIndex = _array.findIndex((obj, _i) => {
|
|
235
232
|
const browseName = uaArrayVariableNode.$$getElementBrowseName(obj, elementIndex).toString();
|
|
236
233
|
return browseName === browseNameToFind;
|
|
237
234
|
});
|
|
@@ -241,7 +238,7 @@ function removeElement(uaArrayVariableNode, element) {
|
|
|
241
238
|
}
|
|
242
239
|
// c8 ignore next
|
|
243
240
|
if (elementIndex < 0) {
|
|
244
|
-
throw new Error(
|
|
241
|
+
throw new Error(`removeElement: cannot find element matching ${element.toString()}`);
|
|
245
242
|
}
|
|
246
243
|
return removeElementByIndex(uaArrayVariableNode, elementIndex);
|
|
247
244
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extension_object_array_node.js","sourceRoot":"","sources":["../../src/extension_object_array_node.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"extension_object_array_node.js","sourceRoot":"","sources":["../../src/extension_object_array_node.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { IAddressSpace } from "node-opcua-address-space-base";
|
|
1
|
+
import type { IAddressSpace } from "node-opcua-address-space-base";
|
|
2
2
|
import { DataType } from "node-opcua-basic-types";
|
|
3
|
-
import { NodeId, NodeIdLike } from "node-opcua-nodeid";
|
|
3
|
+
import type { NodeId, NodeIdLike } from "node-opcua-nodeid";
|
|
4
4
|
export interface IBaseNodeVariableOrVariableType {
|
|
5
5
|
addressSpace: IAddressSpace;
|
|
6
6
|
dataType: NodeId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get_basic_datatype.js","sourceRoot":"","sources":["../../src/get_basic_datatype.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"get_basic_datatype.js","sourceRoot":"","sources":["../../src/get_basic_datatype.ts"],"names":[],"mappings":";;AAYA,kFAUC;AAED,8CAeC;AAtCD,mEAAkD;AAWlD,SAAgB,mCAAmC,CAC/C,YAA2B,EAC3B,cAAmD;IAEnD,MAAM,eAAe,GAAI,cAAsB,CAAC,MAAM,CAAC,CAAC,CAAE,cAAsB,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC;IACzG,MAAM,YAAY,GAAG,YAAY,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;IAChE,IAAI,CAAC,YAAY,EAAE,CAAC;QAChB,OAAO,iCAAQ,CAAC,IAAI,CAAC;IACzB,CAAC;IACD,OAAO,YAAY,CAAC,gBAAgB,EAAE,CAAC;AAC3C,CAAC;AAED,SAAgB,iBAAiB,CAAC,MAAuC;IACrE,MAAM,OAAO,GAAG,MAA2C,CAAC;IAC5D,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;QACzB,OAAO,OAAO,CAAC,cAAc,CAAC;IAClC,CAAC;IACD,IAAI,OAAO,CAAC,QAAQ,CAAC,SAAS,KAAK,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,KAAK,KAAK,CAAC,EAAE,CAAC;QACnE,OAAO,iCAAQ,CAAC,IAAI,CAAC;IACzB,CAAC;IACD,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;IAC1C,IAAI,CAAC,YAAY,EAAE,CAAC;QAChB,uCAAuC;QACvC,OAAO,iCAAQ,CAAC,IAAI,CAAC;IACzB,CAAC;IACD,OAAO,CAAC,cAAc,GAAG,mCAAmC,CAAC,YAAY,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC7F,OAAO,OAAO,CAAC,cAAc,CAAC;AAClC,CAAC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @module node-opcua-address-space
|
|
3
3
|
*/
|
|
4
|
-
import {
|
|
4
|
+
import type { IAddressSpace, IVariableHistorian, IVariableHistorianOptions, UAVariable } from "node-opcua-address-space-base";
|
|
5
|
+
import type { DataValue } from "node-opcua-data-value";
|
|
5
6
|
import { ReadRawModifiedDetails } from "node-opcua-service-history";
|
|
6
|
-
import { CallbackT } from "node-opcua-status-code";
|
|
7
|
-
import { IAddressSpace, IVariableHistorian, IVariableHistorianOptions, UAVariable } from "node-opcua-address-space-base";
|
|
7
|
+
import { type CallbackT } from "node-opcua-status-code";
|
|
8
8
|
import { UAVariableImpl } from "../ua_variable_impl";
|
|
9
9
|
export declare class VariableHistorian implements IVariableHistorian {
|
|
10
10
|
readonly node: UAVariable;
|
|
@@ -13,14 +13,13 @@ const chalk_1 = __importDefault(require("chalk"));
|
|
|
13
13
|
const node_opcua_assert_1 = require("node-opcua-assert");
|
|
14
14
|
const node_opcua_data_model_1 = require("node-opcua-data-model");
|
|
15
15
|
const node_opcua_date_time_1 = require("node-opcua-date-time");
|
|
16
|
+
const node_opcua_debug_1 = require("node-opcua-debug");
|
|
16
17
|
const node_opcua_service_history_1 = require("node-opcua-service-history");
|
|
17
18
|
const node_opcua_status_code_1 = require("node-opcua-status-code");
|
|
18
19
|
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
19
|
-
const node_opcua_debug_1 = require("node-opcua-debug");
|
|
20
|
-
const ua_variable_impl_1 = require("../ua_variable_impl");
|
|
21
20
|
const address_space_ts_1 = require("../../source/address_space_ts");
|
|
21
|
+
const ua_variable_impl_1 = require("../ua_variable_impl");
|
|
22
22
|
const warningLog = (0, node_opcua_debug_1.make_warningLog)(__filename);
|
|
23
|
-
// tslint:disable:no-var-requires
|
|
24
23
|
const Dequeue = require("dequeue");
|
|
25
24
|
/* interface Historian */
|
|
26
25
|
// {
|
|
@@ -29,12 +28,12 @@ const Dequeue = require("dequeue");
|
|
|
29
28
|
function inInTimeRange(historyReadDetails, dataValue) {
|
|
30
29
|
if (historyReadDetails.startTime &&
|
|
31
30
|
!(0, node_opcua_date_time_1.isMinDate)(historyReadDetails.startTime) &&
|
|
32
|
-
dataValue.sourceTimestamp < historyReadDetails.startTime) {
|
|
31
|
+
(dataValue.sourceTimestamp || 0) < historyReadDetails.startTime) {
|
|
33
32
|
return false;
|
|
34
33
|
}
|
|
35
34
|
if (historyReadDetails.endTime &&
|
|
36
35
|
!(0, node_opcua_date_time_1.isMinDate)(historyReadDetails.endTime) &&
|
|
37
|
-
dataValue.sourceTimestamp > historyReadDetails.endTime) {
|
|
36
|
+
(dataValue.sourceTimestamp || 0) > historyReadDetails.endTime) {
|
|
38
37
|
return false;
|
|
39
38
|
}
|
|
40
39
|
return true;
|
|
@@ -42,12 +41,12 @@ function inInTimeRange(historyReadDetails, dataValue) {
|
|
|
42
41
|
function inInTimeRange2(historyReadDetails, dataValue) {
|
|
43
42
|
if (historyReadDetails.endTime &&
|
|
44
43
|
!(0, node_opcua_date_time_1.isMinDate)(historyReadDetails.endTime) &&
|
|
45
|
-
dataValue.sourceTimestamp > historyReadDetails.endTime) {
|
|
44
|
+
(dataValue.sourceTimestamp || 0) > historyReadDetails.endTime) {
|
|
46
45
|
return false;
|
|
47
46
|
}
|
|
48
47
|
return !(historyReadDetails.startTime &&
|
|
49
48
|
!(0, node_opcua_date_time_1.isMinDate)(historyReadDetails.startTime) &&
|
|
50
|
-
dataValue.sourceTimestamp < historyReadDetails.startTime);
|
|
49
|
+
(dataValue.sourceTimestamp || 0) < historyReadDetails.startTime);
|
|
51
50
|
}
|
|
52
51
|
function filter_dequeue(q, historyReadRawModifiedDetails, onlyThisNumber, isReversed) {
|
|
53
52
|
const r = [];
|
|
@@ -101,7 +100,9 @@ class VariableHistorian {
|
|
|
101
100
|
// ensure that values are set with date increasing
|
|
102
101
|
if (sourceTime.getTime() <= this.lastDate.getTime()) {
|
|
103
102
|
if (!(sourceTime.getTime() === this.lastDate.getTime() && sourcePicoSeconds > this.lastDatePicoSeconds)) {
|
|
104
|
-
warningLog(chalk_1.default.red("Warning date not increasing "), chalk_1.default.cyan("\n node: ", this.node.browseName.toString(), this.node.nodeId.toString()), "\n new value = ", newDataValue.toString(), "\n last known date = ", this.lastDate, "\n last known picoSeconds = ", this.lastDatePicoSeconds, "\n lastValue = "
|
|
103
|
+
warningLog(chalk_1.default.red("Warning date not increasing "), chalk_1.default.cyan("\n node: ", this.node.browseName.toString(), this.node.nodeId.toString()), "\n new value = ", newDataValue.toString(), "\n last known date = ", this.lastDate, "\n last known picoSeconds = ", this.lastDatePicoSeconds, "\n lastValue = "
|
|
104
|
+
/// this._timeline[this._timeline.length - 1]?.toString()
|
|
105
|
+
);
|
|
105
106
|
// artificially increment date by one 100 picoseconds
|
|
106
107
|
newDataValue.sourcePicoseconds++;
|
|
107
108
|
}
|
|
@@ -117,7 +118,7 @@ class VariableHistorian {
|
|
|
117
118
|
}
|
|
118
119
|
if (this._timeline.length >= this._maxOnlineValues || this._timeline.length === 1) {
|
|
119
120
|
const first = this._timeline.first();
|
|
120
|
-
this.node._update_startOfOnlineArchive(first.
|
|
121
|
+
this.node._update_startOfOnlineArchive(first?.sourceTimestamp || node_opcua_date_time_1.minDate);
|
|
121
122
|
// we update the node startOnlineDate
|
|
122
123
|
}
|
|
123
124
|
}
|
|
@@ -141,7 +142,7 @@ function _get_startOfArchive(node) {
|
|
|
141
142
|
if (!node.$historicalDataConfiguration) {
|
|
142
143
|
throw new Error("this variable has no HistoricalDataConfiguration");
|
|
143
144
|
}
|
|
144
|
-
return node.$historicalDataConfiguration
|
|
145
|
+
return node.$historicalDataConfiguration?.startOfArchive?.readValue();
|
|
145
146
|
}
|
|
146
147
|
function _update_startOfArchive(newDate) {
|
|
147
148
|
if (!this.$historicalDataConfiguration) {
|
|
@@ -184,14 +185,14 @@ function _historyPush(newDataValue) {
|
|
|
184
185
|
if (!this.varHistorian) {
|
|
185
186
|
throw new Error("this variable has no HistoricalDataConfiguration");
|
|
186
187
|
}
|
|
187
|
-
(0, node_opcua_assert_1.assert)(Object.
|
|
188
|
+
(0, node_opcua_assert_1.assert)(Object.hasOwn(this, "historizing"), "expecting a historizing attribute on node");
|
|
188
189
|
if (!this.historizing) {
|
|
189
190
|
return; //
|
|
190
191
|
}
|
|
191
192
|
(0, node_opcua_assert_1.assert)(this.historizing === true);
|
|
192
193
|
this.varHistorian.push(newDataValue);
|
|
193
194
|
}
|
|
194
|
-
function _historyReadModify(
|
|
195
|
+
function _historyReadModify(_context, _historyReadRawModifiedDetails, _indexRange, _dataEncoding, _continuationData, callback) {
|
|
195
196
|
//
|
|
196
197
|
// 6.4.3.3 Read modified functionality
|
|
197
198
|
// Release 1.03 26 OPC Unified Architecture, Part 11
|
|
@@ -249,9 +250,12 @@ function _historyReadModify(context, historyReadRawModifiedDetails, indexRange,
|
|
|
249
250
|
}
|
|
250
251
|
function _historyReadRawAsync(historyReadRawModifiedDetails, maxNumberToExtract, isReversed, reverseDataValue, callback) {
|
|
251
252
|
(0, node_opcua_assert_1.assert)(typeof callback === "function");
|
|
253
|
+
if (!this.varHistorian) {
|
|
254
|
+
return callback(new Error("this variable has no HistoricalDataConfiguration"));
|
|
255
|
+
}
|
|
252
256
|
this.varHistorian.extractDataValues(historyReadRawModifiedDetails, maxNumberToExtract, isReversed, reverseDataValue, callback);
|
|
253
257
|
}
|
|
254
|
-
function _historyReadRaw(context, historyReadRawModifiedDetails,
|
|
258
|
+
function _historyReadRaw(context, historyReadRawModifiedDetails, _indexRange, _dataEncoding, continuationData, callback) {
|
|
255
259
|
(0, node_opcua_assert_1.assert)(historyReadRawModifiedDetails instanceof node_opcua_service_history_1.ReadRawModifiedDetails);
|
|
256
260
|
// 6.4.3.2 Read raw functionality
|
|
257
261
|
//
|
|
@@ -349,7 +353,8 @@ function _historyReadRaw(context, historyReadRawModifiedDetails, indexRange, dat
|
|
|
349
353
|
historyData: new node_opcua_service_history_1.HistoryData({ dataValues: values }),
|
|
350
354
|
statusCode
|
|
351
355
|
});
|
|
352
|
-
|
|
356
|
+
callback(null, result2);
|
|
357
|
+
return;
|
|
353
358
|
}
|
|
354
359
|
// todo add special treatment for when startTime > endTime
|
|
355
360
|
// ( in this case series must be return in reverse order )
|
|
@@ -364,7 +369,8 @@ function _historyReadRaw(context, historyReadRawModifiedDetails, indexRange, dat
|
|
|
364
369
|
const result = new node_opcua_service_history_1.HistoryReadResult({
|
|
365
370
|
statusCode: node_opcua_status_code_1.StatusCodes.BadHistoryOperationUnsupported // should be an error
|
|
366
371
|
});
|
|
367
|
-
|
|
372
|
+
callback(null, result);
|
|
373
|
+
return;
|
|
368
374
|
}
|
|
369
375
|
}
|
|
370
376
|
else if ((0, node_opcua_date_time_1.isMinDate)(historyReadRawModifiedDetails.startTime)) {
|
|
@@ -380,13 +386,14 @@ function _historyReadRaw(context, historyReadRawModifiedDetails, indexRange, dat
|
|
|
380
386
|
const result = new node_opcua_service_history_1.HistoryReadResult({
|
|
381
387
|
statusCode: node_opcua_status_code_1.StatusCodes.BadHistoryOperationUnsupported // should be an error
|
|
382
388
|
});
|
|
383
|
-
|
|
389
|
+
callback(null, result);
|
|
390
|
+
return;
|
|
384
391
|
}
|
|
385
392
|
}
|
|
386
393
|
else {
|
|
387
394
|
// start time is specified
|
|
388
395
|
// end time is specified
|
|
389
|
-
if (historyReadRawModifiedDetails.endTime
|
|
396
|
+
if ((historyReadRawModifiedDetails.endTime?.getTime() || 0) < (historyReadRawModifiedDetails.startTime?.getTime() || 0)) {
|
|
390
397
|
reverseDataValue = true;
|
|
391
398
|
const tmp = historyReadRawModifiedDetails.endTime;
|
|
392
399
|
historyReadRawModifiedDetails.endTime = historyReadRawModifiedDetails.startTime;
|