New release

.github/workflows/build-test-publish-on-push.yml

@@ -73,7 +73,8 @@ jobs:
 
       #          npm whoami
 
-      - run: git diff -u
+      - name: show diff to track issues with lock file
+        run: git diff -u
 
       - name: publish @latest when on main
         if: github.ref == 'refs/heads/main'

.gitignore

@@ -60,8 +60,8 @@ test/*.js
 *~
 
 /packages/mnemonic-seed-manager/plugin.schema.json
-/packages/vc-api-issuer/plugin.schema.json
-/packages/vc-api-verifier/plugin.schema.json
+/packages/w3c-vc-api-issuer-rest-client/plugin.schema.json
+/packages/w3c-vc-api-verifier-rest-client/plugin.schema.json
 /packages/contact-manager/plugin.schema.json
 /packages/bls-key-manager/plugin.schema.json
 /packages/ms-request-api/plugin.schema.json
@@ -70,3 +70,6 @@ test/*.js
 /packages/issuance-branding/plugin.schema.json
 /packages/oid4vci-issuer-rest-client/plugin.schema.json
 
+**/.env.energyshr
+**/.env.local
+/packages/web3-provider-headless/__tests__/config.json

jest.json

@@ -27,17 +27,20 @@
   "coverageDirectory": "./coverage",
   "transform": {
     "\\.jsx?$": "babel-jest",
-    "\\.tsx?$": ["ts-jest", {
-      "tsconfig": "./packages/tsconfig-base.json"
-    }]
+    "\\.tsx?$": [
+      "ts-jest",
+      {
+        "tsconfig": "./packages/tsconfig-base.json"
+      }
+    ]
   },
   "modulePathIgnorePatterns": [
     "<rootDir>/packages/presentation-exchange/.yalc/",
     "<rootDir>/packages/siopv2-oid4vp-rp-auth/.yalc/",
     "<rootDir>/packages/siopv2-oid4vp-rp-rest-api/.yalc/"
   ],
   "transformIgnorePatterns": [
-    "node_modules/(?!(?:.pnpm/)?(nist-weierstrauss|multiformatsgggggg))"
+    "<rootDir>/node_modules/.pnpm/(?!(nist-weierstrauss|multiformatsgggggg|@digitalcredentials\\+vc-status-list)@)"
   ],
   "testMatch": [
     "**/__tests__/**/*.test.*",

package.json

@@ -1,14 +1,14 @@
 {
   "name": "@sphereon/sphereon-sdk.workspace",
   "private": true,
-  "version": "0.12.2",
+  "version": "0.15.1",
   "description": "Sphereon SSI SDK (Workspace)",
   "repository": "[email protected]:Sphereon-Opensource/SSI-SDK.git",
   "author": "Sphereon <[email protected]>",
   "license": "Apache-2.0",
   "scripts": {
     "preinstall": "npx only-allow pnpm",
-    "build": "pnpm build:js && pnpm build:copyfiles && pnpm build:api && pnpm build:schema",
+    "build": "rimraf --glob ./packages/*/tsconfig.tsbuildinfo && pnpm build:js && pnpm build:copyfiles && pnpm build:api && pnpm build:schema",
     "build:clean": "lerna clean -y && pnpm install && lerna run build:clean --concurrency 1 && pnpm build:copyfiles && pnpm build:schema",
     "build:js": "pnpm -r --stream build",
     "build:api": "pnpm -r --stream extract-api",
@@ -51,7 +51,7 @@
     "@typescript-eslint/eslint-plugin": "^5.59.2",
     "@typescript-eslint/parser": "^5.59.2",
     "codecov": "^3.8.3",
-    "cross-fetch": "^3.1.5",
+    "cross-fetch": "^3.1.8",
     "did-jwt": "6.11.6",
     "eslint": "^8.35.0",
     "eslint-config-prettier": "^8.7.0",
@@ -109,15 +109,15 @@
       "@veramo/remote-server": "4.2.0",
       "@veramo/selective-disclosure": "4.2.0",
       "@veramo/url-handler": "4.2.0",
-      "@sphereon/ssi-types": "workspace:^",
-      "@sphereon/ssi-sdk.core": "workspace:^",
-      "@sphereon/ssi-sdk-ext.did-provider-key": "0.14.0",
+      "@sphereon/ssi-types": "workspace:*",
+      "@sphereon/ssi-sdk.core": "workspace:*",
       "@noble/hashes": "1.2.0",
       "did-jwt": "6.11.6",
       "did-jwt-vc": "3.1.3",
       "ethr-did": "2.3.9",
+      "typeorm": "0.3.17",
       "@mattrglobal/[email protected]>jsonld": "4.0.1",
-      "jsonld": "link:./node_modules/.pnpm/@digitalcredentials+jsonld@5.2.1/node_modules/@digitalcredentials/jsonld",
+      "jsonld": "link:./node_modules/.pnpm/@digitalcredentials+jsonld@6.0.0/node_modules/@digitalcredentials/jsonld",
       "isomorphic-webcrypto": "link:./node_modules/@sphereon/isomorphic-webcrypto"
     },
     "patchedDependencies": {

packages/agent-config/CHANGELOG.md

@@ -7,18 +7,10 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.agent-config
 
-
-
-
-
 # [0.15.0](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.14.1...v0.15.0) (2023-08-10)
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.agent-config
 
-
-
-
-
 ## [0.14.1](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.14.0...v0.14.1) (2023-07-31)
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.agent-config

packages/agent-config/package.json

@@ -12,11 +12,14 @@
     "@veramo/core": "4.2.0",
     "jsonpointer": "^5.0.1",
     "typeorm": "^0.3.12",
+    "debug": "^4.3.4",
     "url-parse": "^1.5.10",
     "yaml": "^2.2.2"
   },
   "devDependencies": {
-    "@types/url-parse": "^1.4.8"
+    "@types/url-parse": "^1.4.8",
+    "@types/debug": "^4.1.8",
+    "typescript": "4.9.5"
   },
   "files": [
     "dist/**/*",

packages/agent-config/src/dataSources.ts

@@ -0,0 +1,79 @@
+import Debug from 'debug'
+import { DataSource } from 'typeorm'
+import { BaseDataSourceOptions } from 'typeorm/data-source/BaseDataSourceOptions'
+import { DataSourceOptions } from 'typeorm/data-source/DataSourceOptions'
+
+const debug = Debug(`demo:databaseService`)
+
+export class DataSources {
+  private dataSources = new Map<string, DataSource>()
+  private configs
+
+  private static singleton: DataSources
+
+  public static singleInstance() {
+    if (!DataSources.singleton) {
+      DataSources.singleton = new DataSources()
+    }
+    return DataSources.singleton
+  }
+
+  public static newInstance(configs?: Map<string, DataSourceOptions>) {
+    return new DataSources(configs)
+  }
+
+  private constructor(configs?: Map<string, DataSourceOptions>) {
+    this.configs = configs ?? new Map<string, BaseDataSourceOptions>()
+  }
+
+  addConfig(dbName: string, config: DataSourceOptions): this {
+    this.configs.set(dbName, config)
+    return this
+  }
+
+  deleteConfig(dbName: string): this {
+    this.configs.delete(dbName)
+    return this
+  }
+
+  getConfig(dbName: string): BaseDataSourceOptions {
+    const config = this.configs.get(dbName)
+    if (!config) {
+      throw Error(`No DB config found for ${dbName}`)
+    }
+    return config
+  }
+
+  public getDbNames(): string[] {
+    return [...this.configs.keys()]
+  }
+
+  async getDbConnection(dbName: string): Promise<DataSource> {
+    const config = this.getConfig(dbName)
+    /*if (config.synchronize) {
+            return Promise.reject(
+                `WARNING: Automatic migrations need to be disabled in this app! Adjust the database configuration and set synchronize to false`
+            )
+        }*/
+
+    let dataSource = this.dataSources.get(dbName)
+    if (dataSource) {
+      return dataSource
+    }
+
+    dataSource = await new DataSource({ ...(config as DataSourceOptions), name: dbName }).initialize()
+    this.dataSources.set(dbName, dataSource)
+    if (config.synchronize) {
+      debug(`WARNING: Automatic migrations need to be disabled in this app! Adjust the database configuration and set synchronize to false`)
+    } else if (config.migrationsRun) {
+      debug(
+        `Migrations are currently managed from config. Please set migrationsRun and synchronize to false to get consistent behaviour. We run migrations from code explicitly`
+      )
+    } else {
+      debug(`Running ${dataSource.migrations.length} migration(s) from code if needed...`)
+      await dataSource.runMigrations()
+      debug(`${dataSource.migrations.length} migration(s) from code were inspected and applied`)
+    }
+    return dataSource
+  }
+}

packages/agent-config/src/index.ts

@@ -1,6 +1,7 @@
 /**
  * @public
  */
+export * from './dataSources'
 export * from './agentCreator'
 export * from './objectCreator'
 export * from './generic'

packages/agent-config/tsconfig.json

@@ -1,6 +1,7 @@
 {
   "extends": "../tsconfig-base.json",
   "compilerOptions": {
+    "experimentalDecorators": true,
     "rootDir": "src",
     "outDir": "dist",
     "declarationDir": "dist",

packages/contact-manager-rest-api/CHANGELOG.md

@@ -0,0 +1 @@
+# Change Log