Merge pull request #24 from tago-io/fix/tago-deploy

feat: enhance URL input handling in login command and update environm…

Author: vitorfdl

src/commands/analysis/run-analysis.ts

@@ -1,9 +1,9 @@
-import { SpawnOptions, spawn } from "node:child_process";
+import { spawn, SpawnOptions } from "node:child_process";
 import path from "node:path";
 
 import { Account } from "@tago-io/sdk";
 
-import { IEnvironment, getEnvironmentConfig, resolveCLIPath } from "../../lib/config-file";
+import { getEnvironmentConfig, IEnvironment, resolveCLIPath } from "../../lib/config-file";
 import { getCurrentFolder } from "../../lib/get-current-folder";
 import { errorHandler, highlightMSG, successMSG } from "../../lib/messages";
 import { searchName } from "../../lib/search-name";
@@ -92,7 +92,9 @@ async function runAnalysis(scriptName: string | undefined, options: { environmen
     if (config.profileRegion.realtime) {
       analysisEnv.TAGOIO_REALTIME = config.profileRegion.realtime;
     }
-    // analysisEnv.TAGOIO_SSE = config.profileRegion.sse;
+    if (config.profileRegion.sse) {
+      analysisEnv.TAGOIO_SSE = config.profileRegion.sse;
+    }
   }
 
   const spawnOptions: SpawnOptions = {

src/commands/login.ts

@@ -3,6 +3,7 @@ import prompts from "prompts";
 import { Account } from "@tago-io/sdk";
 import { OTPType } from "@tago-io/sdk/lib/types";
 
+import { addHttpsToUrl } from "../lib/add-https-to-url";
 import { errorHandler, highlightMSG, successMSG } from "../lib/messages";
 import { writeToken } from "../lib/token";
 
@@ -19,24 +20,34 @@ async function getTagoDeployURL(): Promise<{ urlAPI: string; urlSSE: string } |
     return;
   }
 
-  const { urlAPI } = await prompts({ type: "text", name: "urlAPI", message: "Set the URL for the API service: ", hint: "https://api.tago.io" });
+  let { urlAPI } = await prompts({ type: "text", name: "urlAPI", message: "Set the URL for the API service: ", hint: "https://api.tago.io" });
   if (!urlAPI) {
     return;
   }
 
+  urlAPI = addHttpsToUrl(urlAPI);
+
   const sanitizedUrlAPI = new URL(urlAPI).origin;
 
   let { urlSSE } = await prompts({ type: "text", name: "urlSSE", message: "Set the URL for the SSE service: ", hint: "https://sse.tago.io" });
+
+  urlSSE = addHttpsToUrl(urlSSE);
+
   if (!urlSSE) {
     urlSSE = sanitizedUrlAPI.replace("https://api.", "https://sse.");
   }
 
   if (urlSSE) {
+    urlSSE = urlSSE.replace("api.", "sse.");
+
     const sseUrl = new URL(urlSSE);
     sseUrl.pathname = '/events';
     urlSSE = sseUrl.toString();
   }
 
+  process.env.TAGOIO_API = sanitizedUrlAPI;
+  process.env.TAGOIO_SSE = urlSSE;
+
   return { urlAPI: sanitizedUrlAPI, urlSSE };
 }
 

src/commands/start-config.ts

@@ -7,7 +7,7 @@ import { Account } from "@tago-io/sdk";
 import { GenericModuleParams } from "@tago-io/sdk/lib/common/TagoIOModule";
 import { AnalysisInfo, AnalysisListItem } from "@tago-io/sdk/lib/types";
 
-import { IEnvironment, getConfigFile, writeConfigFileEnv, writeToConfigFile } from "../lib/config-file";
+import { getConfigFile, IEnvironment, writeConfigFileEnv, writeToConfigFile } from "../lib/config-file";
 import { errorHandler, highlightMSG, infoMSG } from "../lib/messages";
 import { readToken, writeToken } from "../lib/token";
 import { promptTextToEnter } from "../prompt/text-prompt";
@@ -179,6 +179,9 @@ async function startConfig(environment: string, { token }: ConfigOptions) {
   }
 
   let tagoAPIURL, tagoSSEURL: string | undefined;
+
+
+
   // Get token from file or prompt user to create one
   if (!token) {
     token = readToken(environment);
@@ -187,6 +190,9 @@ async function startConfig(environment: string, { token }: ConfigOptions) {
       token = data?.profileToken;
       tagoAPIURL = data?.tagoDeployUrl;
       tagoSSEURL = data?.tagoDeploySse;
+    } else {
+      tagoAPIURL = configFile[environment]?.tagoAPIURL;
+      tagoSSEURL = configFile[environment]?.tagoSSEURL;
     }
   } else {
     const urlConfig = await getTagoDeployURL()

src/lib/add-https-to-url.ts

@@ -0,0 +1,18 @@
+/**
+ * Add https to the url if it doesn't have it
+ * If the url is already https, return the url
+ * @param url - The url to add https to
+ * @returns The url with https
+ */
+function addHttpsToUrl(url: string): string {
+  if (!url) {
+    return "";
+  }
+
+  if (!url.startsWith("https://")) {
+    return `https://${url}`;
+  }
+  return url;
+}
+
+export { addHttpsToUrl };