@aigne/doc-smith 0.8.10-beta.2 → 0.8.10

package/tests/utils/deploy.test.mjs

@@ -154,23 +154,120 @@ describe("deploy", () => {
     expect(saveValueToConfigSpy).toHaveBeenCalledWith(
       "checkoutId",
       "checkout-123",
-      "Checkout ID for document deployment service",
+      "Checkout ID for document deployment website",
     );
     expect(saveValueToConfigSpy).toHaveBeenCalledWith(
       "paymentUrl",
       expect.stringContaining("payment"),
-      "Payment URL for document deployment service",
+      "Payment URL for document deployment website",
     );
 
     // Verify console output shows progress
     const logs = consoleOutput.filter((o) => o.type === "log").map((o) => o.args.join(" "));
     expect(logs.some((log) => log.includes("Step 1/4: Waiting for payment"))).toBe(true);
-    expect(logs.some((log) => log.includes("Step 2/4: Installing service"))).toBe(true);
-    expect(logs.some((log) => log.includes("Step 3/4: Starting service"))).toBe(true);
-    expect(logs.some((log) => log.includes("Step 4/4: Getting service URL"))).toBe(true);
+    expect(logs.some((log) => log.includes("Step 2/4: Installing Website"))).toBe(true);
+    expect(logs.some((log) => log.includes("Step 3/4: Starting Website"))).toBe(true);
+    expect(logs.some((log) => log.includes("Step 4/4: Getting Website URL"))).toBe(true);
     expect(logs.some((log) => log.includes("Your website is available at"))).toBe(true);
   });
 
+  test("successful deployment flow with subscription", async () => {
+    // Mock API responses for the complete flow
+    let callCount = 0;
+    global.fetch = mock(async (url) => {
+      callCount++;
+
+      // Step 1: Create payment session
+      if (url.includes("/api/checkout-sessions/start")) {
+        return {
+          ok: true,
+          status: 200,
+          json: async () => ({
+            checkoutSession: { id: "checkout-123" },
+            paymentUrl: "https://payment.test/checkout-123",
+          }),
+        };
+      }
+
+      // Step 2-4: Poll payment/installation/service status
+      if (url.includes("/api/vendors/order/checkout-123/status")) {
+        if (callCount <= 2) {
+          // First call: payment completed, installation in progress
+          return {
+            ok: true,
+            status: 200,
+            json: async () => ({
+              payment_status: "paid",
+              vendors: [{ id: "vendor-1", progress: 50, appUrl: null }],
+            }),
+          };
+        } else {
+          // Subsequent calls: installation complete
+          return {
+            ok: true,
+            status: 200,
+            json: async () => ({
+              payment_status: "paid",
+              vendors: [{ id: "vendor-1", progress: 100, appUrl: "https://app.test" }],
+            }),
+          };
+        }
+      }
+
+      // Step 5: Get order details
+      if (url.includes("/api/vendors/order/checkout-123/detail")) {
+        return {
+          ok: true,
+          status: 200,
+          json: async () => ({
+            vendors: [
+              {
+                appUrl: "https://app.test",
+                dashboardUrl: "https://dashboard.test",
+                homeUrl: "https://home.test",
+                token: "auth-token-123",
+              },
+            ],
+            subscriptionUrl: "https://subscription.test",
+          }),
+        };
+      }
+
+      throw new Error(`Unexpected URL: ${url}`);
+    });
+
+    const result = await deploy();
+
+    // Verify result
+    expect(result).toEqual({
+      appUrl: "https://app.test",
+      homeUrl: "https://home.test",
+      token: "auth-token-123",
+    });
+
+    // Verify saveValueToConfig was called
+    expect(saveValueToConfigSpy).toHaveBeenCalledWith(
+      "checkoutId",
+      "checkout-123",
+      "Checkout ID for document deployment website",
+    );
+    expect(saveValueToConfigSpy).toHaveBeenCalledWith(
+      "paymentUrl",
+      expect.stringContaining("payment"),
+      "Payment URL for document deployment website",
+    );
+
+    // Verify console output shows progress
+    const logs = consoleOutput.filter((o) => o.type === "log").map((o) => o.args.join(" "));
+
+    expect(logs.some((log) => log.includes("Step 1/4: Waiting for payment"))).toBe(true);
+    expect(logs.some((log) => log.includes("Step 2/4: Installing Website"))).toBe(true);
+    expect(logs.some((log) => log.includes("Step 3/4: Starting Website"))).toBe(true);
+    expect(logs.some((log) => log.includes("Step 4/4: Getting Website URL"))).toBe(true);
+    expect(logs.some((log) => log.includes("Your website is available at"))).toBe(true);
+    expect(logs.some((log) => log.includes("Your subscription management URL"))).toBe(true);
+  });
+
   test("handles missing payment link ID", async () => {
     getComponentInfoWithMountPointSpy.mockResolvedValue({
       mountPoint: "/payment",
@@ -359,7 +456,7 @@ describe("deploy", () => {
     expect(saveValueToConfigSpy).toHaveBeenCalledWith(
       "checkoutId",
       "",
-      "Checkout ID for document deployment service",
+      "Checkout ID for document deployment website",
     );
   });
 });

package/utils/deploy.mjs

@@ -12,7 +12,7 @@ const INTERVAL_MS = 3000; // 3 seconds between each check
 const TIMEOUTS = {
   paymentWait: 300, // Step 2: Payment wait timeout (5 minutes)
   installation: 300, // Step 3: Installation timeout (5 minutes)
-  serviceStart: 300, // Step 4: Service startup timeout (5 minutes)
+  serviceStart: 300, // Step 4: Website startup timeout (5 minutes)
 };
 
 // ==================== Utility Functions ====================
@@ -76,8 +76,8 @@ const API_ENDPOINTS = {
 let prefix = "";
 let paymentLinkId = "";
 /**
- * Deploy a new Discuss Kit service and return the installation URL
- * @returns {Promise<string>} - The URL of the deployed service
+ * Deploy a new Discuss Kit Website and return the installation URL
+ * @returns {Promise<string>} - The URL of the deployed Website
  */
 export async function deploy(id, cachedUrl) {
   const { mountPoint, PAYMENT_LINK_ID } = await getComponentInfoWithMountPoint(
@@ -113,28 +113,33 @@ export async function deploy(id, cachedUrl) {
   }
 
   // Step 2: Wait for payment completion
-  console.log(`${chalk.blue("⏳")} Step 1/4: Waiting for payment...`);
-  console.log(`${chalk.blue("🔗")} Payment link: ${chalk.cyan(paymentUrl)}\n`);
+  console.log(`⏳ Step 1/4: Waiting for payment...`);
+  console.log(`🔗 Payment link: ${chalk.cyan(paymentUrl)}\n`);
   await pollPaymentStatus(checkoutId);
-  await saveValueToConfig("checkoutId", checkoutId, "Checkout ID for document deployment service");
-  await saveValueToConfig("paymentUrl", paymentUrl, "Payment URL for document deployment service");
+  await saveValueToConfig("checkoutId", checkoutId, "Checkout ID for document deployment website");
+  await saveValueToConfig("paymentUrl", paymentUrl, "Payment URL for document deployment website");
 
-  // Step 3: Wait for service installation
-  console.log(`${chalk.blue("📦")} Step 2/4: Installing service...`);
+  // Step 3: Wait for website installation
+  console.log(`📦 Step 2/4: Installing Website...`);
   const readyVendors = await waitInstallation(checkoutId);
 
-  // Step 4: Wait for service startup
-  console.log(`${chalk.blue("🚀")} Step 3/4: Starting service...`);
-  const runningVendors = await waitServiceRunning(readyVendors);
+  // Step 4: Wait for website startup
+  console.log(`🚀 Step 3/4: Starting Website...`);
+  const runningVendors = await waitWebsiteRunning(readyVendors);
 
   // Step 5: Get final URL
-  console.log(`${chalk.blue("🌐")} Step 4/4: Getting service URL...`);
+  console.log(`🌐 Step 4/4: Getting Website URL...`);
   const urlInfo = await getDashboardAndUrl(checkoutId, runningVendors);
-  const { appUrl, homeUrl, token } = urlInfo || {};
+  const { appUrl, homeUrl, token, subscriptionUrl } = urlInfo || {};
 
-  console.log(
-    `\n${chalk.blue("🔗")} Your website is available at: ${chalk.cyan(homeUrl || appUrl)}\n`,
-  );
+  console.log(`\n🔗 Your website is available at: ${chalk.cyan(homeUrl || appUrl)}`);
+
+  if (subscriptionUrl) {
+    console.log(`🔗 Your subscription management URL: ${chalk.cyan(subscriptionUrl)}\n`);
+  } else {
+    // just log one space line
+    console.log("");
+  }
 
   return {
     appUrl,
@@ -174,7 +179,7 @@ async function checkCacheCheckoutId(checkoutId) {
 
     return isPaid ? checkoutId : "";
   } catch (_error) {
-    await saveValueToConfig("checkoutId", "", "Checkout ID for document deployment service");
+    await saveValueToConfig("checkoutId", "", "Checkout ID for document deployment website");
     return "";
   }
 }
@@ -310,15 +315,15 @@ async function waitInstallation(checkoutId) {
     },
     maxAttempts: Math.ceil((TIMEOUTS.installation * 1000) / INTERVAL_MS),
     intervalMs: INTERVAL_MS,
-    timeoutMessage: "Installation timeout - services failed to install within 5 minutes",
+    timeoutMessage: "Installation timeout - website failed to install within 5 minutes",
     stepName: "Installation",
   });
 }
 
 /**
- * Wait for service to start running - Step 4
+ * Wait for Website to start running - Step 4
  */
-async function waitServiceRunning(readyVendors) {
+async function waitWebsiteRunning(readyVendors) {
   return pollWithTimeout({
     checkCondition: async () => {
       // Check running status of all vendors concurrently
@@ -346,8 +351,8 @@ async function waitServiceRunning(readyVendors) {
     },
     maxAttempts: Math.ceil((TIMEOUTS.serviceStart * 1000) / INTERVAL_MS),
     intervalMs: INTERVAL_MS,
-    timeoutMessage: "Service start timeout - services failed to start within 5 minutes",
-    stepName: "Service Start",
+    timeoutMessage: "Website start timeout - website failed to start within 5 minutes",
+    stepName: "Website Start",
   });
 }
 
@@ -385,6 +390,7 @@ async function getDashboardAndUrl(checkoutId, runningVendors) {
 
     return {
       appUrl,
+      subscriptionUrl: data.subscriptionUrl,
       dashboardUrl: data.vendors[0]?.dashboardUrl,
       homeUrl: data.vendors[0]?.homeUrl,
       token: data.vendors[0]?.token,

package/utils/markdown-checker.mjs

@@ -300,13 +300,13 @@ function checkContentStructure(markdown, source, errorMessages) {
   }
 
   // Check if content ends with proper punctuation (indicating completeness)
-  const validEndingPunctuation = [".", "。", ")", "|", "*", ">", "`", "!"];
+  const validEndingPunctuation = [".", "。", ")", "|", "*", ">", "`", "!", "）"];
   const trimmedText = markdown.trim();
   const hasValidEnding = validEndingPunctuation.some((punct) => trimmedText.endsWith(punct));
 
   if (trimmedText.length > 0 && !hasValidEnding) {
     errorMessages.push(
-      `Found incomplete content in ${source}: content does not end with proper punctuation (${validEndingPunctuation.join(", ")}). Please return the complete content`,
+      `Found incomplete content in ${source}: content does not end with proper punctuation [${validEndingPunctuation.join(", ")}]. Please return the complete content`,
     );
   }
 }