@opengis/cms 0.0.57 → 0.0.58

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

@@ -1,156 +1,156 @@
-import path from 'node:path';
-import { existsSync, mkdirSync } from 'node:fs';
-import { readdir, stat } from 'node:fs/promises';
-
-import { config, getFolder, pgClients, getMimeType, getFilterSQL } from '@opengis/fastify-table/utils.js';
-import { createHash } from 'node:crypto';
-
-const filterList = [
-    {
-        name: "created_at",
-        type: "Date",
-        ua: "Дата створення"
-    },
-    {
-        name: "updated_at",
-        type: "Date",
-        ua: "Дата редагування"
-    }
-]
-
-// 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 dir = '/files';
-
-const filesizeCache = {};
-const fileMtimeCache = {};
-
-mkdirSync(path.join(rootDir, dir), { recursive: true });
-
-export default async function listMedia(req, reply) {
-    const { pg = pgClients.client, query = {} } = req;
-    const { subdir: subdir1 = '', search } = query;
-
-    if (!pg.pk?.['site.media']) {
-        return reply.status(404).send('table not found');
-    }
-
-    if (typeof subdir1 !== 'string' || subdir1.includes('..')) {
-        return reply.status(403).send('invalid params: subdir');
-    }
-
-    const subdir = subdir1.replace(/\/{2,}/g, '/');
-    const relpath = path.join(dir, subdir1).replace(/\\/g, '/');
-    const dirpath = path.join(rootDir, relpath).replace(/\\/g, '/');
-
-    if (!existsSync(dirpath)) {
-        return { data: [], relpath, msg: 'directory not exists' };
-    }
-
-    const isDirectory = (await stat(dirpath)).isDirectory();
-
-    const allItems = isDirectory ? await readdir(dirpath, { withFileTypes: true, recursive: true }) : [];
-    const items = isDirectory ? await readdir(dirpath, { withFileTypes: true }) : [];
-
-    const { q = '' } = await getFilterSQL({ table: 'site.media', filter: query?.filter, filterList, pg });
-
-    const rows = await pg.query(
-        `select 
-            media_id as id, filename, filetype, filesize, url, description, alt,
-            mime, preview_url, created_at, updated_at, created_by, updated_by
-        from site.media
-        where ${subdir ? 'subdir = $1' : (search ? '1=1' : 'subdir is null')} ${search ? `and filename ilike '%${search.replace(/'/g, "''")}%'` : ''}
-        ${q ? ` and (${q})` : ''}`,
-        [subdir].filter(Boolean),
-    ).then(el => el.rows || []); // ?.filter(row => items.map(el => el.name).includes(row.filename))
-
-    const subdirs = items
-        .filter(el => el.isDirectory())
-        .map(el => ({ type: 'dir', name: el.name }))
-        .filter(el => search ? el.name.includes(search) : true);
-
-    if (subdirs.length) {
-        await Promise.all(subdirs.map(async (item) => {
-            const items = isDirectory ? await readdir(path.join(dirpath, item.name)) : [];
-            Object.assign(item, { count: items.length });
-        }));
-    }
-
-    const result = { relpath };
-
-    if (config.debug) {
-        Object.assign(result, { rootDir });
-    }
-
-    // TODO: Фільтрувати по stats.mtime?
-    const allowedNames = Boolean(query?.filter) || Boolean(q) ? new Set(rows.map(r => r.filename)) : null;
-    const filteredFiles = (search ? allItems.filter(el => el.name.includes(search)) : items)
-        .filter(el => el.isFile())
-        .filter(el => !allowedNames || allowedNames.has(el.name));
-
-    const files = await Promise.all(filteredFiles.map(async el => {
-        const media = rows.find(row => row.filename === el.name);
-        const filepath = media ? media.url : ('/files/' + (el.path.split('/files/')[1] ? el.path.split('/files/')[1] + '/' : '') + el.name);
-
-        if (!filesizeCache[filepath]) {
-            const { mtime, size } = await stat(path.join(rootDir, filepath));
-            Object.assign(filesizeCache, { [filepath]: size });
-            mtime.setHours(0, 0, 0, 0); // strip hours from timestamp, leave only date
-            Object.assign(fileMtimeCache, { [filepath]: mtime });
-        }
-
-
-        const [, from, to] = q ? (q.match(/between\s+'(\d{4}-\d{2}-\d{2})'::date\s+and\s+'(\d{4}-\d{2}-\d{2})'::date/i) || []) : [];
-
-        // skip entirely if invalid dates passed to query.filter
-        if ((from && new Date(from).toString() === 'Invalid Date') || (to && new Date(to).toString() === 'Invalid Date')) {
-            return null;
-        }
-
-        // skip  if file modification date does not match filter value
-        if (fileMtimeCache[filepath] && from && to && (new Date(from) > fileMtimeCache[filepath] || new Date(to) < fileMtimeCache[filepath])) {
-            return null;
-        }
-
-        const dt = q && !q.includes('between') ? query.filter.match(/\d{4}-\d{2}-\d{2}/)?.[0] : null;
-        const date = dt ? new Date(dt) : null;
-        // skip timezone offset
-        if (date) { date.setHours(0, 0, 0, 0); }
-
-        // filter by exact date
-        if (fileMtimeCache[filepath] && date && (new Date(date).getTime() !== fileMtimeCache[filepath].getTime())) {
-            return null;
-        }
-
-        const mime = getMimeType(el.name) || '';
-        const preview = mime.startsWith('image/') /* && mime !== 'image/svg+xml' */
-            ? `${req.routeOptions.url}/${media ? media.id : Buffer.from(filepath).toString('base64url')}/preview`
-            : undefined;
-
-        return media ? {
-            type: 'file',
-            ...media,
-            url: `${req.routeOptions.url}/${media.id}/file`,
-            preview,
-            filepath,
-            metadata: `${req.routeOptions.url}/${media.id}`,
-        } : {
-            id: createHash('md5').update(filepath).digest('hex'),
-            hash: true,
-            type: 'file',
-            filename: el.name,
-            filepath,
-            filetype: mime.startsWith('image/') ? "image" : "other",
-            filesize: filesizeCache[filepath] || 0,
-            url: filepath,
-            mime,
-            preview,
-            updated_at: fileMtimeCache[filepath].toISOString(),
-        }
-    }));
-
-    // filter empty items, such as filtered out by query.filter=updated_at (not from db, but from fs.stat)
-    Object.assign(result, { data: subdirs.concat(files.filter(Boolean)) });
-    return result;
-
+import path from 'node:path';
+import { existsSync, mkdirSync } from 'node:fs';
+import { readdir, stat } from 'node:fs/promises';
+
+import { config, getFolder, pgClients, getMimeType, getFilterSQL } from '@opengis/fastify-table/utils.js';
+import { createHash } from 'node:crypto';
+
+const filterList = [
+    {
+        name: "created_at",
+        type: "Date",
+        ua: "Дата створення"
+    },
+    {
+        name: "updated_at",
+        type: "Date",
+        ua: "Дата редагування"
+    }
+]
+
+// 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 dir = '/files';
+
+const filesizeCache = {};
+const fileMtimeCache = {};
+
+mkdirSync(path.join(rootDir, dir), { recursive: true });
+
+export default async function listMedia(req, reply) {
+    const { pg = pgClients.client, query = {} } = req;
+    const { subdir: subdir1 = '', search } = query;
+
+    if (!pg.pk?.['site.media']) {
+        return reply.status(404).send('table not found');
+    }
+
+    if (typeof subdir1 !== 'string' || subdir1.includes('..')) {
+        return reply.status(403).send('invalid params: subdir');
+    }
+
+    const subdir = subdir1.replace(/\/{2,}/g, '/');
+    const relpath = path.join(dir, subdir1).replace(/\\/g, '/');
+    const dirpath = path.join(rootDir, relpath).replace(/\\/g, '/');
+
+    if (!existsSync(dirpath)) {
+        return { data: [], relpath, msg: 'directory not exists' };
+    }
+
+    const isDirectory = (await stat(dirpath)).isDirectory();
+
+    const allItems = isDirectory ? await readdir(dirpath, { withFileTypes: true, recursive: true }) : [];
+    const items = isDirectory ? await readdir(dirpath, { withFileTypes: true }) : [];
+
+    const { q = '' } = await getFilterSQL({ table: 'site.media', filter: query?.filter, filterList, pg });
+
+    const rows = await pg.query(
+        `select 
+            media_id as id, filename, filetype, filesize, url, description, alt,
+            mime, preview_url, created_at, updated_at, created_by, updated_by
+        from site.media
+        where ${subdir ? 'subdir = $1' : (search ? '1=1' : 'subdir is null')} ${search ? `and filename ilike '%${search.replace(/'/g, "''")}%'` : ''}
+        ${q ? ` and (${q})` : ''}`,
+        [subdir].filter(Boolean),
+    ).then(el => el.rows || []); // ?.filter(row => items.map(el => el.name).includes(row.filename))
+
+    const subdirs = items
+        .filter(el => el.isDirectory())
+        .map(el => ({ type: 'dir', name: el.name }))
+        .filter(el => search ? el.name.includes(search) : true);
+
+    if (subdirs.length) {
+        await Promise.all(subdirs.map(async (item) => {
+            const items = isDirectory ? await readdir(path.join(dirpath, item.name)) : [];
+            Object.assign(item, { count: items.length });
+        }));
+    }
+
+    const result = { relpath };
+
+    if (config.debug) {
+        Object.assign(result, { rootDir });
+    }
+
+    // TODO: Фільтрувати по stats.mtime?
+    const allowedNames = Boolean(query?.filter) || Boolean(q) ? new Set(rows.map(r => r.filename)) : null;
+    const filteredFiles = (search ? allItems.filter(el => el.name.includes(search)) : items)
+        .filter(el => el.isFile())
+        .filter(el => !allowedNames || allowedNames.has(el.name));
+
+    const files = await Promise.all(filteredFiles.map(async el => {
+        const media = rows.find(row => row.filename === el.name);
+        const filepath = media ? media.url : ('/files/' + (el.path.split('/files/')[1] ? el.path.split('/files/')[1] + '/' : '') + el.name);
+
+        if (!filesizeCache[filepath]) {
+            const { mtime, size } = await stat(path.join(rootDir, filepath));
+            Object.assign(filesizeCache, { [filepath]: size });
+            mtime.setHours(0, 0, 0, 0); // strip hours from timestamp, leave only date
+            Object.assign(fileMtimeCache, { [filepath]: mtime });
+        }
+
+
+        const [, from, to] = q ? (q.match(/between\s+'(\d{4}-\d{2}-\d{2})'::date\s+and\s+'(\d{4}-\d{2}-\d{2})'::date/i) || []) : [];
+
+        // skip entirely if invalid dates passed to query.filter
+        if ((from && new Date(from).toString() === 'Invalid Date') || (to && new Date(to).toString() === 'Invalid Date')) {
+            return null;
+        }
+
+        // skip  if file modification date does not match filter value
+        if (fileMtimeCache[filepath] && from && to && (new Date(from) > fileMtimeCache[filepath] || new Date(to) < fileMtimeCache[filepath])) {
+            return null;
+        }
+
+        const dt = q && !q.includes('between') ? query.filter.match(/\d{4}-\d{2}-\d{2}/)?.[0] : null;
+        const date = dt ? new Date(dt) : null;
+        // skip timezone offset
+        if (date) { date.setHours(0, 0, 0, 0); }
+
+        // filter by exact date
+        if (fileMtimeCache[filepath] && date && (new Date(date).getTime() !== fileMtimeCache[filepath].getTime())) {
+            return null;
+        }
+
+        const mime = getMimeType(el.name) || '';
+        const preview = mime.startsWith('image/') /* && mime !== 'image/svg+xml' */
+            ? `${req.routeOptions.url}/${media ? media.id : Buffer.from(filepath).toString('base64url')}/preview`
+            : undefined;
+
+        return media ? {
+            type: 'file',
+            ...media,
+            url: `${req.routeOptions.url}/${media.id}/file`,
+            preview,
+            filepath,
+            metadata: `${req.routeOptions.url}/${media.id}`,
+        } : {
+            id: createHash('md5').update(filepath).digest('hex'),
+            hash: true,
+            type: 'file',
+            filename: el.name,
+            filepath,
+            filetype: mime.startsWith('image/') ? "image" : "other",
+            filesize: filesizeCache[filepath] || 0,
+            url: filepath,
+            mime,
+            preview,
+            updated_at: fileMtimeCache[filepath].toISOString(),
+        }
+    }));
+
+    // filter empty items, such as filtered out by query.filter=updated_at (not from db, but from fs.stat)
+    Object.assign(result, { data: subdirs.concat(files.filter(Boolean)) });
+    return result;
+
 }

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

@@ -1,39 +1,39 @@
-import path from 'node:path';
-import { existsSync } from 'node:fs';
-
-import { config, getFolder, pgClients } from "@opengis/fastify-table/utils.js";
-
-// 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'));
-
-export default async function metadataMedia({
-    routeOptions = {}, pg = pgClients.client, params = {},
-}, reply) {
-    if (!params?.id) {
-        return reply.status(400).send('not enough params: id');
-    }
-
-    if (!pg.pk?.['site.media']) {
-        return reply.status(404).send('table not found');
-    }
-
-    const data = await pg.query(
-        'select * from site.media where media_id = $1 and url is not null',
-        [params.id],
-    ).then(el => el.rows?.[0]);
-
-    if (!data) {
-        return reply.status(404).send('media not found: ' + params.id);
-    }
-
-    const filepath = path.join(rootDir, data.url);
-
-    Object.assign(data, {
-        url: `${routeOptions.url.replace(':id', params.id)}/file`,
-        preview: `${routeOptions.url.replace(':id', params.id)}/preview`,
-        filepath: data.url,
-        exists: existsSync(filepath),
-    });
-
-    return reply.status(200).send(data);
-}
+import path from 'node:path';
+import { existsSync } from 'node:fs';
+
+import { config, getFolder, pgClients } from "@opengis/fastify-table/utils.js";
+
+// 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'));
+
+export default async function metadataMedia({
+    routeOptions = {}, pg = pgClients.client, params = {},
+}, reply) {
+    if (!params?.id) {
+        return reply.status(400).send('not enough params: id');
+    }
+
+    if (!pg.pk?.['site.media']) {
+        return reply.status(404).send('table not found');
+    }
+
+    const data = await pg.query(
+        'select * from site.media where media_id = $1 and url is not null',
+        [params.id],
+    ).then(el => el.rows?.[0]);
+
+    if (!data) {
+        return reply.status(404).send('media not found: ' + params.id);
+    }
+
+    const filepath = path.join(rootDir, data.url);
+
+    Object.assign(data, {
+        url: `${routeOptions.url.replace(':id', params.id)}/file`,
+        preview: `${routeOptions.url.replace(':id', params.id)}/preview`,
+        filepath: data.url,
+        exists: existsSync(filepath),
+    });
+
+    return reply.status(200).send(data);
+}

package/server/routes/cms/controllers/properties.get.js

@@ -1,18 +1,18 @@
-import getSettings from '../functions/getSettings.js';
-
-export default async function getAppSettings({ query, params, user }, reply) {
-  const t1 = Date.now();
-
-  const result = await getSettings({
-    entity: params.entity,
-    keys: query.keys,
-    user,
-    ttl: 0
-  });
-
-  if (result.error) {
-    return reply.status(result.code).send(result);
-  }
-
-  return { time: Date.now() - t1, uid: user?.uid, settings: result };
-}
+import getSettings from '../functions/getSettings.js';
+
+export default async function getAppSettings({ query, params, user }, reply) {
+  const t1 = Date.now();
+
+  const result = await getSettings({
+    entity: params.entity,
+    keys: query.keys,
+    user,
+    ttl: 0
+  });
+
+  if (result.error) {
+    return reply.status(result.code).send(result);
+  }
+
+  return { time: Date.now() - t1, uid: user?.uid, settings: result };
+}

package/server/routes/cms/controllers/properties.post.js

@@ -1,99 +1,99 @@
-import { config, logger, dataInsert, pgClients } from '@opengis/fastify-table/utils.js';
-
-function checkValueType(val) {
-  if (val && typeof val === "object") {
-    return "property_json";
-  }
-  if (
-    val &&
-    typeof val === "number" &&
-    !/\D/.test(val.toString()) &&
-    val.toString().length < 10
-  ) {
-    return "property_int";
-  }
-  return "property_text";
-}
-
-export default async function postAppSettings(
-  {
-    pg = pgClients.client,
-    body,
-    user,
-    params,
-  },
-  reply
-) {
-  const { uid } = user || {};
-
-  if (
-    (!params?.entity || params.entity === "app") &&
-    !user?.user_type?.includes?.("admin") &&
-    !config.local
-  ) {
-    return reply.status(403).send("access restricted");
-  }
-
-  if (!pg) {
-    return reply.status(500).send("empty pg");
-  }
-
-  if (!pg?.pk?.["admin.properties"]) {
-    return reply.status(404).send("table not found");
-  }
-
-  const { key, val } = body;
-
-  if ((!key || !val) && !Object.keys(body).length) {
-    return reply.status(400).send("not enough body params");
-  }
-
-  const keys = Object.keys(body);
-
-  const entity = params?.entity === "user" ? user.uid : params?.entity || "app";
-
-  const client = await pg.connect();
-
-  try {
-    await client.query("begin;");
-
-    await client.query(
-      "delete from admin.properties where property_entity=$1 and property_key=any($2)",
-      [entity, keys]
-    );
-
-    await Promise.all(
-      keys
-        .filter((el) => body[el])
-        .map(async (el) => {
-          const columnType = checkValueType(body[el]);
-
-          await dataInsert({
-            pg: client,
-            table: "admin.properties",
-            data: {
-              property_key: el,
-              [columnType]: body[el],
-              property_entity: entity,
-            },
-            uid,
-          });
-        })
-    );
-
-    await client.query("commit;");
-
-    return reply.status(200).send("ok");
-  } catch (err) {
-    logger.file("properties/error", {
-      error: err.toString(),
-      stack: err.stack,
-      body,
-      user,
-      entity,
-    });
-    return reply.status(500).send(err.toString());
-  } finally {
-    client.release();
-  }
-}
+import { config, logger, dataInsert, pgClients } from '@opengis/fastify-table/utils.js';
+
+function checkValueType(val) {
+  if (val && typeof val === "object") {
+    return "property_json";
+  }
+  if (
+    val &&
+    typeof val === "number" &&
+    !/\D/.test(val.toString()) &&
+    val.toString().length < 10
+  ) {
+    return "property_int";
+  }
+  return "property_text";
+}
+
+export default async function postAppSettings(
+  {
+    pg = pgClients.client,
+    body,
+    user,
+    params,
+  },
+  reply
+) {
+  const { uid } = user || {};
+
+  if (
+    (!params?.entity || params.entity === "app") &&
+    !user?.user_type?.includes?.("admin") &&
+    !config.local
+  ) {
+    return reply.status(403).send("access restricted");
+  }
+
+  if (!pg) {
+    return reply.status(500).send("empty pg");
+  }
+
+  if (!pg?.pk?.["admin.properties"]) {
+    return reply.status(404).send("table not found");
+  }
+
+  const { key, val } = body;
+
+  if ((!key || !val) && !Object.keys(body).length) {
+    return reply.status(400).send("not enough body params");
+  }
+
+  const keys = Object.keys(body);
+
+  const entity = params?.entity === "user" ? user.uid : params?.entity || "app";
+
+  const client = await pg.connect();
+
+  try {
+    await client.query("begin;");
+
+    await client.query(
+      "delete from admin.properties where property_entity=$1 and property_key=any($2)",
+      [entity, keys]
+    );
+
+    await Promise.all(
+      keys
+        .filter((el) => body[el])
+        .map(async (el) => {
+          const columnType = checkValueType(body[el]);
+
+          await dataInsert({
+            pg: client,
+            table: "admin.properties",
+            data: {
+              property_key: el,
+              [columnType]: body[el],
+              property_entity: entity,
+            },
+            uid,
+          });
+        })
+    );
+
+    await client.query("commit;");
+
+    return reply.status(200).send("ok");
+  } catch (err) {
+    logger.file("properties/error", {
+      error: err.toString(),
+      stack: err.stack,
+      body,
+      user,
+      entity,
+    });
+    return reply.status(500).send(err.toString());
+  } finally {
+    client.release();
+  }
+}