Simplify app-runtime natives (#409)

* feat: use eventbus from runtime for native events

* feat: get rid of the NativeDeviceInfoAccess

* fix: push test

Author: jkoenig134

packages/app-runtime/src/AppConfig.ts

@@ -5,6 +5,7 @@ import { defaultsDeep } from "lodash";
 export interface AppConfig extends RuntimeConfig {
     accountsDbName: string;
     applicationId: string;
+    pushService: "apns" | "fcm" | "none" | "dummy";
     applePushEnvironment?: "Development" | "Production";
     allowMultipleAccountsWithSameAddress: boolean;
     databaseFolder: string;
@@ -14,6 +15,7 @@ export interface AppConfigOverwrite {
     transportLibrary?: Omit<IConfigOverwrite, "supportedIdentityVersion">;
     accountsDbName?: string;
     applicationId?: string;
+    pushService?: "apns" | "fcm" | "none" | "dummy";
     applePushEnvironment?: "Development" | "Production";
     allowMultipleAccountsWithSameAddress?: boolean;
     databaseFolder?: string;
@@ -25,6 +27,9 @@ export function createAppConfig(...configs: (AppConfigOverwrite | AppConfig)[]):
         transportLibrary: Omit<IConfigOverwrite, "supportedIdentityVersion" | "platformClientId" | "platformClientSecret" | "baseUrl">;
     } = {
         accountsDbName: "accounts",
+        pushService: "none",
+        allowMultipleAccountsWithSameAddress: false,
+        databaseFolder: "./data",
         transportLibrary: {
             datawalletEnabled: true
         },
@@ -107,9 +112,7 @@ export function createAppConfig(...configs: (AppConfigOverwrite | AppConfig)[]):
                 displayName: "Notification Module",
                 location: "@nmshd/runtime:NotificationModule"
             }
-        },
-        allowMultipleAccountsWithSameAddress: false,
-        databaseFolder: "./data"
+        }
     };
 
     const mergedConfig = defaultsDeep({}, ...configs, appConfig);

packages/app-runtime/src/modules/AppRuntimeModule.ts

@@ -1,5 +1,4 @@
 import { ILogger } from "@js-soft/logging-abstractions";
-import { EventHandler, SubscriptionTarget } from "@js-soft/ts-utils";
 import { ModuleConfiguration, RuntimeModule } from "@nmshd/runtime";
 import { AppRuntime } from "../AppRuntime";
 
@@ -11,16 +10,4 @@ export interface AppRuntimeModuleConfiguration extends ModuleConfiguration {}
 
 export abstract class AppRuntimeModule<TConfig extends AppRuntimeModuleConfiguration = AppRuntimeModuleConfiguration> extends RuntimeModule<TConfig, AppRuntime> {
     private readonly nativeEventSubscriptionIds: number[] = [];
-
-    protected subscribeToNativeEvent<TEvent>(event: SubscriptionTarget<TEvent>, handler: EventHandler<TEvent>): void {
-        const subscriptionResult = this.runtime.nativeEnvironment.eventBus.subscribe(event, handler);
-        this.nativeEventSubscriptionIds.push(subscriptionResult);
-    }
-
-    protected override unsubscribeFromAllEvents(): void {
-        super.unsubscribeFromAllEvents();
-
-        this.nativeEventSubscriptionIds.forEach((id) => this.runtime.nativeEnvironment.eventBus.unsubscribe(id));
-        this.nativeEventSubscriptionIds.splice(0);
-    }
 }

packages/app-runtime/src/modules/PushNotificationModule.ts

@@ -24,8 +24,8 @@ export class PushNotificationModule extends AppRuntimeModule<PushNotificationMod
     }
 
     public start(): void {
-        this.subscribeToNativeEvent(RemoteNotificationEvent, this.handleRemoteNotification.bind(this));
-        this.subscribeToNativeEvent(RemoteNotificationRegistrationEvent, this.handleTokenRegistration.bind(this));
+        this.subscribeToEvent(RemoteNotificationEvent, this.handleRemoteNotification.bind(this));
+        this.subscribeToEvent(RemoteNotificationRegistrationEvent, this.handleTokenRegistration.bind(this));
         this.subscribeToEvent(AccountSelectedEvent, this.handleAccountSelected.bind(this));
     }
 
@@ -102,9 +102,9 @@ export class PushNotificationModule extends AppRuntimeModule<PushNotificationMod
             throw AppRuntimeErrors.modules.pushNotificationModule.tokenRegistrationNotPossible("No device for this account found", deviceResult.error).logWith(this.logger);
         }
 
-        const platform = this.runtime.nativeEnvironment.deviceInfoAccess.deviceInfo.pushService;
         const appId = this.runtime.config.applicationId;
         const handle = token;
+        const platform = this.runtime.config.pushService;
         const environment = this.runtime.config.applePushEnvironment;
 
         const result = await services.transportServices.account.registerPushNotificationToken({

packages/app-runtime/src/modules/appEvents/AppLaunchModule.ts

@@ -12,7 +12,7 @@ export class AppLaunchModule extends AppRuntimeModule<AppLaunchModuleConfig> {
     }
 
     public start(): void {
-        this.subscribeToNativeEvent(UrlOpenEvent, this.handleUrlOpen.bind(this));
+        this.subscribeToEvent(UrlOpenEvent, this.handleUrlOpen.bind(this));
     }
 
     private async handleUrlOpen(event: UrlOpenEvent) {

packages/app-runtime/src/natives/INativeDeviceInfoAccess.ts

@@ -1,15 +1,11 @@
 import { ILokiJsDatabaseFactory } from "@js-soft/docdb-access-loki";
 import { ILoggerFactory } from "@js-soft/logging-abstractions";
-import { EventBus } from "@js-soft/ts-utils";
 import { INativeConfigAccess } from "./INativeConfigAccess";
-import { INativeDeviceInfoAccess } from "./INativeDeviceInfoAccess";
 import { INativeNotificationAccess } from "./INativeNotificationAccess";
 
 export interface INativeEnvironment {
     databaseFactory: ILokiJsDatabaseFactory;
     configAccess: INativeConfigAccess;
     loggerFactory: ILoggerFactory;
     notificationAccess: INativeNotificationAccess;
-    eventBus: EventBus;
-    deviceInfoAccess: INativeDeviceInfoAccess;
 }

packages/app-runtime/src/natives/INativeEnvironment.ts

@@ -1,7 +1,6 @@
 export * from "./events";
 export * from "./INativeBootstrapper";
 export * from "./INativeConfigAccess";
-export * from "./INativeDeviceInfoAccess";
 export * from "./INativeEnvironment";
 export * from "./INativeNotificationAccess";
 export * from "./INativeTranslationProvider";

packages/app-runtime/src/natives/index.ts

@@ -34,7 +34,7 @@ export class TestUtil {
 
         const config = this.createAppConfig(configOverride);
 
-        const nativeBootstrapper = new FakeNativeBootstrapper(eventBus);
+        const nativeBootstrapper = new FakeNativeBootstrapper();
         await nativeBootstrapper.init();
         const runtime = await AppRuntime.create(nativeBootstrapper, config, eventBus);
         runtime.registerUIBridge(uiBridge);

packages/app-runtime/test/lib/TestUtil.ts

@@ -1,14 +1,11 @@
 import { NodeLoggerFactory } from "@js-soft/node-logger";
-import { EventBus, EventEmitter2EventBus, Result } from "@js-soft/ts-utils";
+import { Result } from "@js-soft/ts-utils";
 import { INativeBootstrapper, INativeEnvironment } from "../../../src";
 import { FakeNativeConfigAccess } from "./FakeNativeConfigAccess";
 import { FakeNativeDatabaseFactory } from "./FakeNativeDatabaseFactory";
-import { FakeNativeDeviceInfoAccess } from "./FakeNativeDeviceInfoAccess";
 import { FakeNativeNotificationAccess } from "./FakeNativeNotificationAccess";
 
 export class FakeNativeBootstrapper implements INativeBootstrapper {
-    public constructor(private readonly eventBus?: EventBus) {}
-
     private _nativeEnvironment: INativeEnvironment;
     public get nativeEnvironment(): INativeEnvironment {
         return this._nativeEnvironment;
@@ -45,17 +42,10 @@ export class FakeNativeBootstrapper implements INativeBootstrapper {
         this._nativeEnvironment = {
             configAccess: new FakeNativeConfigAccess(),
             databaseFactory: new FakeNativeDatabaseFactory(),
-            deviceInfoAccess: new FakeNativeDeviceInfoAccess(),
-            eventBus:
-                this.eventBus ??
-                new EventEmitter2EventBus(() => {
-                    // noop
-                }),
             loggerFactory,
             notificationAccess: new FakeNativeNotificationAccess(nativeLogger)
         };
 
-        await this._nativeEnvironment.deviceInfoAccess.init();
         await this._nativeEnvironment.notificationAccess.init();
 
         return Result.ok(undefined);

packages/app-runtime/test/lib/natives/FakeNativeBootstrapper.ts

@@ -10,7 +10,7 @@ describe("PushNotificationModuleTest", function () {
     let devicePushIdentifier = "dummy value";
 
     beforeAll(async function () {
-        runtime = await TestUtil.createRuntime({ modules: { pushNotification: { enabled: true } } }, undefined, eventBus);
+        runtime = await TestUtil.createRuntime({ pushService: "dummy", modules: { pushNotification: { enabled: true } } }, undefined, eventBus);
         await runtime.start();
 
         const accounts = await TestUtil.provideAccounts(runtime, 1);
@@ -24,7 +24,7 @@ describe("PushNotificationModuleTest", function () {
     afterEach(() => eventBus.reset());
 
     test("should persist push identifier", async function () {
-        runtime.nativeEnvironment.eventBus.publish(new RemoteNotificationRegistrationEvent("handleLongerThan10Characters"));
+        runtime.eventBus.publish(new RemoteNotificationRegistrationEvent("handleLongerThan10Characters"));
 
         await eventBus.waitForRunningEventHandlers();
 
@@ -35,7 +35,7 @@ describe("PushNotificationModuleTest", function () {
     });
 
     test("should do a datawallet sync when DatawalletModificationsCreated is received", async function () {
-        runtime.nativeEnvironment.eventBus.publish(
+        runtime.eventBus.publish(
             new RemoteNotificationEvent({
                 content: {
                     devicePushIdentifier: devicePushIdentifier,
@@ -50,7 +50,7 @@ describe("PushNotificationModuleTest", function () {
     });
 
     test("should do a sync everything when ExternalEventCreated is received", async function () {
-        runtime.nativeEnvironment.eventBus.publish(
+        runtime.eventBus.publish(
             new RemoteNotificationEvent({
                 content: {
                     devicePushIdentifier: devicePushIdentifier,