@witchcraft/nuxt-logger 0.1.0 → 0.1.1

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "logger",
   "configKey": "logger",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "builder": {
     "@nuxt/module-builder": "1.0.3",
     "unbuild": "unknown"

package/dist/runtime/electron/main/useElectronLogger.d.ts

@@ -10,9 +10,10 @@ import pino from "pino";
  * - We can't use useRuntimeConfig so it's injected by using vite define instead ({@link STATIC}).
  * - We need to pass the logPath which is defined at runtime.
  * - We need to use some electron only imports which causes problems for the regular server.
- * - Pino needs to be told were to find it's workers electron side in prod.
+ * - Pino needs to be told were to find it's workers electron side in prod both when using a packed asar and when not.
  * {@link https://github.com/pinojs/pino/blob/master/docs/bundling.md}
  * Using vite's ?worker&url imports almost works (the paths are correct) but something about the transpiling breaks things I think.
+ *
  */
 export declare function useElectronLogger(pinoConfig?: PublicRuntimeConfig["logger"], windows?: () => BrowserWindow[], { receiveFromRenderer }?: {
     receiveFromRenderer?: boolean;

package/dist/runtime/electron/main/useElectronLogger.js

@@ -6,6 +6,7 @@ import { receiveFromRendererOnMain } from "./receiveFromRendererOnMain.js";
 import { getBaseOptions } from "../../helpers/getBaseOptions.js";
 import { ELECTRON_LOG_TYPE } from "../types.js";
 globalThis.__bundlerPathsOverrides = {
+  nodeModulesLocation: app.getAppPath(),
   "pino-worker": `./node_modules/pino/lib/worker.js`,
   "pino-worker-pipeline": `./node_modules/pino/lib/worker-pipeline.js`,
   "thread-stream-worker": `./node_modules/thread-stream/lib/worker.js`,
@@ -13,9 +14,8 @@ globalThis.__bundlerPathsOverrides = {
   "pino-pretty": `./node_modules/pino-pretty/index.js`
 };
 const bundlerOverrides = globalThis.__bundlerPathsOverrides;
-const appPath = app.getAppPath();
 for (const key of keys(bundlerOverrides)) {
-  bundlerOverrides[key] = path.resolve(appPath, bundlerOverrides[key]);
+  bundlerOverrides[key] = path.resolve(bundleOverrides.nodeModulesLocation, bundlerOverrides[key]);
 }
 let initiated = false;
 const levels = ["error", "warn", "debug", "trace", "info", "fatal"];

package/dist/runtime/electron/preload/createElectronLoggerApi.js

@@ -1,7 +1,13 @@
 import { ELECTRON_LOG_TYPE } from "../types.js";
 export function createElectronLoggerApi(ipcRenderer) {
   return {
-    log: (level, data) => ipcRenderer.send(ELECTRON_LOG_TYPE.TO_MAIN, { level, data }),
+    log: (level, data) => {
+      try {
+        ipcRenderer.send(ELECTRON_LOG_TYPE.TO_MAIN, { level, data });
+      } catch (error) {
+        throw new Error(`[nuxt-logger] could not forward a "${level}" log to electron's main process, its payload must be cloneable, pass raw values (e.g. \`toRaw\` on a reactive object). Log: ${JSON.stringify(data)}`, { cause: error });
+      }
+    },
     _logs: {
       on(cb) {
         ipcRenderer.on(ELECTRON_LOG_TYPE.FROM_MAIN_ON_RENDERER, (_event, level, data) => {

package/dist/runtime/helpers/getBaseOptions.js

@@ -90,7 +90,7 @@ export function getBaseOptions(config, serverPathResolver) {
           send: (level, logEvent) => {
             if (!logEvent.messages[0]?.ns?.startsWith("main") && levels.values[level] < levels.values[writeLevel]) {
               logEvent.messages[0].ns &&= `renderer:${logEvent.messages[0].ns}`;
-              window.electron.api.log(logEvent);
+              window.electron.api.log(level, logEvent);
             }
           }
         } : void 0

package/dist/runtime/plugins/init.js

@@ -1,3 +1,4 @@
+import { toRaw } from "vue";
 import { defineNuxtPlugin, useRuntimeConfig } from "#imports";
 import { useLogger } from "../composables/useLogger.js";
 export default defineNuxtPlugin({
@@ -5,7 +6,7 @@ export default defineNuxtPlugin({
   setup(nuxtApp) {
     if (import.meta.client) {
       nuxtApp.hook("app:created", () => {
-        const config = useRuntimeConfig().public;
+        const config = toRaw(useRuntimeConfig().public);
         const initialLog = { appInfo: config.appInfo };
         if (window.navigator !== void 0) {
           initialLog.environmentInfo = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@witchcraft/nuxt-logger",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Nuxt module for logging.",
   "repository": "witchcraftjs/nuxt-logger",
   "license": "MIT",

package/src/runtime/electron/main/useElectronLogger.ts

@@ -11,6 +11,7 @@ import { ELECTRON_LOG_TYPE } from "../types.js"
 
 declare const globalThis: any
 globalThis.__bundlerPathsOverrides = {
+	nodeModulesLocation: app.getAppPath(),
 	"pino-worker": `./node_modules/pino/lib/worker.js`,
 	"pino-worker-pipeline": `./node_modules/pino/lib/worker-pipeline.js`,
 	"thread-stream-worker": `./node_modules/thread-stream/lib/worker.js`,
@@ -19,9 +20,8 @@ globalThis.__bundlerPathsOverrides = {
 }
 const bundlerOverrides = globalThis.__bundlerPathsOverrides
 
-const appPath = app.getAppPath()
 for (const key of keys(bundlerOverrides)) {
-	bundlerOverrides[key] = path.resolve(appPath, bundlerOverrides[key])
+	bundlerOverrides[key] = path.resolve(bundleOverrides.nodeModulesLocation, bundlerOverrides[key])
 }
 
 let initiated = false
@@ -37,16 +37,20 @@ const logger: Record<typeof levels[number], ((data: any) => void)> = {} as any
  * - We can't use useRuntimeConfig so it's injected by using vite define instead ({@link STATIC}).
  * - We need to pass the logPath which is defined at runtime.
  * - We need to use some electron only imports which causes problems for the regular server.
- * - Pino needs to be told were to find it's workers electron side in prod.
+ * - Pino needs to be told were to find it's workers electron side in prod both when using a packed asar and when not.
  * {@link https://github.com/pinojs/pino/blob/master/docs/bundling.md}
  * Using vite's ?worker&url imports almost works (the paths are correct) but something about the transpiling breaks things I think.
+ *
  */
 
 export function useElectronLogger(
 	pinoConfig?: PublicRuntimeConfig["logger"],
-	windows?: () => BrowserWindow[], {
+	windows?: () => BrowserWindow[],
+	{
 		receiveFromRenderer = true
-	}: { receiveFromRenderer?: boolean } = {}
+	}: {
+		receiveFromRenderer?: boolean
+	} = {}
 ) {
 	if (initiated && pinoConfig) {
 		throw new Error("Config can only be passed the first time when initiating.")

package/src/runtime/electron/preload/createElectronLoggerApi.ts

@@ -10,7 +10,13 @@ export type ElectronLoggerApi = {
 
 export function createElectronLoggerApi(ipcRenderer: typeof IpcRenderer): ElectronLoggerApi {
 	return {
-		log: (level: Levels, data: any) => ipcRenderer.send(ELECTRON_LOG_TYPE.TO_MAIN, { level, data }),
+		log: (level: Levels, data: any) => {
+			try {
+				ipcRenderer.send(ELECTRON_LOG_TYPE.TO_MAIN, { level, data })
+			} catch (error) {
+				throw new Error(`[nuxt-logger] could not forward a "${level}" log to electron's main process, its payload must be cloneable, pass raw values (e.g. \`toRaw\` on a reactive object). Log: ${JSON.stringify(data)}`, { cause: error })
+			}
+		},
 		_logs: {
 			on(cb: (level: Levels, data: any) => void) {
 				ipcRenderer.on(ELECTRON_LOG_TYPE.FROM_MAIN_ON_RENDERER, (_event, level, data) => {

package/src/runtime/helpers/getBaseOptions.ts

@@ -7,6 +7,8 @@ import type { PublicRuntimeConfig } from "@nuxt/schema"
 import type { LoggerOptions, TransportMultiOptions } from "pino"
 import { pino } from "pino"
 
+import type { ElectronLoggerApi } from "../electron/preload/createElectronLoggerApi.js"
+
 // normally we would access logger.levels, but because we create
 // the shared config here we can't
 const levels = {
@@ -129,7 +131,7 @@ export function getBaseOptions(
 							send: (level, logEvent) => {
 								if (!logEvent.messages[0]?.ns?.startsWith("main") && levels.values[level] < levels.values[writeLevel]) {
 									logEvent.messages[0].ns &&= `renderer:${logEvent.messages[0].ns}`
-									;(window as any).electron.api.log(logEvent)
+									;((window as any).electron.api as ElectronLoggerApi).log(level, logEvent)
 								}
 							}
 						}

package/src/runtime/plugins/init.ts

@@ -1,3 +1,5 @@
+import { toRaw } from "vue"
+
 import { defineNuxtPlugin, useRuntimeConfig } from "#imports"
 
 import { useLogger } from "../composables/useLogger"
@@ -7,7 +9,7 @@ export default defineNuxtPlugin({
 	setup(nuxtApp) {
 		if (import.meta.client) {
 			nuxtApp.hook("app:created", () => {
-				const config = useRuntimeConfig().public
+				const config = toRaw(useRuntimeConfig().public)
 				const initialLog: any = { appInfo: config.appInfo }
 				if (window.navigator !== undefined) {
 					initialLog.environmentInfo = {