@hapico/cli 0.0.11 → 0.0.13

package/bin/index.js

@@ -48,9 +48,11 @@ 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 });
@@ -69,10 +71,10 @@ const getStoredToken = () => {
     if (fs.existsSync(TOKEN_FILE)) {
         const data = fs.readFileSync(TOKEN_FILE, { encoding: "utf8" });
         const json = JSON.parse(data);
-        return json !== null && json !== void 0 ? json : {
+        return (json !== null && json !== void 0 ? json : {
             accessToken: null,
             refreshToken: null,
-        };
+        });
     }
     return {
         accessToken: null,
@@ -244,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 {
@@ -298,7 +300,7 @@ class RoomState {
         return this.isConnected;
     }
 }
-commander_1.program.version("0.0.10").description("Hapico CLI for project management");
+commander_1.program.version("0.0.13").description("Hapico CLI for project management");
 commander_1.program
     .command("clone <id>")
     .description("Clone a project by ID")
@@ -371,12 +373,18 @@ commander_1.program
         devSpinner.fail("Source directory 'src' does not exist. Please clone a project first.");
         return;
     }
-    const projectId = getStoredProjectId(pwd);
+    const info = JSON.stringify({
+        id: (0, crypto_1.randomUUID)(),
+        createdAt: new Date().toISOString(),
+        viewId: getStoredProjectId(pwd),
+    });
+    // convert info info to base64
+    const projectId = Buffer.from(info).toString("base64");
     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!");
@@ -394,10 +402,37 @@ commander_1.program
             });
             room.updateState("view", updatedView);
         });
-        qrcode_terminal_1.default.generate(`https://zalo.me/s/3218692650896662017/player/${projectId}`, { small: true }, (qrcode) => {
-            console.log("Scan this QR code to connect to the project:");
-            console.log(qrcode);
+        // LẤy thông tin về project
+        const projectInfo = getStoredProjectId(pwd);
+        if (!projectInfo) {
+            console.error("Project ID not found. Please ensure hapico.config.json exists in the project directory.");
+            return;
+        }
+        const project = await axios_1.default.get(`https://base.myworkbeast.com/api/views/${projectInfo}`, {
+            headers: {
+                Authorization: `Bearer ${accessToken}`,
+                "Content-Type": "application/json",
+            },
         });
+        if (project.status !== 200) {
+            console.error(`Error fetching project info: ${project.statusText}`);
+            return;
+        }
+        const projectType = project.data.type || "view";
+        console.log("Project type:", projectType);
+        if (projectType === "zalominiapp") {
+            qrcode_terminal_1.default.generate(`https://zalo.me/s/3218692650896662017/player/${projectId}`, { small: true }, (qrcode) => {
+                console.log("Scan this QR code to connect to the project:");
+                console.log(qrcode);
+            });
+            return;
+        }
+        else {
+            // show link https://com.ai.vn/dev_preview/{projectId}
+            const previewUrl = `https://com.ai.vn/dev_preview/${projectId}`;
+            console.log(`Open this URL in your browser to preview the project: \n${previewUrl}`);
+            await (0, open_1.default)(previewUrl);
+        }
     });
 });
 commander_1.program

package/dist/index.js

@@ -48,9 +48,11 @@ 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 });
@@ -69,10 +71,10 @@ const getStoredToken = () => {
     if (fs.existsSync(TOKEN_FILE)) {
         const data = fs.readFileSync(TOKEN_FILE, { encoding: "utf8" });
         const json = JSON.parse(data);
-        return json !== null && json !== void 0 ? json : {
+        return (json !== null && json !== void 0 ? json : {
             accessToken: null,
             refreshToken: null,
-        };
+        });
     }
     return {
         accessToken: null,
@@ -244,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 {
@@ -298,7 +300,7 @@ class RoomState {
         return this.isConnected;
     }
 }
-commander_1.program.version("0.0.10").description("Hapico CLI for project management");
+commander_1.program.version("0.0.13").description("Hapico CLI for project management");
 commander_1.program
     .command("clone <id>")
     .description("Clone a project by ID")
@@ -371,12 +373,18 @@ commander_1.program
         devSpinner.fail("Source directory 'src' does not exist. Please clone a project first.");
         return;
     }
-    const projectId = getStoredProjectId(pwd);
+    const info = JSON.stringify({
+        id: (0, crypto_1.randomUUID)(),
+        createdAt: new Date().toISOString(),
+        viewId: getStoredProjectId(pwd),
+    });
+    // convert info info to base64
+    const projectId = Buffer.from(info).toString("base64");
     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!");
@@ -394,10 +402,37 @@ commander_1.program
             });
             room.updateState("view", updatedView);
         });
-        qrcode_terminal_1.default.generate(`https://zalo.me/s/3218692650896662017/player/${projectId}`, { small: true }, (qrcode) => {
-            console.log("Scan this QR code to connect to the project:");
-            console.log(qrcode);
+        // LẤy thông tin về project
+        const projectInfo = getStoredProjectId(pwd);
+        if (!projectInfo) {
+            console.error("Project ID not found. Please ensure hapico.config.json exists in the project directory.");
+            return;
+        }
+        const project = await axios_1.default.get(`https://base.myworkbeast.com/api/views/${projectInfo}`, {
+            headers: {
+                Authorization: `Bearer ${accessToken}`,
+                "Content-Type": "application/json",
+            },
         });
+        if (project.status !== 200) {
+            console.error(`Error fetching project info: ${project.statusText}`);
+            return;
+        }
+        const projectType = project.data.type || "view";
+        console.log("Project type:", projectType);
+        if (projectType === "zalominiapp") {
+            qrcode_terminal_1.default.generate(`https://zalo.me/s/3218692650896662017/player/${projectId}`, { small: true }, (qrcode) => {
+                console.log("Scan this QR code to connect to the project:");
+                console.log(qrcode);
+            });
+            return;
+        }
+        else {
+            // show link https://com.ai.vn/dev_preview/{projectId}
+            const previewUrl = `https://com.ai.vn/dev_preview/${projectId}`;
+            console.log(`Open this URL in your browser to preview the project: \n${previewUrl}`);
+            await (0, open_1.default)(previewUrl);
+        }
     });
 });
 commander_1.program

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,6 +19,8 @@ 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 });
@@ -28,13 +31,9 @@ const saveToken = (tokens: { accessToken: string; refreshToken?: string }) => {
   if (!tokens || !tokens.accessToken) {
     throw new Error("Invalid token data");
   }
-  fs.writeFileSync(
-    TOKEN_FILE,
-    JSON.stringify(tokens, null, 2),
-    {
-      encoding: "utf8",
-    }
-  );
+  fs.writeFileSync(TOKEN_FILE, JSON.stringify(tokens, null, 2), {
+    encoding: "utf8",
+  });
 };
 
 // Function to get stored token
@@ -45,10 +44,12 @@ const getStoredToken = (): {
   if (fs.existsSync(TOKEN_FILE)) {
     const data = fs.readFileSync(TOKEN_FILE, { encoding: "utf8" });
     const json = JSON.parse(data);
-    return json ?? {
-      accessToken: null,
-      refreshToken: null,
-    };
+    return (
+      json ?? {
+        accessToken: null,
+        refreshToken: null,
+      }
+    );
   }
   return {
     accessToken: null,
@@ -282,16 +283,16 @@ 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) => {
@@ -345,7 +346,7 @@ class RoomState {
   }
 }
 
-program.version("0.0.10").description("Hapico CLI for project management");
+program.version("0.0.13").description("Hapico CLI for project management");
 
 program
   .command("clone <id>")
@@ -441,14 +442,20 @@ program
       );
       return;
     }
-    const projectId = getStoredProjectId(pwd);
+    const info = JSON.stringify({
+      id: randomUUID(),
+      createdAt: new Date().toISOString(),
+      viewId: getStoredProjectId(pwd),
+    });
+    // convert info info to base64
+    const projectId = Buffer.from(info).toString("base64");
     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 () => {
@@ -471,14 +478,51 @@ program
         room.updateState("view", updatedView);
       });
 
-      QRCode.generate(
-        `https://zalo.me/s/3218692650896662017/player/${projectId}`,
-        { small: true },
-        (qrcode: string) => {
-          console.log("Scan this QR code to connect to the project:");
-          console.log(qrcode);
+      // LẤy thông tin về project
+      const projectInfo = getStoredProjectId(pwd);
+      if (!projectInfo) {
+        console.error(
+          "Project ID not found. Please ensure hapico.config.json exists in the project directory."
+        );
+        return;
+      }
+      const project = await axios.get(
+        `https://base.myworkbeast.com/api/views/${projectInfo}`,
+        {
+          headers: {
+            Authorization: `Bearer ${accessToken}`,
+            "Content-Type": "application/json",
+          },
         }
       );
+
+      if (project.status !== 200) {
+        console.error(`Error fetching project info: ${project.statusText}`);
+        return;
+      }
+
+      const projectType = project.data.type || "view";
+
+      console.log("Project type:", projectType);
+
+      if (projectType === "zalominiapp") {
+        QRCode.generate(
+          `https://zalo.me/s/3218692650896662017/player/${projectId}`,
+          { small: true },
+          (qrcode: string) => {
+            console.log("Scan this QR code to connect to the project:");
+            console.log(qrcode);
+          }
+        );
+        return;
+      } else {
+        // show link https://com.ai.vn/dev_preview/{projectId}
+        const previewUrl = `https://com.ai.vn/dev_preview/${projectId}`;
+        console.log(
+          `Open this URL in your browser to preview the project: \n${previewUrl}`
+        );
+        await open(previewUrl);
+      }
     });
   });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hapico/cli",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "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": [