tasiaiso/tildefriends
1
0
Fork 0
forked from cory/tildefriends
Code Issues Pull Requests Releases Wiki Activity

Fixed lots of things about storing blobs.

Browse Source 
git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@3680 ed5197a5-7fde-0310-b194-c3ffbd925b24
This commit is contained in:
Cory McWilliams 2021-10-31 21:15:18 +00:00
parent 08cd0ec878
commit 03a2367532
3 changed files with 49 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/ssb.js
View File

@ -92,13 +92,27 @@ ssb.registerConnectionsChanged(function(change, connection) {
} }
} else { } else {
debug_print("blobs.get", id); debug_print("blobs.get", id);
var received_bytes = 0;
var expected_bytes = message.message[id];
var buffer = new Uint8Array(expected_bytes);
connection.send_json({'name': ['blobs', 'get'], 'type': 'source', 'args': [id]}, function(message) { connection.send_json({'name': ['blobs', 'get'], 'type': 'source', 'args': [id]}, function(message) {
debug_print(id, '=>', debug_utf8Decode(message.message)); buffer.set(new Uint8Array(message.message, 0, message.message.byteLength), received_bytes);
ssb.blobStore(message.message); received_bytes += message.message.byteLength;
if (received_bytes == expected_bytes) {
ssb.blobStore(buffer);
}
}); });
} }
}); });
}); });
followingDeep(g_database, [ssb.whoami()], 2).then(function(ids) {
for (let id of ids) {
var sequence = get_latest_sequence_for_author(id);
connection.send_json({'name': ['createHistoryStream'], 'type': 'source', 'args': [{'id': id, 'seq': sequence}]}, function(message) {
ssb.storeMessage(message.message.value);
});
}
});
} else if (change == 'remove') { } else if (change == 'remove') {
debug_print('REMOVE', connection.id); debug_print('REMOVE', connection.id);
delete g_wants_requests[connection.id]; delete g_wants_requests[connection.id];
@ -110,7 +124,6 @@ ssb.registerConnectionsChanged(function(change, connection) {
ssb.registerRpc(['blobs', 'createWants'], function(request) { ssb.registerRpc(['blobs', 'createWants'], function(request) {
g_wants_requests[request.connection.id] = request; g_wants_requests[request.connection.id] = request;
function blob_want_discovered(id) { function blob_want_discovered(id) {
debug_print('discovered', id);
var message = {}; var message = {};
message[id] = -1; message[id] = -1;
request.send_json(message); request.send_json(message);

18
src/ssb.db.c
View File

@ -218,10 +218,8 @@ bool tf_ssb_db_blob_store(tf_ssb_t* ssb, const uint8_t* blob, size_t size, char*
char id[512]; char id[512];
snprintf(id, sizeof(id), "&%s.sha256", hash64); snprintf(id, sizeof(id), "&%s.sha256", hash64);
printf("blob store %s\n", id);
const char* query = "INSERT INTO blobs (id, content, created) VALUES ($1, $2, CAST(strftime('%s') AS INTEGER)) ON CONFLICT DO NOTHING"; if (sqlite3_prepare(db, "INSERT INTO blobs (id, content, created) VALUES ($1, $2, CAST(strftime('%s') AS INTEGER)) ON CONFLICT DO NOTHING", -1, &statement, NULL) == SQLITE_OK)
if (sqlite3_prepare(db, query, -1, &statement, NULL) == SQLITE_OK)
{ {
if (sqlite3_bind_text(statement, 1, id, -1, NULL) == SQLITE_OK && if (sqlite3_bind_text(statement, 1, id, -1, NULL) == SQLITE_OK &&
sqlite3_bind_blob(statement, 2, blob, size, NULL) == SQLITE_OK) sqlite3_bind_blob(statement, 2, blob, size, NULL) == SQLITE_OK)
@ -239,6 +237,20 @@ bool tf_ssb_db_blob_store(tf_ssb_t* ssb, const uint8_t* blob, size_t size, char*
printf("prepare failed: %s\n", sqlite3_errmsg(db)); printf("prepare failed: %s\n", sqlite3_errmsg(db));
} }
printf("blob store %s %zd => %d\n", id, size, result);
if (result)
{
if (sqlite3_prepare(db, "DELETE FROM blob_wants WHERE id = ?1", -1, &statement, NULL) == SQLITE_OK)
{
if (sqlite3_bind_text(statement, 1, id, -1, NULL) == SQLITE_OK)
{
sqlite3_step(statement);
}
sqlite3_finalize(statement);
}
}
if (result && out_id) if (result && out_id)
{ {
snprintf(out_id, out_id_size, "%s", id); snprintf(out_id, out_id_size, "%s", id);

18
src/ssb.js.c
View File

@ -97,6 +97,24 @@ static JSValue _tf_ssb_blobStore(JSContext* context, JSValueConst this_val, int
result = JS_NewString(context, id); result = JS_NewString(context, id);
} }
} }
else
{
size_t offset;
size_t element_size;
JSValue buffer = tf_try_get_typed_array_buffer(context, argv[0], &offset, &size, &element_size);
if (!JS_IsException(buffer))
{
blob = tf_try_get_array_buffer(context, &size, buffer);
if (blob)
{
if (tf_ssb_db_blob_store(ssb, blob, size, id, sizeof(id)))
{
result = JS_NewString(context, id);
}
}
}
JS_FreeValue(context, buffer);
}
} }
return result; return result;
} }