@opengis/gis 0.2.161 → 0.2.162

package/server/plugins/vite.js

@@ -1,74 +1,74 @@
-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 === 'production';
-
-console.log({ isProduction });
-
-async function plugin(fastify, opts) {
-  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();
-    });
-  }
-
-  async function staticFile(req, reply) {
-    const assetsDir = 'admin/dist';
-
-    const filePathDist = path.join(assetsDir, req.url.replace('/public/', '/'));
-    const filePathAssets = path.join('assets', req.url.replace('/assets', ''));
-
-    const filePath = fs.existsSync(filePathDist) ? filePathDist : filePathAssets; // check dist or assets
-    const ext = path.extname(filePath);
-
-    if (!fs.existsSync(filePath)) return { status: 404, message: 'not found' };
-    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-Encoding': 'identity' });
-
-    const stream = fs.createReadStream(filePath);
-    return mime ? reply.type(mime).send(stream) : stream;
-  }
-  fastify.get('/assets/*', staticFile);
-  fastify.get('/public/*', staticFile);
-
-  fastify.get('*', async (req, reply) => {
-    const { user } = req.session?.passport || {};
-
-    if (!user && req.url.split('?')[0] !== '/login') {
-      return reply.redirect(`/login?redirect=${req.url}`);
-    }
-    if (!isProduction) return null; // admin vite
-    const stream = fs.createReadStream('admin/dist/index.html');
-    return reply.type('text/html').send(stream);
-  });
-}
-
-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 === 'production';
+
+console.log({ isProduction });
+
+async function plugin(fastify, opts) {
+  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();
+    });
+  }
+
+  async function staticFile(req, reply) {
+    const assetsDir = 'admin/dist';
+
+    const filePathDist = path.join(assetsDir, req.url.replace('/public/', '/'));
+    const filePathAssets = path.join('assets', req.url.replace('/assets', ''));
+
+    const filePath = fs.existsSync(filePathDist) ? filePathDist : filePathAssets; // check dist or assets
+    const ext = path.extname(filePath);
+
+    if (!fs.existsSync(filePath)) return { status: 404, message: 'not found' };
+    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-Encoding': 'identity' });
+
+    const stream = fs.createReadStream(filePath);
+    return mime ? reply.type(mime).send(stream) : stream;
+  }
+  fastify.get('/assets/*', staticFile);
+  fastify.get('/public/*', staticFile);
+
+  fastify.get('*', async (req, reply) => {
+    const { user } = req.session?.passport || {};
+
+    if (!user && req.url.split('?')[0] !== '/login') {
+      return reply.redirect(`/login?redirect=${req.url}`);
+    }
+    if (!isProduction) return null; // admin vite
+    const stream = fs.createReadStream('admin/dist/index.html');
+    return reply.type('text/html').send(stream);
+  });
+}
+
+export default plugin;

package/server/routes/gis/cartocss/add.cartocss.js

@@ -1,42 +1,42 @@
-import { pgClients, dataUpdate } from '@opengis/fastify-table/utils.js';
-
-import uploadXML from '../../mapnik/functions/uploadXML.js';
-
-export default async function addCartocss(req, reply) {
-  const {
-    pg = pgClients.client, body, params, user,
-  } = req;
-
-  const cartocss = await pg.query('select cartocss_id, source_path, config, style from gis.cartocss where cartocss_id=$1', [params.id]).then(el => el.rows?.[0]);
-
-  if (!cartocss) {
-    return reply.status(404).send({ error: 'cartocss not found', code: 404 });
-  }
-
-  const sourcePath = body.source_path || cartocss.source_path;
-
-  const config = body.config || cartocss.config;
-  const style = body.style || cartocss.style;
-
-  const data = { ...body, config };
-
-  await dataUpdate({
-    pg,
-    id: params.id,
-    table: 'gis.cartocss',
-    data,
-    uid: user?.uid,
-  });
-
-  // if not from static xml file
-  if (!data.source_path) {
-    await uploadXML({
-      id: params.id,
-      dataset: config,
-      style,
-      source_path: sourcePath,
-    }, pg);
-  }
-
-  return reply.status(200).send({ message: 'cartocss updated', code: 200 });
-}
+import { pgClients, dataUpdate } from '@opengis/fastify-table/utils.js';
+
+import uploadXML from '../../mapnik/functions/uploadXML.js';
+
+export default async function addCartocss(req, reply) {
+  const {
+    pg = pgClients.client, body, params, user,
+  } = req;
+
+  const cartocss = await pg.query('select cartocss_id, source_path, config, style from gis.cartocss where cartocss_id=$1', [params.id]).then(el => el.rows?.[0]);
+
+  if (!cartocss) {
+    return reply.status(404).send({ error: 'cartocss not found', code: 404 });
+  }
+
+  const sourcePath = body.source_path || cartocss.source_path;
+
+  const config = body.config || cartocss.config;
+  const style = body.style || cartocss.style;
+
+  const data = { ...body, config };
+
+  await dataUpdate({
+    pg,
+    id: params.id,
+    table: 'gis.cartocss',
+    data,
+    uid: user?.uid,
+  });
+
+  // if not from static xml file
+  if (!data.source_path) {
+    await uploadXML({
+      id: params.id,
+      dataset: config,
+      style,
+      source_path: sourcePath,
+    }, pg);
+  }
+
+  return reply.status(200).send({ message: 'cartocss updated', code: 200 });
+}

package/server/routes/gis/cartocss/get.cartocss.js

@@ -1,59 +1,59 @@
-import { config, pgClients } from '@opengis/fastify-table/utils.js';
-
-import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
-import cartoBounds from '../../mapnik/functions/cartoBounds.js';
-
-const { RenderTile } = mapnik();
-
-const { prefix = '/api' } = config;
-
-const exclude = ['created_at', 'updated_at', 'created_by', 'updated_by'];
-
-export default async function checkCarto({
-    pg = pgClients.client, params, query, user,
-}, reply) {
-    const time = Date.now();
-    if (!config.mapnik?.server) {
-        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
-    }
-
-    const { sql } = query || {};
-
-    // extract all columns, migrations-agnostic
-    const cartocss = await pg.query('select *, ARRAY[ST_XMin(geom), ST_YMin(geom),  ST_XMax(geom),  ST_YMax(geom)] as bounds, st_asgeojson(geom)::json as geom, source_path from gis.cartocss where cartocss_id=$1', [params.id]).then(el => el.rows?.[0]);
-
-    if (!cartocss) {
-        return reply.status(404).send({ error: `cartocss not found: ${params.id}`, code: 404 });
-    }
-
-    // filter system columns
-    Object.keys(cartocss).filter(key => exclude.includes(key)).forEach(key => delete cartocss[key]);
-
-    const rtile = await RenderTile({
-        name: cartocss.source_path ? `vector/${cartocss.source_path}` : params.id, // required for cartocss
-        width: 256,
-        bbox: [3713463.7081504324, 6088362.176970857, 3713616.5822070027, 6088515.051027427],
-        ttl: '0',
-        // debug: query.debug,
-    }).catch(err => ({ err: err.toString() }));
-
-    // skip empty bounds[null,null,null,null]
-    const bounds = cartocss.bounds && cartocss.geom && !(query.nocache && user?.user_type?.includes?.('admin')) ? cartocss.bounds : await cartoBounds({
-        id: params.id, dataset: cartocss.config, table: cartocss.card_table, sql,
-    }, pg).catch(err => ({ err: err.toString() }));
-
-    if (!(cartocss.bounds && cartocss.geom) && sql && user?.user_type?.includes?.('admin')) {
-        return bounds;
-    }
-
-    return {
-        time: Date.now() - time,
-        ...cartocss,
-        info: !!(cartocss.card_auto || (cartocss.card_html && cartocss.card_table)),
-        url: `${prefix}/gis-rtile/${params.id}/{z}/{x}/{y}.png`,
-        bounds,
-        render: !!rtile.base64,
-        renderError: rtile.err && config.local ? rtile.err : !!rtile.err,
-        boundsError: bounds?.err && config.local ? bounds.err : !!bounds.err,
-    };
-}
+import { config, pgClients } from '@opengis/fastify-table/utils.js';
+
+import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
+import cartoBounds from '../../mapnik/functions/cartoBounds.js';
+
+const { RenderTile } = mapnik();
+
+const { prefix = '/api' } = config;
+
+const exclude = ['created_at', 'updated_at', 'created_by', 'updated_by'];
+
+export default async function checkCarto({
+    pg = pgClients.client, params, query, user,
+}, reply) {
+    const time = Date.now();
+    if (!config.mapnik?.server) {
+        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
+    }
+
+    const { sql } = query || {};
+
+    // extract all columns, migrations-agnostic
+    const cartocss = await pg.query('select *, ARRAY[ST_XMin(geom), ST_YMin(geom),  ST_XMax(geom),  ST_YMax(geom)] as bounds, st_asgeojson(geom)::json as geom, source_path from gis.cartocss where cartocss_id=$1', [params.id]).then(el => el.rows?.[0]);
+
+    if (!cartocss) {
+        return reply.status(404).send({ error: `cartocss not found: ${params.id}`, code: 404 });
+    }
+
+    // filter system columns
+    Object.keys(cartocss).filter(key => exclude.includes(key)).forEach(key => delete cartocss[key]);
+
+    const rtile = await RenderTile({
+        name: cartocss.source_path ? `vector/${cartocss.source_path}` : params.id, // required for cartocss
+        width: 256,
+        bbox: [3713463.7081504324, 6088362.176970857, 3713616.5822070027, 6088515.051027427],
+        ttl: '0',
+        // debug: query.debug,
+    }).catch(err => ({ err: err.toString() }));
+
+    // skip empty bounds[null,null,null,null]
+    const bounds = cartocss.bounds && cartocss.geom && !(query.nocache && user?.user_type?.includes?.('admin')) ? cartocss.bounds : await cartoBounds({
+        id: params.id, dataset: cartocss.config, table: cartocss.card_table, sql,
+    }, pg).catch(err => ({ err: err.toString() }));
+
+    if (!(cartocss.bounds && cartocss.geom) && sql && user?.user_type?.includes?.('admin')) {
+        return bounds;
+    }
+
+    return {
+        time: Date.now() - time,
+        ...cartocss,
+        info: !!(cartocss.card_auto || (cartocss.card_html && cartocss.card_table)),
+        url: `${prefix}/gis-rtile/${params.id}/{z}/{x}/{y}.png`,
+        bounds,
+        render: !!rtile.base64,
+        renderError: rtile.err && config.local ? rtile.err : !!rtile.err,
+        boundsError: bounds?.err && config.local ? bounds.err : !!bounds.err,
+    };
+}

package/server/routes/gis/checkXML.js

@@ -1,117 +1,117 @@
-import path from 'node:path';
-
-import { config, eventStream, pgClients } from "@opengis/fastify-table/utils.js";
-
-import mapnik from "../../plugins/mapnik/funcs/mapnik.js";
-
-const {
-    GetRasterStatus, GetRasterInfo, RenderTile,
-} = mapnik();
-
-export default async function checkXML(req, reply) {
-    const { pg = pgClients.client } = req;
-    const send = process.env.NODE_ENV === 'test' || process.env.VITEST
-        ? console.log
-        : eventStream(reply);
-
-    const errors = { raster: 0, css: 0, service: 0 };
-    try {
-        const rasters = pg?.pk?.['gis.rasters'] ? await pg.query('select * from gis.rasters').then(el => el.rows || []) : [];
-
-        const css = pg?.pk?.['gis.cartocss'] ? await pg.query('select * from gis.cartocss').then(el => el.rows || []) : [];
-
-        const dataset = pg?.pk?.['gis.dataset'] && false ? await pg.query('select * from gis.dataset').then(el => el.rows || []) : [];
-
-        const total = rasters.length + css.length + dataset.length;
-        let successCount = 0;
-
-        send(`Всього растрів: ${rasters.length || '0'}`);
-
-        await rasters.reduce(
-            (promise, row, idx) => promise.then(async () => {
-                const uploadStatus = path.extname(row.source_path) ? await GetRasterStatus({ path: row.source_path }) : {};
-
-                if (uploadStatus.exists === false) {
-                    errors.raster += 1;
-                    send(`${idx}/${rasters.length} ERROR: GetRasterStatus: not uploaded (raster:${row.raster_id}/${row.name})`);
-                    return null;
-                }
-
-                if (uploadStatus.finished === false) {
-                    errors.raster += 1;
-                    send(`${idx}/${rasters.length} ERROR: GetRasterStatus: upload not finished (raster:${row.raster_id}/${row.name})`);
-                    return null;
-                }
-
-                const rasterInfo = await GetRasterInfo({
-                    path: row.source_path,
-                }).catch(err => ({ err }));
-
-                if (rasterInfo.err) {
-                    errors.raster += 1;
-                    send(`${idx}/${rasters.length} ERROR: GetRasterInfo: ${rasterInfo.err} (raster:${row.raster_id}/${row.name})`);
-                    return null;
-                }
-
-                const data = await RenderTile({
-                    path: row.source_path,
-                    width: 256,
-                    bbox: [3713463.7081504324, 6088362.176970857, 3713616.5822070027, 6088515.051027427], // /:id/18/155363/91245.png
-                    ttl: '0',
-                }).catch(err => ({ err: err.toString() }));
-
-                if (data.err) {
-                    errors.raster += 1;
-                    send(`${idx}/${rasters.length} ERROR: RenderTile: ${data.err} (raster:${row.raster_id}/${row.name})`);
-                    return null;
-                }
-
-                send(`${idx}/${rasters.length} OK: (raster:${row.raster_id}/${row.name})`);
-                successCount += 1;
-            }),
-            Promise.resolve(),
-        );
-
-        send(`Всього CSS: ${css.length || '0'}`);
-
-        await css.reduce(
-            (promise, row, idx) => promise.then(async () => {
-                const data = await RenderTile({
-                    path: row.source_path,
-                    name: row.source_path ? undefined : row.cartocss_id,
-                    width: 256,
-                    bbox: [3713463.7081504324, 6088362.176970857, 3713616.5822070027, 6088515.051027427], // /:id/18/155363/91245.png
-                    ttl: '0',
-                }).catch(err => ({ err: err.toString() }));
-
-                if (data.err) {
-                    errors.css += 1;
-                    send(`${idx}/${css.length} ERROR: RenderTile: ${data.err} (css:${row.cartocss_id}/${row.name})`);
-                    return null;
-                }
-
-                send(`${idx}/${css.length} OK: (css:${row.cartocss_id}/${row.name})`);
-                successCount += 1;
-            }),
-            Promise.resolve(),
-        );
-
-        send(`Всього наборів: ${dataset.length || '0'}`);
-        // ? place dataset check logic here
-
-        const errorCount = Object.keys(errors).reduce((acc, curr) => acc + errors[curr], 0);
-        send(`Всього помилок: ${errorCount || '0'}`);
-        send(`Помилки растрів: ${errors.raster || '0'}`);
-        send(`Помилки CSS: ${errors.css || '0'}`);
-        send(`Помилки наборів: ${errors.dataset || '0'}`);
-
-        send(`Успіх: ${successCount || '0'}/${total || '0'}`);
-    }
-    catch (err) {
-        send(config.local ? err.toString() : 'check error');
-        throw err; // allow logger to catch error automatically
-    }
-    finally {
-        send('finish', true);
-    }
-}
+import path from 'node:path';
+
+import { config, eventStream, pgClients } from "@opengis/fastify-table/utils.js";
+
+import mapnik from "../../plugins/mapnik/funcs/mapnik.js";
+
+const {
+    GetRasterStatus, GetRasterInfo, RenderTile,
+} = mapnik();
+
+export default async function checkXML(req, reply) {
+    const { pg = pgClients.client } = req;
+    const send = process.env.NODE_ENV === 'test' || process.env.VITEST
+        ? console.log
+        : eventStream(reply);
+
+    const errors = { raster: 0, css: 0, service: 0 };
+    try {
+        const rasters = pg?.pk?.['gis.rasters'] ? await pg.query('select * from gis.rasters').then(el => el.rows || []) : [];
+
+        const css = pg?.pk?.['gis.cartocss'] ? await pg.query('select * from gis.cartocss').then(el => el.rows || []) : [];
+
+        const dataset = pg?.pk?.['gis.dataset'] && false ? await pg.query('select * from gis.dataset').then(el => el.rows || []) : [];
+
+        const total = rasters.length + css.length + dataset.length;
+        let successCount = 0;
+
+        send(`Всього растрів: ${rasters.length || '0'}`);
+
+        await rasters.reduce(
+            (promise, row, idx) => promise.then(async () => {
+                const uploadStatus = path.extname(row.source_path) ? await GetRasterStatus({ path: row.source_path }) : {};
+
+                if (uploadStatus.exists === false) {
+                    errors.raster += 1;
+                    send(`${idx}/${rasters.length} ERROR: GetRasterStatus: not uploaded (raster:${row.raster_id}/${row.name})`);
+                    return null;
+                }
+
+                if (uploadStatus.finished === false) {
+                    errors.raster += 1;
+                    send(`${idx}/${rasters.length} ERROR: GetRasterStatus: upload not finished (raster:${row.raster_id}/${row.name})`);
+                    return null;
+                }
+
+                const rasterInfo = await GetRasterInfo({
+                    path: row.source_path,
+                }).catch(err => ({ err }));
+
+                if (rasterInfo.err) {
+                    errors.raster += 1;
+                    send(`${idx}/${rasters.length} ERROR: GetRasterInfo: ${rasterInfo.err} (raster:${row.raster_id}/${row.name})`);
+                    return null;
+                }
+
+                const data = await RenderTile({
+                    path: row.source_path,
+                    width: 256,
+                    bbox: [3713463.7081504324, 6088362.176970857, 3713616.5822070027, 6088515.051027427], // /:id/18/155363/91245.png
+                    ttl: '0',
+                }).catch(err => ({ err: err.toString() }));
+
+                if (data.err) {
+                    errors.raster += 1;
+                    send(`${idx}/${rasters.length} ERROR: RenderTile: ${data.err} (raster:${row.raster_id}/${row.name})`);
+                    return null;
+                }
+
+                send(`${idx}/${rasters.length} OK: (raster:${row.raster_id}/${row.name})`);
+                successCount += 1;
+            }),
+            Promise.resolve(),
+        );
+
+        send(`Всього CSS: ${css.length || '0'}`);
+
+        await css.reduce(
+            (promise, row, idx) => promise.then(async () => {
+                const data = await RenderTile({
+                    path: row.source_path,
+                    name: row.source_path ? undefined : row.cartocss_id,
+                    width: 256,
+                    bbox: [3713463.7081504324, 6088362.176970857, 3713616.5822070027, 6088515.051027427], // /:id/18/155363/91245.png
+                    ttl: '0',
+                }).catch(err => ({ err: err.toString() }));
+
+                if (data.err) {
+                    errors.css += 1;
+                    send(`${idx}/${css.length} ERROR: RenderTile: ${data.err} (css:${row.cartocss_id}/${row.name})`);
+                    return null;
+                }
+
+                send(`${idx}/${css.length} OK: (css:${row.cartocss_id}/${row.name})`);
+                successCount += 1;
+            }),
+            Promise.resolve(),
+        );
+
+        send(`Всього наборів: ${dataset.length || '0'}`);
+        // ? place dataset check logic here
+
+        const errorCount = Object.keys(errors).reduce((acc, curr) => acc + errors[curr], 0);
+        send(`Всього помилок: ${errorCount || '0'}`);
+        send(`Помилки растрів: ${errors.raster || '0'}`);
+        send(`Помилки CSS: ${errors.css || '0'}`);
+        send(`Помилки наборів: ${errors.dataset || '0'}`);
+
+        send(`Успіх: ${successCount || '0'}/${total || '0'}`);
+    }
+    catch (err) {
+        send(config.local ? err.toString() : 'check error');
+        throw err; // allow logger to catch error automatically
+    }
+    finally {
+        send('finish', true);
+    }
+}

package/server/routes/gis/dashboard.js

@@ -1,29 +1,29 @@
-import { pgClients } from '@opengis/fastify-table/utils.js';
-
-export default async function getDashboard({ pg = pgClients.client }) {
-  try {
-    const statsQuery = `
-      SELECT
-        (SELECT COUNT(*)::int FROM gis.services) as services_count,
-        (SELECT COUNT(*)::int FROM gis.registers) as registers_count,
-        (SELECT COUNT(*)::int FROM gis.maps) as maps_count,
-        (SELECT COUNT(*)::int FROM gis.ogc_service) as ogc_count
-    `;
-
-    const result = await pg.query(statsQuery);
-    const stats = result?.rows?.[0] || {};
-
-    return {
-      cards: {
-        services: stats.services_count || 0,
-        registers: stats.registers_count || 0,
-        maps: stats.maps_count || 0,
-        ogc: stats.ogc_count || 0,
-      },
-    };
-  }
-  catch (error) {
-    console.error('Dashboard error:', error);
-    return { status: 500, error: 'Internal Server Error' };
-  }
-}
+import { pgClients } from '@opengis/fastify-table/utils.js';
+
+export default async function getDashboard({ pg = pgClients.client }) {
+  try {
+    const statsQuery = `
+      SELECT
+        (SELECT COUNT(*)::int FROM gis.services) as services_count,
+        (SELECT COUNT(*)::int FROM gis.registers) as registers_count,
+        (SELECT COUNT(*)::int FROM gis.maps) as maps_count,
+        (SELECT COUNT(*)::int FROM gis.ogc_service) as ogc_count
+    `;
+
+    const result = await pg.query(statsQuery);
+    const stats = result?.rows?.[0] || {};
+
+    return {
+      cards: {
+        services: stats.services_count || 0,
+        registers: stats.registers_count || 0,
+        maps: stats.maps_count || 0,
+        ogc: stats.ogc_count || 0,
+      },
+    };
+  }
+  catch (error) {
+    console.error('Dashboard error:', error);
+    return { status: 500, error: 'Internal Server Error' };
+  }
+}