el-contador 1.2.8 → 1.2.10

package/README.md

@@ -49,7 +49,7 @@ You do **not** need to install PostgreSQL on the host or create a database/user
 
 On a new server (VPS, dedicated, etc.):
 
-1. Install Node.js (v18+), npm, and Docker (and Docker Compose).
+1. Install Node.js (v18+), npm, Docker, and **Docker Compose V2** (`docker compose`). The CLI requires the Compose plugin; legacy `docker-compose` (V1) is not supported.
 2. Create a directory and install the app as above (e.g. `npm init -y`, `npm install el-contador`, copy `.env.example` to `.env`, set `DB_PASSWORD` and `SESSION_SECRET`).
 3. Start with `npx el-contador` (or the `docker compose -f ...` command). The app listens on `ADMIN_PORT` (default 3080) on the host.
 4. To expose it on a **subdomain or domain** (e.g. `admin.example.com`), configure a **reverse proxy** (nginx, Caddy, or Apache) on that server. The package does not install or configure nginx for you; you add the proxy config yourself. See below.
@@ -117,13 +117,9 @@ After a successful update, the backend log will show `el-contador-server@X.Y.Z`
 - `el-contador down` or `el-contador stop` – stop containers.
 - `el-contador update` – run `npm update el-contador` then rebuild and start.
 
-If `npx el-contador` fails (e.g. "unknown shorthand flag: 'f'"), your host may have Docker but not the Compose plugin in the expected form. Install **docker-compose** (standalone) or run Compose manually from the same directory as `.env`:
+If `npx el-contador` fails with **"docker compose (Compose V2) is required"**, install the Compose plugin: `sudo apt install docker-compose-plugin` (Debian/Ubuntu). Then run `npx el-contador` again.
 
-```bash
-docker-compose --project-directory node_modules/el-contador -f node_modules/el-contador/docker-compose.yml --env-file .env up -d
-```
-
-On Ubuntu: `sudo apt install docker-compose-plugin` (V2) or the standalone `docker-compose` package.
+If you see **KeyError: 'ContainerConfig'** (Python traceback), you are using legacy `docker-compose` (V1). Install Docker Compose V2 as above; the CLI no longer falls back to V1.
 
 ## Publishing to npm (maintainers)
 

package/bin/cli.js

@@ -16,22 +16,19 @@ function shQuote(s) {
   return "'" + String(s).replace(/'/g, "'\"'\"'") + "'";
 }
 
+// Prefer Docker Compose V2 only. V1 (docker-compose) can raise KeyError: 'ContainerConfig'
+// with newer Docker Engine when inspecting container volumes.
 function getDockerComposeCmd() {
-  const r1 = spawnSync(
+  const r = spawnSync(
     process.platform === 'win32' ? 'cmd' : 'sh',
     [process.platform === 'win32' ? '/c' : '-c', 'docker compose version'],
     { stdio: 'ignore' }
   );
-  if (r1.status === 0) return 'docker compose';
-
-  const r2 = spawnSync(
-    process.platform === 'win32' ? 'cmd' : 'sh',
-    [process.platform === 'win32' ? '/c' : '-c', 'docker-compose version'],
-    { stdio: 'ignore' }
-  );
-  if (r2.status === 0) return 'docker-compose';
+  if (r.status === 0) return 'docker compose';
 
-  console.error('el-contador: need "docker compose" or "docker-compose". Install Docker and Docker Compose.');
+  console.error('el-contador: "docker compose" (Compose V2) is required.');
+  console.error('Install the plugin: apt install docker-compose-plugin  (Debian/Ubuntu)');
+  console.error('Or use the Docker Desktop built-in Compose. Legacy "docker-compose" (V1) is not supported.');
   process.exit(1);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "el-contador",
-  "version": "1.2.8",
+  "version": "1.2.10",
   "description": "Bookkeeping and expense management – run with Docker",
   "keywords": [
     "bookkeeping",
@@ -16,6 +16,7 @@
   },
   "files": [
     "server/db",
+    "server/lib",
     "server/middleware",
     "server/routes",
     "server/scripts",

package/server/index.js

@@ -1,5 +1,12 @@
 require('dotenv').config({ path: require('path').join(__dirname, '..', '.env') });
 const path = require('path');
+const fs = require('fs');
+// Fail fast with a clear message if server/lib is missing (e.g. incomplete deploy)
+const libFiscal = path.join(__dirname, 'lib', 'fiscal.js');
+if (!fs.existsSync(libFiscal)) {
+  console.error('Missing server/lib/fiscal.js. Deploy the full server directory including server/lib/.');
+  process.exit(1);
+}
 const express = require('express');
 const session = require('express-session');
 const cookieParser = require('cookie-parser');

package/server/lib/fiscal.js

@@ -0,0 +1,113 @@
+const { pool } = require('../db/pool');
+
+/**
+ * Load fiscal config from invoice_settings. Returns { enabled, startMonth, startDay }.
+ * Default: natural year (enabled: false, startMonth: 1, startDay: 1).
+ */
+async function getFiscalConfig() {
+  const r = await pool.query('SELECT data FROM invoice_settings WHERE id = 1');
+  const raw = r.rows[0]?.data || {};
+  const enabled = Boolean(raw.fiscalYearEnabled);
+  const startMonth = Math.min(12, Math.max(1, Number(raw.fiscalYearStartMonth) || 1));
+  let startDay = Math.min(31, Math.max(1, Number(raw.fiscalYearStartDay) || 1));
+  const maxDay = new Date(2024, startMonth, 0).getDate();
+  if (startDay > maxDay) startDay = maxDay;
+  return { enabled, startMonth, startDay };
+}
+
+function pad(n) {
+  return String(n).padStart(2, '0');
+}
+
+/**
+ * Return { startDate, endDate } (ISO YYYY-MM-DD) for the given fiscal/calendar year number.
+ * When custom fiscal: year 2025 = 2025-startMonth-startDay to day before 2026-startMonth-startDay.
+ */
+function getFiscalYearBounds(yearNumber, config) {
+  const { enabled, startMonth, startDay } = config;
+  if (!enabled || (startMonth === 1 && startDay === 1)) {
+    return {
+      startDate: `${yearNumber}-01-01`,
+      endDate: `${yearNumber}-12-31`,
+    };
+  }
+  const startDate = `${yearNumber}-${pad(startMonth)}-${pad(startDay)}`;
+  const endYear = yearNumber + 1;
+  const endDate = new Date(endYear, startMonth - 1, startDay - 1);
+  const endDateStr = `${endYear}-${pad(endDate.getMonth() + 1)}-${pad(endDate.getDate())}`;
+  return { startDate, endDate: endDateStr };
+}
+
+/**
+ * Return { startDate, endDate } for the given quarter (1-4) of the fiscal/calendar year.
+ * Custom fiscal: Q1 = first 3 months of fiscal year, Q2 = next 3, etc.
+ */
+function getFiscalQuarterBounds(yearNumber, quarter, config) {
+  const { enabled, startMonth, startDay } = config;
+  if (!enabled || (startMonth === 1 && startDay === 1)) {
+    const startMonthQ = (quarter - 1) * 3 + 1;
+    const startDate = `${yearNumber}-${pad(startMonthQ)}-01`;
+    const endMonthQ = quarter * 3;
+    const endDate = new Date(yearNumber, endMonthQ, 0);
+    return {
+      startDate,
+      endDate: `${yearNumber}-${pad(endMonthQ)}-${pad(endDate.getDate())}`,
+    };
+  }
+  const yearStart = getFiscalYearBounds(yearNumber, config).startDate;
+  const start = new Date(yearStart);
+  start.setMonth(start.getMonth() + (quarter - 1) * 3);
+  const end = new Date(start);
+  end.setMonth(end.getMonth() + 3);
+  end.setDate(end.getDate() - 1);
+  const startDate = `${start.getFullYear()}-${pad(start.getMonth() + 1)}-${pad(start.getDate())}`;
+  const endDate = `${end.getFullYear()}-${pad(end.getMonth() + 1)}-${pad(end.getDate())}`;
+  return { startDate, endDate };
+}
+
+/**
+ * Return { startDate, endDate } for the given month (1-12) of the fiscal/calendar year.
+ * Month 1 = first month of fiscal year.
+ */
+function getFiscalMonthBounds(yearNumber, month, config) {
+  const { enabled, startMonth, startDay } = config;
+  if (!enabled || (startMonth === 1 && startDay === 1)) {
+    const startDate = `${yearNumber}-${pad(month)}-01`;
+    const endDate = new Date(yearNumber, month, 0);
+    return {
+      startDate,
+      endDate: `${yearNumber}-${pad(month)}-${pad(endDate.getDate())}`,
+    };
+  }
+  const yearStart = getFiscalYearBounds(yearNumber, config).startDate;
+  const start = new Date(yearStart);
+  start.setMonth(start.getMonth() + (month - 1));
+  const end = new Date(start);
+  end.setMonth(end.getMonth() + 1);
+  end.setDate(end.getDate() - 1);
+  const startDate = `${start.getFullYear()}-${pad(start.getMonth() + 1)}-${pad(start.getDate())}`;
+  const endDate = `${end.getFullYear()}-${pad(end.getMonth() + 1)}-${pad(end.getDate())}`;
+  return { startDate, endDate };
+}
+
+/**
+ * Which fiscal year number contains the given date? Returns the start-year of that fiscal year.
+ */
+function getFiscalYearContainingDateSync(dateStr, config) {
+  const d = new Date(dateStr);
+  const y = d.getFullYear();
+  const m = d.getMonth() + 1;
+  const day = d.getDate();
+  const { enabled, startMonth, startDay } = config;
+  if (!enabled || (startMonth === 1 && startDay === 1)) return y;
+  if (m < startMonth || (m === startMonth && day < startDay)) return y - 1;
+  return y;
+}
+
+module.exports = {
+  getFiscalConfig,
+  getFiscalYearBounds,
+  getFiscalQuarterBounds,
+  getFiscalMonthBounds,
+  getFiscalYearContainingDateSync,
+};

package/server/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "el-contador-server",
-  "version": "1.2.8",
+  "version": "1.2.10",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "el-contador-server",
-      "version": "1.2.8",
+      "version": "1.2.10",
       "dependencies": {
         "@google/genai": "^0.10.0",
         "bcrypt": "^5.1.1",

package/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "el-contador-server",
-  "version": "1.2.8",
+  "version": "1.2.10",
   "description": "El Contador backend API and auth",
   "main": "index.js",
   "scripts": {