From 81344cb67aab614dac509e85106c46a8555cb598 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 19 Jun 2022 10:16:04 +0000 Subject: [PATCH 01/15] scripts/eddn-errors: Remove EDMC codexentry trap --- scripts/eddn-report-log-errors | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/scripts/eddn-report-log-errors b/scripts/eddn-report-log-errors index 81618a8..1a7dd5b 100755 --- a/scripts/eddn-report-log-errors +++ b/scripts/eddn-report-log-errors @@ -138,17 +138,8 @@ def process_file(input_file: str) -> None: elif matches.group('software_name').startswith('E:D Market Connector'): # https://github.com/EDCD/EDMarketConnector/releases/latest - if software_version >= semantic_version.Version.coerce('5.3.0'): - if matches.group('schema_ref') == 'https://eddn.edcd.io/schemas/codexentry/1': - # - if matches.group('err_msg') == 'Failed Validation "[]"': - pass - - else: - print(matches.group('err_msg')) - print(line) - - elif matches.group('schema_ref') == 'https://eddn.edcd.io/schemas/journal/1': + if software_version >= semantic_version.Version.coerce('5.4.1'): + if matches.group('schema_ref') == 'https://eddn.edcd.io/schemas/journal/1': # if matches.group('err_msg') == 'Failed Validation "[]"': # From 66dfedd2af5bc891a5e3083b986f36ef8e284e99 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 19 Jun 2022 10:16:40 +0000 Subject: [PATCH 02/15] scripts/eddn-errors: Remove EDMC misc errors trap --- scripts/eddn-report-log-errors | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/scripts/eddn-report-log-errors b/scripts/eddn-report-log-errors index 1a7dd5b..a3940b4 100755 --- a/scripts/eddn-report-log-errors +++ b/scripts/eddn-report-log-errors @@ -139,23 +139,7 @@ def process_file(input_file: str) -> None: elif matches.group('software_name').startswith('E:D Market Connector'): # https://github.com/EDCD/EDMarketConnector/releases/latest if software_version >= semantic_version.Version.coerce('5.4.1'): - if matches.group('schema_ref') == 'https://eddn.edcd.io/schemas/journal/1': - # - if matches.group('err_msg') == 'Failed Validation "[]"': - # - pass - - elif matches.group('err_msg').startswith( - 'Failed Validation "[ - pass - - else: - print(matches.group('err_msg')) - print(line) - - elif matches.group('schema_ref') == 'https://eddn.edcd.io/schemas/fssdiscoveryscan/1': + if matches.group('schema_ref') == 'https://eddn.edcd.io/schemas/fssdiscoveryscan/1': if matches.group('err_msg') == 'Failed Validation "[]"': # pass From f6345b1705e46af99c30d7c62474a0bb7ffe5c7d Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 19 Jun 2022 10:17:13 +0000 Subject: [PATCH 03/15] eddn/report-errors: Remove other EDMC misc trap --- scripts/eddn-report-log-errors | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/scripts/eddn-report-log-errors b/scripts/eddn-report-log-errors index a3940b4..3302135 100755 --- a/scripts/eddn-report-log-errors +++ b/scripts/eddn-report-log-errors @@ -139,15 +139,7 @@ def process_file(input_file: str) -> None: elif matches.group('software_name').startswith('E:D Market Connector'): # https://github.com/EDCD/EDMarketConnector/releases/latest if software_version >= semantic_version.Version.coerce('5.4.1'): - if matches.group('schema_ref') == 'https://eddn.edcd.io/schemas/fssdiscoveryscan/1': - if matches.group('err_msg') == 'Failed Validation "[]"': - # - pass - - else: - print(line) - - elif matches.group('schema_ref') == 'https://eddn.edcd.io/schemas/approachsettlement/1': + if matches.group('schema_ref') == 'https://eddn.edcd.io/schemas/approachsettlement/1': if matches.group('err_msg') == 'Failed Validation "[]"': # pass From 651bf998a73228961592eb34f2fbbc0324c7b635 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 19 Jun 2022 10:18:27 +0000 Subject: [PATCH 04/15] scripts/eddn-errors: Remove EDMC approachsetttlemtn/missing Latitude trap --- scripts/eddn-report-log-errors | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/scripts/eddn-report-log-errors b/scripts/eddn-report-log-errors index 3302135..96e24ce 100755 --- a/scripts/eddn-report-log-errors +++ b/scripts/eddn-report-log-errors @@ -139,16 +139,7 @@ def process_file(input_file: str) -> None: elif matches.group('software_name').startswith('E:D Market Connector'): # https://github.com/EDCD/EDMarketConnector/releases/latest if software_version >= semantic_version.Version.coerce('5.4.1'): - if matches.group('schema_ref') == 'https://eddn.edcd.io/schemas/approachsettlement/1': - if matches.group('err_msg') == 'Failed Validation "[]"': - # - pass - - else: - print(line) - - else: - print(line) + print(line) elif matches.group('software_name') == 'Elite G19s Companion App': # From 4ceac7bc8bc09d31d7e45152f6b817ac95fe4f3f Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 19 Jun 2022 10:20:32 +0000 Subject: [PATCH 05/15] scripts/eddn-errors: Bump EDD to 15.0.4.0 --- scripts/eddn-report-log-errors | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/eddn-report-log-errors b/scripts/eddn-report-log-errors index 96e24ce..e00e0b8 100755 --- a/scripts/eddn-report-log-errors +++ b/scripts/eddn-report-log-errors @@ -75,7 +75,7 @@ def process_file(input_file: str) -> None: ################################################################### if matches.group('software_name') == 'EDDiscovery': # https://github.com/EDDiscovery/EDDiscovery/releases/latest - if software_version >= semantic_version.Version.coerce('15.0.0.0'): + if software_version >= semantic_version.Version.coerce('15.0.4.0'): if matches.group('schema_ref') == 'https://eddn.edcd.io/schemas/approachsettlement/1': if matches.group('err_msg') == 'Failed Validation "[]"': # From 8e3e279592d79d7b1678095e004ef164f7f128cf Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 19 Jun 2022 10:20:52 +0000 Subject: [PATCH 06/15] scripts/eddn-errors: EDD approachsettlement/Latitude trap removed --- scripts/eddn-report-log-errors | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/eddn-report-log-errors b/scripts/eddn-report-log-errors index e00e0b8..737ec5b 100755 --- a/scripts/eddn-report-log-errors +++ b/scripts/eddn-report-log-errors @@ -77,11 +77,7 @@ def process_file(input_file: str) -> None: # https://github.com/EDDiscovery/EDDiscovery/releases/latest if software_version >= semantic_version.Version.coerce('15.0.4.0'): if matches.group('schema_ref') == 'https://eddn.edcd.io/schemas/approachsettlement/1': - if matches.group('err_msg') == 'Failed Validation "[]"': - # - pass - - elif matches.group('err_msg') == 'Failed Validation "[]"': + if matches.group('err_msg') == 'Failed Validation "[]"': # pass From 13215806e4850cd6a169deaf5670591b6964450a Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 19 Jun 2022 10:21:41 +0000 Subject: [PATCH 07/15] scripts/eddn-errors: EDD approachsettlement/_Localised trap removed --- scripts/eddn-report-log-errors | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/scripts/eddn-report-log-errors b/scripts/eddn-report-log-errors index 737ec5b..d9b4236 100755 --- a/scripts/eddn-report-log-errors +++ b/scripts/eddn-report-log-errors @@ -76,18 +76,6 @@ def process_file(input_file: str) -> None: if matches.group('software_name') == 'EDDiscovery': # https://github.com/EDDiscovery/EDDiscovery/releases/latest if software_version >= semantic_version.Version.coerce('15.0.4.0'): - if matches.group('schema_ref') == 'https://eddn.edcd.io/schemas/approachsettlement/1': - if matches.group('err_msg') == 'Failed Validation "[]"': - # - pass - - else: - print(line) - - else: - print(line) - - elif software_version >= semantic_version.Version.coerce('12.1.7.0'): if matches.group('schema_ref') in ( 'https://eddn.edcd.io/schemas/shipyard/2', 'https://eddn.edcd.io/schemas/outfitting/2', From 75f744abe56b947f230300c69b16d93bf11ef2c8 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 19 Jun 2022 10:22:22 +0000 Subject: [PATCH 08/15] scripts/eddn-errors: EDD shipyard/outfitting trap removed --- scripts/eddn-report-log-errors | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/scripts/eddn-report-log-errors b/scripts/eddn-report-log-errors index d9b4236..700d519 100755 --- a/scripts/eddn-report-log-errors +++ b/scripts/eddn-report-log-errors @@ -76,19 +76,7 @@ def process_file(input_file: str) -> None: if matches.group('software_name') == 'EDDiscovery': # https://github.com/EDDiscovery/EDDiscovery/releases/latest if software_version >= semantic_version.Version.coerce('15.0.4.0'): - if matches.group('schema_ref') in ( - 'https://eddn.edcd.io/schemas/shipyard/2', - 'https://eddn.edcd.io/schemas/outfitting/2', - ): - # Reported via Discord PM to Robby 2022-01-07 - if matches.group('err_msg') == 'Failed Validation "[]"': - pass - - else: - print(line) - - else: - print(line) + print(line) elif matches.group('software_name') == 'EDDLite': # https://github.com/EDDiscovery/EDDLite/releases/tag/latest From e297f24c73e261152e3ccd2fc76cd5158231fea0 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 19 Jun 2022 10:23:03 +0000 Subject: [PATCH 09/15] scripts/eddn-errors: EDD version now 2.2.0 --- scripts/eddn-report-log-errors | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/eddn-report-log-errors b/scripts/eddn-report-log-errors index 700d519..4635aed 100755 --- a/scripts/eddn-report-log-errors +++ b/scripts/eddn-report-log-errors @@ -80,7 +80,7 @@ def process_file(input_file: str) -> None: elif matches.group('software_name') == 'EDDLite': # https://github.com/EDDiscovery/EDDLite/releases/tag/latest - if software_version >= semantic_version.Version.coerce('2.0.0'): + if software_version >= semantic_version.Version.coerce('2.2.0'): if matches.group('schema_ref') in ( 'https://eddn.edcd.io/schemas/shipyard/2', 'https://eddn.edcd.io/schemas/outfitting/2', From bd7a0d6ab92d6138e03d4cbfea2a1e86a6bae472 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 19 Jun 2022 10:23:37 +0000 Subject: [PATCH 10/15] scripts/eddn-errors: EDDLite - remove traps --- scripts/eddn-report-log-errors | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/scripts/eddn-report-log-errors b/scripts/eddn-report-log-errors index 4635aed..42032ff 100755 --- a/scripts/eddn-report-log-errors +++ b/scripts/eddn-report-log-errors @@ -81,27 +81,7 @@ def process_file(input_file: str) -> None: elif matches.group('software_name') == 'EDDLite': # https://github.com/EDDiscovery/EDDLite/releases/tag/latest if software_version >= semantic_version.Version.coerce('2.2.0'): - if matches.group('schema_ref') in ( - 'https://eddn.edcd.io/schemas/shipyard/2', - 'https://eddn.edcd.io/schemas/outfitting/2', - ): - # Failed Validation "[]" - if ( - matches.group('err_msg').startswith('Failed Validation "[]"') - ): - # - pass - - elif matches.group('err_msg') == 'Failed Validation "[]"': - # Reported via Discord PM to Robby 2022-01-07 - pass - - else: - print(line) - - else: - print(line) + print(line) elif matches.group('software_name') == 'EDDI': # https://github.com/EDCD/EDDI/releases/latest From 353c5a23812f8db55e25bf1cca9cb4a8a33e94d0 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 19 Jun 2022 10:26:31 +0000 Subject: [PATCH 11/15] scripts/eddn-errors: EDSM - Console version now 1.0.2 --- scripts/eddn-report-log-errors | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/eddn-report-log-errors b/scripts/eddn-report-log-errors index 42032ff..32bf2ab 100755 --- a/scripts/eddn-report-log-errors +++ b/scripts/eddn-report-log-errors @@ -137,7 +137,7 @@ def process_file(input_file: str) -> None: elif matches.group('software_name') == 'EDSM - Console': # It's in-browser, no public source/releases - if software_version >= semantic_version.Version.coerce('1.0'): + if software_version >= semantic_version.Version.coerce('1.0.2'): if matches.group('schema_ref') == 'https://eddn.edcd.io/schemas/journal/1': if matches.group('journal_event') == 'Scan': # From 159c02caf162b49475d603068994b0be7575fdf1 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 19 Jun 2022 10:31:19 +0000 Subject: [PATCH 12/15] scripts/eddn-errors: Also ignore "EVA [Android]" --- scripts/eddn-report-log-errors | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/eddn-report-log-errors b/scripts/eddn-report-log-errors index 32bf2ab..33234c0 100755 --- a/scripts/eddn-report-log-errors +++ b/scripts/eddn-report-log-errors @@ -210,7 +210,10 @@ def process_file(input_file: str) -> None: # Abandoned/unmaintained project # # - elif matches.group('software_name') == 'EVA [iPhone]': + elif ( + matches.group('software_name') == 'EVA [iPhone]' + or matches.group('software_name') == 'EVA [Android]' + ): pass #################################################################### From 83a7d451ef81e27e824a4e737df0810bdde9c598 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 19 Jun 2022 10:37:20 +0000 Subject: [PATCH 13/15] scripts/eddn-errors: EDMC - two fsssignaldiscovered issues --- scripts/eddn-report-log-errors | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/scripts/eddn-report-log-errors b/scripts/eddn-report-log-errors index 33234c0..82a3568 100755 --- a/scripts/eddn-report-log-errors +++ b/scripts/eddn-report-log-errors @@ -91,7 +91,20 @@ def process_file(input_file: str) -> None: elif matches.group('software_name').startswith('E:D Market Connector'): # https://github.com/EDCD/EDMarketConnector/releases/latest if software_version >= semantic_version.Version.coerce('5.4.1'): - print(line) + if matches.group('schema_ref') == 'https://eddn.edcd.io/schemas/fsssignaldiscovered/1': + if matches.group('err_msg') == 'Failed Validation "[]"': + # + pass + + elif matches.group('err_msg') == 'Failed Validation "[]"': + # + pass + + else: + print(line) + + else: + print(line) elif matches.group('software_name') == 'Elite G19s Companion App': # From 3fa501213981bbc28042d2590ec3c2cf2659f166 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 20 Jun 2022 09:56:40 +0000 Subject: [PATCH 14/15] scripts/eddn-errors: EDMC - Put back in trap for mystery disallowed --- scripts/eddn-report-log-errors | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/eddn-report-log-errors b/scripts/eddn-report-log-errors index 82a3568..a3c77ef 100755 --- a/scripts/eddn-report-log-errors +++ b/scripts/eddn-report-log-errors @@ -91,7 +91,14 @@ def process_file(input_file: str) -> None: elif matches.group('software_name').startswith('E:D Market Connector'): # https://github.com/EDCD/EDMarketConnector/releases/latest if software_version >= semantic_version.Version.coerce('5.4.1'): - if matches.group('schema_ref') == 'https://eddn.edcd.io/schemas/fsssignaldiscovered/1': + if matches.group('schema_ref') == 'https://eddn.edcd.io/schemas/journal/1': + if matches.group('err_msg').startswith( + 'Failed Validation "[ + pass + + elif matches.group('schema_ref') == 'https://eddn.edcd.io/schemas/fsssignaldiscovered/1': if matches.group('err_msg') == 'Failed Validation "[]"': # pass From 723e966b37092c289a5c2db3325a248318cb7fd2 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 24 Jun 2022 14:48:11 +0100 Subject: [PATCH 15/15] docs/README schemas: Be explicit about sub-second timestamp resolution --- schemas/README-EDDN-schemas.md | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/schemas/README-EDDN-schemas.md b/schemas/README-EDDN-schemas.md index 4620dd1..7905cbb 100644 --- a/schemas/README-EDDN-schemas.md +++ b/schemas/README-EDDN-schemas.md @@ -49,11 +49,17 @@ contents all Schemas specify a top-level JSON Object with the data: Each `message` object must have, at bare minimum: -1. `timestamp` - string date and time in ISO8601 format. Whilst this - technically allows for any timezone to be cited you SHOULD provide this in - UTC, aka 'Zulu Time' as in the example above. You MUST ensure that you are - doing this properly. Do not claim 'Z' whilst actually using a local time - that is offset from UTC. +1. `timestamp` - string date and time in ISO8601 format. + 1. Whilst this technically allows for any timezone to be cited you SHOULD + provide this in UTC, aka 'Zulu Time' as in the example above. + You MUST ensure that you are doing this properly. + Do not claim 'Z' whilst actually using a local time that is offset from + UTC. + 2. Historically we had never been explicit about if Senders should include + sub-second resolution in the timestamps, or if Listeners should be + prepared to accept such. As of 2022-06-24 we are explicitly stating that + Senders **MAY** include sub-second resolution, and Listeners **MUST** + be prepared to accept such. If you are only utilising Journal-sourced data then simply using the value from there should be sufficient as the PC game client is meant to