From 7af989b73427a5d75e0704d3c03c0624f8fc2616 Mon Sep 17 00:00:00 2001
From: Maximus7474 <the.maximus.7474@gmail.com>
Date: Mon, 2 Feb 2026 18:10:06 +0100
Subject: [PATCH] fix(package): added an array check on callback args -> Issue
 is that if callaback returns a null value it errors and fails

---
 package/client/resource/callback/index.ts | 2 +-
 package/server/resource/callback/index.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/client/resource/callback/index.ts b/package/client/resource/callback/index.ts
index d4d9e75b2..4b18bfb74 100644
--- a/package/client/resource/callback/index.ts
+++ b/package/client/resource/callback/index.ts
@@ -47,7 +47,7 @@ export function triggerServerCallback<T = unknown>(
 
   return new Promise<T>((resolve, reject) => {
     pendingCallbacks[key] = (args) => {
-      if (args[0] === 'cb_invalid') reject(`callback '${eventName} does not exist`);
+      if (Array.isArray(args) && args[0] === 'cb_invalid') reject(`callback '${eventName} does not exist`);
 
       resolve(args);
     };
diff --git a/package/server/resource/callback/index.ts b/package/server/resource/callback/index.ts
index e79015315..c3aedf442 100644
--- a/package/server/resource/callback/index.ts
+++ b/package/server/resource/callback/index.ts
@@ -29,7 +29,7 @@ export function triggerClientCallback<T = unknown>(
 
   return new Promise<T>((resolve, reject) => {
     pendingCallbacks[key] = (args) => {
-      if (args[0] === 'cb_invalid') reject(`callback '${eventName} does not exist`);
+      if (Array.isArray(args) && args[0] === 'cb_invalid') reject(`callback '${eventName} does not exist`);
 
       resolve(args);
     };