@arkyn/server 2.2.1 → 2.2.3

package/dist/config/apiInstance.d.ts

@@ -1,4 +1,4 @@
-type ApiAinstanceContructorProps = {
+type ApiInstanceContructorProps = {
     baseUrl: string;
     baseHeaders?: HeadersInit;
     baseToken?: string | null;
@@ -26,7 +26,7 @@ declare class ApiInstance {
      * @param props.baseHeaders - Optional base headers to include in all requests.
      * @param props.baseToken - Optional base token for authorization.
      */
-    constructor(props: ApiAinstanceContructorProps);
+    constructor(props: ApiInstanceContructorProps);
     /**
      * Generates the full URL by appending the route to the base URL.
      * @param route - The route to append to the base URL.

package/dist/config/apiInstance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apiInstance.d.ts","sourceRoot":"","sources":["../../src/config/apiInstance.ts"],"names":[],"mappings":"AAMA,KAAK,2BAA2B,GAAG;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B,CAAC;AAEF,KAAK,8BAA8B,GAAG;IACpC,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,KAAK,2BAA2B,GAAG;IACjC,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;GAEG;AAEH,cAAM,WAAW;IACf,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,WAAW,CAAC,CAAc;IAClC,OAAO,CAAC,SAAS,CAAC,CAAS;IAE3B;;;;;;OAMG;gBAES,KAAK,EAAE,2BAA2B;IAM9C;;;;OAIG;IAEH,OAAO,CAAC,WAAW;IAInB;;;;;OAKG;IAEH,OAAO,CAAC,eAAe;IAcvB;;;;;OAKG;IAEG,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,8BAA8B;IAM9D;;;;;OAKG;IAEG,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,2BAA2B;IAO5D;;;;;OAKG;IAEG,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,2BAA2B;IAO3D;;;;;OAKG;IAEG,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,2BAA2B;IAO7D;;;;;OAKG;IAEG,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,2BAA2B;CAM/D;AAED,OAAO,EAAE,WAAW,EAAE,CAAC"}
+{"version":3,"file":"apiInstance.d.ts","sourceRoot":"","sources":["../../src/config/apiInstance.ts"],"names":[],"mappings":"AAMA,KAAK,0BAA0B,GAAG;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B,CAAC;AAEF,KAAK,8BAA8B,GAAG;IACpC,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,KAAK,2BAA2B,GAAG;IACjC,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;GAEG;AAEH,cAAM,WAAW;IACf,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,WAAW,CAAC,CAAc;IAClC,OAAO,CAAC,SAAS,CAAC,CAAS;IAE3B;;;;;;OAMG;gBAES,KAAK,EAAE,0BAA0B;IAM7C;;;;OAIG;IAEH,OAAO,CAAC,WAAW;IAInB;;;;;OAKG;IAEH,OAAO,CAAC,eAAe;IAcvB;;;;;OAKG;IAEG,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,8BAA8B;IAM9D;;;;;OAKG;IAEG,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,2BAA2B;IAO5D;;;;;OAKG;IAEG,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,2BAA2B;IAO3D;;;;;OAKG;IAEG,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,2BAA2B;IAO7D;;;;;OAKG;IAEG,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,2BAA2B;CAM/D;AAED,OAAO,EAAE,WAAW,EAAE,CAAC"}

package/dist/services/getCaller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getCaller.d.ts","sourceRoot":"","sources":["../../src/services/getCaller.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;GAUG;AAEH,iBAAS,SAAS;;;EAyCjB;AAED,OAAO,EAAE,SAAS,EAAE,CAAC"}
+{"version":3,"file":"getCaller.d.ts","sourceRoot":"","sources":["../../src/services/getCaller.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;GAUG;AAEH,iBAAS,SAAS;;;EA+BjB;AAED,OAAO,EAAE,SAAS,EAAE,CAAC"}

package/dist/services/getCaller.js

@@ -12,34 +12,28 @@ import path from "path";
  */
 function getCaller() {
     const projectRoot = process.cwd();
-    const error = new Error();
-    const stackLines = error.stack?.split("\n").map((line) => line.trim()) || [];
-    let callerInfo = "Unknown caller";
-    let functionName = "Unknown function";
-    const relevantLines = stackLines.filter((line) => !line.includes("@arkyn/server"));
-    let foundGetCaller = false;
-    for (const line of relevantLines) {
-        if (!foundGetCaller) {
-            if (line.includes("getCaller")) {
-                foundGetCaller = true;
-            }
-            continue;
-        }
-        const match = line.match(/at (.+?) \((.+?)\)/) || line.match(/at (.+)/);
-        if (match) {
-            const rawFuncName = match[1]?.split(" ")[0] || "";
-            functionName =
-                rawFuncName && !rawFuncName.includes("/")
-                    ? rawFuncName
-                    : "Unknown function";
-            let fullPath = match[2] || match[1];
-            if (fullPath.startsWith(projectRoot)) {
-                fullPath = path.relative(projectRoot, fullPath);
-            }
-            callerInfo = fullPath;
-            break;
+    const err = new Error();
+    const stack = err.stack || "";
+    const stackLines = stack.split("\n").map((line) => line.trim());
+    const callerLine = stackLines[4] || "";
+    let functionName = "unknown";
+    let callerInfo = "unknown location";
+    const functionMatch = callerLine.match(/at\s+([^\s]+)\s+\((.*)\)/);
+    if (functionMatch) {
+        functionName = functionMatch[1];
+        callerInfo = functionMatch[2];
+    }
+    else {
+        const locationMatch = callerLine.match(/at\s+(.*)/);
+        if (locationMatch) {
+            callerInfo = locationMatch[1];
+            const pathParts = callerInfo.split("/");
+            const lastPart = pathParts[pathParts.length - 1] || "";
+            const fileParts = lastPart.split(":");
+            functionName = fileParts[0] || "unknown";
         }
     }
+    callerInfo = path.relative(projectRoot, callerInfo);
     return { functionName, callerInfo };
 }
 export { getCaller };

package/dist/services/httpDebug.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"httpDebug.d.ts","sourceRoot":"","sources":["../../src/services/httpDebug.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAEH,iBAAS,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,GAAG,QAyBtD;AAED,OAAO,EAAE,SAAS,EAAE,CAAC"}
+{"version":3,"file":"httpDebug.d.ts","sourceRoot":"","sources":["../../src/services/httpDebug.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAEH,iBAAS,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,GAAG,QA0BtD;AAED,OAAO,EAAE,SAAS,EAAE,CAAC"}

package/dist/services/httpDebug.js

@@ -47,10 +47,10 @@ function httpDebug(name, body, cause) {
         if (cause) {
             consoleData += `${debugName} Cause: ${JSON.stringify(cause, null, 2)}\n`;
         }
-        console.log(consoleData);
         const arkynKeys = InboxFlowInstance.getInboxConfig();
         if (arkynKeys)
             console.log(arkynKeys);
+        console.log(consoleData);
     }
 }
 export { httpDebug };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkyn/server",
-  "version": "2.2.1",
+  "version": "2.2.3",
   "main": "./dist/bundle.js",
   "module": "./src/index.ts",
   "type": "module",

package/src/config/apiInstance.ts

@@ -4,7 +4,7 @@ import { patchRequest } from "../api/patchRequest";
 import { postRequest } from "../api/postRequest";
 import { putRequest } from "../api/putRequest";
 
-type ApiAinstanceContructorProps = {
+type ApiInstanceContructorProps = {
   baseUrl: string;
   baseHeaders?: HeadersInit;
   baseToken?: string | null;
@@ -38,7 +38,7 @@ class ApiInstance {
    * @param props.baseToken - Optional base token for authorization.
    */
 
-  constructor(props: ApiAinstanceContructorProps) {
+  constructor(props: ApiInstanceContructorProps) {
     this.baseUrl = props.baseUrl;
     this.baseHeaders = props.baseHeaders || undefined;
     this.baseToken = props.baseToken || undefined;

package/src/services/getCaller.ts

@@ -15,43 +15,33 @@ import path from "path";
 function getCaller() {
   const projectRoot = process.cwd();
 
-  const error = new Error();
-  const stackLines = error.stack?.split("\n").map((line) => line.trim()) || [];
-
-  let callerInfo = "Unknown caller";
-  let functionName = "Unknown function";
-
-  const relevantLines = stackLines.filter(
-    (line) => !line.includes("@arkyn/server")
-  );
-
-  let foundGetCaller = false;
-  for (const line of relevantLines) {
-    if (!foundGetCaller) {
-      if (line.includes("getCaller")) {
-        foundGetCaller = true;
-      }
-      continue;
-    }
-
-    const match = line.match(/at (.+?) \((.+?)\)/) || line.match(/at (.+)/);
-    if (match) {
-      const rawFuncName = match[1]?.split(" ")[0] || "";
-
-      functionName =
-        rawFuncName && !rawFuncName.includes("/")
-          ? rawFuncName
-          : "Unknown function";
-
-      let fullPath = match[2] || match[1];
-      if (fullPath.startsWith(projectRoot)) {
-        fullPath = path.relative(projectRoot, fullPath);
-      }
-      callerInfo = fullPath;
-      break;
+  const err = new Error();
+  const stack = err.stack || "";
+
+  const stackLines = stack.split("\n").map((line) => line.trim());
+
+  const callerLine = stackLines[4] || "";
+
+  let functionName = "unknown";
+  let callerInfo = "unknown location";
+
+  const functionMatch = callerLine.match(/at\s+([^\s]+)\s+\((.*)\)/);
+  if (functionMatch) {
+    functionName = functionMatch[1];
+    callerInfo = functionMatch[2];
+  } else {
+    const locationMatch = callerLine.match(/at\s+(.*)/);
+    if (locationMatch) {
+      callerInfo = locationMatch[1];
+      const pathParts = callerInfo.split("/");
+      const lastPart = pathParts[pathParts.length - 1] || "";
+      const fileParts = lastPart.split(":");
+      functionName = fileParts[0] || "unknown";
     }
   }
 
+  callerInfo = path.relative(projectRoot, callerInfo);
+
   return { functionName, callerInfo };
 }
 

package/src/services/httpDebug.ts

@@ -55,9 +55,10 @@ function httpDebug(name: string, body: any, cause?: any) {
       consoleData += `${debugName} Cause: ${JSON.stringify(cause, null, 2)}\n`;
     }
 
-    console.log(consoleData);
     const arkynKeys = InboxFlowInstance.getInboxConfig();
     if (arkynKeys) console.log(arkynKeys);
+
+    console.log(consoleData);
   }
 }