@opengis/cms 0.0.32 → 0.0.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/cms",
-  "version": "0.0.32",
+  "version": "0.0.34",
   "description": "cms",
   "type": "module",
   "author": "Softpro",
@@ -12,10 +12,13 @@
     "plugin.js"
   ],
   "scripts": {
+    "patch": "npm version patch && git push && npm publish",
     "test": "node --test test/**/*.test.js",
     "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
-    "build": "vite build admin",
-    "build:lib": "LIB=true vite build",
+    "dev": "NODE_ENV=dev bun --env-file=.env.softpro server ",
+    "admin": "vite admin",
+    "build": "vite build && vite build admin",
+    "build:lib": "vite build",
     "proxy": "vite dev admin",
     "build-npm": "vite build",
     "start": "bun --env-file=.env.ip server",
@@ -24,7 +27,6 @@
     "prod": "NODE_ENV=production bun --env-file=.env.ip  server ",
     "prod-ip": "PORT=3019 node server --config=ip",
     "prod-ip-test": "PORT=3025 node server --config=ip",
-    "dev": "node server --config=softpro",
     "debug": "bun --watch server --config=softpro",
     "ip-test": "node server --config=ip-test",
     "ip": "node --env-file=.env.ip server",
@@ -65,4 +67,4 @@
     "vitest": "3.2.4",
     "vue-tsc": "^2.2.10"
   }
-}
+}

package/server/plugins/vite.js

@@ -1,58 +1,46 @@
 import fs from 'node:fs';
-import path, { dirname } from 'node:path';
-import { fileURLToPath } from 'url';
+import path from 'node:path';
+import { createServer } from 'vite';
 
 import { config } from '@opengis/fastify-table/utils.js';
 
-const dir = dirname(fileURLToPath(import.meta.url));
-const root = `${dir}/../..`;
-const adminRoot = path.join(root, 'admin');
-
-const isProduction = process.env.NODE_ENV === 'production' || config.production;
+const isProduction = process.env.NODE_ENV !== 'dev';
 console.log({ isProduction })
 async function plugin(fastify) {
   // vite server
-  if (!isProduction) {
-    const vite = await import('vite');
-
-    const viteServer = await vite.createServer({
-      root: adminRoot,
-      configFile: path.join(adminRoot, 'vite.config.js'),
-      server: {
-        middlewareMode: true,
-      },
-    });
+   const viteServer = !isProduction ? await createServer({
+    root: 'admin',
+    server: {
+      middlewareMode: true,
+    },
+  }) : null;
 
-    // add root to watch
-    viteServer.watcher.add(root);
-
-    // hot relaod template
+  if (!isProduction) {
+    const dir1 = process.cwd();
+    viteServer.watcher.add(dir1);
     viteServer.watcher.on('all', (d, t) => {
       if (!t.includes('module')) return;
       console.log(d, t);
       viteServer.ws.send({ type: 'full-reload' });
     });
 
-    // this is middleware for vite's dev servert
+    // this is middleware for vite's dev server
     fastify.addHook('onRequest', async (req, reply) => {
       const { user } = req.session?.passport || {};
-      if (!user && config.pg && !req.url.startsWith('/src/') && !config.auth?.disable) {
-        return reply.redirect('/login');
-      }
+      // console.log(req.url);
 
       const next = () => new Promise((resolve) => {
         viteServer.middlewares(req.raw, reply.raw, () => resolve());
       });
+
       await next();
     });
-    fastify.get('*', async () => { });
-    return;
   }
 
   // From Build
   fastify.get('*', async (req, reply) => {
     const { user } = req.session?.passport || {};
-    const indexPath = path.join(root, 'dist', 'index.html');
+    const indexPath = path.join('admin/dist', 'index.html');
     if (!user && config.pg && !req.url.startsWith('/src/') && !config.auth?.disable) {
       return reply.redirect('/login');
     }
@@ -65,8 +53,8 @@ async function plugin(fastify) {
 
   const fileSize = {};
   async function staticFile(req, reply) {
-    const assetsDir = '/dist';
-    const filePath = path.join(root, assetsDir, req.url);
+    const assetsDir = 'admin/dist';
+    const filePath = path.join( assetsDir, req.url);
     const ext = path.extname(filePath);
 
     if (!fs.existsSync(filePath)) return { status: 404, message: 'not found' };

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

@@ -18,24 +18,23 @@ export default async function deleteContent(req, reply) {
         return reply.status(400).send('not enough params: id');
     }
 
-
     if (id === 'pages') {
         return reply.status(403).send('access restricted: pages contents cannot be deleted');
     }
 
+    const { ctid, dbtable } = await pg.query('select content_type_id as ctid, table_name as dbtable from site.content_types where $1 in (content_type_id, name)', [params.type])
+        .then(el => el.rows?.[0] || {});
+
     const arr = config.pg ? await pg.query(`select array_agg(relname)::text[] from pg_class a 
-    left join pg_namespace b on a.relnamespace=b.oid 
-    where a.relam=2 and b.nspname='data'`).then(el => el.rows?.[0]?.array_agg || []) : [];
+        left join pg_namespace b on a.relnamespace=b.oid 
+        where a.relam=2 and b.nspname='data'`).then(el => el.rows?.[0]?.array_agg || []) : [];
 
-    if (!arr.length) {
+    if (!arr.length && type !== 'pages') {
         return reply.status(400).send('empty schema: data');
     }
 
     const table = arr.find(el => el === params.type);
 
-    const { ctid, dbtable } = await pg.query('select content_type_id as ctid, table_name as dbtable from site.content_types where $1 in (content_type_id, name)', [params.type])
-        .then(el => el.rows?.[0] || {});
-
     // singletone with extra at site.content_data
     if (!table && !dbtable && ctid) {
         const { cid, status } = ctid === 'pages' && id

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/insertContent.js

@@ -42,12 +42,6 @@ export default async function insertContent(req, reply) {
     left join pg_namespace b on a.relnamespace=b.oid 
     where a.relam=2 and b.nspname='data'`).then(el => el.rows?.[0]?.array_agg || []) : [];
 
-    if (!arr.length) {
-        return reply.status(400).send('empty schema: data');
-    }
-
-    const table = arr.find(el => el === params.type);
-
     const { content_id: contentId, type: contentType } = await pg.query(
         'select content_id, (select type from site.content_types where content_type_id=t.content_type_id) from site.contents t where slug=$1',
         [['single', 'pages'].includes(type) ? id : type],
@@ -58,6 +52,12 @@ export default async function insertContent(req, reply) {
         [contentId],
     ).then(el => el.rows?.[0]?.content_type_id) : null;
 
+    if (!arr.length && (ctypeId || type) !== 'pages') {
+        return reply.status(400).send('empty schema: data');
+    }
+
+    const table = arr.find(el => el === params.type);
+
     const { ctid, dbtable, columns: contentColumns } = await pg.query(
         'select content_type_id as ctid, table_name as dbtable, columns from site.content_types where $1 in (content_type_id, name)',
         [type === 'single' && id ? id : (ctypeId || type)],
@@ -70,7 +70,7 @@ export default async function insertContent(req, reply) {
         : contentColumns;
 
     // site.content_data, includes singletone
-    if (((!table && !dbtable) || type === 'pages')) {
+    if (((!table && !dbtable) || (ctypeId || type) === 'pages')) {
         const cid = await pg.query(
             'select content_id from site.contents where content_type_id=$1 limit 1',
             [ctid || 'pages'],