@fluidframework/id-compressor 3.3.0 → 3.5.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @fluidframework/id-compressor
 
+## 3.5.0
+
+Dependency updates only.
+
+## 3.4.0
+
+Dependency updates only.
+
 ## 3.3.0
 
 ### Minor Changes

package/dist/idCompressor.d.ts

@@ -2,11 +2,11 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import type { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
+import type { ITelemetryBaseLogger, Listenable } from "@fluidframework/core-interfaces";
 import type { TelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
 import type { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/legacy";
 import { Sessions } from "./sessions.js";
-import type { IIdCompressor, IIdCompressorCore, IdCreationRange, OpSpaceCompressedId, SerializedIdCompressorWithNoSession, SerializedIdCompressorWithOngoingSession, SessionId, SessionSpaceCompressedId, StableId, ShardSynchronizationToken } from "./types/index.js";
+import type { IIdCompressor, IIdCompressorCore, IdCreationRange, OpSpaceCompressedId, SerializedIdCompressorWithNoSession, SerializedIdCompressorWithOngoingSession, SessionId, SessionSpaceCompressedId, StableId, ShardSynchronizationToken, SerializedIdCompressorShard, ParentShardSynchronizationToken, IdCompressorEvents } from "./types/index.js";
 import { SerializationVersion } from "./types/index.js";
 /**
  * See {@link IIdCompressor} and {@link IIdCompressorCore}
@@ -19,6 +19,8 @@ export declare class IdCompressor implements IIdCompressor, IIdCompressorCore {
      * This number also determines what features are available (e.g. sharding support starts at V3).
      */
     private readonly writeVersion;
+    private readonly eventEmitter;
+    readonly events: Listenable<IdCompressorEvents>;
     /**
      * Max allowed initial cluster size.
      */
@@ -68,26 +70,17 @@ export declare class IdCompressor implements IIdCompressor, IIdCompressorCore {
      * @param ghostSessionId - The session ID to start the ghost session with.
      */
     startGhostSession(ghostSessionId: SessionId): void;
-    /**
-     * {@inheritdoc IIdCompressorCore.beginGhostSession}
-     */
     beginGhostSession(ghostSessionId: SessionId, ghostSessionCallback: () => void): void;
-    /**
-     * {@inheritdoc IIdCompressorCore.shard}
-     */
-    shard(newShardCount: number): SerializedIdCompressorWithOngoingSession[];
-    /**
-     * {@inheritdoc IIdCompressorCore.synchronizeWithShard}
-     */
+    shard(newShardCount: number): SerializedIdCompressorShard[];
     synchronizeWithShard(syncToken: ShardSynchronizationToken): void;
-    private synchronizeChild;
+    getChildShardSyncToken(childToken: ShardSynchronizationToken): ParentShardSynchronizationToken;
+    synchronizeWithParent(token: ParentShardSynchronizationToken): void;
     /**
-     * {@inheritdoc IIdCompressorCore.dispose}
+     * Adds IDs through the next position in this shard's stride after the given generation count.
      */
+    private backfillToNextStridePosition;
+    private synchronizeChild;
     disposeShard(): ShardSynchronizationToken | undefined;
-    /**
-     * {@inheritdoc IIdCompressorCore.getShardSyncToken}
-     */
     getShardSyncToken(): ShardSynchronizationToken | undefined;
     /**
      * Builds a token describing this shard's current progress.

package/dist/idCompressor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"idCompressor.d.ts","sourceRoot":"","sources":["../src/idCompressor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"idCompressor.d.ts","sourceRoot":"","sources":["../src/idCompressor.ts"],"names":[],"mappings":"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"}

package/dist/idCompressor.js

@@ -26,12 +26,25 @@ function rangeFinalizationError(expectedStart, actualStart) {
     });
 }
 const MAX_STRIDE_LENGTH = 1000000;
+/**
+ * Validates the generation count in a shard synchronization token.
+ *
+ * @param localGenCount - The number of positions filled, including backfilled positions.
+ * @throws {@link TypeError} if the count is not a nonnegative safe integer.
+ */
+function validateShardGenerationCount(localGenCount) {
+    if (!Number.isSafeInteger(localGenCount) || localGenCount < 0) {
+        throw new TypeError("Invalid shard synchronization token generation count.");
+    }
+}
 /**
  * See {@link IIdCompressor} and {@link IIdCompressorCore}
  */
 class IdCompressor {
     logger;
     writeVersion;
+    eventEmitter = (0, client_utils_1.createEmitter)();
+    events = this.eventEmitter;
     /**
      * Max allowed initial cluster size.
      */
@@ -159,9 +172,6 @@ class IdCompressor {
         (0, internal_1.assert)(!this.ongoingGhostSession, 0x8fe /* Ghost session already in progress. */);
         this.ongoingGhostSession = { ghostSessionId };
     }
-    /**
-     * {@inheritdoc IIdCompressorCore.beginGhostSession}
-     */
     beginGhostSession(ghostSessionId, ghostSessionCallback) {
         if (this.shardingState) {
             throw new Error("Cannot start a ghost session while sharded.");
@@ -174,9 +184,6 @@ class IdCompressor {
             this.ongoingGhostSession = undefined;
         }
     }
-    /**
-     * {@inheritdoc IIdCompressorCore.shard}
-     */
     shard(newShardCount) {
         if (!Number.isSafeInteger(newShardCount) || newShardCount <= 0) {
             throw new Error("Shard count must be a positive safe integer");
@@ -230,13 +237,13 @@ class IdCompressor {
                 activeChildIds: new Set(),
                 shardId: childShardId,
             };
-            shards.push(child.serialize(true));
+            shards.push({
+                serialized: child.serialize(true),
+                syncToken: child.makeShardToken(false),
+            });
         }
         return shards;
     }
-    /**
-     * {@inheritdoc IIdCompressorCore.synchronizeWithShard}
-     */
     synchronizeWithShard(syncToken) {
         const isNowLeaf = this.synchronizeChild(syncToken);
         // A disposal token additionally reclaims the child's ID space. If reclaiming the last child
@@ -248,6 +255,47 @@ class IdCompressor {
             }
         }
     }
+    getChildShardSyncToken(childToken) {
+        if (!this.shardingState?.activeChildIds.has(childToken.shardId)) {
+            throw new Error("Cannot get a synchronization token for an inactive child shard.");
+        }
+        const token = {
+            type: "parentIdSpaceShardSyncToken",
+            shardId: childToken.shardId,
+            localGenCount: this.localGenCount,
+        };
+        return token;
+    }
+    synchronizeWithParent(token) {
+        const state = this.shardingState;
+        if (token.type !== "parentIdSpaceShardSyncToken" ||
+            state?.shardId === undefined ||
+            state.shardId !== token.shardId) {
+            throw new Error("Invalid parent synchronization token for this child shard.");
+        }
+        validateShardGenerationCount(token.localGenCount);
+        if (token.localGenCount <= this.localGenCount) {
+            // A child can already be ahead through its own allocations. Its local range
+            // then includes the parent's IDs through this generation count.
+            return;
+        }
+        this.backfillToNextStridePosition(token.localGenCount, state.currentStride);
+    }
+    /**
+     * Adds IDs through the next position in this shard's stride after the given generation count.
+     */
+    backfillToNextStridePosition(targetGenCount, stride) {
+        if (targetGenCount <= this.localGenCount) {
+            return;
+        }
+        const count = Math.ceil((targetGenCount - this.localGenCount + 1) / stride) * stride;
+        const nextGenCount = this.localGenCount + count;
+        if (!Number.isSafeInteger(nextGenCount)) {
+            throw new TypeError("Shard progress exceeds the supported ID space.");
+        }
+        this.normalizer.addLocalRange(this.localGenCount + 1, count);
+        this.localGenCount = nextGenCount;
+    }
     synchronizeChild(syncToken) {
         const childDisposed = syncToken.disposed;
         if (this.writeVersion < index_js_1.SerializationVersion.V3) {
@@ -262,33 +310,20 @@ class IdCompressor {
         if (!activeChildIds.has(childShardId)) {
             throw new Error(`Cannot synchronize with child with ID ${childShardId}: not in active children set`);
         }
-        // Only disposal removes the child from the active set. A plain synchronization leaves the
-        // child active so it can continue generating IDs and be synchronized with again later.
+        validateShardGenerationCount(syncToken.localGenCount);
+        // A last-child disposal realigns on the original stride. Backfill before changing
+        // membership so invalid progress cannot accidentally reclaim the child.
+        const isLeaf = childDisposed && activeChildIds.size === 1;
+        this.backfillToNextStridePosition(syncToken.localGenCount, isLeaf ? originalStride : this.shardingState.currentStride);
+        // A plain synchronization leaves the child active so it can keep generating IDs.
         if (childDisposed) {
             activeChildIds.delete(childShardId);
-        }
-        const isLeaf = activeChildIds.size === 0;
-        if (isLeaf && childDisposed) {
-            this.shardingState.currentStride = originalStride;
-        }
-        // Read currentStride after the possible stride reset above, so that a leaf-making disposal
-        // realigns the parent on its original (reclaimed) stride rather than the wider sharded stride.
-        const { currentStride } = this.shardingState;
-        const childGenCount = syncToken.localGenCount;
-        // Realign parent to next position in its sequence if child is ahead
-        if (childGenCount > this.localGenCount) {
-            // Find next aligned position in parent's sequence after child's genCount
-            const distance = childGenCount - this.localGenCount + 1;
-            const steps = Math.ceil(distance / currentStride);
-            const count = steps * currentStride;
-            this.normalizer.addLocalRange(this.localGenCount + 1, count);
-            this.localGenCount += count;
+            if (isLeaf) {
+                this.shardingState.currentStride = originalStride;
+            }
         }
         return isLeaf;
     }
-    /**
-     * {@inheritdoc IIdCompressorCore.dispose}
-     */
     disposeShard() {
         if (this.shardingState === undefined) {
             return undefined;
@@ -305,9 +340,6 @@ class IdCompressor {
         makeCompressorUnusable(this);
         return token;
     }
-    /**
-     * {@inheritdoc IIdCompressorCore.getShardSyncToken}
-     */
     getShardSyncToken() {
         if (this.shardingState === undefined) {
             return undefined;
@@ -465,6 +497,7 @@ class IdCompressor {
             this.telemetryLocalIdCount = 0;
         }
         (0, internal_1.assert)(!session.isEmpty(), 0x757 /* Empty sessions should not be created. */);
+        this.eventEmitter.emit("rangeFinalized", range);
     }
     addEmptyCluster(session, capacity) {
         (0, internal_1.assert)(!this.ongoingGhostSession?.cluster, 0x8a8 /* IdCompressor should not be operated normally when in a ghost session */);