@fluidframework/container-loader 0.58.3000-61081 → 0.59.2000-61729
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 +2 -9
- package/dist/container.d.ts.map +1 -1
- package/dist/container.js +15 -24
- package/dist/container.js.map +1 -1
- package/dist/containerContext.d.ts +5 -7
- package/dist/containerContext.d.ts.map +1 -1
- package/dist/containerContext.js +6 -4
- package/dist/containerContext.js.map +1 -1
- package/dist/contracts.d.ts +8 -1
- package/dist/contracts.d.ts.map +1 -1
- package/dist/contracts.js +21 -1
- package/dist/contracts.js.map +1 -1
- package/dist/loader.d.ts +4 -4
- package/dist/loader.d.ts.map +1 -1
- 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/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +0 -1
- package/dist/utils.js.map +1 -1
- package/lib/container.d.ts +2 -9
- package/lib/container.d.ts.map +1 -1
- package/lib/container.js +15 -24
- package/lib/container.js.map +1 -1
- package/lib/containerContext.d.ts +5 -7
- package/lib/containerContext.d.ts.map +1 -1
- package/lib/containerContext.js +6 -4
- package/lib/containerContext.js.map +1 -1
- package/lib/contracts.d.ts +8 -1
- package/lib/contracts.d.ts.map +1 -1
- package/lib/contracts.js +19 -0
- package/lib/contracts.js.map +1 -1
- package/lib/loader.d.ts +4 -4
- package/lib/loader.d.ts.map +1 -1
- 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/lib/utils.d.ts.map +1 -1
- package/lib/utils.js +0 -1
- package/lib/utils.js.map +1 -1
- package/package.json +17 -16
- package/src/container.ts +16 -25
- package/src/containerContext.ts +11 -13
- package/src/contracts.ts +20 -0
- package/src/loader.ts +5 -6
- package/src/packageVersion.ts +1 -1
- package/src/utils.ts +0 -1
package/dist/container.d.ts
CHANGED
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
* Copyright (c) Microsoft Corporation and contributors. All rights reserved.
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
|
-
import { IRequest, IResponse, IFluidRouter
|
|
6
|
-
import { IAudience, IContainer, IContainerEvents, IDeltaManager, ICriticalContainerError,
|
|
5
|
+
import { IRequest, IResponse, IFluidRouter } from "@fluidframework/core-interfaces";
|
|
6
|
+
import { IAudience, IContainer, IContainerEvents, IDeltaManager, ICriticalContainerError, AttachState, ReadOnlyInfo, IContainerLoadMode, IFluidCodeDetails } from "@fluidframework/container-definitions";
|
|
7
7
|
import { IDocumentStorageService, IFluidResolvedUrl, IResolvedUrl } from "@fluidframework/driver-definitions";
|
|
8
8
|
import { IClientConfiguration, IClientDetails, IDocumentMessage, IQuorumClients, ISequencedDocumentMessage, IVersion } from "@fluidframework/protocol-definitions";
|
|
9
9
|
import { EventEmitterWithErrorHandling, TelemetryLogger } from "@fluidframework/telemetry-utils";
|
|
@@ -197,13 +197,6 @@ export declare class Container extends EventEmitterWithErrorHandling<IContainerE
|
|
|
197
197
|
*/
|
|
198
198
|
resume(): void;
|
|
199
199
|
private resumeInternal;
|
|
200
|
-
/**
|
|
201
|
-
* @deprecated 0.56, will be removed in next release from IContainerContext
|
|
202
|
-
* Raise non-critical error to host. Calling this API will not close container.
|
|
203
|
-
* For critical errors, please call Container.close(error).
|
|
204
|
-
* @param error - an error to raise
|
|
205
|
-
*/
|
|
206
|
-
raiseContainerWarning(warning: ContainerWarning): void;
|
|
207
200
|
getAbsoluteUrl(relativeUrl: string): Promise<string | undefined>;
|
|
208
201
|
proposeCodeDetails(codeDetails: IFluidCodeDetails): Promise<boolean>;
|
|
209
202
|
private processCodeProposal;
|
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;AASH,OAAO,EACH,QAAQ,EACR,SAAS,EACT,YAAY,
|
|
1
|
+
{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../src/container.ts"],"names":[],"mappings":"AAAA;;;GAGG;AASH,OAAO,EACH,QAAQ,EACR,SAAS,EACT,YAAY,EACf,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACH,SAAS,EAET,UAAU,EACV,gBAAgB,EAChB,aAAa,EACb,uBAAuB,EAEvB,WAAW,EAGX,YAAY,EACZ,kBAAkB,EAClB,iBAAiB,EAEpB,MAAM,uCAAuC,CAAC;AAO/C,OAAO,EAEH,uBAAuB,EACvB,iBAAiB,EACjB,YAAY,EACf,MAAM,oCAAoC,CAAC;AAc5C,OAAO,EAEH,oBAAoB,EACpB,cAAc,EAGd,gBAAgB,EAEhB,cAAc,EAGd,yBAAyB,EAOzB,QAAQ,EAGX,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAEH,6BAA6B,EAG7B,eAAe,EAMlB,MAAM,iCAAiC,CAAC;AAMzC,OAAO,EAAE,cAAc,EAAE,MAAM,EAAkB,MAAM,UAAU,CAAC;AAgBlE,MAAM,WAAW,qBAAqB;IAClC;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB;;OAEG;IACH,qBAAqB,CAAC,EAAE,cAAc,CAAC;IACvC,WAAW,EAAE,iBAAiB,CAAC;IAC/B;;OAEG;IACH,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B;;OAEG;IACH,QAAQ,CAAC,EAAE,kBAAkB,CAAC;CACjC;AAED,MAAM,WAAW,gBAAgB;IAC7B,WAAW,CAAC,EAAE,iBAAiB,CAAC;IAChC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB;;OAEG;IACH,qBAAqB,CAAC,EAAE,cAAc,CAAC;CAC1C;AAED,oBAAY,eAAe;IACvB;;OAEG;IACH,YAAY,IAAA;IAEZ;;OAEG;IACH,UAAU,IAAA;IAEV;;OAEG;IACH,SAAS,IAAA;CACZ;AAED;;;;;;;;;GASG;AACH,wBAAsB,sBAAsB,CAAC,SAAS,EAAE,UAAU,oBAmDjE;AAQD,qBAAa,SAAU,SAAQ,6BAA6B,CAAC,gBAAgB,CAAE,YAAW,UAAU;IA0S5F,OAAO,CAAC,QAAQ,CAAC,MAAM;IAzS3B,OAAc,OAAO,SAAY;IAEjC;;OAEG;WACiB,IAAI,CACpB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,qBAAqB,EAClC,iBAAiB,CAAC,EAAE,OAAO,GAC5B,OAAO,CAAC,SAAS,CAAC;IAkDrB;;OAEG;WACiB,cAAc,CAC9B,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,iBAAiB,GAC/B,OAAO,CAAC,SAAS,CAAC;IAgBrB;;;OAGG;WACiB,6BAA6B,CAC7C,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACjB,OAAO,CAAC,SAAS,CAAC;IAgBd,SAAS,EAAE,eAAe,CAAC;IAIlC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAE/C,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAoB;IAEvC,OAAO,CAAC,eAAe,CAAsE;IAE7F,OAAO,KAAK,MAAM,GAEjB;IAED,OAAO,KAAK,MAAM,QASjB;IAED,IAAW,MAAM,IAAI,OAAO,CAE3B;IAED,OAAO,CAAC,YAAY,CAAwB;IAE5C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA0B;IACnD,IAAW,OAAO,IAAI,uBAAuB,CAE5C;IAED,OAAO,CAAC,eAAe,CAAoD;IAC3E,OAAO,KAAK,cAAc,GAKzB;IAED,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAA6B;IACnE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAkC;IAChE,OAAO,CAAC,OAAO,CAA+B;IAC9C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAW;IAErC,OAAO,CAAC,QAAQ,CAA+B;IAC/C,OAAO,KAAK,OAAO,GAKlB;IACD,OAAO,CAAC,gBAAgB,CAAgC;IACxD,OAAO,KAAK,eAAe,GAK1B;IAED,OAAO,CAAC,4BAA4B,CAAS;IAC7C,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAgB;IAC1D,OAAO,CAAC,8BAA8B,CAAa;IACnD,OAAO,CAAC,kBAAkB,CAAuB;IACjD,OAAO,CAAC,YAAY,CAAgC;IACpD,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,eAAe,CAAS;IAEhC,OAAO,CAAC,WAAW,CAAqB;IACxC,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAA2B;IAClE,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAyB;IAEhE,OAAO,CAAC,oBAAoB,CAAqB;IAEjD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAKlC;IAEF,OAAO,KAAK,cAAc,GAAkE;IAE5F,IAAW,YAAY,IAAI,YAAY,CAAiB;IAExD,IAAW,WAAW,IAAI,YAAY,GAAG,SAAS,CAEjD;IAED,IAAW,iBAAiB,IAAI,QAAQ,GAAG,SAAS,CAEnD;IAED,IAAW,YAAY,IAAI,YAAY,CAEtC;IAED,IAAW,WAAW,IAAI,WAAW,CAEpC;IAED;;OAEG;IACI,aAAa,CAAC,QAAQ,EAAE,OAAO;IAItC,IAAW,YAAY,IAAI,aAAa,CAAC,yBAAyB,EAAE,gBAAgB,CAAC,CAEpF;IAED,IAAW,eAAe,IAAI,eAAe,CAE5C;IAED,IAAW,SAAS,IAAI,OAAO,CAE9B;IAED;;;OAGG;IACH,IAAW,oBAAoB,IAAI,oBAAoB,GAAG,SAAS,CAElE;IAED;;;OAGG;IACH,IAAW,QAAQ,IAAI,MAAM,GAAG,SAAS,CAExC;IAED;;;OAGG;IACH,IAAW,MAAM,IAAI,MAAM,EAAE,GAAG,SAAS,CAExC;IAED,IAAW,aAAa,IAAI,cAAc,CAEzC;IAED;;;OAGG;IACI,uBAAuB,IAAI,iBAAiB,GAAG,SAAS;IAI/D;;;;OAIG;IACI,oBAAoB,IAAI,iBAAiB,GAAG,SAAS;IAI5D;;OAEG;IACH,IAAW,QAAQ,IAAI,SAAS,CAE/B;IAED;;;;OAIG;IACH,IAAW,OAAO,YAEjB;IAED,OAAO,KAAK,cAAc,GAAwD;IAClF,OAAO,KAAK,WAAW,GAA6C;IACpE,SAAgB,OAAO,EAAE,cAAc,CAAC;IACxC,OAAO,KAAK,KAAK,GAAwC;IACzD,OAAO,KAAK,UAAU,GAA6C;gBAG9C,MAAM,EAAE,MAAM,EAC/B,MAAM,EAAE,gBAAgB;IAsK5B;;OAEG;IACI,SAAS,IAAI,cAAc;IAI3B,KAAK,CAAC,KAAK,CAAC,EAAE,uBAAuB;IAkDrC,4BAA4B,IAAI,MAAM;IAkB7C,IAAW,WAAW,IAAI,WAAW,CAEpC;IAEM,SAAS,IAAI,MAAM;IAab,MAAM,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAoHxC,OAAO,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;IASxD;;;;;;;OAOG;IACI,gBAAgB,CAAC,SAAS,EAAE,OAAO;IAgB1C,OAAO,CAAC,wBAAwB;IAqBzB,OAAO;IAed,OAAO,CAAC,eAAe;IAahB,UAAU;IASjB,OAAO,CAAC,kBAAkB;IAQ1B;;;;;OAKG;IACI,MAAM;IASb,OAAO,CAAC,cAAc;IAcT,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAWhE,kBAAkB,CAAC,WAAW,EAAE,iBAAiB;YAmBhD,mBAAmB;YAiBnB,UAAU;IAKxB,OAAO,CAAC,sBAAsB;IAM9B,OAAO,CAAC,oBAAoB;IAW5B;;;;;;OAMG;YACW,IAAI;YA2HJ,cAAc;YAuCd,6BAA6B;YA4B7B,qBAAqB;YAsBrB,qBAAqB;YA2BrB,8BAA8B;YA2B9B,uBAAuB;IAwDrC,OAAO,CAAC,sBAAsB;IAmC9B,OAAO,CAAC,wBAAwB;IAQhC,OAAO,KAAK,MAAM,GAkBjB;IAED;;;;;OAKG;IACH,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,kBAAkB;YA4DZ,2BAA2B;IAiBzC,OAAO,CAAC,iCAAiC;IAyDzC,OAAO,CAAC,wBAAwB;IAuBhC,OAAO,CAAC,sBAAsB;IA4B9B,OAAO,CAAC,aAAa;IAWrB,OAAO,CAAC,oBAAoB;IAsC5B,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,aAAa;IAiBrB;;;;OAIG;YACW,iBAAiB;YAkBjB,0BAA0B;YAkB1B,kBAAkB;IAgChC,OAAO,CAAC,yBAAyB;IAQjC,OAAO,CAAC,iBAAiB;CAG5B"}
|
package/dist/container.js
CHANGED
|
@@ -12,7 +12,6 @@ exports.Container = exports.waitContainerToCatchUp = exports.ConnectionState = v
|
|
|
12
12
|
const merge_1 = __importDefault(require("lodash/merge"));
|
|
13
13
|
const uuid_1 = require("uuid");
|
|
14
14
|
const common_utils_1 = require("@fluidframework/common-utils");
|
|
15
|
-
const core_interfaces_1 = require("@fluidframework/core-interfaces");
|
|
16
15
|
const container_definitions_1 = require("@fluidframework/container-definitions");
|
|
17
16
|
const container_utils_1 = require("@fluidframework/container-utils");
|
|
18
17
|
const driver_utils_1 = require("@fluidframework/driver-utils");
|
|
@@ -551,7 +550,7 @@ class Container extends telemetry_utils_1.EventEmitterWithErrorHandling {
|
|
|
551
550
|
const createNewResolvedUrl = await this.urlResolver.resolve(request);
|
|
552
551
|
driver_utils_1.ensureFluidResolvedUrl(createNewResolvedUrl);
|
|
553
552
|
if (this.service === undefined) {
|
|
554
|
-
common_utils_1.assert(this.client.details.type !== summarizerClientType, "client should not be summarizer before container is created");
|
|
553
|
+
common_utils_1.assert(this.client.details.type !== summarizerClientType, 0x2c4 /* "client should not be summarizer before container is created" */);
|
|
555
554
|
this.service = await driver_utils_1.runWithRetry(async () => this.serviceFactory.createContainer(summary, createNewResolvedUrl, this.subLogger, false), "containerAttach", this.mc.logger, {
|
|
556
555
|
cancel: this.closeSignal,
|
|
557
556
|
});
|
|
@@ -662,8 +661,8 @@ class Container extends telemetry_utils_1.EventEmitterWithErrorHandling {
|
|
|
662
661
|
}
|
|
663
662
|
}
|
|
664
663
|
connectInternal(args) {
|
|
665
|
-
common_utils_1.assert(!this.closed, "Attempting to connect() a closed Container");
|
|
666
|
-
common_utils_1.assert(this._attachState === container_definitions_1.AttachState.Attached, "Attempting to connect() a container that is not attached");
|
|
664
|
+
common_utils_1.assert(!this.closed, 0x2c5 /* "Attempting to connect() a closed Container" */);
|
|
665
|
+
common_utils_1.assert(this._attachState === container_definitions_1.AttachState.Attached, 0x2c6 /* "Attempting to connect() a container that is not attached" */);
|
|
667
666
|
// Resume processing ops and connect to delta stream
|
|
668
667
|
this.resumeInternal(args);
|
|
669
668
|
// Set Auto Reconnect Mode
|
|
@@ -679,7 +678,7 @@ class Container extends telemetry_utils_1.EventEmitterWithErrorHandling {
|
|
|
679
678
|
}
|
|
680
679
|
}
|
|
681
680
|
disconnectInternal() {
|
|
682
|
-
common_utils_1.assert(!this.closed, "Attempting to disconnect() a closed Container");
|
|
681
|
+
common_utils_1.assert(!this.closed, 0x2c7 /* "Attempting to disconnect() a closed Container" */);
|
|
683
682
|
// Set Auto Reconnect Mode
|
|
684
683
|
const mode = contracts_1.ReconnectMode.Disabled;
|
|
685
684
|
this.setAutoReconnectInternal(mode);
|
|
@@ -709,29 +708,15 @@ class Container extends telemetry_utils_1.EventEmitterWithErrorHandling {
|
|
|
709
708
|
// Ensure connection to web socket
|
|
710
709
|
this.connectToDeltaStream(args);
|
|
711
710
|
}
|
|
712
|
-
/**
|
|
713
|
-
* @deprecated 0.56, will be removed in next release from IContainerContext
|
|
714
|
-
* Raise non-critical error to host. Calling this API will not close container.
|
|
715
|
-
* For critical errors, please call Container.close(error).
|
|
716
|
-
* @param error - an error to raise
|
|
717
|
-
*/
|
|
718
|
-
raiseContainerWarning(warning) {
|
|
719
|
-
// Some "warning" events come from outside the container and are logged
|
|
720
|
-
// elsewhere (e.g. summarizing container). We shouldn't log these here.
|
|
721
|
-
if (warning.logged !== true) {
|
|
722
|
-
this.logContainerError(warning);
|
|
723
|
-
}
|
|
724
|
-
this.emit("warning", warning);
|
|
725
|
-
}
|
|
726
711
|
async getAbsoluteUrl(relativeUrl) {
|
|
727
712
|
var _a;
|
|
728
713
|
if (this.resolvedUrl === undefined) {
|
|
729
714
|
return undefined;
|
|
730
715
|
}
|
|
731
|
-
return this.urlResolver.getAbsoluteUrl(this.resolvedUrl, relativeUrl, (_a = this._context) === null || _a === void 0 ? void 0 : _a.codeDetails);
|
|
716
|
+
return this.urlResolver.getAbsoluteUrl(this.resolvedUrl, relativeUrl, contracts_1.getPackageName((_a = this._context) === null || _a === void 0 ? void 0 : _a.codeDetails));
|
|
732
717
|
}
|
|
733
718
|
async proposeCodeDetails(codeDetails) {
|
|
734
|
-
if (!
|
|
719
|
+
if (!container_definitions_1.isFluidCodeDetails(codeDetails)) {
|
|
735
720
|
throw new Error("Provided codeDetails are not IFluidCodeDetails");
|
|
736
721
|
}
|
|
737
722
|
if (this.codeLoader.IFluidCodeDetailsComparer) {
|
|
@@ -990,7 +975,7 @@ class Container extends telemetry_utils_1.EventEmitterWithErrorHandling {
|
|
|
990
975
|
});
|
|
991
976
|
protocol.quorum.on("approveProposal", (sequenceNumber, key, value) => {
|
|
992
977
|
if (key === "code" || key === "code2") {
|
|
993
|
-
if (!
|
|
978
|
+
if (!container_definitions_1.isFluidCodeDetails(value)) {
|
|
994
979
|
this.mc.logger.sendErrorEvent({
|
|
995
980
|
eventName: "CodeProposalNotIFluidCodeDetails",
|
|
996
981
|
});
|
|
@@ -1090,7 +1075,13 @@ class Container extends telemetry_utils_1.EventEmitterWithErrorHandling {
|
|
|
1090
1075
|
this.connectionStateHandler.receivedDisconnectEvent(reason);
|
|
1091
1076
|
});
|
|
1092
1077
|
deltaManager.on("throttled", (warning) => {
|
|
1093
|
-
|
|
1078
|
+
const warn = warning;
|
|
1079
|
+
// Some "warning" events come from outside the container and are logged
|
|
1080
|
+
// elsewhere (e.g. summarizing container). We shouldn't log these here.
|
|
1081
|
+
if (warn.logged !== true) {
|
|
1082
|
+
this.logContainerError(warn);
|
|
1083
|
+
}
|
|
1084
|
+
this.emit("warning", warn);
|
|
1094
1085
|
});
|
|
1095
1086
|
deltaManager.on("readonly", (readonly) => {
|
|
1096
1087
|
this.emit("readonly", readonly);
|
|
@@ -1285,7 +1276,7 @@ class Container extends telemetry_utils_1.EventEmitterWithErrorHandling {
|
|
|
1285
1276
|
// The relative loader will proxy requests to '/' to the loader itself assuming no non-cache flags
|
|
1286
1277
|
// are set. Global requests will still go directly to the loader
|
|
1287
1278
|
const loader = new loader_1.RelativeLoader(this, this.loader);
|
|
1288
|
-
this._context = await containerContext_1.ContainerContext.createOrLoad(this, this.scope, this.codeLoader, codeDetails, snapshot, new deltaManagerProxy_1.DeltaManagerProxy(this._deltaManager), new quorum_1.QuorumProxy(this.protocolHandler.quorum), loader, (
|
|
1279
|
+
this._context = await containerContext_1.ContainerContext.createOrLoad(this, this.scope, this.codeLoader, codeDetails, snapshot, new deltaManagerProxy_1.DeltaManagerProxy(this._deltaManager), new quorum_1.QuorumProxy(this.protocolHandler.quorum), loader, (type, contents, batch, metadata) => this.submitContainerMessage(type, contents, batch, metadata), (message) => this.submitSignal(message), (error) => this.close(error), Container.version, (dirty) => this.updateDirtyContainerState(dirty), existing, pendingLocalState);
|
|
1289
1280
|
this.emit("contextChanged", codeDetails);
|
|
1290
1281
|
}
|
|
1291
1282
|
updateDirtyContainerState(dirty) {
|