Merge branch 'main' into ale-new-block-kit-elements

srtaalej · web-flow · commit 1e98db3029a3 · 2026-05-01T11:51:46.000-04:00
diff --git a/.changeset/simple-tests-shine.md b/.changeset/simple-tests-shine.md
@@ -0,0 +1,4 @@
+---
+---
+
+ci: simplify test scripts and separate coverage from test runs
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -6,6 +6,9 @@ on:
       - main
   pull_request:
 
+env:
+  LATEST_SUPPORTED_NODE: "24.x"
+
 jobs:
   test:
     timeout-minutes: 6
@@ -63,16 +66,16 @@ jobs:
       - name: Lint
         run: npm run lint
       - name: Build docs
+        if: matrix.node-version == env.LATEST_SUPPORTED_NODE
         run: npm run docs
-      - name: Run tests (Node 18/20)
-        if: matrix.node-version != '22.x' && matrix.node-version != '24.x'
-        # Node 18 lacks --test-reporter; Node 20 has coverage bugs. Use simpler script.
-        run: npm run test:node18 --workspaces --if-present
-      - name: Run tests (Node 22+)
-        if: matrix.node-version == '22.x' || matrix.node-version == '24.x'
+      - name: Run tests
+        if: matrix.node-version != env.LATEST_SUPPORTED_NODE
         run: npm test
+      - name: Run test coverage
+        if: matrix.node-version == env.LATEST_SUPPORTED_NODE
+        run: npm run test:coverage
       - name: Upload code coverage
-        if: matrix.node-version == '24.x' && matrix.os == 'ubuntu-latest'
+        if: matrix.node-version == env.LATEST_SUPPORTED_NODE && matrix.os == 'ubuntu-latest'
         uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
         with:
           fail_ci_if_error: true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -32,6 +32,21 @@ jobs:
       - name: Install dependencies
         run: npm ci --verbose
 
+      - name: Build packages
+        run: |
+          # Build base dependencies
+          npm run build --workspace=@slack/logger
+          npm run build --workspace=@slack/types
+
+          # Build packages requiring base dependencies
+          npm run build --workspace=@slack/web-api
+          npm run build --workspace=@slack/webhook
+
+          # Build packages that depend on the Web API
+          npm run build --workspace=@slack/oauth
+          npm run build --workspace=@slack/rtm-api
+          npm run build --workspace=@slack/socket-mode
+
       - name: Create or update release PR
         id: changesets
         uses: changesets/action@6a0a831ff30acef54f2c6aa1cbbc1096b066edaf # v1.7.0
@@ -109,9 +124,30 @@ jobs:
           npm run build --workspace=@slack/socket-mode
 
       - name: Publish to npm and create GitHub releases
+        id: changesets
         uses: changesets/action@6a0a831ff30acef54f2c6aa1cbbc1096b066edaf # v1.7.0
         with:
           createGithubReleases: true
           publish: npm run changeset -- publish
         env:
           GITHUB_TOKEN: ${{ steps.credentials.outputs.token }}
+
+      - name: Get publication details
+        if: steps.changesets.outputs.published == 'true'
+        id: release
+        run: |
+          echo "message=$(echo "$PUBLISHED_PACKAGES" | jq -r '[.[] | "\(.name)@\(.version)"] | join(", ")')" >> "$GITHUB_OUTPUT"
+          echo "action_url=$(echo "$PUBLISHED_PACKAGES" | jq -r '[.[] | "https://github.com/${{ github.repository }}/releases/tag/\(.name)@\(.version)"] | join("\n")')" >> "$GITHUB_OUTPUT"
+        env:
+          PUBLISHED_PACKAGES: ${{ steps.changesets.outputs.publishedPackages }}
+
+      - name: Notify Slack
+        if: steps.changesets.outputs.published == 'true'
+        uses: slackapi/slack-github-action@af78098f536edbc4de71162a307590698245be95 # v3.0.1
+        with:
+          webhook: ${{ secrets.SLACK_RELEASE_ANNOUNCEMENTS_WEBHOOK_URL }}
+          webhook-type: webhook-trigger
+          payload: |
+            action_url: "${{ steps.release.outputs.action_url }}"
+            message: "${{ steps.release.outputs.message }}"
+            repository: "${{ github.repository }}"
diff --git a/docs/english/reference/socket-mode/index.md b/docs/english/reference/socket-mode/index.md
@@ -1,4 +1,4 @@
-# @slack/socket-mode v2.0.6
+# @slack/socket-mode v2.0.7
 
 ## Enumerations
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -24,6 +24,7 @@
     "lint": "npx @biomejs/biome check packages",
     "lint:fix": "npx @biomejs/biome check --write packages",
     "test": "npm test --workspaces --if-present",
+    "test:coverage": "npm run test:coverage --workspaces --if-present",
     "version": "npm run changeset version && npm install && npm run docs"
   },
   "devDependencies": {
diff --git a/packages/cli-hooks/package.json b/packages/cli-hooks/package.json
@@ -37,9 +37,8 @@
   "scripts": {
     "build": "shx chmod +x src/*.js",
     "prelint": "tsc --noemit --module es2022 --maxNodeModuleJsDepth 0 --project ./jsconfig.json",
-    "test": "npm run test:unit",
-    "test:node18": "bash -c 'node --test --test-reporter=spec src/*.test.js'",
-    "test:unit": "node --experimental-test-coverage --test-reporter=spec --test-reporter-destination=stdout --test-reporter=lcov --test-reporter-destination=lcov.info --test-reporter=junit --test-reporter-destination=test-results.xml --test src/*.test.js"
+    "test": "bash -c 'node --test-reporter=spec --test-reporter-destination=stdout --test-reporter=junit --test-reporter-destination=test-results.xml --test src/*.test.js'",
+    "test:coverage": "node --experimental-test-coverage --test-reporter=spec --test-reporter-destination=stdout --test-reporter=lcov --test-reporter-destination=lcov.info --test-reporter=junit --test-reporter-destination=test-results.xml --test src/*.test.js"
   },
   "bin": {
     "slack-cli-check-update": "src/check-update.js",
diff --git a/packages/cli-test/package.json b/packages/cli-test/package.json
@@ -32,9 +32,8 @@
     "build:clean": "shx rm -rf ./dist",
     "docs": "npx typedoc --plugin typedoc-plugin-markdown",
     "prepack": "npm run build",
-    "test": "npm run test:unit",
-    "test:node18": "npm run build && cross-env SLACK_CLI_PATH=/doesnt/matter bash -O globstar -c 'node --test --test-reporter=spec --import tsx src/**/*.test.ts'",
-    "test:unit": "npm run build && cross-env SLACK_CLI_PATH=/doesnt/matter node --experimental-test-coverage --test-reporter=spec --test-reporter-destination=stdout --test-reporter=lcov --test-reporter-destination=lcov.info --test-reporter=junit --test-reporter-destination=test-results.xml --import tsx --test src/**/*.test.ts"
+    "test": "npm run build && bash -c 'cross-env SLACK_CLI_PATH=/doesnt/matter node --test-reporter=spec --test-reporter-destination=stdout --test-reporter=junit --test-reporter-destination=test-results.xml --import tsx --test src/**/*.test.ts'",
+    "test:coverage": "npm run build && cross-env SLACK_CLI_PATH=/doesnt/matter node --experimental-test-coverage --test-reporter=spec --test-reporter-destination=stdout --test-reporter=lcov --test-reporter-destination=lcov.info --test-reporter=junit --test-reporter-destination=test-results.xml --import tsx --test src/**/*.test.ts"
   },
   "dependencies": {
     "tree-kill": "^1.2.2",
diff --git a/packages/logger/package.json b/packages/logger/package.json
@@ -33,9 +33,8 @@
     "build:clean": "shx rm -rf ./dist",
     "docs": "npx typedoc --plugin typedoc-plugin-markdown",
     "prepack": "npm run build",
-    "test": "npm run test:unit",
-    "test:node18": "npm run build && node --test --test-reporter=spec --import tsx --test src/index.test.ts",
-    "test:unit": "npm run build && node --experimental-test-coverage --test-reporter=spec --test-reporter-destination=stdout --test-reporter=lcov --test-reporter-destination=lcov.info --test-reporter=junit --test-reporter-destination=test-results.xml --import tsx --test src/index.test.ts"
+    "test": "npm run build && node --test-reporter=spec --test-reporter-destination=stdout --test-reporter=junit --test-reporter-destination=test-results.xml --import tsx --test src/index.test.ts",
+    "test:coverage": "npm run build && node --experimental-test-coverage --test-reporter=spec --test-reporter-destination=stdout --test-reporter=lcov --test-reporter-destination=lcov.info --test-reporter=junit --test-reporter-destination=test-results.xml --import tsx --test src/index.test.ts"
   },
   "dependencies": {
     "@types/node": ">=18"
diff --git a/packages/oauth/package.json b/packages/oauth/package.json
@@ -35,9 +35,8 @@
     "build:clean": "shx rm -rf ./dist",
     "docs": "npx typedoc --plugin typedoc-plugin-markdown",
     "prepack": "npm run build",
-    "test": "npm run test:unit",
-    "test:node18": "npm run build && bash -O globstar -c 'node --test --test-reporter=spec --import tsx src/**/*.test.ts'",
-    "test:unit": "npm run build && node --experimental-test-coverage --test-reporter=spec --test-reporter-destination=stdout --test-reporter=lcov --test-reporter-destination=lcov.info --test-reporter=junit --test-reporter-destination=test-results.xml --import tsx --test src/**/*.test.ts",
+    "test": "npm run build && bash -c 'node --test-reporter=spec --test-reporter-destination=stdout --test-reporter=junit --test-reporter-destination=test-results.xml --import tsx --test src/**/*.test.ts'",
+    "test:coverage": "npm run build && node --experimental-test-coverage --test-reporter=spec --test-reporter-destination=stdout --test-reporter=lcov --test-reporter-destination=lcov.info --test-reporter=junit --test-reporter-destination=test-results.xml --import tsx --test src/**/*.test.ts",
     "watch": "npx nodemon --watch 'src' --ext 'ts' --exec npm run build"
   },
   "dependencies": {
diff --git a/packages/socket-mode/CHANGELOG.md b/packages/socket-mode/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @slack/socket-mode
 
+## 2.0.7
+
+### Patch Changes
+
+- 5395b0c: fix: terminate closing connections earlier if normal close responses fail
+
+  If Slack doesn't respond to a close frame, the WebSocket connection is now force-terminated instead of waiting for a response that won't arrive. Since [disconnects are expected](https://docs.slack.dev/apis/events-api/using-socket-mode/#disconnect) every few hours, this avoids repeated "pong wasn't received" warnings and speeds up reconnection.
+
 ## 2.0.6
 
 ### Patch Changes
diff --git a/packages/socket-mode/package.json b/packages/socket-mode/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@slack/socket-mode",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "description": "Official library for using the Slack Platform's Socket Mode API",
   "author": "Slack Technologies, LLC",
   "license": "MIT",
@@ -44,9 +44,9 @@
     "docs": "npx typedoc --plugin typedoc-plugin-markdown",
     "prepack": "npm run build",
     "test": "npm run test:unit && npm run test:integration",
-    "test:node18": "npm run build && bash -c 'node --test --test-reporter=spec --import tsx src/*.test.ts' && npm run test:integration",
+    "test:coverage": "npm run build && node --experimental-test-coverage --test-reporter=spec --test-reporter-destination=stdout --test-reporter=lcov --test-reporter-destination=lcov.info --test-reporter=junit --test-reporter-destination=test-results.xml --import tsx --test src/*.test.ts",
     "test:integration": "npm run build && node --import tsx --test test/integration.test.js",
-    "test:unit": "npm run build && node --experimental-test-coverage --test-reporter=spec --test-reporter-destination=stdout --test-reporter=lcov --test-reporter-destination=lcov.info --test-reporter=junit --test-reporter-destination=test-results.xml --import tsx --test src/*.test.ts",
+    "test:unit": "npm run build && bash -c 'node --test-reporter=spec --test-reporter-destination=stdout --test-reporter=junit --test-reporter-destination=test-results.xml --import tsx --test src/*.test.ts'",
     "watch": "npx nodemon --watch 'src' --ext 'ts' --exec npm test"
   },
   "dependencies": {
diff --git a/packages/socket-mode/src/SlackWebSocket.ts b/packages/socket-mode/src/SlackWebSocket.ts
@@ -159,11 +159,16 @@ export class SlackWebSocket {
       if (this.closeFrameReceived) {
         this.logger.debug('Terminating WebSocket (close frame received).');
         this.terminate();
+      } else if (this.websocket.readyState === WebSocket.CLOSING) {
+        // A close frame was already sent but the peer hasn't responded. Force-terminate rather than
+        // waiting for the ws library's closeTimeout (~30s) while the ping monitor logs repeated warnings.
+        this.logger.debug('Terminating WebSocket (close frame sent but no response, force-terminating).');
+        this.terminate();
       } else {
         // If we haven't received a close frame yet, then we send one to the peer, expecting to receive a close frame
         // in response.
         this.logger.debug('Sending close frame (status=1000).');
-        this.websocket.close(1000); // send a close frame, 1000=Normal Closure
+        this.websocket.close(1000); // 1000 = Normal Closure
       }
     } else {
       this.logger.debug('WebSocket already disconnected, flushing remainder.');
diff --git a/packages/socket-mode/test/integration.test.js b/packages/socket-mode/test/integration.test.js
@@ -405,6 +405,49 @@ describe('Integration tests with a WebSocket server', { timeout: 30000 }, () =>
           await reconnectedWaiter;
           await client.disconnect();
         });
+        it('should reconnect if server becomes completely unresponsive and does not respond to close frames', async () => {
+          wss.close();
+          // Use noServer mode so we get access to the raw socket via the upgrade event.
+          // After sending hello, we pause the socket to simulate a fully unresponsive server
+          // that won't respond to pings OR close frames.
+          wss = new WebSocketServer({ noServer: true, autoPong: false });
+          const unresponsiveWsServer = createServer();
+          let rawSocket = null;
+          unresponsiveWsServer.on('upgrade', (req, socket, head) => {
+            rawSocket = socket;
+            wss.handleUpgrade(req, socket, head, (ws) => {
+              ws.on('error', () => {});
+              ws.send(JSON.stringify({ type: 'hello' }));
+              exposed_ws_connection = ws;
+              // Make the server completely unresponsive: it won't process any incoming
+              // data, including ping frames and close frames.
+              socket.pause();
+            });
+          });
+          await new Promise((res) => unresponsiveWsServer.listen(WSS_PORT, res));
+          await client.start();
+          let closeCount = 0;
+          client.on('close', () => {
+            closeCount++;
+          });
+          // Swap in a working WSS for the reconnection attempt
+          client.on('reconnecting', () => {
+            if (rawSocket) rawSocket.destroy();
+            unresponsiveWsServer.close();
+            wss.close();
+            wss = new WebSocketServer({ port: WSS_PORT });
+            wss.on('connection', (ws) => {
+              ws.on('error', () => {});
+              ws.send(JSON.stringify({ type: 'hello' }));
+              exposed_ws_connection = ws;
+            });
+          });
+          const reconnectedWaiter = new Promise((res) => client.on('connected', res));
+          await reconnectedWaiter;
+          // The force-terminate should produce 1 close event per reconnection attempt
+          assert.strictEqual(closeCount, 1);
+          await client.disconnect();
+        });
         it('should reconnect if server does not respond with `pong` message within specified client ping timeout after initially responding with `pong`', async () => {
           wss.close();
           // override the web socket server so that it DOESNT auto-respond to ping messages with a pong, except for the first time
diff --git a/packages/web-api/AGENTS.md b/packages/web-api/AGENTS.md
@@ -224,8 +224,7 @@ expectAssignable<Parameters<typeof web.chat.appendStream>>([
 ## Testing
 
 ```bash
-npm test --workspace=packages/web-api         # all tests
-npm run test:unit --workspace=packages/web-api # unit only
+npm test --workspace=packages/web-api           # all tests
 npm run test:types --workspace=packages/web-api # tsd only
 ```
 
diff --git a/packages/web-api/package.json b/packages/web-api/package.json
@@ -40,12 +40,11 @@
     "build:clean": "shx rm -rf ./dist",
     "docs": "npx typedoc --plugin typedoc-plugin-markdown",
     "prepack": "npm run build",
-    "test": "npm run test:unit",
-    "test:node18": "npm run build && bash -c 'node --test --test-reporter=spec --import tsx src/*.test.ts'",
+    "test": "npm run build && bash -c 'node --test-reporter=spec --test-reporter-destination=stdout --test-reporter=junit --test-reporter-destination=test-results.xml --import tsx --test src/*.test.ts'",
+    "test:coverage": "npm run build && node --experimental-test-coverage --test-reporter=spec --test-reporter-destination=stdout --test-reporter=lcov --test-reporter-destination=lcov.info --test-reporter=junit --test-reporter-destination=test-results.xml --import tsx --test src/*.test.ts",
     "test:integration": "npm run build && node test/integration/commonjs-project/index.js && node test/integration/esm-project/index.mjs && npm run test:integration:ts",
     "test:integration:ts": "cd test/integration/ts-4.7-project && npm i && npm run build",
     "test:types": "tsd",
-    "test:unit": "npm run build && node --experimental-test-coverage --test-reporter=spec --test-reporter-destination=stdout --test-reporter=lcov --test-reporter-destination=lcov.info --test-reporter=junit --test-reporter-destination=test-results.xml --import tsx --test src/*.test.ts",
     "watch": "npx nodemon --watch 'src' --ext 'ts' --exec npm run build"
   },
   "dependencies": {
diff --git a/packages/webhook/package.json b/packages/webhook/package.json
@@ -37,9 +37,8 @@
     "build:clean": "shx rm -rf ./dist",
     "docs": "npx typedoc --plugin typedoc-plugin-markdown",
     "prepack": "npm run build",
-    "test": "npm run test:unit",
-    "test:node18": "npm run build && node --test --test-reporter=spec --import tsx --test src/IncomingWebhook.test.ts",
-    "test:unit": "npm run build && node --experimental-test-coverage --test-reporter=spec --test-reporter-destination=stdout --test-reporter=lcov --test-reporter-destination=lcov.info --test-reporter=junit --test-reporter-destination=test-results.xml --import tsx --test src/IncomingWebhook.test.ts"
+    "test": "npm run build && node --test-reporter=spec --test-reporter-destination=stdout --test-reporter=junit --test-reporter-destination=test-results.xml --import tsx --test src/IncomingWebhook.test.ts",
+    "test:coverage": "npm run build && node --experimental-test-coverage --test-reporter=spec --test-reporter-destination=stdout --test-reporter=lcov --test-reporter-destination=lcov.info --test-reporter=junit --test-reporter-destination=test-results.xml --import tsx --test src/IncomingWebhook.test.ts"
   },
   "dependencies": {
     "@slack/types": "^2.20.1",

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +---
 +---
++
 +ci: simplify test scripts and separate coverage from test runs
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# @slack/socket-mode v2.0.6`
	`1`	`+# @slack/socket-mode v2.0.7`
`2`	`2`
`3`	`3`	`## Enumerations`
`4`	`4`