@fluidframework/routerlicious-driver 2.0.0-dev-rc.3.0.0.254866 → 2.0.0-dev-rc.5.0.0.263932
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +27 -0
- package/beta.d.ts +11 -0
- package/dist/beta.d.ts +2 -1
- package/dist/deltaStorageService.d.ts +1 -1
- package/dist/deltaStorageService.d.ts.map +1 -1
- package/dist/deltaStorageService.js.map +1 -1
- package/dist/documentDeltaConnection.d.ts +2 -3
- package/dist/documentDeltaConnection.d.ts.map +1 -1
- package/dist/documentDeltaConnection.js.map +1 -1
- package/dist/documentService.d.ts +1 -1
- package/dist/documentService.d.ts.map +1 -1
- package/dist/documentService.js +2 -3
- package/dist/documentService.js.map +1 -1
- package/dist/documentServiceFactory.js +3 -3
- package/dist/documentServiceFactory.js.map +1 -1
- package/dist/documentStorageService.d.ts +1 -1
- package/dist/documentStorageService.d.ts.map +1 -1
- package/dist/documentStorageService.js.map +1 -1
- package/dist/errorUtils.d.ts +1 -2
- package/dist/errorUtils.d.ts.map +1 -1
- package/dist/errorUtils.js +8 -8
- package/dist/errorUtils.js.map +1 -1
- package/dist/{alpha.d.ts → legacy.d.ts} +3 -2
- package/dist/packageVersion.d.ts +1 -1
- package/dist/packageVersion.js +1 -1
- package/dist/packageVersion.js.map +1 -1
- package/dist/public.d.ts +2 -1
- package/dist/restWrapper.d.ts +3 -3
- package/dist/restWrapper.d.ts.map +1 -1
- package/dist/restWrapper.js +2 -2
- package/dist/restWrapper.js.map +1 -1
- package/dist/retriableGitManager.d.ts +1 -1
- package/dist/retriableGitManager.d.ts.map +1 -1
- package/dist/retriableGitManager.js.map +1 -1
- package/dist/shreddedSummaryDocumentStorageService.d.ts +1 -1
- package/dist/shreddedSummaryDocumentStorageService.d.ts.map +1 -1
- package/dist/shreddedSummaryDocumentStorageService.js +0 -1
- package/dist/shreddedSummaryDocumentStorageService.js.map +1 -1
- package/dist/wholeSummaryDocumentStorageService.d.ts +1 -1
- package/dist/wholeSummaryDocumentStorageService.d.ts.map +1 -1
- package/dist/wholeSummaryDocumentStorageService.js +0 -1
- package/dist/wholeSummaryDocumentStorageService.js.map +1 -1
- package/internal.d.ts +11 -0
- package/legacy.d.ts +11 -0
- package/lib/beta.d.ts +2 -1
- package/lib/deltaStorageService.d.ts +1 -1
- package/lib/deltaStorageService.d.ts.map +1 -1
- package/lib/deltaStorageService.js.map +1 -1
- package/lib/documentDeltaConnection.d.ts +2 -3
- package/lib/documentDeltaConnection.d.ts.map +1 -1
- package/lib/documentDeltaConnection.js.map +1 -1
- package/lib/documentService.d.ts +1 -1
- package/lib/documentService.d.ts.map +1 -1
- package/lib/documentService.js +3 -4
- package/lib/documentService.js.map +1 -1
- package/lib/documentServiceFactory.js +3 -3
- package/lib/documentServiceFactory.js.map +1 -1
- package/lib/documentStorageService.d.ts +1 -1
- package/lib/documentStorageService.d.ts.map +1 -1
- package/lib/documentStorageService.js.map +1 -1
- package/lib/errorUtils.d.ts +1 -2
- package/lib/errorUtils.d.ts.map +1 -1
- package/lib/errorUtils.js +1 -1
- package/lib/errorUtils.js.map +1 -1
- package/lib/{alpha.d.ts → legacy.d.ts} +3 -2
- package/lib/packageVersion.d.ts +1 -1
- package/lib/packageVersion.js +1 -1
- package/lib/packageVersion.js.map +1 -1
- package/lib/public.d.ts +2 -1
- package/lib/restWrapper.d.ts +3 -3
- package/lib/restWrapper.d.ts.map +1 -1
- package/lib/restWrapper.js +3 -3
- package/lib/restWrapper.js.map +1 -1
- package/lib/retriableGitManager.d.ts +1 -1
- package/lib/retriableGitManager.d.ts.map +1 -1
- package/lib/retriableGitManager.js.map +1 -1
- package/lib/shreddedSummaryDocumentStorageService.d.ts +1 -1
- package/lib/shreddedSummaryDocumentStorageService.d.ts.map +1 -1
- package/lib/shreddedSummaryDocumentStorageService.js +0 -1
- package/lib/shreddedSummaryDocumentStorageService.js.map +1 -1
- package/lib/tsdoc-metadata.json +1 -1
- package/lib/wholeSummaryDocumentStorageService.d.ts +1 -1
- package/lib/wholeSummaryDocumentStorageService.d.ts.map +1 -1
- package/lib/wholeSummaryDocumentStorageService.js +0 -1
- package/lib/wholeSummaryDocumentStorageService.js.map +1 -1
- package/package.json +24 -32
- package/src/deltaStorageService.ts +1 -2
- package/src/documentDeltaConnection.ts +5 -3
- package/src/documentService.ts +8 -5
- package/src/documentServiceFactory.ts +3 -3
- package/src/documentStorageService.ts +1 -1
- package/src/errorUtils.ts +5 -2
- package/src/packageVersion.ts +1 -1
- package/src/restWrapper.ts +9 -6
- package/src/retriableGitManager.ts +1 -1
- package/src/shreddedSummaryDocumentStorageService.ts +1 -2
- package/src/wholeSummaryDocumentStorageService.ts +1 -2
package/src/documentService.ts
CHANGED
|
@@ -12,8 +12,11 @@ import {
|
|
|
12
12
|
canRetryOnError,
|
|
13
13
|
} from "@fluidframework/driver-utils/internal";
|
|
14
14
|
import { IClient } from "@fluidframework/protocol-definitions";
|
|
15
|
-
import {
|
|
16
|
-
|
|
15
|
+
import {
|
|
16
|
+
ITelemetryLoggerExt,
|
|
17
|
+
PerformanceEvent,
|
|
18
|
+
wrapError,
|
|
19
|
+
} from "@fluidframework/telemetry-utils/internal";
|
|
17
20
|
import io from "socket.io-client";
|
|
18
21
|
|
|
19
22
|
import { ICache } from "./cache.js";
|
|
@@ -48,9 +51,9 @@ const RediscoverAfterTimeSinceDiscoveryMs = 5 * 60000; // 5 minute
|
|
|
48
51
|
* The DocumentService manages the Socket.IO connection and manages routing requests to connected
|
|
49
52
|
* clients.
|
|
50
53
|
*/
|
|
51
|
-
// eslint-disable-next-line import/namespace
|
|
52
54
|
export class DocumentService
|
|
53
55
|
extends TypedEventEmitter<api.IDocumentServiceEvents>
|
|
56
|
+
// eslint-disable-next-line import/namespace
|
|
54
57
|
implements api.IDocumentService
|
|
55
58
|
{
|
|
56
59
|
private lastDiscoveredAt: number = Date.now();
|
|
@@ -119,7 +122,7 @@ export class DocumentService
|
|
|
119
122
|
const rateLimiter = new RateLimiter(
|
|
120
123
|
this.driverPolicies.maxConcurrentStorageRequests,
|
|
121
124
|
);
|
|
122
|
-
this.storageRestWrapper =
|
|
125
|
+
this.storageRestWrapper = RouterliciousStorageRestWrapper.load(
|
|
123
126
|
this.tenantId,
|
|
124
127
|
this.storageTokenFetcher,
|
|
125
128
|
this.logger,
|
|
@@ -171,7 +174,7 @@ export class DocumentService
|
|
|
171
174
|
const rateLimiter = new RateLimiter(
|
|
172
175
|
this.driverPolicies.maxConcurrentOrdererRequests,
|
|
173
176
|
);
|
|
174
|
-
this.ordererRestWrapper =
|
|
177
|
+
this.ordererRestWrapper = RouterliciousOrdererRestWrapper.load(
|
|
175
178
|
this.ordererTokenFetcher,
|
|
176
179
|
this.logger,
|
|
177
180
|
rateLimiter,
|
|
@@ -131,7 +131,7 @@ export class RouterliciousDocumentServiceFactory implements IDocumentServiceFact
|
|
|
131
131
|
logger2,
|
|
132
132
|
);
|
|
133
133
|
const rateLimiter = new RateLimiter(this.driverPolicies.maxConcurrentOrdererRequests);
|
|
134
|
-
const ordererRestWrapper =
|
|
134
|
+
const ordererRestWrapper = RouterliciousOrdererRestWrapper.load(
|
|
135
135
|
ordererTokenFetcher,
|
|
136
136
|
logger2,
|
|
137
137
|
rateLimiter,
|
|
@@ -281,7 +281,7 @@ export class RouterliciousDocumentServiceFactory implements IDocumentServiceFact
|
|
|
281
281
|
const storageTokenP = storageTokenFetcher();
|
|
282
282
|
|
|
283
283
|
const rateLimiter = new RateLimiter(this.driverPolicies.maxConcurrentOrdererRequests);
|
|
284
|
-
const ordererRestWrapper =
|
|
284
|
+
const ordererRestWrapper = RouterliciousOrdererRestWrapper.load(
|
|
285
285
|
ordererTokenFetcher,
|
|
286
286
|
logger2,
|
|
287
287
|
rateLimiter,
|
|
@@ -330,7 +330,7 @@ export class RouterliciousDocumentServiceFactory implements IDocumentServiceFact
|
|
|
330
330
|
);
|
|
331
331
|
}
|
|
332
332
|
|
|
333
|
-
const storageRestWrapper =
|
|
333
|
+
const storageRestWrapper = RouterliciousStorageRestWrapper.load(
|
|
334
334
|
tenantId,
|
|
335
335
|
storageTokenFetcher,
|
|
336
336
|
logger2,
|
|
@@ -13,7 +13,7 @@ import {
|
|
|
13
13
|
PrefetchDocumentStorageService,
|
|
14
14
|
} from "@fluidframework/driver-utils/internal";
|
|
15
15
|
import { ISnapshotTree, IVersion } from "@fluidframework/protocol-definitions";
|
|
16
|
-
import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
|
|
16
|
+
import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
|
|
17
17
|
|
|
18
18
|
import { ICache } from "./cache.js";
|
|
19
19
|
import { INormalizedWholeSnapshot } from "./contracts.js";
|
package/src/errorUtils.ts
CHANGED
|
@@ -3,8 +3,11 @@
|
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
|
-
import {
|
|
7
|
-
|
|
6
|
+
import {
|
|
7
|
+
DriverError,
|
|
8
|
+
DriverErrorTypes,
|
|
9
|
+
IDriverErrorBase,
|
|
10
|
+
} from "@fluidframework/driver-definitions/internal";
|
|
8
11
|
import {
|
|
9
12
|
AuthorizationError,
|
|
10
13
|
GenericNetworkError,
|
package/src/packageVersion.ts
CHANGED
package/src/restWrapper.ts
CHANGED
|
@@ -17,8 +17,11 @@ import {
|
|
|
17
17
|
RestLessClient,
|
|
18
18
|
getAuthorizationTokenFromCredentials,
|
|
19
19
|
} from "@fluidframework/server-services-client";
|
|
20
|
-
import {
|
|
21
|
-
|
|
20
|
+
import {
|
|
21
|
+
ITelemetryLoggerExt,
|
|
22
|
+
PerformanceEvent,
|
|
23
|
+
numberFromString,
|
|
24
|
+
} from "@fluidframework/telemetry-utils/internal";
|
|
22
25
|
import fetch from "cross-fetch";
|
|
23
26
|
import safeStringify from "json-stringify-safe";
|
|
24
27
|
|
|
@@ -277,7 +280,7 @@ export class RouterliciousStorageRestWrapper extends RouterliciousRestWrapper {
|
|
|
277
280
|
);
|
|
278
281
|
}
|
|
279
282
|
|
|
280
|
-
public static
|
|
283
|
+
public static load(
|
|
281
284
|
tenantId: string,
|
|
282
285
|
tokenFetcher: TokenFetcher,
|
|
283
286
|
logger: ITelemetryLoggerExt,
|
|
@@ -285,7 +288,7 @@ export class RouterliciousStorageRestWrapper extends RouterliciousRestWrapper {
|
|
|
285
288
|
useRestLess: boolean,
|
|
286
289
|
baseurl?: string,
|
|
287
290
|
initialTokenP?: Promise<ITokenResponse>,
|
|
288
|
-
):
|
|
291
|
+
): RouterliciousStorageRestWrapper {
|
|
289
292
|
const defaultQueryString = {
|
|
290
293
|
token: `${fromUtf8ToBase64(tenantId)}`,
|
|
291
294
|
};
|
|
@@ -338,14 +341,14 @@ export class RouterliciousOrdererRestWrapper extends RouterliciousRestWrapper {
|
|
|
338
341
|
);
|
|
339
342
|
}
|
|
340
343
|
|
|
341
|
-
public static
|
|
344
|
+
public static load(
|
|
342
345
|
tokenFetcher: TokenFetcher,
|
|
343
346
|
logger: ITelemetryLoggerExt,
|
|
344
347
|
rateLimiter: RateLimiter,
|
|
345
348
|
useRestLess: boolean,
|
|
346
349
|
baseurl?: string,
|
|
347
350
|
initialTokenP?: Promise<ITokenResponse>,
|
|
348
|
-
):
|
|
351
|
+
): RouterliciousOrdererRestWrapper {
|
|
349
352
|
const getAuthorizationHeader: AuthorizationHeaderGetter = (
|
|
350
353
|
token: ITokenResponse,
|
|
351
354
|
): string => {
|
|
@@ -9,7 +9,7 @@ import {
|
|
|
9
9
|
IWholeSummaryPayload,
|
|
10
10
|
IWriteSummaryResponse,
|
|
11
11
|
} from "@fluidframework/server-services-client";
|
|
12
|
-
import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
|
|
12
|
+
import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
|
|
13
13
|
|
|
14
14
|
import { IWholeFlatSnapshot } from "./contracts.js";
|
|
15
15
|
import { IR11sResponse } from "./restWrapper.js";
|
|
@@ -17,8 +17,8 @@ import {
|
|
|
17
17
|
ISummaryTree,
|
|
18
18
|
IVersion,
|
|
19
19
|
} from "@fluidframework/protocol-definitions";
|
|
20
|
-
import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
|
|
21
20
|
import {
|
|
21
|
+
ITelemetryLoggerExt,
|
|
22
22
|
MonitoringContext,
|
|
23
23
|
PerformanceEvent,
|
|
24
24
|
createChildMonitoringContext,
|
|
@@ -161,7 +161,6 @@ export class ShreddedSummaryDocumentStorageService implements IDocumentStorageSe
|
|
|
161
161
|
return response;
|
|
162
162
|
},
|
|
163
163
|
undefined, // workers
|
|
164
|
-
undefined, // recordHeapSize
|
|
165
164
|
this.mc.config.getNumber("Fluid.Driver.ReadBlobTelemetrySampling"),
|
|
166
165
|
);
|
|
167
166
|
this.blobsShaCache.set(value.sha, "");
|
|
@@ -18,8 +18,8 @@ import {
|
|
|
18
18
|
ISummaryTree,
|
|
19
19
|
IVersion,
|
|
20
20
|
} from "@fluidframework/protocol-definitions";
|
|
21
|
-
import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
|
|
22
21
|
import {
|
|
22
|
+
ITelemetryLoggerExt,
|
|
23
23
|
MonitoringContext,
|
|
24
24
|
PerformanceEvent,
|
|
25
25
|
createChildMonitoringContext,
|
|
@@ -215,7 +215,6 @@ export class WholeSummaryDocumentStorageService implements IDocumentStorageServi
|
|
|
215
215
|
return response;
|
|
216
216
|
},
|
|
217
217
|
undefined, // workers
|
|
218
|
-
undefined, // recordHeapSize
|
|
219
218
|
this.mc.config.getNumber("Fluid.Driver.ReadBlobTelemetrySampling"),
|
|
220
219
|
);
|
|
221
220
|
const bufferValue = stringToBuffer(blob.content, blob.encoding);
|