merge: main sync (OID4VC/P) to main

.sonarcloud.properties

@@ -0,0 +1 @@
+sonar.exclusions=samples/cliConfig.json,src/routes/routes.ts

Dockerfile

@@ -1,5 +1,5 @@
 # Stage 1: Builder stage
-FROM node:18.19.0 AS builder
+FROM node:22.22.0 AS builder
 
 WORKDIR /app
 
@@ -18,8 +18,15 @@ RUN yarn global add patch-package
 # Build the application
 RUN yarn build
 
-# Stage 2: Production stage
-FROM node:18.19.0-slim
+# Stage 2: Production stage  
+FROM node:22.22.0-slim
+
+# Update system packages and install security updates
+RUN apt-get update && apt-get upgrade -y && \
+    apt-get install -y --no-install-recommends \
+    ca-certificates && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 WORKDIR /app
 
@@ -30,5 +37,12 @@ COPY --from=builder /app/package.json ./
 COPY --from=builder /app/node_modules ./node_modules
 COPY --from=builder /app/patches ./patches
 
+# Create non-root user for security
+RUN groupadd -r appuser && useradd -r -g appuser appuser && \
+    chown -R appuser:appuser /app && \
+    chmod -R 755 /app
+
+USER appuser
+
 # Set entry point
 ENTRYPOINT ["node", "./bin/afj-rest.js", "start"]

eslint.config.mjs

@@ -9,12 +9,12 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
 export default [
+  {
+    ignores: ['**/build/**', '**/*.js', '**/*.d.ts'],
+  },
   {
     ignores: [
-      '**/tests/*', 
-      '**/build/**', 
-      '**/*.js',
-      '**/*.d.ts',
+      '**/tests/*',
     ],
     files: ['**/*.ts'],
     languageOptions: {

package.json

@@ -39,18 +39,20 @@
     "validate": "yarn lint && yarn check-types && yarn check-format"
   },
   "dependencies": {
-    "@ayanworks/credo-polygon-w3c-module": "1.0.1-alpha.1",
-    "@credo-ts/anoncreds": "0.5.15",
-    "@credo-ts/askar": "0.5.15",
-    "@credo-ts/core": "0.5.15",
-    "@credo-ts/indy-vdr": "0.5.15",
-    "@credo-ts/node": "^0.5.15",
+    "@ayanworks/credo-polygon-w3c-module": "2.0.2",
+    "@sd-jwt/jwt-status-list": "0.19.0",
+    "@credo-ts/anoncreds": "0.6.2",
+    "@credo-ts/askar": "0.6.2",
+    "@credo-ts/core": "0.6.2",
+    "@credo-ts/didcomm": "0.6.2",
+    "@credo-ts/indy-vdr": "0.6.2",
+    "@credo-ts/node": "0.6.2",
+    "@credo-ts/openid4vc": "0.6.2",
     "@credo-ts/push-notifications": "^0.7.1",
-    "@credo-ts/question-answer": "0.5.15",
-    "@credo-ts/tenants": "0.5.15",
-    "@hyperledger/anoncreds-nodejs": "0.3.1",
-    "@hyperledger/aries-askar-nodejs": "0.2.3",
-    "@hyperledger/indy-vdr-nodejs": "0.2.2",
+    "@credo-ts/question-answer": "0.6.2",
+    "@credo-ts/tenants": "0.6.2",
+    "@hyperledger/anoncreds-nodejs": "^0.3.4",
+    "@hyperledger/indy-vdr-nodejs": "^0.2.3",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/exporter-logs-otlp-http": "^0.202.0",
     "@opentelemetry/exporter-trace-otlp-http": "^0.202.0",
@@ -61,26 +63,30 @@
     "@opentelemetry/sdk-logs": "^0.202.0",
     "@opentelemetry/sdk-node": "^0.202.0",
     "@opentelemetry/semantic-conventions": "^1.34.0",
+    "@openwallet-foundation/askar-nodejs": "^0.4.3",
     "@tsoa/runtime": "^6.6.0",
     "@types/node-fetch": "^2.6.4",
     "@types/ref-struct-di": "^1.1.12",
     "@types/uuid": "^10.0.0",
     "@types/ws": "^8.18.1",
-    "axios": "^1.9.0",
+    "axios": "1.13.5",
     "body-parser": "^2.2.0",
     "cors": "^2.8.5",
     "dotenv": "^16.5.0",
     "express": "^5.1.0",
     "express-rate-limit": "^7.5.0",
     "joi": "^17.13.3",
     "jsonwebtoken": "^9.0.2",
+    "nats": "^2.29.3",
+    "node-cron": "^4.2.1",
     "node-fetch": "2",
     "patch-package": "^8.0.0",
     "reflect-metadata": "^0.2.2",
     "swagger-ui-express": "^4.4.0",
     "tslog": "^3.3.3",
     "tsoa": "^6.0.1",
-    "tsyringe": "^4.8.0",
+    "tsyringe": "^4.10.0",
+    "uuid": "^13.0.0",
     "ws": "^8.18.2",
     "yargs": "^17.7.2"
   },
@@ -94,6 +100,7 @@
     "@types/jsonwebtoken": "^9.0.9",
     "@types/multer": "^1.4.12",
     "@types/node": "^20.17.0",
+    "@types/node-cron": "^3.0.11",
     "@types/ref-array-di": "^1.2.8",
     "@types/ref-struct-di": "^1.1.12",
     "@types/supertest": "^6.0.3",
@@ -115,7 +122,9 @@
     "typescript": "^5.8.3"
   },
   "resolutions": {
-    "@credo-ts/core": "0.5.15",
-    "@credo-ts/askar": "0.5.15"
+    "@credo-ts/core": "0.6.2",
+    "@credo-ts/askar": "0.6.2",
+    "flatted": "3.4.0",
+    "undici": "6.24.0"
   }
 }

patches/@credo-ts+core+0.6.2+001+fix: change version string type-import esm-export interface.patch

@@ -0,0 +1,62 @@
+diff --git a/node_modules/@credo-ts/core/build/modules/vc/data-integrity/jsonldUtil.d.mts b/node_modules/@credo-ts/core/build/modules/vc/data-integrity/jsonldUtil.d.mts
+index 5a311c1..4d640d0 100644
+--- a/node_modules/@credo-ts/core/build/modules/vc/data-integrity/jsonldUtil.d.mts
++++ b/node_modules/@credo-ts/core/build/modules/vc/data-integrity/jsonldUtil.d.mts
+@@ -14,7 +14,7 @@ interface Proof extends JsonObject {
+   verificationMethod: string | VerificationMethod;
+   [key: string]: JsonValue;
+ }
+-interface DocumentLoaderResult {
++export interface DocumentLoaderResult {
+   contextUrl?: string | null;
+   documentUrl: string;
+   document: Record<string, unknown>;
+diff --git a/node_modules/@credo-ts/core/build/modules/vc/data-integrity/libraries/nativeDocumentLoader.mjs b/node_modules/@credo-ts/core/build/modules/vc/data-integrity/libraries/nativeDocumentLoader.mjs
+index 49ee03f..aa7e43a 100644
+--- a/node_modules/@credo-ts/core/build/modules/vc/data-integrity/libraries/nativeDocumentLoader.mjs
++++ b/node_modules/@credo-ts/core/build/modules/vc/data-integrity/libraries/nativeDocumentLoader.mjs
+@@ -2,7 +2,7 @@
+
+ //#region src/modules/vc/data-integrity/libraries/nativeDocumentLoader.ts
+ async function getNativeDocumentLoader() {
+-	const loader = await import("@digitalcredentials/jsonld/lib/documentLoaders/node");
++	const loader = await import("@digitalcredentials/jsonld/lib/documentLoaders/node.js");
+ 	if (!loader) throw new Error("Could not load node document loader. Module did not contain a loader function");
+ 	if (typeof loader === "function") return loader;
+ 	if (typeof loader === "object" && typeof loader.default === "function") return loader.default;
+diff --git a/node_modules/@credo-ts/core/build/modules/vc/data-integrity/libraries/nativeDocumentLoader.native.mjs b/node_modules/@credo-ts/core/build/modules/vc/data-integrity/libraries/nativeDocumentLoader.native.mjs
+index 6a8ca37..0287e99 100644
+--- a/node_modules/@credo-ts/core/build/modules/vc/data-integrity/libraries/nativeDocumentLoader.native.mjs
++++ b/node_modules/@credo-ts/core/build/modules/vc/data-integrity/libraries/nativeDocumentLoader.native.mjs
+@@ -1,8 +1,9 @@
+
+
++
+ //#region src/modules/vc/data-integrity/libraries/nativeDocumentLoader.native.ts
+ async function getNativeDocumentLoader() {
+-	const loader = await import("@digitalcredentials/jsonld/lib/documentLoaders/xhr");
++	const loader = await import("@digitalcredentials/jsonld/lib/documentLoaders/xhr.js");
+ 	if (!loader) throw new Error("Could not load node document loader. Module did not contain a loader function");
+ 	if (typeof loader === "function") return loader;
+ 	if (typeof loader === "object" && typeof loader.default === "function") return loader.default;
+diff --git a/node_modules/@credo-ts/core/build/utils/version.d.mts b/node_modules/@credo-ts/core/build/utils/version.d.mts
+index a71659d..8ed88e2 100644
+--- a/node_modules/@credo-ts/core/build/utils/version.d.mts
++++ b/node_modules/@credo-ts/core/build/utils/version.d.mts
+@@ -1,5 +1,5 @@
+ //#region src/utils/version.d.ts
+-type VersionString = `${number}.${number}` | `${number}.${number}.${number}`;
++type VersionString = string;
+ //#endregion
+ export { VersionString };
+ //# sourceMappingURL=version.d.mts.map
+\ No newline at end of file
+diff --git a/node_modules/@credo-ts/core/build/utils/version.mjs.map b/node_modules/@credo-ts/core/build/utils/version.mjs.map
+index 19457ed..5fb595f 100644
+--- a/node_modules/@credo-ts/core/build/utils/version.mjs.map
++++ b/node_modules/@credo-ts/core/build/utils/version.mjs.map
+@@ -1 +1 @@
+-{"version":3,"file":"version.mjs","names":[],"sources":["../../src/utils/version.ts"],"sourcesContent":["export function parseVersionString(version: VersionString): Version {\n  const [major, minor, patch] = version.split('.')\n\n  return [Number(major), Number(minor), Number(patch ?? '0')]\n}\n\nexport function isFirstVersionHigherThanSecond(first: Version, second: Version) {\n  return (\n    first[0] > second[0] ||\n    (first[0] === second[0] && first[1] > second[1]) ||\n    (first[0] === second[0] && first[1] === second[1] && first[2] > second[2])\n  )\n}\n\nexport function isFirstVersionEqualToSecond(first: Version, second: Version) {\n  return first[0] === second[0] && first[1] === second[1] && first[2] === second[2]\n}\n\nexport type VersionString = `${number}.${number}` | `${number}.${number}.${number}`\nexport type MajorVersion = number\nexport type MinorVersion = number\nexport type PatchVersion = number\nexport type Version = [MajorVersion, MinorVersion, PatchVersion]\n"],"mappings":";;;AAAA,SAAgB,mBAAmB,SAAiC;CAClE,MAAM,CAAC,OAAO,OAAO,SAAS,QAAQ,MAAM,IAAI;AAEhD,QAAO;EAAC,OAAO,MAAM;EAAE,OAAO,MAAM;EAAE,OAAO,SAAS,IAAI;EAAC;;AAG7D,SAAgB,+BAA+B,OAAgB,QAAiB;AAC9E,QACE,MAAM,KAAK,OAAO,MACjB,MAAM,OAAO,OAAO,MAAM,MAAM,KAAK,OAAO,MAC5C,MAAM,OAAO,OAAO,MAAM,MAAM,OAAO,OAAO,MAAM,MAAM,KAAK,OAAO;;AAI3E,SAAgB,4BAA4B,OAAgB,QAAiB;AAC3E,QAAO,MAAM,OAAO,OAAO,MAAM,MAAM,OAAO,OAAO,MAAM,MAAM,OAAO,OAAO"}
+\ No newline at end of file
++{"version":3,"file":"version.mjs","names":[],"sources":["../../src/utils/version.ts"],"sourcesContent":["export function parseVersionString(version: VersionString): Version {\n  const [major, minor, patch] = version.split('.')\n\n  return [Number(major), Number(minor), Number(patch ?? '0')]\n}\n\nexport function isFirstVersionHigherThanSecond(first: Version, second: Version) {\n  return (\n    first[0] > second[0] ||\n    (first[0] === second[0] && first[1] > second[1]) ||\n    (first[0] === second[0] && first[1] === second[1] && first[2] > second[2])\n  )\n}\n\nexport function isFirstVersionEqualToSecond(first: Version, second: Version) {\n  return first[0] === second[0] && first[1] === second[1] && first[2] === second[2]\n}\n\nexport type VersionString = string\nexport type MajorVersion = number\nexport type MinorVersion = number\nexport type PatchVersion = number\nexport type Version = [MajorVersion, MinorVersion, PatchVersion]\n"],"mappings":";;;AAAA,SAAgB,mBAAmB,SAAiC;CAClE,MAAM,CAAC,OAAO,OAAO,SAAS,QAAQ,MAAM,IAAI;AAEhD,QAAO;EAAC,OAAO,MAAM;EAAE,OAAO,MAAM;EAAE,OAAO,SAAS,IAAI;EAAC;;AAG7D,SAAgB,+BAA+B,OAAgB,QAAiB;AAC9E,QACE,MAAM,KAAK,OAAO,MACjB,MAAM,OAAO,OAAO,MAAM,MAAM,KAAK,OAAO,MAC5C,MAAM,OAAO,OAAO,MAAM,MAAM,OAAO,OAAO,MAAM,MAAM,KAAK,OAAO;;AAI3E,SAAgB,4BAA4B,OAAgB,QAAiB;AAC3E,QAAO,MAAM,OAAO,OAAO,MAAM,MAAM,OAAO,OAAO,MAAM,MAAM,OAAO,OAAO"}
+\ No newline at end of file

patches/@credo-ts+core+0.6.2+002+fix: export defaultDocumentLoader.patch

@@ -0,0 +1,27 @@
+diff --git a/node_modules/@credo-ts/core/build/modules/vc/data-integrity/libraries/documentLoader.d.mts b/node_modules/@credo-ts/core/build/modules/vc/data-integrity/libraries/documentLoader.d.mts
+index 195af1d..30d1638 100644
+--- a/node_modules/@credo-ts/core/build/modules/vc/data-integrity/libraries/documentLoader.d.mts
++++ b/node_modules/@credo-ts/core/build/modules/vc/data-integrity/libraries/documentLoader.d.mts
+@@ -5,4 +5,5 @@ import { AgentContext } from "../../../../agent/context/AgentContext.mjs";
+ type DocumentLoaderWithContext = (agentContext: AgentContext) => DocumentLoader;
+ //#endregion
+ export { DocumentLoaderWithContext };
++export declare function defaultDocumentLoader(agentContext: AgentContext): DocumentLoader;
+ //# sourceMappingURL=documentLoader.d.mts.map
+\ No newline at end of file
+diff --git a/node_modules/@credo-ts/core/package.json b/node_modules/@credo-ts/core/package.json
+index 8198ea2..5d23e62 100644
+--- a/node_modules/@credo-ts/core/package.json
++++ b/node_modules/@credo-ts/core/package.json
+@@ -7,6 +7,11 @@
+       "import": "./build/modules/kms/index.mjs",
+       "require": "./build/modules/kms/index.mjs",
+       "types": "./build/modules/kms/index.d.mts"
++    },
++    "./build/modules/vc/data-integrity/libraries/documentLoader.mjs": {
++      "import": "./build/modules/vc/data-integrity/libraries/documentLoader.mjs",
++      "require": "./build/modules/vc/data-integrity/libraries/documentLoader.mjs",
++      "types": "./build/modules/vc/data-integrity/libraries/documentLoader.d.mts"
+     }
+   },
+   "version": "0.6.2",