fix: try uploading not in parallel (#1066)

* fix: try using upload

* added aws-sdk dependency + oclif host

* move to devDependencies

---------

Co-authored-by: enjenjenje <[email protected]>

Author: shamsartem

.github/workflows/pack.yml

@@ -164,7 +164,6 @@ jobs:
           key: ${{ env.cache-name }}-${{ inputs.node-version }}-${{ inputs.platform }}
 
       - name: Pack fluence-cli
-        working-directory: packages/cli/package
         run: yarn pack-${{ inputs.platform }}
 
       - name: Upload fluence-cli

packages/cli/package/.yarn/patches/oclif-patch-c5b232dd7e.patch

@@ -0,0 +1,35 @@
+diff --git a/lib/aws.js b/lib/aws.js
+index de23a617995470968ef472e242a9de263bc6f363..e27793ede9c02e841e7bca2ca2a53544b9f11f25 100644
+--- a/lib/aws.js
++++ b/lib/aws.js
+@@ -2,9 +2,10 @@
+ Object.defineProperty(exports, "__esModule", { value: true });
+ const client_cloudfront_1 = require("@aws-sdk/client-cloudfront");
+ const client_s3_1 = require("@aws-sdk/client-s3");
++const lib_storage_1 = require("@aws-sdk/lib-storage");
++const promises_1 = require("node:fs/promises");
+ const errors_1 = require("@oclif/core/errors");
+ const ux_1 = require("@oclif/core/ux");
+-const fs_extra_1 = require("fs-extra");
+ const log_1 = require("./log");
+ const util_1 = require("./util");
+ const debug = log_1.debug.new('aws');
+@@ -129,11 +130,13 @@ exports.default = {
+                 ux_1.ux.stdout();
+                 if (dryRun)
+                     return;
+-                options.Body = (0, fs_extra_1.createReadStream)(local);
+-                aws.s3
+-                    ?.send(new client_s3_1.PutObjectCommand(options))
+-                    .then((data) => resolve(data))
+-                    .catch((error) => reject(error));
++                promises_1.readFile(local).then((Body) => {
++                    options.Body = Body;
++                    new lib_storage_1.Upload({ client: aws.s3, params: options })
++                        .done()
++                        .then((data) => resolve(data))
++                        .catch((error) => reject(error));
++                })
+             }),
+         };
+     },

packages/cli/package/package.json

@@ -103,6 +103,7 @@
   },
   "devDependencies": {
     "@actions/core": "1.11.1",
+    "@aws-sdk/lib-storage": "^3.501.0",
     "@tsconfig/node22": "^22.0.0",
     "@tsconfig/strictest": "^2.0.5",
     "@types/debug": "4.1.12",
@@ -123,7 +124,7 @@
     "globby": "14",
     "madge": "8.0.0",
     "npm-check-updates": "17.1.4",
-    "oclif": "patch:oclif@npm%3A4.15.9#~/.yarn/patches/oclif-npm-4.15.9-f51cd140c1.patch",
+    "oclif": "patch:oclif@patch%3Aoclif@npm%253A4.15.9%23~/.yarn/patches/oclif-npm-4.15.9-f51cd140c1.patch%3A%3Aversion=4.15.9&hash=ce7fb7#~/.yarn/patches/oclif-patch-c5b232dd7e.patch",
     "proper-lockfile": "4.1.2",
     "shx": "0.3.4",
     "ts-prune": "0.10.3",
@@ -182,6 +183,7 @@
     },
     "update": {
       "s3": {
+        "host": "https://s3.console.aws.amazon.com/",
         "bucket": "fcli-binaries",
         "xz": false
       }

packages/cli/package/yarn.lock

@@ -538,6 +538,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@aws-sdk/lib-storage@npm:^3.501.0":
+  version: 3.682.0
+  resolution: "@aws-sdk/lib-storage@npm:3.682.0"
+  dependencies:
+    "@smithy/abort-controller": "npm:^3.1.5"
+    "@smithy/middleware-endpoint": "npm:^3.1.4"
+    "@smithy/smithy-client": "npm:^3.4.0"
+    buffer: "npm:5.6.0"
+    events: "npm:3.3.0"
+    stream-browserify: "npm:3.0.0"
+    tslib: "npm:^2.6.2"
+  peerDependencies:
+    "@aws-sdk/client-s3": ^3.682.0
+  checksum: 10c0/4305ff4e5b6f4a4df811535bb99256dcaf4a8e46f622858d8a7288d84021492e55246e449fb2d08bfab1653864db7546646ecb94360f0eea9555de4bd3f297f8
+  languageName: node
+  linkType: hard
+
 "@aws-sdk/middleware-bucket-endpoint@npm:3.667.0":
   version: 3.667.0
   resolution: "@aws-sdk/middleware-bucket-endpoint@npm:3.667.0"
@@ -1404,6 +1421,7 @@ __metadata:
   resolution: "@fluencelabs/cli@workspace:."
   dependencies:
     "@actions/core": "npm:1.11.1"
+    "@aws-sdk/lib-storage": "npm:^3.501.0"
     "@fluencelabs/air-beautify-wasm": "npm:0.4.0"
     "@fluencelabs/aqua-api": "npm:0.14.11"
     "@fluencelabs/aqua-to-js": "npm:0.3.13"
@@ -1457,7 +1475,7 @@ __metadata:
     node_modules-path: "npm:2.0.8"
     npm: "npm:10.9.0"
     npm-check-updates: "npm:17.1.4"
-    oclif: "patch:oclif@npm%3A4.15.9#~/.yarn/patches/oclif-npm-4.15.9-f51cd140c1.patch"
+    oclif: "patch:oclif@patch%3Aoclif@npm%253A4.15.9%23~/.yarn/patches/oclif-npm-4.15.9-f51cd140c1.patch%3A%3Aversion=4.15.9&hash=ce7fb7#~/.yarn/patches/oclif-patch-c5b232dd7e.patch"
     parse-duration: "npm:1.1.0"
     platform: "npm:1.3.6"
     proper-lockfile: "npm:4.1.2"
@@ -5092,7 +5110,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"base64-js@npm:^1.3.1":
+"base64-js@npm:^1.0.2, base64-js@npm:^1.3.1":
   version: 1.5.1
   resolution: "base64-js@npm:1.5.1"
   checksum: 10c0/f23823513b63173a001030fae4f2dabe283b99a9d324ade3ad3d148e218134676f1ee8568c877cd79ec1c53158dcf2d2ba527a97c606618928ba99dd930102bf
@@ -5250,6 +5268,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"buffer@npm:5.6.0":
+  version: 5.6.0
+  resolution: "buffer@npm:5.6.0"
+  dependencies:
+    base64-js: "npm:^1.0.2"
+    ieee754: "npm:^1.1.4"
+  checksum: 10c0/07037a0278b07fbc779920f1ba1b473933ffb4a2e2f7b387c55daf6ac64a05b58c27da9e85730a4046e8f97a49f8acd9f7bf89605c0a4dfda88ebfb7e08bfe4a
+  languageName: node
+  linkType: hard
+
 "buffer@npm:^5.5.0":
   version: 5.7.1
   resolution: "buffer@npm:5.7.1"
@@ -7030,6 +7058,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"events@npm:3.3.0":
+  version: 3.3.0
+  resolution: "events@npm:3.3.0"
+  checksum: 10c0/d6b6f2adbccbcda74ddbab52ed07db727ef52e31a61ed26db9feb7dc62af7fc8e060defa65e5f8af9449b86b52cc1a1f6a79f2eafcf4e62add2b7a1fa4a432f6
+  languageName: node
+  linkType: hard
+
 "exponential-backoff@npm:^3.1.1":
   version: 3.1.1
   resolution: "exponential-backoff@npm:3.1.1"
@@ -7982,7 +8017,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ieee754@npm:^1.1.13, ieee754@npm:^1.1.8, ieee754@npm:^1.2.1":
+"ieee754@npm:^1.1.13, ieee754@npm:^1.1.4, ieee754@npm:^1.1.8, ieee754@npm:^1.2.1":
   version: 1.2.1
   resolution: "ieee754@npm:1.2.1"
   checksum: 10c0/b0782ef5e0935b9f12883a2e2aa37baa75da6e66ce6515c168697b42160807d9330de9a32ec1ed73149aea02e0d822e572bca6f1e22bdcbd2149e13b050b17bb
@@ -8055,7 +8090,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.3, inherits@npm:^2.0.4":
+"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.4":
   version: 2.0.4
   resolution: "inherits@npm:2.0.4"
   checksum: 10c0/4e531f648b29039fb7426fb94075e6545faa1eb9fe83c29f0b6d9e7263aceb4289d2d4557db0d428188eeb449cc7c5e77b0a0b2c4e248ff2a65933a0dee49ef2
@@ -10657,7 +10692,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"oclif@patch:oclif@npm%3A4.15.9#~/.yarn/patches/oclif-npm-4.15.9-f51cd140c1.patch":
+"oclif@patch:oclif@npm%3A4.15.9#~/.yarn/patches/oclif-npm-4.15.9-f51cd140c1.patch::version=4.15.9&hash=ce7fb7":
   version: 4.15.9
   resolution: "oclif@patch:oclif@npm%3A4.15.9#~/.yarn/patches/oclif-npm-4.15.9-f51cd140c1.patch::version=4.15.9&hash=ce7fb7"
   dependencies:
@@ -10691,6 +10726,40 @@ __metadata:
   languageName: node
   linkType: hard
 
+"oclif@patch:oclif@patch%3Aoclif@npm%253A4.15.9%23~/.yarn/patches/oclif-npm-4.15.9-f51cd140c1.patch%3A%3Aversion=4.15.9&hash=ce7fb7#~/.yarn/patches/oclif-patch-c5b232dd7e.patch":
+  version: 4.15.9
+  resolution: "oclif@patch:oclif@patch%3Aoclif@npm%253A4.15.9%23~/.yarn/patches/oclif-npm-4.15.9-f51cd140c1.patch%3A%3Aversion=4.15.9&hash=ce7fb7#~/.yarn/patches/oclif-patch-c5b232dd7e.patch::version=4.15.9&hash=65d2c4"
+  dependencies:
+    "@aws-sdk/client-cloudfront": "npm:^3.665.0"
+    "@aws-sdk/client-s3": "npm:^3.670.0"
+    "@inquirer/confirm": "npm:^3.1.22"
+    "@inquirer/input": "npm:^2.2.4"
+    "@inquirer/select": "npm:^2.5.0"
+    "@oclif/core": "npm:^4.0.28"
+    "@oclif/plugin-help": "npm:^6.2.14"
+    "@oclif/plugin-not-found": "npm:^3.2.21"
+    "@oclif/plugin-warn-if-update-available": "npm:^3.1.11"
+    async-retry: "npm:^1.3.3"
+    chalk: "npm:^4"
+    change-case: "npm:^4"
+    debug: "npm:^4.3.4"
+    ejs: "npm:^3.1.10"
+    find-yarn-workspace-root: "npm:^2.0.0"
+    fs-extra: "npm:^8.1"
+    github-slugger: "npm:^2"
+    got: "npm:^13"
+    lodash: "npm:^4.17.21"
+    normalize-package-data: "npm:^6"
+    semver: "npm:^7.6.3"
+    sort-package-json: "npm:^2.10.1"
+    tiny-jsonc: "npm:^1.0.1"
+    validate-npm-package-name: "npm:^5.0.1"
+  bin:
+    oclif: bin/run.js
+  checksum: 10c0/a2d4b8af5d0ca98ce193232a3c29681beda4d5868510c471448f040ef635add5e3be800dad23814235e7949919431ad57ea8b6932dc465c2e5c340243b2b5779
+  languageName: node
+  linkType: hard
+
 "on-finished@npm:2.4.1":
   version: 2.4.1
   resolution: "on-finished@npm:2.4.1"
@@ -11683,7 +11752,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0, readable-stream@npm:^3.6.0":
+"readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0, readable-stream@npm:^3.5.0, readable-stream@npm:^3.6.0":
   version: 3.6.2
   resolution: "readable-stream@npm:3.6.2"
   dependencies:
@@ -12527,6 +12596,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"stream-browserify@npm:3.0.0":
+  version: 3.0.0
+  resolution: "stream-browserify@npm:3.0.0"
+  dependencies:
+    inherits: "npm:~2.0.4"
+    readable-stream: "npm:^3.5.0"
+  checksum: 10c0/ec3b975a4e0aa4b3dc5e70ffae3fc8fd29ac725353a14e72f213dff477b00330140ad014b163a8cbb9922dfe90803f81a5ea2b269e1bbfd8bd71511b88f889ad
+  languageName: node
+  linkType: hard
+
 "stream-to-array@npm:^2.3.0":
   version: 2.3.0
   resolution: "stream-to-array@npm:2.3.0"