@fedify/fedify 1.3.0-dev.570 → 1.3.0-dev.571

package/esm/deno.js

@@ -1,6 +1,6 @@
 export default {
     "name": "@fedify/fedify",
-    "version": "1.3.0-dev.570+61d94afc",
+    "version": "1.3.0-dev.571+be4ca8c6",
     "license": "MIT",
     "exports": {
         ".": "./mod.ts",

package/esm/federation/handler.js

@@ -7,7 +7,6 @@ import { verifyRequest } from "../sig/http.js";
 import { detachSignature, verifyJsonLd } from "../sig/ld.js";
 import { doesActorOwnKey } from "../sig/owner.js";
 import { verifyObject } from "../sig/proof.js";
-import { getTypeId } from "../vocab/type.js";
 import { Activity, CryptographicKey, Link, Multikey, Object, OrderedCollection, OrderedCollectionPage, } from "../vocab/vocab.js";
 export function acceptsJsonLd(request) {
     const types = accepts(request);
@@ -71,28 +70,12 @@ export async function handleObject(request, { values, context, objectDispatcher,
         },
     });
 }
-export function handleCollection(request, params) {
-    const name = params.name.trim().replace(/\s+/g, "_");
-    const tracerProvider = params.tracerProvider ?? trace.getTracerProvider();
+export async function handleCollection(request, { name, identifier, uriGetter, filter, filterPredicate, context, collectionCallbacks, tracerProvider, onUnauthorized, onNotFound, onNotAcceptable, }) {
+    const spanName = name.trim().replace(/\s+/g, "_");
+    tracerProvider = tracerProvider ?? trace.getTracerProvider();
     const tracer = tracerProvider.getTracer(metadata.name, metadata.version);
     const url = new URL(request.url);
     const cursor = url.searchParams.get("cursor");
-    return tracer.startActiveSpan(cursor == null
-        ? `activitypub.dispatch_collection ${name}`
-        : `activitypub.dispatch_collection_page ${name}`, { kind: SpanKind.SERVER }, async (span) => {
-        try {
-            return await handleCollectionInternal(request, cursor, params, span);
-        }
-        catch (e) {
-            span.setStatus({ code: SpanStatusCode.ERROR, message: String(e) });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
-    });
-}
-async function handleCollectionInternal(request, cursor, { name, identifier, uriGetter, filter, filterPredicate, context, collectionCallbacks, onUnauthorized, onNotFound, onNotAcceptable, }, span) {
     if (collectionCallbacks == null)
         return await onNotFound(request);
     let collection;
@@ -100,21 +83,41 @@ async function handleCollectionInternal(request, cursor, { name, identifier, uri
     if (cursor == null) {
         const firstCursor = await collectionCallbacks.firstCursor?.(context, identifier);
         const totalItems = await collectionCallbacks.counter?.(context, identifier);
-        if (totalItems != null) {
-            span.setAttribute("activitypub.collection.total_items", Number(totalItems));
-        }
         if (firstCursor == null) {
-            const page = await collectionCallbacks.dispatcher(context, identifier, null, filter);
-            if (page == null) {
-                span.setStatus({ code: SpanStatusCode.ERROR });
-                return await onNotFound(request);
-            }
-            const { items } = page;
-            span.setAttribute("fedify.collection.items", items.length);
+            const itemsOrResponse = await tracer.startActiveSpan(`activitypub.dispatch_collection ${spanName}`, {
+                kind: SpanKind.SERVER,
+                attributes: {
+                    "activitypub.collection.id": baseUri.href,
+                    "activitypub.collection.type": OrderedCollection.typeId.href,
+                },
+            }, async (span) => {
+                if (totalItems != null) {
+                    span.setAttribute("activitypub.collection.total_items", Number(totalItems));
+                }
+                try {
+                    const page = await collectionCallbacks.dispatcher(context, identifier, null, filter);
+                    if (page == null) {
+                        span.setStatus({ code: SpanStatusCode.ERROR });
+                        return await onNotFound(request);
+                    }
+                    const { items } = page;
+                    span.setAttribute("fedify.collection.items", items.length);
+                    return items;
+                }
+                catch (e) {
+                    span.setStatus({ code: SpanStatusCode.ERROR, message: String(e) });
+                    throw e;
+                }
+                finally {
+                    span.end();
+                }
+            });
+            if (itemsOrResponse instanceof Response)
+                return itemsOrResponse;
             collection = new OrderedCollection({
                 id: baseUri,
                 totalItems: totalItems == null ? null : Number(totalItems),
-                items: filterCollectionItems(items, name, filterPredicate),
+                items: filterCollectionItems(itemsOrResponse, name, filterPredicate),
             });
         }
         else {
@@ -135,16 +138,36 @@ async function handleCollectionInternal(request, cursor, { name, identifier, uri
         }
     }
     else {
-        span.setAttribute("fedify.collection.cursor", cursor);
         const uri = new URL(baseUri);
         uri.searchParams.set("cursor", cursor);
-        const page = await collectionCallbacks.dispatcher(context, identifier, cursor, filter);
-        if (page == null) {
-            span.setStatus({ code: SpanStatusCode.ERROR });
-            return await onNotFound(request);
-        }
-        const { items, prevCursor, nextCursor } = page;
-        span.setAttribute("fedify.collection.items", items.length);
+        const pageOrResponse = await tracer.startActiveSpan(`activitypub.dispatch_collection_page ${name}`, {
+            kind: SpanKind.SERVER,
+            attributes: {
+                "activitypub.collection.id": uri.href,
+                "activitypub.collection.type": OrderedCollectionPage.typeId.href,
+                "fedify.collection.cursor": cursor,
+            },
+        }, async (span) => {
+            try {
+                const page = await collectionCallbacks.dispatcher(context, identifier, cursor, filter);
+                if (page == null) {
+                    span.setStatus({ code: SpanStatusCode.ERROR });
+                    return await onNotFound(request);
+                }
+                span.setAttribute("fedify.collection.items", page.items.length);
+                return page;
+            }
+            catch (e) {
+                span.setStatus({ code: SpanStatusCode.ERROR, message: String(e) });
+                throw e;
+            }
+            finally {
+                span.end();
+            }
+        });
+        if (pageOrResponse instanceof Response)
+            return pageOrResponse;
+        const { items, prevCursor, nextCursor } = pageOrResponse;
         let prev = null;
         if (prevCursor != null) {
             prev = new URL(context.url);
@@ -174,10 +197,6 @@ async function handleCollectionInternal(request, cursor, { name, identifier, uri
             return await onUnauthorized(request);
         }
     }
-    if (collection.id != null) {
-        span.setAttribute("activitypub.collection.id", collection.id.href);
-    }
-    span.setAttribute("activitypub.collection.type", getTypeId(collection).href);
     const jsonLd = await collection.toJsonLd(context);
     return new Response(JSON.stringify(jsonLd), {
         headers: {