@sysnee/pgs 0.1.6 → 0.1.7-rc.2

package/manager.js

@@ -19,6 +19,7 @@ const CONFIG_DIR = path.join(os.homedir(), '.sysnee-config');
 
 const COMPOSE_FILE_PATH = path.join(CONFIG_DIR, 'docker-compose.yml');
 const INIT_DIR_PATH = path.join(CONFIG_DIR, 'init');
+const LUA_DIR_PATH = path.join(CONFIG_DIR, 'haproxy-lua');
 const HAPROXY_CFG_PATH = path.join(CONFIG_DIR, 'haproxy.cfg');
 const TENANT_ACCESS_FILE_PATH = path.join(CONFIG_DIR, 'tenant-access.json');
 const SETUP_STATUS_PATH = path.join(CONFIG_DIR, 'status.txt');
@@ -118,9 +119,9 @@ function updateHAProxyDependsOn() {
             container_name: 'postgres_proxy',
             ports: ['5432:5432'],
             volumes: [
-                './haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg:ro',
-                './haproxy-lua:/etc/haproxy/lua:ro',
-                './tenant-access.json:/etc/haproxy/tenant-access.json:ro'
+                `${HAPROXY_CFG_PATH}:/usr/local/etc/haproxy/haproxy.cfg:ro`,
+                `${LUA_DIR_PATH}:/etc/haproxy/lua:ro`,
+                `${TENANT_ACCESS_FILE_PATH}:/etc/haproxy/tenant-access.json:ro`
             ],
             networks: ['postgres_network'],
             restart: 'unless-stopped'
@@ -137,7 +138,7 @@ function updateHAProxyDependsOn() {
     saveCompose(doc);
 
     // Restart HAProxy
-    executeCommand('docker restart postgres_proxy');
+    executeCommand('docker compose up -d haproxy');
 }
 
 function createInitScript({ tenantId, password, databaseName }) {
@@ -217,14 +218,31 @@ function createInitialFiles() {
     }
 
     // docker-compose.yml
-    if (!fs.existsSync(COMPOSE_FILE_PATH)) {
+    if (!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, '{}');
+    if (!existsSync(TENANT_ACCESS_FILE_PATH)) {
+        writeFileSync(TENANT_ACCESS_FILE_PATH, '{}');
+    }
+
+    // haproxy.cfg
+    if (!existsSync(HAPROXY_CFG_PATH)) {
+        const haproxyTemplate = readFileSync(path.join(__dirname, 'haproxy.cfg'), 'utf8');
+        writeFileSync(HAPROXY_CFG_PATH, haproxyTemplate);
+    }
+
+    // Lua
+    if (!existsSync(LUA_DIR_PATH)) {
+        mkdirSync(LUA_DIR_PATH, { recursive: true });
+    }
+    const luaSourceFile = path.join(__dirname, 'haproxy-lua', 'pg-route.lua');
+    const luaDestFile = path.join(LUA_DIR_PATH, 'pg-route.lua');
+    if (!existsSync(luaDestFile)) {
+        const luaContent = readFileSync(luaSourceFile, 'utf8');
+        writeFileSync(luaDestFile, luaContent);
     }
 }
 

package/package.json

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