@matter/general 0.16.0-alpha.0-20251006-3fe1e7c57 → 0.16.0-alpha.0-20251013-89bb7099d

package/dist/esm/util/Construction.d.ts

@@ -16,7 +16,7 @@ export declare function asyncNew<const A extends any[], const C extends new (...
  * Construction happens in the initializer parameter of {@link Construction} or via {@link Construction.construct} on
  * the subject.  You invoke in your constructor and place in a property called "construction".
  *
- * Destruciton is optional and happens in the destructor parameter of {@link Construction#close} or via
+ * Destruction is optional and happens in the destructor parameter of {@link Construction#close} or via
  * {@link Construction.destruct} on the subject.  Typically you invoke in a "close" method of the subject.
  *
  * If construction or destruction is not asynchronous (does not return a Promise) then they complete synchronously,

package/dist/esm/util/Multiplex.js

@@ -20,7 +20,7 @@ class BasicMultiplex {
         if (description) {
           message = `${message} in ${description}`;
         }
-        logger.error(message, e);
+        logger.error(`${message}:`, e);
       }).finally(() => this.#workers.delete(entry)),
       description
     };

package/dist/esm/util/Multiplex.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/util/Multiplex.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,cAAc;AACvB,SAAS,4BAA4B;AACrC,SAAS,oBAAoB;AAC7B,SAAS,gBAAgB;AAEzB,MAAM,SAAS,OAAO,IAAI,WAAW;AAmB9B,MAAM,eAA4C;AAAA,EACrD,WAAW,IAAI,SAAsB;AAAA,EAErC,IAAI,QAA+B,aAAsB;AACrD,QAAI,CAAC,aAAa,GAAG,MAAM,GAAG;AAC1B;AAAA,IACJ;AAEA,UAAM,QAAQ;AAAA,MACV,MAAM,QAAQ,QAAQ,MAAM,EACvB,MAAM,OAAK;AACR,YAAI,UAAU;AACd,YAAI,aAAa;AACb,oBAAU,GAAG,OAAO,OAAO,WAAW;AAAA,QAC1C;AACA,eAAO,MAAM,SAAS,CAAC;AAAA,MAC3B,CAAC,EACA,QAAQ,MAAM,KAAK,SAAS,OAAO,KAAK,CAAC;AAAA,MAC9C;AAAA,IACJ;AAEA,SAAK,SAAS,IAAI,KAAK;AAAA,EAC3B;AAAA,EAEA,MAAM,QAAQ;AACV,WAAO,KAAK,SAAS,MAAM;AACvB,YAAM,qBAAqB,WAAW,CAAC,GAAG,KAAK,QAAQ,EAAE,IAAI,WAAS,MAAM,IAAI,CAAC;AAAA,IACrF;AAAA,EACJ;AAAA,EAEA,KACI,aACA,YACgC;AAChC,WAAO,KAAK,MAAM,EAAE,KAAK,aAAa,UAAU;AAAA,EACpD;AAAA,EAEA,CAAC,OAAO,YAAY,IAAI,KAAK,MAAM,KAAK,IAAI;AAChD;",
+  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,cAAc;AACvB,SAAS,4BAA4B;AACrC,SAAS,oBAAoB;AAC7B,SAAS,gBAAgB;AAEzB,MAAM,SAAS,OAAO,IAAI,WAAW;AAmB9B,MAAM,eAA4C;AAAA,EACrD,WAAW,IAAI,SAAsB;AAAA,EAErC,IAAI,QAA+B,aAAsB;AACrD,QAAI,CAAC,aAAa,GAAG,MAAM,GAAG;AAC1B;AAAA,IACJ;AAEA,UAAM,QAAQ;AAAA,MACV,MAAM,QAAQ,QAAQ,MAAM,EACvB,MAAM,OAAK;AACR,YAAI,UAAU;AACd,YAAI,aAAa;AACb,oBAAU,GAAG,OAAO,OAAO,WAAW;AAAA,QAC1C;AACA,eAAO,MAAM,GAAG,OAAO,KAAK,CAAC;AAAA,MACjC,CAAC,EACA,QAAQ,MAAM,KAAK,SAAS,OAAO,KAAK,CAAC;AAAA,MAC9C;AAAA,IACJ;AAEA,SAAK,SAAS,IAAI,KAAK;AAAA,EAC3B;AAAA,EAEA,MAAM,QAAQ;AACV,WAAO,KAAK,SAAS,MAAM;AACvB,YAAM,qBAAqB,WAAW,CAAC,GAAG,KAAK,QAAQ,EAAE,IAAI,WAAS,MAAM,IAAI,CAAC;AAAA,IACrF;AAAA,EACJ;AAAA,EAEA,KACI,aACA,YACgC;AAChC,WAAO,KAAK,MAAM,EAAE,KAAK,aAAa,UAAU;AAAA,EACpD;AAAA,EAEA,CAAC,OAAO,YAAY,IAAI,KAAK,MAAM,KAAK,IAAI;AAChD;",
   "names": []
 }

package/dist/esm/util/String.d.ts

@@ -16,7 +16,11 @@ export declare function decamelize(name: string, separator?: string): string;
 /**
  * Like JSON.stringify but targets well-formed JS and is slightly more readable.
  */
-export declare function serialize(value: any): string | undefined;
+export declare function serialize(value: unknown): string | undefined;
+/**
+ * Like {@link JSON.stringify} but with support for additional standard objects.
+ */
+export declare function asJson(value: unknown, space?: number): string;
 export declare namespace serialize {
     /**
      * Custom serialization function key.

package/dist/esm/util/String.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"String.d.ts","sourceRoot":"","sources":["../../../src/util/String.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,CAAC,GACE,UAAU,CAAC,CAAC,CAAC,CAClE;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,UAAQ,UA8DxD;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,SAAM,UAgBvD;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,GAAG,sBAyEnC;AAED,yBAAiB,SAAS,CAAC;IACvB;;OAEG;IACI,MAAM,SAAS,eAAsB,CAAC;IAE7C;;;OAGG;IACH,SAAgB,IAAI,CAAC,KAAK,EAAE,GAAG,OAU9B;IAED;;OAEG;IACH,SAAgB,WAAW,CAAC,KAAK,EAAE,GAAG,WAgBrC;CACJ;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,KAAK,GAAG,IAAI,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,UAkBvE;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,UAwD3C"}
+{"version":3,"file":"String.d.ts","sourceRoot":"","sources":["../../../src/util/String.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,CAAC,GACE,UAAU,CAAC,CAAC,CAAC,CAClE;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,UAAQ,UA8DxD;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,SAAM,UAgBvD;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,OAAO,sBAyEvC;AAED;;GAEG;AACH,wBAAgB,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,MAAM,UAcpD;AAED,yBAAiB,SAAS,CAAC;IACvB;;OAEG;IACI,MAAM,SAAS,eAAsB,CAAC;IAE7C;;;OAGG;IACH,SAAgB,IAAI,CAAC,KAAK,EAAE,GAAG,OAU9B;IAED;;OAEG;IACH,SAAgB,WAAW,CAAC,KAAK,EAAE,GAAG,WAgBrC;CACJ;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,KAAK,GAAG,IAAI,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,UAkBvE;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,UAwD3C"}

package/dist/esm/util/String.js

@@ -135,6 +135,21 @@ function serialize(value) {
   }
   return serializeOne(value);
 }
+function asJson(value, space) {
+  return JSON.stringify(
+    value,
+    (_key, value2) => {
+      if (typeof value2 === "bigint") {
+        return value2.toString();
+      }
+      if (Bytes.isBytes(value2)) {
+        return Bytes.toHex(value2);
+      }
+      return value2;
+    },
+    space
+  );
+}
 ((serialize2) => {
   serialize2.SERIALIZE = Symbol("SERIALIZE");
   function asIs(value) {
@@ -223,6 +238,7 @@ function serializeToJs(value) {
   return parts.join("");
 }
 export {
+  asJson,
   camelize,
   capitalize,
   decamelize,

package/dist/esm/util/String.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/util/String.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["value", "serialize", "parts"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@matter/general",
-    "version": "0.16.0-alpha.0-20251006-3fe1e7c57",
+    "version": "0.16.0-alpha.0-20251013-89bb7099d",
     "description": "Non-Matter support for Matter.js",
     "keywords": [
         "iot",
@@ -36,7 +36,7 @@
         "@noble/curves": "^2.0.1"
     },
     "devDependencies": {
-        "@matter/testing": "0.16.0-alpha.0-20251006-3fe1e7c57"
+        "@matter/testing": "0.16.0-alpha.0-20251013-89bb7099d"
     },
     "files": [
         "dist/**/*",

package/src/codec/Base64Codec.ts

@@ -103,7 +103,7 @@ export namespace Base64 {
                 outLength += 1;
                 break;
             case 1:
-                throw new Error("Invalid base-64 encoding");
+                throw new SyntaxError("Invalid base-64 encoding");
         }
 
         const out = new Uint8Array(outLength);
@@ -113,7 +113,7 @@ export namespace Base64 {
                 if (inPos >= inputLength) return 0;
                 const v = A2B[input.codePointAt(inPos++) ?? -1];
                 if (v === undefined) {
-                    throw new Error("Invalid base-64 encoding");
+                    throw new SyntaxError("Invalid base-64 encoding");
                 }
                 return v;
             }

package/src/environment/Environment.ts

@@ -33,12 +33,12 @@ const logger = Logger.get("Environment");
  * TODO - could remove global singletons by moving here
  */
 export class Environment {
-    #services?: Map<abstract new (...args: any[]) => any, Environmental.Service | null>;
+    #services?: Map<Environmental.ServiceType, Environmental.Service | null>;
     #name: string;
     #parent?: Environment;
-    #added = Observable<[type: abstract new (...args: any[]) => {}, instance: {}]>();
-    #deleted = Observable<[type: abstract new (...args: any[]) => {}, instance: {}]>();
-    #serviceEvents = new Map<abstract new (...args: any[]) => any, Environmental.ServiceEvents<any>>();
+    #added = Observable<[type: Environmental.ServiceType, instance: {}]>();
+    #deleted = Observable<[type: Environmental.ServiceType, instance: {}]>();
+    #serviceEvents = new Map<Environmental.ServiceType, Environmental.ServiceEvents<any>>();
 
     constructor(name: string, parent?: Environment) {
         this.#name = name;
@@ -48,7 +48,7 @@ export class Environment {
     /**
      * Determine if an environmental service is available.
      */
-    has(type: abstract new (...args: any[]) => any): boolean {
+    has(type: Environmental.ServiceType): boolean {
         const mine = this.#services?.get(type);
 
         if (mine === null) {
@@ -61,14 +61,14 @@ export class Environment {
     /**
      * Determine if an environmental services is owned by this environment (not an ancestor).
      */
-    owns(type: abstract new (...args: any[]) => any): boolean {
+    owns(type: Environmental.ServiceType): boolean {
         return !!this.#services?.get(type);
     }
 
     /**
      * Access an environmental service.
      */
-    get<T extends object>(type: abstract new (...args: any[]) => T): T {
+    get<T extends object>(type: Environmental.ServiceType<T>): T {
         const mine = this.#services?.get(type);
 
         if (mine !== undefined && mine !== null) {
@@ -77,21 +77,20 @@ export class Environment {
 
         // When null then we do not have it and also do not want to inherit from parent
         if (mine === undefined) {
-            let instance = this.#parent?.maybeGet(type);
+            const instance = this.#parent?.maybeGet(type);
             if (instance !== undefined && instance !== null) {
                 // Parent has it, use it
                 return instance;
             }
+        }
 
-            // ... otherwise try to create it
-            if ((type as Environmental.Factory<T>)[Environmental.create]) {
-                instance = (type as any)[Environmental.create](this) as T;
-                if (!(instance instanceof type)) {
-                    throw new InternalError(`Service creation did not produce instance of ${type.name}`);
-                }
-                this.set(type, instance);
-                return instance;
+        // ... otherwise try to create it. The create method must install it in the environment if needed
+        if ((type as Environmental.Factory<T>)[Environmental.create]) {
+            const instance = (type as any)[Environmental.create](this) as T;
+            if (!(instance instanceof type)) {
+                throw new InternalError(`Service creation did not produce instance of ${type.name}`);
             }
+            return instance;
         }
 
         throw new UnsupportedDependencyError(`Required dependency ${type.name}`, "is not available");
@@ -100,64 +99,48 @@ export class Environment {
     /**
      * Access an environmental service that may not exist.
      */
-    maybeGet<T extends object>(type: abstract new (...args: any[]) => T): T | undefined {
+    maybeGet<T extends object>(type: Environmental.ServiceType<T>): T | undefined {
         if (this.has(type)) {
             return this.get(type);
         }
     }
 
     /**
-     * Remove an environmental service.
+     * Remove an environmental service and block further inheritance
      *
      * @param type the class of the service to remove
      * @param instance optional instance expected, if existing instance does not match it is not deleted
      */
-    delete(type: abstract new (...args: any[]) => any, instance?: any) {
-        if (instance !== undefined && this.#services?.get(type) !== instance) {
+    delete(type: Environmental.ServiceType, instance?: any) {
+        const localInstance = this.#services?.get(type);
+
+        // Remove instance and replace by null to prevent inheritance from parent
+        this.#services?.set(type, null);
+
+        if (localInstance === undefined || localInstance === null) {
+            return;
+        }
+        if (instance !== undefined && localInstance !== instance) {
             return;
         }
-        this.#services?.delete(type);
-        this.#parent?.delete(type);
 
-        this.#deleted.emit(type, instance);
+        this.#deleted.emit(type, localInstance);
 
         const serviceEvents = this.#serviceEvents.get(type);
         if (serviceEvents) {
-            serviceEvents.deleted.emit(instance);
+            serviceEvents.deleted.emit(localInstance);
         }
     }
 
-    /**
-     * Prevent this environment from automatically instantiating or retrieving a service from parent environment.
-     *
-     * @param type the class of the service to block
-     */
-    block(type: abstract new (...args: any[]) => any) {
-        const instance = this.#services?.get(type);
-
-        if (instance !== undefined && instance !== null) {
-            this.#services?.delete(type);
-
-            this.#deleted.emit(type, instance);
-
-            const serviceEvents = this.#serviceEvents.get(type);
-            if (serviceEvents) {
-                serviceEvents.deleted.emit(instance);
-            }
-        }
-
-        this.#services?.set(type, null);
-    }
-
     /**
      * Remove and close an environmental service.
      */
     close<T extends object>(
-        type: abstract new (...args: any[]) => T,
+        type: Environmental.ServiceType<T>,
     ): T extends { close: () => MaybePromise<void> } ? MaybePromise<void> : void {
         const instance = this.maybeGet(type);
+        this.delete(type, instance); // delete and block inheritance
         if (instance !== undefined) {
-            this.delete(type, instance);
             return (instance as Partial<Destructable>).close?.() as T extends { close: () => MaybePromise<void> }
                 ? MaybePromise<void>
                 : void;
@@ -176,7 +159,7 @@ export class Environment {
     /**
      * Install a preinitialized version of an environmental service.
      */
-    set<T extends {}>(type: abstract new (...args: any[]) => T, instance: T) {
+    set<T extends {}>(type: Environmental.ServiceType<T>, instance: T) {
         if (!this.#services) {
             this.#services = new Map();
         }
@@ -222,7 +205,7 @@ export class Environment {
      *
      * This is a more convenient way to observe a specific service than {@link added} and {@link deleted}.
      */
-    eventsFor<T extends Environmental.Factory<any>>(type: T) {
+    eventsFor<T extends Environmental.ServiceType>(type: T) {
         let events = this.#serviceEvents.get(type);
         if (events === undefined) {
             events = {
@@ -241,8 +224,8 @@ export class Environment {
      * {@link added} in the future if the service is added or replaced and/or {@link deleted} if the service is replaced
      * or deleted.
      */
-    applyTo<T extends Environmental.Factory<any>>(
-        type: T,
+    applyTo<T extends object>(
+        type: Environmental.ServiceType<T>,
         added?: (env: Environment, service: T) => MaybePromise<void>,
         deleted?: (env: Environment, service: T) => MaybePromise<void>,
     ) {

package/src/environment/Environmental.ts

@@ -22,10 +22,25 @@ export namespace Environmental {
         construction?: Promise<any>;
     }
 
+    /**
+     * An object used for service identification.
+     *
+     * We use classes as the key for service registration.  Classes serve as ideal keys because they are trivial to
+     * manage and allow us to manage services in a type-safe manner.
+     *
+     * Any class may be used as the service identifier; the only requirement is that a registered instance is a subclass
+     * of the {@link ServiceType}.
+     *
+     * Note that {@link Environment} only considers service available for the exact class under which they are
+     * registered.  You cannot retrieve a service registered for a subclass of a {@link ServiceType} using the base
+     * class.  You can however register the under both the base and derived {@link ServiceType}s.
+     */
+    export type ServiceType<T extends object = object> = abstract new (...args: any[]) => T;
+
     /**
      * A factory for a {@link Service}.
      *
-     * A "factory" is just a class with a static {@link create} method that performs instantiation.
+     * A "factory" is a concrete {@link ServiceType} with a static {@link create} method that performs instantiation.
      */
     export interface Factory<T extends object = object> {
         new (...args: any[]): T;
@@ -42,7 +57,7 @@ export namespace Environmental {
     /**
      * Events related to service lifecycle.
      */
-    export interface ServiceEvents<T extends abstract new (...args: any[]) => T> {
+    export interface ServiceEvents<T extends Environmental.ServiceType> {
         added: Observable<[instance: InstanceType<T>]>;
         deleted: Observable<[instance: InstanceType<T>]>;
     }

package/src/log/Logger.ts

@@ -215,7 +215,7 @@ export class Logger {
             const dest = Logger.destinations[name];
 
             if (level < (dest.facilityLevels?.[this.#name] ?? dest.level)) {
-                return;
+                continue;
             }
 
             if (!dest.context) {

package/src/net/Network.ts

@@ -12,6 +12,10 @@ export class NetworkError extends MatterError {}
 
 export class NoAddressAvailableError extends NetworkError {}
 
+export class BindError extends NetworkError {}
+
+export class AddressInUseError extends BindError {}
+
 export const STANDARD_MATTER_PORT = 5540;
 
 /**

package/src/net/ServerAddress.ts

@@ -84,6 +84,22 @@ export namespace ServerAddress {
         return Diagnostic.squash(...diagnostic);
     }
 
+    export function isEqual(a: ServerAddress, b: ServerAddress): boolean {
+        if (a.type !== b.type) {
+            return false;
+        }
+
+        if (a.type === "udp" && b.type === "udp") {
+            return a.ip === b.ip && a.port === b.port;
+        }
+
+        if (a.type === "ble" && b.type === "ble") {
+            return a.peripheralAddress === b.peripheralAddress;
+        }
+
+        return false;
+    }
+
     export function definitionOf(address: ServerAddress): Definition {
         return address;
     }

package/src/net/http/HttpEndpoint.ts

@@ -0,0 +1,60 @@
+/**
+ * @license
+ * Copyright 2022-2025 Matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { AppAddress } from "#net/AppAddress.js";
+import { Bytes } from "#util/Bytes.js";
+import { MaybePromise } from "#util/Promises.js";
+
+/**
+ * A platform-independent HTTP endpoint implementation.
+ *
+ * This provides a modern WinterTC-style interface with a focus on simplifying platform-specific implementations.
+ */
+export interface HttpEndpoint {
+    /**
+     * Handler for normal HTTP requests.
+     */
+    http?: HttpEndpoint.HttpHandler;
+
+    /**
+     * Handler for WebSocket upgrade requests.
+     */
+    ws?: HttpEndpoint.WsHandler;
+
+    /**
+     * Release resources for the endpoint.
+     */
+    close(): Promise<void>;
+}
+
+export namespace HttpEndpoint {
+    /**
+     * HTTP request callback.
+     */
+    export type HttpHandler = (request: Request) => MaybePromise<void | Response>;
+
+    /**
+     * WebSocket request callback.
+     */
+    export type WsHandler = (request: Request, upgrade: () => Promise<WsConnection>) => MaybePromise<void>;
+
+    /**
+     * A WebSocket connection.
+     */
+    export interface WsConnection extends ReadableWritablePair<WsMessage, WsMessage> {}
+
+    /**
+     * Raw WebSocket message payload.
+     */
+    export type WsMessage = Bytes | string;
+
+    /**
+     * Configuration options.
+     */
+    export interface Options {
+        address: AppAddress.Definition;
+    }
+}

package/src/net/http/HttpEndpointFactory.ts

@@ -0,0 +1,27 @@
+/**
+ * @license
+ * Copyright 2022-2025 Matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { HttpEndpoint } from "./HttpEndpoint.js";
+import type { HttpService } from "./HttpService.js";
+
+/**
+ * Environmental component that creates HTTP endpoints.
+ *
+ * This component creates a dedicated HTTP server.  Use {@link HttpService} for shared access to HTTP endpoints.
+ */
+export abstract class HttpEndpointFactory {
+    /**
+     * Indicates support for HTTP handlers.
+     */
+    supportsHttp = true;
+
+    /**
+     * Indicates support for WebSocket handlers.
+     */
+    supportsWs = true;
+
+    abstract create(options: HttpEndpoint.Options): Promise<HttpEndpoint>;
+}

package/src/net/http/HttpEndpointGroup.ts

@@ -0,0 +1,43 @@
+/**
+ * @license
+ * Copyright 2022-2025 Matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Logger } from "#log/Logger.js";
+import { MatterAggregateError } from "#MatterError.js";
+import { HttpEndpoint } from "./HttpEndpoint.js";
+
+const logger = Logger.get("HttpEndpointGroup");
+
+/**
+ * A collection of HTTP endpoints that support the same set of handlers.
+ */
+export class HttpEndpointGroup implements HttpEndpoint {
+    #endpoints: HttpEndpoint[];
+
+    constructor(endpoints: HttpEndpoint[]) {
+        this.#endpoints = endpoints;
+    }
+
+    set http(handler: HttpEndpoint.HttpHandler) {
+        for (const endpoint of this.#endpoints) {
+            endpoint.http = handler;
+        }
+    }
+
+    set ws(handler: HttpEndpoint.WsHandler) {
+        for (const endpoint of this.#endpoints) {
+            endpoint.ws = handler;
+        }
+    }
+
+    async close(): Promise<void> {
+        try {
+            await MatterAggregateError.allSettled(this.#endpoints.map(endpoint => endpoint.close()));
+        } catch (e) {
+            logger.error("Error closing HTTP endpoints", e);
+        }
+        this.#endpoints = [];
+    }
+}

package/src/net/http/HttpService.ts

@@ -0,0 +1,75 @@
+/**
+ * @license
+ * Copyright 2022-2025 Matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Environment } from "#environment/Environment.js";
+import { Environmental } from "#environment/Environmental.js";
+import { ImplementationError } from "#MatterError.js";
+import { AppAddress } from "#net/AppAddress.js";
+import { HttpEndpoint } from "./HttpEndpoint.js";
+import { HttpEndpointFactory } from "./HttpEndpointFactory.js";
+import { HttpEndpointGroup } from "./HttpEndpointGroup.js";
+import { HttpSharedEndpoint } from "./HttpSharedEndpoint.js";
+
+/**
+ * An environmental service that manages shared access to a set of endpoints.
+ */
+export class HttpService {
+    #factory: HttpEndpointFactory;
+    #endpoints = {} as Record<string, HttpSharedEndpoint>;
+
+    constructor(factory: HttpEndpointFactory) {
+        this.#factory = factory;
+    }
+
+    async create(...addresses: AppAddress.Definition[]) {
+        if (addresses.length === 1) {
+            return this.#forAddress(addresses[0]);
+        }
+
+        const endpoints = Array<HttpEndpoint>();
+
+        try {
+            for (const address of addresses) {
+                endpoints.push(await this.#forAddress(address));
+            }
+        } catch (e) {
+            await Promise.allSettled(endpoints.map(endpoint => endpoint.close()));
+            throw e;
+        }
+
+        return new HttpEndpointGroup(endpoints);
+    }
+
+    async #forAddress(address: AppAddress.Definition) {
+        const addr = AppAddress.for(address);
+        if (addr.appProtocol !== "http" && addr.appProtocol !== "ws") {
+            throw new ImplementationError(`Unsupported address ${addr} for HTTP endpoint`);
+        }
+
+        const key = JSON.stringify(addr.transport);
+        let endpoint = this.#endpoints[key];
+        if (endpoint) {
+            if (endpoint.isTls !== addr.isTls) {
+                const addrIs = addr.isTls ? "encrypted" : "unencrypted";
+                const endpointIs = endpoint.isTls ? "encrypted" : "unencrypted";
+                throw new ImplementationError(
+                    `Service address ${addr} is ${addrIs} but existing endpoint is ${endpointIs}`,
+                );
+            }
+        } else {
+            endpoint = new HttpSharedEndpoint(addr.isTls, () => this.#factory.create({ address }));
+            this.#endpoints[key] = endpoint;
+        }
+
+        return await endpoint.use();
+    }
+
+    static [Environmental.create](env: Environment) {
+        const instance = new HttpService(env.get(HttpEndpointFactory));
+        env.set(HttpService, instance);
+        return instance;
+    }
+}