@hydranium/protocol 1.0.0-next.148 → 1.0.0-next.155
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 +10 -3
- package/lib/client/data-connection.d.ts.map +1 -1
- package/lib/client/data-connection.js +30 -5
- package/lib/client/data-connection.js.map +1 -1
- package/lib/client/data-session.d.ts +170 -29
- package/lib/client/data-session.d.ts.map +1 -1
- package/lib/client/data-session.js +322 -49
- package/lib/client/data-session.js.map +1 -1
- package/lib/transfer-document.d.ts +12 -0
- package/lib/transfer-document.d.ts.map +1 -1
- package/lib/transfer-document.js.map +1 -1
- package/lib/util.d.ts +6 -9
- package/lib/util.d.ts.map +1 -1
- package/lib/util.js +13 -5
- package/lib/util.js.map +1 -1
- package/package.json +1 -1
- package/src/client/data-connection.ts +32 -6
- package/src/client/data-session.ts +386 -52
- package/src/transfer-document.ts +12 -0
- package/src/util.ts +14 -5
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
* SPDX-License-Identifier: MIT
|
|
8
8
|
********************************************************************************/
|
|
9
9
|
import { Emitter, type Event } from 'vscode-jsonrpc';
|
|
10
|
-
import { type DataClientProtocol, type DataServerProtocol, type DiagnosticOf, type ProjectOf, type TransferDocumentDirtyChangedEvent } from '../data';
|
|
10
|
+
import { type DataClientProtocol, type DataServerProtocol, type DiagnosticOf, type ProjectOf, type TransferDocumentDirtyChangedEvent, type TransferDocumentUpdatedEvent } from '../data';
|
|
11
11
|
import type { TransferElement } from '../transfer-element';
|
|
12
12
|
import { DataEvents } from './data-events';
|
|
13
13
|
import type { DataPort } from './data-port';
|
|
@@ -74,6 +74,10 @@ export declare class DataConnection<TTransfer extends TransferElement, TServer e
|
|
|
74
74
|
* {@link DataSessionHost.restoreDirty}.
|
|
75
75
|
*/
|
|
76
76
|
protected readonly dirtyStates: Map<string, boolean>;
|
|
77
|
+
/** Backs each session's {@link DataSessionHost.onDidChangeDirty}. */
|
|
78
|
+
protected readonly dirtyChangedEmitter: Emitter<TransferDocumentDirtyChangedEvent>;
|
|
79
|
+
/** Backs each session's {@link DataSessionHost.onDidUpdateDocument}. */
|
|
80
|
+
protected readonly documentUpdatedEmitter: Emitter<TransferDocumentUpdatedEvent<TTransfer, DiagnosticOf<TServer>>>;
|
|
77
81
|
constructor(port: DataPort, client: TClient, ...rest: DataConnectionArgs<TTransfer, TClient, TServer>);
|
|
78
82
|
/**
|
|
79
83
|
* The sessions of this connection that have not ended, in the order they
|
|
@@ -104,8 +108,11 @@ export declare class DataConnection<TTransfer extends TransferElement, TServer e
|
|
|
104
108
|
/**
|
|
105
109
|
* The client, with its `onDocumentDirtyChanged` passing through
|
|
106
110
|
* {@link deliverDirty} first, so {@link dirtyStates} holds what the server
|
|
107
|
-
* told it
|
|
108
|
-
*
|
|
111
|
+
* told it, and every session hears it through {@link dirtyChangedEmitter};
|
|
112
|
+
* and with its `onDocumentUpdated` heard by every session through
|
|
113
|
+
* {@link documentUpdatedEmitter} first. Every other bound method forwards
|
|
114
|
+
* to the client unchanged, and one the client lacks stays absent, so the
|
|
115
|
+
* binding still refuses it.
|
|
109
116
|
*/
|
|
110
117
|
protected localTarget(): TClient;
|
|
111
118
|
/** Record `event` in {@link dirtyStates} and hand it to the client. */
|
|
@@ -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;AAErD,OAAO,EAGJ,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,KAAK,iCAAiC,
|
|
1
|
+
{"version":3,"file":"data-connection.d.ts","sourceRoot":"","sources":["../../src/client/data-connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,6 +46,10 @@ class DataConnection extends rpc_connection_1.RpcConnection {
|
|
|
46
46
|
* {@link DataSessionHost.restoreDirty}.
|
|
47
47
|
*/
|
|
48
48
|
dirtyStates = new Map();
|
|
49
|
+
/** Backs each session's {@link DataSessionHost.onDidChangeDirty}. */
|
|
50
|
+
dirtyChangedEmitter = new vscode_jsonrpc_1.Emitter();
|
|
51
|
+
/** Backs each session's {@link DataSessionHost.onDidUpdateDocument}. */
|
|
52
|
+
documentUpdatedEmitter = new vscode_jsonrpc_1.Emitter();
|
|
49
53
|
constructor(port, client, ...rest) {
|
|
50
54
|
const [options = {}] = rest;
|
|
51
55
|
super(port, client, {
|
|
@@ -103,7 +107,9 @@ class DataConnection extends rpc_connection_1.RpcConnection {
|
|
|
103
107
|
this.deliverDirty(event);
|
|
104
108
|
}
|
|
105
109
|
},
|
|
106
|
-
forgetDirty: uri => this.dirtyStates.delete(uri)
|
|
110
|
+
forgetDirty: uri => this.dirtyStates.delete(uri),
|
|
111
|
+
onDidChangeDirty: this.dirtyChangedEmitter.event,
|
|
112
|
+
onDidUpdateDocument: this.documentUpdatedEmitter.event
|
|
107
113
|
}, label);
|
|
108
114
|
this.sessions.add(session);
|
|
109
115
|
// Subscribed before the session is handed out, so the id is free again
|
|
@@ -118,12 +124,17 @@ class DataConnection extends rpc_connection_1.RpcConnection {
|
|
|
118
124
|
/**
|
|
119
125
|
* The client, with its `onDocumentDirtyChanged` passing through
|
|
120
126
|
* {@link deliverDirty} first, so {@link dirtyStates} holds what the server
|
|
121
|
-
* told it
|
|
122
|
-
*
|
|
127
|
+
* told it, and every session hears it through {@link dirtyChangedEmitter};
|
|
128
|
+
* and with its `onDocumentUpdated` heard by every session through
|
|
129
|
+
* {@link documentUpdatedEmitter} first. Every other bound method forwards
|
|
130
|
+
* to the client unchanged, and one the client lacks stays absent, so the
|
|
131
|
+
* binding still refuses it.
|
|
123
132
|
*/
|
|
124
133
|
localTarget() {
|
|
125
134
|
const client = this.client;
|
|
126
|
-
|
|
135
|
+
const hearsDirty = typeof client.onDocumentDirtyChanged === 'function';
|
|
136
|
+
const hearsUpdates = typeof client.onDocumentUpdated === 'function';
|
|
137
|
+
if (!hearsDirty && !hearsUpdates) {
|
|
127
138
|
return this.client;
|
|
128
139
|
}
|
|
129
140
|
const target = {};
|
|
@@ -133,7 +144,19 @@ class DataConnection extends rpc_connection_1.RpcConnection {
|
|
|
133
144
|
target[name] = (params) => method.call(client, params);
|
|
134
145
|
}
|
|
135
146
|
}
|
|
136
|
-
|
|
147
|
+
if (hearsDirty) {
|
|
148
|
+
target.onDocumentDirtyChanged = (event) => {
|
|
149
|
+
this.dirtyChangedEmitter.fire(event);
|
|
150
|
+
this.deliverDirty(event);
|
|
151
|
+
};
|
|
152
|
+
}
|
|
153
|
+
if (hearsUpdates) {
|
|
154
|
+
const forward = target.onDocumentUpdated;
|
|
155
|
+
target.onDocumentUpdated = (event) => {
|
|
156
|
+
this.documentUpdatedEmitter.fire(event);
|
|
157
|
+
forward(event);
|
|
158
|
+
};
|
|
159
|
+
}
|
|
137
160
|
return target;
|
|
138
161
|
}
|
|
139
162
|
/** Record `event` in {@link dirtyStates} and hand it to the client. */
|
|
@@ -172,6 +195,8 @@ class DataConnection extends rpc_connection_1.RpcConnection {
|
|
|
172
195
|
// For a factory's session whose `detach` does not fire.
|
|
173
196
|
this.sessions.clear();
|
|
174
197
|
this.createSessionEmitter.dispose();
|
|
198
|
+
this.dirtyChangedEmitter.dispose();
|
|
199
|
+
this.documentUpdatedEmitter.dispose();
|
|
175
200
|
super.dispose();
|
|
176
201
|
}
|
|
177
202
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-connection.js","sourceRoot":"","sources":["../../src/client/data-connection.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;AAElF,mDAAqD;AACrD,8CAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"data-connection.js","sourceRoot":"","sources":["../../src/client/data-connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,8 +8,8 @@
|
|
|
8
8
|
********************************************************************************/
|
|
9
9
|
import { type Disposable, Emitter, type Event } from 'vscode-jsonrpc';
|
|
10
10
|
import { type Clock } from '../clock';
|
|
11
|
-
import type { DataServerProtocol, DiagnosticOf, TransferDocumentDirtyChangedEvent } from '../data';
|
|
12
|
-
import type
|
|
11
|
+
import type { DataServerProtocol, DiagnosticOf, TransferDocumentDirtyChangedEvent, TransferDocumentUpdatedEvent } from '../data';
|
|
12
|
+
import { type BasedOn, type SnapshotVersion } from '../model-service/based-on';
|
|
13
13
|
import { type ResolvedMessage } from '../messages/primitives';
|
|
14
14
|
import type { OpenModelArgs } from '../model-server';
|
|
15
15
|
import type { MaybePromise } from '../util';
|
|
@@ -18,15 +18,17 @@ import type { TransferDocument } from '../transfer-document';
|
|
|
18
18
|
import type { TransferElement } from '../transfer-element';
|
|
19
19
|
/**
|
|
20
20
|
* A session could not re-open a document it had open after its connection
|
|
21
|
-
* dropped
|
|
21
|
+
* dropped, and forgot it; or could not write it again for another reason than
|
|
22
|
+
* a conflict, and keeps its unsaved edits for the next restore.
|
|
22
23
|
*/
|
|
23
24
|
export declare const DATA_SESSION_RESTORE_FAILED: import("../messages/primitives").MessageDefinition<"Could not restore {uri} after reconnecting to the data server: {detail}">;
|
|
24
25
|
/**
|
|
25
|
-
* A session re-opened documents after its connection dropped
|
|
26
|
-
*
|
|
27
|
-
*
|
|
28
|
-
*
|
|
29
|
-
*
|
|
26
|
+
* A session re-opened documents after its connection dropped and cannot put
|
|
27
|
+
* back what it wrote to them since their last save: another client changed
|
|
28
|
+
* them, even while the session was still connected; the session could not
|
|
29
|
+
* tell the text its writes started from, or lost another document written with
|
|
30
|
+
* them; or the write it sent again conflicted. The session's unsaved edits may
|
|
31
|
+
* be gone, and it no longer holds them.
|
|
30
32
|
*/
|
|
31
33
|
export declare const DATA_SESSION_UNSAVED_LOST: import("../messages/primitives").MessageDefinition<"Unsaved changes to {uris} may have been lost when the connection to the data server dropped.">;
|
|
32
34
|
/**
|
|
@@ -58,6 +60,33 @@ export type DataSessionUpdatesArgs<TTransfer extends TransferElement, TServer ex
|
|
|
58
60
|
export type DataSessionSaveArgs<TTransfer extends TransferElement, TServer extends DataServerProtocol<TTransfer, DiagnosticOf<TServer>> = DataServerProtocol<TTransfer>> = DataSessionArgs<TServer['saveModelDocument']>;
|
|
59
61
|
/** The document a session hands back, carrying its server's diagnostic shape. */
|
|
60
62
|
export type DataSessionDocument<TTransfer extends TransferElement, TServer extends DataServerProtocol<TTransfer, DiagnosticOf<TServer>> = DataServerProtocol<TTransfer>> = TransferDocument<TTransfer, DiagnosticOf<TServer>>;
|
|
63
|
+
/**
|
|
64
|
+
* What a {@link DataSession} keeps of a URI it wrote since the URI's last save,
|
|
65
|
+
* to write it again after a reconnect that lost it.
|
|
66
|
+
*/
|
|
67
|
+
export interface DataSessionUnsavedWrite<TTransfer extends TransferElement, TServer extends DataServerProtocol<TTransfer, DiagnosticOf<TServer>> = DataServerProtocol<TTransfer>> {
|
|
68
|
+
/**
|
|
69
|
+
* The {@link TransferDocument.textHash} of the text the first of these
|
|
70
|
+
* writes was based on. `undefined` when the session could not tell, for a
|
|
71
|
+
* write based on `'anything'` or on a version it could not read back, and
|
|
72
|
+
* such a write is never sent again: the session cannot tell another
|
|
73
|
+
* client's text from the text it wrote over.
|
|
74
|
+
*/
|
|
75
|
+
readonly baseHash: string | undefined;
|
|
76
|
+
readonly answer: Pick<DataSessionDocument<TTransfer, TServer>, 'version' | 'textHash'>;
|
|
77
|
+
/**
|
|
78
|
+
* The call that made the last write, and for an `updateDocuments` call this
|
|
79
|
+
* URI's index in it. Records whose `updates` is the same object were
|
|
80
|
+
* written together and are sent again together, so a restore never applies
|
|
81
|
+
* part of a set.
|
|
82
|
+
*/
|
|
83
|
+
readonly call: {
|
|
84
|
+
readonly update: DataSessionUpdateArgs<TTransfer, TServer>;
|
|
85
|
+
} | {
|
|
86
|
+
readonly updates: DataSessionUpdatesArgs<TTransfer, TServer>;
|
|
87
|
+
readonly index: number;
|
|
88
|
+
};
|
|
89
|
+
}
|
|
61
90
|
/**
|
|
62
91
|
* What a {@link DataSession} needs from the connection that minted it.
|
|
63
92
|
*
|
|
@@ -81,6 +110,19 @@ export interface DataSessionHost<TTransfer extends TransferElement, TServer exte
|
|
|
81
110
|
* has open costs at most one repeat of a state the client already has.
|
|
82
111
|
*/
|
|
83
112
|
forgetDirty?(uri: string): void;
|
|
113
|
+
/**
|
|
114
|
+
* Fires with each flip of a document's dirty state the server sends. A
|
|
115
|
+
* session drops the unsaved write it keeps of a document that turns
|
|
116
|
+
* clean; without this event it keeps it, and a restore after another
|
|
117
|
+
* client's save of the document can report the write lost.
|
|
118
|
+
*/
|
|
119
|
+
readonly onDidChangeDirty?: Event<TransferDocumentDirtyChangedEvent>;
|
|
120
|
+
/**
|
|
121
|
+
* Fires with each update event the server sends. A session drops the
|
|
122
|
+
* unsaved write it keeps of a document another client wrote over; without
|
|
123
|
+
* this event it keeps it, and a restore reports the write lost.
|
|
124
|
+
*/
|
|
125
|
+
readonly onDidUpdateDocument?: Event<TransferDocumentUpdatedEvent<TTransfer, DiagnosticOf<TServer>>>;
|
|
84
126
|
}
|
|
85
127
|
/**
|
|
86
128
|
* Builds the session `DataConnection.createSession` hands out, for an adopter
|
|
@@ -153,11 +195,21 @@ export declare class DataSession<TTransfer extends TransferElement, TServer exte
|
|
|
153
195
|
* it under the open that is still being made.
|
|
154
196
|
*/
|
|
155
197
|
protected readonly openingUris: Map<string, number>;
|
|
198
|
+
/** Per URI written since its last save, what {@link restore} needs to write it again. */
|
|
199
|
+
protected readonly unsavedWrites: Map<string, DataSessionUnsavedWrite<TTransfer, TServer>>;
|
|
156
200
|
/**
|
|
157
|
-
* Per URI
|
|
158
|
-
*
|
|
201
|
+
* Per URI this session has open, the version and text hash of the last
|
|
202
|
+
* document one of its own calls was answered with, which spares the read a
|
|
203
|
+
* first unsaved write otherwise makes for its base; see {@link baseHashOf}.
|
|
159
204
|
*/
|
|
160
|
-
protected readonly
|
|
205
|
+
protected readonly lastAnswers: Map<string, Pick<DataSessionDocument<TTransfer, TServer>, "version" | "textHash">>;
|
|
206
|
+
/**
|
|
207
|
+
* Per URI this session has open, the version its last save of it was
|
|
208
|
+
* answered with; see {@link recordWrite}. Only a save sets it: an open
|
|
209
|
+
* answers at the version of a write still in flight as well, and that
|
|
210
|
+
* write is not saved.
|
|
211
|
+
*/
|
|
212
|
+
protected readonly savedVersions: Map<string, SnapshotVersion>;
|
|
161
213
|
/** Per URI, this session's calls still in flight on it, which a close waits for. */
|
|
162
214
|
protected readonly inFlight: Map<string, Set<Promise<unknown>>>;
|
|
163
215
|
/** This session's saves still in flight, which a host's exit waits for; see {@link hasSavesInFlight}. */
|
|
@@ -192,6 +244,10 @@ export declare class DataSession<TTransfer extends TransferElement, TServer exte
|
|
|
192
244
|
* over a connection that is going away.
|
|
193
245
|
*/
|
|
194
246
|
protected detached: boolean;
|
|
247
|
+
/** The subscription to the host's `onDidChangeDirty`, disposed with the session. */
|
|
248
|
+
protected readonly dirtySubscription?: Disposable;
|
|
249
|
+
/** The subscription to the host's `onDidUpdateDocument`, disposed with the session. */
|
|
250
|
+
protected readonly updateSubscription?: Disposable;
|
|
195
251
|
constructor(clientId: string, host: DataSessionHost<TTransfer, TServer>, label: string);
|
|
196
252
|
/**
|
|
197
253
|
* The connected, READY server proxy once this session is registered on it,
|
|
@@ -300,7 +356,11 @@ export declare class DataSession<TTransfer extends TransferElement, TServer exte
|
|
|
300
356
|
* dispose has not sent yet.
|
|
301
357
|
*/
|
|
302
358
|
detach(): void;
|
|
303
|
-
/**
|
|
359
|
+
/**
|
|
360
|
+
* Dispose {@link dirtySubscription} and {@link updateSubscription}, fire
|
|
361
|
+
* {@link onDidDispose} and dispose its emitter, so a second call fires
|
|
362
|
+
* nothing.
|
|
363
|
+
*/
|
|
304
364
|
protected fireDispose(): void;
|
|
305
365
|
/**
|
|
306
366
|
* Register again and restore now, after the connection dropped, instead of
|
|
@@ -309,36 +369,117 @@ export declare class DataSession<TTransfer extends TransferElement, TServer exte
|
|
|
309
369
|
* again.
|
|
310
370
|
*/
|
|
311
371
|
reconnect(): void;
|
|
372
|
+
/**
|
|
373
|
+
* Drop the record in {@link unsavedWrites} of a document this session has
|
|
374
|
+
* open once the server says it turned clean: it holds no unsaved text
|
|
375
|
+
* then, and a record kept would have a restore report the write lost once
|
|
376
|
+
* another client's save changed the file.
|
|
377
|
+
*
|
|
378
|
+
* The server sends a flip only for a document someone watches, so a
|
|
379
|
+
* document the session writes without watching it keeps its record, and
|
|
380
|
+
* can still be reported lost that way.
|
|
381
|
+
*/
|
|
382
|
+
protected forgetSavedWrite(event: TransferDocumentDirtyChangedEvent): void;
|
|
383
|
+
/**
|
|
384
|
+
* Drop the record in {@link unsavedWrites} of a document another client
|
|
385
|
+
* wrote over while the connection held: its write replaced the session's,
|
|
386
|
+
* so a restore has nothing of the session's to put back, and a record kept
|
|
387
|
+
* would have it report the write lost to the reconnect. A write superseded
|
|
388
|
+
* before its answer needs nothing: the answer names the other client's
|
|
389
|
+
* text, which the record then holds.
|
|
390
|
+
*
|
|
391
|
+
* Only a `'changed'` event from another client counts, and only where the
|
|
392
|
+
* document no longer holds the write: the session's own echo, and an
|
|
393
|
+
* integrity repair already in the write's answer, replaced nothing, and a
|
|
394
|
+
* `'rebuilt'` event carries no new text. Like {@link forgetSavedWrite}, it
|
|
395
|
+
* depends on the server sending the event, which it does only for a
|
|
396
|
+
* document someone watches.
|
|
397
|
+
*/
|
|
398
|
+
protected forgetSupersededWrite(event: TransferDocumentUpdatedEvent<TTransfer, DiagnosticOf<TServer>>): void;
|
|
312
399
|
/**
|
|
313
400
|
* Register on `server`, and after a reconnect restore what the ended session
|
|
314
401
|
* had. Calls issued meanwhile wait for this.
|
|
315
402
|
*/
|
|
316
403
|
protected register(server: RpcProxy<TServer>, reconnected: boolean): Promise<void>;
|
|
317
404
|
/**
|
|
318
|
-
* Re-open and re-watch every document the session had open,
|
|
319
|
-
*
|
|
405
|
+
* Re-open and re-watch every document the session had open, write again
|
|
406
|
+
* what it wrote since their last save where the re-open lost it, and tell
|
|
407
|
+
* the host which of them lost it for good.
|
|
408
|
+
*
|
|
409
|
+
* Decided per document by the re-opened {@link TransferDocument.textHash},
|
|
410
|
+
* in {@link restoreOutcome}. Versions cannot decide a write: a revert moves
|
|
411
|
+
* the version on and a restarted server numbers afresh, so the version the
|
|
412
|
+
* last write was answered with never matches where a write is needed, and
|
|
413
|
+
* any other version may be another client's edit, which a write would
|
|
414
|
+
* overwrite.
|
|
415
|
+
*
|
|
416
|
+
* Only what the drop cost is reported: a write another client wrote over
|
|
417
|
+
* while the connection held has no record left by then, see
|
|
418
|
+
* {@link forgetSupersededWrite}.
|
|
320
419
|
*
|
|
321
|
-
*
|
|
322
|
-
*
|
|
323
|
-
*
|
|
324
|
-
*
|
|
325
|
-
*
|
|
326
|
-
* document's last; or the server restarted and numbers versions afresh.
|
|
327
|
-
* Re-sending based on the write's own version then always conflicts, and
|
|
328
|
-
* based on the re-opened version it would overwrite whatever changed, so
|
|
329
|
-
* neither is done.
|
|
420
|
+
* A write is sent again based on the re-opened version, as an ordinary
|
|
421
|
+
* write, so an edit arriving in between conflicts, and a conflict is not
|
|
422
|
+
* retried. Documents last written by one {@link updateDocuments} are sent
|
|
423
|
+
* again by one, and only when every one of them may be; a document that
|
|
424
|
+
* could not be re-opened blocks its set.
|
|
330
425
|
*
|
|
331
|
-
* No caller is waiting, so
|
|
426
|
+
* No caller is waiting, so the outcomes go through the host: one report
|
|
332
427
|
* naming every document whose unsaved text is gone, whose record is then
|
|
333
|
-
* dropped, and one per document that could not be re-opened
|
|
334
|
-
*
|
|
428
|
+
* dropped, and one per document that could not be re-opened or written
|
|
429
|
+
* again for another reason than a conflict. A document that could not be
|
|
430
|
+
* re-opened is forgotten; a failed write keeps its record, for the next
|
|
431
|
+
* restore to decide again.
|
|
335
432
|
*
|
|
336
433
|
* Each document's dirty state goes to the host too, read once the watch is
|
|
337
|
-
* in place: a flip while the connection was down, or
|
|
338
|
-
* and the watch, reached no one, and the re-open's own
|
|
339
|
-
* second.
|
|
434
|
+
* in place and any write is sent: a flip while the connection was down, or
|
|
435
|
+
* between the re-open and the watch, reached no one, and the re-open's own
|
|
436
|
+
* answer misses the second. Read before the write, it would tell the client
|
|
437
|
+
* a document is clean that the write is about to make dirty again.
|
|
340
438
|
*/
|
|
341
439
|
protected restore(server: RpcProxy<TServer>): Promise<void>;
|
|
440
|
+
/**
|
|
441
|
+
* Whether the re-opened `document` still holds the session's unsaved
|
|
442
|
+
* `write` (`'kept'`), holds the text the write started from, so the write
|
|
443
|
+
* can be sent again (`'resend'`), or holds something else (`'lost'`).
|
|
444
|
+
*
|
|
445
|
+
* A document without a text hash comes from a server that sends none, and
|
|
446
|
+
* counts as kept only at the version the write was answered with.
|
|
447
|
+
*/
|
|
448
|
+
protected restoreOutcome(write: DataSessionUnsavedWrite<TTransfer, TServer>, document: DataSessionDocument<TTransfer, TServer>): 'kept' | 'resend' | 'lost';
|
|
449
|
+
/**
|
|
450
|
+
* Write again, in one call and based on their `reopened` versions, the
|
|
451
|
+
* `members` of one write call that the re-open lost, all or none. Returns
|
|
452
|
+
* the URIs whose unsaved text is gone, and drops their records, and the
|
|
453
|
+
* record of a member that could not be re-opened.
|
|
454
|
+
*
|
|
455
|
+
* A member whose record is no longer the one the restore started with was
|
|
456
|
+
* closed, saved or disposed meanwhile, and is left out: writing it would
|
|
457
|
+
* put back text its caller discarded.
|
|
458
|
+
*/
|
|
459
|
+
protected reapply(server: RpcProxy<TServer>, members: readonly [string, DataSessionUnsavedWrite<TTransfer, TServer>][], reopened: ReadonlyMap<string, DataSessionDocument<TTransfer, TServer>>): Promise<string[]>;
|
|
460
|
+
/**
|
|
461
|
+
* The text hash of the version `basedOn` names for `uri`, for a write that
|
|
462
|
+
* starts the URI's record in {@link unsavedWrites}; `undefined` for any
|
|
463
|
+
* other write, whose record keeps the base it has.
|
|
464
|
+
*
|
|
465
|
+
* Taken from {@link lastAnswers} when that is at the version, otherwise
|
|
466
|
+
* read, and kept only when the read answers that version: a server's text
|
|
467
|
+
* changes only with its version, so the text at a version is the text the
|
|
468
|
+
* write, once it passes the gate, was applied to.
|
|
469
|
+
*/
|
|
470
|
+
protected baseHashOf(server: RpcProxy<TServer>, uri: string, basedOn: BasedOn): Promise<string | undefined>;
|
|
471
|
+
/**
|
|
472
|
+
* Record `document` as the answer to a write of `uri`, keeping the base of
|
|
473
|
+
* the URI's record if it has one. An answer numbered below the record's is
|
|
474
|
+
* ignored: two writes of `uri` in flight at once may answer out of order,
|
|
475
|
+
* and the record holds the one applied last.
|
|
476
|
+
*
|
|
477
|
+
* So is one numbered at or below the URI's entry in {@link savedVersions}.
|
|
478
|
+
* The save came after that write was applied, so the save persisted its
|
|
479
|
+
* text or a later write replaced it, and its answer carries the text as it
|
|
480
|
+
* was when sent, which a restore would report as lost.
|
|
481
|
+
*/
|
|
482
|
+
protected recordWrite(uri: string, document: DataSessionDocument<TTransfer, TServer>, baseHash: string | undefined, call: DataSessionUnsavedWrite<TTransfer, TServer>['call']): void;
|
|
342
483
|
/** Run `call`, counted as in flight on each of `uris` until it settles. */
|
|
343
484
|
protected track<T>(uris: readonly string[], call: () => Promise<T>): Promise<T>;
|
|
344
485
|
/** {@link track} an open of `uri`, counted in {@link openingUris} until it settles. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-session.d.ts","sourceRoot":"","sources":["../../src/client/data-session.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,KAAK,UAAU,EAAE,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAE,KAAK,KAAK,EAAe,MAAM,UAAU,CAAC;AACnD,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,iCAAiC,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"data-session.d.ts","sourceRoot":"","sources":["../../src/client/data-session.ts"],"names":[],"mappings":"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"}
|