doomain 0.1.4 → 0.1.6

package/dist/commands/link.js

@@ -18,7 +18,7 @@ export default class Link extends Command {
         apex: apexFlag,
         domain: domainFlag,
         'dry-run': Flags.boolean({ description: 'Preview changes without writing to Vercel or DNS.' }),
-        force: Flags.boolean({ description: 'Move existing Vercel aliases and overwrite conflicting DNS records.' }),
+        force: Flags.boolean({ description: 'Move existing Vercel project domains and overwrite conflicting DNS records.' }),
         json: jsonFlag,
         project: projectFlag,
         provider: providerFlag,

package/dist/commands/wizard.js

@@ -110,6 +110,9 @@ function teamLabel(team) {
 function globalTokenLabel(token) {
     return token.source === 'environment' ? `Use ${token.label}` : `Use ${token.label} token`;
 }
+function isVercelAuthError(error) {
+    return error instanceof DoomainError && error.code === 'VERCEL_AUTH_FAILED';
+}
 async function promptVercelToken(globalTokens) {
     if (globalTokens.length > 0) {
         const selected = await p.select({
@@ -154,35 +157,54 @@ export default class Wizard extends Command {
             let vercelTeamId = process.env.VERCEL_TEAM_ID || localProject?.orgId || config.vercel?.teamId;
             const defaultProvider = process.env.DOOMAIN_PROVIDER || config.defaults?.provider;
             const defaultDomain = process.env.DOOMAIN_DOMAIN || config.defaults?.domain;
+            let globalVercelTokens = [];
             if (!vercelToken) {
-                const globalVercelTokens = await listGlobalVercelTokens();
+                globalVercelTokens = await listGlobalVercelTokens();
                 vercelToken = (await promptVercelToken(globalVercelTokens)) ?? undefined;
                 if (!vercelToken)
                     return;
             }
-            const teamSpinner = p.spinner();
             let teams = [];
-            if (process.env.VERCEL_TEAM_ID) {
-                p.log.info(`Using Vercel team ${vercelTeamId} from VERCEL_TEAM_ID.`);
-            }
-            else {
-                activeSpinner = teamSpinner;
-                teamSpinner.start('Loading Vercel teams');
-                teams = await createVercelClient({ token: vercelToken }).listTeams();
-                teamSpinner.stop(`Loaded ${teams.length} Vercel team${teams.length === 1 ? '' : 's'}`);
-                activeSpinner = undefined;
-                const selected = await p.select({
-                    message: 'Select Vercel account/team',
-                    initialValue: vercelTeamId ?? localProject?.orgId ?? PERSONAL_ACCOUNT,
-                    options: [
-                        { label: 'Personal account', value: PERSONAL_ACCOUNT, hint: 'No team id' },
-                        ...teams.map((team) => ({ label: teamLabel(team), value: team.id, hint: team.role ?? team.slug })),
-                    ],
-                });
-                const resolved = cancelIfNeeded(selected);
-                if (resolved === null)
-                    return;
-                vercelTeamId = resolved === PERSONAL_ACCOUNT ? undefined : resolved;
+            while (true) {
+                const teamSpinner = p.spinner();
+                try {
+                    if (process.env.VERCEL_TEAM_ID) {
+                        p.log.info(`Using Vercel team ${vercelTeamId} from VERCEL_TEAM_ID.`);
+                    }
+                    else {
+                        activeSpinner = teamSpinner;
+                        teamSpinner.start('Loading Vercel teams');
+                        teams = await createVercelClient({ token: vercelToken }).listTeams();
+                        teamSpinner.stop(`Loaded ${teams.length} Vercel team${teams.length === 1 ? '' : 's'}`);
+                        activeSpinner = undefined;
+                        const selected = await p.select({
+                            message: 'Select Vercel account/team',
+                            initialValue: vercelTeamId ?? localProject?.orgId ?? PERSONAL_ACCOUNT,
+                            options: [
+                                { label: 'Personal account', value: PERSONAL_ACCOUNT, hint: 'No team id' },
+                                ...teams.map((team) => ({ label: teamLabel(team), value: team.id, hint: team.role ?? team.slug })),
+                            ],
+                        });
+                        const resolved = cancelIfNeeded(selected);
+                        if (resolved === null)
+                            return;
+                        vercelTeamId = resolved === PERSONAL_ACCOUNT ? undefined : resolved;
+                    }
+                    break;
+                }
+                catch (error) {
+                    if (!isVercelAuthError(error) || process.env.VERCEL_TOKEN)
+                        throw error;
+                    activeSpinner?.error('Vercel authorization failed');
+                    activeSpinner = undefined;
+                    p.log.warning(error instanceof Error ? error.message : String(error));
+                    if (globalVercelTokens.length === 0)
+                        globalVercelTokens = await listGlobalVercelTokens();
+                    globalVercelTokens = globalVercelTokens.filter((token) => token.token !== vercelToken);
+                    vercelToken = (await promptVercelToken(globalVercelTokens)) ?? undefined;
+                    if (!vercelToken)
+                        return;
+                }
             }
             const selectedTeam = teams.find((team) => team.id === vercelTeamId);
             const teamDisplay = vercelTeamId ? teamLabel(selectedTeam ?? { id: vercelTeamId, name: null, role: null, slug: vercelTeamId }) : 'Personal account';

package/dist/lib/errors.d.ts

@@ -1,4 +1,4 @@
-export type DoomainErrorCode = 'CONFIG_NOT_FOUND' | 'DOMAIN_LINK_FAILED' | 'DOMAIN_ALREADY_ASSIGNED' | 'DOMAIN_VERIFY_FAILED' | 'INVALID_INPUT' | 'MISSING_ARGUMENT' | 'MISSING_CREDENTIALS' | 'PROVIDER_API_ERROR' | 'PROVIDER_AUTH_FAILED' | 'PROVIDER_PERMISSION_DENIED' | 'PROVIDER_NOT_FOUND' | 'PROVIDER_RATE_LIMITED' | 'PROVIDER_RECORD_CONFLICT' | 'PROVIDER_UNSUPPORTED_RECORD' | 'PROVIDER_ZONE_AMBIGUOUS' | 'PROVIDER_ZONE_NOT_FOUND' | 'PROJECT_NOT_FOUND' | 'VERCEL_PROJECT_NOT_LINKED';
+export type DoomainErrorCode = 'CONFIG_NOT_FOUND' | 'DOMAIN_LINK_FAILED' | 'DOMAIN_ALREADY_ASSIGNED' | 'DOMAIN_VERIFY_FAILED' | 'INVALID_INPUT' | 'MISSING_ARGUMENT' | 'MISSING_CREDENTIALS' | 'PROVIDER_API_ERROR' | 'PROVIDER_AUTH_FAILED' | 'PROVIDER_PERMISSION_DENIED' | 'PROVIDER_NOT_FOUND' | 'PROVIDER_RATE_LIMITED' | 'PROVIDER_RECORD_CONFLICT' | 'PROVIDER_UNSUPPORTED_RECORD' | 'PROVIDER_ZONE_AMBIGUOUS' | 'PROVIDER_ZONE_NOT_FOUND' | 'PROJECT_NOT_FOUND' | 'VERCEL_AUTH_FAILED' | 'VERCEL_PROJECT_NOT_LINKED';
 export declare class DoomainError extends Error {
     readonly code: DoomainErrorCode;
     readonly details?: unknown;

package/dist/lib/vercel.js

@@ -22,6 +22,13 @@ function appendTeam(path, teamId) {
 function apiErrorMessage(status, body) {
     return body?.error?.message ?? `Vercel API error (${status}).`;
 }
+function vercelAuthErrorMessage(body) {
+    const message = body?.error?.message;
+    if (!message || message.toLowerCase() === 'not authorized') {
+        return 'Vercel token is not authorized. Run `vercel login` again or enter a token from https://vercel.com/account/tokens.';
+    }
+    return `Vercel authorization failed: ${message}`;
+}
 function isDomainConflictError(error) {
     if (!(error instanceof DoomainError))
         return false;
@@ -36,9 +43,11 @@ function isDomainConflictError(error) {
 function isSameDomain(value, domain) {
     return typeof value === 'string' && value.toLowerCase() === domain.toLowerCase();
 }
-function findAliasTarget(raw, domain) {
+function findProjectDomainTarget(raw, domain) {
     const targets = Array.isArray(raw) ? raw : [raw];
-    return targets.find((target) => target && typeof target === 'object' && isSameDomain(target.domain, domain));
+    return targets.find((target) => target &&
+        typeof target === 'object' &&
+        (isSameDomain(target.domain, domain) || isSameDomain(target.name, domain)));
 }
 export function createVercelClient(config) {
     async function request(path, init = {}, opts = {}) {
@@ -52,6 +61,9 @@ export function createVercelClient(config) {
         });
         if (!response.ok) {
             const body = (await response.json().catch(() => undefined));
+            if (response.status === 401) {
+                throw new DoomainError('VERCEL_AUTH_FAILED', vercelAuthErrorMessage(body), body);
+            }
             throw new DoomainError('DOMAIN_LINK_FAILED', apiErrorMessage(response.status, body), body);
         }
         if (response.status === 204)
@@ -113,15 +125,15 @@ export function createVercelClient(config) {
         },
         async addDomainToProject(project, domain, opts = {}) {
             try {
-                const raw = await request(`/projects/${encodeURIComponent(project)}/alias`, {
+                const raw = await request(`/v10/projects/${encodeURIComponent(project)}/domains`, {
                     method: 'POST',
-                    body: JSON.stringify({ domain, target: 'PRODUCTION' }),
+                    body: JSON.stringify({ name: domain }),
                 });
-                const aliasTarget = findAliasTarget(raw, domain);
-                if (!aliasTarget) {
+                const projectDomain = findProjectDomainTarget(raw, domain);
+                if (!projectDomain) {
                     throw new DoomainError('DOMAIN_LINK_FAILED', `Vercel did not return ${domain} after adding it to project ${project}.`, raw);
                 }
-                return { alreadyAdded: false, raw: aliasTarget };
+                return { alreadyAdded: false, raw: projectDomain };
             }
             catch (error) {
                 if (isDomainConflictError(error)) {
@@ -165,7 +177,7 @@ export function createVercelClient(config) {
             return result.domains ?? [];
         },
         async removeDomainFromProject(project, domain) {
-            await request(`/projects/${encodeURIComponent(project)}/alias?domain=${encodeURIComponent(domain)}`, { method: 'DELETE' });
+            await request(`/v9/projects/${encodeURIComponent(project)}/domains/${encodeURIComponent(domain)}`, { method: 'DELETE' });
         },
         async verifyProjectDomain(project, domain) {
             return request(`/v9/projects/${encodeURIComponent(project)}/domains/${encodeURIComponent(domain)}/verify`, { method: 'POST' });

package/oclif.manifest.json

@@ -37,7 +37,7 @@
           "type": "boolean"
         },
         "force": {
-          "description": "Move existing Vercel aliases and overwrite conflicting DNS records.",
+          "description": "Move existing Vercel project domains and overwrite conflicting DNS records.",
           "name": "force",
           "allowNo": false,
           "type": "boolean"
@@ -629,5 +629,5 @@
       ]
     }
   },
-  "version": "0.1.4"
+  "version": "0.1.6"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "doomain",
   "description": "Link your vercel project and domain in seconds",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "author": "Crafter Station",
   "packageManager": "bun@1.3.13",
   "bin": {