@maker-or/opencms 0.1.3 → 0.1.5

package/README.md

@@ -19,6 +19,10 @@ npx @maker-or/opencms deploy
 
 `opencms create` authenticates you, creates an OpenCMS project, pulls the Next.js template, writes the project configuration, and installs dependencies.
 
+`opencms login` refreshes the saved browser session. The CLI also retries a management request once with a fresh browser session when the saved session has expired.
+
 The generated `cms/schema.json` file defines the project's content types and allowed blocks. The CLI syncs it to the development environment when `dev` or `deploy` runs.
 
 The CLI stores its local login configuration in `~/.config/opencms/config.json` (or `$XDG_CONFIG_HOME/opencms/config.json` when configured).
+
+The CLI defaults to the hosted OpenCMS dashboard and API. Use `OPENCMS_DASHBOARD_URL` and `OPENCMS_API_URL` to target a local or self-hosted instance.

package/dist/index.js

@@ -65,7 +65,12 @@ class OpenCmsApiError extends Error {
   }
 }
 function createSdk(options = {}) {
-  const baseUrl = (options.baseUrl ?? "http://localhost:3000").replace(/\/$/, "");
+  const defaultBaseUrl = typeof window === "undefined" ? undefined : window.location.origin;
+  const configuredBaseUrl = options.baseUrl ?? defaultBaseUrl;
+  if (!configuredBaseUrl) {
+    throw new Error("baseUrl is required when using the OpenCMS SDK outside a browser.");
+  }
+  const baseUrl = configuredBaseUrl.replace(/\/$/, "");
   const fetcher = options.fetch ?? globalThis.fetch;
   const projectId = options.projectId;
   const environment = options.environment ?? "development";
@@ -201,8 +206,9 @@ function createSdk(options = {}) {
 }
 
 // src/index.ts
-var dashboardUrl = process.env.OPENCMS_DASHBOARD_URL ?? "http://localhost:3000";
-var apiUrl = process.env.OPENCMS_API_URL ?? "http://localhost:3000";
+var hostedUrl = "https://web-eta-ten-16.vercel.app";
+var dashboardUrl = process.env.OPENCMS_DASHBOARD_URL ?? hostedUrl;
+var apiUrl = process.env.OPENCMS_API_URL ?? hostedUrl;
 var configRoot = process.env.XDG_CONFIG_HOME ?? join(homedir(), ".config");
 var configPath = join(configRoot, "opencms", "config.json");
 async function readConfig() {
@@ -315,6 +321,9 @@ async function ensureToken(config) {
   return loggedInToken;
 }
 async function reauthenticate(config) {
+  if (process.env.OPENCMS_CLERK_TOKEN) {
+    throw new Error("OPENCMS_CLERK_TOKEN was rejected or expired. Provide a fresh token or unset the variable to use browser login.");
+  }
   console.log("Your OpenCMS session has expired. Opening browser login…");
   const loggedInToken = await browserLogin();
   await writeConfig({ ...config, token: loggedInToken, apiUrl: config.apiUrl ?? apiUrl });
@@ -327,7 +336,8 @@ async function login() {
     console.log("Saved OPENCMS_CLERK_TOKEN for local CLI use.");
     return;
   }
-  await ensureToken(config);
+  const loggedInToken = await browserLogin();
+  await writeConfig({ ...config, token: loggedInToken, apiUrl: config.apiUrl ?? apiUrl });
   console.log("Logged in to OpenCMS.");
 }
 async function logout() {
@@ -443,7 +453,14 @@ Next steps:
 async function runDev() {
   const config = await readConfig();
   await ensureToken(config);
-  await syncLocalSchema(await projectIdFromEnv(), await readConfig());
+  try {
+    await syncLocalSchema(await projectIdFromEnv(), await readConfig());
+  } catch (error) {
+    if (!(error instanceof OpenCmsApiError) || error.status !== 401)
+      throw error;
+    await reauthenticate(await readConfig());
+    await syncLocalSchema(await projectIdFromEnv(), await readConfig());
+  }
   const manager = await packageManager(process.cwd());
   const command = manager[0] === "npm" ? ["npm", "run", "dev"] : manager[0] === "pnpm" ? ["pnpm", "dev"] : manager[0] === "yarn" ? ["yarn", "dev"] : ["bun", "run", "dev"];
   process.exit(await runCommand(command[0], command.slice(1), { cwd: process.cwd(), env: { ...process.env, OPENCMS_ENVIRONMENT: "development" }, inherit: true }));
@@ -478,8 +495,17 @@ async function deploy() {
   const projectId = await projectIdFromEnv() ?? config.projectId;
   if (!projectId)
     throw new Error("No OpenCMS project is configured in this directory.");
-  await syncLocalSchema(projectId, await readConfig());
-  const deployment = await sdk(await readConfig()).deploy(projectId);
+  let deployment;
+  try {
+    await syncLocalSchema(projectId, await readConfig());
+    deployment = await sdk(await readConfig()).deploy(projectId);
+  } catch (error) {
+    if (!(error instanceof OpenCmsApiError) || error.status !== 401)
+      throw error;
+    await reauthenticate(await readConfig());
+    await syncLocalSchema(projectId, await readConfig());
+    deployment = await sdk(await readConfig()).deploy(projectId);
+  }
   console.log(`Deployed ${deployment.sourceEnvironment} content to ${deployment.targetEnvironment}.`);
   if (process.env.VERCEL_TOKEN) {
     console.log("Deploying the application to Vercel…");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maker-or/opencms",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "The developer-first CLI for OpenCMS",
   "type": "module",
   "repository": {