@opengis/cms 0.0.56 → 0.0.58

package/server/routes/cms/controllers/downloadMedia.js

@@ -1,84 +1,84 @@
-import path from 'node:path';
-import { existsSync } from 'node:fs';
-import { readFile } from 'node:fs/promises';
-
-import sharp from "sharp";
-import { imageSize } from "image-size";
-
-import { config, getFolder, pgClients, grpc, getMimeType } from "@opengis/fastify-table/utils.js";
-
-const { resizeImage } = grpc();
-
-// path.resolve() converts POSIX paths from getFolder to valid Windows paths (Bun/Node fs require this on Windows)
-const rootDir = path.resolve(getFolder(config, 'local'));
-
-const previewWidth = 200;
-const resizeQuality = 75;
-
-export default async function downloadMedia({
-    pg = pgClients.client, params = {}, query,
-}, reply) {
-    if (!params?.id) {
-        return reply.status(400).send({ error: 'not enough params: id', code: 400 });
-    }
-
-    if (!pg.pk?.['site.media']) {
-        return reply.status(404).send({ error: 'table not found', code: 404 });
-    }
-
-    const media = await pg.query(
-        `select media_id as id, filename, mime, url from site.media where media_id = $1 and url is not null`,
-        [params.id],
-    ).then(el => el.rows?.[0] || {});
-
-    if (!media.id) {
-        // return reply.status(404).send('media not found: ' + params.id);
-        const decodedPath = Buffer.from(params.id, 'base64url').toString('utf-8');
-        Object.assign(media, { url: decodedPath, mime: getMimeType(decodedPath) });
-    }
-
-    if (!media.url || media.url.includes('..')) {
-        return reply.status(403).send({ error: "wrong params", code: 403 });
-    }
-
-    const filepath = path.join(rootDir, media.url);
-
-    if (!existsSync(filepath)) {
-        return reply.status(404).send({ error: 'file not found', code: 404 });
-    }
-
-    const buffer = await readFile(filepath, { buffer: true });
-    const headers = { 'Content-Type': media.mime, 'Cache-Control': query.nocache ? 'no-store, no-cache, must-revalidate' : 'public, max-age=2592000' };
-
-    // without nocache - cache resized images for 30d
-    if (params.type === 'preview' && media.mime && media.mime.startsWith('image/') && !media.mime.endsWith('/svg+xml')) {
-        const { width, height } = imageSize(buffer) || {};
-        const ratio = width / height;
-        const resizeWidth = Math.min(previewWidth, width);
-        const resizeHeight = resizeWidth / ratio;
-
-        const { result } = await resizeImage({
-            base64: buffer.toString("base64"),
-            width: resizeWidth,
-            height: resizeHeight,
-            quality: resizeQuality,
-        });
-        if (media.mime && media.mime.endsWith('/webp')) {
-            const webp = await sharp(Buffer.from(result, "base64")).webp({ quality: resizeQuality }).toBuffer({ resolveWithObject: false });
-            return reply.headers(headers).send(webp);
-        }
-        return reply.headers(headers).send(Buffer.from(result, "base64"));
-    }
-
-    // skip xml load for preview
-    if (params.type === 'preview' && ['.xml'].includes(path.extname(filepath))) {
-        return reply
-            .headers({
-                'Content-Type': media.mime,
-                'Content-Disposition': `attachment; filename=${path.basename(filepath)}`,
-            })
-            .send(buffer);
-    }
-
-    return reply.headers(headers).send(buffer);
-}
+import path from 'node:path';
+import { existsSync } from 'node:fs';
+import { readFile } from 'node:fs/promises';
+
+import sharp from "sharp";
+import { imageSize } from "image-size";
+
+import { config, getFolder, pgClients, grpc, getMimeType } from "@opengis/fastify-table/utils.js";
+
+const { resizeImage } = grpc();
+
+// path.resolve() converts POSIX paths from getFolder to valid Windows paths (Bun/Node fs require this on Windows)
+const rootDir = path.resolve(getFolder(config, 'local'));
+
+const previewWidth = 200;
+const resizeQuality = 75;
+
+export default async function downloadMedia({
+    pg = pgClients.client, params = {}, query,
+}, reply) {
+    if (!params?.id) {
+        return reply.status(400).send({ error: 'not enough params: id', code: 400 });
+    }
+
+    if (!pg.pk?.['site.media']) {
+        return reply.status(404).send({ error: 'table not found', code: 404 });
+    }
+
+    const media = await pg.query(
+        `select media_id as id, filename, mime, url from site.media where media_id = $1 and url is not null`,
+        [params.id],
+    ).then(el => el.rows?.[0] || {});
+
+    if (!media.id) {
+        // return reply.status(404).send('media not found: ' + params.id);
+        const decodedPath = Buffer.from(params.id, 'base64url').toString('utf-8');
+        Object.assign(media, { url: decodedPath, mime: getMimeType(decodedPath) });
+    }
+
+    if (!media.url || media.url.includes('..')) {
+        return reply.status(403).send({ error: "wrong params", code: 403 });
+    }
+
+    const filepath = path.join(rootDir, media.url);
+
+    if (!existsSync(filepath)) {
+        return reply.status(404).send({ error: 'file not found', code: 404 });
+    }
+
+    const buffer = await readFile(filepath, { buffer: true });
+    const headers = { 'Content-Type': media.mime, 'Cache-Control': query.nocache ? 'no-store, no-cache, must-revalidate' : 'public, max-age=2592000' };
+
+    // without nocache - cache resized images for 30d
+    if (params.type === 'preview' && media.mime && media.mime.startsWith('image/') && !media.mime.endsWith('/svg+xml')) {
+        const { width, height } = imageSize(buffer) || {};
+        const ratio = width / height;
+        const resizeWidth = Math.min(previewWidth, width);
+        const resizeHeight = resizeWidth / ratio;
+
+        const { result } = await resizeImage({
+            base64: buffer.toString("base64"),
+            width: resizeWidth,
+            height: resizeHeight,
+            quality: resizeQuality,
+        });
+        if (media.mime && media.mime.endsWith('/webp')) {
+            const webp = await sharp(Buffer.from(result, "base64")).webp({ quality: resizeQuality }).toBuffer({ resolveWithObject: false });
+            return reply.headers(headers).send(webp);
+        }
+        return reply.headers(headers).send(Buffer.from(result, "base64"));
+    }
+
+    // skip xml load for preview
+    if (params.type === 'preview' && ['.xml'].includes(path.extname(filepath))) {
+        return reply
+            .headers({
+                'Content-Type': media.mime,
+                'Content-Disposition': `attachment; filename=${path.basename(filepath)}`,
+            })
+            .send(buffer);
+    }
+
+    return reply.headers(headers).send(buffer);
+}

package/server/routes/cms/controllers/getContent.js

@@ -1,114 +1,114 @@
-import { config, pgClients, addHook, getTemplate } from '@opengis/fastify-table/utils.js';
-
-import getCollection from '../utils/getCollection.js';
-import getSingle from '../utils/getSingle.js';
-import getDraftKey from '../../../functions/getDraftKey.js';
-
-const maxLimit = 100;
-
-addHook('preFilter', async ({ pg = pgClients.client, table }) => {
-    if (config.trace) console.log('preFilter', table);
-    if (!pg || !table) return null;
-
-    if (!table.startsWith('data.') && ['site.contents', 'single.default.table'].includes(table)) {
-        const { filters = [] } = await getTemplate('table', 'single.default.table') || {};
-        return { table: 'site.contents', filters };
-    }
-
-    // default filters, same as pages collection
-    const { filters = [] } = await getTemplate('table', 'collection.default.table') || {};
-
-    if (['site.contents', 'collection.default.table'].includes(table)) {
-        return { table: 'site.contents', filters };
-    }
-
-    if (table.startsWith('data.') && pg?.pk?.[table.replace(/"/g, '')]) {
-        const { ctid, columns } = await pg.query(
-            `select content_type_id as ctid, columns from site.content_types where 'data.' || table_name = $1`,
-            [table.replace(/"/g, '')]
-        ).then(el => el.rows?.[0] || {});
-        if (!ctid) return null;
-
-        return { table, filters: filters.concat((columns || []).filter(el => !el.hidden && el.filter && el.name && filters.map(item => item.name).includes(el.name))) };
-    }
-});
-
-const defaultFields = ['title', 'slug', 'status', 'created_at', 'updated_at', 'main_image', 'published_at'];
-
-export default async function getContent(req, reply, opt) {
-    const called = !!opt;
-    const { showDrafts: showDrafts1 } = opt || {};
-    const { pg = pgClients.client, params = {}, query = {}, headers = {} } = req;
-    const user = req.user || {};
-    const { type, id } = params;
-    const { filter, state, limit = 16, page, sql, contextQuery, locale, tags, fields } = query;
-    const search = filter ? filter?.split?.('search=')?.[1]?.split?.('|')?.[0] : undefined;
-    const [order, ord] = query.order?.split?.('-') || [];
-    const desc = query.desc || ord === 'desc';
-
-    const { draftKey } = await getDraftKey();
-    const showDrafts = query.draftKey && query.draftKey === draftKey;
-    const statusQuery = !!req.user?.uid || showDrafts || showDrafts1 ? '1=1' : `status='published'`;
-
-    // headers.authorization = 'Bearer tokenExample'
-    const isValidToken = await pg.query(
-        `select count(*) = 1 as isvalid from site.tokens where token_value=$1 and token_status = 'Active'`,
-        [headers.authorization?.split(' ')?.pop?.() || '']
-    ).then(el => el.rows?.[0]?.isvalid);
-
-    if (!config.local && !isValidToken && config.mode !== 'cms' && !called) {
-        return reply.status(403).send('access restricted: token');
-    }
-
-    if (!type) {
-        return reply.status(400).send('not enough params: type');
-    }
-
-    const { contentId, contentTypeId, meta } = params.type === 'pages'
-        ? { contentId: params.id || 'pages', contentTypeId: params.id || 'pages', meta: null }
-        : await pg.query(`select content_id as "contentId", content_type_id as "contentTypeId", meta from site.contents where $1 in (slug, content_id, content_type_id)`, [params.type]).then(el => el.rows?.[0] || {});
-
-    if (!contentId) {
-        return reply.status(404).send('content not found');
-    }
-
-    const { table, contentType, preview, columns: columns1 } = await pg.query(
-        'select table_name as table, type as "contentType", preview_path as preview, columns from site.content_types where content_type_id=$1',
-        [contentTypeId],
-    ).then(el => el.rows?.[0] || {});
-
-    if (!contentType) {
-        return reply.status(404).send('content type not found');
-    }
-
-    const loadTable = contentType === 'collection' && table
-        ? await getTemplate('table', 'collection.default.table')
-        : await getTemplate('table', 'single.default.table');
-    const { columns: defaultColumns = [], filters: defaultFilters = [] } = loadTable || {};
-
-    defaultColumns.forEach(col => Object.assign(col, { default: true }));
-
-    const columns = (columns1 || []).filter(col => !defaultColumns.map(el => el.name).includes(col.name));
-
-    const result = contentType === 'collection' && table
-        ? await getCollection({
-            table, id, limit, maxLimit, tags, order, search, filter, state, page, desc,
-            sql, locale, contextQuery, statusQuery, columns, preview, user, defaultColumns,
-            fields, defaultFields, defaultFilters, called,
-        }, reply, pg)
-        : await getSingle({
-            contentId, id, limit, maxLimit, tags, search, filter, locale, statusQuery, user, sql, page, defaultColumns, fields, defaultFields, defaultFilters,
-        }, pg);
-
-    if (!result) {
-        return reply.status(404).send('empty content data');
-    }
-
-    if (result?.message) {
-        return reply.status(result.status || 500).send(result.message);
-    }
-
-    Object.assign(result, { meta });
-
-    return reply.status(200).send(result);
+import { config, pgClients, addHook, getTemplate } from '@opengis/fastify-table/utils.js';
+
+import getCollection from '../utils/getCollection.js';
+import getSingle from '../utils/getSingle.js';
+import getDraftKey from '../../../functions/getDraftKey.js';
+
+const maxLimit = 100;
+
+addHook('preFilter', async ({ pg = pgClients.client, table }) => {
+    if (config.trace) console.log('preFilter', table);
+    if (!pg || !table) return null;
+
+    if (!table.startsWith('data.') && ['site.contents', 'single.default.table'].includes(table)) {
+        const { filters = [] } = await getTemplate('table', 'single.default.table') || {};
+        return { table: 'site.contents', filters };
+    }
+
+    // default filters, same as pages collection
+    const { filters = [] } = await getTemplate('table', 'collection.default.table') || {};
+
+    if (['site.contents', 'collection.default.table'].includes(table)) {
+        return { table: 'site.contents', filters };
+    }
+
+    if (table.startsWith('data.') && pg?.pk?.[table.replace(/"/g, '')]) {
+        const { ctid, columns } = await pg.query(
+            `select content_type_id as ctid, columns from site.content_types where 'data.' || table_name = $1`,
+            [table.replace(/"/g, '')]
+        ).then(el => el.rows?.[0] || {});
+        if (!ctid) return null;
+
+        return { table, filters: filters.concat((columns || []).filter(el => !el.hidden && el.filter && el.name && filters.map(item => item.name).includes(el.name))) };
+    }
+});
+
+const defaultFields = ['title', 'slug', 'status', 'created_at', 'updated_at', 'main_image', 'published_at'];
+
+export default async function getContent(req, reply, opt) {
+    const called = !!opt;
+    const { showDrafts: showDrafts1 } = opt || {};
+    const { pg = pgClients.client, params = {}, query = {}, headers = {} } = req;
+    const user = req.user || {};
+    const { type, id } = params;
+    const { filter, state, limit = 16, page, sql, contextQuery, locale, tags, fields } = query;
+    const search = filter ? filter?.split?.('search=')?.[1]?.split?.('|')?.[0] : undefined;
+    const [order, ord] = query.order?.split?.('-') || [];
+    const desc = query.desc || ord === 'desc';
+
+    const { draftKey } = await getDraftKey();
+    const showDrafts = query.draftKey && query.draftKey === draftKey;
+    const statusQuery = !!req.user?.uid || showDrafts || showDrafts1 ? '1=1' : `status='published'`;
+
+    // headers.authorization = 'Bearer tokenExample'
+    const isValidToken = await pg.query(
+        `select count(*) = 1 as isvalid from site.tokens where token_value=$1 and token_status = 'Active'`,
+        [headers.authorization?.split(' ')?.pop?.() || '']
+    ).then(el => el.rows?.[0]?.isvalid);
+
+    if (!config.local && !isValidToken && config.mode !== 'cms' && !called) {
+        return reply.status(403).send('access restricted: token');
+    }
+
+    if (!type) {
+        return reply.status(400).send('not enough params: type');
+    }
+
+    const { contentId, contentTypeId, meta } = params.type === 'pages'
+        ? await pg.query(`select content_id as "contentId", content_type_id as "contentTypeId", meta from site.contents where content_id=$1`, [params.type]).then(el => el.rows?.[0] || {})
+        : await pg.query(`select content_id as "contentId", content_type_id as "contentTypeId", meta from site.contents where $1 in (slug, content_id, content_type_id)`, [params.type]).then(el => el.rows?.[0] || {});
+
+    if (!contentId) {
+        return reply.status(404).send('content not found');
+    }
+
+    const { table, contentType, preview, columns: columns1 } = await pg.query(
+        'select table_name as table, type as "contentType", preview_path as preview, columns from site.content_types where content_type_id=$1',
+        [contentTypeId],
+    ).then(el => el.rows?.[0] || {});
+
+    if (!contentType && params.type !== 'pages') {
+        return reply.status(404).send('content type not found');
+    }
+
+    const loadTable = contentType === 'collection' && table
+        ? await getTemplate('table', 'collection.default.table')
+        : await getTemplate('table', 'single.default.table');
+    const { columns: defaultColumns = [], filters: defaultFilters = [] } = loadTable || {};
+
+    defaultColumns.forEach(col => Object.assign(col, { default: true }));
+
+    const columns = (columns1 || []).filter(col => !defaultColumns.map(el => el.name).includes(col.name));
+
+    const result = contentType === 'collection' && table
+        ? await getCollection({
+            table, id, limit, maxLimit, tags, order, search, filter, state, page, desc,
+            sql, locale, contextQuery, statusQuery, columns, preview, user, defaultColumns,
+            fields, defaultFields, defaultFilters, called,
+        }, reply, pg)
+        : await getSingle({
+            contentId, contentTypeId, id, limit, maxLimit, tags, search, filter, locale, statusQuery, user, sql, page, defaultColumns, fields, defaultFields, defaultFilters,
+        }, pg);
+
+    if (!result) {
+        return reply.status(404).send('empty content data');
+    }
+
+    if (result?.message) {
+        return reply.status(result.status || 500).send(result.message);
+    }
+
+    Object.assign(result, { meta });
+
+    return reply.status(200).send(result);
 }

package/server/routes/cms/controllers/getContentBySlug.js

@@ -1,93 +1,93 @@
-import { config, pgClients } from '@opengis/fastify-table/utils.js';
-
-import inputTypes from '../utils/inputTypes.js';
-
-export default async function getContentBySlug({ pg = pgClients.client, params = {}, headers = {} }, reply) {
-  if (!params.slug) {
-    return reply.status(400).send('not enough params: slug');
-  }
-
-  if (!pg?.pk?.['site.content_types']) {
-    return reply.status(404).send('table not found');
-  }
-
-  // headers.authorization = 'Bearer tokenExample'
-  const isValidToken = await pg.query(
-    `select count(*) = 1 as isvalid from site.tokens where token_value=$1 and token_status = 'Active'`,
-    [headers.authorization?.split(' ')?.pop?.() || '']
-  ).then(el => el.rows?.[0]?.isvalid);
-
-  if (!config.local && !isValidToken && config.mode !== 'cms') {
-    return reply.status(403).send('access restricted: token');
-  }
-
-  const { cid } = await pg.query(
-    `select content_id as cid from site.contents where $1 in (content_id,slug) limit 1`,
-    [params.slug],
-  ).then(el => el.rows?.[0] || {});
-
-  if (cid) {
-    const { rows: data = [] } = await pg.query(
-      `select field_key, field_type, field_value, field_value_object, content_id from site.content_data where content_id=$1`, [cid]
-    );
-
-    const meta = await pg.query(
-      'select title, status, revision, locale, slug, content_type_id, (select columns from site.content_types where content_type_id=a.content_type_id limit 1) as columns from site.contents a where content_id=$1 limit 1',
-      [cid],
-    ).then(el => el.rows?.[0] || {});
-
-    const rows = meta.content_type_id ? [{
-      ...meta,
-      columns: undefined,
-      ...Object.fromEntries(
-        data.map(k =>
-          [k.field_key, inputTypes[k.field_type] === 'json' || k.field_key === 'meta'
-            ? k.field_value_object
-            : k.field_value]
-        ) || []
-      )
-    }] : [];
-
-    const meta1 = meta.content_type_id ? await pg.query(
-      'select type from site.content_types where content_type_id=$1',
-      [meta.content_type_id],
-    ).then(el => el.rows?.[0] || {}) : {};
-
-    return reply.status(200).send({
-      ...meta,
-      ...meta1,
-      rows,
-    });
-  }
-
-  const { rows: contentTypes = [] } = await pg.query(`select content_type_id as ctid, table_name as table, type from site.content_types where table_name is not null and type='collection' `);
-
-  if (!contentTypes.length || contentTypes.find(row => row.table && pg.pk[row.table])) {
-    return reply.status(404).send('content not found');
-  }
-
-  const tlist = await pg.query(`select array_agg((select nspname from pg_namespace where oid=relnamespace)||'.'||relname) tlist 
-  from pg_class where relkind in ('r','v')`).then((d) => d.rows[0].tlist);
-
-  const q = contentTypes.filter(row => row.table && tlist.includes(`data.${row.table}`)).map(row => `select id as dataid, '${row.ctid}' as ctid from data."${row.table}" where slug='${params.slug.replace(/'/g, "''")}'`).join(' union all ');
-
-  const { dataid, ctid } = await pg.query(q).then(el => el.rows?.[0] || {});
-
-  if (!dataid) {
-    return reply.status(404).send('content not found: 2');
-  }
-
-  if (!ctid) {
-    return reply.status(404).send('content not found: 3');
-  }
-
-  const meta = await pg.query('select content_type_id, type, table_name as table, title, status, name as slug, columns from site.content_types where content_type_id=$1', [ctid]).then(el => el.rows?.[0] || {});
-
-  if (!meta?.table) {
-    return reply.status(404).send('content not found: 4');
-  }
-
-  const { rows = [] } = await pg.query(`select * from data.${meta.table} where id=$1`, [dataid]);
-
-  return reply.status(200).send({ ...meta, custom: true, rows });
-}
+import { config, pgClients } from '@opengis/fastify-table/utils.js';
+
+import inputTypes from '../utils/inputTypes.js';
+
+export default async function getContentBySlug({ pg = pgClients.client, params = {}, headers = {} }, reply) {
+  if (!params.slug) {
+    return reply.status(400).send('not enough params: slug');
+  }
+
+  if (!pg?.pk?.['site.content_types']) {
+    return reply.status(404).send('table not found');
+  }
+
+  // headers.authorization = 'Bearer tokenExample'
+  const isValidToken = await pg.query(
+    `select count(*) = 1 as isvalid from site.tokens where token_value=$1 and token_status = 'Active'`,
+    [headers.authorization?.split(' ')?.pop?.() || '']
+  ).then(el => el.rows?.[0]?.isvalid);
+
+  if (!config.local && !isValidToken && config.mode !== 'cms') {
+    return reply.status(403).send('access restricted: token');
+  }
+
+  const { cid } = await pg.query(
+    `select content_id as cid from site.contents where $1 in (content_id,slug) limit 1`,
+    [params.slug],
+  ).then(el => el.rows?.[0] || {});
+
+  if (cid) {
+    const { rows: data = [] } = await pg.query(
+      `select field_key, field_type, field_value, field_value_object, content_id from site.content_data where content_id=$1`, [cid]
+    );
+
+    const meta = await pg.query(
+      'select title, status, revision, locale, slug, content_type_id, (select columns from site.content_types where content_type_id=a.content_type_id limit 1) as columns from site.contents a where content_id=$1 limit 1',
+      [cid],
+    ).then(el => el.rows?.[0] || {});
+
+    const rows = meta.content_type_id ? [{
+      ...meta,
+      columns: undefined,
+      ...Object.fromEntries(
+        data.map(k =>
+          [k.field_key, inputTypes[k.field_type] === 'json' || k.field_key === 'meta'
+            ? k.field_value_object
+            : k.field_value]
+        ) || []
+      )
+    }] : [];
+
+    const meta1 = meta.content_type_id ? await pg.query(
+      'select type from site.content_types where content_type_id=$1',
+      [meta.content_type_id],
+    ).then(el => el.rows?.[0] || {}) : {};
+
+    return reply.status(200).send({
+      ...meta,
+      ...meta1,
+      rows,
+    });
+  }
+
+  const { rows: contentTypes = [] } = await pg.query(`select content_type_id as ctid, table_name as table, type from site.content_types where table_name is not null and type='collection' `);
+
+  if (!contentTypes.length || contentTypes.find(row => row.table && pg.pk[row.table])) {
+    return reply.status(404).send('content not found');
+  }
+
+  const tlist = await pg.query(`select array_agg((select nspname from pg_namespace where oid=relnamespace)||'.'||relname) tlist 
+  from pg_class where relkind in ('r','v')`).then((d) => d.rows[0].tlist);
+
+  const q = contentTypes.filter(row => row.table && tlist.includes(`data.${row.table}`)).map(row => `select id as dataid, '${row.ctid}' as ctid from data."${row.table}" where slug='${params.slug.replace(/'/g, "''")}'`).join(' union all ');
+
+  const { dataid, ctid } = await pg.query(q).then(el => el.rows?.[0] || {});
+
+  if (!dataid) {
+    return reply.status(404).send('content not found: 2');
+  }
+
+  if (!ctid) {
+    return reply.status(404).send('content not found: 3');
+  }
+
+  const meta = await pg.query('select content_type_id, type, table_name as table, title, status, name as slug, columns from site.content_types where content_type_id=$1', [ctid]).then(el => el.rows?.[0] || {});
+
+  if (!meta?.table) {
+    return reply.status(404).send('content not found: 4');
+  }
+
+  const { rows = [] } = await pg.query(`select * from data.${meta.table} where id=$1`, [dataid]);
+
+  return reply.status(200).send({ ...meta, custom: true, rows });
+}