@fluid-tools/fetch-tool 1.4.0-115997 → 2.0.0-dev-rc.1.0.0.224419

package/.eslintrc.js

@@ -4,11 +4,9 @@
  */
 
 module.exports = {
-    "extends": [
-        require.resolve("@fluidframework/eslint-config-fluid")
-    ],
-    "rules": {
-        // This library is used in the browser, so we don't want dependencies on most node libraries.
-        "import/no-nodejs-modules": ["error", {"allow": ["child_process","fs","url","util"]}],
-    }
-}
+	extends: [require.resolve("@fluidframework/eslint-config-fluid/minimal"), "prettier"],
+	rules: {
+		// This library is used in the browser, so we don't want dependencies on most node libraries.
+		"import/no-nodejs-modules": ["error", { allow: ["child_process", "fs", "url", "util"] }],
+	},
+};

package/CHANGELOG.md

@@ -0,0 +1,117 @@
+# @fluid-tools/fetch-tool
+
+## 2.0.0-internal.8.0.0
+
+Dependency updates only.
+
+## 2.0.0-internal.7.4.0
+
+Dependency updates only.
+
+## 2.0.0-internal.7.3.0
+
+Dependency updates only.
+
+## 2.0.0-internal.7.2.0
+
+Dependency updates only.
+
+## 2.0.0-internal.7.1.0
+
+Dependency updates only.
+
+## 2.0.0-internal.7.0.0
+
+### Major Changes
+
+-   Dependencies on @fluidframework/protocol-definitions package updated to 3.0.0 [871b3493dd](https://github.com/microsoft/FluidFramework/commits/871b3493dd0d7ea3a89be64998ceb6cb9021a04e)
+
+    This included the following changes from the protocol-definitions release:
+
+    -   Updating signal interfaces for some planned improvements. The intention is split the interface between signals
+        submitted by clients to the server and the resulting signals sent from the server to clients.
+        -   A new optional type member is available on the ISignalMessage interface and a new ISentSignalMessage interface has
+            been added, which will be the typing for signals sent from the client to the server. Both extend a new
+            ISignalMessageBase interface that contains common members.
+    -   The @fluidframework/common-definitions package dependency has been updated to version 1.0.0.
+
+-   Server upgrade: dependencies on Fluid server packages updated to 2.0.1 [871b3493dd](https://github.com/microsoft/FluidFramework/commits/871b3493dd0d7ea3a89be64998ceb6cb9021a04e)
+
+    Dependencies on the following Fluid server package have been updated to version 2.0.1:
+
+    -   @fluidframework/gitresources: 2.0.1
+    -   @fluidframework/server-kafka-orderer: 2.0.1
+    -   @fluidframework/server-lambdas: 2.0.1
+    -   @fluidframework/server-lambdas-driver: 2.0.1
+    -   @fluidframework/server-local-server: 2.0.1
+    -   @fluidframework/server-memory-orderer: 2.0.1
+    -   @fluidframework/protocol-base: 2.0.1
+    -   @fluidframework/server-routerlicious: 2.0.1
+    -   @fluidframework/server-routerlicious-base: 2.0.1
+    -   @fluidframework/server-services: 2.0.1
+    -   @fluidframework/server-services-client: 2.0.1
+    -   @fluidframework/server-services-core: 2.0.1
+    -   @fluidframework/server-services-ordering-kafkanode: 2.0.1
+    -   @fluidframework/server-services-ordering-rdkafka: 2.0.1
+    -   @fluidframework/server-services-ordering-zookeeper: 2.0.1
+    -   @fluidframework/server-services-shared: 2.0.1
+    -   @fluidframework/server-services-telemetry: 2.0.1
+    -   @fluidframework/server-services-utils: 2.0.1
+    -   @fluidframework/server-test-utils: 2.0.1
+    -   tinylicious: 2.0.1
+
+-   Minimum TypeScript version now 5.1.6 [871b3493dd](https://github.com/microsoft/FluidFramework/commits/871b3493dd0d7ea3a89be64998ceb6cb9021a04e)
+
+    The minimum supported TypeScript version for Fluid 2.0 clients is now 5.1.6.
+
+## 2.0.0-internal.6.4.0
+
+Dependency updates only.
+
+## 2.0.0-internal.6.3.0
+
+Dependency updates only.
+
+## 2.0.0-internal.6.2.0
+
+Dependency updates only.
+
+## 2.0.0-internal.6.1.0
+
+Dependency updates only.
+
+## 2.0.0-internal.6.0.0
+
+### Major Changes
+
+-   Upgraded typescript transpilation target to ES2020 [8abce8cdb4](https://github.com/microsoft/FluidFramework/commits/8abce8cdb4e2832fb6405fb44e393bef03d5648a)
+
+    Upgraded typescript transpilation target to ES2020. This is done in order to decrease the bundle sizes of Fluid Framework packages. This has provided size improvements across the board for ex. Loader, Driver, Runtime etc. Reduced bundle sizes helps to load lesser code in apps and hence also helps to improve the perf.If any app wants to target any older versions of browsers with which this target version is not compatible, then they can use packages like babel to transpile to a older target.
+
+## 2.0.0-internal.5.4.0
+
+Dependency updates only.
+
+## 2.0.0-internal.5.3.0
+
+Dependency updates only.
+
+## 2.0.0-internal.5.2.0
+
+Dependency updates only.
+
+## 2.0.0-internal.5.1.0
+
+Dependency updates only.
+
+## 2.0.0-internal.5.0.0
+
+Dependency updates only.
+
+## 2.0.0-internal.4.4.0
+
+Dependency updates only.
+
+## 2.0.0-internal.4.1.0
+
+Dependency updates only.

package/README.md

@@ -1,7 +1,8 @@
 # @fluid-tools/fetch-tool
 
 Connection using ODSP or routerlicious driver to dump the messages or snapshot information on the server.
-In order to connect to ODSP, the clientID and clientSecret must be set as environment variables login__microsoft__clientId and login__microsoft__secret, respectively. If you have access to the keyvault this can be done by running [this tool](../../../tools/getkeys).
+In order to connect to ODSP, the clientID and clientSecret must be set as environment variables `login__microsoft__clientId` and `login__microsoft__secret`, respectively. If you have access to the keyvault this can be done by running [this tool](../../../tools/getkeys).
+Beware that to use fetch-tool on documents in the Microsoft tenant, you will need to follow the fetch tool usage instructions on the "Debugging Tools" page of the internal Fluid wiki.
 
 ## Usage
 
@@ -24,6 +25,20 @@ In order to connect to ODSP, the clientID and clientSecret must be set as enviro
       --snapshotVersionIndex <number> : Index of the version to dump
       --saveDir <outdir>              : Save data of the snapshots and messages
 
+### Tips
+
+-   If not done already run `npm run build`
+-   Example command - run `node bin/fluid-fetch --saveDir example 'URL'` in the `fetch-tool` directory
+    -   An example URL is something from office.com that looks like `https://www.office.com/launch/fluid/...`
+    -   This command creates an `example` directory (if it doesn't exist) in the `fetch-tool` folder.
+    -   If run multiple times without clearing the `example` directory, the snapshot will overwrite any old folders or files.
+-   Looking at the `example` directory:
+    -   Go to `1-XYZ/decoded/tree.json` to see the snapshot tree.
+    -   Each `'#-XYZ'` string in the `tree.json` correlates to a file in the decoded folder. These files are essentially blobs.
+    -   `0-XYZ/decoded/tree.json` is an older snapshot tree.
+    -   The `messages.json` is a list of ops/messages that are stored.
+-   For 401 authentication errors, as stated above, check that [getkeys](../../../tools/getkeys) has been run.
+
 ## Example Output
 
 ### Messages Stats
@@ -42,7 +57,6 @@ In order to connect to ODSP, the clientID and clientSecret must be set as enviro
     ----------------------------------------------------------------------------------------------------
     Total                                                                    |   105      38605
 
-
 **--stat:dataType**
 
     107 total messages (105 delta storage, 2 initial ws messages, 0 dup)
@@ -102,13 +116,30 @@ If you would like to debug fetch-tool, you can create a unit test. Remember to a
 In the unit test, you can use `setArguments()` from fluidFetchArgs to pass in arguments you want to test. Then call the methods you want to run and you will be able to set breakpoints in vscode.
 
 **Example**
+
 ```js
 describe("fetch tool", () => {
-    it("can fetch messages", async () => {
-        fluidFetchArgs.setArguments(your_args);
-        const documentService = await fluidFetchInit(your_paramURL);
-        await fluidFetchMessages(documentService, your_saveDir);
-    });
+	it("can fetch messages", async () => {
+		fluidFetchArgs.setArguments(your_args);
+		const documentService = await fluidFetchInit(your_paramURL);
+		await fluidFetchMessages(documentService, your_saveDir);
+	});
 });
 ```
 
+<!-- AUTO-GENERATED-CONTENT:START (README_TRADEMARK_SECTION:includeHeading=TRUE) -->
+
+<!-- prettier-ignore-start -->
+<!-- NOTE: This section is automatically generated using @fluid-tools/markdown-magic. Do not update these generated contents directly. -->
+
+## Trademark
+
+This project may contain Microsoft trademarks or logos for Microsoft projects, products, or services.
+
+Use of these trademarks or logos must follow Microsoft's [Trademark & Brand Guidelines](https://www.microsoft.com/en-us/legal/intellectualproperty/trademarks/usage/general).
+
+Use of Microsoft trademarks or logos in modified versions of this project must not cause confusion or imply Microsoft sponsorship.
+
+<!-- prettier-ignore-end -->
+
+<!-- AUTO-GENERATED-CONTENT:END -->

package/dist/fluidAnalyzeMessages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fluidAnalyzeMessages.d.ts","sourceRoot":"","sources":["../src/fluidAnalyzeMessages.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAyEH,eAAO,MAAM,YAAY,QAAS,MAAM,KAAG,MAA8D,CAAC;AAgW1G,wBAAsB,iBAAiB,CACnC,SAAS,KAAA,EAAE,+CAA+C;AAC1D,gBAAgB,EAAE,OAAO,EACzB,YAAY,EAAE,OAAO,EACrB,iBAAiB,GAAE,GAAG,CAAC,MAAM,CAAqB,iBAwCrD"}
+{"version":3,"file":"fluidAnalyzeMessages.d.ts","sourceRoot":"","sources":["../src/fluidAnalyzeMessages.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA2EH,eAAO,MAAM,YAAY,QAAS,MAAM,KAAG,MAEU,CAAC;AAgZtD,wBAAsB,iBAAiB,CACtC,SAAS,KAAA,EAAE,+CAA+C;AAC1D,gBAAgB,EAAE,OAAO,EACzB,YAAY,EAAE,OAAO,EACrB,iBAAiB,GAAE,GAAG,CAAC,MAAM,CAAqB,iBA0ClD"}

package/dist/fluidAnalyzeMessages.js

@@ -3,16 +3,9 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-var __asyncValues = (this && this.__asyncValues) || function (o) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var m = o[Symbol.asyncIterator], i;
-    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
-    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
-    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.printMessageStats = exports.formatNumber = void 0;
-const common_utils_1 = require("@fluidframework/common-utils");
+const core_utils_1 = require("@fluidframework/core-utils");
 const protocol_definitions_1 = require("@fluidframework/protocol-definitions");
 const container_runtime_1 = require("@fluidframework/container-runtime");
 const datastore_1 = require("@fluidframework/datastore");
@@ -33,14 +26,14 @@ function incr(map, key, size, count = 1) {
  * Helper class to track session statistics
  */
 class ActiveSession {
+    static create(email, message) {
+        return new ActiveSession(email, message);
+    }
     constructor(email, startMessage) {
         this.email = email;
         this.startMessage = startMessage;
         this.opCount = 0;
     }
-    static create(email, message) {
-        return new ActiveSession(email, message);
-    }
     reportOp(timestamp) {
         this.opCount++;
     }
@@ -54,16 +47,16 @@ class ActiveSession {
     }
 }
 // Format a number separating 3 digits by comma
+const formatNumber = (num) => 
 // eslint-disable-next-line unicorn/no-unsafe-regex
-const formatNumber = (num) => num.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+num.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
 exports.formatNumber = formatNumber;
 function dumpStats(map, props) {
-    var _a;
     const fieldSizes = [10, 14];
     const nameLength = 72;
     const fieldsLength = fieldSizes[0] + fieldSizes[1] + 1;
     let headers = props.headers;
-    let recordsToShow = (_a = props.lines) !== null && _a !== void 0 ? _a : 10;
+    let recordsToShow = props.lines ?? 10;
     if (map.size !== recordsToShow && props.removeTotals === undefined && recordsToShow > 1) {
         recordsToShow--;
     }
@@ -116,11 +109,9 @@ function dumpStats(map, props) {
     }
     if (props.removeTotals === undefined) {
         if (allOtherCount || allOtherSize) {
-            // eslint-disable-next-line max-len
             console.log(`${`All Others (${sorted.length - recordsToShow})`.padEnd(nameLength)} │ ${(0, exports.formatNumber)(allOtherCount).padStart(fieldSizes[0])} ${(0, exports.formatNumber)(allOtherSize).padStart(fieldSizes[1])}`);
         }
         console.log(`${"─".repeat(nameLength + 1)}┼${"─".repeat(fieldsLength + 1)}`);
-        // eslint-disable-next-line max-len
         console.log(`${"Total".padEnd(nameLength)} │ ${(0, exports.formatNumber)(totalCount).padStart(fieldSizes[0])} ${(0, exports.formatNumber)(sizeTotal).padStart(fieldSizes[1])}`);
     }
 }
@@ -181,6 +172,7 @@ class DataStructureAnalyzer {
         this.dataType = new Map();
         this.dataTypeStats = new Map();
         this.objectStats = new Map();
+        // eslint-disable-next-line @typescript-eslint/member-delimiter-style
         this.chunkMap = new Map();
     }
     processOp(message, msgSize, skipMessage) {
@@ -231,7 +223,6 @@ class FilteredMessageAnalyzer {
     }
     reportAnalyzes(lastOp) {
         if (this.filtered) {
-            // eslint-disable-next-line max-len
             console.log(`\nData is filtered according to --filter:messageType argument(s):\nOp size: ${this.sizeFiltered} / ${this.sizeTotal}\nOp count ${this.opsFiltered} / ${this.opsTotal}`);
         }
         if (this.opsTotal === 0) {
@@ -256,7 +247,6 @@ class MessageDensityAnalyzer {
             if (message.sequenceNumber !== 1) {
                 const timeDiff = durationFromTime(message.timestamp - this.timeStart);
                 const opsString = `ops = [${this.opLimit - this.opChunk}, ${this.opLimit - 1}]`.padEnd(26);
-                // eslint-disable-next-line max-len
                 const timeString = `time = [${durationFromTime(this.timeStart - this.doctimerStart)}, ${durationFromTime(message.timestamp - this.doctimerStart)}]`;
                 this.ranges.set(`${opsString} ${timeString}`, [timeDiff, this.size]);
             }
@@ -328,7 +318,8 @@ class SummaryAnalyzer {
             this.lastSummaryOp = message.sequenceNumber;
         }
         if (message.type === protocol_definitions_1.MessageType.SummaryAck || message.type === protocol_definitions_1.MessageType.SummaryNack) {
-            const contents = message.contents.summaryProposal;
+            const contents = message.contents
+                .summaryProposal;
             const distance = message.sequenceNumber - contents.summarySequenceNumber;
             if (distance > this.maxResponse) {
                 this.maxResponse = distance;
@@ -362,12 +353,10 @@ class MessageDumper {
             console.log(JSON.stringify(message, undefined, 2));
         }
     }
-    reportAnalyzes(lastOp) {
-    }
+    reportAnalyzes(lastOp) { }
 }
 async function printMessageStats(generator, // AsyncGenerator<ISequencedDocumentMessage[]>,
 dumpMessageStats, dumpMessages, messageTypeFilter = new Set()) {
-    var e_1, _a;
     let lastMessage;
     const analyzers = [
         new FilteredMessageAnalyzer(),
@@ -380,26 +369,16 @@ dumpMessageStats, dumpMessages, messageTypeFilter = new Set()) {
     if (dumpMessages) {
         analyzers.push(new MessageDumper());
     }
-    try {
-        for (var generator_1 = __asyncValues(generator), generator_1_1; generator_1_1 = await generator_1.next(), !generator_1_1.done;) {
-            const messages = generator_1_1.value;
-            for (const message of messages) {
-                const msgSize = JSON.stringify(message).length;
-                lastMessage = message;
-                const skipMessage = messageTypeFilter.size !== 0 && !messageTypeFilter.has(message.type);
-                for (const analyzer of analyzers) {
-                    analyzer.processOp(message, msgSize, skipMessage);
-                }
+    for await (const messages of generator) {
+        for (const message of messages) {
+            const msgSize = JSON.stringify(message).length;
+            lastMessage = message;
+            const skipMessage = messageTypeFilter.size !== 0 && !messageTypeFilter.has(message.type);
+            for (const analyzer of analyzers) {
+                analyzer.processOp(message, msgSize, skipMessage);
             }
         }
     }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (generator_1_1 && !generator_1_1.done && (_a = generator_1.return)) await _a.call(generator_1);
-        }
-        finally { if (e_1) throw e_1.error; }
-    }
     if (lastMessage !== undefined) {
         if (dumpMessageStats) {
             for (const analyzer of analyzers) {
@@ -414,34 +393,41 @@ dumpMessageStats, dumpMessages, messageTypeFilter = new Set()) {
     console.log("");
 }
 exports.printMessageStats = printMessageStats;
-function processOp(message, dataType, objectStats, msgSize, dataTypeStats, messageTypeStats, chunkMap) {
-    let type = message.type;
+function processOp(runtimeMessage, dataType, objectStats, msgSize, dataTypeStats, messageTypeStats, chunkMap) {
+    let type = runtimeMessage.type;
     let recorded = false;
     let totalMsgSize = msgSize;
     let opCount = 1;
-    if ((0, container_runtime_1.isRuntimeMessage)(message)) {
-        let runtimeMessage = (0, container_runtime_1.unpackRuntimeMessage)(message);
+    if ((0, container_runtime_1.unpackRuntimeMessage)(runtimeMessage)) {
         const messageType = runtimeMessage.type;
         switch (messageType) {
-            case container_runtime_1.RuntimeMessage.Attach: {
+            case container_runtime_1.ContainerMessageType.Attach: {
                 const attachMessage = runtimeMessage.contents;
                 processDataStoreAttachOp(attachMessage, dataType);
                 break;
             }
             // skip for now because these ops do not have contents
-            case container_runtime_1.RuntimeMessage.BlobAttach: {
+            case container_runtime_1.ContainerMessageType.BlobAttach: {
+                break;
+            }
+            // The default method to count stats should be used for GC messages.
+            case container_runtime_1.ContainerMessageType.GC: {
                 break;
             }
-            case container_runtime_1.RuntimeMessage.ChunkedOp: {
+            case container_runtime_1.ContainerMessageType.ChunkedOp: {
                 const chunk = runtimeMessage.contents;
+                // TODO: Verify whether this should be able to handle server-generated ops (with null clientId)
+                // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
                 if (!chunkMap.has(runtimeMessage.clientId)) {
+                    // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
                     chunkMap.set(runtimeMessage.clientId, {
                         chunks: new Array(chunk.totalChunks),
                         totalSize: 0,
                     });
                 }
+                // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
                 const value = chunkMap.get(runtimeMessage.clientId);
-                (0, common_utils_1.assert)(value !== undefined, 0x2b8 /* "Chunk should be set in map" */);
+                (0, core_utils_1.assert)(value !== undefined, 0x2b8 /* "Chunk should be set in map" */);
                 const chunks = value.chunks;
                 const chunkIndex = chunk.chunkId - 1;
                 if (chunks[chunkIndex] !== undefined) {
@@ -451,78 +437,77 @@ function processOp(message, dataType, objectStats, msgSize, dataTypeStats, messa
                 value.totalSize += msgSize;
                 if (chunk.chunkId === chunk.totalChunks) {
                     opCount = chunk.totalChunks; // 1 op for each chunk.
-                    runtimeMessage = Object.create(runtimeMessage);
-                    runtimeMessage.contents = chunks.join("");
-                    runtimeMessage.type = chunk.originalType;
+                    const patchedMessage = Object.create(runtimeMessage);
+                    patchedMessage.contents = chunks.join("");
+                    patchedMessage.type = chunk.originalType;
                     type = chunk.originalType;
                     totalMsgSize = value.totalSize;
-                    chunkMap.delete(runtimeMessage.clientId);
+                    chunkMap.delete(patchedMessage.clientId);
                 }
                 else {
                     return;
                 }
                 // eslint-disable-next-line no-fallthrough
             }
-            case container_runtime_1.RuntimeMessage.FluidDataStoreOp:
-            case container_runtime_1.RuntimeMessage.Alias:
-            case container_runtime_1.RuntimeMessage.Rejoin:
-            case container_runtime_1.RuntimeMessage.Operation:
-                {
-                    let envelope = runtimeMessage.contents;
-                    // TODO: Legacy?
-                    if (envelope !== undefined && typeof envelope === "string") {
-                        envelope = JSON.parse(envelope);
+            case container_runtime_1.ContainerMessageType.IdAllocation:
+            case container_runtime_1.ContainerMessageType.FluidDataStoreOp:
+            case container_runtime_1.ContainerMessageType.Alias:
+            case container_runtime_1.ContainerMessageType.Rejoin: {
+                let envelope = runtimeMessage.contents;
+                // TODO: Legacy?
+                if (envelope !== undefined && typeof envelope === "string") {
+                    envelope = JSON.parse(envelope);
+                }
+                const innerContent = envelope.contents;
+                const address = envelope.address;
+                type = `${type}/${innerContent.type}`;
+                switch (innerContent.type) {
+                    case datastore_1.DataStoreMessageType.Attach: {
+                        const attachMessage = innerContent.content;
+                        let objectType = attachMessage.type;
+                        if (objectType.startsWith(objectTypePrefix)) {
+                            objectType = objectType.substring(objectTypePrefix.length);
+                        }
+                        dataType.set(getObjectId(address, attachMessage.id), objectType);
+                        break;
                     }
-                    const innerContent = envelope.contents;
-                    const address = envelope.address;
-                    type = `${type}/${innerContent.type}`;
-                    switch (innerContent.type) {
-                        case datastore_1.DataStoreMessageType.Attach: {
-                            const attachMessage = innerContent.content;
-                            let objectType = attachMessage.type;
-                            if (objectType.startsWith(objectTypePrefix)) {
-                                objectType = objectType.substring(objectTypePrefix.length);
-                            }
-                            dataType.set(getObjectId(address, attachMessage.id), objectType);
-                            break;
+                    case datastore_1.DataStoreMessageType.ChannelOp:
+                    default: {
+                        const innerEnvelope = innerContent.content;
+                        const innerContent2 = innerEnvelope.contents;
+                        const objectId = getObjectId(address, innerEnvelope.address);
+                        incr(objectStats, objectId, totalMsgSize, opCount);
+                        let objectType = dataType.get(objectId);
+                        if (objectType === undefined) {
+                            // Somehow we do not have data...
+                            dataType.set(objectId, objectId);
+                            objectType = objectId;
                         }
-                        case datastore_1.DataStoreMessageType.ChannelOp:
-                        default: {
-                            const innerEnvelope = innerContent.content;
-                            const innerContent2 = innerEnvelope.contents;
-                            const objectId = getObjectId(address, innerEnvelope.address);
-                            incr(objectStats, objectId, totalMsgSize, opCount);
-                            let objectType = dataType.get(objectId);
-                            if (objectType === undefined) {
-                                // Somehow we do not have data...
-                                dataType.set(objectId, objectId);
-                                objectType = objectId;
-                            }
-                            incr(dataTypeStats, objectType, totalMsgSize, opCount);
-                            recorded = true;
-                            let subType = innerContent2.type;
-                            if (innerContent2.type === "set" &&
-                                typeof innerContent2.value === "object" &&
-                                innerContent2.value !== null) {
-                                type = `${type}/${subType}`;
-                                subType = innerContent2.value.type;
-                            }
-                            else if (objectType === "mergeTree" && subType !== undefined) {
-                                const types = ["insert", "remove", "annotate", "group"];
-                                if (types[subType] !== undefined) {
-                                    subType = types[subType];
-                                }
-                            }
-                            if (subType !== undefined) {
-                                type = `${type}/${subType}`;
+                        incr(dataTypeStats, objectType, totalMsgSize, opCount);
+                        recorded = true;
+                        let subType = innerContent2.type;
+                        if (innerContent2.type === "set" &&
+                            typeof innerContent2.value === "object" &&
+                            innerContent2.value !== null) {
+                            type = `${type}/${subType}`;
+                            subType = innerContent2.value.type;
+                        }
+                        else if (objectType === "mergeTree" && subType !== undefined) {
+                            const types = ["insert", "remove", "annotate", "group"];
+                            if (types[subType] !== undefined) {
+                                subType = types[subType];
                             }
-                            type = `${type} (${objectType})`;
                         }
+                        if (subType !== undefined) {
+                            type = `${type}/${subType}`;
+                        }
+                        type = `${type} (${objectType})`;
                     }
-                    break;
                 }
+                break;
+            }
             default:
-                (0, common_utils_1.unreachableCase)(messageType, "Message type not recognized!");
+                (0, core_utils_1.unreachableCase)(messageType, "Message type not recognized!");
         }
     }
     incr(messageTypeStats, type, totalMsgSize, opCount);
@@ -541,13 +526,7 @@ function processDataStoreAttachOp(attachMessage, dataType) {
     // dataType.set(getObjectId(attachMessage.id), attachMessage.type);
     // That's data store, and it brings a bunch of data structures.
     // Let's try to crack it.
-    let parsedAttachMessage;
-    if (typeof attachMessage === "string") {
-        parsedAttachMessage = JSON.parse(attachMessage);
-    }
-    else {
-        parsedAttachMessage = attachMessage;
-    }
+    const parsedAttachMessage = typeof attachMessage === "string" ? JSON.parse(attachMessage) : attachMessage;
     for (const entry of parsedAttachMessage.snapshot.entries) {
         if (entry.type === protocol_definitions_1.TreeEntry.Tree) {
             for (const entry2 of entry.value.entries) {
@@ -569,12 +548,18 @@ function reportOpenSessions(lastOpTimestamp, sessionsInProgress, sessions, users
         const sessionInfo = ses.leave(lastOpTimestamp);
         if (clientId !== noClientName) {
             const sessionName = `${clientId} (${sessionInfo.email})`;
-            const sessionPayload = [durationFromTime(sessionInfo.duration), sessionInfo.opCount];
+            const sessionPayload = [
+                durationFromTime(sessionInfo.duration),
+                sessionInfo.opCount,
+            ];
             sessions.set(sessionName, sessionPayload);
             activeSessions.set(sessionName, sessionPayload);
         }
         else {
-            sessions.set(`Full file lifespan (noClient messages)`, [durationFromTime(sessionInfo.duration), sessionInfo.opCount]);
+            sessions.set(`Full file lifespan (noClient messages)`, [
+                durationFromTime(sessionInfo.duration),
+                sessionInfo.opCount,
+            ]);
         }
         incr(users, sessionInfo.email, sessionInfo.opCount);
     }
@@ -616,23 +601,28 @@ function processQuorumMessages(message, skipMessage, sessionsInProgress, session
         const clientId = JSON.parse(dataString);
         session = sessionsInProgress.get(clientId);
         sessionsInProgress.delete(clientId);
-        (0, common_utils_1.assert)(!!session, 0x1b7 /* "Bad session state for processing quorum messages" */);
+        (0, core_utils_1.assert)(!!session, 0x1b7 /* "Bad session state for processing quorum messages" */);
         if (session !== undefined) {
             if (!skipMessage) {
                 session.reportOp(message.timestamp);
             }
             const sessionInfo = session.leave(message.timestamp);
-            sessions.set(`${clientId} (${sessionInfo.email})`, [durationFromTime(sessionInfo.duration), sessionInfo.opCount]);
+            sessions.set(`${clientId} (${sessionInfo.email})`, [
+                durationFromTime(sessionInfo.duration),
+                sessionInfo.opCount,
+            ]);
             incr(users, sessionInfo.email, sessionInfo.opCount);
             session = undefined; // Do not record it second time
         }
     }
     else {
         // message.clientId can be null
+        // TODO: Verify whether this should be able to handle server-generated ops (with null clientId)
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
         session = sessionsInProgress.get(message.clientId);
         if (session === undefined) {
             session = sessionsInProgress.get(noClientName);
-            (0, common_utils_1.assert)(!!session, 0x1b8 /* "Bad session state for processing quorum messages" */);
+            (0, core_utils_1.assert)(!!session, 0x1b8 /* "Bad session state for processing quorum messages" */);
         }
     }
     return session;