@fluidframework/container-loader 2.0.0-dev.1.3.0.96595 → 2.0.0-dev.1.4.5.105745

package/lib/packageVersion.d.ts

@@ -5,5 +5,5 @@
  * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
  */
 export declare const pkgName = "@fluidframework/container-loader";
-export declare const pkgVersion = "2.0.0-dev.1.3.0.96595";
+export declare const pkgVersion = "2.0.0-dev.1.4.5.105745";
 //# sourceMappingURL=packageVersion.d.ts.map

package/lib/packageVersion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"packageVersion.d.ts","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,eAAO,MAAM,OAAO,qCAAqC,CAAC;AAC1D,eAAO,MAAM,UAAU,0BAA0B,CAAC"}
+{"version":3,"file":"packageVersion.d.ts","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,eAAO,MAAM,OAAO,qCAAqC,CAAC;AAC1D,eAAO,MAAM,UAAU,2BAA2B,CAAC"}

package/lib/packageVersion.js

@@ -5,5 +5,5 @@
  * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
  */
 export const pkgName = "@fluidframework/container-loader";
-export const pkgVersion = "2.0.0-dev.1.3.0.96595";
+export const pkgVersion = "2.0.0-dev.1.4.5.105745";
 //# sourceMappingURL=packageVersion.js.map

package/lib/packageVersion.js.map

@@ -1 +1 @@
-{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,kCAAkC,CAAC;AAC1D,MAAM,CAAC,MAAM,UAAU,GAAG,uBAAuB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/container-loader\";\nexport const pkgVersion = \"2.0.0-dev.1.3.0.96595\";\n"]}
+{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,kCAAkC,CAAC;AAC1D,MAAM,CAAC,MAAM,UAAU,GAAG,wBAAwB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/container-loader\";\nexport const pkgVersion = \"2.0.0-dev.1.4.5.105745\";\n"]}

package/lib/protocol.d.ts

@@ -4,23 +4,18 @@
  */
 import { IAudienceOwner } from "@fluidframework/container-definitions";
 import { IProtocolHandler as IBaseProtocolHandler, IQuorumSnapshot, ProtocolOpHandler } from "@fluidframework/protocol-base";
-import { IDocumentAttributes, IProcessMessageResult, ISequencedDocumentMessage, ISignalMessage } from "@fluidframework/protocol-definitions";
-export declare enum SignalType {
-    ClientJoin = "join",
-    ClientLeave = "leave",
-    Clear = "clear"
-}
+import { IDocumentAttributes, IProcessMessageResult, ISequencedDocumentMessage, ISignalClient, ISignalMessage } from "@fluidframework/protocol-definitions";
 /**
  * Function to be used for creating a protocol handler.
  */
-export declare type ProtocolHandlerBuilder = (attributes: IDocumentAttributes, snapshot: IQuorumSnapshot, sendProposal: (key: string, value: any) => number) => IProtocolHandler;
+export declare type ProtocolHandlerBuilder = (attributes: IDocumentAttributes, snapshot: IQuorumSnapshot, sendProposal: (key: string, value: any) => number, initialClients: ISignalClient[]) => IProtocolHandler;
 export interface IProtocolHandler extends IBaseProtocolHandler {
     readonly audience: IAudienceOwner;
     processSignal(message: ISignalMessage): any;
 }
 export declare class ProtocolHandler extends ProtocolOpHandler implements IProtocolHandler {
     readonly audience: IAudienceOwner;
-    constructor(attributes: IDocumentAttributes, quorumSnapshot: IQuorumSnapshot, sendProposal: (key: string, value: any) => number, audience: IAudienceOwner);
+    constructor(attributes: IDocumentAttributes, quorumSnapshot: IQuorumSnapshot, sendProposal: (key: string, value: any) => number, initialClients: ISignalClient[], audience: IAudienceOwner);
     processMessage(message: ISequencedDocumentMessage, local: boolean): IProcessMessageResult;
     processSignal(message: ISignalMessage): void;
 }

package/lib/protocol.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../src/protocol.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAEH,gBAAgB,IAAI,oBAAoB,EACxC,eAAe,EACf,iBAAiB,EACpB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACH,mBAAmB,EACnB,qBAAqB,EACrB,yBAAyB,EAEzB,cAAc,EAEjB,MAAM,sCAAsC,CAAC;AAI9C,oBAAY,UAAU;IAClB,UAAU,SAAS;IACnB,WAAW,UAAU;IACrB,KAAK,UAAU;CAClB;AAED;;GAEG;AACH,oBAAY,sBAAsB,GAAG,CACjC,UAAU,EAAE,mBAAmB,EAC/B,QAAQ,EAAE,eAAe,EACzB,YAAY,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,MAAM,KAChD,gBAAgB,CAAC;AAEtB,MAAM,WAAW,gBAAiB,SAAQ,oBAAoB;IAC1D,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC;IAClC,aAAa,CAAC,OAAO,EAAE,cAAc,OAAE;CAC1C;AAED,qBAAa,eAAgB,SAAQ,iBAAkB,YAAW,gBAAgB;IAK1E,QAAQ,CAAC,QAAQ,EAAE,cAAc;gBAHjC,UAAU,EAAE,mBAAmB,EAC/B,cAAc,EAAE,eAAe,EAC/B,YAAY,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,MAAM,EACxC,QAAQ,EAAE,cAAc;IAoB9B,cAAc,CAAC,OAAO,EAAE,yBAAyB,EAAE,KAAK,EAAE,OAAO,GAAG,qBAAqB;IAoBzF,aAAa,CAAC,OAAO,EAAE,cAAc;CA+B/C"}
+{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../src/protocol.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAEH,gBAAgB,IAAI,oBAAoB,EACxC,eAAe,EACf,iBAAiB,EACpB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACH,mBAAmB,EACnB,qBAAqB,EACrB,yBAAyB,EACzB,aAAa,EACb,cAAc,EAEjB,MAAM,sCAAsC,CAAC;AAG9C;;GAEG;AACH,oBAAY,sBAAsB,GAAG,CACjC,UAAU,EAAE,mBAAmB,EAC/B,QAAQ,EAAE,eAAe,EACzB,YAAY,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,MAAM,EACjD,cAAc,EAAE,aAAa,EAAE,KAC9B,gBAAgB,CAAC;AAEtB,MAAM,WAAW,gBAAiB,SAAQ,oBAAoB;IAC1D,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC;IAClC,aAAa,CAAC,OAAO,EAAE,cAAc,OAAE;CAC1C;AAED,qBAAa,eAAgB,SAAQ,iBAAkB,YAAW,gBAAgB;IAM1E,QAAQ,CAAC,QAAQ,EAAE,cAAc;gBAJjC,UAAU,EAAE,mBAAmB,EAC/B,cAAc,EAAE,eAAe,EAC/B,YAAY,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,MAAM,EACjD,cAAc,EAAE,aAAa,EAAE,EACtB,QAAQ,EAAE,cAAc;IAiB9B,cAAc,CAAC,OAAO,EAAE,yBAAyB,EAAE,KAAK,EAAE,OAAO,GAAG,qBAAqB;IAoBzF,aAAa,CAAC,OAAO,EAAE,cAAc;CAgB/C"}

package/lib/protocol.js

@@ -5,22 +5,12 @@
 import { ProtocolOpHandler, } from "@fluidframework/protocol-base";
 import { MessageType, } from "@fluidframework/protocol-definitions";
 import { canBeCoalescedByService } from "@fluidframework/driver-utils";
-// ADO: #1986: Start using enum from protocol-base.
-export var SignalType;
-(function (SignalType) {
-    SignalType["ClientJoin"] = "join";
-    SignalType["ClientLeave"] = "leave";
-    SignalType["Clear"] = "clear";
-})(SignalType || (SignalType = {}));
 export class ProtocolHandler extends ProtocolOpHandler {
-    constructor(attributes, quorumSnapshot, sendProposal, audience) {
+    constructor(attributes, quorumSnapshot, sendProposal, initialClients, audience) {
         super(attributes.minimumSequenceNumber, attributes.sequenceNumber, attributes.term, quorumSnapshot.members, quorumSnapshot.proposals, quorumSnapshot.values, sendProposal);
         this.audience = audience;
-        // Join / leave signals are ignored for "write" clients in favor of join / leave ops
-        this.quorum.on("addMember", (clientId, details) => audience.addMember(clientId, details.client));
-        this.quorum.on("removeMember", (clientId) => audience.removeMember(clientId));
-        for (const [clientId, details] of this.quorum.getMembers()) {
-            this.audience.addMember(clientId, details.client);
+        for (const initialClient of initialClients) {
+            this.audience.addMember(initialClient.clientId, initialClient.client);
         }
     }
     processMessage(message, local) {
@@ -40,32 +30,16 @@ export class ProtocolHandler extends ProtocolOpHandler {
         return super.processMessage(message, local);
     }
     processSignal(message) {
-        var _a;
         const innerContent = message.content;
         switch (innerContent.type) {
-            case SignalType.Clear: {
-                const members = this.audience.getMembers();
-                for (const [clientId, client] of members) {
-                    if (client.mode === "read") {
-                        this.audience.removeMember(clientId);
-                    }
-                }
-                break;
-            }
-            case SignalType.ClientJoin: {
+            case MessageType.ClientJoin: {
                 const newClient = innerContent.content;
-                // Ignore write clients - quorum will control such clients.
-                if (newClient.client.mode === "read") {
-                    this.audience.addMember(newClient.clientId, newClient.client);
-                }
+                this.audience.addMember(newClient.clientId, newClient.client);
                 break;
             }
-            case SignalType.ClientLeave: {
+            case MessageType.ClientLeave: {
                 const leftClientId = innerContent.content;
-                // Ignore write clients - quorum will control such clients.
-                if (((_a = this.audience.getMember(leftClientId)) === null || _a === void 0 ? void 0 : _a.mode) === "read") {
-                    this.audience.removeMember(leftClientId);
-                }
+                this.audience.removeMember(leftClientId);
                 break;
             }
             default: break;

package/lib/protocol.js.map

@@ -1 +1 @@
-{"version":3,"file":"protocol.js","sourceRoot":"","sources":["../src/protocol.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { IAudienceOwner } from \"@fluidframework/container-definitions\";\nimport {\n    ILocalSequencedClient,\n    IProtocolHandler as IBaseProtocolHandler,\n    IQuorumSnapshot,\n    ProtocolOpHandler,\n} from \"@fluidframework/protocol-base\";\nimport {\n    IDocumentAttributes,\n    IProcessMessageResult,\n    ISequencedDocumentMessage,\n    ISignalClient,\n    ISignalMessage,\n    MessageType,\n} from \"@fluidframework/protocol-definitions\";\nimport { canBeCoalescedByService } from \"@fluidframework/driver-utils\";\n\n// ADO: #1986: Start using enum from protocol-base.\nexport enum SignalType {\n    ClientJoin = \"join\", // same value as MessageType.ClientJoin,\n    ClientLeave = \"leave\", // same value as MessageType.ClientLeave,\n    Clear = \"clear\", // used only by client for synthetic signals\n}\n\n/**\n * Function to be used for creating a protocol handler.\n */\nexport type ProtocolHandlerBuilder = (\n    attributes: IDocumentAttributes,\n    snapshot: IQuorumSnapshot,\n    sendProposal: (key: string, value: any) => number,\n) => IProtocolHandler;\n\nexport interface IProtocolHandler extends IBaseProtocolHandler {\n    readonly audience: IAudienceOwner;\n    processSignal(message: ISignalMessage);\n}\n\nexport class ProtocolHandler extends ProtocolOpHandler implements IProtocolHandler {\n    constructor(\n        attributes: IDocumentAttributes,\n        quorumSnapshot: IQuorumSnapshot,\n        sendProposal: (key: string, value: any) => number,\n        readonly audience: IAudienceOwner,\n    ) {\n        super(\n            attributes.minimumSequenceNumber,\n            attributes.sequenceNumber,\n            attributes.term,\n            quorumSnapshot.members,\n            quorumSnapshot.proposals,\n            quorumSnapshot.values,\n            sendProposal,\n        );\n\n        // Join / leave signals are ignored for \"write\" clients in favor of join / leave ops\n        this.quorum.on(\"addMember\", (clientId, details) => audience.addMember(clientId, details.client));\n        this.quorum.on(\"removeMember\", (clientId) => audience.removeMember(clientId));\n        for (const [clientId, details] of this.quorum.getMembers()) {\n            this.audience.addMember(clientId, details.client);\n        }\n    }\n\n    public processMessage(message: ISequencedDocumentMessage, local: boolean): IProcessMessageResult {\n        const client: ILocalSequencedClient | undefined = this.quorum.getMember(message.clientId);\n\n        // Check and report if we're getting messages from a clientId that we previously\n        // flagged as shouldHaveLeft, or from a client that's not in the quorum but should be\n        if (message.clientId != null) {\n            if (client === undefined && message.type !== MessageType.ClientJoin) {\n                // pre-0.58 error message: messageClientIdMissingFromQuorum\n                throw new Error(\"Remote message's clientId is missing from the quorum\");\n            }\n\n            if (client?.shouldHaveLeft === true && !canBeCoalescedByService(message)) {\n                // pre-0.58 error message: messageClientIdShouldHaveLeft\n                throw new Error(\"Remote message's clientId already should have left\");\n            }\n        }\n\n        return super.processMessage(message, local);\n    }\n\n    public processSignal(message: ISignalMessage) {\n        const innerContent = message.content as { content: any; type: string; };\n        switch (innerContent.type) {\n            case SignalType.Clear: {\n                const members = this.audience.getMembers();\n                for (const [clientId, client] of members) {\n                    if (client.mode === \"read\") {\n                        this.audience.removeMember(clientId);\n                    }\n                }\n                break;\n            }\n            case SignalType.ClientJoin: {\n                const newClient = innerContent.content as ISignalClient;\n                // Ignore write clients - quorum will control such clients.\n                if (newClient.client.mode === \"read\") {\n                    this.audience.addMember(newClient.clientId, newClient.client);\n                }\n                break;\n            }\n            case SignalType.ClientLeave: {\n                const leftClientId = innerContent.content as string;\n                // Ignore write clients - quorum will control such clients.\n                if (this.audience.getMember(leftClientId)?.mode === \"read\") {\n                    this.audience.removeMember(leftClientId);\n                }\n                break;\n            }\n            default: break;\n        }\n    }\n}\n"]}
+{"version":3,"file":"protocol.js","sourceRoot":"","sources":["../src/protocol.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAIH,iBAAiB,GACpB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAMH,WAAW,GACd,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAiBvE,MAAM,OAAO,eAAgB,SAAQ,iBAAiB;IAClD,YACI,UAA+B,EAC/B,cAA+B,EAC/B,YAAiD,EACjD,cAA+B,EACtB,QAAwB;QAEjC,KAAK,CACD,UAAU,CAAC,qBAAqB,EAChC,UAAU,CAAC,cAAc,EACzB,UAAU,CAAC,IAAI,EACf,cAAc,CAAC,OAAO,EACtB,cAAc,CAAC,SAAS,EACxB,cAAc,CAAC,MAAM,EACrB,YAAY,CACf,CAAC;QAVO,aAAQ,GAAR,QAAQ,CAAgB;QAYjC,KAAK,MAAM,aAAa,IAAI,cAAc,EAAE;YACxC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;SACzE;IACL,CAAC;IAEM,cAAc,CAAC,OAAkC,EAAE,KAAc;QACpE,MAAM,MAAM,GAAsC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAE1F,gFAAgF;QAChF,qFAAqF;QACrF,IAAI,OAAO,CAAC,QAAQ,IAAI,IAAI,EAAE;YAC1B,IAAI,MAAM,KAAK,SAAS,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,UAAU,EAAE;gBACjE,2DAA2D;gBAC3D,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;aAC3E;YAED,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,cAAc,MAAK,IAAI,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,EAAE;gBACtE,wDAAwD;gBACxD,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;aACzE;SACJ;QAED,OAAO,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAChD,CAAC;IAEM,aAAa,CAAC,OAAuB;QACxC,MAAM,YAAY,GAAG,OAAO,CAAC,OAA0C,CAAC;QACxE,QAAQ,YAAY,CAAC,IAAI,EAAE;YACvB,KAAK,WAAW,CAAC,UAAU,CAAC,CAAC;gBACzB,MAAM,SAAS,GAAG,YAAY,CAAC,OAAwB,CAAC;gBACxD,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;gBAC9D,MAAM;aACT;YACD,KAAK,WAAW,CAAC,WAAW,CAAC,CAAC;gBAC1B,MAAM,YAAY,GAAG,YAAY,CAAC,OAAiB,CAAC;gBACpD,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;gBACzC,MAAM;aACT;YACD,OAAO,CAAC,CAAC,MAAM;SAClB;IACL,CAAC;CACJ","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { IAudienceOwner } from \"@fluidframework/container-definitions\";\nimport {\n    ILocalSequencedClient,\n    IProtocolHandler as IBaseProtocolHandler,\n    IQuorumSnapshot,\n    ProtocolOpHandler,\n} from \"@fluidframework/protocol-base\";\nimport {\n    IDocumentAttributes,\n    IProcessMessageResult,\n    ISequencedDocumentMessage,\n    ISignalClient,\n    ISignalMessage,\n    MessageType,\n} from \"@fluidframework/protocol-definitions\";\nimport { canBeCoalescedByService } from \"@fluidframework/driver-utils\";\n\n/**\n * Function to be used for creating a protocol handler.\n */\nexport type ProtocolHandlerBuilder = (\n    attributes: IDocumentAttributes,\n    snapshot: IQuorumSnapshot,\n    sendProposal: (key: string, value: any) => number,\n    initialClients: ISignalClient[],\n) => IProtocolHandler;\n\nexport interface IProtocolHandler extends IBaseProtocolHandler {\n    readonly audience: IAudienceOwner;\n    processSignal(message: ISignalMessage);\n}\n\nexport class ProtocolHandler extends ProtocolOpHandler implements IProtocolHandler {\n    constructor(\n        attributes: IDocumentAttributes,\n        quorumSnapshot: IQuorumSnapshot,\n        sendProposal: (key: string, value: any) => number,\n        initialClients: ISignalClient[],\n        readonly audience: IAudienceOwner,\n    ) {\n        super(\n            attributes.minimumSequenceNumber,\n            attributes.sequenceNumber,\n            attributes.term,\n            quorumSnapshot.members,\n            quorumSnapshot.proposals,\n            quorumSnapshot.values,\n            sendProposal,\n        );\n\n        for (const initialClient of initialClients) {\n            this.audience.addMember(initialClient.clientId, initialClient.client);\n        }\n    }\n\n    public processMessage(message: ISequencedDocumentMessage, local: boolean): IProcessMessageResult {\n        const client: ILocalSequencedClient | undefined = this.quorum.getMember(message.clientId);\n\n        // Check and report if we're getting messages from a clientId that we previously\n        // flagged as shouldHaveLeft, or from a client that's not in the quorum but should be\n        if (message.clientId != null) {\n            if (client === undefined && message.type !== MessageType.ClientJoin) {\n                // pre-0.58 error message: messageClientIdMissingFromQuorum\n                throw new Error(\"Remote message's clientId is missing from the quorum\");\n            }\n\n            if (client?.shouldHaveLeft === true && !canBeCoalescedByService(message)) {\n                // pre-0.58 error message: messageClientIdShouldHaveLeft\n                throw new Error(\"Remote message's clientId already should have left\");\n            }\n        }\n\n        return super.processMessage(message, local);\n    }\n\n    public processSignal(message: ISignalMessage) {\n        const innerContent = message.content as { content: any; type: string; };\n        switch (innerContent.type) {\n            case MessageType.ClientJoin: {\n                const newClient = innerContent.content as ISignalClient;\n                this.audience.addMember(newClient.clientId, newClient.client);\n                break;\n            }\n            case MessageType.ClientLeave: {\n                const leftClientId = innerContent.content as string;\n                this.audience.removeMember(leftClientId);\n                break;\n            }\n            default: break;\n        }\n    }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/container-loader",
-  "version": "2.0.0-dev.1.3.0.96595",
+  "version": "2.0.0-dev.1.4.5.105745",
   "description": "Fluid container loader",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -63,14 +63,14 @@
   "dependencies": {
     "@fluidframework/common-definitions": "^0.20.1",
     "@fluidframework/common-utils": "^1.0.0",
-    "@fluidframework/container-definitions": "2.0.0-dev.1.3.0.96595",
-    "@fluidframework/container-utils": "2.0.0-dev.1.3.0.96595",
-    "@fluidframework/core-interfaces": "2.0.0-dev.1.3.0.96595",
-    "@fluidframework/driver-definitions": "2.0.0-dev.1.3.0.96595",
-    "@fluidframework/driver-utils": "2.0.0-dev.1.3.0.96595",
+    "@fluidframework/container-definitions": "2.0.0-dev.1.4.5.105745",
+    "@fluidframework/container-utils": "2.0.0-dev.1.4.5.105745",
+    "@fluidframework/core-interfaces": "2.0.0-dev.1.4.5.105745",
+    "@fluidframework/driver-definitions": "2.0.0-dev.1.4.5.105745",
+    "@fluidframework/driver-utils": "2.0.0-dev.1.4.5.105745",
     "@fluidframework/protocol-base": "^0.1037.2001",
     "@fluidframework/protocol-definitions": "^1.0.0",
-    "@fluidframework/telemetry-utils": "2.0.0-dev.1.3.0.96595",
+    "@fluidframework/telemetry-utils": "2.0.0-dev.1.4.5.105745",
     "abort-controller": "^3.0.0",
     "double-ended-queue": "^2.1.0-0",
     "lodash": "^4.17.21",
@@ -79,11 +79,11 @@
   },
   "devDependencies": {
     "@fluidframework/build-common": "^1.0.0",
-    "@fluidframework/build-tools": "^0.4.6000",
+    "@fluidframework/build-tools": "^0.4.4000",
     "@fluidframework/container-loader-previous": "npm:@fluidframework/container-loader@^1.0.0",
     "@fluidframework/eslint-config-fluid": "^1.0.0",
-    "@fluidframework/mocha-test-setup": "2.0.0-dev.1.3.0.96595",
-    "@fluidframework/test-loader-utils": "2.0.0-dev.1.3.0.96595",
+    "@fluidframework/mocha-test-setup": "2.0.0-dev.1.4.5.105745",
+    "@fluidframework/test-loader-utils": "2.0.0-dev.1.4.5.105745",
     "@microsoft/api-extractor": "^7.22.2",
     "@rushstack/eslint-config": "^2.5.1",
     "@types/double-ended-queue": "^2.1.0",

package/src/audience.ts

@@ -21,12 +21,8 @@ export class Audience extends EventEmitter implements IAudienceOwner {
      * Adds a new client to the audience
      */
     public addMember(clientId: string, details: IClient) {
-        // Given that signal delivery is unreliable process, we might observe same client being added twice
-        // In such case we should see exactly same payload (IClient), and should not raise event twice!
-        if (!this.members.has(clientId)) {
-            this.members.set(clientId, details);
-            this.emit("addMember", clientId, details);
-        }
+        this.members.set(clientId, details);
+        this.emit("addMember", clientId, details);
     }
 
     /**
@@ -57,4 +53,14 @@ export class Audience extends EventEmitter implements IAudienceOwner {
     public getMember(clientId: string): IClient | undefined {
         return this.members.get(clientId);
     }
+
+    /**
+     * Clears the audience
+     */
+    public clear(): void {
+        const clientIds = this.members.keys();
+        for (const clientId of clientIds) {
+            this.removeMember(clientId);
+        }
+    }
 }

package/src/connectionManager.ts

@@ -59,7 +59,6 @@ import {
     IConnectionManagerFactoryArgs,
 } from "./contracts";
 import { DeltaQueue } from "./deltaQueue";
-import { SignalType } from "./protocol";
 
 const MaxReconnectDelayInMs = 8000;
 const InitialReconnectDelayInMs = 1000;
@@ -714,43 +713,17 @@ export class ConnectionManager implements IConnectionManager {
             initialMessages,
             this.connectFirstConnection ? "InitialOps" : "ReconnectOps");
 
-        const details = ConnectionManager.detailsFromConnection(connection);
-        details.checkpointSequenceNumber = checkpointSequenceNumber;
-        this.props.connectHandler(details);
-
-        this.connectFirstConnection = false;
-
-        // Synthesize clear & join signals out of initialClients state.
-        // This allows us to have single way to process signals, and makes it simpler to initialize
-        // protocol in Container.
-        const clearSignal: ISignalMessage = {
-            clientId: null, // system message
-            content: JSON.stringify({
-                type: SignalType.Clear,
-            }),
-        };
-        this.props.signalHandler(clearSignal);
-
-        for (const priorClient of connection.initialClients ?? []) {
-            const joinSignal: ISignalMessage = {
-                clientId: null, // system signal
-                content: JSON.stringify({
-                    type: SignalType.ClientJoin,
-                    content: priorClient, // ISignalClient
-                }),
-            };
-            this.props.signalHandler(joinSignal);
-        }
-
-        // Unfortunately, there is no defined order between initialSignals (including join & leave signals)
-        // and connection.initialClients. In practice, connection.initialSignals quite often contains join signal
-        // for "self" and connection.initialClients does not contain "self", so we have to process them after
-        // "clear" signal above.
         if (connection.initialSignals !== undefined) {
             for (const signal of connection.initialSignals) {
                 this.props.signalHandler(signal);
             }
         }
+
+        const details = ConnectionManager.detailsFromConnection(connection);
+        details.checkpointSequenceNumber = checkpointSequenceNumber;
+        this.props.connectHandler(details);
+
+        this.connectFirstConnection = false;
     }
 
     /**

package/src/container.ts

@@ -64,6 +64,7 @@ import {
     ISequencedClient,
     ISequencedDocumentMessage,
     ISequencedProposal,
+    ISignalClient,
     ISignalMessage,
     ISnapshotTree,
     ISummaryContent,
@@ -411,6 +412,7 @@ export class Container extends EventEmitterWithErrorHandling<IContainerEvents> i
     private readonly clientDetailsOverride: IClientDetails | undefined;
     private readonly _deltaManager: DeltaManager<ConnectionManager>;
     private service: IDocumentService | undefined;
+    private _initialClients: ISignalClient[] | undefined;
 
     private _context: ContainerContext | undefined;
     private get context() {
@@ -1381,8 +1383,11 @@ export class Container extends EventEmitterWithErrorHandling<IContainerEvents> i
             attributes,
             quorumSnapshot,
             (key, value) => this.submitMessage(MessageType.Propose, JSON.stringify({ key, value })),
+            this._initialClients ?? [],
         );
 
+        this._initialClients = undefined;
+
         const protocolLogger = ChildLogger.create(this.subLogger, "ProtocolHandler");
 
         protocol.quorum.on("error", (error) => {
@@ -1507,6 +1512,20 @@ export class Container extends EventEmitterWithErrorHandling<IContainerEvents> i
         deltaManager.inboundSignal.pause();
 
         deltaManager.on("connect", (details: IConnectionDetails, _opsBehind?: number) => {
+            if (this._protocolHandler === undefined) {
+                // Store the initial clients so that they can be submitted to the
+                // protocol handler when it is created.
+                this._initialClients = details.initialClients;
+            } else {
+                // When reconnecting, the protocol handler is already created,
+                // so we can update the audience right now.
+                this._protocolHandler.audience.clear();
+
+                for (const priorClient of details.initialClients ?? []) {
+                    this._protocolHandler.audience.addMember(priorClient.clientId, priorClient.client);
+                }
+            }
+
             this.connectionStateHandler.receivedConnectEvent(
                 this.connectionMode,
                 details,

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/container-loader";
-export const pkgVersion = "2.0.0-dev.1.3.0.96595";
+export const pkgVersion = "2.0.0-dev.1.4.5.105745";

package/src/protocol.ts

@@ -20,13 +20,6 @@ import {
 } from "@fluidframework/protocol-definitions";
 import { canBeCoalescedByService } from "@fluidframework/driver-utils";
 
-// ADO: #1986: Start using enum from protocol-base.
-export enum SignalType {
-    ClientJoin = "join", // same value as MessageType.ClientJoin,
-    ClientLeave = "leave", // same value as MessageType.ClientLeave,
-    Clear = "clear", // used only by client for synthetic signals
-}
-
 /**
  * Function to be used for creating a protocol handler.
  */
@@ -34,6 +27,7 @@ export type ProtocolHandlerBuilder = (
     attributes: IDocumentAttributes,
     snapshot: IQuorumSnapshot,
     sendProposal: (key: string, value: any) => number,
+    initialClients: ISignalClient[],
 ) => IProtocolHandler;
 
 export interface IProtocolHandler extends IBaseProtocolHandler {
@@ -46,6 +40,7 @@ export class ProtocolHandler extends ProtocolOpHandler implements IProtocolHandl
         attributes: IDocumentAttributes,
         quorumSnapshot: IQuorumSnapshot,
         sendProposal: (key: string, value: any) => number,
+        initialClients: ISignalClient[],
         readonly audience: IAudienceOwner,
     ) {
         super(
@@ -58,11 +53,8 @@ export class ProtocolHandler extends ProtocolOpHandler implements IProtocolHandl
             sendProposal,
         );
 
-        // Join / leave signals are ignored for "write" clients in favor of join / leave ops
-        this.quorum.on("addMember", (clientId, details) => audience.addMember(clientId, details.client));
-        this.quorum.on("removeMember", (clientId) => audience.removeMember(clientId));
-        for (const [clientId, details] of this.quorum.getMembers()) {
-            this.audience.addMember(clientId, details.client);
+        for (const initialClient of initialClients) {
+            this.audience.addMember(initialClient.clientId, initialClient.client);
         }
     }
 
@@ -89,29 +81,14 @@ export class ProtocolHandler extends ProtocolOpHandler implements IProtocolHandl
     public processSignal(message: ISignalMessage) {
         const innerContent = message.content as { content: any; type: string; };
         switch (innerContent.type) {
-            case SignalType.Clear: {
-                const members = this.audience.getMembers();
-                for (const [clientId, client] of members) {
-                    if (client.mode === "read") {
-                        this.audience.removeMember(clientId);
-                    }
-                }
-                break;
-            }
-            case SignalType.ClientJoin: {
+            case MessageType.ClientJoin: {
                 const newClient = innerContent.content as ISignalClient;
-                // Ignore write clients - quorum will control such clients.
-                if (newClient.client.mode === "read") {
-                    this.audience.addMember(newClient.clientId, newClient.client);
-                }
+                this.audience.addMember(newClient.clientId, newClient.client);
                 break;
             }
-            case SignalType.ClientLeave: {
+            case MessageType.ClientLeave: {
                 const leftClientId = innerContent.content as string;
-                // Ignore write clients - quorum will control such clients.
-                if (this.audience.getMember(leftClientId)?.mode === "read") {
-                    this.audience.removeMember(leftClientId);
-                }
+                this.audience.removeMember(leftClientId);
                 break;
             }
             default: break;