diff --git a/packages/core/src/common/logger/ipc-file-logger-channel.ts b/packages/core/src/common/logger/ipc-file-logger-channel.ts index 7550f4f314..f598fa4596 100644 --- a/packages/core/src/common/logger/ipc-file-logger-channel.ts +++ b/packages/core/src/common/logger/ipc-file-logger-channel.ts @@ -2,7 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import type { MessageChannel } from "../utils/channel/message-channel-listener-injection-token"; + +import type { MessageChannel } from "@k8slens/messaging"; export interface IpcFileLogObject { fileId: string; diff --git a/packages/core/src/main/logger/close-ipc-logging-listener.injectable.ts b/packages/core/src/main/logger/close-ipc-logging-listener.injectable.ts index 6870a29c61..df31f05760 100644 --- a/packages/core/src/main/logger/close-ipc-logging-listener.injectable.ts +++ b/packages/core/src/main/logger/close-ipc-logging-listener.injectable.ts @@ -2,8 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { getMessageChannelListenerInjectable } from "@k8slens/messaging"; import ipcFileLoggerInjectable from "./ipc-file-logger.injectable"; -import { getMessageChannelListenerInjectable } from "../../common/utils/channel/message-channel-listener-injection-token"; import { closeIpcFileLoggerChannel, } from "../../common/logger/ipc-file-logger-channel"; @@ -11,7 +11,7 @@ import { const closeIpcFileLoggingListenerInjectable = getMessageChannelListenerInjectable({ id: "close-ipc-file-logging", channel: closeIpcFileLoggerChannel, - handler: (di) => { + getHandler: (di) => { const ipcFileLogger = di.inject(ipcFileLoggerInjectable); return (fileId) => ipcFileLogger.close(fileId); diff --git a/packages/core/src/main/logger/ipc-logging-listener.injectable.ts b/packages/core/src/main/logger/ipc-logging-listener.injectable.ts index 170e0609b5..dde708b44b 100644 --- a/packages/core/src/main/logger/ipc-logging-listener.injectable.ts +++ b/packages/core/src/main/logger/ipc-logging-listener.injectable.ts @@ -2,7 +2,7 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getMessageChannelListenerInjectable } from "../../common/utils/channel/message-channel-listener-injection-token"; +import { getMessageChannelListenerInjectable } from "@k8slens/messaging"; import type { IpcFileLogObject } from "../../common/logger/ipc-file-logger-channel"; import { ipcFileLoggerChannel } from "../../common/logger/ipc-file-logger-channel"; import { MESSAGE } from "triple-beam"; @@ -28,7 +28,7 @@ export function deserializeLogFromIpc(ipcFileLogObject: IpcFileLogObject) { const ipcFileLoggingListenerInjectable = getMessageChannelListenerInjectable({ id: "ipc-file-logging", channel: ipcFileLoggerChannel, - handler: (di) => { + getHandler: (di) => { const ipcFileLogger = di.inject(ipcFileLoggerInjectable); return (ipcFileLogObject) => diff --git a/packages/core/src/renderer/logger/close-renderer-log-file-id.test.ts b/packages/core/src/renderer/logger/close-renderer-log-file-id.test.ts index bf39fdfb5e..1c8f8bd514 100644 --- a/packages/core/src/renderer/logger/close-renderer-log-file-id.test.ts +++ b/packages/core/src/renderer/logger/close-renderer-log-file-id.test.ts @@ -2,13 +2,13 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import type winston from "winston"; +import type { SendMessageToChannel } from "@k8slens/messaging"; +import { sendMessageToChannelInjectionToken } from "@k8slens/messaging"; +import type { DiContainer } from "@ogre-tools/injectable"; import winstonLoggerInjectable from "../../common/winston-logger.injectable"; import { getDiForUnitTesting } from "../getDiForUnitTesting"; import closeRendererLogFileInjectable from "./close-renderer-log-file.injectable"; -import type { DiContainer } from "@ogre-tools/injectable"; -import type winston from "winston"; -import type { SendMessageToChannel } from "../../common/utils/channel/message-to-channel-injection-token"; -import { sendMessageToChannelInjectionToken } from "../../common/utils/channel/message-to-channel-injection-token"; import rendererLogFileIdInjectable from "./renderer-log-file-id.injectable"; import ipcLogTransportInjectable from "./ipc-transport.injectable"; import type IpcLogTransport from "./ipc-transport"; diff --git a/packages/core/src/renderer/logger/close-renderer-log-file.injectable.ts b/packages/core/src/renderer/logger/close-renderer-log-file.injectable.ts index 8015708d84..73e579a8ea 100644 --- a/packages/core/src/renderer/logger/close-renderer-log-file.injectable.ts +++ b/packages/core/src/renderer/logger/close-renderer-log-file.injectable.ts @@ -2,10 +2,10 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { sendMessageToChannelInjectionToken } from "@k8slens/messaging"; import { getInjectable } from "@ogre-tools/injectable"; import winstonLoggerInjectable from "../../common/winston-logger.injectable"; import { closeIpcFileLoggerChannel } from "../../common/logger/ipc-file-logger-channel"; -import { sendMessageToChannelInjectionToken } from "../../common/utils/channel/message-to-channel-injection-token"; import rendererLogFileIdInjectable from "./renderer-log-file-id.injectable"; import ipcLogTransportInjectable from "./ipc-transport.injectable"; diff --git a/packages/core/src/renderer/logger/ipc-transport.injectable.ts b/packages/core/src/renderer/logger/ipc-transport.injectable.ts index 45139cd917..a20096eb1a 100644 --- a/packages/core/src/renderer/logger/ipc-transport.injectable.ts +++ b/packages/core/src/renderer/logger/ipc-transport.injectable.ts @@ -8,14 +8,13 @@ import type winston from "winston"; import { MESSAGE } from "triple-beam"; import IpcLogTransport from "./ipc-transport"; -import { sendMessageToChannelInjectionToken } from "../../common/utils/channel/message-to-channel-injection-token"; -import type { - IpcFileLogObject } from "../../common/logger/ipc-file-logger-channel"; +import type { IpcFileLogObject } from "../../common/logger/ipc-file-logger-channel"; import { closeIpcFileLoggerChannel, ipcFileLoggerChannel, } from "../../common/logger/ipc-file-logger-channel"; import rendererLogFileIdInjectable from "./renderer-log-file-id.injectable"; +import { sendMessageToChannelInjectionToken } from "@k8slens/messaging"; /** * Winston uses symbol property for the actual message. diff --git a/packages/core/src/renderer/logger/ipc-transport.test.ts b/packages/core/src/renderer/logger/ipc-transport.test.ts index 931df377c7..2782724696 100644 --- a/packages/core/src/renderer/logger/ipc-transport.test.ts +++ b/packages/core/src/renderer/logger/ipc-transport.test.ts @@ -3,12 +3,12 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import type { DiContainer } from "@ogre-tools/injectable"; -import type { SendMessageToChannel } from "../../common/utils/channel/message-to-channel-injection-token"; -import { sendMessageToChannelInjectionToken } from "../../common/utils/channel/message-to-channel-injection-token"; +import { MESSAGE } from "triple-beam"; +import type { SendMessageToChannel } from "@k8slens/messaging"; +import { sendMessageToChannelInjectionToken } from "@k8slens/messaging"; import { getDiForUnitTesting } from "../getDiForUnitTesting"; import rendererLogFileIdInjectable from "./renderer-log-file-id.injectable"; import ipcLogTransportInjectable from "./ipc-transport.injectable"; -import { MESSAGE } from "triple-beam"; describe("renderer log transport through ipc", () => { let di: DiContainer;