@forgehive/forge-cli 0.2.4 → 0.2.5

package/dist/tasks/init.js

@@ -27,7 +27,7 @@ exports.init = (0, task_1.createTask)(schema, boundaries, async function (argv,
     const forgePath = path_1.default.join(cwd, 'forge.json');
     const config = {
         project: {
-            name: 'ChangeMePls'
+            name: 'BaseProject'
         },
         paths: {
             logs: 'logs/',

package/dist/tasks/task/publish.js

@@ -101,6 +101,7 @@ exports.publish = (0, task_1.createTask)(schema, boundaries, async function ({ d
     const task = bundle[taskDescriptor.handler];
     const description = task.getDescription() ?? '';
     const schema = task.getSchema() || new schema_1.Schema({});
+    const boundaries = Object.keys(task.getBoundaries()) || [];
     const schemaDescriptor = schema.describe();
     // Read the task file content
     const sourceCode = await readFileUtf8(entryPoint);
@@ -114,6 +115,7 @@ exports.publish = (0, task_1.createTask)(schema, boundaries, async function ({ d
         projectName,
         description,
         schemaDescriptor: JSON.stringify(schemaDescriptor),
+        boundaries,
         sourceCode,
         bundleSize
     };

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

@@ -1,9 +1,10 @@
-import { type ForgeConf } from '../types';
+import { type ForgeConf, type Profile } from '../types';
 export declare const run: import("@forgehive/task").TaskInstanceType<(argv: {
     descriptorName: string;
     args: Record<string, string | number | boolean>;
 }, boundaries: import("@forgehive/task").WrappedBoundaries<{
     loadConf: (args: {}) => Promise<Promise<ForgeConf>>;
+    loadCurrentProfile: (args: {}) => Promise<Promise<Profile>>;
     bundleCreate: (args: {
         entryPoint: string;
         outputFile: string;
@@ -15,8 +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>;
 }>) => Promise<any>, {
     loadConf: (args: {}) => Promise<Promise<ForgeConf>>;
+    loadCurrentProfile: (args: {}) => Promise<Promise<Profile>>;
     bundleCreate: (args: {
         entryPoint: string;
         outputFile: string;
@@ -28,4 +31,5 @@ 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>;
 }>;

package/dist/tasks/task/run.js

@@ -10,12 +10,14 @@ 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 create_1 = require("../bundle/create");
 const load_1 = require("../bundle/load");
 const load_2 = require("../conf/load");
+const loadCurrent_1 = require("../auth/loadCurrent");
 // For now, we'll use a simple schema without the record type
 // TODO: Use Schema.record once it's properly built and available
 const schema = new schema_1.Schema({
@@ -25,6 +27,7 @@ const schema = new schema_1.Schema({
 });
 const boundaries = {
     loadConf: load_2.load.asBoundary(),
+    loadCurrentProfile: loadCurrent_1.loadCurrent.asBoundary(),
     bundleCreate: create_1.create.asBoundary(),
     bundleLoad: load_1.load.asBoundary(),
     verifyLogFolder: async (logsPath) => {
@@ -46,15 +49,49 @@ const boundaries = {
             await promises_1.default.mkdir(buildsPath, { recursive: true });
         }
         return buildsPath;
+    },
+    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, {
+                projectName,
+                taskName,
+                logItem: JSON.stringify(logItem)
+            }, {
+                headers: {
+                    Authorization: `Bearer ${authToken}`,
+                    'Content-Type': 'application/json'
+                }
+            });
+            console.log('===============================================');
+            console.log('Log sent to API... ', profile.name, profile.url);
+            return true;
+        }
+        catch (e) {
+            const error = e;
+            console.error('Failed to send log to API:', error.message);
+            return false;
+        }
     }
 };
-exports.run = (0, task_1.createTask)(schema, boundaries, async function ({ descriptorName, args }, { loadConf, bundleCreate, bundleLoad, verifyLogFolder, ensureBuildsFolder }) {
+exports.run = (0, task_1.createTask)(schema, boundaries, async function ({ descriptorName, args }, { loadConf, bundleCreate, bundleLoad, verifyLogFolder, ensureBuildsFolder, loadCurrentProfile, sendLogToAPI }) {
     // Load forge configuration
     const forge = await loadConf({});
     const taskDescriptor = forge.tasks[descriptorName];
+    const projectName = forge.project.name;
     if (taskDescriptor === undefined) {
         throw new Error('Task is not defined on forge.json');
     }
+    // Try to load profile, but continue if not found
+    let profile = null;
+    try {
+        profile = await loadCurrentProfile({});
+    }
+    catch (error) {
+        // Profile not found or not configured, continue without it
+        console.log('No profile found, logs will not be sent to remote API');
+    }
     // Verify if log folder exists
     const logFolderPath = path_1.default.join(process.cwd(), forge.paths.logs);
     const logFolderExists = await verifyLogFolder(logFolderPath);
@@ -105,14 +142,26 @@ exports.run = (0, task_1.createTask)(schema, boundaries, async function ({ descr
     }
     tape.recordFrom(descriptorName, task);
     // Run the task with provided arguments
-    let result;
+    let result, error;
     try {
         result = await task.run(args);
     }
-    catch (error) {
-        await tape.save();
-        throw error;
+    catch (e) {
+        error = e;
     }
     await tape.save();
+    const logItems = tape.getLog();
+    const lastLogItem = logItems[logItems.length - 1];
+    if (profile) {
+        try {
+            await sendLogToAPI(profile, projectName, descriptorName, lastLogItem);
+        }
+        catch (e) {
+            console.error('Failed to send log to API:', e);
+        }
+    }
+    if (error) {
+        throw error;
+    }
     return result;
 });

package/dist/test/tasks/init.test.js

@@ -43,7 +43,7 @@ describe('Init task', () => {
         const fileContent = await fs.promises.readFile(path_1.default.join(rootDir, 'forge.json'), 'utf-8');
         const config = JSON.parse(fileContent);
         // Verify the file content
-        expect(config).toHaveProperty('project.name', 'ChangeMePls');
+        expect(config).toHaveProperty('project.name', 'BaseProject');
         expect(config).toHaveProperty('paths.logs', 'logs/');
         expect(config).toHaveProperty('paths.tasks', 'src/tasks/');
         expect(config).toHaveProperty('infra.region', 'us-west-2');
@@ -66,7 +66,7 @@ describe('Init task', () => {
         // Verify saveFile was not called
         expect(saveFileFn).not.toHaveBeenCalled();
         // Verify the returned config has the correct structure
-        expect(result).toHaveProperty('project.name', 'ChangeMePls');
+        expect(result).toHaveProperty('project.name', 'BaseProject');
         expect(result).toHaveProperty('paths.logs', 'logs/');
         expect(result).toHaveProperty('paths.tasks', 'src/tasks/');
         expect(result).toHaveProperty('infra.region', 'us-west-2');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forgehive/forge-cli",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "TypeScript CLI application",
   "license": "MIT",
   "main": "dist/index.js",
@@ -26,9 +26,9 @@
     "handlebars": "^4.7.8",
     "minimist": "^1.2.8",
     "@forgehive/task": "0.1.5",
+    "@forgehive/schema": "0.1.4",
     "@forgehive/record-tape": "0.0.2",
-    "@forgehive/runner": "0.1.5",
-    "@forgehive/schema": "0.1.4"
+    "@forgehive/runner": "0.1.5"
   },
   "devDependencies": {
     "@types/jest": "^29.5.3",

package/src/tasks/init.ts

@@ -32,7 +32,7 @@ export const init = createTask(
 
     const config: ForgeConf = {
       project: {
-        name: 'ChangeMePls'
+        name: 'BaseProject'
       },
       paths: {
         logs: 'logs/',

package/src/tasks/task/publish.ts

@@ -126,6 +126,7 @@ export const publish = createTask(
     const task = bundle[taskDescriptor.handler]
     const description = task.getDescription() ?? ''
     const schema = task.getSchema() || new Schema({})
+    const boundaries = Object.keys(task.getBoundaries()) || []
     const schemaDescriptor = schema.describe()
 
     // Read the task file content
@@ -142,6 +143,7 @@ export const publish = createTask(
       projectName,
       description,
       schemaDescriptor: JSON.stringify(schemaDescriptor),
+      boundaries,
       sourceCode,
       bundleSize
     }

package/src/tasks/task/run.ts

@@ -5,6 +5,7 @@
 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'
@@ -13,7 +14,8 @@ import { RecordTape } from '@forgehive/record-tape'
 import { create as bundleCreate } from '../bundle/create'
 import { load as bundleLoad } from '../bundle/load'
 import { load as loadConf } from '../conf/load'
-import { type ForgeConf } from '../types'
+import { loadCurrent as loadCurrentProfile } from '../auth/loadCurrent'
+import { type ForgeConf, type Profile } from '../types'
 
 // For now, we'll use a simple schema without the record type
 // TODO: Use Schema.record once it's properly built and available
@@ -25,6 +27,7 @@ const schema = new Schema({
 
 const boundaries = {
   loadConf: loadConf.asBoundary(),
+  loadCurrentProfile: loadCurrentProfile.asBoundary(),
   bundleCreate: bundleCreate.asBoundary(),
   bundleLoad: bundleLoad.asBoundary(),
   verifyLogFolder: async (logsPath: string): Promise<boolean> => {
@@ -46,21 +49,65 @@ const boundaries = {
     }
 
     return buildsPath
+  },
+  sendLogToAPI: async (profile: Profile, projectName: string, taskName: string, logItem: unknown): Promise<boolean> => {
+    try {
+      const logsUrl = `${profile.url}/api/tasks/log-ingest`
+      const authToken = `${profile.apiKey}:${profile.apiSecret}`
+
+      await axios.post(logsUrl, {
+        projectName,
+        taskName,
+        logItem: JSON.stringify(logItem)
+      }, {
+        headers: {
+          Authorization: `Bearer ${authToken}`,
+          'Content-Type': 'application/json'
+        }
+      })
+
+      console.log('===============================================')
+      console.log('Log sent to API... ', profile.name, profile.url)
+
+      return true
+    } catch (e) {
+      const error = e as Error
+      console.error('Failed to send log to API:', error.message)
+      return false
+    }
   }
 }
 
 export const run = createTask(
   schema,
   boundaries,
-  async function ({ descriptorName, args }, { loadConf, bundleCreate, bundleLoad, verifyLogFolder, ensureBuildsFolder }) {
+  async function ({ descriptorName, args }, {
+    loadConf,
+    bundleCreate,
+    bundleLoad,
+    verifyLogFolder,
+    ensureBuildsFolder,
+    loadCurrentProfile,
+    sendLogToAPI
+  }) {
     // Load forge configuration
     const forge: ForgeConf = await loadConf({})
     const taskDescriptor = forge.tasks[descriptorName as keyof typeof forge.tasks]
+    const projectName = forge.project.name
 
     if (taskDescriptor === undefined) {
       throw new Error('Task is not defined on forge.json')
     }
 
+    // Try to load profile, but continue if not found
+    let profile = null
+    try {
+      profile = await loadCurrentProfile({})
+    } catch (error) {
+      // Profile not found or not configured, continue without it
+      console.log('No profile found, logs will not be sent to remote API')
+    }
+
     // Verify if log folder exists
     const logFolderPath = path.join(process.cwd(), forge.paths.logs)
     const logFolderExists = await verifyLogFolder(logFolderPath)
@@ -122,15 +169,28 @@ export const run = createTask(
     tape.recordFrom(descriptorName, task)
 
     // Run the task with provided arguments
-    let result
+    let result, error
     try {
       result = await task.run(args)
-    } catch (error) {
-      await tape.save()
-      throw error
+    } catch (e) {
+      error = e as Error
     }
 
     await tape.save()
+    const logItems = tape.getLog()
+    const lastLogItem = logItems[logItems.length - 1]
+
+    if (profile) {
+      try {
+        await sendLogToAPI(profile, projectName, descriptorName, lastLogItem)
+      } catch (e) {
+        console.error('Failed to send log to API:', e)
+      }
+    }
+
+    if (error) {
+      throw error
+    }
 
     return result
   }

package/src/test/tasks/init.test.ts

@@ -48,7 +48,7 @@ describe('Init task', () => {
     const config = JSON.parse(fileContent)
 
     // Verify the file content
-    expect(config).toHaveProperty('project.name', 'ChangeMePls')
+    expect(config).toHaveProperty('project.name', 'BaseProject')
     expect(config).toHaveProperty('paths.logs', 'logs/')
     expect(config).toHaveProperty('paths.tasks', 'src/tasks/')
     expect(config).toHaveProperty('infra.region', 'us-west-2')
@@ -77,7 +77,7 @@ describe('Init task', () => {
     expect(saveFileFn).not.toHaveBeenCalled()
 
     // Verify the returned config has the correct structure
-    expect(result).toHaveProperty('project.name', 'ChangeMePls')
+    expect(result).toHaveProperty('project.name', 'BaseProject')
     expect(result).toHaveProperty('paths.logs', 'logs/')
     expect(result).toHaveProperty('paths.tasks', 'src/tasks/')
     expect(result).toHaveProperty('infra.region', 'us-west-2')