Skip to content

Commit ae53887

Browse files
committed
Make buffers work both in browser and node.js
1 parent 8b78b71 commit ae53887

File tree

3 files changed

+1235
-1260
lines changed

3 files changed

+1235
-1260
lines changed

lib/woqlClient.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
/// /@ts-check
66
const FormData = require('form-data');
77
const fs = require('fs');
8+
const { Buffer } = require('buffer');
89
const typedef = require('./typedef');
910
const CONST = require('./const');
1011
const DispatchRequest = require('./dispatchRequest');
@@ -648,7 +649,7 @@ WOQLClient.prototype.query = function (woql, commitMsg, allWitnesses, lastDataVe
648649
const providedResourcesLookupMap = (resources ?? [])
649650
.reduce((map, res) => ({ ...map, [(res.filename).split('/').pop()]: res.data }), {});
650651

651-
if (woql && woql.json && (!woql.containsUpdate() || commitMsg)) {
652+
if (woql?.json && (!woql.containsUpdate() || commitMsg)) {
652653
const doql = woql.containsUpdate() ? this.generateCommitInfo(commitMsg) : {};
653654
doql.query = woql.json();
654655

@@ -667,14 +668,14 @@ WOQLClient.prototype.query = function (woql, commitMsg, allWitnesses, lastDataVe
667668
const fileName = resourceObject.source.post.split('/').pop();
668669

669670
if (providedResourceInsteadOfFile) {
670-
formData.append("file", new Blob([providedResourceInsteadOfFile], { type: "application/csv" }), fileName)
671+
formData.append('file', Buffer.from(providedResourceInsteadOfFile), { filename: fileName, contentType: 'application/csv' });
671672
} else {
672673
formData.append('file', fs.createReadStream(resourceObject.source.post));
673674
}
674675
resourceObject.source.post = fileName;
675676
});
676677

677-
formData.append('payload', new Blob([JSON.stringify(doql)], { type: 'application/json' }), 'body.json');
678+
formData.append('payload', Buffer.from(JSON.stringify(doql)), { filename: 'body.json', contentType: 'application/json' });
678679
if (formData.getHeaders) {
679680
this.customHeaders(formData.getHeaders());
680681
} else {

0 commit comments

Comments
 (0)