@springfield/ham-radio-registry 1.5.0 → 1.6.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/README.md +6 -88
- package/dist/catalog/module-catalog.d.ts.map +1 -1
- package/dist/catalog/module-catalog.js +99 -9
- package/dist/catalog/module-catalog.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/types/module-catalog.d.ts +16 -0
- package/dist/types/module-catalog.d.ts.map +1 -1
- package/package.json +3 -3
- package/src/catalog/module-catalog.ts +126 -10
- package/src/index.ts +1 -0
- package/src/types/module-catalog.ts +17 -0
package/README.md
CHANGED
|
@@ -1,93 +1,11 @@
|
|
|
1
1
|
# ham-radio-registry
|
|
2
2
|
|
|
3
|
+
Loads and validates HamBench radio JSON configs. The desktop app installs modules from GitHub Releases via the official catalog; in Node, the registry can also resolve workspace packages.
|
|
3
4
|
|
|
5
|
+
Docs: [Registry](https://springfield-ham-radio.github.io/ham-radio-docs/developer/registry/) · [Publish a module](https://springfield-ham-radio.github.io/ham-radio-docs/developer/publishing-modules.html)
|
|
4
6
|
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
|
|
10
|
-
|
|
11
|
-
## Add your files
|
|
12
|
-
|
|
13
|
-
- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
|
|
14
|
-
- [ ] [Add files using the command line](https://docs.gitlab.com/topics/git/add_files/#add-files-to-a-git-repository) or push an existing Git repository with the following command:
|
|
15
|
-
|
|
16
|
-
```
|
|
17
|
-
cd existing_repo
|
|
18
|
-
git remote add origin https://gitlab.com/springfield-ham-radio/app/ham-radio-registry.git
|
|
19
|
-
git branch -M main
|
|
20
|
-
git push -uf origin main
|
|
7
|
+
```bash
|
|
8
|
+
corepack enable
|
|
9
|
+
yarn install
|
|
10
|
+
yarn build
|
|
21
11
|
```
|
|
22
|
-
|
|
23
|
-
## Integrate with your tools
|
|
24
|
-
|
|
25
|
-
- [ ] [Set up project integrations](https://gitlab.com/springfield-ham-radio/app/ham-radio-registry/-/settings/integrations)
|
|
26
|
-
|
|
27
|
-
## Collaborate with your team
|
|
28
|
-
|
|
29
|
-
- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
|
|
30
|
-
- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
|
|
31
|
-
- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
|
|
32
|
-
- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
|
|
33
|
-
- [ ] [Set auto-merge](https://docs.gitlab.com/user/project/merge_requests/auto_merge/)
|
|
34
|
-
|
|
35
|
-
## Test and Deploy
|
|
36
|
-
|
|
37
|
-
Use the built-in continuous integration in GitLab.
|
|
38
|
-
|
|
39
|
-
- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/)
|
|
40
|
-
- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing (SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
|
|
41
|
-
- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
|
|
42
|
-
- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
|
|
43
|
-
- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
|
|
44
|
-
|
|
45
|
-
***
|
|
46
|
-
|
|
47
|
-
# Editing this README
|
|
48
|
-
|
|
49
|
-
When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thanks to [makeareadme.com](https://www.makeareadme.com/) for this template.
|
|
50
|
-
|
|
51
|
-
## Suggestions for a good README
|
|
52
|
-
|
|
53
|
-
Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
|
|
54
|
-
|
|
55
|
-
## Name
|
|
56
|
-
Choose a self-explaining name for your project.
|
|
57
|
-
|
|
58
|
-
## Description
|
|
59
|
-
Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
|
|
60
|
-
|
|
61
|
-
## Badges
|
|
62
|
-
On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
|
|
63
|
-
|
|
64
|
-
## Visuals
|
|
65
|
-
Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
|
|
66
|
-
|
|
67
|
-
## Installation
|
|
68
|
-
Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
|
|
69
|
-
|
|
70
|
-
## Usage
|
|
71
|
-
Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
|
|
72
|
-
|
|
73
|
-
## Support
|
|
74
|
-
Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
|
|
75
|
-
|
|
76
|
-
## Roadmap
|
|
77
|
-
If you have ideas for releases in the future, it is a good idea to list them in the README.
|
|
78
|
-
|
|
79
|
-
## Contributing
|
|
80
|
-
State if you are open to contributions and what your requirements are for accepting them.
|
|
81
|
-
|
|
82
|
-
For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
|
|
83
|
-
|
|
84
|
-
You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
|
|
85
|
-
|
|
86
|
-
## Authors and acknowledgment
|
|
87
|
-
Show your appreciation to those who have contributed to the project.
|
|
88
|
-
|
|
89
|
-
## License
|
|
90
|
-
For open source projects, say how it is licensed.
|
|
91
|
-
|
|
92
|
-
## Project status
|
|
93
|
-
If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-catalog.d.ts","sourceRoot":"","sources":["../../src/catalog/module-catalog.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"module-catalog.d.ts","sourceRoot":"","sources":["../../src/catalog/module-catalog.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,uBAAuB,EACvB,kBAAkB,EAGnB,MAAM,4BAA4B,CAAC;AAoMpC;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,uBAAuB,GAAG;IAAE,OAAO,CAAC,EAAE,kBAAkB,CAAA;CAAE,CAiDhH;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB,CAiBnE;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAejE;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,mBAAmB,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAElG;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE1D"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
const INTEGRITY_PATTERN = /^sha256:[a-fA-F0-9]{64}$/;
|
|
2
|
-
const
|
|
2
|
+
const CONFIG_PATH_PATTERN = /^configs\/[^/]+\.json$/;
|
|
3
|
+
const SUPPORTED_SCHEMA_VERSIONS = new Set([1, 2]);
|
|
3
4
|
function isRecord(value) {
|
|
4
5
|
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
5
6
|
}
|
|
@@ -15,6 +16,58 @@ function isHttpsUrl(value) {
|
|
|
15
16
|
return false;
|
|
16
17
|
}
|
|
17
18
|
}
|
|
19
|
+
function sameStringSet(left, right) {
|
|
20
|
+
if (left.length !== right.length) {
|
|
21
|
+
return false;
|
|
22
|
+
}
|
|
23
|
+
const rightSet = new Set(right);
|
|
24
|
+
return left.every((value) => rightSet.has(value));
|
|
25
|
+
}
|
|
26
|
+
function validateCatalogRadio(value, prefix, errors, seenModelIds, seenConfigs) {
|
|
27
|
+
if (!isRecord(value)) {
|
|
28
|
+
errors.push(`${prefix} must be an object`);
|
|
29
|
+
return undefined;
|
|
30
|
+
}
|
|
31
|
+
if (!isNonEmptyString(value.modelId)) {
|
|
32
|
+
errors.push(`${prefix}.modelId is required`);
|
|
33
|
+
}
|
|
34
|
+
if (!isNonEmptyString(value.name)) {
|
|
35
|
+
errors.push(`${prefix}.name is required`);
|
|
36
|
+
}
|
|
37
|
+
if (value.config !== undefined) {
|
|
38
|
+
if (!isNonEmptyString(value.config) || !CONFIG_PATH_PATTERN.test(value.config)) {
|
|
39
|
+
errors.push(`${prefix}.config must be a configs/*.json path`);
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
if (errors.some((error) => error.startsWith(prefix))) {
|
|
43
|
+
return undefined;
|
|
44
|
+
}
|
|
45
|
+
const modelId = value.modelId;
|
|
46
|
+
const config = typeof value.config === 'string' ? value.config : undefined;
|
|
47
|
+
if (seenModelIds.has(modelId)) {
|
|
48
|
+
errors.push(`${prefix}.modelId is duplicated: ${modelId}`);
|
|
49
|
+
return undefined;
|
|
50
|
+
}
|
|
51
|
+
seenModelIds.add(modelId);
|
|
52
|
+
if (config) {
|
|
53
|
+
if (seenConfigs.has(config)) {
|
|
54
|
+
errors.push(`${prefix}.config is duplicated: ${config}`);
|
|
55
|
+
return undefined;
|
|
56
|
+
}
|
|
57
|
+
seenConfigs.add(config);
|
|
58
|
+
}
|
|
59
|
+
return {
|
|
60
|
+
modelId,
|
|
61
|
+
name: value.name,
|
|
62
|
+
...(config ? { config } : {}),
|
|
63
|
+
};
|
|
64
|
+
}
|
|
65
|
+
function radiosFromSupportedRadios(supportedRadios) {
|
|
66
|
+
return supportedRadios.map((modelId) => ({
|
|
67
|
+
modelId,
|
|
68
|
+
name: modelId,
|
|
69
|
+
}));
|
|
70
|
+
}
|
|
18
71
|
function validateModuleEntry(entry, index, errors) {
|
|
19
72
|
if (!isRecord(entry)) {
|
|
20
73
|
errors.push(`modules[${index}] must be an object`);
|
|
@@ -33,11 +86,47 @@ function validateModuleEntry(entry, index, errors) {
|
|
|
33
86
|
if (!isNonEmptyString(entry.version)) {
|
|
34
87
|
errors.push(`${prefix}.version is required`);
|
|
35
88
|
}
|
|
36
|
-
|
|
37
|
-
|
|
89
|
+
const radiosValue = entry.radios;
|
|
90
|
+
const supportedRadiosValue = entry.supportedRadios;
|
|
91
|
+
const hasRadios = Array.isArray(radiosValue);
|
|
92
|
+
const hasSupportedRadios = Array.isArray(supportedRadiosValue);
|
|
93
|
+
let radios = [];
|
|
94
|
+
let supportedRadios = [];
|
|
95
|
+
if (hasRadios) {
|
|
96
|
+
if (radiosValue.length === 0) {
|
|
97
|
+
errors.push(`${prefix}.radios must be a non-empty array`);
|
|
98
|
+
}
|
|
99
|
+
else {
|
|
100
|
+
const seenModelIds = new Set();
|
|
101
|
+
const seenConfigs = new Set();
|
|
102
|
+
radios = radiosValue
|
|
103
|
+
.map((radio, radioIndex) => validateCatalogRadio(radio, `${prefix}.radios[${radioIndex}]`, errors, seenModelIds, seenConfigs))
|
|
104
|
+
.filter((radio) => radio !== undefined);
|
|
105
|
+
}
|
|
106
|
+
supportedRadios = radios.map((radio) => radio.modelId);
|
|
107
|
+
if (hasSupportedRadios) {
|
|
108
|
+
if (supportedRadiosValue.length === 0 || !supportedRadiosValue.every((radio) => isNonEmptyString(radio))) {
|
|
109
|
+
errors.push(`${prefix}.supportedRadios must contain only non-empty strings`);
|
|
110
|
+
}
|
|
111
|
+
else if (!sameStringSet(supportedRadiosValue.filter(isNonEmptyString), supportedRadios)) {
|
|
112
|
+
errors.push(`${prefix}.supportedRadios must match radios[].modelId`);
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
else if (hasSupportedRadios) {
|
|
117
|
+
if (supportedRadiosValue.length === 0) {
|
|
118
|
+
errors.push(`${prefix}.supportedRadios must be a non-empty array`);
|
|
119
|
+
}
|
|
120
|
+
else if (!supportedRadiosValue.every((radio) => isNonEmptyString(radio))) {
|
|
121
|
+
errors.push(`${prefix}.supportedRadios must contain only non-empty strings`);
|
|
122
|
+
}
|
|
123
|
+
else {
|
|
124
|
+
supportedRadios = supportedRadiosValue.filter(isNonEmptyString);
|
|
125
|
+
radios = radiosFromSupportedRadios(supportedRadios);
|
|
126
|
+
}
|
|
38
127
|
}
|
|
39
|
-
else
|
|
40
|
-
errors.push(`${prefix}.
|
|
128
|
+
else {
|
|
129
|
+
errors.push(`${prefix}.radios must be a non-empty array`);
|
|
41
130
|
}
|
|
42
131
|
if (!isNonEmptyString(entry.minApiVersion)) {
|
|
43
132
|
errors.push(`${prefix}.minApiVersion is required`);
|
|
@@ -60,7 +149,8 @@ function validateModuleEntry(entry, index, errors) {
|
|
|
60
149
|
manufacturer: entry.manufacturer,
|
|
61
150
|
...(typeof entry.description === 'string' ? { description: entry.description } : {}),
|
|
62
151
|
version: entry.version,
|
|
63
|
-
|
|
152
|
+
radios,
|
|
153
|
+
supportedRadios,
|
|
64
154
|
minApiVersion: entry.minApiVersion,
|
|
65
155
|
downloadUrl: entry.downloadUrl,
|
|
66
156
|
integrity: entry.integrity.toLowerCase(),
|
|
@@ -75,8 +165,8 @@ export function validateModuleCatalog(value) {
|
|
|
75
165
|
if (!isRecord(value)) {
|
|
76
166
|
return { isValid: false, errors: ['Catalog must be a JSON object'], warnings };
|
|
77
167
|
}
|
|
78
|
-
if (value.schemaVersion !==
|
|
79
|
-
errors.push(`Unsupported schemaVersion: expected ${
|
|
168
|
+
if (typeof value.schemaVersion !== 'number' || !SUPPORTED_SCHEMA_VERSIONS.has(value.schemaVersion)) {
|
|
169
|
+
errors.push(`Unsupported schemaVersion: expected ${[...SUPPORTED_SCHEMA_VERSIONS].join(' or ')}`);
|
|
80
170
|
}
|
|
81
171
|
if (!Array.isArray(value.modules)) {
|
|
82
172
|
errors.push('modules must be an array');
|
|
@@ -104,7 +194,7 @@ export function validateModuleCatalog(value) {
|
|
|
104
194
|
errors,
|
|
105
195
|
warnings,
|
|
106
196
|
catalog: {
|
|
107
|
-
schemaVersion:
|
|
197
|
+
schemaVersion: value.schemaVersion,
|
|
108
198
|
modules,
|
|
109
199
|
},
|
|
110
200
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-catalog.js","sourceRoot":"","sources":["../../src/catalog/module-catalog.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"module-catalog.js","sourceRoot":"","sources":["../../src/catalog/module-catalog.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export type { RadioConfigMetadata, RadioCapabilities, RadioCatConfig, CodecConfig, RegistryRadio, RadioCatalogEntry, RadioCatalogSource, } from './types/radio-config.js';
|
|
2
|
-
export type { RadioModuleCatalog, RadioModuleCatalogEntry, CatalogValidationResult, } from './types/module-catalog.js';
|
|
2
|
+
export type { RadioModuleCatalog, RadioModuleCatalogEntry, RadioModuleCatalogRadio, CatalogValidationResult, } from './types/module-catalog.js';
|
|
3
3
|
export type { ValidationResult } from '@springfield/ham-radio-api';
|
|
4
4
|
export type { PluginModule, PluginCapabilities, SpringfieldPluginConfig, NpmPluginInfo, PluginManifest, PluginManifestConfiguration, PluginSharedComponents, PluginSecurity, } from './types/plugin-module.js';
|
|
5
5
|
export { hydrateRadioConfig, extractCatalogMetadata, validateConfiguration, computeContentHash, hashRadioConfig, validateModuleCatalog, parseModuleCatalog, compareSemver, isApiVersionCompatible, normalizeIntegrity, integrityFromSha256Hex, } from './catalog/index.js';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,YAAY,EACV,mBAAmB,EACnB,iBAAiB,EACjB,cAAc,EACd,WAAW,EACX,aAAa,EACb,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,yBAAyB,CAAC;AAEjC,YAAY,EACV,kBAAkB,EAClB,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,2BAA2B,CAAC;AAGnC,YAAY,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAEnE,YAAY,EACV,YAAY,EACZ,kBAAkB,EAClB,uBAAuB,EACvB,aAAa,EACb,cAAc,EACd,2BAA2B,EAC3B,sBAAsB,EACtB,cAAc,GACf,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EACL,kBAAkB,EAClB,sBAAsB,EACtB,qBAAqB,EACrB,kBAAkB,EAClB,eAAe,EACf,qBAAqB,EACrB,kBAAkB,EAClB,aAAa,EACb,sBAAsB,EACtB,kBAAkB,EAClB,sBAAsB,GACvB,MAAM,oBAAoB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,YAAY,EACV,mBAAmB,EACnB,iBAAiB,EACjB,cAAc,EACd,WAAW,EACX,aAAa,EACb,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,yBAAyB,CAAC;AAEjC,YAAY,EACV,kBAAkB,EAClB,uBAAuB,EACvB,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,2BAA2B,CAAC;AAGnC,YAAY,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAEnE,YAAY,EACV,YAAY,EACZ,kBAAkB,EAClB,uBAAuB,EACvB,aAAa,EACb,cAAc,EACd,2BAA2B,EAC3B,sBAAsB,EACtB,cAAc,GACf,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EACL,kBAAkB,EAClB,sBAAsB,EACtB,qBAAqB,EACrB,kBAAkB,EAClB,eAAe,EACf,qBAAqB,EACrB,kBAAkB,EAClB,aAAa,EACb,sBAAsB,EACtB,kBAAkB,EAClB,sBAAsB,GACvB,MAAM,oBAAoB,CAAC"}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAgCA,wCAAwC;AACxC,OAAO,EACL,kBAAkB,EAClB,sBAAsB,EACtB,qBAAqB,EACrB,kBAAkB,EAClB,eAAe,EACf,qBAAqB,EACrB,kBAAkB,EAClB,aAAa,EACb,sBAAsB,EACtB,kBAAkB,EAClB,sBAAsB,GACvB,MAAM,oBAAoB,CAAC"}
|
|
@@ -5,6 +5,17 @@ export interface RadioModuleCatalog {
|
|
|
5
5
|
schemaVersion: number;
|
|
6
6
|
modules: RadioModuleCatalogEntry[];
|
|
7
7
|
}
|
|
8
|
+
/**
|
|
9
|
+
* One radio config shipped inside a manufacturer module zip.
|
|
10
|
+
*/
|
|
11
|
+
export interface RadioModuleCatalogRadio {
|
|
12
|
+
/** Config `id.model`, e.g. `baofeng-uv5r`. */
|
|
13
|
+
modelId: string;
|
|
14
|
+
/** Config `id.name`, e.g. `Baofeng UV-5R`. */
|
|
15
|
+
name: string;
|
|
16
|
+
/** Path inside the zip, e.g. `configs/baofeng-uv5r.json`. */
|
|
17
|
+
config?: string;
|
|
18
|
+
}
|
|
8
19
|
/**
|
|
9
20
|
* One installable official radio module listed in the catalog.
|
|
10
21
|
*/
|
|
@@ -14,6 +25,11 @@ export interface RadioModuleCatalogEntry {
|
|
|
14
25
|
manufacturer: string;
|
|
15
26
|
description?: string;
|
|
16
27
|
version: string;
|
|
28
|
+
/** Radios actually present as `configs/*.json` in the zip. */
|
|
29
|
+
radios: RadioModuleCatalogRadio[];
|
|
30
|
+
/**
|
|
31
|
+
* `radios[].modelId`. Kept so schemaVersion 1 clients can still list models.
|
|
32
|
+
*/
|
|
17
33
|
supportedRadios: string[];
|
|
18
34
|
minApiVersion: string;
|
|
19
35
|
downloadUrl: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-catalog.d.ts","sourceRoot":"","sources":["../../src/types/module-catalog.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,uBAAuB,EAAE,CAAC;CACpC;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,4CAA4C;IAC5C,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB"}
|
|
1
|
+
{"version":3,"file":"module-catalog.d.ts","sourceRoot":"","sources":["../../src/types/module-catalog.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,uBAAuB,EAAE,CAAC;CACpC;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,8CAA8C;IAC9C,OAAO,EAAE,MAAM,CAAC;IAChB,8CAA8C;IAC9C,IAAI,EAAE,MAAM,CAAC;IACb,6DAA6D;IAC7D,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,8DAA8D;IAC9D,MAAM,EAAE,uBAAuB,EAAE,CAAC;IAClC;;OAEG;IACH,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,4CAA4C;IAC5C,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@springfield/ham-radio-registry",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.6.0",
|
|
4
4
|
"author": "Bryan Hunt",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"readme": "README.md",
|
|
@@ -42,8 +42,8 @@
|
|
|
42
42
|
"test:integration": "tsx --test test/integration/**/*.test.ts"
|
|
43
43
|
},
|
|
44
44
|
"dependencies": {
|
|
45
|
-
"@springfield/ham-radio-api": "^17.
|
|
46
|
-
"@springfield/ham-radio-utils": "^4.
|
|
45
|
+
"@springfield/ham-radio-api": "^17.8.0",
|
|
46
|
+
"@springfield/ham-radio-utils": "^4.11.0",
|
|
47
47
|
"loglayer": "^9.4.0"
|
|
48
48
|
},
|
|
49
49
|
"devDependencies": {
|
|
@@ -1,7 +1,13 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type {
|
|
2
|
+
CatalogValidationResult,
|
|
3
|
+
RadioModuleCatalog,
|
|
4
|
+
RadioModuleCatalogEntry,
|
|
5
|
+
RadioModuleCatalogRadio,
|
|
6
|
+
} from '../types/module-catalog.js';
|
|
2
7
|
|
|
3
8
|
const INTEGRITY_PATTERN = /^sha256:[a-fA-F0-9]{64}$/;
|
|
4
|
-
const
|
|
9
|
+
const CONFIG_PATH_PATTERN = /^configs\/[^/]+\.json$/;
|
|
10
|
+
const SUPPORTED_SCHEMA_VERSIONS = new Set([1, 2]);
|
|
5
11
|
|
|
6
12
|
function isRecord(value: unknown): value is Record<string, unknown> {
|
|
7
13
|
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
@@ -20,6 +26,78 @@ function isHttpsUrl(value: string): boolean {
|
|
|
20
26
|
}
|
|
21
27
|
}
|
|
22
28
|
|
|
29
|
+
function sameStringSet(left: string[], right: string[]): boolean {
|
|
30
|
+
if (left.length !== right.length) {
|
|
31
|
+
return false;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
const rightSet = new Set(right);
|
|
35
|
+
return left.every((value) => rightSet.has(value));
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
function validateCatalogRadio(
|
|
39
|
+
value: unknown,
|
|
40
|
+
prefix: string,
|
|
41
|
+
errors: string[],
|
|
42
|
+
seenModelIds: Set<string>,
|
|
43
|
+
seenConfigs: Set<string>,
|
|
44
|
+
): RadioModuleCatalogRadio | undefined {
|
|
45
|
+
if (!isRecord(value)) {
|
|
46
|
+
errors.push(`${prefix} must be an object`);
|
|
47
|
+
return undefined;
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
if (!isNonEmptyString(value.modelId)) {
|
|
51
|
+
errors.push(`${prefix}.modelId is required`);
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
if (!isNonEmptyString(value.name)) {
|
|
55
|
+
errors.push(`${prefix}.name is required`);
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
if (value.config !== undefined) {
|
|
59
|
+
if (!isNonEmptyString(value.config) || !CONFIG_PATH_PATTERN.test(value.config)) {
|
|
60
|
+
errors.push(`${prefix}.config must be a configs/*.json path`);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
if (errors.some((error) => error.startsWith(prefix))) {
|
|
65
|
+
return undefined;
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
const modelId = value.modelId as string;
|
|
69
|
+
const config = typeof value.config === 'string' ? value.config : undefined;
|
|
70
|
+
|
|
71
|
+
if (seenModelIds.has(modelId)) {
|
|
72
|
+
errors.push(`${prefix}.modelId is duplicated: ${modelId}`);
|
|
73
|
+
return undefined;
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
seenModelIds.add(modelId);
|
|
77
|
+
|
|
78
|
+
if (config) {
|
|
79
|
+
if (seenConfigs.has(config)) {
|
|
80
|
+
errors.push(`${prefix}.config is duplicated: ${config}`);
|
|
81
|
+
return undefined;
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
seenConfigs.add(config);
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
return {
|
|
88
|
+
modelId,
|
|
89
|
+
name: value.name as string,
|
|
90
|
+
...(config ? { config } : {}),
|
|
91
|
+
};
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
function radiosFromSupportedRadios(supportedRadios: string[]): RadioModuleCatalogRadio[] {
|
|
95
|
+
return supportedRadios.map((modelId) => ({
|
|
96
|
+
modelId,
|
|
97
|
+
name: modelId,
|
|
98
|
+
}));
|
|
99
|
+
}
|
|
100
|
+
|
|
23
101
|
function validateModuleEntry(entry: unknown, index: number, errors: string[]): RadioModuleCatalogEntry | undefined {
|
|
24
102
|
if (!isRecord(entry)) {
|
|
25
103
|
errors.push(`modules[${index}] must be an object`);
|
|
@@ -44,10 +122,47 @@ function validateModuleEntry(entry: unknown, index: number, errors: string[]): R
|
|
|
44
122
|
errors.push(`${prefix}.version is required`);
|
|
45
123
|
}
|
|
46
124
|
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
125
|
+
const radiosValue = entry.radios;
|
|
126
|
+
const supportedRadiosValue = entry.supportedRadios;
|
|
127
|
+
const hasRadios = Array.isArray(radiosValue);
|
|
128
|
+
const hasSupportedRadios = Array.isArray(supportedRadiosValue);
|
|
129
|
+
let radios: RadioModuleCatalogRadio[] = [];
|
|
130
|
+
let supportedRadios: string[] = [];
|
|
131
|
+
|
|
132
|
+
if (hasRadios) {
|
|
133
|
+
if (radiosValue.length === 0) {
|
|
134
|
+
errors.push(`${prefix}.radios must be a non-empty array`);
|
|
135
|
+
} else {
|
|
136
|
+
const seenModelIds = new Set<string>();
|
|
137
|
+
const seenConfigs = new Set<string>();
|
|
138
|
+
|
|
139
|
+
radios = radiosValue
|
|
140
|
+
.map((radio: unknown, radioIndex: number) =>
|
|
141
|
+
validateCatalogRadio(radio, `${prefix}.radios[${radioIndex}]`, errors, seenModelIds, seenConfigs),
|
|
142
|
+
)
|
|
143
|
+
.filter((radio: RadioModuleCatalogRadio | undefined): radio is RadioModuleCatalogRadio => radio !== undefined);
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
supportedRadios = radios.map((radio) => radio.modelId);
|
|
147
|
+
|
|
148
|
+
if (hasSupportedRadios) {
|
|
149
|
+
if (supportedRadiosValue.length === 0 || !supportedRadiosValue.every((radio: unknown) => isNonEmptyString(radio))) {
|
|
150
|
+
errors.push(`${prefix}.supportedRadios must contain only non-empty strings`);
|
|
151
|
+
} else if (!sameStringSet(supportedRadiosValue.filter(isNonEmptyString), supportedRadios)) {
|
|
152
|
+
errors.push(`${prefix}.supportedRadios must match radios[].modelId`);
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
} else if (hasSupportedRadios) {
|
|
156
|
+
if (supportedRadiosValue.length === 0) {
|
|
157
|
+
errors.push(`${prefix}.supportedRadios must be a non-empty array`);
|
|
158
|
+
} else if (!supportedRadiosValue.every((radio: unknown) => isNonEmptyString(radio))) {
|
|
159
|
+
errors.push(`${prefix}.supportedRadios must contain only non-empty strings`);
|
|
160
|
+
} else {
|
|
161
|
+
supportedRadios = supportedRadiosValue.filter(isNonEmptyString);
|
|
162
|
+
radios = radiosFromSupportedRadios(supportedRadios);
|
|
163
|
+
}
|
|
164
|
+
} else {
|
|
165
|
+
errors.push(`${prefix}.radios must be a non-empty array`);
|
|
51
166
|
}
|
|
52
167
|
|
|
53
168
|
if (!isNonEmptyString(entry.minApiVersion)) {
|
|
@@ -76,7 +191,8 @@ function validateModuleEntry(entry: unknown, index: number, errors: string[]): R
|
|
|
76
191
|
manufacturer: entry.manufacturer as string,
|
|
77
192
|
...(typeof entry.description === 'string' ? { description: entry.description } : {}),
|
|
78
193
|
version: entry.version as string,
|
|
79
|
-
|
|
194
|
+
radios,
|
|
195
|
+
supportedRadios,
|
|
80
196
|
minApiVersion: entry.minApiVersion as string,
|
|
81
197
|
downloadUrl: entry.downloadUrl as string,
|
|
82
198
|
integrity: (entry.integrity as string).toLowerCase(),
|
|
@@ -94,8 +210,8 @@ export function validateModuleCatalog(value: unknown): CatalogValidationResult &
|
|
|
94
210
|
return { isValid: false, errors: ['Catalog must be a JSON object'], warnings };
|
|
95
211
|
}
|
|
96
212
|
|
|
97
|
-
if (value.schemaVersion !==
|
|
98
|
-
errors.push(`Unsupported schemaVersion: expected ${
|
|
213
|
+
if (typeof value.schemaVersion !== 'number' || !SUPPORTED_SCHEMA_VERSIONS.has(value.schemaVersion)) {
|
|
214
|
+
errors.push(`Unsupported schemaVersion: expected ${[...SUPPORTED_SCHEMA_VERSIONS].join(' or ')}`);
|
|
99
215
|
}
|
|
100
216
|
|
|
101
217
|
if (!Array.isArray(value.modules)) {
|
|
@@ -131,7 +247,7 @@ export function validateModuleCatalog(value: unknown): CatalogValidationResult &
|
|
|
131
247
|
errors,
|
|
132
248
|
warnings,
|
|
133
249
|
catalog: {
|
|
134
|
-
schemaVersion:
|
|
250
|
+
schemaVersion: value.schemaVersion as number,
|
|
135
251
|
modules,
|
|
136
252
|
},
|
|
137
253
|
};
|
package/src/index.ts
CHANGED
|
@@ -6,6 +6,18 @@ export interface RadioModuleCatalog {
|
|
|
6
6
|
modules: RadioModuleCatalogEntry[];
|
|
7
7
|
}
|
|
8
8
|
|
|
9
|
+
/**
|
|
10
|
+
* One radio config shipped inside a manufacturer module zip.
|
|
11
|
+
*/
|
|
12
|
+
export interface RadioModuleCatalogRadio {
|
|
13
|
+
/** Config `id.model`, e.g. `baofeng-uv5r`. */
|
|
14
|
+
modelId: string;
|
|
15
|
+
/** Config `id.name`, e.g. `Baofeng UV-5R`. */
|
|
16
|
+
name: string;
|
|
17
|
+
/** Path inside the zip, e.g. `configs/baofeng-uv5r.json`. */
|
|
18
|
+
config?: string;
|
|
19
|
+
}
|
|
20
|
+
|
|
9
21
|
/**
|
|
10
22
|
* One installable official radio module listed in the catalog.
|
|
11
23
|
*/
|
|
@@ -15,6 +27,11 @@ export interface RadioModuleCatalogEntry {
|
|
|
15
27
|
manufacturer: string;
|
|
16
28
|
description?: string;
|
|
17
29
|
version: string;
|
|
30
|
+
/** Radios actually present as `configs/*.json` in the zip. */
|
|
31
|
+
radios: RadioModuleCatalogRadio[];
|
|
32
|
+
/**
|
|
33
|
+
* `radios[].modelId`. Kept so schemaVersion 1 clients can still list models.
|
|
34
|
+
*/
|
|
18
35
|
supportedRadios: string[];
|
|
19
36
|
minApiVersion: string;
|
|
20
37
|
downloadUrl: string;
|