From e66b6805bca935c626cded5d52c5ea57a158e13b Mon Sep 17 00:00:00 2001
From: Maximus7474 <94017712+Maximus7474@users.noreply.github.com>
Date: Wed, 11 Feb 2026 18:07:42 +0100
Subject: [PATCH] fix(package): added an array check on callback args (#85)

-> 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 d4d9e75..4b18bfb 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 e790153..c3aedf4 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);
     };