Skip to content

Self-hosted, Self-Improving, Federated Everything App — dev management, agent orchestration, persistent mind, digital twin, second brain, and creative pipeline from a single dashboard over Tailscale to port the user into the OS

fix: Life Calendar keeps deleted defaults gone and rejects non-integer activity indexes (#12610)

[._.]/ Adam Eivy00a8dbced3f9
diff --git a/server/routes/meatspaceCalendarRoutes.js b/server/routes/meatspaceCalendarRoutes.js
index 13ebb3b38f..af58c93d38 100644
--- a/server/routes/meatspaceCalendarRoutes.js
+++ b/server/routes/meatspaceCalendarRoutes.js
@@ -6,7 +6,7 @@
import { Router } from 'express';
import { asyncHandler, ServerError } from '../lib/errorHandler.js';
-import { validateRequest } from '../lib/validation.js';
+import { parseIndexParam, validateRequest } from '../lib/validation.js';
import {
activitySchema,
activityUpdateSchema,
@@ -54,7 +54,7 @@ router.post('/activities', asyncHandler(async (req, res) => {
* Update an activity by index.
*/
router.put('/activities/:index', asyncHandler(async (req, res) => {
- const index = parseInt(req.params.index, 10);
+ const index = parseIndexParam(req.params.index);
const data = validateRequest(activityUpdateSchema, req.body);
const activities = await calendarService.updateActivity(index, data);
if (!activities) {
@@ -68,7 +68,7 @@ router.put('/activities/:index', asyncHandler(async (req, res) => {
* Remove an activity by index.
*/
router.delete('/activities/:index', asyncHandler(async (req, res) => {
- const index = parseInt(req.params.index, 10);
+ const index = parseIndexParam(req.params.index);
const activities = await calendarService.removeActivity(index);
if (!activities) {
throw new ServerError('Activity not found', { status: 404, code: 'NOT_FOUND' });
diff --git a/server/services/meatspaceCalendar.js b/server/services/meatspaceCalendar.js
index 56e14a8fee..6b8be8813a 100644
--- a/server/services/meatspaceCalendar.js
+++ b/server/services/meatspaceCalendar.js
@@ -186,7 +186,7 @@ export function computeActivityBudgets(deathDate, activities) {
// === File I/O ===
async function loadActivities() {
- return readJSONFile(ACTIVITIES_FILE, { activities: [] }, { strict: true });
+ return readJSONFile(ACTIVITIES_FILE, { activities: null }, { strict: true });
}
async function saveActivities(data) {
@@ -220,7 +220,7 @@ const DEFAULT_EVENTS = [
];
async function loadEvents() {
- return readJSONFile(EVENTS_FILE, { events: [] }, { strict: true });
+ return readJSONFile(EVENTS_FILE, { events: null }, { strict: true });
}
async function saveEvents(data) {
@@ -231,12 +231,12 @@ async function saveEvents(data) {
export async function getLifeEvents() {
const data = await loadEvents();
- return data.events.length > 0 ? data.events : DEFAULT_EVENTS;
+ return Array.isArray(data.events) ? data.events : DEFAULT_EVENTS;
}
export async function addLifeEvent(event) {
const data = await loadEvents();
- if (data.events.length === 0) {
+ if (!Array.isArray(data.events)) {
data.events = [...DEFAULT_EVENTS];
}
const newEvent = { id: randomUUID(), ...event };
@@ -248,7 +248,7 @@ export async function addLifeEvent(event) {
export async function updateLifeEvent(id, updates) {
const data = await loadEvents();
- if (data.events.length === 0) {
+ if (!Array.isArray(data.events)) {
data.events = [...DEFAULT_EVENTS];
}
const idx = data.events.findIndex(e => e.id === id);
@@ -261,7 +261,7 @@ export async function updateLifeEvent(id, updates) {
export async function removeLifeEvent(id) {
const data = await loadEvents();
- if (data.events.length === 0) {
+ if (!Array.isArray(data.events)) {
data.events = [...DEFAULT_EVENTS];
}
const idx = data.events.findIndex(e => e.id === id);
@@ -288,7 +288,7 @@ export async function getCalendarData() {
// Load activities
const data = await loadActivities();
- const activities = data.activities.length > 0 ? data.activities : DEFAULT_ACTIVITIES;
+ const activities = Array.isArray(data.activities) ? data.activities : DEFAULT_ACTIVITIES;
const budgets = computeActivityBudgets(deathDate, activities);
// Load life events
@@ -302,19 +302,19 @@ export async function getCalendarData() {
grid,
budgets,
events,
- activitiesConfigured: data.activities.length > 0,
+ activitiesConfigured: Array.isArray(data.activities),
};
}
export async function getActivities() {
const data = await loadActivities();
- return data.activities.length > 0 ? data.activities : DEFAULT_ACTIVITIES;
+ return Array.isArray(data.activities) ? data.activities : DEFAULT_ACTIVITIES;
}
export async function addActivity(activity) {
const data = await loadActivities();
// If using defaults, seed with defaults first
- if (data.activities.length === 0) {
+ if (!Array.isArray(data.activities)) {
data.activities = [...DEFAULT_ACTIVITIES];
}
data.activities.push(activity);
@@ -324,7 +324,7 @@ export async function addActivity(activity) {
export async function updateActivity(index, updates) {
const data = await loadActivities();
- if (data.activities.length === 0) {
+ if (!Array.isArray(data.activities)) {
data.activities = [...DEFAULT_ACTIVITIES];
}
if (index < 0 || index >= data.activities.length) {
@@ -337,7 +337,7 @@ export async function updateActivity(index, updates) {
export async function removeActivity(index) {
const data = await loadActivities();
- if (data.activities.length === 0) {
+ if (!Array.isArray(data.activities)) {
data.activities = [...DEFAULT_ACTIVITIES];
}
if (index < 0 || index >= data.activities.length) {
diff --git a/server/services/meatspaceCalendar.test.js b/server/services/meatspaceCalendar.test.js
new file mode 100644
index 0000000000..6439910d90
--- /dev/null
+++ b/server/services/meatspaceCalendar.test.js
@@ -0,0 +1,62 @@
+import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest';
+import { rm } from 'fs/promises';
+import express from 'express';
+import { cleanupTempDataRoots, lazyTempDataRoot, makePathsProxy } from '../lib/mockPathsDataRoot.js';
+import { request } from '../lib/testHelper.js';
+import { errorMiddleware } from '../lib/errorHandler.js';
+
+vi.mock('../lib/fileUtils.js', async (original) => makePathsProxy(await original(), {
+ dataRoot: () => lazyTempDataRoot('portos-meatspace-calendar-'),
+}));
+vi.mock('./meatspace.js', () => ({ getDeathClock: async () => ({ error: 'no birth date' }) }));
+
+import { PATHS } from '../lib/fileUtils.js';
+import meatspaceCalendarRoutes from '../routes/meatspaceCalendarRoutes.js';
+import {
+ addActivity, getActivities, getLifeEvents, removeActivity, removeLifeEvent, addLifeEvent,
+} from './meatspaceCalendar.js';
+
+function makeApp() {
+ const app = express();
+ app.use(express.json());
+ app.use('/api/meatspace', meatspaceCalendarRoutes);
+ app.use(errorMiddleware);
+ return app;
+}
+
+beforeEach(async () => {
+ await rm(PATHS.meatspace, { recursive: true, force: true });
+});
+afterAll(cleanupTempDataRoots);
+
+describe('Life Calendar defaults vs deliberately emptied lists', () => {
+ it('shows the defaults when nothing has been configured', async () => {
+ expect((await getLifeEvents()).length).toBeGreaterThan(0);
+ expect((await getActivities()).length).toBeGreaterThan(0);
+ });
+
+ it('keeps events empty after the user deletes every one, even across a later add', async () => {
+ for (const { id } of await getLifeEvents()) await removeLifeEvent(id);
+ expect(await getLifeEvents()).toEqual([]);
+ await addLifeEvent({ name: 'Mine', type: 'custom', recurrence: 'yearly', month: 0, day: 2, enabled: true });
+ expect(await getLifeEvents()).toHaveLength(1);
+ });
+
+ it('keeps activities empty after the user deletes every one', async () => {
+ const total = (await getActivities()).length;
+ for (let i = 0; i < total; i++) await removeActivity(0);
+ expect(await getActivities()).toEqual([]);
+ await addActivity({ name: 'Mine', cadence: 'day', frequency: 1, icon: 'coffee' });
+ expect(await getActivities()).toHaveLength(1);
+ });
+});
+
+describe('activity index routes', () => {
+ it.each(['delete', 'put'])('%s with a non-integer index answers 400 and changes nothing', async (method) => {
+ const before = await getActivities();
+ const req = request(makeApp())[method]('/api/meatspace/activities/abc');
+ const res = await (method === 'put' ? req.send({ name: 'X' }) : req);
+ expect(res.status).toBe(400);
+ expect(await getActivities()).toEqual(before);
+ });
+});