ds-01 1.0.6 → 1.0.8

package/dist/commands/add.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../../src/commands/add.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAgEpC,eAAO,MAAM,GAAG,SAkRZ,CAAC"}
+{"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../../src/commands/add.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAuDpC,eAAO,MAAM,GAAG,SA0MZ,CAAC"}

package/dist/commands/add.js

@@ -84,8 +84,9 @@ export const add = new Command()
             },
         });
         if (!response.ok) {
+            const errorData = await response.json().catch(() => null);
             s.stop(pc.red("Component fetch failed."));
-            cancel(`Component not found or server error (HTTP ${response.status})`);
+            cancel(errorData?.error || `Server returned HTTP ${response.status}`);
             process.exit(1);
         }
         const componentData = await response.json();
@@ -118,8 +119,7 @@ export const add = new Command()
         // --------------------------------------------------
         // 7. Install dependencies
         // --------------------------------------------------
-        if (componentData.dependencies &&
-            componentData.dependencies.length > 0) {
+        if (componentData.dependencies && componentData.dependencies.length > 0) {
             const depsToInstall = componentData.dependencies.join(" ");
             s.start(`Installing missing dependencies: ${pc.cyan(depsToInstall)}...`);
             try {
@@ -136,16 +136,14 @@ export const add = new Command()
         // --------------------------------------------------
         // 8. Success
         // --------------------------------------------------
-        const mainFile = bundledFileNames.find((name) => name.toLowerCase() ===
-            componentName.toLowerCase()) || bundledFileNames[0];
+        const mainFile = bundledFileNames.find((name) => name.toLowerCase() === componentName.toLowerCase()) || bundledFileNames[0];
         outro(`${pc.white("✔")} ${pc.bold(`Component <${componentName} /> is ready!`)}\n` +
             pc.gray("Import it: ") +
             pc.cyan(`import { ${mainFile} } from "@/${config.componentsPath}/${componentName}/${mainFile}"`));
     }
     catch (error) {
         s.stop(pc.red("An error occurred during injection."));
-        cancel(pc.gray(error?.message ||
-            "Unknown CLI Error"));
+        cancel(pc.gray(error?.message || "Unknown CLI Error"));
         process.exit(1);
     }
 });

package/dist/commands/login.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAwBpC,eAAO,MAAM,KAAK,SAuTd,CAAC"}
+{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAwBpC,eAAO,MAAM,KAAK,SA6Td,CAAC"}

package/dist/commands/login.js

@@ -16,23 +16,19 @@ export const login = new Command()
     intro(`${pc.bgWhite(pc.black(pc.bold(" DS01 ")))} ${pc.gray("v1.0.0 — Terminal Authentication")}`);
     const s = spinner();
     try {
-        // --------------------------------------------------
-        // 1. Create / load the device's secure key
-        // --------------------------------------------------
+        // ==================================================
+        // 1. CREATE / LOAD SECURE DEVICE KEY
+        // ==================================================
         s.start("Preparing secure device identity...");
         await createDeviceKey();
-        // Only the PUBLIC key/certificate leaves
-        // the user's machine.
         const publicKey = await getDevicePublicKey();
-        // Existing machine fingerprint.
         const hardwareId = machineIdSync();
-        // Detect the cryptographic key type.
         const publicKeyType = process.platform === "win32"
             ? "windows-rsa"
             : "macos-ec";
-        // --------------------------------------------------
-        // 2. Start device authorization
-        // --------------------------------------------------
+        // ==================================================
+        // 2. REQUEST DEVICE CODE
+        // ==================================================
         s.start("Requesting pairing code...");
         const initResponse = await fetch(`${API_BASE_URL}/api/auth/device/code`, {
             method: "POST",
@@ -57,21 +53,20 @@ export const login = new Command()
             throw new Error("Authorization server returned an invalid device response.");
         }
         s.stop(pc.green("Secure device identity registered."));
-        // --------------------------------------------------
-        // 3. Ask user to approve in browser
-        // --------------------------------------------------
+        // ==================================================
+        // 3. SHOW BROWSER AUTHORIZATION
+        // ==================================================
         note(`${pc.bold("Pairing Code:")}    ${pc.cyan(pc.bold(` ${userCode} `))}\n` +
             `${pc.bold("Verification URL:")} ${pc.underline(verificationUrl)}`, "Action Required");
         try {
             await open(verificationUrl);
         }
         catch {
-            // Browser launch failure
-            // is non-fatal.
+            // Browser launch failure is non-fatal.
         }
-        // --------------------------------------------------
-        // 4. Poll for authorization
-        // --------------------------------------------------
+        // ==================================================
+        // 4. POLL FOR AUTHORIZATION
+        // ==================================================
         s.start("Waiting for web authorization...");
         const pollInterval = (interval || 5) * 1000;
         let token = null;
@@ -97,56 +92,64 @@ export const login = new Command()
                 cancel("Unable to read authorization response.");
                 process.exit(1);
             }
-            // --------------------------------------------------
-            // SUCCESS
-            // --------------------------------------------------
+            // ==================================================
+            // AUTHORIZATION SUCCESS
+            // ==================================================
             if (tokenResponse.ok &&
                 typeof tokenData.accessToken ===
                     "string" &&
                 tokenData.accessToken.length > 0) {
                 token =
                     tokenData.accessToken;
-                // IMPORTANT:
-                // Stop the spinner immediately.
-                s.stop(pc.green("Hardware signature linked & token verified!"));
-                // IMPORTANT:
-                // Leave the polling loop immediately.
                 break;
             }
-            // --------------------------------------------------
+            // ==================================================
             // STILL WAITING
-            // --------------------------------------------------
+            // ==================================================
             if (tokenData.error ===
                 "authorization_pending") {
                 continue;
             }
-            // --------------------------------------------------
-            // FAILED / EXPIRED
-            // --------------------------------------------------
+            // ==================================================
+            // AUTHORIZATION FAILED
+            // ==================================================
             s.stop(pc.red("Authorization failed or expired."));
             cancel(`Reason: ${tokenData.error ||
                 "Unknown authorization error"}`);
             process.exit(1);
         }
-        // --------------------------------------------------
-        // 5. Make absolutely sure token exists
-        // --------------------------------------------------
+        // ==================================================
+        // 5. STOP POLLING SPINNER
+        // ==================================================
+        s.stop(pc.green("Hardware signature linked & token verified!"));
+        // ==================================================
+        // 6. ENSURE TOKEN EXISTS
+        // ==================================================
         if (!token) {
             throw new Error("Authorization completed without receiving an access token.");
         }
-        // --------------------------------------------------
-        // 6. Save CLI token + machine ID
-        // --------------------------------------------------
+        // ==================================================
+        // 7. SAVE TOKEN
+        // ==================================================
         saveToken(token, hardwareId);
-        // --------------------------------------------------
-        // 7. Success
-        // --------------------------------------------------
+        // ==================================================
+        // 8. SUCCESS
+        // ==================================================
         outro(`${pc.white("✔")} ${pc.bold("Terminal synced successfully")}\n` +
             pc.gray("Secure device key and session token are ready."));
+        // ==================================================
+        // 9. HARD EXIT
+        // ==================================================
+        //
+        // The login command is completely finished.
+        //
+        // This prevents any lingering CLI handles
+        // (spinner timers, readline handles, etc.)
+        // from keeping the Node process alive.
+        //
+        process.exit(0);
     }
     catch (error) {
-        // Only stop the spinner if it is
-        // still running.
         s.stop(pc.red("An error occurred during login."));
         cancel(pc.gray(error?.message ||
             "Unknown CLI Error"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ds-01",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "Make your site best with DS01",
   "type": "module",
   "bin": {

package/src/commands/add.ts

@@ -12,8 +12,7 @@ import machineIdPkg from "node-machine-id";
 
 const { machineIdSync } = machineIdPkg;
 
-const API_BASE_URL =
-  process.env.DS01_API_URL || "https://ds-01.vercel.app";
+const API_BASE_URL = process.env.DS01_API_URL || "https://ds-01.vercel.app";
 
 // Helper to verify Tailwind exists before doing anything
 function checkTailwindInstallation() {
@@ -29,9 +28,7 @@ function checkTailwindInstallation() {
     process.exit(1);
   }
 
-  const pkgJson = JSON.parse(
-    fs.readFileSync(pkgJsonPath, "utf-8"),
-  );
+  const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, "utf-8"));
 
   const allDeps = {
     ...pkgJson.dependencies,
@@ -40,22 +37,16 @@ function checkTailwindInstallation() {
 
   if (!allDeps["tailwindcss"]) {
     cancel(
-      pc.red(
-        "Tailwind CSS is missing from your project dependencies.\n",
-      ) +
+      pc.red("Tailwind CSS is missing from your project dependencies.\n") +
         pc.gray(
           "DS01 components rely strictly on Tailwind CSS for styling.\n\n",
         ) +
         pc.white(
           "Kindly install it and configure your project, then retry:\n",
         ) +
-        pc.cyan(
-          "  npm install tailwindcss @tailwindcss/postcss postcss\n\n",
-        ) +
+        pc.cyan("  npm install tailwindcss @tailwindcss/postcss postcss\n\n") +
         pc.gray("Official Setup Guide: ") +
-        pc.underline(
-          "https://tailwindcss.com/docs/installation",
-        ),
+        pc.underline("https://tailwindcss.com/docs/installation"),
     );
 
     process.exit(1);
@@ -65,10 +56,7 @@ function checkTailwindInstallation() {
 export const add = new Command()
   .name("add")
   .description("Add a component from DS01 to your project")
-  .argument(
-    "<component>",
-    "The name of the component (e.g., premium-section)",
-  )
+  .argument("<component>", "The name of the component (e.g., premium-section)")
   .action(async (componentName: string) => {
     console.log();
 
@@ -82,45 +70,28 @@ export const add = new Command()
 
     const cwd = process.cwd();
 
-    const configPath = path.join(
-      cwd,
-      "ds01.config.json",
-    );
+    const configPath = path.join(cwd, "ds01.config.json");
 
     if (!fs.existsSync(configPath)) {
-      cancel(
-        pc.red(
-          "ds01.config.json not found. Run 'npx ds-01 init' first.",
-        ),
-      );
+      cancel(pc.red("ds01.config.json not found. Run 'npx ds-01 init' first."));
 
       process.exit(1);
     }
 
-    const config = JSON.parse(
-      fs.readFileSync(configPath, "utf-8"),
-    );
+    const config = JSON.parse(fs.readFileSync(configPath, "utf-8"));
 
     const token = getToken();
     const machineId = machineIdSync();
 
     if (!token || !machineId) {
-      cancel(
-        pc.red(
-          "You are not authenticated. Run 'npx ds-01 login' first.",
-        ),
-      );
+      cancel(pc.red("You are not authenticated. Run 'npx ds-01 login' first."));
 
       process.exit(1);
     }
 
     const s = spinner();
 
-    s.start(
-      `Fetching ${pc.cyan(
-        `<${componentName} />`,
-      )} from registry...`,
-    );
+    s.start(`Fetching ${pc.cyan(`<${componentName} />`)} from registry...`);
 
     try {
       // --------------------------------------------------
@@ -144,8 +115,7 @@ export const add = new Command()
         new TextEncoder().encode(message),
       );
 
-      const signatureBase64 =
-        Buffer.from(signature).toString("base64");
+      const signatureBase64 = Buffer.from(signature).toString("base64");
 
       // --------------------------------------------------
       // 3. Send token + machine ID + signature
@@ -169,29 +139,22 @@ export const add = new Command()
       );
 
       if (!response.ok) {
-        s.stop(
-          pc.red("Component fetch failed."),
-        );
+        const errorData = await response.json().catch(() => null);
 
-        cancel(
-          `Component not found or server error (HTTP ${response.status})`,
-        );
+        s.stop(pc.red("Component fetch failed."));
+
+        cancel(errorData?.error || `Server returned HTTP ${response.status}`);
 
         process.exit(1);
       }
 
-      const componentData =
-        await response.json();
+      const componentData = await response.json();
 
       // --------------------------------------------------
       // 4. Create component folder
       // --------------------------------------------------
 
-      const targetDir = path.join(
-        cwd,
-        config.componentsPath,
-        componentName,
-      );
+      const targetDir = path.join(cwd, config.componentsPath, componentName);
 
       if (!fs.existsSync(targetDir)) {
         fs.mkdirSync(targetDir, {
@@ -203,45 +166,29 @@ export const add = new Command()
       // 5. Extract bundled file names
       // --------------------------------------------------
 
-      const bundledFileNames =
-        componentData.files.map(
-          (file: any) =>
-            file.name.replace(
-              /\.[^/.]+$/,
-              "",
-            ),
-        );
+      const bundledFileNames = componentData.files.map((file: any) =>
+        file.name.replace(/\.[^/.]+$/, ""),
+      );
 
       // --------------------------------------------------
       // 6. Write component files
       // --------------------------------------------------
 
       for (const file of componentData.files) {
-        const filePath = path.join(
-          targetDir,
-          file.name,
-        );
+        const filePath = path.join(targetDir, file.name);
 
         let content = file.content;
 
-        bundledFileNames.forEach(
-          (fileName: string) => {
-            const regex = new RegExp(
-              `from\\s+["']\\.[^"']*?\\/${fileName}["']`,
-              "g",
-            );
-
-            content = content.replace(
-              regex,
-              `from "./${fileName}"`,
-            );
-          },
-        );
+        bundledFileNames.forEach((fileName: string) => {
+          const regex = new RegExp(
+            `from\\s+["']\\.[^"']*?\\/${fileName}["']`,
+            "g",
+          );
 
-        fs.writeFileSync(
-          filePath,
-          content,
-        );
+          content = content.replace(regex, `from "./${fileName}"`);
+        });
+
+        fs.writeFileSync(filePath, content);
       }
 
       s.stop(
@@ -256,45 +203,28 @@ export const add = new Command()
       // 7. Install dependencies
       // --------------------------------------------------
 
-      if (
-        componentData.dependencies &&
-        componentData.dependencies.length > 0
-      ) {
-        const depsToInstall =
-          componentData.dependencies.join(" ");
+      if (componentData.dependencies && componentData.dependencies.length > 0) {
+        const depsToInstall = componentData.dependencies.join(" ");
 
         s.start(
-          `Installing missing dependencies: ${pc.cyan(
-            depsToInstall,
-          )}...`,
+          `Installing missing dependencies: ${pc.cyan(depsToInstall)}...`,
         );
 
         try {
-          execSync(
-            `npm install ${depsToInstall}`,
-            {
-              stdio: "ignore",
-            },
-          );
+          execSync(`npm install ${depsToInstall}`, {
+            stdio: "ignore",
+          });
 
           s.stop(
             pc.green(
-              `Dependencies installed successfully: ${pc.gray(
-                depsToInstall,
-              )}`,
+              `Dependencies installed successfully: ${pc.gray(depsToInstall)}`,
             ),
           );
         } catch {
-          s.stop(
-            pc.red(
-              "Failed to auto-install dependencies.",
-            ),
-          );
+          s.stop(pc.red("Failed to auto-install dependencies."));
 
           note(
-            `Please run: ${pc.cyan(
-              `npm install ${depsToInstall}`,
-            )} manually.`,
+            `Please run: ${pc.cyan(`npm install ${depsToInstall}`)} manually.`,
             "Manual Action Required",
           );
         }
@@ -306,9 +236,7 @@ export const add = new Command()
 
       const mainFile =
         bundledFileNames.find(
-          (name: string) =>
-            name.toLowerCase() ===
-            componentName.toLowerCase(),
+          (name: string) => name.toLowerCase() === componentName.toLowerCase(),
         ) || bundledFileNames[0];
 
       outro(
@@ -321,19 +249,10 @@ export const add = new Command()
           ),
       );
     } catch (error: any) {
-      s.stop(
-        pc.red(
-          "An error occurred during injection.",
-        ),
-      );
+      s.stop(pc.red("An error occurred during injection."));
 
-      cancel(
-        pc.gray(
-          error?.message ||
-            "Unknown CLI Error",
-        ),
-      );
+      cancel(pc.gray(error?.message || "Unknown CLI Error"));
 
       process.exit(1);
     }
-  });
+  });

package/src/commands/login.ts

@@ -43,9 +43,9 @@ export const login = new Command()
     const s = spinner();
 
     try {
-      // --------------------------------------------------
-      // 1. Create / load the device's secure key
-      // --------------------------------------------------
+      // ==================================================
+      // 1. CREATE / LOAD SECURE DEVICE KEY
+      // ==================================================
 
       s.start(
         "Preparing secure device identity...",
@@ -53,24 +53,20 @@ export const login = new Command()
 
       await createDeviceKey();
 
-      // Only the PUBLIC key/certificate leaves
-      // the user's machine.
       const publicKey =
         await getDevicePublicKey();
 
-      // Existing machine fingerprint.
       const hardwareId =
         machineIdSync();
 
-      // Detect the cryptographic key type.
       const publicKeyType =
         process.platform === "win32"
           ? "windows-rsa"
           : "macos-ec";
 
-      // --------------------------------------------------
-      // 2. Start device authorization
-      // --------------------------------------------------
+      // ==================================================
+      // 2. REQUEST DEVICE CODE
+      // ==================================================
 
       s.start(
         "Requesting pairing code...",
@@ -117,7 +113,8 @@ export const login = new Command()
         userCode,
         verificationUrl,
         interval,
-      } = await initResponse.json();
+      } =
+        await initResponse.json();
 
       if (
         !deviceCode ||
@@ -135,9 +132,9 @@ export const login = new Command()
         ),
       );
 
-      // --------------------------------------------------
-      // 3. Ask user to approve in browser
-      // --------------------------------------------------
+      // ==================================================
+      // 3. SHOW BROWSER AUTHORIZATION
+      // ==================================================
 
       note(
         `${pc.bold(
@@ -160,13 +157,12 @@ export const login = new Command()
           verificationUrl,
         );
       } catch {
-        // Browser launch failure
-        // is non-fatal.
+        // Browser launch failure is non-fatal.
       }
 
-      // --------------------------------------------------
-      // 4. Poll for authorization
-      // --------------------------------------------------
+      // ==================================================
+      // 4. POLL FOR AUTHORIZATION
+      // ==================================================
 
       s.start(
         "Waiting for web authorization...",
@@ -225,9 +221,9 @@ export const login = new Command()
           process.exit(1);
         }
 
-        // --------------------------------------------------
-        // SUCCESS
-        // --------------------------------------------------
+        // ==================================================
+        // AUTHORIZATION SUCCESS
+        // ==================================================
 
         if (
           tokenResponse.ok &&
@@ -238,22 +234,12 @@ export const login = new Command()
           token =
             tokenData.accessToken;
 
-          // IMPORTANT:
-          // Stop the spinner immediately.
-          s.stop(
-            pc.green(
-              "Hardware signature linked & token verified!",
-            ),
-          );
-
-          // IMPORTANT:
-          // Leave the polling loop immediately.
           break;
         }
 
-        // --------------------------------------------------
+        // ==================================================
         // STILL WAITING
-        // --------------------------------------------------
+        // ==================================================
 
         if (
           tokenData.error ===
@@ -262,9 +248,9 @@ export const login = new Command()
           continue;
         }
 
-        // --------------------------------------------------
-        // FAILED / EXPIRED
-        // --------------------------------------------------
+        // ==================================================
+        // AUTHORIZATION FAILED
+        // ==================================================
 
         s.stop(
           pc.red(
@@ -282,9 +268,19 @@ export const login = new Command()
         process.exit(1);
       }
 
-      // --------------------------------------------------
-      // 5. Make absolutely sure token exists
-      // --------------------------------------------------
+      // ==================================================
+      // 5. STOP POLLING SPINNER
+      // ==================================================
+
+      s.stop(
+        pc.green(
+          "Hardware signature linked & token verified!",
+        ),
+      );
+
+      // ==================================================
+      // 6. ENSURE TOKEN EXISTS
+      // ==================================================
 
       if (!token) {
         throw new Error(
@@ -292,18 +288,18 @@ export const login = new Command()
         );
       }
 
-      // --------------------------------------------------
-      // 6. Save CLI token + machine ID
-      // --------------------------------------------------
+      // ==================================================
+      // 7. SAVE TOKEN
+      // ==================================================
 
       saveToken(
         token,
         hardwareId,
       );
 
-      // --------------------------------------------------
-      // 7. Success
-      // --------------------------------------------------
+      // ==================================================
+      // 8. SUCCESS
+      // ==================================================
 
       outro(
         `${pc.white(
@@ -315,9 +311,19 @@ export const login = new Command()
             "Secure device key and session token are ready.",
           ),
       );
+
+      // ==================================================
+      // 9. HARD EXIT
+      // ==================================================
+      //
+      // The login command is completely finished.
+      //
+      // This prevents any lingering CLI handles
+      // (spinner timers, readline handles, etc.)
+      // from keeping the Node process alive.
+      //
+      process.exit(0);
     } catch (error: any) {
-      // Only stop the spinner if it is
-      // still running.
       s.stop(
         pc.red(
           "An error occurred during login.",