From b14a170dd805c2ffe0e01eeccc36ced788382e92 Mon Sep 17 00:00:00 2001 From: yflory Date: Mon, 26 May 2025 14:34:17 +0200 Subject: [PATCH] Fix issues with WS upload --- lib/commands/upload.js | 2 +- lib/storage/blob.js | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/commands/upload.js b/lib/commands/upload.js index 999f003f0..8a85d1177 100644 --- a/lib/commands/upload.js +++ b/lib/commands/upload.js @@ -75,7 +75,7 @@ Upload.status = function (Env, safeKey, filesize, _cb) { // FIXME FILES }; Upload.upload = function (Env, safeKey, chunk, cb) { - Env.blobStore.upload(safeKey, chunk, cb); + Env.blobStore.uploadWs(safeKey, chunk, cb); }; Upload.cancel = function (Env, safeKey, arg, cb) { diff --git a/lib/storage/blob.js b/lib/storage/blob.js index 4733cd8ef..3fda70217 100644 --- a/lib/storage/blob.js +++ b/lib/storage/blob.js @@ -282,6 +282,7 @@ var uploadWs = function (Env, safeKey, content, cb) { var session = Env.getSession(safeKey); + /* if (typeof(session.currentUploadSize) !== 'number' || typeof(session.pendingUploadSize) !== 'number') { // improperly initialized... maybe they didn't check before uploading? @@ -292,6 +293,7 @@ var uploadWs = function (Env, safeKey, content, cb) { if (session.currentUploadSize > session.pendingUploadSize) { return cb('E_OVER_LIMIT'); } + */ var stagePath = makeStagePath(Env, safeKey); @@ -779,6 +781,11 @@ BlobStore.create = function (config, _cb) { if (!isValidSafeKey(safeKey)) { return void cb('INVALID_SAFEKEY'); } isFile(makeStagePath(Env, safeKey), cb); }, + uploadWs: function (safeKey, content, _cb) { + var cb = Util.once(Util.mkAsync(_cb)); + if (!isValidSafeKey(safeKey)) { return void cb('INVALID_SAFEKEY'); } + uploadWs(Env, safeKey, content, Util.once(Util.mkAsync(cb))); + }, upload: function (safeKey, content, _cb) { var cb = Util.once(Util.mkAsync(_cb)); if (!isValidSafeKey(safeKey)) { return void cb('INVALID_SAFEKEY'); }