@pmate/cli 0.15.0 → 0.16.0

package/dist/index.d.ts

@@ -51,6 +51,8 @@ type BucketCommandArgs = {
     type: Command.Bucket;
     bucketCreate: boolean;
     bucketName: string;
+    bucketSubdomain?: string;
+    bucketDomain?: string;
 };
 type DeployCommandArgs = {
     type: Command.Deploy;

package/dist/index.js

@@ -13827,12 +13827,107 @@ var StsCommandHandler = class {
   }
 };
 
+// src/staticSiteSetup.ts
+async function setupStaticSiteBucket(input) {
+  const bucketName = input.bucketName.trim();
+  const domainName = input.domainName.trim();
+  const subdomain = input.subdomain?.trim();
+  const dnsRr = subdomain || "@";
+  const cdnDomain = subdomain ? `${subdomain}.${domainName}` : domainName;
+  await AliyunService.ensureBucket(bucketName);
+  await sleep(2e3);
+  await AliyunService.ensureCdnDomain(cdnDomain, bucketName);
+  await sleep(2e3);
+  await AliyunService.enableOssPrivateBucketOrigin(cdnDomain);
+  await sleep(2e3);
+  ui.success(`Enabled OSS private bucket origin for ${cdnDomain}`);
+  await AliyunService.setDefaultCacheRules(cdnDomain);
+  await sleep(2e3);
+  ui.success(`Set default cache rules for ${cdnDomain}`);
+  const cname = await AliyunService.getCdnCname(cdnDomain);
+  if (!cname) {
+    throw new Error(`No CNAME found for ${cdnDomain}. Try again in a minute.`);
+  }
+  ui.info(`CNAME for ${cdnDomain}:`, cname);
+  const existingCname = await AliyunService.getCnameRecordValue(domainName, dnsRr);
+  if (existingCname) {
+    if (existingCname !== cname) {
+      throw new Error(
+        `Existing CNAME record for ${cdnDomain} points to ${existingCname}, not ${cname}.`
+      );
+    }
+    ui.success(`CNAME record already exists for ${cdnDomain}`);
+  } else {
+    await AliyunService.addRecord({
+      domainName,
+      rr: dnsRr,
+      type: "CNAME",
+      value: cname,
+      ttl: 600
+    });
+    await sleep(2e3);
+    ui.success(`Added CNAME record ${cdnDomain} -> ${cname}`);
+  }
+  if (!subdomain) {
+    const wwwCname = await AliyunService.getCnameRecordValue(domainName, "www");
+    if (wwwCname) {
+      if (wwwCname !== domainName) {
+        throw new Error(
+          `Existing CNAME record for www.${domainName} points to ${wwwCname}, not ${domainName}.`
+        );
+      }
+      ui.success(`CNAME record already exists for www.${domainName}`);
+    } else {
+      await AliyunService.addRecord({
+        domainName,
+        rr: "www",
+        type: "CNAME",
+        value: domainName,
+        ttl: 600
+      });
+      await sleep(2e3);
+      ui.success(`Added CNAME record www.${domainName} -> ${domainName}`);
+    }
+  }
+  await AliyunService.enableHttpsCertificate(cdnDomain);
+  await sleep(2e3);
+  ui.success(`Enabled HTTPS certificate for ${cdnDomain}`);
+  if (input.routeType === "ssg") {
+    await AliyunService.enableSsgRewriteRule(cdnDomain);
+    await sleep(2e3);
+    ui.success(`Enabled SSG rewrite rule for ${cdnDomain}`);
+    return;
+  }
+  await AliyunService.enableSpaRewriteRule(cdnDomain);
+  await sleep(2e3);
+  ui.success(`Enabled SPA rewrite rule for ${cdnDomain}`);
+}
+function sleep(ms) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, ms);
+  });
+}
+
 // src/commands/BucketCommandHandler.ts
 var BucketCommandHandler = class {
   async handle(args) {
     const bucketName = args.bucketName.trim();
-    await AliyunService.createBucket(bucketName);
-    ui.success(`Bucket created: ${bucketName}`);
+    const subdomain = args.bucketSubdomain?.trim();
+    if (!subdomain) {
+      await AliyunService.createBucket(bucketName);
+      ui.success(`Bucket created: ${bucketName}`);
+      return;
+    }
+    const domainName = args.bucketDomain?.trim();
+    if (!domainName) {
+      throw new Error("Missing domain name. Use --domain <name> when --subdomain is set.");
+    }
+    await setupStaticSiteBucket({
+      bucketName,
+      domainName,
+      subdomain,
+      routeType: "spa"
+    });
   }
 };
 
@@ -14301,82 +14396,12 @@ var InitCommandHandler = class {
     if (!baseDomain) {
       throw new Error(`Missing domain in ${import_node_path8.default.join(cwd, ".pmate.yaml")}`);
     }
-    const subdomain = appConfig.subdomain?.trim();
-    const dnsRr = subdomain || "@";
-    const cdnDomain = subdomain ? `${subdomain}.${baseDomain}` : baseDomain;
-    await AliyunService.ensureBucket(bucketName);
-    await this.sleep(2e3);
-    await AliyunService.ensureCdnDomain(cdnDomain, bucketName);
-    await this.sleep(2e3);
-    await AliyunService.enableOssPrivateBucketOrigin(cdnDomain);
-    await this.sleep(2e3);
-    ui.success(`Enabled OSS private bucket origin for ${cdnDomain}`);
-    await AliyunService.setDefaultCacheRules(cdnDomain);
-    await this.sleep(2e3);
-    ui.success(`Set default cache rules for ${cdnDomain}`);
-    const cname = await AliyunService.getCdnCname(cdnDomain);
-    if (!cname) {
-      throw new Error(`No CNAME found for ${cdnDomain}. Try again in a minute.`);
-    }
-    ui.info(`CNAME for ${cdnDomain}:`, cname);
-    const existingCname = await AliyunService.getCnameRecordValue(
-      baseDomain,
-      dnsRr
-    );
-    if (existingCname) {
-      if (existingCname !== cname) {
-        throw new Error(
-          `Existing CNAME record for ${cdnDomain} points to ${existingCname}, not ${cname}.`
-        );
-      }
-      ui.success(`CNAME record already exists for ${cdnDomain}`);
-    } else {
-      await AliyunService.addRecord({
-        domainName: baseDomain,
-        rr: dnsRr,
-        type: "CNAME",
-        value: cname,
-        ttl: 600
-      });
-      await this.sleep(2e3);
-      ui.success(`Added CNAME record ${cdnDomain} -> ${cname}`);
-    }
-    if (!subdomain) {
-      const wwwCname = await AliyunService.getCnameRecordValue(
-        baseDomain,
-        "www"
-      );
-      if (wwwCname) {
-        if (wwwCname !== baseDomain) {
-          throw new Error(
-            `Existing CNAME record for www.${baseDomain} points to ${wwwCname}, not ${baseDomain}.`
-          );
-        }
-        ui.success(`CNAME record already exists for www.${baseDomain}`);
-      } else {
-        await AliyunService.addRecord({
-          domainName: baseDomain,
-          rr: "www",
-          type: "CNAME",
-          value: baseDomain,
-          ttl: 600
-        });
-        await this.sleep(2e3);
-        ui.success(`Added CNAME record www.${baseDomain} -> ${baseDomain}`);
-      }
-    }
-    await AliyunService.enableHttpsCertificate(cdnDomain);
-    await this.sleep(2e3);
-    ui.success(`Enabled HTTPS certificate for ${cdnDomain}`);
-    if (appConfig.type === "vite" && appConfig.routeType === "ssg") {
-      await AliyunService.enableSsgRewriteRule(cdnDomain);
-      await this.sleep(2e3);
-      ui.success(`Enabled SSG rewrite rule for ${cdnDomain}`);
-    } else {
-      await AliyunService.enableSpaRewriteRule(cdnDomain);
-      await this.sleep(2e3);
-      ui.success(`Enabled SPA rewrite rule for ${cdnDomain}`);
-    }
+    await setupStaticSiteBucket({
+      bucketName,
+      domainName: baseDomain,
+      subdomain: appConfig.subdomain,
+      routeType: appConfig.type === "vite" && appConfig.routeType === "ssg" ? "ssg" : "spa"
+    });
   }
   async initNode(appConfig, cwd) {
     console.log("Initializing node app...");
@@ -17194,7 +17219,7 @@ var LinearCommandHandler = class {
     for (let attempt = 0; attempt < 12; attempt++) {
       buffer = await this.captureClipboardImageAsPng();
       if (buffer.length > 0) break;
-      await sleep(150);
+      await sleep2(150);
     }
     if (buffer.length === 0) {
       const info = await this.getClipboardDebugInfo();
@@ -17645,7 +17670,7 @@ function parseJson(raw) {
     return JSON.parse(match[0]);
   }
 }
-function sleep(ms) {
+function sleep2(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
@@ -20063,7 +20088,7 @@ var HELP_TEXT = [
   `  ${import_chalk3.default.gray("                  --type <t> --value <v> --rr <rr> [--ttl <n>] [--domain <name>]")}`,
   `  ${import_chalk3.default.cyan("sts")}              Request an OSS STS token from the CI server`,
   `  ${import_chalk3.default.cyan("bucket")}           Manage OSS buckets`,
-  `  ${import_chalk3.default.gray("                  --create --name <bucket>")}`,
+  `  ${import_chalk3.default.gray("                  --create --name <bucket> [--subdomain <name> --domain <name>]")}`,
   `  ${import_chalk3.default.cyan("deploy")}           Deploy or view logs for app dir from .pmate.yaml`,
   `  ${import_chalk3.default.gray("                  <app-name> [deploy|logs] [--cwd <dir>]")}`,
   `  ${import_chalk3.default.cyan("log")}              Query app logs from the log indexer API`,
@@ -20379,7 +20404,9 @@ function parseAddDnsArgs(tokens) {
 function parseBucketArgs(tokens) {
   const options = {
     bucketCreate: false,
-    bucketName: ""
+    bucketName: "",
+    bucketSubdomain: void 0,
+    bucketDomain: void 0
   };
   const rest = [...tokens];
   while (rest.length > 0) {
@@ -20391,6 +20418,12 @@ function parseBucketArgs(tokens) {
       case "--name":
         options.bucketName = requireValue4(rest, token);
         break;
+      case "--subdomain":
+        options.bucketSubdomain = requireValue4(rest, token);
+        break;
+      case "--domain":
+        options.bucketDomain = requireValue4(rest, token);
+        break;
       default:
         throw new Error(`Unknown bucket option: ${token}`);
     }
@@ -20401,6 +20434,9 @@ function parseBucketArgs(tokens) {
   if (!options.bucketName.trim()) {
     throw new Error("Missing bucket name. Use --name <bucket>.");
   }
+  if (options.bucketSubdomain && !options.bucketDomain?.trim()) {
+    throw new Error("Missing domain name. Use --domain <name> when --subdomain is set.");
+  }
   return { type: "bucket" /* Bucket */, ...options };
 }
 function parseDeployArgs(tokens) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmate/cli",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "CLI utilities for the pMate project",
   "license": "MIT",
   "bin": {