@opengis/fastify-table 2.0.106 → 2.0.108

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

@@ -5,38 +5,40 @@ import getRedis from "../../redis/funcs/getRedis.js";
 import logger from "../../logger/getLogger.js";
 const rclient = getRedis({ db: 0 });
 async function init(client) {
-    if (!client?.options?.database) {
+    if (!client)
+        return;
+    // for unit tests
+    const options = client.options || {
+        database: client.database,
+        user: client.user,
+        password: client.password,
+        port: client.port,
+        host: client.host,
+    };
+    if (!client || !client.query || !client.connect) {
         return;
     }
-    const { pgType, pk } = await client
-        .query(`SELECT
-        (
-          SELECT
-            json_object_agg(
-              conrelid:: regclass,
-              (
-                SELECT
-                  attname
-                FROM
-                  pg_attribute
-                WHERE
-                  attrelid = c.conrelid
-                  AND attnum = c.conkey [1]
-              )
-            )
-          FROM
-            pg_constraint c
-          WHERE
-            contype = 'p'
-            AND connamespace:: regnamespace:: text NOT IN ('sde')
-        ) AS pk,
-        (
-          SELECT
-            json_object_agg(t.oid:: text, pg_catalog.format_type(t.oid, NULL))
-          FROM
-            pg_catalog.pg_type t
-        ) AS "pgType"`)
-        .then((d) => d.rows[0]);
+    const pgType = await client
+        .query(`SELECT json_object_agg(t.oid:: text, pg_catalog.format_type(t.oid, NULL)) FROM pg_catalog.pg_type t`)
+        .then((el) => el.rows[0]?.json_object_agg || {});
+    const pks = await client
+        .query(`
+    SELECT
+      connamespace::regnamespace::text,
+      conrelid::regclass,
+      (
+        SELECT attname FROM pg_attribute WHERE attrelid = c.conrelid AND attnum = c.conkey[1]
+      ) as pk
+    FROM pg_constraint c
+    WHERE contype = 'p'
+    AND connamespace::regnamespace::text NOT IN ('sde')`)
+        .then((el) => el.rows || []);
+    const pk = pks.reduce((acc, curr) => ({
+        ...acc,
+        [curr.connamespace === "public"
+            ? `${curr.connamespace}.${curr.conrelid}`
+            : curr.conrelid]: curr.pk,
+    }), {});
     const tlist = await client
         .query(`SELECT
         array_agg(
@@ -72,6 +74,8 @@ async function init(client) {
         .then((el) => el.rows || []);
     const relkinds = rows.reduce((acc, curr) => Object.assign(acc, { [curr.tname]: curr.relkind }), {});
     async function query(q, args = []) {
+        if (!client)
+            throw new Error("empty pg client");
         try {
             const data = await client.query(q, args);
             return data;
@@ -86,7 +90,7 @@ async function init(client) {
     }
     async function querySafe(q, param) {
         const pg1 = new pg.Pool({
-            ...client.options,
+            ...options,
             statement_timeout: param?.timeout || 100000000,
         });
         try {
@@ -97,10 +101,10 @@ async function init(client) {
         }
         catch (err) {
             if (err.code === "57014") {
-                console.warn("pg.querySafe timeout", q);
+                console.warn("⚠️ pg.querySafe timeout", q);
                 return { rows: [], timeout: true };
             }
-            console.warn("pg.querySafe error", q);
+            console.warn("⚠️ pg.querySafe error", q);
             throw err;
         }
         finally {
@@ -114,6 +118,8 @@ async function init(client) {
         return result;
     }
     async function queryNotice(q, args, cb = () => { }) {
+        if (!client)
+            throw new Error("empty pg client");
         const clientCb = await client.connect();
         clientCb.on("notice", (e) => {
             cb(e.message);
@@ -159,6 +165,8 @@ async function init(client) {
         return data;
     }
     Object.assign(client, {
+        ...options,
+        options,
         one,
         pgType,
         pk,
@@ -168,11 +176,10 @@ async function init(client) {
         queryNotice,
         querySafe,
     });
-    // client.init = undefined;
-    console.log("New client init finished", client.options?.database);
+    console.log("New client init finished", client.database);
     logger.file("pg", {
         message: "client init finished",
-        database: client.options?.database,
+        database: client.database,
     });
 }
 // export default client;

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

@@ -1 +1 @@
-{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/pool.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,CAAC;yBAK7B,QAAO,GAAQ;AAA/B,wBAsEE"}
+{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/pool.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,CAAC;yBAE7B,QAAO,GAAQ;AAA/B,wBAgEE"}

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

@@ -6,9 +6,8 @@ types.setTypeParser(1114, (stringValue) => stringValue);
 import pgClients from "../pgClients.js";
 import init from "./init.js";
 import config from "../../../../config.js";
+config.ready = config.ready || {};
 export const Pools = {};
-const errored = {};
-const inited = {};
 export default (param = {}) => {
     if (!config.pg)
         return null;
@@ -26,24 +25,24 @@ export default (param = {}) => {
         }
     });
     pool.on("error", (err) => {
-        console.warn("Unexpected error on idle client", param.database);
-        errored[param.database] = 1;
+        console.warn("⚠️ Unexpected error on idle client", param.database);
+        config.ready[`pg:${param.database}`] = false;
         logger.file("pg", {
             error: err.toString(),
             database: param.database,
         });
         if (config.trace) {
-            console.warn("Unexpected error on idle client details:", err.toString(), err.stack);
+            console.warn("⚠️ Unexpected error on idle client details:", err.toString(), err.stack);
         }
     });
-    pool.on("connect", (client) => {
+    pool.on("connect", () => {
         // skip auto drops and reconnects handled by pg internally
-        if (!inited[param.database] || errored[param.database]) {
+        if (!config.ready[`pg:${param.database}`]) {
             logger.file("pg", {
                 message: "client connected",
                 database: param.database,
             });
-            inited[param.database] = 1;
+            config.ready[`pg:${param.database}`] = true;
         }
         if (config.trace) {
             console.log("PG client connected", param.database);
@@ -52,17 +51,12 @@ export default (param = {}) => {
         if (pgClients[name] && !pgClients[name]?.tlist) {
             init(Pools[name]);
         }
-        Pools[name] = client;
+        Pools[name] = pool;
     });
-    pool.on("acquire", () => {
-        if (config.trace) {
-            console.log("PG client acquired", param.database);
-        }
-    });
-    pool.on("remove", () => {
-        if (config.trace) {
+    if (config.trace) {
+        pool.on("remove", () => {
             console.log("PG Client removed from the pool.", param.database);
-        }
-    });
+        });
+    }
     return pool;
 };

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,QAwB3B;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/pg/index.ts"],"names":[],"mappings":"AAgCA,iBAAS,MAAM,CAAC,OAAO,EAAE,GAAG,QAwB3B;AAED,eAAe,MAAM,CAAC"}

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

@@ -3,8 +3,9 @@ import pgClients from "./pgClients.js";
 import getPGAsync from "./funcs/getPGAsync.js";
 import logger from "../logger/getLogger.js";
 function close() {
-    Object.keys(pgClients).forEach((el) => {
-        pgClients[el].end();
+    Object.keys(pgClients).forEach((key) => {
+        console.log("Closing pg client", key);
+        pgClients[key].end();
     });
 }
 async function getHeadersPG(req) {

package/dist/server/plugins/redis/funcs/getRedis.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getRedis.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/redis/funcs/getRedis.ts"],"names":[],"mappings":"AAQA,iBAAS,QAAQ,CACf,EACE,EAAE,EACF,IAAI,EACJ,IAAI,EACJ,WAAkB,EAClB,aAAwB,EACxB,kBAAyB,EACzB,WAAkB,EAClB,cAAqB,EACrB,oBAAwB,GACzB,GAAE;IACD,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;CACnB,OAwCd;AAED,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"getRedis.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/redis/funcs/getRedis.ts"],"names":[],"mappings":"AAQA,iBAAS,QAAQ,CACf,EACE,EAAE,EACF,IAAI,EACJ,IAAI,EACJ,WAAmB,EACnB,aAA8D,EAC9D,kBAAyB,EACzB,WAAkB,EAClB,cAAqB,EACrB,oBAAwB,GACzB,GAAE;IACD,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;CACnB,OA6Cd;AAED,eAAe,QAAQ,CAAC"}

package/dist/server/plugins/redis/funcs/getRedis.js

@@ -3,10 +3,15 @@ import config from "../../../../config.js";
 import logger from "../../logger/getLogger.js";
 import redisClients from "./redisClients.js";
 config.ready = config.ready || {};
-function getRedis({ db, host, port, closeClient = true, retryStrategy = () => { }, enableOfflineQueue = true, lazyConnect = true, connectTimeout = 2000, maxRetriesPerRequest = 0, } = { db: 0 }) {
+function getRedis({ db, host, port, closeClient = false, retryStrategy = (times) => Math.min(times * 500, 5000), enableOfflineQueue = true, lazyConnect = true, connectTimeout = 2000, maxRetriesPerRequest = 1, } = { db: 0 }) {
     if (!config.redis && !host)
         return null;
     const key = host || port ? [host, port, db].join("-") : db;
+    // try to reconnect after connection error / disconnect
+    if (redisClients[key]?.status === "end" &&
+        typeof redisClients[key].connect === "function") {
+        redisClients[key].connect();
+    }
     if (redisClients[key]) {
         return redisClients[key];
     }
@@ -28,11 +33,8 @@ function getRedis({ db, host, port, closeClient = true, retryStrategy = () => {
         config.ready[`redis:${key}`] = true;
     });
     redisClients[key].on("error", (err) => {
-        console.warn("Ignored redis error:", err.message);
+        console.warn("⚠️ Ignored redis error:", err.message);
         logger.file("redis", { error: err.toString() });
-        if (err.code === "ETIMEDOUT") {
-            // redisClients[key].disconnect();
-        }
     });
     console.log("redis connected", db, host, port);
     return redisClients[key];

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/redis/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,SAAS,CAAC;AAQ/C,iBAAe,MAAM,CAAC,OAAO,EAAE,eAAe,iBAE7C;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/redis/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,SAAS,CAAC;AAW/C,iBAAe,MAAM,CAAC,OAAO,EAAE,eAAe,iBAE7C;AAED,eAAe,MAAM,CAAC"}

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

@@ -1,6 +1,9 @@
 import redisClients from "./funcs/redisClients.js";
 function close() {
-    Object.keys(redisClients).forEach((key) => redisClients[key].quit());
+    Object.keys(redisClients).forEach((key) => {
+        console.log("Closing redis client", key);
+        redisClients[key].quit();
+    });
 }
 async function plugin(fastify) {
     fastify.addHook("onClose", close);

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/sqlite/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAM1C,iBAAe,QAAQ,CAAC,GAAG,EAAE,eAAe,iBAI3C;;AAED,wBAA4B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/sqlite/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAa1C,iBAAe,QAAQ,CAAC,GAAG,EAAE,eAAe,iBAE3C;;AAED,wBAA4B"}

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

@@ -1,8 +1,12 @@
 import fp from "fastify-plugin";
 import sqliteClients from "./sqliteClients.js";
-async function dbPlugin(app) {
-    app.addHook("onClose", async () => {
-        Object.keys(sqliteClients).forEach((key) => sqliteClients[key].close());
+function close() {
+    Object.keys(sqliteClients).forEach((key) => {
+        console.log("Closing sqlite client", key);
+        sqliteClients[key].close();
     });
 }
+async function dbPlugin(app) {
+    app.addHook("onClose", close);
+}
 export default fp(dbPlugin);

package/dist/server/plugins/table/funcs/getFilter.d.ts

@@ -7,5 +7,5 @@ export default function getFilter({ pg, table, filter, custom, state, search, us
     state?: string;
     search?: string;
     user?: Record<string, any>;
-}, reply: any): Promise<any>;
+}, reply?: any): Promise<any>;
 //# sourceMappingURL=getFilter.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getFilter.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/table/funcs/getFilter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAGzD,wBAA8B,SAAS,CACrC,EACE,EAAqB,EACrB,KAAK,EACL,MAAM,EACN,MAAM,EACN,KAAK,EACL,MAAM,EACN,IAAI,GACL,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC5B,EACD,KAAK,EAAE,GAAG,gBAoBX"}
+{"version":3,"file":"getFilter.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/table/funcs/getFilter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAmBzD,wBAA8B,SAAS,CACrC,EACE,EAAqB,EACrB,KAAK,EACL,MAAM,EACN,MAAM,EACN,KAAK,EACL,MAAM,EACN,IAAI,GACL,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC5B,EACD,KAAK,CAAC,EAAE,GAAG,gBAoBZ"}

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

@@ -1,5 +1,18 @@
 import routeFilter from "../../../routes/table/controllers/filter.js";
 import pgClients from "../../pg/pgClients.js";
+const reply1 = {
+    response: {},
+    // redirect: (txt) => txt,
+    redirect: (txt) => Object.assign(reply1.response, {
+        body: txt,
+        statusCode: reply1.response.statusCode || 200,
+    }),
+    status: (statusCode) => {
+        Object.assign(reply1.response, { status: statusCode });
+        return reply1;
+    },
+    send: (txt) => Object.assign(reply1.response, txt),
+};
 export default async function getFilter({ pg = pgClients.client, table, filter, custom, state, search, user, }, reply) {
     const params = { table };
     const query = {
@@ -13,6 +26,6 @@ export default async function getFilter({ pg = pgClients.client, table, filter,
         params,
         query,
         user,
-    }, reply, 1);
+    }, reply || reply1, 1);
     return result;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"getSelectMeta.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/table/funcs/getSelectMeta.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAWzD,wBAA8B,aAAa,CAAC,EAC1C,IAAI,EACJ,UAAU,EACV,GAAG,EACH,OAAO,EACP,MAAM,EACN,EAAqB,GACtB,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,EAAE,CAAC,EAAE,UAAU,CAAC;CACjB,gBA6GA"}
+{"version":3,"file":"getSelectMeta.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/table/funcs/getSelectMeta.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAWzD,wBAA8B,aAAa,CAAC,EAC1C,IAAI,EACJ,UAAU,EACV,GAAG,EACH,OAAO,EACP,MAAM,EACN,EAAqB,GACtB,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,EAAE,CAAC,EAAE,UAAU,CAAC;CACjB,gBA4GA"}

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

@@ -1,6 +1,6 @@
 import logger from "../../logger/getLogger.js";
 import autoIndex from "../../pg/funcs/autoIndex.js";
-import getPG from "../../pg/funcs/getPG.js";
+import getPGAsync from "../../pg/funcs/getPGAsync.js";
 import pgClients from "../../pg/pgClients.js";
 import getSelect from "./getSelect.js";
 const limit = 50;
@@ -17,9 +17,7 @@ export default async function getSelectMeta({ name, startsWith, key, nocache, pa
     }
     const cls = await getSelect(name, pg, nocache);
     const db = typeof cls?.db === "string" ? { database: cls.db } : cls?.db;
-    const pg1 = cls?.db ? getPG(db) : pg;
-    if (!pg1?.pk)
-        await pg1?.init?.();
+    const pg1 = cls?.db ? await getPGAsync(db) : pg;
     if (!cls)
         return null;
     if (cls.arr)

package/dist/server/plugins/table/funcs/gisIRColumn.d.ts

@@ -28,7 +28,7 @@ export default function gisIRColumn({ pg, layer, column, sql, query, filter, sta
 } | {
     count: any;
     sql: string | undefined;
-    rows: any[];
+    rows: any;
     error?: undefined;
     status?: undefined;
     message?: undefined;
@@ -37,7 +37,7 @@ export default function gisIRColumn({ pg, layer, column, sql, query, filter, sta
     time: number;
     count: any;
     sql: string | undefined;
-    rows: any[];
+    rows: any;
     error?: undefined;
     status?: undefined;
     message?: undefined;

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

@@ -19,7 +19,7 @@ export default async function gisIRColumn({ pg = pgClients.client, layer, column
     const { tlist } = await pg
         .query(`select array_agg((select nspname from pg_namespace where oid=relnamespace)||'.'||relname) tlist from pg_class 
   where relkind in ('r','v','m')`)
-        .then((el) => el.rows[0]);
+        .then((el) => el.rows?.[0] || {});
     const tableName = body?.table || layer;
     if (!tlist.includes(tableName))
         return { error: `table not found: ${tableName}`, status: 400 };

package/dist/server/plugins/upload/finishUpload.d.ts

@@ -0,0 +1,9 @@
+export default function finishUpload({ host, id, }: {
+    host?: string;
+    id: string;
+}): Promise<{
+    error?: string;
+    success?: boolean;
+    code: number;
+}>;
+//# sourceMappingURL=finishUpload.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"finishUpload.d.ts","sourceRoot":"","sources":["../../../../server/plugins/upload/finishUpload.ts"],"names":[],"mappings":"AAMA,wBAA8B,YAAY,CAAC,EACzC,IAAI,EACJ,EAAE,GACH,EAAE;IACD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;CACZ,GAAG,OAAO,CAAC;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAqC/D"}

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

@@ -0,0 +1,33 @@
+import path from "node:path";
+import { existsSync } from "node:fs";
+import { readFile, writeFile } from "node:fs/promises";
+import { prefix, metaDir, fetchTimeoutMs } from "./index.js";
+export default async function finishUpload({ host, id, }) {
+    if (!host) {
+        const metaExists = existsSync(path.join(metaDir, `${id}.json`));
+        if (!metaExists) {
+            return { error: "upload not found: " + id, code: 404 };
+        }
+        const meta = JSON.parse(await readFile(path.join(metaDir, `${id}.json`), "utf8"));
+        if (meta.uploaded !== meta.size) {
+            return { error: "Upload not complete", code: 400 };
+        }
+        const metaData = {
+            ...meta,
+            uploadDate: new Date().toISOString(),
+            exists: true,
+            finished: true,
+        };
+        const fileBytes = Buffer.from(JSON.stringify(metaData, null, 2));
+        // save metadata
+        await writeFile(path.join(metaDir, `${id}.json`), fileBytes);
+        return { success: true, code: 200 };
+    }
+    const res = await fetch(`${host}/${prefix}/${id}/finish`, {
+        method: "POST",
+        signal: AbortSignal.timeout(fetchTimeoutMs),
+    }).catch((err) => ({
+        json: () => Promise.resolve({ error: err.toString(), code: 501 }),
+    }));
+    return res.json();
+}

package/dist/server/plugins/upload/getUploadStatus.d.ts

@@ -0,0 +1,5 @@
+export default function getUploadStatus({ host, id, }: {
+    host?: string;
+    id: string;
+}): Promise<any>;
+//# sourceMappingURL=getUploadStatus.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"getUploadStatus.d.ts","sourceRoot":"","sources":["../../../../server/plugins/upload/getUploadStatus.ts"],"names":[],"mappings":"AAaA,wBAA8B,eAAe,CAAC,EAC5C,IAAI,EACJ,EAAE,GACH,EAAE;IACD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;CACZ,gBAoCA"}

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

@@ -0,0 +1,36 @@
+import path from "node:path";
+import { existsSync } from "node:fs";
+import { readFile } from "node:fs/promises";
+import { prefix, metaDir, uploadChunkDirectory, fetchTimeoutMs, } from "./index.js";
+import isFileExists from "../file/isFileExists.js";
+export default async function getUploadStatus({ host, id, }) {
+    // return local file metadata
+    if (!host) {
+        const metaExists = existsSync(path.join(metaDir, `${id}.json`));
+        // check file upload status: finished/inprogress
+        const meta = metaExists
+            ? JSON.parse(await readFile(path.join(metaDir, `${id}.json`), "utf8"))
+            : {};
+        // check if file exists
+        // const fileExists = existsSync(
+        //   path.join(fileDir, `${id}.${meta.extension}`)
+        // );
+        const fileExists = await isFileExists(path
+            .join(uploadChunkDirectory, `${id}.${meta.extension}`)
+            .replace(/\\/g, "/"));
+        return {
+            ...meta,
+            // metaPath: path.join(metaDir, `${id}.json`),
+            uploadChunkDirectory,
+            exists: !!fileExists,
+            finished: meta.uploaded && meta.size && meta.uploaded === meta.size,
+        };
+    }
+    // request remote file upload status
+    const resp = await fetch(`${host}/${prefix}/${id}`, {
+        signal: AbortSignal.timeout(fetchTimeoutMs),
+    }).catch((err) => ({
+        json: () => Promise.resolve({ error: err.toString(), code: 501 }),
+    }));
+    return resp.json();
+}

package/dist/server/plugins/upload/index.d.ts

@@ -0,0 +1,6 @@
+export declare const fetchTimeoutMs: number;
+export declare const prefix = "file/upload2";
+export declare const uploadChunkDirectory = "/files/uploads";
+export declare const fileDir: string;
+export declare const metaDir: string;
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/upload/index.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,cAAc,QAAmC,CAAC;AAE/D,eAAO,MAAM,MAAM,iBAAiB,CAAC;AAErC,eAAO,MAAM,oBAAoB,mBAAmB,CAAC;AAErD,eAAO,MAAM,OAAO,QAEE,CAAC;AAEvB,eAAO,MAAM,OAAO,QAA4B,CAAC"}

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

@@ -0,0 +1,12 @@
+import path from "node:path";
+import config from "../../../config.js";
+import getFolder from "../crud/funcs/utils/getFolder.js";
+config.chunkSize = +(config.chunkSize || 1048576); // 1 MB per chunk by default
+const rootDir = getFolder(config, "local");
+export const fetchTimeoutMs = +(config.fetchTimeoutMs || 5000);
+export const prefix = "file/upload2";
+export const uploadChunkDirectory = "/files/uploads";
+export const fileDir = path
+    .join(rootDir, uploadChunkDirectory)
+    .replace(/\\/g, "/");
+export const metaDir = path.join(fileDir, "tmp");

package/dist/server/plugins/upload/startUpload.d.ts

@@ -0,0 +1,8 @@
+export default function startUpload({ host, id, fileName, size, subdir, }: {
+    host?: string;
+    id?: string;
+    fileName: string;
+    size?: number;
+    subdir?: string;
+}): Promise<unknown>;
+//# sourceMappingURL=startUpload.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"startUpload.d.ts","sourceRoot":"","sources":["../../../../server/plugins/upload/startUpload.ts"],"names":[],"mappings":"AAaA,wBAA8B,WAAW,CAAC,EACxC,IAAI,EACJ,EAAE,EACF,QAAQ,EACR,IAAI,EACJ,MAAM,GACP,EAAE;IACD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,oBA2DA"}

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

@@ -0,0 +1,53 @@
+import path from "node:path";
+import { randomUUID } from "node:crypto";
+import { mkdir, writeFile } from "node:fs/promises";
+import getUploadStatus from "./getUploadStatus.js";
+import { prefix, fileDir, metaDir, uploadChunkDirectory, fetchTimeoutMs, } from "./index.js";
+export default async function startUpload({ host, id, fileName, size, subdir, }) {
+    if (!host) {
+        const extension = path.extname(fileName).substring(1);
+        const id1 = id || randomUUID();
+        const key = id1.split("-").pop();
+        const meta = {
+            id: id1,
+            key,
+            fileName,
+            size,
+            extension,
+            uploaded: 0,
+            exists: false,
+        };
+        // check current upload state
+        if (id) {
+            const status = await getUploadStatus({ id });
+            Object.assign(meta, status);
+        }
+        // resume file upload
+        if (meta.uploaded > 0) {
+            return meta;
+        }
+        // if not started - start new upload
+        const relativeDirpath = path
+            .join(uploadChunkDirectory, subdir || "")
+            .replace(/\\/g, "/");
+        await mkdir(path.join(fileDir, "tmp"), { recursive: true });
+        // create metadata for resumable upload
+        const metaData = {
+            ...meta,
+            subdir,
+            metaPath: undefined,
+            relativeDirpath,
+        };
+        await writeFile(path.join(metaDir, `${id1}.json`), JSON.stringify(metaData, null, 2));
+        return { ...meta, metaPath: undefined };
+    }
+    const res = await fetch(`${host}/${prefix}/start`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ fileName, size, subdir, id }),
+        signal: AbortSignal.timeout(fetchTimeoutMs),
+    }).catch((err) => ({
+        json: () => Promise.resolve({ error: err.toString(), code: 501 }),
+    }));
+    return res.json();
+}

package/dist/server/plugins/upload/uploadChunk.d.ts

@@ -0,0 +1,9 @@
+export default function uploadChunk({ host, id, body, offset, end, size, }: {
+    host?: string;
+    id: string;
+    body: any;
+    offset: number;
+    end: number;
+    size: number;
+}): Promise<any>;
+//# sourceMappingURL=uploadChunk.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"uploadChunk.d.ts","sourceRoot":"","sources":["../../../../server/plugins/upload/uploadChunk.ts"],"names":[],"mappings":"AAaA,wBAA8B,WAAW,CAAC,EACxC,IAAI,EACJ,EAAE,EACF,IAAI,EACJ,MAAM,EACN,GAAG,EACH,IAAI,GACL,EAAE;IACD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,GAAG,CAAC;IACV,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd,gBA6DA"}

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

@@ -0,0 +1,47 @@
+import path from "node:path";
+import { existsSync } from "node:fs";
+import { readFile, writeFile } from "node:fs/promises";
+import { prefix, fileDir, metaDir, fetchTimeoutMs, uploadChunkDirectory, } from "./index.js";
+import uploadFile from "../file/uploadFile.js";
+export default async function uploadChunk({ host, id, body, offset, end, size, }) {
+    if (!host) {
+        const metaExists = existsSync(path.join(metaDir, `${id}.json`));
+        if (!metaExists) {
+            return { error: "File not found", code: 404 };
+        }
+        const meta = JSON.parse(await readFile(path.join(metaDir, `${id}.json`), "utf8"));
+        if (size !== meta.size) {
+            return { error: "Total size mismatch", code: 400 };
+        }
+        if (offset !== meta.uploaded) {
+            return { error: "Wrong offset", expected: meta.uploaded, code: 409 };
+        }
+        if (body?.length !== end - offset + 1) {
+            return { error: "Chunk size mismatch", code: 400 };
+        }
+        // append chunk to existing file
+        const filePath = path.join(fileDir, `${id}.${meta.extension}`);
+        // await appendFile(filePath, body);
+        await uploadFile(path
+            .join(uploadChunkDirectory, `${id}.${meta.extension}`)
+            .replace(/\\/g, "/"), body);
+        meta.uploaded = end + 1;
+        // update metadata for resumable upload
+        await writeFile(path.join(metaDir, `${id}.json`), JSON.stringify(meta, null, 2));
+        return { uploaded: meta.uploaded, finished: meta.uploaded === meta.size };
+    }
+    if (!end || !size) {
+        return { error: "not enough params: offset/end/size", code: 400 };
+    }
+    const res = await fetch(`${host}/${prefix}/${id}`, {
+        method: "PATCH",
+        headers: {
+            "Content-Range": `bytes ${offset || 0}-${end}/${size}`,
+        },
+        body,
+        signal: AbortSignal.timeout(fetchTimeoutMs),
+    }).catch((err) => ({
+        json: () => Promise.resolve({ error: err.toString(), code: 501 }),
+    }));
+    return res.json();
+}