@fedify/fedify 1.6.1-pr.242.857 → 1.6.1-pr.242.860

package/dist/x/cfworkers.js

@@ -19,12 +19,16 @@ var WorkersKvStore = class {
 	}
 	async get(key) {
 		const encodedKey = this.#encodeKey(key);
-		const value = await this.#namespace.get(encodedKey);
-		return value == null ? void 0 : JSON.parse(value);
+		const { value, metadata } = await this.#namespace.getWithMetadata(encodedKey, "json");
+		return metadata == null || metadata.expires < Date.now() ? void 0 : value;
 	}
 	async set(key, value, options) {
 		const encodedKey = this.#encodeKey(key);
-		await this.#namespace.put(encodedKey, JSON.stringify(value), options?.ttl == null ? {} : { expirationTtl: Math.max(options.ttl.total("seconds"), 60) });
+		const metadata = options?.ttl == null ? {} : { expires: Date.now() + options.ttl.total("milliseconds") };
+		await this.#namespace.put(encodedKey, JSON.stringify(value), options?.ttl == null ? { metadata } : {
+			expirationTtl: Math.max(options.ttl.total("seconds"), 60),
+			metadata
+		});
 	}
 	delete(key) {
 		return this.#namespace.delete(this.#encodeKey(key));

package/dist/x/cfworkers.test.d.ts

@@ -0,0 +1,2 @@
+import { Temporal } from "@js-temporal/polyfill";
+import { URLPattern } from "urlpattern-polyfill";

package/dist/x/cfworkers.test.js

@@ -0,0 +1,36 @@
+
+      import { Temporal } from "@js-temporal/polyfill";
+      import { URLPattern } from "urlpattern-polyfill";
+    
+import { assertEquals } from "../node_modules/.pnpm/@jsr_std__assert@0.226.0/node_modules/@jsr/std__assert/assert_equals.js";
+import { test } from "../testing/mod.js";
+import { WorkersKvStore } from "./cfworkers.js";
+
+//#region x/cfworkers.test.ts
+test({
+	name: "WorkersKvStore",
+	ignore: !("navigator" in globalThis && navigator.userAgent === "Cloudflare-Workers"),
+	async fn(t) {
+		const { env } = t;
+		const store = new WorkersKvStore(env.KV1);
+		await t.step("set() & get()", async () => {
+			await store.set(["foo", "bar"], {
+				foo: 1,
+				bar: 2
+			});
+			assertEquals(await store.get(["foo", "bar"]), {
+				foo: 1,
+				bar: 2
+			});
+			assertEquals(await store.get(["foo"]), void 0);
+			await store.set(["foo", "baz"], "baz", { ttl: Temporal.Duration.from({ seconds: 0 }) });
+			assertEquals(await store.get(["foo", "baz"]), void 0);
+		});
+		await t.step("delete()", async () => {
+			await store.delete(["foo", "bar"]);
+			assertEquals(await store.get(["foo", "bar"]), void 0);
+		});
+	}
+});
+
+//#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/fedify",
-  "version": "1.6.1-pr.242.857+3b03b99a",
+  "version": "1.6.1-pr.242.860+9674ec22",
   "description": "An ActivityPub server framework",
   "keywords": [
     "ActivityPub",