@agilecustoms/envctl 1.2.0 → 1.3.1

package/dist/client/Cli.js

@@ -1,4 +1,10 @@
 import { spawn } from 'child_process';
+import { createWriteStream } from 'node:fs';
+import { mkdir } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { Readable } from 'node:stream';
+import { pipeline } from 'node:stream/promises';
 import path from 'path';
 import * as readline from 'readline';
 import inquirer from 'inquirer';
@@ -95,4 +101,11 @@ export class Cli {
     getKind(cwd) {
         return getDirName(cwd);
     }
+    async writeInTmpFile(stream, fileName) {
+        const outDir = join(tmpdir(), 'envctl');
+        await mkdir(outDir, { recursive: true });
+        const outPath = join(outDir, fileName);
+        await pipeline(Readable.fromWeb(stream), createWriteStream(outPath, { flags: 'w' }));
+        return outPath;
+    }
 }

package/dist/client/EnvApiClient.js

@@ -1,11 +1,14 @@
 import { BusinessException, KnownException, NotFoundException } from '../exceptions.js';
 import { EnvStatus } from '../model/index.js';
-import { HttpClient } from './HttpClient.js';
+import { HttpClient, toUrl } from './HttpClient.js';
 export class EnvApiClient {
     httpClient;
     constructor(httpClient) {
         this.httpClient = httpClient;
     }
+    async fetch(url) {
+        return await fetch(url);
+    }
     async get(key) {
         try {
             return await this.httpClient.fetch(`/ci/env/${key}`);
@@ -28,7 +31,7 @@ export class EnvApiClient {
             }
             throw error;
         }
-        return result.token;
+        return toUrl(`/public/env/${env.key}/extend?token=${result.token}`);
     }
     async create(env) {
         let result;

package/dist/client/HttpClient.js

@@ -1,5 +1,8 @@
 import { BusinessException, HttpException, NotFoundException } from '../exceptions.js';
 const HOST = 'cli.maintenance.agilecustoms.com';
+export function toUrl(path) {
+    return `https://${HOST}/env-api${path}`;
+}
 export class HttpClient {
     constructor() { }
     async post(path, body, options = {}) {
@@ -15,7 +18,7 @@ export class HttpClient {
         return await this.fetch(path, options);
     }
     async fetch(path, options = {}) {
-        const url = `https://${HOST}/env-api${path}`;
+        const url = toUrl(path);
         let response;
         try {
             response = await fetch(url, options);

package/dist/service/LogService.js

@@ -1,9 +1,4 @@
-import { createWriteStream } from 'node:fs';
-import { mkdir } from 'node:fs/promises';
-import { tmpdir } from 'node:os';
-import { basename, join } from 'node:path';
-import { Readable } from 'node:stream';
-import { pipeline } from 'node:stream/promises';
+import { basename } from 'node:path';
 import { TerraformAdapter } from '../client/index.js';
 import { KnownException } from '../exceptions.js';
 import { BaseService } from './BaseService.js';
@@ -32,15 +27,12 @@ export class LogService extends BaseService {
         }).formatToParts(timestamp);
         const get = (type) => parts.find(p => p.type === type)?.value ?? '';
         const outName = `${get('year')}-${get('month')}-${get('day')}_${get('hour')}.${get('minute')}.${get('second')}.log`;
-        const outDir = join(tmpdir(), 'envctl');
-        await mkdir(outDir, { recursive: true });
-        const outPath = join(outDir, outName);
-        const res = await fetch(url);
+        const res = await this.envApi.fetch(url);
         if (!res.ok) {
             const msg = await res.text();
             throw new KnownException(`Failed to download logs: ${res.status} ${res.statusText}${msg ? ` - ${msg}` : ''}`);
         }
-        await pipeline(Readable.fromWeb(res.body), createWriteStream(outPath, { flags: 'w' }));
+        const outPath = await this.cli.writeInTmpFile(res.body, outName);
         console.log(`Logs saved to: ${outPath}`);
         await this.cli.run('open', ['-R', outPath]);
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@agilecustoms/envctl",
   "description": "node.js CLI client for manage environments",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "author": "Alex Chekulaev",
   "type": "module",
   "engines": {