@opengis/fastify-table 2.3.1 → 2.3.3

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

@@ -54,7 +54,9 @@ export declare function uploadChunk({ id, chunk, partNumber, }: {
 export declare function finishUpload({ id, }: {
     id: string;
 }, s3?: any): Promise<{
+    finished: boolean;
     uploaded: any;
+    filepath: any;
 }>;
 export declare function abortUpload({ id, }: {
     id: string;

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":"AAgGA,wBAAsB,sBAAsB,CAAC,EAAE,MAAW,iBAuCzD;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,iBAqBd;AAED,wBAAsB,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,iBA0B9D;AAED,wBAAsB,aAAa,CAAC,EAAE,EAAE,MAAM,gBAQ7C;AAED,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,MAAM,gBAMrD;AAED,wBAAsB,mBAAmB,CAAC,EAAE,MAAW,iBAwEtD;AAED,wBAAsB,UAAU,CAAC,EAAE,EAAE,EAAE,EAAE;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,EAAE,EAAE,MAAW;;;;;;;;GAqCrE;AAED,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;;;;;;;;;;;;;;;;GAqDd;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;;;;;;;;GAyBd;AAED,wBAAsB,YAAY,CAChC,EACE,EAAE,GACH,EAAE;IACD,EAAE,EAAE,MAAM,CAAC;CACZ,EACD,EAAE,MAAW;;GAoCd;AAED,wBAAsB,WAAW,CAC/B,EACE,EAAE,GACH,EAAE;IACD,EAAE,EAAE,MAAM,CAAC;CACZ,EACD,EAAE,MAAW;;GAuBd;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;;;;;;;;;;;;;;GAmEd"}
+{"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,iBA0B9D;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;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;;;;;;;;GA0Bd;AAED,wBAAsB,YAAY,CAChC,EACE,EAAE,GACH,EAAE;IACD,EAAE,EAAE,MAAM,CAAC;CACZ,EACD,EAAE,MAAW;;;;GAuCd;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;;;;;;;;;;;;;;GAoEd"}

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

@@ -23,6 +23,8 @@ function clearUploadTimeout(id) {
     }
 }
 async function scheduleNonRedisCleanup(id, s3 = s3Client) {
+    if (!s3)
+        throw new Error("No S3 client");
     if (config.redis)
         return;
     clearUploadTimeout(id);
@@ -71,6 +73,8 @@ async function scheduleNonRedisCleanup(id, s3 = s3Client) {
 }
 // used via onClose hook to avoid memory leaks
 export async function cleanupNonRedisUploads(s3 = s3Client) {
+    if (!s3)
+        throw new Error("No S3 client");
     if (config.redis)
         return;
     console.log("cleanupNonRedisUploads start");
@@ -116,6 +120,8 @@ export async function saveUploadMeta(id, meta, ttl = UPLOAD_TTL_SECONDS) {
     ]);
 }
 export async function refreshUploadTTL(id, ttl = UPLOAD_TTL_SECONDS, s3 = s3Client) {
+    if (!s3)
+        throw new Error("No S3 client");
     if (!config.redis) {
         await scheduleNonRedisCleanup(id, s3);
         return;
@@ -162,6 +168,8 @@ export async function getResumableUploadId(key) {
     return rclient.get(resumableKey(key));
 }
 export async function cleanupStaleUploads(s3 = s3Client) {
+    if (!s3)
+        throw new Error("No S3 client");
     if (!config.redis) {
         await cleanupNonRedisUploads(s3);
         return;
@@ -216,6 +224,8 @@ export async function cleanupStaleUploads(s3 = s3Client) {
     } while (cursor !== "0");
 }
 export async function findUpload({ id }, s3 = s3Client) {
+    if (!s3)
+        throw new Error("No S3 client");
     const cachedInfo = await getUploadMeta(id);
     const { Key, Bucket, fileSize: cacheSize, ContentType: cacheContentType, } = cachedInfo || {};
     const parts = await s3
@@ -238,7 +248,12 @@ export async function findUpload({ id }, s3 = s3Client) {
         })) || [],
     };
 }
+// todo: optional - keep originalFileName, else - id + extension
+//  + implement rotateFilenameS3 logic, like const filename = await rotateFilenameS3({ Name: originalFilename, Bucket, Prefix }, s3Client);
+// ! if originalFileName - check names with spaces - s3 mights throw error - encode request or at upload?
 export async function startUpload({ Bucket, Key, ContentType, fileSize, }, s3 = s3Client) {
+    if (!s3)
+        throw new Error("No S3 client");
     const cachedUploadId = await getResumableUploadId(Key);
     const cachedMeta = cachedUploadId
         ? await getUploadMeta(cachedUploadId)
@@ -281,6 +296,8 @@ export async function startUpload({ Bucket, Key, ContentType, fileSize, }, s3 =
     };
 }
 export async function uploadChunk({ id, chunk, partNumber, }, s3 = s3Client) {
+    if (!s3)
+        throw new Error("No S3 client");
     const upload = await findUpload({ id }, s3);
     if (!upload?.UploadId) {
         throw new Error("upload not found");
@@ -299,6 +316,8 @@ export async function uploadChunk({ id, chunk, partNumber, }, s3 = s3Client) {
     return upload;
 }
 export async function finishUpload({ id, }, s3 = s3Client) {
+    if (!s3)
+        throw new Error("No S3 client");
     const redisCache = await getUploadMeta(id);
     const { fileSize: cachedSize, Key, Bucket } = redisCache || {};
     const size = cachedSize ? Number(cachedSize) : undefined;
@@ -319,10 +338,14 @@ export async function finishUpload({ id, }, s3 = s3Client) {
     }));
     await deleteUploadMeta(id, Key);
     return {
+        finished: true,
         uploaded: upload.uploaded,
+        filepath: Key.replace(config.folder, ""),
     };
 }
 export async function abortUpload({ id, }, s3 = s3Client) {
+    if (!s3)
+        throw new Error("No S3 client");
     const meta = await getUploadMeta(id);
     if (!meta) {
         return {
@@ -340,6 +363,8 @@ export async function abortUpload({ id, }, s3 = s3Client) {
     };
 }
 export async function getUploadStatus({ id, Key, Bucket, }, s3 = s3Client) {
+    if (!s3)
+        throw new Error("No S3 client");
     const redisCache = id ? await getUploadMeta(id) : undefined;
     const { fileSize: cachedSize, Key: redisKey, Bucket: redisBucket, } = redisCache || {};
     if (!redisKey && Key && Bucket) {

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

@@ -1 +1 @@
-{"version":3,"file":"uploadChunk.d.ts","sourceRoot":"","sources":["../../../../server/plugins/upload/uploadChunk.ts"],"names":[],"mappings":"AAqBA,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,gBAiIA"}
+{"version":3,"file":"uploadChunk.d.ts","sourceRoot":"","sources":["../../../../server/plugins/upload/uploadChunk.ts"],"names":[],"mappings":"AAqBA,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,gBAwIA"}

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

@@ -39,14 +39,16 @@ export default async function uploadChunk({ host, id, body, offset, end, size, }
             return { error: "Chunk size mismatch", code: 400 };
         }
         const relpath = path.posix.join(uploadChunkDirectory, `${id}.${meta.extension}`);
-        const filepath = path.posix.join(config.folder, uploadChunkDirectory, `${id}.${meta.extension}`);
         const res = await getFileSize(relpath, { fallback: false }).catch((err) => ({
             error: err.toString(),
+            code: err.code,
         }));
-        if (res.error && res.error !== "Error: file not found") {
+        if (res.error &&
+            res.error !== "Error: file not found" &&
+            res.code !== "ENOENT") {
             throw new Error(res.error);
         }
-        if (meta.size > res) {
+        if (!res.error && res > meta.size) {
             throw new Error("uploaded size exceeds file size");
         }
         // append chunk to existing file
@@ -67,8 +69,16 @@ export default async function uploadChunk({ host, id, body, offset, end, size, }
             // save metadata
             const fileBytes = Buffer.from(JSON.stringify(metaData, null, 2));
             await writeFile(path.join(metaDir, `${id}.json`), fileBytes);
-            const payload = { uploaded: meta.uploaded, finished };
-            const hookData = await applyHook("afterChunkedUpload", { id, meta });
+            const payload = {
+                uploaded: meta.uploaded,
+                finished,
+                filepath: path.posix.join(meta.relativeDirpath, meta.fileName),
+            };
+            const hookData = await applyHook("afterChunkedUpload", {
+                id,
+                meta,
+                payload,
+            });
             return hookData || payload;
         }
         return { uploaded: meta.uploaded, finished };

package/dist/server/routes/table/controllers/suggest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"suggest.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/suggest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAuBpD,wBAAsB,kBAAkB,CAAC,EACvC,KAAK,EACL,QAAQ,EACR,MAAM,EACN,UAAU,EACV,QAAQ,EACR,UAAU,EACV,GAAG,EACH,EAAqB,GACtB,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,GAAG,CAAC;IACZ,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,UAAU,CAAC;CACjB;;;;;UA+EA;AAED,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAmXzD"}
+{"version":3,"file":"suggest.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/suggest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAuBpD,wBAAsB,kBAAkB,CAAC,EACvC,KAAK,EACL,QAAQ,EACR,MAAM,EACN,UAAU,EACV,QAAQ,EACR,UAAU,EACV,GAAG,EACH,EAAqB,GACtB,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,GAAG,CAAC;IACZ,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,UAAU,CAAC;CACjB;;;;;UAwFA;AAED,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBA0XzD"}

package/dist/server/routes/table/controllers/suggest.js

@@ -27,6 +27,14 @@ export async function getTableColumnMeta({ table, template, column, selectName,
         .filter((el) => !el.disabled && el.sql && el.sql.includes(column) && false)
         .map((el, i) => ` left join lateral (${el.sql}) ${el.name || `t${i}`} on 1=1 `)
         ?.join("") || "";
+    if (arr?.length && !arr.find((el) => el.id === "null")) {
+        arr.push({
+            color: "#B8B8B8",
+            icon: null,
+            id: "null",
+            text: "None",
+        });
+    }
     // w/out select
     const searchQueryDefault = startsWith && key
         ? `(left(lower("text"::text),${key.length}) = $1 )`
@@ -176,7 +184,7 @@ export default async function suggest(req, reply) {
         if (tableName && pg?.pk?.[tableName] && columnName) {
             const qRes = await pg.queryCache(sqlCls, { table: tableName });
             const vals = (query.count
-                ? qRes.rows?.map?.((el) => el.value?.toString?.())
+                ? qRes.rows?.map?.((el) => el.value?.toString?.() || null)
                 : qRes.rows?.[0]?.array_agg) || [];
             const lower = query.key?.toLowerCase?.();
             const data1 = query.key || query.val
@@ -185,7 +193,9 @@ export default async function suggest(req, reply) {
                     (el[lang] || el.text)?.toLowerCase()?.indexOf(lower) !== -1)
                     ?.filter((el) => !query.val || query.val?.split?.(",")?.includes?.(el.id))
                 : arr;
-            const data2 = data1.filter((el) => el.id && vals.includes(el.id.toString()));
+            const data2 = data1.filter((el) => el.id === "null"
+                ? vals.includes(null)
+                : el.id && vals.includes(el.id.toString()));
             const data = data2.slice(0, Math.min(query.limit || limit, limit));
             if (data.length && query.count) {
                 const counts = qRes.rows?.reduce?.((acc, curr) => ({
@@ -245,7 +255,7 @@ export default async function suggest(req, reply) {
         };
     }
     // select, with search by text support
-    const search = query.key ? searchQuery : null;
+    const search = query.key && typeof query.key === "string" ? searchQuery : null;
     // filter by value
     const val = query.val
         ? `${meta.pk}=any('{${query.val.replace(/'/g, "''")}}')`
@@ -258,13 +268,22 @@ export default async function suggest(req, reply) {
     const where = [search, val, filter, meta.pk ? `${meta.pk} is not null` : null]
         .filter(Boolean)
         .join(" and ") || "true";
-    const sqlSuggest = `with c(id,text) as ( ${meta.original.replace(/{{parent}}/gi, parent)} where ${where} ${meta.original.toLowerCase().includes("order by") ? "" : "order by 2"}) select * from c where ${filter} limit ${Math.min(query.limit || meta.limit || limit, limit)}`.replace(/{{uid}}/g, user?.uid || "0");
+    // const sqlSuggest = `with c(id,text) as ( ${meta.original.replace(/{{parent}}/gi, parent)} where ${where} ${meta.original.toLowerCase().includes("order by") ? "" : "order by 2"}) select * from c where ${filter} limit ${Math.min(query.limit || meta.limit || limit, limit)}`.replace(/{{uid}}/g, user?.uid || "0");
+    const sqlSuggest = `${meta.original}
+  WHERE EXISTS ( SELECT 1 FROM ${tableName} o WHERE o.${column} IS NOT DISTINCT FROM c.id ) and ${val || "true"} and ${search || "true"}
+  ${meta.original.toLowerCase().includes("order by") ? "" : "order by 2"}
+  LIMIT ${Math.min(query.limit || meta.limit || limit, limit)}`
+        .replace(/{{parent}}/gi, parent)
+        .replace(/{{uid}}/g, user?.uid || "0");
     if (query.sql && debugMode) {
         return sqlSuggest;
     }
-    const { rows: dataNew } = await pg.query(sqlSuggest, query.key ? [query.key.toLowerCase()] : []);
+    const { rows: dataNew } = await pg.query(sqlSuggest, query.key && typeof query.key === "string" ? [query.key.toLowerCase()] : []);
     // in case id / text = Boolean
     const data = dataNew.filter((el) => Object.hasOwn(el, "id") && Object.hasOwn(el, "text"));
+    data
+        .filter((el) => el.id === null)
+        .forEach((el) => Object.assign(el, { id: "null", text: "None" }));
     // table:column + select
     if (tableName && column) {
         const { name = selectName || column, type = "select" } = getColumnCLS(tableName, column) || {};

package/package.json

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