@smarthome.exchange/api 1.0.1 → 1.1.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/changelog.md +14 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.smarthomeexchangeapiclient.d.ts +7 -0
- package/dist_ts/classes.smarthomeexchangeapiclient.js +23 -2
- package/package.json +10 -12
- package/readme.md +34 -4
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.smarthomeexchangeapiclient.ts +36 -1
package/changelog.md
CHANGED
|
@@ -1,5 +1,19 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-11-11 - 1.1.0
|
|
4
|
+
|
|
5
|
+
### Features
|
|
6
|
+
|
|
7
|
+
- pin the hub's TLS public key with the client option `hubKeySha256` (client)
|
|
8
|
+
- The pin is the RFC 7469 `pin-sha256` of the hub key (padded standard base64, 44 characters) and requires an `https:` hubUrl; the constructor rejects hex, every other form and a non-`https:` hub URL with a `TypeError`.
|
|
9
|
+
- A pinned client sends every request over its started TypedSocket, opened with TypedSocket's `tls: { publicKeySha256 }`, and never over HTTP: requests before `start()` or after `stop()` reject, and a hub presenting another key rejects `start()` with `TypedSocketTlsPinError` before any request byte or credential is written.
|
|
10
|
+
- Clients without `hubKeySha256` are unchanged.
|
|
11
|
+
|
|
12
|
+
### Maintenance
|
|
13
|
+
|
|
14
|
+
- Move to TypedSocket ^10.1.0 and TypedRequest ^9.2.0, one TypedRequest copy in the production dependency graph, and test against SmartServe 10.0.1. The socket wire major stays 9, so started clients keep working with TypedSocket 9 hubs. TypedSocket 10 no longer supports Deno, and an HTTP answer outside 2xx now rejects with TypedRequest's `TypedRequestHttpError` (still an `Error` with the message `HTTP <status>: <statusText>`).
|
|
15
|
+
- Update release tooling: replace the deprecated @git.zone/tsbuild, @git.zone/tsdoc, @git.zone/tsrun and @git.zone/tstest with @git.zone/tsrepo 2.0.0 (`tsrepo build`, `tsrepo test`, `tsrepo docs`; tests import `@git.zone/tsrepo/tapbundle`), pnpm 12.17.0 and @types/node 26.6.6.
|
|
16
|
+
|
|
3
17
|
## 2026-10-12 - 1.0.1
|
|
4
18
|
|
|
5
19
|
### Fixes
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@smarthome.exchange/api',
|
|
6
|
-
version: '1.0
|
|
6
|
+
version: '1.1.0',
|
|
7
7
|
description: 'Typed API client for smarthome.exchange hubs.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx5QkFBeUI7SUFDL0IsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLCtDQUErQztDQUM3RCxDQUFBIn0=
|
|
@@ -4,6 +4,13 @@ export interface IShxApiClientOptions {
|
|
|
4
4
|
homeId: string;
|
|
5
5
|
authorizationHeaderProvider: TShxAuthorizationHeaderProvider;
|
|
6
6
|
socketConnectionPreparationTimeoutMs?: number;
|
|
7
|
+
/**
|
|
8
|
+
* Pins the hub's TLS public key (Node.js): the RFC 7469 `pin-sha256` of the hub certificate's
|
|
9
|
+
* public key, the SHA-256 of its DER SubjectPublicKeyInfo as padded standard base64
|
|
10
|
+
* (44 characters). Requires an `https:` hubUrl. A pinned client sends every request over its
|
|
11
|
+
* started TypedSocket, which connects only to a hub presenting this key, and never over HTTP.
|
|
12
|
+
*/
|
|
13
|
+
hubKeySha256?: string;
|
|
7
14
|
}
|
|
8
15
|
export interface IShxAuthorizationContext {
|
|
9
16
|
readonly homeId: string;
|
|
@@ -1,10 +1,16 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
2
|
const maxLifecycleOperationCount = 64;
|
|
3
|
+
/**
|
|
4
|
+
* A SHA-256 digest (32 bytes) as canonical padded standard base64: 43 characters and `=`, where
|
|
5
|
+
* the last character before the padding carries four data bits and two zero bits.
|
|
6
|
+
*/
|
|
7
|
+
const hubKeySha256Pattern = /^[A-Za-z0-9+/]{42}[AEIMQUYcgkosw048]=$/;
|
|
3
8
|
export class SmarthomeExchangeApiClient {
|
|
4
9
|
#homeId;
|
|
5
10
|
#httpEndpoint;
|
|
6
11
|
#hubUrl;
|
|
7
12
|
#socketConnectionPreparationTimeoutMs;
|
|
13
|
+
#hubKeySha256;
|
|
8
14
|
#authorizationHeaderProvider;
|
|
9
15
|
lifecycleTail = Promise.resolve();
|
|
10
16
|
lifecycleOperationCount = 0;
|
|
@@ -16,7 +22,7 @@ export class SmarthomeExchangeApiClient {
|
|
|
16
22
|
#typedsocketClient;
|
|
17
23
|
typedrouter = new plugins.typedrequest.TypedRouter();
|
|
18
24
|
constructor(optionsArg) {
|
|
19
|
-
this.assertKnownProperties(optionsArg, ['hubUrl', 'homeId', 'authorizationHeaderProvider', 'socketConnectionPreparationTimeoutMs'], 'Client options');
|
|
25
|
+
this.assertKnownProperties(optionsArg, ['hubUrl', 'homeId', 'authorizationHeaderProvider', 'socketConnectionPreparationTimeoutMs', 'hubKeySha256'], 'Client options');
|
|
20
26
|
if (!optionsArg || typeof optionsArg.homeId !== 'string'
|
|
21
27
|
|| optionsArg.homeId.length < 1 || optionsArg.homeId.length > 200
|
|
22
28
|
|| optionsArg.homeId.trim() !== optionsArg.homeId
|
|
@@ -35,6 +41,17 @@ export class SmarthomeExchangeApiClient {
|
|
|
35
41
|
|| hubUrl.username || hubUrl.password || hubUrl.search || hubUrl.hash) {
|
|
36
42
|
throw new TypeError('hubUrl must be an HTTP or HTTPS URL without credentials, query, or fragment.');
|
|
37
43
|
}
|
|
44
|
+
const hubKeySha256 = optionsArg.hubKeySha256;
|
|
45
|
+
if (hubKeySha256 !== undefined) {
|
|
46
|
+
if (typeof hubKeySha256 !== 'string' || !hubKeySha256Pattern.test(hubKeySha256)) {
|
|
47
|
+
throw new TypeError('hubKeySha256 must be the RFC 7469 pin-sha256 of the hub public key: the SHA-256 of its DER '
|
|
48
|
+
+ 'SubjectPublicKeyInfo as padded standard base64, 44 characters. Hex is not accepted.');
|
|
49
|
+
}
|
|
50
|
+
if (hubUrl.protocol !== 'https:') {
|
|
51
|
+
throw new TypeError('hubKeySha256 requires an https: hubUrl.');
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
this.#hubKeySha256 = hubKeySha256;
|
|
38
55
|
const preparationTimeoutMs = optionsArg.socketConnectionPreparationTimeoutMs;
|
|
39
56
|
if (preparationTimeoutMs !== undefined && (!Number.isInteger(preparationTimeoutMs)
|
|
40
57
|
|| preparationTimeoutMs < 1
|
|
@@ -79,6 +96,9 @@ export class SmarthomeExchangeApiClient {
|
|
|
79
96
|
maxRetries: 0,
|
|
80
97
|
});
|
|
81
98
|
}
|
|
99
|
+
if (this.#hubKeySha256 !== undefined) {
|
|
100
|
+
throw new Error('This client is pinned to a hub key and sends requests only over its started TypedSocket; await start() first.');
|
|
101
|
+
}
|
|
82
102
|
const authorization = await this.getAuthorization(Object.freeze({
|
|
83
103
|
homeId: this.#homeId,
|
|
84
104
|
endpoint: this.#httpEndpoint,
|
|
@@ -233,6 +253,7 @@ export class SmarthomeExchangeApiClient {
|
|
|
233
253
|
autoReconnect: false,
|
|
234
254
|
prepareConnection: (contextArg) => this.prepareSocketConnection(contextArg),
|
|
235
255
|
connectionPreparationTimeoutMs: this.#socketConnectionPreparationTimeoutMs,
|
|
256
|
+
tls: this.#hubKeySha256 === undefined ? undefined : { publicKeySha256: this.#hubKeySha256 },
|
|
236
257
|
});
|
|
237
258
|
if (this.stopIntentGeneration !== startStopIntentGeneration) {
|
|
238
259
|
this.socketPendingStop = createdSocket;
|
|
@@ -429,4 +450,4 @@ export class SmarthomeExchangeApiClient {
|
|
|
429
450
|
return this.fire('submitApproval', this.prepareRequest(requestArg, ['approvalId', 'expectedActionDigest', 'decision']), optionsArg);
|
|
430
451
|
}
|
|
431
452
|
}
|
|
432
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.smarthomeexchangeapiclient.js","sourceRoot":"","sources":["../ts/classes.smarthomeexchangeapiclient.ts"],"names":[],"mappings":"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"}
|
|
453
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.smarthomeexchangeapiclient.js","sourceRoot":"","sources":["../ts/classes.smarthomeexchangeapiclient.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@smarthome.exchange/api",
|
|
3
|
-
"version": "1.0
|
|
3
|
+
"version": "1.1.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "Typed API client for smarthome.exchange hubs.",
|
|
6
6
|
"exports": {
|
|
@@ -10,19 +10,17 @@
|
|
|
10
10
|
"author": "Task Venture Capital GmbH",
|
|
11
11
|
"license": "MIT",
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@api.global/typedrequest": "9.
|
|
13
|
+
"@api.global/typedrequest": "^9.2.0",
|
|
14
14
|
"@api.global/typedrequest-interfaces": "^7.0.0",
|
|
15
|
-
"@api.global/typedsocket": "
|
|
15
|
+
"@api.global/typedsocket": "^10.1.0",
|
|
16
16
|
"@push.rocks/smartpromise": "^4.2.4",
|
|
17
17
|
"@smarthome.exchange/interfaces": "2.1.0"
|
|
18
18
|
},
|
|
19
19
|
"devDependencies": {
|
|
20
|
-
"@git.zone/
|
|
21
|
-
"@
|
|
22
|
-
"@
|
|
23
|
-
"@
|
|
24
|
-
"@push.rocks/smartserve": "9.0.0",
|
|
25
|
-
"@types/node": "^26.6.3"
|
|
20
|
+
"@git.zone/tsrepo": "^2.0.0",
|
|
21
|
+
"@push.rocks/smartcrypto": "^3.3.0",
|
|
22
|
+
"@push.rocks/smartserve": "10.0.1",
|
|
23
|
+
"@types/node": "^26.6.6"
|
|
26
24
|
},
|
|
27
25
|
"files": [
|
|
28
26
|
"ts/**/*",
|
|
@@ -37,8 +35,8 @@
|
|
|
37
35
|
"last 1 chrome versions"
|
|
38
36
|
],
|
|
39
37
|
"scripts": {
|
|
40
|
-
"test": "
|
|
41
|
-
"build": "
|
|
42
|
-
"buildDocs": "
|
|
38
|
+
"test": "tsrepo test test/ --verbose --logfile --timeout 60",
|
|
39
|
+
"build": "tsrepo build tsfolders --allowimplicitany",
|
|
40
|
+
"buildDocs": "tsrepo docs"
|
|
43
41
|
}
|
|
44
42
|
}
|
package/readme.md
CHANGED
|
@@ -45,7 +45,7 @@ The constructor captures the home and provider from plain own data properties. C
|
|
|
45
45
|
|
|
46
46
|
## Transport and Cancellation
|
|
47
47
|
|
|
48
|
-
HTTP calls use published TypedRequest 9.
|
|
48
|
+
HTTP calls use published TypedRequest 9.2 and `${hubUrl}/typedrequest`. An answer outside 2xx rejects with TypedRequest's exported `TypedRequestHttpError`, which carries the status and the parsed response body. Credentials stay in HTTP headers outside RPC JSON. Header-bearing calls bypass the shared response cache, including when `useCache: true`, and reject redirects before credentials can be forwarded. Configure the final hub URL without embedded credentials, query parameters, or a fragment. HTTPS and server-managed browser CORS remain deployment responsibilities.
|
|
49
49
|
|
|
50
50
|
Every method accepts optional request options:
|
|
51
51
|
|
|
@@ -74,16 +74,46 @@ try {
|
|
|
74
74
|
}
|
|
75
75
|
```
|
|
76
76
|
|
|
77
|
-
Node `start()` consumes published TypedSocket
|
|
77
|
+
Node `start()` consumes published TypedSocket 10 and obtains an Authorization header before the WebSocket upgrade, including its transport compatibility handshake. Credentials stay outside URLs and RPC frames; upgrade redirects are disabled. Socket calls carry the captured home context, and the hub must enforce current subject grants on every message. The package-major handshake establishes compatibility only.
|
|
78
78
|
|
|
79
|
-
While started, methods use that authenticated socket and its bound subject; the header provider is not reevaluated for individual socket messages. To rotate credentials or change subjects, stop and explicitly start a new connection. Automatic reconnects are disabled, so denied upgrade admission settles immediately without repeatedly presenting stale credentials.
|
|
79
|
+
While started, methods use that authenticated socket and its bound subject; the header provider is not reevaluated for individual socket messages. To rotate credentials or change subjects, stop and explicitly start a new connection. Automatic reconnects are disabled, so denied upgrade admission settles immediately without repeatedly presenting stale credentials. Without a hub key pin, calls before startup and after successful stop use authenticated HTTP; a pinned client rejects them (see [Hub Key Pinning](#hub-key-pinning)). An in-flight socket request that fails or is stopped is never resent over HTTP. In socket mode, `timeoutMs` configures both the TypedRequest deadline and TypedSocket’s per-call timeout, with the owning maximum of `300000` milliseconds; omitting it retains the socket’s `30000`-millisecond default. Larger HTTP deadlines are unavailable in socket mode.
|
|
80
80
|
|
|
81
|
-
Browser
|
|
81
|
+
Browser WebSocket APIs cannot supply Authorization upgrade headers. Their `start()` fails with the owning `TypedSocketConnectionPreparationError`, code `callback-rejected`, whose `cause` is a `TypedSocketConnectionPreparationError` with code `unsupported-headers`. The capability check runs before obtaining credentials or opening a socket. Use the authenticated HTTP methods and snapshot polling in browsers. TypedSocket 10 does not support Deno, so socket mode is not supported there. The hub has no published application cookie-ticket issuer/consumer contract; this client creates no ticket endpoint and sends no authentication RPC. Native Fetch CORS and credential policy remain server/application responsibilities.
|
|
82
82
|
|
|
83
83
|
TypedSocket requires TLS for remote Node sockets; insecure `ws:` is permitted only on loopback. Configure an HTTPS hub URL for remote socket use. Credential preparation has the owning ten-second default/maximum deadline; set constructor `socketConnectionPreparationTimeoutMs` to a positive integer no greater than `10000` to reduce it. Its signal aborts on timeout, cancellation, disconnect, and stop. A noncooperative provider cannot hold socket stop open or open a connection with a late credential result.
|
|
84
84
|
|
|
85
85
|
Concurrent identical `start()`/`stop()` calls coalesce. Mixed lifecycle calls run in order, with at most 64 active and queued operations. `stop()` supersedes earlier queued starts and cancels an in-flight startup using TypedSocket's exported public startup-aborted error. A late-created socket remains owned until its exact cleanup succeeds. A cleanup failure retains that socket for a later `stop()` and blocks new startup; failed startup is retryable through a later explicit `start()`.
|
|
86
86
|
|
|
87
|
+
## Hub Key Pinning
|
|
88
|
+
|
|
89
|
+
A hub that serves its local listener over TLS with a self-signed certificate is trusted by its key instead of by a certificate authority. Pass the pin of the hub key as `hubKeySha256` with an `https:` hub URL:
|
|
90
|
+
|
|
91
|
+
```ts
|
|
92
|
+
const client = new SmarthomeExchangeApiClient({
|
|
93
|
+
hubUrl: 'https://192.168.1.10:8443',
|
|
94
|
+
homeId: 'home:primary',
|
|
95
|
+
hubKeySha256: 'hB3V5ryySb8VT4CKjozUKRHBW6gZuNoQWXWJBPSamxY=',
|
|
96
|
+
authorizationHeaderProvider: async ({ abortSignal }) => {
|
|
97
|
+
const accessToken = await yourCredentialProvider.getAccessToken({ abortSignal });
|
|
98
|
+
return `Bearer ${accessToken}`;
|
|
99
|
+
},
|
|
100
|
+
});
|
|
101
|
+
|
|
102
|
+
await client.start();
|
|
103
|
+
try {
|
|
104
|
+
const snapshotResponse = await client.getHomeSnapshot();
|
|
105
|
+
console.log(snapshotResponse.snapshot.home.name);
|
|
106
|
+
} finally {
|
|
107
|
+
await client.stop();
|
|
108
|
+
}
|
|
109
|
+
```
|
|
110
|
+
|
|
111
|
+
The pin is the RFC 7469 `pin-sha256` of the hub certificate's public key: the SHA-256 of its DER `SubjectPublicKeyInfo` as padded standard base64, 44 characters. The constructor rejects hex and every other form, and a pin with a hub URL that is not `https:`, with a `TypeError`. Compute the pin with `openssl x509 -in hub.pem -noout -pubkey | openssl pkey -pubin -outform DER | openssl dgst -sha256 -binary | base64`, or with `computePublicKeyPinSha256(certificatePem)` from `@push.rocks/smartcrypto`. A hub that issues every certificate for the same key keeps its pin across renewals.
|
|
112
|
+
|
|
113
|
+
A pinned client sends every request over its started TypedSocket, opened with TypedSocket's Node.js option `tls: { publicKeySha256 }`. Each connection completes the TLS handshake and compares the hub's public key with the pin before it writes the upgrade request and its Authorization header; the pin replaces certificate authority and hostname verification. A hub presenting another key rejects `start()` with TypedSocket's exported `TypedSocketTlsPinError` (`code` `public-key-mismatch`, or `certificate-missing`), whose message carries no header or credential. TypedSocket prepares the connection's header before it connects, so the credential provider has been asked once by then, but the header is never written.
|
|
114
|
+
|
|
115
|
+
A pinned client has no HTTP path. A request before `start()` resolves, after `stop()`, or after a failed start rejects with an `Error` that names `start()`, and a snapshot watcher reports that error to `onError`. Pinning needs Node.js 20.16 or a later 20.x release, or Node.js 22.3 or later; browsers refuse it, so a pinned client cannot start there. A client without `hubKeySha256` behaves as before.
|
|
116
|
+
|
|
87
117
|
|
|
88
118
|
## Client Methods
|
|
89
119
|
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -5,6 +5,13 @@ export interface IShxApiClientOptions {
|
|
|
5
5
|
homeId: string;
|
|
6
6
|
authorizationHeaderProvider: TShxAuthorizationHeaderProvider;
|
|
7
7
|
socketConnectionPreparationTimeoutMs?: number;
|
|
8
|
+
/**
|
|
9
|
+
* Pins the hub's TLS public key (Node.js): the RFC 7469 `pin-sha256` of the hub certificate's
|
|
10
|
+
* public key, the SHA-256 of its DER SubjectPublicKeyInfo as padded standard base64
|
|
11
|
+
* (44 characters). Requires an `https:` hubUrl. A pinned client sends every request over its
|
|
12
|
+
* started TypedSocket, which connects only to a hub presenting this key, and never over HTTP.
|
|
13
|
+
*/
|
|
14
|
+
hubKeySha256?: string;
|
|
8
15
|
}
|
|
9
16
|
|
|
10
17
|
export interface IShxAuthorizationContext {
|
|
@@ -72,11 +79,18 @@ export type THomeSnapshotWatchStop = () => Promise<void>;
|
|
|
72
79
|
|
|
73
80
|
const maxLifecycleOperationCount = 64;
|
|
74
81
|
|
|
82
|
+
/**
|
|
83
|
+
* A SHA-256 digest (32 bytes) as canonical padded standard base64: 43 characters and `=`, where
|
|
84
|
+
* the last character before the padding carries four data bits and two zero bits.
|
|
85
|
+
*/
|
|
86
|
+
const hubKeySha256Pattern = /^[A-Za-z0-9+/]{42}[AEIMQUYcgkosw048]=$/;
|
|
87
|
+
|
|
75
88
|
export class SmarthomeExchangeApiClient {
|
|
76
89
|
readonly #homeId: string;
|
|
77
90
|
readonly #httpEndpoint: string;
|
|
78
91
|
readonly #hubUrl: string;
|
|
79
92
|
readonly #socketConnectionPreparationTimeoutMs?: number;
|
|
93
|
+
readonly #hubKeySha256?: string;
|
|
80
94
|
readonly #authorizationHeaderProvider: TShxAuthorizationHeaderProvider;
|
|
81
95
|
private lifecycleTail = Promise.resolve();
|
|
82
96
|
private lifecycleOperationCount = 0;
|
|
@@ -93,7 +107,9 @@ export class SmarthomeExchangeApiClient {
|
|
|
93
107
|
|
|
94
108
|
constructor(optionsArg: IShxApiClientOptions) {
|
|
95
109
|
this.assertKnownProperties(
|
|
96
|
-
optionsArg,
|
|
110
|
+
optionsArg,
|
|
111
|
+
['hubUrl', 'homeId', 'authorizationHeaderProvider', 'socketConnectionPreparationTimeoutMs', 'hubKeySha256'],
|
|
112
|
+
'Client options'
|
|
97
113
|
);
|
|
98
114
|
if (!optionsArg || typeof optionsArg.homeId !== 'string'
|
|
99
115
|
|| optionsArg.homeId.length < 1 || optionsArg.homeId.length > 200
|
|
@@ -112,6 +128,19 @@ export class SmarthomeExchangeApiClient {
|
|
|
112
128
|
|| hubUrl.username || hubUrl.password || hubUrl.search || hubUrl.hash) {
|
|
113
129
|
throw new TypeError('hubUrl must be an HTTP or HTTPS URL without credentials, query, or fragment.');
|
|
114
130
|
}
|
|
131
|
+
const hubKeySha256 = optionsArg.hubKeySha256;
|
|
132
|
+
if (hubKeySha256 !== undefined) {
|
|
133
|
+
if (typeof hubKeySha256 !== 'string' || !hubKeySha256Pattern.test(hubKeySha256)) {
|
|
134
|
+
throw new TypeError(
|
|
135
|
+
'hubKeySha256 must be the RFC 7469 pin-sha256 of the hub public key: the SHA-256 of its DER '
|
|
136
|
+
+ 'SubjectPublicKeyInfo as padded standard base64, 44 characters. Hex is not accepted.'
|
|
137
|
+
);
|
|
138
|
+
}
|
|
139
|
+
if (hubUrl.protocol !== 'https:') {
|
|
140
|
+
throw new TypeError('hubKeySha256 requires an https: hubUrl.');
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
this.#hubKeySha256 = hubKeySha256;
|
|
115
144
|
const preparationTimeoutMs = optionsArg.socketConnectionPreparationTimeoutMs;
|
|
116
145
|
if (preparationTimeoutMs !== undefined && (!Number.isInteger(preparationTimeoutMs)
|
|
117
146
|
|| preparationTimeoutMs < 1
|
|
@@ -167,6 +196,11 @@ export class SmarthomeExchangeApiClient {
|
|
|
167
196
|
maxRetries: 0,
|
|
168
197
|
});
|
|
169
198
|
}
|
|
199
|
+
if (this.#hubKeySha256 !== undefined) {
|
|
200
|
+
throw new Error(
|
|
201
|
+
'This client is pinned to a hub key and sends requests only over its started TypedSocket; await start() first.'
|
|
202
|
+
);
|
|
203
|
+
}
|
|
170
204
|
const authorization = await this.getAuthorization(Object.freeze({
|
|
171
205
|
homeId: this.#homeId,
|
|
172
206
|
endpoint: this.#httpEndpoint,
|
|
@@ -337,6 +371,7 @@ export class SmarthomeExchangeApiClient {
|
|
|
337
371
|
autoReconnect: false,
|
|
338
372
|
prepareConnection: (contextArg) => this.prepareSocketConnection(contextArg),
|
|
339
373
|
connectionPreparationTimeoutMs: this.#socketConnectionPreparationTimeoutMs,
|
|
374
|
+
tls: this.#hubKeySha256 === undefined ? undefined : { publicKeySha256: this.#hubKeySha256 },
|
|
340
375
|
}
|
|
341
376
|
);
|
|
342
377
|
if (this.stopIntentGeneration !== startStopIntentGeneration) {
|