Fix preflight adoption

2026-05-16 23:23:55 +02:00
parent 3dc69bb070
commit d34a640efe
3 changed files with 208 additions and 7 deletions
@@ -190,7 +190,18 @@ func DeployWikiWithOptions(p *project.Project, opts DeployWikiOptions, progress
 		case "create":
 			created, err := client.createTopic(plan.Entry.CID, plan.Page.Title, plan.Content, summary)
 			if err != nil {
-				return result, err
+				if isNodeBBWikiPageCollision(err) {
+					recovered, recoverErr := recoverCreateCollision(plan, nextManifest, client, summary)
+					if recoverErr != nil {
+						return result, fmt.Errorf("deploy wiki page %q: recover existing NodeBB page after create collision: %w", plan.Page.PageID, recoverErr)
+					}
+					if recovered {
+						result.Created--
+						result.Updated++
+						continue
+					}
+				}
+				return result, fmt.Errorf("deploy wiki page %q: create NodeBB topic %q in category %d: %w", plan.Page.PageID, plan.Page.Title, plan.Entry.CID, err)
 			}
 			entry := nextManifest.Pages[plan.Page.PageID]
 			entry.TID = created.TID
@@ -198,11 +209,11 @@ func DeployWikiWithOptions(p *project.Project, opts DeployWikiOptions, progress
 			nextManifest.Pages[plan.Page.PageID] = entry
 		case "update":
 			if err := client.updatePost(plan.Entry.TID, plan.Entry.PID, plan.Content, summary); err != nil {
-				return result, err
+				return result, fmt.Errorf("deploy wiki page %q: update NodeBB post %d: %w", plan.Page.PageID, plan.Entry.PID, err)
 			}
 		case "archive":
 			if err := client.updatePost(plan.Entry.TID, plan.Entry.PID, plan.Content, summary); err != nil {
-				return result, err
+				return result, fmt.Errorf("deploy wiki page %q: archive NodeBB post %d: %w", plan.Page.PageID, plan.Entry.PID, err)
 			}
 		}
 	}
@@ -431,6 +442,31 @@ func planNodeBBDeploy(pages map[string]wikiDeployPage, manifest wikiDeployManife
 	return plans, result, next, nil
 }

+func recoverCreateCollision(plan wikiDeployPlan, manifest wikiDeployManifest, client *nodeBBClient, summary string) (bool, error) {
+	entry, ok, err := findExistingNodeBBPage(plan.Page, plan.Entry.CID, client)
+	if err != nil || !ok {
+		return ok, err
+	}
+	remote, err := client.getPost(entry.PID)
+	if err != nil {
+		return false, err
+	}
+	if entry.TID == 0 && remote.TID != 0 {
+		entry.TID = remote.TID
+	}
+	content := mergeManagedContent(remote.Content, plan.Content)
+	if err := client.updatePost(entry.TID, entry.PID, content, summary); err != nil {
+		return false, err
+	}
+	entry.Hash = plan.Entry.Hash
+	entry.LastSeenHash = plan.Entry.LastSeenHash
+	entry.Title = plan.Entry.Title
+	entry.Namespace = plan.Entry.Namespace
+	entry.Stale = false
+	manifest.Pages[plan.Page.PageID] = entry
+	return true, nil
+}
+
 func adoptExistingNodeBBPage(page wikiDeployPage, cid int, remotePagesByCID map[int][]nodeBBWikiPage, client *nodeBBClient) (wikiDeployManifestPage, bool, error) {
 	remotePages, ok := remotePagesByCID[cid]
 	if !ok {
@@ -445,6 +481,29 @@ func adoptExistingNodeBBPage(page wikiDeployPage, cid int, remotePagesByCID map[
 	if !ok || remotePage.TID == 0 {
 		return wikiDeployManifestPage{}, false, nil
 	}
+	return fetchNodeBBWikiPageMapping(page, cid, remotePage, client)
+}
+
+func findExistingNodeBBPage(page wikiDeployPage, cid int, client *nodeBBClient) (wikiDeployManifestPage, bool, error) {
+	queries := []string{pageIDLeaf(page.PageID), page.Title, pageIDRemainder(page.PageID)}
+	for _, query := range queries {
+		query = strings.TrimSpace(query)
+		if query == "" {
+			continue
+		}
+		remotePages, err := client.searchNamespacePages(cid, query)
+		if err != nil {
+			return wikiDeployManifestPage{}, false, err
+		}
+		remotePage, ok := matchExistingNodeBBPage(page, remotePages)
+		if ok && remotePage.TID != 0 {
+			return fetchNodeBBWikiPageMapping(page, cid, remotePage, client)
+		}
+	}
+	return wikiDeployManifestPage{}, false, nil
+}
+
+func fetchNodeBBWikiPageMapping(page wikiDeployPage, cid int, remotePage nodeBBWikiPage, client *nodeBBClient) (wikiDeployManifestPage, bool, error) {
 	topic, err := client.getTopic(remotePage.TID)
 	if err != nil {
 		return wikiDeployManifestPage{}, false, err
@@ -821,6 +880,17 @@ type nodeBBClient struct {
 	timeout  time.Duration
 }

+type nodeBBHTTPError struct {
+	Method string
+	Path   string
+	Status int
+	Body   string
+}
+
+func (e nodeBBHTTPError) Error() string {
+	return fmt.Sprintf("NodeBB %s %s failed: HTTP %d: %s", e.Method, e.Path, e.Status, e.Body)
+}
+
 type nodeBBPost struct {
 	PID     int
 	TID     int
@@ -868,10 +938,21 @@ func (c *nodeBBClient) getTopic(tid int) (nodeBBPost, error) {
 }

 func (c *nodeBBClient) listNamespacePages(cid int) ([]nodeBBWikiPage, error) {
+	return c.listNamespacePagesWithQuery(cid, "")
+}
+
+func (c *nodeBBClient) searchNamespacePages(cid int, query string) ([]nodeBBWikiPage, error) {
+	return c.listNamespacePagesWithQuery(cid, query)
+}
+
+func (c *nodeBBClient) listNamespacePagesWithQuery(cid int, query string) ([]nodeBBWikiPage, error) {
 	var out []nodeBBWikiPage
 	after := ""
 	for {
 		path := fmt.Sprintf("/api/v3/plugins/westgate-wiki/namespace/%d/pages?limit=80", cid)
+		if query != "" {
+			path += "&q=" + url.QueryEscape(query)
+		}
 		if after != "" {
 			path += "&after=" + url.QueryEscape(after)
 		}
@@ -971,7 +1052,7 @@ func (c *nodeBBClient) request(method, path string, payload any, out any) error
 		return err
 	}
 	if resp.StatusCode >= 400 {
-		return fmt.Errorf("NodeBB %s %s failed: HTTP %d: %s", method, path, resp.StatusCode, strings.TrimSpace(string(raw)))
+		return nodeBBHTTPError{Method: method, Path: path, Status: resp.StatusCode, Body: strings.TrimSpace(string(raw))}
 	}
 	if out == nil || len(bytes.TrimSpace(raw)) == 0 {
 		return nil
@@ -1054,6 +1135,20 @@ func parseNodeBBWikiPageList(doc any) ([]nodeBBWikiPage, string, bool) {
 	}
 }

+func isNodeBBWikiPageCollision(err error) bool {
+	var httpErr nodeBBHTTPError
+	if !errors.As(err, &httpErr) {
+		return false
+	}
+	if httpErr.Status != http.StatusBadRequest {
+		return false
+	}
+	body := strings.ToLower(httpErr.Body)
+	return strings.Contains(body, "wiki page with this url already exists") ||
+		strings.Contains(body, "page-collision") ||
+		strings.Contains(body, "namespace-page-collision")
+}
+
 func boolFromAny(value any) bool {
 	switch typed := value.(type) {
 	case bool: