@opengis/cms 0.0.34 → 0.0.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/cms",
-  "version": "0.0.34",
+  "version": "0.0.36",
   "description": "cms",
   "type": "module",
   "author": "Softpro",

package/plugin.js

@@ -39,7 +39,7 @@ export default async function (app) {
   const pg = await getPGAsync(config.pg);
   execMigrations(path.join(dirname, 'server/migrations'), pg).catch(err => console.log(err));
   if (pg?.pk?.['site.content_types']) {
-    const customTables = await pg.query('select array_agg(table_name) from site.content_types where table_name is not null').then(el => el.rows?.[0]?.array_agg || []).catch(err => console.log(err));
+    const customTables = await pg.query('select array_agg(table_name) from site.content_types where table_name is not null').catch(err => console.log(err)).then(el => el?.rows?.[0]?.array_agg || []);
 
     await Promise.all(customTables.filter(table => pg.pk?.[`data.${table}`])?.map(async (table) => {
       await pg.query(`alter table data.${table} add column if not exists meta json`).catch(err => console.log(err));

package/server/migrations/fixes.sql

@@ -42,12 +42,12 @@ left join lateral (select content_type_id from site.content_types b where a.type
 -- seamless migration finish
 
 --- insert default content types start
-insert into site.content_types(content_type_id,name,title,type,columns)
+insert into site.content_types(content_type_id,name,title,type,columns,template,uid)
 values('pages','pages','Сторінки','collection',
 '[{"name":"slug","label":"Slug","type":"slug","parent":"title","required":true},{"name":"title","label":"Title","type":"text","required":true},{"name":"status","label":"Status","type":"select","options":[{"id":"draft","text":"Draft"},{"id":"published","text":"Published"},{"id":"archived","text":"Archived"},{"id":"delayPublished","text":"Delay Published"}],"required":true},{"name":"published_at","label":"Publish at","type":"datetime","required":true}]'::json
-) on conflict(content_type_id) do update set columns=excluded.columns, type = excluded.type;
-insert into site.contents(content_id,content_type_id,space_id)
-values('pages','pages','default') on conflict(content_id) do nothing;
+,'','1') on conflict(content_type_id) do update set columns=excluded.columns, type = excluded.type;
+insert into site.contents(content_id,content_type_id,space_id,template,uid)
+values('pages','pages','default','','1') on conflict(content_id) do nothing;
 --- insert default content types finish
 
 alter table site.contents add column if not exists meta json;
@@ -83,7 +83,8 @@ update site.content_types
 set columns=replace(columns::text,'publish_at', 'published_at')::json
 where columns::text like '%publish_at%';
 
-ALTER TABLE site.contents DROP CONSTRAINT contents_status_check;
+ALTER TABLE site.contents DROP CONSTRAINT if exists contents_status_check;
+-- select * from site.contents where not status = ANY (ARRAY['draft'::text, 'published'::text, 'archived'::text, 'delayPublished'::text])
 ALTER TABLE site.contents ADD CONSTRAINT contents_status_check CHECK (status = ANY (ARRAY['draft'::text, 'published'::text, 'archived'::text, 'delayPublished'::text]));
 
 UPDATE site.content_types

package/server/migrations/site.sql

@@ -64,7 +64,7 @@ CREATE TABLE if not exists site.content_types (
     table_name VARCHAR(50),
     columns json,
     status VARCHAR (20) DEFAULT 'draft' CHECK (status::text = ANY (ARRAY['draft', 'published', 'archived']::text[])),
-    visible BOOLEAN DEFAULT TRUE, 
+    visible BOOLEAN DEFAULT TRUE,
     localized BOOLEAN DEFAULT FALSE,
     type VARCHAR(20) NOT NULL DEFAULT 'collection' CHECK (type::text = ANY (ARRAY['collection', 'single']::text[])),
     schema JSONB,
@@ -78,6 +78,20 @@ CREATE TABLE if not exists site.content_types (
     updated_by text REFERENCES admin.users(uid)
 );
 
+ALTER TABLE site.content_types add COLUMN if not exists table_name text;
+ALTER TABLE site.content_types add COLUMN if not exists title text;
+ALTER TABLE site.content_types add COLUMN if not exists status text;
+ALTER TABLE site.content_types add COLUMN if not exists visible boolean default true;
+ALTER TABLE site.content_types add COLUMN if not exists localized boolean default false;
+ALTER TABLE site.content_types add COLUMN if not exists schema jsonb;
+ALTER TABLE site.content_types add COLUMN if not exists icon text;
+ALTER TABLE site.content_types add COLUMN if not exists color text;
+ALTER TABLE site.content_types add COLUMN if not exists created_at TIMESTAMP DEFAULT NOW();
+ALTER TABLE site.content_types add COLUMN if not exists updated_at TIMESTAMP DEFAULT NOW();
+ALTER TABLE site.content_types add COLUMN if not exists created_by text REFERENCES admin.users(uid);
+ALTER TABLE site.content_types add COLUMN if not exists updated_by text REFERENCES admin.users(uid);
+ALTER TABLE site.content_types add COLUMN if not exists preview_path text;
+
 ALTER TABLE if exists site.content_types ALTER COLUMN table_name DROP NOT NULL;
 ALTER TABLE if exists site.content_types ADD COLUMN if not exists columns json;
 
@@ -145,6 +159,14 @@ CREATE TABLE if not exists site.menus (
 );
 
 alter table site.menus add column if not exists locale VARCHAR(20) not null default 'uk';
+alter table site.menus add column if not exists content text;
+alter table site.menus add column if not exists items json;
+alter table site.menus add column if not exists description text;
+ALTER TABLE site.menus add COLUMN if not exists created_at TIMESTAMP DEFAULT NOW();
+ALTER TABLE site.menus add COLUMN if not exists updated_at TIMESTAMP DEFAULT NOW();
+ALTER TABLE site.menus add COLUMN if not exists created_by text REFERENCES admin.users(uid);
+ALTER TABLE site.menus add COLUMN if not exists updated_by text REFERENCES admin.users(uid);
+
 ALTER TABLE site.menus DROP CONSTRAINT if exists menus_name_key;
 ALTER TABLE site.menus DROP CONSTRAINT if exists menus_name_locale_unique;
 alter table site.menus drop column if exists lang;
@@ -189,8 +211,8 @@ CREATE INDEX if not exists idx_roles_name ON site.roles(name);
 -- drop table if exists site.permissions cascade;
 CREATE TABLE if not exists site.permissions (
     permission_id text PRIMARY KEY default next_id(),
-    role_id text references site.roles(role_id), 
-    user_id text references admin.users(uid), 
+    role_id text references site.roles(role_id),
+    user_id text references admin.users(uid),
     content_type_id text references site.content_types(content_type_id),
     subject VARCHAR(100) NOT NULL,
     actions TEXT[] NOT NULL check (actions && (ARRAY['read', 'create', 'delete', 'edit']::text[])),
@@ -229,7 +251,7 @@ CREATE TABLE if not exists site.tokens (
     last_used TIMESTAMP NULL, -- When the token was last used (nullable)
     created_at TIMESTAMP NOT NULL default now(), -- When the token was created
     updated_at TIMESTAMP NOT NULL default now(), -- When the token was updated
-    created_by TEXT, -- Who created the token 
+    created_by TEXT, -- Who created the token
     updated_by TEXT, -- When updated the token
     expiration_date TIMESTAMP, -- (nullable) Expiration date of the token
     token_type TEXT CHECK (token_type IN ('CMA', 'PAT')), -- Type of token
@@ -348,6 +370,19 @@ CREATE TABLE if not exists site.contents (
     FOREIGN KEY (updated_by) REFERENCES admin.users(uid)
 );
 
+alter table site.contents add column if not exists  space_id text;
+alter table site.contents add column if not exists  content_type_id text;
+ALTER TABLE site.contents add COLUMN if not exists created_at TIMESTAMP DEFAULT NOW();
+ALTER TABLE site.contents add COLUMN if not exists updated_at TIMESTAMP DEFAULT NOW();
+ALTER TABLE site.contents add COLUMN if not exists created_by text REFERENCES admin.users(uid);
+ALTER TABLE site.contents add COLUMN if not exists updated_by text REFERENCES admin.users(uid);
+ALTER TABLE site.contents add COLUMN if not exists published_at TIMESTAMP DEFAULT NOW();
+ALTER TABLE site.contents add COLUMN if not exists revision INTEGER NOT NULL DEFAULT 1;
+ALTER TABLE site.contents add COLUMN if not exists locale TEXT NOT NULL DEFAULT 'uk'::text;
+ALTER TABLE site.contents add COLUMN if not exists published_by text;
+ALTER TABLE site.contents add COLUMN if not exists slug text;
+ALTER TABLE site.contents add COLUMN if not exists meta json;
+
 COMMENT ON COLUMN site.contents.content_id IS 'Unique identifier for the content item (entry)';
 COMMENT ON COLUMN site.contents.space_id IS 'FK to the space this content belongs to';
 COMMENT ON COLUMN site.contents.content_type_id IS 'FK to the content type definition';
@@ -380,6 +415,21 @@ CREATE TABLE if not exists site.content_data (
     constraint content_data_content_id_fkey FOREIGN KEY (content_id) REFERENCES site.contents(content_id) on delete cascade
 );
 
+
+alter table site.content_data add column  if not exists field_key text not null;
+alter table site.content_data add column  if not exists field_type text;
+alter table site.content_data add column  if not exists field_value text;
+alter table site.content_data add column  if not exists field_value_object json;
+alter table site.content_data add column  if not exists locale text;
+alter table site.content_data add column  if not exists field_id text;
+alter table site.content_data add column  if not exists object_id text;
+ALTER TABLE site.content_data add COLUMN if not exists created_at TIMESTAMP DEFAULT NOW();
+ALTER TABLE site.content_data add COLUMN if not exists updated_at TIMESTAMP DEFAULT NOW();
+ALTER TABLE site.content_data add COLUMN if not exists created_by text REFERENCES admin.users(uid);
+ALTER TABLE site.content_data add COLUMN if not exists updated_by text REFERENCES admin.users(uid);
+
+
+
 -- create unique index for slug
 CREATE UNIQUE INDEX if not exists content_data_slug_unique ON site.content_data (field_value) WHERE field_key = 'slug';
 

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

@@ -1,77 +1,77 @@
-import path from 'node:path';
-import { existsSync } from 'node:fs';
-import { rm, stat, readdir } from 'node:fs/promises';
-
-import { config, dataDelete, 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'));
-const dir = '/files';
-
-export default async function deleteMedia({
-    pg = pgClients.client, params = {}, query = {}, user = {}, method = 'DELETE',
-}, reply) {
-    if (!config.debug && method !== 'DELETE') {
-        return reply.status(403).send('access restricted');
-    }
-
-    if (!params.id && query.subdir) {
-        const dirpath = path.join(rootDir, dir, query.subdir || '');
-        const exists = existsSync(dirpath);
-        const stats = await stat(dirpath);
-
-        if (!stats.isDirectory()) {
-            return reply.status(400).send('not a directory');
-        }
-
-        if (!exists) {
-            return reply.status(404).send('subdir not found: ' + query.subdir);
-        }
-
-        const content = await readdir(dirpath, { recursive: true });
-
-        if (query.subdir.startsWith('uploads') && !query.subdir.split('/')[1]) {
-            return reply.status(403).send('access restricted: uploads directory');
-        }
-
-        // only admins are allowed to delete non-empty directories
-        if (content?.length && !user?.user_type?.includes?.('admin')) {
-            return reply.status(400).send('directory is not empty');
-        }
-
-        await rm(dirpath, { recursive: true });
-        return reply.status(200).send('subdirectory successfully deleted');
-    }
-
-    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 { url: relpath, id } = await pg.query(
-        'select media_id as id, url from site.media where media_id = $1 and url is not null',
-        [params.id],
-    ).then(el => el.rows?.[0] || {});
-
-    if (!id) {
-        return reply.status(404).send('media not found: ' + params.id);
-    }
-
-    const res = await dataDelete({
-        pg,
-        id,
-        table: 'site.media',
-        uid: user?.uid || 0,
-    });
-
-    const filepath = path.join(rootDir, relpath);
-
-    if (existsSync(filepath)) {
-        await rm(filepath, { recursive: true });
-    }
-
-    return { id, ...res || {} };
+import path from 'node:path';
+import { existsSync } from 'node:fs';
+import { rm, stat, readdir } from 'node:fs/promises';
+
+import { config, dataDelete, 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'));
+const dir = '/files';
+
+export default async function deleteMedia({
+    pg = pgClients.client, params = {}, query = {}, user = {}, method = 'DELETE',
+}, reply) {
+    if (!config.debug && method !== 'DELETE') {
+        return reply.status(403).send('access restricted');
+    }
+
+    if (!params.id && query.subdir) {
+        const dirpath = path.join(rootDir, dir, query.subdir || '');
+        const exists = existsSync(dirpath);
+        const stats = await stat(dirpath);
+
+        if (!stats.isDirectory()) {
+            return reply.status(400).send('not a directory');
+        }
+
+        if (!exists) {
+            return reply.status(404).send('subdir not found: ' + query.subdir);
+        }
+
+        const content = await readdir(dirpath, { recursive: true });
+
+        if (query.subdir.startsWith('uploads') && !query.subdir.split('/')[1]) {
+            return reply.status(403).send('access restricted: uploads directory');
+        }
+
+        // only admins are allowed to delete non-empty directories
+        if (content?.length && !user?.user_type?.includes?.('admin')) {
+            return reply.status(400).send('directory is not empty');
+        }
+
+        await rm(dirpath, { recursive: true });
+        return reply.status(200).send('subdirectory successfully deleted');
+    }
+
+    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 { url: relpath, id } = await pg.query(
+        'select media_id as id, url from site.media where media_id = $1 and url is not null',
+        [params.id],
+    ).then(el => el.rows?.[0] || {});
+
+    if (!id) {
+        return reply.status(404).send('media not found: ' + params.id);
+    }
+
+    const res = await dataDelete({
+        pg,
+        id,
+        table: 'site.media',
+        uid: user?.uid || 0,
+    });
+
+    const filepath = path.join(rootDir, relpath);
+
+    if (existsSync(filepath)) {
+        await rm(filepath, { recursive: true });
+    }
+
+    return { id, ...res || {} };
 }

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

@@ -1,49 +1,49 @@
-import path from 'node:path';
-import { existsSync } from 'node:fs';
-import { readFile } from 'node:fs/promises';
-
-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 downloadMedia({
-    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 { filename, mime, id, url: relpath } = 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 (!id) {
-        return reply.status(404).send('media not found: ' + params.id);
-    }
-
-    const filepath = path.join(rootDir, relpath);
-
-    if (!existsSync(filepath)) {
-        return reply.status(404).send('file not found');
-    }
-
-    const buffer = await readFile(filepath, { buffer: true });
-
-    // skip xml load for preview
-    if (params.type === 'preview' && path.extname(filename) !== '.xml') {
-        return reply.headers({ 'Content-Type': mime }).send(buffer);
-    }
-
-    return reply
-        .headers({
-            'Content-Type': mime,
-            'Content-Disposition': `attachment; filename=${filename || path.basename(filepath)}`,
-        })
-        .send(buffer);
-}
+import path from 'node:path';
+import { existsSync } from 'node:fs';
+import { readFile } from 'node:fs/promises';
+
+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 downloadMedia({
+    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 { filename, mime, id, url: relpath } = 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 (!id) {
+        return reply.status(404).send('media not found: ' + params.id);
+    }
+
+    const filepath = path.join(rootDir, relpath);
+
+    if (!existsSync(filepath)) {
+        return reply.status(404).send('file not found');
+    }
+
+    const buffer = await readFile(filepath, { buffer: true });
+
+    // skip xml load for preview
+    if (params.type === 'preview' && path.extname(filename) !== '.xml') {
+        return reply.headers({ 'Content-Type': mime }).send(buffer);
+    }
+
+    return reply
+        .headers({
+            'Content-Type': mime,
+            'Content-Disposition': `attachment; filename=${filename || path.basename(filepath)}`,
+        })
+        .send(buffer);
+}

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

@@ -1,16 +1,16 @@
-import { pgClients } from '@opengis/fastify-table/utils.js';
-
-export default async function getPermissions(req, reply) {
-    const { pg = pgClients.client, params = {}, user = {} } = req;
-
-    if (!user?.uid) {
-        return reply.status(401).send('unauthorized');
-    }
-
-    const { rows = [] } = await pg.query(
-        `select * from site.permissions where ${params.id ? 'user_id=$1' : 'true'}`,
-        [params.id].filter(Boolean),
-    );
-
-    return { permissions: rows };
+import { pgClients } from '@opengis/fastify-table/utils.js';
+
+export default async function getPermissions(req, reply) {
+    const { pg = pgClients.client, params = {}, user = {} } = req;
+
+    if (!user?.uid) {
+        return reply.status(401).send('unauthorized');
+    }
+
+    const { rows = [] } = await pg.query(
+        `select * from site.permissions where ${params.id ? 'user_id=$1' : 'true'}`,
+        [params.id].filter(Boolean),
+    );
+
+    return { permissions: rows };
 }

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

@@ -1,95 +1,95 @@
-import path from 'node:path';
-import { existsSync, mkdirSync } from 'node:fs';
-import { readdir, stat } from 'node:fs/promises';
-
-import { config, getFolder, pgClients, getMimeType } from '@opengis/fastify-table/utils.js';
-import { createHash } from 'node:crypto';
-
-// 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';
-
-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 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, "''")}%'` : ''}`,
-        [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 });
-    }
-
-    const files = (search ? allItems.filter(el => el.name.includes(search)) : items)
-        .filter(el => el.isFile())
-        .map(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);
-            return media ? {
-                type: 'file',
-                ...media,
-                url: `${req.routeOptions.url}/${media.id}/file`,
-                preview: `${req.routeOptions.url}/${media.id}/preview`,
-                filepath,
-                metadata: `${req.routeOptions.url}/${media.id}`,
-            } : {
-                id: createHash('md5').update(filepath).digest('hex'),
-                hash: true,
-                type: 'file',
-                filename: el.name,
-                filepath,
-                filetype: getMimeType(el.name)?.startsWith('image/') ? "image" : "other",
-                filesize: 0,
-                url: filepath,
-                mime: getMimeType(el.name),
-                preview: filepath,
-            }
-        });
-
-    Object.assign(result, { data: subdirs.concat(files) });
-    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 } from '@opengis/fastify-table/utils.js';
+import { createHash } from 'node:crypto';
+
+// 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';
+
+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 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, "''")}%'` : ''}`,
+        [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 });
+    }
+
+    const files = (search ? allItems.filter(el => el.name.includes(search)) : items)
+        .filter(el => el.isFile())
+        .map(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);
+            return media ? {
+                type: 'file',
+                ...media,
+                url: `${req.routeOptions.url}/${media.id}/file`,
+                preview: `${req.routeOptions.url}/${media.id}/preview`,
+                filepath,
+                metadata: `${req.routeOptions.url}/${media.id}`,
+            } : {
+                id: createHash('md5').update(filepath).digest('hex'),
+                hash: true,
+                type: 'file',
+                filename: el.name,
+                filepath,
+                filetype: getMimeType(el.name)?.startsWith('image/') ? "image" : "other",
+                filesize: 0,
+                url: filepath,
+                mime: getMimeType(el.name),
+                preview: filepath,
+            }
+        });
+
+    Object.assign(result, { data: subdirs.concat(files) });
+    return result;
+
 }