@fluidframework/container-loader 2.0.0-internal.3.0.1 → 2.0.0-internal.3.0.2
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/dist/container.d.ts +10 -1
- package/dist/container.d.ts.map +1 -1
- package/dist/container.js +10 -5
- package/dist/container.js.map +1 -1
- package/dist/loader.d.ts.map +1 -1
- package/dist/loader.js +7 -2
- package/dist/loader.js.map +1 -1
- package/dist/packageVersion.d.ts +1 -1
- package/dist/packageVersion.js +1 -1
- package/dist/packageVersion.js.map +1 -1
- package/lib/container.d.ts +10 -1
- package/lib/container.d.ts.map +1 -1
- package/lib/container.js +10 -5
- package/lib/container.js.map +1 -1
- package/lib/loader.d.ts.map +1 -1
- package/lib/loader.js +7 -2
- package/lib/loader.js.map +1 -1
- package/lib/packageVersion.d.ts +1 -1
- package/lib/packageVersion.js +1 -1
- package/lib/packageVersion.js.map +1 -1
- package/package.json +13 -13
- package/src/container.ts +16 -2
- package/src/loader.ts +27 -20
- package/src/packageVersion.ts +1 -1
package/dist/container.d.ts
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
5
|
import { ITelemetryBaseLogger, ITelemetryLogger, ITelemetryProperties } from "@fluidframework/common-definitions";
|
|
6
|
-
import { IRequest, IResponse, IFluidRouter } from "@fluidframework/core-interfaces";
|
|
6
|
+
import { IRequest, IResponse, IFluidRouter, FluidObject } from "@fluidframework/core-interfaces";
|
|
7
7
|
import { IAudience, IContainer, IContainerEvents, IDeltaManager, ICriticalContainerError, AttachState, ReadOnlyInfo, IContainerLoadMode, IFluidCodeDetails } from "@fluidframework/container-definitions";
|
|
8
8
|
import { IDocumentStorageService, IFluidResolvedUrl, IResolvedUrl } from "@fluidframework/driver-definitions";
|
|
9
9
|
import { IClientConfiguration, IClientDetails, IDocumentMessage, IProtocolState, IQuorumClients, ISequencedDocumentMessage, IVersion } from "@fluidframework/protocol-definitions";
|
|
@@ -34,6 +34,10 @@ export interface IContainerLoadOptions {
|
|
|
34
34
|
* use the loader's logger, `Loader.services.subLogger`.
|
|
35
35
|
*/
|
|
36
36
|
baseLogger?: ITelemetryBaseLogger;
|
|
37
|
+
/**
|
|
38
|
+
* A scope object to replace the one provided on the Loader.
|
|
39
|
+
*/
|
|
40
|
+
scopeOverride?: FluidObject;
|
|
37
41
|
}
|
|
38
42
|
export interface IContainerConfig {
|
|
39
43
|
resolvedUrl?: IFluidResolvedUrl;
|
|
@@ -51,6 +55,10 @@ export interface IContainerConfig {
|
|
|
51
55
|
* use the loader's logger, `Loader.services.subLogger`.
|
|
52
56
|
*/
|
|
53
57
|
baseLogger?: ITelemetryBaseLogger;
|
|
58
|
+
/**
|
|
59
|
+
* A scope object to replace the one provided on the Loader.
|
|
60
|
+
*/
|
|
61
|
+
scopeOverride?: FluidObject;
|
|
54
62
|
}
|
|
55
63
|
/**
|
|
56
64
|
* Waits until container connects to delta storage and gets up-to-date.
|
|
@@ -129,6 +137,7 @@ export declare class Container extends EventEmitterWithErrorHandling<IContainerE
|
|
|
129
137
|
private readonly storageService;
|
|
130
138
|
get storage(): IDocumentStorageService;
|
|
131
139
|
private readonly clientDetailsOverride;
|
|
140
|
+
private readonly _scopeOverride;
|
|
132
141
|
private readonly _deltaManager;
|
|
133
142
|
private service;
|
|
134
143
|
private _context;
|
package/dist/container.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../src/container.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,EACH,oBAAoB,EACpB,gBAAgB,EAChB,oBAAoB,EAEvB,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EACH,QAAQ,EACR,SAAS,EACT,YAAY,
|
|
1
|
+
{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../src/container.ts"],"names":[],"mappings":"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"}
|
package/dist/container.js
CHANGED
|
@@ -129,7 +129,7 @@ exports.ReportIfTooLong = ReportIfTooLong;
|
|
|
129
129
|
const summarizerClientType = "summarizer";
|
|
130
130
|
class Container extends telemetry_utils_1.EventEmitterWithErrorHandling {
|
|
131
131
|
constructor(loader, config, protocolHandlerBuilder) {
|
|
132
|
-
var _a, _b;
|
|
132
|
+
var _a, _b, _c;
|
|
133
133
|
super((name, error) => {
|
|
134
134
|
this.mc.logger.sendErrorEvent({
|
|
135
135
|
eventName: "ContainerEventHandlerException",
|
|
@@ -168,6 +168,7 @@ class Container extends telemetry_utils_1.EventEmitterWithErrorHandling {
|
|
|
168
168
|
this.setAutoReconnectTime = common_utils_1.performance.now();
|
|
169
169
|
this._disposed = false;
|
|
170
170
|
this.clientDetailsOverride = config.clientDetailsOverride;
|
|
171
|
+
this._scopeOverride = config.scopeOverride;
|
|
171
172
|
this._resolvedUrl = config.resolvedUrl;
|
|
172
173
|
if (config.canReconnect !== undefined) {
|
|
173
174
|
this._canReconnect = config.canReconnect;
|
|
@@ -178,7 +179,9 @@ class Container extends telemetry_utils_1.EventEmitterWithErrorHandling {
|
|
|
178
179
|
const clientType = `${interactive ? "interactive" : "noninteractive"}${type !== undefined && type !== "" ? `/${type}` : ""}`;
|
|
179
180
|
// Need to use the property getter for docId because for detached flow we don't have the docId initially.
|
|
180
181
|
// We assign the id later so property getter is used.
|
|
181
|
-
this.subLogger = telemetry_utils_1.ChildLogger.create(
|
|
182
|
+
this.subLogger = telemetry_utils_1.ChildLogger.create(
|
|
183
|
+
// If a baseLogger was provided, use it; otherwise use the loader's logger.
|
|
184
|
+
(_a = config.baseLogger) !== null && _a !== void 0 ? _a : loader.services.subLogger, undefined, {
|
|
182
185
|
all: {
|
|
183
186
|
clientType,
|
|
184
187
|
containerId: (0, uuid_1.v4)(),
|
|
@@ -208,10 +211,10 @@ class Container extends telemetry_utils_1.EventEmitterWithErrorHandling {
|
|
|
208
211
|
});
|
|
209
212
|
// Prefix all events in this file with container-loader
|
|
210
213
|
this.mc = (0, telemetry_utils_1.loggerToMonitoringContext)(telemetry_utils_1.ChildLogger.create(this.subLogger, "Container"));
|
|
211
|
-
const summarizeProtocolTree = (
|
|
214
|
+
const summarizeProtocolTree = (_b = this.mc.config.getBoolean("Fluid.Container.summarizeProtocolTree2")) !== null && _b !== void 0 ? _b : this.loader.services.options.summarizeProtocolTree;
|
|
212
215
|
this.options = Object.assign(Object.assign({}, this.loader.services.options), { summarizeProtocolTree });
|
|
213
216
|
this._deltaManager = this.createDeltaManager();
|
|
214
|
-
this._clientId = (
|
|
217
|
+
this._clientId = (_c = config.serializedContainerState) === null || _c === void 0 ? void 0 : _c.clientId;
|
|
215
218
|
this.connectionStateHandler = (0, connectionStateHandler_1.createConnectionStateHandler)({
|
|
216
219
|
logger: this.mc.logger,
|
|
217
220
|
connectionStateChanged: (value, oldState, reason) => {
|
|
@@ -316,6 +319,8 @@ class Container extends telemetry_utils_1.EventEmitterWithErrorHandling {
|
|
|
316
319
|
resolvedUrl: loadOptions.resolvedUrl,
|
|
317
320
|
canReconnect: loadOptions.canReconnect,
|
|
318
321
|
serializedContainerState: pendingLocalState,
|
|
322
|
+
baseLogger: loadOptions.baseLogger,
|
|
323
|
+
scopeOverride: loadOptions.scopeOverride,
|
|
319
324
|
}, protocolHandlerBuilder);
|
|
320
325
|
return telemetry_utils_1.PerformanceEvent.timedExecAsync(container.mc.logger, { eventName: "Load" }, async (event) => new Promise((resolve, reject) => {
|
|
321
326
|
var _a, _b;
|
|
@@ -482,7 +487,7 @@ class Container extends telemetry_utils_1.EventEmitterWithErrorHandling {
|
|
|
482
487
|
}
|
|
483
488
|
get serviceFactory() { return this.loader.services.documentServiceFactory; }
|
|
484
489
|
get urlResolver() { return this.loader.services.urlResolver; }
|
|
485
|
-
get scope() { return this.loader.services.scope; }
|
|
490
|
+
get scope() { var _a; return (_a = this._scopeOverride) !== null && _a !== void 0 ? _a : this.loader.services.scope; }
|
|
486
491
|
get codeLoader() { return this.loader.services.codeLoader; }
|
|
487
492
|
/**
|
|
488
493
|
* Retrieves the quorum associated with the document
|