@opengis/fastify-table 2.0.142 → 2.0.144

package/dist/server/plugins/crud/funcs/dataDelete.js

@@ -59,7 +59,7 @@ export default async function dataDelete({ table: table1, tokenData, referer, id
             type: "DELETE",
         });
         if (config.redis) {
-            rclient.incr(`pg:${table}:crud`);
+            rclient.incr(`pg:${client.options?.database}:${table}:crud`);
         }
         if (!isClient) {
             await client.query("commit;");

package/dist/server/plugins/crud/funcs/dataInsert.js

@@ -106,7 +106,7 @@ export default async function dataInsert({ id, table: table1, referer, data, pg:
             type: "INSERT",
         });
         if (config.redis && rclient?.status !== "end") {
-            rclient.incr(`pg:${table}:crud`);
+            rclient.incr(`pg:${client.options?.database}:${table}:crud`);
         }
         if (!isClient) {
             await client.query("commit;");

package/dist/server/plugins/crud/funcs/dataUpdate.js

@@ -172,7 +172,7 @@ export default async function dataUpdate({ table: table1, tokenData, referer, id
             type: "UPDATE",
         });
         if (config.redis && rclient?.status !== "end") {
-            rclient.incr(`pg:${table}:crud`);
+            rclient.incr(`pg:${client.options?.database}:${table}:crud`);
         }
         if (!isClient) {
             await client.query("commit;");

package/dist/server/plugins/crud/funcs/dataUpsert.js

@@ -120,7 +120,7 @@ export default async function dataUpsert({ id, table: table1, referer, data, pg:
             type: "UPSERT",
         });
         if (config.redis) {
-            rclient.incr(`pg:${table}:crud`);
+            rclient.incr(`pg:${client.options?.database}:${table}:crud`);
         }
         if (!isClient) {
             await client.query("commit;");

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

@@ -145,11 +145,11 @@ async function init(client) {
             return data;
         }
         // CRUD table state
-        const keyCacheTable = `pg:${table}:crud`;
+        const keyCacheTable = `pg:${client?.database}:${table}:crud`;
         const crudInc = table && config.redis ? (await rclient.get(keyCacheTable)) || 0 : 0;
         //
         const hash = createHash("sha1")
-            .update([q, JSON.stringify(args)].join())
+            .update([q, client?.database, JSON.stringify(args)].join())
             .digest("base64");
         const keyCache = `pg:${hash}:${crudInc}`;
         const cacheData = config.redis ? await rclient.get(keyCache) : null;

package/dist/server/plugins/table/funcs/metaFormat/getSelectVal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getSelectVal.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/table/funcs/metaFormat/getSelectVal.ts"],"names":[],"mappings":"AAaA,wBAA8B,YAAY,CAAC,EACzC,EAAqB,EACrB,IAAI,EACJ,MAAM,EAAE,YAAY,EACpB,EAAU,GACX,EAAE,GAAG,gBA6GL"}
+{"version":3,"file":"getSelectVal.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/table/funcs/metaFormat/getSelectVal.ts"],"names":[],"mappings":"AAaA,wBAA8B,YAAY,CAAC,EACzC,EAAqB,EACrB,IAAI,EACJ,MAAM,EAAE,YAAY,EACpB,EAAU,GACX,EAAE,GAAG,gBA+GL"}

package/dist/server/plugins/table/funcs/metaFormat/getSelectVal.js

@@ -38,7 +38,9 @@ export default async function getSelectVal({ pg = pgClients.client, name, values
         ?.split?.(" from ")
         ?.filter?.((el) => /^[a-z0-9_]+\.[a-z0-9_]+/.test(el))
         ?.map?.((el) => el.split(/[ )]/)[0])?.[0];
-    const crudInc = table && config.redis ? (await rclient.get(`pg:${table}:crud`)) || 0 : 0;
+    const crudInc = table && config.redis
+        ? (await rclient.get(`pg:${pg.options?.database}:${table}:crud`)) || 0
+        : 0;
     const key = `select:${name}:${crudInc}`;
     const cache = values?.length && config.redis && !config.disableCache
         ? (await rclient.hmget(key, values)).reduce((p, el, i) => ({

package/dist/server/routes/auth/controllers/jwt/authorize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"authorize.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/jwt/authorize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAwBvC,wBAA8B,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBA4GpE"}
+{"version":3,"file":"authorize.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/jwt/authorize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAyBvC,wBAA8B,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBA4GpE"}

package/dist/server/routes/auth/controllers/jwt/authorize.js

@@ -1,3 +1,4 @@
+import config from "../../../../../config.js";
 import pgClients from "../../../../plugins/pg/pgClients.js";
 import dataInsert from "../../../../plugins/crud/funcs/dataInsert.js";
 import { sign, scryptHash } from "../../../../plugins/auth/funcs/jwt.js";
@@ -9,7 +10,7 @@ const getIp = (req) => (req.headers?.["x-real-ip"] ||
     "")
     .split(":")
     .pop();
-const expireMsec = 1000 * 60 * 60;
+const expireMsec = +(config.auth?.oauthTokenExpireMs || 1000 * 60 * 60);
 // ? Request example: http://localhost:3000/oauth/authorize?response_type=code&client_id=2835134164020233999&redirect_uri=http%3A%2F%2Flocalhost%3A3000%2Foauth%2Ftoken%3Fclient_id%3D2835134164020233999%26noredirect%3D1%26grant_type%3Dauthorization_code
 // ? add &noredirect=1 to retrieve code via GET request or simply send POST requests
 export default async function authorize(req, reply) {

package/dist/server/routes/file/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/file/index.ts"],"names":[],"mappings":"AAWA,iBAAS,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,GAAE,GAAQ,QAuBtC;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/file/index.ts"],"names":[],"mappings":"AAaA,iBAAS,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,GAAE,GAAQ,QA8BtC;AAED,eAAe,MAAM,CAAC"}

package/dist/server/routes/file/index.js

@@ -1,3 +1,4 @@
+import config from "../../../config.js";
 import files from "./controllers/files.js";
 import resize from "./controllers/resize.js";
 import resizeAll from "./controllers/resizeAll.js";
@@ -8,15 +9,26 @@ import uploadImage from "./controllers/uploadImage.js";
 import deleteFileAPI from "./controllers/delete.js";
 import { resizeSchema } from "./schema.js";
 function plugin(app, opt = {}) {
-    app.get("/files/*", { config: { policy: ["public"] } }, files);
-    if (!app.hasRoute({ method: 'GET', url: '/file/resize', })) {
-        app.get("/file/resize", { config: { policy: ["public"] }, schema: resizeSchema }, resize);
+    app.get("/files/*", { config: { policy: "L0" } }, files);
+    if (!app.hasRoute({ method: "GET", url: "/file/resize" })) {
+        app.get("/file/resize", {
+            config: {
+                policy: "L0",
+                rateLimit: config.rateLimit
+                    ? {
+                        max: +(config.rateLimit?.resize?.max || 1),
+                        timeWindow: config.rateLimit?.resize?.timeWindow || "1 minute",
+                    }
+                    : undefined,
+            },
+            schema: resizeSchema,
+        }, resize);
     }
     app.get("/api/resize-all", { config: { policy: ["admin", "site"] }, schema: resizeSchema }, resizeAll);
-    app.post("/file/upload/*", { config: { policy: ["public"] } }, upload);
-    app.post("/file/upload-image/*", { config: { policy: ["public"] } }, uploadImage);
-    app.get("/file/download/*", { config: { policy: ["public"] } }, download);
-    app.get("/file/delete/*", { config: { policy: ["public"] } }, deleteFileAPI);
-    app.get(`/api/export`, { config: { policy: ["public"] } }, exportTable);
+    app.post("/file/upload/*", { config: { policy: "L0" } }, upload);
+    app.post("/file/upload-image/*", { config: { policy: "L0" } }, uploadImage);
+    app.get("/file/download/*", { config: { policy: "L0" } }, download);
+    app.get("/file/delete/*", { config: { policy: "L0" } }, deleteFileAPI);
+    app.get(`/api/export`, { config: { policy: "L0" } }, exportTable);
 }
 export default plugin;

package/package.json

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