@pmate/cli 0.24.2 → 0.24.3

package/dist/index.js

@@ -10178,7 +10178,7 @@ var AliyunService = class {
       const routeIndex = routes.findIndex((item) => item?.path === route.path);
       if (routeIndex >= 0) {
         const current = routes[routeIndex];
-        if (current?.functionName === route.functionName && (current?.qualifier || "LATEST") === route.qualifier) {
+        if (current?.functionName === route.functionName && (current?.qualifier || "LATEST") === route.qualifier && !input.certConfig && (existing?.protocol || "HTTP") === (input.protocol ?? existing?.protocol ?? "HTTP")) {
           ui.success(`FC custom domain route already exists: ${input.domainName}${route.path}`);
           return;
         }
@@ -10191,6 +10191,9 @@ var AliyunService = class {
         new import_fc20230330.UpdateCustomDomainRequest({
           body: new import_fc20230330.UpdateCustomDomainInput({
             protocol: input.protocol ?? existing?.protocol ?? "HTTP",
+            ...input.certConfig ? {
+              certConfig: new import_fc20230330.CertConfig(input.certConfig)
+            } : {},
             routeConfig: new import_fc20230330.RouteConfig({ routes })
           })
         })
@@ -10206,7 +10209,10 @@ var AliyunService = class {
       new import_fc20230330.CreateCustomDomainRequest({
         body: new import_fc20230330.CreateCustomDomainInput({
           domainName: input.domainName,
-          protocol: input.protocol ?? "HTTP",
+          protocol: input.protocol ?? (input.certConfig ? "HTTP,HTTPS" : "HTTP"),
+          ...input.certConfig ? {
+            certConfig: new import_fc20230330.CertConfig(input.certConfig)
+          } : {},
           authConfig: new import_fc20230330.AuthConfig({ authType: "anonymous", authInfo: "{}" }),
           routeConfig: new import_fc20230330.RouteConfig({ routes: [route] })
         })
@@ -18562,13 +18568,15 @@ var ServiceRuntimeRunner = class {
         });
         ui.success(`Added CNAME ${host} -> ${cnameTarget}`);
       }
+      const certConfig = this.resolveFcCertConfig(host);
       await AliyunService.ensureFcCustomDomain({
         domainName: host,
         region: fc.region,
         functionName: fc.functionName,
         routePath: fc.routePath,
-        protocol: fc.protocol,
-        qualifier: fc.qualifier
+        protocol: this.resolveFcProtocol(fc, certConfig),
+        qualifier: fc.qualifier,
+        certConfig
       });
     }
     ui.success(`Initialized FC service ${service.id}`, {
@@ -19322,6 +19330,37 @@ var ServiceRuntimeRunner = class {
   normalizeDnsValue(value) {
     return value.trim().replace(/\.$/, "").toLowerCase();
   }
+  resolveFcCertConfig(host) {
+    const config = loadPmateConfig();
+    const certificatePath = config.ssl?.pub?.trim();
+    const privateKeyPath = config.ssl?.prv?.trim();
+    if (!certificatePath && !privateKeyPath) {
+      return void 0;
+    }
+    if (!certificatePath) {
+      throw new Error("Missing ssl.pub in ~/.pmate/config.yaml.");
+    }
+    if (!privateKeyPath) {
+      throw new Error("Missing ssl.prv in ~/.pmate/config.yaml.");
+    }
+    if (!(0, import_node_fs17.existsSync)(certificatePath)) {
+      throw new Error(`SSL certificate file not found: ${certificatePath}`);
+    }
+    if (!(0, import_node_fs17.existsSync)(privateKeyPath)) {
+      throw new Error(`SSL private key file not found: ${privateKeyPath}`);
+    }
+    return {
+      certName: host,
+      certificate: (0, import_node_fs17.readFileSync)(certificatePath, "utf8"),
+      privateKey: (0, import_node_fs17.readFileSync)(privateKeyPath, "utf8")
+    };
+  }
+  resolveFcProtocol(fc, certConfig) {
+    if (!certConfig) {
+      return fc.protocol;
+    }
+    return fc.protocol === "HTTPS" ? "HTTPS" : "HTTP,HTTPS";
+  }
   async resolveAliyunDeploymentEnv() {
     const config = loadPmateConfig();
     const accessKeyId = config.aliyun?.ak?.trim();

package/package.json

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