@docyrus/docyrus 0.0.10 → 0.0.12

package/main.js

@@ -63633,7 +63633,7 @@ function buildInputSchema(args, env, options) {
 // package.json
 var package_default = {
   name: "@docyrus/docyrus",
-  version: "0.0.10",
+  version: "0.0.12",
   private: false,
   description: "Docyrus API CLI",
   main: "./main.js",
@@ -63854,10 +63854,11 @@ var DEFAULT_LOGIN_SCOPES = [
   "Docs.ReadWrite.All",
   "Architect.ReadWrite.All"
 ].join(" ");
-var AUTH_DIR_PATH = (0, import_node_path3.join)((0, import_node_os3.homedir)(), ".docyrus");
+var DOCYRUS_SETTINGS_DIR_NAME = ".docyrus";
+var AUTH_DIR_PATH = (0, import_node_path3.join)((0, import_node_os3.homedir)(), DOCYRUS_SETTINGS_DIR_NAME);
 var AUTH_FILE_PATH = (0, import_node_path3.join)(AUTH_DIR_PATH, "auth.json");
 var CONFIG_FILE_PATH = (0, import_node_path3.join)(AUTH_DIR_PATH, "config.json");
-var TENANT_OPENAPI_ROOT_PATH = (0, import_node_path3.join)((0, import_node_os3.homedir)(), "docyrus", "tenans");
+var TENANT_OPENAPI_ROOT_PATH = (0, import_node_path3.join)(AUTH_DIR_PATH, "tenans");
 var TENANT_OPENAPI_PUBLIC_URL_TEMPLATE = "https://api.docyrus.app/storage/v1/object/public/tenant-public/{tenantId}/openapi.json";
 var DEFAULT_ENVIRONMENT_ID = "live";
 var DEFAULT_ENVIRONMENTS = [
@@ -63886,6 +63887,41 @@ var TOKEN_EXPIRY_SKEW_MS = 6e4;
 var DEFAULT_DEVICE_POLL_INTERVAL_SECONDS = 5;
 var DEVICE_POLL_SLOW_DOWN_SECONDS = 5;
 var DEFAULT_DEVICE_CODE_EXPIRY_SECONDS = 600;
+function getLocalDocyrusSettingsRootPath(cwd = process.cwd()) {
+  return (0, import_node_path3.join)(cwd, DOCYRUS_SETTINGS_DIR_NAME);
+}
+function toDocyrusSettingsPaths(rootPath, scope) {
+  return {
+    scope,
+    rootPath,
+    authFilePath: (0, import_node_path3.join)(rootPath, "auth.json"),
+    configFilePath: (0, import_node_path3.join)(rootPath, "config.json"),
+    tenantOpenApiRootPath: (0, import_node_path3.join)(rootPath, "tenans")
+  };
+}
+function resolveDocyrusSettingsPaths(params) {
+  const cwd = params?.cwd || process.cwd();
+  const localRootPath = getLocalDocyrusSettingsRootPath(cwd);
+  if (params?.forceGlobal) {
+    return toDocyrusSettingsPaths(AUTH_DIR_PATH, "global");
+  }
+  return toDocyrusSettingsPaths(localRootPath, "local");
+}
+function extractGlobalFlagFromArgv(argv) {
+  let forceGlobal = false;
+  const sanitizedArgs = [];
+  for (const value of argv) {
+    if (value === "-g" || value === "--global") {
+      forceGlobal = true;
+      continue;
+    }
+    sanitizedArgs.push(value);
+  }
+  return {
+    forceGlobal,
+    argv: sanitizedArgs
+  };
+}
 function getContextEnvValue(contextEnv, key) {
   if (typeof contextEnv === "object" && contextEnv !== null && key in contextEnv) {
     const value = contextEnv[key];
@@ -63984,26 +64020,44 @@ function createAuthCli(dependencies) {
     description: "Authorize CLI using OAuth2 device flow",
     options: external_exports.object({
       clientId: external_exports.string().optional().describe("OAuth2 client id"),
-      scope: external_exports.string().default(DEFAULT_LOGIN_SCOPES).describe("OAuth2 scopes")
+      scope: external_exports.string().default(DEFAULT_LOGIN_SCOPES).describe("OAuth2 scopes"),
+      accessToken: external_exports.string().optional().describe("Manual access token; skips device flow"),
+      refreshToken: external_exports.string().optional().describe("Manual refresh token used with --accessToken")
     }),
     run: async (context) => {
       const apiBaseUrl = await dependencies.environmentConfigService.getActiveApiBaseUrl();
+      const manualAccessToken = context.options.accessToken?.trim();
+      const manualRefreshToken = context.options.refreshToken?.trim();
+      if (manualRefreshToken && !manualAccessToken) {
+        throw new UserInputError("refreshToken requires accessToken. Pass --accessToken when using --refreshToken.");
+      }
+      const envClientId = getOptionalEnvValue(context.env, "DOCYRUS_API_CLIENT_ID");
       const configuredClientId = await dependencies.environmentConfigService.getDefaultClientId();
-      const clientId = context.options.clientId || getOptionalEnvValue(context.env, "DOCYRUS_API_CLIENT_ID") || configuredClientId;
+      const globalConfiguredClientId = configuredClientId ? void 0 : await dependencies.globalEnvironmentConfigService?.getDefaultClientId();
+      const resolvedClientId = context.options.clientId || envClientId || configuredClientId || globalConfiguredClientId;
+      const clientId = resolvedClientId || (manualAccessToken ? "manual-token" : void 0);
       if (!clientId) {
         throw new UserInputError(
           "Client ID is required. Pass --clientId, set DOCYRUS_API_CLIENT_ID, or login once with --clientId to save it."
         );
       }
       const authSessionService = dependencies.createAuthSessionService(apiBaseUrl);
-      const profile = await authSessionService.loginWithDeviceFlow({
+      const profile = manualAccessToken ? await authSessionService.loginWithManualTokens({
+        clientId,
+        accessToken: manualAccessToken,
+        refreshToken: manualRefreshToken || void 0,
+        scope: context.options.scope,
+        tokenType: "Bearer"
+      }) : await authSessionService.loginWithDeviceFlow({
         clientId,
         scope: context.options.scope,
         onVerification: (verification) => {
           logVerificationHint(verification, context.agent, dependencies.onMessage);
         }
       });
-      await dependencies.environmentConfigService.setDefaultClientId(clientId);
+      if (resolvedClientId) {
+        await dependencies.environmentConfigService.setDefaultClientId(resolvedClientId);
+      }
       return await injectContext({
         apiBaseUrl,
         authStore: dependencies.authStore,
@@ -66245,6 +66299,7 @@ var ApiClient = class {
 };
 
 // src/services/authSession.ts
+var DEFAULT_MANUAL_ACCESS_TOKEN_EXPIRY_SECONDS = 3600;
 function isRecord5(value) {
   return typeof value === "object" && value !== null;
 }
@@ -66286,6 +66341,22 @@ var AuthSessionService = class {
       onVerification: options.onVerification
     });
   }
+  async loginWithManualTokens(options) {
+    const expiresIn = this.#resolveManualAccessTokenExpiresIn(options.accessToken);
+    const profile = await this.#buildProfileFromToken(
+      options.clientId,
+      {
+        accessToken: options.accessToken,
+        refreshToken: options.refreshToken,
+        tokenType: options.tokenType || "Bearer",
+        scope: options.scope,
+        expiresIn
+      },
+      {}
+    );
+    await this.#persistProfile(profile);
+    return profile;
+  }
   async getValidAccessToken() {
     const activeProfile = await this.params.authStore.getActiveProfile(this.#apiBaseUrl);
     if (!activeProfile) {
@@ -66480,9 +66551,7 @@ var AuthSessionService = class {
           expectedUserId: options.expectedUserId,
           expectedTenantId: options.expectedTenantId
         });
-        await this.params.authStore.upsertProfile(profile);
-        await this.#refreshTenantCatalog(profile.userId, profile.accessToken, profile.tenantId);
-        await this.params.authStore.setActiveAccountTenant(this.#apiBaseUrl, profile.userId, profile.tenantId);
+        await this.#persistProfile(profile);
         return profile;
       } catch (error48) {
         if (!(error48 instanceof ApiResponseError)) {
@@ -66621,6 +66690,11 @@ var AuthSessionService = class {
       lastUsedAt: nowIso
     });
   }
+  async #persistProfile(profile) {
+    await this.params.authStore.upsertProfile(profile);
+    await this.#refreshTenantCatalog(profile.userId, profile.accessToken, profile.tenantId);
+    await this.params.authStore.setActiveAccountTenant(this.#apiBaseUrl, profile.userId, profile.tenantId);
+  }
   async #ensureProfileAccessToken(profile) {
     if (!this.#isExpired(profile.expiresAt)) {
       return profile;
@@ -66736,6 +66810,32 @@ var AuthSessionService = class {
   #now() {
     return this.params.now ? this.params.now() : Date.now();
   }
+  #resolveManualAccessTokenExpiresIn(accessToken) {
+    const token = accessToken.trim();
+    if (!token) {
+      return DEFAULT_MANUAL_ACCESS_TOKEN_EXPIRY_SECONDS;
+    }
+    const parts = token.split(".");
+    if (parts.length < 2) {
+      return DEFAULT_MANUAL_ACCESS_TOKEN_EXPIRY_SECONDS;
+    }
+    try {
+      const payloadSegment = parts[1].replace(/-/g, "+").replace(/_/g, "/");
+      const paddingLength = payloadSegment.length % 4;
+      const paddedPayload = paddingLength === 0 ? payloadSegment : payloadSegment.padEnd(payloadSegment.length + (4 - paddingLength), "=");
+      const decodedPayload = Buffer.from(paddedPayload, "base64").toString("utf8");
+      const parsedPayload = JSON.parse(decodedPayload);
+      if (typeof parsedPayload.exp === "number" && Number.isFinite(parsedPayload.exp)) {
+        const remainingSeconds = Math.floor(parsedPayload.exp - this.#now() / 1e3);
+        if (remainingSeconds > 0) {
+          return remainingSeconds;
+        }
+      }
+    } catch {
+      return DEFAULT_MANUAL_ACCESS_TOKEN_EXPIRY_SECONDS;
+    }
+    return DEFAULT_MANUAL_ACCESS_TOKEN_EXPIRY_SECONDS;
+  }
 };
 
 // src/services/authStore.ts
@@ -67295,6 +67395,7 @@ var TenantOpenApiService = class {
 
 // src/main.ts
 var ROOT_HELP_COMMANDS = [
+  { command: "docyrus -g <command>", description: "Force use of global ~/.docyrus settings for this run" },
   { command: "env", description: "Show active environment and list environments" },
   { command: "env use <id|name>", description: "Switch active environment" },
   { command: "auth login", description: "Authenticate with OAuth2 device flow" },
@@ -67313,11 +67414,17 @@ var ROOT_HELP_COMMANDS = [
   { command: "curl <path>", description: "Send arbitrary API requests" }
 ];
 function createDocyrusCli(params) {
-  const authStore = params?.authStore ?? new AuthStore();
-  const environmentConfigService = params?.environmentConfigService ?? new EnvironmentConfigService();
+  const settingsPaths = resolveDocyrusSettingsPaths({
+    forceGlobal: params?.forceGlobalSettings,
+    cwd: params?.cwd
+  });
+  const authStore = params?.authStore ?? new AuthStore(settingsPaths.authFilePath);
+  const environmentConfigService = params?.environmentConfigService ?? new EnvironmentConfigService(settingsPaths.configFilePath);
+  const globalEnvironmentConfigService = new EnvironmentConfigService(CONFIG_FILE_PATH);
   const includeTui = params?.includeTui !== false;
   const tenantOpenApiService = new TenantOpenApiService({
-    fetchFn: params?.fetchFn
+    fetchFn: params?.fetchFn,
+    rootPath: settingsPaths.tenantOpenApiRootPath
   });
   const createAuthSessionService = (apiBaseUrl) => {
     return new AuthSessionService({
@@ -67361,6 +67468,7 @@ function createDocyrusCli(params) {
     createApiClient,
     createAuthSessionService,
     environmentConfigService,
+    globalEnvironmentConfigService,
     onMessage: params?.onAuthMessage,
     authStore
   }));
@@ -67396,8 +67504,11 @@ function createDocyrusCli(params) {
   }));
   return cli2;
 }
-var cli = createDocyrusCli();
-cli.serve();
+var runtimeArgs = extractGlobalFlagFromArgv(process.argv.slice(2));
+var cli = createDocyrusCli({
+  forceGlobalSettings: runtimeArgs.forceGlobal
+});
+cli.serve(runtimeArgs.argv);
 var main_default = cli;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {