fix: Remove daf-data-store from packages

packages/daf-cli/package.json

@@ -16,7 +16,6 @@
     "commander": "^4.0.1",
     "console-table-printer": "^1.1.15",
     "daf-core": "^4.0.0-beta.45",
-    "daf-data-store": "^4.0.0-beta.45",
     "daf-did-comm": "^4.0.0-beta.45",
     "daf-did-jwt": "^4.0.0-beta.45",
     "daf-ethr-did": "^4.0.0-beta.45",

packages/daf-cli/src/credential.ts

@@ -1,7 +1,7 @@
 import * as Daf from 'daf-core'
 import * as W3c from 'daf-w3c'
 import * as DIDComm from 'daf-did-comm'
-import { agent, dataStore } from './setup'
+import { agent } from './setup'
 import program from 'commander'
 import inquirer from 'inquirer'
 import qrcode from 'qrcode-terminal'
@@ -98,19 +98,19 @@ program
       process.exit()
     }
 
-    const dids = await dataStore.allIdentities()
+    const ids = await Daf.Identity.find()
 
     const identities = [
       {
         name: 'Enter manualy',
         value: 'manual',
       },
     ]
-    for (const did of dids) {
-      const shortId = await dataStore.shortId(did.did)
+    for (const id of ids) {
+      const name = await id.getLatestClaimValue(agent.dbConnection, { type: 'name'})
       identities.push({
-        value: did.did,
-        name: `${did.did} - ${shortId}`,
+        value: id.did,
+        name: `${id.did} - ${name}`,
       })
     }
 
@@ -148,19 +148,21 @@ program
       aud = answers.aud
     }
 
-    const credentials = await dataStore.findCredentials({ sub: answers.iss })
+    const credentials = await Daf.Credential.find({ 
+      where: { subject: answers.iss}, 
+      relations: ['claims'] 
+    })
     const list: any = []
     if (credentials.length > 0) {
       for (const credential of credentials) {
-        const fields = await dataStore.credentialsFieldsForClaimHash(credential.hash)
-        const issuer = await dataStore.shortId(credential.iss.did)
+        const issuer = credential.issuer.shortDid()
         const claims = []
-        for (const field of fields) {
-          claims.push(field.type + ' = ' + field.value)
+        for (const claim of credential.claims) {
+          claims.push(claim.type + ' = ' + claim.value)
         }
         list.push({
           name: claims.join(', ') + ' | Issuer: ' + issuer,
-          value: credential.jwt,
+          value: credential.raw,
         })
       }
 

packages/daf-cli/src/data-explorer.ts

@@ -1,4 +1,5 @@
-import { agent, dataStore } from './setup'
+import * as Daf from 'daf-core'
+import { agent } from './setup'
 import program from 'commander'
 import inquirer from 'inquirer'
 import { formatDistanceToNow } from 'date-fns'
@@ -11,18 +12,19 @@ program
   .option('-m, --messages', 'List messages')
   .action(async cmd => {
     if (cmd.identities) {
-      const dids = await dataStore.allIdentities()
-      if (dids.length === 0) {
+      const dbConnection = await agent.dbConnection
+      const ids = await dbConnection.getRepository(Daf.Identity).find()
+      if (ids.length === 0) {
         console.error('No dids')
         process.exit()
       }
 
       const identities = []
-      for (const did of dids) {
-        const shortId = await dataStore.shortId(did.did)
+      for (const id of ids) {
+        const name = await id.getLatestClaimValue(agent.dbConnection, {type: 'name'})
         identities.push({
-          value: did.did,
-          name: `${did.did} - ${shortId}`,
+          value: id.did,
+          name: `${id.did} - ${name || id.shortDid()}`,
         })
       }
 
@@ -43,10 +45,10 @@ program
 
       switch (answers.type) {
         case 'Sent Messages':
-          showMessageList(await dataStore.findMessages({ sender: answers.did }))
+          showMessageList(await Daf.Message.find({ where: { from: answers.did } }))
           break
         case 'Received Messages':
-          showMessageList(await dataStore.findMessages({ receiver: answers.did }))
+          showMessageList(await Daf.Message.find({ where: { to: answers.did } }))
           break
         case 'Credentials':
           showCredentials(answers.did)
@@ -55,11 +57,12 @@ program
     }
 
     if (cmd.messages) {
-      showMessageList(await dataStore.findMessages({}))
+      const dbConnection = await agent.dbConnection
+      showMessageList(await dbConnection.getRepository(Daf.Message).find())
     }
   })
 
-const showMessageList = async (messages: any) => {
+const showMessageList = async (messages: Daf.Message[]) => {
   if (messages.length === 0) {
     console.error('No messages')
     process.exit()
@@ -69,9 +72,9 @@ const showMessageList = async (messages: any) => {
     {
       type: 'list',
       name: 'id',
-      choices: messages.map((item: any) => ({
-        name: `${formatDistanceToNow(item.timestamp * 1000)} ${item.type} from: ${item.sender?.did} to: ${
-          item.receiver?.did
+      choices: messages.map((item: Daf.Message) => ({
+        name: `${formatDistanceToNow(item.createdAt)} ${item.type} from: ${item.from?.did} to: ${
+          item.to?.did
         }`,
         value: item.id,
       })),
@@ -82,22 +85,23 @@ const showMessageList = async (messages: any) => {
 }
 
 const showMessage = async (id: string) => {
-  const message = await dataStore.findMessage(id)
+  const dbConnection = await agent.dbConnection
+  const message = await dbConnection.getRepository(Daf.Message)
+    .findOne(id, {relations: ['credentials', 'credentials.claims']})
   console.log(message)
 
   const table = []
-  const credentials = await dataStore.credentialsForMessageId(id)
-  if (credentials.length > 0) {
-    for (const credential of credentials) {
-      const fields = await dataStore.credentialsFieldsForClaimHash(credential.hash)
-      const issuer = await dataStore.shortId(credential.iss.did)
-      const subject = await dataStore.shortId(credential.sub.did)
-      for (const field of fields) {
+
+  if (message.credentials.length > 0) {
+    for (const credential of message.credentials) {
+      const issuer = credential.issuer.shortDid()
+      const subject = credential.subject.shortDid()
+      for (const claim of credential.claims) {
         table.push({
           from: issuer,
           to: subject,
-          type: field.type,
-          value: field.value,
+          type: claim.type,
+          value: claim.value,
         })
       }
     }
@@ -108,18 +112,21 @@ const showMessage = async (id: string) => {
 
 const showCredentials = async (did: string) => {
   const table = []
-  const credentials = await dataStore.findCredentials({ sub: did })
+  const dbConnection = await agent.dbConnection
+
+  const credentials = await dbConnection.getRepository(Daf.Credential)
+    .find({ where: { subject: did } })
+
   if (credentials.length > 0) {
     for (const credential of credentials) {
-      const fields = await dataStore.credentialsFieldsForClaimHash(credential.hash)
-      const issuer = await dataStore.shortId(credential.iss.did)
-      const subject = await dataStore.shortId(credential.sub.did)
-      for (const field of fields) {
+      const issuer = credential.issuer.shortDid()
+      const subject = credential.subject.shortDid()
+      for (const claim of credential.claims) {
         table.push({
           from: issuer,
           to: subject,
-          type: field.type,
-          value: field.value,
+          type: claim.type,
+          value: claim.value,
         })
       }
     }

packages/daf-cli/src/graphql.ts

@@ -6,7 +6,7 @@ import { TrustGraphGql } from 'daf-trust-graph'
 import { DIDCommGql } from 'daf-did-comm'
 import { SdrGql } from 'daf-selective-disclosure'
 import merge from 'lodash.merge'
-import { agent, dataStore } from './setup'
+import { agent } from './setup'
 import { listen } from './services'
 program
   .command('graphql')
@@ -33,7 +33,7 @@ program
         W3cGql.resolvers,
         SdrGql.resolvers,
       ),
-      context: () => ({ dataStore, agent }),
+      context: () => ({ agent }),
       introspection: true,
     })
     // await core.setupServices()

packages/daf-cli/src/msg.ts

@@ -1,5 +1,5 @@
 import * as Daf from 'daf-core'
-import { agent, dataStore } from './setup'
+import { agent } from './setup'
 import program from 'commander'
 
 program

packages/daf-cli/src/services.ts

@@ -1,5 +1,5 @@
 import { EventTypes, Message } from 'daf-core'
-import { agent, dataStore } from './setup'
+import { agent } from './setup'
 import program from 'commander'
 import { setInterval } from 'timers'
 
@@ -18,11 +18,11 @@ export const listen = async (pollSeconds?: number) => {
 
   await agent.setupServices()
   await agent.listen()
-  await agent.getMessagesSince(await dataStore.latestMessageTimestamps())
+  await agent.getMessagesSince([])
 
   if (pollSeconds) {
     setInterval(async () => {
-      await agent.getMessagesSince(await dataStore.latestMessageTimestamps())
+      await agent.getMessagesSince([])
     }, pollSeconds * 1000)
   }
 }

packages/daf-cli/src/setup.ts

@@ -13,7 +13,6 @@ import { DIDCommActionHandler, DIDCommMessageHandler } from 'daf-did-comm'
 import { UrlMessageHandler } from 'daf-url'
 import { createConnection } from 'typeorm'
 
-import { DataStore } from 'daf-data-store'
 import ws from 'ws'
 
 const defaultPath = process.env.HOME + '/.daf/'
@@ -82,5 +81,3 @@ export const agent = new Daf.Agent({
   messageHandler,
   actionHandler,
 })
-
-export const dataStore = new DataStore()

packages/daf-cli/tsconfig.json

@@ -6,7 +6,6 @@
   },
   "references": [
     { "path": "../daf-core" },
-    { "path": "../daf-data-store" },
     { "path": "../daf-did-comm" },
     { "path": "../daf-did-jwt" },
     { "path": "../daf-ethr-did" },