doomain 0.1.21 → 0.1.22

package/dist/lib/providers/spaceship/index.js

@@ -1,7 +1,7 @@
 import { normalizeDomain } from '../../validate.js';
 import { createProviderHttpClient } from '../core/http.js';
 import { paginateBySkip } from '../core/pagination.js';
-import { applyDnsChanges, planDnsChanges } from '../core/planner.js';
+import { assertNoConflicts, planDnsChanges } from '../core/planner.js';
 const SPACESHIP_API_URL = 'https://spaceship.dev/api/v1';
 const capabilities = {
     defaultTtl: 3600,
@@ -108,12 +108,21 @@ export class SpaceshipProvider {
         });
     }
     async applyChanges(zone, plan) {
-        return applyDnsChanges({
-            deleteRecord: (record) => this.deleteRecord(zone, record),
-            plan,
-            providerId: this.id,
-            upsertRecord: (record) => this.upsertRecord(zone, record),
-        });
+        assertNoConflicts(this.id, plan);
+        const skipped = plan.changes.flatMap((change) => (change.action === 'skip' ? [change.record] : []));
+        const applied = plan.changes.filter((change) => change.action !== 'skip');
+        // Spaceship records do not have stable ids. Delete every old value before creating
+        // replacements so an API that processes accepted writes out of order cannot leave
+        // two address records in the same slot without the reconciler noticing and retrying.
+        for (const change of applied) {
+            if (change.action === 'delete' || change.action === 'update')
+                await this.deleteRecord(zone, change.existing);
+        }
+        for (const change of applied) {
+            if (change.action === 'create' || change.action === 'update')
+                await this.upsertRecord(zone, change.record);
+        }
+        return { applied, skipped };
     }
     async upsertRecord(zone, record) {
         await this.http.request(`/dns/records/${zone.name}`, {

package/dist/lib/providers/status.d.ts

@@ -2,7 +2,9 @@ import { type DoomainConfig } from '../config.js';
 import type { DnsProviderDefinition } from './types.js';
 export interface ProviderStatus {
     account: string;
+    accountLabel: string;
     configured: boolean;
+    /** @deprecated Use isPreferredProvider. */
     default: boolean;
     displayName: string;
     docsUrl?: string;
@@ -10,6 +12,7 @@ export interface ProviderStatus {
     error?: string;
     id: string;
     isDefaultAccount: boolean;
+    isPreferredProvider: boolean;
     verified?: boolean;
 }
 export declare function isProviderConfigured(definition: DnsProviderDefinition, config: DoomainConfig, opts?: {

package/dist/lib/providers/status.js

@@ -17,12 +17,14 @@ export async function listProviderStatuses(opts = {}) {
             const configured = accounts.some((item) => item.account === account);
             const status = {
                 account,
+                accountLabel: ref.isDefaultAccount ? `${definition.id}/default` : `${definition.id}/${account}`,
                 configured,
                 default: config.defaults?.provider === definition.id,
                 displayName: definition.displayName,
                 docsUrl: definition.docsUrl,
                 id: definition.id,
                 isDefaultAccount: ref.isDefaultAccount,
+                isPreferredProvider: config.defaults?.provider === definition.id,
             };
             if (configured && opts.verify) {
                 try {

package/dist/lib/remove-domain.d.ts

@@ -0,0 +1,38 @@
+import { type DnsRecordSelector } from './dns-records.js';
+import { type ResolvedDnsTarget } from './domain-provider.js';
+import type { DnsProvider, DnsRecord, DnsRecordType } from './providers/types.js';
+export interface RemoveDomainInput {
+    account?: string;
+    allMatching?: boolean;
+    domain: string;
+    dryRun?: boolean;
+    provider?: string;
+    recordType: DnsRecordType;
+    reconcileTimeoutSeconds?: number;
+    value?: string;
+    confirmMultiple?: (records: DnsRecord[]) => Promise<boolean>;
+    progress?: (message: string) => void;
+}
+export interface RemoveDomainResult {
+    account: string;
+    accountInferred: boolean;
+    domain: string;
+    dryRun: boolean;
+    isDefaultAccount: boolean;
+    matched: DnsRecord[];
+    provider: string;
+    providerInferred: boolean;
+    reconciled: boolean;
+    reconciliationAttempts: number;
+    removed: number;
+    selector: DnsRecordSelector;
+    zoneDomain: string;
+}
+interface RemoveDomainDependencies {
+    createProvider: (provider: string, opts: {
+        account?: string;
+    }) => Promise<DnsProvider>;
+    resolveTarget: (input: Pick<RemoveDomainInput, 'account' | 'domain' | 'provider'>) => Promise<ResolvedDnsTarget>;
+}
+export declare function removeDomain(input: RemoveDomainInput, dependencies?: RemoveDomainDependencies): Promise<RemoveDomainResult>;
+export {};

package/dist/lib/remove-domain.js

@@ -0,0 +1,125 @@
+import { reconcileRecordRemoval } from './dns-reconciliation.js';
+import { recordMatchesSelector } from './dns-records.js';
+import { resolveProviderTarget } from './domain-provider.js';
+import { DoomainError } from './errors.js';
+import { createProvider } from './providers/registry.js';
+const defaultDependencies = { createProvider, resolveTarget: resolveProviderTarget };
+function quoteCommandArgument(value) {
+    return /^[a-zA-Z0-9_./:@+-]+$/.test(value) ? value : `'${value.replaceAll("'", `'"'"'`)}'`;
+}
+function removalCommand(input, options) {
+    const arguments_ = ['doomain', 'dns', 'remove', quoteCommandArgument(input.domain)];
+    if (input.provider)
+        arguments_.push('--provider', quoteCommandArgument(input.provider));
+    if (input.account)
+        arguments_.push('--account', quoteCommandArgument(input.account));
+    arguments_.push('--type', input.recordType);
+    if (input.value !== undefined)
+        arguments_.push('--value', quoteCommandArgument(input.value));
+    if (options?.allMatching ?? input.allMatching)
+        arguments_.push('--all-matching');
+    if (options?.dryRun ?? input.dryRun)
+        arguments_.push('--dry-run');
+    arguments_.push('--json');
+    return arguments_.join(' ');
+}
+function removalResolutionError(error, input) {
+    if (error.code !== 'CONFIG_NOT_FOUND' && error.code !== 'PROVIDER_ZONE_NOT_FOUND')
+        return error;
+    const details = error.details && typeof error.details === 'object' ? error.details : {};
+    const retry = removalCommand(input);
+    return new DoomainError(error.code, error.message, {
+        ...details,
+        recovery: `Connect or repair the DNS provider account that owns this domain, then retry \`${retry}\`.`,
+        suggestedCommands: ['doomain providers connect', retry],
+    });
+}
+function ambiguousDeletionError(input, records) {
+    return new DoomainError('DNS_DELETE_AMBIGUOUS', `${records.length} DNS records match this deletion. Pass --all-matching to delete all of them.`, {
+        matched: records,
+        recovery: 'Narrow the deletion with --value, or explicitly approve all matching records with --all-matching.',
+        suggestedCommands: [removalCommand(input, { allMatching: true, dryRun: true })],
+    });
+}
+export async function removeDomain(input, dependencies = defaultDependencies) {
+    if (!input.allMatching && input.value === undefined) {
+        throw new DoomainError('INVALID_INPUT', 'An exact --value is required unless --all-matching is passed.', {
+            recovery: 'Pass --value <expected-value>, or preview --all-matching with --dry-run.',
+        });
+    }
+    let resolved;
+    try {
+        resolved = await dependencies.resolveTarget(input);
+    }
+    catch (error) {
+        if (error instanceof DoomainError)
+            throw removalResolutionError(error, input);
+        throw error;
+    }
+    const provider = await dependencies.createProvider(resolved.provider, { account: resolved.account });
+    if (!provider.capabilities.recordTypes.includes(input.recordType)) {
+        throw new DoomainError('PROVIDER_UNSUPPORTED_RECORD', `${provider.name} does not support ${input.recordType} records.`);
+    }
+    const zone = await provider.getZone(resolved.target.zoneDomain);
+    if (!zone) {
+        throw new DoomainError('PROVIDER_ZONE_NOT_FOUND', `${provider.name} does not have a DNS zone for ${resolved.target.zoneDomain}.`);
+    }
+    const selector = {
+        name: resolved.target.recordName,
+        type: input.recordType,
+        ...(input.value === undefined ? {} : { value: input.value }),
+    };
+    const existing = await provider.listRecords(zone);
+    const matched = existing.filter((record) => recordMatchesSelector(record, selector));
+    if (matched.length > 1 && !input.allMatching) {
+        const confirmed = (await input.confirmMultiple?.(matched)) === true;
+        if (!confirmed)
+            throw ambiguousDeletionError(input, matched);
+    }
+    const base = {
+        account: resolved.account,
+        accountInferred: resolved.accountInferred,
+        domain: resolved.target.fullDomain,
+        isDefaultAccount: resolved.isDefaultAccount,
+        matched,
+        provider: resolved.provider,
+        providerInferred: resolved.providerInferred,
+        selector,
+        zoneDomain: resolved.target.zoneDomain,
+    };
+    if (input.dryRun) {
+        return {
+            ...base,
+            dryRun: true,
+            reconciled: false,
+            reconciliationAttempts: 0,
+            removed: 0,
+        };
+    }
+    if (matched.length === 0) {
+        return { ...base, dryRun: false, reconciled: true, reconciliationAttempts: 1, removed: 0 };
+    }
+    input.progress?.(`Deleting ${matched.length} DNS record${matched.length === 1 ? '' : 's'}`);
+    const plan = {
+        changes: matched.map((record) => ({ action: 'delete', existing: record })),
+        conflicts: [],
+        desired: [],
+        existing,
+        zone,
+    };
+    await provider.applyChanges(zone, plan, { force: true });
+    const reconciliation = await reconcileRecordRemoval({
+        progress: input.progress,
+        provider,
+        selector,
+        timeoutMs: (input.reconcileTimeoutSeconds ?? 30) * 1000,
+        zone,
+    });
+    return {
+        ...base,
+        dryRun: false,
+        reconciled: reconciliation.reconciled,
+        reconciliationAttempts: reconciliation.attempts,
+        removed: matched.length,
+    };
+}

package/oclif.manifest.json

@@ -374,6 +374,163 @@
         "vercel.js"
       ]
     },
+    "dns:delete": {
+      "aliases": [],
+      "args": {
+        "domain": {
+          "description": "Fully qualified DNS name whose record should be removed.",
+          "name": "domain",
+          "required": true
+        }
+      },
+      "description": "Safely remove exact DNS records and verify their absence.",
+      "examples": [
+        "<%= config.bin %> <%= command.id %> app.example.com --type A --value 203.0.113.10 --dry-run --json",
+        "<%= config.bin %> <%= command.id %> app.example.com --type A --all-matching --json"
+      ],
+      "flags": {
+        "account": {
+          "description": "DNS provider profile/account alias. Defaults to the provider default account.",
+          "name": "account",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "all-matching": {
+          "description": "Delete every record matching the name and type (and value, if set).",
+          "name": "all-matching",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "dry-run": {
+          "description": "Preview the exact records without deleting them.",
+          "name": "dry-run",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "json": {
+          "description": "Output a single JSON object and never prompt.",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "provider": {
+          "description": "DNS provider id. Inferred from the target domain when omitted.",
+          "name": "provider",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "type": {
+          "description": "DNS record type to remove.",
+          "name": "type",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "options": [
+            "A",
+            "AAAA",
+            "CNAME",
+            "MX",
+            "TXT"
+          ],
+          "type": "option"
+        },
+        "value": {
+          "description": "Expected record value. Required unless --all-matching is passed.",
+          "name": "value",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "dns:delete",
+      "pluginAlias": "doomain",
+      "pluginName": "doomain",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "dns",
+        "delete.js"
+      ]
+    },
+    "dns:diagnose": {
+      "aliases": [],
+      "args": {
+        "domain": {
+          "description": "Fully qualified DNS name to diagnose.",
+          "name": "domain",
+          "required": true
+        }
+      },
+      "description": "Compare DNS provider records with system and public resolver answers.",
+      "examples": [
+        "<%= config.bin %> <%= command.id %> example.com --json",
+        "<%= config.bin %> <%= command.id %> app.example.com --type A --target 203.0.113.10 --json"
+      ],
+      "flags": {
+        "account": {
+          "description": "DNS provider profile/account alias. Defaults to the provider default account.",
+          "name": "account",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "json": {
+          "description": "Output a single JSON object and never prompt.",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "provider": {
+          "description": "DNS provider id. Inferred from the target domain when omitted.",
+          "name": "provider",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "target": {
+          "description": "Expected IP address or canonical hostname.",
+          "name": "target",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "type": {
+          "description": "Record type to compare.",
+          "name": "type",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "options": [
+            "A",
+            "AAAA",
+            "CNAME"
+          ],
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "dns:diagnose",
+      "pluginAlias": "doomain",
+      "pluginName": "doomain",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "dns",
+        "diagnose.js"
+      ]
+    },
     "dns:point": {
       "aliases": [],
       "args": {
@@ -481,6 +638,92 @@
         "point.js"
       ]
     },
+    "dns:remove": {
+      "aliases": [],
+      "args": {
+        "domain": {
+          "description": "Fully qualified DNS name whose record should be removed.",
+          "name": "domain",
+          "required": true
+        }
+      },
+      "description": "Safely remove exact DNS records and verify their absence.",
+      "examples": [
+        "<%= config.bin %> <%= command.id %> app.example.com --type A --value 203.0.113.10 --dry-run --json",
+        "<%= config.bin %> <%= command.id %> app.example.com --type A --all-matching --json"
+      ],
+      "flags": {
+        "account": {
+          "description": "DNS provider profile/account alias. Defaults to the provider default account.",
+          "name": "account",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "all-matching": {
+          "description": "Delete every record matching the name and type (and value, if set).",
+          "name": "all-matching",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "dry-run": {
+          "description": "Preview the exact records without deleting them.",
+          "name": "dry-run",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "json": {
+          "description": "Output a single JSON object and never prompt.",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "provider": {
+          "description": "DNS provider id. Inferred from the target domain when omitted.",
+          "name": "provider",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "type": {
+          "description": "DNS record type to remove.",
+          "name": "type",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "options": [
+            "A",
+            "AAAA",
+            "CNAME",
+            "MX",
+            "TXT"
+          ],
+          "type": "option"
+        },
+        "value": {
+          "description": "Expected record value. Required unless --all-matching is passed.",
+          "name": "value",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "dns:remove",
+      "pluginAlias": "doomain",
+      "pluginName": "doomain",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "dns",
+        "delete.js"
+      ]
+    },
     "domains:find": {
       "aliases": [],
       "args": {
@@ -1063,5 +1306,5 @@
       ]
     }
   },
-  "version": "0.1.21"
+  "version": "0.1.22"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "doomain",
   "description": "Configure production domains and DNS records in seconds",
-  "version": "0.1.21",
+  "version": "0.1.22",
   "author": "Crafter Station",
   "packageManager": "bun@1.3.13",
   "bin": {
@@ -82,12 +82,13 @@
   "scripts": {
     "build": "shx rm -rf dist && tsc -b",
     "check": "biome lint .",
+    "check:manifest": "node scripts/check-manifest-version.js",
     "format": "biome format --write .",
     "lint": "biome lint .",
     "postpack": "shx rm -f oclif.manifest.json",
     "posttest": "bun run lint",
     "prepare": "husky",
-    "prepack": "oclif manifest && oclif readme",
+    "prepack": "oclif manifest && bun run check:manifest && oclif readme",
     "test": "mocha --forbid-only \"test/**/*.test.ts\"",
     "version": "oclif readme && git add README.md"
   },