chore: Remove dependencies that are part of node

joachimvh · joachimvh · commit 7bdd277a0c19 · 2025-04-14T13:08:20.000+02:00
diff --git a/package.json b/package.json
@@ -78,7 +78,6 @@
     "@typescript-eslint/parser": "^5.12.1",
     "componentsjs-generator": "^3.1.2",
     "concurrently": "^8.2.2",
-    "cross-fetch": "^4.0.0",
     "eslint": "^8.10.0",
     "jest": "^29.7.0",
     "jest-rdf": "^1.8.1",
diff --git a/packages/css/package.json b/packages/css/package.json
@@ -72,7 +72,6 @@
     "@solidlab/uma": "workspace:^",
     "@types/n3": "^1.16.4",
     "componentsjs": "^5.4.2",
-    "cross-fetch": "^4.0.0",
     "fetch-retry": "^6.0.0",
     "http-message-signatures": "^1.0.4",
     "jose": "^5.2.2",
diff --git a/packages/css/src/util/fetch/BaseFetcher.ts b/packages/css/src/util/fetch/BaseFetcher.ts
@@ -1,9 +1,8 @@
-import { fetch as crossFetch } from 'cross-fetch';
 import type { FetchParams, Fetcher } from './Fetcher';
 
 /**
- * A simple {@link Fetcher} relying on cross-fetch.
+ * A simple {@link Fetcher} relying on fetch.
  */
 export class BaseFetcher implements Fetcher {
-  fetch(...args: FetchParams): Promise<Response> { return crossFetch(...args) }
+  fetch(...args: FetchParams): Promise<Response> { return fetch(...args) }
 }
diff --git a/packages/ucp/src/Explanation.ts b/packages/ucp/src/Explanation.ts
@@ -1,6 +1,6 @@
 import { Store, DataFactory } from "n3";
+import { randomUUID } from 'node:crypto';
 import { UconRequest, createContext } from "./Request"
-import { v4 as uuidv4 } from 'uuid';
 import { ACCESS_MODES_ALLOWED } from "./util/Constants";
 import { SimplePolicy } from "./policy/UsageControlPolicy";
 import { storeToString } from "./util/Conversion";
@@ -93,7 +93,7 @@ export function explanationToRdf(explanation: Explanation): Store {
 
     // conclusions
     for (const conclusion of explanation.conclusions) {
-        const conclusionIri = baseIRI + uuidv4();
+        const conclusionIri = baseIRI + randomUUID();
         const conclusionPred = namedNode(baseIRI + 'conclusion');
         const conclusionNode = namedNode(conclusionIri);
         store.addQuad(explanationNode, conclusionPred, conclusionNode);
@@ -110,8 +110,8 @@ export function explanationToRdf(explanation: Explanation): Store {
 }
 /**
  * Serialize the request together with a set of ucon rules and set of N3 rules interpreting into a single string.
- * 
- * This string can be given to an N3 reasoning engine. 
+ *
+ * This string can be given to an N3 reasoning engine.
  * When there is a conclusion, one or multiple rule activations will occur. (rule must be seen in the context of a policy rule)
  * Each rule activation contains permissions granted.
  * @param policies
@@ -135,10 +135,10 @@ export function serializePremises(policies: SimplePolicy[], request: UconRequest
  * - request
  * - ucon rules set
  * - n3 intepretation rules
- * @param explanation 
- * @param uconRules 
- * @param n3InterpretationRules 
- * @returns 
+ * @param explanation
+ * @param uconRules
+ * @param n3InterpretationRules
+ * @returns
  */
 export function serializeFullExplanation(explanation: Explanation, uconRules: Store, n3InterpretationRules: string): string {
     const explanationString = storeToString(explanationToRdf(explanation));
diff --git a/packages/ucp/src/policy/ODRL.ts b/packages/ucp/src/policy/ODRL.ts
@@ -1,17 +1,17 @@
 import { DataFactory, Quad, Store } from "n3";
-import { v4 as uuidv4 } from 'uuid';
+import { randomUUID } from 'node:crypto';
 import { ODRL, RDF, XSD } from "../util/Vocabularies";
 import { SimplePolicy, UCPConstraint, UCPPolicy, UCPRule } from "./UsageControlPolicy";
 const { quad, namedNode, literal } = DataFactory
 
 /**
  * Create a simple ODRL policy with an agreement and one rule
- * @param policy 
- * @param policyIRI 
- * @returns 
+ * @param policy
+ * @param policyIRI
+ * @returns
  */
 export function basicPolicy(policy: UCPPolicy, policyIRI?: string): SimplePolicy {
-  policyIRI = policyIRI ?? "urn:ucp:policy:" + uuidv4();
+  policyIRI = policyIRI ?? "urn:ucp:policy:" + randomUUID();
   const store = new Store();
   const ruleIRIs: string[] = []
   if (policy.type) {
@@ -33,13 +33,13 @@ export function basicPolicy(policy: UCPPolicy, policyIRI?: string): SimplePolicy
 
 /**
  * Convert an Usage Control Rule to ODRL quads
- * @param rule 
- * @param policyIRI 
- * @returns 
+ * @param rule
+ * @param policyIRI
+ * @returns
  */
 export function createRuleQuads(rule: UCPRule, policyIRI?: string): { quads: Quad[], ruleIRI: string } {
   const quads: Quad[] = []
-  const ruleIRI = "urn:ucp:rule:" + uuidv4();
+  const ruleIRI = "urn:ucp:rule:" + randomUUID();
   quads.push(quad(namedNode(ruleIRI), ODRL.terms.action, namedNode(rule.action)))
   quads.push(quad(namedNode(ruleIRI), ODRL.terms.target, namedNode(rule.resource)))
   quads.push(quad(namedNode(ruleIRI), ODRL.terms.assignee, namedNode(rule.requestingParty)))
@@ -67,21 +67,21 @@ export function createRuleQuads(rule: UCPRule, policyIRI?: string): { quads: Qua
 
 /**
  * Convert an Usage Control Constraint to ODRL quads
- * @param rule 
- * @param policyIRI 
- * @returns 
+ * @param rule
+ * @param policyIRI
+ * @returns
  */
 export function createConstraintQuads(
-  constraint: UCPConstraint, 
+  constraint: UCPConstraint,
   ruleIRI?: string
 ): { quads: Quad[], constraintIRI: string } {
   const quads: Quad[] = []
-  const constraintIRI = "urn:ucp:constraint:" + uuidv4();
+  const constraintIRI = "urn:ucp:constraint:" + randomUUID();
   switch (constraint.type) {
     case "temporal": // maybe have as type something more semantically defined?
       quads.push(quad(namedNode(constraintIRI), ODRL.terms.leftOperand, ODRL.terms.dateTime));
       quads.push(quad(namedNode(constraintIRI), ODRL.terms.operator, namedNode(constraint.operator)));
-      quads.push(quad(namedNode(constraintIRI), ODRL.terms.rightOperand, 
+      quads.push(quad(namedNode(constraintIRI), ODRL.terms.rightOperand,
         literal((constraint.value as Date).toISOString(), XSD.terms.dateTime)));
       if (ruleIRI) {
         quads.push(quad(namedNode(ruleIRI), ODRL.terms.constraint, namedNode(constraintIRI)))
@@ -104,6 +104,3 @@ export function createConstraintQuads(
     constraintIRI
   }
 }
-
-
-
diff --git a/packages/uma/package.json b/packages/uma/package.json
@@ -65,9 +65,7 @@
     "@solid/community-server": "^7.0.4",
     "@solidlab/ucp": "workspace:^",
     "@types/n3": "^1.16.4",
-    "@types/uuid": "^8.3.4",
     "componentsjs": "^5.4.2",
-    "cross-fetch": "^4.0.0",
     "get-jwks": "^9.0.1",
     "http-message-signatures": "^1.0.4",
     "jose": "^5.2.2",
@@ -76,7 +74,6 @@
     "n3": "^1.17.2",
     "ts-node": "^10.9.2",
     "uri-template-lite": "^23.4.0",
-    "uuid": "^9.0.1",
     "winston": "^3.11.0"
   },
   "jest": {
diff --git a/packages/uma/src/dialog/BaseNegotiator.ts b/packages/uma/src/dialog/BaseNegotiator.ts
@@ -1,3 +1,4 @@
+import { randomUUID } from 'node:crypto';
 import { Ticket } from '../ticketing/Ticket';
 import { Verifier } from '../credentials/verify/Verifier';
 import { TokenFactory } from '../tokens/TokenFactory';
@@ -7,7 +8,6 @@ import { DialogInput } from './Input';
 import { DialogOutput } from './Output';
 import { reType } from '../util/ReType';
 import { TicketingStrategy } from '../ticketing/strategy/TicketingStrategy';
-import { v4 } from 'uuid';
 import {
   BadRequestHttpError,
   ForbiddenHttpError,
@@ -84,7 +84,7 @@ export class BaseNegotiator implements Negotiator {
     if (requiredClaims.length === 0) throw new ForbiddenHttpError();
 
     // ... require more info otherwise
-    const id = v4();
+    const id = randomUUID();
     this.ticketStore.set(id, ticket);
     throw new NeedInfoError('Need more info to authorize request ...', id, {
       required_claims: {
diff --git a/packages/uma/src/routes/ResourceRegistration.ts b/packages/uma/src/routes/ResourceRegistration.ts
@@ -7,10 +7,10 @@ import {
   UnauthorizedHttpError,
   UnsupportedMediaTypeHttpError
 } from '@solid/community-server';
+import { randomUUID } from 'node:crypto';
 import {HttpHandler} from '../util/http/models/HttpHandler';
 import {HttpHandlerContext} from '../util/http/models/HttpHandlerContext';
 import {HttpHandlerResponse} from '../util/http/models/HttpHandlerResponse';
-import {v4} from 'uuid';
 import { HttpHandlerRequest } from '../util/http/models/HttpHandlerRequest';
 import { ResourceDescription } from '../views/ResourceDescription';
 import { reType } from '../util/ReType';
@@ -69,7 +69,7 @@ export class ResourceRegistrationRequestHandler extends HttpHandler {
       throw new BadRequestHttpError(`Request has bad syntax${e instanceof Error ? ': ' + e.message : ''}`)
     }
 
-    const resource = v4();
+    const resource = randomUUID();
     this.resourceStore.set(resource, body);
 
     this.logger.info(`Registered resource ${resource}.`);
diff --git a/packages/uma/src/routes/Ticket.ts b/packages/uma/src/routes/Ticket.ts
@@ -7,15 +7,15 @@ import {
   UnauthorizedHttpError,
   UnsupportedMediaTypeHttpError
 } from '@solid/community-server';
-import { v4 } from 'uuid';
-import { TicketingStrategy } from '../ticketing/strategy/TicketingStrategy';
-import { Ticket } from '../ticketing/Ticket';
+import { randomUUID } from 'node:crypto';
 import { HttpHandler } from '../util/http/models/HttpHandler';
 import { HttpHandlerContext } from '../util/http/models/HttpHandlerContext';
 import { HttpHandlerResponse } from '../util/http/models/HttpHandlerResponse';
 import { verifyRequest } from '../util/HttpMessageSignatures';
 import { array, reType } from '../util/ReType';
 import { Permission } from '../views/Permission';
+import { Ticket } from '../ticketing/Ticket';
+import { TicketingStrategy } from '../ticketing/strategy/TicketingStrategy';
 
 /**
  * A TicketRequestHandler is tasked with implementing
@@ -70,7 +70,7 @@ export class TicketRequestHandler extends HttpHandler {
 
     if (resolved.success) return { status: 200 };
 
-    const id = v4();
+    const id = randomUUID();
     this.ticketStore.set(id, ticket);
 
     return {
diff --git a/packages/uma/src/tokens/JwtTokenFactory.ts b/packages/uma/src/tokens/JwtTokenFactory.ts
@@ -1,6 +1,6 @@
 import { importJWK, jwtVerify, SignJWT } from 'jose';
-import { v4 } from 'uuid';
 import { BadRequestHttpError, getLoggerFor, HttpErrorClass, JwkGenerator } from '@solid/community-server';
+import { randomUUID } from 'node:crypto';
 import { SerializedToken , TokenFactory} from './TokenFactory';
 import { AccessToken } from './AccessToken';
 import { array, reType } from '../util/ReType';
@@ -45,7 +45,7 @@ export class JwtTokenFactory extends TokenFactory {
       .setIssuer(this.issuer)
       .setAudience(AUD)
       .setExpirationTime(this.params.expirationTime)
-      .setJti(v4())
+      .setJti(randomUUID())
       .sign(jwk);
 
     this.logger.debug(`Issued new JWT Token ${JSON.stringify(token)}`);
diff --git a/packages/uma/src/tokens/OpaqueTokenFactory.ts b/packages/uma/src/tokens/OpaqueTokenFactory.ts
@@ -1,7 +1,7 @@
 import { KeyValueStorage } from '@solid/community-server';
+import { randomUUID } from 'node:crypto';
 import {AccessToken} from './AccessToken';
 import {SerializedToken, TokenFactory} from './TokenFactory';
-import {v4} from 'uuid';
 
 /**
  * A TokenFactory that serializes to an opaque string
@@ -21,7 +21,7 @@ export class OpaqueTokenFactory extends TokenFactory {
    * @return {Promise<SerializedToken>}
    */
   public async serialize(token: AccessToken): Promise<SerializedToken> {
-    const serialized = v4();
+    const serialized = randomUUID();
     await this.tokenStore.set(serialized, token);
     return {tokenType: 'Bearer', token: serialized};
   }
diff --git a/scripts/test-private.ts b/scripts/test-private.ts
@@ -1,15 +1,13 @@
 #!/usr/bin/env ts-node
 
-import { fetch } from 'cross-fetch'
-
 const privateResource = "http://localhost:3000/alice/private/resource.txt"
 
 function parseJwt (token:string) {
   return JSON.parse(Buffer.from(token.split('.')[1], 'base64').toString());
 }
 
-const request: RequestInit = { 
-  method: "PUT", 
+const request: RequestInit = {
+  method: "PUT",
   headers: {},
   body: 'Some text ...' ,
 };
@@ -31,7 +29,7 @@ async function main() {
   const { as_uri, ticket } = Object.fromEntries(wwwAuthenticateHeader.replace(/^UMA /,'').split(', ').map(
       param => param.split('=').map(s => s.replace(/"/g,''))
   ));
-  
+
   const tokenEndpoint = as_uri + "/token" // should normally be retrieved from .well-known/uma2-configuration
 
   const claim_token = "https://woslabbi.pod.knows.idlab.ugent.be/profile/card#me"
@@ -59,7 +57,7 @@ async function main() {
   // console.log("Authorization Server response:", await asRequestResponse.text());
   // throw 'stop'
 
-  const asResponse = await asRequestResponse.json();
+  const asResponse: any = await asRequestResponse.json();
 
   const decodedToken = parseJwt(asResponse.access_token);
 
@@ -71,14 +69,14 @@ async function main() {
   // for (const permission of decodedToken.permissions) {
   //   console.log(`Permissioned scopes for resource ${permission.resource_id}:`, permission.resource_scopes)
   // }
-  
+
   console.log(`=== Trying to create private resource <${privateResource}> WITH access token.\n`);
 
   request.headers = { 'Authorization': `${asResponse.token_type} ${asResponse.access_token}` };
-  
+
   const tokenResponse = await fetch(privateResource, request);
 
-  console.log(`= Status: ${tokenResponse.status}\n`); 
+  console.log(`= Status: ${tokenResponse.status}\n`);
 }
 
 main();
diff --git a/scripts/test-public.ts b/scripts/test-public.ts
@@ -1,15 +1,13 @@
 #!/usr/bin/env ts-node
 
-import { fetch } from 'cross-fetch'
-
 const publicResource = "http://localhost:3000/alice/profile/card"
 
 async function main() {
 
   console.log('\n\n');
 
   console.log(`=== Trying to read public resource <${publicResource}> without access token.\n`);
-  
+
   const publicResponse = await fetch(publicResource, { method: "GET" });
 
   console.log(`= Status: ${publicResponse.status}\n`);
diff --git a/scripts/test-registration.ts b/scripts/test-registration.ts
@@ -1,7 +1,5 @@
 #!/usr/bin/env ts-node
 
-import { fetch } from 'cross-fetch'
-
 const container = "http://localhost:3000/alice/public/";
 const slug = "resource.txt";
 const body = "This is a resource.";
diff --git a/scripts/test-uma-ucp.ts b/scripts/test-uma-ucp.ts
diff --git a/yarn.lock b/yarn.lock
