@forgehive/forge-cli 0.3.0 → 0.3.2

package/dist/tasks/task/run.d.ts

@@ -16,7 +16,10 @@ export declare const run: import("@forgehive/task").TaskInstanceType<(argv: {
     }) => Promise<Promise<any>>;
     verifyLogFolder: (logsPath: string) => Promise<boolean>;
     ensureBuildsFolder: () => Promise<string>;
-    sendLogToAPI: (profile: Profile, projectName: string, taskName: string, logItem: unknown) => Promise<boolean>;
+    sendLogToAPI: (profile: Profile, projectName: string, taskName: string, logItem: {
+        input: unknown;
+        metadata?: Record<string, string>;
+    }) => Promise<boolean>;
 }>) => Promise<any>, {
     loadConf: (args: {}) => Promise<Promise<ForgeConf>>;
     loadCurrentProfile: (args: {}) => Promise<Promise<Profile>>;
@@ -31,5 +34,8 @@ export declare const run: import("@forgehive/task").TaskInstanceType<(argv: {
     }) => Promise<Promise<any>>;
     verifyLogFolder: (logsPath: string) => Promise<boolean>;
     ensureBuildsFolder: () => Promise<string>;
-    sendLogToAPI: (profile: Profile, projectName: string, taskName: string, logItem: unknown) => Promise<boolean>;
+    sendLogToAPI: (profile: Profile, projectName: string, taskName: string, logItem: {
+        input: unknown;
+        metadata?: Record<string, string>;
+    }) => Promise<boolean>;
 }>;

package/dist/tasks/task/run.js

@@ -11,10 +11,10 @@ exports.run = void 0;
 const path_1 = __importDefault(require("path"));
 const promises_1 = __importDefault(require("fs/promises"));
 const os_1 = __importDefault(require("os"));
-const axios_1 = __importDefault(require("axios"));
 const task_1 = require("@forgehive/task");
 const schema_1 = require("@forgehive/schema");
 const record_tape_1 = require("@forgehive/record-tape");
+const hive_sdk_1 = require("@forgehive/hive-sdk");
 const create_1 = require("../bundle/create");
 const load_1 = require("../bundle/load");
 const load_2 = require("../conf/load");
@@ -53,25 +53,31 @@ const boundaries = {
     },
     sendLogToAPI: async (profile, projectName, taskName, logItem) => {
         try {
-            const logsUrl = `${profile.url}/api/tasks/log-ingest`;
-            const authToken = `${profile.apiKey}:${profile.apiSecret}`;
-            await axios_1.default.post(logsUrl, {
+            const config = {
                 projectName,
-                taskName,
-                logItem: JSON.stringify(logItem)
-            }, {
-                headers: {
-                    Authorization: `Bearer ${authToken}`,
-                    'Content-Type': 'application/json'
+                apiKey: profile.apiKey,
+                apiSecret: profile.apiSecret,
+                host: profile.url,
+                metadata: {
+                    environment: 'cli'
                 }
-            });
-            console.log('===============================================');
-            console.log('Log sent to API... ', profile.name, profile.url);
-            return true;
+            };
+            const client = new hive_sdk_1.HiveLogClient(config);
+            const result = await client.sendLog(taskName, logItem);
+            if (result === 'success') {
+                console.log('===============================================');
+                console.log('Log sent to API... ', profile.name, profile.url);
+                return true;
+            }
+            else {
+                console.error('Failed to send log to API:', profile.url);
+                return false;
+            }
         }
         catch (e) {
+            console.error('Failed to send log to API:', profile.url);
             const error = e;
-            console.error('Failed to send log to API:', error.message);
+            console.error('Error:', error.message);
             return false;
         }
     }
@@ -122,23 +128,17 @@ exports.run = (0, task_1.createTask)({
             throw new Error(`Handler "${taskDescriptor.handler}" not found in bundle`);
         }
         // Setup record tape
-        let tape = new record_tape_1.RecordTape({
+        const tape = new record_tape_1.RecordTape({
             path: logsPath
         });
         // load record tape
         try {
             await tape.load();
-            // Need to figure out how to handle the log length
-            // and other options for the RecordTape
-            // For now, we'll just keep the implementation simple
-            const maxLogLength = 9;
-            const log = tape.getLog();
-            if (log.length > maxLogLength) {
-                const newTape = new record_tape_1.RecordTape({
-                    path: logsPath,
-                    log: log.slice(-maxLogLength)
-                });
-                tape = newTape;
+            // Maintain a maximum log length by removing old records
+            const maxLogLength = 10;
+            // Remove records from the beginning until we're within the limit
+            while (tape.getLength() >= maxLogLength) {
+                tape.shift();
             }
         }
         catch (_error) {
@@ -146,7 +146,7 @@ exports.run = (0, task_1.createTask)({
         }
         // Run the task with provided arguments
         const [result, error, record] = await task.safeRun(args);
-        const logItem = tape.push(descriptorName, record, {
+        const logItem = tape.push(record, {
             environment: 'cli'
         });
         await tape.save();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forgehive/forge-cli",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "TypeScript CLI application",
   "license": "MIT",
   "main": "dist/index.js",
@@ -10,10 +10,11 @@
   "publishConfig": {
     "access": "public",
     "dependencies": {
-      "@forgehive/record-tape": "^0.2.0",
-      "@forgehive/runner": "^0.2.0",
+      "@forgehive/hive-sdk": "^0.0.2",
+      "@forgehive/record-tape": "^0.2.2",
+      "@forgehive/runner": "^0.2.2",
       "@forgehive/schema": "^0.1.4",
-      "@forgehive/task": "^0.2.0",
+      "@forgehive/task": "^0.2.2",
       "esbuild": "^0.25.0",
       "handlebars": "^4.7.8",
       "minimist": "^1.2.8"
@@ -26,10 +27,11 @@
     "esbuild": "^0.25.0",
     "handlebars": "^4.7.8",
     "minimist": "^1.2.8",
-    "@forgehive/record-tape": "0.2.0",
-    "@forgehive/task": "0.2.0",
-    "@forgehive/schema": "0.1.4",
-    "@forgehive/runner": "0.2.0"
+    "@forgehive/hive-sdk": "0.0.2",
+    "@forgehive/record-tape": "0.2.2",
+    "@forgehive/task": "0.2.2",
+    "@forgehive/runner": "0.2.2",
+    "@forgehive/schema": "0.1.4"
   },
   "devDependencies": {
     "@types/archiver": "^6.0.3",

package/src/tasks/task/run.ts

@@ -6,11 +6,11 @@
 import path from 'path'
 import fs from 'fs/promises'
 import os from 'os'
-import axios from 'axios'
 
 import { createTask } from '@forgehive/task'
 import { Schema } from '@forgehive/schema'
 import { RecordTape } from '@forgehive/record-tape'
+import { HiveLogClient } from '@forgehive/hive-sdk'
 
 import { create as bundleCreate } from '../bundle/create'
 import { load as bundleLoad } from '../bundle/load'
@@ -51,29 +51,33 @@ const boundaries = {
 
     return buildsPath
   },
-  sendLogToAPI: async (profile: Profile, projectName: string, taskName: string, logItem: unknown): Promise<boolean> => {
+  sendLogToAPI: async (profile: Profile, projectName: string, taskName: string, logItem: { input: unknown; metadata?: Record<string, string> }): Promise<boolean> => {
     try {
-      const logsUrl = `${profile.url}/api/tasks/log-ingest`
-      const authToken = `${profile.apiKey}:${profile.apiSecret}`
-
-      await axios.post(logsUrl, {
+      const config = {
         projectName,
-        taskName,
-        logItem: JSON.stringify(logItem)
-      }, {
-        headers: {
-          Authorization: `Bearer ${authToken}`,
-          'Content-Type': 'application/json'
+        apiKey: profile.apiKey,
+        apiSecret: profile.apiSecret,
+        host: profile.url,
+        metadata: {
+          environment: 'cli'
         }
-      })
+      }
 
-      console.log('===============================================')
-      console.log('Log sent to API... ', profile.name, profile.url)
+      const client = new HiveLogClient(config)
+      const result = await client.sendLog(taskName, logItem)
 
-      return true
+      if (result === 'success') {
+        console.log('===============================================')
+        console.log('Log sent to API... ', profile.name, profile.url)
+        return true
+      } else {
+        console.error('Failed to send log to API:', profile.url)
+        return false
+      }
     } catch (e) {
+      console.error('Failed to send log to API:', profile.url)
       const error = e as Error
-      console.error('Failed to send log to API:', error.message)
+      console.error('Error:', error.message)
       return false
     }
   }
@@ -141,7 +145,7 @@ export const run = createTask({
     }
 
     // Setup record tape
-    let tape = new RecordTape({
+    const tape = new RecordTape({
       path: logsPath
     })
 
@@ -149,19 +153,12 @@ export const run = createTask({
     try {
       await tape.load()
 
-      // Need to figure out how to handle the log length
-      // and other options for the RecordTape
-      // For now, we'll just keep the implementation simple
-      const maxLogLength = 9
-      const log = tape.getLog()
-
-      if (log.length > maxLogLength) {
-        const newTape = new RecordTape({
-          path: logsPath,
-          log: log.slice(-maxLogLength)
-        })
+      // Maintain a maximum log length by removing old records
+      const maxLogLength = 10
 
-        tape = newTape
+      // Remove records from the beginning until we're within the limit
+      while (tape.getLength() >= maxLogLength) {
+        tape.shift()
       }
     } catch (_error) {
       // if the tape is not found, create a new one on saving
@@ -169,7 +166,7 @@ export const run = createTask({
 
     // Run the task with provided arguments
     const [result, error, record] = await task.safeRun(args)
-    const logItem = tape.push(descriptorName, record, {
+    const logItem = tape.push(record, {
       environment: 'cli'
     })
     await tape.save()