@opengis/gis 0.2.49 → 0.2.50

package/server/plugins/mapnik/map.proto

@@ -1,155 +1,155 @@
-syntax = "proto3";
-
-import "google/protobuf/struct.proto"; // after syntax!
-
-package map;
-
-// ----------------------------
-// Map Service
-// ----------------------------
-service MapService {
-    rpc RenderTile(RenderTileRequest) returns (RenderTileOut);
-    rpc ClearTile(ClearTileRequest) returns (ClearTileOut);
-    rpc ReadDir(ReadDirRequest) returns (ReadDirOut);
-    rpc CreateXML(CreateXMLRequest) returns (stream JobProgress); // streaming XML creation
-    rpc UploadXML(UploadXMLRequest) returns (UploadXMLOut);
-    rpc UploadRaster(UploadRasterRequest) returns (UploadRasterOut);
-    rpc GetRasterStatus(GetRasterStatusRequest) returns (GetStatusOut);
-    rpc GetStat(GetStatRequest) returns (GetStatOut);
-    rpc GetRender(GetRenderRequest) returns (GetRenderOut);
-    rpc GetLogs(GetLogsRequest) returns (GetLogsOut);
-}
-
-// ----------------------------
-// Messages for MapService
-// ----------------------------
-message RenderTileRequest {
-    string name = 1;
-    string path = 2;
-    repeated double bbox = 3;  // [minx, miny, maxx, maxy]
-    int32 width = 4;
-    int32 height = 5;
-    string ttl = 6; // "5m", "1h", "1d" or "0"
-    string debug = 7;
-}
-
-message RenderTileOut {
-    string base64 = 1;
-    bool cache = 2;
-    string err = 3;
-    string xml_path = 4;
-}
-
-message ClearTileRequest {
-    string name = 1;
-    string path = 2;
-}
-
-message ClearTileOut {
-    string result = 1;
-    string err = 2;
-}
-
-message ReadDirRequest {
-    string path = 1;
-}
-
-message FileInfo {
-    string name = 1;
-    int64 size = 2;
-    string date = 3;
-}
-
-message ReadDirOut {
-    bool exists = 1;
-    int32 count = 2;
-    repeated FileInfo files = 3;
-}
-
-message CreateXMLRequest {
-    string path = 1;
-    int32 srid = 2;
-    int32 previewZoom = 3;
-    repeated string layers = 4;
-    bool vrt = 5;
-    string name = 6;
-    string debug = 7;
-    string nocache = 8;
-}
-
-message UploadXMLRequest {
-    string name = 1;
-    string xml = 2;
-    string encoding = 3;
-}
-
-message UploadXMLOut {
-    string status = 1;
-    string filepath = 2;
-}
-
-message UploadRasterRequest {
-    string path = 1;
-    bytes data = 2;
-    bool chunked = 3;
-    int64 filesize = 4;
-}
-
-message UploadRasterOut {
-    string status = 1;
-    int64 uploaded = 2;
-    bool finished = 3;
-}
-
-message GetRasterStatusRequest {
-    string path = 1;
-    bool md5 = 2;
-}
-
-message GetStatusOut {
-  bool exists = 1;
-  string size = 2;
-  bool finished = 3;
-}
-
-message GetStatRequest {
-    string period = 1;  // "5m", "1h", "1d"
-}
-
-message GetStatOut {
-    google.protobuf.Struct result = 1; // dynamic json structure, not bound by same value type like with map
-}
-
-message GetRenderRequest {
-    string name = 1;
-    string path = 2;
-}
-
-message GetRenderOut {
-    string result = 1;  // serialized object or placeholder
-}
-
-message GetLogsRequest {
-    string period = 1;  // "5m", "1h", "1d"
-    string type = 2;    // optional filter
-}
-
-message GetLogsOut {
-    repeated string result = 1;
-}
-
-// ----------------------------
-// Job Service Messages
-// ----------------------------
-message JobRequest {
-    string job_id = 1;
-    string xml_name = 2;
-    string xml_path = 3;
-    repeated string layers = 4;
-}
-
-message JobProgress {
-    string message = 1;
-    string error = 2;
-    bool done = 3;
-}
+syntax = "proto3";
+
+import "google/protobuf/struct.proto"; // after syntax!
+
+package map;
+
+// ----------------------------
+// Map Service
+// ----------------------------
+service MapService {
+    rpc RenderTile(RenderTileRequest) returns (RenderTileOut);
+    rpc ClearTile(ClearTileRequest) returns (ClearTileOut);
+    rpc ReadDir(ReadDirRequest) returns (ReadDirOut);
+    rpc CreateXML(CreateXMLRequest) returns (stream JobProgress); // streaming XML creation
+    rpc UploadXML(UploadXMLRequest) returns (UploadXMLOut);
+    rpc UploadRaster(UploadRasterRequest) returns (UploadRasterOut);
+    rpc GetRasterStatus(GetRasterStatusRequest) returns (GetStatusOut);
+    rpc GetStat(GetStatRequest) returns (GetStatOut);
+    rpc GetRender(GetRenderRequest) returns (GetRenderOut);
+    rpc GetLogs(GetLogsRequest) returns (GetLogsOut);
+}
+
+// ----------------------------
+// Messages for MapService
+// ----------------------------
+message RenderTileRequest {
+    string name = 1;
+    string path = 2;
+    repeated double bbox = 3;  // [minx, miny, maxx, maxy]
+    int32 width = 4;
+    int32 height = 5;
+    string ttl = 6; // "5m", "1h", "1d" or "0"
+    string debug = 7;
+}
+
+message RenderTileOut {
+    string base64 = 1;
+    bool cache = 2;
+    string err = 3;
+    string xml_path = 4;
+}
+
+message ClearTileRequest {
+    string name = 1;
+    string path = 2;
+}
+
+message ClearTileOut {
+    string result = 1;
+    string err = 2;
+}
+
+message ReadDirRequest {
+    string path = 1;
+}
+
+message FileInfo {
+    string name = 1;
+    int64 size = 2;
+    string date = 3;
+}
+
+message ReadDirOut {
+    bool exists = 1;
+    int32 count = 2;
+    repeated FileInfo files = 3;
+}
+
+message CreateXMLRequest {
+    string path = 1;
+    int32 srid = 2;
+    int32 previewZoom = 3;
+    repeated string layers = 4;
+    bool vrt = 5;
+    string name = 6;
+    string debug = 7;
+    string nocache = 8;
+}
+
+message UploadXMLRequest {
+    string name = 1;
+    string xml = 2;
+    string encoding = 3;
+}
+
+message UploadXMLOut {
+    string status = 1;
+    string filepath = 2;
+}
+
+message UploadRasterRequest {
+    string path = 1;
+    bytes data = 2;
+    bool chunked = 3;
+    int64 filesize = 4;
+}
+
+message UploadRasterOut {
+    string status = 1;
+    int64 uploaded = 2;
+    bool finished = 3;
+}
+
+message GetRasterStatusRequest {
+    string path = 1;
+    bool md5 = 2;
+}
+
+message GetStatusOut {
+  bool exists = 1;
+  string size = 2;
+  bool finished = 3;
+}
+
+message GetStatRequest {
+    string period = 1;  // "5m", "1h", "1d"
+}
+
+message GetStatOut {
+    google.protobuf.Struct result = 1; // dynamic json structure, not bound by same value type like with map
+}
+
+message GetRenderRequest {
+    string name = 1;
+    string path = 2;
+}
+
+message GetRenderOut {
+    string result = 1;  // serialized object or placeholder
+}
+
+message GetLogsRequest {
+    string period = 1;  // "5m", "1h", "1d"
+    string type = 2;    // optional filter
+}
+
+message GetLogsOut {
+    repeated string result = 1;
+}
+
+// ----------------------------
+// Job Service Messages
+// ----------------------------
+message JobRequest {
+    string job_id = 1;
+    string xml_name = 2;
+    string xml_path = 3;
+    repeated string layers = 4;
+}
+
+message JobProgress {
+    string message = 1;
+    string error = 2;
+    bool done = 3;
+}

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' || config.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 || {};
-    // console.log(req.url);
-    if (!user && req.url !== '/login') {
-      return reply.redirect('/login');
-    }
-    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' || config.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 || {};
+    // console.log(req.url);
+    if (!user && req.url !== '/login') {
+      return reply.redirect('/login');
+    }
+    if (!isProduction) return null; // admin vite
+    const stream = fs.createReadStream('admin/dist/index.html');
+    return reply.type('text/html').send(stream);
+  });
+}
+
+export default plugin;