@matter/general 0.17.2 → 0.17.3-alpha.0-20260614-888c310c5
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/cjs/environment/Environment.d.ts +2 -2
- package/dist/cjs/environment/Environment.d.ts.map +1 -1
- package/dist/cjs/environment/Environment.js +2 -1
- package/dist/cjs/environment/Environment.js.map +1 -1
- package/dist/cjs/net/udp/UdpMulticastServer.d.ts.map +1 -1
- package/dist/cjs/net/udp/UdpMulticastServer.js +18 -3
- package/dist/cjs/net/udp/UdpMulticastServer.js.map +1 -1
- package/dist/cjs/util/Cache.d.ts +2 -0
- package/dist/cjs/util/Cache.d.ts.map +1 -1
- package/dist/cjs/util/Cache.js +4 -0
- package/dist/cjs/util/Cache.js.map +1 -1
- package/dist/esm/environment/Environment.d.ts +2 -2
- package/dist/esm/environment/Environment.d.ts.map +1 -1
- package/dist/esm/environment/Environment.js +2 -1
- package/dist/esm/environment/Environment.js.map +1 -1
- package/dist/esm/net/udp/UdpMulticastServer.d.ts.map +1 -1
- package/dist/esm/net/udp/UdpMulticastServer.js +19 -4
- package/dist/esm/net/udp/UdpMulticastServer.js.map +1 -1
- package/dist/esm/util/Cache.d.ts +2 -0
- package/dist/esm/util/Cache.d.ts.map +1 -1
- package/dist/esm/util/Cache.js +4 -0
- package/dist/esm/util/Cache.js.map +1 -1
- package/package.json +2 -2
- package/src/environment/Environment.ts +4 -3
- package/src/net/udp/UdpMulticastServer.ts +20 -4
- package/src/util/Cache.ts +5 -0
|
@@ -16,8 +16,8 @@ import { VariableService } from "./VariableService.js";
|
|
|
16
16
|
* Access to general platform-dependent features.
|
|
17
17
|
*
|
|
18
18
|
* The following variables are defined by this class:
|
|
19
|
-
* * `log.level` - Log level to use {@link Logger.
|
|
20
|
-
* * `log.format` - Log format to use {@link Logger.
|
|
19
|
+
* * `log.level` - Log level to use, as a name (`debug`, `info`, `notice`, `warn`, `error`, `fatal`) or number (0-5) {@link Logger.level}
|
|
20
|
+
* * `log.format` - Log format to use {@link Logger.format}
|
|
21
21
|
* * `log.stack.limit` - Stack trace limit, see https://nodejs.org/api/errors.html#errorstacktracelimit
|
|
22
22
|
* * `mdns.networkInterface` - Network interface to use for MDNS broadcasts and scanning, default are all available interfaces
|
|
23
23
|
* * `mdns.ipv4` - Also announce/scan on IPv4 interfaces
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Environment.d.ts","sourceRoot":"","sources":["../../../src/environment/Environment.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;
|
|
1
|
+
{"version":3,"file":"Environment.d.ts","sourceRoot":"","sources":["../../../src/environment/Environment.ts"],"names":[],"mappings":"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"}
|
|
@@ -70,6 +70,7 @@ var import_SharedEnvironmentServices = require("#environment/SharedEnvironmentSe
|
|
|
70
70
|
var import_SharedServicesManager = require("#environment/SharedServicesManager.js");
|
|
71
71
|
var import_Diagnostic = require("#log/Diagnostic.js");
|
|
72
72
|
var import_LogFormat = require("#log/LogFormat.js");
|
|
73
|
+
var import_LogLevel = require("#log/LogLevel.js");
|
|
73
74
|
var import_MatterError = require("#MatterError.js");
|
|
74
75
|
var import_TimeUnit = require("#time/TimeUnit.js");
|
|
75
76
|
var import_Lifetime = require("#util/Lifetime.js");
|
|
@@ -344,7 +345,7 @@ class Environment {
|
|
|
344
345
|
global[Symbol.dispose]();
|
|
345
346
|
global = env;
|
|
346
347
|
env.vars.use(() => {
|
|
347
|
-
import_Logger.Logger.level = env.vars.get("log.level", import_Logger.Logger.level);
|
|
348
|
+
import_Logger.Logger.level = env.vars.get("log.level", import_LogLevel.LogLevel.names[(0, import_LogLevel.LogLevel)(import_Logger.Logger.level)]);
|
|
348
349
|
import_Logger.Logger.format = env.vars.get("log.format", import_Logger.Logger.format);
|
|
349
350
|
const stackLimit = global.vars.number("log.stack.limit");
|
|
350
351
|
if (stackLimit !== void 0) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/environment/Environment.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,uCAA0C;AAC1C,mCAAsC;AACtC,wBAA2B;AAC3B,uBAA0B;AAC1B,yBAA8B;AAC9B,sBAAwB;AACxB,sBAAyB;AACzB,sBAA6B;AAC7B,8BAAiC;AACjC,oBAAuB;AACvB,wBAAO;AACP,kBAAqB;AACrB,uBAAyD;AACzD,wBAA2B;AAC3B,2BAA8B;AAC9B,4BAA+B;AAC/B,6BAAgC;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UdpMulticastServer.d.ts","sourceRoot":"","sources":["../../../../src/net/udp/UdpMulticastServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAK7C,OAAO,EAAE,OAAO,EAA2B,MAAM,eAAe,CAAC;AAKjE,MAAM,WAAW,yBAAyB;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC;CAC7B;AAED,qBAAa,kBAAkB;;IAE3B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IAO1C,OAAa,MAAM,CAAC,EAChB,YAAY,EACZ,oBAAoB,EACpB,oBAAoB,EACpB,aAAa,EACb,OAAO,EACP,QAAQ,EAAE,aAAa,EAC1B,EAAE,yBAAyB,+BAqD3B;IAED,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAKhC;IAEF,OAAO,eAkBN;IAED,IAAI,YAAY,YAEf;IAED,SAAS,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,QAetF;IAEK,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,YAAY,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"UdpMulticastServer.d.ts","sourceRoot":"","sources":["../../../../src/net/udp/UdpMulticastServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAK7C,OAAO,EAAE,OAAO,EAA2B,MAAM,eAAe,CAAC;AAKjE,MAAM,WAAW,yBAAyB;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC;CAC7B;AAED,qBAAa,kBAAkB;;IAE3B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IAO1C,OAAa,MAAM,CAAC,EAChB,YAAY,EACZ,oBAAoB,EACpB,oBAAoB,EACpB,aAAa,EACb,OAAO,EACP,QAAQ,EAAE,aAAa,EAC1B,EAAE,yBAAyB,+BAqD3B;IAED,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAKhC;IAEF,OAAO,eAkBN;IAED,IAAI,YAAY,YAEf;IAED,SAAS,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,QAetF;IAEK,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,YAAY,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,iBAiDvE;YAea,sBAAsB;IAU9B,KAAK,kBAKV;CACJ"}
|
|
@@ -147,11 +147,11 @@ class UdpMulticastServer {
|
|
|
147
147
|
throw error;
|
|
148
148
|
}
|
|
149
149
|
}
|
|
150
|
-
broadcastChannels = new import_Cache.
|
|
150
|
+
broadcastChannels = new import_Cache.AsyncCache(
|
|
151
151
|
"UDP broadcast channel",
|
|
152
152
|
(netInterface, isIPv42) => this.createBroadcastChannel(netInterface, isIPv42),
|
|
153
153
|
(0, import_TimeUnit.Minutes)(5),
|
|
154
|
-
async (
|
|
154
|
+
async (_key, channel) => channel.close()
|
|
155
155
|
);
|
|
156
156
|
constructor(lifetime, network, broadcastAddressIpv4, broadcastAddressIpv6, broadcastPort, serverIpv4, serverIpv6, netInterface) {
|
|
157
157
|
this.#lifetime = lifetime;
|
|
@@ -183,10 +183,12 @@ class UdpMulticastServer {
|
|
|
183
183
|
async send(message, netInterface, uniCastTarget) {
|
|
184
184
|
netInterface = netInterface ?? this.netInterface;
|
|
185
185
|
if (uniCastTarget !== void 0 && netInterface !== void 0) {
|
|
186
|
+
const ipV4Target = (0, import_Ip.isIPv4)(uniCastTarget);
|
|
186
187
|
try {
|
|
187
|
-
await (await this.broadcastChannels.get(netInterface,
|
|
188
|
+
await (await this.broadcastChannels.get(netInterface, ipV4Target)).send(uniCastTarget, this.#broadcastPort, message);
|
|
188
189
|
} catch (error) {
|
|
189
190
|
logger.info(`${netInterface} ${uniCastTarget}: ${(0, import_Error.asError)(error).message}`);
|
|
191
|
+
await this.#evictBroadcastChannel(netInterface, ipV4Target);
|
|
190
192
|
}
|
|
191
193
|
} else {
|
|
192
194
|
const netInterfaces = netInterface !== void 0 ? [{ name: netInterface }] : await this.network.getNetInterfaces();
|
|
@@ -210,6 +212,7 @@ class UdpMulticastServer {
|
|
|
210
212
|
await (await this.broadcastChannels.get(netInterface2, isIPv42)).send(address, this.#broadcastPort, message);
|
|
211
213
|
} catch (error) {
|
|
212
214
|
logger.info(`${netInterface2}: ${(0, import_Error.asError)(error).message}`);
|
|
215
|
+
await this.#evictBroadcastChannel(netInterface2, isIPv42);
|
|
213
216
|
}
|
|
214
217
|
}),
|
|
215
218
|
`Error sending UDP Multicast message on interface ${netInterface2}`
|
|
@@ -219,6 +222,18 @@ class UdpMulticastServer {
|
|
|
219
222
|
);
|
|
220
223
|
}
|
|
221
224
|
}
|
|
225
|
+
/**
|
|
226
|
+
* Drop a broadcast channel after a send failure so the next send rebinds it. A failed send can mean the cached
|
|
227
|
+
* socket is bound to an interface address that no longer exists (e.g. after the host resumed from standby).
|
|
228
|
+
* Eviction must never escalate a send failure, so closing the stale socket is best-effort.
|
|
229
|
+
*/
|
|
230
|
+
async #evictBroadcastChannel(netInterface, isIPv42) {
|
|
231
|
+
try {
|
|
232
|
+
await this.broadcastChannels.evict(netInterface, isIPv42);
|
|
233
|
+
} catch (error) {
|
|
234
|
+
logger.info(`${netInterface}: failed to evict broadcast channel: ${(0, import_Error.asError)(error).message}`);
|
|
235
|
+
}
|
|
236
|
+
}
|
|
222
237
|
async createBroadcastChannel(netInterface, isIPv42) {
|
|
223
238
|
return await this.network.createUdpSocket({
|
|
224
239
|
lifetime: this.#lifetime,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/net/udp/UdpMulticastServer.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,yBAAqC;AACrC,sBAAwB;AAExB,sBAAyB;AACzB,oBAAuB;AACvB,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["isIPv4", "netInterface"]
|
|
6
6
|
}
|
package/dist/cjs/util/Cache.d.ts
CHANGED
|
@@ -17,6 +17,8 @@ declare class GenericCache<T> {
|
|
|
17
17
|
protected keyFor(params: unknown[]): string;
|
|
18
18
|
keys(): string[];
|
|
19
19
|
delete(key: string): Promise<void>;
|
|
20
|
+
/** Evict the entry addressed by the same params passed to {@link Cache.get}/{@link AsyncCache.get}. */
|
|
21
|
+
evict(...params: unknown[]): Promise<void>;
|
|
20
22
|
clear(): Promise<void>;
|
|
21
23
|
close(): Promise<void>;
|
|
22
24
|
private expire;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Cache.d.ts","sourceRoot":"","sources":["../../../src/util/Cache.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAO7C,cAAM,YAAY,CAAC,CAAC;IAQZ,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;IARpC,SAAS,CAAC,QAAQ,CAAC,SAAS,cAAqB;IACjD,SAAS,CAAC,QAAQ,CAAC,MAAM,iBAAwB;IACjD,SAAS,CAAC,QAAQ,CAAC,UAAU,sBAA6B;IAC1D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAQ;IAEtC,YACI,IAAI,EAAE,MAAM,EACK,UAAU,EAAE,QAAQ,EACpB,cAAc,CAAC,GAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,aAAA,EAQ7E;IAGD,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAE1C;IAED,IAAI,aAEH;IAEK,MAAM,CAAC,GAAG,EAAE,MAAM,iBAOvB;IAEK,KAAK,kBAMV;IAEK,KAAK,kBAIV;YAEa,MAAM;CAOvB;AAED,qBAAa,KAAK,CAAC,CAAC,CAAE,SAAQ,YAAY,CAAC,CAAC,CAAC;IAGrC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAF9B,YACI,IAAI,EAAE,MAAM,EACK,SAAS,EAAE,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,EACnD,UAAU,EAAE,QAAQ,EACpB,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,EAG5D;IAED,GAAG,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE,GAOe,CAAC,CACnC;CACJ;AAED,qBAAa,UAAU,CAAC,CAAC,CAAE,SAAQ,YAAY,CAAC,CAAC,CAAC;;IAK1C,OAAO,CAAC,QAAQ,CAAC,SAAS;IAF9B,YACI,IAAI,EAAE,MAAM,EACK,SAAS,EAAE,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,EAC5D,UAAU,EAAE,QAAQ,EACpB,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,EAG5D;IAED,GAAG,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAehC;IAWc,MAAM,CAAC,GAAG,EAAE,MAAM,iBAUhC;IAEc,KAAK,kBAGnB;CACJ"}
|
|
1
|
+
{"version":3,"file":"Cache.d.ts","sourceRoot":"","sources":["../../../src/util/Cache.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAO7C,cAAM,YAAY,CAAC,CAAC;IAQZ,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;IARpC,SAAS,CAAC,QAAQ,CAAC,SAAS,cAAqB;IACjD,SAAS,CAAC,QAAQ,CAAC,MAAM,iBAAwB;IACjD,SAAS,CAAC,QAAQ,CAAC,UAAU,sBAA6B;IAC1D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAQ;IAEtC,YACI,IAAI,EAAE,MAAM,EACK,UAAU,EAAE,QAAQ,EACpB,cAAc,CAAC,GAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,aAAA,EAQ7E;IAGD,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAE1C;IAED,IAAI,aAEH;IAEK,MAAM,CAAC,GAAG,EAAE,MAAM,iBAOvB;IAED,uGAAuG;IACjG,KAAK,CAAC,GAAG,MAAM,EAAE,OAAO,EAAE,iBAE/B;IAEK,KAAK,kBAMV;IAEK,KAAK,kBAIV;YAEa,MAAM;CAOvB;AAED,qBAAa,KAAK,CAAC,CAAC,CAAE,SAAQ,YAAY,CAAC,CAAC,CAAC;IAGrC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAF9B,YACI,IAAI,EAAE,MAAM,EACK,SAAS,EAAE,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,EACnD,UAAU,EAAE,QAAQ,EACpB,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,EAG5D;IAED,GAAG,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE,GAOe,CAAC,CACnC;CACJ;AAED,qBAAa,UAAU,CAAC,CAAC,CAAE,SAAQ,YAAY,CAAC,CAAC,CAAC;;IAK1C,OAAO,CAAC,QAAQ,CAAC,SAAS;IAF9B,YACI,IAAI,EAAE,MAAM,EACK,SAAS,EAAE,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,EAC5D,UAAU,EAAE,QAAQ,EACpB,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,EAG5D;IAED,GAAG,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAehC;IAWc,MAAM,CAAC,GAAG,EAAE,MAAM,iBAUhC;IAEc,KAAK,kBAGnB;CACJ"}
|
package/dist/cjs/util/Cache.js
CHANGED
|
@@ -63,6 +63,10 @@ class GenericCache {
|
|
|
63
63
|
this.values.delete(key);
|
|
64
64
|
this.timestamps.delete(key);
|
|
65
65
|
}
|
|
66
|
+
/** Evict the entry addressed by the same params passed to {@link Cache.get}/{@link AsyncCache.get}. */
|
|
67
|
+
async evict(...params) {
|
|
68
|
+
await this.delete(this.keyFor(params));
|
|
69
|
+
}
|
|
66
70
|
async clear() {
|
|
67
71
|
for (const key of this.values.keys()) {
|
|
68
72
|
await this.delete(key);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/util/Cache.ts"],
|
|
4
|
-
"mappings": "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",
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -16,8 +16,8 @@ import { VariableService } from "./VariableService.js";
|
|
|
16
16
|
* Access to general platform-dependent features.
|
|
17
17
|
*
|
|
18
18
|
* The following variables are defined by this class:
|
|
19
|
-
* * `log.level` - Log level to use {@link Logger.
|
|
20
|
-
* * `log.format` - Log format to use {@link Logger.
|
|
19
|
+
* * `log.level` - Log level to use, as a name (`debug`, `info`, `notice`, `warn`, `error`, `fatal`) or number (0-5) {@link Logger.level}
|
|
20
|
+
* * `log.format` - Log format to use {@link Logger.format}
|
|
21
21
|
* * `log.stack.limit` - Stack trace limit, see https://nodejs.org/api/errors.html#errorstacktracelimit
|
|
22
22
|
* * `mdns.networkInterface` - Network interface to use for MDNS broadcasts and scanning, default are all available interfaces
|
|
23
23
|
* * `mdns.ipv4` - Also announce/scan on IPv4 interfaces
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Environment.d.ts","sourceRoot":"","sources":["../../../src/environment/Environment.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;
|
|
1
|
+
{"version":3,"file":"Environment.d.ts","sourceRoot":"","sources":["../../../src/environment/Environment.ts"],"names":[],"mappings":"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"}
|
|
@@ -52,6 +52,7 @@ import { SharedEnvironmentServices } from "#environment/SharedEnvironmentService
|
|
|
52
52
|
import { SharedServicesManager } from "#environment/SharedServicesManager.js";
|
|
53
53
|
import { Diagnostic } from "#log/Diagnostic.js";
|
|
54
54
|
import { LogFormat } from "#log/LogFormat.js";
|
|
55
|
+
import { LogLevel } from "#log/LogLevel.js";
|
|
55
56
|
import { InternalError } from "#MatterError.js";
|
|
56
57
|
import { Instant } from "#time/TimeUnit.js";
|
|
57
58
|
import { Lifetime } from "#util/Lifetime.js";
|
|
@@ -321,7 +322,7 @@ class Environment {
|
|
|
321
322
|
global[Symbol.dispose]();
|
|
322
323
|
global = env;
|
|
323
324
|
env.vars.use(() => {
|
|
324
|
-
Logger.level = env.vars.get("log.level", Logger.level);
|
|
325
|
+
Logger.level = env.vars.get("log.level", LogLevel.names[LogLevel(Logger.level)]);
|
|
325
326
|
Logger.format = env.vars.get("log.format", Logger.format);
|
|
326
327
|
const stackLimit = global.vars.number("log.stack.limit");
|
|
327
328
|
if (stackLimit !== void 0) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/environment/Environment.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UdpMulticastServer.d.ts","sourceRoot":"","sources":["../../../../src/net/udp/UdpMulticastServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAK7C,OAAO,EAAE,OAAO,EAA2B,MAAM,eAAe,CAAC;AAKjE,MAAM,WAAW,yBAAyB;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC;CAC7B;AAED,qBAAa,kBAAkB;;IAE3B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IAO1C,OAAa,MAAM,CAAC,EAChB,YAAY,EACZ,oBAAoB,EACpB,oBAAoB,EACpB,aAAa,EACb,OAAO,EACP,QAAQ,EAAE,aAAa,EAC1B,EAAE,yBAAyB,+BAqD3B;IAED,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAKhC;IAEF,OAAO,eAkBN;IAED,IAAI,YAAY,YAEf;IAED,SAAS,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,QAetF;IAEK,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,YAAY,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"UdpMulticastServer.d.ts","sourceRoot":"","sources":["../../../../src/net/udp/UdpMulticastServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAK7C,OAAO,EAAE,OAAO,EAA2B,MAAM,eAAe,CAAC;AAKjE,MAAM,WAAW,yBAAyB;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC;CAC7B;AAED,qBAAa,kBAAkB;;IAE3B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IAO1C,OAAa,MAAM,CAAC,EAChB,YAAY,EACZ,oBAAoB,EACpB,oBAAoB,EACpB,aAAa,EACb,OAAO,EACP,QAAQ,EAAE,aAAa,EAC1B,EAAE,yBAAyB,+BAqD3B;IAED,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAKhC;IAEF,OAAO,eAkBN;IAED,IAAI,YAAY,YAEf;IAED,SAAS,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,QAetF;IAEK,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,YAAY,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,iBAiDvE;YAea,sBAAsB;IAU9B,KAAK,kBAKV;CACJ"}
|
|
@@ -52,7 +52,7 @@ import { MatterAggregateError } from "#MatterError.js";
|
|
|
52
52
|
import { Minutes } from "#time/TimeUnit.js";
|
|
53
53
|
import { Lifetime } from "#util/Lifetime.js";
|
|
54
54
|
import { Logger } from "../../log/Logger.js";
|
|
55
|
-
import {
|
|
55
|
+
import { AsyncCache } from "../../util/Cache.js";
|
|
56
56
|
import { asError } from "../../util/Error.js";
|
|
57
57
|
import { isIPv4 } from "../../util/Ip.js";
|
|
58
58
|
import { NoAddressAvailableError } from "../Network.js";
|
|
@@ -124,11 +124,11 @@ class UdpMulticastServer {
|
|
|
124
124
|
throw error;
|
|
125
125
|
}
|
|
126
126
|
}
|
|
127
|
-
broadcastChannels = new
|
|
127
|
+
broadcastChannels = new AsyncCache(
|
|
128
128
|
"UDP broadcast channel",
|
|
129
129
|
(netInterface, isIPv42) => this.createBroadcastChannel(netInterface, isIPv42),
|
|
130
130
|
Minutes(5),
|
|
131
|
-
async (
|
|
131
|
+
async (_key, channel) => channel.close()
|
|
132
132
|
);
|
|
133
133
|
constructor(lifetime, network, broadcastAddressIpv4, broadcastAddressIpv6, broadcastPort, serverIpv4, serverIpv6, netInterface) {
|
|
134
134
|
this.#lifetime = lifetime;
|
|
@@ -160,10 +160,12 @@ class UdpMulticastServer {
|
|
|
160
160
|
async send(message, netInterface, uniCastTarget) {
|
|
161
161
|
netInterface = netInterface ?? this.netInterface;
|
|
162
162
|
if (uniCastTarget !== void 0 && netInterface !== void 0) {
|
|
163
|
+
const ipV4Target = isIPv4(uniCastTarget);
|
|
163
164
|
try {
|
|
164
|
-
await (await this.broadcastChannels.get(netInterface,
|
|
165
|
+
await (await this.broadcastChannels.get(netInterface, ipV4Target)).send(uniCastTarget, this.#broadcastPort, message);
|
|
165
166
|
} catch (error) {
|
|
166
167
|
logger.info(`${netInterface} ${uniCastTarget}: ${asError(error).message}`);
|
|
168
|
+
await this.#evictBroadcastChannel(netInterface, ipV4Target);
|
|
167
169
|
}
|
|
168
170
|
} else {
|
|
169
171
|
const netInterfaces = netInterface !== void 0 ? [{ name: netInterface }] : await this.network.getNetInterfaces();
|
|
@@ -187,6 +189,7 @@ class UdpMulticastServer {
|
|
|
187
189
|
await (await this.broadcastChannels.get(netInterface2, isIPv42)).send(address, this.#broadcastPort, message);
|
|
188
190
|
} catch (error) {
|
|
189
191
|
logger.info(`${netInterface2}: ${asError(error).message}`);
|
|
192
|
+
await this.#evictBroadcastChannel(netInterface2, isIPv42);
|
|
190
193
|
}
|
|
191
194
|
}),
|
|
192
195
|
`Error sending UDP Multicast message on interface ${netInterface2}`
|
|
@@ -196,6 +199,18 @@ class UdpMulticastServer {
|
|
|
196
199
|
);
|
|
197
200
|
}
|
|
198
201
|
}
|
|
202
|
+
/**
|
|
203
|
+
* Drop a broadcast channel after a send failure so the next send rebinds it. A failed send can mean the cached
|
|
204
|
+
* socket is bound to an interface address that no longer exists (e.g. after the host resumed from standby).
|
|
205
|
+
* Eviction must never escalate a send failure, so closing the stale socket is best-effort.
|
|
206
|
+
*/
|
|
207
|
+
async #evictBroadcastChannel(netInterface, isIPv42) {
|
|
208
|
+
try {
|
|
209
|
+
await this.broadcastChannels.evict(netInterface, isIPv42);
|
|
210
|
+
} catch (error) {
|
|
211
|
+
logger.info(`${netInterface}: failed to evict broadcast channel: ${asError(error).message}`);
|
|
212
|
+
}
|
|
213
|
+
}
|
|
199
214
|
async createBroadcastChannel(netInterface, isIPv42) {
|
|
200
215
|
return await this.network.createUdpSocket({
|
|
201
216
|
lifetime: this.#lifetime,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/net/udp/UdpMulticastServer.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,4BAA4B;AACrC,SAAS,eAAe;AAExB,SAAS,gBAAgB;AACzB,SAAS,cAAc;AACvB,SAAS,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["isIPv4", "netInterface"]
|
|
6
6
|
}
|
package/dist/esm/util/Cache.d.ts
CHANGED
|
@@ -17,6 +17,8 @@ declare class GenericCache<T> {
|
|
|
17
17
|
protected keyFor(params: unknown[]): string;
|
|
18
18
|
keys(): string[];
|
|
19
19
|
delete(key: string): Promise<void>;
|
|
20
|
+
/** Evict the entry addressed by the same params passed to {@link Cache.get}/{@link AsyncCache.get}. */
|
|
21
|
+
evict(...params: unknown[]): Promise<void>;
|
|
20
22
|
clear(): Promise<void>;
|
|
21
23
|
close(): Promise<void>;
|
|
22
24
|
private expire;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Cache.d.ts","sourceRoot":"","sources":["../../../src/util/Cache.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAO7C,cAAM,YAAY,CAAC,CAAC;IAQZ,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;IARpC,SAAS,CAAC,QAAQ,CAAC,SAAS,cAAqB;IACjD,SAAS,CAAC,QAAQ,CAAC,MAAM,iBAAwB;IACjD,SAAS,CAAC,QAAQ,CAAC,UAAU,sBAA6B;IAC1D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAQ;IAEtC,YACI,IAAI,EAAE,MAAM,EACK,UAAU,EAAE,QAAQ,EACpB,cAAc,CAAC,GAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,aAAA,EAQ7E;IAGD,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAE1C;IAED,IAAI,aAEH;IAEK,MAAM,CAAC,GAAG,EAAE,MAAM,iBAOvB;IAEK,KAAK,kBAMV;IAEK,KAAK,kBAIV;YAEa,MAAM;CAOvB;AAED,qBAAa,KAAK,CAAC,CAAC,CAAE,SAAQ,YAAY,CAAC,CAAC,CAAC;IAGrC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAF9B,YACI,IAAI,EAAE,MAAM,EACK,SAAS,EAAE,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,EACnD,UAAU,EAAE,QAAQ,EACpB,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,EAG5D;IAED,GAAG,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE,GAOe,CAAC,CACnC;CACJ;AAED,qBAAa,UAAU,CAAC,CAAC,CAAE,SAAQ,YAAY,CAAC,CAAC,CAAC;;IAK1C,OAAO,CAAC,QAAQ,CAAC,SAAS;IAF9B,YACI,IAAI,EAAE,MAAM,EACK,SAAS,EAAE,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,EAC5D,UAAU,EAAE,QAAQ,EACpB,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,EAG5D;IAED,GAAG,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAehC;IAWc,MAAM,CAAC,GAAG,EAAE,MAAM,iBAUhC;IAEc,KAAK,kBAGnB;CACJ"}
|
|
1
|
+
{"version":3,"file":"Cache.d.ts","sourceRoot":"","sources":["../../../src/util/Cache.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAO7C,cAAM,YAAY,CAAC,CAAC;IAQZ,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;IARpC,SAAS,CAAC,QAAQ,CAAC,SAAS,cAAqB;IACjD,SAAS,CAAC,QAAQ,CAAC,MAAM,iBAAwB;IACjD,SAAS,CAAC,QAAQ,CAAC,UAAU,sBAA6B;IAC1D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAQ;IAEtC,YACI,IAAI,EAAE,MAAM,EACK,UAAU,EAAE,QAAQ,EACpB,cAAc,CAAC,GAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,aAAA,EAQ7E;IAGD,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAE1C;IAED,IAAI,aAEH;IAEK,MAAM,CAAC,GAAG,EAAE,MAAM,iBAOvB;IAED,uGAAuG;IACjG,KAAK,CAAC,GAAG,MAAM,EAAE,OAAO,EAAE,iBAE/B;IAEK,KAAK,kBAMV;IAEK,KAAK,kBAIV;YAEa,MAAM;CAOvB;AAED,qBAAa,KAAK,CAAC,CAAC,CAAE,SAAQ,YAAY,CAAC,CAAC,CAAC;IAGrC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAF9B,YACI,IAAI,EAAE,MAAM,EACK,SAAS,EAAE,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,EACnD,UAAU,EAAE,QAAQ,EACpB,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,EAG5D;IAED,GAAG,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE,GAOe,CAAC,CACnC;CACJ;AAED,qBAAa,UAAU,CAAC,CAAC,CAAE,SAAQ,YAAY,CAAC,CAAC,CAAC;;IAK1C,OAAO,CAAC,QAAQ,CAAC,SAAS;IAF9B,YACI,IAAI,EAAE,MAAM,EACK,SAAS,EAAE,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,EAC5D,UAAU,EAAE,QAAQ,EACpB,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,EAG5D;IAED,GAAG,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAehC;IAWc,MAAM,CAAC,GAAG,EAAE,MAAM,iBAUhC;IAEc,KAAK,kBAGnB;CACJ"}
|
package/dist/esm/util/Cache.js
CHANGED
|
@@ -39,6 +39,10 @@ class GenericCache {
|
|
|
39
39
|
this.values.delete(key);
|
|
40
40
|
this.timestamps.delete(key);
|
|
41
41
|
}
|
|
42
|
+
/** Evict the entry addressed by the same params passed to {@link Cache.get}/{@link AsyncCache.get}. */
|
|
43
|
+
async evict(...params) {
|
|
44
|
+
await this.delete(this.keyFor(params));
|
|
45
|
+
}
|
|
42
46
|
async clear() {
|
|
43
47
|
for (const key of this.values.keys()) {
|
|
44
48
|
await this.delete(key);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/util/Cache.ts"],
|
|
4
|
-
"mappings": "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",
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@matter/general",
|
|
3
|
-
"version": "0.17.
|
|
3
|
+
"version": "0.17.3-alpha.0-20260614-888c310c5",
|
|
4
4
|
"description": "Non-Matter support for Matter.js",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"iot",
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
"@noble/curves": "^2.2.0"
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
|
-
"@matter/testing": "0.17.
|
|
38
|
+
"@matter/testing": "0.17.3-alpha.0-20260614-888c310c5"
|
|
39
39
|
},
|
|
40
40
|
"files": [
|
|
41
41
|
"dist/**/*",
|
|
@@ -9,6 +9,7 @@ import { SharedEnvironmentServices } from "#environment/SharedEnvironmentService
|
|
|
9
9
|
import { SharedServicesManager } from "#environment/SharedServicesManager.js";
|
|
10
10
|
import { Diagnostic } from "#log/Diagnostic.js";
|
|
11
11
|
import { LogFormat } from "#log/LogFormat.js";
|
|
12
|
+
import { LogLevel } from "#log/LogLevel.js";
|
|
12
13
|
import { InternalError } from "#MatterError.js";
|
|
13
14
|
import { Instant } from "#time/TimeUnit.js";
|
|
14
15
|
import { Lifetime } from "#util/Lifetime.js";
|
|
@@ -29,8 +30,8 @@ const logger = Logger.get("Environment");
|
|
|
29
30
|
* Access to general platform-dependent features.
|
|
30
31
|
*
|
|
31
32
|
* The following variables are defined by this class:
|
|
32
|
-
* * `log.level` - Log level to use {@link Logger.
|
|
33
|
-
* * `log.format` - Log format to use {@link Logger.
|
|
33
|
+
* * `log.level` - Log level to use, as a name (`debug`, `info`, `notice`, `warn`, `error`, `fatal`) or number (0-5) {@link Logger.level}
|
|
34
|
+
* * `log.format` - Log format to use {@link Logger.format}
|
|
34
35
|
* * `log.stack.limit` - Stack trace limit, see https://nodejs.org/api/errors.html#errorstacktracelimit
|
|
35
36
|
* * `mdns.networkInterface` - Network interface to use for MDNS broadcasts and scanning, default are all available interfaces
|
|
36
37
|
* * `mdns.ipv4` - Also announce/scan on IPv4 interfaces
|
|
@@ -349,7 +350,7 @@ export class Environment implements ServiceProvider, Lifetime.Owner {
|
|
|
349
350
|
global = env;
|
|
350
351
|
|
|
351
352
|
env.vars.use(() => {
|
|
352
|
-
Logger.level = env.vars.get("log.level", Logger.level);
|
|
353
|
+
Logger.level = env.vars.get("log.level", LogLevel.names[LogLevel(Logger.level)]);
|
|
353
354
|
Logger.format = env.vars.get("log.format", Logger.format);
|
|
354
355
|
|
|
355
356
|
const stackLimit = global.vars.number("log.stack.limit");
|
|
@@ -9,7 +9,7 @@ import { Minutes } from "#time/TimeUnit.js";
|
|
|
9
9
|
import { Bytes } from "#util/Bytes.js";
|
|
10
10
|
import { Lifetime } from "#util/Lifetime.js";
|
|
11
11
|
import { Logger } from "../../log/Logger.js";
|
|
12
|
-
import {
|
|
12
|
+
import { AsyncCache } from "../../util/Cache.js";
|
|
13
13
|
import { asError } from "../../util/Error.js";
|
|
14
14
|
import { isIPv4 } from "../../util/Ip.js";
|
|
15
15
|
import { Network, NoAddressAvailableError } from "../Network.js";
|
|
@@ -98,11 +98,11 @@ export class UdpMulticastServer {
|
|
|
98
98
|
}
|
|
99
99
|
}
|
|
100
100
|
|
|
101
|
-
private readonly broadcastChannels = new
|
|
101
|
+
private readonly broadcastChannels = new AsyncCache<UdpSocket>(
|
|
102
102
|
"UDP broadcast channel",
|
|
103
103
|
(netInterface, isIPv4) => this.createBroadcastChannel(netInterface, isIPv4),
|
|
104
104
|
Minutes(5),
|
|
105
|
-
async (
|
|
105
|
+
async (_key, channel) => channel.close(),
|
|
106
106
|
);
|
|
107
107
|
|
|
108
108
|
private constructor(
|
|
@@ -151,12 +151,14 @@ export class UdpMulticastServer {
|
|
|
151
151
|
|
|
152
152
|
// When we know the network interface and the unicast target, we can send unicast
|
|
153
153
|
if (uniCastTarget !== undefined && netInterface !== undefined) {
|
|
154
|
+
const ipV4Target = isIPv4(uniCastTarget);
|
|
154
155
|
try {
|
|
155
156
|
await (
|
|
156
|
-
await this.broadcastChannels.get(netInterface,
|
|
157
|
+
await this.broadcastChannels.get(netInterface, ipV4Target)
|
|
157
158
|
).send(uniCastTarget, this.#broadcastPort, message);
|
|
158
159
|
} catch (error) {
|
|
159
160
|
logger.info(`${netInterface} ${uniCastTarget}: ${asError(error).message}`);
|
|
161
|
+
await this.#evictBroadcastChannel(netInterface, ipV4Target);
|
|
160
162
|
}
|
|
161
163
|
} else {
|
|
162
164
|
const netInterfaces =
|
|
@@ -184,6 +186,7 @@ export class UdpMulticastServer {
|
|
|
184
186
|
).send(address, this.#broadcastPort, message);
|
|
185
187
|
} catch (error) {
|
|
186
188
|
logger.info(`${netInterface}: ${asError(error).message}`);
|
|
189
|
+
await this.#evictBroadcastChannel(netInterface, isIPv4);
|
|
187
190
|
}
|
|
188
191
|
}),
|
|
189
192
|
`Error sending UDP Multicast message on interface ${netInterface}`,
|
|
@@ -194,6 +197,19 @@ export class UdpMulticastServer {
|
|
|
194
197
|
}
|
|
195
198
|
}
|
|
196
199
|
|
|
200
|
+
/**
|
|
201
|
+
* Drop a broadcast channel after a send failure so the next send rebinds it. A failed send can mean the cached
|
|
202
|
+
* socket is bound to an interface address that no longer exists (e.g. after the host resumed from standby).
|
|
203
|
+
* Eviction must never escalate a send failure, so closing the stale socket is best-effort.
|
|
204
|
+
*/
|
|
205
|
+
async #evictBroadcastChannel(netInterface: string, isIPv4: boolean) {
|
|
206
|
+
try {
|
|
207
|
+
await this.broadcastChannels.evict(netInterface, isIPv4);
|
|
208
|
+
} catch (error) {
|
|
209
|
+
logger.info(`${netInterface}: failed to evict broadcast channel: ${asError(error).message}`);
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
|
|
197
213
|
private async createBroadcastChannel(netInterface: string, isIPv4: boolean): Promise<UdpSocket> {
|
|
198
214
|
return await this.network.createUdpSocket({
|
|
199
215
|
lifetime: this.#lifetime,
|
package/src/util/Cache.ts
CHANGED
|
@@ -50,6 +50,11 @@ class GenericCache<T> {
|
|
|
50
50
|
this.timestamps.delete(key);
|
|
51
51
|
}
|
|
52
52
|
|
|
53
|
+
/** Evict the entry addressed by the same params passed to {@link Cache.get}/{@link AsyncCache.get}. */
|
|
54
|
+
async evict(...params: unknown[]) {
|
|
55
|
+
await this.delete(this.keyFor(params));
|
|
56
|
+
}
|
|
57
|
+
|
|
53
58
|
async clear() {
|
|
54
59
|
for (const key of this.values.keys()) {
|
|
55
60
|
await this.delete(key);
|