@akanjs/devkit 2.1.1 → 2.1.2-rc.1

package/cloud/cloudApi.ts

@@ -1,9 +1,5 @@
-import {
-  type AccessToken,
-  type AccessTokenDto,
-  akanCloudHost,
-  type HostConfig,
-} from "./constants";
+import type { Workspace } from "../commandDecorators";
+import { type AccessToken, type AccessTokenDto, akanCloudHost, type HostConfig } from "./constants";
 import { GlobalConfig } from "./globalConfig";
 
 class HttpClient {
@@ -13,10 +9,7 @@ class HttpClient {
     this.baseUrl = baseUrl;
     this.headers = headers;
   }
-  async get<T>(
-    url: string,
-    { headers }: { headers?: Record<string, string> } = {},
-  ): Promise<T> {
+  async get<T>(url: string, { headers }: { headers?: Record<string, string> } = {}): Promise<T> {
     const response = await fetch(`${this.baseUrl}${url}`, {
       headers: {
         "Content-Type": "application/json",
@@ -26,25 +19,14 @@ class HttpClient {
     });
     return response.json();
   }
-  async getFile(
-    url: string,
-    localPath: string,
-    headers?: Record<string, string>,
-  ): Promise<void> {
+  async getFile(url: string, localPath: string, headers?: Record<string, string>): Promise<void> {
     const response = await fetch(`${this.baseUrl}${url}`, {
       headers: { ...this.headers, ...headers },
     });
-    if (!response.ok)
-      throw new Error(
-        `Failed to download file: ${response.status} ${response.statusText}`,
-      );
+    if (!response.ok) throw new Error(`Failed to download file: ${response.status} ${response.statusText}`);
     await Bun.write(localPath, response);
   }
-  async post<T>(
-    url: string,
-    data: unknown,
-    { headers }: { headers?: Record<string, string> } = {},
-  ): Promise<T> {
+  async post<T>(url: string, data: unknown, { headers }: { headers?: Record<string, string> } = {}): Promise<T> {
     const isFormData = data instanceof FormData;
     const response = await fetch(`${this.baseUrl}${url}`, {
       method: "POST",
@@ -64,12 +46,14 @@ class HttpClient {
 export class CloudApi {
   readonly #api: HttpClient;
   #accessToken: AccessToken | null = null;
+  #workspace: Workspace;
 
-  static async fromHost(host?: string) {
+  static async fromHost(workspace: Workspace, host?: string) {
     const hostConfig = await GlobalConfig.getHostConfig(host);
-    return new CloudApi(hostConfig);
+    return new CloudApi(workspace, hostConfig);
   }
-  constructor(hostConfig: HostConfig) {
+  constructor(workspace: Workspace, hostConfig: HostConfig) {
+    this.#workspace = workspace;
     const host = akanCloudHost;
     this.#api = new HttpClient(`${host}/api`);
     this.#accessToken = hostConfig.auth?.accessToken ?? null;
@@ -83,25 +67,21 @@ export class CloudApi {
     const formData = new FormData();
     formData.append("devProjectId", devProjectId);
     formData.append("file", file);
-    const data = await this.#api.post<boolean>(
-      `/uploadEnv/${devProjectId}`,
-      formData,
-    );
+    const data = await this.#api.post<boolean>(`/uploadEnv/${devProjectId}`, formData);
     return data;
   }
-  async downloadEnv(devProjectId: string, localPath: string): Promise<void> {
+  async downloadEnv(devProjectId: string): Promise<unknown> {
+    const localPath = `${this.#workspace.workspaceRoot}/local/env.tar`;
     await this.#api.getFile(`/downloadEnv/${devProjectId}`, localPath);
+    return localPath;
   }
   async getRemoteAuthToken(remoteId: string): Promise<AccessToken | null> {
     try {
       if (this.#accessToken) {
-        if (GlobalConfig.needRefreshToken(this.#accessToken))
-          return await this.refreshAuthToken();
-        else return await this.refreshAuthToken();
+        if (GlobalConfig.needRefreshToken(this.#accessToken)) return await this.#refreshAuthToken();
+        else return await this.#refreshAuthToken();
       }
-      const accessToken = await this.#api.get<AccessTokenDto>(
-        `/getRemoteAuthToken/${remoteId}`,
-      );
+      const accessToken = await this.#api.get<AccessTokenDto>(`/getRemoteAuthToken/${remoteId}`);
       this.#accessToken = GlobalConfig.toAccessToken(accessToken);
       this.#api.setHeaders({
         Authorization: `Bearer ${this.#accessToken.jwt}`,
@@ -111,22 +91,20 @@ export class CloudApi {
       return null;
     }
   }
-  async refreshAuthToken(): Promise<AccessToken> {
-    const response = await this.#api.post<AccessTokenDto>(
-      `/refreshRemoteAuthToken`,
-      {
-        refreshToken: this.#accessToken?.refreshToken,
-      },
-    );
+  async #refreshAuthToken(): Promise<AccessToken> {
+    const refreshToken = this.#accessToken?.refreshToken;
+    if (!refreshToken) throw new Error("No refresh token");
+    return await this.refreshAuthToken(refreshToken);
+  }
+  async refreshAuthToken(refreshToken: string): Promise<AccessToken> {
+    const response = await this.#api.post<AccessTokenDto>(`/refreshRemoteAuthToken`, { refreshToken });
     this.#accessToken = GlobalConfig.toAccessToken(response);
     this.#api.setHeaders({ Authorization: `Bearer ${this.#accessToken.jwt}` });
     return this.#accessToken;
   }
   async getRemoteSelf(): Promise<{ id: string; nickname: string } | null> {
     try {
-      const data = await this.#api.get<{ id: string; nickname: string }>(
-        `/getRemoteSelf`,
-      );
+      const data = await this.#api.get<{ id: string; nickname: string }>(`/getRemoteSelf`);
       return data;
     } catch {
       return null;

package/executors.test.ts

@@ -251,6 +251,53 @@ describe("Workspace and app executor environment contracts", () => {
     expect((await stat(path.join(root, "dist/apps/demo/private"))).isDirectory()).toBe(true);
     expect((await stat(path.join(root, "dist/apps/demo/public"))).isDirectory()).toBe(true);
   });
+
+  test("assigns start command ports from sorted app order", async () => {
+    const root = await makeTempRoot();
+    process.env.AKAN_PUBLIC_REPO_NAME = "repo";
+    process.env.AKAN_PUBLIC_SERVE_DOMAIN = "example.com";
+    process.env.AKAN_PUBLIC_ENV = "local";
+
+    await writeJson(path.join(root, "package.json"), rootPackageJson());
+    for (const appName of ["minimal", "akan"]) {
+      await mkdir(path.join(root, `apps/${appName}`), { recursive: true });
+      await writeFile(
+        path.join(root, `apps/${appName}/akan.config.ts`),
+        [
+          "export default {",
+          `  routes: [{ basePath: "${appName}", domains: { debug: ["${appName}.local:8282"] } }],`,
+          "};",
+          "",
+        ].join("\n"),
+      );
+    }
+
+    const workspace = new WorkspaceExecutor({ workspaceRoot: root, repoName: "repo" });
+    const akan = AppExecutor.from(workspace, "akan");
+    const minimal = AppExecutor.from(workspace, "minimal");
+
+    const akanStart = await akan.prepareCommand("start");
+    expect(akanStart.env.PORT).toBe("8282");
+    expect(akanStart.env.AKAN_PUBLIC_CLIENT_PORT).toBe("8282");
+    expect(akanStart.env.AKAN_PUBLIC_SERVER_PORT).toBe("8282");
+
+    const minimalStart = await minimal.prepareCommand("start");
+    expect(minimalStart.env.PORT).toBe("8283");
+    expect(minimalStart.env.AKAN_PUBLIC_CLIENT_PORT).toBe("8283");
+    expect(minimalStart.env.AKAN_PUBLIC_SERVER_PORT).toBe("8283");
+
+    process.env.PORT_OFFSET = "3";
+
+    const offsetAkanStart = await akan.prepareCommand("start");
+    expect(offsetAkanStart.env.PORT).toBe("8285");
+    expect(offsetAkanStart.env.AKAN_PUBLIC_CLIENT_PORT).toBe("8285");
+    expect(offsetAkanStart.env.AKAN_PUBLIC_SERVER_PORT).toBe("8285");
+
+    const offsetMinimalStart = await minimal.prepareCommand("start");
+    expect(offsetMinimalStart.env.PORT).toBe("8286");
+    expect(offsetMinimalStart.env.AKAN_PUBLIC_CLIENT_PORT).toBe("8286");
+    expect(offsetMinimalStart.env.AKAN_PUBLIC_SERVER_PORT).toBe("8286");
+  });
 });
 
 describe("PkgExecutor package generation", () => {