@nmshd/app-runtime 2.0.0-alpha.5 → 2.0.0-beta.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (35) hide show
  1. package/dist/AppRuntime.d.ts +13 -22
  2. package/dist/AppRuntime.js +68 -122
  3. package/dist/AppRuntime.js.map +1 -1
  4. package/dist/AppRuntimeErrors.d.ts +0 -1
  5. package/dist/AppRuntimeErrors.js +0 -3
  6. package/dist/AppRuntimeErrors.js.map +1 -1
  7. package/dist/SessionStorage.d.ts +10 -0
  8. package/dist/SessionStorage.js +31 -0
  9. package/dist/SessionStorage.js.map +1 -0
  10. package/dist/buildInformation.js +5 -5
  11. package/dist/events/index.d.ts +0 -1
  12. package/dist/events/index.js +0 -1
  13. package/dist/events/index.js.map +1 -1
  14. package/dist/modules/AppRuntimeModule.d.ts +1 -1
  15. package/dist/modules/AppRuntimeModule.js +4 -6
  16. package/dist/modules/AppRuntimeModule.js.map +1 -1
  17. package/dist/modules/appEvents/MailReceivedModule.js +1 -5
  18. package/dist/modules/appEvents/MailReceivedModule.js.map +1 -1
  19. package/dist/modules/appEvents/OnboardingChangeReceivedModule.js +1 -5
  20. package/dist/modules/appEvents/OnboardingChangeReceivedModule.js.map +1 -1
  21. package/dist/modules/appSync/AppSyncModule.js +1 -2
  22. package/dist/modules/appSync/AppSyncModule.js.map +1 -1
  23. package/dist/modules/pushNotifications/PushNotificationModule.d.ts +1 -1
  24. package/dist/modules/pushNotifications/PushNotificationModule.js +18 -34
  25. package/dist/modules/pushNotifications/PushNotificationModule.js.map +1 -1
  26. package/dist/modules/runtimeEvents/MessageReceivedModule.js +2 -10
  27. package/dist/modules/runtimeEvents/MessageReceivedModule.js.map +1 -1
  28. package/dist/modules/runtimeEvents/RelationshipChangedModule.js +12 -14
  29. package/dist/modules/runtimeEvents/RelationshipChangedModule.js.map +1 -1
  30. package/lib-web/nmshd.app-runtime.js +228 -256
  31. package/lib-web/nmshd.app-runtime.min.js +1 -1
  32. package/package.json +15 -16
  33. package/dist/events/RequestReceivedEvent.d.ts +0 -8
  34. package/dist/events/RequestReceivedEvent.js +0 -15
  35. package/dist/events/RequestReceivedEvent.js.map +0 -1
@@ -8,7 +8,7 @@ export declare class PushNotificationModule extends AppRuntimeModule<PushNotific
8
8
  private handleRemoteNotification;
9
9
  private handleTokenRegistration;
10
10
  private handleAccountSelected;
11
- registerPushTokenForLocalAccount(id: string, token: string): Promise<void>;
11
+ registerPushTokenForLocalAccount(address: string, token: string): Promise<void>;
12
12
  getNotificationTokenFromConfig(): Result<string>;
13
13
  stop(): void;
14
14
  }
@@ -21,28 +21,23 @@ class PushNotificationModule extends AppRuntimeModule_1.AppRuntimeModule {
21
21
  const notification = event.notification;
22
22
  const content = notification.content;
23
23
  try {
24
- const account = await this.runtime.selectAccountByAddress(content.accRef, "");
25
- const session = this.runtime.findSession(account.id.toString());
26
- if (!session) {
27
- this.logger.error(`No session found for account ref ${content.accRef}`);
28
- return;
29
- }
24
+ const services = await this.runtime.getServices(content.accRef);
30
25
  switch (content.eventName) {
31
26
  case IBackboneEventContent_1.BackboneEventName.DatawalletModificationsCreated:
32
- const walletResult = await session.transportServices.account.syncDatawallet();
27
+ const walletResult = await services.transportServices.account.syncDatawallet();
33
28
  if (walletResult.isError) {
34
29
  this.logger.error(walletResult);
35
30
  return;
36
31
  }
37
- this.runtime.eventBus.publish(new events_1.DatawalletSynchronizedEvent(session.address));
32
+ this.runtime.eventBus.publish(new events_1.DatawalletSynchronizedEvent(content.accRef));
38
33
  break;
39
34
  case IBackboneEventContent_1.BackboneEventName.ExternalEventCreated:
40
- const syncResult = await session.transportServices.account.syncEverything();
35
+ const syncResult = await services.transportServices.account.syncEverything();
41
36
  if (syncResult.isError) {
42
37
  this.logger.error(syncResult);
43
38
  return;
44
39
  }
45
- this.runtime.eventBus.publish(new events_1.ExternalEventReceivedEvent(session.address, syncResult.value.messages, syncResult.value.relationships));
40
+ this.runtime.eventBus.publish(new events_1.ExternalEventReceivedEvent(content.accRef, syncResult.value.messages, syncResult.value.relationships));
46
41
  break;
47
42
  default:
48
43
  break;
@@ -55,8 +50,8 @@ class PushNotificationModule extends AppRuntimeModule_1.AppRuntimeModule {
55
50
  async handleTokenRegistration(event) {
56
51
  try {
57
52
  this.logger.trace("PushNotificationModule.handleTokenRegistration", event);
58
- for (const account of this.runtime.getSessions()) {
59
- await this.registerPushTokenForLocalAccount(account.id, event.token);
53
+ for (const session of this.runtime.getSessions()) {
54
+ await this.registerPushTokenForLocalAccount(session.account.address, event.token);
60
55
  }
61
56
  }
62
57
  catch (e) {
@@ -64,33 +59,22 @@ class PushNotificationModule extends AppRuntimeModule_1.AppRuntimeModule {
64
59
  }
65
60
  }
66
61
  async handleAccountSelected(event) {
67
- try {
68
- this.logger.trace("PushNotificationModule.handleAccountSelected", event);
69
- const tokenResult = this.getNotificationTokenFromConfig();
70
- if (tokenResult.isSuccess) {
71
- await this.registerPushTokenForLocalAccount(event.data.localAccountId, tokenResult.value);
72
- }
73
- else {
74
- this.logger.error(tokenResult.error);
75
- }
76
- }
77
- catch (e) {
78
- this.logger.error(e);
62
+ this.logger.trace("PushNotificationModule.handleAccountSelected", event);
63
+ const tokenResult = this.getNotificationTokenFromConfig();
64
+ if (tokenResult.isError) {
65
+ this.logger.error(tokenResult.error);
66
+ return;
79
67
  }
68
+ await this.registerPushTokenForLocalAccount(event.data.address, tokenResult.value);
80
69
  }
81
- async registerPushTokenForLocalAccount(id, token) {
70
+ async registerPushTokenForLocalAccount(address, token) {
82
71
  if (!token) {
83
72
  throw AppRuntimeErrors_1.AppRuntimeErrors.modules.pushNotificationModule
84
73
  .tokenRegistrationNotPossible("The registered token was empty. This might be the case if you did not allow push notifications.")
85
74
  .logWith(this.logger);
86
75
  }
87
- const session = this.runtime.findSession(id);
88
- if (!session) {
89
- throw AppRuntimeErrors_1.AppRuntimeErrors.modules.pushNotificationModule
90
- .tokenRegistrationNotPossible("No session for this account found")
91
- .logWith(this.logger);
92
- }
93
- const deviceResult = await session.transportServices.account.getDeviceInfo();
76
+ const services = await this.runtime.getServices(address);
77
+ const deviceResult = await services.transportServices.account.getDeviceInfo();
94
78
  if (deviceResult.isError) {
95
79
  throw AppRuntimeErrors_1.AppRuntimeErrors.modules.pushNotificationModule
96
80
  .tokenRegistrationNotPossible("No device for this account found", deviceResult.error)
@@ -100,7 +84,7 @@ class PushNotificationModule extends AppRuntimeModule_1.AppRuntimeModule {
100
84
  const platform = this.runtime.nativeEnvironment.deviceInfoAccess.deviceInfo.pushService;
101
85
  const handle = token;
102
86
  const installationId = device.id;
103
- const result = await session.transportServices.account.registerPushNotificationToken({
87
+ const result = await services.transportServices.account.registerPushNotificationToken({
104
88
  platform,
105
89
  handle,
106
90
  installationId
@@ -111,7 +95,7 @@ class PushNotificationModule extends AppRuntimeModule_1.AppRuntimeModule {
111
95
  .logWith(this.logger);
112
96
  }
113
97
  else {
114
- this.logger.trace(`PushNotificationModule.registerPushTokenForLocalAccount: Token ${handle} registered for account ${id} on platform ${platform} and installationId ${installationId}`);
98
+ this.logger.trace(`PushNotificationModule.registerPushTokenForLocalAccount: Token ${handle} registered for account ${address} on platform ${platform} and installationId ${installationId}`);
115
99
  }
116
100
  }
117
101
  getNotificationTokenFromConfig() {
@@ -1 +1 @@
1
- {"version":3,"file":"PushNotificationModule.js","sourceRoot":"","sources":["../../../src/modules/pushNotifications/PushNotificationModule.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"PushNotificationModule.js","sourceRoot":"","sources":["../../../src/modules/pushNotifications/PushNotificationModule.ts"],"names":[],"mappings":"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"}
@@ -16,17 +16,9 @@ class MessageReceivedModule extends AppRuntimeModule_1.AppRuntimeModule {
16
16
  this.subscribeToEvent(runtime_1.MessageReceivedEvent, this.handleMessageReceived.bind(this));
17
17
  }
18
18
  async handleMessageReceived(event) {
19
- const message = event.data;
20
- const session = this.runtime.findSessionByAddress(event.eventTargetAddress);
21
- if (!session) {
22
- this.logger.error(`No session found for address ${event.eventTargetAddress}`);
23
- return;
24
- }
25
- const messageDVO = await session.expander.expandMessageDTO(message);
19
+ const services = await this.runtime.getServices(event.eventTargetAddress);
20
+ const messageDVO = await services.dataViewExpander.expandMessageDTO(event.data);
26
21
  switch (messageDVO.type) {
27
- case "RequestMessageDVO":
28
- this.runtime.eventBus.publish(new events_1.RequestReceivedEvent(event.eventTargetAddress, messageDVO.request, messageDVO));
29
- break;
30
22
  case "MailDVO":
31
23
  const mail = messageDVO;
32
24
  this.runtime.eventBus.publish(new events_1.MailReceivedEvent(event.eventTargetAddress, mail));
@@ -1 +1 @@
1
- {"version":3,"file":"MessageReceivedModule.js","sourceRoot":"","sources":["../../../src/modules/runtimeEvents/MessageReceivedModule.ts"],"names":[],"mappings":";;;AAAA,4CAA8D;AAC9D,2DAAuD;AACvD,yCAAsE;AACtE,0DAAqF;AAIrF,MAAa,0BAA2B,SAAQ,iCAAe;CAAG;AAAlE,gEAAkE;AAElE,MAAa,qBAAsB,SAAQ,mCAA6C;IAC7E,KAAK,CAAC,IAAI;QACb,qBAAqB;IACzB,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,gBAAgB,CAAC,8BAAoB,EAAE,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IACtF,CAAC;IAEO,KAAK,CAAC,qBAAqB,CAAC,KAA2B;QAC3D,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAA;QAC1B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;QAC3E,IAAI,CAAC,OAAO,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,KAAK,CAAC,kBAAkB,EAAE,CAAC,CAAA;YAC7E,OAAM;SACT;QACD,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAA;QAEnE,QAAQ,UAAU,CAAC,IAAI,EAAE;YACrB,KAAK,mBAAmB;gBACpB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CACzB,IAAI,6BAAoB,CAAC,KAAK,CAAC,kBAAkB,EAAE,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,CACrF,CAAA;gBACD,MAAK;YACT,KAAK,SAAS;gBACV,MAAM,IAAI,GAAY,UAAU,CAAA;gBAChC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,0BAAiB,CAAC,KAAK,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC,CAAA;gBACpF,MAAK;YACT;gBACI,MAAK;SACZ;IACL,CAAC;IAEM,IAAI;QACP,IAAI,CAAC,wBAAwB,EAAE,CAAA;IACnC,CAAC;CACJ;AApCD,sDAoCC"}
1
+ {"version":3,"file":"MessageReceivedModule.js","sourceRoot":"","sources":["../../../src/modules/runtimeEvents/MessageReceivedModule.ts"],"names":[],"mappings":";;;AAAA,4CAA8D;AAC9D,2DAAuD;AACvD,yCAAgD;AAChD,0DAAqF;AAIrF,MAAa,0BAA2B,SAAQ,iCAAe;CAAG;AAAlE,gEAAkE;AAElE,MAAa,qBAAsB,SAAQ,mCAA6C;IAC7E,KAAK,CAAC,IAAI;QACb,qBAAqB;IACzB,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,gBAAgB,CAAC,8BAAoB,EAAE,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IACtF,CAAC;IAEO,KAAK,CAAC,qBAAqB,CAAC,KAA2B;QAC3D,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;QACzE,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAE/E,QAAQ,UAAU,CAAC,IAAI,EAAE;YACrB,KAAK,SAAS;gBACV,MAAM,IAAI,GAAY,UAAU,CAAA;gBAChC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,0BAAiB,CAAC,KAAK,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC,CAAA;gBACpF,MAAK;YACT;gBACI,MAAK;SACZ;IACL,CAAC;IAEM,IAAI;QACP,IAAI,CAAC,wBAAwB,EAAE,CAAA;IACnC,CAAC;CACJ;AA1BD,sDA0BC"}
@@ -17,21 +17,19 @@ class RelationshipChangedModule extends AppRuntimeModule_1.AppRuntimeModule {
17
17
  }
18
18
  async handleRelationshipChanged(event) {
19
19
  const relationship = event.data;
20
- const session = this.runtime.findSessionByAddress(event.eventTargetAddress);
21
- if (!session) {
22
- this.logger.error(`No session found for address ${event.eventTargetAddress}`);
20
+ // Only listen for the creation change (the first one)
21
+ if (relationship.changes.length !== 1)
23
22
  return;
24
- }
25
- // The very first change is the onboarding change
26
- if (relationship.changes.length === 1) {
27
- const change = relationship.changes[0];
28
- // Only fire received events if the current session did not create it
29
- if ((!change.response && change.request.createdBy !== session.address) ||
30
- (change.response && change.response.createdBy !== session.address)) {
31
- const relationshipDVO = await session.expander.expandRelationshipDTO(relationship);
32
- this.runtime.eventBus.publish(new events_1.OnboardingChangeReceivedEvent(session.address, relationship.changes[0], relationship, relationshipDVO));
33
- }
34
- }
23
+ const change = relationship.changes[0];
24
+ // response exits and created by the current identity
25
+ if (!change.response && change.request.createdBy === event.eventTargetAddress)
26
+ return;
27
+ // response exits and created by the current identity
28
+ if (change.response && change.response.createdBy === event.eventTargetAddress)
29
+ return;
30
+ const services = await this.runtime.getServices(event.eventTargetAddress);
31
+ const relationshipDVO = await services.dataViewExpander.expandRelationshipDTO(relationship);
32
+ this.runtime.eventBus.publish(new events_1.OnboardingChangeReceivedEvent(event.eventTargetAddress, change, relationship, relationshipDVO));
35
33
  }
36
34
  stop() {
37
35
  this.unsubscribeFromAllEvents();
@@ -1 +1 @@
1
- {"version":3,"file":"RelationshipChangedModule.js","sourceRoot":"","sources":["../../../src/modules/runtimeEvents/RelationshipChangedModule.ts"],"names":[],"mappings":";;;AAAA,4CAAyD;AACzD,2DAAuD;AACvD,yCAA4D;AAC5D,0DAAqF;AAIrF,MAAa,8BAA+B,SAAQ,iCAAe;CAAG;AAAtE,wEAAsE;AAEtE,MAAa,yBAA0B,SAAQ,mCAAiD;IACrF,KAAK,CAAC,IAAI;QACb,qBAAqB;IACzB,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,gBAAgB,CAAC,kCAAwB,EAAE,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IAC9F,CAAC;IAEO,KAAK,CAAC,yBAAyB,CAAC,KAA+B;QACnE,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAA;QAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;QAC3E,IAAI,CAAC,OAAO,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,KAAK,CAAC,kBAAkB,EAAE,CAAC,CAAA;YAC7E,OAAM;SACT;QAED,iDAAiD;QACjD,IAAI,YAAY,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YACnC,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;YACtC,qEAAqE;YACrE,IACI,CAAC,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,KAAK,OAAO,CAAC,OAAO,CAAC;gBAClE,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,SAAS,KAAK,OAAO,CAAC,OAAO,CAAC,EACpE;gBACE,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC,YAAY,CAAC,CAAA;gBAClF,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CACzB,IAAI,sCAA6B,CAC7B,OAAO,CAAC,OAAO,EACf,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EACvB,YAAY,EACZ,eAAe,CAClB,CACJ,CAAA;aACJ;SACJ;IACL,CAAC;IAEM,IAAI;QACP,IAAI,CAAC,wBAAwB,EAAE,CAAA;IACnC,CAAC;CACJ;AAzCD,8DAyCC"}
1
+ {"version":3,"file":"RelationshipChangedModule.js","sourceRoot":"","sources":["../../../src/modules/runtimeEvents/RelationshipChangedModule.ts"],"names":[],"mappings":";;;AAAA,4CAAyD;AACzD,2DAAuD;AACvD,yCAA4D;AAC5D,0DAAqF;AAIrF,MAAa,8BAA+B,SAAQ,iCAAe;CAAG;AAAtE,wEAAsE;AAEtE,MAAa,yBAA0B,SAAQ,mCAAiD;IACrF,KAAK,CAAC,IAAI;QACb,qBAAqB;IACzB,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,gBAAgB,CAAC,kCAAwB,EAAE,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IAC9F,CAAC;IAEO,KAAK,CAAC,yBAAyB,CAAC,KAA+B;QACnE,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAA;QAC/B,sDAAsD;QACtD,IAAI,YAAY,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,OAAM;QAE7C,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;QAEtC,qDAAqD;QACrD,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,KAAK,KAAK,CAAC,kBAAkB;YAAE,OAAM;QAErF,qDAAqD;QACrD,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,SAAS,KAAK,KAAK,CAAC,kBAAkB;YAAE,OAAM;QAErF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;QACzE,MAAM,eAAe,GAAG,MAAM,QAAQ,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,YAAY,CAAC,CAAA;QAC3F,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CACzB,IAAI,sCAA6B,CAAC,KAAK,CAAC,kBAAkB,EAAE,MAAM,EAAE,YAAY,EAAE,eAAe,CAAC,CACrG,CAAA;IACL,CAAC;IAEM,IAAI;QACP,IAAI,CAAC,wBAAwB,EAAE,CAAA;IACnC,CAAC;CACJ;AAhCD,8DAgCC"}