@sysnee/pgs 0.1.4-rc2 → 0.1.4-rc4

package/manager.js

@@ -9,6 +9,9 @@ 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);
 
@@ -21,10 +24,6 @@ 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);
@@ -38,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) || {};
 }
@@ -203,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(path.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() {
@@ -397,13 +413,13 @@ const program = new Command();
 program
     .name('postgres-manager')
     .description('Manage PostgreSQL tenant instances')
-    .version(JSON.parse(readFileSync('package.json', 'utf8')).version);
+    .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.4-rc2",
+  "version": "0.1.4-rc4",
   "description": "Dynamic PostgreSQL service instance manager",
   "type": "module",
   "bin": {