attio 0.0.1-experimental.20250409 → 0.0.1-experimental.20250414

package/lib/api/api.js

@@ -2,7 +2,7 @@ import { Fetcher } from "./fetcher.js";
 import { APP } from "../env.js";
 import { isErrored, complete, errored } from "@attio/fetchable";
 import { whoamiSchema, listDevWorkspacesResponseSchema, createVersionSchema, appInfoSchema, completeBundleUploadSchema, startUploadSchema, createDevVersionSchema, installationSchema, versionsSchema, TEST_WORKSPACES, TEST_APP_INFO, tokenResponseSchema, } from "./schemas.js";
-class CliApi {
+class ApiImpl {
     _fetcher;
     constructor() {
         this._fetcher = new Fetcher();
@@ -163,4 +163,4 @@ class CliApi {
         return result;
     }
 }
-export const API = new CliApi();
+export const api = new ApiImpl();

package/lib/api/fetcher.js

@@ -1,9 +1,9 @@
 import { complete, errored, isErrored } from "@attio/fetchable";
 import { API } from "../env.js";
-import { Authenticator } from "../auth/auth.js";
+import { authenticator } from "../auth/auth.js";
 export class Fetcher {
     async _fetch({ path, fetchOptions, schema, authenticated, }) {
-        const tokenResult = authenticated === "Authenticated" ? await Authenticator.ensureAuthed() : complete(null);
+        const tokenResult = authenticated === "Authenticated" ? await authenticator.ensureAuthed() : complete(null);
         if (isErrored(tokenResult)) {
             return errored({
                 code: "UNAUTHORIZED",

package/lib/auth/auth.js

@@ -4,20 +4,20 @@ import { randomBytes, createHash } from "crypto";
 import open from "open";
 import { APP } from "../env.js";
 import { findAvailablePort } from "../util/find-available-port.js";
-import { Keychain } from "./keychain.js";
-import { API } from "../api/api.js";
+import { keychain } from "./keychain.js";
+import { api } from "../api/api.js";
 import { isErrored, complete, errored } from "@attio/fetchable";
 import { printFetcherError, printKeychainError } from "../print-errors.js";
 class AuthenticatorImpl {
     clientId = "f881c6f1-82d7-48a5-a581-649596167845";
     refreshTimeout = null;
     async ensureAuthed() {
-        const existingTokenResult = await Keychain.load();
+        const existingTokenResult = await keychain.load();
         if (isErrored(existingTokenResult)) {
             return this.promptToAuthenticate();
         }
         const existingToken = existingTokenResult.value;
-        if (existingToken === null || existingToken.expires_in < Date.now()) {
+        if (existingToken === null || existingToken.expires_at < Date.now()) {
             return this.promptToAuthenticate();
         }
         this.scheduleRefresh(existingToken);
@@ -31,12 +31,12 @@ class AuthenticatorImpl {
         return this.authenticate();
     }
     async authenticate() {
-        const existingTokenResult = await Keychain.load();
+        const existingTokenResult = await keychain.load();
         if (isErrored(existingTokenResult)) {
             return existingTokenResult;
         }
         const existingToken = existingTokenResult.value;
-        if (existingToken !== null && existingToken.expires_in > Date.now()) {
+        if (existingToken !== null && existingToken.expires_at > Date.now()) {
             return complete(existingToken.access_token);
         }
         const verifier = randomBytes(32);
@@ -64,7 +64,7 @@ class AuthenticatorImpl {
             if (!receivedCode) {
                 resolveAsyncResult(errored({ code: "NO_AUTHORIZATION_CODE" }));
             }
-            const tokenResult = await API.exchangeToken({
+            const tokenResult = await api.exchangeToken({
                 receivedCode,
                 verifierString,
                 redirectUri,
@@ -106,9 +106,9 @@ class AuthenticatorImpl {
                 access_token: token.access_token,
                 refresh_token: token.refresh_token,
                 token_type: token.token_type,
-                expires_in: token.expires_in,
+                expires_at: Date.now() + token.expires_in * 1000,
             };
-            const saveResult = await Keychain.save(keychainToken);
+            const saveResult = await keychain.save(keychainToken);
             if (isErrored(saveResult)) {
                 return saveResult;
             }
@@ -123,10 +123,10 @@ class AuthenticatorImpl {
         if (this.refreshTimeout !== null) {
             clearTimeout(this.refreshTimeout);
         }
-        this.refreshTimeout = setTimeout(async () => await this.refreshToken(token), Math.max(0, token.expires_in - Date.now() - 5_000));
+        this.refreshTimeout = setTimeout(async () => await this.refreshToken(token), Math.max(0, token.expires_at - Date.now() - 5_000));
     }
     async refreshToken(token) {
-        const refreshTokenResult = await API.refreshToken({
+        const refreshTokenResult = await api.refreshToken({
             refreshToken: token.refresh_token,
             clientId: this.clientId,
         });
@@ -139,14 +139,21 @@ class AuthenticatorImpl {
             access_token: refreshedToken.access_token,
             refresh_token: refreshedToken.refresh_token,
             token_type: refreshedToken.token_type,
-            expires_in: refreshedToken.expires_in,
+            expires_at: Date.now() + refreshedToken.expires_in * 1000,
         };
-        const saveResult = await Keychain.save(keychainToken);
+        const saveResult = await keychain.save(keychainToken);
         if (isErrored(saveResult)) {
             printKeychainError(saveResult.error);
             return;
         }
         this.scheduleRefresh(keychainToken);
     }
+    async logout() {
+        if (this.refreshTimeout !== null) {
+            clearTimeout(this.refreshTimeout);
+            this.refreshTimeout = null;
+        }
+        await keychain.delete();
+    }
 }
-export const Authenticator = new AuthenticatorImpl();
+export const authenticator = new AuthenticatorImpl();

package/lib/auth/keychain.js

@@ -1,10 +1,10 @@
-import { complete, errored } from "@attio/fetchable";
+import { complete, errored, isErrored } from "@attio/fetchable";
 import { z } from "zod";
 const authTokenSchema = z.object({
     access_token: z.string(),
     refresh_token: z.string(),
     token_type: z.literal("Bearer"),
-    expires_in: z.number(),
+    expires_at: z.number(),
 });
 class KeytarKeychain {
     SERVICE_NAME = "attio-cli";
@@ -43,17 +43,21 @@ class KeytarKeychain {
             jsonToken = JSON.parse(unparsedToken);
         }
         catch (error) {
-            return errored({
-                code: "LOAD_KEYCHAIN_ERROR",
-                error,
-            });
+            const deleteResult = await this.delete();
+            if (isErrored(deleteResult)) {
+                return errored({ code: "LOAD_KEYCHAIN_ERROR", error: deleteResult.error });
+            }
+            console.debug("Wiped keychain entry due to invalid JSON");
+            return complete(null);
         }
         const parsedToken = authTokenSchema.safeParse(jsonToken);
         if (!parsedToken.success) {
-            return errored({
-                code: "LOAD_KEYCHAIN_ERROR",
-                error: parsedToken.error,
-            });
+            const deleteResult = await this.delete();
+            if (isErrored(deleteResult)) {
+                return errored({ code: "LOAD_KEYCHAIN_ERROR", error: deleteResult.error });
+            }
+            console.debug("Wiped keychain entry due to schema mismatch");
+            return complete(null);
         }
         return complete(parsedToken.data);
     }
@@ -76,7 +80,7 @@ class TestKeychain {
         access_token: "TEST",
         refresh_token: "TEST",
         token_type: "Bearer",
-        expires_in: Number.MAX_SAFE_INTEGER,
+        expires_at: Number.MAX_SAFE_INTEGER,
     };
     async save(_token) {
         return complete(undefined);
@@ -88,4 +92,4 @@ class TestKeychain {
         return complete(undefined);
     }
 }
-export const Keychain = process.env.NODE_ENV === "test" ? new TestKeychain() : new KeytarKeychain();
+export const keychain = process.env.NODE_ENV === "test" ? new TestKeychain() : new KeytarKeychain();

package/lib/commands/dev/boot.js

@@ -3,7 +3,7 @@ import { printFetcherError, printCliVersionError, printPackageJsonError, printDe
 import { getAppSlugFromPackageJson } from "../../spinners/get-app-slug-from-package-json.js";
 import { determineWorkspace } from "../../spinners/determine-workspace.spinner.js";
 import { loadAttioCliVersion } from "../../util/load-attio-cli-version.js";
-import { API } from "../../api/api.js";
+import { api } from "../../api/api.js";
 import { getAppInfo } from "../../spinners/get-app-info.spinner.js";
 import { loadEnv } from "../../util/load-env.js";
 export async function boot({ workspaceSlug }) {
@@ -32,7 +32,7 @@ export async function boot({ workspaceSlug }) {
         process.exit(1);
     }
     const cliVersion = cliVersionResult.value;
-    const devVersionResult = await API.createDevVersion({
+    const devVersionResult = await api.createDevVersion({
         appId: appInfo.app_id,
         cliVersion,
         targetWorkspaceId: workspace.workspace_id,

package/lib/commands/dev/onboarding.js

@@ -1,7 +1,7 @@
 import { listenForKey } from "../../util/listen-for-key.js";
 import open from "open";
 import { APP } from "../../env.js";
-import { API } from "../../api/api.js";
+import { api } from "../../api/api.js";
 import { isErrored } from "@attio/fetchable";
 function prompt() {
     process.stdout.write(`🚨 IMPORTANT: You will need to install your app in your workspace. Press "i" to open the app settings page, and then click "Install".\n\n`);
@@ -11,7 +11,7 @@ export function onboarding({ appId, appSlug, workspace, }) {
         open(`${APP}/${workspace.slug}/settings/apps/${appSlug}`);
     });
     const poll = async () => {
-        const installationResult = await API.fetchInstallation({
+        const installationResult = await api.fetchInstallation({
             appId,
             workspaceId: workspace.workspace_id,
         });
@@ -23,7 +23,7 @@ export function onboarding({ appId, appSlug, workspace, }) {
             prompt();
             while (!installation) {
                 await new Promise((resolve) => setTimeout(resolve, 60_000));
-                const installationResult = await API.fetchInstallation({
+                const installationResult = await api.fetchInstallation({
                     appId,
                     workspaceId: workspace.workspace_id,
                 });

package/lib/commands/dev/upload.js

@@ -1,11 +1,11 @@
 import notifier from "node-notifier";
 import { spinnerify } from "../../util/spinner.js";
 import { uploadBundle } from "../../util/upload-bundle.js";
-import { API } from "../../api/api.js";
+import { api } from "../../api/api.js";
 import { isErrored, complete, combineAsync } from "@attio/fetchable";
 export async function upload({ contents, devVersionId, appId, }) {
     return await spinnerify("Uploading...", () => `Upload complete at ${new Date().toLocaleTimeString()}`, async () => {
-        const startUploadResult = await API.startUpload({
+        const startUploadResult = await api.startUpload({
             appId,
             devVersionId,
         });
@@ -21,7 +21,7 @@ export async function upload({ contents, devVersionId, appId, }) {
         if (isErrored(uploadResults)) {
             return uploadResults;
         }
-        const completeBundleUploadResult = await API.completeBundleUpload({
+        const completeBundleUploadResult = await api.completeBundleUpload({
             appId,
             devVersionId,
             bundleId,

package/lib/commands/login.js

@@ -1,11 +1,11 @@
 import { Command } from "commander";
-import { Authenticator } from "../auth/auth.js";
+import { authenticator } from "../auth/auth.js";
 import { isErrored } from "@attio/fetchable";
 import { printAuthenticationError } from "../print-errors.js";
 export const login = new Command("login")
     .description("Authenticate with Attio")
     .action(async () => {
-    const result = await Authenticator.authenticate();
+    const result = await authenticator.authenticate();
     if (isErrored(result)) {
         printAuthenticationError(result.error);
         process.exit(1);

package/lib/commands/logout.js

@@ -1,9 +1,9 @@
 import { Command } from "commander";
-import { Keychain } from "../auth/keychain.js";
+import { keychain } from "../auth/keychain.js";
 import { printKeychainError } from "../print-errors.js";
 import { isErrored } from "@attio/fetchable";
 export const logout = new Command("logout").description("Log out from Attio").action(async () => {
-    const result = await Keychain.delete();
+    const result = await keychain.delete();
     if (isErrored(result)) {
         printKeychainError(result.error);
         process.exit(1);

package/lib/commands/version/create.js

@@ -10,7 +10,7 @@ import { combineAsync, isErrored } from "@attio/fetchable";
 import { getAppSlugFromPackageJson } from "../../spinners/get-app-slug-from-package-json.js";
 import { bundleJavaScript } from "./create/bundle-javascript.js";
 import { printBuildContextError } from "../dev/prepare-build-contexts.js";
-import { API } from "../../api/api.js";
+import { api } from "../../api/api.js";
 import { printJsError } from "../../util/typescript.js";
 export const versionCreate = new Command("create")
     .description("Create a new unpublished version of your Attio app")
@@ -59,7 +59,7 @@ export const versionCreate = new Command("create")
             process.exit(1);
         }
         const cliVersion = cliVersionResult.value;
-        const versionResult = await API.createVersion({
+        const versionResult = await api.createVersion({
             appId: appInfo.app_id,
             major: versions.length === 0
                 ? 1
@@ -86,7 +86,7 @@ export const versionCreate = new Command("create")
         process.exit(1);
     }
     const version = versionResult.value;
-    const signingResult = await spinnerify("Signing bundles...", "Bundles signed", async () => await API.completeProdBundleUpload({
+    const signingResult = await spinnerify("Signing bundles...", "Bundles signed", async () => await api.completeProdBundleUpload({
         appId: appInfo.app_id,
         major: version.major,
         minor: version.minor,

package/lib/commands/whoami.js

@@ -1,18 +1,18 @@
 import { Command } from "commander";
-import { Keychain } from "../auth/keychain.js";
-import { API } from "../api/api.js";
+import { keychain } from "../auth/keychain.js";
+import { api } from "../api/api.js";
 import { isErrored } from "@attio/fetchable";
 import { printFetcherError } from "../print-errors.js";
 export const whoami = new Command()
     .name("whoami")
     .description("Identify the current user")
     .action(async () => {
-    const tokenResult = await Keychain.load();
+    const tokenResult = await keychain.load();
     if (isErrored(tokenResult) || tokenResult.value === null) {
         process.stdout.write("🔒 Not logged in.\n");
         process.exit(0);
     }
-    const result = await API.whoami();
+    const result = await api.whoami();
     if (isErrored(result)) {
         printFetcherError("Error fetching user", result.error);
         process.exit(1);

package/lib/spinners/determine-workspace.spinner.js

@@ -1,9 +1,9 @@
 import { select } from "@inquirer/prompts";
 import { spinnerify } from "../util/spinner.js";
-import { API } from "../api/api.js";
+import { api } from "../api/api.js";
 import { isErrored, complete, errored } from "@attio/fetchable";
 export async function determineWorkspace(workspaceSlug) {
-    const workspacesResult = await spinnerify("Loading workspaces...", "Workspaces loaded", async () => await API.fetchWorkspaces());
+    const workspacesResult = await spinnerify("Loading workspaces...", "Workspaces loaded", async () => await api.fetchWorkspaces());
     if (isErrored(workspacesResult)) {
         return workspacesResult;
     }

package/lib/spinners/get-app-info.spinner.js

@@ -1,7 +1,7 @@
-import { API } from "../api/api.js";
+import { api } from "../api/api.js";
 import { spinnerify } from "../util/spinner.js";
 export async function getAppInfo(appSlug) {
     return await spinnerify("Loading app information...", (app) => `App found: ${app.title}`, async () => {
-        return await API.fetchAppInfo(appSlug);
+        return await api.fetchAppInfo(appSlug);
     });
 }

package/lib/spinners/get-versions.spinner.js

@@ -1,5 +1,5 @@
 import { spinnerify } from "../util/spinner.js";
-import { API } from "../api/api.js";
+import { api } from "../api/api.js";
 export async function getVersions(appInfo) {
-    return await spinnerify("Loading versions...", "Versions loaded", async () => await API.fetchVersions(appInfo.app_id));
+    return await spinnerify("Loading versions...", "Versions loaded", async () => await api.fetchVersions(appInfo.app_id));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "attio",
-  "version": "0.0.1-experimental.20250409",
+  "version": "0.0.1-experimental.20250414",
   "bin": "lib/attio.js",
   "type": "module",
   "files": [