@kadi.build/core 0.0.1-alpha.1 → 0.0.1-alpha.2

package/index.js

@@ -5,10 +5,6 @@ import { fileURLToPath } from 'url';
 import { exec, execSync, spawn } from 'child_process';
 import { Broker, BrokerMessageBuilder } from './broker.js';
 import { IPCManager, IPCMessageBuilder } from './ipc.js';
-import { createRequire } from 'module'; // Import createRequire to use require in ES Modules
-
-// Create a require function scoped to the current module
-const require = createRequire(import.meta.url);
 
 function resolveKadiExecPath() {
   const command = process.platform === 'win32' ? 'where kadi' : 'which kadi';
@@ -27,44 +23,56 @@ function resolveKadiExecPath() {
 }
 
 function resolveKadiInstallPath() {
+  /* 1 - production / normal install -------------------------------- */
   try {
-    // Step 1: Get the path to the kadi binary
-    const command = process.platform === 'win32' ? 'where kadi' : 'which kadi';
-    const kadiBinaryPath = execSync(command, { encoding: 'utf8' }).trim();
+    if (typeof import.meta.resolve === 'function') {
+      const p = import.meta.resolve('@kadi.build/cli/package.json');
+      if (p) return path.dirname(new URL(p).pathname);
+    }
+  } catch {
+    /* ignore – fall through */
+  }
 
+  /* 2 - legacy strategy – follow the kadi executable --------------- */
+  try {
+    const cmd = process.platform === 'win32' ? 'where kadi' : 'which kadi';
+    const kadiBinaryPath = execSync(cmd, { encoding: 'utf8' }).trim();
     if (!kadiBinaryPath) {
       throw new Error('Kadi CLI tool not found in the system PATH');
     }
-    // console.log('Resolved Kadi binary path:', kadiBinaryPath);
-
-    // Step 2: Resolve the symlink to find the actual location of the binary
-    const resolvedBinaryPath = fs.realpathSync(kadiBinaryPath);
-    // console.log('Resolved binary real path:', resolvedBinaryPath);
+    const realKadiBinaryPath = fs.realpathSync(kadiBinaryPath); // resolve symlink
+    let kadiDir = path.dirname(realKadiBinaryPath); // start alongside the binary
 
-    // Step 3: Correctly determine the root directory of the kadi package
-    const kadiDir = path.dirname(resolvedBinaryPath); // Move up one level to get the kadi directory
-    // console.log('Kadi directory:', kadiDir);
-
-    // Step 4: Verify if this directory contains the kadi package.json
-    const packageJsonPath = path.join(kadiDir, 'package.json');
-    // console.log('Checking for package.json at:', packageJsonPath);
-
-    if (fs.existsSync(packageJsonPath)) {
-      const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
-
-      if (packageJson.name === 'kadi') {
-        // console.log('Kadi package.json found:', packageJsonPath);
+    const kadiPackageJsonPath = path.join(kadiDir, 'package.json');
+    if (fs.existsSync(kadiPackageJsonPath)) {
+      const kadiPackageJson = JSON.parse(
+        fs.readFileSync(kadiPackageJsonPath, 'utf8')
+      );
+      if (
+        kadiPackageJson.name === '@kadi.build/cli' ||
+        (kadiPackageJson.bin && kadiPackageJson.bin.kadi)
+      ) {
         return kadiDir;
       } else {
-        throw new Error('Package.json found, but it is not for kadi.');
+        throw new Error(
+          'Package.json found, but it is not for @kadi.build/cli'
+        );
       }
     } else {
-      throw new Error('Kadi package.json not found in the resolved path.');
+      throw new Error(
+        '@kadi.build/cli package.json not found in the resolved path.'
+      );
     }
-  } catch (error) {
-    console.error('Error resolving Kadi CLI install path:', error);
-    return null;
+  } catch {
+    /* ignore – fall through */
   }
+
+  /* 3 - give up ----------------------------------------------------- */
+  throw new Error(
+    'Could not locate @kadi.build/cli installation. ' +
+      'Make sure the CLI is installed (`npm i -g @kadi.build/cli`) ' +
+      'or run commands from inside the CLI repository during development.'
+  );
 }
 
 const __filename = fileURLToPath(import.meta.url);
@@ -194,16 +202,20 @@ export const GET_API_URL = kadijson.api + '/get';
 
 // Export all broker URLs
 const brokers = {};
-for (const [name, url] of Object.entries(kadijson.brokers)) {
-  const brokerUrl = new URL(url);
-  brokers[name] =
-    `${brokerUrl.hostname}:${brokerUrl.port}${brokerUrl.pathname}`;
+if (kadijson.brokers && typeof kadijson.brokers === 'object') {
+  for (const [name, url] of Object.entries(kadijson.brokers)) {
+    const brokerUrl = new URL(url);
+    brokers[name] =
+      `${brokerUrl.hostname}:${brokerUrl.port}${brokerUrl.pathname}`;
+  }
 }
 
 export const KADI_BROKERS = brokers;
 
 // Get default broker (first one defined)
-const defaultBrokerName = Object.keys(kadijson.brokers)[0];
+const defaultBrokerName = kadijson.brokers
+  ? Object.keys(kadijson.brokers)[0]
+  : null;
 export const KADI_BROKER_URL = brokers[defaultBrokerName]; // Backward compatibility
 
 // Utility functions

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kadi.build/core",
-  "version": "0.0.1-alpha.1",
+  "version": "0.0.1-alpha.2",
   "description": "A module that is a comprehensive toolkit for developers integrating with the KADI infrastructure.",
   "main": "index.js",
   "type": "module",