From 2701b6bb264300d35361310c26f1fb160a64b285 Mon Sep 17 00:00:00 2001 From: Nour Alharithi Date: Mon, 26 Feb 2024 12:29:39 -0800 Subject: [PATCH 1/2] more robust promise.all --- src/index.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index e05e454..764b6e2 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1000,6 +1000,8 @@ const main = async (): Promise => { return; } + let hasError = false; + let errorMessage = ''; const l2s = await Promise.all( normedParams.map(async (normedParam) => { const { normedMarketType, normedMarketIndex, error } = @@ -1011,7 +1013,8 @@ const main = async (): Promise => { normedParam['marketName'] as string ); if (error) { - res.status(400).send(`Bad Request: ${error}`); + hasError = true; + errorMessage = `Bad Request: ${error}`; return; } @@ -1136,6 +1139,11 @@ const main = async (): Promise => { }) ); + if (hasError) { + res.status(400).send(errorMessage); + return; + } + res.writeHead(200); res.end(JSON.stringify({ l2s })); } catch (err) { From ae1a131a630ab0d5f064c749dfb804655f8d373d Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 26 Feb 2024 20:44:55 +0000 Subject: [PATCH 2/2] Bumping sdk dependency to 2.65.0-beta.11 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 46812ed..bc80005 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "license": "Apache-2.0", "dependencies": { "@coral-xyz/anchor": "^0.29.0", - "@drift-labs/sdk": "2.65.0-beta.10", + "@drift-labs/sdk": "2.65.0-beta.11", "@opentelemetry/api": "^1.1.0", "@opentelemetry/auto-instrumentations-node": "^0.31.1", "@opentelemetry/exporter-prometheus": "^0.31.0", diff --git a/yarn.lock b/yarn.lock index e5a4674..c32c3ec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -115,10 +115,10 @@ enabled "2.0.x" kuler "^2.0.0" -"@drift-labs/sdk@2.65.0-beta.10": - version "2.65.0-beta.10" - resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.65.0-beta.10.tgz#308122a76d037201d4717dd90dc1f954db4ce56f" - integrity sha512-TdmnSJmlk5Oq/qp4rY2hMoZ9NNTY9iwHP6MmJ1FrabW1U438LR7WjkNDVMLUkyGC+CQmH1+CGN7xwfhyqlPvJg== +"@drift-labs/sdk@2.65.0-beta.11": + version "2.65.0-beta.11" + resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.65.0-beta.11.tgz#c991a4fb895f970bbf52362353ee50c5267b6124" + integrity sha512-R8bKH4/5PItamVMK04CLFt/hUI89oz9ciLfH1YAydoWuHMBCQi1VuU1YdboW+4/DKBDYYSBtSgt4AxrIO50uGw== dependencies: "@coral-xyz/anchor" "0.28.1-beta.2" "@ellipsis-labs/phoenix-sdk" "^1.4.2"