Merge pull request #127 from jolocom/fix/deeplinks

Fixes for the Deeplinks implementation

src/agent.ts

@@ -378,6 +378,8 @@ export class Agent {
       // JWTs
       await interxn.processInteractionToken(token)
       await this.storage.store.interactionToken(token)
+    } else if (interxn.lastMessage.encode() === jwt) {
+      this.interactionManager.emit('interactionResumed', interxn)
     }
 
     return interxn

src/errors.ts

@@ -4,6 +4,7 @@ export enum ErrorCode {
   SaveExternalCredentialFailed = 'SaveExtCred',
   SaveCredentialMetadataFailed = 'SaveCredMetadata',
   TransportNotSupported = 'UnsuportedTransport',
+  TransportSubscriptionNotSuported = 'TransportSubscriptionNotSuported',
 
   TokenExpired = 'TokenExpired',
   InvalidSignature = 'InvalidSignature',

src/interactionManager/interactionManager.ts

@@ -16,6 +16,7 @@ flows.forEach((f) => {
 export interface InteractionEvents {
   interactionCreated: (interxn: Interaction) => void
   interactionUpdated: (interxn: Interaction) => void
+  interactionResumed: (interxn: Interaction) => void
 }
 
 /**

src/transports.ts

@@ -1,6 +1,11 @@
 import { SDKError, ErrorCode } from './errors'
 import { HTTPTransport } from './http'
-import { TransportHandler, TransportDesc, TransportMessageHandler, TransportAPI } from './types'
+import {
+  TransportHandler,
+  TransportDesc,
+  TransportMessageHandler,
+  TransportAPI,
+} from './types'
 import { WebSocketTransport } from './websocket'
 
 export class Transportable {
@@ -18,7 +23,6 @@ export class Transportable {
   set transportAPI(api: TransportAPI) {
     this._transportAPI = api
   }
-
 }
 
 export class TransportKeeper {
@@ -36,10 +40,22 @@ export class TransportKeeper {
     }
   }
 
-  public register(
-    typeName: string,
-    handler: TransportHandler
-  ) {
+  private getTransportHandler(typeName: string) {
+    const transportHandler = this._transportHandlers[typeName]
+    if (!transportHandler) throw new SDKError(ErrorCode.TransportNotSupported)
+
+    return transportHandler
+  }
+
+  public subscribe(typeName: string, onMessage: TransportMessageHandler) {
+    const transportHandler = this.getTransportHandler(typeName)
+    if (!transportHandler.subscribe)
+      throw new SDKError(ErrorCode.TransportSubscriptionNotSuported)
+
+    transportHandler.subscribe(onMessage)
+  }
+
+  public register(typeName: string, handler: TransportHandler) {
     this._transportHandlers[typeName] = handler
   }
 
@@ -49,11 +65,9 @@ export class TransportKeeper {
    */
   public async start(
     transport: TransportDesc,
-    onMessage?: TransportMessageHandler
+    onMessage?: TransportMessageHandler,
   ): Promise<TransportAPI> {
-    const transportHandler = this._transportHandlers[transport.type]
-    if (!transportHandler) throw new SDKError(ErrorCode.TransportNotSupported)
-
+    const transportHandler = this.getTransportHandler(transport.type)
     const transportAPI = transportHandler.start(transport, onMessage)
     transportAPI.desc = transport
     return transportAPI

src/types.ts

@@ -47,13 +47,17 @@ export interface TransportDesc {
 /**
  * @category Transports
  */
-export type TransportMessageHandler = (msg: string) => Promise<void>
+export type TransportMessageHandler = (
+  msg: string,
+  error?: Error,
+) => Promise<void>
 
 /**
  * @category Transports
  */
 export interface TransportHandler {
   configure?(...args: any[]): void
+  subscribe?(onMessage: TransportMessageHandler): void
   start(d: TransportDesc, cb?: TransportMessageHandler): TransportAPI
 }