@hapico/cli 0.0.9 → 0.0.11

package/bin/index.js

@@ -47,6 +47,7 @@ const ora_1 = __importDefault(require("ora"));
 const ws_1 = require("ws");
 const Babel = __importStar(require("@babel/standalone"));
 const qrcode_terminal_1 = __importDefault(require("qrcode-terminal"));
+const open_1 = __importDefault(require("open"));
 // Directory to store the token and project config
 const CONFIG_DIR = path.join(process.env.HOME || process.env.USERPROFILE || ".", ".hapico");
 const TOKEN_FILE = path.join(CONFIG_DIR, "auth_token.json");
@@ -55,8 +56,11 @@ if (!fs.existsSync(CONFIG_DIR)) {
     fs.mkdirSync(CONFIG_DIR, { recursive: true });
 }
 // Function to save token
-const saveToken = (token) => {
-    fs.writeFileSync(TOKEN_FILE, JSON.stringify({ access_token: token }, null, 2), {
+const saveToken = (tokens) => {
+    if (!tokens || !tokens.accessToken) {
+        throw new Error("Invalid token data");
+    }
+    fs.writeFileSync(TOKEN_FILE, JSON.stringify(tokens, null, 2), {
         encoding: "utf8",
     });
 };
@@ -65,9 +69,15 @@ const getStoredToken = () => {
     if (fs.existsSync(TOKEN_FILE)) {
         const data = fs.readFileSync(TOKEN_FILE, { encoding: "utf8" });
         const json = JSON.parse(data);
-        return json.access_token || null;
+        return json !== null && json !== void 0 ? json : {
+            accessToken: null,
+            refreshToken: null,
+        };
     }
-    return null;
+    return {
+        accessToken: null,
+        refreshToken: null,
+    };
 };
 // Function to save project ID
 const saveProjectId = (projectDir, id) => {
@@ -288,13 +298,13 @@ class RoomState {
         return this.isConnected;
     }
 }
-commander_1.program.version("0.0.9").description("Hapico CLI for project management");
+commander_1.program.version("0.0.10").description("Hapico CLI for project management");
 commander_1.program
     .command("clone <id>")
     .description("Clone a project by ID")
     .action(async (id) => {
-    const token = getStoredToken();
-    if (!token) {
+    const { accessToken } = getStoredToken();
+    if (!accessToken) {
         console.error("You need to login first. Use 'hapico login' command.");
         return;
     }
@@ -349,8 +359,8 @@ commander_1.program
     .command("dev")
     .description("Start the project in development mode")
     .action(() => {
-    const token = getStoredToken();
-    if (!token) {
+    const { accessToken } = getStoredToken();
+    if (!accessToken) {
         console.error("You need to login first. Use 'hapico login' command.");
         return;
     }
@@ -394,8 +404,9 @@ commander_1.program
     .command("push")
     .description("Push the project source code to the server")
     .action(() => {
-    const token = getStoredToken();
-    if (!token) {
+    const data = getStoredToken();
+    const { accessToken } = data || {};
+    if (!accessToken) {
         console.error("You need to login first. Use 'hapico login' command.");
         return;
     }
@@ -421,7 +432,7 @@ commander_1.program
         }),
     }, {
         headers: {
-            Authorization: `Bearer ${token}`,
+            Authorization: `Bearer ${accessToken}`,
             "Content-Type": "application/json",
         },
     })
@@ -435,28 +446,51 @@ commander_1.program
 commander_1.program
     .command("login")
     .description("Login to the system")
-    .action(() => {
-    const token = getStoredToken();
-    if (token) {
-        console.log("You are already logged in.");
-        return;
+    .action(async () => {
+    console.log("Logging in to the system...");
+    const loginSpinner = (0, ora_1.default)("Initiating login...").start();
+    try {
+        const response = await axios_1.default.post("https://auth.myworkbeast.com/auth/device");
+        const { device_code, user_code, verification_url, expires_in, interval } = response.data;
+        loginSpinner.succeed("Login initiated!");
+        console.log(`Please open this URL in your browser: ${verification_url}`);
+        console.log(`And enter this code: ${user_code}`);
+        console.log("Waiting for authentication...");
+        await (0, open_1.default)(verification_url);
+        const pollSpinner = (0, ora_1.default)("Waiting for authentication...").start();
+        let tokens = null;
+        const startTime = Date.now();
+        while (Date.now() - startTime < expires_in * 1000) {
+            try {
+                const pollResponse = await axios_1.default.post("https://auth.myworkbeast.com/auth/device/poll", { device_code });
+                if (pollResponse.data.accessToken) {
+                    tokens = pollResponse.data;
+                    break;
+                }
+            }
+            catch (error) {
+                // Ignore temporary errors and continue polling
+            }
+            await new Promise((resolve) => setTimeout(resolve, interval * 1000));
+        }
+        if (tokens) {
+            pollSpinner.succeed("Login successful!");
+            saveToken(tokens);
+        }
+        else {
+            pollSpinner.fail("Login failed: Timeout or user did not complete authentication.");
+        }
+    }
+    catch (error) {
+        loginSpinner.fail(`Login error: ${error.message}`);
     }
-    const readline = require("readline").createInterface({
-        input: process.stdin,
-        output: process.stdout,
-    });
-    readline.question("Please enter your token: ", (inputToken) => {
-        saveToken(inputToken);
-        console.log("Login successful!");
-        readline.close();
-    });
 });
 commander_1.program
     .command("logout")
     .description("Logout from the system")
     .action(() => {
-    const token = getStoredToken();
-    if (!token) {
+    const accessToken = getStoredToken();
+    if (!accessToken) {
         console.log("You are not logged in.");
         return;
     }

package/dist/index.js

@@ -47,6 +47,7 @@ const ora_1 = __importDefault(require("ora"));
 const ws_1 = require("ws");
 const Babel = __importStar(require("@babel/standalone"));
 const qrcode_terminal_1 = __importDefault(require("qrcode-terminal"));
+const open_1 = __importDefault(require("open"));
 // Directory to store the token and project config
 const CONFIG_DIR = path.join(process.env.HOME || process.env.USERPROFILE || ".", ".hapico");
 const TOKEN_FILE = path.join(CONFIG_DIR, "auth_token.json");
@@ -55,8 +56,11 @@ if (!fs.existsSync(CONFIG_DIR)) {
     fs.mkdirSync(CONFIG_DIR, { recursive: true });
 }
 // Function to save token
-const saveToken = (token) => {
-    fs.writeFileSync(TOKEN_FILE, JSON.stringify({ access_token: token }, null, 2), {
+const saveToken = (tokens) => {
+    if (!tokens || !tokens.accessToken) {
+        throw new Error("Invalid token data");
+    }
+    fs.writeFileSync(TOKEN_FILE, JSON.stringify(tokens, null, 2), {
         encoding: "utf8",
     });
 };
@@ -65,9 +69,15 @@ const getStoredToken = () => {
     if (fs.existsSync(TOKEN_FILE)) {
         const data = fs.readFileSync(TOKEN_FILE, { encoding: "utf8" });
         const json = JSON.parse(data);
-        return json.access_token || null;
+        return json !== null && json !== void 0 ? json : {
+            accessToken: null,
+            refreshToken: null,
+        };
     }
-    return null;
+    return {
+        accessToken: null,
+        refreshToken: null,
+    };
 };
 // Function to save project ID
 const saveProjectId = (projectDir, id) => {
@@ -288,13 +298,13 @@ class RoomState {
         return this.isConnected;
     }
 }
-commander_1.program.version("0.0.9").description("Hapico CLI for project management");
+commander_1.program.version("0.0.10").description("Hapico CLI for project management");
 commander_1.program
     .command("clone <id>")
     .description("Clone a project by ID")
     .action(async (id) => {
-    const token = getStoredToken();
-    if (!token) {
+    const { accessToken } = getStoredToken();
+    if (!accessToken) {
         console.error("You need to login first. Use 'hapico login' command.");
         return;
     }
@@ -349,8 +359,8 @@ commander_1.program
     .command("dev")
     .description("Start the project in development mode")
     .action(() => {
-    const token = getStoredToken();
-    if (!token) {
+    const { accessToken } = getStoredToken();
+    if (!accessToken) {
         console.error("You need to login first. Use 'hapico login' command.");
         return;
     }
@@ -394,8 +404,9 @@ commander_1.program
     .command("push")
     .description("Push the project source code to the server")
     .action(() => {
-    const token = getStoredToken();
-    if (!token) {
+    const data = getStoredToken();
+    const { accessToken } = data || {};
+    if (!accessToken) {
         console.error("You need to login first. Use 'hapico login' command.");
         return;
     }
@@ -421,7 +432,7 @@ commander_1.program
         }),
     }, {
         headers: {
-            Authorization: `Bearer ${token}`,
+            Authorization: `Bearer ${accessToken}`,
             "Content-Type": "application/json",
         },
     })
@@ -435,28 +446,51 @@ commander_1.program
 commander_1.program
     .command("login")
     .description("Login to the system")
-    .action(() => {
-    const token = getStoredToken();
-    if (token) {
-        console.log("You are already logged in.");
-        return;
+    .action(async () => {
+    console.log("Logging in to the system...");
+    const loginSpinner = (0, ora_1.default)("Initiating login...").start();
+    try {
+        const response = await axios_1.default.post("https://auth.myworkbeast.com/auth/device");
+        const { device_code, user_code, verification_url, expires_in, interval } = response.data;
+        loginSpinner.succeed("Login initiated!");
+        console.log(`Please open this URL in your browser: ${verification_url}`);
+        console.log(`And enter this code: ${user_code}`);
+        console.log("Waiting for authentication...");
+        await (0, open_1.default)(verification_url);
+        const pollSpinner = (0, ora_1.default)("Waiting for authentication...").start();
+        let tokens = null;
+        const startTime = Date.now();
+        while (Date.now() - startTime < expires_in * 1000) {
+            try {
+                const pollResponse = await axios_1.default.post("https://auth.myworkbeast.com/auth/device/poll", { device_code });
+                if (pollResponse.data.accessToken) {
+                    tokens = pollResponse.data;
+                    break;
+                }
+            }
+            catch (error) {
+                // Ignore temporary errors and continue polling
+            }
+            await new Promise((resolve) => setTimeout(resolve, interval * 1000));
+        }
+        if (tokens) {
+            pollSpinner.succeed("Login successful!");
+            saveToken(tokens);
+        }
+        else {
+            pollSpinner.fail("Login failed: Timeout or user did not complete authentication.");
+        }
+    }
+    catch (error) {
+        loginSpinner.fail(`Login error: ${error.message}`);
     }
-    const readline = require("readline").createInterface({
-        input: process.stdin,
-        output: process.stdout,
-    });
-    readline.question("Please enter your token: ", (inputToken) => {
-        saveToken(inputToken);
-        console.log("Login successful!");
-        readline.close();
-    });
 });
 commander_1.program
     .command("logout")
     .description("Logout from the system")
     .action(() => {
-    const token = getStoredToken();
-    if (!token) {
+    const accessToken = getStoredToken();
+    if (!accessToken) {
         console.log("You are not logged in.");
         return;
     }

package/index.ts

@@ -24,10 +24,13 @@ if (!fs.existsSync(CONFIG_DIR)) {
 }
 
 // Function to save token
-const saveToken = (token: string) => {
+const saveToken = (tokens: { accessToken: string; refreshToken?: string }) => {
+  if (!tokens || !tokens.accessToken) {
+    throw new Error("Invalid token data");
+  }
   fs.writeFileSync(
     TOKEN_FILE,
-    JSON.stringify({ access_token: token }, null, 2),
+    JSON.stringify(tokens, null, 2),
     {
       encoding: "utf8",
     }
@@ -35,13 +38,22 @@ const saveToken = (token: string) => {
 };
 
 // Function to get stored token
-const getStoredToken = (): string | null => {
+const getStoredToken = (): {
+  accessToken: string | null;
+  refreshToken: string | null;
+} => {
   if (fs.existsSync(TOKEN_FILE)) {
     const data = fs.readFileSync(TOKEN_FILE, { encoding: "utf8" });
     const json = JSON.parse(data);
-    return json.access_token || null;
+    return json ?? {
+      accessToken: null,
+      refreshToken: null,
+    };
   }
-  return null;
+  return {
+    accessToken: null,
+    refreshToken: null,
+  };
 };
 
 // Function to save project ID
@@ -146,7 +158,9 @@ class FileManager {
         } else if (entry.isFile()) {
           const content = fs.readFileSync(fullPath, { encoding: "utf8" });
           files.push({
-            path: this.replaceSplashWithSeparator(fullPath.replace(this.basePath + path.sep, "./")),
+            path: this.replaceSplashWithSeparator(
+              fullPath.replace(this.basePath + path.sep, "./")
+            ),
             content,
             es5: compileES5(content, fullPath) ?? "",
           });
@@ -331,14 +345,14 @@ class RoomState {
   }
 }
 
-program.version("0.0.9").description("Hapico CLI for project management");
+program.version("0.0.10").description("Hapico CLI for project management");
 
 program
   .command("clone <id>")
   .description("Clone a project by ID")
   .action(async (id: string) => {
-    const token = getStoredToken();
-    if (!token) {
+    const { accessToken } = getStoredToken();
+    if (!accessToken) {
       console.error("You need to login first. Use 'hapico login' command.");
       return;
     }
@@ -411,8 +425,8 @@ program
   .command("dev")
   .description("Start the project in development mode")
   .action(() => {
-    const token = getStoredToken();
-    if (!token) {
+    const { accessToken } = getStoredToken();
+    if (!accessToken) {
       console.error("You need to login first. Use 'hapico login' command.");
       return;
     }
@@ -472,8 +486,9 @@ program
   .command("push")
   .description("Push the project source code to the server")
   .action(() => {
-    const token = getStoredToken();
-    if (!token) {
+    const data = getStoredToken();
+    const { accessToken } = data || {};
+    if (!accessToken) {
       console.error("You need to login first. Use 'hapico login' command.");
       return;
     }
@@ -506,7 +521,7 @@ program
         },
         {
           headers: {
-            Authorization: `Bearer ${token}`,
+            Authorization: `Bearer ${accessToken}`,
             "Content-Type": "application/json",
           },
         }
@@ -522,37 +537,68 @@ program
 program
   .command("login")
   .description("Login to the system")
-  .action(() => {
-    const token = getStoredToken();
-    if (token) {
-      console.log("You are already logged in.");
-      return;
-    }
-    const readline = require("readline").createInterface({
-      input: process.stdin,
-      output: process.stdout,
-    });
+  .action(async () => {
+    console.log("Logging in to the system...");
+    const loginSpinner: Ora = ora("Initiating login...").start();
 
-    readline.question("Please enter your token: ", (inputToken: string) => {
-      saveToken(inputToken);
-      console.log("Login successful!");
-      readline.close();
-    });
+    try {
+      const response = await axios.post(
+        "https://auth.myworkbeast.com/auth/device"
+      );
+      const { device_code, user_code, verification_url, expires_in, interval } =
+        response.data;
+
+      loginSpinner.succeed("Login initiated!");
+      console.log(`Please open this URL in your browser: ${verification_url}`);
+      console.log(`And enter this code: ${user_code}`);
+      console.log("Waiting for authentication...");
+
+      await open(verification_url);
+
+      const pollSpinner: Ora = ora("Waiting for authentication...").start();
+      let tokens = null;
+      const startTime = Date.now();
+      while (Date.now() - startTime < expires_in * 1000) {
+        try {
+          const pollResponse = await axios.post(
+            "https://auth.myworkbeast.com/auth/device/poll",
+            { device_code }
+          );
+          if (pollResponse.data.accessToken) {
+            tokens = pollResponse.data;
+            break;
+          }
+        } catch (error) {
+          // Ignore temporary errors and continue polling
+        }
+        await new Promise((resolve) => setTimeout(resolve, interval * 1000));
+      }
+
+      if (tokens) {
+        pollSpinner.succeed("Login successful!");
+        saveToken(tokens);
+      } else {
+        pollSpinner.fail(
+          "Login failed: Timeout or user did not complete authentication."
+        );
+      }
+    } catch (error) {
+      loginSpinner.fail(`Login error: ${(error as Error).message}`);
+    }
   });
 
 program
   .command("logout")
   .description("Logout from the system")
   .action(() => {
-    const token = getStoredToken();
-    if (!token) {
+    const accessToken = getStoredToken();
+    if (!accessToken) {
       console.log("You are not logged in.");
       return;
     }
     fs.unlinkSync(TOKEN_FILE);
     console.log("Logout successful!");
   });
-
 // Pull command to fetch the latest project files from the server
 program
   .command("pull")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hapico/cli",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "description": "A simple CLI tool for project management",
   "main": "index.js",
   "bin": {