@tinycloud/operations 0.5.0-beta.0 → 0.5.0-beta.1

package/dist/index.cjs

@@ -5516,7 +5516,10 @@ async function importRequestBoundDelegation(context, input) {
         delegation,
         { host }
       );
-    } catch {
+    } catch (error) {
+      if (typeof error === "object" && error !== null && "reason" in error && error.reason === "expired") {
+        return expiredDelegation();
+      }
       return operationFailure(
         "DELEGATION_REJECTED",
         "The delegation was rejected by the TinyCloud runtime."
@@ -5534,55 +5537,67 @@ async function importRequestBoundDelegation(context, input) {
       );
     }
     try {
-      return await updateProfileStore(
-        context.summary.profile,
-        "additional-delegations",
-        async (records) => {
-          const state = await importState(context, input.requestId);
-          if (!state.ok) return { records, result: state.result };
-          if (state.sessionDid !== sessionDid || normalizeHost(state.host) !== normalizeHost(host)) {
-            return {
-              records,
-              result: audienceMismatch(state.sessionDid, sessionDid)
+      return await withProfileLock(context.summary.profile, async () => {
+        const previousRecords = await readAdditionalDelegations(context.summary.profile);
+        const result = await updateProfileStore(
+          context.summary.profile,
+          "additional-delegations",
+          async (records) => {
+            const state = await importState(context, input.requestId);
+            if (!state.ok) return { records, result: state.result };
+            if (state.sessionDid !== sessionDid || normalizeHost(state.host) !== normalizeHost(host)) {
+              return {
+                records,
+                result: audienceMismatch(state.sessionDid, sessionDid)
+              };
+            }
+            if (state.request.profile !== context.summary.profile || !samePrincipal(state.request.sessionDid, sessionDid) || normalizeHost(state.request.host) !== normalizeHost(host) || JSON.stringify(canonicalizeOperationCapabilities(state.request.requested, resolveSpace2)) !== JSON.stringify(canonicalizeOperationCapabilities(request.requested, resolveSpace2))) {
+              return {
+                records,
+                result: operationFailure(
+                  "DELEGATION_ARTIFACT_INVALID",
+                  "The delegation does not reference a current stored request."
+                )
+              };
+            }
+            const record = {
+              delegation: activated.delegation,
+              permissions: activated.effectivePermissions,
+              authorityRequest: {
+                requestId: request.requestId,
+                requested: request.requested
+              }
             };
-          }
-          if (state.request.profile !== context.summary.profile || !samePrincipal(state.request.sessionDid, sessionDid) || normalizeHost(state.request.host) !== normalizeHost(host) || JSON.stringify(canonicalizeOperationCapabilities(state.request.requested, resolveSpace2)) !== JSON.stringify(canonicalizeOperationCapabilities(request.requested, resolveSpace2))) {
+            const position = records.findIndex((entry) => delegationCid(entry) === activated.cid);
+            const alreadyPresent = position !== -1;
+            const others = records.filter((entry) => delegationCid(entry) !== activated.cid);
             return {
-              records,
-              result: operationFailure(
-                "DELEGATION_ARTIFACT_INVALID",
-                "The delegation does not reference a current stored request."
-              )
+              records: alreadyPresent ? [...others.slice(0, position), record, ...others.slice(position)] : [...records, record],
+              result: {
+                status: "ok",
+                output: {
+                  cid: activated.cid,
+                  effectivePermissions,
+                  expiry: activated.expiry.toISOString(),
+                  audience: activated.audience,
+                  host: activated.host,
+                  activated: true,
+                  alreadyPresent
+                }
+              }
             };
           }
-          const record = {
-            delegation: activated.delegation,
-            permissions: activated.effectivePermissions,
-            authorityRequest: {
-              requestId: request.requestId,
-              requested: request.requested
-            }
-          };
-          const position = records.findIndex((entry) => delegationCid(entry) === activated.cid);
-          const alreadyPresent = position !== -1;
-          const others = records.filter((entry) => delegationCid(entry) !== activated.cid);
-          return {
-            records: alreadyPresent ? [...others.slice(0, position), record, ...others.slice(position)] : [...records, record],
-            result: {
-              status: "ok",
-              output: {
-                cid: activated.cid,
-                effectivePermissions,
-                expiry: activated.expiry.toISOString(),
-                audience: activated.audience,
-                host: activated.host,
-                activated: true,
-                alreadyPresent
-              }
-            }
-          };
+        );
+        if (activated.expiry.getTime() <= Date.now()) {
+          await updateProfileStore(
+            context.summary.profile,
+            "additional-delegations",
+            () => ({ records: previousRecords, result: void 0 })
+          );
+          return expiredDelegation();
         }
-      );
+        return result;
+      });
     } catch {
       return internalImportFailure();
     }