diff --git a/internal/domain/workflow.go b/internal/domain/workflow.go index a2e049e2..256ad08d 100644 --- a/internal/domain/workflow.go +++ b/internal/domain/workflow.go @@ -106,12 +106,13 @@ type WorkflowNodeConfigForDeploy struct { } type WorkflowNodeConfigForNotify struct { - Channel string `json:"channel,omitempty"` // Deprecated: v0.4.x 将废弃 - Provider string `json:"provider"` // 通知提供商 - ProviderAccessId string `json:"providerAccessId"` // 通知提供商授权记录 ID - ProviderConfig map[string]any `json:"providerConfig,omitempty"` // 通知提供商额外配置 - Subject string `json:"subject"` // 通知主题 - Message string `json:"message"` // 通知内容 + Channel string `json:"channel,omitempty"` // Deprecated: v0.4.x 将废弃 + Provider string `json:"provider"` // 通知提供商 + ProviderAccessId string `json:"providerAccessId"` // 通知提供商授权记录 ID + ProviderConfig map[string]any `json:"providerConfig,omitempty"` // 通知提供商额外配置 + Subject string `json:"subject"` // 通知主题 + Message string `json:"message"` // 通知内容 + SkipOnAllPrevSkipped bool `json:"skipOnAllPrevSkipped"` // 前序节点均已跳过时是否跳过 } type WorkflowNodeConfigForCondition struct { @@ -128,7 +129,7 @@ func (n *WorkflowNode) GetConfigForApply() WorkflowNodeConfigForApply { CAProvider: maputil.GetString(n.Config, "caProvider"), CAProviderAccessId: maputil.GetString(n.Config, "caProviderAccessId"), CAProviderConfig: maputil.GetKVMapAny(n.Config, "caProviderConfig"), - KeyAlgorithm: maputil.GetString(n.Config, "keyAlgorithm"), + KeyAlgorithm: maputil.GetOrDefaultString(n.Config, "keyAlgorithm", string(CertificateKeyAlgorithmTypeRSA2048)), Nameservers: maputil.GetString(n.Config, "nameservers"), DnsPropagationWait: maputil.GetInt32(n.Config, "dnsPropagationWait"), DnsPropagationTimeout: maputil.GetInt32(n.Config, "dnsPropagationTimeout"), @@ -169,12 +170,13 @@ func (n *WorkflowNode) GetConfigForDeploy() WorkflowNodeConfigForDeploy { func (n *WorkflowNode) GetConfigForNotify() WorkflowNodeConfigForNotify { return WorkflowNodeConfigForNotify{ - Channel: maputil.GetString(n.Config, "channel"), - Provider: maputil.GetString(n.Config, "provider"), - ProviderAccessId: maputil.GetString(n.Config, "providerAccessId"), - ProviderConfig: maputil.GetKVMapAny(n.Config, "providerConfig"), - Subject: maputil.GetString(n.Config, "subject"), - Message: maputil.GetString(n.Config, "message"), + Channel: maputil.GetString(n.Config, "channel"), + Provider: maputil.GetString(n.Config, "provider"), + ProviderAccessId: maputil.GetString(n.Config, "providerAccessId"), + ProviderConfig: maputil.GetKVMapAny(n.Config, "providerConfig"), + Subject: maputil.GetString(n.Config, "subject"), + Message: maputil.GetString(n.Config, "message"), + SkipOnAllPrevSkipped: maputil.GetBool(n.Config, "skipOnAllPrevSkipped"), } } diff --git a/internal/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb.go b/internal/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb.go index 3bb965ca..87d7ba65 100644 --- a/internal/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb.go +++ b/internal/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb.go @@ -285,6 +285,7 @@ func (d *DeployerProvider) updateHttpsListenerCertificate(ctx context.Context, c ClientToken: generateClientToken(), ListenerPort: uint16(cloudHttpsListenerPort), Scheduler: describeAppHTTPSListenersResp.ListenerList[0].Scheduler, + CertIds: describeAppHTTPSListenersResp.ListenerList[0].CertIds, AdditionalCertDomains: sliceutil.Map(describeAppHTTPSListenersResp.ListenerList[0].AdditionalCertDomains, func(domain bceappblb.AdditionalCertDomainsModel) bceappblb.AdditionalCertDomainsModel { if domain.Host == d.config.Domain { return bceappblb.AdditionalCertDomainsModel{ diff --git a/internal/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb.go b/internal/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb.go index 0490b9ad..54e4a55d 100644 --- a/internal/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb.go +++ b/internal/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb.go @@ -283,6 +283,7 @@ func (d *DeployerProvider) updateHttpsListenerCertificate(ctx context.Context, c updateHTTPSListenerReq := &bceblb.UpdateHTTPSListenerArgs{ ClientToken: generateClientToken(), ListenerPort: uint16(cloudHttpsListenerPort), + CertIds: describeHTTPSListenersResp.ListenerList[0].CertIds, AdditionalCertDomains: sliceutil.Map(describeHTTPSListenersResp.ListenerList[0].AdditionalCertDomains, func(domain bceblb.AdditionalCertDomainsModel) bceblb.AdditionalCertDomainsModel { if domain.Host == d.config.Domain { return bceblb.AdditionalCertDomainsModel{ diff --git a/internal/pkg/core/deployer/providers/wangsu-cdn/wangsu_cdn.go b/internal/pkg/core/deployer/providers/wangsu-cdn/wangsu_cdn.go index f889b996..3be2b119 100644 --- a/internal/pkg/core/deployer/providers/wangsu-cdn/wangsu_cdn.go +++ b/internal/pkg/core/deployer/providers/wangsu-cdn/wangsu_cdn.go @@ -6,11 +6,13 @@ import ( "fmt" "log/slog" "strconv" + "strings" "github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/wangsu-certificate" wangsusdk "github.com/usual2970/certimate/internal/pkg/sdk3rd/wangsu/cdn" + sliceutil "github.com/usual2970/certimate/internal/pkg/utils/slice" ) type DeployerConfig struct { @@ -18,7 +20,7 @@ type DeployerConfig struct { AccessKeyId string `json:"accessKeyId"` // 网宿云 AccessKeySecret。 AccessKeySecret string `json:"accessKeySecret"` - // 加速域名数组。 + // 加速域名数组（支持泛域名）。 Domains []string `json:"domains"` } @@ -80,7 +82,10 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE certId, _ := strconv.ParseInt(upres.CertId, 10, 64) batchUpdateCertificateConfigReq := &wangsusdk.BatchUpdateCertificateConfigRequest{ CertificateId: certId, - DomainNames: d.config.Domains, + DomainNames: sliceutil.Map(d.config.Domains, func(domain string) string { + // "*.example.com" → ".example.com"，适配网宿云 CDN 要求的泛域名格式 + return strings.TrimPrefix(domain, "*") + }), } batchUpdateCertificateConfigResp, err := d.sdkClient.BatchUpdateCertificateConfig(batchUpdateCertificateConfigReq) d.logger.Debug("sdk request 'cdn.BatchUpdateCertificateConfig'", slog.Any("request", batchUpdateCertificateConfigReq), slog.Any("response", batchUpdateCertificateConfigResp)) diff --git a/internal/repository/certificate.go b/internal/repository/certificate.go index 290d5f9f..f5a345c7 100644 --- a/internal/repository/certificate.go +++ b/internal/repository/certificate.go @@ -77,25 +77,6 @@ func (r *CertificateRepository) GetByWorkflowNodeId(ctx context.Context, workflo return r.castRecordToModel(records[0]) } -func (r *CertificateRepository) GetByWorkflowRunId(ctx context.Context, workflowRunId string) (*domain.Certificate, error) { - records, err := app.GetApp().FindRecordsByFilter( - domain.CollectionNameCertificate, - "workflowRunId={:workflowRunId} && deleted=null", - "-created", - 1, 0, - dbx.Params{"workflowRunId": workflowRunId}, - ) - if err != nil { - return nil, err - } - - if len(records) == 0 { - return nil, domain.ErrRecordNotFound - } - - return r.castRecordToModel(records[0]) -} - func (r *CertificateRepository) Save(ctx context.Context, certificate *domain.Certificate) (*domain.Certificate, error) { collection, err := app.GetApp().FindCollectionByNameOrId(domain.CollectionNameCertificate) if err != nil { diff --git a/internal/workflow/dispatcher/invoker.go b/internal/workflow/dispatcher/invoker.go index b6e4a4db..c1d1260e 100644 --- a/internal/workflow/dispatcher/invoker.go +++ b/internal/workflow/dispatcher/invoker.go @@ -112,6 +112,7 @@ func (w *workflowInvoker) processNode(ctx context.Context, node *domain.Workflow break } + // TODO: 优化可读性 if procErr != nil && current.Type == domain.WorkflowNodeTypeCondition { current = nil diff --git a/internal/workflow/node-processor/apply_node.go b/internal/workflow/node-processor/apply_node.go index 8616fbd9..313d21a6 100644 --- a/internal/workflow/node-processor/apply_node.go +++ b/internal/workflow/node-processor/apply_node.go @@ -3,6 +3,7 @@ package nodeprocessor import ( "context" "fmt" + "log/slog" "strconv" "time" @@ -35,7 +36,8 @@ func NewApplyNode(node *domain.WorkflowNode) *applyNode { } func (n *applyNode) Process(ctx context.Context) error { - n.logger.Info("ready to obtain certificiate ...") + nodeCfg := n.node.GetConfigForApply() + n.logger.Info("ready to obtain certificiate ...", slog.Any("config", nodeCfg)) // 查询上次执行结果 lastOutput, err := n.outputRepo.GetByNodeId(ctx, n.node.Id) @@ -45,6 +47,7 @@ func (n *applyNode) Process(ctx context.Context) error { // 检测是否可以跳过本次执行 if skippable, reason := n.checkCanSkip(ctx, lastOutput); skippable { + n.outputs[outputKeyForNodeSkipped] = strconv.FormatBool(true) n.logger.Info(fmt.Sprintf("skip this application, because %s", reason)) return nil } else if reason != "" { @@ -101,8 +104,8 @@ func (n *applyNode) Process(ctx context.Context) error { } // 保存 ARI 记录 - if applyResult.ARIReplaced { - lastCertificate, _ := n.certRepo.GetByWorkflowRunId(ctx, lastOutput.RunId) + if applyResult.ARIReplaced && lastOutput != nil { + lastCertificate, _ := n.certRepo.GetByWorkflowNodeId(ctx, lastOutput.NodeId) if lastCertificate != nil { lastCertificate.ACMERenewed = true n.certRepo.Save(ctx, lastCertificate) @@ -110,6 +113,7 @@ func (n *applyNode) Process(ctx context.Context) error { } // 记录中间结果 + n.outputs[outputKeyForNodeSkipped] = strconv.FormatBool(false) n.outputs[outputKeyForCertificateValidity] = strconv.FormatBool(true) n.outputs[outputKeyForCertificateDaysLeft] = strconv.FormatInt(int64(time.Until(certificate.ExpireAt).Hours()/24), 10) @@ -120,39 +124,40 @@ func (n *applyNode) Process(ctx context.Context) error { func (n *applyNode) checkCanSkip(ctx context.Context, lastOutput *domain.WorkflowOutput) (_skip bool, _reason string) { if lastOutput != nil && lastOutput.Succeeded { // 比较和上次申请时的关键配置（即影响证书签发的）参数是否一致 - currentNodeConfig := n.node.GetConfigForApply() - lastNodeConfig := lastOutput.Node.GetConfigForApply() - if currentNodeConfig.Domains != lastNodeConfig.Domains { + thisNodeCfg := n.node.GetConfigForApply() + lastNodeCfg := lastOutput.Node.GetConfigForApply() + + if thisNodeCfg.Domains != lastNodeCfg.Domains { return false, "the configuration item 'Domains' changed" } - if currentNodeConfig.ContactEmail != lastNodeConfig.ContactEmail { + if thisNodeCfg.ContactEmail != lastNodeCfg.ContactEmail { return false, "the configuration item 'ContactEmail' changed" } - if currentNodeConfig.Provider != lastNodeConfig.Provider { + if thisNodeCfg.Provider != lastNodeCfg.Provider { return false, "the configuration item 'Provider' changed" } - if currentNodeConfig.ProviderAccessId != lastNodeConfig.ProviderAccessId { + if thisNodeCfg.ProviderAccessId != lastNodeCfg.ProviderAccessId { return false, "the configuration item 'ProviderAccessId' changed" } - if !maps.Equal(currentNodeConfig.ProviderConfig, lastNodeConfig.ProviderConfig) { + if !maps.Equal(thisNodeCfg.ProviderConfig, lastNodeCfg.ProviderConfig) { return false, "the configuration item 'ProviderConfig' changed" } - if currentNodeConfig.CAProvider != lastNodeConfig.CAProvider { + if thisNodeCfg.CAProvider != lastNodeCfg.CAProvider { return false, "the configuration item 'CAProvider' changed" } - if currentNodeConfig.CAProviderAccessId != lastNodeConfig.CAProviderAccessId { + if thisNodeCfg.CAProviderAccessId != lastNodeCfg.CAProviderAccessId { return false, "the configuration item 'CAProviderAccessId' changed" } - if !maps.Equal(currentNodeConfig.CAProviderConfig, lastNodeConfig.CAProviderConfig) { + if !maps.Equal(thisNodeCfg.CAProviderConfig, lastNodeCfg.CAProviderConfig) { return false, "the configuration item 'CAProviderConfig' changed" } - if currentNodeConfig.KeyAlgorithm != lastNodeConfig.KeyAlgorithm { + if thisNodeCfg.KeyAlgorithm != lastNodeCfg.KeyAlgorithm { return false, "the configuration item 'KeyAlgorithm' changed" } - lastCertificate, _ := n.certRepo.GetByWorkflowRunId(ctx, lastOutput.RunId) + lastCertificate, _ := n.certRepo.GetByWorkflowNodeId(ctx, lastOutput.NodeId) if lastCertificate != nil { - renewalInterval := time.Duration(currentNodeConfig.SkipBeforeExpiryDays) * time.Hour * 24 + renewalInterval := time.Duration(thisNodeCfg.SkipBeforeExpiryDays) * time.Hour * 24 expirationTime := time.Until(lastCertificate.ExpireAt) if expirationTime > renewalInterval { daysLeft := int(expirationTime.Hours() / 24) @@ -160,7 +165,7 @@ func (n *applyNode) checkCanSkip(ctx context.Context, lastOutput *domain.Workflo n.outputs[outputKeyForCertificateValidity] = strconv.FormatBool(true) n.outputs[outputKeyForCertificateDaysLeft] = strconv.FormatInt(int64(daysLeft), 10) - return true, fmt.Sprintf("the certificate has already been issued (expires in %d day(s), next renewal in %d day(s))", daysLeft, currentNodeConfig.SkipBeforeExpiryDays) + return true, fmt.Sprintf("the certificate has already been issued (expires in %d day(s), next renewal in %d day(s))", daysLeft, thisNodeCfg.SkipBeforeExpiryDays) } } } diff --git a/internal/workflow/node-processor/condition_node.go b/internal/workflow/node-processor/condition_node.go index d9e8126d..023f9e1a 100644 --- a/internal/workflow/node-processor/condition_node.go +++ b/internal/workflow/node-processor/condition_node.go @@ -47,6 +47,6 @@ func (n *conditionNode) Process(ctx context.Context) error { } func (n *conditionNode) evalExpr(ctx context.Context, expression expr.Expr) (*expr.EvalResult, error) { - variables := GetNodeOutputs(ctx) + variables := GetAllNodeOutputs(ctx) return expression.Eval(variables) } diff --git a/internal/workflow/node-processor/const.go b/internal/workflow/node-processor/const.go index 62d2d56b..21bdf167 100644 --- a/internal/workflow/node-processor/const.go +++ b/internal/workflow/node-processor/const.go @@ -3,4 +3,5 @@ package nodeprocessor const ( outputKeyForCertificateValidity = "certificate.validity" outputKeyForCertificateDaysLeft = "certificate.daysLeft" + outputKeyForNodeSkipped = "node.skipped" ) diff --git a/internal/workflow/node-processor/context.go b/internal/workflow/node-processor/context.go index 96c40487..d600554d 100644 --- a/internal/workflow/node-processor/context.go +++ b/internal/workflow/node-processor/context.go @@ -25,6 +25,15 @@ func newNodeOutputsContainer() *nodeOutputsContainer { } } +// 获取节点输出容器 +func getNodeOutputsContainer(ctx context.Context) *nodeOutputsContainer { + value := ctx.Value(nodeOutputsKey) + if value == nil { + return nil + } + return value.(*nodeOutputsContainer) +} + // 添加节点输出到上下文 func AddNodeOutput(ctx context.Context, nodeId string, output map[string]any) context.Context { container := getNodeOutputsContainer(ctx) @@ -50,7 +59,7 @@ func AddNodeOutput(ctx context.Context, nodeId string, output map[string]any) co func GetNodeOutput(ctx context.Context, nodeId string) map[string]any { container := getNodeOutputsContainer(ctx) if container == nil { - return nil + container = newNodeOutputsContainer() } container.RLock() @@ -69,22 +78,11 @@ func GetNodeOutput(ctx context.Context, nodeId string) map[string]any { return outputCopy } -// 获取特定节点的特定输出项 -func GetNodeOutputValue(ctx context.Context, nodeId string, key string) (any, bool) { - output := GetNodeOutput(ctx, nodeId) - if output == nil { - return nil, false - } - - value, exists := output[key] - return value, exists -} - // 获取所有节点输出 -func GetNodeOutputs(ctx context.Context) map[string]map[string]any { +func GetAllNodeOutputs(ctx context.Context) map[string]map[string]any { container := getNodeOutputsContainer(ctx) if container == nil { - return nil + container = newNodeOutputsContainer() } container.RLock() @@ -103,26 +101,3 @@ func GetNodeOutputs(ctx context.Context) map[string]map[string]any { return allOutputs } - -// 获取节点输出容器 -func getNodeOutputsContainer(ctx context.Context) *nodeOutputsContainer { - value := ctx.Value(nodeOutputsKey) - if value == nil { - return nil - } - return value.(*nodeOutputsContainer) -} - -// 检查节点是否有输出 -func HasNodeOutput(ctx context.Context, nodeId string) bool { - container := getNodeOutputsContainer(ctx) - if container == nil { - return false - } - - container.RLock() - defer container.RUnlock() - - _, exists := container.outputs[nodeId] - return exists -} diff --git a/internal/workflow/node-processor/deploy_node.go b/internal/workflow/node-processor/deploy_node.go index f89f4a1f..30a7c4e7 100644 --- a/internal/workflow/node-processor/deploy_node.go +++ b/internal/workflow/node-processor/deploy_node.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "log/slog" + "strconv" "strings" "github.com/usual2970/certimate/internal/deployer" @@ -33,7 +34,8 @@ func NewDeployNode(node *domain.WorkflowNode) *deployNode { } func (n *deployNode) Process(ctx context.Context) error { - n.logger.Info("ready to deploy certificate ...") + nodeCfg := n.node.GetConfigForDeploy() + n.logger.Info("ready to deploy certificate ...", slog.Any("config", nodeCfg)) // 查询上次执行结果 lastOutput, err := n.outputRepo.GetByNodeId(ctx, n.node.Id) @@ -58,6 +60,7 @@ func (n *deployNode) Process(ctx context.Context) error { // 检测是否可以跳过本次执行 if lastOutput != nil && certificate.CreatedAt.Before(lastOutput.UpdatedAt) { if skippable, reason := n.checkCanSkip(ctx, lastOutput); skippable { + n.outputs[outputKeyForNodeSkipped] = strconv.FormatBool(true) n.logger.Info(fmt.Sprintf("skip this deployment, because %s", reason)) return nil } else if reason != "" { @@ -96,6 +99,9 @@ func (n *deployNode) Process(ctx context.Context) error { return err } + // 记录中间结果 + n.outputs[outputKeyForNodeSkipped] = strconv.FormatBool(false) + n.logger.Info("deployment completed") return nil } @@ -103,16 +109,17 @@ func (n *deployNode) Process(ctx context.Context) error { func (n *deployNode) checkCanSkip(ctx context.Context, lastOutput *domain.WorkflowOutput) (_skip bool, _reason string) { if lastOutput != nil && lastOutput.Succeeded { // 比较和上次部署时的关键配置（即影响证书部署的）参数是否一致 - currentNodeConfig := n.node.GetConfigForDeploy() - lastNodeConfig := lastOutput.Node.GetConfigForDeploy() - if currentNodeConfig.ProviderAccessId != lastNodeConfig.ProviderAccessId { + thisNodeCfg := n.node.GetConfigForDeploy() + lastNodeCfg := lastOutput.Node.GetConfigForDeploy() + + if thisNodeCfg.ProviderAccessId != lastNodeCfg.ProviderAccessId { return false, "the configuration item 'ProviderAccessId' changed" } - if !maps.Equal(currentNodeConfig.ProviderConfig, lastNodeConfig.ProviderConfig) { + if !maps.Equal(thisNodeCfg.ProviderConfig, lastNodeCfg.ProviderConfig) { return false, "the configuration item 'ProviderConfig' changed" } - if currentNodeConfig.SkipOnLastSucceeded { + if thisNodeCfg.SkipOnLastSucceeded { return true, "the certificate has already been deployed" } } diff --git a/internal/workflow/node-processor/monitor_node.go b/internal/workflow/node-processor/monitor_node.go index 4b875f26..d13e4247 100644 --- a/internal/workflow/node-processor/monitor_node.go +++ b/internal/workflow/node-processor/monitor_node.go @@ -5,7 +5,9 @@ import ( "crypto/tls" "crypto/x509" "fmt" + "log/slog" "math" + "net" "net/http" "strconv" "strings" @@ -30,13 +32,12 @@ func NewMonitorNode(node *domain.WorkflowNode) *monitorNode { } func (n *monitorNode) Process(ctx context.Context) error { - n.logger.Info("ready to monitor certificate ...") - nodeCfg := n.node.GetConfigForMonitor() + n.logger.Info("ready to monitor certificate ...", slog.Any("config", nodeCfg)) - targetAddr := fmt.Sprintf("%s:%d", nodeCfg.Host, nodeCfg.Port) + targetAddr := net.JoinHostPort(nodeCfg.Host, fmt.Sprintf("%d", nodeCfg.Port)) if nodeCfg.Port == 0 { - targetAddr = fmt.Sprintf("%s:443", nodeCfg.Host) + targetAddr = net.JoinHostPort(nodeCfg.Host, "443") } targetDomain := nodeCfg.Domain diff --git a/internal/workflow/node-processor/notify_node.go b/internal/workflow/node-processor/notify_node.go index dabfd034..2cba06cf 100644 --- a/internal/workflow/node-processor/notify_node.go +++ b/internal/workflow/node-processor/notify_node.go @@ -2,7 +2,9 @@ package nodeprocessor import ( "context" + "fmt" "log/slog" + "strconv" "github.com/usual2970/certimate/internal/domain" "github.com/usual2970/certimate/internal/notify" @@ -28,9 +30,8 @@ func NewNotifyNode(node *domain.WorkflowNode) *notifyNode { } func (n *notifyNode) Process(ctx context.Context) error { - n.logger.Info("ready to send notification ...") - nodeCfg := n.node.GetConfigForNotify() + n.logger.Info("ready to send notification ...", slog.Any("config", nodeCfg)) if nodeCfg.Provider == "" { // Deprecated: v0.4.x 将废弃 @@ -59,6 +60,12 @@ func (n *notifyNode) Process(ctx context.Context) error { return nil } + // 检测是否可以跳过本次执行 + if skippable := n.checkCanSkip(ctx); skippable { + n.logger.Info(fmt.Sprintf("skip this notification, because all the previous nodes have been skipped")) + return nil + } + // 初始化通知器 deployer, err := notify.NewWithWorkflowNode(notify.NotifierWithWorkflowNodeConfig{ Node: n.node, @@ -80,3 +87,21 @@ func (n *notifyNode) Process(ctx context.Context) error { n.logger.Info("notification completed") return nil } + +func (n *notifyNode) checkCanSkip(ctx context.Context) (_skip bool) { + thisNodeCfg := n.node.GetConfigForNotify() + if !thisNodeCfg.SkipOnAllPrevSkipped { + return false + } + + prevNodeOutputs := GetAllNodeOutputs(ctx) + for _, nodeOutput := range prevNodeOutputs { + if nodeOutput[outputKeyForNodeSkipped] != nil { + if nodeOutput[outputKeyForNodeSkipped].(string) != strconv.FormatBool(true) { + return false + } + } + } + + return true +} diff --git a/internal/workflow/node-processor/processor.go b/internal/workflow/node-processor/processor.go index d375883f..ec0a1d91 100644 --- a/internal/workflow/node-processor/processor.go +++ b/internal/workflow/node-processor/processor.go @@ -50,7 +50,6 @@ func (n *nodeOutputer) GetOutputs() map[string]any { type certificateRepository interface { GetByWorkflowNodeId(ctx context.Context, workflowNodeId string) (*domain.Certificate, error) - GetByWorkflowRunId(ctx context.Context, workflowRunId string) (*domain.Certificate, error) Save(ctx context.Context, certificate *domain.Certificate) (*domain.Certificate, error) } diff --git a/internal/workflow/node-processor/upload_node.go b/internal/workflow/node-processor/upload_node.go index 9431d31a..95aac51d 100644 --- a/internal/workflow/node-processor/upload_node.go +++ b/internal/workflow/node-processor/upload_node.go @@ -3,6 +3,7 @@ package nodeprocessor import ( "context" "fmt" + "log/slog" "strconv" "strings" "time" @@ -32,9 +33,8 @@ func NewUploadNode(node *domain.WorkflowNode) *uploadNode { } func (n *uploadNode) Process(ctx context.Context) error { - n.logger.Info("ready to upload certiticate ...") - nodeCfg := n.node.GetConfigForUpload() + n.logger.Info("ready to upload certiticate ...", slog.Any("config", nodeCfg)) // 查询上次执行结果 lastOutput, err := n.outputRepo.GetByNodeId(ctx, n.node.Id) @@ -44,6 +44,7 @@ func (n *uploadNode) Process(ctx context.Context) error { // 检测是否可以跳过本次执行 if skippable, reason := n.checkCanSkip(ctx, lastOutput); skippable { + n.outputs[outputKeyForNodeSkipped] = strconv.FormatBool(true) n.logger.Info(fmt.Sprintf("skip this uploading, because %s", reason)) return nil } else if reason != "" { @@ -71,6 +72,7 @@ func (n *uploadNode) Process(ctx context.Context) error { } // 记录中间结果 + n.outputs[outputKeyForNodeSkipped] = strconv.FormatBool(false) n.outputs[outputKeyForCertificateValidity] = strconv.FormatBool(true) n.outputs[outputKeyForCertificateDaysLeft] = strconv.FormatInt(int64(time.Until(certificate.ExpireAt).Hours()/24), 10) @@ -81,16 +83,17 @@ func (n *uploadNode) Process(ctx context.Context) error { func (n *uploadNode) checkCanSkip(ctx context.Context, lastOutput *domain.WorkflowOutput) (_skip bool, _reason string) { if lastOutput != nil && lastOutput.Succeeded { // 比较和上次上传时的关键配置（即影响证书上传的）参数是否一致 - currentNodeConfig := n.node.GetConfigForUpload() - lastNodeConfig := lastOutput.Node.GetConfigForUpload() - if strings.TrimSpace(currentNodeConfig.Certificate) != strings.TrimSpace(lastNodeConfig.Certificate) { + thisNodeCfg := n.node.GetConfigForUpload() + lastNodeCfg := lastOutput.Node.GetConfigForUpload() + + if strings.TrimSpace(thisNodeCfg.Certificate) != strings.TrimSpace(lastNodeCfg.Certificate) { return false, "the configuration item 'Certificate' changed" } - if strings.TrimSpace(currentNodeConfig.PrivateKey) != strings.TrimSpace(lastNodeConfig.PrivateKey) { + if strings.TrimSpace(thisNodeCfg.PrivateKey) != strings.TrimSpace(lastNodeCfg.PrivateKey) { return false, "the configuration item 'PrivateKey' changed" } - lastCertificate, _ := n.certRepo.GetByWorkflowRunId(ctx, lastOutput.RunId) + lastCertificate, _ := n.certRepo.GetByWorkflowNodeId(ctx, lastOutput.NodeId) if lastCertificate != nil { daysLeft := int(time.Until(lastCertificate.ExpireAt).Hours() / 24) n.outputs[outputKeyForCertificateValidity] = strconv.FormatBool(daysLeft > 0) diff --git a/ui/src/components/workflow/WorkflowEditModal.tsx b/ui/src/components/workflow/WorkflowEditModal.tsx new file mode 100644 index 00000000..76932ece --- /dev/null +++ b/ui/src/components/workflow/WorkflowEditModal.tsx @@ -0,0 +1,122 @@ +import { useRef, useState } from "react"; +import { useTranslation } from "react-i18next"; +import { useControllableValue } from "ahooks"; +import { Modal, notification } from "antd"; + +import ModalForm from "@/components/ModalForm"; +import { useTriggerElement, useZustandShallowSelector } from "@/hooks"; +import { getErrMsg } from "@/utils/error"; + +import WorkflowForm, { type WorkflowFormInstance, type WorkflowFormProps } from "./WorkflowForm"; + +export type WorkflowEditModalProps = { + data?: WorkflowFormProps["initialValues"]; + loading?: boolean; + open?: boolean; + usage?: WorkflowFormProps["usage"]; + scene: WorkflowFormProps["scene"]; + trigger?: React.ReactNode; + onOpenChange?: (open: boolean) => void; + afterSubmit?: (record: WorkflowModel) => void; +}; + +const WorkflowEditModal = ({ data, loading, trigger, scene, usage, afterSubmit, ...props }: WorkflowEditModalProps) => { + const { t } = useTranslation(); + + const [notificationApi, NotificationContextHolder] = notification.useNotification(); + + const { createWorkflow, updateWorkflow } = useWorkflowesStore(useZustandShallowSelector(["createWorkflow", "updateWorkflow"])); + + const [open, setOpen] = useControllableValue(props, { + valuePropName: "open", + defaultValuePropName: "defaultOpen", + trigger: "onOpenChange", + }); + + const triggerEl = useTriggerElement(trigger, { onClick: () => setOpen(true) }); + + const formRef = useRef(null); + const [formPending, setFormPending] = useState(false); + + const handleOkClick = async () => { + setFormPending(true); + try { + await formRef.current!.validateFields(); + } catch (err) { + setFormPending(false); + throw err; + } + + try { + let values: WorkflowModel = formRef.current!.getFieldsValue(); + + if (scene === "add") { + if (data?.id) { + throw "Invalid props: `data`"; + } + + values = await createWorkflow(values); + } else if (scene === "edit") { + if (!data?.id) { + throw "Invalid props: `data`"; + } + + values = await updateWorkflow({ ...data, ...values }); + } else { + throw "Invalid props: `preset`"; + } + + afterSubmit?.(values); + setOpen(false); + } catch (err) { + notificationApi.error({ message: t("common.text.request_error"), description: getErrMsg(err) }); + + throw err; + } finally { + setFormPending(false); + } + }; + + const handleCancelClick = () => { + if (formPending) return; + + setOpen(false); + }; + + return ( + <> + {NotificationContextHolder} + + {triggerEl} + + setOpen(false)} + cancelButtonProps={{ disabled: formPending }} + cancelText={t("common.button.cancel")} + closable + confirmLoading={formPending} + destroyOnHidden + loading={loading} + okText={scene === "edit" ? t("common.button.save") : t("common.button.submit")} + open={open} + title={t(`access.action.${scene}`)} + width={480} + onOk={handleOkClick} + onCancel={handleCancelClick} + > +
+ +
+ + + ); +}; + +export default WorkflowEditModal; diff --git a/ui/src/components/workflow/node/ApplyNodeConfigForm.tsx b/ui/src/components/workflow/node/ApplyNodeConfigForm.tsx index ae56efc3..abbce8b4 100644 --- a/ui/src/components/workflow/node/ApplyNodeConfigForm.tsx +++ b/ui/src/components/workflow/node/ApplyNodeConfigForm.tsx @@ -28,7 +28,7 @@ import ACMEDns01ProviderSelect from "@/components/provider/ACMEDns01ProviderSele import CAProviderSelect from "@/components/provider/CAProviderSelect"; import Show from "@/components/Show"; import { ACCESS_USAGES, ACME_DNS01_PROVIDERS, accessProvidersMap, acmeDns01ProvidersMap, caProvidersMap } from "@/domain/provider"; -import { type WorkflowNodeConfigForApply } from "@/domain/workflow"; +import { type WorkflowNodeConfigForApply, defaultNodeConfigForApply } from "@/domain/workflow"; import { useAntdForm, useAntdFormName, useZustandShallowSelector } from "@/hooks"; import { useAccessesStore } from "@/stores/access"; import { useContactEmailsStore } from "@/stores/contact"; @@ -59,11 +59,7 @@ export type ApplyNodeConfigFormInstance = { const MULTIPLE_INPUT_SEPARATOR = ";"; const initFormModel = (): ApplyNodeConfigFormFieldValues => { - return { - challengeType: "dns-01", - keyAlgorithm: "RSA2048", - skipBeforeExpiryDays: 30, - }; + return defaultNodeConfigForApply(); }; const ApplyNodeConfigForm = forwardRef( diff --git a/ui/src/components/workflow/node/ConditionNodeConfigForm.tsx b/ui/src/components/workflow/node/ConditionNodeConfigForm.tsx index 3cd92d7b..1a2794e7 100644 --- a/ui/src/components/workflow/node/ConditionNodeConfigForm.tsx +++ b/ui/src/components/workflow/node/ConditionNodeConfigForm.tsx @@ -4,7 +4,7 @@ import { Form, type FormInstance } from "antd"; import { createSchemaFieldRule } from "antd-zod"; import { z } from "zod"; -import { type Expr, type WorkflowNodeConfigForCondition } from "@/domain/workflow"; +import { type Expr, type WorkflowNodeConfigForCondition, defaultNodeConfigForCondition } from "@/domain/workflow"; import { useAntdForm } from "@/hooks"; import ConditionNodeConfigFormExpressionEditor, { type ConditionNodeConfigFormExpressionEditorInstance } from "./ConditionNodeConfigFormExpressionEditor"; @@ -29,7 +29,7 @@ export type ConditionNodeConfigFormInstance = { }; const initFormModel = (): ConditionNodeConfigFormFieldValues => { - return {}; + return defaultNodeConfigForCondition(); }; const ConditionNodeConfigForm = forwardRef( diff --git a/ui/src/components/workflow/node/DeployNodeConfigForm.tsx b/ui/src/components/workflow/node/DeployNodeConfigForm.tsx index c0083298..96e50911 100644 --- a/ui/src/components/workflow/node/DeployNodeConfigForm.tsx +++ b/ui/src/components/workflow/node/DeployNodeConfigForm.tsx @@ -11,7 +11,7 @@ import DeploymentProviderPicker from "@/components/provider/DeploymentProviderPi import DeploymentProviderSelect from "@/components/provider/DeploymentProviderSelect.tsx"; import Show from "@/components/Show"; import { ACCESS_USAGES, DEPLOYMENT_PROVIDERS, accessProvidersMap, deploymentProvidersMap } from "@/domain/provider"; -import { type WorkflowNodeConfigForDeploy, WorkflowNodeType } from "@/domain/workflow"; +import { type WorkflowNodeConfigForDeploy, WorkflowNodeType, defaultNodeConfigForDeploy } from "@/domain/workflow"; import { useAntdForm, useAntdFormName, useZustandShallowSelector } from "@/hooks"; import { useWorkflowStore } from "@/stores/workflow"; @@ -117,9 +117,7 @@ export type DeployNodeConfigFormInstance = { }; const initFormModel = (): DeployNodeConfigFormFieldValues => { - return { - skipOnLastSucceeded: true, - }; + return defaultNodeConfigForDeploy(); }; const DeployNodeConfigForm = forwardRef( diff --git a/ui/src/components/workflow/node/DeployNodeConfigFormWangsuCDNConfig.tsx b/ui/src/components/workflow/node/DeployNodeConfigFormWangsuCDNConfig.tsx index 36d663b5..7650894e 100644 --- a/ui/src/components/workflow/node/DeployNodeConfigFormWangsuCDNConfig.tsx +++ b/ui/src/components/workflow/node/DeployNodeConfigFormWangsuCDNConfig.tsx @@ -43,7 +43,7 @@ const DeployNodeConfigFormWangsuCDNConfig = ({ if (!v) return false; return String(v) .split(MULTIPLE_INPUT_SEPARATOR) - .every((e) => validDomainName(e)); + .every((e) => validDomainName(e, { allowWildcard: true })); }, t("workflow_node.deploy.form.wangsu_cdn_domains.placeholder")), }); const formRule = createSchemaFieldRule(formSchema); diff --git a/ui/src/components/workflow/node/MonitorNodeConfigForm.tsx b/ui/src/components/workflow/node/MonitorNodeConfigForm.tsx index 883124f9..92eef42e 100644 --- a/ui/src/components/workflow/node/MonitorNodeConfigForm.tsx +++ b/ui/src/components/workflow/node/MonitorNodeConfigForm.tsx @@ -4,7 +4,7 @@ import { Alert, Form, type FormInstance, Input, InputNumber } from "antd"; import { createSchemaFieldRule } from "antd-zod"; import { z } from "zod"; -import { type WorkflowNodeConfigForMonitor } from "@/domain/workflow"; +import { type WorkflowNodeConfigForMonitor, defaultNodeConfigForMonitor } from "@/domain/workflow"; import { useAntdForm } from "@/hooks"; import { validDomainName, validIPv4Address, validIPv6Address, validPortNumber } from "@/utils/validators"; @@ -25,11 +25,7 @@ export type MonitorNodeConfigFormInstance = { }; const initFormModel = (): MonitorNodeConfigFormFieldValues => { - return { - host: "", - port: 443, - requestPath: "/", - }; + return defaultNodeConfigForMonitor(); }; const MonitorNodeConfigForm = forwardRef( diff --git a/ui/src/components/workflow/node/NotifyNodeConfigForm.tsx b/ui/src/components/workflow/node/NotifyNodeConfigForm.tsx index 3c612df8..09c6e02e 100644 --- a/ui/src/components/workflow/node/NotifyNodeConfigForm.tsx +++ b/ui/src/components/workflow/node/NotifyNodeConfigForm.tsx @@ -2,7 +2,7 @@ import { forwardRef, memo, useEffect, useImperativeHandle, useMemo, useState } f import { useTranslation } from "react-i18next"; import { Link } from "react-router"; import { PlusOutlined as PlusOutlinedIcon, RightOutlined as RightOutlinedIcon } from "@ant-design/icons"; -import { Button, Divider, Form, type FormInstance, Input, Select, Typography } from "antd"; +import { Button, Divider, Flex, Form, type FormInstance, Input, Select, Switch, Typography } from "antd"; import { createSchemaFieldRule } from "antd-zod"; import { z } from "zod"; @@ -12,7 +12,7 @@ import NotificationProviderSelect from "@/components/provider/NotificationProvid import Show from "@/components/Show"; import { ACCESS_USAGES, NOTIFICATION_PROVIDERS, accessProvidersMap, notificationProvidersMap } from "@/domain/provider"; import { notifyChannelsMap } from "@/domain/settings"; -import { type WorkflowNodeConfigForNotify } from "@/domain/workflow"; +import { type WorkflowNodeConfigForNotify, defaultNodeConfigForNotify } from "@/domain/workflow"; import { useAntdForm, useAntdFormName, useZustandShallowSelector } from "@/hooks"; import { useAccessesStore } from "@/stores/access"; import { useNotifyChannelsStore } from "@/stores/notify"; @@ -41,7 +41,7 @@ export type NotifyNodeConfigFormInstance = { }; const initFormModel = (): NotifyNodeConfigFormFieldValues => { - return {}; + return defaultNodeConfigForNotify(); }; const NotifyNodeConfigForm = forwardRef( @@ -74,6 +74,7 @@ const NotifyNodeConfigForm = forwardRef + + + + {t("workflow_node.notify.form.strategy_config.label")} + + + +
+ + +
{t("workflow_node.notify.form.skip_on_all_prev_skipped.prefix")}
+ + + +
{t("workflow_node.notify.form.skip_on_all_prev_skipped.suffix")}
+ + +
); } diff --git a/ui/src/components/workflow/node/StartNodeConfigForm.tsx b/ui/src/components/workflow/node/StartNodeConfigForm.tsx index 7b3ba73d..7acdfddc 100644 --- a/ui/src/components/workflow/node/StartNodeConfigForm.tsx +++ b/ui/src/components/workflow/node/StartNodeConfigForm.tsx @@ -6,7 +6,7 @@ import dayjs from "dayjs"; import { z } from "zod"; import Show from "@/components/Show"; -import { WORKFLOW_TRIGGERS, type WorkflowNodeConfigForStart, type WorkflowTriggerType } from "@/domain/workflow"; +import { WORKFLOW_TRIGGERS, type WorkflowNodeConfigForStart, type WorkflowTriggerType, defaultNodeConfigForStart } from "@/domain/workflow"; import { useAntdForm } from "@/hooks"; import { getNextCronExecutions, validCronExpression } from "@/utils/cron"; @@ -27,10 +27,7 @@ export type StartNodeConfigFormInstance = { }; const initFormModel = (): StartNodeConfigFormFieldValues => { - return { - trigger: WORKFLOW_TRIGGERS.AUTO, - triggerCron: "0 0 * * *", - }; + return defaultNodeConfigForStart(); }; const StartNodeConfigForm = forwardRef( diff --git a/ui/src/components/workflow/node/UploadNodeConfigForm.tsx b/ui/src/components/workflow/node/UploadNodeConfigForm.tsx index 5dc16b0b..27898401 100644 --- a/ui/src/components/workflow/node/UploadNodeConfigForm.tsx +++ b/ui/src/components/workflow/node/UploadNodeConfigForm.tsx @@ -6,7 +6,7 @@ import { z } from "zod"; import { validateCertificate, validatePrivateKey } from "@/api/certificates"; import TextFileInput from "@/components/TextFileInput"; -import { type WorkflowNodeConfigForUpload } from "@/domain/workflow"; +import { type WorkflowNodeConfigForUpload, defaultNodeConfigForUpload } from "@/domain/workflow"; import { useAntdForm } from "@/hooks"; import { getErrMsg } from "@/utils/error"; @@ -27,7 +27,7 @@ export type UploadNodeConfigFormInstance = { }; const initFormModel = (): UploadNodeConfigFormFieldValues => { - return {}; + return defaultNodeConfigForUpload(); }; const UploadNodeConfigForm = forwardRef( diff --git a/ui/src/domain/workflow.ts b/ui/src/domain/workflow.ts index 6ebb7c97..415123c4 100644 --- a/ui/src/domain/workflow.ts +++ b/ui/src/domain/workflow.ts @@ -133,6 +133,13 @@ export type WorkflowNodeConfigForStart = { triggerCron?: string; }; +export const defaultNodeConfigForStart = (): Partial => { + return { + trigger: WORKFLOW_TRIGGERS.AUTO, + triggerCron: "0 0 * * *", + }; +}; + export type WorkflowNodeConfigForApply = { domains: string; contactEmail: string; @@ -152,6 +159,14 @@ export type WorkflowNodeConfigForApply = { skipBeforeExpiryDays: number; }; +export const defaultNodeConfigForApply = (): Partial => { + return { + challengeType: "dns-01", + keyAlgorithm: "RSA2048", + skipBeforeExpiryDays: 30, + }; +}; + export type WorkflowNodeConfigForUpload = { certificateId: string; domains: string; @@ -159,6 +174,10 @@ export type WorkflowNodeConfigForUpload = { privateKey: string; }; +export const defaultNodeConfigForUpload = (): Partial => { + return {}; +}; + export type WorkflowNodeConfigForMonitor = { host: string; port: number; @@ -166,6 +185,13 @@ export type WorkflowNodeConfigForMonitor = { requestPath?: string; }; +export const defaultNodeConfigForMonitor = (): Partial => { + return { + port: 443, + requestPath: "/", + }; +}; + export type WorkflowNodeConfigForDeploy = { certificate: string; provider: string; @@ -174,6 +200,12 @@ export type WorkflowNodeConfigForDeploy = { skipOnLastSucceeded: boolean; }; +export const defaultNodeConfigForDeploy = (): Partial => { + return { + skipOnLastSucceeded: true, + }; +}; + export type WorkflowNodeConfigForNotify = { subject: string; message: string; @@ -184,12 +216,21 @@ export type WorkflowNodeConfigForNotify = { provider: string; providerAccessId: string; providerConfig?: Record; + skipOnAllPrevSkipped?: boolean; +}; + +export const defaultNodeConfigForNotify = (): Partial => { + return {}; }; export type WorkflowNodeConfigForCondition = { expression?: Expr; }; +export const defaultNodeConfigForCondition = (): Partial => { + return {}; +}; + export type WorkflowNodeConfigForBranch = never; export type WorkflowNodeConfigForEnd = never; @@ -243,15 +284,18 @@ type InitWorkflowOptions = { }; export const initWorkflow = (options: InitWorkflowOptions = {}): WorkflowModel => { - const root = newNode(WorkflowNodeType.Start, {}) as WorkflowNode; - root.config = { trigger: WORKFLOW_TRIGGERS.MANUAL }; + const root = newNode(WorkflowNodeType.Start, { + nodeConfig: { trigger: WORKFLOW_TRIGGERS.MANUAL }, + }); switch (options.template) { case "standard": { let current = root; - const applyNode = newNode(WorkflowNodeType.Apply); + const applyNode = newNode(WorkflowNodeType.Apply, { + nodeConfig: defaultNodeConfigForApply(), + }); current.next = applyNode; current = current.next; @@ -260,6 +304,7 @@ export const initWorkflow = (options: InitWorkflowOptions = {}): WorkflowModel = current = current.next!.branches![1]; current.next = newNode(WorkflowNodeType.Notify, { nodeConfig: { + ...defaultNodeConfigForNotify(), subject: "[Certimate] Workflow Failure Alert!", message: "Your workflow run for the certificate application has failed. Please check the details.", } as WorkflowNodeConfigForNotify, @@ -268,8 +313,8 @@ export const initWorkflow = (options: InitWorkflowOptions = {}): WorkflowModel = current = applyNode.next!.branches![0]; current.next = newNode(WorkflowNodeType.Deploy, { nodeConfig: { + ...defaultNodeConfigForDeploy(), certificate: `${applyNode.id}#certificate`, - skipOnLastSucceeded: true, } as WorkflowNodeConfigForDeploy, }); @@ -279,6 +324,7 @@ export const initWorkflow = (options: InitWorkflowOptions = {}): WorkflowModel = current = current.next!.branches![1]; current.next = newNode(WorkflowNodeType.Notify, { nodeConfig: { + ...defaultNodeConfigForNotify(), subject: "[Certimate] Workflow Failure Alert!", message: "Your workflow run for the certificate deployment has failed. Please check the details.", } as WorkflowNodeConfigForNotify, @@ -290,7 +336,9 @@ export const initWorkflow = (options: InitWorkflowOptions = {}): WorkflowModel = { let current = root; - const monitorNode = newNode(WorkflowNodeType.Monitor); + const monitorNode = newNode(WorkflowNodeType.Monitor, { + nodeConfig: defaultNodeConfigForMonitor(), + }); current.next = monitorNode; current = current.next; @@ -299,6 +347,7 @@ export const initWorkflow = (options: InitWorkflowOptions = {}): WorkflowModel = current = current.next!.branches![1]; current.next = newNode(WorkflowNodeType.Notify, { nodeConfig: { + ...defaultNodeConfigForNotify(), subject: "[Certimate] Workflow Failure Alert!", message: "Your workflow run for the certificate monitoring has failed. Please check the details.", } as WorkflowNodeConfigForNotify, @@ -352,6 +401,7 @@ export const initWorkflow = (options: InitWorkflowOptions = {}): WorkflowModel = } as WorkflowNodeConfigForCondition; current.next = newNode(WorkflowNodeType.Notify, { nodeConfig: { + ...defaultNodeConfigForNotify(), subject: "[Certimate] Certificate Expiry Alert!", message: "The certificate will expire soon. Please pay attention to your website.", } as WorkflowNodeConfigForNotify, @@ -380,6 +430,7 @@ export const initWorkflow = (options: InitWorkflowOptions = {}): WorkflowModel = } as WorkflowNodeConfigForCondition; current.next = newNode(WorkflowNodeType.Notify, { nodeConfig: { + ...defaultNodeConfigForNotify(), subject: "[Certimate] Certificate Expiry Alert!", message: "The certificate has already expired. Please pay attention to your website.", } as WorkflowNodeConfigForNotify, @@ -458,18 +509,22 @@ export const newNode = (nodeType: WorkflowNodeType, options: NewNodeOptions = {} return node; }; -export const cloneNode = (sourceNode: WorkflowNode): WorkflowNode => { +type CloneNodeOptions = { + withCopySuffix?: boolean; +}; + +export const cloneNode = (sourceNode: WorkflowNode, { withCopySuffix }: CloneNodeOptions = { withCopySuffix: true }): WorkflowNode => { const { produce } = new Immer({ autoFreeze: false }); const deepClone = (node: WorkflowNode): WorkflowNode => { return produce(node, (draft) => { draft.id = nanoid(); if (draft.next) { - draft.next = cloneNode(draft.next); + draft.next = cloneNode(draft.next, { withCopySuffix }); } if (draft.branches) { - draft.branches = draft.branches.map((branch) => cloneNode(branch)); + draft.branches = draft.branches.map((branch) => cloneNode(branch, { withCopySuffix })); } return draft; @@ -477,7 +532,7 @@ export const cloneNode = (sourceNode: WorkflowNode): WorkflowNode => { }; const copyNode = produce(sourceNode, (draft) => { - draft.name = `${draft.name}-copy`; + draft.name = withCopySuffix ? `${draft.name}-copy` : draft.name; }); return deepClone(copyNode); }; diff --git a/ui/src/i18n/locales/en/nls.workflow.json b/ui/src/i18n/locales/en/nls.workflow.json index b086e25f..900a7f44 100644 --- a/ui/src/i18n/locales/en/nls.workflow.json +++ b/ui/src/i18n/locales/en/nls.workflow.json @@ -7,6 +7,8 @@ "workflow.action.create": "Create workflow", "workflow.action.edit": "Edit workflow", + "workflow.action.duplicate": "Duplicate workflow", + "workflow.action.duplicate.confirm": "Are you sure to duplicate this workflow?", "workflow.action.delete": "Delete workflow", "workflow.action.delete.confirm": "Are you sure to delete this workflow?", "workflow.action.enable": "Enable", diff --git a/ui/src/i18n/locales/en/nls.workflow.nodes.json b/ui/src/i18n/locales/en/nls.workflow.nodes.json index 88d3dc15..742abcd7 100644 --- a/ui/src/i18n/locales/en/nls.workflow.nodes.json +++ b/ui/src/i18n/locales/en/nls.workflow.nodes.json @@ -878,6 +878,12 @@ "workflow_node.notify.form.webhook_data.tooltip": "Leave it blank to use the default Webhook data provided by the authorization.", "workflow_node.notify.form.webhook_data.guide": "
Supported variables:
  1. ${SUBJECT}: The subject of notification.
  2. ${MESSAGE}: The message of notification.

Please visit the authorization management page for addtional notes.", "workflow_node.notify.form.webhook_data.errmsg.json_invalid": "Please enter a valiod JSON string", + "workflow_node.notify.form.strategy_config.label": "Strategy settings", + "workflow_node.notify.form.skip_on_all_prev_skipped.label": "Silent behavior", + "workflow_node.notify.form.skip_on_all_prev_skipped.prefix": "If all the previous nodes were skipped, ", + "workflow_node.notify.form.skip_on_all_prev_skipped.suffix": " to notify.", + "workflow_node.notify.form.skip_on_all_prev_skipped.switch.on": "skip", + "workflow_node.notify.form.skip_on_all_prev_skipped.switch.off": "not skip", "workflow_node.end.label": "End", "workflow_node.end.default_name": "End", diff --git a/ui/src/i18n/locales/zh/nls.workflow.json b/ui/src/i18n/locales/zh/nls.workflow.json index 9ff12aac..66e59ece 100644 --- a/ui/src/i18n/locales/zh/nls.workflow.json +++ b/ui/src/i18n/locales/zh/nls.workflow.json @@ -7,6 +7,8 @@ "workflow.action.create": "新建工作流", "workflow.action.edit": "编辑工作流", + "workflow.action.duplicate": "复制工作流", + "workflow.action.duplicate.confirm": "确定要复制此工作流吗？", "workflow.action.delete": "删除工作流", "workflow.action.delete.confirm": "确定要删除此工作流吗？", "workflow.action.enable": "启用", diff --git a/ui/src/i18n/locales/zh/nls.workflow.nodes.json b/ui/src/i18n/locales/zh/nls.workflow.nodes.json index 9a8be8af..a1497782 100644 --- a/ui/src/i18n/locales/zh/nls.workflow.nodes.json +++ b/ui/src/i18n/locales/zh/nls.workflow.nodes.json @@ -795,7 +795,7 @@ "workflow_node.deploy.form.volcengine_tos_domain.placeholder": "请输入火山引擎 TOS 自定义域名", "workflow_node.deploy.form.volcengine_tos_domain.tooltip": "这是什么？请参阅 see https://console.volcengine.com/tos", "workflow_node.deploy.form.wangsu_cdn_domains.label": "网宿云 CDN 加速域名", - "workflow_node.deploy.form.wangsu_cdn_domains.placeholder": "请输入网宿云 CDN 加速域名（多个值请用半角分号隔开）", + "workflow_node.deploy.form.wangsu_cdn_domains.placeholder": "请输入网宿云 CDN 加速域名（支持泛域名；多个值请用半角分号隔开）", "workflow_node.deploy.form.wangsu_cdn_domains.tooltip": "这是什么？请参阅 https://cdn.console.wangsu.com/v2/index/#/property/list", "workflow_node.deploy.form.wangsu_cdn_domains.multiple_input_modal.title": "修改网宿云 CDN 加速域名", "workflow_node.deploy.form.wangsu_cdn_domains.multiple_input_modal.placeholder": "请输入网宿云 CDN 加速域名", @@ -845,7 +845,7 @@ "workflow_node.notify.form.subject.placeholder": "请输入通知主题", "workflow_node.notify.form.message.label": "通知内容", "workflow_node.notify.form.message.placeholder": "请输入通知内容", - "workflow_node.notify.form.channel.label": "通知渠道（已废弃，请使用「通知渠道授权」字段）", + "workflow_node.notify.form.channel.label": "通知渠道（即将废弃，请使用「通知渠道授权」字段）", "workflow_node.notify.form.channel.placeholder": "请选择通知渠道", "workflow_node.notify.form.channel.button": "设置", "workflow_node.notify.form.provider.label": "通知渠道", @@ -877,6 +877,12 @@ "workflow_node.notify.form.webhook_data.tooltip": "不填写时，将使用所选部署目标授权的默认 Webhook 回调数据。", "workflow_node.notify.form.webhook_data.guide": "
支持的变量：
  1. ${SUBJECT}：通知主题。
  2. ${MESSAGE}：通知内容。

其他注意事项请前往授权管理页面查看。", "workflow_node.notify.form.webhook_data.errmsg.json_invalid": "请输入有效的 JSON 格式字符串", + "workflow_node.notify.form.strategy_config.label": "执行策略", + "workflow_node.notify.form.skip_on_all_prev_skipped.label": "静默行为", + "workflow_node.notify.form.skip_on_all_prev_skipped.prefix": "当前序申请、上传、部署等节点均已跳过执行时，", + "workflow_node.notify.form.skip_on_all_prev_skipped.suffix": "此通知节点。", + "workflow_node.notify.form.skip_on_all_prev_skipped.switch.on": "跳过", + "workflow_node.notify.form.skip_on_all_prev_skipped.switch.off": "不跳过", "workflow_node.end.label": "结束", "workflow_node.end.default_name": "结束", diff --git a/ui/src/pages/workflows/WorkflowList.tsx b/ui/src/pages/workflows/WorkflowList.tsx index e40bc894..dd12e53a 100644 --- a/ui/src/pages/workflows/WorkflowList.tsx +++ b/ui/src/pages/workflows/WorkflowList.tsx @@ -9,6 +9,7 @@ import { EditOutlined as EditOutlinedIcon, PlusOutlined as PlusOutlinedIcon, ReloadOutlined as ReloadOutlinedIcon, + SnippetsOutlined as SnippetsOutlinedIcon, StopOutlined as StopOutlinedIcon, SyncOutlined as SyncOutlinedIcon, } from "@ant-design/icons"; @@ -39,7 +40,7 @@ import { import dayjs from "dayjs"; import { ClientResponseError } from "pocketbase"; -import { WORKFLOW_TRIGGERS, type WorkflowModel, isAllNodesValidated } from "@/domain/workflow"; +import { WORKFLOW_TRIGGERS, type WorkflowModel, cloneNode, initWorkflow, isAllNodesValidated } from "@/domain/workflow"; import { WORKFLOW_RUN_STATUSES } from "@/domain/workflowRun"; import { list as listWorkflows, remove as removeWorkflow, save as saveWorkflow } from "@/repository/workflow"; import { getErrMsg } from "@/utils/error"; @@ -219,6 +220,17 @@ const WorkflowList = () => { /> + +