@photon-ai/flux 0.3.2 → 0.3.3

package/README.md

@@ -31,8 +31,8 @@ Flux is an open-sourced CLI tool that lets developers build and deploy LangChain
 ## Installation
 
 ```
-npm install @photon-cli/flux
-bun add @photon-cli/flux
+npm install @photon-ai/flux
+bun add @photon-ai/flux
 ```
 
 ---
@@ -41,13 +41,13 @@ bun add @photon-cli/flux
 
 | Command | Description |
 |---------|-------------|
-| `npx @photon-cli/flux` | Show help |
-| `npx @photon-cli/flux whoami` | Check account |
-| `npx @photon-cli/flux login` | Login and signup|
-| `npx @photon-cli/flux logout` | Logout |
-| `npx @photon-cli/flux run --local` | Start the development server (local mode) |
-| `npx @photon-cli/flux run --prod` | Start with live iMessage bridge |
-| `npx @photon-cli/flux validate` | Check your code for errors |
+| `npx @photon-ai/flux` | Show help |
+| `npx @photon-ai/flux whoami` | Check account |
+| `npx @photon-ai/flux login` | Login and signup|
+| `npx @photon-ai/flux logout` | Logout |
+| `npx @photon-ai/flux run --local` | Start the development server (local mode) |
+| `npx @photon-ai/flux run --prod` | Start with live iMessage bridge |
+| `npx @photon-ai/flux validate` | Check your code for errors |
 
 ---
 
@@ -57,6 +57,15 @@ Message +16286298650 with you phone number to text the LangChain agent that you
 
 ---
 
+## Log in
+
+Authentication is based on iMessage: 
+- The user (client) sends a code to the Flux number to prove phone ownership. 
+- The server generates a UUID per login attempt. It then waits for the iMessage text from the client with the UUID. Once verified, it will issue a token. 
+- Credentials (token, phone, timestamp) are saved to credentials.json. This way, the user only has to log in once. 
+
+---
+
 ## Usage 
 
 #### Step 1: Create LangChain Agent
@@ -77,11 +86,31 @@ export default {
 Authenticate with your phone number and iMessage: 
 
 ```
-npx @photon-cli/flux login
+npx @photon-ai/flux login
 
 Enter your phone number (e.g. +15551234567): +1234567890
-[FLUX] Validating with server...
-[FLUX] Logged in as +1234567890
+[FLUX] Requesting verification code...
+[FLUX] Verification code: d33gwu
+[FLUX] Opening iMessage to send verification code...
+[FLUX] Please send the code "d33gwu" to +16286298650 via iMessage.
+[FLUX] Waiting for verification...
+[FLUX] Successfully logged in as +1234567890
+```
+
+If already logged in: 
+
+```
+npx @photon-ai/flux login
+
+[FLUX] Already logged in as +1234567890
+```
+
+Log out: 
+
+```
+npx @photon-ai/flux logout
+
+[FLUX] Logged out.
 ```
 
 ### Step 3: Validate
@@ -89,7 +118,7 @@ Enter your phone number (e.g. +15551234567): +1234567890
 Validate that your agent works and exports correctly: 
 
 ```
-npx @photon-cli/flux validate
+npx @photon-ai/flux validate
 
 [FLUX] Validating agent.ts...
 [FLUX] Agent is valid!
@@ -100,7 +129,7 @@ npx @photon-cli/flux validate
 Test your agent through your terminal (no iMessage connection): 
 
 ```
-npx @photon-cli/flux run --local
+npx @photon-ai/flux run --local
 
 [FLUX] Welcome to Flux! Your agent is loaded.
 [FLUX] Type a message to test it. Press Ctrl+C to exit.
@@ -115,7 +144,7 @@ Agent: Hello! How can I assist you today?
 Run your agent locally and connect it to the iMessage bridge. When you message the FLUX number with your phone number, you will receive the output of your LangChain agent: 
 
 ```
-npx @photon-cli/flux run --prod
+npx @photon-ai/flux run --prod
 
 [FLUX] Loading agent from agent.ts...
 [FLUX] Agent loaded successfully!

package/dist/index.js

@@ -11,6 +11,7 @@ var p3 = require('net');
 var util = require('util');
 var worker_threads = require('worker_threads');
 var readline = require('readline');
+var child_process = require('child_process');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -58169,12 +58170,17 @@ async function createGrpcClient(address, grpcOptionsOrServiceImpls, ...serviceIm
 
 // src/service.ts
 var FluxService = class extends Service("FluxService") {
+  // Message handling
   sendMessage = server();
   messageStream = bidi();
   registerAgent = server();
   unregisterAgent = server();
   onIncomingMessage = client();
-  validateUser = server();
+  // Authentication - iMessage verification flow
+  getDynamicCode = server();
+  waitingVerified = server();
+  validateToken = server();
+  revokeToken = server();
 };
 
 // src/flux-client.ts
@@ -58182,9 +58188,11 @@ var GRPC_SERVER_ADDRESS = process.env.FLUX_SERVER_ADDRESS || "fluxy.photon.codes
 var FluxClient = class {
   client = null;
   phoneNumber;
+  token;
   onMessage;
-  constructor(phoneNumber, onMessage) {
+  constructor(phoneNumber, token, onMessage) {
     this.phoneNumber = phoneNumber.replace(/[\s\-\(\)]/g, "");
+    this.token = token;
     this.onMessage = onMessage;
   }
   async connect() {
@@ -58198,7 +58206,7 @@ var FluxClient = class {
   }
   async register() {
     if (!this.client) throw new Error("Not connected. Call connect() first.");
-    const result = await this.client.FluxService.registerAgent(this.phoneNumber);
+    const result = await this.client.FluxService.registerAgent(this.phoneNumber, this.token);
     if (result.success) {
       console.log(`[FLUX] Registered agent for ${this.phoneNumber}`);
       this.startMessageStream();
@@ -58245,8 +58253,9 @@ var FluxClient = class {
 };
 var GRPC_SERVER_ADDRESS2 = process.env.FLUX_SERVER_ADDRESS || "fluxy.photon.codes:443";
 var CONFIG_DIR = m3__namespace.join(process.env.HOME || "~", ".flux");
-var CONFIG_FILE = m3__namespace.join(CONFIG_DIR, "config.json");
-function loadConfig() {
+var CONFIG_FILE = m3__namespace.join(CONFIG_DIR, "credentials.json");
+var VERIFICATION_NUMBER = "+16286298650";
+function loadCredentials() {
   try {
     if (U__namespace.existsSync(CONFIG_FILE)) {
       return JSON.parse(U__namespace.readFileSync(CONFIG_FILE, "utf-8"));
@@ -58255,13 +58264,13 @@ function loadConfig() {
   }
   return {};
 }
-function saveConfig(config) {
+function saveCredentials(credentials) {
   if (!U__namespace.existsSync(CONFIG_DIR)) {
     U__namespace.mkdirSync(CONFIG_DIR, { recursive: true });
   }
-  U__namespace.writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2));
+  U__namespace.writeFileSync(CONFIG_FILE, JSON.stringify(credentials, null, 2));
 }
-function clearConfig() {
+function clearCredentials() {
   if (U__namespace.existsSync(CONFIG_FILE)) {
     U__namespace.unlinkSync(CONFIG_FILE);
   }
@@ -58278,50 +58287,124 @@ async function prompt(question) {
     });
   });
 }
+function openIMessage(to, body) {
+  return new Promise((resolve, reject) => {
+    const url = `sms:${to}&body=${encodeURIComponent(body)}`;
+    const command = process.platform === "darwin" ? `open "${url}"` : process.platform === "win32" ? `start "" "${url}"` : `xdg-open "${url}"`;
+    child_process.exec(command, (error) => {
+      if (error) {
+        reject(error);
+      } else {
+        resolve();
+      }
+    });
+  });
+}
+async function createGrpcClientWithRetry() {
+  const clientImpl = FluxService.Client({
+    async onIncomingMessage() {
+      return { received: true };
+    }
+  });
+  return await createGrpcClient(GRPC_SERVER_ADDRESS2, clientImpl);
+}
 async function login() {
+  const existing = loadCredentials();
+  if (existing.token) {
+    try {
+      const client2 = await createGrpcClientWithRetry();
+      const result = await client2.FluxService.validateToken(existing.token);
+      if (result.valid) {
+        console.log(`[FLUX] Already logged in as ${result.phone}`);
+        return result.phone;
+      }
+    } catch {
+    }
+    clearCredentials();
+  }
   const phoneNumber = await prompt("Enter your phone number (e.g. +15551234567): ");
   if (!phoneNumber.match(/^\+?[0-9]{10,15}$/)) {
-    console.error("Invalid phone number format.");
+    console.error("[FLUX] Invalid phone number format.");
     process.exit(1);
   }
-  console.log("[FLUX] Validating with server...");
+  const normalizedPhone = phoneNumber.startsWith("+") ? phoneNumber : `+${phoneNumber}`;
+  console.log("[FLUX] Requesting verification code...");
   try {
-    const clientImpl = FluxService.Client({
-      async onIncomingMessage() {
-        return { received: true };
-      }
-    });
-    const client2 = await createGrpcClient(GRPC_SERVER_ADDRESS2, clientImpl);
-    const result = await client2.FluxService.validateUser(phoneNumber);
-    if (result.error) {
-      console.error(`[FLUX] Login failed: ${result.error}`);
+    const client2 = await createGrpcClientWithRetry();
+    const clientId = crypto.randomUUID();
+    const codeResult = await client2.FluxService.getDynamicCode(clientId, normalizedPhone);
+    if (codeResult.error) {
+      console.error(`[FLUX] Failed to get verification code: ${codeResult.error}`);
       process.exit(1);
     }
-    if (result.created) {
-      console.log(`[FLUX] New account created for ${phoneNumber}`);
-    } else if (result.exists) {
-      console.log(`[FLUX] Welcome back, ${phoneNumber}`);
+    const code = codeResult.code;
+    console.log(`[FLUX] Verification code: ${code}`);
+    console.log(`[FLUX] Opening iMessage to send verification code...`);
+    try {
+      await openIMessage(VERIFICATION_NUMBER, code);
+      console.log(`[FLUX] Please send the code "${code}" to ${VERIFICATION_NUMBER} via iMessage.`);
+    } catch {
+      console.log(`[FLUX] Could not open iMessage automatically.`);
+      console.log(`[FLUX] Please manually send "${code}" to ${VERIFICATION_NUMBER} via iMessage.`);
     }
-    saveConfig({ phoneNumber });
-    console.log(`[FLUX] Logged in as ${phoneNumber}`);
-    return phoneNumber;
+    console.log("[FLUX] Waiting for verification...");
+    const verifyResult = await client2.FluxService.waitingVerified(clientId);
+    if (verifyResult.error || !verifyResult.token) {
+      console.error(`[FLUX] Verification failed: ${verifyResult.error || "No token received"}`);
+      process.exit(1);
+    }
+    const credentials = {
+      token: verifyResult.token,
+      phone: normalizedPhone,
+      authenticatedAt: (/* @__PURE__ */ new Date()).toISOString()
+    };
+    saveCredentials(credentials);
+    console.log(`[FLUX] Successfully logged in as ${normalizedPhone}`);
+    return normalizedPhone;
   } catch (error) {
     console.error(`[FLUX] Failed to connect to server: ${error.message}`);
     console.error(`[FLUX] Make sure the Flux server is running at ${GRPC_SERVER_ADDRESS2}`);
     process.exit(1);
   }
 }
-function logout() {
-  clearConfig();
+async function logout() {
+  const credentials = loadCredentials();
+  if (credentials.token) {
+    try {
+      const client2 = await createGrpcClientWithRetry();
+      await client2.FluxService.revokeToken(credentials.token);
+    } catch {
+    }
+  }
+  clearCredentials();
   console.log("[FLUX] Logged out.");
 }
-async function getPhoneNumber() {
-  const config = loadConfig();
-  if (config.phoneNumber) {
-    return config.phoneNumber;
+async function getAuthToken() {
+  const credentials = loadCredentials();
+  if (credentials.token && credentials.phone) {
+    try {
+      const client2 = await createGrpcClientWithRetry();
+      const result = await client2.FluxService.validateToken(credentials.token);
+      if (result.valid) {
+        return { token: credentials.token, phone: result.phone };
+      }
+    } catch {
+    }
+    console.log("[FLUX] Session expired. Please log in again.");
+    clearCredentials();
   }
   console.log("[FLUX] Not logged in.");
-  return await login();
+  const phone = await login();
+  const newCredentials = loadCredentials();
+  if (!newCredentials.token) {
+    console.error("[FLUX] Login failed.");
+    process.exit(1);
+  }
+  return { token: newCredentials.token, phone };
+}
+function loadConfig() {
+  const credentials = loadCredentials();
+  return { phoneNumber: credentials.phone };
 }
 var AGENT_FILE_NAME = "agent.ts";
 var tsxRegistered = false;
@@ -58439,7 +58522,7 @@ async function runLocal() {
   askQuestion();
 }
 async function runProd() {
-  const phoneNumber = await getPhoneNumber();
+  const { token, phone: phoneNumber } = await getAuthToken();
   const agentPath = findAgentFile();
   if (!agentPath) {
     console.error("[FLUX] No agent.ts or agent.js found in current directory.");
@@ -58454,7 +58537,7 @@ async function runProd() {
   console.log(`[FLUX] Loading agent from ${m3__namespace.basename(agentPath)}...`);
   const agent = await loadAgent(agentPath);
   console.log("[FLUX] Agent loaded successfully!");
-  const flux = new FluxClient(phoneNumber, async (message) => {
+  const flux = new FluxClient(phoneNumber, token, async (message) => {
     console.log(`[FLUX] Processing message from ${message.userPhoneNumber}: ${message.text}`);
     try {
       const response = await agent.invoke({
@@ -58488,10 +58571,10 @@ async function main() {
   switch (command) {
     case "login":
       await login();
-      break;
+      process.exit(0);
     case "logout":
-      logout();
-      break;
+      await logout();
+      process.exit(0);
     case "run":
       if (flag === "--local") {
         await runLocal();