@hydranium/protocol 1.0.0-next.227 → 1.0.0-next.228
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/lib/client/data-connection.d.ts +88 -9
- package/lib/client/data-connection.d.ts.map +1 -1
- package/lib/client/data-connection.js +181 -14
- package/lib/client/data-connection.js.map +1 -1
- package/lib/client/data-port.d.ts +3 -0
- package/lib/client/data-port.d.ts.map +1 -1
- package/lib/client/data-session.d.ts +6 -4
- package/lib/client/data-session.d.ts.map +1 -1
- package/lib/client/data-session.js +9 -4
- package/lib/client/data-session.js.map +1 -1
- package/lib/client/rpc-connection.d.ts +8 -0
- package/lib/client/rpc-connection.d.ts.map +1 -1
- package/lib/client/rpc-connection.js +12 -0
- package/lib/client/rpc-connection.js.map +1 -1
- package/lib/messages/index.d.ts +1 -0
- package/lib/messages/index.d.ts.map +1 -1
- package/lib/messages/index.js +4 -1
- package/lib/messages/index.js.map +1 -1
- package/lib/testing/data-doubles.d.ts +3 -0
- package/lib/testing/data-doubles.d.ts.map +1 -1
- package/lib/testing/data-doubles.js +1 -0
- package/lib/testing/data-doubles.js.map +1 -1
- package/package.json +1 -1
- package/src/client/data-connection.ts +202 -15
- package/src/client/data-port.ts +4 -0
- package/src/client/data-session.ts +9 -4
- package/src/client/rpc-connection.ts +13 -0
- package/src/messages/index.ts +1 -0
- package/src/testing/data-doubles.ts +4 -0
|
@@ -6,13 +6,24 @@
|
|
|
6
6
|
*
|
|
7
7
|
* SPDX-License-Identifier: MIT
|
|
8
8
|
********************************************************************************/
|
|
9
|
-
import { Emitter, type Event } from 'vscode-jsonrpc';
|
|
9
|
+
import { Disposable, Emitter, type Event } from 'vscode-jsonrpc';
|
|
10
10
|
import { type DataClientProtocol, type DataServerProtocol, type DiagnosticOf, type ProjectOf, type TransferDocumentDirtyChangedEvent, type TransferDocumentUpdatedEvent } from '../data';
|
|
11
|
+
import type { Logger } from '../logger';
|
|
11
12
|
import type { TransferElement } from '../transfer-element';
|
|
12
13
|
import { DataEvents } from './data-events';
|
|
13
14
|
import type { DataPort } from './data-port';
|
|
14
15
|
import { DataSession, type DataSessionFactory } from './data-session';
|
|
15
|
-
import { RpcConnection, type RpcConnectionLifecycle } from './rpc-connection';
|
|
16
|
+
import { RpcConnection, type RpcConnectionGeneration, type RpcConnectionLifecycle } from './rpc-connection';
|
|
17
|
+
/**
|
|
18
|
+
* A watch {@link DataConnection.watchDocument} keeps could not be sent again to
|
|
19
|
+
* a connection that became ready after a drop; the next one sends it again.
|
|
20
|
+
*/
|
|
21
|
+
export declare const DATA_CONNECTION_WATCH_RESTORE_FAILED: import("../messages/primitives").MessageDefinition<"Could not watch {uri} again after reconnecting to the data server: {detail}">;
|
|
22
|
+
/**
|
|
23
|
+
* A session's restore threw when its connection came back; the connection
|
|
24
|
+
* went on restoring the others.
|
|
25
|
+
*/
|
|
26
|
+
export declare const DATA_CONNECTION_SESSION_RESTORE_FAILED: import("../messages/primitives").MessageDefinition<"Could not restore a session after reconnecting to the data server: {detail}">;
|
|
16
27
|
/** Options for {@link DataConnection}. */
|
|
17
28
|
export interface DataConnectionOptions<TTransfer extends TransferElement = TransferElement, TServer extends DataServerProtocol<TTransfer, DiagnosticOf<TServer>> = DataServerProtocol<TTransfer>> extends RpcConnectionLifecycle {
|
|
18
29
|
/**
|
|
@@ -52,6 +63,8 @@ export type DataConnectionArgs<TTransfer extends TransferElement, TClient extend
|
|
|
52
63
|
* `clientId`, which identifies a participant rather than a wire, and the server
|
|
53
64
|
* keys its opens and watches per `(uri, clientId)`. Two parties sharing one
|
|
54
65
|
* identity cannot tell each other's writes from their own echoes.
|
|
66
|
+
* {@link DataConnection.watchDocument} is the exception: it acts as no
|
|
67
|
+
* participant, under an id no session holds, and opens or writes nothing.
|
|
55
68
|
*
|
|
56
69
|
* Generic over the transfer root so this file names no grammar. An adopter
|
|
57
70
|
* binds the concrete root (or the union of them, for a multi-grammar head) at
|
|
@@ -68,16 +81,39 @@ export declare class DataConnection<TTransfer extends TransferElement, TServer e
|
|
|
68
81
|
*/
|
|
69
82
|
readonly onDidCreateSession: Event<DataSession<TTransfer, TServer>>;
|
|
70
83
|
/**
|
|
71
|
-
* Per URI, the `dirty` the client was last told
|
|
72
|
-
* connection
|
|
73
|
-
*
|
|
74
|
-
*
|
|
84
|
+
* Per URI, the `dirty` the client was last told, whether a session of this
|
|
85
|
+
* connection has it open or a watch follows it. A session's open or close
|
|
86
|
+
* of the URI forgets it; disposing a watch does not, since a watch knows
|
|
87
|
+
* only the caller's spelling of the URI, not the server's key. A
|
|
88
|
+
* session's restore and a watch sent again after a reconnect tell the
|
|
89
|
+
* client their answer where it differs, a forgotten URI included; see
|
|
90
|
+
* {@link restoreDirty}.
|
|
75
91
|
*/
|
|
76
92
|
protected readonly dirtyStates: Map<string, boolean>;
|
|
77
93
|
/** Backs each session's {@link DataSessionHost.onDidChangeDirty}. */
|
|
78
94
|
protected readonly dirtyChangedEmitter: Emitter<TransferDocumentDirtyChangedEvent>;
|
|
79
95
|
/** Backs each session's {@link DataSessionHost.onDidUpdateDocument}. */
|
|
80
96
|
protected readonly documentUpdatedEmitter: Emitter<TransferDocumentUpdatedEvent<TTransfer, DiagnosticOf<TServer>>>;
|
|
97
|
+
/**
|
|
98
|
+
* Per id {@link watchDocument} watches under, the URI it watches, which
|
|
99
|
+
* {@link generationReady} sends again to every later generation until the
|
|
100
|
+
* watch's handle is disposed.
|
|
101
|
+
*/
|
|
102
|
+
protected readonly watches: Map<string, string>;
|
|
103
|
+
/** The port's logger, or one that logs nothing. */
|
|
104
|
+
protected readonly logger: Logger;
|
|
105
|
+
/** Backs {@link onDidReconnect}. */
|
|
106
|
+
protected readonly reconnectEmitter: Emitter<void>;
|
|
107
|
+
/**
|
|
108
|
+
* Fires on every reconnect: once a connection becomes ready after an
|
|
109
|
+
* earlier one was, and its watches have been sent. The server sends no
|
|
110
|
+
* event for a change made while the connection was down, so a watcher reads
|
|
111
|
+
* its document again on this; a read it sends now reaches the server after
|
|
112
|
+
* its watch.
|
|
113
|
+
*/
|
|
114
|
+
readonly onDidReconnect: Event<void>;
|
|
115
|
+
/** Whether a generation was ready before, which makes the next one a reconnect. */
|
|
116
|
+
protected readyBefore: boolean;
|
|
81
117
|
constructor(port: DataPort, client: TClient, ...rest: DataConnectionArgs<TTransfer, TClient, TServer>);
|
|
82
118
|
/**
|
|
83
119
|
* The sessions of this connection that have not ended, in the order they
|
|
@@ -105,6 +141,16 @@ export declare class DataConnection<TTransfer extends TransferElement, TServer e
|
|
|
105
141
|
* connection already holds.
|
|
106
142
|
*/
|
|
107
143
|
createSession(label?: string, clientId?: string): DataSession<TTransfer, TServer>;
|
|
144
|
+
/**
|
|
145
|
+
* Follow `uri` without opening it: its update events reach this
|
|
146
|
+
* connection's client once this resolves. An open would hold the document
|
|
147
|
+
* for as long as the caller follows it. The watch runs under an id of its
|
|
148
|
+
* own, `label` plus `#` plus a random UUID, and needs no session: a session
|
|
149
|
+
* closing the document would also end its own watch of it. Every later
|
|
150
|
+
* connection that becomes ready gets the watch again. Disposing the handle
|
|
151
|
+
* unwatches.
|
|
152
|
+
*/
|
|
153
|
+
watchDocument(uri: string, label?: string): Promise<Disposable>;
|
|
108
154
|
/**
|
|
109
155
|
* The client, with its `onDocumentDirtyChanged` passing through
|
|
110
156
|
* {@link deliverDirty} first, so {@link dirtyStates} holds what the server
|
|
@@ -115,16 +161,49 @@ export declare class DataConnection<TTransfer extends TransferElement, TServer e
|
|
|
115
161
|
* binding still refuses it.
|
|
116
162
|
*/
|
|
117
163
|
protected localTarget(): TClient;
|
|
164
|
+
/**
|
|
165
|
+
* Hand a dirty state a restore read to the client, unless it is what
|
|
166
|
+
* {@link dirtyStates} says the client was last told; a URI it holds
|
|
167
|
+
* nothing for counts as different.
|
|
168
|
+
*/
|
|
169
|
+
protected restoreDirty(event: TransferDocumentDirtyChangedEvent): void;
|
|
118
170
|
/** Record `event` in {@link dirtyStates} and hand it to the client. */
|
|
119
171
|
protected deliverDirty(event: TransferDocumentDirtyChangedEvent): void;
|
|
120
172
|
/**
|
|
121
173
|
* After the transport dropped, reconnect on the next macrotask for the
|
|
122
174
|
* sessions with documents open, so they re-watch and follow their documents
|
|
123
|
-
* again without waiting for a call of their own
|
|
124
|
-
*
|
|
125
|
-
*
|
|
175
|
+
* again without waiting for a call of their own, and connect for what
|
|
176
|
+
* {@link watchDocument} watches, which {@link generationReady} places
|
|
177
|
+
* again; a session with nothing open restores on its next call. Nothing is
|
|
178
|
+
* scheduled once this connection is disposed, which drops its generation
|
|
179
|
+
* too.
|
|
126
180
|
*/
|
|
127
181
|
protected dropGeneration(): void;
|
|
182
|
+
/**
|
|
183
|
+
* Call `reconnect()` on every session, reporting a throw instead of letting
|
|
184
|
+
* one session's restore stop the others and the watches after them, and,
|
|
185
|
+
* inside the readiness gate, fail the whole generation.
|
|
186
|
+
*/
|
|
187
|
+
protected reconnectSessions(): void;
|
|
188
|
+
/**
|
|
189
|
+
* Restore what the server lost with an earlier generation, whichever
|
|
190
|
+
* request brought this one up: the documents of sessions that have some
|
|
191
|
+
* open, and every watch {@link watchDocument} keeps.
|
|
192
|
+
*/
|
|
193
|
+
protected generationReady(generation: RpcConnectionGeneration<TServer>): void;
|
|
194
|
+
/**
|
|
195
|
+
* Send the watch of `uri` under `clientId` to `generation`, which has just
|
|
196
|
+
* passed its readiness gate. Sent at once rather than after a wait, so no
|
|
197
|
+
* drop can come between choosing the generation and sending. A failure is
|
|
198
|
+
* reported, since no caller waits on it, only while the watch is kept and
|
|
199
|
+
* `generation` is still current: otherwise the next generation sends it
|
|
200
|
+
* again.
|
|
201
|
+
*
|
|
202
|
+
* Once the watch is in place, the document's dirty state is read and goes
|
|
203
|
+
* through {@link restoreDirty}, as a session's restore does: a flip while
|
|
204
|
+
* the connection was down reached no one.
|
|
205
|
+
*/
|
|
206
|
+
protected watchAgain(generation: RpcConnectionGeneration<TServer>, clientId: string, uri: string): void;
|
|
128
207
|
/**
|
|
129
208
|
* Sessions are detached rather than disposed: the server ends every session
|
|
130
209
|
* on a connection it sees close, so ending each one first sends requests
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-connection.d.ts","sourceRoot":"","sources":["../../src/client/data-connection.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"data-connection.d.ts","sourceRoot":"","sources":["../../src/client/data-connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,15 +8,27 @@
|
|
|
8
8
|
* SPDX-License-Identifier: MIT
|
|
9
9
|
********************************************************************************/
|
|
10
10
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
11
|
-
exports.DataConnectionWithEvents = exports.DataConnection = void 0;
|
|
11
|
+
exports.DataConnectionWithEvents = exports.DataConnection = exports.DATA_CONNECTION_SESSION_RESTORE_FAILED = exports.DATA_CONNECTION_WATCH_RESTORE_FAILED = void 0;
|
|
12
12
|
const vscode_jsonrpc_1 = require("vscode-jsonrpc");
|
|
13
13
|
const client_ids_1 = require("../client-ids");
|
|
14
14
|
const data_1 = require("../data");
|
|
15
15
|
const errors_1 = require("../errors");
|
|
16
|
+
const primitives_1 = require("../messages/primitives");
|
|
17
|
+
const noop_logger_1 = require("../noop-logger");
|
|
16
18
|
const random_uuid_1 = require("../random-uuid");
|
|
17
19
|
const data_events_1 = require("./data-events");
|
|
18
20
|
const data_session_1 = require("./data-session");
|
|
19
21
|
const rpc_connection_1 = require("./rpc-connection");
|
|
22
|
+
/**
|
|
23
|
+
* A watch {@link DataConnection.watchDocument} keeps could not be sent again to
|
|
24
|
+
* a connection that became ready after a drop; the next one sends it again.
|
|
25
|
+
*/
|
|
26
|
+
exports.DATA_CONNECTION_WATCH_RESTORE_FAILED = (0, primitives_1.defineMessage)('hydranium/protocol/data-connection-watch-restore-failed', 'Could not watch {uri} again after reconnecting to the data server: {detail}');
|
|
27
|
+
/**
|
|
28
|
+
* A session's restore threw when its connection came back; the connection
|
|
29
|
+
* went on restoring the others.
|
|
30
|
+
*/
|
|
31
|
+
exports.DATA_CONNECTION_SESSION_RESTORE_FAILED = (0, primitives_1.defineMessage)('hydranium/protocol/data-connection-session-restore-failed', 'Could not restore a session after reconnecting to the data server: {detail}');
|
|
20
32
|
/**
|
|
21
33
|
* A {@link RpcConnection} to the data head, carrying as many participants as
|
|
22
34
|
* the host has interested parties.
|
|
@@ -25,6 +37,8 @@ const rpc_connection_1 = require("./rpc-connection");
|
|
|
25
37
|
* `clientId`, which identifies a participant rather than a wire, and the server
|
|
26
38
|
* keys its opens and watches per `(uri, clientId)`. Two parties sharing one
|
|
27
39
|
* identity cannot tell each other's writes from their own echoes.
|
|
40
|
+
* {@link DataConnection.watchDocument} is the exception: it acts as no
|
|
41
|
+
* participant, under an id no session holds, and opens or writes nothing.
|
|
28
42
|
*
|
|
29
43
|
* Generic over the transfer root so this file names no grammar. An adopter
|
|
30
44
|
* binds the concrete root (or the union of them, for a multi-grammar head) at
|
|
@@ -41,16 +55,39 @@ class DataConnection extends rpc_connection_1.RpcConnection {
|
|
|
41
55
|
*/
|
|
42
56
|
onDidCreateSession = this.createSessionEmitter.event;
|
|
43
57
|
/**
|
|
44
|
-
* Per URI, the `dirty` the client was last told
|
|
45
|
-
* connection
|
|
46
|
-
*
|
|
47
|
-
*
|
|
58
|
+
* Per URI, the `dirty` the client was last told, whether a session of this
|
|
59
|
+
* connection has it open or a watch follows it. A session's open or close
|
|
60
|
+
* of the URI forgets it; disposing a watch does not, since a watch knows
|
|
61
|
+
* only the caller's spelling of the URI, not the server's key. A
|
|
62
|
+
* session's restore and a watch sent again after a reconnect tell the
|
|
63
|
+
* client their answer where it differs, a forgotten URI included; see
|
|
64
|
+
* {@link restoreDirty}.
|
|
48
65
|
*/
|
|
49
66
|
dirtyStates = new Map();
|
|
50
67
|
/** Backs each session's {@link DataSessionHost.onDidChangeDirty}. */
|
|
51
68
|
dirtyChangedEmitter = new vscode_jsonrpc_1.Emitter();
|
|
52
69
|
/** Backs each session's {@link DataSessionHost.onDidUpdateDocument}. */
|
|
53
70
|
documentUpdatedEmitter = new vscode_jsonrpc_1.Emitter();
|
|
71
|
+
/**
|
|
72
|
+
* Per id {@link watchDocument} watches under, the URI it watches, which
|
|
73
|
+
* {@link generationReady} sends again to every later generation until the
|
|
74
|
+
* watch's handle is disposed.
|
|
75
|
+
*/
|
|
76
|
+
watches = new Map();
|
|
77
|
+
/** The port's logger, or one that logs nothing. */
|
|
78
|
+
logger;
|
|
79
|
+
/** Backs {@link onDidReconnect}. */
|
|
80
|
+
reconnectEmitter = new vscode_jsonrpc_1.Emitter();
|
|
81
|
+
/**
|
|
82
|
+
* Fires on every reconnect: once a connection becomes ready after an
|
|
83
|
+
* earlier one was, and its watches have been sent. The server sends no
|
|
84
|
+
* event for a change made while the connection was down, so a watcher reads
|
|
85
|
+
* its document again on this; a read it sends now reaches the server after
|
|
86
|
+
* its watch.
|
|
87
|
+
*/
|
|
88
|
+
onDidReconnect = this.reconnectEmitter.event;
|
|
89
|
+
/** Whether a generation was ready before, which makes the next one a reconnect. */
|
|
90
|
+
readyBefore = false;
|
|
54
91
|
constructor(port, client, ...rest) {
|
|
55
92
|
const [options = {}] = rest;
|
|
56
93
|
super(port, client, {
|
|
@@ -63,6 +100,7 @@ class DataConnection extends rpc_connection_1.RpcConnection {
|
|
|
63
100
|
});
|
|
64
101
|
this.sessionFactory =
|
|
65
102
|
options.sessionFactory ?? ((clientId, host, label) => new data_session_1.DataSession(clientId, host, label));
|
|
103
|
+
this.logger = (port.logger ?? new noop_logger_1.NoopLogger()).for('DataConnection');
|
|
66
104
|
}
|
|
67
105
|
/**
|
|
68
106
|
* The sessions of this connection that have not ended, in the order they
|
|
@@ -103,11 +141,7 @@ class DataConnection extends rpc_connection_1.RpcConnection {
|
|
|
103
141
|
const session = this.sessionFactory(id, {
|
|
104
142
|
connected: () => this.connected(),
|
|
105
143
|
reportError: (error, reported) => this.reportError(error, reported),
|
|
106
|
-
restoreDirty: event =>
|
|
107
|
-
if (this.dirtyStates.get(event.uri) !== (event.text?.dirty ?? false)) {
|
|
108
|
-
this.deliverDirty(event);
|
|
109
|
-
}
|
|
110
|
-
},
|
|
144
|
+
restoreDirty: event => this.restoreDirty(event),
|
|
111
145
|
forgetDirty: uri => this.dirtyStates.delete(uri),
|
|
112
146
|
onDidChangeDirty: this.dirtyChangedEmitter.event,
|
|
113
147
|
onDidUpdateDocument: this.documentUpdatedEmitter.event
|
|
@@ -122,6 +156,47 @@ class DataConnection extends rpc_connection_1.RpcConnection {
|
|
|
122
156
|
this.createSessionEmitter.fire(session);
|
|
123
157
|
return session;
|
|
124
158
|
}
|
|
159
|
+
/**
|
|
160
|
+
* Follow `uri` without opening it: its update events reach this
|
|
161
|
+
* connection's client once this resolves. An open would hold the document
|
|
162
|
+
* for as long as the caller follows it. The watch runs under an id of its
|
|
163
|
+
* own, `label` plus `#` plus a random UUID, and needs no session: a session
|
|
164
|
+
* closing the document would also end its own watch of it. Every later
|
|
165
|
+
* connection that becomes ready gets the watch again. Disposing the handle
|
|
166
|
+
* unwatches.
|
|
167
|
+
*/
|
|
168
|
+
async watchDocument(uri, label = 'watch') {
|
|
169
|
+
const clientId = `${label}#${(0, random_uuid_1.randomUuid)()}`;
|
|
170
|
+
const server = await this.connected();
|
|
171
|
+
// Kept only from here: kept during the wait, a generation that became
|
|
172
|
+
// ready meanwhile would send the watch a second time.
|
|
173
|
+
this.watches.set(clientId, uri);
|
|
174
|
+
try {
|
|
175
|
+
await server.watchModelDocument({ uri, clientId });
|
|
176
|
+
}
|
|
177
|
+
catch (error) {
|
|
178
|
+
this.watches.delete(clientId);
|
|
179
|
+
throw error;
|
|
180
|
+
}
|
|
181
|
+
this.logger.debug(`Watch ${uri} as ${clientId}`);
|
|
182
|
+
return vscode_jsonrpc_1.Disposable.create(() => {
|
|
183
|
+
if (!this.watches.delete(clientId)) {
|
|
184
|
+
return;
|
|
185
|
+
}
|
|
186
|
+
// Without a generation the server dropped the watch with its
|
|
187
|
+
// connection, and one that drops before it is ready drops it too: the
|
|
188
|
+
// unwatch follows no drop to a connection opened only for it.
|
|
189
|
+
const generation = this.generation;
|
|
190
|
+
if (generation) {
|
|
191
|
+
(generation.ready ??= this.awaitReady(generation)).then(() => {
|
|
192
|
+
if (this.generation === generation) {
|
|
193
|
+
this.logger.debug(`Unwatch ${uri} as ${clientId}`);
|
|
194
|
+
generation.server.unwatchModelDocument({ uri, clientId }).catch(() => undefined);
|
|
195
|
+
}
|
|
196
|
+
}, () => undefined);
|
|
197
|
+
}
|
|
198
|
+
});
|
|
199
|
+
}
|
|
125
200
|
/**
|
|
126
201
|
* The client, with its `onDocumentDirtyChanged` passing through
|
|
127
202
|
* {@link deliverDirty} first, so {@link dirtyStates} holds what the server
|
|
@@ -160,6 +235,16 @@ class DataConnection extends rpc_connection_1.RpcConnection {
|
|
|
160
235
|
}
|
|
161
236
|
return target;
|
|
162
237
|
}
|
|
238
|
+
/**
|
|
239
|
+
* Hand a dirty state a restore read to the client, unless it is what
|
|
240
|
+
* {@link dirtyStates} says the client was last told; a URI it holds
|
|
241
|
+
* nothing for counts as different.
|
|
242
|
+
*/
|
|
243
|
+
restoreDirty(event) {
|
|
244
|
+
if (this.dirtyStates.get(event.uri) !== (event.text?.dirty ?? false)) {
|
|
245
|
+
this.deliverDirty(event);
|
|
246
|
+
}
|
|
247
|
+
}
|
|
163
248
|
/** Record `event` in {@link dirtyStates} and hand it to the client. */
|
|
164
249
|
deliverDirty(event) {
|
|
165
250
|
this.dirtyStates.set(event.uri, event.text?.dirty ?? false);
|
|
@@ -169,9 +254,11 @@ class DataConnection extends rpc_connection_1.RpcConnection {
|
|
|
169
254
|
/**
|
|
170
255
|
* After the transport dropped, reconnect on the next macrotask for the
|
|
171
256
|
* sessions with documents open, so they re-watch and follow their documents
|
|
172
|
-
* again without waiting for a call of their own
|
|
173
|
-
*
|
|
174
|
-
*
|
|
257
|
+
* again without waiting for a call of their own, and connect for what
|
|
258
|
+
* {@link watchDocument} watches, which {@link generationReady} places
|
|
259
|
+
* again; a session with nothing open restores on its next call. Nothing is
|
|
260
|
+
* scheduled once this connection is disposed, which drops its generation
|
|
261
|
+
* too.
|
|
175
262
|
*/
|
|
176
263
|
dropGeneration() {
|
|
177
264
|
const dropped = this.generation !== undefined;
|
|
@@ -179,11 +266,89 @@ class DataConnection extends rpc_connection_1.RpcConnection {
|
|
|
179
266
|
if (dropped && !this.disposed) {
|
|
180
267
|
setTimeout(() => {
|
|
181
268
|
if (!this.disposed) {
|
|
182
|
-
this.
|
|
269
|
+
this.reconnectSessions();
|
|
270
|
+
if (this.watches.size > 0) {
|
|
271
|
+
// One generation, not `connected`, which follows a drop to
|
|
272
|
+
// the next: that drop's own timer asks again whether
|
|
273
|
+
// anything is still kept. A failure is reported by the gate.
|
|
274
|
+
const generation = this.currentGeneration();
|
|
275
|
+
(generation.ready ??= this.awaitReady(generation)).catch(() => undefined);
|
|
276
|
+
}
|
|
183
277
|
}
|
|
184
278
|
}, 0);
|
|
185
279
|
}
|
|
186
280
|
}
|
|
281
|
+
/**
|
|
282
|
+
* Call `reconnect()` on every session, reporting a throw instead of letting
|
|
283
|
+
* one session's restore stop the others and the watches after them, and,
|
|
284
|
+
* inside the readiness gate, fail the whole generation.
|
|
285
|
+
*/
|
|
286
|
+
reconnectSessions() {
|
|
287
|
+
for (const session of this.sessions) {
|
|
288
|
+
try {
|
|
289
|
+
session.reconnect();
|
|
290
|
+
}
|
|
291
|
+
catch (error) {
|
|
292
|
+
// Reported, so it reaches the user on a port without a logger;
|
|
293
|
+
// logged too, since only the log names the session.
|
|
294
|
+
this.reportError(error, (0, primitives_1.resolve)(exports.DATA_CONNECTION_SESSION_RESTORE_FAILED, { detail: (0, primitives_1.describeError)(error) }));
|
|
295
|
+
this.logger.error(`Could not restore session ${session.clientId}: ${(0, primitives_1.describeError)(error)}`);
|
|
296
|
+
}
|
|
297
|
+
}
|
|
298
|
+
}
|
|
299
|
+
/**
|
|
300
|
+
* Restore what the server lost with an earlier generation, whichever
|
|
301
|
+
* request brought this one up: the documents of sessions that have some
|
|
302
|
+
* open, and every watch {@link watchDocument} keeps.
|
|
303
|
+
*/
|
|
304
|
+
generationReady(generation) {
|
|
305
|
+
super.generationReady(generation);
|
|
306
|
+
this.reconnectSessions();
|
|
307
|
+
this.watches.forEach((uri, clientId) => this.watchAgain(generation, clientId, uri));
|
|
308
|
+
if (this.readyBefore) {
|
|
309
|
+
this.reconnectEmitter.fire(undefined);
|
|
310
|
+
}
|
|
311
|
+
this.readyBefore = true;
|
|
312
|
+
}
|
|
313
|
+
/**
|
|
314
|
+
* Send the watch of `uri` under `clientId` to `generation`, which has just
|
|
315
|
+
* passed its readiness gate. Sent at once rather than after a wait, so no
|
|
316
|
+
* drop can come between choosing the generation and sending. A failure is
|
|
317
|
+
* reported, since no caller waits on it, only while the watch is kept and
|
|
318
|
+
* `generation` is still current: otherwise the next generation sends it
|
|
319
|
+
* again.
|
|
320
|
+
*
|
|
321
|
+
* Once the watch is in place, the document's dirty state is read and goes
|
|
322
|
+
* through {@link restoreDirty}, as a session's restore does: a flip while
|
|
323
|
+
* the connection was down reached no one.
|
|
324
|
+
*/
|
|
325
|
+
watchAgain(generation, clientId, uri) {
|
|
326
|
+
generation.server.watchModelDocument({ uri, clientId }).then(() => {
|
|
327
|
+
if (!this.watches.has(clientId)) {
|
|
328
|
+
return;
|
|
329
|
+
}
|
|
330
|
+
this.logger.debug(`Watch ${uri} again as ${clientId}`);
|
|
331
|
+
generation.server.getModelDocument({ uri }).then(current => {
|
|
332
|
+
if (current.text && this.watches.has(clientId)) {
|
|
333
|
+
try {
|
|
334
|
+
this.restoreDirty({ uri: current.uri, text: current.text });
|
|
335
|
+
}
|
|
336
|
+
catch {
|
|
337
|
+
// The client's listener failed, not the watch, which stays kept.
|
|
338
|
+
}
|
|
339
|
+
}
|
|
340
|
+
}, () => undefined);
|
|
341
|
+
}, (error) => {
|
|
342
|
+
if (!this.watches.has(clientId)) {
|
|
343
|
+
return;
|
|
344
|
+
}
|
|
345
|
+
if (this.generation !== generation) {
|
|
346
|
+
this.logger.debug(`Watch of ${uri} as ${clientId} cut short by a lost connection; the next one sends it again`);
|
|
347
|
+
return;
|
|
348
|
+
}
|
|
349
|
+
this.reportError(error, (0, primitives_1.resolve)(exports.DATA_CONNECTION_WATCH_RESTORE_FAILED, { uri, detail: (0, primitives_1.describeError)(error) }));
|
|
350
|
+
});
|
|
351
|
+
}
|
|
187
352
|
/**
|
|
188
353
|
* Sessions are detached rather than disposed: the server ends every session
|
|
189
354
|
* on a connection it sees close, so ending each one first sends requests
|
|
@@ -195,7 +360,9 @@ class DataConnection extends rpc_connection_1.RpcConnection {
|
|
|
195
360
|
}
|
|
196
361
|
// For a factory's session whose `detach` does not fire.
|
|
197
362
|
this.sessions.clear();
|
|
363
|
+
this.watches.clear();
|
|
198
364
|
this.createSessionEmitter.dispose();
|
|
365
|
+
this.reconnectEmitter.dispose();
|
|
199
366
|
this.dirtyChangedEmitter.dispose();
|
|
200
367
|
this.documentUpdatedEmitter.dispose();
|
|
201
368
|
super.dispose();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-connection.js","sourceRoot":"","sources":["../../src/client/data-connection.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;AAElF,
|
|
1
|
+
{"version":3,"file":"data-connection.js","sourceRoot":"","sources":["../../src/client/data-connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
* SPDX-License-Identifier: MIT
|
|
8
8
|
********************************************************************************/
|
|
9
9
|
import type { Event, MessageConnection } from 'vscode-jsonrpc';
|
|
10
|
+
import type { Logger } from '../logger';
|
|
10
11
|
import type { ResolvedMessage } from '../messages/primitives';
|
|
11
12
|
import type { RpcConnectionLifecycle } from './rpc-connection';
|
|
12
13
|
/**
|
|
@@ -73,6 +74,8 @@ export interface DataPort {
|
|
|
73
74
|
* passing no translation map yields the English.
|
|
74
75
|
*/
|
|
75
76
|
reportError(error: unknown, reported: ResolvedMessage): void;
|
|
77
|
+
/** Where a connection over this port logs what it does on its own. Without one it logs nothing. */
|
|
78
|
+
readonly logger?: Logger;
|
|
76
79
|
/**
|
|
77
80
|
* Fires when the host tears the transport down and the current connection
|
|
78
81
|
* is no longer usable — a language-server restart being the case that
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-port.d.ts","sourceRoot":"","sources":["../../src/client/data-port.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,KAAK,EAAE,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE/D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,MAAM,WAAW,QAAQ;IACtB;;;;;;;OAOG;IACH,OAAO,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAEtC;;;;;;;;;;;;;;OAcG;IACH,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,eAAe,GAAG,IAAI,CAAC;IAE7D;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAEhC;;;;OAIG;IACH,QAAQ,CAAC,mBAAmB,CAAC,EAAE,sBAAsB,CAAC;CACxD"}
|
|
1
|
+
{"version":3,"file":"data-port.d.ts","sourceRoot":"","sources":["../../src/client/data-port.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,KAAK,EAAE,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE/D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,MAAM,WAAW,QAAQ;IACtB;;;;;;;OAOG;IACH,OAAO,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAEtC;;;;;;;;;;;;;;OAcG;IACH,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,eAAe,GAAG,IAAI,CAAC;IAE7D,mGAAmG;IACnG,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAEzB;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAEhC;;;;OAIG;IACH,QAAQ,CAAC,mBAAmB,CAAC,EAAE,sBAAsB,CAAC;CACxD"}
|
|
@@ -163,8 +163,9 @@ export type DataSessionFactory<TTransfer extends TransferElement, TServer extend
|
|
|
163
163
|
* re-opens and re-watches what it had open, tells the client of their dirty
|
|
164
164
|
* state where it changed, and reports the documents whose unsaved edits did
|
|
165
165
|
* not survive; see {@link restore}. The connection does this at
|
|
166
|
-
* once for a session with documents open, and
|
|
167
|
-
*
|
|
166
|
+
* once for a session with documents open, and again once any later connection
|
|
167
|
+
* is ready, so a reconnect that failed is not left to the session's own next
|
|
168
|
+
* call; any session's next call does it too.
|
|
168
169
|
*
|
|
169
170
|
* Generic over the transfer root so this file names no grammar.
|
|
170
171
|
*
|
|
@@ -384,8 +385,9 @@ export declare class DataSession<TTransfer extends TransferElement, TServer exte
|
|
|
384
385
|
/**
|
|
385
386
|
* Register again and restore now, after the connection dropped, instead of
|
|
386
387
|
* on the next call. A no-op for a session with nothing open, which the next
|
|
387
|
-
* call restores anyway
|
|
388
|
-
*
|
|
388
|
+
* call restores anyway, and for one already registered on the current
|
|
389
|
+
* connection. A failure is retried on the connection's next ready
|
|
390
|
+
* generation; a call before then meets it again.
|
|
389
391
|
*/
|
|
390
392
|
reconnect(): void;
|
|
391
393
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-session.d.ts","sourceRoot":"","sources":["../../src/client/data-session.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"data-session.d.ts","sourceRoot":"","sources":["../../src/client/data-session.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,8 +58,9 @@ function indexOf(write) {
|
|
|
58
58
|
* re-opens and re-watches what it had open, tells the client of their dirty
|
|
59
59
|
* state where it changed, and reports the documents whose unsaved edits did
|
|
60
60
|
* not survive; see {@link restore}. The connection does this at
|
|
61
|
-
* once for a session with documents open, and
|
|
62
|
-
*
|
|
61
|
+
* once for a session with documents open, and again once any later connection
|
|
62
|
+
* is ready, so a reconnect that failed is not left to the session's own next
|
|
63
|
+
* call; any session's next call does it too.
|
|
63
64
|
*
|
|
64
65
|
* Generic over the transfer root so this file names no grammar.
|
|
65
66
|
*
|
|
@@ -183,6 +184,9 @@ class DataSession {
|
|
|
183
184
|
this.registration = this.register(server, reconnected);
|
|
184
185
|
}
|
|
185
186
|
await this.registration;
|
|
187
|
+
// And after the registration: a call waiting on it has not reached the
|
|
188
|
+
// wire, and sent now it would land after the session's close.
|
|
189
|
+
this.assertLive();
|
|
186
190
|
return server;
|
|
187
191
|
}
|
|
188
192
|
/**
|
|
@@ -439,8 +443,9 @@ class DataSession {
|
|
|
439
443
|
/**
|
|
440
444
|
* Register again and restore now, after the connection dropped, instead of
|
|
441
445
|
* on the next call. A no-op for a session with nothing open, which the next
|
|
442
|
-
* call restores anyway
|
|
443
|
-
*
|
|
446
|
+
* call restores anyway, and for one already registered on the current
|
|
447
|
+
* connection. A failure is retried on the connection's next ready
|
|
448
|
+
* generation; a call before then meets it again.
|
|
444
449
|
*/
|
|
445
450
|
reconnect() {
|
|
446
451
|
if (!this.disposed && this.openUris.size > 0) {
|