@sysnee/pgs 0.1.5 → 0.1.6

package/manager.js

@@ -6,6 +6,14 @@ import yaml from 'js-yaml';
 import os from 'os';
 import { Command } from 'commander';
 import { execSync } from 'child_process';
+import { fileURLToPath } from 'url';
+import { dirname } from 'path';
+
+import packageJson from './package.json' with { type: 'json' };
+
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
 
 const CONFIG_DIR = path.join(os.homedir(), '.sysnee-config');
 
@@ -16,11 +24,8 @@ const TENANT_ACCESS_FILE_PATH = path.join(CONFIG_DIR, 'tenant-access.json');
 const SETUP_STATUS_PATH = path.join(CONFIG_DIR, 'status.txt');
 
 function loadCompose() {
-    if (!fs.existsSync(COMPOSE_FILE_PATH)) {
-        const dockerComposeInitialContent = readFileSync(path.join(path.dirname(''), 'docker-compose.yml'), 'utf8')
-        writeFileSync(COMPOSE_FILE_PATH, dockerComposeInitialContent)
-    }
     const content = fs.readFileSync(COMPOSE_FILE_PATH, 'utf8');
+    console.debug(`docker-compose file readed from ${COMPOSE_FILE_PATH}`)
     return yaml.load(content);
 }
 
@@ -32,9 +37,6 @@ function saveCompose(doc) {
 // ==================== Tenant Access Management ====================
 
 function loadTenantAccess() {
-    if (!fs.existsSync(TENANT_ACCESS_FILE_PATH)) {
-        fs.writeFileSync(TENANT_ACCESS_FILE_PATH, '{}');
-    }
     const content = fs.readFileSync(TENANT_ACCESS_FILE_PATH, 'utf8');
     return JSON.parse(content) || {};
 }
@@ -59,15 +61,20 @@ function removeTenantAccess(tenantId) {
 // ==================== HAProxy Configuration ====================
 
 function generateHAProxyConfig() {
+    console.debug('In generateHAProxy function')
     const doc = loadCompose();
 
     // Get all tenant services
     const tenants = Object.keys(doc.services || {})
         .filter(name => name.startsWith('pgs_') && name !== 'haproxy');
 
+    console.debug(`tenants.lenght: ${tenants.length}`)
+
     // Get initial HAProxy config
-    const templateFilePath = path.join(path.dirname(''), 'haproxy.cfg')
+    const templateFilePath = path.join(__dirname, 'haproxy.cfg')
+    console.debug(`haproxy template file path: ${templateFilePath}`)
     let config = readFileSync(templateFilePath, 'utf8');
+    console.debug(`haproxy template file loaded`)
 
     // Add all tenant backends to SSL pool for SSL negotiation
     // PostgreSQL will respond 'N' (no SSL) during negotiation, then client retries without SSL
@@ -92,7 +99,9 @@ function generateHAProxyConfig() {
 `;
     }
 
-    fs.writeFileSync(HAPROXY_CFG_PATH, config);
+    console.log(`Preparing to save haproxy file in ${HAPROXY_CFG_PATH}`)
+    writeFileSync(HAPROXY_CFG_PATH, config);
+    console.log(`Succesfully saved haproxy file in ${HAPROXY_CFG_PATH}`)
 }
 
 function updateHAProxyDependsOn() {
@@ -143,6 +152,8 @@ function createInitScript({ tenantId, password, databaseName }) {
     `;
 
     fs.writeFileSync(initFile, sql);
+
+    console.debug('Init script created!')
     return initFile;
 }
 
@@ -188,13 +199,33 @@ function ensureNetwork(doc) {
     }
 }
 
+function initialSetup() {
+    createInitialFiles()
+    ensureDockerPrivilegies()
+    console.log('All ready!')
+}
+
 function ensureDockerPrivilegies() {
+    execSync('sudo usermod -aG docker $USER && newgrp docker')
+    writeFileSync(SETUP_STATUS_PATH, 'container:ok')
+}
+
+function createInitialFiles() {
+    // config dir
     if (!existsSync(CONFIG_DIR)) {
         mkdirSync(CONFIG_DIR, { recursive: true });
     }
-    execSync('sudo usermod -aG docker $USER && newgrp docker')
-    writeFileSync(SETUP_STATUS_PATH, 'container:ok')
-    console.log('All ready!')
+
+    // docker-compose.yml
+    if (!fs.existsSync(COMPOSE_FILE_PATH)) {
+        const dockerComposeInitialContent = readFileSync(path.join(__dirname, 'docker-compose.yml'), 'utf8')
+        writeFileSync(COMPOSE_FILE_PATH, dockerComposeInitialContent)
+    }
+
+    // tenant-access.json
+    if (!fs.existsSync(TENANT_ACCESS_FILE_PATH)) {
+        fs.writeFileSync(TENANT_ACCESS_FILE_PATH, '{}');
+    }
 }
 
 function checkSetupStatus() {
@@ -382,13 +413,13 @@ const program = new Command();
 program
     .name('postgres-manager')
     .description('Manage PostgreSQL tenant instances')
-    .version('0.1.5');
+    .version(packageJson.version);
 
 program
     .command('setup')
     .description('Initial required setup')
     .action(() => {
-        ensureDockerPrivilegies()
+        initialSetup()
     })
 
 program

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sysnee/pgs",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Dynamic PostgreSQL service instance manager",
   "type": "module",
   "bin": {