hereya-cli 0.34.0 → 0.36.0

package/dist/backend/config.js

@@ -1,7 +1,8 @@
 import os from 'node:os';
 import path from 'node:path';
-import { load, save } from "../lib/yaml-utils.js";
-import { BackendType } from "./index.js";
+import { load, save } from '../lib/yaml-utils.js';
+import { BackendType } from './index.js';
+import { secretManager } from './secrets.js';
 export async function getCurrentBackendType() {
     const config = await loadBackendConfig();
     return config.current;
@@ -18,6 +19,39 @@ export async function loadBackendConfig() {
     }
     return data;
 }
+export async function saveCloudCredentials(credentials) {
+    await secretManager.saveSecret(credentials.clientId, {
+        accessToken: credentials.accessToken,
+        refreshToken: credentials.refreshToken,
+    });
+    const config = await loadBackendConfig();
+    config.cloud = {
+        clientId: credentials.clientId,
+        url: credentials.url,
+    };
+    config.current = BackendType.Cloud;
+    await save(config, getBackendConfigPath());
+}
+export async function deleteCloudCredentials() {
+    const config = await loadBackendConfig();
+    const originalConfig = { ...config };
+    if (!config.cloud) {
+        return { didDelete: false, originalConfig, secret: null, success: true };
+    }
+    const secret = await secretManager.getSecret(config.cloud.clientId);
+    if (secret) {
+        await secretManager.deleteSecret(config.cloud.clientId);
+    }
+    config.cloud = undefined;
+    if (config.current === BackendType.Cloud) {
+        config.current = BackendType.Local;
+    }
+    await save(config, getBackendConfigPath());
+    return { didDelete: true, originalConfig, secret, success: true };
+}
+export async function getCloudCredentials(clientId) {
+    return secretManager.getSecret(clientId);
+}
 export function getBackendConfigPath() {
     return path.join(os.homedir(), '.hereya', 'backend.yaml');
 }

package/dist/backend/file.d.ts

@@ -1,5 +1,5 @@
 import { Config } from '../lib/config/common.js';
-import { AddPackageToWorkspaceInput, AddPackageToWorkspaceOutput, Backend, CreateWorkspaceInput, CreateWorkspaceOutput, DeleteWorkspaceInput, DeleteWorkspaceOutput, GetProvisioningIdInput, GetProvisioningIdOutput, GetStateInput, GetStateOutput, GetWorkspaceEnvInput, GetWorkspaceEnvOutput, GetWorkspaceOutput, InitProjectInput, InitProjectOutput, RemovePackageFromWorkspaceInput, RemovePackageFromWorkspaceOutput, SetEnvVarInput, SetEnvVarOutput, UnsetEnvVarInput, UnsetEnvVarOutput } from './common.js';
+import { AddPackageToWorkspaceInput, AddPackageToWorkspaceOutput, Backend, CreateWorkspaceInput, CreateWorkspaceOutput, DeleteWorkspaceInput, DeleteWorkspaceOutput, ExportBackendOutput, GetProvisioningIdInput, GetProvisioningIdOutput, GetStateInput, GetStateOutput, GetWorkspaceEnvInput, GetWorkspaceEnvOutput, GetWorkspaceOutput, ImportBackendInput, ImportBackendOutput, InitProjectInput, InitProjectOutput, RemovePackageFromWorkspaceInput, RemovePackageFromWorkspaceOutput, SetEnvVarInput, SetEnvVarOutput, UnsetEnvVarInput, UnsetEnvVarOutput } from './common.js';
 import { FileStorage } from './file-storage/common.js';
 export declare class FileBackend implements Backend {
     private readonly fileStorage;
@@ -7,10 +7,12 @@ export declare class FileBackend implements Backend {
     addPackageToWorkspace(input: AddPackageToWorkspaceInput): Promise<AddPackageToWorkspaceOutput>;
     createWorkspace(input: CreateWorkspaceInput): Promise<CreateWorkspaceOutput>;
     deleteWorkspace(input: DeleteWorkspaceInput): Promise<DeleteWorkspaceOutput>;
+    exportBackend(): Promise<ExportBackendOutput>;
     getProvisioningId(input: GetProvisioningIdInput): Promise<GetProvisioningIdOutput>;
     getState(input: GetStateInput): Promise<GetStateOutput>;
     getWorkspace(workspace: string): Promise<GetWorkspaceOutput>;
     getWorkspaceEnv(input: GetWorkspaceEnvInput): Promise<GetWorkspaceEnvOutput>;
+    importBackend(_: ImportBackendInput): Promise<ImportBackendOutput>;
     init(options: InitProjectInput): Promise<InitProjectOutput>;
     listWorkspaces(): Promise<string[]>;
     removePackageFromWorkspace(input: RemovePackageFromWorkspaceInput): Promise<RemovePackageFromWorkspaceOutput>;

package/dist/backend/file.js

@@ -24,7 +24,7 @@ export class FileBackend {
         const { workspace } = workspace$;
         if (workspace.mirrorOf) {
             return {
-                reason: `Cannot add package to mirrored workspace ${input.workspace}`,
+                reason: `Cannot add package to mirroring workspace ${input.workspace}`,
                 success: false,
             };
         }
@@ -154,6 +154,12 @@ export class FileBackend {
             success: false,
         };
     }
+    async exportBackend() {
+        return {
+            reason: 'This backend does not support exporting',
+            success: false,
+        };
+    }
     async getProvisioningId(input) {
         const idPaths = [`provisioning/${input.logicalId}.yaml`, `provisioning/${input.logicalId}.yml`];
         const newId = `p-${randomUUID()}`;
@@ -285,6 +291,12 @@ export class FileBackend {
             success: true,
         };
     }
+    async importBackend(_) {
+        return {
+            reason: 'This backend does not support importing',
+            success: false,
+        };
+    }
     async init(options) {
         return {
             project: {
@@ -372,7 +384,7 @@ export class FileBackend {
         const { workspace } = workspace$;
         workspace.env = {
             ...workspace.env,
-            [input.name]: input.value,
+            [input.name]: `${input.infrastructure}:${input.value}`,
         };
         await this.saveWorkspace(workspace, input.workspace);
         return {

package/dist/backend/index.d.ts

@@ -1,7 +1,9 @@
 import { Backend } from './common.js';
-export declare function getBackend(): Promise<Backend>;
+export declare function getBackend(type?: BackendType): Promise<Backend>;
+export declare function clearBackend(): void;
 export declare function setBackendType(type: BackendType): void;
 export declare enum BackendType {
+    Cloud = "cloud",
     Local = "local",
     S3 = "s3"
 }

package/dist/backend/index.js

@@ -1,15 +1,33 @@
 import { getAwsConfig } from '../infrastructure/aws-config.js';
-import { getCurrentBackendType } from './config.js';
+import { CloudBackend } from './cloud/cloud-backend.js';
+import { getCloudCredentials, loadBackendConfig } from './config.js';
 import { LocalFileBackend } from './local.js';
 import { S3FileBackend } from './s3.js';
 let backend;
 let currentBackendType;
-export async function getBackend() {
+export async function getBackend(type) {
     if (backend) {
         return backend;
     }
-    const backendType = currentBackendType ?? await getCurrentBackendType();
+    const backendConfig = await loadBackendConfig();
+    const backendType = type ?? currentBackendType ?? backendConfig.current;
     switch (backendType) {
+        case BackendType.Cloud: {
+            if (!backendConfig.cloud) {
+                throw new Error('Cloud credentials not found. Please run `hereya login` first.');
+            }
+            const credentials = await getCloudCredentials(backendConfig.cloud.clientId);
+            if (!credentials) {
+                throw new Error('Cloud credentials not found. Please run `hereya login` first.');
+            }
+            backend = new CloudBackend({
+                accessToken: credentials.accessToken,
+                clientId: backendConfig.cloud.clientId,
+                refreshToken: credentials.refreshToken,
+                url: backendConfig.cloud.url,
+            });
+            break;
+        }
         case BackendType.Local: {
             backend = new LocalFileBackend();
             break;
@@ -28,11 +46,16 @@ export async function getBackend() {
     }
     return backend;
 }
+export function clearBackend() {
+    backend = undefined;
+    currentBackendType = undefined;
+}
 export function setBackendType(type) {
     currentBackendType = type;
 }
 export var BackendType;
 (function (BackendType) {
+    BackendType["Cloud"] = "cloud";
     BackendType["Local"] = "local";
     BackendType["S3"] = "s3";
 })(BackendType || (BackendType = {}));

package/dist/backend/secrets.d.ts

@@ -0,0 +1,5 @@
+export declare const secretManager: {
+    deleteSecret(name: string): Promise<void>;
+    getSecret<T>(name: string): Promise<null | T>;
+    saveSecret<T>(name: string, value: T): Promise<void>;
+};

package/dist/backend/secrets.js

@@ -0,0 +1,66 @@
+import fs from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+const SECRETS_DIR = path.join(os.homedir(), '.hereya', 'secrets');
+async function ensureSecretsDir() {
+    try {
+        await fs.mkdir(SECRETS_DIR, { recursive: true });
+    }
+    catch {
+        // Ignore if directory already exists
+    }
+}
+async function getSecretPath(name) {
+    await ensureSecretsDir();
+    return path.join(SECRETS_DIR, `${name}.json`);
+}
+export const secretManager = {
+    async deleteSecret(name) {
+        try {
+            const keytar = await import('keytar').then((m) => m.default);
+            await keytar.deletePassword('hereya', name);
+        }
+        catch {
+            // Fallback to file-based storage
+            const secretPath = await getSecretPath(name);
+            try {
+                await fs.unlink(secretPath);
+            }
+            catch {
+                // Ignore if file doesn't exist
+            }
+        }
+    },
+    async getSecret(name) {
+        try {
+            const keytar = await import('keytar').then((m) => m.default);
+            const value = await keytar.getPassword('hereya', name);
+            if (!value) {
+                return null;
+            }
+            return JSON.parse(value);
+        }
+        catch {
+            // Fallback to file-based storage
+            const secretPath = await getSecretPath(name);
+            try {
+                const value = await fs.readFile(secretPath, 'utf8');
+                return JSON.parse(value);
+            }
+            catch {
+                return null;
+            }
+        }
+    },
+    async saveSecret(name, value) {
+        try {
+            const keytar = await import('keytar').then((m) => m.default);
+            await keytar.setPassword('hereya', name, JSON.stringify(value));
+        }
+        catch {
+            // Fallback to file-based storage
+            const secretPath = await getSecretPath(name);
+            await fs.writeFile(secretPath, JSON.stringify(value), 'utf8');
+        }
+    },
+};

package/dist/commands/config/export-backend/index.d.ts

@@ -0,0 +1,9 @@
+import { Command } from '@oclif/core';
+export default class ConfigExportBackend extends Command {
+    static args: {
+        file: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
+    };
+    static description: string;
+    static examples: string[];
+    run(): Promise<void>;
+}

package/dist/commands/config/export-backend/index.js

@@ -0,0 +1,28 @@
+import { Args, Command } from '@oclif/core';
+import { writeFile } from 'node:fs/promises';
+import { join } from 'node:path';
+import { getBackend } from '../../../backend/index.js';
+export default class ConfigExportBackend extends Command {
+    static args = {
+        file: Args.string({
+            description: 'Path to save the export file. Defaults to cloud-backend.json in current directory',
+            required: false,
+        }),
+    };
+    static description = 'Export the cloud backend configuration to a file';
+    static examples = [
+        '<%= config.bin %> <%= command.id %>',
+        '<%= config.bin %> <%= command.id %> ./path/to/export.json',
+    ];
+    async run() {
+        const { args } = await this.parse(ConfigExportBackend);
+        const backend = await getBackend();
+        const result = await backend.exportBackend();
+        if (!result.success) {
+            this.error(`Failed to export backend: ${result.reason}`);
+        }
+        const filePath = args.file ?? join(process.cwd(), 'cloud-backend.json');
+        await writeFile(filePath, result.data);
+        this.log(`Backend configuration exported to ${filePath}`);
+    }
+}

package/dist/commands/config/import-backend/index.d.ts

@@ -0,0 +1,9 @@
+import { Command } from '@oclif/core';
+export default class ConfigImportBackend extends Command {
+    static args: {
+        file: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
+    };
+    static description: string;
+    static examples: string[];
+    run(): Promise<void>;
+}

package/dist/commands/config/import-backend/index.js

@@ -0,0 +1,25 @@
+import { Args, Command } from '@oclif/core';
+import { readFile } from 'node:fs/promises';
+import { getBackend } from '../../../backend/index.js';
+export default class ConfigImportBackend extends Command {
+    static args = {
+        file: Args.string({
+            description: 'Path to the file containing the backend configuration to import',
+            required: true,
+        }),
+    };
+    static description = 'Import a backend configuration from a file';
+    static examples = [
+        '<%= config.bin %> <%= command.id %> ./path/to/cloud-backend.json',
+    ];
+    async run() {
+        const { args } = await this.parse(ConfigImportBackend);
+        const backend = await getBackend();
+        const fileContent = await readFile(args.file, 'utf8');
+        const result = await backend.importBackend({ data: fileContent });
+        if (!result.success) {
+            this.error(`Failed to import backend: ${result.reason}`);
+        }
+        this.log('Backend configuration imported successfully');
+    }
+}

package/dist/commands/init/index.js

@@ -36,7 +36,7 @@ export default class Init extends Command {
             workspace: flags.workspace,
         });
         const content = {
-            project: initProjectOutput.project.id,
+            project: initProjectOutput.project.name,
             workspace: initProjectOutput.workspace.name,
         };
         await configManager.saveConfig({ config: content, projectRootDir });

package/dist/commands/login/index.d.ts

@@ -0,0 +1,9 @@
+import { Command } from '@oclif/core';
+export default class Login extends Command {
+    static args: {
+        url: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
+    };
+    static description: string;
+    static examples: string[];
+    run(): Promise<void>;
+}

package/dist/commands/login/index.js

@@ -0,0 +1,27 @@
+import { Args, Command } from '@oclif/core';
+import { loginToCloudBackend } from '../../backend/cloud/login.js';
+import { saveCloudCredentials } from '../../backend/config.js';
+export default class Login extends Command {
+    static args = {
+        url: Args.string({ description: 'URL of the Hereya Cloud backend', required: true }),
+    };
+    static description = 'Login to the Hereya Cloud backend';
+    static examples = [
+        '<%= config.bin %> <%= command.id %> https://cloud.hereya.dev',
+        '<%= config.bin %> <%= command.id %> http://localhost:5173',
+    ];
+    async run() {
+        const { args } = await this.parse(Login);
+        const result = await loginToCloudBackend(args.url);
+        if (!result.success) {
+            this.error(result.error);
+        }
+        await saveCloudCredentials({
+            accessToken: result.accessToken,
+            clientId: result.clientId,
+            refreshToken: result.refreshToken,
+            url: args.url,
+        });
+        this.log(`Logged in to ${args.url}`);
+    }
+}

package/dist/commands/logout/index.d.ts

@@ -0,0 +1,6 @@
+import { Command } from '@oclif/core';
+export default class Logout extends Command {
+    static description: string;
+    static examples: string[];
+    run(): Promise<void>;
+}

package/dist/commands/logout/index.js

@@ -0,0 +1,23 @@
+import { Command } from '@oclif/core';
+import { logoutFromCloudBackend } from '../../backend/cloud/logout.js';
+import { deleteCloudCredentials } from '../../backend/config.js';
+export default class Logout extends Command {
+    static description = 'Logout from Hereya Cloud';
+    static examples = ['<%= config.bin %> <%= command.id %>'];
+    async run() {
+        await this.parse(Logout);
+        const result = await deleteCloudCredentials();
+        if (result.originalConfig.cloud) {
+            await logoutFromCloudBackend({
+                secret: result.secret,
+                url: result.originalConfig.cloud.url,
+            });
+        }
+        if (result.didDelete) {
+            this.log('Logged out from Hereya Cloud');
+        }
+        else {
+            this.log('Not logged in to Hereya Cloud');
+        }
+    }
+}

package/dist/executor/local.js

@@ -76,8 +76,9 @@ export class LocalExecutor {
             return { reason: setEnvVarOutput.reason, success: false };
         }
         return backend.setEnvVar({
+            infrastructure: input.infra,
             name: input.name,
-            value: `${input.infra}:${setEnvVarOutput.value}`,
+            value: setEnvVarOutput.value,
             workspace: input.workspace,
         });
     }
@@ -116,6 +117,7 @@ export class LocalExecutor {
             };
         }
         return backend.unsetEnvVar({
+            infrastructure: infra,
             name: input.name,
             workspace: input.workspace,
         });

package/dist/infrastructure/aws.js

@@ -7,24 +7,9 @@ import { getIac } from '../iac/index.js';
 import { downloadPackage } from '../lib/package/index.js';
 import { runShell } from '../lib/shell.js';
 import { getAwsConfig, getAwsConfigKey } from './aws-config.js';
-import { getPackageDownloadPath } from './common.js';
+import { getPackageDownloadPath, } from './common.js';
 import { destroyPackage, provisionPackage } from './index.js';
 export class AwsInfrastructure {
-    // public static configKey = '/hereya-bootstrap/config'
-    // public static async getConfig(): Promise<{
-    //   backendBucket: string
-    //   terraformStateBucketName: string
-    //   terraformStateBucketRegion?: string
-    //   terraformStateLockTableName: string
-    // }> {
-    //   const ssmClient = new SSMClient({})
-    //   const ssmParameter = await ssmClient.send(
-    //     new GetParameterCommand({
-    //       Name: AwsInfrastructure.configKey,
-    //     }),
-    //   )
-    //   return JSON.parse(ssmParameter.Parameter?.Value ?? '{}')
-    // }
     async bootstrap(_) {
         const stsClient = new STSClient({});
         const { Account: accountId } = await stsClient.send(new GetCallerIdentityCommand({}));
@@ -59,7 +44,7 @@ export class AwsInfrastructure {
         const downloadPath = await downloadPackage(input.pkgUrl, destPath);
         const region = process.env.AWS_REGION || process.env.AWS_DEFAULT_REGION;
         const infraConfig = {
-            ...await getAwsConfig(),
+            ...(await getAwsConfig()),
             region,
         };
         if (!infraConfig.terraformStateBucketName || !infraConfig.terraformStateLockTableName) {

package/oclif.manifest.json

@@ -313,6 +313,61 @@
         "index.js"
       ]
     },
+    "login": {
+      "aliases": [],
+      "args": {
+        "url": {
+          "description": "URL of the Hereya Cloud backend",
+          "name": "url",
+          "required": true
+        }
+      },
+      "description": "Login to the Hereya Cloud backend",
+      "examples": [
+        "<%= config.bin %> <%= command.id %> https://cloud.hereya.dev",
+        "<%= config.bin %> <%= command.id %> http://localhost:5173"
+      ],
+      "flags": {},
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "login",
+      "pluginAlias": "hereya-cli",
+      "pluginName": "hereya-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "login",
+        "index.js"
+      ]
+    },
+    "logout": {
+      "aliases": [],
+      "args": {},
+      "description": "Logout from Hereya Cloud",
+      "examples": [
+        "<%= config.bin %> <%= command.id %>"
+      ],
+      "flags": {},
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "logout",
+      "pluginAlias": "hereya-cli",
+      "pluginName": "hereya-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "logout",
+        "index.js"
+      ]
+    },
     "remove": {
       "aliases": [],
       "args": {
@@ -558,6 +613,38 @@
         "index.js"
       ]
     },
+    "config:export-backend": {
+      "aliases": [],
+      "args": {
+        "file": {
+          "description": "Path to save the export file. Defaults to cloud-backend.json in current directory",
+          "name": "file",
+          "required": false
+        }
+      },
+      "description": "Export the cloud backend configuration to a file",
+      "examples": [
+        "<%= config.bin %> <%= command.id %>",
+        "<%= config.bin %> <%= command.id %> ./path/to/export.json"
+      ],
+      "flags": {},
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "config:export-backend",
+      "pluginAlias": "hereya-cli",
+      "pluginName": "hereya-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "config",
+        "export-backend",
+        "index.js"
+      ]
+    },
     "config:get-backend": {
       "aliases": [],
       "args": {},
@@ -583,6 +670,37 @@
         "index.js"
       ]
     },
+    "config:import-backend": {
+      "aliases": [],
+      "args": {
+        "file": {
+          "description": "Path to the file containing the backend configuration to import",
+          "name": "file",
+          "required": true
+        }
+      },
+      "description": "Import a backend configuration from a file",
+      "examples": [
+        "<%= config.bin %> <%= command.id %> ./path/to/cloud-backend.json"
+      ],
+      "flags": {},
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "config:import-backend",
+      "pluginAlias": "hereya-cli",
+      "pluginName": "hereya-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "config",
+        "import-backend",
+        "index.js"
+      ]
+    },
     "config:use-backend": {
       "aliases": [],
       "args": {
@@ -1063,5 +1181,5 @@
       ]
     }
   },
-  "version": "0.34.0"
+  "version": "0.36.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hereya-cli",
   "description": "Infrastructure as Package",
-  "version": "0.34.0",
+  "version": "0.36.0",
   "author": "Hereya Developers",
   "bin": {
     "hereya": "./bin/run.js"
@@ -21,7 +21,10 @@
     "@oclif/plugin-plugins": "^5.4.31",
     "glob": "^11.0.1",
     "ignore": "^7.0.3",
+    "keytar": "^7.9.0",
     "listr2": "^8.2.5",
+    "node-machine-id": "^1.1.12",
+    "open": "^10.1.1",
     "simple-git": "^3.27.0",
     "unzip-stream": "^0.3.4",
     "yaml": "^2.7.0",
@@ -43,7 +46,7 @@
     "eslint-plugin-chai-friendly": "^1.0.1",
     "mocha": "^11.1.0",
     "mock-fs": "^5.5.0",
-    "nock": "^14.0.1",
+    "nock": "^14.0.3",
     "oclif": "^4.17.27",
     "shx": "^0.3.4",
     "sinon": "^19.0.2",