@opengis/fastify-table 2.2.1 → 2.2.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (13) hide show
  1. package/dist/server/plugins/file/providers/fs.d.ts.map +1 -1
  2. package/dist/server/plugins/file/providers/fs.js +2 -0
  3. package/dist/server/plugins/file/providers/s3/funcs/downloadFile.d.ts.map +1 -1
  4. package/dist/server/plugins/file/providers/s3/funcs/downloadFile.js +7 -0
  5. package/dist/server/routes/cron/controllers/cronApi.js +1 -1
  6. package/dist/server/routes/file/controllers/files.js +1 -1
  7. package/dist/server/routes/file/controllers/resize.d.ts.map +1 -1
  8. package/dist/server/routes/file/controllers/resize.js +8 -1
  9. package/dist/server/routes/file/controllers/resizeAll.d.ts.map +1 -1
  10. package/dist/server/routes/file/controllers/resizeAll.js +2 -1
  11. package/dist/server/routes/table/functions/getData.d.ts.map +1 -1
  12. package/dist/server/routes/table/functions/getData.js +8 -1
  13. package/package.json +1 -1
package/dist/server/plugins/file/providers/fs.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"fs.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/file/providers/fs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AAoGzB,MAAM,CAAC,OAAO,UAAU,SAAS;qBArFG,MAAM;uBAsB7B,MAAM,YAAW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;;;;qBAwBpC,MAAM,QAAQ,GAAG;2BALX,GAAG,QAAO,GAAG;qBAgCI,MAAM;mBAjER,MAAM,gBAAgB,MAAM;4BAoEnB,GAAG;yBAGN,GAAG;wBAGJ,GAAG;EAezC"}
1
+ {"version":3,"file":"fs.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/file/providers/fs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AAuGzB,MAAM,CAAC,OAAO,UAAU,SAAS;qBAtFG,MAAM;uBAsB7B,MAAM,YAAW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;;;;qBAyBpC,MAAM,QAAQ,GAAG;2BALX,GAAG,QAAO,GAAG;qBAgCI,MAAM;mBAlER,MAAM,gBAAgB,MAAM;4BAqEnB,GAAG;yBAGN,GAAG;wBAGJ,GAAG;EAezC"}
package/dist/server/plugins/file/providers/fs.js CHANGED
@@ -2,6 +2,7 @@ import fs from "node:fs";
2
2
  import fsp from "node:fs/promises";
3
3
  import path from "node:path";
4
4
  import isFileExists from "../utils/isFileExists.js";
5
+ import logger from "../../logger/getLogger.js";
5
6
  import isBuffer from "./utils/typeguards/isBuffer.js";
6
7
  import isReadableStream from "./utils/typeguards/isReadableStream.js";
7
8
  import getValidData from "./utils/getValidData.js";
@@ -36,6 +37,7 @@ const downloadFile = () => async (fp, options = {}) => {
36
37
  return fsp.readFile(filepath);
37
38
  }
38
39
  const fileStream = fs.createReadStream(filepath);
40
+ logger.file("file/download", { provider: "fs", relpath: fp, filepath });
39
41
  return fileStream;
40
42
  };
41
43
  const fileExists = () => async (filepath, opt = {}) => isFileExists(getPath(filepath, opt));
package/dist/server/plugins/file/providers/s3/funcs/downloadFile.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"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,iBA0CnD,CAAC;AAEJ,eAAe,aAAa,CAAC"}
1
+ {"version":3,"file":"downloadFile.d.ts","sourceRoot":"","sources":["../../../../../../../server/plugins/file/providers/s3/funcs/downloadFile.ts"],"names":[],"mappings":"AAiBA,QAAA,MAAM,aAAa,GAChB,aAAa,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,MAC1B,IAAI,MAAM,EAAE,UAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,iBAgDnD,CAAC;AAEJ,eAAe,aAAa,CAAC"}
package/dist/server/plugins/file/providers/s3/funcs/downloadFile.js CHANGED
@@ -3,6 +3,7 @@ import { readFile } from "node:fs/promises";
3
3
  import { createReadStream } from "node:fs";
4
4
  import s3Client from "../client.js";
5
5
  import config from "../../../../../../config.js";
6
+ import logger from "../../../../logger/getLogger.js";
6
7
  import streamToBuffer from "../../utils/streamToBuffer.js";
7
8
  // if not found on s3 => fs
8
9
  import fsFuncs from "../../fs.js";
@@ -17,6 +18,7 @@ const getFileStream = (s3Settings) => async (fp, options = {}) => {
17
18
  };
18
19
  try {
19
20
  const data = await s3Client.send(new GetObjectCommand(bucketParams));
21
+ logger.file("file/download", { provider: "s3", filepath });
20
22
  if (options.buffer) {
21
23
  return streamToBuffer(data.Body);
22
24
  }
@@ -36,6 +38,11 @@ const getFileStream = (s3Settings) => async (fp, options = {}) => {
36
38
  if (!exists) {
37
39
  return null;
38
40
  }
41
+ logger.file("file/download", {
42
+ provider: "fs/fallback",
43
+ relpath: fp,
44
+ filepath: filepath1,
45
+ });
39
46
  if (options.buffer) {
40
47
  return readFile(filepath1);
41
48
  }
package/dist/server/routes/cron/controllers/cronApi.js CHANGED
@@ -13,6 +13,6 @@ export default async function cronApi(req, reply) {
13
13
  .status(404)
14
14
  .send({ error: `cron not found: ${params.name}`, code: 404 });
15
15
  }
16
- const result = await cronList[params.name]?.(req);
16
+ const result = await cronList[params.name]?.(req, reply);
17
17
  return result;
18
18
  }
package/dist/server/routes/file/controllers/files.js CHANGED
@@ -30,7 +30,7 @@ export default async function getFile({ params, user }, reply) {
30
30
  if (params["*"].includes("../")) {
31
31
  return reply.status(403).send({ error: "wrong params", code: 403 });
32
32
  }
33
- const relpath = (params["*"].startsWith("/") ? params["*"].slice(1) : params["*"]).replace(/files\//g, "") + (params["*"].endsWith("/") ? "index.html" : "");
33
+ const relpath = (params["*"].startsWith("/") ? params["*"].slice(1) : params["*"]).replace(/^files\//g, "") + (params["*"].endsWith("/") ? "index.html" : "");
34
34
  if (!relpath) {
35
35
  return reply
36
36
  .status(400)
package/dist/server/routes/file/controllers/resize.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"resize.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/resize.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAwC5C;;GAEG;AAEH,wBAA8B,MAAM,CAClC,EACE,KAAK,GACN,EAAE;IACD,KAAK,EAAE;QACL,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QAC1B,IAAI,EAAE,MAAM,CAAC;QACb,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,OAAO,CAAC,EAAE,GAAG,CAAC;QACd,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,GAAG,CAAC;KACf,CAAC;CACH,EACD,KAAK,EAAE,YAAY,kBA8IpB"}
1
+ {"version":3,"file":"resize.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/resize.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAyC5C;;GAEG;AAEH,wBAA8B,MAAM,CAClC,EACE,KAAK,GACN,EAAE;IACD,KAAK,EAAE;QACL,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QAC1B,IAAI,EAAE,MAAM,CAAC;QACb,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,OAAO,CAAC,EAAE,GAAG,CAAC;QACd,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,GAAG,CAAC;KACf,CAAC;CACH,EACD,KAAK,EAAE,YAAY,kBAoJpB"}
package/dist/server/routes/file/controllers/resize.js CHANGED
@@ -7,6 +7,7 @@ import { config, downloadFile,
7
7
  isFileExists, getFolder, } from "../../../../utils.js";
8
8
  import grpc from "../../../plugins/grpc/grpc.js";
9
9
  import getMimeType from "../../../plugins/file/providers/mime/index.js";
10
+ import { mkdir } from "node:fs/promises";
10
11
  const defaultWidth = 400;
11
12
  const defaultHeight = 240;
12
13
  const maxWidth = 2000;
@@ -107,13 +108,19 @@ export default async function resize({ query, }, reply) {
107
108
  quality: resizeQuality,
108
109
  });
109
110
  // await uploadFile(resizePath, Buffer.from(result, "base64"));
111
+ await mkdir(path.dirname(path.join(rootDir, resizePath)), {
112
+ recursive: true,
113
+ });
110
114
  await writeFile(path.join(rootDir, resizePath), Buffer.from(result, "base64"));
111
115
  if (format === "webp") {
112
116
  const buffer = await sharp(Buffer.from(result, "base64"))
113
117
  .webp({ quality: resizeQuality })
114
118
  .toBuffer({ resolveWithObject: false });
115
- await writeFile(path.join(rootDir, resizePath2), buffer);
116
119
  // await uploadFile(resizePath2, buffer);
120
+ await mkdir(path.dirname(path.join(rootDir, resizePath2)), {
121
+ recursive: true,
122
+ });
123
+ await writeFile(path.join(rootDir, resizePath2), buffer);
117
124
  return reply.headers({ "Content-Type": "image/webp" }).send(buffer);
118
125
  }
119
126
  return reply
package/dist/server/routes/file/controllers/resizeAll.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"resizeAll.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/resizeAll.ts"],"names":[],"mappings":"AAyHA,wBAA8B,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAsH3D"}
1
+ {"version":3,"file":"resizeAll.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/resizeAll.ts"],"names":[],"mappings":"AA0HA,wBAA8B,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAsH3D"}
package/dist/server/routes/file/controllers/resizeAll.js CHANGED
@@ -1,6 +1,6 @@
1
1
  /* eslint-disable no-console */
2
2
  import path from "node:path";
3
- import { writeFile } from "node:fs/promises";
3
+ import { writeFile, mkdir } from "node:fs/promises";
4
4
  import { imageSize } from "image-size";
5
5
  import { config, pgClients, eventStream, logger, isFileExists, downloadFile, uploadFile, getFolder, } from "../../../../utils.js";
6
6
  import grpc from "../../../plugins/grpc/grpc.js";
@@ -59,6 +59,7 @@ async function resizeOne({ relpath: relpath1, resizeQuality = 80, maxWidth = 204
59
59
  quality: resizeQuality,
60
60
  });
61
61
  // await uploadFile(relpath1, Buffer.from(result, "base64"));
62
+ await mkdir(path.dirname(path.join(rootDir, relpath1)), { recursive: true });
62
63
  await writeFile(path.join(rootDir, relpath1), Buffer.from(result, "base64"));
63
64
  send(`resize ${relpath1} success`);
64
65
  success.push(relpath1);
package/dist/server/routes/table/functions/getData.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/functions/getData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAkFzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,KAAK,EACL,EAAE,EACF,OAAY,EACZ,KAAU,EACV,IAAS,EACT,YAAY,EACZ,YAAY,EACZ,KAAY,EACZ,UAAU,EACV,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,gBAAgB,EAC7B,OAAO,EAAE,YAAY,EACrB,QAAgB,GACjB,EAAE;IACD,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,MAAM,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACxD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,EACD,MAAM,CAAC,EAAE,YAAY,EACrB,MAAM,CAAC,EAAE,GAAG,gBAo3Bb"}
1
+ {"version":3,"file":"getData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/functions/getData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAkFzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,KAAK,EACL,EAAE,EACF,OAAY,EACZ,KAAU,EACV,IAAS,EACT,YAAY,EACZ,YAAY,EACZ,KAAY,EACZ,UAAU,EACV,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,gBAAgB,EAC7B,OAAO,EAAE,YAAY,EACrB,QAAgB,GACjB,EAAE;IACD,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,MAAM,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACxD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,EACD,MAAM,CAAC,EAAE,YAAY,EACrB,MAAM,CAAC,EAAE,GAAG,gBA23Bb"}
package/dist/server/routes/table/functions/getData.js CHANGED
@@ -391,6 +391,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
391
391
  id: row.id,
392
392
  table: templateName,
393
393
  form: loadTable?.form,
394
+ resource,
394
395
  obj: tokenData?.obj || hookData?.obj,
395
396
  }),
396
397
  ],
@@ -502,7 +503,12 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
502
503
  });
503
504
  const token = item.form && item.table
504
505
  ? setToken({
505
- ids: [JSON.stringify(item)],
506
+ ids: [
507
+ JSON.stringify({
508
+ ...item,
509
+ resource,
510
+ }),
511
+ ],
506
512
  uid,
507
513
  array: 1,
508
514
  })[0]
@@ -654,6 +660,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
654
660
  const addTokens = setToken({
655
661
  ids: [
656
662
  JSON.stringify({
663
+ resource,
657
664
  table: templateName,
658
665
  form: loadTable?.form,
659
666
  obj: tokenData?.obj || hookData?.obj,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@opengis/fastify-table",
3
- "version": "2.2.1",
3
+ "version": "2.2.3",
4
4
  "type": "module",
5
5
  "description": "core-plugins",
6
6
  "keywords": [