@budibase/backend-core 2.26.0 → 2.26.2

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 (8) hide show
  1. package/dist/index.js +81 -78
  2. package/dist/index.js.map +3 -3
  3. package/dist/index.js.meta.json +1 -1
  4. package/dist/package.json +4 -5
  5. package/dist/src/objectStore/utils.js +6 -3
  6. package/dist/src/objectStore/utils.js.map +1 -1
  7. package/package.json +4 -5
  8. package/src/objectStore/utils.ts +8 -4
package/dist/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@budibase/backend-core",
3
- "version": "2.26.0",
3
+ "version": "2.26.2",
4
4
  "description": "Budibase backend core libraries used in server and worker",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/src/index.d.ts",
@@ -23,8 +23,8 @@
23
23
  "dependencies": {
24
24
  "@budibase/nano": "10.1.5",
25
25
  "@budibase/pouchdb-replication-stream": "1.2.10",
26
- "@budibase/shared-core": "2.26.0",
27
- "@budibase/types": "2.26.0",
26
+ "@budibase/shared-core": "2.26.2",
27
+ "@budibase/types": "2.26.2",
28
28
  "@govtechsg/passport-openidconnect": "^1.0.2",
29
29
  "aws-cloudfront-sign": "3.0.2",
30
30
  "aws-sdk": "2.1030.0",
@@ -73,7 +73,6 @@
73
73
  "chance": "1.1.8",
74
74
  "ioredis-mock": "8.9.0",
75
75
  "jest": "29.7.0",
76
- "jest-environment-node": "29.7.0",
77
76
  "jest-serial-runner": "1.2.1",
78
77
  "pino-pretty": "10.0.0",
79
78
  "pouchdb-adapter-memory": "7.2.2",
@@ -96,5 +95,5 @@
96
95
  }
97
96
  }
98
97
  },
99
- "gitHead": "a7b9a5e059543bc51a4d3393dd1f54bc98d61dec"
98
+ "gitHead": "3d3bff09f82a7994168af6c475616750c0e9163a"
100
99
  }
package/dist/src/objectStore/utils.js CHANGED
@@ -41,6 +41,7 @@ const os_1 = require("os");
41
41
  const fs_1 = __importDefault(require("fs"));
42
42
  const environment_1 = __importDefault(require("../environment"));
43
43
  const objectStore = __importStar(require("./objectStore"));
44
+ const stream_1 = __importDefault(require("stream"));
44
45
  /****************************************************
45
46
  * NOTE: When adding a new bucket - name *
46
47
  * sure that S3 usages (like budibase-infra) *
@@ -80,11 +81,10 @@ const bucketTTLConfig = (bucketName, days) => {
80
81
  const lifecycleConfiguration = {
81
82
  Rules: [lifecycleRule],
82
83
  };
83
- const params = {
84
+ return {
84
85
  Bucket: bucketName,
85
86
  LifecycleConfiguration: lifecycleConfiguration,
86
87
  };
87
- return params;
88
88
  };
89
89
  exports.bucketTTLConfig = bucketTTLConfig;
90
90
  function processUrlAttachment(attachment) {
@@ -94,9 +94,12 @@ function processUrlAttachment(attachment) {
94
94
  throw new Error(`Unexpected response ${response.statusText}`);
95
95
  }
96
96
  const fallbackFilename = path_1.default.basename(new URL(attachment.url).pathname);
97
+ if (!response.body) {
98
+ throw new Error("No response received for attachment");
99
+ }
97
100
  return {
98
101
  filename: attachment.filename || fallbackFilename,
99
- content: response.body,
102
+ content: stream_1.default.Readable.fromWeb(response.body),
100
103
  };
101
104
  });
102
105
  }
package/dist/src/objectStore/utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/objectStore/utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/objectStore/utils.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@budibase/backend-core",
3
- "version": "2.26.0",
3
+ "version": "2.26.2",
4
4
  "description": "Budibase backend core libraries used in server and worker",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/src/index.d.ts",
@@ -23,8 +23,8 @@
23
23
  "dependencies": {
24
24
  "@budibase/nano": "10.1.5",
25
25
  "@budibase/pouchdb-replication-stream": "1.2.10",
26
- "@budibase/shared-core": "2.26.0",
27
- "@budibase/types": "2.26.0",
26
+ "@budibase/shared-core": "2.26.2",
27
+ "@budibase/types": "2.26.2",
28
28
  "@govtechsg/passport-openidconnect": "^1.0.2",
29
29
  "aws-cloudfront-sign": "3.0.2",
30
30
  "aws-sdk": "2.1030.0",
@@ -73,7 +73,6 @@
73
73
  "chance": "1.1.8",
74
74
  "ioredis-mock": "8.9.0",
75
75
  "jest": "29.7.0",
76
- "jest-environment-node": "29.7.0",
77
76
  "jest-serial-runner": "1.2.1",
78
77
  "pino-pretty": "10.0.0",
79
78
  "pouchdb-adapter-memory": "7.2.2",
@@ -96,5 +95,5 @@
96
95
  }
97
96
  }
98
97
  },
99
- "gitHead": "a7b9a5e059543bc51a4d3393dd1f54bc98d61dec"
98
+ "gitHead": "3d3bff09f82a7994168af6c475616750c0e9163a"
100
99
  }
package/src/objectStore/utils.ts CHANGED
@@ -9,6 +9,9 @@ import {
9
9
  AutomationAttachmentContent,
10
10
  BucketedContent,
11
11
  } from "@budibase/types"
12
+ import stream from "stream"
13
+ import streamWeb from "node:stream/web"
14
+
12
15
  /****************************************************
13
16
  * NOTE: When adding a new bucket - name *
14
17
  * sure that S3 usages (like budibase-infra) *
@@ -53,12 +56,10 @@ export const bucketTTLConfig = (
53
56
  Rules: [lifecycleRule],
54
57
  }
55
58
 
56
- const params = {
59
+ return {
57
60
  Bucket: bucketName,
58
61
  LifecycleConfiguration: lifecycleConfiguration,
59
62
  }
60
-
61
- return params
62
63
  }
63
64
 
64
65
  async function processUrlAttachment(
@@ -69,9 +70,12 @@ async function processUrlAttachment(
69
70
  throw new Error(`Unexpected response ${response.statusText}`)
70
71
  }
71
72
  const fallbackFilename = path.basename(new URL(attachment.url).pathname)
73
+ if (!response.body) {
74
+ throw new Error("No response received for attachment")
75
+ }
72
76
  return {
73
77
  filename: attachment.filename || fallbackFilename,
74
- content: response.body,
78
+ content: stream.Readable.fromWeb(response.body as streamWeb.ReadableStream),
75
79
  }
76
80
  }
77
81