@opengis/gis 0.0.6 → 0.0.7

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@opengis/gis",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "type": "module",
   "author": "Softpro",
-  "main": "index.js",
+  "main": "plugin.js",
   "files": [
     "dist/*",
     "module/*",
@@ -12,7 +12,6 @@
     "utils.js",
     "config.js",
     "README.md",
-    "index.js",
     "LICENSE"
   ],
   "scripts": {
@@ -48,4 +47,4 @@
     "eslint": "^8.49.0",
     "eslint-config-airbnb": "^19.0.4"
   }
-}
+}

package/plugin.js

@@ -1,6 +1,6 @@
 import fp from 'fastify-plugin';
 
-import config from './config.js';
+import { config } from '@opengis/fastify-table/utils.js';
 
 config.prefix = config.prefix || '/api';
 

package/server/plugins/mapnik/funcs/gdalWrapper.js

@@ -2,7 +2,7 @@ import path from 'path';
 import { randomUUID as uuidv4 } from 'crypto';
 import mapnik from './mapnik.js';
 
-import config from '../../../config.js';
+import { config } from '@opengis/fastify-table/utils.js';
 
 const { mapServerAddress } = mapnik();
 

package/server/plugins/mapnik/funcs/mapnik.js

@@ -1,78 +1,101 @@
 /* eslint-disable consistent-return */
-import path from 'path';
+import path from 'node:path';
+
 import grpc from '@grpc/grpc-js';
 import protoLoader from '@grpc/proto-loader';
-import config from '../../../config.js';
 
-function getMapnik() {
-  const { mapServerAddress } = config || {};
+import { config, logger } from '@opengis/fastify-table/utils.js';
 
-  if (!mapServerAddress) {
-    throw new Error('mapServerAddress not set in config');
-  }
+config.ready = config.ready || {};
+
+const { mapServerAddress } = config || {};
+
+if (!mapServerAddress) {
+  throw new Error('mapServerAddress not set in config');
+}
+
+const proto = grpc.loadPackageDefinition(
+  protoLoader.loadSync(path.join(process.cwd(), '/server/plugins/mapnik/utils/map.proto'), {
+    keepCase: true,
+    longs: String,
+    enums: String,
+    defaults: true,
+    oneofs: true,
+  }),
+);
 
-  const proto = grpc.loadPackageDefinition(
-    protoLoader.loadSync(path.join(process.cwd(), '/server/plugins/mapnik/utils/map.proto'), {
-      keepCase: true,
-      longs: String,
-      enums: String,
-      defaults: true,
-      oneofs: true,
-    }),
-  );
+const mapClient = mapServerAddress ? new proto.Map(
+  mapServerAddress,
+  grpc.credentials.createInsecure(),
+) : null;
 
-  const mapClient = mapServerAddress ? new proto.Map(
-    mapServerAddress,
-    grpc.credentials.createInsecure(),
-  ) : null;
+mapClient.waitForReady(Date.now() + 5000, (err) => {
+  if (err) {
+    config.ready.mapnik = false;
+    console.error('Mapnik client connection timeout or failure:', err);
+  }
+  else {
+    config.ready.mapnik = true;
+    console.log('Mapnik client connected successfully.');
+    // You can now make RPC calls safely
+  }
+});
 
-  const fsFuncsList = ['uploadFile', 'deleteFiles', 'downloadFile', 'checkFiles', 'fileList', 'readDir'];
+const fsFuncsList = ['uploadFile', 'deleteFiles', 'downloadFile', 'checkFiles', 'fileList', 'readDir'];
 
-  const funcs1 = [
-    'render', 'renderXML', 'loadXML', 'markerIcon', 'gdal',
-    'printMap', 'log', 'sqlToShp', 'uploadFile', 'deleteFiles',
-    'downloadFile', 'checkFiles', 'fileList', 'readDir', 'renderStatus',
-  ].reduce((p, el) => {
+const funcs1 = [
+  'render', 'renderXML', 'loadXML', 'markerIcon', 'gdal',
+  'printMap', 'log', 'sqlToShp', 'uploadFile', 'deleteFiles',
+  'downloadFile', 'checkFiles', 'fileList', 'readDir', 'renderStatus',
+].reduce((p, el) => {
+  // eslint-disable-next-line no-param-reassign
+  p[el] = mapServerAddress ? async (data) => new Promise((res, rej) => {
+    const capitalized = fsFuncsList.includes(el) ? el : el.charAt(0).toUpperCase() + el.slice(1);
     // eslint-disable-next-line no-param-reassign
-    p[el] = mapServerAddress ? async (data) => new Promise((res, rej) => {
-      const capitalized = fsFuncsList.includes(el) ? el : el.charAt(0).toUpperCase() + el.slice(1);
-      // eslint-disable-next-line no-param-reassign
-      if (data) {
-        if (data?.path && data.path?.[0] !== '"') {
-          // eslint-disable-next-line no-param-reassign
-          data.path = `"${data.path}"`;
-        }
+    if (data) {
+      if (data?.path && data.path?.[0] !== '"') {
+        // eslint-disable-next-line no-param-reassign
+        data.path = `"${data.path}"`;
       }
+    }
 
-      if (el === 'downloadFile') {
-        const downloadBuffer = [];
-        const download = mapClient[capitalized].call(mapClient, data, (err, data1) => {
-          if (err || data1?.result?.startsWith?.('Usage:')) {
-            return rej(err || data1?.result);
+    if (el === 'downloadFile') {
+      const downloadBuffer = [];
+      const download = mapClient[capitalized].call(mapClient, data, (err, data1) => {
+        if (err || data1?.result?.startsWith?.('Usage:')) {
+          logger.file('grpc/mapnik', { error: err.toString(), stack: err.stack, ready: config.ready.mapnik });
+          if (!config.ready.mapnik) {
+            return rej(new Error('no grpc mapnik connection'));
           }
-          res(data1);
-        });
-        download.on('data', (resp) => {
-          downloadBuffer.push(...resp.chunk_data);
-        });
-        download.on('end', () => res({ data: Buffer.from(downloadBuffer) }));
-      }
-      else {
-        mapClient[capitalized].call(mapClient, data, (err, data1) => {
-          if (err || data1?.result?.startsWith?.('Usage:')) {
-            return rej(err || data1?.result);
+          return rej(err || data1?.result);
+        }
+        res(data1);
+      });
+      download.on('data', (resp) => {
+        downloadBuffer.push(...resp.chunk_data);
+      });
+      download.on('end', () => res({ data: Buffer.from(downloadBuffer) }));
+    }
+    else {
+      mapClient[capitalized].call(mapClient, data, (err, data1) => {
+        if (err || data1?.result?.startsWith?.('Usage:')) {
+          logger.file('grpc/mapnik', { error: err.toString(), stack: err.stack, ready: config.ready.mapnik });
+          if (!config.ready.mapnik) {
+            return rej(new Error('no grpc mapnik connection'));
           }
-          res(data1);
-        });
-      }
-    }) : null;
-    return p;
-  }, {});
+          return rej(err || data1?.result);
+        }
+        res(data1);
+      });
+    }
+  }) : null;
+  return p;
+}, {});
 
-  return {
-    ...funcs1,
-    mapServerAddress,
-  };
-}
+
+const getMapnik = () => ({
+  ...funcs1,
+  mapServerAddress,
+});
 
 export default getMapnik;

package/server/plugins/mapnik/index.mjs

@@ -5,8 +5,8 @@ import mapnik from './funcs/mapnik.js';
 import gdalWrapper from './funcs/gdalWrapper.js';
 
 async function plugin(fastify, opts) {
-  fastify.decorate('mapnik', mapnik);
-  fastify.decorate('gdalWrapper', gdalWrapper);
+  // fastify.decorate('mapnik', mapnik);
+  // fastify.decorate('gdalWrapper', gdalWrapper);
 }
 
 export default fp(plugin);

package/config.js

@@ -1,11 +0,0 @@
-import fs from 'fs';
-
-const fileName = ['config.json', '/data/local/config.json'].find(el => (fs.existsSync(el) ? el : null));
-const config = fileName ? JSON.parse(fs.readFileSync(fileName)) : {};
-
-Object.assign(config, {
-  allTemplates: config?.allTemplates || {},
-  skipCheckPolicyRoutes: [],
-});
-
-export default config;

package/index.js

@@ -1,11 +0,0 @@
-import fp from 'fastify-plugin';
-import config from './config.js';
-
-import gisRouter from './server/routes/gis/index.mjs';
-import mapRouter from './server/routes/map/index.mjs';
-
-async function plugin(fastify, opts) {
-    fastify.register(gisRouter, config);
-    fastify.register(mapRouter, config);
-}
-export default fp(plugin);

package/server/config.js

@@ -1,16 +0,0 @@
-import { readFile } from 'fs/promises';
-import fs from 'fs';
-
-let config = {};
-
-async function loadConfig() {
-  if (fs.existsSync('config.json')) {
-    const data = await readFile('config.json');
-    config = JSON.parse(data);
-  }
-}
-
-// Завантажуємо конфігурацію
-loadConfig().catch(console.error);
-
-export default config;