@opengis/fastify-table 2.5.44 → 2.5.47

package/dist/functions.d.ts

@@ -1,5 +1,6 @@
 export declare function onListen1(): Promise<void>;
 export declare function onListen2(): Promise<void>;
+export declare function onListen3(): Promise<void>;
 export declare function preTemplate({ name, type, user, }: {
     name?: string;
     type?: string;

package/dist/functions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"functions.d.ts","sourceRoot":"","sources":["../functions.ts"],"names":[],"mappings":"AAgCA,wBAAsB,SAAS,kBAkH9B;AAED,wBAAsB,SAAS,kBAiJ9B;AAED,wBAAsB,WAAW,CAAC,EAChC,IAAI,EACJ,IAAI,EACJ,IAAS,GACV,EAAE;IACD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC3B;;eAqBA;AAED,wBAAsB,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,GAAG,CAAA;CAAE,gBASxE;AAED,wBAAsB,UAAU,CAAC,EAC/B,KAAK,EACL,GAAQ,EACR,OAAO,EAAE,IAAS,EAClB,IAAS,GACV,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACzB,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC3B,iBA+FA;AAED,wBAAsB,aAAa,CAAC,EAClC,IAAI,EACJ,IAAI,EACJ,OAAO,EAAE,IAAS,EAClB,IAAS,GACV,EAAE;IACD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC5B,6BAiEA;AAED,wBAAsB,WAAW,CAAC,EAChC,KAAK,EACL,IAAS,EACT,OAAO,EAAE,GAAQ,EACjB,IAAS,GACV,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC3B,gBA6CA;AAED,wBAAsB,WAAW,CAAC,EAChC,KAAK,EACL,IAAI,EACJ,OAAO,EAAE,GAAQ,EACjB,IAAS,GACV,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC3B,gBA2CA;AAED,wBAAsB,OAAO,kBAmC5B"}
+{"version":3,"file":"functions.d.ts","sourceRoot":"","sources":["../functions.ts"],"names":[],"mappings":"AAoCA,wBAAsB,SAAS,kBAkH9B;AAED,wBAAsB,SAAS,kBAiJ9B;AAED,wBAAsB,SAAS,kBAkM9B;AAED,wBAAsB,WAAW,CAAC,EAChC,IAAI,EACJ,IAAI,EACJ,IAAS,GACV,EAAE;IACD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC3B;;eAqBA;AAED,wBAAsB,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,GAAG,CAAA;CAAE,gBASxE;AAED,wBAAsB,UAAU,CAAC,EAC/B,KAAK,EACL,GAAQ,EACR,OAAO,EAAE,IAAS,EAClB,IAAS,GACV,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACzB,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC3B,iBA+FA;AAED,wBAAsB,aAAa,CAAC,EAClC,IAAI,EACJ,IAAI,EACJ,OAAO,EAAE,IAAS,EAClB,IAAS,GACV,EAAE;IACD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC5B,6BAiEA;AAED,wBAAsB,WAAW,CAAC,EAChC,KAAK,EACL,IAAS,EACT,OAAO,EAAE,GAAQ,EACjB,IAAS,GACV,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC3B,gBA6CA;AAED,wBAAsB,WAAW,CAAC,EAChC,KAAK,EACL,IAAI,EACJ,OAAO,EAAE,GAAQ,EACjB,IAAS,GACV,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC3B,gBA2CA;AAED,wBAAsB,OAAO,kBAmC5B"}

package/dist/functions.js

@@ -1,6 +1,6 @@
 import path from "node:path";
 import { existsSync, readdirSync, readFileSync, mkdirSync, writeFileSync, } from "node:fs";
-import { createHash } from "node:crypto";
+import { createHash, randomUUID } from "node:crypto";
 import { fileURLToPath } from "node:url";
 import config from "./config.js";
 import getTemplatePath from "./server/plugins/table/funcs/getTemplatePath.js";
@@ -12,11 +12,14 @@ import getMenu from "./server/routes/menu/controllers/getMenu.js";
 import getSelectVal from "./server/plugins/table/funcs/metaFormat/getSelectVal.js";
 import locales from "./server/routes/table/controllers/utils/locales.js";
 import pgClients from "./server/plugins/pg/pgClients.js";
+import { readdir } from "node:fs/promises";
+import { readFile } from "node:fs/promises";
 const { client } = pgClients;
 const rclient = getRedis();
 // core templates && cls
 const filename = fileURLToPath(import.meta.url);
 const cwd = path.dirname(filename);
+const shortId = () => randomUUID().split("-").pop() || "";
 export async function onListen1() {
     const json = await getMenu({ user: { uid: "1" }, pg: client }, null).catch(); // prevent "too many clients already" from crashing the application
     // insert interface list to db (user access management)
@@ -178,6 +181,124 @@ export async function onListen2() {
         console.trace(err);
     }
 }
+export async function onListen3() {
+    const clsQuery = [];
+    if (client && !client?.pk && client?.init) {
+        await client.init();
+    }
+    if (!client?.pk?.["admin.dictionaries"])
+        return;
+    try {
+        const dictionaries = existsSync("dictionaries")
+            ? (await readdir("dictionaries", { withFileTypes: true }))
+                .filter((el) => el.isFile() && path.extname(el.name) === ".json")
+                .map((el) => el.name)
+            : [];
+        if (!dictionaries?.length)
+            return;
+        const uniqueDictionaries = dictionaries.filter((el, idx, arr) => arr.indexOf(el) === idx);
+        const hashes = await rclient
+            .hgetall("dictionaries-insert-hashes")
+            .then((obj) => Object.keys(obj));
+        const dbdata = await client
+            .query(`select json_object_agg(code, hash) from admin.dictionaries where system is true`)
+            .then((el) => el.rows?.[0]?.json_object_agg || {});
+        const codes = Object.keys(dbdata);
+        console.log("admin/hook dictionaries promise start");
+        const qHashes = await Promise.all(uniqueDictionaries.map(async (dictFileName) => {
+            const { code, name, module: moduleName, editable, values: arr, } = JSON.parse(await readFile(`dictionaries/${dictFileName}`, "utf-8"));
+            const hash = createHash("md5")
+                .update(JSON.stringify(arr || ""))
+                .digest("hex");
+            const dbhash = dbdata[code];
+            // check for changes by redis hash / dropped from db / changed at git project
+            const update = code &&
+                (!hashes.includes(hash) || !codes.includes(code) || hash !== dbhash);
+            if (update) {
+                const id = shortId();
+                const mainArgs = [
+                    id,
+                    code,
+                    name,
+                    moduleName,
+                    "git",
+                    editable || false,
+                    true,
+                    hash,
+                ];
+                const mainQuery = `insert into admin.dictionaries(id,code,name,module,source,editable,system,hash) values($1::text,$2,$3,$4,$5,$6,$7,$8)`;
+                const itemsArgs = [];
+                const itemArgsLength = 8;
+                const itemsQuery = `insert into admin.dictionary_items(dictionary_id,code,name,icon,color,parent_id,system,sort_order) values ${arr.map((_, idx) => `(${Array.from({ length: itemArgsLength }, (_, i) => `$${itemsArgs.length + i + 1 + idx * itemArgsLength}${i <= 5 ? "::text" : ""}`).join(",")})`)}`;
+                arr.forEach((el) => {
+                    itemsArgs.push(id);
+                    itemsArgs.push(el.code);
+                    itemsArgs.push(el.name);
+                    itemsArgs.push(el.icon);
+                    itemsArgs.push(el.color);
+                    itemsArgs.push(el.parent_id);
+                    itemsArgs.push(true);
+                    itemsArgs.push(el.sort || 0);
+                });
+                if (config.trace) {
+                    console.log(code, "insert fresh dictionary");
+                }
+                return {
+                    code,
+                    update,
+                    hash,
+                    mainQuery,
+                    mainArgs,
+                    itemsQuery,
+                    itemsArgs,
+                };
+            }
+            else {
+                if (config.trace) {
+                    console.log(code, codes.includes(code)
+                        ? "skip equal hash dictionary"
+                        : "insert missing dictionary");
+                }
+                return { code, update, hash, equalHash: hashes.includes(hash) };
+            }
+        }));
+        // debug
+        const logDir = path.join(cwd, "log/migration");
+        mkdirSync(logDir, { recursive: true });
+        writeFileSync(path.join(logDir, `${path.basename(cwd)}-${client.options?.database}-dictionaries.sql`), clsQuery.filter(Boolean).join(";"));
+        writeFileSync(path.join(logDir, `${path.basename(cwd)}-${client.options?.database}-dictionaries.json`), JSON.stringify(dictionaries));
+        const updateIds = qHashes
+            .filter((el) => el.mainQuery)
+            .map((el) => el.code);
+        const rowCountItems = await client
+            .query("delete from admin.dictionary_items where dictionary_id in (select id from admin.dictionaries where system is true and code=any($1::text[]))", [updateIds])
+            .then((r) => r.rowCount || 0);
+        const rowCount = await client
+            .query("delete from admin.dictionaries where system is true and code=any($1::text[])", [updateIds])
+            .then((r) => r.rowCount || 0);
+        console.log("fastify-table/hook old dictionaries deleted", rowCount, rowCountItems);
+        if (qHashes.find((el) => el && el.mainQuery)) {
+            await Promise.all(qHashes
+                .filter((el) => el && el.mainQuery)
+                .map(async ({ hash, mainQuery, mainArgs, itemsQuery, itemsArgs, }) => {
+                await client.query(mainQuery, mainArgs);
+                await client.query(itemsQuery, itemsArgs);
+                rclient.hset("dictionaries-insert-hashes", hash, 1);
+            }));
+            logger.file("migration/hash", {
+                list: qHashes.filter(Boolean),
+                dictionaries: true,
+            });
+            console.log("fastify-table/hook dictionaries sql finish");
+        }
+        else {
+            console.log("fastify-table/hook dictionaries sql insert skipped");
+        }
+    }
+    catch (err) {
+        console.error("fastify-table/hook dictionaries sql error", err.toString());
+    }
+}
 export async function preTemplate({ name, type, user = {}, }) {
     if (!name || !type)
         return;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AA8FA,iBAAe,MAAM,CAAC,OAAO,EAAE,GAAG,iBAmPjC;;AACD,wBAEG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAgGA,iBAAe,MAAM,CAAC,OAAO,EAAE,GAAG,iBAsPjC;;AACD,wBAEG"}

package/dist/index.js

@@ -9,7 +9,7 @@ const cwd = path.dirname(filename);
 config.templates?.forEach((el) => addTemplateDir(el));
 addTemplateDir(path.join(cwd, "module/core"));
 import config from "./config.js";
-import { preForm, afterInsert, afterTable, afterTemplate, afterUpdate, preTemplate, onReady, onListen1, onListen2, } from "./functions.js";
+import { preForm, afterInsert, afterTable, afterTemplate, afterUpdate, preTemplate, onReady, onListen1, onListen2, onListen3, } from "./functions.js";
 import addHook from "./server/plugins/hook/addHook.js";
 const { maxFileSize = 512 } = config;
 const { name: execName } = path.parse(process.argv0);
@@ -56,6 +56,7 @@ import uploadChunkRoutes from "./server/routes/upload/index.js";
 import grpcRoutes from "./server/routes/grpc/index.js";
 import notificationsRoutes from "./server/routes/notifications/index.js";
 import userClsRoutes from "./server/routes/usercls/index.js";
+import dictionariesRoutes from "./server/routes/dictionaries/dictionaries.route.js";
 import apiListService from "./server/routes/util/controllers/api.list.js";
 addHook("preForm", preForm);
 addHook("afterTable", afterTable);
@@ -138,6 +139,7 @@ async function plugin(fastify) {
     });
     fastify.addHook("onListen", onListen1);
     fastify.addHook("onListen", onListen2);
+    fastify.addHook("onListen", onListen3);
     fastify.addHook("onReady", onReady);
     // core migrations (second argument for core only)
     execMigrations(path.join(cwd, "server/migrations"), pgClients.client, true).catch((err) => console.warn(err.toString()));
@@ -226,6 +228,7 @@ async function plugin(fastify) {
     // from admin
     fastify.register(notificationsRoutes, opt);
     fastify.register(userClsRoutes, opt);
+    fastify.register(dictionariesRoutes, opt);
     config.proxy?.forEach?.((el) => {
         if (execName === "bun") {
             fastify.all(`${el.source}/*`, async (req, reply) => {

package/dist/server/migrations/dictionaries.sql

@@ -0,0 +1,79 @@
+create schema if not exists admin;
+
+DO $$
+BEGIN
+    IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'dictionary_source_enum') THEN
+        CREATE TYPE admin.dictionary_source_enum AS ENUM (
+            'git',
+            'custom'
+        );
+    END IF;
+END $$;
+
+CREATE TABLE if not exists admin.dictionaries (
+    id text PRIMARY KEY DEFAULT public.next_id(),
+
+    code VARCHAR(100) NOT NULL UNIQUE,
+    name VARCHAR(255) NOT NULL,
+    module VARCHAR(50),
+    description TEXT,
+
+    source admin.dictionary_source_enum NOT NULL DEFAULT 'custom',
+    editable BOOLEAN NOT NULL DEFAULT true,
+    system BOOLEAN NOT NULL DEFAULT false,
+
+    hash text,
+
+    created_at TIMESTAMP NOT NULL DEFAULT now(),
+    updated_at TIMESTAMP NOT NULL DEFAULT now()
+);
+
+CREATE TABLE if not exists admin.dictionary_items (
+    id text PRIMARY KEY DEFAULT public.next_id(),
+
+    dictionary_id text NOT NULL REFERENCES admin.dictionaries(id) ON DELETE CASCADE,
+
+    code VARCHAR(100) NOT NULL,
+    name VARCHAR(255) NOT NULL,
+    description TEXT,
+
+    color VARCHAR(20),
+    icon VARCHAR(50),
+
+    sort_order INTEGER NOT NULL DEFAULT 0,
+
+    parent_id text,
+
+    active BOOLEAN NOT NULL DEFAULT true,
+    system BOOLEAN NOT NULL DEFAULT false,
+
+    metadata JSONB NOT NULL DEFAULT '{}'::jsonb,
+
+    created_at TIMESTAMP NOT NULL DEFAULT now(),
+    updated_at TIMESTAMP NOT NULL DEFAULT now(),
+
+    CONSTRAINT admin_dictionary_items_dictionary_code_unique
+		UNIQUE (code, dictionary_id)
+);
+
+ALTER TABLE admin.dictionary_items
+	DROP CONSTRAINT if exists admin_dictionary_items_dictionary_code_unique cascade;
+
+ALTER TABLE admin.dictionary_items
+	ADD CONSTRAINT admin_dictionary_items_dictionary_code_unique UNIQUE (code, dictionary_id);
+
+ALTER TABLE admin.dictionary_items
+	DROP CONSTRAINT if exists admin_dictionary_items_parent_same_dictionary_fk;
+
+ALTER TABLE admin.dictionary_items
+	ADD CONSTRAINT admin_dictionary_items_parent_same_dictionary_fk FOREIGN KEY (parent_id, dictionary_id)
+	REFERENCES admin.dictionary_items (code, dictionary_id)
+	ON DELETE SET NULL;
+
+CREATE INDEX if not exists admin_dictionary_items_dictionary_id_idx ON admin.dictionary_items (dictionary_id);
+
+CREATE INDEX if not exists admin_dictionary_items_parent_id_idx ON admin.dictionary_items (parent_id);
+
+CREATE INDEX if not exists admin_dictionary_items_sort_order_idx ON admin.dictionary_items (dictionary_id, sort_order);
+
+CREATE INDEX if not exists admin_dictionary_items_active_idx ON admin.dictionary_items (dictionary_id, active);

package/dist/server/plugins/crud/funcs/dataDelete.d.ts

@@ -1,5 +1,5 @@
 import type { ExtendedPG } from "../../../types/core.js";
-export default function dataDelete({ table: table1, tokenData, referer, id, pg: pg1, uid, query, }: {
+export default function dataDelete({ table: table1, tokenData, referer, id, pg: pg1, uid, query, args, }: {
     table: string;
     tokenData?: Record<string, any>;
     referer?: string;
@@ -7,5 +7,6 @@ export default function dataDelete({ table: table1, tokenData, referer, id, pg:
     pg?: ExtendedPG;
     uid: string | number;
     query?: string;
+    args?: any[];
 }): Promise<any>;
 //# sourceMappingURL=dataDelete.d.ts.map

package/dist/server/plugins/crud/funcs/dataDelete.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataDelete.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/dataDelete.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAezD,wBAA8B,UAAU,CAAC,EACvC,KAAK,EAAE,MAAM,EACb,SAAS,EACT,OAAO,EACP,EAAE,EACF,EAAE,EAAE,GAAG,EACP,GAAG,EACH,KAAK,GACN,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,gBA+FA"}
+{"version":3,"file":"dataDelete.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/dataDelete.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAezD,wBAA8B,UAAU,CAAC,EACvC,KAAK,EAAE,MAAM,EACb,SAAS,EACT,OAAO,EACP,EAAE,EACF,EAAE,EAAE,GAAG,EACP,GAAG,EACH,KAAK,EACL,IAAI,GACL,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;CACd,gBA+FA"}

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

@@ -7,7 +7,7 @@ import extraData from "../../extra/extraData.js";
 import logChanges from "./utils/logChanges.js";
 import logger from "../../logger/getLogger.js";
 const rclient = getRedis();
-export default async function dataDelete({ table: table1, tokenData, referer, id, pg: pg1, uid, query, }) {
+export default async function dataDelete({ table: table1, tokenData, referer, id, pg: pg1, uid, query, args, }) {
     const pg = pg1 || getPG({ name: "client" });
     if (!pg)
         return null;
@@ -47,7 +47,7 @@ export default async function dataDelete({ table: table1, tokenData, referer, id
             row,
         }, client);
         const res = await client
-            .query(delQuery, [id])
+            .query(delQuery, [id].concat(args || []))
             .then((el) => (el.rows?.[0] ? { rowCount: 1, ...el.rows[0] } : {}));
         await logChanges({
             pg: client,

package/dist/server/plugins/file/utils/inspectContent.d.ts

@@ -1,4 +1,4 @@
-export default function inspectContent(buffer: Buffer, expectedExtension: string): Promise<{
+export default function inspectContent(input: Buffer | ReadableStream, expectedExtension: string): Promise<{
     ext: any;
     mime: any;
     isValid: boolean;

package/dist/server/plugins/file/utils/inspectContent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inspectContent.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/file/utils/inspectContent.ts"],"names":[],"mappings":"AA+CA,wBAA8B,cAAc,CAC1C,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,MAAM;;;;GAgD1B"}
+{"version":3,"file":"inspectContent.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/file/utils/inspectContent.ts"],"names":[],"mappings":"AAkDA,wBAA8B,cAAc,CAC1C,KAAK,EAAE,MAAM,GAAG,cAAc,EAC9B,iBAAiB,EAAE,MAAM;;;;GAoE1B"}

package/dist/server/plugins/file/utils/inspectContent.js

@@ -1,4 +1,4 @@
-import { fileTypeFromBuffer } from "file-type";
+import { fileTypeFromBuffer, fileTypeFromStream } from "file-type";
 import { BadRequestError } from "../../../../errors.js";
 import applyHook from "../../hook/applyHook.js";
 // Office 97–2003 (.doc/.xls/.ppt) share CFB magic; file-type reports them as "cfb"
@@ -38,24 +38,40 @@ const handlers = {
         }
     },
 };
-export default async function inspectContent(buffer, expectedExtension) {
+const isReadableStream = (stream) => stream && stream instanceof ReadableStream;
+export default async function inspectContent(input, expectedExtension) {
     if (!expectedExtension) {
-        throw new BadRequestError("not enough params: expectedExtension");
+        throw new Error("not enough params: expectedExtension");
     }
-    if (!Buffer.isBuffer(buffer) || !buffer.length) {
-        throw new BadRequestError("Invalid buffer");
+    const buffer = Buffer.isBuffer(input) ? input : undefined;
+    const stream = !buffer ? input : undefined;
+    if (buffer && !buffer.length) {
+        throw BadRequestError("Invalid buffer");
+    }
+    if (stream && !isReadableStream(stream)) {
+        throw BadRequestError("invalid params: input");
+    }
+    if (!buffer && !stream) {
+        throw new Error("not enough params: input");
     }
     // custom inspection of extensions like kml, svg etc
     const hookData = (await applyHook("onInspectContent", {
         buffer,
+        stream,
         expectedExtension,
     }));
     if (hookData) {
         return hookData;
     }
-    const { ext, mime } = (await fileTypeFromBuffer(buffer)) || {};
+    const inspectResult1 = buffer
+        ? await fileTypeFromBuffer(buffer)
+        : stream
+            ? await fileTypeFromStream(stream)
+            : undefined;
+    const inspectResult2 = stream ? await fileTypeFromStream(stream) : undefined;
+    const { ext, mime } = inspectResult1 || inspectResult2 || {};
     // ? geojson, signed pdf, kml, svg etc - not recognized - inspecting the content
-    if (!ext && handlers[expectedExtension]) {
+    if (!ext && handlers[expectedExtension] && buffer) {
         const { ext: ext2, mime: mime2 } = (await handlers[expectedExtension](buffer)) || {};
         return { ext: ext2, mime: mime2, isValid: ext2 === expectedExtension };
     }

package/dist/server/plugins/policy/funcs/checkXSS.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"checkXSS.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/policy/funcs/checkXSS.ts"],"names":[],"mappings":"AAGA,iBAAS,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAW,EAAE,EAAE,GAAG;;;;;;EAyD3C;AAED,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"checkXSS.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/policy/funcs/checkXSS.ts"],"names":[],"mappings":"AAGA,iBAAS,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAW,EAAE,EAAE,GAAG;;;;;;EA0D3C;AAED,eAAe,QAAQ,CAAC"}

package/dist/server/plugins/policy/funcs/checkXSS.js

@@ -14,6 +14,7 @@ function checkXSS({ body, schema = {} }) {
         "Tiny",
         "Ace",
         "Texteditor",
+        "RichText",
     ];
     Object.keys(body)
         .filter((key) => ["<", ">"].find((el) => body[key]?.includes?.(el)) &&

package/dist/server/plugins/upload/s3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"s3.d.ts","sourceRoot":"","sources":["../../../../server/plugins/upload/s3.ts"],"names":[],"mappings":"AAiGA,wBAAsB,sBAAsB,CAAC,EAAE,MAAW,iBAwCzD;AAED,wBAAsB,cAAc,CAClC,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,GAAG,EACT,GAAG,SAAqB,iBAazB;AAED,wBAAsB,gBAAgB,CACpC,EAAE,EAAE,MAAM,EACV,GAAG,SAAqB,EACxB,EAAE,MAAW,iBAsBd;AAED,wBAAsB,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,iBA2B9D;AAED,wBAAsB,aAAa,CAAC,EAAE,EAAE,MAAM,gBAQ7C;AAED,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,MAAM,gBAMrD;AAED,wBAAsB,mBAAmB,CAAC,EAAE,MAAW,iBAyEtD;AAED,wBAAsB,UAAU,CAAC,EAAE,EAAE,EAAE,EAAE;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,EAAE,EAAE,MAAW;;;;;;;;GAsCrE;AAKD,wBAAsB,WAAW,CAC/B,EACE,MAAM,EACN,GAAG,EACH,WAAW,EACX,QAAQ,GACT,EAAE;IACD,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;CAClB,EACD,EAAE,MAAW;;;;;;;;;;;;;;;;GAsDd;AASD,wBAAsB,QAAQ,CAC5B,EAAE,EAAE,MAAM,EACV,IAAI,EAAE;IACJ,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB,iBAwBF;AAED,wBAAsB,cAAc,CAAC,EAAE,EAAE,MAAM,kBAY9C;AAED,wBAAsB,iBAAiB,CAAC,EAAE,EAAE,MAAM,iBAQjD;AAED,wBAAsB,WAAW,CAC/B,EACE,EAAE,EACF,KAAK,EACL,UAAU,GACX,EAAE;IACD,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,GAAG,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;CACpB,EACD,EAAE,MAAW;;;;;;;;GA+Bd;AAED,wBAAsB,YAAY,CAChC,EACE,EAAE,GACH,EAAE;IACD,EAAE,EAAE,MAAM,CAAC;CACZ,EACD,EAAE,MAAW;;;;GA2Cd;AAED,wBAAsB,WAAW,CAC/B,EACE,EAAE,GACH,EAAE;IACD,EAAE,EAAE,MAAM,CAAC;CACZ,EACD,EAAE,MAAW;;GAwBd;AAED,wBAAsB,eAAe,CACnC,EACE,EAAE,EACF,GAAG,EACH,MAAM,GACP,EAAE;IACD,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,EACD,EAAE,MAAW;;;;;;;;;;;;;;GAqEd"}
+{"version":3,"file":"s3.d.ts","sourceRoot":"","sources":["../../../../server/plugins/upload/s3.ts"],"names":[],"mappings":"AAmGA,wBAAsB,sBAAsB,CAAC,EAAE,MAAW,iBAwCzD;AAED,wBAAsB,cAAc,CAClC,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,GAAG,EACT,GAAG,SAAqB,iBAazB;AAED,wBAAsB,gBAAgB,CACpC,EAAE,EAAE,MAAM,EACV,GAAG,SAAqB,EACxB,EAAE,MAAW,iBAsBd;AAED,wBAAsB,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,iBA2B9D;AAED,wBAAsB,aAAa,CAAC,EAAE,EAAE,MAAM,gBAQ7C;AAED,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,MAAM,gBAMrD;AAED,wBAAsB,mBAAmB,CAAC,EAAE,MAAW,iBAyEtD;AAED,wBAAsB,UAAU,CAAC,EAAE,EAAE,EAAE,EAAE;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,EAAE,EAAE,MAAW;;;;;;;;GAsCrE;AAKD,wBAAsB,WAAW,CAC/B,EACE,MAAM,EACN,GAAG,EACH,WAAW,EACX,QAAQ,GACT,EAAE;IACD,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;CAClB,EACD,EAAE,MAAW;;;;;;;;;;;;;;;;GAsDd;AASD,wBAAsB,QAAQ,CAC5B,EAAE,EAAE,MAAM,EACV,IAAI,EAAE;IACJ,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB,iBAwBF;AAED,wBAAsB,cAAc,CAAC,EAAE,EAAE,MAAM,kBAY9C;AAED,wBAAsB,iBAAiB,CAAC,EAAE,EAAE,MAAM,iBAQjD;AAED,wBAAsB,WAAW,CAC/B,EACE,EAAE,EACF,KAAK,EACL,UAAU,GACX,EAAE;IACD,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,GAAG,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;CACpB,EACD,EAAE,MAAW;;;;;;;;GAyCd;AAED,wBAAsB,YAAY,CAChC,EACE,EAAE,GACH,EAAE;IACD,EAAE,EAAE,MAAM,CAAC;CACZ,EACD,EAAE,MAAW;;;;GA2Cd;AAED,wBAAsB,WAAW,CAC/B,EACE,EAAE,GACH,EAAE;IACD,EAAE,EAAE,MAAM,CAAC;CACZ,EACD,EAAE,MAAW;;GAwBd;AAED,wBAAsB,eAAe,CACnC,EACE,EAAE,EACF,GAAG,EACH,MAAM,GACP,EAAE;IACD,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,EACD,EAAE,MAAW;;;;;;;;;;;;;;GAqEd"}

package/dist/server/plugins/upload/s3.js

@@ -4,6 +4,8 @@ import config from "../../../config.js";
 import s3Client from "../file/providers/s3/client.js";
 import rclient from "../redis/client.js";
 import logger from "../logger/getLogger.js";
+import inspectContent from "../file/utils/inspectContent.js";
+import { ConflictError } from "../../../errors.js";
 const uploads = new Map();
 const resumableUploads = new Map();
 // non-redis upload timeout handlers
@@ -339,6 +341,12 @@ export async function uploadChunk({ id, chunk, partNumber, }, s3 = s3Client) {
     if (upload.parts.some((p) => p.PartNumber === partNumber)) {
         throw new Error(`Part ${partNumber} already uploaded`);
     }
+    if (partNumber === 1) {
+        const { isValid } = await inspectContent(chunk, path.extname(upload.Key).substring(1));
+        if (!isValid) {
+            throw ConflictError("file type spoofing attempt detected");
+        }
+    }
     const res = await s3.send(new UploadPartCommand({
         Bucket: upload.Bucket,
         Key: upload.Key,

package/dist/server/routes/crud/controllers/insert.d.ts

@@ -1,3 +1,2 @@
-import { type FastifyReply } from "fastify";
-export default function insert(req: any, reply: FastifyReply): Promise<any>;
+export default function insert(req: any): Promise<any>;
 //# sourceMappingURL=insert.d.ts.map

package/dist/server/routes/crud/controllers/insert.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/insert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAqB5C,wBAA8B,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,gBAgMjE"}
+{"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/insert.ts"],"names":[],"mappings":"AAqBA,wBAA8B,MAAM,CAAC,GAAG,EAAE,GAAG,gBAgM5C"}

package/dist/server/routes/crud/controllers/insert.js

@@ -10,7 +10,7 @@ import getToken from "../../../plugins/crud/funcs/getToken.js";
 import getTemplate from "../../../plugins/table/funcs/getTemplate.js";
 import { resources } from "../../../plugins/access/funcs/getResources.js";
 import { BadRequestError, ConflictError, ForbiddenError, NotFoundError, } from "../../../../errors.js";
-export default async function insert(req, reply) {
+export default async function insert(req) {
     const { pg = pgClients.client, user = {}, params = {}, body = {}, headers = {}, method, } = req || {};
     if (!user) {
         throw ForbiddenError("access restricted");

package/dist/server/routes/crud/controllers/update.js

@@ -76,7 +76,7 @@ export default async function update(req, reply) {
         throw BadRequestError("table is required");
     }
     if (!id && tokenData?.table) {
-        return insert(req, reply);
+        return insert(req);
     }
     if (!id) {
         throw BadRequestError("id is required");

package/dist/server/routes/dictionaries/dictionaries.route.d.ts

@@ -0,0 +1,2 @@
+export default function route(app: any): void;
+//# sourceMappingURL=dictionaries.route.d.ts.map

package/dist/server/routes/dictionaries/dictionaries.route.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dictionaries.route.d.ts","sourceRoot":"","sources":["../../../../server/routes/dictionaries/dictionaries.route.ts"],"names":[],"mappings":"AAoBA,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,GAAG,EAAE,GAAG,QAmJrC"}

package/dist/server/routes/dictionaries/dictionaries.route.js

@@ -0,0 +1,134 @@
+import readDictionaries from "./functions/read.dictionaries.js";
+import createDictionary from "./functions/create.dictionary.js";
+import updateDictionary from "./functions/update.dictionary.js";
+import deleteDictionary from "./functions/delete.dictionary.js";
+import createDictionaryItem from "./functions/create.dictionary.item.js";
+import updateDictionaryItem from "./functions/update.dictionary.item.js";
+import deleteDictionaryItem from "./functions/delete.dictionary.item.js";
+import { dictionaryParamsSchema, createDictionaryBodySchema, createDictionaryItemBodySchema, updateDictionaryBodySchema, updateDictionaryItemBodySchema, } from "./dictionaries.schema.js";
+const tags = ["core", "dictionaries"];
+const packageName = "fastify-table";
+export default function route(app) {
+    app.route({
+        method: "GET",
+        url: "/dictionaries/:code?",
+        config: { tags, package: packageName, policy: "L0" },
+        schema: { params: dictionaryParamsSchema },
+        handler: async ({ params, pg }) => {
+            const result = await readDictionaries({
+                code: params.code,
+            }, pg);
+            return result;
+        },
+    });
+    app.route({
+        method: "GET",
+        url: "/dictionaries/:code/values",
+        config: { tags, package: packageName, policy: "L0" },
+        schema: { params: dictionaryParamsSchema },
+        handler: async ({ params, pg }) => {
+            const result = await readDictionaries({
+                code: params.code,
+                values: true,
+            }, pg);
+            return result;
+        },
+    });
+    app.route({
+        method: "POST",
+        url: "/dictionaries/:id?",
+        config: { tags, package: packageName, policy: "L1" },
+        schema: {
+            params: dictionaryParamsSchema,
+            body: createDictionaryBodySchema,
+        },
+        handler: async ({ params, body, user, pg }) => {
+            const result = await createDictionary({
+                id: params.id,
+                body,
+                uid: user?.uid,
+            }, pg);
+            return result;
+        },
+    });
+    app.route({
+        method: "PUT",
+        url: "/dictionaries/:id",
+        config: { tags, package: packageName, policy: "L1" },
+        schema: {
+            params: dictionaryParamsSchema,
+            body: updateDictionaryBodySchema,
+        },
+        handler: async ({ params, user, body, pg }) => {
+            const result = await updateDictionary({
+                id: params.id,
+                body,
+                uid: user?.uid,
+            }, pg);
+            return result;
+        },
+    });
+    app.route({
+        method: "DELETE",
+        url: "/dictionaries/:id",
+        config: { tags, package: packageName, policy: "L1" },
+        schema: { params: dictionaryParamsSchema },
+        handler: async ({ params, user, pg }) => {
+            const result = await deleteDictionary({
+                id: params.id,
+                uid: user?.uid,
+            }, pg);
+            return result;
+        },
+    });
+    app.route({
+        method: "POST",
+        url: "/dictionaries/:code/values/:id?",
+        config: { tags, package: packageName, policy: "L1" },
+        schema: {
+            params: dictionaryParamsSchema,
+            body: createDictionaryItemBodySchema,
+        },
+        handler: async ({ params, body, user, pg }) => {
+            const result = await createDictionaryItem({
+                id: params.id,
+                code: params.code,
+                body,
+                uid: user?.uid,
+            }, pg);
+            return result;
+        },
+    });
+    app.route({
+        method: "PUT",
+        url: "/dictionaries/:code/values/:id",
+        config: { tags, package: packageName, policy: "L1" },
+        schema: {
+            params: dictionaryParamsSchema,
+            body: updateDictionaryItemBodySchema,
+        },
+        handler: async ({ params, body, user, pg }) => {
+            const result = await updateDictionaryItem({
+                id: params.id,
+                code: params.code,
+                body,
+                uid: user?.uid,
+            }, pg);
+            return result;
+        },
+    });
+    app.route({
+        method: "DELETE",
+        url: "/dictionaries/:code/values/:id",
+        config: { tags, package: packageName, policy: "L1" },
+        schema: { params: dictionaryParamsSchema },
+        handler: async ({ params, user, pg }) => {
+            const result = await deleteDictionaryItem({
+                id: params.id,
+                code: params.code,
+                uid: user?.uid,
+            }, pg);
+            return result;
+        },
+    });
+}