Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { configs } from "@js-soft/eslint-config-ts";
import { globalIgnores } from "eslint/config";
import tseslint from "typescript-eslint";

export default tseslint.config(globalIgnores(["**/Schemas.ts", "**/dist", "**/scripts", "**/coverage", "**/node_modules", "eslint.config.mjs"]), {
export default tseslint.config(globalIgnores(["**/Schemas.ts", "**/dist", "**/scripts", "**/coverage", "**/node_modules", "eslint.config.mjs", "**/jest.config.ts"]), {
extends: [configs.base, configs.jest],
languageOptions: {
parserOptions: {
Expand Down
349 changes: 196 additions & 153 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions packages/app-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"license": "AGPL-3.0-or-later",
"author": "j&s-soft AG",
"main": "dist/index.js",
"type": "module",
"types": "dist/index.d.ts",
"files": [
"dist"
Expand Down
18 changes: 9 additions & 9 deletions packages/app-runtime/src/AppRuntime.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import { EventBus, Result } from "@js-soft/ts-utils";
import { ConsumptionController } from "@nmshd/consumption";
import { CoreId, ICoreAddress } from "@nmshd/core-types";
import { ModuleConfiguration, Runtime, RuntimeHealth, RuntimeServices } from "@nmshd/runtime";
import { AppConfig, AppConfigOverwrite, createAppConfig } from "./AppConfig";
import { AppRuntimeErrors } from "./AppRuntimeErrors";
import { AppStringProcessor } from "./AppStringProcessor";
import { AccountSelectedEvent } from "./events";
import { IUIBridge } from "./extensibility";
import { IAppLanguageProvider, INotificationAccess } from "./infrastructure";
import { AppConfig, AppConfigOverwrite, createAppConfig } from "./AppConfig.js";
import { AppRuntimeErrors } from "./AppRuntimeErrors.js";
import { AppStringProcessor } from "./AppStringProcessor.js";
import { AccountSelectedEvent } from "./events/index.js";
import { IUIBridge } from "./extensibility/index.js";
import { IAppLanguageProvider, INotificationAccess } from "./infrastructure/index.js";
import {
AppLanguageModule,
AppRuntimeModuleConfiguration,
Expand All @@ -24,9 +24,9 @@ import {
RelationshipChangedModule,
RelationshipTemplateProcessedModule,
SSEModule
} from "./modules";
import { AccountServices, LocalAccountMapper, LocalAccountSession, MultiAccountController } from "./multiAccount";
import { SessionStorage } from "./SessionStorage";
} from "./modules/index.js";
import { AccountServices, LocalAccountMapper, LocalAccountSession, MultiAccountController } from "./multiAccount/index.js";
import { SessionStorage } from "./SessionStorage.js";

export class AppRuntime extends Runtime<AppConfig> {
public constructor(
Expand Down
6 changes: 3 additions & 3 deletions packages/app-runtime/src/AppStringProcessor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import { EventBus, Result } from "@js-soft/ts-utils";
import { ICoreAddress, Reference, SharedPasswordProtection } from "@nmshd/core-types";
import { AnonymousServices, DeviceMapper, RuntimeServices } from "@nmshd/runtime";
import { BackboneIds, TokenContentDeviceSharedSecret } from "@nmshd/transport";
import { AppRuntimeErrors } from "./AppRuntimeErrors";
import { IUIBridge } from "./extensibility";
import { AccountServices, LocalAccountDTO, LocalAccountSession } from "./multiAccount";
import { AppRuntimeErrors } from "./AppRuntimeErrors.js";
import { IUIBridge } from "./extensibility/index.js";
import { AccountServices, LocalAccountDTO, LocalAccountSession } from "./multiAccount/index.js";

export class AppStringProcessor {
private readonly logger: ILogger;
Expand Down
4 changes: 2 additions & 2 deletions packages/app-runtime/src/SessionStorage.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AppRuntimeErrors } from "./AppRuntimeErrors";
import { LocalAccountSession } from "./multiAccount";
import { AppRuntimeErrors } from "./AppRuntimeErrors.js";
import { LocalAccountSession } from "./multiAccount/index.js";

export class SessionStorage {
private readonly _availableSessions: LocalAccountSession[] = [];
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { DataEvent } from "@nmshd/runtime";
import { LocalAccountDTO } from "../multiAccount";
import { LocalAccountDTO } from "../multiAccount/index.js";

export class LocalAccountDeletionDateChangedEvent extends DataEvent<LocalAccountDTO> {
public static readonly namespace: string = "app.localAccountDeletionDateChanged";
Expand Down
18 changes: 9 additions & 9 deletions packages/app-runtime/src/events/index.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
export * from "./AccountSelectedEvent";
export * from "./AppLanguageChangedEvent";
export * from "./ExternalEventReceivedEvent";
export * from "./LocalAccountDeletionDateChangedEvent";
export * from "./MailReceivedEvent";
export * from "./OnboardingChangeReceivedEvent";
export * from "./RelationshipSelectedEvent";
export * from "./RemoteNotificationEvent";
export * from "./RemoteNotificationRegistrationEvent";
export * from "./AccountSelectedEvent.js";
export * from "./AppLanguageChangedEvent.js";
export * from "./ExternalEventReceivedEvent.js";
export * from "./LocalAccountDeletionDateChangedEvent.js";
export * from "./MailReceivedEvent.js";
export * from "./OnboardingChangeReceivedEvent.js";
export * from "./RelationshipSelectedEvent.js";
export * from "./RemoteNotificationEvent.js";
export * from "./RemoteNotificationRegistrationEvent.js";
2 changes: 1 addition & 1 deletion packages/app-runtime/src/extensibility/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export * from "./ui/IUIBridge";
export * from "./ui/IUIBridge.js";
2 changes: 1 addition & 1 deletion packages/app-runtime/src/extensibility/ui/IUIBridge.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ApplicationError, Result } from "@js-soft/ts-utils";
import { DeviceOnboardingInfoDTO, FileDVO, IdentityDVO, LocalRequestDVO, MailDVO, MessageDVO, RequestMessageDVO } from "@nmshd/runtime";
import { LocalAccountDTO } from "../../multiAccount";
import { LocalAccountDTO } from "../../multiAccount/index.js";

export interface IUIBridge {
showMessage(account: LocalAccountDTO, relationship: IdentityDVO, message: MessageDVO | MailDVO | RequestMessageDVO): Promise<Result<void>>;
Expand Down
18 changes: 9 additions & 9 deletions packages/app-runtime/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
export * from "./AppConfig";
export * from "./AppRuntime";
export * from "./AppRuntimeErrors";
export * from "./buildInformation";
export * from "./events";
export * from "./extensibility";
export * from "./infrastructure";
export * from "./modules";
export * from "./multiAccount";
export * from "./AppConfig.js";
export * from "./AppRuntime.js";
export * from "./AppRuntimeErrors.js";
export * from "./buildInformation.js";
export * from "./events/index.js";
export * from "./extensibility/index.js";
export * from "./infrastructure/index.js";
export * from "./modules/index.js";
export * from "./multiAccount/index.js";
4 changes: 2 additions & 2 deletions packages/app-runtime/src/infrastructure/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export * from "./IAppLanguageProvider";
export * from "./INotificationAccess";
export * from "./IAppLanguageProvider.js";
export * from "./INotificationAccess.js";
4 changes: 2 additions & 2 deletions packages/app-runtime/src/modules/AppLanguageModule.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { LanguageISO639 } from "@nmshd/core-types";
import { AccountSelectedEvent, AppLanguageChangedEvent } from "../events";
import { AppRuntimeModule, AppRuntimeModuleConfiguration } from "./AppRuntimeModule";
import { AccountSelectedEvent, AppLanguageChangedEvent } from "../events/index.js";
import { AppRuntimeModule, AppRuntimeModuleConfiguration } from "./AppRuntimeModule.js";

export interface AppLanguageModuleConfig extends AppRuntimeModuleConfiguration {}

Expand Down
2 changes: 1 addition & 1 deletion packages/app-runtime/src/modules/AppRuntimeModule.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ILogger } from "@js-soft/logging-abstractions";
import { ModuleConfiguration, RuntimeModule } from "@nmshd/runtime";
import { AppRuntime } from "../AppRuntime";
import { AppRuntime } from "../AppRuntime.js";

export interface IAppRuntimeModuleConstructor {
new (runtime: AppRuntime, configuration: any, logger: ILogger): AppRuntimeModule;
Expand Down
2 changes: 1 addition & 1 deletion packages/app-runtime/src/modules/AppSyncModule.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AppRuntimeModule, AppRuntimeModuleConfiguration } from "./AppRuntimeModule";
import { AppRuntimeModule, AppRuntimeModuleConfiguration } from "./AppRuntimeModule.js";

export interface AppSyncModuleConfiguration extends AppRuntimeModuleConfiguration {
interval: number;
Expand Down
6 changes: 3 additions & 3 deletions packages/app-runtime/src/modules/PushNotificationModule.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { sleep } from "@js-soft/ts-utils";
import { RuntimeServices, SyncEverythingResponse } from "@nmshd/runtime";
import { AppRuntimeErrors } from "../AppRuntimeErrors";
import { AccountSelectedEvent, ExternalEventReceivedEvent, RemoteNotificationEvent, RemoteNotificationRegistrationEvent } from "../events";
import { AppRuntimeModule, AppRuntimeModuleConfiguration } from "./AppRuntimeModule";
import { AppRuntimeErrors } from "../AppRuntimeErrors.js";
import { AccountSelectedEvent, ExternalEventReceivedEvent, RemoteNotificationEvent, RemoteNotificationRegistrationEvent } from "../events/index.js";
import { AppRuntimeModule, AppRuntimeModuleConfiguration } from "./AppRuntimeModule.js";

enum BackboneEventName {
DatawalletModificationsCreated = "DatawalletModificationsCreated",
Expand Down
8 changes: 4 additions & 4 deletions packages/app-runtime/src/modules/SSEModule.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { ILogger } from "@js-soft/logging-abstractions";
import { ModuleConfiguration } from "@nmshd/runtime";
import { EventSource } from "eventsource";
import { AppRuntime } from "../AppRuntime";
import { AccountSelectedEvent } from "../events";
import { LocalAccountSession } from "../multiAccount";
import { AppRuntimeModule } from "./AppRuntimeModule";
import { AppRuntime } from "../AppRuntime.js";
import { AccountSelectedEvent } from "../events/index.js";
import { LocalAccountSession } from "../multiAccount/index.js";
import { AppRuntimeModule } from "./AppRuntimeModule.js";

export interface SSEModuleConfiguration extends ModuleConfiguration {
baseUrlOverride?: string;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { MailReceivedEvent } from "../../events";
import { AppRuntimeModule, AppRuntimeModuleConfiguration } from "../AppRuntimeModule";
import { MailReceivedEvent } from "../../events/index.js";
import { AppRuntimeModule, AppRuntimeModuleConfiguration } from "../AppRuntimeModule.js";

export interface MailReceivedModuleConfig extends AppRuntimeModuleConfiguration {}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { RelationshipAuditLogEntryReason } from "@nmshd/runtime";
import { OnboardingChangeReceivedEvent } from "../../events";
import { AppRuntimeModule, AppRuntimeModuleConfiguration } from "../AppRuntimeModule";
import { OnboardingChangeReceivedEvent } from "../../events/index.js";
import { AppRuntimeModule, AppRuntimeModuleConfiguration } from "../AppRuntimeModule.js";

export interface OnboardingChangeReceivedModuleConfig extends AppRuntimeModuleConfiguration {}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ApplicationError } from "@js-soft/ts-utils";
import { RelationshipTemplateProcessedEvent, RelationshipTemplateProcessedResult } from "@nmshd/runtime";
import { AppRuntimeModule, AppRuntimeModuleConfiguration } from "../AppRuntimeModule";
import { AppRuntimeModule, AppRuntimeModuleConfiguration } from "../AppRuntimeModule.js";

export interface RelationshipTemplateProcessedModuleConfig extends AppRuntimeModuleConfiguration {}

Expand Down
6 changes: 3 additions & 3 deletions packages/app-runtime/src/modules/appEvents/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export * from "./MailReceivedModule";
export * from "./OnboardingChangeReceivedModule";
export * from "./RelationshipTemplateProcessedModule";
export * from "./MailReceivedModule.js";
export * from "./OnboardingChangeReceivedModule.js";
export * from "./RelationshipTemplateProcessedModule.js";
14 changes: 7 additions & 7 deletions packages/app-runtime/src/modules/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export * from "./appEvents";
export * from "./AppLanguageModule";
export * from "./AppRuntimeModule";
export * from "./AppSyncModule";
export * from "./PushNotificationModule";
export * from "./runtimeEvents";
export * from "./SSEModule";
export * from "./appEvents/index.js";
export * from "./AppLanguageModule.js";
export * from "./AppRuntimeModule.js";
export * from "./AppSyncModule.js";
export * from "./PushNotificationModule.js";
export * from "./runtimeEvents/index.js";
export * from "./SSEModule.js";
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { CoreDate } from "@nmshd/core-types";
import { IdentityDeletionProcessStatus, IdentityDeletionProcessStatusChangedEvent } from "@nmshd/runtime";
import { LocalAccountDeletionDateChangedEvent } from "../../events";
import { LocalAccountMapper } from "../../multiAccount/data/LocalAccountMapper";
import { AppRuntimeModule, AppRuntimeModuleConfiguration } from "../AppRuntimeModule";
import { LocalAccountDeletionDateChangedEvent } from "../../events/index.js";
import { LocalAccountMapper } from "../../multiAccount/data/LocalAccountMapper.js";
import { AppRuntimeModule, AppRuntimeModuleConfiguration } from "../AppRuntimeModule.js";

export interface IdentityDeletionProcessStatusChangedModuleConfig extends AppRuntimeModuleConfiguration {}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { MessageReceivedEvent } from "@nmshd/runtime";
import { MailReceivedEvent } from "../../events";
import { AppRuntimeModule, AppRuntimeModuleConfiguration } from "../AppRuntimeModule";
import { MailReceivedEvent } from "../../events/index.js";
import { AppRuntimeModule, AppRuntimeModuleConfiguration } from "../AppRuntimeModule.js";

export interface MessageReceivedModuleConfig extends AppRuntimeModuleConfiguration {}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { RelationshipAuditLogEntryReason, RelationshipChangedEvent } from "@nmshd/runtime";
import { OnboardingChangeReceivedEvent } from "../../events";
import { AppRuntimeModule, AppRuntimeModuleConfiguration } from "../AppRuntimeModule";
import { OnboardingChangeReceivedEvent } from "../../events/index.js";
import { AppRuntimeModule, AppRuntimeModuleConfiguration } from "../AppRuntimeModule.js";

export interface RelationshipChangedModuleConfig extends AppRuntimeModuleConfiguration {}

Expand Down
6 changes: 3 additions & 3 deletions packages/app-runtime/src/modules/runtimeEvents/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export * from "./IdentityDeletionProcessStatusChangedModule";
export * from "./MessageReceivedModule";
export * from "./RelationshipChangedModule";
export * from "./IdentityDeletionProcessStatusChangedModule.js";
export * from "./MessageReceivedModule.js";
export * from "./RelationshipChangedModule.js";
6 changes: 3 additions & 3 deletions packages/app-runtime/src/multiAccount/AccountServices.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { CoreId } from "@nmshd/core-types";
import { DeviceMapper, DeviceOnboardingInfoDTO } from "@nmshd/runtime";
import { MultiAccountController } from "./MultiAccountController";
import { LocalAccountDTO } from "./data/LocalAccountDTO";
import { LocalAccountMapper } from "./data/LocalAccountMapper";
import { MultiAccountController } from "./MultiAccountController.js";
import { LocalAccountDTO } from "./data/LocalAccountDTO.js";
import { LocalAccountMapper } from "./data/LocalAccountMapper.js";

export class AccountServices {
public constructor(protected readonly multiAccountController: MultiAccountController) {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import { LokiJsConnection } from "@js-soft/docdb-access-loki";
import { ILogger } from "@js-soft/logging-abstractions";
import { CoreAddress, CoreDate, CoreError, CoreId, CoreIdHelper } from "@nmshd/core-types";
import { AccountController, DeviceSharedSecret, Transport, TransportCoreErrors, TransportLoggerFactory } from "@nmshd/transport";
import { AppConfig } from "../AppConfig";
import { SessionStorage } from "../SessionStorage";
import { LocalAccount } from "./data/LocalAccount";
import { AppConfig } from "../AppConfig.js";
import { SessionStorage } from "../SessionStorage.js";
import { LocalAccount } from "./data/LocalAccount.js";

export class MultiAccountController {
private readonly _log: ILogger;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { LocalAccountDTO } from "..";
import { LocalAccount } from "./LocalAccount";
import { LocalAccount } from "./LocalAccount.js";
import { LocalAccountDTO } from "./LocalAccountDTO.js";

export class LocalAccountMapper {
public static toLocalAccountDTO(localAccount: LocalAccount): LocalAccountDTO {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ConsumptionController } from "@nmshd/consumption";
import { ConsumptionServices, DataViewExpander, IdentityDVO, TransportServices } from "@nmshd/runtime";
import { AccountController } from "@nmshd/transport";
import { LocalAccountDTO } from "./LocalAccountDTO";
import { LocalAccountDTO } from "./LocalAccountDTO.js";

export interface LocalAccountSession {
address: string;
Expand Down
12 changes: 6 additions & 6 deletions packages/app-runtime/src/multiAccount/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export * from "./AccountServices";
export * from "./data/LocalAccount";
export * from "./data/LocalAccountDTO";
export * from "./data/LocalAccountMapper";
export * from "./data/LocalAccountSession";
export * from "./MultiAccountController";
export * from "./AccountServices.js";
export * from "./data/LocalAccount.js";
export * from "./data/LocalAccountDTO.js";
export * from "./data/LocalAccountMapper.js";
export * from "./data/LocalAccountSession.js";
export * from "./MultiAccountController.js";
2 changes: 1 addition & 1 deletion packages/app-runtime/test/customMatchers.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ApplicationError, EventConstructor, Result } from "@js-soft/ts-utils";
import { MockEventBus } from "./lib";
import { MockEventBus } from "./lib/index.js";

import "./lib/MockUIBridge.matchers";

Expand Down
4 changes: 2 additions & 2 deletions packages/app-runtime/test/extensibility/UIBridge.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AppRuntime } from "../../src";
import { FakeUIBridge, TestUtil } from "../lib";
import { AppRuntime } from "@nmshd/app-runtime";
import { FakeUIBridge, TestUtil } from "../lib/index.js";

let runtime: AppRuntime;

Expand Down
2 changes: 1 addition & 1 deletion packages/app-runtime/test/lib/EventListener.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Event, SubscriptionTarget } from "@js-soft/ts-utils";
import { LocalAccountSession } from "@nmshd/app-runtime";
import { DataEvent, Runtime } from "@nmshd/runtime";
import { LocalAccountSession } from "../../src";

export class EventWrapper {
public namespace: string;
Expand Down
2 changes: 1 addition & 1 deletion packages/app-runtime/test/lib/FakeUIBridge.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ApplicationError, Result } from "@js-soft/ts-utils";
import { IUIBridge, LocalAccountDTO } from "../../src";
import { IUIBridge, LocalAccountDTO } from "@nmshd/app-runtime";

export class FakeUIBridge implements IUIBridge {
public showMessage(): Promise<Result<void, ApplicationError>> {
Expand Down
2 changes: 1 addition & 1 deletion packages/app-runtime/test/lib/MockUIBridge.matchers.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { DeviceOnboardingInfoDTO } from "@nmshd/runtime";
import { MockUIBridge } from "./MockUIBridge";
import { MockUIBridge } from "./MockUIBridge.js";

expect.extend({
showDeviceOnboardingCalled(mockUIBridge: unknown, predicate: (deviceOnboardingInfo: DeviceOnboardingInfoDTO) => boolean) {
Expand Down
2 changes: 1 addition & 1 deletion packages/app-runtime/test/lib/MockUIBridge.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ApplicationError, Result } from "@js-soft/ts-utils";
import { IUIBridge, LocalAccountDTO } from "@nmshd/app-runtime";
import { DeviceOnboardingInfoDTO, FileDVO, IdentityDVO, LocalRequestDVO, MailDVO, MessageDVO, RequestMessageDVO } from "@nmshd/runtime";
import { IUIBridge, LocalAccountDTO } from "../../src";

export type MockUIBridgeCall =
| { method: "showMessage"; account: LocalAccountDTO; relationship: IdentityDVO; message: MessageDVO | MailDVO | RequestMessageDVO }
Expand Down
Loading