@opengis/gis 0.2.175 → 0.2.176

package/server/routes/mapnik/functions/rtile.js

@@ -1,164 +1,164 @@
-import path from 'node:path';
-import { createHash } from 'node:crypto';
-
-import { SphericalMercator } from '@mapbox/sphericalmercator';
-
-const mercator = new SphericalMercator({ size: 256 });
-
-import {
-    config, logger, pgClients,
-} from '@opengis/fastify-table/utils.js';
-
-import { BadRequestError, ForbiddenError, NotFoundError } from '@opengis/fastify-table/errors.js';
-
-import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
-
-const { RenderTile } = mapnik();
-
-const meta = !!config?.mapnik?.meta;
-
-/**
- * Формування растрового tile cartoCss
- *
- * @method GET
- * @alias rtile
- * @param {String} bbox - bbox
- * @param {Number} height - висота по координатам
- * @param {Number} width - ширина по координатам
- * @param {String} data - стилізація
- * @param {String} lang - мова
- * @param {String} z - координата z
- * @param {String} x - координата y
- * @param {String} y - координата x
- */
-
-export default async function gisRtile({
-    id, z, y, x, debug, nocache, nottl, uid,
-}, pg = pgClients.client) {
-    if (!RenderTile) {
-        throw BadRequestError('mapnik server address needed');
-    }
-
-    if (!id) {
-        throw BadRequestError('not enough params: id');
-    }
-
-    if (!x || !y || !z) {
-        throw BadRequestError('not enough params: xyz');
-    }
-
-    const decodedPath = Buffer.from(id, 'base64url').toString('utf-8');
-
-    const data = pg.pk?.['gis.rasters']
-        ? await pg.queryCache(`select raster_id as id, source_path, is_public, 'raster' as type from gis.rasters where raster_id=$1::text or source_path=$2::text`, { args: [id, decodedPath], table: 'gis.rasters' })
-            .then(r => r.rows?.[0] || {})
-        : {};
-
-    const carto = pg.pk?.['gis.cartocss']
-        ? await pg.queryCache('select cartocss_id, source_path, is_public, is_static from gis.cartocss where cartocss_id=$1::text', { args: [id], table: 'gis.cartocss' }).then(r => r.rows?.[0] || {})
-        : {};
-
-    if (carto.cartocss_id) {
-        Object.assign(data, {
-            id: carto.cartocss_id,
-            source_path: carto.source_path,
-            is_public: carto.is_public,
-            is_static: carto.is_static,
-            type: 'css',
-        });
-    }
-
-    if (!uid && !config.local && data.is_public === false && process.env.NODE_ENV !== 'test' && !process.env.VITEST) {
-        throw ForbiddenError('access restricted');
-    }
-
-    if (!data.id && data.type !== 'css') {
-        Object.assign(data, { source_path: decodedPath });
-    }
-
-    if (!data.source_path && data.type !== 'css') {
-        throw NotFoundError('raster / cartocss not found');
-    }
-
-    const bbox = mercator.bbox(y, x, z, false, '900913');
-
-    const ttl = (nocache ? '0' : null)
-        || (data.type === 'css' && !data.is_static ? '1w' : null);
-
-    const md5 = data.source_path
-        ? createHash('md5').update(data.source_path).digest('hex')
-        : undefined;
-    const base64 = data.source_path
-        ? Buffer.from(data.source_path).toString('base64url')
-        : undefined;
-
-    const getParams = () => {
-        if (data.type === 'css' && data.source_path) {
-            return { name: path.posix.join('vector', config.mapnik?.folder || '', data.source_path) };
-        }
-        if (data.type === 'css') {
-            return { name: path.posix.join('xml', config.mapnik?.folder || '', id) };
-        }
-        return { path: path.posix.join('raster', config.mapnik?.folder || '', data.source_path) };
-    };
-
-    const { path: rpath, name } = getParams();
-
-    const param = {
-        path: rpath, // for rasters only
-        name, // required for cartocss
-        width: 256,
-        bbox,
-        ttl,
-        format: 'webp',
-        meta,
-        base64: false,
-        debug,
-    };
-
-    const result = await RenderTile(param);
-
-    if (result.err) {
-        logger.file('rtile/error', {
-            error: result.err, x, y, z, id: data.id, type: data.type,
-        });
-        throw new Error(result.err);
-    }
-
-    if (meta) {
-        const accelPath = result.tile_path?.startsWith('/') ? result.tile_path : `/${result.tile_path}`;
-        const metaHeaders = {
-            'Content-Type': 'image/webp',
-            'Cache-Control': nocache || nottl ? 'no-store, no-cache, must-revalidate' : 'public, max-age=2592000',
-            'X-Accel-Redirect': accelPath,
-        };
-        if (debug) {
-            return {
-                headers: metaHeaders,
-                base64: result.base64,
-                z,
-                x,
-                y,
-            };
-        }
-        return { headers: metaHeaders, code: 204 };
-    }
-
-    if (debug) {
-        return {
-            ...result,
-            name,
-            path: rpath,
-            ttl,
-            md5_path: md5,
-            base64_path: base64,
-            raster: !!data.id,
-            carto: data.type === 'css',
-            is_static: data.type === 'css' ? data.is_static : true,
-        };
-    }
-
-    const buffer = result.data || Buffer.from(result.base64, 'base64');
-
-    return { headers: { 'Content-Type': 'image/webp', 'Cache-Control': nocache || nottl ? 'no-store, no-cache, must-revalidate' : 'public, max-age=2592000' }, data: buffer };
-}
+import path from 'node:path';
+import { createHash } from 'node:crypto';
+
+import { SphericalMercator } from '@mapbox/sphericalmercator';
+
+const mercator = new SphericalMercator({ size: 256 });
+
+import {
+    config, logger, pgClients,
+} from '@opengis/fastify-table/utils.js';
+
+import { BadRequestError, ForbiddenError, NotFoundError } from '@opengis/fastify-table/errors.js';
+
+import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
+
+const { RenderTile } = mapnik();
+
+const meta = !!config?.mapnik?.meta;
+
+/**
+ * Формування растрового tile cartoCss
+ *
+ * @method GET
+ * @alias rtile
+ * @param {String} bbox - bbox
+ * @param {Number} height - висота по координатам
+ * @param {Number} width - ширина по координатам
+ * @param {String} data - стилізація
+ * @param {String} lang - мова
+ * @param {String} z - координата z
+ * @param {String} x - координата y
+ * @param {String} y - координата x
+ */
+
+export default async function gisRtile({
+    id, z, y, x, debug, nocache, nottl, uid,
+}, pg = pgClients.client) {
+    if (!RenderTile) {
+        throw BadRequestError('mapnik server address needed');
+    }
+
+    if (!id) {
+        throw BadRequestError('not enough params: id');
+    }
+
+    if (!x || !y || !z) {
+        throw BadRequestError('not enough params: xyz');
+    }
+
+    const decodedPath = Buffer.from(id, 'base64url').toString('utf-8');
+
+    const data = pg.pk?.['gis.rasters']
+        ? await pg.queryCache(`select raster_id as id, source_path, is_public, 'raster' as type from gis.rasters where raster_id=$1::text or source_path=$2::text`, { args: [id, decodedPath], table: 'gis.rasters' })
+            .then(r => r.rows?.[0] || {})
+        : {};
+
+    const carto = pg.pk?.['gis.cartocss']
+        ? await pg.queryCache('select cartocss_id, source_path, is_public, is_static from gis.cartocss where cartocss_id=$1::text', { args: [id], table: 'gis.cartocss' }).then(r => r.rows?.[0] || {})
+        : {};
+
+    if (carto.cartocss_id) {
+        Object.assign(data, {
+            id: carto.cartocss_id,
+            source_path: carto.source_path,
+            is_public: carto.is_public,
+            is_static: carto.is_static,
+            type: 'css',
+        });
+    }
+
+    if (!uid && !config.local && data.is_public === false && process.env.NODE_ENV !== 'test' && !process.env.VITEST) {
+        throw ForbiddenError('access restricted');
+    }
+
+    if (!data.id && data.type !== 'css') {
+        Object.assign(data, { source_path: decodedPath });
+    }
+
+    if (!data.source_path && data.type !== 'css') {
+        throw NotFoundError('raster / cartocss not found');
+    }
+
+    const bbox = mercator.bbox(y, x, z, false, '900913');
+
+    const ttl = (nocache ? '0' : null)
+        || (data.type === 'css' && !data.is_static ? '1w' : null);
+
+    const md5 = data.source_path
+        ? createHash('md5').update(data.source_path).digest('hex')
+        : undefined;
+    const base64 = data.source_path
+        ? Buffer.from(data.source_path).toString('base64url')
+        : undefined;
+
+    const getParams = () => {
+        if (data.type === 'css' && data.source_path) {
+            return { name: path.posix.join('vector', config.mapnik?.folder || '', data.source_path) };
+        }
+        if (data.type === 'css') {
+            return { name: path.posix.join('xml', config.mapnik?.folder || '', id) };
+        }
+        return { path: path.posix.join('raster', config.mapnik?.folder || '', data.source_path) };
+    };
+
+    const { path: rpath, name } = getParams();
+
+    const param = {
+        path: rpath, // for rasters only
+        name, // required for cartocss
+        width: 256,
+        bbox,
+        ttl,
+        format: 'webp',
+        meta,
+        base64: false,
+        debug,
+    };
+
+    const result = await RenderTile(param);
+
+    if (result.err) {
+        logger.file('rtile/error', {
+            error: result.err, x, y, z, id: data.id, type: data.type,
+        });
+        throw new Error(result.err);
+    }
+
+    if (meta) {
+        const accelPath = result.tile_path?.startsWith('/') ? result.tile_path : `/${result.tile_path}`;
+        const metaHeaders = {
+            'Content-Type': 'image/webp',
+            'Cache-Control': nocache || nottl ? 'no-store, no-cache, must-revalidate' : 'public, max-age=2592000',
+            'X-Accel-Redirect': accelPath,
+        };
+        if (debug) {
+            return {
+                headers: metaHeaders,
+                base64: result.base64,
+                z,
+                x,
+                y,
+            };
+        }
+        return { headers: metaHeaders, code: 204 };
+    }
+
+    if (debug) {
+        return {
+            ...result,
+            name,
+            path: rpath,
+            ttl,
+            md5_path: md5,
+            base64_path: base64,
+            raster: !!data.id,
+            carto: data.type === 'css',
+            is_static: data.type === 'css' ? data.is_static : true,
+        };
+    }
+
+    const buffer = result.data || Buffer.from(result.base64, 'base64');
+
+    return { headers: { 'Content-Type': 'image/webp', 'Cache-Control': nocache || nottl ? 'no-store, no-cache, must-revalidate' : 'public, max-age=2592000' }, data: buffer };
+}

package/server/routes/mapnik/functions/uploadRaster.js

@@ -1,152 +1,152 @@
-import path from 'node:path';
-import { ListObjectsV2Command } from '@aws-sdk/client-s3';
-
-/* eslint-disable no-await-in-loop */
-import {
-    config, isFileExists, logger, pgClients, downloadFile, s3Client,
-} from '@opengis/fastify-table/utils.js';
-
-import { BadRequestError, NotFoundError, NotImplementedError } from '@opengis/fastify-table/errors.js';
-
-import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
-
-const { UploadRaster, GetRasterStatus } = mapnik();
-
-const CHUNK_SIZE = 1024 * 1024; // 1 MB per chunk
-
-function sequence(files, data, fn) {
-    return files.reduce(
-        (promise, relpath) => promise.then(() => fn({
-            ...data,
-            relpath, // allow upload multiple to one directory for vrt
-        })),
-        Promise.resolve(),
-    );
-}
-
-async function uploadRasterFile({
-    id, prefix, relpath: relpathOriginal, callback = () => { },
-}) {
-    const metadata = await isFileExists(relpathOriginal);
-    const relpath = ['raster', config.mapnik?.folder || '', relpathOriginal.replace(/\/\//, '/').replace(config.folder, '')].join('/');
-
-    let offset = 0;
-
-    try {
-        const uploadStatus = await GetRasterStatus({ path: relpath, md5: true });
-
-        if (uploadStatus.finished) {
-            callback(`Already uploaded: ${relpath}`);
-            return { message: 'already uploaded', status: 200 };
-        }
-
-        if (!metadata || !metadata.ContentLength) {
-            callback(`File not found at s3: ${relpath}`);
-            return { error: `File not found at s3: ${relpath}`, code: 404 };
-        }
-
-        offset = uploadStatus.exists ? +uploadStatus.size : 0;
-
-        if (offset === metadata.ContentLength) {
-            callback(`Already uploaded: ${relpath}`);
-            return { message: 'already uploaded', status: 200 };
-        }
-
-        while (offset < metadata.ContentLength) {
-            const end = Math.min(offset + CHUNK_SIZE - 1, metadata.ContentLength - 1);
-            const Range = `bytes=${offset}-${end}`;
-
-            callback(`Uploading chunk ${(end / 1024 / 1024).toFixed(0)}/${(metadata.ContentLength / 1024 / 1024).toFixed(0)} MB...`);
-
-            const chunk = await downloadFile(relpathOriginal, { Range, fallback: false });
-            // const { Body: chunk } = await s3Client.send(new GetObjectCommand({ Bucket, Key, Range }));
-            const bufferPart = chunk ? await chunk.transformToByteArray() : [];
-
-            if (!bufferPart.length) {
-                callback(`Server error: file not found / zero bytes: ${relpath}`);
-                break;
-            }
-
-            const result = await UploadRaster({
-                path: relpath,
-                filesize: metadata.ContentLength,
-                data: bufferPart,
-                chunked: true,
-            });
-
-            if (result.finished) {
-                callback(`Upload completed: ${relpath}`);
-                break;
-            }
-
-            if (!result.uploaded) {
-                callback(`Chunked upload error: ${relpath}`);
-                break;
-            }
-
-            offset = +result.uploaded;
-        }
-
-        return null;
-    }
-    catch (err) {
-        logger.file('mapnik/upload/error', { error: err.toString(), stack: err.stack });
-        callback(config.local ? err.toString() : `Upload error: ${relpath}`);
-        return null;
-    }
-}
-
-export default async function uploadRaster({
-    id, callback = () => { },
-}, pg = pgClients.client) {
-    if (!UploadRaster || !GetRasterStatus) {
-        throw NotImplementedError('mapnik server address needed');
-    }
-
-    if (!id) {
-        throw BadRequestError('not enough params: id');
-    }
-
-    const data = pg.pk?.['gis.rasters']
-        ? await pg.query('select raster_id as id, source_path from gis.rasters where raster_id=$1::text', [id])
-            .then(r => r.rows?.[0])
-        : null;
-
-    if (!data?.id) {
-        throw NotFoundError('raster not found');
-    }
-
-    if (!data.source_path) {
-        throw BadRequestError('raster source_path not set');
-    }
-
-    const prefix = '/map/raster';
-    const relpath = `${prefix}/${data.source_path}`;
-
-    if (!path.extname(relpath)) {
-        const metadata = await s3Client.send(new ListObjectsV2Command({
-            Bucket: config.s3?.containerName || 'work',
-            Prefix: path.join(config.folder, relpath).replace(/\\/g, '/'),
-        }));
-        if (!metadata.Contents?.length) {
-            throw NotFoundError('invalid: raster source_path: not found / empty directory');
-        }
-
-        // list rasters, skip preview subdir content, skip folders from s3 directory name of which only starts with same characters, but does not exactly match
-        const files = metadata.Contents.map(file => file.Key).filter((file) => path.basename(path.dirname(file)) === path.basename(relpath) && !path.basename(path.dirname(file)).startsWith('preview') && path.extname(file).toLowerCase() === '.tif');
-
-        if (!files.length) {
-            throw BadRequestError('invalid: raster source_path: no raster files at directory');
-        }
-
-        await sequence(files, { id, prefix, callback }, uploadRasterFile);
-        return 'uploaded';
-    }
-
-
-    await uploadRasterFile({
-        id, prefix, callback, relpath: data.source_path,
-    });
-
-    return 'uploaded';
-}
+import path from 'node:path';
+import { ListObjectsV2Command } from '@aws-sdk/client-s3';
+
+/* eslint-disable no-await-in-loop */
+import {
+    config, isFileExists, logger, pgClients, downloadFile, s3Client,
+} from '@opengis/fastify-table/utils.js';
+
+import { BadRequestError, NotFoundError, NotImplementedError } from '@opengis/fastify-table/errors.js';
+
+import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
+
+const { UploadRaster, GetRasterStatus } = mapnik();
+
+const CHUNK_SIZE = 1024 * 1024; // 1 MB per chunk
+
+function sequence(files, data, fn) {
+    return files.reduce(
+        (promise, relpath) => promise.then(() => fn({
+            ...data,
+            relpath, // allow upload multiple to one directory for vrt
+        })),
+        Promise.resolve(),
+    );
+}
+
+async function uploadRasterFile({
+    id, prefix, relpath: relpathOriginal, callback = () => { },
+}) {
+    const metadata = await isFileExists(relpathOriginal);
+    const relpath = ['raster', config.mapnik?.folder || '', relpathOriginal.replace(/\/\//, '/').replace(config.folder, '')].join('/');
+
+    let offset = 0;
+
+    try {
+        const uploadStatus = await GetRasterStatus({ path: relpath, md5: true });
+
+        if (uploadStatus.finished) {
+            callback(`Already uploaded: ${relpath}`);
+            return { message: 'already uploaded', status: 200 };
+        }
+
+        if (!metadata || !metadata.ContentLength) {
+            callback(`File not found at s3: ${relpath}`);
+            return { error: `File not found at s3: ${relpath}`, code: 404 };
+        }
+
+        offset = uploadStatus.exists ? +uploadStatus.size : 0;
+
+        if (offset === metadata.ContentLength) {
+            callback(`Already uploaded: ${relpath}`);
+            return { message: 'already uploaded', status: 200 };
+        }
+
+        while (offset < metadata.ContentLength) {
+            const end = Math.min(offset + CHUNK_SIZE - 1, metadata.ContentLength - 1);
+            const Range = `bytes=${offset}-${end}`;
+
+            callback(`Uploading chunk ${(end / 1024 / 1024).toFixed(0)}/${(metadata.ContentLength / 1024 / 1024).toFixed(0)} MB...`);
+
+            const chunk = await downloadFile(relpathOriginal, { Range, fallback: false });
+            // const { Body: chunk } = await s3Client.send(new GetObjectCommand({ Bucket, Key, Range }));
+            const bufferPart = chunk ? await chunk.transformToByteArray() : [];
+
+            if (!bufferPart.length) {
+                callback(`Server error: file not found / zero bytes: ${relpath}`);
+                break;
+            }
+
+            const result = await UploadRaster({
+                path: relpath,
+                filesize: metadata.ContentLength,
+                data: bufferPart,
+                chunked: true,
+            });
+
+            if (result.finished) {
+                callback(`Upload completed: ${relpath}`);
+                break;
+            }
+
+            if (!result.uploaded) {
+                callback(`Chunked upload error: ${relpath}`);
+                break;
+            }
+
+            offset = +result.uploaded;
+        }
+
+        return null;
+    }
+    catch (err) {
+        logger.file('mapnik/upload/error', { error: err.toString(), stack: err.stack });
+        callback(config.local ? err.toString() : `Upload error: ${relpath}`);
+        return null;
+    }
+}
+
+export default async function uploadRaster({
+    id, callback = () => { },
+}, pg = pgClients.client) {
+    if (!UploadRaster || !GetRasterStatus) {
+        throw NotImplementedError('mapnik server address needed');
+    }
+
+    if (!id) {
+        throw BadRequestError('not enough params: id');
+    }
+
+    const data = pg.pk?.['gis.rasters']
+        ? await pg.query('select raster_id as id, source_path from gis.rasters where raster_id=$1::text', [id])
+            .then(r => r.rows?.[0])
+        : null;
+
+    if (!data?.id) {
+        throw NotFoundError('raster not found');
+    }
+
+    if (!data.source_path) {
+        throw BadRequestError('raster source_path not set');
+    }
+
+    const prefix = '/map/raster';
+    const relpath = `${prefix}/${data.source_path}`;
+
+    if (!path.extname(relpath)) {
+        const metadata = await s3Client.send(new ListObjectsV2Command({
+            Bucket: config.s3?.containerName || 'work',
+            Prefix: path.join(config.folder, relpath).replace(/\\/g, '/'),
+        }));
+        if (!metadata.Contents?.length) {
+            throw NotFoundError('invalid: raster source_path: not found / empty directory');
+        }
+
+        // list rasters, skip preview subdir content, skip folders from s3 directory name of which only starts with same characters, but does not exactly match
+        const files = metadata.Contents.map(file => file.Key).filter((file) => path.basename(path.dirname(file)) === path.basename(relpath) && !path.basename(path.dirname(file)).startsWith('preview') && path.extname(file).toLowerCase() === '.tif');
+
+        if (!files.length) {
+            throw BadRequestError('invalid: raster source_path: no raster files at directory');
+        }
+
+        await sequence(files, { id, prefix, callback }, uploadRasterFile);
+        return 'uploaded';
+    }
+
+
+    await uploadRasterFile({
+        id, prefix, callback, relpath: data.source_path,
+    });
+
+    return 'uploaded';
+}