Persist Build ID in URL

.env-example

@@ -1,4 +1,5 @@
 GTFS_AWS_ACCESS_KEY_ID=YOUR_AWS_ACCESS_KEY
 GTFS_AWS_ACCESS_KEY_SECRET=YOUR_AWS_SECRET
 GTFS_AWS_REGION=us-east-1
-GTFS_AWS_S3_URL=https://gtfs-to-html.s3.amazonaws.com
+NEXT_PUBLIC_GTFS_AWS_S3_URL=https://gtfs-to-html.s3.amazonaws.com
+TRANSIT_FEEDS_API_KEY=YOUR_TRANSIT_FEEDS_API_KEY

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Added
+
+- Persist Build ID in URL
+
 ## [1.0.4] - 2024-01-24
 
 ### Updated

README.md

@@ -75,6 +75,7 @@ If instead there is an error while processing, the response will contain the err
 
 ## Upgrading node.js
 
+    npm run build
     npm install pm2 -g
     pm2 update
     pm2 unstartup

package.json

@@ -27,13 +27,15 @@
     "hapi-require-https": "^6.0.0",
     "lodash-es": "^4.17.21",
     "next": "^12.2.5",
+    "next-query-params": "^5.0.0",
     "node-fetch": "^3.3.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-ga": "^3.3.1",
     "socket.io": "^4.7.4",
     "socket.io-client": "^4.7.4",
     "tmp-promise": "^3.0.3",
+    "use-query-params": "^2.2.1",
     "uuid": "^9.0.1"
   },
   "devDependencies": {

pages/_app.js

@@ -0,0 +1,12 @@
+import { NextAdapter } from 'next-query-params';
+import { QueryParamProvider } from 'use-query-params';
+
+function MyApp({ Component, pageProps: { session, ...pageProps } }) {
+  return (
+    <QueryParamProvider adapter={NextAdapter}>
+      <Component {...pageProps} />
+    </QueryParamProvider>
+  );
+}
+
+export default MyApp;

pages/index.js

@@ -1,5 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import Head from 'next/head.js';
+import { useQueryParam } from 'use-query-params';
 
 import io from 'socket.io-client';
 import { initGA, logPageView, logEvent } from '../util/analytics.js';
@@ -69,11 +70,11 @@ function Home() {
   const [showOptions, setShowOptions] = useState(false);
   const [processing, setProcessing] = useState(false);
   const [statuses, setStatuses] = useState([]);
-  const [buildId, setBuildId] = useState();
   const [locations, setLocations] = useState();
   const [selectedLocation, setSelectedLocation] = useState('');
   const [feeds, setFeeds] = useState();
   const [selectedFeed, setSelectedFeed] = useState('');
+  const [buildId, setBuildId] = useQueryParam('build');
 
   const statusContainer = React.createRef();
 
@@ -86,6 +87,24 @@ function Home() {
     logPageView();
   }, []);
 
+  useEffect(() => {
+    if (buildId && statuses.length === 0) {
+      setStatuses([
+        {
+          status: 'Timetable creation completed',
+          html_download_url: new URL(
+            `/${buildId}/timetables.zip`,
+            process.env.NEXT_PUBLIC_GTFS_AWS_S3_URL,
+          ),
+          html_preview_url: new URL(
+            `/${buildId}/index.html`,
+            process.env.NEXT_PUBLIC_GTFS_AWS_S3_URL,
+          ),
+        },
+      ]);
+    }
+  }, [buildId]);
+
   useEffect(() => {
     socket.on('status', (payload) => {
       if (statuses.length > 0 && payload.overwrite === true) {

util/create.mjs

@@ -1,5 +1,5 @@
 import {join} from 'node:path';
-import {fileURLToPath, resolve} from 'node:url';
+import {fileURLToPath} from 'node:url';
 import {readFile, stat, writeFile} from 'node:fs/promises';
 import fetch from 'node-fetch';
 import { throttle } from 'lodash-es';
@@ -123,9 +123,9 @@ export default async (data, socket) => {
     uploader.on('end', () => {
       setTimeout(() => {
         socket.emit('status', {
-          status: 'Timetable upload completed',
-          html_download_url: resolve(process.env.GTFS_AWS_S3_URL, join(buildId, 'timetables.zip')),
-          html_preview_url: resolve(process.env.GTFS_AWS_S3_URL, join(buildId, 'index.html'))
+          status: 'Timetable creation completed',
+          html_download_url: new URL(`/${buildId}/timetables.zip`, process.env.NEXT_PUBLIC_GTFS_AWS_S3_URL),
+          html_preview_url: new URL(`/${buildId}/index.html`, process.env.NEXT_PUBLIC_GTFS_AWS_S3_URL),
         });
       }, 1000);
     });