@fluidframework/container-loader 0.58.3000-61081 → 0.59.1000-61898
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/lib/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":"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"}
|
package/lib/container.js
CHANGED
|
@@ -6,8 +6,7 @@
|
|
|
6
6
|
import merge from "lodash/merge";
|
|
7
7
|
import { v4 as uuid } from "uuid";
|
|
8
8
|
import { assert, performance, unreachableCase } from "@fluidframework/common-utils";
|
|
9
|
-
import { isFluidCodeDetails, } from "@fluidframework/
|
|
10
|
-
import { AttachState, } from "@fluidframework/container-definitions";
|
|
9
|
+
import { AttachState, isFluidCodeDetails, } from "@fluidframework/container-definitions";
|
|
11
10
|
import { DataCorruptionError, extractSafePropertiesFromMessage, GenericError, UsageError, } from "@fluidframework/container-utils";
|
|
12
11
|
import { readAndParse, OnlineStatus, isOnline, ensureFluidResolvedUrl, combineAppAndProtocolSummary, runWithRetry, isFluidResolvedUrl, } from "@fluidframework/driver-utils";
|
|
13
12
|
import { isSystemMessage, ProtocolOpHandler, } from "@fluidframework/protocol-base";
|
|
@@ -15,7 +14,7 @@ import { MessageType, SummaryType, } from "@fluidframework/protocol-definitions"
|
|
|
15
14
|
import { ChildLogger, EventEmitterWithErrorHandling, PerformanceEvent, raiseConnectedEvent, TelemetryLogger, connectedEventName, disconnectedEventName, normalizeError, loggerToMonitoringContext, } from "@fluidframework/telemetry-utils";
|
|
16
15
|
import { Audience } from "./audience";
|
|
17
16
|
import { ContainerContext } from "./containerContext";
|
|
18
|
-
import { ReconnectMode } from "./contracts";
|
|
17
|
+
import { ReconnectMode, getPackageName } from "./contracts";
|
|
19
18
|
import { DeltaManager } from "./deltaManager";
|
|
20
19
|
import { DeltaManagerProxy } from "./deltaManagerProxy";
|
|
21
20
|
import { RelativeLoader } from "./loader";
|
|
@@ -544,7 +543,7 @@ export class Container extends EventEmitterWithErrorHandling {
|
|
|
544
543
|
const createNewResolvedUrl = await this.urlResolver.resolve(request);
|
|
545
544
|
ensureFluidResolvedUrl(createNewResolvedUrl);
|
|
546
545
|
if (this.service === undefined) {
|
|
547
|
-
assert(this.client.details.type !== summarizerClientType, "client should not be summarizer before container is created");
|
|
546
|
+
assert(this.client.details.type !== summarizerClientType, 0x2c4 /* "client should not be summarizer before container is created" */);
|
|
548
547
|
this.service = await runWithRetry(async () => this.serviceFactory.createContainer(summary, createNewResolvedUrl, this.subLogger, false), "containerAttach", this.mc.logger, {
|
|
549
548
|
cancel: this.closeSignal,
|
|
550
549
|
});
|
|
@@ -655,8 +654,8 @@ export class Container extends EventEmitterWithErrorHandling {
|
|
|
655
654
|
}
|
|
656
655
|
}
|
|
657
656
|
connectInternal(args) {
|
|
658
|
-
assert(!this.closed, "Attempting to connect() a closed Container");
|
|
659
|
-
assert(this._attachState === AttachState.Attached, "Attempting to connect() a container that is not attached");
|
|
657
|
+
assert(!this.closed, 0x2c5 /* "Attempting to connect() a closed Container" */);
|
|
658
|
+
assert(this._attachState === AttachState.Attached, 0x2c6 /* "Attempting to connect() a container that is not attached" */);
|
|
660
659
|
// Resume processing ops and connect to delta stream
|
|
661
660
|
this.resumeInternal(args);
|
|
662
661
|
// Set Auto Reconnect Mode
|
|
@@ -672,7 +671,7 @@ export class Container extends EventEmitterWithErrorHandling {
|
|
|
672
671
|
}
|
|
673
672
|
}
|
|
674
673
|
disconnectInternal() {
|
|
675
|
-
assert(!this.closed, "Attempting to disconnect() a closed Container");
|
|
674
|
+
assert(!this.closed, 0x2c7 /* "Attempting to disconnect() a closed Container" */);
|
|
676
675
|
// Set Auto Reconnect Mode
|
|
677
676
|
const mode = ReconnectMode.Disabled;
|
|
678
677
|
this.setAutoReconnectInternal(mode);
|
|
@@ -702,26 +701,12 @@ export class Container extends EventEmitterWithErrorHandling {
|
|
|
702
701
|
// Ensure connection to web socket
|
|
703
702
|
this.connectToDeltaStream(args);
|
|
704
703
|
}
|
|
705
|
-
/**
|
|
706
|
-
* @deprecated 0.56, will be removed in next release from IContainerContext
|
|
707
|
-
* Raise non-critical error to host. Calling this API will not close container.
|
|
708
|
-
* For critical errors, please call Container.close(error).
|
|
709
|
-
* @param error - an error to raise
|
|
710
|
-
*/
|
|
711
|
-
raiseContainerWarning(warning) {
|
|
712
|
-
// Some "warning" events come from outside the container and are logged
|
|
713
|
-
// elsewhere (e.g. summarizing container). We shouldn't log these here.
|
|
714
|
-
if (warning.logged !== true) {
|
|
715
|
-
this.logContainerError(warning);
|
|
716
|
-
}
|
|
717
|
-
this.emit("warning", warning);
|
|
718
|
-
}
|
|
719
704
|
async getAbsoluteUrl(relativeUrl) {
|
|
720
705
|
var _a;
|
|
721
706
|
if (this.resolvedUrl === undefined) {
|
|
722
707
|
return undefined;
|
|
723
708
|
}
|
|
724
|
-
return this.urlResolver.getAbsoluteUrl(this.resolvedUrl, relativeUrl, (_a = this._context) === null || _a === void 0 ? void 0 : _a.codeDetails);
|
|
709
|
+
return this.urlResolver.getAbsoluteUrl(this.resolvedUrl, relativeUrl, getPackageName((_a = this._context) === null || _a === void 0 ? void 0 : _a.codeDetails));
|
|
725
710
|
}
|
|
726
711
|
async proposeCodeDetails(codeDetails) {
|
|
727
712
|
if (!isFluidCodeDetails(codeDetails)) {
|
|
@@ -1083,7 +1068,13 @@ export class Container extends EventEmitterWithErrorHandling {
|
|
|
1083
1068
|
this.connectionStateHandler.receivedDisconnectEvent(reason);
|
|
1084
1069
|
});
|
|
1085
1070
|
deltaManager.on("throttled", (warning) => {
|
|
1086
|
-
|
|
1071
|
+
const warn = warning;
|
|
1072
|
+
// Some "warning" events come from outside the container and are logged
|
|
1073
|
+
// elsewhere (e.g. summarizing container). We shouldn't log these here.
|
|
1074
|
+
if (warn.logged !== true) {
|
|
1075
|
+
this.logContainerError(warn);
|
|
1076
|
+
}
|
|
1077
|
+
this.emit("warning", warn);
|
|
1087
1078
|
});
|
|
1088
1079
|
deltaManager.on("readonly", (readonly) => {
|
|
1089
1080
|
this.emit("readonly", readonly);
|
|
@@ -1278,7 +1269,7 @@ export class Container extends EventEmitterWithErrorHandling {
|
|
|
1278
1269
|
// The relative loader will proxy requests to '/' to the loader itself assuming no non-cache flags
|
|
1279
1270
|
// are set. Global requests will still go directly to the loader
|
|
1280
1271
|
const loader = new RelativeLoader(this, this.loader);
|
|
1281
|
-
this._context = await ContainerContext.createOrLoad(this, this.scope, this.codeLoader, codeDetails, snapshot, new DeltaManagerProxy(this._deltaManager), new QuorumProxy(this.protocolHandler.quorum), loader, (
|
|
1272
|
+
this._context = await ContainerContext.createOrLoad(this, this.scope, this.codeLoader, codeDetails, snapshot, new DeltaManagerProxy(this._deltaManager), new 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);
|
|
1282
1273
|
this.emit("contextChanged", codeDetails);
|
|
1283
1274
|
}
|
|
1284
1275
|
updateDirtyContainerState(dirty) {
|