tauri-notice-window 1.0.7 → 1.0.9

package/dist/index.js

@@ -1,33 +1,35 @@
-import { create as oe } from "zustand";
-import { syncTabs as ue } from "zustand-sync";
-import ce from "dexie";
-import { useCallback as A, useState as x, useEffect as B } from "react";
-import { jsx as k, Fragment as de } from "react/jsx-runtime";
-const Z = "tauri-notice-config", G = {
+import { create as ge } from "zustand";
+import { syncTabs as ye } from "zustand-sync";
+import be from "dexie";
+import { useCallback as I, useState as E, useEffect as G } from "react";
+import { jsx as A, Fragment as pe } from "react/jsx-runtime";
+const K = "tauri-notice-config", Q = {
   routePrefix: "/notice",
   databaseName: "tauri-notice-db",
   defaultWidth: 400,
-  defaultHeight: 300
-}, Y = () => {
+  defaultHeight: 300,
+  notFoundUrl: "/404"
+  // Default 404 page
+}, X = () => {
   try {
-    const t = localStorage.getItem(Z);
+    const t = localStorage.getItem(K);
     if (t)
-      return { ...G, ...JSON.parse(t) };
+      return { ...Q, ...JSON.parse(t) };
   } catch (t) {
     console.warn("Failed to load config from localStorage:", t);
   }
-  return G;
-}, we = (t) => {
+  return Q;
+}, _e = (t) => {
   try {
-    localStorage.setItem(Z, JSON.stringify(t));
+    localStorage.setItem(K, JSON.stringify(t));
   } catch (e) {
     console.warn("Failed to save config to localStorage:", e);
   }
-}, Ge = (t) => {
-  const i = { ...Y(), ...t };
-  we(i);
-}, K = () => Y();
-class he extends ce {
+}, He = (t) => {
+  const i = { ...X(), ...t };
+  _e(i);
+}, ee = () => X();
+class fe extends be {
   messages;
   constructor(e) {
     super(e), this.version(1).stores({
@@ -35,14 +37,14 @@ class he extends ce {
     });
   }
 }
-let v = null;
-const X = () => {
-  if (!v) {
-    const t = K();
-    v = new he(t.databaseName);
-  }
-  return v;
-}, h = () => v || X(), ge = async (t) => {
+let D = null;
+const te = () => {
+  if (!D) {
+    const t = ee();
+    D = new fe(t.databaseName);
+  }
+  return D;
+}, h = () => D || te(), me = async (t) => {
   const e = {
     ...t,
     timestamp: (/* @__PURE__ */ new Date()).toISOString(),
@@ -52,30 +54,36 @@ const X = () => {
     queuePosition: 0
   };
   await h().messages.put(e);
-}, be = async (t) => !!await h().messages.get(t), ye = async (t) => {
+}, ve = async (t) => !!await h().messages.get(t), We = async (t) => {
   const e = await h().messages.get(t);
   return e?.isShown === !0 || e?.queueStatus === "shown";
-}, pe = async () => await h().messages.where("queueStatus").equals("pending").sortBy("queuePosition"), _e = async (t, e) => {
+}, Se = async () => await h().messages.where("queueStatus").equals("pending").sortBy("queuePosition"), De = async (t, e) => {
   await h().messages.update(t, { queueStatus: e });
-}, ee = async (t) => {
+}, ie = async (t) => {
   await h().messages.update(t, {
     queueStatus: "shown",
     isShown: !0
   });
-}, fe = async (t) => {
+}, Ne = async (t) => {
   await h().messages.update(t, {
     queueStatus: "hidden"
   });
-}, me = async (t) => await h().messages.get(t), Ue = async (t) => {
+}, ne = async (t) => await h().messages.get(t), Ve = async (t) => {
   await h().messages.delete(t);
-}, ve = async () => {
+  try {
+    const { useMessageQueueStore: e } = await Promise.resolve().then(() => Pe), { removeFromQueue: i } = e.getState();
+    i(t);
+  } catch (e) {
+    console.warn("Failed to remove message from queue store:", e);
+  }
+}, ze = async () => {
   await h().messages.where("queueStatus").anyOf(["pending", "showing"]).delete();
-}, We = async (t) => {
+}, Ae = async (t) => {
   const e = t.map(
     (i) => h().messages.update(i.id, { queuePosition: i.position })
   );
   await Promise.all(e);
-}, Se = (t, e) => ({
+}, Oe = (t, e) => ({
   // Initial state
   queue: [],
   currentMessage: null,
@@ -85,11 +93,11 @@ const X = () => {
   // Enqueue a new message
   enqueue: async (i) => {
     const n = e();
-    if (await ye(i.id)) {
+    if (await We(i.id)) {
       console.log(`Message ${i.id} was already shown, skipping`);
       return;
     }
-    if (await be(i.id) || await ge(i), !n.queue.some((u) => u.id === i.id)) {
+    if (await ve(i.id) || await me(i), !n.queue.some((u) => u.id === i.id)) {
       const u = [...n.queue, i];
       t({ queue: u }), await e().persistQueue();
     }
@@ -110,10 +118,14 @@ const X = () => {
       t({ isProcessing: !1, currentMessage: null });
       return;
     }
+    if (!await ne(n.id)) {
+      console.log(`Message ${n.id} was deleted, skipping to next`), await e().showNext();
+      return;
+    }
     t({
       currentMessage: n,
       isProcessing: !0
-    }), await _e(n.id, "showing"), await e().persistQueue();
+    }), await De(n.id, "showing"), await e().persistQueue();
   },
   // Clear current message and show next
   clearCurrent: () => {
@@ -138,16 +150,16 @@ const X = () => {
   initializeFromDatabase: async () => {
     if (e().initialized) return;
     t({ initialized: !0 });
-    const n = await pe();
+    const n = await Se();
     n.length > 0 && (t({ queue: n }), await e().showNext());
   },
   // Persist queue to database
   persistQueue: async () => {
-    const n = e().queue.map((a, r) => ({
+    const n = e().queue.map((a, l) => ({
       id: a.id,
-      position: r
+      position: l
     }));
-    await We(n);
+    await Ae(n);
   },
   // Clear all messages on logout
   clearOnLogout: async () => {
@@ -157,7 +169,19 @@ const X = () => {
       isProcessing: !1,
       activeWindowIds: [],
       initialized: !1
-    }), await ve();
+    }), await ze();
+  },
+  // Remove a specific message from the queue by ID
+  removeFromQueue: (i) => {
+    const n = e(), a = n.queue.filter((l) => l.id !== i);
+    t({ queue: a }), n.currentMessage?.id === i && (async () => {
+      try {
+        const { closeNoticeWindow: r } = await Promise.resolve().then(() => Fe);
+        await r(i);
+      } catch (r) {
+        console.warn("Failed to close notice window:", r), e().clearCurrent();
+      }
+    })();
   },
   // Add active window ID
   addActiveWindow: (i) => {
@@ -168,7 +192,7 @@ const X = () => {
   removeActiveWindow: (i) => {
     const n = e(), a = String(i);
     t({
-      activeWindowIds: n.activeWindowIds.filter((r) => r !== a)
+      activeWindowIds: n.activeWindowIds.filter((l) => l !== a)
     });
   },
   // Check if window is active
@@ -176,46 +200,50 @@ const X = () => {
     const n = e(), a = String(i);
     return n.activeWindowIds.includes(a);
   }
-}), d = oe()(
-  ue(Se, {
+}), w = ge()(
+  ye(Oe, {
     name: "tauri-notice-queue"
   })
-), D = {
+), S = {
   queueLength: (t) => t.queue.length,
   currentMessage: (t) => t.currentMessage,
   isProcessing: (t) => t.isProcessing,
   queue: (t) => t.queue
-}, He = () => {
-  const t = d((i) => i.enqueue);
-  return { showNotice: A(
+}, Pe = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  __proto__: null,
+  messageQueueSelectors: S,
+  useMessageQueueStore: w
+}, Symbol.toStringTag, { value: "Module" })), $e = () => {
+  const t = w((i) => i.enqueue);
+  return { showNotice: I(
     async (i) => {
       await t(i);
     },
     [t]
   ) };
 };
-function De(t, e, i, n) {
+function xe(t, e, i, n) {
   if (typeof e == "function" ? t !== e || !n : !e.has(t)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
   return i === "m" ? n : i === "a" ? n.call(t) : n ? n.value : e.get(t);
 }
-function Ne(t, e, i, n, a) {
+function Ie(t, e, i, n, a) {
   if (typeof e == "function" ? t !== e || !0 : !e.has(t)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
   return e.set(t, i), i;
 }
-var N;
-const w = "__TAURI_TO_IPC_KEY__";
-function ze(t, e = !1) {
+var O;
+const d = "__TAURI_TO_IPC_KEY__";
+function Me(t, e = !1) {
   return window.__TAURI_INTERNALS__.transformCallback(t, e);
 }
 async function s(t, e = {}, i) {
   return window.__TAURI_INTERNALS__.invoke(t, e, i);
 }
-class Ae {
+class ke {
   get rid() {
-    return De(this, N, "f");
+    return xe(this, O, "f");
   }
   constructor(e) {
-    N.set(this, void 0), Ne(this, N, e);
+    O.set(this, void 0), Ie(this, O, e);
   }
   /**
    * Destroys and cleans up this resource from memory.
@@ -227,8 +255,8 @@ class Ae {
     });
   }
 }
-N = /* @__PURE__ */ new WeakMap();
-class te {
+O = /* @__PURE__ */ new WeakMap();
+class se {
   constructor(...e) {
     this.type = "Logical", e.length === 1 ? "Logical" in e[0] ? (this.width = e[0].Logical.width, this.height = e[0].Logical.height) : (this.width = e[0].width, this.height = e[0].height) : (this.width = e[0], this.height = e[1]);
   }
@@ -248,19 +276,19 @@ class te {
    * @since 2.0.0
    */
   toPhysical(e) {
-    return new b(this.width * e, this.height * e);
+    return new y(this.width * e, this.height * e);
   }
-  [w]() {
+  [d]() {
     return {
       width: this.width,
       height: this.height
     };
   }
   toJSON() {
-    return this[w]();
+    return this[d]();
   }
 }
-class b {
+class y {
   constructor(...e) {
     this.type = "Physical", e.length === 1 ? "Physical" in e[0] ? (this.width = e[0].Physical.width, this.height = e[0].Physical.height) : (this.width = e[0].width, this.height = e[0].height) : (this.width = e[0], this.height = e[1]);
   }
@@ -276,16 +304,16 @@ class b {
    * ```
    */
   toLogical(e) {
-    return new te(this.width / e, this.height / e);
+    return new se(this.width / e, this.height / e);
   }
-  [w]() {
+  [d]() {
     return {
       width: this.width,
       height: this.height
     };
   }
   toJSON() {
-    return this[w]();
+    return this[d]();
   }
 }
 class g {
@@ -293,12 +321,12 @@ class g {
     this.size = e;
   }
   toLogical(e) {
-    return this.size instanceof te ? this.size : this.size.toLogical(e);
+    return this.size instanceof se ? this.size : this.size.toLogical(e);
   }
   toPhysical(e) {
-    return this.size instanceof b ? this.size : this.size.toPhysical(e);
+    return this.size instanceof y ? this.size : this.size.toPhysical(e);
   }
-  [w]() {
+  [d]() {
     return {
       [`${this.size.type}`]: {
         width: this.size.width,
@@ -307,10 +335,10 @@ class g {
     };
   }
   toJSON() {
-    return this[w]();
+    return this[d]();
   }
 }
-class ie {
+class ae {
   constructor(...e) {
     this.type = "Logical", e.length === 1 ? "Logical" in e[0] ? (this.x = e[0].Logical.x, this.y = e[0].Logical.y) : (this.x = e[0].x, this.y = e[0].y) : (this.x = e[0], this.y = e[1]);
   }
@@ -332,14 +360,14 @@ class ie {
   toPhysical(e) {
     return new c(this.x * e, this.y * e);
   }
-  [w]() {
+  [d]() {
     return {
       x: this.x,
       y: this.y
     };
   }
   toJSON() {
-    return this[w]();
+    return this[d]();
   }
 }
 class c {
@@ -362,29 +390,29 @@ class c {
    * @since 2.0.0
    */
   toLogical(e) {
-    return new ie(this.x / e, this.y / e);
+    return new ae(this.x / e, this.y / e);
   }
-  [w]() {
+  [d]() {
     return {
       x: this.x,
       y: this.y
     };
   }
   toJSON() {
-    return this[w]();
+    return this[d]();
   }
 }
-class p {
+class _ {
   constructor(e) {
     this.position = e;
   }
   toLogical(e) {
-    return this.position instanceof ie ? this.position : this.position.toLogical(e);
+    return this.position instanceof ae ? this.position : this.position.toLogical(e);
   }
   toPhysical(e) {
     return this.position instanceof c ? this.position : this.position.toPhysical(e);
   }
-  [w]() {
+  [d]() {
     return {
       [`${this.position.type}`]: {
         x: this.position.x,
@@ -393,47 +421,47 @@ class p {
     };
   }
   toJSON() {
-    return this[w]();
+    return this[d]();
   }
 }
 var o;
 (function(t) {
   t.WINDOW_RESIZED = "tauri://resize", t.WINDOW_MOVED = "tauri://move", t.WINDOW_CLOSE_REQUESTED = "tauri://close-requested", t.WINDOW_DESTROYED = "tauri://destroyed", t.WINDOW_FOCUS = "tauri://focus", t.WINDOW_BLUR = "tauri://blur", t.WINDOW_SCALE_FACTOR_CHANGED = "tauri://scale-change", t.WINDOW_THEME_CHANGED = "tauri://theme-changed", t.WINDOW_CREATED = "tauri://window-created", t.WEBVIEW_CREATED = "tauri://webview-created", t.DRAG_ENTER = "tauri://drag-enter", t.DRAG_OVER = "tauri://drag-over", t.DRAG_DROP = "tauri://drag-drop", t.DRAG_LEAVE = "tauri://drag-leave";
 })(o || (o = {}));
-async function ne(t, e) {
+async function re(t, e) {
   window.__TAURI_EVENT_PLUGIN_INTERNALS__.unregisterListener(t, e), await s("plugin:event|unlisten", {
     event: t,
     eventId: e
   });
 }
-async function O(t, e, i) {
+async function M(t, e, i) {
   var n;
   const a = typeof i?.target == "string" ? { kind: "AnyLabel", label: i.target } : (n = i?.target) !== null && n !== void 0 ? n : { kind: "Any" };
   return s("plugin:event|listen", {
     event: t,
     target: a,
-    handler: ze(e)
-  }).then((r) => async () => ne(t, r));
+    handler: Me(e)
+  }).then((l) => async () => re(t, l));
 }
-async function E(t, e, i) {
-  return O(t, (n) => {
-    ne(t, n.id), e(n);
+async function B(t, e, i) {
+  return M(t, (n) => {
+    re(t, n.id), e(n);
   }, i);
 }
-async function se(t, e) {
+async function le(t, e) {
   await s("plugin:event|emit", {
     event: t,
     payload: e
   });
 }
-async function ae(t, e, i) {
+async function oe(t, e, i) {
   await s("plugin:event|emit_to", {
     target: typeof t == "string" ? { kind: "AnyLabel", label: t } : t,
     event: e,
     payload: i
   });
 }
-class W extends Ae {
+class N extends ke {
   /**
    * Creates an Image from a resource ID. For internal use only.
    *
@@ -445,10 +473,10 @@ class W extends Ae {
   /** Creates a new Image using RGBA data, in row-major order from top to bottom, and with specified width and height. */
   static async new(e, i, n) {
     return s("plugin:image|new", {
-      rgba: z(e),
+      rgba: x(e),
       width: i,
       height: n
-    }).then((a) => new W(a));
+    }).then((a) => new N(a));
   }
   /**
    * Creates a new image using the provided bytes by inferring the file format.
@@ -465,8 +493,8 @@ class W extends Ae {
    */
   static async fromBytes(e) {
     return s("plugin:image|from_bytes", {
-      bytes: z(e)
-    }).then((i) => new W(i));
+      bytes: x(e)
+    }).then((i) => new N(i));
   }
   /**
    * Creates a new image using the provided path.
@@ -481,7 +509,7 @@ class W extends Ae {
    * ```
    */
   static async fromPath(e) {
-    return s("plugin:image|from_path", { path: e }).then((i) => new W(i));
+    return s("plugin:image|from_path", { path: e }).then((i) => new N(i));
   }
   /** Returns the RGBA data for this image, in row-major order from top to bottom.  */
   async rgba() {
@@ -494,14 +522,14 @@ class W extends Ae {
     return s("plugin:image|size", { rid: this.rid });
   }
 }
-function z(t) {
-  return t == null ? null : typeof t == "string" ? t : t instanceof W ? t.rid : t;
+function x(t) {
+  return t == null ? null : typeof t == "string" ? t : t instanceof N ? t.rid : t;
 }
-var R;
+var F;
 (function(t) {
   t[t.Critical = 1] = "Critical", t[t.Informational = 2] = "Informational";
-})(R || (R = {}));
-class Oe {
+})(F || (F = {}));
+class Ce {
   constructor(e) {
     this._preventDefault = !1, this.event = e.event, this.id = e.id;
   }
@@ -512,24 +540,24 @@ class Oe {
     return this._preventDefault;
   }
 }
-var U;
+var j;
 (function(t) {
   t.None = "none", t.Normal = "normal", t.Indeterminate = "indeterminate", t.Paused = "paused", t.Error = "error";
-})(U || (U = {}));
-function le() {
-  return new P(window.__TAURI_INTERNALS__.metadata.currentWindow.label, {
+})(j || (j = {}));
+function ue() {
+  return new k(window.__TAURI_INTERNALS__.metadata.currentWindow.label, {
     // @ts-expect-error `skip` is not defined in the public API but it is handled by the constructor
     skip: !0
   });
 }
-async function M() {
-  return s("plugin:window|get_all_windows").then((t) => t.map((e) => new P(e, {
+async function R() {
+  return s("plugin:window|get_all_windows").then((t) => t.map((e) => new k(e, {
     // @ts-expect-error `skip` is not defined in the public API but it is handled by the constructor
     skip: !0
   })));
 }
-const C = ["tauri://created", "tauri://error"];
-class P {
+const T = ["tauri://created", "tauri://error"];
+class k {
   /**
    * Creates a new Window.
    * @example
@@ -570,19 +598,19 @@ class P {
    */
   static async getByLabel(e) {
     var i;
-    return (i = (await M()).find((n) => n.label === e)) !== null && i !== void 0 ? i : null;
+    return (i = (await R()).find((n) => n.label === e)) !== null && i !== void 0 ? i : null;
   }
   /**
    * Get an instance of `Window` for the current window.
    */
   static getCurrent() {
-    return le();
+    return ue();
   }
   /**
    * Gets a list of instances of `Window` for all available windows.
    */
   static async getAll() {
-    return M();
+    return R();
   }
   /**
    *  Gets the focused window.
@@ -595,7 +623,7 @@ class P {
    * @returns The Window instance or `undefined` if there is not any focused window.
    */
   static async getFocusedWindow() {
-    for (const e of await M())
+    for (const e of await R())
       if (await e.isFocused())
         return e;
     return null;
@@ -623,7 +651,7 @@ class P {
     return this._handleTauriEvent(e, i) ? () => {
       const n = this.listeners[e];
       n.splice(n.indexOf(i), 1);
-    } : O(e, i, {
+    } : M(e, i, {
       target: { kind: "Window", label: this.label }
     });
   }
@@ -650,7 +678,7 @@ class P {
     return this._handleTauriEvent(e, i) ? () => {
       const n = this.listeners[e];
       n.splice(n.indexOf(i), 1);
-    } : E(e, i, {
+    } : B(e, i, {
       target: { kind: "Window", label: this.label }
     });
   }
@@ -666,7 +694,7 @@ class P {
    * @param payload Event payload.
    */
   async emit(e, i) {
-    if (C.includes(e)) {
+    if (T.includes(e)) {
       for (const n of this.listeners[e] || [])
         n({
           event: e,
@@ -675,7 +703,7 @@ class P {
         });
       return;
     }
-    return se(e, i);
+    return le(e, i);
   }
   /**
    * Emits an event to all {@link EventTarget|targets} matching the given target.
@@ -690,7 +718,7 @@ class P {
    * @param payload Event payload.
    */
   async emitTo(e, i, n) {
-    if (C.includes(i)) {
+    if (T.includes(i)) {
       for (const a of this.listeners[i] || [])
         a({
           event: i,
@@ -699,11 +727,11 @@ class P {
         });
       return;
     }
-    return ae(e, i, n);
+    return oe(e, i, n);
   }
   /** @ignore */
   _handleTauriEvent(e, i) {
-    return C.includes(e) ? (e in this.listeners ? this.listeners[e].push(i) : this.listeners[e] = [i], !0) : !1;
+    return T.includes(e) ? (e in this.listeners ? this.listeners[e].push(i) : this.listeners[e] = [i], !0) : !1;
   }
   // Getters
   /**
@@ -765,7 +793,7 @@ class P {
   async innerSize() {
     return s("plugin:window|inner_size", {
       label: this.label
-    }).then((e) => new b(e));
+    }).then((e) => new y(e));
   }
   /**
    * The physical size of the entire window.
@@ -781,7 +809,7 @@ class P {
   async outerSize() {
     return s("plugin:window|outer_size", {
       label: this.label
-    }).then((e) => new b(e));
+    }).then((e) => new y(e));
   }
   /**
    * Gets the window's current fullscreen state.
@@ -1032,7 +1060,7 @@ class P {
    */
   async requestUserAttention(e) {
     let i = null;
-    return e && (e === R.Critical ? i = { type: "Critical" } : i = { type: "Informational" }), s("plugin:window|request_user_attention", {
+    return e && (e === F.Critical ? i = { type: "Critical" } : i = { type: "Informational" }), s("plugin:window|request_user_attention", {
       label: this.label,
       value: i
     });
@@ -1508,7 +1536,7 @@ class P {
   async setPosition(e) {
     return s("plugin:window|set_position", {
       label: this.label,
-      value: e instanceof p ? e : new p(e)
+      value: e instanceof _ ? e : new _(e)
     });
   }
   /**
@@ -1602,7 +1630,7 @@ class P {
   async setIcon(e) {
     return s("plugin:window|set_icon", {
       label: this.label,
-      value: z(e)
+      value: x(e)
     });
   }
   /**
@@ -1720,7 +1748,7 @@ class P {
   async setCursorPosition(e) {
     return s("plugin:window|set_cursor_position", {
       label: this.label,
-      value: e instanceof p ? e : new p(e)
+      value: e instanceof _ ? e : new _(e)
     });
   }
   /**
@@ -1837,7 +1865,7 @@ class P {
   async setOverlayIcon(e) {
     return s("plugin:window|set_overlay_icon", {
       label: this.label,
-      value: e ? z(e) : void 0
+      value: e ? x(e) : void 0
     });
   }
   /**
@@ -1927,7 +1955,7 @@ class P {
    */
   async onResized(e) {
     return this.listen(o.WINDOW_RESIZED, (i) => {
-      i.payload = new b(i.payload), e(i);
+      i.payload = new y(i.payload), e(i);
     });
   }
   /**
@@ -1976,7 +2004,7 @@ class P {
    */
   async onCloseRequested(e) {
     return this.listen(o.WINDOW_CLOSE_REQUESTED, async (i) => {
-      const n = new Oe(i);
+      const n = new Ce(i);
       await e(n), n.isPreventDefault() || await this.destroy();
     });
   }
@@ -2006,37 +2034,37 @@ class P {
    * Note that removing the listener is required if your listener goes out of scope e.g. the component is unmounted.
    */
   async onDragDropEvent(e) {
-    const i = await this.listen(o.DRAG_ENTER, (l) => {
+    const i = await this.listen(o.DRAG_ENTER, (r) => {
       e({
-        ...l,
+        ...r,
         payload: {
           type: "enter",
-          paths: l.payload.paths,
-          position: new c(l.payload.position)
+          paths: r.payload.paths,
+          position: new c(r.payload.position)
         }
       });
-    }), n = await this.listen(o.DRAG_OVER, (l) => {
+    }), n = await this.listen(o.DRAG_OVER, (r) => {
       e({
-        ...l,
+        ...r,
         payload: {
           type: "over",
-          position: new c(l.payload.position)
+          position: new c(r.payload.position)
         }
       });
-    }), a = await this.listen(o.DRAG_DROP, (l) => {
+    }), a = await this.listen(o.DRAG_DROP, (r) => {
       e({
-        ...l,
+        ...r,
         payload: {
           type: "drop",
-          paths: l.payload.paths,
-          position: new c(l.payload.position)
+          paths: r.payload.paths,
+          position: new c(r.payload.position)
         }
       });
-    }), r = await this.listen(o.DRAG_LEAVE, (l) => {
-      e({ ...l, payload: { type: "leave" } });
+    }), l = await this.listen(o.DRAG_LEAVE, (r) => {
+      e({ ...r, payload: { type: "leave" } });
     });
     return () => {
-      i(), a(), n(), r();
+      i(), a(), n(), l();
     };
   }
   /**
@@ -2115,41 +2143,41 @@ var H;
 (function(t) {
   t.Disabled = "disabled", t.Throttle = "throttle", t.Suspend = "suspend";
 })(H || (H = {}));
-var Q;
+var V;
 (function(t) {
   t.Default = "default", t.FluentOverlay = "fluentOverlay";
-})(Q || (Q = {}));
-var V;
+})(V || (V = {}));
+var $;
 (function(t) {
   t.AppearanceBased = "appearanceBased", t.Light = "light", t.Dark = "dark", t.MediumLight = "mediumLight", t.UltraDark = "ultraDark", t.Titlebar = "titlebar", t.Selection = "selection", t.Menu = "menu", t.Popover = "popover", t.Sidebar = "sidebar", t.HeaderView = "headerView", t.Sheet = "sheet", t.WindowBackground = "windowBackground", t.HudWindow = "hudWindow", t.FullScreenUI = "fullScreenUI", t.Tooltip = "tooltip", t.ContentBackground = "contentBackground", t.UnderWindowBackground = "underWindowBackground", t.UnderPageBackground = "underPageBackground", t.Mica = "mica", t.Blur = "blur", t.Acrylic = "acrylic", t.Tabbed = "tabbed", t.TabbedDark = "tabbedDark", t.TabbedLight = "tabbedLight";
-})(V || (V = {}));
-var j;
+})($ || ($ = {}));
+var J;
 (function(t) {
   t.FollowsWindowActiveState = "followsWindowActiveState", t.Active = "active", t.Inactive = "inactive";
-})(j || (j = {}));
-function Pe(t) {
+})(J || (J = {}));
+function Le(t) {
   return t === null ? null : {
     name: t.name,
     scaleFactor: t.scaleFactor,
     position: new c(t.position),
-    size: new b(t.size),
+    size: new y(t.size),
     workArea: {
       position: new c(t.workArea.position),
-      size: new b(t.workArea.size)
+      size: new y(t.workArea.size)
     }
   };
 }
-async function Ie() {
-  return s("plugin:window|primary_monitor").then(Pe);
+async function Ee() {
+  return s("plugin:window|primary_monitor").then(Le);
 }
-function re() {
-  return new T(le(), window.__TAURI_INTERNALS__.metadata.currentWebview.label, {
+function ce() {
+  return new U(ue(), window.__TAURI_INTERNALS__.metadata.currentWebview.label, {
     // @ts-expect-error `skip` is not defined in the public API but it is handled by the constructor
     skip: !0
   });
 }
-async function $() {
-  return s("plugin:webview|get_all_webviews").then((t) => t.map((e) => new T(new P(e.windowLabel, {
+async function Z() {
+  return s("plugin:webview|get_all_webviews").then((t) => t.map((e) => new U(new k(e.windowLabel, {
     // @ts-expect-error `skip` is not defined in the public API but it is handled by the constructor
     skip: !0
   }), e.label, {
@@ -2157,8 +2185,8 @@ async function $() {
     skip: !0
   })));
 }
-const L = ["tauri://created", "tauri://error"];
-class T {
+const q = ["tauri://created", "tauri://error"];
+class U {
   /**
    * Creates a new Webview.
    * @example
@@ -2213,19 +2241,19 @@ class T {
    */
   static async getByLabel(e) {
     var i;
-    return (i = (await $()).find((n) => n.label === e)) !== null && i !== void 0 ? i : null;
+    return (i = (await Z()).find((n) => n.label === e)) !== null && i !== void 0 ? i : null;
   }
   /**
    * Get an instance of `Webview` for the current webview.
    */
   static getCurrent() {
-    return re();
+    return ce();
   }
   /**
    * Gets a list of instances of `Webview` for all available webviews.
    */
   static async getAll() {
-    return $();
+    return Z();
   }
   /**
    * Listen to an emitted event on this webview.
@@ -2250,7 +2278,7 @@ class T {
     return this._handleTauriEvent(e, i) ? () => {
       const n = this.listeners[e];
       n.splice(n.indexOf(i), 1);
-    } : O(e, i, {
+    } : M(e, i, {
       target: { kind: "Webview", label: this.label }
     });
   }
@@ -2277,7 +2305,7 @@ class T {
     return this._handleTauriEvent(e, i) ? () => {
       const n = this.listeners[e];
       n.splice(n.indexOf(i), 1);
-    } : E(e, i, {
+    } : B(e, i, {
       target: { kind: "Webview", label: this.label }
     });
   }
@@ -2294,7 +2322,7 @@ class T {
    * @param payload Event payload.
    */
   async emit(e, i) {
-    if (L.includes(e)) {
+    if (q.includes(e)) {
       for (const n of this.listeners[e] || [])
         n({
           event: e,
@@ -2303,7 +2331,7 @@ class T {
         });
       return;
     }
-    return se(e, i);
+    return le(e, i);
   }
   /**
    * Emits an event to all {@link EventTarget|targets} matching the given target.
@@ -2319,7 +2347,7 @@ class T {
    * @param payload Event payload.
    */
   async emitTo(e, i, n) {
-    if (L.includes(i)) {
+    if (q.includes(i)) {
       for (const a of this.listeners[i] || [])
         a({
           event: i,
@@ -2328,11 +2356,11 @@ class T {
         });
       return;
     }
-    return ae(e, i, n);
+    return oe(e, i, n);
   }
   /** @ignore */
   _handleTauriEvent(e, i) {
-    return L.includes(e) ? (e in this.listeners ? this.listeners[e].push(i) : this.listeners[e] = [i], !0) : !1;
+    return q.includes(e) ? (e in this.listeners ? this.listeners[e].push(i) : this.listeners[e] = [i], !0) : !1;
   }
   // Getters
   /**
@@ -2364,7 +2392,7 @@ class T {
   async size() {
     return s("plugin:webview|webview_size", {
       label: this.label
-    }).then((e) => new b(e));
+    }).then((e) => new y(e));
   }
   // Setters
   /**
@@ -2413,7 +2441,7 @@ class T {
   async setPosition(e) {
     return s("plugin:webview|set_webview_position", {
       label: this.label,
-      value: e instanceof p ? e : new p(e)
+      value: e instanceof _ ? e : new _(e)
     });
   }
   /**
@@ -2569,51 +2597,51 @@ class T {
    * Note that removing the listener is required if your listener goes out of scope e.g. the component is unmounted.
    */
   async onDragDropEvent(e) {
-    const i = await this.listen(o.DRAG_ENTER, (l) => {
+    const i = await this.listen(o.DRAG_ENTER, (r) => {
       e({
-        ...l,
+        ...r,
         payload: {
           type: "enter",
-          paths: l.payload.paths,
-          position: new c(l.payload.position)
+          paths: r.payload.paths,
+          position: new c(r.payload.position)
         }
       });
-    }), n = await this.listen(o.DRAG_OVER, (l) => {
+    }), n = await this.listen(o.DRAG_OVER, (r) => {
       e({
-        ...l,
+        ...r,
         payload: {
           type: "over",
-          position: new c(l.payload.position)
+          position: new c(r.payload.position)
         }
       });
-    }), a = await this.listen(o.DRAG_DROP, (l) => {
+    }), a = await this.listen(o.DRAG_DROP, (r) => {
       e({
-        ...l,
+        ...r,
         payload: {
           type: "drop",
-          paths: l.payload.paths,
-          position: new c(l.payload.position)
+          paths: r.payload.paths,
+          position: new c(r.payload.position)
         }
       });
-    }), r = await this.listen(o.DRAG_LEAVE, (l) => {
-      e({ ...l, payload: { type: "leave" } });
+    }), l = await this.listen(o.DRAG_LEAVE, (r) => {
+      e({ ...r, payload: { type: "leave" } });
     });
     return () => {
-      i(), a(), n(), r();
+      i(), a(), n(), l();
     };
   }
 }
-function xe() {
-  const t = re();
-  return new _(t.label, { skip: !0 });
+function P() {
+  const t = ce();
+  return new f(t.label, { skip: !0 });
 }
-async function J() {
-  return s("plugin:window|get_all_windows").then((t) => t.map((e) => new _(e, {
+async function Y() {
+  return s("plugin:window|get_all_windows").then((t) => t.map((e) => new f(e, {
     // @ts-expect-error `skip` is not defined in the public API but it is handled by the constructor
     skip: !0
   })));
 }
-class _ {
+class f {
   /**
    * Creates a new {@link Window} hosting a {@link Webview}.
    * @example
@@ -2656,20 +2684,20 @@ class _ {
    */
   static async getByLabel(e) {
     var i;
-    const n = (i = (await J()).find((a) => a.label === e)) !== null && i !== void 0 ? i : null;
-    return n ? new _(n.label, { skip: !0 }) : null;
+    const n = (i = (await Y()).find((a) => a.label === e)) !== null && i !== void 0 ? i : null;
+    return n ? new f(n.label, { skip: !0 }) : null;
   }
   /**
    * Get an instance of `Webview` for the current webview.
    */
   static getCurrent() {
-    return xe();
+    return P();
   }
   /**
    * Gets a list of instances of `Webview` for all available webviews.
    */
   static async getAll() {
-    return J();
+    return Y();
   }
   /**
    * Listen to an emitted event on this webivew window.
@@ -2694,7 +2722,7 @@ class _ {
     return this._handleTauriEvent(e, i) ? () => {
       const n = this.listeners[e];
       n.splice(n.indexOf(i), 1);
-    } : O(e, i, {
+    } : M(e, i, {
       target: { kind: "WebviewWindow", label: this.label }
     });
   }
@@ -2721,7 +2749,7 @@ class _ {
     return this._handleTauriEvent(e, i) ? () => {
       const n = this.listeners[e];
       n.splice(n.indexOf(i), 1);
-    } : E(e, i, {
+    } : B(e, i, {
       target: { kind: "WebviewWindow", label: this.label }
     });
   }
@@ -2745,8 +2773,8 @@ class _ {
     return s("plugin:window|set_background_color", { color: e }).then(() => s("plugin:webview|set_webview_background_color", { color: e }));
   }
 }
-ke(_, [P, T]);
-function ke(t, e) {
+Re(f, [k, U]);
+function Re(t, e) {
   (Array.isArray(e) ? e : [e]).forEach((i) => {
     Object.getOwnPropertyNames(i.prototype).forEach((n) => {
       var a;
@@ -2759,14 +2787,21 @@ function ke(t, e) {
     });
   });
 }
-const S = /* @__PURE__ */ new Map(), Me = async (t, e, i) => {
+const z = /* @__PURE__ */ new Map(), Te = (t) => {
+  if (!t || t.trim() === "") return !1;
+  try {
+    return !!(t.startsWith("/") || t.startsWith("http://") || t.startsWith("https://") || t.startsWith("tauri://"));
+  } catch {
+    return !1;
+  }
+}, qe = async (t, e, i) => {
   const n = i?.padding ?? 20;
   if (i?.x !== void 0 && i?.y !== void 0)
     return { x: i.x, y: i.y };
-  let a = 1920, r = 1080;
+  let a = 1920, l = 1080;
   try {
-    const u = await Ie();
-    u?.size && (a = u.size.width, r = u.size.height);
+    const u = await Ee();
+    u?.size && (a = u.size.width, l = u.size.height);
   } catch (u) {
     console.warn("Failed to get monitor info, using defaults:", u);
   }
@@ -2774,7 +2809,7 @@ const S = /* @__PURE__ */ new Map(), Me = async (t, e, i) => {
     case "right-bottom":
       return {
         x: a - t - n,
-        y: r - e - n
+        y: l - e - n
       };
     case "right-top":
       return {
@@ -2784,7 +2819,7 @@ const S = /* @__PURE__ */ new Map(), Me = async (t, e, i) => {
     case "left-bottom":
       return {
         x: n,
-        y: r - e - n
+        y: l - e - n
       };
     case "left-top":
       return {
@@ -2794,157 +2829,192 @@ const S = /* @__PURE__ */ new Map(), Me = async (t, e, i) => {
     case "center":
       return {
         x: (a - t) / 2,
-        y: (r - e) / 2
+        y: (l - e) / 2
       };
     default:
       return {
         x: a - t - n,
-        y: r - e - n
+        y: l - e - n
       };
   }
-}, Ce = async (t) => {
-  const e = String(t.id), i = d.getState();
+}, we = async (t) => {
+  const e = String(t.id), i = w.getState();
   if (i.isWindowActive(e)) {
     console.log(`Notice window already open for message: ${e}`);
     return;
   }
-  const n = K(), a = `notice-${e}`, r = `${n.routePrefix}/${t.type}?id=${t.id}`, l = t.min_width || n.defaultWidth, u = t.min_height || n.defaultHeight, { x: f, y: m } = await Me(l, u, t.windowPosition);
+  const n = ee(), a = `notice-${e}`;
+  let l = `${n.routePrefix}/${t.type}?id=${t.id}`;
+  Te(l) || (console.warn(`Invalid window URL: ${l}. Using fallback 404 page.`), l = n.notFoundUrl || "/404");
+  const r = t.min_width || n.defaultWidth, u = t.min_height || n.defaultHeight, { x: m, y: v } = await qe(r, u, t.windowPosition);
   try {
-    const y = new _(a, {
-      url: r,
+    const b = new f(a, {
+      url: l,
       title: t.title,
-      width: l,
+      width: r,
       height: u,
-      x: f,
-      y: m,
+      x: m,
+      y: v,
       resizable: !0,
       decorations: !0,
       skipTaskbar: !1,
       alwaysOnTop: !0
     });
-    S.set(e, y), i.addActiveWindow(e), y.once("tauri://destroyed", async () => {
-      S.delete(e), i.removeActiveWindow(e), await ee(e), i.clearCurrent();
+    z.set(e, b), i.addActiveWindow(e), b.once("tauri://destroyed", async () => {
+      z.delete(e), i.removeActiveWindow(e), await ie(e), i.clearCurrent();
     }), console.log(`Created notice window: ${a}`);
-  } catch (y) {
-    console.error("Failed to create notice window:", y), i.removeActiveWindow(e), i.clearCurrent();
+  } catch (b) {
+    console.error("Failed to create notice window:", b), i.removeActiveWindow(e), i.clearCurrent();
   }
-}, q = async (t) => {
-  const e = String(t), i = S.get(e), n = d.getState();
+}, C = async (t) => {
+  const e = String(t), i = z.get(e), n = w.getState();
   if (i)
     try {
-      await i.close(), S.delete(e), n.removeActiveWindow(e), await ee(e), n.clearCurrent(), console.log(`Closed notice window: ${e}`);
+      await i.close(), z.delete(e), n.removeActiveWindow(e), await ie(e), n.clearCurrent(), console.log(`Closed notice window: ${e}`);
     } catch (a) {
       console.error("Failed to close notice window:", a);
     }
-}, Le = async () => {
-  const t = Array.from(S.keys()).map(
-    (e) => q(e)
+}, de = async () => {
+  const t = Array.from(z.keys()).map(
+    (e) => C(e)
   );
   await Promise.all(t);
-}, Re = () => {
+}, he = () => {
   let t = null;
-  d.subscribe((e) => {
+  w.subscribe((e) => {
     const i = e.currentMessage;
-    i && i !== t ? (t = i, Ce(i)) : i || (t = null);
+    i && i !== t ? (t = i, we(i)) : i || (t = null);
   }), console.log("Notice window system initialized");
-}, Qe = () => {
-  const t = d((i) => i.currentMessage);
-  return { closeNotice: A(async () => {
-    t && await q(t.id);
+}, Fe = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  __proto__: null,
+  closeAllNoticeWindows: de,
+  closeNoticeWindow: C,
+  createNoticeWindow: we,
+  initializeNoticeWindowSystem: he
+}, Symbol.toStringTag, { value: "Module" })), Je = () => {
+  const t = w((i) => i.currentMessage);
+  return { closeNotice: I(async () => {
+    t && await C(t.id);
   }, [t]) };
-}, Ve = () => {
-  const t = d();
-  return { hideNotice: A(
+}, Ze = () => {
+  const t = w();
+  return { hideNotice: I(
     async (i) => {
-      await fe(i), await q(i), t.currentMessage?.id === i && t.clearCurrent();
+      await Ne(i), await C(i), t.currentMessage?.id === i && t.clearCurrent();
     },
     [t]
   ) };
-}, je = () => {
-  const t = d((i) => i.clearOnLogout);
-  return { hideAllNotices: A(async () => {
-    await Le(), await t();
+}, Ye = () => {
+  const t = w((i) => i.clearOnLogout);
+  return { hideAllNotices: I(async () => {
+    await de(), await t();
   }, [t]) };
-}, $e = () => {
-  const t = d(D.queueLength), e = d(D.currentMessage), i = d(D.isProcessing), n = d(D.queue);
+}, Ke = () => {
+  const t = w(S.queueLength), e = w(S.currentMessage), i = w(S.isProcessing), n = w(S.queue);
   return {
     queueLength: t,
     currentMessage: e,
     isProcessing: i,
     queue: n
   };
-}, Je = ({ children: t, onLoad: e, onClose: i }) => {
-  const [n, a] = x(null), [r, l] = x(!0), [u, f] = x(null);
-  return B(() => {
+}, Xe = ({ children: t, onLoad: e, onClose: i }) => {
+  const [n, a] = E(null), [l, r] = E(!0), [u, m] = E(null);
+  return G(() => {
     (async () => {
       try {
-        const F = new URLSearchParams(window.location.search).get("id");
-        if (!F) {
-          f("No message ID provided"), l(!1);
+        const p = new URLSearchParams(window.location.search).get("id");
+        if (!p) {
+          m("No message ID provided"), r(!1), setTimeout(async () => {
+            try {
+              await P().close();
+            } catch (W) {
+              console.error("Failed to close window:", W);
+            }
+          }, 1e3);
           return;
         }
-        const I = await me(F);
-        if (!I) {
-          f("Message not found"), l(!1);
+        const L = await ne(p);
+        if (!L) {
+          console.log(`Message ${p} not found in database, closing window`), m("Message not found"), r(!1), setTimeout(async () => {
+            try {
+              await P().close();
+            } catch (W) {
+              console.error("Failed to close window:", W);
+            }
+          }, 500);
           return;
         }
-        a(I), l(!1), e && e(I);
-      } catch (y) {
-        console.error("Failed to load message:", y), f("Failed to load message"), l(!1);
+        a(L), r(!1), e && e(L);
+      } catch (b) {
+        console.error("Failed to load message:", b), m("Failed to load message"), r(!1), setTimeout(async () => {
+          try {
+            await P().close();
+          } catch (p) {
+            console.error("Failed to close window:", p);
+          }
+        }, 1e3);
       }
     })();
-  }, [e]), B(() => {
+  }, [e]), G(() => {
     if (!n || !i) return;
-    const m = () => {
+    const v = () => {
       i(n);
     };
-    return window.addEventListener("beforeunload", m), () => {
-      window.removeEventListener("beforeunload", m);
+    return window.addEventListener("beforeunload", v), () => {
+      window.removeEventListener("beforeunload", v);
     };
-  }, [n, i]), r ? /* @__PURE__ */ k("div", { style: {
+  }, [n, i]), l ? /* @__PURE__ */ A("div", { style: {
     display: "flex",
     justifyContent: "center",
     alignItems: "center",
     height: "100vh",
     fontFamily: "system-ui, -apple-system, sans-serif"
-  }, children: "Loading..." }) : u || !n ? /* @__PURE__ */ k("div", { style: {
+  }, children: "Loading..." }) : u ? /* @__PURE__ */ A("div", { style: {
+    display: "flex",
+    justifyContent: "center",
+    alignItems: "center",
+    height: "100vh",
+    fontFamily: "system-ui, -apple-system, sans-serif",
+    color: "#ef4444"
+  }, children: u }) : n ? /* @__PURE__ */ A(pe, { children: t(n) }) : /* @__PURE__ */ A("div", { style: {
     display: "flex",
     justifyContent: "center",
     alignItems: "center",
     height: "100vh",
     fontFamily: "system-ui, -apple-system, sans-serif",
     color: "#ef4444"
-  }, children: u || "Message not found" }) : /* @__PURE__ */ k(de, { children: t(n) });
-}, Ze = async () => {
-  X(), Re();
-  const { initializeFromDatabase: t } = d.getState();
+  }, children: "Closing window..." });
+}, et = async () => {
+  te(), he();
+  const { initializeFromDatabase: t } = w.getState();
   await t(), console.log("Tauri Notice System initialized");
 };
 export {
-  Je as NoticeLayout,
-  ve as clearPendingMessages,
-  Le as closeAllNoticeWindows,
-  q as closeNoticeWindow,
-  Ce as createNoticeWindow,
-  Ue as deleteMessageById,
-  me as getMessage,
-  K as getNoticeConfig,
-  pe as getPendingMessages,
-  be as hasMessage,
-  X as initializeDatabase,
-  Ze as initializeNoticeSystem,
-  Re as initializeNoticeWindowSystem,
-  ye as isMessageShown,
-  fe as markAsHidden,
-  ee as markAsShown,
-  D as messageQueueSelectors,
-  ge as saveMessage,
-  Ge as setNoticeConfig,
-  Qe as useCloseNotice,
-  je as useHideAllNotices,
-  Ve as useHideNotice,
-  $e as useMessageQueue,
-  d as useMessageQueueStore,
-  He as useNoticeWindow
+  Xe as NoticeLayout,
+  ze as clearPendingMessages,
+  de as closeAllNoticeWindows,
+  C as closeNoticeWindow,
+  we as createNoticeWindow,
+  Ve as deleteMessageById,
+  ne as getMessage,
+  ee as getNoticeConfig,
+  Se as getPendingMessages,
+  ve as hasMessage,
+  te as initializeDatabase,
+  et as initializeNoticeSystem,
+  he as initializeNoticeWindowSystem,
+  We as isMessageShown,
+  Ne as markAsHidden,
+  ie as markAsShown,
+  S as messageQueueSelectors,
+  me as saveMessage,
+  He as setNoticeConfig,
+  De as updateQueueStatus,
+  Je as useCloseNotice,
+  Ye as useHideAllNotices,
+  Ze as useHideNotice,
+  Ke as useMessageQueue,
+  w as useMessageQueueStore,
+  $e as useNoticeWindow
 };
 //# sourceMappingURL=index.js.map