@opengis/fastify-table 2.0.105 → 2.0.107

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../config.ts"],"names":[],"mappings":"AAWA,QAAA,MAAM,MAAM,KAA8D,CAAC;AAoC3E,eAAe,MAAM,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../config.ts"],"names":[],"mappings":"AAWA,QAAA,MAAM,MAAM,KAA8D,CAAC;AAqC3E,eAAe,MAAM,CAAC"}

package/dist/script/adduser

@@ -0,0 +1,15 @@
+#!/bin/bash
+rootDir=`echo $(dirname "$0")`
+echo "$rootDir/passwd"
+
+if [ -e "$rootDir/../passwd" ]
+then
+    password=`echo -n "$2" | sha1sum | awk '{print $1}'`
+    echo "$1:$password"
+    echo "$1:$password" >> "$rootDir/../passwd"
+else
+    > passwd
+    password=`echo -n "$2" | sha1sum | awk '{print $1}'`
+    echo "$1:$password"
+    echo "$1:$password" > "$rootDir/../passwd"
+fi

package/dist/script/dump.js

@@ -0,0 +1,176 @@
+// Вигрузка схеми бд
+// Usage examples:
+// bun .\script\dump.js --table=bpmn.tasks
+// bun .\script\dump.js --schema=bpmn
+
+import path from 'node:path';
+import { existsSync } from 'node:fs';
+import { mkdir, writeFile, rm, rmdir, stat } from 'node:fs/promises';
+
+import { config, handlebars, pgClients, getTemplate } from '../utils.js';
+
+import { build, teardown } from '../helper.js';
+
+const app = build();
+app.addHook('onClose', async () => teardown());
+dumpMigrateSQL();
+// app.close();
+
+const debug = false;
+
+export default async function dumpMigrateSQL() {
+    try {
+        // const { database, host, port, user, password } = config.pg;
+
+        if (!config.pg) {
+            console.error('empty config.pg, skip...');
+            return null;
+        }
+
+        if (!Bun.argv[2]) {
+            console.error('missing schema / table name, skip...');
+        }
+
+        const [key, value] = Bun.argv[2].substring(2).split('=');
+        const tableName = key === 'table' ? value : null;
+        const schemaName = key === 'schema' ? value : value.split('.').shift();
+
+        const pg = pgClients.client;
+        // const pg = await getPGAsync({ database, host, port, user, password });
+        await pg.query(`select 1`);
+
+        const schemaExists = await pg.query(`SELECT 1 FROM information_schema.schemata WHERE schema_name = $1`, [schemaName]).then(el => el.rowCount);
+
+        if (!schemaExists) {
+            console.error('Вказаної схеми не існує', config.pg?.database);
+            return null;
+        }
+
+        // if (tableName && !pg.pk?.[tableName]) {
+        //     console.error('Вказаної таблиці не існує', config.pg?.database);
+        //     return null;
+        // }
+
+        const dump = await schemaItem({
+            pg,
+            table: tableName,
+            schema: schemaName,
+            debug,
+            is_erd: false
+        });
+
+        if (debug) {
+            console.log(dump);
+            return null;
+        }
+
+        const filepath = await saveFile(dump, tableName || schemaName);
+        console.log('sucess', filepath);
+    } catch (err) {
+        console.error(err);
+    } finally {
+        app.close();
+    }
+}
+
+async function saveFile(data, filename) {
+    if (!data) throw new Error(`no data - ${filename}`);
+
+    const filepath = path.join('log/dump', `${filename}.sql`);
+    const fileExists = existsSync(filepath);
+
+    // overwrite old file
+    if (fileExists) {
+        const stats = await stat(filepath);
+        if (stats.isDirectory()) {
+            await rmdir(filepath, { force: true, recursive: true });
+        } else {
+            await rm(filepath)
+        }
+    }
+
+    await mkdir(path.dirname(filepath), { recursive: true });
+    await writeFile(filepath, Buffer.from(data, 'utf-8'));
+
+    return filepath;
+}
+
+async function schemaItem({
+    pg, table, schema, debug
+}) {
+    if (!schema && !table) return new Error('param schema is required');
+
+    const { rows: schemaInfo } = await pg.query(`select c.oid,relname,nspname,obj_description(c.oid) as description,
+    (
+      select json_agg(row_to_json(q))
+      from (
+        select
+          column_name,
+          case 
+            when data_type='USER-DEFINED' AND udt_name='geometry' THEN 'geometry' 
+            when data_type='ARRAY' AND udt_name='_text'  THEN 'text[]' 
+            when data_type='ARRAY' AND udt_name='_int4'  THEN 'integer[]' 
+            else data_type 
+          end as data_type,
+          ordinal_position,
+          column_default,
+          is_nullable,
+          case 
+            when column_name='uid' then 'ідентифікатор автора запису в БД'
+            when column_name='cdate' then 'Дата створення запису в БД'
+            when column_name='editor_id' then 'Ідентифікатор автора, який останій вніс зміни в запис'
+            when column_name='editor_date' then 'Час останії зміни в записі'
+            when column_name='files' then 'Системна колонка'
+            when column_name='doc_status' then 'Статус документа'
+            when column_name='reg_status' then 'Статус реєстрації'
+            when column_name='obj_version' then 'Версія запису'
+          else col_description(a.attrelid,ordinal_position) 
+          end as description
+        from information_schema.columns col
+        LEFT JOIN pg_attribute a ON col.column_name=a.attname and c.oid = a.attrelid
+        where col.table_schema=nspname and col.table_name=relname
+      )q
+    ) as columns
+    from pg_class c
+    LEFT JOIN pg_namespace n ON n.oid = c.relnamespace
+    where ${table ? `nspname||'.'||relname='${table}'` : `'${schema}'=nspname`} and relam=2
+    order by nspname,relname`);
+
+    if (!schemaInfo?.length) throw new Error('invalid params');
+
+    const { rows: constraints } = await pg.query(`select con.conrelid::regclass as constraint_table, a.column_name,
+    con.conname as constraint_name,contype as constraint_type, con.confrelid::regclass as foreign_table, 
+    con.confupdtype, con.confdeltype, con.confmatchtype, u.column_name as foreign_column from pg_constraint con
+    left join pg_class c ON c.oid = con.conrelid              
+    left join pg_namespace n ON n.oid = c.relnamespace
+    left join lateral (
+      select string_agg(a.attname,',') as column_name from pg_attribute a 
+        where con.conrelid = a.attrelid and a.attnum = any(con.conkey) limit 1
+    )a on 1=1
+    left join lateral (
+      select column_name from information_schema.constraint_column_usage u 
+        where conname=u.constraint_name limit 1
+    )u on 1=1
+    where ${table ? `conrelid::regclass::text = '${table}'` : `nspname = '${schema}'`}`);
+
+    // add table constraints, mermaid
+    schemaInfo?.forEach((row) => {
+        // constraint type to column
+        row?.columns?.forEach((col) => {
+            const { constraint_type } = constraints?.find((con) => con?.column_name === col?.column_name && con.constraint_table === `${row.nspname}.${row.relname}`) || {};
+            Object.assign(col, { constraint_type });
+        });
+
+        // table relations
+        const tableConstraints = constraints?.filter((el) => el?.constraint_table === `${row.nspname}.${row.relname}`);
+        Object.assign(row, { constraints: tableConstraints });
+    });
+
+    if (debug) return schemaInfo;
+
+    const body = await getTemplate('pt', 'schemaItem.pt');
+
+    const schemaContent = await handlebars.compile(body?.hbs || 'template not found: schemaItem.pt')({ nspname: schema, rows: schemaInfo, constraints });
+
+    return schemaContent.replace(/'/g, "'");
+}

package/dist/script/migrate.js

@@ -0,0 +1,25 @@
+import Fastify from 'fastify';
+
+import config from '../config.js';
+import plugin from '../index.js';
+
+const timeoutMs = +(config.migrationTimeout || 5000);
+
+process.env.PORT = process.env.PORT || config.port || 3000;
+
+const app = Fastify();
+
+app.register(plugin, config);
+
+app.listen({ host: '0.0.0.0', port: process.env.PORT }, (err) => {
+    console.log(`Server started via port: ${process.env.PORT}`);
+    setTimeout(() => {
+        console.log('Server closed after timeout', timeoutMs);
+        app.close();
+        process.exit(0);
+    }, timeoutMs);
+    if (err) {
+        console.error('migrations error', err.toString());
+        process.exit(1);
+    }
+});

package/dist/server/migrations/users.sql

@@ -35,7 +35,7 @@ ALTER TABLE admin.users add CONSTRAINT admin_user_user_rnokpp UNIQUE (user_rnokp
 
 -- update admin.users set user_type='regular' where user_type not in ('viewer', 'regular','admin','superadmin');
 -- ALTER TABLE admin.users add constraint admin_user_type_check CHECK (user_type=any(array['viewer', 'regular','admin','superadmin']));
-insert into admin.users (uid,login,password,user_type,enabled)values('viewer','viewer','viewer','viewer', false) on conflict (uid) do update set enabled=excluded.enabled;
+insert into admin.users (uid,login,sur_name,password,user_type,enabled)values('viewer','viewer','viewer','viewer','viewer', false) on conflict (uid) do update set enabled=excluded.enabled, sur_name=excluded.sur_name;
 -- update admin.users set enabled=true where uid='viewer';
 
 COMMENT ON TABLE admin.users IS 'Користувачі';

package/dist/server/plugins/auth/funcs/verifyPassword.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"verifyPassword.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/auth/funcs/verifyPassword.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAWpD,wBAA8B,cAAc,CAAC,EAC3C,EAAE,EACF,QAAQ,EACR,QAAQ,GACT,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;;;;;;eA+BA"}
+{"version":3,"file":"verifyPassword.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/auth/funcs/verifyPassword.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAWpD,wBAA8B,cAAc,CAAC,EAC3C,EAAE,EACF,QAAQ,EACR,QAAQ,GACT,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;;;;;;eAiCA"}

package/dist/server/plugins/auth/funcs/verifyPassword.js

@@ -12,7 +12,9 @@ export default async function verifyPassword({ pg, username, password, }) {
     if (!password || password === "")
         return { message: "not enough params: password" };
     const query = "select * from admin.users where $1 in (login,email,phone) and enabled limit 1";
-    const json = await pg.query(query, [username]).then((res) => res.rows[0]);
+    const json = await pg
+        .query(query, [username])
+        .then((el) => el.rows?.[0] || {});
     if (!json)
         return { message: "user not found" };
     let hash = "";

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"dataUpdate.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/dataUpdate.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAepD,wBAA8B,UAAU,CAAC,EACvC,KAAK,EACL,SAAS,EACT,OAAO,EACP,EAAE,EACF,IAAI,EACJ,EAAE,EAAE,GAAG,EACP,GAAG,GACJ,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,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,gBA4OA"}
+{"version":3,"file":"dataUpdate.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/dataUpdate.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAepD,wBAA8B,UAAU,CAAC,EACvC,KAAK,EACL,SAAS,EACT,OAAO,EACP,EAAE,EACF,IAAI,EACJ,EAAE,EAAE,GAAG,EACP,GAAG,GACJ,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,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,gBAkPA"}

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

@@ -20,11 +20,13 @@ function assignValue(key, i, srid = 4326, columnType = "text") {
     return `"${key}"=$${i + 2}`;
 }
 export default async function dataUpdate({ table, tokenData, referer, id, data, pg: pg1, uid, }) {
-    if (!data || !table || !id)
+    if (!data || !table || !id) {
         return null;
+    }
     const pg = pg1 || getPG({ name: "client" });
-    if (!pg)
+    if (!pg) {
         return null;
+    }
     // pg client single transaction support
     if (!pg?.pk && config.pg) {
         pg.options = pgClients.client?.options;
@@ -34,8 +36,9 @@ export default async function dataUpdate({ table, tokenData, referer, id, data,
         pg.pk = pgClients.client?.pk;
     }
     const { columns, pk } = await getMeta({ pg, table });
-    if (!columns)
+    if (!columns) {
         return null;
+    }
     const names = columns.map((el) => el.name);
     const types = columns.reduce((acc, { name, dataTypeID }) => ({
         ...acc,
@@ -167,7 +170,7 @@ export default async function dataUpdate({ table, tokenData, referer, id, data,
             uid,
             type: "UPDATE",
         });
-        if (config.redis) {
+        if (config.redis && rclient?.status !== "end") {
             rclient.incr(`pg:${table}:crud`);
         }
         if (!isClient) {

package/dist/server/plugins/file/providers/s3/client.d.ts

@@ -1,5 +1,13 @@
-declare const _default: {
-    getS3Client: ({ accessKeyId, secretAccessKey, user, password, endpoint, host, region, }: any) => any;
-};
-export default _default;
+declare const getS3Client: ({ accessKeyId: accessKeyId1, secretAccessKey: secretAccessKey1, user, password, endpoint: endpoint1, host, region, }?: {
+    accessKeyId?: string;
+    secretAccessKey?: string;
+    user?: string;
+    password?: string;
+    endpoint?: string;
+    host?: string;
+    region: string;
+}) => any;
+declare const s3Client: any;
+export { getS3Client, s3Client };
+export default s3Client;
 //# sourceMappingURL=client.d.ts.map

package/dist/server/plugins/file/providers/s3/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/file/providers/s3/client.ts"],"names":[],"mappings":";6FAkBG,GAAG;;AAsBN,wBAA+B"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/file/providers/s3/client.ts"],"names":[],"mappings":"AAQA,QAAA,MAAM,WAAW,GACf,uHAQG;IACD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CACE,QA+BpB,CAAC;AAEF,QAAA,MAAM,QAAQ,KAAgB,CAAC;AAE/B,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC;AAEjC,eAAe,QAAQ,CAAC"}

package/dist/server/plugins/file/providers/s3/client.js

@@ -1,26 +1,32 @@
 import { S3Client } from "@aws-sdk/client-s3";
 import { createHash } from "crypto";
-function md5(string) {
-    return createHash("md5").update(string).digest("hex");
-}
+import config from "../.../../../../../../config.js";
 const CLIENT_CACHE = {};
-const getS3Client = ({ accessKeyId, secretAccessKey, user, password, endpoint, host, region = "us-west-2", }) => {
-    // md5 have a hign chance of collisions consider switching on highload
-    // if (!accessKeyId || !secretAccessKey || !endpoint) throw new Error('No required params');
-    const uniqueKey = md5(`${accessKeyId}${secretAccessKey}${endpoint}`);
-    let client = CLIENT_CACHE[uniqueKey];
-    if (client)
-        return client;
-    client = new S3Client({
+const getS3Client = ({ accessKeyId: accessKeyId1, secretAccessKey: secretAccessKey1, user, password, endpoint: endpoint1, host, region = "us-west-2", } = config.s3 || {}) => {
+    const accessKeyId = accessKeyId1 || user;
+    const endpoint = endpoint1 || host;
+    const secretAccessKey = secretAccessKey1 || password;
+    if (!accessKeyId || !secretAccessKey || !endpoint) {
+        return null;
+    }
+    const uniqueKey = createHash("md5")
+        .update(`${accessKeyId}${secretAccessKey}${endpoint}`)
+        .digest("hex");
+    if (CLIENT_CACHE[uniqueKey]) {
+        return CLIENT_CACHE[uniqueKey];
+    }
+    const client = new S3Client({
         credentials: {
-            accessKeyId: accessKeyId || user,
-            secretAccessKey: secretAccessKey || password,
+            accessKeyId,
+            secretAccessKey,
         },
-        endpoint: endpoint || host,
+        endpoint,
         forcePathStyle: true,
         region,
     });
     CLIENT_CACHE[uniqueKey] = client;
     return client;
 };
-export default { getS3Client };
+const s3Client = getS3Client();
+export { getS3Client, s3Client };
+export default s3Client;

package/dist/server/plugins/file/providers/s3/funcs/downloadFile.d.ts

@@ -1,3 +1,3 @@
-declare const getFileStream: (s3Settings: Record<string, any>) => (fp: string, options?: Record<string, any>) => Promise<any>;
+declare const getFileStream: (s3Settings?: Record<string, any>) => (fp: string, options?: Record<string, any>) => Promise<any>;
 export default getFileStream;
 //# sourceMappingURL=downloadFile.d.ts.map

package/dist/server/plugins/file/providers/s3/funcs/downloadFile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"downloadFile.d.ts","sourceRoot":"","sources":["../../../../../../../server/plugins/file/providers/s3/funcs/downloadFile.ts"],"names":[],"mappings":"AAeA,QAAA,MAAM,aAAa,GAChB,YAAY,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,MACzB,IAAI,MAAM,EAAE,UAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,iBAoCnD,CAAC;AAEJ,eAAe,aAAa,CAAC"}
+{"version":3,"file":"downloadFile.d.ts","sourceRoot":"","sources":["../../../../../../../server/plugins/file/providers/s3/funcs/downloadFile.ts"],"names":[],"mappings":"AAgBA,QAAA,MAAM,aAAa,GAChB,aAAa,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,MAC1B,IAAI,MAAM,EAAE,UAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,iBA2CnD,CAAC;AAEJ,eAAe,aAAa,CAAC"}

package/dist/server/plugins/file/providers/s3/funcs/downloadFile.js

@@ -1,7 +1,8 @@
 import { GetObjectCommand } from "@aws-sdk/client-s3";
 import { readFile } from "node:fs/promises";
 import { createReadStream } from "node:fs";
-import client from "../client.js";
+import s3Client from "../client.js";
+import config from "../../../../../../config.js";
 import streamToBuffer from "../../utils/streamToBuffer.js";
 // if not found on s3 => fs
 import fsFuncs from "../../fs.js";
@@ -9,11 +10,11 @@ import getPath from "../../../utils/getPath.js";
 import getS3FilePath from "./utils/getS3FilePath.js";
 const getFileStream = (s3Settings) => async (fp, options = {}) => {
     const filepath = getS3FilePath(fp, s3Settings);
-    const s3Client = client.getS3Client(s3Settings);
-    const bucketName = s3Settings.containerName;
     const bucketParams = {
-        Bucket: bucketName,
+        Bucket: (s3Settings || config.s3 || { containerName: "work" })
+            .containerName,
         Key: filepath[0] === "/" ? filepath?.slice(1) : filepath,
+        Range: options.Range,
     };
     try {
         const data = await s3Client.send(new GetObjectCommand(bucketParams));
@@ -23,6 +24,10 @@ const getFileStream = (s3Settings) => async (fp, options = {}) => {
         return data.Body;
     }
     catch (err) {
+        // disable fs fallback for chunked download from s3
+        if (options.fallback === false) {
+            return null;
+        }
         const filepath1 = getPath(fp, options);
         if (!filepath1) {
             return null;

package/dist/server/plugins/file/providers/s3/funcs/fileExists.d.ts

@@ -1,3 +1,3 @@
-declare const getFileMetadata: (s3Settings: any) => (fp: any) => Promise<any>;
+declare const getFileMetadata: (s3Settings?: any) => (fp: any, options?: Record<string, any>) => Promise<any>;
 export default getFileMetadata;
 //# sourceMappingURL=fileExists.d.ts.map

package/dist/server/plugins/file/providers/s3/funcs/fileExists.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fileExists.d.ts","sourceRoot":"","sources":["../../../../../../../server/plugins/file/providers/s3/funcs/fileExists.ts"],"names":[],"mappings":"AAYA,QAAA,MAAM,eAAe,GAAI,YAAY,GAAG,MAAY,IAAI,GAAG,iBAiB1D,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"fileExists.d.ts","sourceRoot":"","sources":["../../../../../../../server/plugins/file/providers/s3/funcs/fileExists.ts"],"names":[],"mappings":"AAWA,QAAA,MAAM,eAAe,GAClB,aAAa,GAAG,MACV,IAAI,GAAG,EAAE,UAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,iBAmBhD,CAAC;AAEJ,eAAe,eAAe,CAAC"}

package/dist/server/plugins/file/providers/s3/funcs/fileExists.js

@@ -1,22 +1,25 @@
-import { HeadObjectCommand, } from '@aws-sdk/client-s3';
-import client from '../client.js';
-import getPath from '../../../utils/getPath.js';
-import getS3FilePath from './utils/getS3FilePath.js';
+import { HeadObjectCommand } from "@aws-sdk/client-s3";
+import s3Client from "../client.js";
+import config from "../../../../../../config.js";
+import getPath from "../../../utils/getPath.js";
+import getS3FilePath from "./utils/getS3FilePath.js";
 // if not found on s3 => fs
-import isFileExists from '../../../utils/isFileExists.js';
-const getFileMetadata = (s3Settings) => async (fp) => {
+import isFileExists from "../../../utils/isFileExists.js";
+const getFileMetadata = (s3Settings) => async (fp, options = {}) => {
     const filepath = getS3FilePath(fp, s3Settings);
-    const s3Client = client.getS3Client(s3Settings);
-    const bucketName = s3Settings.containerName;
     const bucketParams = {
-        Bucket: bucketName,
-        Key: filepath[0] === '/' ? filepath?.slice(1) : filepath,
+        Bucket: (s3Settings || config.s3 || { containerName: "work" })
+            .containerName,
+        Key: filepath[0] === "/" ? filepath?.slice(1) : filepath,
     };
     try {
         const data = await s3Client.send(new HeadObjectCommand(bucketParams));
         return data;
     }
     catch (err) {
+        if (options.fallback === false) {
+            return false;
+        }
         const filepath1 = getPath(fp);
         return isFileExists(filepath1);
     }

package/dist/server/plugins/file/providers/s3/funcs/uploadFile.d.ts

@@ -1,3 +1,3 @@
-declare const uploadFile: (s3Settings: any) => (fp: any, data: any) => Promise<import("@aws-sdk/client-s3").CompleteMultipartUploadCommandOutput>;
+declare const uploadFile: (s3Settings?: any) => (fp: any, data: any) => Promise<import("@aws-sdk/client-s3").CompleteMultipartUploadCommandOutput>;
 export default uploadFile;
 //# sourceMappingURL=uploadFile.d.ts.map

package/dist/server/plugins/file/providers/s3/funcs/uploadFile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uploadFile.d.ts","sourceRoot":"","sources":["../../../../../../../server/plugins/file/providers/s3/funcs/uploadFile.ts"],"names":[],"mappings":"AAYA,QAAA,MAAM,UAAU,GAAI,YAAY,GAAG,MAAY,IAAI,GAAG,EAAE,MAAM,GAAG,+EAgChE,CAAC;AAEF,eAAe,UAAU,CAAC"}
+{"version":3,"file":"uploadFile.d.ts","sourceRoot":"","sources":["../../../../../../../server/plugins/file/providers/s3/funcs/uploadFile.ts"],"names":[],"mappings":"AAaA,QAAA,MAAM,UAAU,GAAI,aAAa,GAAG,MAAY,IAAI,GAAG,EAAE,MAAM,GAAG,+EA8BjE,CAAC;AAEF,eAAe,UAAU,CAAC"}

package/dist/server/plugins/file/providers/s3/funcs/uploadFile.js

@@ -1,5 +1,6 @@
 import { Upload } from "@aws-sdk/lib-storage";
-import client from "../client.js";
+import s3Client from "../client.js";
+import config from "../../../../../../config.js";
 import getValidData from "../../utils/getValidData.js";
 import getDataSize from "../../utils/getDataSize.js";
 import dataTypes from "../../utils/handlers/dataTypes.js";
@@ -11,10 +12,9 @@ const uploadFile = (s3Settings) => async (fp, data) => {
     const size = await getDataSize({ data });
     const type = getMimeType(filepath);
     try {
-        const s3Client = client.getS3Client(s3Settings);
-        const bucketName = s3Settings.containerName;
         const bucketParams = {
-            Bucket: bucketName,
+            Bucket: (s3Settings || config.s3 || { containerName: "work" })
+                .containerName,
             Key: filepath,
             ContentLength: size,
             ContentType: type,

package/dist/server/plugins/file/providers/s3/funcs/utils/getS3FilePath.d.ts

@@ -1,3 +1,3 @@
-declare function getS3FilePath(fp: any, s3Settings: any): string;
+declare function getS3FilePath(fp: any, s3Settings?: any): string;
 export default getS3FilePath;
 //# sourceMappingURL=getS3FilePath.d.ts.map

package/dist/server/plugins/file/providers/s3/funcs/utils/getS3FilePath.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getS3FilePath.d.ts","sourceRoot":"","sources":["../../../../../../../../server/plugins/file/providers/s3/funcs/utils/getS3FilePath.ts"],"names":[],"mappings":"AAgBA,iBAAS,aAAa,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,UAQ9C;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"getS3FilePath.d.ts","sourceRoot":"","sources":["../../../../../../../../server/plugins/file/providers/s3/funcs/utils/getS3FilePath.ts"],"names":[],"mappings":"AAgBA,iBAAS,aAAa,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,MAAY,UAQrD;AAED,eAAe,aAAa,CAAC"}

package/dist/server/plugins/file/providers/s3/funcs/utils/getS3FilePath.js

@@ -7,7 +7,7 @@ function getPath(fp, s3Settings) {
     }
     return filepath;
 }
-function getS3FilePath(fp, s3Settings) {
+function getS3FilePath(fp, s3Settings = config.s3) {
     const filepath = getPath(fp, s3Settings);
     const unixPath = filepath.replace(/\\/g, "/").split("work/").pop();
     const prefix = !filepath.includes(config.folder) ? config.folder : "";

package/dist/server/plugins/file/providers/s3/index.d.ts

@@ -2,6 +2,6 @@ export default function s3Storage(opt: any): {
     name: string;
     downloadFile: (fp: string, options?: Record<string, any>) => Promise<any>;
     uploadFile: (fp: any, data: any) => Promise<import("@aws-sdk/client-s3").CompleteMultipartUploadCommandOutput>;
-    fileExists: (fp: any) => Promise<any>;
+    fileExists: (fp: any, options?: Record<string, any>) => Promise<any>;
 };
 //# sourceMappingURL=index.d.ts.map

package/dist/server/plugins/logger/getLogger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getLogger.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/getLogger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,SAAS,CAAC;AAE9C,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,UAAU,cAAe,SAAQ,IAAI,CAAC,MAAM;IAC1C,IAAI,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,cAAc,KAAK,IAAI,CAAC;IAClE,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;CAC5D;AAgDD,QAAA,MAAM,MAAM,EAAE,cAAgD,CAAC;AA+B/D,eAAe,MAAM,CAAC"}
+{"version":3,"file":"getLogger.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/getLogger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,SAAS,CAAC;AAE9C,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,UAAU,cAAe,SAAQ,IAAI,CAAC,MAAM;IAC1C,IAAI,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,cAAc,KAAK,IAAI,CAAC;IAClE,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;CAC5D;AAmDD,QAAA,MAAM,MAAM,EAAE,cAAgD,CAAC;AA+B/D,eAAe,MAAM,CAAC"}

package/dist/server/plugins/logger/getLogger.js

@@ -9,16 +9,19 @@ import timestampWithTimeZone from "./timestampWithTimeZone.js";
 const isServer = process.argv[2];
 const level = process.env.LOG_LEVEL || "info";
 console.log(`log level: ${level}`);
-const targets = [
-    {
-        target: "./createFileStream.js", // path.resolve('utils/createFileStream.js')
-    },
-    {
-        level: "error",
-        target: "pino/file",
-        options: { destination: 1 },
-    },
-];
+// skip logging during npx vitest run
+const targets = process.env.VITEST
+    ? []
+    : [
+        {
+            target: "./createFileStream.js", // path.resolve('utils/createFileStream.js')
+        },
+        {
+            level: "error",
+            target: "pino/file",
+            options: { destination: 1 },
+        },
+    ];
 // push trace logs to console (those would not be saved to file)
 if (["trace", "debug"].includes(level)) {
     targets.push({

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAgC,MAAM,SAAS,CAAC;AAiC7E,iBAAe,MAAM,CAAC,OAAO,EAAE,eAAe,iBAwC7C;AACD,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAgC,MAAM,SAAS,CAAC;AAyC7E,iBAAe,MAAM,CAAC,OAAO,EAAE,eAAe,iBAwC7C;AACD,eAAe,MAAM,CAAC"}

package/dist/server/plugins/logger/index.js

@@ -13,12 +13,16 @@ process.on("uncaughtException", (err) => {
 });
 // avoid process exit with rejection during client connect at process start
 process.on("unhandledRejection", (err) => {
-    if (err.message === "Connection terminated due to connection timeout") {
+    if ([
+        "Client was closed and is not queryable",
+        "Connection terminated due to connection timeout",
+    ].includes(err.message)) {
         logger.file("pg", { error: err.message });
-        console.warn("Ignored pg connection timeout:", err.toString());
+        console.warn("Ignored pg connection timeout / close:", err.toString());
         return;
     }
-    if (err.message === "Connection is closed.") {
+    if (err.message === "Connection is closed." ||
+        err.message.includes("maxRetriesPerRequest")) {
         logger.file("redis", { error: err.message });
         console.warn("Ignored redis connection close:", err.toString());
         return;

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":"AAQA,iBAAS,KAAK,CAAC,KAAK,GAAE,GAAQ,OAuD7B;AAMD,eAAe,KAAK,CAAC"}
+{"version":3,"file":"getPG.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/getPG.ts"],"names":[],"mappings":"AAQA,iBAAS,KAAK,CAAC,KAAK,GAAE,GAAQ,OAyD7B;AAMD,eAAe,KAAK,CAAC"}

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

@@ -5,6 +5,7 @@ import dblist from "../../../../dblist.js";
 import pgClients from "../pgClients.js";
 import getDBParams from "./getDBParams.js";
 function getPG(param = {}) {
+    // console.log("config.pg", config.pg, process.env); // ! process.env.VITEST always in uppercase, debug to properly test via npx vitest run
     if (!config.pg)
         return null;
     const dbListParams = dblist.find((el) => el.key === param?.key) ||

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

@@ -2,7 +2,7 @@ import init from "./init.js";
 import getPG from "./getPG.js";
 async function getPGAsync(param) {
     const client = getPG(param);
-    const { host, port, database } = client.options || {};
+    const { host, port, database } = client?.options || {};
     if (client && !client.tlist) {
         // force init
         await init(client).catch((err) => console.warn("PG client init error", host, port, database));

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

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