@fluidframework/container-loader 2.0.0-dev.7.4.0.215747 → 2.0.0-dev.7.4.0.216897

package/lib/container.mjs

@@ -44,6 +44,7 @@ const hasBlobsSummaryTree = ".hasAttachmentBlobs";
  * but it maybe still behind.
  *
  * @throws an error beginning with `"Container closed"` if the container is closed before it catches up.
+ * @internal
  */
 export async function waitContainerToCatchUp(container) {
     // Make sure we stop waiting if container is closed.
@@ -412,11 +413,12 @@ export class Container extends EventEmitterWithErrorHandling {
                 ...createParamOverrides,
             });
         };
+        this._containerId = uuid();
+        this.client = Container.setupClient(this._containerId, this.options, this.clientDetailsOverride);
         // Create logger for data stores to use
         const type = this.client.details.type;
         const interactive = this.client.details.capabilities.interactive;
         const clientType = `${interactive ? "interactive" : "noninteractive"}${type !== undefined && type !== "" ? `/${type}` : ""}`;
-        this._containerId = uuid();
         // Need to use the property getter for docId because for detached flow we don't have the docId initially.
         // We assign the id later so property getter is used.
         this.subLogger = createChildLogger({
@@ -1248,9 +1250,10 @@ export class Container extends EventEmitterWithErrorHandling {
         const pkg = getCodeProposal(quorum);
         return pkg;
     }
-    get client() {
-        const client = this.options?.client !== undefined
-            ? this.options.client
+    static setupClient(containerId, options, clientDetailsOverride) {
+        const loaderOptionsClient = structuredClone(options?.client);
+        const client = loaderOptionsClient !== undefined
+            ? loaderOptionsClient
             : {
                 details: {
                     capabilities: { interactive: true },
@@ -1260,20 +1263,20 @@ export class Container extends EventEmitterWithErrorHandling {
                 scopes: [],
                 user: { id: "" },
             };
-        if (this.clientDetailsOverride !== undefined) {
+        if (clientDetailsOverride !== undefined) {
             client.details = {
                 ...client.details,
-                ...this.clientDetailsOverride,
+                ...clientDetailsOverride,
                 capabilities: {
                     ...client.details.capabilities,
-                    ...this.clientDetailsOverride.capabilities,
+                    ...clientDetailsOverride?.capabilities,
                 },
             };
         }
         client.details.environment = [
             client.details.environment,
             ` loaderVersion:${pkgVersion}`,
-            ` containerId:${this._containerId}`,
+            ` containerId:${containerId}`,
         ].join(";");
         return client;
     }