@project-ajax/cli 0.0.9 → 0.0.11

package/dist/commands/auth.impl.d.ts

@@ -1,4 +1,6 @@
 import type { GlobalFlags } from "../flags.js";
+import { type HandlerContext } from "../handler.js";
+export declare function runLogin(context: HandlerContext, token?: string): Promise<void>;
 export declare const login: (this: import("../context.js").LocalContext, flags: GlobalFlags, token?: string | undefined) => Promise<void>;
 export declare const show: (this: import("../context.js").LocalContext, flags: GlobalFlags) => Promise<void>;
 export declare const logout: (this: import("../context.js").LocalContext, flags: GlobalFlags) => Promise<void>;

package/dist/commands/auth.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.impl.d.ts","sourceRoot":"","sources":["../../src/commands/auth.impl.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AA0E/C,eAAO,MAAM,KAAK,+GA8FhB,CAAC;AAEH,eAAO,MAAM,IAAI,mFAEf,CAAC;AAEH,eAAO,MAAM,MAAM,mFAIjB,CAAC"}
+{"version":3,"file":"auth.impl.d.ts","sourceRoot":"","sources":["../../src/commands/auth.impl.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAgB,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AAyElE,wBAAsB,QAAQ,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,CAAC,EAAE,MAAM,iBA0FrE;AAED,eAAO,MAAM,KAAK,+GAMhB,CAAC;AAEH,eAAO,MAAM,IAAI,mFAEf,CAAC;AAEH,eAAO,MAAM,MAAM,mFAIjB,CAAC"}

package/dist/commands/auth.impl.js

@@ -30,9 +30,9 @@ async function pollLoginRedeem(baseUrl, sessionId, timeoutMs = 3e5, intervalMs =
   }
   return { status: "expired" };
 }
-const login = buildHandler(async function(_, token) {
-  const environment = this.config.environment;
-  const baseUrl = this.config.baseUrl;
+async function runLogin(context, token) {
+  const environment = context.config.environment;
+  const baseUrl = context.config.baseUrl;
   if (token) {
     const update2 = {
       token,
@@ -41,11 +41,11 @@ const login = buildHandler(async function(_, token) {
     if (environment !== "prod") {
       update2.environment = environment;
     }
-    await this.config.update(update2);
-    this.io.writeErr("Successfully logged in!");
+    await context.config.update(update2);
+    context.io.writeErr("Successfully logged in!");
     return;
   }
-  this.io.writeErr("Starting browser login...\n");
+  context.io.writeErr("Starting browser login...\n");
   let initResponse;
   try {
     initResponse = await loginFetch(
@@ -54,40 +54,40 @@ const login = buildHandler(async function(_, token) {
       {}
     );
   } catch (error) {
-    this.io.writeErr(
+    context.io.writeErr(
       `Failed to start login: ${error instanceof Error ? error.message : String(error)}`
     );
     process.exit(1);
   }
   const { sessionId, verificationCode, browserUrl } = initResponse;
-  this.io.writeErr(
+  context.io.writeErr(
     "Copy this verification code and paste it in your browser:\n"
   );
-  this.io.writeErr(`  ${verificationCode}
+  context.io.writeErr(`  ${verificationCode}
 `);
-  await this.io.input({
-    message: "Press Enter to open browser...",
+  await context.io.input({
+    message: `Press Enter to open the browser, or visit: ${browserUrl}`,
     noTTY: `Please visit this URL to authenticate:
   ${browserUrl}`
   });
   try {
     await openNotionUrl(environment, browserUrl);
   } catch (_error) {
-    this.io.writeErr(
+    context.io.writeErr(
       `Could not open browser automatically. Please visit:
   ${browserUrl}`
     );
   }
-  this.io.writeErr("");
-  this.io.writeErr("Waiting for browser confirmation...");
-  this.io.writeErr("(Press Ctrl+C to cancel)\n");
+  context.io.writeErr("");
+  context.io.writeErr("Waiting for browser confirmation...");
+  context.io.writeErr("(Press Ctrl+C to cancel)\n");
   const redeemResponse = await pollLoginRedeem(baseUrl, sessionId);
   if (redeemResponse.status === "expired") {
-    this.io.writeErr("Login session expired. Please try again.");
+    context.io.writeErr("Login session expired. Please try again.");
     process.exit(1);
   }
   if (redeemResponse.status !== "confirmed") {
-    this.io.writeErr("Login failed. Please try again.");
+    context.io.writeErr("Login failed. Please try again.");
     process.exit(1);
   }
   const update = {
@@ -97,8 +97,11 @@ const login = buildHandler(async function(_, token) {
   if (environment !== "prod") {
     update.environment = environment;
   }
-  await this.config.update(update);
-  this.io.writeErr("\u2713 Successfully logged in!");
+  await context.config.update(update);
+  context.io.writeErr("\u2713 Successfully logged in!");
+}
+const login = buildHandler(async function(_, token) {
+  await runLogin(this, token);
 });
 const show = buildHandler(function() {
   this.io.writeOut(`${this.config.token ?? ""}`);
@@ -111,5 +114,6 @@ const logout = buildHandler(async function() {
 export {
   login,
   logout,
+  runLogin,
   show
 };

package/dist/commands/deploy.impl.d.ts

@@ -1,6 +1,7 @@
+import type { GlobalFlags } from "../flags.js";
 interface DeployFlags {
     name?: string;
 }
-export declare const deploy: (this: import("../context.js").LocalContext, flags: import("../flags.js").GlobalFlags & DeployFlags) => Promise<void>;
+export declare const deploy: (this: import("../context.js").LocalContext, flags: GlobalFlags & DeployFlags) => Promise<void>;
 export {};
 //# sourceMappingURL=deploy.impl.d.ts.map

package/dist/commands/deploy.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.impl.d.ts","sourceRoot":"","sources":["../../src/commands/deploy.impl.ts"],"names":[],"mappings":"AAKA,UAAU,WAAW;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;CACd;AAED,eAAO,MAAM,MAAM,uHA+DjB,CAAC"}
+{"version":3,"file":"deploy.impl.d.ts","sourceRoot":"","sources":["../../src/commands/deploy.impl.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI/C,UAAU,WAAW;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;CACd;AAED,eAAO,MAAM,MAAM,iGAgFjB,CAAC"}

package/dist/commands/deploy.impl.js

@@ -1,14 +1,28 @@
+import { ApiClient } from "../api/client.js";
 import { Result } from "../api/result.js";
 import { deployWorker } from "../deploy.js";
-import { buildAuthedHandler } from "../handler.js";
-const deploy = buildAuthedHandler(async function(flags) {
-  const { token } = this.config.tokenInfo;
+import { buildHandler } from "../handler.js";
+import { runLogin } from "./auth.impl.js";
+const deploy = buildHandler(async function(flags) {
+  if (!this.config.token) {
+    this.io.writeErr("No authentication token found. Starting login flow...");
+    await runLogin(this);
+  }
+  const { token, cellId } = this.config.tokenInfo;
   const workerId = this.config.workerId;
   const environment = this.config.environment;
   if (!environment) {
     throw new Error("Unexpected error: Environment not set");
   }
   const workerPath = this.process.cwd();
+  const apiClient = new ApiClient({
+    token,
+    environment,
+    baseUrl: this.config.baseUrl,
+    cellId,
+    writer: this.io
+  });
+  const authedContext = { ...this, apiClient };
   this.io.writeErr("Deploying worker...");
   const name = flags.name;
   if (workerId && name) {
@@ -16,7 +30,7 @@ const deploy = buildAuthedHandler(async function(flags) {
   }
   let result;
   if (workerId) {
-    result = await deployWorker(this, {
+    result = await deployWorker(authedContext, {
       workerPath,
       workerId,
       token,
@@ -38,7 +52,7 @@ const deploy = buildAuthedHandler(async function(flags) {
       }
       validatedName = trimmedName;
     }
-    result = await deployWorker(this, {
+    result = await deployWorker(authedContext, {
       name: validatedName,
       workerPath,
       token,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@project-ajax/cli",
-	"version": "0.0.9",
+	"version": "0.0.11",
 	"description": "A CLI for the Project Ajax platform",
 	"license": "UNLICENSED",
 	"type": "module",