@camstack/develop 0.1.51 → 0.1.52
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/CHANGELOG.md +6 -0
- package/dist/hub-discovery/hub-candidates.d.ts +3 -0
- package/dist/hub-discovery/hub-candidates.d.ts.map +1 -1
- package/dist/hub-discovery/hub-candidates.js +5 -0
- package/dist/hub-discovery/mdns-browse.d.ts +2 -0
- package/dist/hub-discovery/mdns-browse.d.ts.map +1 -1
- package/dist/hub-discovery/mdns-browse.js +6 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|
|
7
7
|
|
|
8
8
|
## [Unreleased]
|
|
9
9
|
|
|
10
|
+
## [0.1.52] - 2026-11-10
|
|
11
|
+
|
|
12
|
+
### Added
|
|
13
|
+
|
|
14
|
+
- Hub discovery reads the hub id a hub announces on the LAN
|
|
15
|
+
|
|
10
16
|
## [0.1.51] - 2026-11-08
|
|
11
17
|
|
|
12
18
|
### Changed
|
|
@@ -15,6 +15,8 @@ export interface HubCandidate {
|
|
|
15
15
|
readonly host: string;
|
|
16
16
|
readonly port: number;
|
|
17
17
|
readonly nodeId: string | null;
|
|
18
|
+
/** The hub's announced identity (#494); absent when no source named one. */
|
|
19
|
+
readonly hubId?: string;
|
|
18
20
|
readonly version: string | null;
|
|
19
21
|
/** Human labels: "LAN (mDNS)", "saved session admin", "CAMSTACK_HUB_URL"… */
|
|
20
22
|
readonly sources: readonly string[];
|
|
@@ -24,6 +26,7 @@ export interface RawCandidate {
|
|
|
24
26
|
readonly url: string;
|
|
25
27
|
readonly source: string;
|
|
26
28
|
readonly nodeId?: string | null;
|
|
29
|
+
readonly hubId?: string;
|
|
27
30
|
readonly version?: string | null;
|
|
28
31
|
}
|
|
29
32
|
export interface DiscoverHubsDeps {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hub-candidates.d.ts","sourceRoot":"","sources":["../../src/hub-discovery/hub-candidates.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,KAAK,aAAa,EAAkB,KAAK,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAKnF,eAAO,MAAM,iBAAiB,eAAe,CAAA;AAE7C,qDAAqD;AACrD,MAAM,WAAW,YAAY;IAC3B,oDAAoD;IACpD,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9B,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IAC/B,6EAA6E;IAC7E,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAA;CACpC;AAED,oDAAoD;AACpD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC/B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CACjC;AAED,MAAM,WAAW,gBAAgB;IAC/B,2EAA2E;IAC3E,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,YAAY,EAAE,CAAA;IACxC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC,SAAS,OAAO,EAAE,CAAC,CAAA;IACzE,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;IACjE,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAA;IAC/B,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CAC/C;AAED,sFAAsF;AACtF,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAejG;
|
|
1
|
+
{"version":3,"file":"hub-candidates.d.ts","sourceRoot":"","sources":["../../src/hub-discovery/hub-candidates.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,KAAK,aAAa,EAAkB,KAAK,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAKnF,eAAO,MAAM,iBAAiB,eAAe,CAAA;AAE7C,qDAAqD;AACrD,MAAM,WAAW,YAAY;IAC3B,oDAAoD;IACpD,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9B,4EAA4E;IAC5E,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IAC/B,6EAA6E;IAC7E,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAA;CACpC;AAED,oDAAoD;AACpD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC/B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CACjC;AAED,MAAM,WAAW,gBAAgB;IAC/B,2EAA2E;IAC3E,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,YAAY,EAAE,CAAA;IACxC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC,SAAS,OAAO,EAAE,CAAC,CAAA;IACzE,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;IACjE,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAA;IAC/B,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CAC/C;AAED,sFAAsF;AACtF,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAejG;AAMD,gFAAgF;AAChF,wBAAgB,eAAe,CAAC,GAAG,EAAE,SAAS,YAAY,EAAE,GAAG,SAAS,YAAY,EAAE,CAoBrF;AAED,oFAAoF;AACpF,wBAAsB,YAAY,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC,CAoBhG;AAED;;;;GAIG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAwB7E"}
|
|
@@ -31,6 +31,9 @@ export function normalizeHubUrl(value) {
|
|
|
31
31
|
const shown = host.includes(':') ? `[${host}]` : host;
|
|
32
32
|
return { url: `https://${shown}:${port}`, host, port };
|
|
33
33
|
}
|
|
34
|
+
function hubIdField(hubId) {
|
|
35
|
+
return hubId !== undefined ? { hubId } : {};
|
|
36
|
+
}
|
|
34
37
|
/** Merge raw candidates by host:port, keeping every source and any identity. */
|
|
35
38
|
export function mergeCandidates(raw) {
|
|
36
39
|
const merged = new Map();
|
|
@@ -45,6 +48,7 @@ export function mergeCandidates(raw) {
|
|
|
45
48
|
host: n.host,
|
|
46
49
|
port: n.port,
|
|
47
50
|
nodeId: prev?.nodeId ?? r.nodeId ?? null,
|
|
51
|
+
...hubIdField(prev?.hubId ?? r.hubId),
|
|
48
52
|
version: prev?.version ?? r.version ?? null,
|
|
49
53
|
sources: prev?.sources.includes(r.source)
|
|
50
54
|
? prev.sources
|
|
@@ -66,6 +70,7 @@ export async function discoverHubs(deps = {}) {
|
|
|
66
70
|
url: h.url,
|
|
67
71
|
source: MDNS_SOURCE_LABEL,
|
|
68
72
|
nodeId: h.nodeId,
|
|
73
|
+
...hubIdField(h.hubId),
|
|
69
74
|
version: h.version,
|
|
70
75
|
})),
|
|
71
76
|
...(deps.known ?? []),
|
|
@@ -33,6 +33,8 @@ export interface MdnsHub {
|
|
|
33
33
|
/** Base https URL, no trailing slash. */
|
|
34
34
|
readonly url: string;
|
|
35
35
|
readonly nodeId: string | null;
|
|
36
|
+
/** The hub's announced identity (`hub-<16 hex>`, #494); absent when it announces none. */
|
|
37
|
+
readonly hubId?: string;
|
|
36
38
|
readonly version: string | null;
|
|
37
39
|
}
|
|
38
40
|
export interface BrowseOptions {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mdns-browse.d.ts","sourceRoot":"","sources":["../../src/hub-discovery/mdns-browse.ts"],"names":[],"mappings":"AASA,4EAA4E;AAC5E,MAAM,MAAM,UAAU,GAClB;IAAE,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACxE;IACE,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAA;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CACxB,GACD;IAAE,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,GACpF;IAAE,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAA;AAE3E,iEAAiE;AACjE,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,OAAO,EAAE,SAAS,UAAU,EAAE,CAAA;IACvC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CACtB;AAED,2DAA2D;AAC3D,MAAM,WAAW,UAAU;IACzB,UAAU,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,YAAY,KAAK,IAAI,GAAG,IAAI,CAAA;IAC5D,OAAO,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI,CAAA;IAC/C,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IACzB,OAAO,IAAI,IAAI,CAAA;CAChB;AAED,MAAM,WAAW,OAAO;IACtB,yCAAyC;IACzC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9B,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CAChC;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,UAAU,CAAA;IACxC,yEAAyE;IACzE,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;IAC3B,yEAAyE;IACzE,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CAC/C;AAED,wBAAgB,oBAAoB,IAAI,UAAU,CAyBjD;
|
|
1
|
+
{"version":3,"file":"mdns-browse.d.ts","sourceRoot":"","sources":["../../src/hub-discovery/mdns-browse.ts"],"names":[],"mappings":"AASA,4EAA4E;AAC5E,MAAM,MAAM,UAAU,GAClB;IAAE,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACxE;IACE,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAA;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CACxB,GACD;IAAE,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,GACpF;IAAE,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAA;AAE3E,iEAAiE;AACjE,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,OAAO,EAAE,SAAS,UAAU,EAAE,CAAA;IACvC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CACtB;AAED,2DAA2D;AAC3D,MAAM,WAAW,UAAU;IACzB,UAAU,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,YAAY,KAAK,IAAI,GAAG,IAAI,CAAA;IAC5D,OAAO,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI,CAAA;IAC/C,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IACzB,OAAO,IAAI,IAAI,CAAA;CAChB;AAED,MAAM,WAAW,OAAO;IACtB,yCAAyC;IACzC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9B,0FAA0F;IAC1F,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CAChC;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,UAAU,CAAA;IACxC,yEAAyE;IACzE,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;IAC3B,yEAAyE;IACzE,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CAC/C;AAED,wBAAgB,oBAAoB,IAAI,UAAU,CAyBjD;AA0BD,2EAA2E;AAC3E,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,SAAS,YAAY,EAAE,GAAG,SAAS,OAAO,EAAE,CA2BxF;AAED,0FAA0F;AAC1F,wBAAsB,cAAc,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,OAAO,EAAE,CAAC,CAyBxF"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* for that service — it never reads the mesh multicast channel (D826 retired
|
|
5
5
|
* it on the hub, so it can only ever show pre-D826 hubs).
|
|
6
6
|
*/
|
|
7
|
-
import { HUB_MDNS_QUERY_NAME, HUB_MDNS_ROLE, HUB_MDNS_TXT_KEYS } from '@camstack/types';
|
|
7
|
+
import { HUB_MDNS_QUERY_NAME, HUB_MDNS_ROLE, HUB_MDNS_TXT_KEYS, isHubId } from '@camstack/types';
|
|
8
8
|
import makeMdns from 'multicast-dns';
|
|
9
9
|
export function createRealMdnsSocket() {
|
|
10
10
|
const socket = makeMdns();
|
|
@@ -54,6 +54,10 @@ function originOf(value) {
|
|
|
54
54
|
return null;
|
|
55
55
|
}
|
|
56
56
|
}
|
|
57
|
+
/** `{ hubId }` when the TXT names a real hub id, else nothing (a forged `hub` is dropped). */
|
|
58
|
+
function hubIdOf(value) {
|
|
59
|
+
return isHubId(value) ? { hubId: value } : {};
|
|
60
|
+
}
|
|
57
61
|
/** Fold the responses into hubs. Pure, so it is tested without sockets. */
|
|
58
62
|
export function hubsFromResponses(responses) {
|
|
59
63
|
const found = new Map();
|
|
@@ -78,6 +82,7 @@ export function hubsFromResponses(responses) {
|
|
|
78
82
|
found.set(url, {
|
|
79
83
|
url,
|
|
80
84
|
nodeId: txt.get(HUB_MDNS_TXT_KEYS.nodeId) ?? null,
|
|
85
|
+
...hubIdOf(txt.get(HUB_MDNS_TXT_KEYS.hubId)),
|
|
81
86
|
version: txt.get(HUB_MDNS_TXT_KEYS.version) ?? null,
|
|
82
87
|
});
|
|
83
88
|
}
|
package/package.json
CHANGED