@corva/create-app 0.42.0-0 → 0.42.0-2

package/lib/flows/steps/attach/index.js

@@ -0,0 +1,9 @@
+import { PREPARE_DATA_TASK_STEP } from './prepare-data.js';
+import { GET_ALL_LIVE_ASSETS_TASK_STEP } from './get-all-live-assets.js';
+import { ADD_APP_TO_STREAM_TASK_STEP } from './add-app-to-stream.js';
+
+export const ATTACH_STEPS = [
+  PREPARE_DATA_TASK_STEP,
+  GET_ALL_LIVE_ASSETS_TASK_STEP,
+  ADD_APP_TO_STREAM_TASK_STEP,
+];

package/lib/flows/steps/attach/prepare-data.js

@@ -0,0 +1,20 @@
+import _ from 'lodash';
+import { StepError } from '../../lib/step-error.js';
+
+export const PREPARE_DATA_TASK_STEP = {
+  message: 'Preparing and checking data...',
+  fn: async (context) => {
+    const { manifest, api } = context;
+
+    if (!['scheduler', 'stream'].includes(manifest.manifest.application.type)) {
+      throw new StepError('Command supports only "scheduler" or "stream" apps');
+    }
+
+    const app = await api.getAppByKey(manifest.manifest.application.key.toLowerCase());
+
+    return {
+      app,
+      ...context,
+    };
+  },
+};

package/lib/flows/steps/release/add-label.js

@@ -1,4 +1,3 @@
-
 export const ADD_LABEL_STEP = {
   message: 'Adding label...',
   async fn({ options: { label }, api, appId, packageId }) {
@@ -7,5 +6,5 @@ export const ADD_LABEL_STEP = {
     }
 
     await api.putLabel(appId, packageId, label);
-  }
-}
+  },
+};

package/lib/flows/steps/release/add-notes.js

@@ -6,5 +6,5 @@ export const ADD_NOTES_STEP = {
     }
 
     await api.addNotes(appId, packageId, notes);
-  }
-}
+  },
+};

package/lib/flows/steps/release/get-config.js

@@ -4,6 +4,7 @@ import dotenv from 'dotenv';
 import { resolve } from 'node:path';
 import { StepError } from '../../lib/step-error.js';
 import { Api } from '../../lib/api.js';
+import { Notification } from '../../lib/notification.js';
 
 async function getVarsFromDotEnv({ dirName }) {
   try {
@@ -28,10 +29,12 @@ export const SETUP_API_CLIENT_STEP = {
     }
 
     const api = new Api(CORVA_API_ENV, API_KEY, AUTH_TOKEN);
+    const notification = new Notification(CORVA_API_ENV);
 
     return {
       CORVA_API_ENV: CORVA_API_ENV || 'qa',
-      api
+      api,
+      notification,
     };
   },
 };

package/lib/flows/steps/release/prepare-data.js

@@ -5,6 +5,6 @@ export const RELEASE_PREPARE_DATA_STEP = {
 
     return {
       appId: app.id,
-    }
-  }
-}
+    };
+  },
+};

package/lib/flows/steps/release/publish.js

@@ -1,9 +1,11 @@
 export const PUBLISH_PACKAGE_STEP = {
   message: 'Publishing app...',
   /**
-   * 
-   * @param {object} param0 
+   *
+   * @param {object} param0
    * @param {import('../../lib/api').Api} param0.api
    */
-  async fn({ api, appId, packageId }) { await api.publishApp(appId, packageId) }
-}
+  async fn({ api, appId, packageId }) {
+    await api.publishApp(appId, packageId);
+  },
+};

package/lib/flows/steps/release/remove-failed-upload.js

@@ -1,11 +1,20 @@
-import { resolve } from 'node:path'
-import { unlink } from 'node:fs/promises'
+import { resolve } from 'node:path';
+import { unlink } from 'node:fs/promises';
 
 export const REMOVE_FAILED_UPLOAD_STEP = {
   message: 'Cleaning up...',
-  async fn({ api, appId, packageId, removeOnFail, uploadStatus, dirName, zipFileName }) {
+  async fn({
+    api,
+    appId,
+    packageId,
+    removeOnFail,
+    uploadStatus,
+    dirName,
+    zipFileName,
+    removeOnSuccess,
+  }) {
     if (uploadStatus === 'draft') {
-      await unlink(resolve(dirName, zipFileName));
+      removeOnSuccess && (await unlink(resolve(dirName, zipFileName)));
 
       return;
     }
@@ -15,6 +24,8 @@ export const REMOVE_FAILED_UPLOAD_STEP = {
       await api.deleteAppUpload(appId, packageId);
     }
 
-    throw new Error(`Got unexpected status '${uploadStatus}' while processing package ${packageId}.`);
-  }
-}
+    throw new Error(
+      `Got unexpected status '${uploadStatus}' while processing package ${packageId}.`
+    );
+  },
+};

package/lib/flows/steps/release/upload-zip-to-corva.js

@@ -8,18 +8,21 @@ import _ from 'lodash/fp.js';
 export const UPLOAD_ZIP_TO_CORVA_STEP = {
   message: RELEASE.uploadApp,
   /**
-   * 
-   * @param {object} param0 
-   * @param {import('../../lib/api').Api} param0.api 
-   * @param {import('../../lib/manifest').Manifest} param0.manifest 
+   *
+   * @param {object} param0
+   * @param {import('../../lib/api').Api} param0.api
+   * @param {import('../../lib/manifest').Manifest} param0.manifest
    */
   fn: async ({ zipFileName, manifest, api, dirName }) => {
     const form = new FormData();
 
     form.append('package', createReadStream(resolve(dirName, zipFileName)), 'package.zip');
 
-    const { id: packageId, status: uploadStatus } = await api.uploadPackages(manifest.manifest.application.key, form)
+    const { id: packageId, status: uploadStatus } = await api.uploadPackages(
+      manifest.manifest.application.key,
+      form
+    );
 
-    return { packageId }
+    return { packageId };
   },
 };

package/lib/flows/steps/release/wait-for-build.js

@@ -9,13 +9,13 @@ export const WAIT_FOR_BUILD_FINISH_STEP = {
   message: 'Wait till the app will process to draft status...',
   /**
    * @param {object} param0
-   * @param {import('../../lib/api').Api} param0.api 
+   * @param {import('../../lib/api').Api} param0.api
    */
   async fn({ api, appId, packageId, progress }) {
     do {
       const { status } = await api.checkApp(appId, packageId);
 
-      progress()
+      progress();
 
       debug(`Status: ${status}`);
 
@@ -25,5 +25,5 @@ export const WAIT_FOR_BUILD_FINISH_STEP = {
 
       await waitForMs(5000);
     } while (true);
-  }
-}
+  },
+};

package/lib/flows/steps/rerun/create-task.js

@@ -6,9 +6,9 @@ import { logger } from '../../../helpers/logger.js';
 export const CREATE_TASK_STEP = {
   message: 'Creating tasks...',
   /**
-   * 
-   * @param {object} param0 
-   * @param {import('../../lib/api').Api} param0.api 
+   *
+   * @param {object} param0
+   * @param {import('../../lib/api').Api} param0.api
    */
   fn: async ({
     app,
@@ -22,9 +22,7 @@ export const CREATE_TASK_STEP = {
     CORVA_API_ENV,
   }) => {
     if (!assets.length) {
-      logger.write(
-        `\n\n${chalk.yellow.bold('There is no asset ID to create a new task')}`
-      );
+      logger.write(`\n\n${chalk.yellow.bold('There is no asset ID to create a new task')}`);
     }
 
     for (const assetId of assets) {
@@ -41,14 +39,12 @@ export const CREATE_TASK_STEP = {
       }
 
       try {
-        const result = await api.queueAppRun(
-          app.id,
-          version,
-          interval,
-          wellId,
-          appDatasetsNames,
-          streamId,
-        ).catch(e => { console.log(e.response.body); throw e });
+        const result = await api
+          .queueAppRun(app.id, version, interval, wellId, appDatasetsNames, streamId)
+          .catch((e) => {
+            console.log(e.response.body);
+            throw e;
+          });
 
         logger.write(
           `\n    Created a new task with ID ${chalk.yellow(result.id)} for asset ID - ${chalk.green(
@@ -57,7 +53,8 @@ export const CREATE_TASK_STEP = {
         );
 
         logger.write(
-          `\n    Task link - https://app${CORVA_API_ENV === 'production' ? '.' : `.${CORVA_API_ENV}.`
+          `\n    Task link - https://app${
+            CORVA_API_ENV === 'production' ? '.' : `.${CORVA_API_ENV}.`
           }corva.ai/dev-center/apps/${app.id}/runner`
         );
       } catch (e) {

package/lib/flows/steps/rerun/ensure-that-app-in-stream.js

@@ -7,11 +7,11 @@ import { logger } from '../../../helpers/logger.js';
 export const ENSURE_APP_IN_STREAM_TASK_STEP = {
   message: 'Ensure that app in the stream...',
   /**
-   * 
-   * @param {object} context 
+   *
+   * @param {object} context
    */
   fn: async (context) => {
-    const {mappedAssetsToStreams, app, api, manifest } = context;
+    const { mappedAssetsToStreams, app, api, manifest } = context;
 
     await Promise.all(
       [...mappedAssetsToStreams].map(([assetId, stream]) => {
@@ -23,29 +23,37 @@ export const ENSURE_APP_IN_STREAM_TASK_STEP = {
   },
 };
 
- /**
-  *  Ensure if the app is in the stream, if no, add app to the stream
-  *
-  * @param {string} assetId
-  * @param {object} stream
-  * @param {string} appId
-  * @param {import('../lib/api').Api} api
+/**
+ *  Ensure if the app is in the stream, if no, add app to the stream
+ *
+ * @param {string} assetId
+ * @param {object} stream
+ * @param {string} appId
+ * @param {import('../lib/api').Api} api
  * @param {object} manifest
-  *
-  * @returns {void}
-  */
-  const ensureAppIsInTheStream = async (assetId, stream, appId, api, manifest) => {
-    const connectedApp = stream.app_connections.find((connection) => connection.app_id == appId);
-    if (connectedApp) {
-      logger.write(
-        `\n\n${chalk.black.underline.bold(`App has already connected to the stream ID: ${stream.id}, for asset ID: ${assetId}`)}`
-      );
-      return;
-    }
-
-    const newConnection = await api.connectAppToStream(appId, stream.id, manifest.settings.app);
-
+ *
+ * @returns {void}
+ */
+const ensureAppIsInTheStream = async (assetId, stream, appId, api, manifest) => {
+  const connectedApp = stream.app_connections.find(
+    (connection) => connection.app_id === parseInt(appId)
+  );
+  if (connectedApp) {
     logger.write(
-      `\n\n${chalk.black.underline.bold(`Added app to the stream, connect ID - ${chalk.green(newConnection.id)}, for asset ID: ${assetId}`)}`
+      `\n\n${chalk.black.underline.bold(
+        `App has been already connected to the stream ID: ${stream.id}, for asset ID: ${assetId}`
+      )}`
     );
+    return;
   }
+
+  const newConnection = await api.connectAppToStream(appId, stream.id, manifest.settings.app);
+
+  logger.write(
+    `\n\n${chalk.black.underline.bold(
+      `Added app to the stream, connect ID - ${chalk.green(
+        newConnection.id
+      )}, for asset ID: ${assetId}`
+    )}`
+  );
+};

package/lib/flows/steps/rerun/get-app-version.js

@@ -7,18 +7,18 @@ import { logger } from '../../../helpers/logger.js';
 export const GET_APP_VERSION_TASK_STEP = {
   message: 'Get app version...',
   /**
-   * 
-   * @param {object} context 
+   *
+   * @param {object} context
    */
   fn: async (context) => {
-    const {app, options, api } = context;
+    const { app, options, api } = context;
     const { appVersion } = options;
 
     const currentAppVersion = await getAppVersion(app.id, appVersion, api);
 
     return {
       ...context,
-      version: currentAppVersion
+      version: currentAppVersion,
     };
   },
 };
@@ -32,7 +32,7 @@ export const GET_APP_VERSION_TASK_STEP = {
  *
  * @returns {Promise<{number}>}
  */
- const getAppVersion = async (appId, optionAppVersion, api) => {
+const getAppVersion = async (appId, optionAppVersion, api) => {
   logger.write('\n    Checking app versions...');
   const appPackages = await api.getAppPackages(appId);
 
@@ -41,14 +41,14 @@ export const GET_APP_VERSION_TASK_STEP = {
   }
 
   const confirmUseVersionMessage = (version) => {
-    logger.write(
-      `\n\n${chalk.black.underline.bold(`Use app version - ${chalk.green(version)}`)}`
-    );
+    logger.write(`\n\n${chalk.black.underline.bold(`Use app version - ${chalk.green(version)}`)}`);
   };
 
   // try to get version from CLI option
   if (optionAppVersion) {
-    const currentAppPackageByOption = appPackages.find((appPackage) => appPackage.attributes.version == optionAppVersion);
+    const currentAppPackageByOption = appPackages.find(
+      (appPackage) => appPackage.attributes.version == optionAppVersion
+    );
     if (currentAppPackageByOption) {
       const version = currentAppPackageByOption.attributes.version;
       confirmUseVersionMessage(version);
@@ -56,7 +56,9 @@ export const GET_APP_VERSION_TASK_STEP = {
     }
 
     logger.write(
-      `\n\n${chalk.black.underline.bold(`Could not find app version - ${chalk.green(optionAppVersion)}`)}`
+      `\n\n${chalk.black.underline.bold(
+        `Could not find app version - ${chalk.green(optionAppVersion)}`
+      )}`
     );
   }
 
@@ -73,9 +75,9 @@ export const GET_APP_VERSION_TASK_STEP = {
       value: appPackage.attributes.version,
       name: appPackage.attributes.version,
     };
-  })
+  });
 
-  logger.log('\n')
+  logger.log('\n');
 
   return inquirer
     .prompt([

package/lib/flows/steps/rerun/prepare-data.js

@@ -52,7 +52,7 @@ export const PREPARE_DATA_TASK_STEP = {
       options,
       manifest,
       appDatasetsNames,
-      interval: getInterval(manifest.manifest, interval)
+      interval: getInterval(manifest.manifest, interval),
     };
   },
 };
@@ -63,7 +63,7 @@ export const PREPARE_DATA_TASK_STEP = {
  * @returns
  */
 const promptAreYouSure = async () => {
-  logger.log('\n')
+  logger.log('\n');
   const answers = await inquirer.prompt([
     {
       message:
@@ -122,17 +122,15 @@ const getExistAppRuns = async (appId, assets, appDatasetsNames, api) => {
  *
  * @returns {number | null}
  */
- const getInterval = (manifest, intervalOption) => {
+const getInterval = (manifest, intervalOption) => {
   if (manifest.application.type !== 'scheduler') {
     return null;
   }
-  
+
   const DEFAULT_INTERVAL = 3600;
   const interval = intervalOption || DEFAULT_INTERVAL;
 
-  logger.write(
-    `\n\n${chalk.black.underline.bold(`Use interval - ${chalk.green(interval)}`)}`
-  );
+  logger.write(`\n\n${chalk.black.underline.bold(`Use interval - ${chalk.green(interval)}`)}`);
 
   return parseInt(interval);
- };
+};

package/lib/flows/steps/rerun/prepare-well-and-stream-data.js

@@ -7,15 +7,15 @@ import { logger } from '../../../helpers/logger.js';
 export const PREPARE_WELL_AND_STREAM_TASK_STEP = {
   message: 'Prepare well and stream data...',
   /**
-   * 
-   * @param {object} context 
+   *
+   * @param {object} context
    */
   fn: async (context) => {
     let { assets } = context;
-    const { api } = context;
+    const { api, manifest } = context;
 
     const { mappedAssetsToWells, mappedAssetsToStreams, assetsToDelete } =
-      await prepareWellAndStreamData(assets, api);
+      await prepareWellAndStreamData(assets, api, manifest);
 
     if (assetsToDelete.length) {
       // remove asset ID if could not found stream or well
@@ -26,7 +26,7 @@ export const PREPARE_WELL_AND_STREAM_TASK_STEP = {
       ...context,
       assets,
       mappedAssetsToStreams,
-      mappedAssetsToWells
+      mappedAssetsToWells,
     };
   },
 };
@@ -36,11 +36,9 @@ export const PREPARE_WELL_AND_STREAM_TASK_STEP = {
  *
  * @param {object[]} streams
  *
- * @returns
+ * @returns {Promise<object>}
  */
- const getStreamWithPrompt = async (streams) => {
-  let stream = {};
-
+const getStreamWithPrompt = async (streams) => {
   const choices = streams.map((stream) => {
     return {
       value: stream,
@@ -49,7 +47,7 @@ export const PREPARE_WELL_AND_STREAM_TASK_STEP = {
   });
 
   if (!choices.length) {
-    throw new Error('No completed streams')
+    throw new Error('No completed streams');
   }
 
   if (choices.length === 1) {
@@ -58,12 +56,12 @@ export const PREPARE_WELL_AND_STREAM_TASK_STEP = {
     logger.write(
       `\n\n${chalk.black.underline.bold(`Process stream - ${chalk.green(stream.name)}`)}`
     );
-    return stream.value
+    return stream.value;
   }
 
-  logger.log('\n')
+  logger.log('\n');
 
-  await inquirer
+  return inquirer
     .prompt([
       {
         message: 'Please choose stream?',
@@ -72,11 +70,7 @@ export const PREPARE_WELL_AND_STREAM_TASK_STEP = {
         choices,
       },
     ])
-    .then((answers) => {
-      stream = answers.option;
-    });
-
-  return stream;
+    .then((answers) => answers.option);
 };
 
 /**
@@ -85,11 +79,9 @@ export const PREPARE_WELL_AND_STREAM_TASK_STEP = {
  * @param {object[]} wells
  * @param {import('../lib/api').Api} api
  *
- * @returns
+ * @returns {Promise<object>}
  */
 const getWellWithPrompt = async (wells, api) => {
-  let well = {};
-
   const choices = await Promise.all(
     wells.map(async (well) => {
       const assetDetails = await api.getAssetById(well.data.attributes.asset_id);
@@ -108,15 +100,13 @@ const getWellWithPrompt = async (wells, api) => {
   if (choices.length === 1) {
     const [well] = choices;
 
-    logger.write(
-      `\n\n${chalk.black.underline.bold(`Process well - ${chalk.green(well.name)}`)}`
-    );
-    return well.value
+    logger.write(`\n\n${chalk.black.underline.bold(`Process well - ${chalk.green(well.name)}`)}`);
+    return well.value;
   }
 
-  logger.log('\n')
+  logger.log('\n');
 
-  await inquirer
+  return inquirer
     .prompt([
       {
         message: 'Please choose the well?',
@@ -125,24 +115,19 @@ const getWellWithPrompt = async (wells, api) => {
         choices,
       },
     ])
-    .then((answers) => {
-      well = answers.option;
-    });
-
-  return well;
+    .then((answers) => answers.option);
 };
 
 /**
  *  Get stream and well data for assets
  *
  * @param {string[]} assets
- * @param {string} appId
  * @param {import('../lib/api').Api} api
  * @param {object} manifest
  *
- * @returns {object}
+ * @returns {Promise<object>}
  */
-const prepareWellAndStreamData = async (assets, api) => {
+const prepareWellAndStreamData = async (assets, api, manifest) => {
   const mappedAssetsToWells = new Map();
   const mappedAssetsToStreams = new Map();
   const assetsToDelete = [];
@@ -161,7 +146,15 @@ const prepareWellAndStreamData = async (assets, api) => {
 
       logger.write('\n    Loading streams...');
 
-      const streams = await api.getStreamByAssetId(assetId);
+      const streams = await api.getStreamsByAssetIds(
+        [assetId],
+        manifest.manifest.application.segments
+      );
+
+      if (!streams.length) {
+        throw new Error(`Could not found streams for asset ID - ${assetId}`);
+      }
+
       const stream = await getStreamWithPrompt(streams);
       mappedAssetsToStreams.set(stream.asset_id, stream);
     } catch (e) {

package/lib/flows/steps/rerun/rerun.js

@@ -5,9 +5,9 @@ import { ENSURE_APP_IN_STREAM_TASK_STEP } from './ensure-that-app-in-stream.js';
 import { PREPARE_WELL_AND_STREAM_TASK_STEP } from './prepare-well-and-stream-data.js';
 
 export const RERUN_STEPS = [
-    PREPARE_DATA_TASK_STEP,
-    GET_APP_VERSION_TASK_STEP,
-    PREPARE_WELL_AND_STREAM_TASK_STEP,
-    ENSURE_APP_IN_STREAM_TASK_STEP,
-    CREATE_TASK_STEP
+  PREPARE_DATA_TASK_STEP,
+  GET_APP_VERSION_TASK_STEP,
+  PREPARE_WELL_AND_STREAM_TASK_STEP,
+  ENSURE_APP_IN_STREAM_TASK_STEP,
+  CREATE_TASK_STEP,
 ];

package/lib/helpers/logger.js

@@ -1,35 +1,35 @@
 export class Logger {
-    constructor() {
-        this.isSilent = process.argv.includes('--silent');
-    }
-
-    write(str) {
-        if (this.isSilent) {
-            return;
-        }
+  constructor() {
+    this.isSilent = process.argv.includes('--silent');
+  }
 
-        if (str === undefined) {
-          process.stdout.write();
+  write(str) {
+    if (this.isSilent) {
+      return;
+    }
 
-          return;
-        }
+    if (str === undefined) {
+      process.stdout.write();
 
-        process.stdout.write(str);
+      return;
     }
 
-    log(str) {
-        if (this.isSilent) {
-            return;
-        }
+    process.stdout.write(str);
+  }
 
-        if (str === undefined) {
-          console.log();
+  log(str) {
+    if (this.isSilent) {
+      return;
+    }
 
-          return;
-        }
+    if (str === undefined) {
+      console.log();
 
-        console.log(str);
+      return;
     }
+
+    console.log(str);
+  }
 }
 
 export const logger = new Logger();