effect-cf 0.13.0 → 0.13.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # effect-cf
 
+## 0.13.1
+
+### Patch Changes
+
+- [#41](https://github.com/danieljvdm/effect-cf/pull/41) [`6e1ddc9`](https://github.com/danieljvdm/effect-cf/commit/6e1ddc9e246ee966dee7a66eae38739241d23816) Thanks [@danieljvdm](https://github.com/danieljvdm)! - Provide an epoch-based Effect clock in Worker and Durable Object runtimes so OTLP
+  span and log timestamps are valid under Cloudflare workerd.
+
 ## 0.13.0
 
 ### Minor Changes

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { t as __exportAll } from "./chunk-CfYAbeIz.mjs";
-import { a as WorkerConfig, i as layer$10, n as Binding_exports, o as WorkerEnvironment, r as Service$2, t as Hyperdrive_exports } from "./Hyperdrive-89hg_Fck.mjs";
+import { a as WorkerConfig, i as layer$11, n as Binding_exports, o as WorkerEnvironment, r as Service$2, t as Hyperdrive_exports } from "./Hyperdrive-89hg_Fck.mjs";
 import { Cause, Clock, Config, ConfigProvider, Context, Data, DateTime, Duration, Effect, Exit, Layer, ManagedRuntime, Option, Queue, Schema } from "effect";
 import { FetchHttpClient, HttpServerRequest, HttpServerResponse } from "effect/unstable/http";
 import { Otlp, OtlpLogger, OtlpMetrics, OtlpSerialization, OtlpTracer } from "effect/unstable/observability";
@@ -302,7 +302,7 @@ const runPromiseExitPreservingTypedFailures = async (effect) => {
 var CloudflareOtlp_exports = /* @__PURE__ */ __exportAll({
 	CloudflareOtlpSettings: () => CloudflareOtlpSettings,
 	durableObjectLayer: () => durableObjectLayer,
-	layer: () => layer$9,
+	layer: () => layer$10,
 	layerJson: () => layerJson,
 	layerProtobuf: () => layerProtobuf,
 	settingsConfig: () => settingsConfig,
@@ -537,14 +537,14 @@ const makeLayer = (options = {}, runtimeAttributes = {}) => makeLayerFromSetting
 * specific endpoints are used as-is, matching the OpenTelemetry OTLP exporter
 * convention.
 */
-const layer$9 = (options = {}) => makeLayer(options);
+const layer$10 = (options = {}) => makeLayer(options);
 /** Base OTLP telemetry layer forced to JSON serialization. */
-const layerJson = (options = {}) => layer$9({
+const layerJson = (options = {}) => layer$10({
 	...options,
 	serialization: "json"
 });
 /** Base OTLP telemetry layer forced to protobuf serialization. */
-const layerProtobuf = (options = {}) => layer$9({
+const layerProtobuf = (options = {}) => layer$10({
 	...options,
 	serialization: "protobuf"
 });
@@ -622,7 +622,7 @@ const Service$1 = () => (id, definition) => {
 var QueueBinding_exports = /* @__PURE__ */ __exportAll({
 	QueueOperationError: () => QueueOperationError,
 	isQueue: () => isQueue,
-	layer: () => layer$8,
+	layer: () => layer$9,
 	makeClient: () => makeClient$6
 });
 const expectedQueueProducer = "Queue producer binding with send(); optional sendBatch()/metrics()";
@@ -678,7 +678,7 @@ const makeClient$6 = (definition) => {
 		unsafeRaw: Effect.succeed(queue)
 	});
 };
-const layer$8 = (tag, definition) => layer$10(tag, definition.binding, (value) => isQueue(value), makeClient$6(definition), { expected: expectedQueueProducer });
+const layer$9 = (tag, definition) => layer$11(tag, definition.binding, (value) => isQueue(value), makeClient$6(definition), { expected: expectedQueueProducer });
 //#endregion
 //#region src/QueueDefinition.ts
 var QueueDefinition_exports = /* @__PURE__ */ __exportAll({
@@ -701,7 +701,7 @@ const make$9 = (id, definition) => Tag$10()(id, definition);
 const Tag$10 = () => (id, definition) => {
 	const queueDefinition = makeDefinition$4(id, definition);
 	const tag = Context.Service()(id);
-	const layer = (binding) => layer$8(tag, {
+	const layer = (binding) => layer$9(tag, {
 		...binding,
 		message: definition.message
 	});
@@ -957,7 +957,7 @@ var ServiceBinding_exports = /* @__PURE__ */ __exportAll({
 	ServiceBindingFetchError: () => ServiceBindingFetchError,
 	ServiceBindingRpcError: () => ServiceBindingRpcError,
 	isServiceBindingClient: () => isServiceBindingClient,
-	layer: () => layer$7,
+	layer: () => layer$8,
 	makeClient: () => makeClient$5,
 	makeDirectMethods: () => makeDirectMethods$1
 });
@@ -1021,7 +1021,7 @@ const makeClient$5 = (definition) => {
 		});
 	};
 };
-const layer$7 = (tag, definition) => layer$10(tag, definition.binding, (value) => isServiceBindingClient(value), makeClient$5(definition), { expected: expectedServiceBinding });
+const layer$8 = (tag, definition) => layer$11(tag, definition.binding, (value) => isServiceBindingClient(value), makeClient$5(definition), { expected: expectedServiceBinding });
 /**
 * Creates a typed Effect service for a Worker service binding.
 *
@@ -1138,7 +1138,7 @@ const Tag$8 = () => (id, methods) => {
 		...binding,
 		definition
 	});
-	const layer = (binding) => layer$7(tag, bindingDefinition(binding));
+	const layer = (binding) => layer$8(tag, bindingDefinition(binding));
 	const fetch = (input, init) => Effect.gen(function* () {
 		return yield* (yield* tag).fetch(input, init);
 	});
@@ -1179,6 +1179,26 @@ const wrapHandlers$1 = (definition, handlers) => {
 */
 const implement$5 = (_definition, handlers) => handlers;
 //#endregion
+//#region src/internal/Clock.ts
+const maxTimerMillis = 2 ** 31 - 1;
+const nanosPerMilli = BigInt(1e6);
+const clock = {
+	currentTimeMillisUnsafe: () => Date.now(),
+	currentTimeMillis: Effect.sync(() => clock.currentTimeMillisUnsafe()),
+	currentTimeNanosUnsafe: () => BigInt(Date.now()) * nanosPerMilli,
+	currentTimeNanos: Effect.sync(() => clock.currentTimeNanosUnsafe()),
+	sleep: (duration) => {
+		const millis = Duration.toMillis(duration);
+		if (millis <= 0) return Effect.yieldNow;
+		return Effect.callback((resume) => {
+			if (millis > maxTimerMillis) return;
+			const handle = setTimeout(() => resume(Effect.void), millis);
+			return Effect.sync(() => clearTimeout(handle));
+		});
+	}
+};
+const layer$7 = Layer.effect(Clock.Clock, Effect.succeed(clock));
+//#endregion
 //#region src/internal/Entrypoint.ts
 const provideEntrypointServices = (layer, services) => layer.pipe(Layer.provideMerge(services));
 const defineEntrypointRpcMethods = (target, prototype, rpc, reservedMethodNames, run) => {
@@ -1259,7 +1279,7 @@ function make$6(layer, optionsOrFetch) {
 		constructor(ctx, env) {
 			super(ctx, env);
 			let runWaitUntilEffect = () => Promise.reject(/* @__PURE__ */ new Error("WorkerContext runtime is not initialized"));
-			const runtimeLayer = provideEntrypointServices(layer, Layer.mergeAll(Layer.succeed(ExecutionContext, ctx), ConfigProvider.layer(Effect.succeed(WorkerConfig.providerFromEnv(env))), Layer.succeed(WorkerContext, fromExecutionContext(ctx, (effect) => runWaitUntilEffect(effect))), Layer.succeed(WorkerEnvironment, env)));
+			const runtimeLayer = provideEntrypointServices(layer, Layer.mergeAll(layer$7, Layer.succeed(ExecutionContext, ctx), ConfigProvider.layer(Effect.succeed(WorkerConfig.providerFromEnv(env))), Layer.succeed(WorkerContext, fromExecutionContext(ctx, (effect) => runWaitUntilEffect(effect))), Layer.succeed(WorkerEnvironment, env)));
 			this.runtime = ManagedRuntime.make(runtimeLayer);
 			runWaitUntilEffect = (effect) => this.runtime.runPromiseExit(effect);
 		}
@@ -1378,7 +1398,7 @@ const makeClient$4 = (definition) => {
 		});
 	};
 };
-const layer$6 = (tag, definition) => layer$10(tag, definition.binding, (value) => isDurableObjectNamespaceClient(value), makeClient$4(definition), { expected: expectedDurableObjectNamespace });
+const layer$6 = (tag, definition) => layer$11(tag, definition.binding, (value) => isDurableObjectNamespaceClient(value), makeClient$4(definition), { expected: expectedDurableObjectNamespace });
 const makeDirectMethods = (rpcDefinition, helpers) => {
 	const methods = {};
 	if (rpcDefinition !== void 0) {
@@ -1549,7 +1569,7 @@ const make$4 = (layer, options = {}) => {
 		runtime;
 		constructor(state, env) {
 			super(state, env);
-			const runtimeLayer = provideEntrypointServices(layer, Layer.mergeAll(Layer.succeed(DurableObjectState, fromDurableObjectState(state)), Layer.succeed(WorkerEnvironment, env)));
+			const runtimeLayer = provideEntrypointServices(layer, Layer.mergeAll(layer$7, Layer.succeed(DurableObjectState, fromDurableObjectState(state)), Layer.succeed(WorkerEnvironment, env)));
 			this.runtime = ManagedRuntime.make(runtimeLayer);
 			const initialize = options.initialize;
 			if (initialize !== void 0) state.waitUntil(this[RunSymbol](initialize, { eventLayer: false }));
@@ -2155,7 +2175,7 @@ const makeClient$3 = (definition) => (images) => {
 		unsafeRaw: Effect.succeed(images)
 	};
 };
-const layer$3 = (tag, definition) => layer$10(tag, definition.binding, isImagesBinding, makeClient$3(definition), { expected: expectedImagesBinding });
+const layer$3 = (tag, definition) => layer$11(tag, definition.binding, isImagesBinding, makeClient$3(definition), { expected: expectedImagesBinding });
 const make$3 = (id) => Tag$4()(id);
 const Tag$4 = () => (id) => {
 	const tag = Context.Service()(id);
@@ -2250,7 +2270,7 @@ const makeClient$2 = (definition) => {
 		unsafeRaw: Effect.succeed(kv)
 	});
 };
-const layer$2 = (tag, definition) => layer$10(tag, definition.binding, isKvNamespace, makeClient$2(definition), { expected: expectedKvNamespace });
+const layer$2 = (tag, definition) => layer$11(tag, definition.binding, isKvNamespace, makeClient$2(definition), { expected: expectedKvNamespace });
 const makeDefinition$1 = (id, definition) => {
 	const kvDefinition = {
 		id,
@@ -2367,7 +2387,7 @@ const makeClient$1 = (definition) => {
 		};
 	};
 };
-const layer$1 = (tag, definition) => layer$10(tag, definition.binding, isR2Bucket, makeClient$1(definition), { expected: expectedR2Bucket });
+const layer$1 = (tag, definition) => layer$11(tag, definition.binding, isR2Bucket, makeClient$1(definition), { expected: expectedR2Bucket });
 const make$2 = (id) => Tag$2()(id);
 const Tag$2 = () => (id) => {
 	const tag = Context.Service()(id);
@@ -2453,7 +2473,7 @@ const makeClient = (definition) => {
 		unsafeRaw: Effect.succeed(workflow)
 	});
 };
-const layer = (tag, definition) => layer$10(tag, definition.binding, (value) => isWorkflow(value), makeClient(definition), { expected: expectedWorkflow });
+const layer = (tag, definition) => layer$11(tag, definition.binding, (value) => isWorkflow(value), makeClient(definition), { expected: expectedWorkflow });
 //#endregion
 //#region src/WorkflowDefinition.ts
 var WorkflowDefinition_exports = /* @__PURE__ */ __exportAll({
@@ -2474,7 +2494,7 @@ const make$1 = (id, definition) => Tag$1()(id, definition);
 const Tag$1 = () => (id, definition) => {
 	const workflowDefinition = makeDefinition(id, definition);
 	const tag = Context.Service()(id);
-	const layer$11 = (binding) => layer(tag, {
+	const layer$12 = (binding) => layer(tag, {
 		...binding,
 		payload: definition.payload,
 		result: definition.result
@@ -2496,7 +2516,7 @@ const Tag$1 = () => (id, definition) => {
 		payload: workflowDefinition.payload,
 		result: workflowDefinition.result,
 		make: workflowDefinition.make,
-		layer: layer$11,
+		layer: layer$12,
 		create,
 		createBatch,
 		get,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "effect-cf",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "description": "Effect-native primitives for Cloudflare Workers and bindings.",
   "license": "MIT",
   "repository": {

package/src/DurableObject.ts

@@ -10,6 +10,7 @@ import type * as Binding from "./Binding";
 import * as DurableObjectDefinition from "./DurableObjectDefinition";
 import type * as DurableObjectNamespace from "./DurableObjectNamespace";
 import type * as Rpc from "./Rpc";
+import * as CloudflareClock from "./internal/Clock";
 import * as Entrypoint from "./internal/Entrypoint";
 
 const reservedMethodNames = new Set<string>([
@@ -161,6 +162,7 @@ export const make = <
       super(state, env);
 
       const services = Layer.mergeAll(
+        CloudflareClock.layer,
         Layer.succeed(DurableObjectState, fromDurableObjectState(state)),
         Layer.succeed(WorkerEnvironment, env),
       );

package/src/Worker.ts

@@ -10,6 +10,7 @@ import type * as Rpc from "./Rpc";
 import type * as RpcDefinition from "./RpcDefinition";
 import type * as ServiceBinding from "./ServiceBinding";
 import * as WorkerDefinition from "./WorkerDefinition";
+import * as CloudflareClock from "./internal/Clock";
 import * as Entrypoint from "./internal/Entrypoint";
 import { fromExecutionContext, type RunWaitUntilEffect } from "./internal/WorkerContext";
 
@@ -241,6 +242,7 @@ export function make<
         Promise.reject(new Error("WorkerContext runtime is not initialized"));
 
       const services = Layer.mergeAll(
+        CloudflareClock.layer,
         Layer.succeed(ExecutionContext, ctx),
         ConfigProvider.layer(Effect.succeed(WorkerConfig.providerFromEnv(env))),
         Layer.succeed(

package/src/internal/Clock.ts

@@ -0,0 +1,28 @@
+import { Clock, Duration, Effect, Layer } from "effect";
+
+const maxTimerMillis = 2 ** 31 - 1;
+const nanosPerMilli = BigInt(1_000_000);
+
+export const clock: Clock.Clock = {
+  currentTimeMillisUnsafe: () => Date.now(),
+  currentTimeMillis: Effect.sync(() => clock.currentTimeMillisUnsafe()),
+  currentTimeNanosUnsafe: () => BigInt(Date.now()) * nanosPerMilli,
+  currentTimeNanos: Effect.sync(() => clock.currentTimeNanosUnsafe()),
+  sleep: (duration) => {
+    const millis = Duration.toMillis(duration);
+    if (millis <= 0) {
+      return Effect.yieldNow;
+    }
+
+    return Effect.callback<void>((resume) => {
+      if (millis > maxTimerMillis) {
+        return;
+      }
+
+      const handle = setTimeout(() => resume(Effect.void), millis);
+      return Effect.sync(() => clearTimeout(handle));
+    });
+  },
+};
+
+export const layer = Layer.effect(Clock.Clock, Effect.succeed(clock));