@coffer-org/server 1.6.0 → 1.7.1

package/dist/index.js

@@ -27,8 +27,8 @@ import { resolveWithinHome, filterSort, listDir } from "./fs-list.js";
 import { initPlugins, teardownPlugins, readDisabled, purgePluginData, getPluginSettings, getPlugins, } from "./plugin-runtime.js";
 import { registerPluginsApi } from "./plugins-api.js";
 import { registerAuthApi, resolveRequestUser, requireAdmin, PUBLIC_API_PATHS } from "./auth-api.js";
-import { discoverPluginAssets } from "./plugin-discovery.js";
-import { checkLatestVersion, resolveUpdateTarget, resolveAllUpdateTargets, runNpmInstall } from "./plugin-updates.js";
+import { discoverPluginAssets, discoverRuntime } from "./plugin-discovery.js";
+import { checkLatestVersion, resolveUpdateTarget, resolveAllUpdateTargets, resolveRuntimeTarget, runNpmInstall, } from "./plugin-updates.js";
 import { buildClientSchema } from "./schema-api.js";
 import { recordList, recordGet, recordCreate, recordUpdate, recordDelete, rowMatch, UnknownTypeError } from "./records-api.js";
 import { maskTree, preserveTree } from "./secrets.js";
@@ -229,7 +229,7 @@ app.post('/api/plugins/:id/update', async (req, reply) => {
     const { id } = req.params;
     const assets = await discoverPluginAssets();
     const rec = assets.find((a) => a.id === id);
-    const latest = rec ? await checkLatestVersion(rec.packageName) : null;
+    const latest = rec && !rec.local ? await checkLatestVersion(rec.packageName) : null;
     const target = resolveUpdateTarget(assets, id, latest);
     if (!target.ok) {
         return reply.code(target.error === 'unknown_plugin' ? 404 : 400).send({ error: target.error });
@@ -245,15 +245,28 @@ app.post('/api/plugins/update-all', async (req, reply) => {
     if (!requireAdmin(req, reply))
         return;
     const assets = await discoverPluginAssets();
-    const latestById = new Map(await Promise.all(assets.map(async (a) => [a.id, await checkLatestVersion(a.packageName)])));
+    const runtime = await discoverRuntime();
+    const [latestById, runtimeLatest] = await Promise.all([
+        Promise.all(assets.map(async (a) => [a.id, a.local ? null : await checkLatestVersion(a.packageName)])).then((entries) => new Map(entries)),
+        runtime && !runtime.local ? checkLatestVersion(runtime.packageName) : Promise.resolve(null),
+    ]);
     const targets = resolveAllUpdateTargets(assets, latestById);
-    if (targets.length === 0)
+    const runtimeTarget = resolveRuntimeTarget(runtime, runtimeLatest);
+    const specs = [
+        ...targets.map((t) => `${t.packageName}@${t.to}`),
+        ...(runtimeTarget ? [`${runtimeTarget.packageName}@${runtimeTarget.to}`] : []),
+    ];
+    if (specs.length === 0)
         return reply.code(400).send({ error: 'no_update_available' });
-    const result = await runNpmInstall(targets.map((t) => `${t.packageName}@${t.to}`), process.cwd());
+    const result = await runNpmInstall(specs, process.cwd());
     if (!result.ok) {
         return reply.code(500).send({ error: 'install_failed', stderr: result.stderr });
     }
-    reply.send({ ok: true, updated: targets.map(({ id, from, to }) => ({ id, from, to })) });
+    const updated = [
+        ...targets.map(({ id, from, to }) => ({ id, from, to })),
+        ...(runtimeTarget ? [{ id: 'runtime', from: runtimeTarget.from, to: runtimeTarget.to }] : []),
+    ];
+    reply.send({ ok: true, updated });
     setTimeout(() => process.exit(0), 500);
 });
 app.get('/api/plugins/:id/settings', async (req, reply) => {

package/dist/log.js

@@ -1,5 +1,22 @@
 import { pino } from 'pino';
 import { setRootLogger, LOG_LEVEL, getLogger } from '@coffer-org/sdk/logger';
-export const rootLogger = pino({ level: LOG_LEVEL });
+const prettyEnv = process.env.COFFER_LOG_PRETTY;
+const pretty = prettyEnv !== undefined ? prettyEnv !== '0' && prettyEnv !== '' : process.stdout.isTTY;
+export const rootLogger = pino({
+    level: LOG_LEVEL,
+    ...(pretty
+        ? {
+            transport: {
+                target: 'pino-pretty',
+                options: {
+                    colorize: true,
+                    translateTime: 'SYS:HH:MM:ss',
+                    ignore: 'pid,hostname,tag',
+                    messageFormat: '{if tag}[{tag}] {end}{msg}',
+                },
+            },
+        }
+        : {}),
+});
 setRootLogger(rootLogger);
 export { getLogger };

package/dist/plugin-discovery.d.ts

@@ -19,7 +19,14 @@ export interface PluginAssetRecord {
     schema: string;
     web?: string;
     css?: string;
+    local?: boolean;
 }
 export declare function discoverPluginAssets(): Promise<PluginAssetRecord[]>;
+export interface RuntimeRecord {
+    packageName: string;
+    installedVersion: string;
+    local: boolean;
+}
+export declare function discoverRuntime(): Promise<RuntimeRecord | null>;
 export declare function discoverPlugins(): Promise<PluginManifest[]>;
 export declare function loadServerHooks(): Promise<Record<string, PluginHooks>>;

package/dist/plugin-discovery.js

@@ -6,8 +6,8 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
     }
     return path;
 };
-import { readdir, readFile } from 'node:fs/promises';
-import { join } from 'node:path';
+import { readdir, readFile, realpath } from 'node:fs/promises';
+import { join, sep } from 'node:path';
 import { pathToFileURL } from 'node:url';
 import { getLogger } from '@coffer-org/sdk/logger';
 const log = getLogger('discovery');
@@ -40,6 +40,15 @@ export function resolveAssetUrls(id, coffer) {
         out.css = `${base}/web.css`;
     return out;
 }
+async function isLocalPackage(dir) {
+    try {
+        const real = await realpath(dir);
+        return !real.includes(`${sep}node_modules${sep}`);
+    }
+    catch {
+        return false;
+    }
+}
 export async function discoverPluginAssets() {
     const nm = join(process.cwd(), 'node_modules');
     const names = await pkgNames(nm);
@@ -62,6 +71,7 @@ export async function discoverPluginAssets() {
                 schema: urls.schema,
                 web: urls.web,
                 css: urls.css,
+                local: await isLocalPackage(join(nm, name)),
             });
         }
         catch (e) {
@@ -70,6 +80,19 @@ export async function discoverPluginAssets() {
     }
     return out;
 }
+const RUNTIME_PACKAGE = '@coffer-org/meta';
+export async function discoverRuntime() {
+    const dir = join(process.cwd(), 'node_modules', RUNTIME_PACKAGE);
+    try {
+        const pkg = JSON.parse(await readFile(join(dir, 'package.json'), 'utf8'));
+        if (!pkg.version)
+            return null;
+        return { packageName: RUNTIME_PACKAGE, installedVersion: pkg.version, local: await isLocalPackage(dir) };
+    }
+    catch {
+        return null;
+    }
+}
 async function loadManifest(nm, name) {
     try {
         const pkg = JSON.parse(await readFile(join(nm, name, 'package.json'), 'utf8'));

package/dist/plugin-hooks.d.ts

@@ -1,6 +1,7 @@
 import type { EntityManager } from '@mikro-orm/core';
 import type { z } from 'zod';
 import type { ColumnType } from '@coffer-org/sdk/fields';
+import { type Logger } from '@coffer-org/sdk/logger';
 export interface TableOps {
     renameColumn(from: string, to: string): Promise<void>;
     fill(column: string, value: string | number | boolean | null, opts?: {
@@ -20,7 +21,9 @@ export interface Migration {
 }
 export interface PluginCtx {
     em: EntityManager;
+    log: Logger;
 }
+export declare function pluginCtx(id: string, em: EntityManager): PluginCtx;
 export interface Seed {
     name: string;
     run(ctx: PluginCtx): Promise<void> | void;

package/dist/plugin-hooks.js

@@ -1 +1,5 @@
+import { getLogger } from '@coffer-org/sdk/logger';
+export function pluginCtx(id, em) {
+    return { em, log: getLogger(id) };
+}
 export const pluginHooks = {};

package/dist/plugin-runtime.js

@@ -4,7 +4,7 @@ import { getLogger } from '@coffer-org/sdk/logger';
 import { initDb, getOrm, getEm } from "./db.js";
 import { syncSchema } from "./schema-sync.js";
 import { systemEntities, buildPluginEntities, moduleTableName } from "./entity-schema.js";
-import { pluginHooks } from "./plugin-hooks.js";
+import { pluginHooks, pluginCtx } from "./plugin-hooks.js";
 import { discoverPlugins, loadServerHooks } from "./plugin-discovery.js";
 import { runMigrations, assertSafeRequired } from "./migrations.js";
 import { runSeeds } from "./seeds.js";
@@ -78,7 +78,7 @@ export async function initPlugins() {
         const h = pluginHooks[p.id];
         try {
             if (h?.init) {
-                await h.init({ em: getEm().fork() });
+                await h.init(pluginCtx(p.id, getEm().fork()));
                 log.debug(`${p.id}: init ✓`);
             }
         }
@@ -100,7 +100,7 @@ export async function teardownPlugins() {
         if (!h?.teardown)
             continue;
         try {
-            await h.teardown({ em: getEm().fork() });
+            await h.teardown(pluginCtx(p.id, getEm().fork()));
             log.debug(`${p.id}: teardown ✓`);
         }
         catch (e) {
@@ -111,7 +111,7 @@ export async function teardownPlugins() {
 export async function teardownPlugin(id) {
     const h = pluginHooks[id];
     if (h?.teardown) {
-        await h.teardown({ em: getEm().fork() });
+        await h.teardown(pluginCtx(id, getEm().fork()));
         log.debug(`${id}: teardown ✓`);
     }
 }

package/dist/plugin-updates.d.ts

@@ -16,6 +16,16 @@ export interface AllUpdateTarget {
     to: string;
 }
 export declare function resolveAllUpdateTargets(assets: PluginAssetRecord[], latestById: Map<string, string | null>): AllUpdateTarget[];
+export interface RuntimeUpdateTarget {
+    packageName: string;
+    from: string;
+    to: string;
+}
+export declare function resolveRuntimeTarget(runtime: {
+    packageName: string;
+    installedVersion: string;
+    local: boolean;
+} | null, latestVersion: string | null): RuntimeUpdateTarget | null;
 export declare function runNpmInstall(specs: string[], cwd: string): Promise<{
     ok: boolean;
     stderr: string;

package/dist/plugin-updates.js

@@ -49,6 +49,13 @@ export function resolveAllUpdateTargets(assets, latestById) {
         return [{ id: rec.id, packageName: rec.packageName, from: rec.version, to: latest }];
     });
 }
+export function resolveRuntimeTarget(runtime, latestVersion) {
+    if (!runtime || runtime.local)
+        return null;
+    if (!latestVersion || latestVersion === runtime.installedVersion)
+        return null;
+    return { packageName: runtime.packageName, from: runtime.installedVersion, to: latestVersion };
+}
 export function runNpmInstall(specs, cwd) {
     return new Promise((resolve) => {
         execFile('npm', ['install', ...specs], { cwd, timeout: 120_000 + 30_000 * specs.length, encoding: 'utf8' }, (err, _stdout, stderr) => {

package/dist/plugins-api.js

@@ -1,6 +1,6 @@
 import { join } from 'node:path';
 import { createReadStream, existsSync, readFileSync } from 'node:fs';
-import { discoverPluginAssets } from "./plugin-discovery.js";
+import { discoverPluginAssets, discoverRuntime } from "./plugin-discovery.js";
 import { getPlugins, readDisabled } from "./plugin-runtime.js";
 import { checkLatestVersion } from "./plugin-updates.js";
 const nmRoot = () => join(process.cwd(), 'node_modules');
@@ -12,7 +12,7 @@ export async function buildPluginListResponse(plugins, assets, disabled) {
         return {
             id: p.id,
             installedVersion: a?.version ?? p.version,
-            latestVersion: a ? await checkLatestVersion(a.packageName) : null,
+            latestVersion: a && !a.local ? await checkLatestVersion(a.packageName) : null,
             packageName: a?.packageName ?? null,
             dependsOn: p.dependsOn,
             enabled: !disabled.has(p.id),
@@ -30,6 +30,13 @@ export async function registerPluginsApi(app) {
         const [plugins, assets, disabled] = await Promise.all([getPlugins(), discoverPluginAssets(), readDisabled()]);
         return buildPluginListResponse(plugins, assets, disabled);
     });
+    app.get('/api/runtime', async () => {
+        const runtime = await discoverRuntime();
+        if (!runtime)
+            return { installedVersion: null, latestVersion: null };
+        const latestVersion = runtime.local ? null : await checkLatestVersion(runtime.packageName);
+        return { installedVersion: runtime.installedVersion, latestVersion };
+    });
     app.get('/plugins/:id/:file', async (req, reply) => {
         const { id, file } = req.params;
         const key = ASSET_KEY[file];

package/dist/seeds.d.ts

@@ -1,5 +1,5 @@
 import type { EntityManager } from '@mikro-orm/core';
-import type { PluginHooks } from './plugin-hooks.ts';
+import { type PluginHooks } from './plugin-hooks.ts';
 export declare function validateSeeds(pluginId: string, list: {
     name: string;
 }[]): void;

package/dist/seeds.js

@@ -1,3 +1,4 @@
+import { pluginCtx } from "./plugin-hooks.js";
 import { getLogger } from '@coffer-org/sdk/logger';
 const log = getLogger('seeds');
 export function validateSeeds(pluginId, list) {
@@ -16,7 +17,7 @@ export async function runSeeds({ em, plugins, hooks }) {
         const applied = new Set((await conn.execute(`SELECT name FROM _seeds WHERE plugin_id = ?`, [p.id])).map((r) => r.name));
         const pending = list.filter((s) => !applied.has(s.name));
         for (const s of pending) {
-            await s.run({ em: em.fork() });
+            await s.run(pluginCtx(p.id, em.fork()));
             await conn.execute(`INSERT INTO _seeds (plugin_id, name) VALUES (?, ?)`, [p.id, s.name]);
         }
         if (pending.length)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coffer-org/server",
-  "version": "1.6.0",
+  "version": "1.7.1",
   "type": "module",
   "engines": {
     "node": ">=24"
@@ -35,6 +35,7 @@
     "fastify": "^5.2.1",
     "open-graph-scraper": "^6.11.0",
     "pino": "^9.14.0",
+    "pino-pretty": "^13.1.3",
     "zod": "^4.4.3"
   },
   "optionalDependencies": {