@hapico/cli 0.0.10 → 0.0.12

package/bin/index.js

@@ -48,16 +48,21 @@ 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"));
+const crypto_1 = require("crypto");
 // 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");
+const connected = (0, ora_1.default)("Connected to WebSocket server");
 // Ensure config directory exists
 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",
     });
 };
@@ -66,9 +71,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) => {
@@ -235,13 +246,13 @@ class RoomState {
             this.isConnected = true;
             this.reconnectAttempts = 0;
             onConnected === null || onConnected === void 0 ? void 0 : onConnected();
+            connected.succeed(`Connected to WebSocket server`);
         });
         this.ws.on("close", () => {
             this.isConnected = false;
             this.reconnectAttempts++;
-            const delay = Math.min(1000 * Math.pow(2, this.reconnectAttempts), 30000);
-            console.log(`Attempting to reconnect in ${delay / 1000}s...`);
-            this.reconnectTimeout = setTimeout(() => this.connect(), delay);
+            connected.start(`Retry connection...`);
+            this.connect();
         });
         this.ws.on("message", (data) => {
             try {
@@ -289,13 +300,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.12").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;
     }
@@ -350,8 +361,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;
     }
@@ -362,12 +373,16 @@ commander_1.program
         devSpinner.fail("Source directory 'src' does not exist. Please clone a project first.");
         return;
     }
-    const projectId = getStoredProjectId(pwd);
+    const projectId = JSON.stringify({
+        id: (0, crypto_1.randomUUID)(),
+        createdAt: new Date().toISOString(),
+        viewId: getStoredProjectId(pwd),
+    });
     if (!projectId) {
         devSpinner.fail("Project ID not found. Please ensure hapico.config.json exists in the project directory.");
         return;
     }
-    console.log(`Connecting to WebSocket server for room: ${projectId}`);
+    console.log(`Connecting to WebSocket server`);
     const room = new RoomState(`view_${projectId}`);
     room.connect(async () => {
         devSpinner.succeed("Project started in development mode!");
@@ -395,8 +410,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;
     }
@@ -422,7 +438,7 @@ commander_1.program
         }),
     }, {
         headers: {
-            Authorization: `Bearer ${token}`,
+            Authorization: `Bearer ${accessToken}`,
             "Content-Type": "application/json",
         },
     })
@@ -437,6 +453,7 @@ commander_1.program
     .command("login")
     .description("Login to the system")
     .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");

package/dist/index.js

@@ -48,16 +48,21 @@ 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"));
+const crypto_1 = require("crypto");
 // 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");
+const connected = (0, ora_1.default)("Connected to WebSocket server");
 // Ensure config directory exists
 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",
     });
 };
@@ -66,9 +71,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) => {
@@ -235,13 +246,13 @@ class RoomState {
             this.isConnected = true;
             this.reconnectAttempts = 0;
             onConnected === null || onConnected === void 0 ? void 0 : onConnected();
+            connected.succeed(`Connected to WebSocket server`);
         });
         this.ws.on("close", () => {
             this.isConnected = false;
             this.reconnectAttempts++;
-            const delay = Math.min(1000 * Math.pow(2, this.reconnectAttempts), 30000);
-            console.log(`Attempting to reconnect in ${delay / 1000}s...`);
-            this.reconnectTimeout = setTimeout(() => this.connect(), delay);
+            connected.start(`Retry connection...`);
+            this.connect();
         });
         this.ws.on("message", (data) => {
             try {
@@ -289,13 +300,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.12").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;
     }
@@ -350,8 +361,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;
     }
@@ -362,12 +373,16 @@ commander_1.program
         devSpinner.fail("Source directory 'src' does not exist. Please clone a project first.");
         return;
     }
-    const projectId = getStoredProjectId(pwd);
+    const projectId = JSON.stringify({
+        id: (0, crypto_1.randomUUID)(),
+        createdAt: new Date().toISOString(),
+        viewId: getStoredProjectId(pwd),
+    });
     if (!projectId) {
         devSpinner.fail("Project ID not found. Please ensure hapico.config.json exists in the project directory.");
         return;
     }
-    console.log(`Connecting to WebSocket server for room: ${projectId}`);
+    console.log(`Connecting to WebSocket server`);
     const room = new RoomState(`view_${projectId}`);
     room.connect(async () => {
         devSpinner.succeed("Project started in development mode!");
@@ -395,8 +410,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;
     }
@@ -422,7 +438,7 @@ commander_1.program
         }),
     }, {
         headers: {
-            Authorization: `Bearer ${token}`,
+            Authorization: `Bearer ${accessToken}`,
             "Content-Type": "application/json",
         },
     })
@@ -437,6 +453,7 @@ commander_1.program
     .command("login")
     .description("Login to the system")
     .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");

package/index.ts

@@ -10,6 +10,7 @@ import { WebSocket } from "ws";
 import * as Babel from "@babel/standalone";
 import QRCode from "qrcode-terminal";
 import open from "open";
+import { randomUUID } from "crypto";
 
 // Directory to store the token and project config
 const CONFIG_DIR = path.join(
@@ -18,16 +19,21 @@ const CONFIG_DIR = path.join(
 );
 const TOKEN_FILE = path.join(CONFIG_DIR, "auth_token.json");
 
+const connected = ora("Connected to WebSocket server");
+
 // Ensure config directory exists
 if (!fs.existsSync(CONFIG_DIR)) {
   fs.mkdirSync(CONFIG_DIR, { recursive: true });
 }
 
 // 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 +41,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
@@ -270,16 +285,18 @@ class RoomState {
       this.isConnected = true;
       this.reconnectAttempts = 0;
       onConnected?.();
+      connected.succeed(`Connected to WebSocket server`);
     });
 
     this.ws.on("close", () => {
       this.isConnected = false;
 
       this.reconnectAttempts++;
-      const delay = Math.min(1000 * Math.pow(2, this.reconnectAttempts), 30000);
-      console.log(`Attempting to reconnect in ${delay / 1000}s...`);
+      connected.start(
+        `Retry connection...`
+      );
 
-      this.reconnectTimeout = setTimeout(() => this.connect(), delay);
+      this.connect();
     });
 
     this.ws.on("message", (data: Buffer) => {
@@ -333,14 +350,14 @@ class RoomState {
   }
 }
 
-program.version("0.0.9").description("Hapico CLI for project management");
+program.version("0.0.12").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;
     }
@@ -413,8 +430,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;
     }
@@ -429,14 +446,18 @@ program
       );
       return;
     }
-    const projectId = getStoredProjectId(pwd);
+    const projectId = JSON.stringify({
+      id: randomUUID(),
+      createdAt: new Date().toISOString(),
+      viewId: getStoredProjectId(pwd),
+    });
     if (!projectId) {
       devSpinner.fail(
         "Project ID not found. Please ensure hapico.config.json exists in the project directory."
       );
       return;
     }
-    console.log(`Connecting to WebSocket server for room: ${projectId}`);
+    console.log(`Connecting to WebSocket server`);
     const room = new RoomState(`view_${projectId}`);
 
     room.connect(async () => {
@@ -474,8 +495,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;
     }
@@ -508,7 +530,7 @@ program
         },
         {
           headers: {
-            Authorization: `Bearer ${token}`,
+            Authorization: `Bearer ${accessToken}`,
             "Content-Type": "application/json",
           },
         }
@@ -525,6 +547,7 @@ program
   .command("login")
   .description("Login to the system")
   .action(async () => {
+    console.log("Logging in to the system...");
     const loginSpinner: Ora = ora("Initiating login...").start();
 
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hapico/cli",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "description": "A simple CLI tool for project management",
   "main": "index.js",
   "bin": {
@@ -9,6 +9,7 @@
   "scripts": {
     "build": "tsc && cp -r dist/* ./bin/",
     "start": "node dist/index.js",
+    "dev": "npm run build && bun link @hapico/cli",
     "pub": "npm run build && npm publish --access public"
   },
   "keywords": [