Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/durabletask-js/src/client/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1205,7 +1205,7 @@ export class TaskHubGrpcClient {
const instanceIdStr = protoMetadata.getInstanceid();
const entityId = EntityInstanceId.fromString(instanceIdStr);

const lastModifiedTime = protoMetadata.getLastmodifiedtime()?.toDate() ?? new Date();
const lastModifiedTime = protoMetadata.getLastmodifiedtime()?.toDate() ?? new Date(0);
const backlogQueueSize = protoMetadata.getBacklogqueuesize();
const lockedBy = protoMetadata.getLockedby()?.getValue();
const serializedState = protoMetadata.getSerializedstate()?.getValue();
Expand Down
44 changes: 44 additions & 0 deletions packages/durabletask-js/test/entity-client.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,21 @@

import { EntityInstanceId } from "../src/entities/entity-instance-id";
import { EntityQuery } from "../src/entities/entity-query";
import { EntityMetadata } from "../src/entities/entity-metadata";
import { TaskHubGrpcClient } from "../src/client/client";
import * as pb from "../src/proto/orchestrator_service_pb";
import { Timestamp } from "google-protobuf/google/protobuf/timestamp_pb";
import { StringValue, Int32Value } from "google-protobuf/google/protobuf/wrappers_pb";

type EntityMetadataConverter = {
convertEntityMetadata<T>(protoMetadata: pb.EntityMetadata, includeState: boolean): EntityMetadata<T>;
};

function convertEntityMetadata<T>(metadata: pb.EntityMetadata, includeState = false): EntityMetadata<T> {
const client = new TaskHubGrpcClient({ hostAddress: "localhost:4001" });
return (client as unknown as EntityMetadataConverter).convertEntityMetadata<T>(metadata, includeState);
}

// Note: These are unit tests for the entity client methods.
// They test the proto request/response conversion logic.
// Integration tests with actual gRPC calls are in e2e tests.
Expand Down Expand Up @@ -287,6 +298,39 @@ describe("Entity Client Proto Conversion", () => {
expect(metadata.getSerializedstate()).toBeUndefined();
});

it("should default lastModifiedTime to epoch when missing from proto", () => {
// Arrange - proto metadata without lastModifiedTime set
const metadata = new pb.EntityMetadata();
metadata.setInstanceid("@counter@test");
metadata.setBacklogqueuesize(0);
// No lastModifiedTime set

// Act
const result = convertEntityMetadata(metadata);

// Assert - should default to epoch (not current time) for consistency
// with OrchestrationState's createdAt/lastUpdatedAt defaults
expect(result.lastModifiedTime.getTime()).toBe(0);
});

it("should use actual timestamp when lastModifiedTime is present in proto", () => {
// Arrange
const metadata = new pb.EntityMetadata();
metadata.setInstanceid("@counter@test");
metadata.setBacklogqueuesize(0);

const expectedDate = new Date("2026-03-15T10:30:00Z");
const ts = new Timestamp();
ts.fromDate(expectedDate);
metadata.setLastmodifiedtime(ts);

// Act
const result = convertEntityMetadata(metadata);

// Assert - should use the actual timestamp
expect(result.lastModifiedTime.toISOString()).toBe(expectedDate.toISOString());
});

it("should gracefully handle invalid JSON in serialized state", () => {
// Arrange - simulate what convertEntityMetadata does
const metadata = new pb.EntityMetadata();
Expand Down
Loading