Skip to content

Update storage-server-hoc-writer.js #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
benjamarle wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update storage-server-hoc-writer.js #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions data-writers/storage-server-hoc-writer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { AsyncStorage } from "react-native";
import StringifyDataWriter from "./stringify-data-writer";
import moment from "moment";
import apisauce from 'apisauce';
import _ from 'lodash';

export default class StorageServerHocWriter {
static SERVER_SEND_STORAGE_KEY = "debug-rows-SERVER_SEND_STORAGE_KEY";
Expand Down Expand Up @@ -93,6 +95,7 @@ export default class StorageServerHocWriter {
);
} finally {
setTimeout(() => {
this.initalSendToServerPromise = null;
this.sendToServerLoop();
}, this.options.sendInterval);
}
Expand Down Expand Up @@ -125,20 +128,17 @@ export default class StorageServerHocWriter {
extraData: this.options.getExtraData(),
};
this.log(`Sending ${rowsToSend.length} log-rows to server`);
const response = await fetch(this.options.serverUrl, {
method: "POST",
body: this.options.serializeData
? this.options.serializeData(data)
: JSON.stringify(data),
headers: {
Accept: "application/json",
"Content-Type": "application/json",
},

const api = apisauce.create({
baseURL: this.options.serverUrl,
timeout: 9000,
});
if (!response.ok) {
this.log(response);
throw new Error("Failed sending logRows to server");
}

const response = await api.post('/', this.options.serializeData
? this.options.serializeData(data)
: JSON.stringify(data)
);

sentToServerRows.forEach(row => (row.success = true));
rowsToSend.forEach(row => this.removeFromSendQueue(row));
return rowsToSend;
Expand All @@ -158,7 +158,7 @@ export default class StorageServerHocWriter {

getPostData(batchSize) {
if (this.sendQueue && this.sendQueue.length) {
const rowsToSend = this.sendQueue.slice(0, batchSize);
const rowsToSend = _.takeRight(this.sendQueue, batchSize);
if (rowsToSend && rowsToSend.length) {
let sentToServerRows = rowsToSend.map(rowToSend => {
let sentToServerRow = this.sentToServerRows.find(
Expand Down