@opengis/cms 0.0.57 → 0.0.58

package/server/plugins/adminHook.js

@@ -1,78 +1,78 @@
-import fp from 'fastify-plugin';
-import { createReadStream } from 'node:fs';
-
-function plugin(fastify) {
-  // preSerialization
-  fastify.addHook('preSerialization', async (req, reply, payload) => {
-    /*if (req.url.includes('/suggest/') && !req.query.json) {
-      return payload?.data;
-    }*/
-    /* if (payload.redirect) {
-       return reply.redirect(payload.redirect);
-     }*/
-    if (reply.sent) {
-      return null;
-    }
-    if (!payload) {
-      return payload;
-    }
-
-    if (['200', '400', '500', '403', '404'].includes(payload.status)) {
-      reply.status(payload.status);
-    }
-    /* if (payload.headers) {
-      reply.headers(payload.headers);
-    } */
-    if (payload.buffer) {
-      return payload.buffer;
-    }
-    if (payload.file) {
-      // const buffer = await readFile(payload.file);
-      // return reply.send(buffer);
-      const stream = createReadStream(payload.file);
-      return stream;
-      // return reply.send(stream);
-    }
-
-    if (payload.message) {
-      return payload.message;
-    }
-    return payload;
-  });
-
-  //  preValidation
-  fastify.addHook('preValidation', async (req) => {
-    const parseRawBody = ['POST', 'PUT'].includes(req.method) && req.body && typeof req.body === 'string'
-      && req.body.trim(/\r\n/g).startsWith('{')
-      && req.body.trim(/\r\n/g).endsWith('}');
-    if (parseRawBody) {
-      try {
-        req.body = JSON.parse(req.body || '{}');
-      }
-      catch (err) {
-        // throw new Error('invalid body');
-        // return { error: 'invalid body', status: 400 };
-      }
-    }
-  });
-
-  // allow upload file
-  const kIsMultipart = Symbol.for('[FastifyMultipart.isMultipart]');
-  fastify.addContentTypeParser('multipart', (request, _, done) => {
-    request[kIsMultipart] = true;
-    done(null);
-  });
-
-  // parse Body
-  function contentParser(req, body, done) {
-    const parseBody = decodeURIComponent(body.toString()).split('&').reduce((acc, el) => {
-      const [key, val] = el.split('=');
-      return { ...acc, [key]: val };
-    }, {});
-    done(null, parseBody);
-  }
-
-  fastify.addContentTypeParser('application/x-www-form-urlencoded', { parseAs: 'buffer' }, contentParser);
-}
-
-export default fp(plugin);
+import fp from 'fastify-plugin';
+import { createReadStream } from 'node:fs';
+
+function plugin(fastify) {
+  // preSerialization
+  fastify.addHook('preSerialization', async (req, reply, payload) => {
+    /*if (req.url.includes('/suggest/') && !req.query.json) {
+      return payload?.data;
+    }*/
+    /* if (payload.redirect) {
+       return reply.redirect(payload.redirect);
+     }*/
+    if (reply.sent) {
+      return null;
+    }
+    if (!payload) {
+      return payload;
+    }
+
+    if (['200', '400', '500', '403', '404'].includes(payload.status)) {
+      reply.status(payload.status);
+    }
+    /* if (payload.headers) {
+      reply.headers(payload.headers);
+    } */
+    if (payload.buffer) {
+      return payload.buffer;
+    }
+    if (payload.file) {
+      // const buffer = await readFile(payload.file);
+      // return reply.send(buffer);
+      const stream = createReadStream(payload.file);
+      return stream;
+      // return reply.send(stream);
+    }
+
+    if (payload.message) {
+      return payload.message;
+    }
+    return payload;
+  });
+
+  //  preValidation
+  fastify.addHook('preValidation', async (req) => {
+    const parseRawBody = ['POST', 'PUT'].includes(req.method) && req.body && typeof req.body === 'string'
+      && req.body.trim(/\r\n/g).startsWith('{')
+      && req.body.trim(/\r\n/g).endsWith('}');
+    if (parseRawBody) {
+      try {
+        req.body = JSON.parse(req.body || '{}');
+      }
+      catch (err) {
+        // throw new Error('invalid body');
+        // return { error: 'invalid body', status: 400 };
+      }
+    }
+  });
+
+  // allow upload file
+  const kIsMultipart = Symbol.for('[FastifyMultipart.isMultipart]');
+  fastify.addContentTypeParser('multipart', (request, _, done) => {
+    request[kIsMultipart] = true;
+    done(null);
+  });
+
+  // parse Body
+  function contentParser(req, body, done) {
+    const parseBody = decodeURIComponent(body.toString()).split('&').reduce((acc, el) => {
+      const [key, val] = el.split('=');
+      return { ...acc, [key]: val };
+    }, {});
+    done(null, parseBody);
+  }
+
+  fastify.addContentTypeParser('application/x-www-form-urlencoded', { parseAs: 'buffer' }, contentParser);
+}
+
+export default fp(plugin);

package/server/plugins/hook.js

@@ -1,59 +1,59 @@
-import fp from 'fastify-plugin';
-import { randomUUID, createHash } from 'node:crypto';
-
-import { addHook, addCron, config, pgClients } from '@opengis/fastify-table/utils.js';
-
-import getDraftKey from '../functions/getDraftKey.js';
-
-const pg = pgClients.client;
-
-const q = `select 
-    content_id as id, a.status, type, published_at, table_name as table
-from site.contents a
-left join site.content_types b
-    on a.content_type_id=b.content_type_id
-where
-    b.visible
-    and case
-            when type = 'single'
-            then
-                a.status='delayPublished'
-                and CURRENT_DATE >= published_at::date
-            else true
-        end`;
-
-async function updateDelayPublished() {
-    const rows = pg ? await pg.query(q).then(el => el.rows || []) : [];
-
-    const result = await Promise.all(rows.map(async ({ id, status, type, table }) => {
-        if (status === 'delayPublished' && type === 'single') {
-            const { rowCount } = await pg.query(`update site.contents set status='published' where content_id=$1`, [id]);
-            return { id, type, rowCount };
-        } else if (table && type === 'collection') {
-            const { rowCount } = await pg.query(`update data."${table}" set status='published' where status='delayPublished' and now() >= published_at`);
-            return { id, type, rowCount };
-        } else {
-            return { id, type, skip: true };
-        }
-    }));
-    const r = { updated: result.reduce((acc, curr) => acc + +(curr.rowCount || 0), 0), skipped: result.filter(el => el.skip).length };
-    if (config.trace) console.log(r);
-    return r;
-}
-function plugin(app) {
-    addHook('afterUser', async ({ payload = {} }) => {
-        if (payload?.user) {
-            // get from cache, refresh hourly
-            const { draftKey, ttl } = await getDraftKey();
-            Object.assign(payload.user, { draftKey, draftKeyTTL: ttl });
-        }
-    });
-    // force refresh at restart
-    app.addHook('onListen', async () => {
-        await getDraftKey(true);
-    });
-    addCron(updateDelayPublished, 60 * 60);
-    updateDelayPublished();
-}
-
-export default fp(plugin);
+import fp from 'fastify-plugin';
+import { randomUUID, createHash } from 'node:crypto';
+
+import { addHook, addCron, config, pgClients } from '@opengis/fastify-table/utils.js';
+
+import getDraftKey from '../functions/getDraftKey.js';
+
+const pg = pgClients.client;
+
+const q = `select 
+    content_id as id, a.status, type, published_at, table_name as table
+from site.contents a
+left join site.content_types b
+    on a.content_type_id=b.content_type_id
+where
+    b.visible
+    and case
+            when type = 'single'
+            then
+                a.status='delayPublished'
+                and CURRENT_DATE >= published_at::date
+            else true
+        end`;
+
+async function updateDelayPublished() {
+    const rows = pg ? await pg.query(q).then(el => el.rows || []) : [];
+
+    const result = await Promise.all(rows.map(async ({ id, status, type, table }) => {
+        if (status === 'delayPublished' && type === 'single') {
+            const { rowCount } = await pg.query(`update site.contents set status='published' where content_id=$1`, [id]);
+            return { id, type, rowCount };
+        } else if (table && type === 'collection') {
+            const { rowCount } = await pg.query(`update data."${table}" set status='published' where status='delayPublished' and now() >= published_at`);
+            return { id, type, rowCount };
+        } else {
+            return { id, type, skip: true };
+        }
+    }));
+    const r = { updated: result.reduce((acc, curr) => acc + +(curr.rowCount || 0), 0), skipped: result.filter(el => el.skip).length };
+    if (config.trace) console.log(r);
+    return r;
+}
+function plugin(app) {
+    addHook('afterUser', async ({ payload = {} }) => {
+        if (payload?.user) {
+            // get from cache, refresh hourly
+            const { draftKey, ttl } = await getDraftKey();
+            Object.assign(payload.user, { draftKey, draftKeyTTL: ttl });
+        }
+    });
+    // force refresh at restart
+    app.addHook('onListen', async () => {
+        await getDraftKey(true);
+    });
+    addCron(updateDelayPublished, 60 * 60);
+    updateDelayPublished();
+}
+
+export default fp(plugin);

package/server/plugins/vite.js

@@ -1,75 +1,75 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { createServer } from 'vite';
-
-import { config } from '@opengis/fastify-table/utils.js';
-
-const isProduction = process.env.NODE_ENV !== 'dev';
-console.log({ isProduction })
-async function plugin(fastify) {
-  // vite server
-   const viteServer = !isProduction ? await createServer({
-    root: 'admin',
-    server: {
-      middlewareMode: true,
-    },
-  }) : null;
-
-  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 server
-    fastify.addHook('onRequest', async (req, reply) => {
-      const { user } = req.session?.passport || {};
-      // console.log(req.url);
-
-      const next = () => new Promise((resolve) => {
-        viteServer.middlewares(req.raw, reply.raw, () => resolve());
-      });
-
-      await next();
-    });
-  }
-
-  // From Build
-  fastify.get('*', async (req, reply) => {
-    const { user } = req.session?.passport || {};
-    const indexPath = path.join('admin/dist', 'index.html');
-    if (!user && config.pg && !req.url.startsWith('/src/') && !config.auth?.disable) {
-      return reply.redirect('/login');
-    }
-    if (!fs.existsSync(indexPath)) {
-      return reply.status(404).send('index.html not found');
-    }
-    const stream = fs.createReadStream(indexPath);
-    return reply.type('text/html').send(stream);
-  });
-
-  const fileSize = {};
-  async function staticFile(req, reply) {
-    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' };
-    fileSize[filePath] = fileSize[filePath] || fs.statSync(filePath).size;
-    const mime = {
-      '.js': 'text/javascript', '.css': 'text/css', '.woff2': 'application/font-woff', '.png': 'image/png', '.svg': 'image/svg+xml', '.jpg': 'image/jpg',
-    }[ext];
-    reply.headers({ 'Cache-control': 'max-age=3600, public', 'Content-length': fileSize[filePath], 'Content-Encoding': 'identity' });
-
-    const stream = fs.createReadStream(filePath);
-    return mime ? reply.type(mime).send(stream) : stream;
-  }
-
-  fastify.get('/assets/*', staticFile);
-  fastify.get('/public/*', staticFile);
-}
-
-export default plugin;
+import fs from 'node:fs';
+import path from 'node:path';
+import { createServer } from 'vite';
+
+import { config } from '@opengis/fastify-table/utils.js';
+
+const isProduction = process.env.NODE_ENV !== 'dev';
+console.log({ isProduction })
+async function plugin(fastify) {
+  // vite server
+   const viteServer = !isProduction ? await createServer({
+    root: 'admin',
+    server: {
+      middlewareMode: true,
+    },
+  }) : null;
+
+  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 server
+    fastify.addHook('onRequest', async (req, reply) => {
+      const { user } = req.session?.passport || {};
+      // console.log(req.url);
+
+      const next = () => new Promise((resolve) => {
+        viteServer.middlewares(req.raw, reply.raw, () => resolve());
+      });
+
+      await next();
+    });
+  }
+
+  // From Build
+  fastify.get('*', async (req, reply) => {
+    const { user } = req.session?.passport || {};
+    const indexPath = path.join('admin/dist', 'index.html');
+    if (!user && config.pg && !req.url.startsWith('/src/') && !config.auth?.disable) {
+      return reply.redirect('/login');
+    }
+    if (!fs.existsSync(indexPath)) {
+      return reply.status(404).send('index.html not found');
+    }
+    const stream = fs.createReadStream(indexPath);
+    return reply.type('text/html').send(stream);
+  });
+
+  const fileSize = {};
+  async function staticFile(req, reply) {
+    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' };
+    fileSize[filePath] = fileSize[filePath] || fs.statSync(filePath).size;
+    const mime = {
+      '.js': 'text/javascript', '.css': 'text/css', '.woff2': 'application/font-woff', '.png': 'image/png', '.svg': 'image/svg+xml', '.jpg': 'image/jpg',
+    }[ext];
+    reply.headers({ 'Cache-control': 'max-age=3600, public', 'Content-length': fileSize[filePath], 'Content-Encoding': 'identity' });
+
+    const stream = fs.createReadStream(filePath);
+    return mime ? reply.type(mime).send(stream) : stream;
+  }
+
+  fastify.get('/assets/*', staticFile);
+  fastify.get('/public/*', staticFile);
+}
+
+export default plugin;

package/server/routes/category/controllers/cms.category.delete.js

@@ -1,21 +1,21 @@
-import { dataDelete, getMeta } from '@opengis/fastify-table/utils.js';
-
-export default async function categoryDelete({ user = {}, params = {} }) {
-
-  if (!params.id) {
-    return { message: 'id is required', status: 400 };
-  }
-  const { pk } = await getMeta({ table: 'site.categories' });
-
-  if (!pk) {
-    return { message: 'table not found', status: 404 };
-  }
-
-  const res = await dataDelete({
-    table: 'site.categories', 
-    id: params.id,
-    uid: user?.uid
-  });
-
-  return { id: res.category_id, rows: [res] };
-}
+import { dataDelete, getMeta } from '@opengis/fastify-table/utils.js';
+
+export default async function categoryDelete({ user = {}, params = {} }) {
+
+  if (!params.id) {
+    return { message: 'id is required', status: 400 };
+  }
+  const { pk } = await getMeta({ table: 'site.categories' });
+
+  if (!pk) {
+    return { message: 'table not found', status: 404 };
+  }
+
+  const res = await dataDelete({
+    table: 'site.categories', 
+    id: params.id,
+    uid: user?.uid
+  });
+
+  return { id: res.category_id, rows: [res] };
+}

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

@@ -1,17 +1,17 @@
-import { pgClients, getMeta, getTemplate } from '@opengis/fastify-table/utils.js';
-
-export default async function categoryGet({ pg = pgClients.client, params = {} }) {
-
-  const { pk } = await getMeta({ table: 'site.categories' });
-
-  if (!pk) {
-    return { message: 'table not found', status: 404 };
-  }
-
-  const { rows, rowCount: total } = await pg.query(
-    `select a.category_id as id, a.* FROM site.categories a
-   where a.category_id=$1`,
-    [params.id]
-  );
-  return { message: { total, rows }, status: 200 };
-}
+import { pgClients, getMeta, getTemplate } from '@opengis/fastify-table/utils.js';
+
+export default async function categoryGet({ pg = pgClients.client, params = {} }) {
+
+  const { pk } = await getMeta({ table: 'site.categories' });
+
+  if (!pk) {
+    return { message: 'table not found', status: 404 };
+  }
+
+  const { rows, rowCount: total } = await pg.query(
+    `select a.category_id as id, a.* FROM site.categories a
+   where a.category_id=$1`,
+    [params.id]
+  );
+  return { message: { total, rows }, status: 200 };
+}

package/server/routes/category/controllers/cms.category.list.js

@@ -1,16 +1,16 @@
-import { pgClients, getTemplate, getMeta }  from '@opengis/fastify-table/utils.js';
-
-export default async function categoryList({ pg = pgClients.client, query = {} }) {
-
-  const { pk } = await getMeta({ table: 'site.categories' });
-
-  if (!pk) {
-    return { message: 'table not found', status: 404 };
-  }
-  const sql = `select a.category_id as id, a.* FROM site.categories a
-  where ${query.category_id ? 'category_id=$1' : '1=1'}`
-
-  const { rows, rowCount: total } = await pg.query(sql, [query.category_id].filter((el) => el));
-
-  return { message: { total, rows }, status: 200 };
-}
+import { pgClients, getTemplate, getMeta }  from '@opengis/fastify-table/utils.js';
+
+export default async function categoryList({ pg = pgClients.client, query = {} }) {
+
+  const { pk } = await getMeta({ table: 'site.categories' });
+
+  if (!pk) {
+    return { message: 'table not found', status: 404 };
+  }
+  const sql = `select a.category_id as id, a.* FROM site.categories a
+  where ${query.category_id ? 'category_id=$1' : '1=1'}`
+
+  const { rows, rowCount: total } = await pg.query(sql, [query.category_id].filter((el) => el));
+
+  return { message: { total, rows }, status: 200 };
+}

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

@@ -1,21 +1,21 @@
-import { dataInsert, getMeta } from "@opengis/fastify-table/utils.js";
-
-export default async function categoryPost(req) {
-  const { user = {}, body = {} } = req;
-
-  const { pk } = await getMeta({ table: "site.categories" });
-
-  if (!pk) {
-    return { message: "table not found", status: 404 };
-  }
-
-  const resData = await dataInsert({
-    table: "site.categories",
-    data: body,
-    uid: user?.uid,
-  });
-//   console.log(resData);
-  const res = resData?.rows[0];
-
-  return { id: res.category_id, rows: [res] };
-}
+import { dataInsert, getMeta } from "@opengis/fastify-table/utils.js";
+
+export default async function categoryPost(req) {
+  const { user = {}, body = {} } = req;
+
+  const { pk } = await getMeta({ table: "site.categories" });
+
+  if (!pk) {
+    return { message: "table not found", status: 404 };
+  }
+
+  const resData = await dataInsert({
+    table: "site.categories",
+    data: body,
+    uid: user?.uid,
+  });
+//   console.log(resData);
+  const res = resData?.rows[0];
+
+  return { id: res.category_id, rows: [res] };
+}

package/server/routes/category/controllers/cms.category.put.js

@@ -1,23 +1,23 @@
-import { dataUpdate, getMeta } from '@opengis/fastify-table/utils.js';
-
-export default async function categoryPut({ body = {}, params = {} }) {
-
-  if (!params.id) {
-    return { message: 'id is required', status: 400 };
-  }
-  const { pk } = await getMeta({ table: 'site.categories' });
-
-  if (!pk) {
-    return { message: 'table not found', status: 404 };
-  }
-
-  const resData = await dataUpdate({
-    table: 'site.categories', 
-    data: body, 
-    id: params.id,
-  });
-//   console.log(resData)
-  const res = resData;
-
-  return { id: res.category_id, rows: [res] };
-}
+import { dataUpdate, getMeta } from '@opengis/fastify-table/utils.js';
+
+export default async function categoryPut({ body = {}, params = {} }) {
+
+  if (!params.id) {
+    return { message: 'id is required', status: 400 };
+  }
+  const { pk } = await getMeta({ table: 'site.categories' });
+
+  if (!pk) {
+    return { message: 'table not found', status: 404 };
+  }
+
+  const resData = await dataUpdate({
+    table: 'site.categories', 
+    data: body, 
+    id: params.id,
+  });
+//   console.log(resData)
+  const res = resData;
+
+  return { id: res.category_id, rows: [res] };
+}