ds-harness-remote 0.3.35 → 0.4.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/README.md +26 -24
- package/dist/client-runtime.d.ts +9 -4
- package/dist/client-runtime.d.ts.map +1 -1
- package/dist/client-runtime.js +137 -35
- package/dist/client-runtime.js.map +1 -1
- package/dist/client.d.ts.map +1 -1
- package/dist/client.github.js +79 -32
- package/dist/client.js +79 -32
- package/dist/client.js.map +1 -1
- package/dist/harness-api-bridge.d.ts +2 -9
- package/dist/harness-api-bridge.d.ts.map +1 -1
- package/dist/harness-api-bridge.js.map +1 -1
- package/dist/harness-remote-bridge.d.ts +46 -0
- package/dist/harness-remote-bridge.d.ts.map +1 -0
- package/dist/harness-remote-bridge.js +321 -0
- package/dist/harness-remote-bridge.js.map +1 -0
- package/dist/index.d.ts +4 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +870 -81
- package/dist/index.js.map +4 -4
- package/dist/remote-file-content-provider.d.ts +3 -1
- package/dist/remote-file-content-provider.d.ts.map +1 -1
- package/dist/remote-file-content-provider.js +10 -1
- package/dist/remote-file-content-provider.js.map +1 -1
- package/dist/remote-typert-gateway.d.ts +13 -0
- package/dist/remote-typert-gateway.d.ts.map +1 -0
- package/dist/remote-typert-gateway.js +242 -0
- package/dist/remote-typert-gateway.js.map +1 -0
- package/dist/rpc-router.d.ts +7 -2
- package/dist/rpc-router.d.ts.map +1 -1
- package/dist/rpc-router.js +61 -12
- package/dist/rpc-router.js.map +1 -1
- package/dist/server-api.d.ts +1 -1
- package/dist/server-api.d.ts.map +1 -1
- package/dist/server-api.js +14 -3
- package/dist/server-api.js.map +1 -1
- package/dist/service.d.ts +5 -3
- package/dist/service.d.ts.map +1 -1
- package/dist/service.js +26 -8
- package/dist/service.js.map +1 -1
- package/dist/typert-gateway-contract.d.ts +48 -0
- package/dist/typert-gateway-contract.d.ts.map +1 -0
- package/dist/typert-gateway-contract.js +2 -0
- package/dist/typert-gateway-contract.js.map +1 -0
- package/dist/typert-gateway-switch.d.ts +28 -7
- package/dist/typert-gateway-switch.d.ts.map +1 -1
- package/dist/typert-gateway-switch.js +114 -23
- package/dist/typert-gateway-switch.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.d.ts.map +1 -1
- package/dist/version.js +1 -1
- package/dist/version.js.map +1 -1
- package/package.json +13 -8
|
@@ -37,10 +37,12 @@ export interface RemoteFileViewerStatus {
|
|
|
37
37
|
/** Fail closed for legacy/unknown Hosts that predate remote file-viewer support. */
|
|
38
38
|
export declare function shouldUseRemoteFileViewer(status: RemoteFileViewerStatus): boolean;
|
|
39
39
|
export declare const REMOTE_FILE_SAVE_AS_MAX_BYTES: number;
|
|
40
|
+
export declare const REMOTE_FILE_FAST_SAVE_AS_MAX_BYTES: number;
|
|
40
41
|
export declare function shouldAllowRemoteFileSaveAs(status: RemoteFileViewerStatus): boolean;
|
|
42
|
+
export declare function remoteFileSaveAsMaxBytes(status: RemoteFileViewerStatus): number;
|
|
41
43
|
/** Browser-side provider registered into dsh-file-viewer's `fileViewer` service. */
|
|
42
44
|
export declare function createRemoteFileContentProvider(call: RemoteFileControlCall, options?: {
|
|
43
45
|
saveAsAllowed?: boolean | (() => boolean);
|
|
44
|
-
saveAsMaxBytes?: number;
|
|
46
|
+
saveAsMaxBytes?: number | (() => number);
|
|
45
47
|
}): RemoteFileContentProvider;
|
|
46
48
|
//# sourceMappingURL=remote-file-content-provider.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-file-content-provider.d.ts","sourceRoot":"","sources":["../src/remote-file-content-provider.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,WAAW,CAAC,EAAE,OAAO,CAAA;CACtB;AAED,MAAM,WAAW,sBAAuB,SAAQ,qBAAqB;IACnE,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,WAAW,CAAA;CACpB;AAED,MAAM,WAAW,yBAAyB;IACxC,EAAE,EAAE,MAAM,CAAA;IACV,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAA;IAClC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAAA;IACtF,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;IAC1E,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC,CAAA;IAC7E,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACtE,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,GAAG;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CACvF;AAED,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,EACpC,QAAQ,EAAE,iBAAiB,GAAG,sBAAsB,GAAG,iBAAiB,EACxE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,MAAM,CAAC,EAAE,WAAW,KACjB,OAAO,CAAC,CAAC,CAAC,CAAA;AAEf,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,OAAO,GAAG,QAAQ,CAAA;IACxB,SAAS,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,cAAc,CAAA;IAC7D,cAAc,CAAC,EAAE;QAAE,UAAU,EAAE,OAAO,CAAA;KAAE,CAAA;CACzC;AAED,oFAAoF;AACpF,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,sBAAsB,GAAG,OAAO,CAEjF;AAED,eAAO,MAAM,6BAA6B,QAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"remote-file-content-provider.d.ts","sourceRoot":"","sources":["../src/remote-file-content-provider.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,WAAW,CAAC,EAAE,OAAO,CAAA;CACtB;AAED,MAAM,WAAW,sBAAuB,SAAQ,qBAAqB;IACnE,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,WAAW,CAAA;CACpB;AAED,MAAM,WAAW,yBAAyB;IACxC,EAAE,EAAE,MAAM,CAAA;IACV,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAA;IAClC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAAA;IACtF,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;IAC1E,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC,CAAA;IAC7E,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACtE,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,GAAG;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CACvF;AAED,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,EACpC,QAAQ,EAAE,iBAAiB,GAAG,sBAAsB,GAAG,iBAAiB,EACxE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,MAAM,CAAC,EAAE,WAAW,KACjB,OAAO,CAAC,CAAC,CAAC,CAAA;AAEf,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,OAAO,GAAG,QAAQ,CAAA;IACxB,SAAS,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,cAAc,CAAA;IAC7D,cAAc,CAAC,EAAE;QAAE,UAAU,EAAE,OAAO,CAAA;KAAE,CAAA;CACzC;AAED,oFAAoF;AACpF,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,sBAAsB,GAAG,OAAO,CAEjF;AAED,eAAO,MAAM,6BAA6B,QAAoB,CAAA;AAC9D,eAAO,MAAM,kCAAkC,QAAqB,CAAA;AAEpE,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,sBAAsB,GAAG,OAAO,CAEnF;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,sBAAsB,GAAG,MAAM,CAI/E;AA+BD,oFAAoF;AACpF,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,qBAAqB,EAAE,OAAO,GAAE;IAAE,aAAa,CAAC,EAAE,OAAO,GAAG,CAAC,MAAM,OAAO,CAAC,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,CAAA;CAAO,GAAG,yBAAyB,CAwD7M"}
|
|
@@ -4,9 +4,15 @@ export function shouldUseRemoteFileViewer(status) {
|
|
|
4
4
|
return status.mode === 'remote' && status.remoteFeatures?.fileViewer === true;
|
|
5
5
|
}
|
|
6
6
|
export const REMOTE_FILE_SAVE_AS_MAX_BYTES = 100 * 1024 * 1024;
|
|
7
|
+
export const REMOTE_FILE_FAST_SAVE_AS_MAX_BYTES = 1024 * 1024 * 1024;
|
|
7
8
|
export function shouldAllowRemoteFileSaveAs(status) {
|
|
8
9
|
return shouldUseRemoteFileViewer(status) && (status.transport === 'LAN' || status.transport === 'P2P' || status.transport === 'TURN');
|
|
9
10
|
}
|
|
11
|
+
export function remoteFileSaveAsMaxBytes(status) {
|
|
12
|
+
return status.transport === 'LAN' || status.transport === 'P2P'
|
|
13
|
+
? REMOTE_FILE_FAST_SAVE_AS_MAX_BYTES
|
|
14
|
+
: REMOTE_FILE_SAVE_AS_MAX_BYTES;
|
|
15
|
+
}
|
|
10
16
|
/** Browser-side provider registered into dsh-file-viewer's `fileViewer` service. */
|
|
11
17
|
export function createRemoteFileContentProvider(call, options = {}) {
|
|
12
18
|
return {
|
|
@@ -15,7 +21,7 @@ export function createRemoteFileContentProvider(call, options = {}) {
|
|
|
15
21
|
supports: () => true,
|
|
16
22
|
saveAsAllowed: () => ({
|
|
17
23
|
allowed: currentSaveAsAllowed(options.saveAsAllowed),
|
|
18
|
-
maxBytes: options.saveAsMaxBytes
|
|
24
|
+
maxBytes: currentSaveAsMaxBytes(options.saveAsMaxBytes),
|
|
19
25
|
}),
|
|
20
26
|
async stat(locator, signal) {
|
|
21
27
|
const value = await call('fileviewer.stat', { path: locator }, signal);
|
|
@@ -74,6 +80,9 @@ export function createRemoteFileContentProvider(call, options = {}) {
|
|
|
74
80
|
function currentSaveAsAllowed(value) {
|
|
75
81
|
return typeof value === 'function' ? value() : value === true;
|
|
76
82
|
}
|
|
83
|
+
function currentSaveAsMaxBytes(value) {
|
|
84
|
+
return typeof value === 'function' ? value() : value ?? REMOTE_FILE_SAVE_AS_MAX_BYTES;
|
|
85
|
+
}
|
|
77
86
|
function decodeBase64(value) {
|
|
78
87
|
const binary = atob(value);
|
|
79
88
|
const bytes = new Uint8Array(binary.length);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-file-content-provider.js","sourceRoot":"","sources":["../src/remote-file-content-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAA;AA2CnE,oFAAoF;AACpF,MAAM,UAAU,yBAAyB,CAAC,MAA8B;IACtE,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,MAAM,CAAC,cAAc,EAAE,UAAU,KAAK,IAAI,CAAA;AAC/E,CAAC;AAED,MAAM,CAAC,MAAM,6BAA6B,GAAG,GAAG,GAAG,IAAI,GAAG,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"remote-file-content-provider.js","sourceRoot":"","sources":["../src/remote-file-content-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { type RemoteClientCore } from '@dsh-remote/client-core';
|
|
2
|
+
import type { RemoteTypertGatewayTarget, TypertGatewayRequest, TypertRpcResult } from './typert-gateway-contract.js';
|
|
3
|
+
/** Client-side alpha.1 Gateway carrier over the authenticated Remote channel. */
|
|
4
|
+
export declare class RemoteTypertGateway implements RemoteTypertGatewayTarget {
|
|
5
|
+
private readonly client;
|
|
6
|
+
constructor(client: RemoteClientCore);
|
|
7
|
+
invoke(request: TypertGatewayRequest): Promise<unknown>;
|
|
8
|
+
dispatch(endpoint: string, payload: unknown, signal: AbortSignal): Promise<TypertRpcResult>;
|
|
9
|
+
open(endpoint: string, payload: unknown, signal: AbortSignal): Promise<AsyncIterable<unknown>>;
|
|
10
|
+
private iterate;
|
|
11
|
+
private callTransferred;
|
|
12
|
+
}
|
|
13
|
+
//# sourceMappingURL=remote-typert-gateway.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"remote-typert-gateway.d.ts","sourceRoot":"","sources":["../src/remote-typert-gateway.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAWlF,OAAO,KAAK,EACV,yBAAyB,EACzB,oBAAoB,EACpB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AAIrC,iFAAiF;AACjF,qBAAa,mBAAoB,YAAW,yBAAyB;IACvD,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,gBAAgB;IAE/C,MAAM,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC;IAUvD,QAAQ,CACZ,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,eAAe,CAAC;IAiBrB,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;YAoBrF,OAAO;YAmBR,eAAe;CA2D9B"}
|
|
@@ -0,0 +1,242 @@
|
|
|
1
|
+
import { RemoteClientError } from '@dsh-remote/client-core';
|
|
2
|
+
import { HARNESS_API_TRANSFER_CHUNK_BYTES, MAX_HARNESS_API_TRANSFER_BYTES, } from '@dsh-remote/protocol';
|
|
3
|
+
import { uuidV7 } from './ids.js';
|
|
4
|
+
const DIRECT_REMOTE_CALL_BYTES = 2 * 1024 * 1024;
|
|
5
|
+
/** Client-side alpha.1 Gateway carrier over the authenticated Remote channel. */
|
|
6
|
+
export class RemoteTypertGateway {
|
|
7
|
+
client;
|
|
8
|
+
constructor(client) {
|
|
9
|
+
this.client = client;
|
|
10
|
+
}
|
|
11
|
+
async invoke(request) {
|
|
12
|
+
const result = await this.dispatch(`${request.namespace}/${request.method}`, { args: request.args }, request.signal ?? new AbortController().signal);
|
|
13
|
+
if (result.ok)
|
|
14
|
+
return result.value;
|
|
15
|
+
throw remoteFailure(result.error);
|
|
16
|
+
}
|
|
17
|
+
async dispatch(endpoint, payload, signal) {
|
|
18
|
+
const request = { endpoint, payload };
|
|
19
|
+
const encoded = new TextEncoder().encode(JSON.stringify(request));
|
|
20
|
+
let response;
|
|
21
|
+
if (encoded.byteLength > DIRECT_REMOTE_CALL_BYTES) {
|
|
22
|
+
response = await this.callTransferred(encoded, signal);
|
|
23
|
+
}
|
|
24
|
+
else {
|
|
25
|
+
try {
|
|
26
|
+
response = await this.client.rpc('harness.remote.call', request, signal);
|
|
27
|
+
}
|
|
28
|
+
catch (error) {
|
|
29
|
+
if (!hasErrorCode(error, 'RESPONSE_TOO_LARGE'))
|
|
30
|
+
throw error;
|
|
31
|
+
response = await this.callTransferred(encoded, signal);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
return parseRpcResult(response);
|
|
35
|
+
}
|
|
36
|
+
async open(endpoint, payload, signal) {
|
|
37
|
+
const streamId = uuidV7();
|
|
38
|
+
const queue = new AsyncValueQueue();
|
|
39
|
+
const unsubscribe = this.client.onEvent(event => routeStreamEvent(event, streamId, queue));
|
|
40
|
+
const unsubscribeClose = this.client.onClose(() => {
|
|
41
|
+
queue.fail(new RemoteClientError('TRANSPORT_CLOSED', 'The remote Harness stream transport closed.'));
|
|
42
|
+
});
|
|
43
|
+
const onAbort = () => queue.close();
|
|
44
|
+
signal.addEventListener('abort', onAbort, { once: true });
|
|
45
|
+
try {
|
|
46
|
+
await this.client.rpc('harness.remote.stream.open', { streamId, endpoint, payload }, signal);
|
|
47
|
+
}
|
|
48
|
+
catch (error) {
|
|
49
|
+
signal.removeEventListener('abort', onAbort);
|
|
50
|
+
unsubscribe();
|
|
51
|
+
unsubscribeClose();
|
|
52
|
+
throw error;
|
|
53
|
+
}
|
|
54
|
+
return this.iterate(streamId, queue, unsubscribe, unsubscribeClose, signal, onAbort);
|
|
55
|
+
}
|
|
56
|
+
async *iterate(streamId, queue, unsubscribe, unsubscribeClose, signal, onAbort) {
|
|
57
|
+
try {
|
|
58
|
+
yield* queue;
|
|
59
|
+
}
|
|
60
|
+
finally {
|
|
61
|
+
signal.removeEventListener('abort', onAbort);
|
|
62
|
+
unsubscribe();
|
|
63
|
+
unsubscribeClose();
|
|
64
|
+
queue.close();
|
|
65
|
+
await this.client.rpc('harness.remote.stream.close', { streamId }).catch(() => undefined);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
async callTransferred(encoded, signal) {
|
|
69
|
+
if (encoded.byteLength > MAX_HARNESS_API_TRANSFER_BYTES) {
|
|
70
|
+
throw new Error('The Harness Remote request exceeds the transfer limit.');
|
|
71
|
+
}
|
|
72
|
+
const transferId = uuidV7();
|
|
73
|
+
const totalChunks = Math.ceil(encoded.byteLength / HARNESS_API_TRANSFER_CHUNK_BYTES);
|
|
74
|
+
let opened = false;
|
|
75
|
+
try {
|
|
76
|
+
await this.client.rpc('harness.remote.transfer.open', {
|
|
77
|
+
transferId,
|
|
78
|
+
totalBytes: encoded.byteLength,
|
|
79
|
+
totalChunks,
|
|
80
|
+
}, signal);
|
|
81
|
+
opened = true;
|
|
82
|
+
for (let index = 0; index < totalChunks; index += 1) {
|
|
83
|
+
const start = index * HARNESS_API_TRANSFER_CHUNK_BYTES;
|
|
84
|
+
const chunk = encoded.subarray(start, Math.min(start + HARNESS_API_TRANSFER_CHUNK_BYTES, encoded.byteLength));
|
|
85
|
+
await this.client.rpc('harness.remote.transfer.chunk', {
|
|
86
|
+
transferId,
|
|
87
|
+
index,
|
|
88
|
+
data: bytesToBase64(chunk),
|
|
89
|
+
}, signal);
|
|
90
|
+
}
|
|
91
|
+
const committed = await this.client.rpc('harness.remote.transfer.commit', { transferId }, signal);
|
|
92
|
+
if (committed.kind === 'inline')
|
|
93
|
+
return committed.response;
|
|
94
|
+
if (committed.transferId !== transferId
|
|
95
|
+
|| committed.totalBytes <= 0
|
|
96
|
+
|| committed.totalBytes > MAX_HARNESS_API_TRANSFER_BYTES
|
|
97
|
+
|| committed.totalChunks !== Math.ceil(committed.totalBytes / HARNESS_API_TRANSFER_CHUNK_BYTES)) {
|
|
98
|
+
throw new Error('The remote Host returned an invalid Harness Remote transfer descriptor.');
|
|
99
|
+
}
|
|
100
|
+
const responseBytes = new Uint8Array(committed.totalBytes);
|
|
101
|
+
let offset = 0;
|
|
102
|
+
for (let index = 0; index < committed.totalChunks; index += 1) {
|
|
103
|
+
const result = await this.client.rpc('harness.remote.transfer.read', { transferId, index }, signal);
|
|
104
|
+
if (result.transferId !== transferId || result.index !== index) {
|
|
105
|
+
throw new Error('The remote Host returned an out-of-order Harness Remote transfer chunk.');
|
|
106
|
+
}
|
|
107
|
+
const chunk = base64ToBytes(result.data);
|
|
108
|
+
const expectedBytes = Math.min(HARNESS_API_TRANSFER_CHUNK_BYTES, committed.totalBytes - offset);
|
|
109
|
+
if (chunk.byteLength !== expectedBytes) {
|
|
110
|
+
throw new Error('The remote Host returned an invalid Harness Remote transfer chunk.');
|
|
111
|
+
}
|
|
112
|
+
responseBytes.set(chunk, offset);
|
|
113
|
+
offset += chunk.byteLength;
|
|
114
|
+
}
|
|
115
|
+
return JSON.parse(new TextDecoder('utf-8', { fatal: true }).decode(responseBytes));
|
|
116
|
+
}
|
|
117
|
+
finally {
|
|
118
|
+
if (opened)
|
|
119
|
+
await this.client.rpc('harness.remote.transfer.close', { transferId }).catch(() => undefined);
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
class AsyncValueQueue {
|
|
124
|
+
values = [];
|
|
125
|
+
waiters = [];
|
|
126
|
+
closed = false;
|
|
127
|
+
error;
|
|
128
|
+
push(value) {
|
|
129
|
+
if (this.closed)
|
|
130
|
+
return;
|
|
131
|
+
const waiter = this.waiters.shift();
|
|
132
|
+
if (waiter === undefined)
|
|
133
|
+
this.values.push(value);
|
|
134
|
+
else
|
|
135
|
+
waiter({ done: false, value });
|
|
136
|
+
}
|
|
137
|
+
close() {
|
|
138
|
+
if (this.closed)
|
|
139
|
+
return;
|
|
140
|
+
this.closed = true;
|
|
141
|
+
for (const waiter of this.waiters.splice(0))
|
|
142
|
+
waiter({ done: true, value: undefined });
|
|
143
|
+
}
|
|
144
|
+
fail(error) {
|
|
145
|
+
if (this.closed)
|
|
146
|
+
return;
|
|
147
|
+
this.error = error;
|
|
148
|
+
this.close();
|
|
149
|
+
}
|
|
150
|
+
async *[Symbol.asyncIterator]() {
|
|
151
|
+
while (true) {
|
|
152
|
+
if (this.values.length > 0) {
|
|
153
|
+
yield this.values.shift();
|
|
154
|
+
continue;
|
|
155
|
+
}
|
|
156
|
+
if (this.closed) {
|
|
157
|
+
if (this.error !== undefined)
|
|
158
|
+
throw this.error;
|
|
159
|
+
return;
|
|
160
|
+
}
|
|
161
|
+
const next = await new Promise(resolve => this.waiters.push(resolve));
|
|
162
|
+
if (next.done) {
|
|
163
|
+
if (this.error !== undefined)
|
|
164
|
+
throw this.error;
|
|
165
|
+
return;
|
|
166
|
+
}
|
|
167
|
+
yield next.value;
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
function routeStreamEvent(event, streamId, queue) {
|
|
172
|
+
if (event.event === 'harness.remote.frame') {
|
|
173
|
+
const data = event.data;
|
|
174
|
+
if (data.streamId === streamId && data.hasValue === true)
|
|
175
|
+
queue.push(data.value);
|
|
176
|
+
return;
|
|
177
|
+
}
|
|
178
|
+
if (event.event !== 'harness.remote.stream.closed')
|
|
179
|
+
return;
|
|
180
|
+
const data = event.data;
|
|
181
|
+
if (data.streamId !== streamId)
|
|
182
|
+
return;
|
|
183
|
+
if (data.reason === 'failed') {
|
|
184
|
+
const failure = data.failure;
|
|
185
|
+
queue.fail(remoteFailure({
|
|
186
|
+
code: typeof failure?.code === 'string' ? failure.code : 'internal',
|
|
187
|
+
message: typeof failure?.message === 'string' ? failure.message : 'The remote Harness stream failed.',
|
|
188
|
+
details: isRecord(failure?.details) ? failure.details : {},
|
|
189
|
+
}));
|
|
190
|
+
}
|
|
191
|
+
else {
|
|
192
|
+
queue.close();
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
function parseRpcResult(value) {
|
|
196
|
+
if (!isRecord(value))
|
|
197
|
+
throw new Error('The remote Host returned an invalid Gateway result.');
|
|
198
|
+
if (value.ok === true)
|
|
199
|
+
return Object.hasOwn(value, 'value') ? { ok: true, value: value.value } : { ok: true };
|
|
200
|
+
if (value.ok !== false || !isRecord(value.error)
|
|
201
|
+
|| typeof value.error.code !== 'string'
|
|
202
|
+
|| typeof value.error.message !== 'string'
|
|
203
|
+
|| !isRecord(value.error.details)) {
|
|
204
|
+
throw new Error('The remote Host returned an invalid Gateway failure.');
|
|
205
|
+
}
|
|
206
|
+
return {
|
|
207
|
+
ok: false,
|
|
208
|
+
error: { code: value.error.code, message: value.error.message, details: value.error.details },
|
|
209
|
+
};
|
|
210
|
+
}
|
|
211
|
+
function remoteFailure(failure) {
|
|
212
|
+
return Object.assign(new Error(failure.message), { code: failure.code, details: failure.details });
|
|
213
|
+
}
|
|
214
|
+
function bytesToBase64(bytes) {
|
|
215
|
+
let binary = '';
|
|
216
|
+
for (let offset = 0; offset < bytes.byteLength; offset += 0x8000) {
|
|
217
|
+
binary += String.fromCharCode(...bytes.subarray(offset, Math.min(offset + 0x8000, bytes.byteLength)));
|
|
218
|
+
}
|
|
219
|
+
return btoa(binary);
|
|
220
|
+
}
|
|
221
|
+
function base64ToBytes(value) {
|
|
222
|
+
let binary;
|
|
223
|
+
try {
|
|
224
|
+
binary = atob(value);
|
|
225
|
+
}
|
|
226
|
+
catch {
|
|
227
|
+
throw new Error('The remote Host returned malformed Harness Remote transfer data.');
|
|
228
|
+
}
|
|
229
|
+
const bytes = new Uint8Array(binary.length);
|
|
230
|
+
for (let index = 0; index < binary.length; index += 1)
|
|
231
|
+
bytes[index] = binary.charCodeAt(index);
|
|
232
|
+
if (bytesToBase64(bytes) !== value)
|
|
233
|
+
throw new Error('The remote Host returned non-canonical Harness Remote transfer data.');
|
|
234
|
+
return bytes;
|
|
235
|
+
}
|
|
236
|
+
function isRecord(value) {
|
|
237
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
238
|
+
}
|
|
239
|
+
function hasErrorCode(error, code) {
|
|
240
|
+
return error instanceof Error && 'code' in error && error.code === code;
|
|
241
|
+
}
|
|
242
|
+
//# sourceMappingURL=remote-typert-gateway.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"remote-typert-gateway.js","sourceRoot":"","sources":["../src/remote-typert-gateway.ts"],"names":[],"mappings":"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"}
|
package/dist/rpc-router.d.ts
CHANGED
|
@@ -1,18 +1,23 @@
|
|
|
1
1
|
import { type RemoteMessage } from '@dsh-remote/protocol';
|
|
2
2
|
import type { RemoteFileViewerBridge } from './file-viewer-bridge.js';
|
|
3
3
|
import type { HarnessApiBridge } from './harness-api-bridge.js';
|
|
4
|
+
import type { HarnessRemoteBridge } from './harness-remote-bridge.js';
|
|
4
5
|
import type { SafeLogger } from './logging.js';
|
|
5
6
|
export { RpcError } from './safe-error.js';
|
|
6
|
-
export declare const HOST_CAPABILITIES: readonly ["harness.api.v1", "harness.api.transfer.v1", "fileviewer.read.v1"];
|
|
7
|
+
export declare const HOST_CAPABILITIES: readonly ["harness.api.v1", "harness.api.transfer.v1", "harness.remote.v1", "harness.remote.transfer.v1", "fileviewer.read.v1"];
|
|
7
8
|
export declare class RpcRouter {
|
|
8
9
|
private readonly harnessApi;
|
|
9
10
|
private readonly maxPending;
|
|
10
11
|
private readonly logger?;
|
|
11
12
|
private readonly fileViewer?;
|
|
13
|
+
private readonly harnessRemote?;
|
|
14
|
+
private readonly capabilities;
|
|
12
15
|
private active;
|
|
13
|
-
constructor(harnessApi: HarnessApiBridge, maxPending?: number, logger?: SafeLogger | undefined, fileViewer?: RemoteFileViewerBridge | undefined);
|
|
16
|
+
constructor(harnessApi: HarnessApiBridge | undefined, maxPending?: number, logger?: SafeLogger | undefined, fileViewer?: RemoteFileViewerBridge | undefined, harnessRemote?: HarnessRemoteBridge | undefined, capabilities?: () => readonly string[]);
|
|
14
17
|
closePeerStreams(): Promise<void>;
|
|
15
18
|
handle(message: RemoteMessage): Promise<RemoteMessage>;
|
|
16
19
|
private invoke;
|
|
20
|
+
private requireApiProxy;
|
|
21
|
+
private requireRemoteGateway;
|
|
17
22
|
}
|
|
18
23
|
//# 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,UAAU,EAAE,MAAM,cAAc,CAAA;AAG9C,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,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,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;AAG9C,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AA0B1C,eAAO,MAAM,iBAAiB,iIAMpB,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;IAR/B,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;IAG5E,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAOjC,MAAM,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAoC5D,OAAO,CAAC,MAAM;IAiCd,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,oBAAoB;CAM7B"}
|
package/dist/rpc-router.js
CHANGED
|
@@ -3,7 +3,9 @@ import { z } from 'zod';
|
|
|
3
3
|
import { RpcError, safeErrorCode } from './safe-error.js';
|
|
4
4
|
export { RpcError } from './safe-error.js';
|
|
5
5
|
const wireRequestSchema = z.object({ method: z.string().min(1), params: z.unknown() }).strict();
|
|
6
|
+
const emptyParamsSchema = z.object({}).strict();
|
|
6
7
|
const apiMethods = new Set([
|
|
8
|
+
'harness.transport.describe',
|
|
7
9
|
'harness.api.call',
|
|
8
10
|
'harness.api.transfer.open',
|
|
9
11
|
'harness.api.transfer.chunk',
|
|
@@ -13,22 +15,45 @@ const apiMethods = new Set([
|
|
|
13
15
|
'harness.api.respond',
|
|
14
16
|
'harness.api.stream.open',
|
|
15
17
|
'harness.api.stream.close',
|
|
18
|
+
'harness.remote.call',
|
|
19
|
+
'harness.remote.transfer.open',
|
|
20
|
+
'harness.remote.transfer.chunk',
|
|
21
|
+
'harness.remote.transfer.commit',
|
|
22
|
+
'harness.remote.transfer.read',
|
|
23
|
+
'harness.remote.transfer.close',
|
|
24
|
+
'harness.remote.stream.open',
|
|
25
|
+
'harness.remote.stream.close',
|
|
16
26
|
'fileviewer.call',
|
|
17
27
|
]);
|
|
18
|
-
export const HOST_CAPABILITIES = [
|
|
28
|
+
export const HOST_CAPABILITIES = [
|
|
29
|
+
'harness.api.v1',
|
|
30
|
+
'harness.api.transfer.v1',
|
|
31
|
+
'harness.remote.v1',
|
|
32
|
+
'harness.remote.transfer.v1',
|
|
33
|
+
'fileviewer.read.v1',
|
|
34
|
+
];
|
|
19
35
|
export class RpcRouter {
|
|
20
36
|
harnessApi;
|
|
21
37
|
maxPending;
|
|
22
38
|
logger;
|
|
23
39
|
fileViewer;
|
|
40
|
+
harnessRemote;
|
|
41
|
+
capabilities;
|
|
24
42
|
active = 0;
|
|
25
|
-
constructor(harnessApi, maxPending = 128, logger, fileViewer) {
|
|
43
|
+
constructor(harnessApi, maxPending = 128, logger, fileViewer, harnessRemote, capabilities = () => HOST_CAPABILITIES) {
|
|
26
44
|
this.harnessApi = harnessApi;
|
|
27
45
|
this.maxPending = maxPending;
|
|
28
46
|
this.logger = logger;
|
|
29
47
|
this.fileViewer = fileViewer;
|
|
48
|
+
this.harnessRemote = harnessRemote;
|
|
49
|
+
this.capabilities = capabilities;
|
|
50
|
+
}
|
|
51
|
+
async closePeerStreams() {
|
|
52
|
+
await Promise.all([
|
|
53
|
+
this.harnessApi?.closeAll(),
|
|
54
|
+
this.harnessRemote?.closeAll(),
|
|
55
|
+
]);
|
|
30
56
|
}
|
|
31
|
-
closePeerStreams() { return this.harnessApi.closeAll(); }
|
|
32
57
|
async handle(message) {
|
|
33
58
|
if (message.type !== 'rpc.request') {
|
|
34
59
|
return createRpcError(message.id, 'INVALID_MESSAGE', 'Only RPC requests are accepted on the Host business channel.');
|
|
@@ -69,15 +94,27 @@ export class RpcRouter {
|
|
|
69
94
|
}
|
|
70
95
|
invoke(method, params) {
|
|
71
96
|
switch (method) {
|
|
72
|
-
case 'harness.
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
case 'harness.api.
|
|
77
|
-
case 'harness.api.transfer.
|
|
78
|
-
case 'harness.api.
|
|
79
|
-
case 'harness.api.
|
|
80
|
-
case 'harness.api.
|
|
97
|
+
case 'harness.transport.describe': {
|
|
98
|
+
emptyParamsSchema.parse(params);
|
|
99
|
+
return { capabilities: [...this.capabilities()] };
|
|
100
|
+
}
|
|
101
|
+
case 'harness.api.call': return this.requireApiProxy().call(params);
|
|
102
|
+
case 'harness.api.transfer.open': return this.requireApiProxy().openTransfer(params);
|
|
103
|
+
case 'harness.api.transfer.chunk': return this.requireApiProxy().appendTransfer(params);
|
|
104
|
+
case 'harness.api.transfer.commit': return this.requireApiProxy().commitTransfer(params);
|
|
105
|
+
case 'harness.api.transfer.read': return this.requireApiProxy().readTransfer(params);
|
|
106
|
+
case 'harness.api.transfer.close': return this.requireApiProxy().closeTransfer(params);
|
|
107
|
+
case 'harness.api.respond': return this.requireApiProxy().respond(params);
|
|
108
|
+
case 'harness.api.stream.open': return this.requireApiProxy().openStream(params);
|
|
109
|
+
case 'harness.api.stream.close': return this.requireApiProxy().closeStream(params);
|
|
110
|
+
case 'harness.remote.call': return this.requireRemoteGateway().call(params);
|
|
111
|
+
case 'harness.remote.transfer.open': return this.requireRemoteGateway().openTransfer(params);
|
|
112
|
+
case 'harness.remote.transfer.chunk': return this.requireRemoteGateway().appendTransfer(params);
|
|
113
|
+
case 'harness.remote.transfer.commit': return this.requireRemoteGateway().commitTransfer(params);
|
|
114
|
+
case 'harness.remote.transfer.read': return this.requireRemoteGateway().readTransfer(params);
|
|
115
|
+
case 'harness.remote.transfer.close': return this.requireRemoteGateway().closeTransfer(params);
|
|
116
|
+
case 'harness.remote.stream.open': return this.requireRemoteGateway().openStream(params);
|
|
117
|
+
case 'harness.remote.stream.close': return this.requireRemoteGateway().closeStream(params);
|
|
81
118
|
case 'fileviewer.call': {
|
|
82
119
|
if (this.fileViewer === undefined) {
|
|
83
120
|
throw new RpcError('FILE_VIEWER_UNAVAILABLE', 'The Remote Host does not have DSH File Viewer available.');
|
|
@@ -87,6 +124,18 @@ export class RpcRouter {
|
|
|
87
124
|
default: throw new RpcError('METHOD_NOT_FOUND', 'The requested method does not exist.');
|
|
88
125
|
}
|
|
89
126
|
}
|
|
127
|
+
requireApiProxy() {
|
|
128
|
+
if (this.harnessApi === undefined) {
|
|
129
|
+
throw new RpcError('FEATURE_NOT_SUPPORTED', 'This Harness version does not provide the legacy ApiProxy transport.');
|
|
130
|
+
}
|
|
131
|
+
return this.harnessApi;
|
|
132
|
+
}
|
|
133
|
+
requireRemoteGateway() {
|
|
134
|
+
if (this.harnessRemote === undefined) {
|
|
135
|
+
throw new RpcError('FEATURE_NOT_SUPPORTED', 'This Harness version does not provide the Remote Gateway transport.');
|
|
136
|
+
}
|
|
137
|
+
return this.harnessRemote;
|
|
138
|
+
}
|
|
90
139
|
}
|
|
91
140
|
function errorResponse(requestId, error) {
|
|
92
141
|
const code = safeErrorCode(error);
|
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
|
@@ -51,7 +51,7 @@ export declare class HostServerApi {
|
|
|
51
51
|
revokeCurrentDevice(): Promise<void>;
|
|
52
52
|
authorizeWithAccount(identity: HostIdentity, email: string, password: string): Promise<DeviceAuthorization>;
|
|
53
53
|
startOAuthQrLogin(provider?: OAuthProvider): Promise<OAuthQrSession>;
|
|
54
|
-
pollOAuthQrLogin(identity: HostIdentity, qrId: string): Promise<OAuthQrPollResult>;
|
|
54
|
+
pollOAuthQrLogin(identity: HostIdentity, qrId: string, recoverIdentity?: () => Promise<HostIdentity>): Promise<OAuthQrPollResult>;
|
|
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>;
|
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":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,KAAK,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAwBvF,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,QAAQ,CAAA;AAE9C,MAAM,MAAM,iBAAiB,GACzB;IAAE,MAAM,EAAE,SAAS,GAAG,SAAS,CAAA;CAAE,GACjC;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,aAAa,EAAE,mBAAmB,CAAA;CAAE,CAAA;AAE9D,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,SAAS,GAAG,wBAAwB,GAAG,cAAc,CAAA;IAC7D,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,MAAM,mBAAmB,GAAG,OAAO,KAAK,CAAA;AAE9C,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB;AAED,MAAM,WAAW,oBAAqB,SAAQ,gBAAgB;IAC5D,IAAI,EAAE,MAAM,GAAG,QAAQ,CAAA;IACvB,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,qBAAa,aAAa;IAStB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,IAAI;IAVvB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,OAAO,CAAC,QAAQ,CAAC,CAAc;IAC/B,OAAO,CAAC,WAAW,CAAC,CAAmB;IACvC,OAAO,CAAC,kBAAkB,CAAC,CAA4B;IACvD,OAAO,CAAC,cAAc,CAAC,CAAQ;gBAG7B,SAAS,EAAE,MAAM,EACA,KAAK,EAAE,qBAAqB,EAC5B,mBAAmB,GAAE,mBAA2B,EAChD,IAAI,GAAE,MAAM,GAAG,QAAiB;IAKnD,YAAY,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAE1C,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAEpD,oBAAoB,IAAI,mBAAmB,GAAG,SAAS;IAQjD,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAMnC,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAapC,oBAAoB,CAAC,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAuB3G,iBAAiB,CAAC,QAAQ,GAAE,aAAuB,GAAG,OAAO,CAAC,cAAc,CAAC;IAe7E,gBAAgB,
|
|
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
|
@@ -81,7 +81,8 @@ export class HostServerApi {
|
|
|
81
81
|
}
|
|
82
82
|
return { qrId: value.qrId, scanUrl: value.scanUrl, expiresIn: value.expiresIn };
|
|
83
83
|
}
|
|
84
|
-
async pollOAuthQrLogin(identity, qrId) {
|
|
84
|
+
async pollOAuthQrLogin(identity, qrId, recoverIdentity) {
|
|
85
|
+
this.bindIdentity(identity);
|
|
85
86
|
const value = requireRecord(await this.publicRequest(`/api/v1/auth/oauth/qr/${encodeURIComponent(qrId)}`, { method: 'GET' }), 'QR login status');
|
|
86
87
|
if (value.status === 'pending' || value.status === 'expired')
|
|
87
88
|
return { status: value.status };
|
|
@@ -92,11 +93,21 @@ export class HostServerApi {
|
|
|
92
93
|
if (typeof account.account !== 'string' || account.account.length === 0 || typeof account.isAdmin !== 'boolean') {
|
|
93
94
|
throw new ServerApiError('INVALID_MESSAGE', 'The Server returned an invalid account profile.', false);
|
|
94
95
|
}
|
|
95
|
-
|
|
96
|
+
const authorization = {
|
|
96
97
|
accountToken: value.token,
|
|
97
98
|
account: account.account,
|
|
98
99
|
authorizationMethod: 'account',
|
|
99
|
-
}
|
|
100
|
+
};
|
|
101
|
+
try {
|
|
102
|
+
await this.register(identity, authorization);
|
|
103
|
+
}
|
|
104
|
+
catch (error) {
|
|
105
|
+
if (!(error instanceof ServerApiError) || error.code !== 'DEVICE_REVOKED' || recoverIdentity === undefined)
|
|
106
|
+
throw error;
|
|
107
|
+
const nextIdentity = await recoverIdentity();
|
|
108
|
+
this.bindIdentity(nextIdentity);
|
|
109
|
+
await this.register(nextIdentity, authorization);
|
|
110
|
+
}
|
|
100
111
|
return {
|
|
101
112
|
status: 'complete',
|
|
102
113
|
authorization: { method: 'account', account: account.account, isAdmin: account.isAdmin },
|