@sphereon/ssi-sdk.vc-status-list 0.34.1-feature.SSISDK.26.54 → 0.34.1-feature.SSISDK.26.RP.57

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sphereon/ssi-sdk.vc-status-list",
   "description": "Sphereon SSI-SDK plugin for Status List management, like StatusList2021.",
-  "version": "0.34.1-feature.SSISDK.26.54+bb6d50bb",
+  "version": "0.34.1-feature.SSISDK.26.RP.57+9836fe9c",
   "source": "src/index.ts",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -28,12 +28,12 @@
     "@sd-jwt/sd-jwt-vc": "^0.9.2",
     "@sphereon/kmp-mdoc-core": "0.2.0-SNAPSHOT.26",
     "@sphereon/oid4vci-common": "0.19.1-feature.SSISDK.13.32",
-    "@sphereon/ssi-sdk-ext.did-utils": "0.34.1-feature.SSISDK.26.54+bb6d50bb",
-    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-feature.SSISDK.26.54+bb6d50bb",
-    "@sphereon/ssi-sdk-ext.jwt-service": "0.34.1-feature.SSISDK.26.54+bb6d50bb",
-    "@sphereon/ssi-sdk.credential-vcdm": "0.34.1-feature.SSISDK.26.54+bb6d50bb",
-    "@sphereon/ssi-sdk.data-store": "0.34.1-feature.SSISDK.26.54+bb6d50bb",
-    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.26.54+bb6d50bb",
+    "@sphereon/ssi-sdk-ext.did-utils": "0.34.1-feature.SSISDK.26.RP.57+9836fe9c",
+    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-feature.SSISDK.26.RP.57+9836fe9c",
+    "@sphereon/ssi-sdk-ext.jwt-service": "0.34.1-feature.SSISDK.26.RP.57+9836fe9c",
+    "@sphereon/ssi-sdk.credential-vcdm": "0.34.1-feature.SSISDK.26.RP.57+9836fe9c",
+    "@sphereon/ssi-sdk.data-store": "0.34.1-feature.SSISDK.26.RP.57+9836fe9c",
+    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.26.RP.57+9836fe9c",
     "@sphereon/vc-status-list": "7.0.0-next.0",
     "@veramo/core": "4.2.0",
     "@veramo/credential-status": "4.2.0",
@@ -72,5 +72,5 @@
     "SSI",
     "StatusList2021"
   ],
-  "gitHead": "bb6d50bb1ba7abdf1a04e0da27edfb9011abcc0e"
+  "gitHead": "9836fe9c1ba582b925c14e88fb09c43938edd9b2"
 }

package/src/impl/encoding/cbor.ts

@@ -1,23 +1,24 @@
 import type { BitsPerStatus } from '@sd-jwt/jwt-status-list'
 import { StatusList } from '@sd-jwt/jwt-status-list'
 import { deflate, inflate } from 'pako'
-import pkg from '@sphereon/kmp-mdoc-core'
-const { com, kotlin } = pkg
+
+import * as mdoc from '@sphereon/kmp-mdoc-core'
+
 import base64url from 'base64url'
 import type { IRequiredContext, SignedStatusListData } from '../../types'
 import { type DecodedStatusListPayload, resolveIdentifier } from './common'
 
-export type IKey = pkg.com.sphereon.crypto.IKey
-export type CborItem<T> = pkg.com.sphereon.cbor.CborItem<T>
-export const CborByteString = com.sphereon.cbor.CborByteString
-export type CborByteStringType = pkg.com.sphereon.cbor.CborByteString
-export const CborUInt = com.sphereon.cbor.CborUInt
-export type CborUIntType = pkg.com.sphereon.cbor.CborUInt
-export const CborString = com.sphereon.cbor.CborString
-export type CborStringType = pkg.com.sphereon.cbor.CborString
+export type IKey = mdoc.com.sphereon.crypto.IKey
+export type CborItem<T> = mdoc.com.sphereon.cbor.CborItem<T>
+export const CborByteString = mdoc.com.sphereon.cbor.CborByteString
+export type CborByteStringType = mdoc.com.sphereon.cbor.CborByteString
+export const CborUInt = mdoc.com.sphereon.cbor.CborUInt
+export type CborUIntType = mdoc.com.sphereon.cbor.CborUInt
+export const CborString = mdoc.com.sphereon.cbor.CborString
+export type CborStringType = mdoc.com.sphereon.cbor.CborString
 
 // const cbor = cborpkg.com.sphereon.cbor
-// const kmp = cborpkg.com.sphereon.kmp
+// const kmp = cborpkg. mdoc.com.sphereon.kmp
 // const kotlin = cborpkg.kotlin
 const decompressRawStatusList = (StatusList as any).decodeStatusList.bind(StatusList)
 
@@ -44,26 +45,28 @@ export const createSignedCbor = async (
   const compressedList = deflate(encodeStatusList, { level: 9 })
   const compressedBytes = new Int8Array(compressedList)
 
-  const statusListMap = new com.sphereon.cbor.CborMap(
-    kotlin.collections.KtMutableMap.fromJsMap(
+  const statusListMap = new mdoc.com.sphereon.cbor.CborMap(
+    mdoc.kotlin.collections.KtMutableMap.fromJsMap(
       new Map<CborStringType, CborItem<any>>([
         [
-          new com.sphereon.cbor.CborString('bits'),
-          new com.sphereon.cbor.CborUInt(com.sphereon.kmp.LongKMP.fromNumber(statusList.getBitsPerStatus())),
+          new mdoc.com.sphereon.cbor.CborString('bits'),
+          new mdoc.com.sphereon.cbor.CborUInt(mdoc.com.sphereon.kmp.LongKMP.fromNumber(statusList.getBitsPerStatus())),
         ],
-        [new com.sphereon.cbor.CborString('lst'), new com.sphereon.cbor.CborByteString(compressedBytes)],
+        [new mdoc.com.sphereon.cbor.CborString('lst'), new mdoc.com.sphereon.cbor.CborByteString(compressedBytes)],
       ]),
     ),
   )
 
-  const protectedHeader = new com.sphereon.cbor.CborMap(
-    kotlin.collections.KtMutableMap.fromJsMap(
-      new Map([[new com.sphereon.cbor.CborUInt(com.sphereon.kmp.LongKMP.fromNumber(16)), new com.sphereon.cbor.CborString('statuslist+cwt')]]), // "type"
+  const protectedHeader = new mdoc.com.sphereon.cbor.CborMap(
+    mdoc.kotlin.collections.KtMutableMap.fromJsMap(
+      new Map([
+        [new mdoc.com.sphereon.cbor.CborUInt(mdoc.com.sphereon.kmp.LongKMP.fromNumber(16)), new mdoc.com.sphereon.cbor.CborString('statuslist+cwt')],
+      ]), // "type"
     ),
   )
-  const protectedHeaderEncoded = com.sphereon.cbor.Cbor.encode(protectedHeader)
+  const protectedHeaderEncoded = mdoc.com.sphereon.cbor.Cbor.encode(protectedHeader)
   const claimsMap = buildClaimsMap(id, issuerString, statusListMap, expiresAt)
-  const claimsEncoded: Int8Array = com.sphereon.cbor.Cbor.encode(claimsMap)
+  const claimsEncoded: Int8Array = mdoc.com.sphereon.cbor.Cbor.encode(claimsMap)
 
   const signedCWT: string = await context.agent.keyManagerSign({
     keyRef: identifier.kmsKeyRef,
@@ -81,8 +84,8 @@ export const createSignedCbor = async (
     new CborByteString(claimsEncodedInt8),
     new CborByteString(signatureInt8),
   ]
-  const cwtArray = new com.sphereon.cbor.CborArray(kotlin.collections.KtMutableList.fromJsArray(cwtArrayElements))
-  const cwtEncoded = com.sphereon.cbor.Cbor.encode(cwtArray)
+  const cwtArray = new mdoc.com.sphereon.cbor.CborArray(mdoc.kotlin.collections.KtMutableList.fromJsArray(cwtArrayElements))
+  const cwtEncoded = mdoc.com.sphereon.cbor.Cbor.encode(cwtArray)
   const cwtBuffer = Buffer.from(cwtEncoded)
   return {
     statusListCredential: base64url.encode(cwtBuffer),
@@ -93,36 +96,36 @@ export const createSignedCbor = async (
 function buildClaimsMap(
   id: string,
   issuerString: string,
-  statusListMap: pkg.com.sphereon.cbor.CborMap<CborStringType, CborItem<any>>,
+  statusListMap: mdoc.com.sphereon.cbor.CborMap<CborStringType, CborItem<any>>,
   expiresAt?: Date,
 ) {
   const ttl = 65535 // FIXME figure out what value should be / come from and what the difference is with exp
   const claimsEntries: Array<[CborUIntType, CborItem<any>]> = [
-    [new CborUInt(com.sphereon.kmp.LongKMP.fromNumber(CWT_CLAIMS.SUBJECT)), new com.sphereon.cbor.CborString(id)], // "sub"
-    [new CborUInt(com.sphereon.kmp.LongKMP.fromNumber(CWT_CLAIMS.ISSUER)), new com.sphereon.cbor.CborString(issuerString)], // "iss"
+    [new CborUInt(mdoc.com.sphereon.kmp.LongKMP.fromNumber(CWT_CLAIMS.SUBJECT)), new mdoc.com.sphereon.cbor.CborString(id)], // "sub"
+    [new CborUInt(mdoc.com.sphereon.kmp.LongKMP.fromNumber(CWT_CLAIMS.ISSUER)), new mdoc.com.sphereon.cbor.CborString(issuerString)], // "iss"
     [
-      new CborUInt(com.sphereon.kmp.LongKMP.fromNumber(CWT_CLAIMS.ISSUED_AT)),
-      new CborUInt(com.sphereon.kmp.LongKMP.fromNumber(Math.floor(Date.now() / 1000))), // "iat"
+      new CborUInt(mdoc.com.sphereon.kmp.LongKMP.fromNumber(CWT_CLAIMS.ISSUED_AT)),
+      new CborUInt(mdoc.com.sphereon.kmp.LongKMP.fromNumber(Math.floor(Date.now() / 1000))), // "iat"
     ],
   ]
 
   if (expiresAt) {
     claimsEntries.push([
-      new com.sphereon.cbor.CborUInt(com.sphereon.kmp.LongKMP.fromNumber(CWT_CLAIMS.EXPIRATION)),
-      new com.sphereon.cbor.CborUInt(com.sphereon.kmp.LongKMP.fromNumber(Math.floor(expiresAt.getTime() / 1000))), // "exp"
+      new mdoc.com.sphereon.cbor.CborUInt(mdoc.com.sphereon.kmp.LongKMP.fromNumber(CWT_CLAIMS.EXPIRATION)),
+      new mdoc.com.sphereon.cbor.CborUInt(mdoc.com.sphereon.kmp.LongKMP.fromNumber(Math.floor(expiresAt.getTime() / 1000))), // "exp"
     ])
   }
 
   if (ttl) {
     claimsEntries.push([
-      new com.sphereon.cbor.CborUInt(com.sphereon.kmp.LongKMP.fromNumber(CWT_CLAIMS.TIME_TO_LIVE)),
-      new com.sphereon.cbor.CborUInt(com.sphereon.kmp.LongKMP.fromNumber(ttl)), // "time to live"
+      new mdoc.com.sphereon.cbor.CborUInt(mdoc.com.sphereon.kmp.LongKMP.fromNumber(CWT_CLAIMS.TIME_TO_LIVE)),
+      new mdoc.com.sphereon.cbor.CborUInt(mdoc.com.sphereon.kmp.LongKMP.fromNumber(ttl)), // "time to live"
     ])
   }
 
-  claimsEntries.push([new com.sphereon.cbor.CborUInt(com.sphereon.kmp.LongKMP.fromNumber(CWT_CLAIMS.STATUS_LIST)), statusListMap])
+  claimsEntries.push([new mdoc.com.sphereon.cbor.CborUInt(mdoc.com.sphereon.kmp.LongKMP.fromNumber(CWT_CLAIMS.STATUS_LIST)), statusListMap])
 
-  const claimsMap = new com.sphereon.cbor.CborMap(kotlin.collections.KtMutableMap.fromJsMap(new Map(claimsEntries)))
+  const claimsMap = new mdoc.com.sphereon.cbor.CborMap(mdoc.kotlin.collections.KtMutableMap.fromJsMap(new Map(claimsEntries)))
   return claimsMap
 }
 
@@ -135,7 +138,7 @@ const getCborValueFromMap = <T>(map: Map<CborItem<any>, CborItem<any>>, key: num
 }
 
 const getCborOptionalValueFromMap = <T>(map: Map<CborItem<any>, CborItem<any>>, key: number): T | undefined | never => {
-  const value = map.get(new CborUInt(com.sphereon.kmp.LongKMP.fromNumber(key)))
+  const value = map.get(new CborUInt(mdoc.com.sphereon.kmp.LongKMP.fromNumber(key)))
   if (!value) {
     return undefined
   }
@@ -145,25 +148,25 @@ const getCborOptionalValueFromMap = <T>(map: Map<CborItem<any>, CborItem<any>>,
 export const decodeStatusListCWT = (cwt: string): DecodedStatusListPayload => {
   const encodedCbor = base64url.toBuffer(cwt)
   const encodedCborArray = new Int8Array(encodedCbor)
-  const decodedCbor = com.sphereon.cbor.Cbor.decode(encodedCborArray)
+  const decodedCbor = mdoc.com.sphereon.cbor.Cbor.decode(encodedCborArray)
 
-  if (!(decodedCbor instanceof com.sphereon.cbor.CborArray)) {
+  if (!(decodedCbor instanceof mdoc.com.sphereon.cbor.CborArray)) {
     throw new Error('Invalid CWT format: Expected a CBOR array')
   }
 
   const [, payload] = decodedCbor.value.asJsArrayView()
-  if (!(payload instanceof com.sphereon.cbor.CborByteString)) {
+  if (!(payload instanceof mdoc.com.sphereon.cbor.CborByteString)) {
     throw new Error('Invalid payload format: Expected a CBOR ByteString')
   }
 
-  const claims = com.sphereon.cbor.Cbor.decode(payload.value)
-  if (!(claims instanceof com.sphereon.cbor.CborMap)) {
+  const claims = mdoc.com.sphereon.cbor.Cbor.decode(payload.value)
+  if (!(claims instanceof mdoc.com.sphereon.cbor.CborMap)) {
     throw new Error('Invalid claims format: Expected a CBOR map')
   }
 
   const claimsMap = claims.value.asJsMapView()
 
-  const statusListMap = claimsMap.get(new CborUInt(com.sphereon.kmp.LongKMP.fromNumber(65533))).value.asJsMapView()
+  const statusListMap = claimsMap.get(new CborUInt(mdoc.com.sphereon.kmp.LongKMP.fromNumber(65533))).value.asJsMapView()
 
   const bits = Number(statusListMap.get(new CborString('bits')).value) as BitsPerStatus
   const decoded = new Uint8Array(statusListMap.get(new CborString('lst')).value)