@fedify/fedify 0.8.0-dev.140 → 0.8.0-dev.144

package/CHANGES.md

@@ -36,6 +36,10 @@ To be released.
         parameter became `CollectionDispatcher<Recipient, TContextData, URL>`
         (was `CollectionDispatcher<Actor | URL, TContextData>`).
 
+ -  Removed the dependency on *@js-temporal/polyfill* on Deno, and Fedify now
+    requires `--unstable-temporal` flag.  On other runtime, it still depends
+    on *@js-temporal/polyfill*.
+
 [FEP-8fcf]: https://codeberg.org/fediverse/fep/src/branch/main/fep/8fcf/fep-8fcf.md
 
 

package/README.md

@@ -105,15 +105,20 @@ via the following command:
 deno add @fedify/fedify
 ~~~~
 
-~~~~ typescript
-import { Federation } from "@fedify/fedify";
+Since Fedify requires [`Temporal`] API, which is an unstable feature in Deno as
+of April 2024, you need to add the `"temporal"` to the `"unstable"` field of
+the *deno.json* file:
+
+~~~~ json
+{
+  "imports": {
+    "@fedify/fedify": "jsr:@fedify/fedify"
+  },
+  "unstable": ["temporal"]
+}
 ~~~~
 
-Or you can directly import it in your code using `jsr:` specifier:
-
-~~~~ typescript
-import { Federation } from "jsr:@fedify/fedify";
-~~~~
+[`Temporal`]: https://tc39.es/proposal-temporal/docs/
 
 ### Node.js
 
@@ -125,10 +130,6 @@ the following command:
 npm add @fedify/fedify
 ~~~~
 
-~~~~ typescript
-import { Federation } from "@fedify/fedify";
-~~~~
-
 ### Bun
 
 Fedify can also be used in Bun.  You can install it via the following
@@ -137,7 +138,3 @@ command:
 ~~~~ sh
 bun add @fedify/fedify
 ~~~~
-
-~~~~ typescript
-import { Federation } from "@fedify/fedify";
-~~~~

package/esm/_dnt.shims.js

@@ -4,10 +4,13 @@ import { crypto } from "@deno/shim-crypto";
 export { crypto } from "@deno/shim-crypto";
 import { URLPattern as URLPattern } from "urlpattern-polyfill";
 export { URLPattern as URLPattern } from "urlpattern-polyfill";
+import { Temporal as Temporal } from "@js-temporal/polyfill";
+export { Temporal as Temporal } from "@js-temporal/polyfill";
 const dntGlobals = {
     Deno,
     crypto,
     URLPattern,
+    Temporal,
 };
 export const dntGlobalThis = createMergeProxy(globalThis, dntGlobals);
 function createMergeProxy(baseObj, extObj) {

package/esm/federation/handler.js

@@ -1,4 +1,4 @@
-import { Temporal } from "@js-temporal/polyfill";
+import * as dntShim from "../_dnt.shims.js";
 import { getLogger } from "@logtape/logtape";
 import { accepts } from "../deps/jsr.io/@std/http/0.220.1/negotiation.js";
 import { doesActorOwnKey, verify } from "../httpsig/mod.js";
@@ -270,7 +270,7 @@ export async function handleInbox(request, { handle, context, kv, kvPrefix, acto
         });
     }
     if (cacheKey != null) {
-        await kv.set(cacheKey, true, { ttl: Temporal.Duration.from({ days: 1 }) });
+        await kv.set(cacheKey, true, { ttl: dntShim.Temporal.Duration.from({ days: 1 }) });
     }
     logger.info("Activity {activityId} has been processed.", { activityId: activity.id?.href, activity: json });
     return new Response("", {

package/esm/federation/kv.js

@@ -1,4 +1,9 @@
-import { Temporal } from "@js-temporal/polyfill";
+/**
+ * A key for a key-value store.  An array of one or more strings.
+ *
+ * @since 0.5.0
+ */
+import * as dntShim from "../_dnt.shims.js";
 /**
  * A key-value store that stores values in memory.
  * Do not use this in production as it does not persist values.
@@ -19,7 +24,7 @@ export class MemoryKvStore {
         if (entry == null)
             return Promise.resolve(undefined);
         const [value, expiration] = entry;
-        if (expiration != null && Temporal.Now.instant().until(expiration).sign < 0) {
+        if (expiration != null && dntShim.Temporal.Now.instant().until(expiration).sign < 0) {
             delete this.#values[encodedKey];
             return Promise.resolve(undefined);
         }
@@ -32,7 +37,7 @@ export class MemoryKvStore {
         const encodedKey = this.#encodeKey(key);
         const expiration = options?.ttl == null
             ? null
-            : Temporal.Now.instant().add(options.ttl.round({ largestUnit: "hour" }));
+            : dntShim.Temporal.Now.instant().add(options.ttl.round({ largestUnit: "hour" }));
         this.#values[encodedKey] = [value, expiration];
         return Promise.resolve();
     }

package/esm/federation/middleware.js

@@ -1,5 +1,4 @@
 import * as dntShim from "../_dnt.shims.js";
-import { Temporal } from "@js-temporal/polyfill";
 import { getLogger } from "@logtape/logtape";
 import { exportJwk, importJwk, validateCryptoKey } from "../httpsig/key.js";
 import { getKeyOwner, verify } from "../httpsig/mod.js";
@@ -73,7 +72,7 @@ export class Federation {
             60000,
             15 * 60000,
             60 * 60000,
-        ].map((ms) => Temporal.Duration.from({ milliseconds: ms }));
+        ].map((ms) => dntShim.Temporal.Duration.from({ milliseconds: ms }));
     }
     #startQueue() {
         if (this.#queue != null && !this.#queueStarted) {

package/esm/federation/mq.js

@@ -1,3 +1,4 @@
+// deno-lint-ignore-file no-explicit-any
 /**
  * A message queue that processes messages in the same process.
  * Do not use this in production as it does not persist messages.

package/esm/httpsig/mod.js

@@ -5,7 +5,6 @@
  * @module
  */
 import * as dntShim from "../_dnt.shims.js";
-import { Temporal } from "@js-temporal/polyfill";
 import { equals } from "../deps/jsr.io/@std/bytes/0.220.1/mod.js";
 import { decodeBase64, encodeBase64 } from "../deps/jsr.io/@std/encoding/0.220.1/base64.js";
 import { isActor } from "../vocab/actor.js";
@@ -104,13 +103,13 @@ export async function verify(request, documentLoader, currentTime) {
         if (!matched)
             return null;
     }
-    const date = Temporal.Instant.from(new Date(dateHeader).toISOString());
-    const now = currentTime ?? Temporal.Now.instant();
-    if (Temporal.Instant.compare(date, now.add({ seconds: 30 })) > 0) {
+    const date = dntShim.Temporal.Instant.from(new Date(dateHeader).toISOString());
+    const now = currentTime ?? dntShim.Temporal.Now.instant();
+    if (dntShim.Temporal.Instant.compare(date, now.add({ seconds: 30 })) > 0) {
         // Too far in the future
         return null;
     }
-    else if (Temporal.Instant.compare(date, now.subtract({ seconds: 30 })) < 0) {
+    else if (dntShim.Temporal.Instant.compare(date, now.subtract({ seconds: 30 })) < 0) {
         // Too far in the past
         return null;
     }

package/esm/runtime/docloader.js

@@ -1,5 +1,4 @@
 import * as dntShim from "../_dnt.shims.js";
-import { Temporal } from "@js-temporal/polyfill";
 import { validateCryptoKey } from "../httpsig/key.js";
 import { sign } from "../httpsig/mod.js";
 /**
@@ -79,13 +78,13 @@ export function kvCache({ loader, kv, prefix, rules }) {
     rules ??= [
         [
             "https://www.w3.org/ns/activitystreams",
-            Temporal.Duration.from({ days: 30 }),
+            dntShim.Temporal.Duration.from({ days: 30 }),
         ],
-        ["https://w3id.org/security/v1", Temporal.Duration.from({ days: 30 })],
-        [new dntShim.URLPattern({}), Temporal.Duration.from({ minutes: 5 })],
+        ["https://w3id.org/security/v1", dntShim.Temporal.Duration.from({ days: 30 })],
+        [new dntShim.URLPattern({}), dntShim.Temporal.Duration.from({ minutes: 5 })],
     ];
     for (const [p, duration] of rules) {
-        if (Temporal.Duration.compare(duration, { days: 30 }) > 0) {
+        if (dntShim.Temporal.Duration.compare(duration, { days: 30 }) > 0) {
             throw new TypeError("The maximum cache duration is 30 days: " +
                 (p instanceof dntShim.URLPattern
                     ? `${p.protocol}://${p.username}:${p.password}@${p.hostname}:${p.port}/${p.pathname}?${p.search}#${p.hash}`