Merge branch 'main' into fix-flaky-file-state-store-2

Author: WilliamBergamin

packages/cli-hooks/package.json

@@ -63,6 +63,6 @@
     "mocha-multi-reporters": "^1.5.1",
     "shx": "^0.4.0",
     "sinon": "^20.0.0",
-    "typescript": "5.8.2"
+    "typescript": "5.8.3"
   }
 }

packages/cli-test/package.json

@@ -47,6 +47,6 @@
     "shx": "^0.4.0",
     "sinon": "^20.0.0",
     "ts-node": "^10.9.2",
-    "typescript": "5.8.2"
+    "typescript": "5.8.3"
   }
 }

packages/oauth/package.json

@@ -53,6 +53,6 @@
     "sinon": "^20",
     "source-map-support": "^0.5.21",
     "ts-node": "^10",
-    "typescript": "5.8.2"
+    "typescript": "5.8.3"
   }
 }

packages/socket-mode/package.json

@@ -71,6 +71,6 @@
     "sinon": "^20",
     "source-map-support": "^0.5.21",
     "ts-node": "^10",
-    "typescript": "5.7.3"
+    "typescript": "5.8.3"
   }
 }

packages/types/package.json

@@ -32,7 +32,7 @@
   "devDependencies": {
     "@biomejs/biome": "^1.8.3",
     "shx": "^0.4.0",
-    "tsd": "^0.31.0",
+    "tsd": "^0.32.0",
     "typescript": "^5.5.4"
   },
   "tsd": {

packages/web-api/package.json

@@ -61,13 +61,13 @@
     "mocha": "^11",
     "mocha-junit-reporter": "^2.2.1",
     "mocha-multi-reporters": "^1.5.1",
-    "nock": "^13",
+    "nock": "^14",
     "shx": "^0.4.0",
     "sinon": "^20",
     "source-map-support": "^0.5.21",
     "ts-node": "^10",
-    "tsd": "^0.31.1",
-    "typescript": "5.3.3"
+    "tsd": "^0.32.0",
+    "typescript": "5.8.3"
   },
   "tsd": {
     "directory": "test/types"

packages/web-api/src/WebClient.spec.ts

@@ -1,7 +1,7 @@
 import fs from 'node:fs';
 import axios, { type InternalAxiosRequestConfig } from 'axios';
 import { assert, expect } from 'chai';
-import nock from 'nock';
+import nock, { type ReplyHeaders } from 'nock';
 import sinon from 'sinon';
 import {
   type RequestConfig,
@@ -801,7 +801,7 @@ describe('WebClient', () => {
 
   describe('has an option to set request concurrency', () => {
     // TODO: factor out common logic into test helpers
-    const responseDelay = 100; // ms
+    const responseDelay = 500; // ms
     let testStart: number;
     let scope: nock.Scope;
 
@@ -1102,14 +1102,15 @@ describe('WebClient', () => {
   });
 
   it('should throw an error if the response has no retry info', async () => {
-    // @ts-expect-error header values cannot be undefined
-    const scope = nock('https://slack.com').post(/api/).reply(429, {}, { 'retry-after': undefined });
+    const emptyHeaders: ReplyHeaders & { 'retry-after'?: never } = {}; // Ensure that 'retry-after' is not in the headers
+    const scope = nock('https://slack.com').post(/api/).reply(429, {}, emptyHeaders);
     const client = new WebClient(token);
     try {
       await client.apiCall('method');
       assert.fail('expected error to be thrown');
     } catch (err) {
       assert.instanceOf(err, Error);
+    } finally {
       scope.done();
     }
   });

packages/web-api/src/file-upload.ts

@@ -5,6 +5,7 @@ import type { Logger } from '@slack/logger';
 
 import { ErrorCode, errorWithCode } from './errors';
 import type {
+  FileThreadDestinationArgument,
   FileUploadV2,
   FileUploadV2Job,
   FilesCompleteUploadExternalArguments,
@@ -200,10 +201,10 @@ export async function getFileDataAsStream(readable: Readable): Promise<Buffer> {
 
   return new Promise((resolve, reject) => {
     readable.on('readable', () => {
-      let chunk: Buffer;
-      // biome-ignore lint/suspicious/noAssignInExpressions: being terse, this is OK
-      while ((chunk = readable.read()) !== null) {
+      let chunk = readable.read();
+      while (chunk !== null) {
         chunks.push(chunk);
+        chunk = readable.read();
       }
     });
     readable.on('end', () => {
@@ -240,8 +241,15 @@ export function getAllFileUploadsToComplete(
           channel_id,
           initial_comment,
         };
-        if (thread_ts) {
-          toComplete[compareString].thread_ts = upload.thread_ts;
+        if (thread_ts && channel_id) {
+          const fileThreadDestinationArgument: FileThreadDestinationArgument = {
+            channel_id,
+            thread_ts,
+          };
+          toComplete[compareString] = {
+            ...toComplete[compareString],
+            ...fileThreadDestinationArgument,
+          };
         }
         if ('token' in upload) {
           toComplete[compareString].token = upload.token;