@forgehive/forge-cli 0.2.3 → 0.2.4

package/dist/runner.js

@@ -26,7 +26,7 @@ const runner = new runner_1.Runner((data) => {
     const { _, ...filteredObj } = data;
     return {
         taskName: String(_[0]),
-        action: String(_[1]),
+        action: _[1] ?? '',
         args: filteredObj
     };
 });
@@ -53,7 +53,7 @@ runner.setHandler(async (data) => {
     const parsedArgs = runner.parseArguments(data);
     const { taskName, action, args } = parsedArgs;
     console.log('========================================');
-    console.log('Running:', taskName, action, args);
+    console.log(`Running: ${taskName} ${action ? action : ''} ${JSON.stringify(args)}`);
     console.log('========================================');
     const task = runner.getTask(taskName);
     if (!task) {

package/dist/tasks/conf/info.d.ts

@@ -3,11 +3,7 @@ export declare const info: import("@forgehive/task").TaskInstanceType<(argv: {},
     loadCurrentProfile: (args: {}) => Promise<Promise<import("../types").Profile>>;
 }>) => Promise<{
     version: any;
-    profile: {
-        name: string;
-        url: string;
-        apiKey: string;
-    };
+    profile: {};
 }>, {
     readFile: (filePath: string) => Promise<string>;
     loadCurrentProfile: (args: {}) => Promise<Promise<import("../types").Profile>>;

package/dist/tasks/conf/info.js

@@ -51,13 +51,21 @@ exports.info = (0, task_1.createTask)(schema, boundaries, async function (_argv,
     const packageJsonPath = path.join(__dirname, '../../../package.json');
     const packageJsonContent = await readFile(packageJsonPath);
     const packageJson = JSON.parse(packageJsonContent);
-    const profile = await loadCurrentProfile({});
-    return {
+    const info = {
         version: packageJson.version,
-        profile: {
+        profile: {}
+    };
+    let profile;
+    try {
+        profile = await loadCurrentProfile({});
+        info.profile = {
             name: profile.name,
             url: profile.url,
             apiKey: profile.apiKey
-        }
-    };
+        };
+    }
+    catch (error) {
+        console.log('No default profile set. Please run forge task:run auth:add to create a profile.');
+    }
+    return info;
 });

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

@@ -17,10 +17,11 @@ export declare const publish: import("@forgehive/task").TaskInstanceType<(argv:
     readFileUtf8: (filePath: string) => Promise<string>;
     readFileBinary: (filePath: string) => Promise<Buffer>;
     publishTask: (data: any, profile: Profile) => Promise<any>;
+    uploadBundleWithPresignedUrl: (presignedUrl: string, bundleContent: Buffer) => Promise<any>;
     ensureBuildsFolder: () => Promise<string>;
 }>) => Promise<{
     descriptor: import("../types").TaskDescriptor;
-    publishResponse: any;
+    publish: boolean;
 }>, {
     getCwd: () => Promise<string>;
     loadConf: (args: {}) => Promise<Promise<import("../types").ForgeConf>>;
@@ -37,5 +38,6 @@ export declare const publish: import("@forgehive/task").TaskInstanceType<(argv:
     readFileUtf8: (filePath: string) => Promise<string>;
     readFileBinary: (filePath: string) => Promise<Buffer>;
     publishTask: (data: any, profile: Profile) => Promise<any>;
+    uploadBundleWithPresignedUrl: (presignedUrl: string, bundleContent: Buffer) => Promise<any>;
     ensureBuildsFolder: () => Promise<string>;
 }>;

package/dist/tasks/task/publish.js

@@ -37,15 +37,32 @@ const boundaries = {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     publishTask: async (data, profile) => {
         const publishUrl = `${profile.url}/api/tasks/publish`;
-        console.log(`Publishing task to ${publishUrl}...`);
         const authToken = `${profile.apiKey}:${profile.apiSecret}`;
-        const response = await axios_1.default.post(publishUrl, data, {
+        try {
+            const response = await axios_1.default.post(publishUrl, data, {
+                headers: {
+                    Authorization: `Bearer ${authToken}`,
+                    'Content-Type': 'application/json'
+                }
+            });
+            return response.data;
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        }
+        catch (error) {
+            if (error.response?.data?.error.includes('Bundle size')) {
+                throw new Error('Bundle size exceeds the maximum allowed size of 25MB');
+            }
+            throw new Error('Failed to publish task source code and metadata');
+        }
+    },
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    uploadBundleWithPresignedUrl: async (presignedUrl, bundleContent) => {
+        const response = await axios_1.default.put(presignedUrl, bundleContent, {
             headers: {
-                Authorization: `Bearer ${authToken}`,
-                'Content-Type': 'application/json'
+                'Content-Type': 'application/octet-stream'
             }
         });
-        return response.data;
+        return response.status === 200;
     },
     ensureBuildsFolder: async () => {
         const buildsPath = path_1.default.join(os_1.default.homedir(), '.forge', 'builds');
@@ -58,7 +75,7 @@ const boundaries = {
         return buildsPath;
     }
 };
-exports.publish = (0, task_1.createTask)(schema, boundaries, async function ({ descriptorName }, { getCwd, ensureBuildsFolder, loadConf, bundleCreate, bundleLoad, readFileUtf8, readFileBinary, publishTask, loadCurrentProfile }) {
+exports.publish = (0, task_1.createTask)(schema, boundaries, async function ({ descriptorName }, { getCwd, ensureBuildsFolder, loadConf, bundleCreate, bundleLoad, readFileUtf8, readFileBinary, publishTask, loadCurrentProfile, uploadBundleWithPresignedUrl }) {
     const cwd = await getCwd();
     const forgeJson = await loadConf({});
     const profile = await loadCurrentProfile({});
@@ -70,14 +87,12 @@ exports.publish = (0, task_1.createTask)(schema, boundaries, async function ({ d
     const entryPoint = path_1.default.join(cwd, taskDescriptor.path);
     const buildsPath = await ensureBuildsFolder();
     const outputFile = path_1.default.join(buildsPath, `${descriptorName}.js`);
-    console.log('entryPoint:', entryPoint);
-    console.log('buildsPath:', buildsPath);
-    console.log('outputFile:', outputFile);
     // Bundle the task
     await bundleCreate({
         entryPoint,
         outputFile
     });
+    console.log('Bundle created...');
     // Load the bundled task
     const bundle = await bundleLoad({
         bundlePath: outputFile
@@ -87,9 +102,12 @@ exports.publish = (0, task_1.createTask)(schema, boundaries, async function ({ d
     const description = task.getDescription() ?? '';
     const schema = task.getSchema() || new schema_1.Schema({});
     const schemaDescriptor = schema.describe();
-    // Read the task file content and bundle
+    // Read the task file content
     const sourceCode = await readFileUtf8(entryPoint);
     const bundleContent = await readFileBinary(outputFile);
+    // Get bundle size
+    const bundleSize = bundleContent.length;
+    // First, publish task metadata and get presigned URL for bundle upload
     const data = {
         ...taskDescriptor,
         taskName: descriptorName,
@@ -97,10 +115,21 @@ exports.publish = (0, task_1.createTask)(schema, boundaries, async function ({ d
         description,
         schemaDescriptor: JSON.stringify(schemaDescriptor),
         sourceCode,
-        bundle: bundleContent.toString('base64')
+        bundleSize
     };
-    // Publish to hive api server
-    const response = await publishTask(data, profile);
-    console.log('Publish response:', response);
-    return { descriptor: taskDescriptor, publishResponse: response };
+    // Publish metadata to hive api server
+    console.log(`Publishing metadata and source code to ${profile.url}...`);
+    const publishResponse = await publishTask(data, profile);
+    // Upload bundle using the presigned URL
+    if (publishResponse.bundleUploadUrl) {
+        console.log('Uploading bundle...');
+        await uploadBundleWithPresignedUrl(publishResponse.bundleUploadUrl, bundleContent);
+        return {
+            descriptor: taskDescriptor,
+            publish: true
+        };
+    }
+    else {
+        throw new Error('Bundle upload failed');
+    }
 });

package/package.json

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

package/src/runner.ts

@@ -33,7 +33,7 @@ const runner = new Runner((data: ParsedArgs): CliParsedArguments => {
 
   return {
     taskName: String(_[0]),
-    action: String(_[1]),
+    action: _[1] ?? '',
     args: filteredObj
   }
 })
@@ -66,7 +66,7 @@ runner.setHandler(async (data: ParsedArgs): Promise<unknown> => {
   const { taskName, action, args } = parsedArgs
 
   console.log('========================================')
-  console.log('Running:', taskName, action, args)
+  console.log(`Running: ${taskName} ${action ? action : ''} ${JSON.stringify(args)}`)
   console.log('========================================')
 
   const task = runner.getTask(taskName)

package/src/tasks/conf/info.ts

@@ -22,19 +22,27 @@ export const info = createTask(
   async function (_argv, { loadCurrentProfile, readFile }) {
     const packageJsonPath = path.join(__dirname, '../../../package.json')
 
-
     const packageJsonContent = await readFile(packageJsonPath)
     const packageJson = JSON.parse(packageJsonContent)
 
-    const profile = await loadCurrentProfile({})
-
-    return {
+    const info = {
       version: packageJson.version,
-      profile: {
+      profile: {}
+    }
+
+    let profile
+    try {
+      profile = await loadCurrentProfile({})
+
+      info.profile = {
         name: profile.name,
         url: profile.url,
         apiKey: profile.apiKey
       }
+    } catch (error) {
+      console.log('No default profile set. Please run forge task:run auth:add to create a profile.')
     }
+
+    return info
   }
 )

package/src/tasks/task/publish.ts

@@ -37,17 +37,34 @@ const boundaries = {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   publishTask: async (data: any, profile: Profile): Promise<any> => {
     const publishUrl = `${profile.url}/api/tasks/publish`
-
-    console.log(`Publishing task to ${publishUrl}...`)
     const authToken = `${profile.apiKey}:${profile.apiSecret}`
-    const response = await axios.post(publishUrl, data, {
+
+    try {
+      const response = await axios.post(publishUrl, data, {
+        headers: {
+          Authorization: `Bearer ${authToken}`,
+          'Content-Type': 'application/json'
+        }
+      })
+
+      return response.data
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    } catch (error: any) {
+      if (error.response?.data?.error.includes('Bundle size')) {
+        throw new Error('Bundle size exceeds the maximum allowed size of 25MB')
+      }
+
+      throw new Error('Failed to publish task source code and metadata')
+    }
+  },
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  uploadBundleWithPresignedUrl: async (presignedUrl: string, bundleContent: Buffer): Promise<any> => {
+    const response = await axios.put(presignedUrl, bundleContent, {
       headers: {
-        Authorization: `Bearer ${authToken}`,
-        'Content-Type': 'application/json'
+        'Content-Type': 'application/octet-stream'
       }
     })
-
-    return response.data
+    return response.status === 200
   },
 
   ensureBuildsFolder: async (): Promise<string> => {
@@ -74,7 +91,8 @@ export const publish = createTask(
     readFileUtf8,
     readFileBinary,
     publishTask,
-    loadCurrentProfile
+    loadCurrentProfile,
+    uploadBundleWithPresignedUrl
   }) {
     const cwd = await getCwd()
     const forgeJson = await loadConf({})
@@ -91,16 +109,14 @@ export const publish = createTask(
     const buildsPath = await ensureBuildsFolder()
     const outputFile = path.join(buildsPath, `${descriptorName}.js`)
 
-    console.log('entryPoint:', entryPoint)
-    console.log('buildsPath:', buildsPath)
-    console.log('outputFile:', outputFile)
-
     // Bundle the task
     await bundleCreate({
       entryPoint,
       outputFile
     })
 
+    console.log('Bundle created...')
+
     // Load the bundled task
     const bundle = await bundleLoad({
       bundlePath: outputFile
@@ -112,10 +128,14 @@ export const publish = createTask(
     const schema = task.getSchema() || new Schema({})
     const schemaDescriptor = schema.describe()
 
-    // Read the task file content and bundle
+    // Read the task file content
     const sourceCode = await readFileUtf8(entryPoint)
     const bundleContent = await readFileBinary(outputFile)
 
+    // Get bundle size
+    const bundleSize = bundleContent.length
+
+    // First, publish task metadata and get presigned URL for bundle upload
     const data = {
       ...taskDescriptor,
       taskName: descriptorName,
@@ -123,13 +143,27 @@ export const publish = createTask(
       description,
       schemaDescriptor: JSON.stringify(schemaDescriptor),
       sourceCode,
-      bundle: bundleContent.toString('base64')
+      bundleSize
     }
 
-    // Publish to hive api server
-    const response = await publishTask(data, profile)
-
-    console.log('Publish response:', response)
-    return { descriptor: taskDescriptor, publishResponse: response }
+    // Publish metadata to hive api server
+    console.log(`Publishing metadata and source code to ${profile.url}...`)
+    const publishResponse = await publishTask(data, profile)
+
+    // Upload bundle using the presigned URL
+    if (publishResponse.bundleUploadUrl) {
+      console.log('Uploading bundle...')
+      await uploadBundleWithPresignedUrl(
+        publishResponse.bundleUploadUrl,
+        bundleContent
+      )
+
+      return {
+        descriptor: taskDescriptor,
+        publish: true
+      }
+    } else {
+      throw new Error('Bundle upload failed')
+    }
   }
 )