@heronlabs/terminal-cli 2.1.1 → 2.1.2

package/bin/src/infrastructure/environment/environment-module.js

@@ -10,10 +10,12 @@ exports.EnvironmentModule = exports.environmentModule = void 0;
 const env_ssm_1 = require("@heronlabs/env-ssm");
 const common_1 = require("@nestjs/common");
 const config_1 = require("@nestjs/config");
+const database_url_service_1 = require("./services/database-url-service");
 const environment_service_1 = require("./services/environment-service");
 exports.environmentModule = {
     providers: [
         environment_service_1.EnvironmentService,
+        database_url_service_1.DatabaseUrlService,
         {
             provide: env_ssm_1.ConfigService,
             useValue: env_ssm_1.SsmConfigFactory.make(),

package/bin/src/infrastructure/environment/services/database-url-service.js

@@ -0,0 +1,68 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DatabaseUrlService = void 0;
+const env_ssm_1 = require("@heronlabs/env-ssm");
+const common_1 = require("@nestjs/common");
+let DatabaseUrlService = class DatabaseUrlService {
+    ssmConfigService;
+    constructor(ssmConfigService) {
+        this.ssmConfigService = ssmConfigService;
+    }
+    splitFirst(value, delimiter) {
+        const index = value.indexOf(delimiter);
+        if (index === -1) {
+            return [value, undefined];
+        }
+        const head = value.slice(0, index);
+        const tail = value.slice(index + delimiter.length);
+        return [head, tail];
+    }
+    splitLast(value, delimiter) {
+        const index = value.lastIndexOf(delimiter);
+        if (index === -1) {
+            return ['', value];
+        }
+        const head = value.slice(0, index);
+        const tail = value.slice(index + delimiter.length);
+        return [head, tail];
+    }
+    async parse() {
+        try {
+            const databaseUrl = await this.ssmConfigService.getOrThrow('DB_URL');
+            const [, rest = ''] = this.splitFirst(databaseUrl, '://');
+            const [userinfo, remainder] = this.splitLast(rest, '@');
+            const [hostport, name = ''] = this.splitFirst(remainder, '/');
+            const [user, password = ''] = this.splitFirst(userinfo, ':');
+            const [host, port = ''] = this.splitFirst(hostport, ':');
+            const connection = { host, port, name, user, password };
+            const missing = ['host', 'name', 'user'].filter(field => connection[field] === '');
+            if (missing.length > 0) {
+                return {
+                    ok: false,
+                    error: new Error(`Invalid DB_URL: missing ${missing.join(', ')}`),
+                };
+            }
+            return { ok: true, connection };
+        }
+        catch (error) {
+            return {
+                ok: false,
+                error: error instanceof Error ? error : new Error('Invalid DB_URL'),
+            };
+        }
+    }
+};
+exports.DatabaseUrlService = DatabaseUrlService;
+exports.DatabaseUrlService = DatabaseUrlService = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [env_ssm_1.ConfigService])
+], DatabaseUrlService);

package/bin/src/infrastructure/environment/services/environment-service.js

@@ -10,56 +10,28 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EnvironmentService = void 0;
-const env_ssm_1 = require("@heronlabs/env-ssm");
 const common_1 = require("@nestjs/common");
 const config_1 = require("@nestjs/config");
+const database_url_service_1 = require("./database-url-service");
 let EnvironmentService = class EnvironmentService {
     configService;
-    ssmConfigService;
-    async database() {
-        let databaseUrl;
-        try {
-            databaseUrl = await this.ssmConfigService.getOrThrow('DB_URL');
-        }
-        catch (error) {
-            return { ok: false, error: error };
-        }
-        let url;
-        try {
-            url = new URL(databaseUrl);
-        }
-        catch {
-            return { ok: false, error: new Error('Invalid DB_URL') };
-        }
-        const connection = {
-            host: url.hostname,
-            port: url.port,
-            name: url.pathname.slice(1),
-            user: decodeURIComponent(url.username),
-            password: decodeURIComponent(url.password),
-        };
-        const missing = ['host', 'name', 'user'].filter(field => connection[field] === '');
-        if (missing.length > 0) {
-            return {
-                ok: false,
-                error: new Error(`Invalid DB_URL: missing ${missing.join(', ')}`),
-            };
-        }
-        return { ok: true, connection };
+    databaseUrlService;
+    database() {
+        return this.databaseUrlService.parse();
     }
     get storage() {
         return {
             bucketName: this.configService.getOrThrow('AWS_S3_BUCKET_NAME'),
         };
     }
-    constructor(configService, ssmConfigService) {
+    constructor(configService, databaseUrlService) {
         this.configService = configService;
-        this.ssmConfigService = ssmConfigService;
+        this.databaseUrlService = databaseUrlService;
     }
 };
 exports.EnvironmentService = EnvironmentService;
 exports.EnvironmentService = EnvironmentService = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [config_1.ConfigService,
-        env_ssm_1.ConfigService])
+        database_url_service_1.DatabaseUrlService])
 ], EnvironmentService);

package/package.json

@@ -73,6 +73,7 @@
       "@swc/core"
     ],
     "overrides": {
+      "js-yaml@<4.2.0": ">=4.2.0",
       "qs@<6.15.2": ">=6.15.2",
       "tmp@<0.2.6": ">=0.2.6"
     }
@@ -96,5 +97,5 @@
     "test:mutation": "stryker run stryker.conf.json",
     "test:unit": "vitest run"
   },
-  "version": "2.1.1"
+  "version": "2.1.2"
 }