hubot-nextbus 2.2.2 → 2.3.0

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"
+          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.3.0",
   "author": "Stephen Yeargin <stephen@yearg.in>",
   "homepage": "https://github.com/transitnownash/hubot-nextbus",
   "license": "MIT",

package/src/nextbus.js

@@ -53,33 +53,97 @@ 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 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()]);
+      nextTripsData.slice(0, 5).forEach((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();
+        const columns = [
+          formatTripTimeAsMoment(tripData.stop_time.arrival_time).format('LT'),
+          `#${tripData.trip.route_gid} - ${tripData.trip.trip_headsign}${busIndicator}`,
+          timeUntilText,
+        ];
+        table.addRow(columns);
       });
+      const adapterName = robot.adapterName ?? robot.adapter?.name ?? '';
       table.removeBorder();
-      msg.send(table.toString());
+      const tableOutput = table.toString().split('\n').map((line) => line.trimEnd()).join('\n');
+
+      const heading = `🚏 *${stop.stop_name}*`;
+
+      if (/slack/i.test(adapterName)) {
+        msg.send(`${heading}\n\`\`\`\n${tableOutput}\n\`\`\``);
+        return;
+      }
+      msg.send(`${heading}\n${tableOutput}`);
     });
   });
 

package/test/adapters/slack.js

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