@opengis/fastify-table 2.0.97 → 2.0.99

package/dist/server/plugins/pg/funcs/getMeta.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getMeta.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/getMeta.ts"],"names":[],"mappings":"AAIA,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,gBAkE5D"}
+{"version":3,"file":"getMeta.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/getMeta.ts"],"names":[],"mappings":"AAKA,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,gBAyE5D"}

package/dist/server/plugins/pg/funcs/getMeta.js

@@ -1,9 +1,16 @@
+import init from "./init.js";
 import getPG from "./getPG.js";
 const data = {};
 export default async function getMeta(opt, nocache) {
     const pg = opt?.pg || getPG({ name: "client" });
     if (!pg)
         return { error: "pg connection not established", status: 400 };
+    // reconnect if at start of process connection was unavailable
+    if (!pg.pk) {
+        pg.connectionAttempt = 0;
+        pg.init = init(pg);
+        await init(pg);
+    }
     const table1 = opt?.table || opt;
     const table = pg.pk?.[table1] ? table1 : table1?.replace?.(/"/g, "");
     if (pg?.options?.database && data[pg.options.database]?.[table] && !nocache)

package/dist/server/plugins/pg/funcs/getPG.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getPG.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/getPG.ts"],"names":[],"mappings":"AAYA,iBAAS,KAAK,CAAC,KAAK,GAAE,GAAQ,OA6C7B;AAED,eAAe,KAAK,CAAC"}
+{"version":3,"file":"getPG.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/getPG.ts"],"names":[],"mappings":"AAYA,iBAAS,KAAK,CAAC,KAAK,GAAE,GAAQ,OAgD7B;AAED,eAAe,KAAK,CAAC"}

package/dist/server/plugins/pg/funcs/getPG.js

@@ -32,10 +32,11 @@ function getPG(param = {}) {
         return null;
     }
     pgClients[name] = new pg.Pool(dbConfig);
-    pgClients[name].init = async () => {
-        await init(pgClients[name]);
-    };
-    init(pgClients[name]);
+    pgClients[name].on("error", (err, client) => {
+        console.warn("Unexpected error on idle client", client?.options?.database);
+    });
+    pgClients[name].init = async () => init(pgClients[name]);
+    // pgClients[name].init();
     return pgClients[name];
 }
 export default getPG;

package/dist/server/plugins/pg/funcs/getPGAsync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getPGAsync.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/getPGAsync.ts"],"names":[],"mappings":"AAYA,iBAAe,UAAU,CAAC,KAAK,EAAE,GAAG,gBAyDnC;AAED,eAAe,UAAU,CAAC"}
+{"version":3,"file":"getPGAsync.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/getPGAsync.ts"],"names":[],"mappings":"AAYA,iBAAe,UAAU,CAAC,KAAK,EAAE,GAAG,gBA6DnC;AAED,eAAe,UAAU,CAAC"}

package/dist/server/plugins/pg/funcs/getPGAsync.js

@@ -31,11 +31,14 @@ async function getPGAsync(param) {
         return null;
     }
     pgClients[name] = new pg.Pool(dbConfig);
+    pgClients[name].on("error", (err, client) => {
+        console.warn("Unexpected error on idle client", client?.options?.database);
+    });
     try {
         await init(pgClients[name]);
     }
     catch (err) {
-        console.error("pg client init error", host, port, database);
+        console.warn("pg client init error", host, port, database);
         // debug only
         if (config.local && name !== "client") {
             console.warn("fall back to default pgClient", pgClients.client?.host, pgClients.client?.port, pgClients.client?.database);

package/dist/server/plugins/pg/funcs/init.d.ts

@@ -1,4 +1,4 @@
-import pg from "pg";
-declare function init(client: pg.Pool): Promise<void>;
+import { ExtendedPG } from "../../../types/core.js";
+declare function init(client: ExtendedPG): Promise<void>;
 export default init;
 //# sourceMappingURL=init.d.ts.map

package/dist/server/plugins/pg/funcs/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AASpB,iBAAe,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,iBA2MlC;AAGD,eAAe,IAAI,CAAC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/init.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAsBpD,iBAAe,IAAI,CAAC,MAAM,EAAE,UAAU,iBA4NrC;AAGD,eAAe,IAAI,CAAC"}

package/dist/server/plugins/pg/funcs/init.js

@@ -4,16 +4,40 @@ import config from "../../../../config.js";
 import getRedis from "../../redis/funcs/getRedis.js";
 import logger from "../../logger/getLogger.js";
 const rclient = getRedis({ db: 0 });
+const { reconnectAttempts = 2, reconnectInterval } = config.pg || {};
+function delay(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+// avoid process exit with exception on network changes: disconnect from db, internet altogether etc
+process.on("uncaughtException", (err) => {
+    if (err.message === "Connection terminated unexpectedly" ||
+        err.code === "ECONNRESET") {
+        console.warn("Ignored pg connection drop:", err.toString());
+        return;
+    }
+    throw err; // keep normal behavior
+});
 async function init(client) {
     if (!client?.options?.database) {
         return;
     }
+    if (!client?.init) {
+        return;
+    }
+    client.connectionAttempt = ++client.connectionAttempt || 1;
+    if (client.connectionAttempt - 1 > reconnectAttempts) {
+        return;
+    }
     try {
+        console.log(client.connectionAttempt, "init pg attempt");
         await client.connect();
     }
     catch (err) {
-        console.error("Error connecting to PostgreSQL:", client?.options?.database, err.message);
-        return;
+        console.warn("Error connecting to PostgreSQL:", client?.options?.database, err.message);
+        const wait = +(reconnectInterval || 500) * client.connectionAttempt;
+        // resolve fastify plugin register promise
+        await delay(wait);
+        return init(client);
     }
     const { pgType, pk } = await client
         .query(`SELECT
@@ -104,10 +128,10 @@ async function init(client) {
         }
         catch (err) {
             if (err.code === "57014") {
-                console.error("pg.querySafe timeout", q);
+                console.warn("pg.querySafe timeout", q);
                 return { rows: [], timeout: true };
             }
-            console.error("pg.querySafe error", q);
+            console.warn("pg.querySafe error", q);
             throw err;
         }
         finally {
@@ -175,6 +199,7 @@ async function init(client) {
         queryNotice,
         querySafe,
     });
+    client.init = undefined;
     console.log("pg connected", client.options?.database);
 }
 // export default client;

package/dist/server/plugins/pg/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/pg/index.ts"],"names":[],"mappings":"AA+BA,iBAAS,MAAM,CAAC,OAAO,EAAE,GAAG,QA0B3B;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/pg/index.ts"],"names":[],"mappings":"AA+BA,iBAAS,MAAM,CAAC,OAAO,EAAE,GAAG,QAwB3B;AAED,eAAe,MAAM,CAAC"}

package/dist/server/plugins/pg/pgClients.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pgClients.d.ts","sourceRoot":"","sources":["../../../../server/plugins/pg/pgClients.ts"],"names":[],"mappings":"AAMA,QAAA,MAAM,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,CAAC;AAiB1C,eAAe,SAAS,CAAC"}
+{"version":3,"file":"pgClients.d.ts","sourceRoot":"","sources":["../../../../server/plugins/pg/pgClients.ts"],"names":[],"mappings":"AAMA,QAAA,MAAM,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,CAAC;AAkB1C,eAAe,SAAS,CAAC"}

package/dist/server/plugins/pg/pgClients.js

@@ -12,10 +12,11 @@ if (config.pg) {
         statement_timeout: config.pg?.statement_timeout || 10000,
         connectionTimeoutMillis: config.pg?.connectionTimeoutMillis || 5000,
     });
-    client.init = async () => {
-        await init(client);
-    };
-    client.init();
+    client.on("error", (err, client1) => {
+        console.warn("Unexpected error on idle client", client1?.options?.database);
+    });
+    client.init = async () => init(client);
+    // client.init();
     pgClients.client = client;
 }
 export default pgClients;

package/dist/server/plugins/table/funcs/getTemplate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getTemplate.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/table/funcs/getTemplate.ts"],"names":[],"mappings":"AAoFA,wBAA8B,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,gBAyB7D"}
+{"version":3,"file":"getTemplate.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/table/funcs/getTemplate.ts"],"names":[],"mappings":"AA+FA,wBAA8B,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,gBAyB7D"}

package/dist/server/plugins/table/funcs/getTemplate.js

@@ -10,7 +10,7 @@ async function readFileData(file) {
     if (ext === "yml") {
         return yaml.load(data);
     }
-    if (ext === "json") {
+    if (ext === "json" && data) {
         return JSON.parse(data);
     }
     if (ext === "md") {
@@ -44,6 +44,13 @@ async function getTemplateData(template) {
     // one file template: table, form
     if (template.length === 1) {
         const data = await readFileData(template[0][1]);
+        if (template[0][2] === "json" &&
+            path.basename(path.dirname(template[0][1])) === "table" &&
+            data?.parent) {
+            const parentTemplate = getTemplatePath("table").find((el) => el[0] === data.parent);
+            const parentData = await readFileData(parentTemplate[1]);
+            return { ...(parentData || {}), ...data };
+        }
         return data;
     }
     // multi file template: select, etc

package/dist/server/types/core.d.ts

@@ -5,6 +5,7 @@ declare let Database: any;
 export interface ExtendedPG extends Pool {
     readonly?: any;
     init?: () => void;
+    connectionAttempt: number;
     pk?: Record<string, string>;
     pgType?: Record<any, string>;
     tlist?: string[];

package/dist/server/types/core.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../server/types/core.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AACpE,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAM1B,QAAA,IAAI,QAAQ,EAAE,GAAG,CAAC;AAUlB,MAAM,WAAW,UAAW,SAAQ,IAAI;IACtC,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,IAAI,CAAC;IAClB,EAAE,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC7B,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,GAAG,CAAC;CACjE;AAYD,MAAM,WAAW,YAAY;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,MAAM,WAAW,eAAgB,SAAQ,oBAAoB;IAC3D,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,MAAM,WAAW,eAAgB,SAAQ,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC;IACnE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,OAAO,EAAE,eAAe,CAAC;IACzB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,KAAK,EAAE,GAAG,CAAC;IACX,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,YAAY,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG;QAC7C,MAAM,EAAE,0BAA0B,CAAC;KACpC,CAAC;CACH;AAED,MAAM,WAAW,cAAe,SAAQ,YAAY,CAAC,OAAO,QAAQ,CAAC;IACnE,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC5B,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,MAAM,WAAW,0BAA2B,SAAQ,oBAAoB;IACtE,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB"}
+{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../server/types/core.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AACpE,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAM1B,QAAA,IAAI,QAAQ,EAAE,GAAG,CAAC;AAUlB,MAAM,WAAW,UAAW,SAAQ,IAAI;IACtC,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,IAAI,CAAC;IAClB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,EAAE,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC7B,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,GAAG,CAAC;CACjE;AAYD,MAAM,WAAW,YAAY;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,MAAM,WAAW,eAAgB,SAAQ,oBAAoB;IAC3D,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,MAAM,WAAW,eAAgB,SAAQ,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC;IACnE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,OAAO,EAAE,eAAe,CAAC;IACzB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,KAAK,EAAE,GAAG,CAAC;IACX,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,YAAY,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG;QAC7C,MAAM,EAAE,0BAA0B,CAAC;KACpC,CAAC;CACH;AAED,MAAM,WAAW,cAAe,SAAQ,YAAY,CAAC,OAAO,QAAQ,CAAC;IACnE,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC5B,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,MAAM,WAAW,0BAA2B,SAAQ,oBAAoB;IACtE,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "2.0.97",
+  "version": "2.0.99",
   "type": "module",
   "description": "core-plugins",
   "keywords": [