@paralect/hive 0.0.28 → 0.1.1

package/cli/hive.js

@@ -3,12 +3,12 @@
 const { program } = require('commander');
 
 const path = require('path');
-const isAuthorized = require('./helpers/isAuthorized');
+const inquirer = require('inquirer');
 const mergeDirs = require('./helpers/mergeDirs');
 const execCommand = require('./helpers/execCommand');
 const downloadDirectory = require('./helpers/downloadDirectory');
-const axios = require('./helpers/axiosAuth');
-const isProjectInit = require('./helpers/isProjectInit.js');
+const axios = require('axios');
+const tsx = require('tsx/cjs/api')
 
 program
   .command('run [dirPath]')
@@ -16,56 +16,17 @@ program
   .action(async (dirPath = '.') => {
     try {
       process.env.HIVE_SRC = path.resolve(process.cwd(), dirPath);
-      require('./../starter/src/app.js');
-    } catch (error) {
-      console.error('An error occurred:', error.message);
-    }
-  });
-
-  program
-  .command('deploy [imageTag]')
-  .description('Build and deploy Hive project from local machine docker + helm')
-  .action(async (imageTag) => {
-    process.env.HIVE_SRC = path.resolve(process.cwd());
-    
-    if (!imageTag) {
-      const { stdout: branch } = await execCommand(
-        "git rev-parse --abbrev-ref HEAD",
-        { stdio: "pipe" }
-      );
-      const { stdout: commitSHA } = await execCommand("git rev-parse HEAD", {
-        stdio: "pipe",
-      });
-
-      imageTag = `${branch}.${commitSHA}`;
-    }
-
-    console.log("Deploying Image Tag ", imageTag);
+      execCommand(`npm run dev --prefix ${path.resolve(__dirname, '../starter')}`);
 
-    try {
-     await isAuthorized();
-    const { projectId } = await isProjectInit();
-    console.log('project id', projectId)
-     const { isOk } = (
-      await axios({ 
-        // url: `http://localhost:3001/projects/${projectId}/deploy`,
-        url: `projects/${projectId}/deploy`,
-        method: 'post',
-        data: {
-          imageTag
-        }
-      })
-      ).data;
-
-      console.log('Deployed');
+      tsx.require('./../starter/src/app.js', __filename);
     } catch (error) {
       console.error('An error occurred:', error.message);
     }
   });
 
   program
-  .command('build-local')
-  .description('Build Hive project from local machine with docker')
+  .command('deploy')
+  .description('Build hive project')
   .action(async () => {
     try {
       let outDir = path.resolve(process.cwd(), './dist');
@@ -74,7 +35,6 @@ program
       console.log('outDir',  path.resolve(outDir, `./deploy/script`))
       await execCommand(`npm install --prefix ${path.resolve(outDir, `./deploy/script`)}`);
 
-      // process.env.SKIP_KUBERNETES = true;
       await execCommand('node ./index.js', {
         cwd: path.resolve(outDir, `./deploy/script/src`)
       });
@@ -96,95 +56,51 @@ program
     }
   });
 
+
 program
   .command('login')
   .description('Login into Hive Cloud')
   .action(async () => {
     if (process.env.HIVE_TOKEN) {
-      const user = (await axios({ url: `users/me`, method: 'get' })).data;
+      const user = (await axios({ url: `https://hive-api-test.paralect.co/users/me`, method: 'get', headers: {
+        'Authorization': `Bearer ${process.env.HIVE_TOKEN}`
+      } })).data;
 
       console.log(`Already logged in!`, user);
       
       return;
     }
-   
-  });
 
-program
-  .command('init')
-  .description('Init Hive Project')
-  .action(async () => {
-    try {
-      process.env.HIVE_SRC = path.resolve(process.cwd());
+    const { email } = await inquirer.prompt([
+      {
+        type: 'input',
+        name: 'email',
+        message: 'Please enter your email:'
+      }
+    ]);
 
-      await isAuthorized();
-      await isProjectInit();
-    } catch (error) {
-      console.error('An error occurred:', error.message);
-    }
-  });
-
-program
-  .command('env-get <envName>')
-  .description('Get env variable')
-  .action(async (envName) => {
     try {
-      process.env.HIVE_SRC = path.resolve(process.cwd());
-
-      await isAuthorized();
-      const { projectId } = await isProjectInit();
-
-      const { value } = (await axios({ 
-        method: 'post',
-        url: `projects/${projectId}/get-env`,
-        data: {
-          name: envName
+      await axios({ url: `https://hive-api-test.paralect.co/auth/login-code`, method: 'post', data: { email } });
+      
+      const { code } = await inquirer.prompt([
+        {
+          type: 'input',
+          name: 'code',
+          message: `One time code (sent to ${email})`,
         }
-      })).data;
+      ]);
 
-      console.log(`${envName} value is ${value || '<empty>'}`)
-    } catch (error) {
-      console.error('An error occurred:', error.message);
-    }
-  });
+      const { token, user } = (await axios({ url: `https://hive-api-test.paralect.co/auth/verify-login`, method: 'post', data: { email, code } })).data;
 
-  program
-  .command('env-set <envName> <envValue>')
-  .description('Set env variable')
-  .action(async (envName, envValue) => {
-    try {
-      process.env.HIVE_SRC = path.resolve(process.cwd());
+      console.log(`
+        You're now logged into Hive! Welcome 🐝
+        
+        Important: to save access add HIVE_TOKEN to your env variables and your ~/.zshrc file
 
-      await isAuthorized();
-      const { projectId } = await isProjectInit();
-
-      const { value } = (await axios({ 
-        method: 'post',
-        url: `projects/${projectId}/env`,
-        data: {
-          name: envName,
-          value: envValue,
-        }
-      })).data;
-
-      console.log(`Updated ${envName}`)
+        export HIVE_TOKEN=${token}`)
     } catch (error) {
       console.error('An error occurred:', error.message);
     }
   });
 
-
-// program
-//   .command('init [name]')
-//   .description('Installs Hive plugin')
-//   .action(async (plugin) => {
-//     try {
-//       const destDir = process.cwd();
-      
-//       await downloadDirectory(plugin);
-//     } catch (error) {
-//       console.error('An error occurred:', error.message);
-//     }
-//   });
-
 program.parse(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paralect/hive",
-  "version": "0.0.28",
+  "version": "0.1.1",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -55,7 +55,10 @@
     "socket.io": "4.4.1",
     "socket.io-emitter": "3.2.0",
     "tail": "2.2.4",
-    "winston": "3.6.0"
+    "tsx": "^4.16.2",
+    "typescript": "^5.5.4",
+    "winston": "3.6.0",
+    "zod": "^3.23.8"
   },
   "devDependencies": {
     "eslint": "8.9.0",