ds-harness-remote 0.4.13 → 0.4.15
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 +2 -2
- package/dist/acp.d.ts +75 -0
- package/dist/acp.d.ts.map +1 -0
- package/dist/acp.js +61 -0
- package/dist/acp.js.map +1 -0
- package/dist/client-runtime.d.ts +11 -0
- package/dist/client-runtime.d.ts.map +1 -1
- package/dist/client-runtime.js +24 -0
- package/dist/client-runtime.js.map +1 -1
- package/dist/client-secure-transport.d.ts +1 -0
- package/dist/client-secure-transport.d.ts.map +1 -1
- package/dist/client-secure-transport.js +12 -5
- package/dist/client-secure-transport.js.map +1 -1
- package/dist/client.d.ts.map +1 -1
- package/dist/client.github.js +474 -76
- package/dist/client.js +474 -76
- package/dist/client.js.map +1 -1
- package/dist/codex/method-policy.d.ts +10 -10
- package/dist/config.d.ts +36 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +9 -0
- package/dist/config.js.map +1 -1
- package/dist/connection-controller.d.ts +5 -0
- package/dist/connection-controller.d.ts.map +1 -1
- package/dist/connection-controller.js +16 -1
- package/dist/connection-controller.js.map +1 -1
- package/dist/control-route.d.ts +10 -1
- package/dist/control-route.d.ts.map +1 -1
- package/dist/control-route.js +17 -4
- package/dist/control-route.js.map +1 -1
- package/dist/control-runtime.d.ts +12 -1
- package/dist/control-runtime.d.ts.map +1 -1
- package/dist/control-runtime.js +95 -1
- package/dist/control-runtime.js.map +1 -1
- package/dist/control-stream.d.ts +67 -0
- package/dist/control-stream.d.ts.map +1 -0
- package/dist/control-stream.js +179 -0
- package/dist/control-stream.js.map +1 -0
- package/dist/harness-api-bridge.d.ts.map +1 -1
- package/dist/harness-api-bridge.js +32 -8
- package/dist/harness-api-bridge.js.map +1 -1
- package/dist/harness-remote-bridge.d.ts +5 -2
- package/dist/harness-remote-bridge.d.ts.map +1 -1
- package/dist/harness-remote-bridge.js +85 -5
- package/dist/harness-remote-bridge.js.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1872 -588
- package/dist/index.js.map +4 -4
- package/dist/loopback-host.d.ts +20 -0
- package/dist/loopback-host.d.ts.map +1 -0
- package/dist/loopback-host.js +220 -0
- package/dist/loopback-host.js.map +1 -0
- package/dist/loopback-preview.d.ts +19 -0
- package/dist/loopback-preview.d.ts.map +1 -0
- package/dist/loopback-preview.js +232 -0
- package/dist/loopback-preview.js.map +1 -0
- package/dist/remote-typert-gateway.js +16 -4
- package/dist/remote-typert-gateway.js.map +1 -1
- package/dist/rpc-router.d.ts +7 -2
- package/dist/rpc-router.d.ts.map +1 -1
- package/dist/rpc-router.js +27 -1
- package/dist/rpc-router.js.map +1 -1
- package/dist/server-api.d.ts +6 -3
- package/dist/server-api.d.ts.map +1 -1
- package/dist/server-api.js +50 -26
- package/dist/server-api.js.map +1 -1
- package/dist/server-connection.d.ts +1 -0
- package/dist/server-connection.d.ts.map +1 -1
- package/dist/server-connection.js +54 -7
- package/dist/server-connection.js.map +1 -1
- package/dist/server-credentials.d.ts +9 -0
- package/dist/server-credentials.d.ts.map +1 -1
- package/dist/server-credentials.js +34 -0
- package/dist/server-credentials.js.map +1 -1
- package/dist/service.d.ts +14 -0
- package/dist/service.d.ts.map +1 -1
- package/dist/service.js +48 -2
- package/dist/service.js.map +1 -1
- package/dist/status-stream.d.ts +48 -0
- package/dist/status-stream.d.ts.map +1 -0
- package/dist/status-stream.js +133 -0
- package/dist/status-stream.js.map +1 -0
- package/dist/terminal-policy.d.ts +21 -0
- package/dist/terminal-policy.d.ts.map +1 -0
- package/dist/terminal-policy.js +62 -0
- package/dist/terminal-policy.js.map +1 -0
- package/dist/tui-command.js +6 -0
- package/dist/tui-command.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/dsh-plugin.json +1 -1
- package/package.json +44 -24
- package/public.d.ts +2 -0
package/dist/rpc-router.d.ts
CHANGED
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import { type RemoteMessage } from '@dsh-remote/protocol';
|
|
2
|
+
import type { LoopbackHost } from './loopback-host.js';
|
|
2
3
|
import type { RemoteFileViewerBridge } from './file-viewer-bridge.js';
|
|
3
4
|
import type { HarnessApiBridge } from './harness-api-bridge.js';
|
|
4
5
|
import type { HarnessRemoteBridge } from './harness-remote-bridge.js';
|
|
5
6
|
import type { SafeLogger } from './logging.js';
|
|
6
7
|
import type { CodexPeerBridge } from './codex/peer-bridge.js';
|
|
8
|
+
import type { AcpGateway } from './acp.js';
|
|
7
9
|
export { RpcError } from './safe-error.js';
|
|
8
|
-
export declare const HOST_CAPABILITIES: readonly ["harness.api.v1", "harness.api.transfer.v1", "harness.remote.v1", "harness.remote.transfer.v1", "fileviewer.read.v1", "codex.appserver.v1", "codex.appserver.transfer.v1"];
|
|
10
|
+
export declare const HOST_CAPABILITIES: readonly ["harness.api.v1", "harness.api.transfer.v1", "harness.remote.v1", "harness.remote.transfer.v1", "fileviewer.read.v1", "codex.appserver.v1", "codex.appserver.transfer.v1", "agent.acp.v1"];
|
|
9
11
|
export declare class RpcRouter {
|
|
10
12
|
private readonly harnessApi;
|
|
11
13
|
private readonly maxPending;
|
|
@@ -14,13 +16,16 @@ export declare class RpcRouter {
|
|
|
14
16
|
private readonly harnessRemote?;
|
|
15
17
|
private readonly capabilities;
|
|
16
18
|
private readonly codex?;
|
|
19
|
+
private readonly acp?;
|
|
20
|
+
private readonly loopback?;
|
|
17
21
|
private active;
|
|
18
|
-
constructor(harnessApi: HarnessApiBridge | undefined, maxPending?: number, logger?: SafeLogger | undefined, fileViewer?: RemoteFileViewerBridge | undefined, harnessRemote?: HarnessRemoteBridge | undefined, capabilities?: () => readonly string[], codex?: CodexPeerBridge | undefined);
|
|
22
|
+
constructor(harnessApi: HarnessApiBridge | undefined, maxPending?: number, logger?: SafeLogger | undefined, fileViewer?: RemoteFileViewerBridge | undefined, harnessRemote?: HarnessRemoteBridge | undefined, capabilities?: () => readonly string[], codex?: CodexPeerBridge | undefined, acp?: AcpGateway | undefined, loopback?: LoopbackHost | undefined);
|
|
19
23
|
closePeerStreams(): Promise<void>;
|
|
20
24
|
handle(message: RemoteMessage): Promise<RemoteMessage>;
|
|
21
25
|
private invoke;
|
|
22
26
|
private requireApiProxy;
|
|
23
27
|
private requireRemoteGateway;
|
|
28
|
+
private requireAcp;
|
|
24
29
|
private requireCodex;
|
|
25
30
|
}
|
|
26
31
|
//# sourceMappingURL=rpc-router.d.ts.map
|
package/dist/rpc-router.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc-router.d.ts","sourceRoot":"","sources":["../src/rpc-router.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,aAAa,EAGnB,MAAM,sBAAsB,CAAA;AAE7B,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AACrE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAA;AACrE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;
|
|
1
|
+
{"version":3,"file":"rpc-router.d.ts","sourceRoot":"","sources":["../src/rpc-router.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,aAAa,EAGnB,MAAM,sBAAsB,CAAA;AAE7B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AACrE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAA;AACrE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAE7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAE1C,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAsC1C,eAAO,MAAM,iBAAiB,sMASpB,CAAA;AAEV,qBAAa,SAAS;IAIlB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;IAC5B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC;IAC/B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC;IACvB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;IACrB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;IAX5B,OAAO,CAAC,MAAM,CAAI;gBAGC,UAAU,EAAE,gBAAgB,GAAG,SAAS,EACxC,UAAU,SAAM,EAChB,MAAM,CAAC,EAAE,UAAU,YAAA,EACnB,UAAU,CAAC,EAAE,sBAAsB,YAAA,EACnC,aAAa,CAAC,EAAE,mBAAmB,YAAA,EACnC,YAAY,GAAE,MAAM,SAAS,MAAM,EAA4B,EAC/D,KAAK,CAAC,EAAE,eAAe,YAAA,EACvB,GAAG,CAAC,EAAE,UAAU,YAAA,EAChB,QAAQ,CAAC,EAAE,YAAY,YAAA;IAGpC,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IASjC,MAAM,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAoC5D,OAAO,CAAC,MAAM;IAqDd,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,oBAAoB;IAO5B,OAAO,CAAC,UAAU;IAKlB,OAAO,CAAC,YAAY;CAMrB"}
|
package/dist/rpc-router.js
CHANGED
|
@@ -23,6 +23,7 @@ const apiMethods = new Set([
|
|
|
23
23
|
'harness.remote.transfer.close',
|
|
24
24
|
'harness.remote.stream.open',
|
|
25
25
|
'harness.remote.stream.close',
|
|
26
|
+
'loopback.call',
|
|
26
27
|
'fileviewer.call',
|
|
27
28
|
'codex.app.call',
|
|
28
29
|
'codex.app.respond',
|
|
@@ -33,6 +34,8 @@ const apiMethods = new Set([
|
|
|
33
34
|
'codex.app.transfer.commit',
|
|
34
35
|
'codex.app.transfer.read',
|
|
35
36
|
'codex.app.transfer.close',
|
|
37
|
+
'acp.initialize', 'acp.session.new', 'acp.session.load', 'acp.session.prompt',
|
|
38
|
+
'acp.session.respond_permission', 'acp.session.cancel', 'acp.session.set_mode',
|
|
36
39
|
]);
|
|
37
40
|
export const HOST_CAPABILITIES = [
|
|
38
41
|
'harness.api.v1',
|
|
@@ -42,6 +45,7 @@ export const HOST_CAPABILITIES = [
|
|
|
42
45
|
'fileviewer.read.v1',
|
|
43
46
|
'codex.appserver.v1',
|
|
44
47
|
'codex.appserver.transfer.v1',
|
|
48
|
+
'agent.acp.v1',
|
|
45
49
|
];
|
|
46
50
|
export class RpcRouter {
|
|
47
51
|
harnessApi;
|
|
@@ -51,8 +55,10 @@ export class RpcRouter {
|
|
|
51
55
|
harnessRemote;
|
|
52
56
|
capabilities;
|
|
53
57
|
codex;
|
|
58
|
+
acp;
|
|
59
|
+
loopback;
|
|
54
60
|
active = 0;
|
|
55
|
-
constructor(harnessApi, maxPending = 128, logger, fileViewer, harnessRemote, capabilities = () => HOST_CAPABILITIES, codex) {
|
|
61
|
+
constructor(harnessApi, maxPending = 128, logger, fileViewer, harnessRemote, capabilities = () => HOST_CAPABILITIES, codex, acp, loopback) {
|
|
56
62
|
this.harnessApi = harnessApi;
|
|
57
63
|
this.maxPending = maxPending;
|
|
58
64
|
this.logger = logger;
|
|
@@ -60,8 +66,11 @@ export class RpcRouter {
|
|
|
60
66
|
this.harnessRemote = harnessRemote;
|
|
61
67
|
this.capabilities = capabilities;
|
|
62
68
|
this.codex = codex;
|
|
69
|
+
this.acp = acp;
|
|
70
|
+
this.loopback = loopback;
|
|
63
71
|
}
|
|
64
72
|
async closePeerStreams() {
|
|
73
|
+
this.loopback?.closeAll();
|
|
65
74
|
await Promise.all([
|
|
66
75
|
this.harnessApi?.closeAll(),
|
|
67
76
|
this.harnessRemote?.closeAll(),
|
|
@@ -129,6 +138,11 @@ export class RpcRouter {
|
|
|
129
138
|
case 'harness.remote.transfer.close': return this.requireRemoteGateway().closeTransfer(params);
|
|
130
139
|
case 'harness.remote.stream.open': return this.requireRemoteGateway().openStream(params);
|
|
131
140
|
case 'harness.remote.stream.close': return this.requireRemoteGateway().closeStream(params);
|
|
141
|
+
case 'loopback.call': {
|
|
142
|
+
if (this.loopback === undefined)
|
|
143
|
+
throw new RpcError('FEATURE_NOT_SUPPORTED', 'Loopback preview is unavailable on this Host.');
|
|
144
|
+
return this.loopback.call(params);
|
|
145
|
+
}
|
|
132
146
|
case 'fileviewer.call': {
|
|
133
147
|
if (this.fileViewer === undefined) {
|
|
134
148
|
throw new RpcError('FILE_VIEWER_UNAVAILABLE', 'The Remote Host does not have DSH File Viewer available.');
|
|
@@ -144,6 +158,13 @@ export class RpcRouter {
|
|
|
144
158
|
case 'codex.app.transfer.commit': return this.requireCodex().commitTransfer(params);
|
|
145
159
|
case 'codex.app.transfer.read': return this.requireCodex().readTransfer(params);
|
|
146
160
|
case 'codex.app.transfer.close': return this.requireCodex().closeTransfer(params);
|
|
161
|
+
case 'acp.initialize': return this.requireAcp().initialize(params);
|
|
162
|
+
case 'acp.session.new': return this.requireAcp().sessionNew(params);
|
|
163
|
+
case 'acp.session.load': return this.requireAcp().sessionLoad(params);
|
|
164
|
+
case 'acp.session.prompt': return this.requireAcp().prompt(params, async () => undefined);
|
|
165
|
+
case 'acp.session.respond_permission': return this.requireAcp().respondPermission(params);
|
|
166
|
+
case 'acp.session.cancel': return this.requireAcp().cancel(params);
|
|
167
|
+
case 'acp.session.set_mode': return this.requireAcp().setMode(params);
|
|
147
168
|
default: throw new RpcError('METHOD_NOT_FOUND', 'The requested method does not exist.');
|
|
148
169
|
}
|
|
149
170
|
}
|
|
@@ -159,6 +180,11 @@ export class RpcRouter {
|
|
|
159
180
|
}
|
|
160
181
|
return this.harnessRemote;
|
|
161
182
|
}
|
|
183
|
+
requireAcp() {
|
|
184
|
+
if (!this.acp)
|
|
185
|
+
throw new RpcError('CAPABILITY_NOT_SUPPORTED', 'ACP is not configured on this Host.');
|
|
186
|
+
return this.acp;
|
|
187
|
+
}
|
|
162
188
|
requireCodex() {
|
|
163
189
|
if (this.codex === undefined) {
|
|
164
190
|
throw new RpcError('FEATURE_NOT_SUPPORTED', 'Codex Remote is disabled or unavailable on this Host.');
|
package/dist/rpc-router.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc-router.js","sourceRoot":"","sources":["../src/rpc-router.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,iBAAiB,GAIlB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;
|
|
1
|
+
{"version":3,"file":"rpc-router.js","sourceRoot":"","sources":["../src/rpc-router.ts"],"names":[],"mappings":"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"}
|
package/dist/server-api.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { RtcIceServer } from '@dsh-remote/webrtc';
|
|
2
2
|
import type { HostIdentity } from './identity-store.js';
|
|
3
|
-
import type
|
|
3
|
+
import { type ServerCredentialStore, type ServerCredentials } from './server-credentials.js';
|
|
4
4
|
export interface OAuthQrSession {
|
|
5
5
|
qrId: string;
|
|
6
6
|
scanUrl: string;
|
|
@@ -55,7 +55,9 @@ export declare class HostServerApi {
|
|
|
55
55
|
authorizeHostWithCode(identity: HostIdentity, code: string): Promise<DeviceAuthorization>;
|
|
56
56
|
authorizeOwnedRole(identity: HostIdentity, authorizingAccessToken: string, account?: string): Promise<DeviceAuthorization>;
|
|
57
57
|
authenticate(identity?: HostIdentity): Promise<ServerCredentials>;
|
|
58
|
-
refreshCredentials(): Promise<ServerCredentials>;
|
|
58
|
+
refreshCredentials(rejectedAccessToken?: string | undefined): Promise<ServerCredentials>;
|
|
59
|
+
private withRefreshLock;
|
|
60
|
+
private rotateCredentials;
|
|
59
61
|
listDevices(): Promise<ServerHostDevice[]>;
|
|
60
62
|
deviceFor(peerDeviceId: string): Promise<AuthorizedPeerDevice>;
|
|
61
63
|
turnCredentials(connectionId: string): Promise<RtcIceServer[]>;
|
|
@@ -78,6 +80,7 @@ export declare class ServerApiError extends Error {
|
|
|
78
80
|
readonly code: string;
|
|
79
81
|
readonly retryable: boolean;
|
|
80
82
|
readonly status?: number | undefined;
|
|
81
|
-
|
|
83
|
+
readonly phase?: "credential_refresh" | undefined;
|
|
84
|
+
constructor(code: string, message: string, retryable: boolean, status?: number | undefined, phase?: "credential_refresh" | undefined);
|
|
82
85
|
}
|
|
83
86
|
//# sourceMappingURL=server-api.d.ts.map
|
package/dist/server-api.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-api.d.ts","sourceRoot":"","sources":["../src/server-api.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"server-api.d.ts","sourceRoot":"","sources":["../src/server-api.ts"],"names":[],"mappings":"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"}
|
package/dist/server-api.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { platform } from 'node:os';
|
|
2
2
|
import { fromBase64Url, toBase64Url } from '@dsh-remote/crypto';
|
|
3
3
|
import { deviceTokenPairSchema } from '@dsh-remote/protocol';
|
|
4
|
+
import { ServerCredentialsBusyError } from './server-credentials.js';
|
|
4
5
|
import { normalizeServerUrl } from './config.js';
|
|
5
6
|
import { PLUGIN_VERSION } from './version.js';
|
|
6
7
|
const TERMINAL_CONTROL_CHARACTERS = /[\u0000-\u001f\u007f-\u009f]/u;
|
|
@@ -158,23 +159,52 @@ export class HostServerApi {
|
|
|
158
159
|
this.credentials = await this.credentialsPromise;
|
|
159
160
|
return this.credentials;
|
|
160
161
|
}
|
|
161
|
-
async refreshCredentials() {
|
|
162
|
+
async refreshCredentials(rejectedAccessToken = this.credentials?.accessToken) {
|
|
162
163
|
const identity = this.requireIdentity();
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
164
|
+
this.credentials = await this.withRefreshLock(async () => {
|
|
165
|
+
// Another process may have rotated the token while we waited for the lock.
|
|
166
|
+
const stored = await this.store.load(this.baseUrl, identity.deviceId);
|
|
167
|
+
if (stored === undefined || stored.refreshTokenExpiresAt <= Date.now())
|
|
168
|
+
return this.register(identity);
|
|
169
|
+
if (stored.accessToken !== rejectedAccessToken && stored.accessTokenExpiresAt > Date.now() + 30_000) {
|
|
170
|
+
return stored;
|
|
171
|
+
}
|
|
172
|
+
return this.rotateCredentials(identity, stored);
|
|
169
173
|
});
|
|
170
|
-
this.credentials
|
|
174
|
+
return this.credentials;
|
|
175
|
+
}
|
|
176
|
+
async withRefreshLock(operation) {
|
|
177
|
+
try {
|
|
178
|
+
return await this.store.withRefreshLock(operation);
|
|
179
|
+
}
|
|
180
|
+
catch (error) {
|
|
181
|
+
if (error instanceof ServerCredentialsBusyError) {
|
|
182
|
+
throw new ServerApiError(error.code, error.message, false);
|
|
183
|
+
}
|
|
184
|
+
throw error;
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
async rotateCredentials(identity, stored) {
|
|
188
|
+
let tokens;
|
|
189
|
+
try {
|
|
190
|
+
tokens = await this.publicRequest('/api/v1/auth/refresh', {
|
|
191
|
+
method: 'POST',
|
|
192
|
+
body: JSON.stringify({ deviceId: identity.deviceId, refreshToken: stored.refreshToken }),
|
|
193
|
+
});
|
|
194
|
+
}
|
|
195
|
+
catch (error) {
|
|
196
|
+
if (error instanceof ServerApiError) {
|
|
197
|
+
throw new ServerApiError(error.code, error.message, error.retryable, error.status, 'credential_refresh');
|
|
198
|
+
}
|
|
199
|
+
throw error;
|
|
200
|
+
}
|
|
201
|
+
return this.store.save({
|
|
171
202
|
serverUrl: this.baseUrl,
|
|
172
203
|
deviceId: identity.deviceId,
|
|
173
204
|
authorizationMethod: stored.authorizationMethod,
|
|
174
205
|
...(stored.account === undefined ? {} : { account: stored.account }),
|
|
175
206
|
...validateTokens(tokens),
|
|
176
207
|
});
|
|
177
|
-
return this.credentials;
|
|
178
208
|
}
|
|
179
209
|
async listDevices() {
|
|
180
210
|
const result = await this.request('/api/v1/devices');
|
|
@@ -201,22 +231,14 @@ export class HostServerApi {
|
|
|
201
231
|
return { online: result.online, ...(typeof result.lastSeenAt === 'number' ? { lastSeenAt: result.lastSeenAt } : {}) };
|
|
202
232
|
}
|
|
203
233
|
async loadOrIssue(identity) {
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
body: JSON.stringify({ deviceId: identity.deviceId, refreshToken: stored.refreshToken }),
|
|
213
|
-
});
|
|
214
|
-
return this.store.save({
|
|
215
|
-
serverUrl: this.baseUrl,
|
|
216
|
-
deviceId: identity.deviceId,
|
|
217
|
-
authorizationMethod: stored.authorizationMethod,
|
|
218
|
-
...(stored.account === undefined ? {} : { account: stored.account }),
|
|
219
|
-
...validateTokens(tokens),
|
|
234
|
+
return this.withRefreshLock(async () => {
|
|
235
|
+
const stored = await this.store.load(this.baseUrl, identity.deviceId);
|
|
236
|
+
if (stored === undefined || stored.refreshTokenExpiresAt <= Date.now() + 30_000) {
|
|
237
|
+
return this.register(identity);
|
|
238
|
+
}
|
|
239
|
+
if (stored.accessTokenExpiresAt > Date.now() + 30_000)
|
|
240
|
+
return stored;
|
|
241
|
+
return this.rotateCredentials(identity, stored);
|
|
220
242
|
});
|
|
221
243
|
}
|
|
222
244
|
async register(identity, authorization) {
|
|
@@ -312,11 +334,13 @@ export class ServerApiError extends Error {
|
|
|
312
334
|
code;
|
|
313
335
|
retryable;
|
|
314
336
|
status;
|
|
315
|
-
|
|
337
|
+
phase;
|
|
338
|
+
constructor(code, message, retryable, status, phase) {
|
|
316
339
|
super(message);
|
|
317
340
|
this.code = code;
|
|
318
341
|
this.retryable = retryable;
|
|
319
342
|
this.status = status;
|
|
343
|
+
this.phase = phase;
|
|
320
344
|
}
|
|
321
345
|
}
|
|
322
346
|
function validateTokens(value) {
|
package/dist/server-api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-api.js","sourceRoot":"","sources":["../src/server-api.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"server-api.js","sourceRoot":"","sources":["../src/server-api.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-connection.d.ts","sourceRoot":"","sources":["../src/server-connection.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"server-connection.d.ts","sourceRoot":"","sources":["../src/server-connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { waitForRelayCapacity, SerialSend } from '@dsh-remote/webrtc';
|
|
1
2
|
import { NoiseIkSession, createNoisePrologue, fromBase64Url, toBase64Url, } from '@dsh-remote/crypto';
|
|
2
3
|
import { PROTOCOL_VERSION, SecureMessageCodec, acceptNegotiatedCapabilities, createControlFrame, decodeControlFrame, decodeMessage, encodeControlFrame, encodeMessage, } from '@dsh-remote/protocol';
|
|
3
4
|
import { RtcDataChannelTransport, stunOnlyIceServers, } from '@dsh-remote/webrtc';
|
|
@@ -25,6 +26,7 @@ export class HostServerConnection {
|
|
|
25
26
|
lastActiveAt;
|
|
26
27
|
reconnectRequested = false;
|
|
27
28
|
resumeQueued = false;
|
|
29
|
+
authRecoveryAttempted = false;
|
|
28
30
|
rtcFactory;
|
|
29
31
|
negotiatedCapabilities = ['transport.relay'];
|
|
30
32
|
controlFrameLimits = {};
|
|
@@ -94,6 +96,7 @@ export class HostServerConnection {
|
|
|
94
96
|
}
|
|
95
97
|
async run() {
|
|
96
98
|
let delayMs = this.config.reconnect.initialDelayMs;
|
|
99
|
+
this.authRecoveryAttempted = false;
|
|
97
100
|
while (!this.stopped) {
|
|
98
101
|
try {
|
|
99
102
|
await this.connectOnce();
|
|
@@ -101,8 +104,20 @@ export class HostServerConnection {
|
|
|
101
104
|
}
|
|
102
105
|
catch (error) {
|
|
103
106
|
const code = errorCode(error);
|
|
107
|
+
if (code === 'CREDENTIALS_REFRESHED')
|
|
108
|
+
continue;
|
|
104
109
|
this.terminalError = code;
|
|
105
|
-
this.logger.warn('server control connection failed', {
|
|
110
|
+
this.logger.warn('server control connection failed', {
|
|
111
|
+
code, retryable: isRetryable(error),
|
|
112
|
+
...(error instanceof ServerApiError && error.phase !== undefined ? { phase: error.phase } : {}),
|
|
113
|
+
});
|
|
114
|
+
if (TERMINAL_AUTH_ERRORS.has(code)) {
|
|
115
|
+
this.logger.warn(code === 'CONNECTION_REPLACED'
|
|
116
|
+
? 'Another instance is using this Host identity. Stop it or use a separate DSH_HOME; automatic reconnect is paused.'
|
|
117
|
+
: code === 'SERVER_CREDENTIALS_BUSY'
|
|
118
|
+
? 'Credential refresh is locked. Stop other instances; after a crash, stop all instances before removing server-credentials.json.refresh-lock and authorizing again.'
|
|
119
|
+
: 'Host authorization failed. Run /remote login or authorize this Host again in Remote settings.');
|
|
120
|
+
}
|
|
106
121
|
if (TERMINAL_AUTH_ERRORS.has(code) || !this.config.reconnect.enabled)
|
|
107
122
|
return;
|
|
108
123
|
}
|
|
@@ -166,6 +181,7 @@ export class HostServerConnection {
|
|
|
166
181
|
this.lastActiveAt = Date.now();
|
|
167
182
|
if (frame.type === 'hello.ack') {
|
|
168
183
|
const payload = requireHelloAck(frame.payload);
|
|
184
|
+
this.authRecoveryAttempted = false;
|
|
169
185
|
this.controlFrameLimits = {
|
|
170
186
|
maxControlFrameBytes: payload.maxControlFrameBytes,
|
|
171
187
|
maxRelayFrameBytes: payload.maxRelayFrameBytes,
|
|
@@ -207,14 +223,31 @@ export class HostServerConnection {
|
|
|
207
223
|
socket.onclose = event => {
|
|
208
224
|
const close = async () => {
|
|
209
225
|
await messageQueue.catch(() => undefined);
|
|
226
|
+
if (this.stopped) {
|
|
227
|
+
finish();
|
|
228
|
+
return;
|
|
229
|
+
}
|
|
230
|
+
if (event.code === 4003) {
|
|
231
|
+
finish(new ControlConnectionError('CONNECTION_REPLACED', 'Another instance connected with this Host identity.'));
|
|
232
|
+
return;
|
|
233
|
+
}
|
|
210
234
|
if (event.code === 4002) {
|
|
235
|
+
if (this.authRecoveryAttempted) {
|
|
236
|
+
finish(new ControlConnectionError('AUTH_INVALID', 'Server rejected refreshed credentials.'));
|
|
237
|
+
return;
|
|
238
|
+
}
|
|
211
239
|
try {
|
|
212
|
-
await this.api.refreshCredentials();
|
|
240
|
+
await this.api.refreshCredentials(credentials.accessToken);
|
|
213
241
|
}
|
|
214
242
|
catch (error) {
|
|
215
243
|
finish(asError(error));
|
|
216
244
|
return;
|
|
217
245
|
}
|
|
246
|
+
// Only a successfully refreshed credential consumes the hello retry.
|
|
247
|
+
// Transient refresh errors must remain eligible for normal backoff.
|
|
248
|
+
this.authRecoveryAttempted = true;
|
|
249
|
+
finish(new ControlConnectionError('CREDENTIALS_REFRESHED', 'Retry hello with refreshed credentials.'));
|
|
250
|
+
return;
|
|
218
251
|
}
|
|
219
252
|
if (event.code === 4004) {
|
|
220
253
|
finish(new ControlConnectionError('DEVICE_REVOKED', 'The Server revoked this Host device.'));
|
|
@@ -681,6 +714,12 @@ export class HostServerConnection {
|
|
|
681
714
|
const counter = Number(tunnel.noise.sendingCounter() - 1n);
|
|
682
715
|
if (!Number.isSafeInteger(counter) || counter < 0)
|
|
683
716
|
throw new ControlConnectionError('FRAME_TOO_LARGE', 'Noise transport counter overflowed.');
|
|
717
|
+
const socket = this.socket;
|
|
718
|
+
if (socket === undefined)
|
|
719
|
+
throw new Error('Relay transport closed');
|
|
720
|
+
await waitForRelayCapacity(socket);
|
|
721
|
+
if (this.socket !== socket)
|
|
722
|
+
throw new Error('Relay transport replaced');
|
|
684
723
|
this.sendControl('relay', {
|
|
685
724
|
connectionId: tunnel.connectionId,
|
|
686
725
|
targetDeviceId: tunnel.peer.deviceId,
|
|
@@ -749,6 +788,8 @@ export class HostServerConnection {
|
|
|
749
788
|
}
|
|
750
789
|
}
|
|
751
790
|
const TERMINAL_AUTH_ERRORS = new Set([
|
|
791
|
+
'CONNECTION_REPLACED',
|
|
792
|
+
'SERVER_CREDENTIALS_BUSY',
|
|
752
793
|
'ACCOUNT_AUTH_REQUIRED',
|
|
753
794
|
'AUTH_INVALID',
|
|
754
795
|
'DEVICE_OWNERSHIP_REQUIRED',
|
|
@@ -759,6 +800,7 @@ class ServerNoiseChannel {
|
|
|
759
800
|
tunnel;
|
|
760
801
|
transmit;
|
|
761
802
|
onClose;
|
|
803
|
+
sends = new SerialSend();
|
|
762
804
|
security;
|
|
763
805
|
peerDeviceId;
|
|
764
806
|
peerIdentityKey;
|
|
@@ -783,11 +825,14 @@ class ServerNoiseChannel {
|
|
|
783
825
|
async send(message) {
|
|
784
826
|
if (this.closed)
|
|
785
827
|
throw new Error('secure channel is closed');
|
|
786
|
-
const
|
|
828
|
+
const encoded = encodeMessage(message);
|
|
787
829
|
try {
|
|
788
|
-
|
|
789
|
-
|
|
790
|
-
|
|
830
|
+
await this.sends.run(encoded.byteLength, async () => {
|
|
831
|
+
if (this.closed)
|
|
832
|
+
throw new Error('Secure channel closed');
|
|
833
|
+
for (const plaintext of this.outgoing.encode(encoded))
|
|
834
|
+
await this.transmit(this.tunnel.noise.encrypt(plaintext));
|
|
835
|
+
});
|
|
791
836
|
}
|
|
792
837
|
catch (error) {
|
|
793
838
|
await this.close().catch(() => undefined);
|
|
@@ -953,10 +998,12 @@ function rtcDiagnostics(rtc) {
|
|
|
953
998
|
}
|
|
954
999
|
}
|
|
955
1000
|
function errorCode(error) { return error instanceof ServerApiError || error instanceof ControlConnectionError ? error.code : 'CONNECTION_FAILED'; }
|
|
956
|
-
function isRetryable(error) { return error instanceof ServerApiError
|
|
1001
|
+
function isRetryable(error) { return !TERMINAL_AUTH_ERRORS.has(errorCode(error)) && (!(error instanceof ServerApiError) || error.retryable); }
|
|
957
1002
|
function closeCode(code) {
|
|
958
1003
|
if (code === 4002)
|
|
959
1004
|
return 'AUTH_INVALID';
|
|
1005
|
+
if (code === 4003)
|
|
1006
|
+
return 'CONNECTION_REPLACED';
|
|
960
1007
|
if (code === 4004)
|
|
961
1008
|
return 'DEVICE_REVOKED';
|
|
962
1009
|
if (code === 4007)
|