@opengis/gis 0.2.176 → 0.2.178

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/cartocss/cartocss.route.js

@@ -1,31 +1,31 @@
-import getCartocss from './functions/get.cartocss.js';
-import addCartocss from './functions/add.cartocss.js';
-
-import {
-    getCartocssSchema,
-    addCartocssSchema,
-} from './cartocss.schema.js';
-
-const privateParams = { config: { policy: 'L1', package: 'gis' } };
-const publicParams = { config: { policy: 'L0', package: 'gis' } };
-
-async function route(app) {
-    app.get('/gis-css/:id', { ...publicParams, schema: getCartocssSchema }, async ({ params, query, user, pg }) => {
-        const result = await getCartocss({
-            id: params.id,
-            sql: query.sql,
-            nocache: query.nocache,
-            isAdmin: user?.user_type?.includes?.('admin')
-        }, pg);
-        return result;
-    });
-    app.post('/gis-css/:id', { ...privateParams, schema: addCartocssSchema }, async ({ params, body, user, pg }) => {
-        const result = await addCartocss({
-            id: params.id,
-            body,
-            uid: user?.uid,
-        }, pg);
-        return result;
-    });
-}
-export default route;
+import getCartocss from './functions/get.cartocss.js';
+import addCartocss from './functions/add.cartocss.js';
+
+import {
+    getCartocssSchema,
+    addCartocssSchema,
+} from './cartocss.schema.js';
+
+const privateParams = { config: { policy: 'L1', package: 'gis' } };
+const publicParams = { config: { policy: 'L0', package: 'gis' } };
+
+async function route(app) {
+    app.get('/gis-css/:id', { ...publicParams, schema: getCartocssSchema }, async ({ params, query, user, pg }) => {
+        const result = await getCartocss({
+            id: params.id,
+            sql: query.sql,
+            nocache: query.nocache,
+            isAdmin: user?.user_type?.includes?.('admin')
+        }, pg);
+        return result;
+    });
+    app.post('/gis-css/:id', { ...privateParams, schema: addCartocssSchema }, async ({ params, body, user, pg }) => {
+        const result = await addCartocss({
+            id: params.id,
+            body,
+            uid: user?.uid,
+        }, pg);
+        return result;
+    });
+}
+export default route;

package/server/routes/cartocss/cartocss.route.test.js

@@ -1,79 +1,79 @@
-import { afterAll, beforeAll, describe, expect, test } from 'vitest';
-
-import { getPGAsync } from '@opengis/fastify-table/utils.js';
-
-import { build, injectWithHeaders } from '../../../test/helper.js';
-
-const user = { id: '2', type: 'admin' };
-
-let pg;
-
-beforeAll(async () => {
-    await build();
-
-    pg = await getPGAsync();
-
-    await cleanUp('before');
-});
-
-afterAll(async () => {
-    await cleanUp('after');
-});
-
-const testId = 'testCss';
-
-const cleanUp = async (when) => {
-    if (!pg) return;
-    const rowCount = await pg.query('delete from gis.cartocss where cartocss_id=$1', [testId]).then(r => r.rowCount || 0);
-    const rowCount3 = await pg.query('delete from gis.metadata where metadata_id=$1', [testId]).then(r => r.rowCount || 0);
-    console.log(`clean up finished: ${when}`, rowCount, rowCount3);
-};
-
-describe('cartocss api', () => {
-    test('POST /gis-css/:id returns 200', async () => {
-        const payload = {
-            source_path: 'test',
-            config: { test: 1 },
-            style: '#test { color: red; }'
-        };
-
-        await pg.query('insert into gis.cartocss(cartocss_id,name) values($1,$2)', [testId, 'unit-test']).catch(err => console.error(err));
-        const res = await injectWithHeaders({
-            method: 'POST',
-            url: `/api/gis-css/${testId}`,
-            payload,
-            headers: { uid: user.id, user_type: user.type }
-        });
-
-        expect(res.statusCode).toBe(200);
-        expect(res.body).toHaveProperty('message');
-        expect(res.body).toHaveProperty('code');
-    });
-
-    test('POST /gis-metadata/:type/:id returns 200', async () => {
-        const res = await injectWithHeaders({
-            method: 'POST',
-            url: `/api/gis-metadata/css/${testId}`,
-            payload: {
-                layer_id: testId
-            },
-            headers: { uid: user.id, user_type: user.type }
-        });
-
-        expect(res.statusCode).toBe(200);
-        expect(res.body).toHaveProperty('metadata_id');
-        expect(res.body.metadata_id).toBe(testId);
-    });
-
-    test('GET /gis-css/:id returns 200', async () => {
-        const res = await injectWithHeaders({
-            url: `/api/gis-css/${testId}`,
-        });
-
-        expect(res.statusCode).toBe(200);
-        expect(res.body).toHaveProperty('source_path');
-        expect(res.body).toHaveProperty('cartocss_id');
-        expect(res.body).toHaveProperty('cartocss_key');
-        expect(res.body).toHaveProperty('url');
-    });
+import { afterAll, beforeAll, describe, expect, test } from 'vitest';
+
+import { getPGAsync } from '@opengis/fastify-table/utils.js';
+
+import { build, injectWithHeaders } from '../../../test/helper.js';
+
+const user = { id: '2', type: 'admin' };
+
+let pg;
+
+beforeAll(async () => {
+    await build();
+
+    pg = await getPGAsync();
+
+    await cleanUp('before');
+});
+
+afterAll(async () => {
+    await cleanUp('after');
+});
+
+const testId = 'testCss';
+
+const cleanUp = async (when) => {
+    if (!pg) return;
+    const rowCount = await pg.query('delete from gis.cartocss where cartocss_id=$1', [testId]).then(r => r.rowCount || 0);
+    const rowCount3 = await pg.query('delete from gis.metadata where metadata_id=$1', [testId]).then(r => r.rowCount || 0);
+    console.log(`clean up finished: ${when}`, rowCount, rowCount3);
+};
+
+describe('cartocss api', () => {
+    test('POST /gis-css/:id returns 200', async () => {
+        const payload = {
+            source_path: 'test',
+            config: { test: 1 },
+            style: '#test { color: red; }'
+        };
+
+        await pg.query('insert into gis.cartocss(cartocss_id,name) values($1,$2)', [testId, 'unit-test']).catch(err => console.error(err));
+        const res = await injectWithHeaders({
+            method: 'POST',
+            url: `/api/gis-css/${testId}`,
+            payload,
+            headers: { uid: user.id, user_type: user.type }
+        });
+
+        expect(res.statusCode).toBe(200);
+        expect(res.body).toHaveProperty('message');
+        expect(res.body).toHaveProperty('code');
+    });
+
+    test('POST /gis-metadata/:type/:id returns 200', async () => {
+        const res = await injectWithHeaders({
+            method: 'POST',
+            url: `/api/gis-metadata/css/${testId}`,
+            payload: {
+                layer_id: testId
+            },
+            headers: { uid: user.id, user_type: user.type }
+        });
+
+        expect(res.statusCode).toBe(200);
+        expect(res.body).toHaveProperty('metadata_id');
+        expect(res.body.metadata_id).toBe(testId);
+    });
+
+    test('GET /gis-css/:id returns 200', async () => {
+        const res = await injectWithHeaders({
+            url: `/api/gis-css/${testId}`,
+        });
+
+        expect(res.statusCode).toBe(200);
+        expect(res.body).toHaveProperty('source_path');
+        expect(res.body).toHaveProperty('cartocss_id');
+        expect(res.body).toHaveProperty('cartocss_key');
+        expect(res.body).toHaveProperty('url');
+    });
 });

package/server/routes/cartocss/cartocss.schema.js

@@ -1,73 +1,73 @@
-const geometrySchema = {
-
-    type: "object",
-    required: ["type", "coordinates"],
-    properties: {
-        type: {
-            enum: [
-                "Point",
-                "LineString",
-                "Polygon",
-                "MultiPoint",
-                "MultiLineString",
-                "MultiPolygon",
-            ],
-        },
-        coordinates: {
-            type: "array",
-        },
-    },
-
-};
-
-const cssBodySchema = {
-    type: "object",
-    additionalProperties: true,
-
-    properties: {
-        id: { type: "string", pattern: '^([\\d\\w._-]+)$' },
-        name: { type: "string" },
-        group_id: { type: "string" },
-        cartocss_key: { type: "string" },
-        source_path: { type: "string" },
-        description: { type: ["string", "null"] },
-        card_table: { type: "string" },
-        card_columns: { type: "string" },
-        card_html: { type: "string" },
-        is_public: { type: "boolean" },
-        is_static: { type: "boolean" },
-        enabled: { type: "boolean" },
-        geom: geometrySchema,
-    },
-};
-
-export const getCartocssSchema = {
-    params: {
-        type: 'object',
-        required: ['id'],
-        properties: {
-            id: { type: 'string', pattern: '^([\\d\\w._-]+)$' }
-        }
-    },
-    querystring: {
-        type: 'object',
-        additionalProperties: false,
-        properties: {
-            nocache: { type: 'number', enum: [1] },
-            sql: { type: 'number', enum: [1] },
-        }
-    }
-};
-
-export const addCartocssSchema = {
-    params: {
-        type: 'object',
-        required: ['id'],
-        properties: {
-            id: { type: 'string', pattern: '^([\\d\\w._-]+)$' }
-        }
-    },
-    body: cssBodySchema,
-};
-
-export default null;
+const geometrySchema = {
+
+    type: "object",
+    required: ["type", "coordinates"],
+    properties: {
+        type: {
+            enum: [
+                "Point",
+                "LineString",
+                "Polygon",
+                "MultiPoint",
+                "MultiLineString",
+                "MultiPolygon",
+            ],
+        },
+        coordinates: {
+            type: "array",
+        },
+    },
+
+};
+
+const cssBodySchema = {
+    type: "object",
+    additionalProperties: true,
+
+    properties: {
+        id: { type: "string", pattern: '^([\\d\\w._-]+)$' },
+        name: { type: "string" },
+        group_id: { type: "string" },
+        cartocss_key: { type: "string" },
+        source_path: { type: "string" },
+        description: { type: ["string", "null"] },
+        card_table: { type: "string" },
+        card_columns: { type: "string" },
+        card_html: { type: "string" },
+        is_public: { type: "boolean" },
+        is_static: { type: "boolean" },
+        enabled: { type: "boolean" },
+        geom: geometrySchema,
+    },
+};
+
+export const getCartocssSchema = {
+    params: {
+        type: 'object',
+        required: ['id'],
+        properties: {
+            id: { type: 'string', pattern: '^([\\d\\w._-]+)$' }
+        }
+    },
+    querystring: {
+        type: 'object',
+        additionalProperties: false,
+        properties: {
+            nocache: { type: 'number', enum: [1] },
+            sql: { type: 'number', enum: [1] },
+        }
+    }
+};
+
+export const addCartocssSchema = {
+    params: {
+        type: 'object',
+        required: ['id'],
+        properties: {
+            id: { type: 'string', pattern: '^([\\d\\w._-]+)$' }
+        }
+    },
+    body: cssBodySchema,
+};
+
+export default null;

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

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