miolo 3.0.0-beta.210 → 3.0.0-beta.212

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miolo",
-  "version": "3.0.0-beta.210",
+  "version": "3.0.0-beta.212",
   "description": "all-in-one koa-based server",
   "author": "Donato Lorenzo <donato@afialapis.com>",
   "contributors": [
@@ -47,7 +47,7 @@
     "@babel/plugin-proposal-decorators": "^7.29.7",
     "@babel/preset-env": "^7.29.7",
     "@babel/preset-react": "^7.29.7",
-    "@dotenvx/dotenvx": "^1.75.0",
+    "@dotenvx/dotenvx": "^1.75.1",
     "@koa/bodyparser": "^6.1.0",
     "@koa/cors": "^5.0.0",
     "@koa/router": "^15.6.0",
@@ -60,8 +60,8 @@
     "@rollup/plugin-replace": "^6.0.3",
     "@tailwindcss/postcss": "^4.3.1",
     "@tailwindcss/vite": "^4.3.1",
-    "@vitejs/plugin-react": "^6.0.2",
-    "autoprefixer": "^10.5.0",
+    "@vitejs/plugin-react": "^6.0.3",
+    "autoprefixer": "^10.5.1",
     "cacheiro": "^0.5.0-beta.11",
     "calustra": "^1.0.0-beta.14",
     "cron": "^4.4.0",
@@ -94,7 +94,7 @@
     "statuses": "^2.0.2",
     "tailwindcss": "^4.3.1",
     "tinguir": "^0.0.7",
-    "vite": "^8.0.16",
+    "vite": "^8.1.0",
     "winston": "^3.19.0",
     "winston-daily-rotate-file": "^5.0.0",
     "yargs-parser": "^22.0.0"

package/src/config/defaults.mjs

@@ -484,7 +484,7 @@ export default function make_config_defaults() {
          url: '',
          options: {}
         */
-      }
+      },
       /*
       connection: (socket) => {},
       new_namespace: (namespace) => {},
@@ -493,6 +493,10 @@ export default function make_config_defaults() {
         listener: (data) => {}
       }]
       */
+      ssr: {
+        enabled: true,
+        namespace: "ssr"
+      }
     },
 
     build: {

package/src/engines/socket/index.mjs

@@ -48,7 +48,23 @@ function init_socket(app, config) {
   }
 
   io.on("connection", (socket) => {
-    logger.info(`[socket] Connection from ... `) // ${i.ip} ${i.id}`)
+    logger.info(`[socket] Connection from ... `)
+
+    if (config?.ssr?.enabled === true) {
+      socket.on("ssr-versions", async () => {
+        logger.verbose(`[socket] ssr-versions requested for ${socket.id}`)
+        try {
+          const versions = await app.context.miolo.cache.get_cache_versions()
+          const ssr_versions = versions[config?.ssr?.namespace || "ssr"] || {}
+          socket.emit("ssr-versions", ssr_versions)
+          logger.verbose(
+            `[socket] ssr-versions sent for ${socket.id}: ${JSON.stringify(ssr_versions)}`
+          )
+        } catch (err) {
+          logger.error(`[socket] Error getting cache versions: ${err.message}`)
+        }
+      })
+    }
 
     if (config?.connection) {
       config.connection(socket)
@@ -59,6 +75,42 @@ function init_socket(app, config) {
     }
   })
 
+  if (config?.ssr?.enabled === true) {
+    io.emitSsrVersions = async (ctx) => {
+      logger.verbose(`[socket] Emitting ssr-versions`)
+      try {
+        const versions = await ctx.miolo.cache.get_cache_versions()
+        const ssr_versions = versions[config?.ssr?.namespace || "ssr"] || {}
+        io.emit("ssr-versions", ssr_versions)
+        logger.verbose(`[socket] ssr-versions sent: ${JSON.stringify(ssr_versions)}`)
+      } catch (err) {
+        logger.error(`[socket] Error emitting cache versions: ${err.message}`)
+      }
+    }
+
+    io.emitSsrInvalidate = async (ctx, name) => {
+      logger.verbose(`[socket] Emitting ssr-invalidate for ${name}`)
+      try {
+        const socketId = ctx.request?.headers?.["x-socket-id"]
+        io.emit("ssr-invalidate", { name, exclude_socket_id: socketId })
+        logger.verbose(`[socket] ssr-invalidate sent for ${name}`)
+      } catch (err) {
+        logger.error(`[socket] Error emitting ssr-invalidate: ${err.message}`)
+      }
+    }
+
+    io.emitSsrRefresh = async (ctx, name) => {
+      logger.verbose(`[socket] Emitting ssr-refresh for ${name}`)
+      try {
+        const socketId = ctx.request?.headers?.["x-socket-id"]
+        io.emit("ssr-refresh", { name, exclude_socket_id: socketId })
+        logger.verbose(`[socket] ssr-refresh sent for ${name}`)
+      } catch (err) {
+        logger.error(`[socket] Error emitting ssr-refresh: ${err.message}`)
+      }
+    }
+  }
+
   app.context.miolo.io = io
 }
 

package/src/middleware/context/cache/index.mjs

@@ -94,12 +94,90 @@ export function init_context_cache(config, logger) {
     _glob_cache_mother = undefined
   }
 
+  const set_cache_version = async (name, key, version = Date.now()) => {
+    const cache_mother = await _get_cache_mother(config, logger)
+    await cache_mother.setItem(`versions:${name}:${key}`, version)
+  }
+
+  const get_cache_versions = async () => {
+    const cache_mother = await _get_cache_mother(config, logger)
+    const keys = await cache_mother.getKeys("versions:*")
+    const versions = {}
+    for (const key of keys) {
+      const parts = key.split(":")
+      if (parts.length === 3) {
+        const name = parts[1]
+        const item = parts[2]
+        const version = await cache_mother.getItem(key)
+        if (!versions[name]) {
+          versions[name] = {}
+        }
+        versions[name][item] = version
+      }
+    }
+    return versions
+  }
+
+  const _item_get_or_set = async (name, key, callback, parse_read, parse_write) => {
+    const cache = await get_cache(name)
+
+    if (!cache) {
+      logger.warn(`[cache] Cache ${name} is not ready!`)
+    }
+
+    if (cache) {
+      if (await cache.hasItem(key)) {
+        return parse_read(await cache.getItem(key))
+      }
+    }
+
+    const data = await callback()
+
+    if (cache) {
+      await cache.setItem(key, parse_write(data))
+
+      await set_cache_version(name, key)
+    }
+
+    return data
+  }
+
+  const item_get_or_set = async (name, key, callback) => {
+    return await _item_get_or_set(
+      name,
+      key,
+      callback,
+      (data) => data,
+      (data) => data
+    )
+  }
+
+  const item_get_or_set_json = async (name, key, callback) => {
+    return await _item_get_or_set(name, key, callback, JSON.parse, JSON.stringify)
+  }
+
+  const item_unset = async (name, key) => {
+    const cache = await get_cache(name)
+
+    if (!cache) {
+      logger.warn(`[cache] Cache ${name} is not ready!`)
+    }
+
+    await cache.unsetItem(key)
+    await set_cache_version(name, key)
+  }
+
   const cache_ctx = {
     init,
     get_cache,
     get_cache_names,
+    set_cache_version,
+    get_cache_versions,
     drop_cache,
-    close
+    close,
+    item_get_or_set,
+    item_get_or_set_json,
+    item_unset
   }
 
   return cache_ctx

package/src/server-cron.mjs

@@ -1,6 +1,5 @@
 import { init_config } from "./config/index.mjs"
 import { init_cron } from "./engines/cron/index.mjs"
-import { init_socket } from "./engines/socket/index.mjs"
 import { init_context_middleware } from "./middleware/context/index.mjs"
 
 export async function miolo_cron(makeConfig) {
@@ -22,9 +21,6 @@ export async function miolo_cron(makeConfig) {
   app.start = async () => {
     // Init and reset db connection
     await app.context.miolo.db.init_connection()
-    if (app.context.miolo?.io) {
-      app.context.miolo.io.attach(app.http.server)
-    }
     await app.cron.start()
   }
 
@@ -38,8 +34,5 @@ export async function miolo_cron(makeConfig) {
     await app.start()
   }
 
-  // Socket.io
-  init_socket(app, config?.socket)
-
   return app
 }

package/template/biome.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.5.0/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.5.1/schema.json",
   "files": {
     "includes": [
       "**/*",

package/template/package.json

@@ -45,15 +45,15 @@
     "intre": "^3.0.0-beta.4",
     "joi": "^18.2.3",
     "lucide-react": "^1.21.0",
-    "miolo-cli": "^3.0.0-beta.210",
+    "miolo-cli": "^3.0.0-beta.212",
     "miolo-model": "file:../miolo-model",
-    "miolo-react": "^3.0.0-beta.210",
+    "miolo-react": "^3.0.0-beta.212",
     "next-themes": "^0.4.6",
     "radix-ui": "^1.6.0",
     "react": "^19.2.7",
     "react-dom": "^19.2.7",
     "react-router": "^7.16.0",
-    "recharts": "^3.8.1",
+    "recharts": "^3.9.0",
     "sonner": "^2.0.7",
     "tailwind": "^4.0.0",
     "tailwind-merge": "^3.6.0",
@@ -61,8 +61,8 @@
     "tw-animate-css": "^1.4.0"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.5.0",
-    "miolo": "^3.0.0-beta.210",
+    "@biomejs/biome": "2.5.1",
+    "miolo": "^3.0.0-beta.212",
     "sass-embedded": "^1.100.0"
   },
   "overrides": {

package/template/src/cli/pages/todos/context/TodosProvider.jsx

@@ -10,15 +10,15 @@ const TodosProvider = ({ children }) => {
   const { logger } = useMioloContext()
   const { useSsrData, fetcher, socket, authenticated } = useSessionContext()
   const { toast } = useUIContext()
-  const [useCrud, setUseCrud] = useState(true)
+  const [useCrud, setUseCrud] = useState(false)
   const [socketInited, setSocketInited] = useState(false)
 
   const {
     data: todoList,
     setData: setTodoList,
     refresh: refreshTodoList,
-    ready,
-    invalidate: invalidateTodoList
+    ready
+    // invalidate: invalidateTodoList
   } = useSsrData("todos", {
     model: TodoList,
     loader: useCallback(

package/template/src/server/io/cache/todos.mjs

@@ -0,0 +1,39 @@
+import { db_todo_read } from "#server/io/db/todos/read.mjs"
+import { COMMON_CACHE_NS } from "#server/miolo/cache/ns.mjs"
+
+export async function ch_todo_read(ctx, params) {
+  ctx.miolo.logger.verbose(`[cache][todo] Reading todos`)
+
+  const todos = await ctx.miolo.cache.item_get_or_set_json(COMMON_CACHE_NS, `todos`, async () => {
+    const filter = {}
+    const options = {}
+    return await db_todo_read(ctx, { filter, options })
+  })
+
+  if (params?.options?.limit) {
+    return todos.slice(0, params.options.limit)
+  }
+
+  return todos
+}
+
+export async function ch_todo_find(ctx, params) {
+  ctx.miolo.logger.verbose(`[cache][todo] Finding todo`)
+
+  const todos = await ch_todo_read(ctx)
+
+  return todos.find((todo) => todo.id === params?.filter?.id)
+}
+
+export async function ch_todo_invalidate(ctx) {
+  ctx.miolo.logger.verbose(`[cache][todo] Invalidating todos cache`)
+  await ctx.miolo.cache.item_unset(COMMON_CACHE_NS, `todos`)
+
+  if (!ctx.miolo.io) {
+    ctx.miolo.logger.warn(`[cache][todo] IO not available`)
+    return
+  }
+
+  ctx.miolo.logger.verbose(`[cache][todo] Invalidating connected clients`)
+  await ctx.miolo.io.emitSsrRefresh(ctx, "todos")
+}

package/template/src/server/io/db/todos/delete.mjs

@@ -12,7 +12,7 @@ async function _db_todo_delete(ctx, params) {
 
   const Todo = await conn.get_model("todo")
 
-  const todo = await db_todo_find(ctx, params.id)
+  const todo = await db_todo_find(ctx, { filter: { id: params?.id } })
 
   if (todo == null) {
     throw new Error(`[db_todo_delete] Trying to delete a todo that does not exist`)

package/template/src/server/io/db/todos/toggle.mjs

@@ -7,7 +7,7 @@ import { db_todo_upsave } from "./upsave.mjs"
 async function _db_todo_toggle(ctx, params) {
   ctx.miolo.logger.verbose(`[db_todo_toggle] Toggling todo with tid ${params?.id}`)
 
-  const todo = await db_todo_find(ctx, params)
+  const todo = await db_todo_find(ctx, { filter: { id: params?.id } })
 
   if (todo == null) {
     throw new Error(`[db_todo_toggle] Trying to toggle a todo that does not exist`)

package/template/src/server/miolo/cache/ns.mjs

@@ -0,0 +1 @@
+export const COMMON_CACHE_NS = "miolo-sample-default"

package/template/src/server/miolo/cron/{invalidate.mjs → auto-todos.mjs}

@@ -1,9 +1,10 @@
 import { intre_now, intre_to_str } from "intre"
 import { blue } from "tinguir"
+import { ch_todo_invalidate } from "#server/io/cache/todos.mjs"
 import { db_todo_upsave } from "#server/io/db/todos/upsave.mjs"
 
-export const cacheInvalidate = async (miolo) => {
-  miolo.logger.info(`${blue("[cron][cache_invalidate]")} Invalidating cache...`)
+export const autoTodosInsert = async (miolo) => {
+  miolo.logger.info(`${blue("[cron][auto-todos]")} Inserting auto todo...`)
 
   // broadcast an event to all clients
   //miolo.io.emit("ssr-invalidate", { name: "todos" })
@@ -15,7 +16,9 @@ export const cacheInvalidate = async (miolo) => {
     done: false
   })
 
-  miolo.io.emit("ssr-refresh", { name: "todos" })
+  await ch_todo_invalidate({ miolo })
+  //
+  // miolo.io.emit("ssr-refresh", { name: "todos" })
 
-  miolo.logger.info(`${blue("[cron][cache_invalidate]")} Cache invalidated!`)
+  miolo.logger.info(`${blue("[cron][auto-todos]")} Done!`)
 }

package/template/src/server/miolo/cron/index.mjs

@@ -1,5 +1,5 @@
+import { autoTodosInsert } from "./auto-todos.mjs"
 import { onTickFoo } from "./foo.mjs"
-import { cacheInvalidate } from "./invalidate.mjs"
 
 // check https://github.com/kelektiv/node-cron#readme
 //
@@ -16,9 +16,9 @@ export default function init_cron() {
   })
 
   cronList.push({
-    name: "miolo-sample-cache-invalidate",
+    name: "miolo-sample-auto-todos",
     cronTime: "*/1 * * * *",
-    onTick: cacheInvalidate,
+    onTick: autoTodosInsert,
     start: true
   })
 

package/template/src/server/miolo/index.mjs

@@ -1,9 +1,10 @@
 import passport from "./auth/passport.mjs"
-import cache from "./cache.mjs"
+import cache from "./cache/index.mjs"
 import init_cron from "./cron/index.mjs"
 import db from "./db.mjs"
 import http from "./http.mjs"
 import routes from "./routes/index.mjs"
+import socket from "./socket.mjs"
 import { loader } from "./ssr/loader.mjs"
 
 export default () => {
@@ -20,24 +21,6 @@ export default () => {
       ssr: { loader }
     },
     cron: init_cron(),
-    socket: {
-      enabled: true,
-      namespaces: [
-        {
-          name: "todos-update",
-          listener: (data) => {
-            console.log("TODOS UPDATED!!!")
-            console.log(data)
-          }
-        },
-        {
-          name: "ping",
-          listener: (data) => {
-            console.log("PING!!!")
-            console.log(data)
-          }
-        }
-      ]
-    }
+    socket
   }
 }

package/template/src/server/miolo/socket.mjs

@@ -0,0 +1,25 @@
+import { COMMON_CACHE_NS } from "./cache/ns.mjs"
+
+export default {
+  enabled: true,
+  namespaces: [
+    {
+      name: "todos-update",
+      listener: (data) => {
+        console.log("TODOS UPDATED!!!")
+        console.log(data)
+      }
+    },
+    {
+      name: "ping",
+      listener: (data) => {
+        console.log("PING!!!")
+        console.log(data)
+      }
+    }
+  ],
+  ssr: {
+    enabled: true,
+    namespace: COMMON_CACHE_NS
+  }
+}

package/template/src/server/miolo/ssr/loader.mjs

@@ -1,10 +1,10 @@
-import { db_todo_read } from "#server/io/db/todos/read.mjs"
+import { ch_todo_read } from "#server/io/cache/todos.mjs"
 
 const loader = async (ctx) => {
   let lastTodos = []
 
   try {
-    lastTodos = await db_todo_read(ctx, { options: { limit: 3 } })
+    lastTodos = await ch_todo_read(ctx, { options: { limit: 3 } })
     lastTodos = lastTodos.sort((a, b) => b.created_at - a.created_at)
   } catch (_) {}
 

package/template/src/server/routes/todos/mod.mjs

@@ -1,3 +1,4 @@
+import { ch_todo_invalidate } from "#server/io/cache/todos.mjs"
 import { db_todo_delete } from "#server/io/db/todos/delete.mjs"
 import { db_todo_toggle } from "#server/io/db/todos/toggle.mjs"
 import { db_todo_upsave } from "#server/io/db/todos/upsave.mjs"
@@ -10,6 +11,8 @@ export async function r_todo_upsave(ctx, params) {
 
     const res = await db_todo_upsave(ctx, params)
 
+    await ch_todo_invalidate(ctx)
+
     ctx.miolo.logger.info(`[r_todo_upsave] Upsaved todo info for tid ${params?.id || "new"}`)
     return { ok: true, data: res }
   } catch (error) {
@@ -26,6 +29,8 @@ export async function r_todo_delete(ctx, params) {
 
     const res = await db_todo_delete(ctx, params)
 
+    await ch_todo_invalidate(ctx)
+
     ctx.miolo.logger.info(`[r_todo_delete] Deleted todo for tid ${params.id}`)
     return { ok: true, data: res }
   } catch (error) {
@@ -40,6 +45,8 @@ export async function r_todo_toggle_done(ctx, params) {
 
     const done = await db_todo_toggle(ctx, params)
 
+    await ch_todo_invalidate(ctx)
+
     ctx.miolo.logger.info(`[r_todo_toggle_done] Toggled todo with tid ${params?.id}`)
 
     return { ok: true, data: { done } }

package/template/src/server/routes/todos/read.mjs

@@ -1,11 +1,10 @@
-import { db_todo_find } from "#server/io/db/todos/find.mjs"
-import { db_todo_read } from "#server/io/db/todos/read.mjs"
+import { ch_todo_find, ch_todo_read } from "#server/io/cache/todos.mjs"
 
 export async function r_todo_list(ctx, _params) {
   try {
     ctx.miolo.logger.info(`[r_todo_list] Reading todo list`)
 
-    const res = await db_todo_read(ctx, { filter: {}, options: {} })
+    const res = await ch_todo_read(ctx, { filter: {}, options: {} })
 
     ctx.miolo.logger.info(`[r_todo_list] Read todo list (${res.length})`)
     return { ok: true, data: res }
@@ -20,7 +19,7 @@ export async function r_todo_last(ctx, params) {
   try {
     ctx.miolo.logger.info(`[r_todo_last] Reading last todos`)
 
-    const res = await db_todo_read(ctx, { options: { limit: 3 } })
+    const res = await ch_todo_read(ctx, { options: { limit: 3 } })
 
     ctx.miolo.logger.info(`[r_todo_last] Read last todos (${res.length})`)
     return { ok: true, data: res }
@@ -34,7 +33,7 @@ export async function r_todo_find(ctx, params) {
   try {
     ctx.miolo.logger.info(`[r_todo_find] Reading todo for tid ${params?.id}`)
 
-    const todo = await db_todo_find(ctx, { filter: { id: params?.id } })
+    const todo = await ch_todo_find(ctx, { filter: { id: params?.id } })
 
     ctx.miolo.logger.info(`[r_todo_find] Read todo for tid ${params?.id}`)
     return { ok: todo?.id !== undefined, data: todo }

package/template/src/server/io/cache/base.mjs

@@ -1,21 +0,0 @@
-export async function cache_get_or_set_json(ctx, name, key, callback) {
-  const cache = await ctx.miolo.cache.get_cache(name)
-
-  if (!cache) {
-    ctx.miolo.logger.warn(`[cache] Cache ${name} is not ready!`)
-  }
-
-  if (cache) {
-    if (await cache.hasItem(key)) {
-      return JSON.parse(await cache.getItem(key))
-    }
-  }
-
-  const data = await callback()
-
-  if (cache) {
-    await cache.setItem(key, JSON.stringify(data))
-  }
-
-  return data
-}