hubot-nextbus 2.2.2 → 2.4.0

package/.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    ignore:
+      - dependency-name: "eslint*"

package/.github/workflows/nodejs.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [16.x, 18.x, 20.x]
+        node-version: [20.x, 22.x, 24.x]
 
     steps:
     - uses: actions/checkout@v3
@@ -32,4 +32,3 @@ jobs:
         npm test
       env:
         CI: true
-  

package/.github/workflows/npm-publish.yml

@@ -1,26 +1,51 @@
 on:
   push:
-    branches: main
+    branches:
+      - main
 
 name: npm-publish
 
 permissions:
   contents: write
+  id-token: write
 
 jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v6
+
+      - uses: actions/setup-node@v6
         with:
-          node-version: "20"
+          node-version: "24"
+          registry-url: https://registry.npmjs.org
+
+      - name: Update npm to latest version
+        run: npm install -g npm@latest
+
       - run: npm ci
       - run: npm test
-      - uses: JS-DevTools/npm-publish@v3
+
+      - name: Publish to npm
         id: publish
-        with:
-          token: ${{ secrets.NPM_AUTH_TOKEN }}
+        run: |
+          # Verify npm version supports OIDC
+          echo "npm version: $(npm --version)"
+
+          # Check if version is already published
+          PACKAGE_NAME=$(node -p "require('./package.json').name")
+          PACKAGE_VERSION=$(node -p "require('./package.json').version")
+
+          if npm view "$PACKAGE_NAME@$PACKAGE_VERSION" version 2>/dev/null; then
+            echo "Version $PACKAGE_VERSION already published"
+            echo "type=" >> $GITHUB_OUTPUT
+          else
+            echo "Publishing $PACKAGE_NAME@$PACKAGE_VERSION..."
+            npm publish --access public
+            echo "type=patch" >> $GITHUB_OUTPUT
+            echo "version=$PACKAGE_VERSION" >> $GITHUB_OUTPUT
+          fi
+
       - if: ${{ steps.publish.outputs.type }}
         name: Create Release
         env:

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hubot-nextbus",
   "description": "Shows when the next transit vehicle will arrive at a particular stop.",
-  "version": "2.2.2",
+  "version": "2.4.0",
   "author": "Stephen Yeargin <stephen@yearg.in>",
   "homepage": "https://github.com/transitnownash/hubot-nextbus",
   "license": "MIT",
@@ -24,18 +24,16 @@
     "hubot": ">=3 || 0.0.0-development"
   },
   "devDependencies": {
-    "chai": "^4.3.10",
+    "@vitest/coverage-v8": "^4.1.6",
     "eslint": "^8.56.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-n": "^16.5.0",
     "eslint-plugin-promise": "^6.1.1",
-    "hubot-test-helper": "^1.9.0",
-    "husky": "^8.0.3",
-    "mocha": "^10.2.0",
-    "nock": "^13.4.0",
-    "sinon": "^17.0.1",
-    "sinon-chai": "^3.7.0"
+    "hubot": "^14.1.0",
+    "husky": "^9.1.7",
+    "nock": "^14.0.17",
+    "vitest": "^4.1.6"
   },
   "main": "index.js",
   "scripts": {
@@ -46,7 +44,10 @@
     "ascii-table": "^0.0.9",
     "moment": "^2.29.4"
   },
+  "engines": {
+    "node": ">=22"
+  },
   "volta": {
-    "node": "18.19.0"
+    "node": "22.22.3"
   }
 }

package/script/test

@@ -3,4 +3,4 @@
 # bootstrap environment
 source script/bootstrap
 
-mocha "test/**/*.js" --reporter spec --exit
+vitest run --coverage

package/src/nextbus.js

@@ -27,11 +27,12 @@ module.exports = (robot) => {
     robot.logger.debug(url);
     robot.http(url)
       .get()((err, res, body) => {
-        const response = JSON.parse(body);
         if (err) {
-          msg.send(err);
+          const detail = err.errors ? err.errors.map((e) => e.message).join(', ') : err.message;
+          msg.send(`Error fetching NextBus data: ${detail || err}`);
           return;
         }
+        const response = JSON.parse(body);
         if (response.error) {
           msg.send(response.error);
           return;
@@ -53,33 +54,115 @@ module.exports = (robot) => {
     return moment(`${moment().format('YYYY-MM-DD')} ${timeStr.trim().padStart(8, '0')}`);
   };
 
+  const getRealTimeStatus = (stopTime) => {
+    // Check if realtime data is available
+    if (!stopTime.realtime || !stopTime.realtime.departure) {
+      return '';
+    }
+
+    const scheduled = formatTripTimeAsMoment(stopTime.departure_time);
+    const actual = formatTripTimeAsMoment(stopTime.realtime.departure);
+    const diffMinutes = actual.diff(scheduled, 'minutes');
+
+    if (diffMinutes === 0) {
+      return 'On time';
+    } if (diffMinutes > 0) {
+      return `${diffMinutes}m late`;
+    }
+    return `${Math.abs(diffMinutes)}m early`;
+  };
+
+  const formatAlerts = (alerts) => {
+    if (!alerts || alerts.length === 0) {
+      return '';
+    }
+
+    const alertLines = alerts.map((alert) => {
+      const headerText = alert.header_text?.translation?.[0]?.text || 'Service Alert';
+      return `⚠️  *${headerText.trim()}*`;
+    });
+
+    return alertLines.join('\n');
+  };
+
+  const tripTableHeading = ['Time', 'Route', 'ETA'];
+
+  const formatSlackTripTable = (heading, rows) => ({
+    blocks: [
+      {
+        type: 'header',
+        text: { type: 'plain_text', text: heading, emoji: true },
+      },
+      {
+        type: 'table',
+        rows: [tripTableHeading, ...rows].map((row) => row.map((cell) => ({
+          type: 'raw_text',
+          text: String(cell ?? ''),
+        }))),
+      },
+    ],
+  });
+
   const queryStopById = (stopId, msg) => getAPIResponse('agencies.json', msg, (agencies) => {
     // Override timezone for moment() calls
     process.env.TZ = agencies.data[0].agency_timezone;
     robot.logger.debug(process.env.TZ);
     robot.logger.debug('Current Time:', moment());
-    getAPIResponse(`stops/${stopId}/trips.json?per_page=2000`, msg, (trips) => {
-      const nextTrips = trips.data.filter((trip) => {
-        const tripTime = formatTripTimeAsMoment(trip.stop_times[0].arrival_time);
+    getAPIResponse(`stops/${stopId}/next.json`, msg, (response) => {
+      const {
+        stop,
+        next_trip: nextTrip,
+        upcoming_trips: upcomingTrips,
+        alerts,
+        vehicle_positions: vehiclePositions,
+      } = response;
+
+      // Show alerts if any exist
+      const alertMessage = formatAlerts(alerts);
+      if (alertMessage) {
+        msg.send(alertMessage);
+      }
+
+      // Combine next trip with upcoming trips to get all trips
+      const allTrips = nextTrip ? [nextTrip, ...upcomingTrips] : upcomingTrips;
+
+      const nextTripsData = allTrips.filter((tripData) => {
+        const tripTime = formatTripTimeAsMoment(tripData.stop_time.arrival_time);
         return tripTime.isAfter(moment(), 'second');
       });
-      robot.logger.debug(nextTrips);
-      if (nextTrips.length === 0) {
+
+      robot.logger.debug(nextTripsData);
+      if (nextTripsData.length === 0) {
         msg.send('The last bus has already run for today.');
         return;
       }
 
-      const table = new AsciiTable();
-      const {
-        stop,
-      } = nextTrips[0].stop_times[0];
-      msg.send(`Upcoming Trips for [${stop.stop_gid}] ${stop.stop_name}`);
-      nextTrips.slice(0, 5).forEach((trip) => {
-        const tripTime = formatTripTimeAsMoment(trip.stop_times[0].arrival_time);
-        table.addRow([formatTripTimeAsMoment(trip.stop_times[0].arrival_time).format('LT'), `#${trip.route_gid} - ${trip.trip_headsign}`, tripTime.fromNow()]);
+      const rows = nextTripsData.slice(0, 5).map((tripData) => {
+        const tripTime = formatTripTimeAsMoment(tripData.stop_time.arrival_time);
+        const realtimeStatus = getRealTimeStatus(tripData.stop_time);
+        const hasVehicle = vehiclePositions
+          && vehiclePositions.some((vp) => vp.trip && vp.trip.trip_id === tripData.trip.trip_gid);
+        const busIndicator = hasVehicle ? ' 🚌' : '';
+        const timeUntilText = realtimeStatus ? `${tripTime.fromNow()} (${realtimeStatus})` : tripTime.fromNow();
+        return [
+          tripTime.format('LT'),
+          `#${tripData.trip.route_gid} - ${tripData.trip.trip_headsign}${busIndicator}`,
+          timeUntilText,
+        ];
       });
+      const adapterName = robot.adapterName ?? robot.adapter?.name ?? '';
+
+      if (/slack/i.test(adapterName)) {
+        msg.send(formatSlackTripTable(`🚏 ${stop.stop_name}`, rows));
+        return;
+      }
+
+      const table = new AsciiTable();
+      rows.forEach((row) => table.addRow(row));
       table.removeBorder();
-      msg.send(table.toString());
+      const tableOutput = table.toString().split('\n').map((line) => line.trimEnd()).join('\n');
+      const heading = `🚏 *${stop.stop_name}*`;
+      msg.send(`${heading}\n${tableOutput}`);
     });
   });
 
@@ -92,7 +175,7 @@ module.exports = (robot) => {
 
     getAPIResponse(`stops/near/${latlon}/1000.json?per_page=5`, msg, (stops) => {
       if (stops.total > 0) {
-        queryStopById(stops.data[0].stop_gid, msg);
+        queryStopById(stops.data[0].stop_code, msg);
         return;
       }
       msg.send(`No stops found near ${latlon}`);
@@ -101,16 +184,20 @@ module.exports = (robot) => {
 
   // get a list of nearby stops
   robot.respond(/(?:bus|nextbus) stops$/i, (msg) => getAPIResponse(`stops/near/${latlon}/1000.json?per_page=5`, msg, (stops) => {
+    if (stops.total === 0) {
+      msg.send(`No stops found near ${latlon}`);
+      return;
+    }
     msg.send('List of nearby stops:');
     const output = [];
     stops.data.forEach((stop) => {
-      output.push(`- [${stop.stop_gid}] ${stop.stop_name}`);
+      output.push(`- \`#${stop.stop_code}\` - ${stop.stop_name}`);
     });
     msg.send(output.join('\n'));
   }));
 
   // get a particular stop's next bus
-  robot.respond(/(?:bus|nextbus) stop ([A-Z0-9_]+)$/i, (msg) => {
+  robot.respond(/(?:bus|nextbus) stop #?([A-Z0-9_]+)$/i, (msg) => {
     const stopId = msg.match[1];
     robot.logger.debug(stopId);
     queryStopById(stopId, msg);

package/test/adapters/slack.js

@@ -0,0 +1,5 @@
+// Description
+//   Mock Slack adapter
+module.exports = (robot) => {
+  robot.adapterName = 'slack';
+};

package/test/fixtures/agencies.json

@@ -4,7 +4,7 @@
   "per_page": 100,
   "data": [
     {
-      "id": 1,
+      "id": 178,
       "agency_gid": "WeGo Public Transit",
       "agency_name": "WeGo Public Transit",
       "agency_url": "http://www.wegotransit.com",
@@ -13,8 +13,8 @@
       "agency_phone": "615-862-8833",
       "agency_fare_url": null,
       "agency_email": null,
-      "created_at": "2022-08-02T21:14:03.545-05:00",
-      "updated_at": "2022-08-02T21:14:03.545-05:00"
+      "created_at": "2026-08-30T04:05:14.056-05:00",
+      "updated_at": "2026-08-30T04:05:14.056-05:00"
     }
   ]
 }