doomain 0.1.22 → 0.1.24

package/dist/lib/vercel.js

@@ -1,17 +1,20 @@
+import { Effect } from 'effect';
 import { loadConfig } from './config.js';
-import { DoomainError } from './errors.js';
+import { DoomainError, toDoomainError } from './errors.js';
 import { listGlobalVercelTokens } from './vercel-auth.js';
 const VERCEL_API_URL = 'https://api.vercel.com';
 export const VERCEL_APEX_A_RECORD = '76.76.21.21';
 export const VERCEL_CNAME_RECORD = 'cname.vercel-dns.com';
-export async function resolveVercelConfig() {
-    const config = await loadConfig();
-    const token = process.env.VERCEL_TOKEN || config.vercel?.token || (await listGlobalVercelTokens())[0]?.token;
-    const teamId = process.env.VERCEL_TEAM_ID || config.vercel?.teamId;
-    if (!token) {
-        throw new DoomainError('MISSING_CREDENTIALS', 'Missing Vercel token. Run `doomain auth vercel`, set VERCEL_TOKEN, or sign in with Vercel CLI.');
-    }
-    return { token, teamId };
+export function resolveVercelConfig() {
+    return Effect.gen(function* () {
+        const config = yield* loadConfig();
+        const token = process.env.VERCEL_TOKEN || config.vercel?.token || (yield* listGlobalVercelTokens())[0]?.token;
+        const teamId = process.env.VERCEL_TEAM_ID || config.vercel?.teamId;
+        if (!token) {
+            return yield* Effect.fail(new DoomainError('MISSING_CREDENTIALS', 'Missing Vercel token. Run `doomain auth vercel`, set VERCEL_TOKEN, or sign in with Vercel CLI.'));
+        }
+        return { token, teamId };
+    });
 }
 function appendTeam(path, teamId) {
     if (!teamId)
@@ -50,140 +53,197 @@ function findProjectDomainTarget(raw, domain) {
         (isSameDomain(target.domain, domain) ||
             isSameDomain(target.name, domain)));
 }
-export function createVercelClient(config) {
-    async function request(path, init = {}, opts = {}) {
-        const response = await fetch(`${VERCEL_API_URL}${opts.team === false ? path : appendTeam(path, config.teamId)}`, {
-            ...init,
-            headers: {
-                Authorization: `Bearer ${config.token}`,
-                'Content-Type': 'application/json',
-                ...(init.headers ?? {}),
-            },
+export function createVercelClient(config, clientOpts = {}) {
+    const decodeErrorCode = clientOpts.transportErrorCode ?? 'DOMAIN_LINK_FAILED';
+    function decode(label, value, validate) {
+        return Effect.try({
+            try: () => validate(value),
+            catch: (cause) => new DoomainError(decodeErrorCode, `Vercel returned an invalid ${label} response.`, {
+                cause: cause instanceof Error ? cause.message : String(cause),
+                response: value,
+            }),
+        });
+    }
+    function recordResponse(label, value) {
+        return decode(label, value, (candidate) => {
+            if (!candidate || typeof candidate !== 'object' || Array.isArray(candidate))
+                throw new TypeError('Expected an object.');
+            return candidate;
         });
-        if (!response.ok) {
-            const body = (await response.json().catch(() => undefined));
-            if (response.status === 401) {
-                throw new DoomainError('VERCEL_AUTH_FAILED', vercelAuthErrorMessage(body), body);
+    }
+    function request(path, init = {}, opts = {}) {
+        return Effect.gen(function* () {
+            const response = yield* Effect.tryPromise({
+                try: (signal) => fetch(`${VERCEL_API_URL}${opts.team === false ? path : appendTeam(path, config.teamId)}`, {
+                    ...init,
+                    headers: {
+                        Authorization: `Bearer ${config.token}`,
+                        'Content-Type': 'application/json',
+                        ...(init.headers ?? {}),
+                    },
+                    signal: init.signal ?? signal,
+                }),
+                catch: (cause) => toDoomainError(cause, clientOpts.transportErrorCode ?? 'DOMAIN_LINK_FAILED'),
+            });
+            if (!response.ok) {
+                const body = yield* Effect.tryPromise(() => response.json()).pipe(Effect.catchAll(() => Effect.succeed(undefined)));
+                if (response.status === 401) {
+                    return yield* Effect.fail(new DoomainError('VERCEL_AUTH_FAILED', vercelAuthErrorMessage(body), body));
+                }
+                return yield* Effect.fail(new DoomainError('DOMAIN_LINK_FAILED', apiErrorMessage(response.status, body), body));
             }
-            throw new DoomainError('DOMAIN_LINK_FAILED', apiErrorMessage(response.status, body), body);
-        }
-        if (response.status === 204)
-            return undefined;
-        return (await response.json().catch(() => undefined));
+            if (response.status === 204)
+                return undefined;
+            return (yield* Effect.tryPromise({
+                try: () => response.json(),
+                catch: (cause) => toDoomainError(cause, clientOpts.transportErrorCode ?? 'DOMAIN_LINK_FAILED'),
+            }));
+        });
     }
     return {
-        async listTeams() {
-            const teamsById = new Map();
-            const seenCursors = new Set();
-            let cursor;
-            for (let page = 0; page < 25; page += 1) {
-                const query = new URLSearchParams({ limit: '100' });
-                if (cursor)
-                    query.set('until', cursor);
-                const result = await request(`/v2/teams?${query.toString()}`, {}, { team: false });
-                for (const team of result.teams) {
-                    teamsById.set(team.id, {
-                        id: team.id,
-                        name: team.name ?? null,
-                        role: team.membership?.role ?? null,
-                        slug: team.slug ?? team.id,
+        listTeams() {
+            return Effect.gen(function* () {
+                const teamsById = new Map();
+                const seenCursors = new Set();
+                let cursor;
+                for (let page = 0; page < 25; page += 1) {
+                    const query = new URLSearchParams({ limit: '100' });
+                    if (cursor)
+                        query.set('until', cursor);
+                    const raw = yield* request(`/v2/teams?${query.toString()}`, {}, { team: false });
+                    const result = yield* decode('teams', raw, (candidate) => {
+                        const response = candidate;
+                        if (!response || !Array.isArray(response.teams))
+                            throw new TypeError('Expected a teams array.');
+                        if (response.teams.some((team) => !team || typeof team.id !== 'string')) {
+                            throw new TypeError('Expected every team to have an id.');
+                        }
+                        return response;
                     });
+                    for (const team of result.teams) {
+                        teamsById.set(team.id, {
+                            id: team.id,
+                            name: team.name ?? null,
+                            role: team.membership?.role ?? null,
+                            slug: team.slug ?? team.id,
+                        });
+                    }
+                    const next = result.pagination?.next?.toString();
+                    if (!next || seenCursors.has(next))
+                        break;
+                    seenCursors.add(next);
+                    cursor = next;
                 }
-                const next = result.pagination?.next?.toString();
-                if (!next || seenCursors.has(next))
-                    break;
-                seenCursors.add(next);
-                cursor = next;
-            }
-            return [...teamsById.values()].sort((a, b) => (a.name ?? a.slug).localeCompare(b.name ?? b.slug));
+                return [...teamsById.values()].sort((a, b) => (a.name ?? a.slug).localeCompare(b.name ?? b.slug));
+            });
         },
-        async listProjects(search) {
-            const projectsById = new Map();
-            const seenCursors = new Set();
-            let cursor;
-            for (let page = 0; page < 25; page += 1) {
-                const query = new URLSearchParams({ limit: '100' });
-                if (search)
-                    query.set('search', search);
-                if (cursor)
-                    query.set('from', cursor);
-                const result = await request(`/v9/projects?${query.toString()}`);
-                for (const project of result.projects) {
-                    projectsById.set(project.id, {
-                        id: project.id,
-                        name: project.name,
-                        framework: project.framework ?? null,
-                        updatedAt: project.updatedAt ?? null,
+        listProjects(search) {
+            return Effect.gen(function* () {
+                const projectsById = new Map();
+                const seenCursors = new Set();
+                let cursor;
+                for (let page = 0; page < 25; page += 1) {
+                    const query = new URLSearchParams({ limit: '100' });
+                    if (search)
+                        query.set('search', search);
+                    if (cursor)
+                        query.set('from', cursor);
+                    const raw = yield* request(`/v9/projects?${query.toString()}`);
+                    const result = yield* decode('projects', raw, (candidate) => {
+                        const response = candidate;
+                        if (!response || !Array.isArray(response.projects))
+                            throw new TypeError('Expected a projects array.');
+                        if (response.projects.some((project) => !project || typeof project.id !== 'string' || typeof project.name !== 'string')) {
+                            throw new TypeError('Expected every project to have an id and name.');
+                        }
+                        return response;
                     });
+                    for (const project of result.projects) {
+                        projectsById.set(project.id, {
+                            id: project.id,
+                            name: project.name,
+                            framework: project.framework ?? null,
+                            updatedAt: project.updatedAt ?? null,
+                        });
+                    }
+                    const next = result.pagination?.next?.toString();
+                    if (!next || seenCursors.has(next))
+                        break;
+                    seenCursors.add(next);
+                    cursor = next;
                 }
-                const next = result.pagination?.next?.toString();
-                if (!next || seenCursors.has(next))
-                    break;
-                seenCursors.add(next);
-                cursor = next;
-            }
-            return [...projectsById.values()].sort((a, b) => a.name.localeCompare(b.name));
+                return [...projectsById.values()].sort((a, b) => a.name.localeCompare(b.name));
+            });
         },
-        async addDomainToProject(project, domain, opts = {}) {
-            try {
-                const raw = await request(`/v10/projects/${encodeURIComponent(project)}/domains`, {
+        addDomainToProject(project, domain, opts = {}) {
+            return Effect.gen(this, function* () {
+                const attempted = yield* Effect.either(request(`/v10/projects/${encodeURIComponent(project)}/domains`, {
                     method: 'POST',
                     body: JSON.stringify({ name: domain }),
-                });
-                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);
+                }));
+                if (attempted._tag === 'Right') {
+                    const raw = attempted.right;
+                    const projectDomain = findProjectDomainTarget(raw, domain);
+                    if (!projectDomain) {
+                        return yield* Effect.fail(new DoomainError('DOMAIN_LINK_FAILED', `Vercel did not return ${domain} after adding it to project ${project}.`, raw));
+                    }
+                    return { alreadyAdded: false, raw: projectDomain };
                 }
-                return { alreadyAdded: false, raw: projectDomain };
-            }
-            catch (error) {
+                const error = attempted.left;
                 if (isDomainConflictError(error)) {
-                    const projectDomain = await this.getProjectDomain(project, domain).catch(() => undefined);
+                    const projectDomain = yield* this.getProjectDomain(project, domain).pipe(Effect.catchAll(() => Effect.succeed(undefined)));
                     if (projectDomain)
                         return { alreadyAdded: true, raw: projectDomain };
                     if (opts.force) {
-                        const owner = await this.findProjectDomainOwner(domain);
+                        const owner = yield* this.findProjectDomainOwner(domain);
                         if (owner && owner.project.id !== project) {
-                            await this.removeDomainFromProject(owner.project.id, domain);
-                            return this.addDomainToProject(project, domain);
+                            yield* this.removeDomainFromProject(owner.project.id, domain);
+                            return yield* this.addDomainToProject(project, domain);
                         }
                     }
-                    throw new DoomainError('DOMAIN_ALREADY_ASSIGNED', `Vercel reports ${domain} is already assigned to another project. Re-run with --force if you intend to move it to ${project}.`, error instanceof DoomainError ? error.details : undefined);
+                    return yield* Effect.fail(new DoomainError('DOMAIN_ALREADY_ASSIGNED', `Vercel reports ${domain} is already assigned to another project. Re-run with --force if you intend to move it to ${project}.`, error.details));
                 }
-                throw error;
-            }
+                return yield* Effect.fail(error);
+            });
         },
-        async findProjectDomainOwner(domain) {
-            for (const project of await this.listProjects()) {
-                const domains = await this.listProjectDomains(project.id).catch(() => []);
-                const match = domains.find((item) => isSameDomain(item.name, domain));
-                if (match)
-                    return { domain: match, project };
-            }
-            return undefined;
+        findProjectDomainOwner(domain) {
+            return Effect.gen(this, function* () {
+                for (const project of yield* this.listProjects()) {
+                    const domains = yield* this.listProjectDomains(project.id).pipe(Effect.catchAll(() => Effect.succeed([])));
+                    const match = domains.find((item) => isSameDomain(item.name, domain));
+                    if (match)
+                        return { domain: match, project };
+                }
+                return undefined;
+            });
         },
-        async getDomainConfig(domain) {
-            return request(`/v6/domains/${encodeURIComponent(domain)}/config`);
+        getDomainConfig(domain) {
+            return request(`/v6/domains/${encodeURIComponent(domain)}/config`).pipe(Effect.flatMap((value) => recordResponse('domain config', value)));
         },
-        async getRecommendedCname(domain) {
-            const config = await this.getDomainConfig(domain).catch(() => undefined);
-            const recommended = config?.recommendedCNAME?.sort((a, b) => (a.rank ?? 999) - (b.rank ?? 999))[0];
-            return recommended?.value?.replace(/\.$/, '') || VERCEL_CNAME_RECORD;
+        getRecommendedCname(domain) {
+            return this.getDomainConfig(domain).pipe(Effect.catchAll(() => Effect.succeed(undefined)), Effect.map((domainConfig) => {
+                const recommended = domainConfig?.recommendedCNAME?.sort((a, b) => (a.rank ?? 999) - (b.rank ?? 999))[0];
+                return recommended?.value?.replace(/\.$/, '') || VERCEL_CNAME_RECORD;
+            }));
         },
-        async getProjectDomain(project, domain) {
-            return request(`/v9/projects/${encodeURIComponent(project)}/domains/${encodeURIComponent(domain)}`);
+        getProjectDomain(project, domain) {
+            return request(`/v9/projects/${encodeURIComponent(project)}/domains/${encodeURIComponent(domain)}`).pipe(Effect.flatMap((value) => recordResponse('project domain', value)));
         },
-        async listProjectDomains(project) {
-            const result = await request(`/v9/projects/${encodeURIComponent(project)}/domains`);
-            return result.domains ?? [];
+        listProjectDomains(project) {
+            return request(`/v9/projects/${encodeURIComponent(project)}/domains`).pipe(Effect.flatMap((value) => decode('project domains', value, (candidate) => {
+                const response = candidate;
+                if (!response || !Array.isArray(response.domains))
+                    throw new TypeError('Expected a domains array.');
+                return response.domains;
+            })));
         },
-        async removeDomainFromProject(project, domain) {
-            await request(`/v9/projects/${encodeURIComponent(project)}/domains/${encodeURIComponent(domain)}`, {
+        removeDomainFromProject(project, domain) {
+            return request(`/v9/projects/${encodeURIComponent(project)}/domains/${encodeURIComponent(domain)}`, {
                 method: 'DELETE',
-            });
+            }).pipe(Effect.asVoid);
         },
-        async verifyProjectDomain(project, domain) {
-            return request(`/v9/projects/${encodeURIComponent(project)}/domains/${encodeURIComponent(domain)}/verify`, { method: 'POST' });
+        verifyProjectDomain(project, domain) {
+            return request(`/v9/projects/${encodeURIComponent(project)}/domains/${encodeURIComponent(domain)}/verify`, { method: 'POST' }).pipe(Effect.flatMap((value) => recordResponse('domain verification', value)));
         },
     };
 }

package/oclif.manifest.json

@@ -259,6 +259,26 @@
         "verify.js"
       ]
     },
+    "version": {
+      "aliases": [],
+      "args": {},
+      "description": "Display the installed doomain version.",
+      "flags": {},
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "version",
+      "pluginAlias": "doomain",
+      "pluginName": "doomain",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "version.js"
+      ]
+    },
     "wizard": {
       "aliases": [],
       "args": {},
@@ -1306,5 +1326,5 @@
       ]
     }
   },
-  "version": "0.1.22"
+  "version": "0.1.24"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "doomain",
   "description": "Configure production domains and DNS records in seconds",
-  "version": "0.1.22",
+  "version": "0.1.24",
   "author": "Crafter Station",
   "packageManager": "bun@1.3.13",
   "bin": {
@@ -12,6 +12,7 @@
     "@clack/prompts": "^1.2.0",
     "@oclif/core": "^4",
     "@oclif/plugin-help": "^6",
+    "effect": "^3.22.2",
     "fast-xml-parser": "^5.7.2"
   },
   "devDependencies": {
@@ -47,6 +48,12 @@
   "main": "dist/index.js",
   "type": "module",
   "oclif": {
+    "additionalHelpFlags": [
+      "-h"
+    ],
+    "additionalVersionFlags": [
+      "-v"
+    ],
     "bin": "doomain",
     "dirname": "doomain",
     "commands": "./dist/commands",