@opengis/cms 0.0.45 → 0.0.46

package/package.json

@@ -1,65 +1,66 @@
-{
-  "name": "@opengis/cms",
-  "version": "0.0.45",
-  "description": "cms",
-  "type": "module",
-  "author": "Softpro",
-  "main": "./dist/index.js",
-  "license": "EULA",
-  "files": [
-    "module",
-    "dist",
-    "server",
-    "plugin.js",
-    "input-types.json"
-  ],
-  "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",
-    "dev": "NODE_ENV=dev bun --env-file=.env.ip server ",
-    "admin": "vite admin",
-    "build": "vite build && vite build admin",
-    "build:lib": "vite build",
-    "proxy": "vite dev admin",
-    "start": "bun --env-file=.env.ip server",
-    "prod": "NODE_ENV=production bun --env-file=.env.ip  server ",
-    "ip": "bun --env-file=.env.ip server",
-    "demo": "node --env-file=.env.demo --env-file=.env server",
-    "i18n:sync": "node i18n-sync.cjs",
-    "prepublishOnly": "bun build:lib",
-    "softpro": "bun --env-file=.env.softpro server",
-    "softpro1": "NODE_ENV=production bun --env-file=.env.prod-softpro.local server"
-  },
-  "dependencies": {},
-  "resolutions": {
-    "rollup": "4.30.0"
-  },
-  "devDependencies": {
-    "@fastify/compress": "^8.1.0",
-    "@opengis/core": "^0.0.30",
-    "@opengis/fastify-table": "^2.0.128",
-    "@opengis/filter": "^0.1.31",
-    "@opengis/form": "^0.0.108",
-    "@opengis/richtext": "0.0.38",
-    "@vueuse/head": "2.0.0",
-    "js-yaml": "^4.1.0",
-    "lucide-vue-next": "0.344.0",
-    "vite": "5.1.4",
-    "vue": "^3.5.17",
-    "vue-i18n": "11.1.5",
-    "vue-router": "4.4.3",
-    "vuedraggable": "4.1.0",
-    "@tailwindcss/typography": "0.5.10",
-    "@tsconfig/node22": "^22.0.2",
-    "@vitejs/plugin-vue": "5.0.4",
-    "autoprefixer": "10.4.18",
-    "eslint": "8.49.0",
-    "postcss": "8.4.35",
-    "sass": "^1.92.1",
-    "tailwindcss": "3.4.1",
-    "typescript": "~5.8.0",
-    "vitest": "3.2.4",
-    "vue-tsc": "^2.2.10"
-  }
-}
+{
+  "name": "@opengis/cms",
+  "version": "0.0.46",
+  "description": "cms",
+  "type": "module",
+  "author": "Softpro",
+  "main": "./dist/index.js",
+  "license": "EULA",
+  "files": [
+    "module",
+    "dist",
+    "server",
+    "plugin.js",
+    "utils.js",
+    "input-types.json"
+  ],
+  "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",
+    "dev": "NODE_ENV=dev bun --env-file=.env.ip server ",
+    "admin": "vite admin",
+    "build": "vite build && vite build admin",
+    "build:lib": "vite build",
+    "proxy": "vite dev admin",
+    "start": "bun --env-file=.env.ip server",
+    "prod": "NODE_ENV=production bun --env-file=.env.ip  server ",
+    "ip": "bun --env-file=.env.ip server",
+    "demo": "node --env-file=.env.demo --env-file=.env server",
+    "i18n:sync": "node i18n-sync.cjs",
+    "prepublishOnly": "bun build:lib",
+    "softpro": "bun --env-file=.env.softpro server",
+    "softpro1": "NODE_ENV=production bun --env-file=.env.prod-softpro.local server"
+  },
+  "dependencies": {},
+  "resolutions": {
+    "rollup": "4.30.0"
+  },
+  "devDependencies": {
+    "@fastify/compress": "^8.1.0",
+    "@opengis/core": "^0.0.30",
+    "@opengis/fastify-table": "^2.0.128",
+    "@opengis/filter": "^0.1.31",
+    "@opengis/form": "^0.0.108",
+    "@opengis/richtext": "0.0.38",
+    "@vueuse/head": "2.0.0",
+    "js-yaml": "^4.1.0",
+    "lucide-vue-next": "0.344.0",
+    "vite": "5.1.4",
+    "vue": "^3.5.17",
+    "vue-i18n": "11.1.5",
+    "vue-router": "4.4.3",
+    "vuedraggable": "4.1.0",
+    "@tailwindcss/typography": "0.5.10",
+    "@tsconfig/node22": "^22.0.2",
+    "@vitejs/plugin-vue": "5.0.4",
+    "autoprefixer": "10.4.18",
+    "eslint": "8.49.0",
+    "postcss": "8.4.35",
+    "sass": "^1.92.1",
+    "tailwindcss": "3.4.1",
+    "typescript": "~5.8.0",
+    "vitest": "3.2.4",
+    "vue-tsc": "^2.2.10"
+  }
+}

package/server/functions/getContent.js

@@ -0,0 +1,44 @@
+import { createHash } from 'node:crypto';
+
+import { config, getRedis, pgClients } from '@opengis/fastify-table/utils.js';
+
+import getContent from '../routes/cms/controllers/getContent.js';
+
+const rclient = getRedis();
+
+const mockReply = {
+  response: {},
+  status: (statusCode) => {
+    Object.assign(mockReply.response, { status: statusCode });
+    return mockReply;
+  },
+  send: (result) => {
+    Object.assign(mockReply.response, typeof result === 'object' ? result : { message: result });
+    return { ...mockReply.response };
+  },
+};
+
+export default async function getContentBySlug(slug, { locale, ttl = 3600, fields, limit = 12, page = 1, pg = pgClients.client } = {}) {
+  if (!slug) {
+    return { error: 'not enough params: slug', code: 400 };
+  }
+
+  const cacheKey = createHash('md5').update([config.pg?.database, 'cms:content', slug, fields && typeof fields !== 'string' ? JSON.stringify(fields) : fields].filter(Boolean).join(':')).digest('hex');
+
+  const cache = ttl === 0 ? null : await rclient.get(cacheKey);
+
+  // return from cache
+  if (cache) {
+    return { cache: true, ...JSON.parse(cache) };
+  }
+
+
+  const token = await pg.query(`select token_value from site.tokens where token_status = 'Active'`).then(el => el.rows?.[0]?.token_value);
+
+  const req = { pg: pgClients.client, params: { type: slug }, query: { locale, fields, limit, page }, headers: { 'authorization': `Bearer ${token}` } };
+  const result = await getContent(req, mockReply);
+
+  if (ttl) await rclient.set(cacheKey, JSON.stringify(result), 'EX', ttl);
+
+  return result;
+}

package/server/functions/getUser.js

@@ -0,0 +1,26 @@
+import { unsign } from "@fastify/cookie";
+
+import { config, getRedis } from "@opengis/fastify-table/utils.js";
+
+const rclient2 = getRedis({ db: 2 });
+
+// const test = await getUser(req.cookies);
+
+export default async function getUser(cookies) {
+  const rawCookie = cookies?.['session_auth'];
+
+  // unauthorized
+  if (!rawCookie) {
+    return null;
+  }
+
+  const { valid, value: sessionId } = unsign(rawCookie, config.auth?.secret || "61b820e12858570a4b0633020d4394a17903d9a9");
+
+  // invalid cookie
+  if (!valid) {
+    return null;
+  }
+
+  const str = await rclient2.get(`session_auth:${config.pg?.database || 'db'}:${sessionId}`);
+  return str ? JSON.parse(str).passport.user : null;
+}

package/server/plugins/hook.js

@@ -23,7 +23,7 @@ where
         end`;
 
 async function updateDelayPublished() {
-    const rows = await pg.query(q).then(el => el.rows || []);
+    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') {

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

@@ -1,53 +1,18 @@
-/* eslint-disable camelcase */
-import { pgClients } from '@opengis/fastify-table/utils.js';
+import getSettings from '../functions/getSettings.js';
 
-export default async function getAppSettings(
-  {
-    pg = pgClients.client,
-    query,
-    params,
-    user = {},
-  },
-  reply
-) {
+export default async function getAppSettings({ query, params, user }, reply) {
   const t1 = Date.now();
 
-  if (!pg) {
-    return reply.status(500).send("empty pg");
-  }
-
-  if (!pg.pk?.["admin.properties"]) {
-    return reply.status(404).send("properties table not found");
-  }
+  const result = await getSettings({
+    entity: params.entity,
+    keys: query.keys,
+    user,
+    ttl: 0
+  });
 
-  if (params?.entity === "user" && !user.uid) {
-    return reply.status(401).send("unauthorized");
+  if (result.error) {
+    return reply.status(result.code).send(result);
   }
 
-  const { uid } = user || {};
-
-  const args =
-    params?.entity === "user" ? [user.uid] : [params?.entity || "app"];
-
-  const { rows = [] } = await pg.query(
-    "select property_key as key, property_text, property_json from admin.properties where property_entity=$1",
-    args
-  );
-
-  const settings = rows
-    .filter((row) =>
-      typeof query?.keys === "string" ? query.keys.includes(row.key) : true
-    )
-    .reduce(
-      (
-        acc,
-        { key, property_text, property_json }
-      ) => ({
-        ...acc,
-        [key]: property_text || property_json,
-      }),
-      {}
-    );
-
-  return reply.status(200).send({ time: Date.now() - t1, uid, settings });
+  return { time: Date.now() - t1, uid: user?.uid, settings: result };
 }

package/server/routes/cms/functions/getSettings.js

@@ -0,0 +1,46 @@
+import { config, pgClients, getRedis } from "@opengis/fastify-table/utils.js";
+
+const rclient = getRedis();
+
+export default async function getSettings({ entity = 'app', keys = ['cms'], uid = 0, ttl = 3600, pg = pgClients.client } = {}) {
+  if (!pg) {
+    return { error: "empty pg", code: 500 };
+  }
+
+  if (!pg.pk?.["admin.properties"]) {
+    return { error: "properties table not found", code: 404 };
+  }
+
+  const cacheKey = [config.pg?.database, "cms:settings", entity, keys, uid].filter(Boolean).join(":");
+  const cache = ttl === 0 ? null : await rclient.get(cacheKey);
+
+  // return from cache
+  if (cache) {
+    return { cache: true, ...JSON.parse(cache) };
+  }
+
+  const rows = await pg.query(
+    "select property_key as key, property_text, property_json from admin.properties where property_entity=$1",
+    entity === "user" ? [uid] : [entity || "app"]
+  ).then(el => el.rows || []);
+
+  const settings = rows
+    .filter((row) =>
+      typeof keys === "string" ? keys.includes(row.key) : true
+    )
+    .reduce(
+      (
+        acc,
+        { key, property_text, property_json }
+      ) => ({
+        ...acc,
+        [key]: property_text || property_json,
+      }),
+      {}
+    );
+
+  // save to cache, default = 1 hour
+  if (ttl) await rclient.set(cacheKey, JSON.stringify(settings), 'EX', ttl);
+
+  return settings;
+}

package/server/routes/menu/controllers/getMenu.js

@@ -1,43 +1,25 @@
-import { pgClients } from "@opengis/fastify-table/utils.js";
+import getMenu from "../functions/getMenu.js";
 
 const limit = 16;
 
-const err = { error: 'menu not found', code: 404 };
+export default async function getMenuAPI(req, reply) {
+    const { query = {}, params = {} } = req;
 
-export default async function getMenu(req, reply) {
-    const { pg = pgClients.client, query = {}, params = {} } = req;
+    const result = await getMenu(params.id, {
+        locale: query.locale,
+        page: query.page,
+        limit: Math.min(query.limit || limit, limit),
+        sql: query.sql,
+        ttl: 3600
+    });
 
-    if (!pg?.pk) {
-        return reply.status(400).send('empty pg');
+    if (result.error) {
+        return reply.status(result.code || 500).send(result);
     }
 
-    if (!pg?.pk?.['site.menus']) {
-        return reply.status(404).send('table not found');
-    }
-
-    const offset = query.page && query.page > 0 ? (query.page - 1) * limit : 0;
-
-    const q = `select menu_id, name, locale, description ${params.id ? ',items::json, content' : ''} from site.menus 
-    where ${params.id ? '$1 in (menu_id, name)' : '1=1'} 
-    and ${query.locale ? `locale='${query.locale.replace(/'/g, "''")}'` : 'true'}
-    order by (case when locale='uk' then false else true end)
-    limit ${limit} offset ${offset}`;
-
-    if (query.sql) return q;
-
-    const rows = await pg.query(q, [params.id].filter(Boolean))
-        .then(el => el.rows || []);
-
     if (params.id) {
-        if (!rows.length && params.id) {
-            return reply.status(404).send(err);
-        }
-        return reply.status(200).send(rows[0]);
-    }
-
-    if (!rows.length && params.id) {
-        return reply.status(404).send(err);
+        return reply.status(200).send(result);
     }
 
-    return reply.status(200).send({ rows });
+    return reply.status(200).send({ rows: result.rows });
 }

package/server/routes/menu/functions/getMenu.js

@@ -0,0 +1,48 @@
+import { createHash } from 'node:crypto';
+
+import { config, pgClients, getRedis } from "@opengis/fastify-table/utils.js";
+
+const rclient = getRedis();
+
+export default async function getMenu(name, { locale, ttl = 3600, page, limit = 16, sql, pg = pgClients.client } = {}) {
+  if (!pg?.pk) {
+    return { error: 'empty pg', code: 400 };
+  }
+
+  if (!pg?.pk?.['site.menus']) {
+    return { error: 'table not found', code: 404 };
+  }
+
+  const cacheKey = createHash('md5').update([config.pg?.database, 'cms:menu', name, locale].filter(Boolean).join(':')).digest('hex');
+
+  const cache = ttl === 0 ? null : await rclient.get(cacheKey);
+
+  // return from cache
+  if (cache) {
+    return { cache: true, ...JSON.parse(cache) };
+  }
+
+  const offset = page && page > 0 ? (page - 1) * limit : 0;
+  const args = name ? [name, locale].filter(Boolean) : [locale].filter(Boolean);
+  const where = name ?
+    `$1 in (menu_id, name) and ${locale ? `locale=$2` : 'true'}`
+    : (locale ? `locale=$1` : 'true');
+
+  const q = `select menu_id, name, locale, description ${name ? ', items::json, content' : ''} 
+  from site.menus
+  where ${where} 
+  order by (case when locale='uk' then false else true end)
+  limit ${limit} 
+  offset ${offset}`;
+
+  if (sql) return q;
+
+  const rows = pg ? await pg.query(q, args).then(el => el.rows || []) : [];
+
+  const payload = name ? (rows[0] || { error: 'menu not found', code: 404 }) : { rows };
+
+  // save to cache, default = 1 hour
+  if (ttl) await rclient.set(cacheKey, JSON.stringify(payload), 'EX', ttl);
+
+  return payload;
+}

package/utils.js

@@ -0,0 +1,6 @@
+export { default as getMenu } from "./server/routes/menu/functions/getMenu.js";
+export { default as getContent } from "./server/functions/getContent.js";
+export { default as getSettings } from "./server/routes/cms/functions/getSettings.js";
+export { default as getUser } from "./server/functions/getUser.js";
+
+export default null;