zet-api 1.0.0 → 1.0.1

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

@@ -4,17 +4,17 @@ on:
   push:
     branches:
       - main
-    paths:
-      - 'src/**'
-      - 'package.json'
-      - 'tsconfig.json'
-      - 'pnpm-lock.yaml'
+  release:
+    types: [published]
   workflow_dispatch:
 
 permissions:
   id-token: write
   contents: read
 
+env:
+  publish: false
+
 jobs:
   publish:
     runs-on: ubuntu-latest
@@ -26,55 +26,41 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
-          registry-url: 'https://registry.npmjs.org'
+          node-version: "20"
+          registry-url: "https://registry.npmjs.org"
           always-auth: true
 
-      - name: Ensure latest npm
+      - name: Ensure latest npm (for OIDC support)
         run: npm install -g npm@latest
 
-      - name: Install pnpm
-        uses: pnpm/action-setup@v3
-        with:
-          version: latest
-
-      - name: Cache pnpm store
-        uses: actions/cache@v3
-        with:
-          path: ~/.pnpm-store
-          key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-
-
       - name: Install dependencies
-        run: pnpm install --frozen-lockfile
+        run: |
+          npm i -g pnpm
+          pnpm install
 
       - name: Check if package needs publishing
         id: check_publish
         run: |
           current_version=$(node -p "require('./package.json').version")
-          package_name=$(node -p "require('./package.json').name")
-          published_version=$(npm view $package_name version 2>/dev/null || echo "0.0.0")
+          npm_package_name=$(node -p "require('./package.json').name")
+          published_version=$(npm show $npm_package_name version) || echo "0.0.0"
 
           echo "Current version: $current_version"
           echo "Published version: $published_version"
 
           if [ "$current_version" == "$published_version" ]; then
             echo "No new version. Skipping publish."
-            echo "should_publish=false" >> $GITHUB_OUTPUT
+            echo "publish=false" >> $GITHUB_ENV
           else
             echo "New version available. Proceeding to publish."
-            echo "should_publish=true" >> $GITHUB_OUTPUT
+            echo "publish=true" >> $GITHUB_ENV
           fi
 
-      - name: Run linting
-        if: steps.check_publish.outputs.should_publish == 'true'
-        run: pnpm run lint
-
       - name: Build the project
-        if: steps.check_publish.outputs.should_publish == 'true'
-        run: pnpm run build
+        run: |
+          pnpm run build
 
-      - name: Publish to NPM using OIDC
-        if: steps.check_publish.outputs.should_publish == 'true'
-        run: pnpm publish --access public --no-git-checks --provenance
+      - name: Publish to npm using OIDC
+        if: env.publish == 'true'
+        run: |
+          npm publish --provenance

package/dist/auth/types.d.ts

@@ -88,8 +88,8 @@ export declare const AccountSchema: z.ZodObject<{
     messages: z.ZodArray<z.ZodUnknown, "many">;
     processes: z.ZodNullable<z.ZodUnknown>;
 }, "strip", z.ZodTypeAny, {
-    email: string;
     id: number;
+    email: string;
     uid: string;
     firstName: string;
     lastName: string;
@@ -100,8 +100,8 @@ export declare const AccountSchema: z.ZodObject<{
     messages: unknown[];
     processes?: unknown;
 }, {
-    email: string;
     id: number;
+    email: string;
     uid: string;
     firstName: string;
     lastName: string;
@@ -153,13 +153,8 @@ export declare const StopIncomingTripSchema: z.ZodObject<{
         } | undefined;
     }>, "many">;
 }, "strip", z.ZodTypeAny, {
-    tripId: string;
-    routeShortName: string;
     headsign: string;
-    expectedArrivalDateTime: string;
     hasLiveTracking: boolean;
-    daysFromToday: number;
-    shapeId: string;
     vehicles: {
         id: string;
         isForDisabledPeople: boolean | null;
@@ -169,14 +164,14 @@ export declare const StopIncomingTripSchema: z.ZodObject<{
             longitude: number;
         } | undefined;
     }[];
-}, {
+    shapeId: string;
+    expectedArrivalDateTime: string;
+    daysFromToday: number;
     tripId: string;
     routeShortName: string;
+}, {
     headsign: string;
-    expectedArrivalDateTime: string;
     hasLiveTracking: boolean;
-    daysFromToday: number;
-    shapeId: string;
     vehicles: {
         id: string;
         isForDisabledPeople: boolean | null;
@@ -186,6 +181,11 @@ export declare const StopIncomingTripSchema: z.ZodObject<{
             longitude: number;
         } | undefined;
     }[];
+    shapeId: string;
+    expectedArrivalDateTime: string;
+    daysFromToday: number;
+    tripId: string;
+    routeShortName: string;
 }>;
 export type StopIncomingTripWithDates = Omit<StopIncomingTrip, 'expectedArrivalDateTime'> & {
     expectedArrivalDateTime: Date;
@@ -241,13 +241,8 @@ export declare const StopIncomingTripsResponseSchema: z.ZodArray<z.ZodObject<{
         } | undefined;
     }>, "many">;
 }, "strip", z.ZodTypeAny, {
-    tripId: string;
-    routeShortName: string;
     headsign: string;
-    expectedArrivalDateTime: string;
     hasLiveTracking: boolean;
-    daysFromToday: number;
-    shapeId: string;
     vehicles: {
         id: string;
         isForDisabledPeople: boolean | null;
@@ -257,14 +252,14 @@ export declare const StopIncomingTripsResponseSchema: z.ZodArray<z.ZodObject<{
             longitude: number;
         } | undefined;
     }[];
-}, {
+    shapeId: string;
+    expectedArrivalDateTime: string;
+    daysFromToday: number;
     tripId: string;
     routeShortName: string;
+}, {
     headsign: string;
-    expectedArrivalDateTime: string;
     hasLiveTracking: boolean;
-    daysFromToday: number;
-    shapeId: string;
     vehicles: {
         id: string;
         isForDisabledPeople: boolean | null;
@@ -274,4 +269,9 @@ export declare const StopIncomingTripsResponseSchema: z.ZodArray<z.ZodObject<{
             longitude: number;
         } | undefined;
     }[];
+    shapeId: string;
+    expectedArrivalDateTime: string;
+    daysFromToday: number;
+    tripId: string;
+    routeShortName: string;
 }>, "many">;

package/dist/core/config.d.ts

@@ -1,5 +1,6 @@
 declare const _default: {
     baseUrl: string;
+    gtfsRtUrl: string;
     timetableServiceUrl: string;
     newsProxyServiceUrl: string;
     authServiceUrl: string;

package/dist/core/config.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.headers = void 0;
 exports.default = {
     baseUrl: 'https://api.zet.hr',
+    gtfsRtUrl: 'https://www.zet.hr/gtfs-rt-protobuf',
     timetableServiceUrl: 'https://api.zet.hr/TimetableService.Api/api/gtfs',
     newsProxyServiceUrl: 'https://api.zet.hr/NewsProxyService.Api/api/newsfeed',
     authServiceUrl: 'https://api.zet.hr/AuthService.Api/api/auth',

package/dist/core/constants.d.ts

@@ -19,7 +19,21 @@ export declare enum NewsTypeEnum {
     ScheduleChange = 3,
     ServiceChange = 4
 }
+export declare enum ScheduleRelationshipEnum {
+    Scheduled = "SCHEDULED",
+    Added = "ADDED",
+    Unscheduled = "UNSCHEDULED",
+    Canceled = "CANCELED",
+    Replacement = "REPLACEMENT",
+    Duplicated = "DUPLICATED"
+}
+export declare enum IncrementalityEnum {
+    FullDataSet = "FULL_DATASET",
+    Differential = "DIFFERENTIAL"
+}
 export declare const routeTypeMap: Record<RouteTypeEnum, string>;
 export declare const directionMap: Record<DirectionEnum, string>;
 export declare const tripStatusMap: Record<TripStatusEnum, string>;
 export declare const newsTypeMap: Record<NewsTypeEnum, string>;
+export declare const scheduleRelationshipMap: Record<ScheduleRelationshipEnum, string>;
+export declare const incrementalityMap: Record<IncrementalityEnum, string>;

package/dist/core/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.newsTypeMap = exports.tripStatusMap = exports.directionMap = exports.routeTypeMap = exports.NewsTypeEnum = exports.TripStatusEnum = exports.DirectionEnum = exports.RouteTypeEnum = void 0;
+exports.incrementalityMap = exports.scheduleRelationshipMap = exports.newsTypeMap = exports.tripStatusMap = exports.directionMap = exports.routeTypeMap = exports.IncrementalityEnum = exports.ScheduleRelationshipEnum = exports.NewsTypeEnum = exports.TripStatusEnum = exports.DirectionEnum = exports.RouteTypeEnum = void 0;
 var RouteTypeEnum;
 (function (RouteTypeEnum) {
     RouteTypeEnum[RouteTypeEnum["Tram"] = 0] = "Tram";
@@ -28,6 +28,20 @@ var NewsTypeEnum;
     NewsTypeEnum[NewsTypeEnum["ScheduleChange"] = 3] = "ScheduleChange";
     NewsTypeEnum[NewsTypeEnum["ServiceChange"] = 4] = "ServiceChange";
 })(NewsTypeEnum || (exports.NewsTypeEnum = NewsTypeEnum = {}));
+var ScheduleRelationshipEnum;
+(function (ScheduleRelationshipEnum) {
+    ScheduleRelationshipEnum["Scheduled"] = "SCHEDULED";
+    ScheduleRelationshipEnum["Added"] = "ADDED";
+    ScheduleRelationshipEnum["Unscheduled"] = "UNSCHEDULED";
+    ScheduleRelationshipEnum["Canceled"] = "CANCELED";
+    ScheduleRelationshipEnum["Replacement"] = "REPLACEMENT";
+    ScheduleRelationshipEnum["Duplicated"] = "DUPLICATED";
+})(ScheduleRelationshipEnum || (exports.ScheduleRelationshipEnum = ScheduleRelationshipEnum = {}));
+var IncrementalityEnum;
+(function (IncrementalityEnum) {
+    IncrementalityEnum["FullDataSet"] = "FULL_DATASET";
+    IncrementalityEnum["Differential"] = "DIFFERENTIAL";
+})(IncrementalityEnum || (exports.IncrementalityEnum = IncrementalityEnum = {}));
 exports.routeTypeMap = {
     [RouteTypeEnum.Tram]: 'Tram',
     [RouteTypeEnum.Bus]: 'Bus',
@@ -49,3 +63,15 @@ exports.newsTypeMap = {
     [NewsTypeEnum.ScheduleChange]: 'Schedule Change',
     [NewsTypeEnum.ServiceChange]: 'Service Change',
 };
+exports.scheduleRelationshipMap = {
+    [ScheduleRelationshipEnum.Scheduled]: 'Scheduled',
+    [ScheduleRelationshipEnum.Added]: 'Added',
+    [ScheduleRelationshipEnum.Unscheduled]: 'Unscheduled',
+    [ScheduleRelationshipEnum.Canceled]: 'Canceled',
+    [ScheduleRelationshipEnum.Replacement]: 'Replacement',
+    [ScheduleRelationshipEnum.Duplicated]: 'Duplicated',
+};
+exports.incrementalityMap = {
+    [IncrementalityEnum.FullDataSet]: 'Full Dataset',
+    [IncrementalityEnum.Differential]: 'Differential',
+};

package/dist/core/manager.d.ts

@@ -1,4 +1,4 @@
-import { Route, Stop, News, GetRoutesInput, GetRouteTripsInput, GetStopsInput, GetTripStopTimesInput, SearchRoutesInput, SearchStopsInput, GetLiveVehiclesInput, TripWithDates, TripStopTimeWithDates, NewsWithDates, Vehicle } from './parsers';
+import { Route, Stop, News, GetRoutesInput, GetRouteTripsInput, GetStopsInput, GetTripStopTimesInput, SearchRoutesInput, SearchStopsInput, TripWithDates, TripStopTimeWithDates, NewsWithDates, GTFSRTVehiclePosition } from './parsers';
 import { GetStopIncomingTripsInput, StopIncomingTripWithDates, Account } from '../auth/types';
 import { ZetAuthManager } from '../auth/manager';
 import { RouteTypeEnum } from './constants';
@@ -30,8 +30,7 @@ export declare class ZetManager {
     private getNewsfeedInternal;
     getNewsfeed(): Promise<NewsWithDates[]>;
     getNewsByRoute(routeId: number): Promise<News[]>;
-    getLiveVehicles(options?: GetLiveVehiclesInput): Promise<Vehicle[]>;
-    getVehicleById(vehicleId: string): Promise<Vehicle | null>;
+    getLiveVehicles(routeId?: number): Promise<GTFSRTVehiclePosition[]>;
     refreshCache(): Promise<void>;
     clearCache(): void;
     private fetchAndCacheRoutes;

package/dist/core/manager.js

@@ -284,31 +284,16 @@ class ZetManager {
         return news.filter((item) => item.lines.includes(routeId));
     }
     // Vehicles.
-    async getLiveVehicles(options) {
-        const routes = options?.routeId ? [await this.getRouteById(options.routeId)].filter((r) => r !== null) : await this.getRoutes();
-        const vehicles = [];
-        for (const route of routes) {
-            try {
-                const trips = await this.getRouteTrips({ routeId: route.id, daysFromToday: 0 });
-                for (const trip of trips) {
-                    for (const vehicle of trip.vehicles) {
-                        if (options?.vehicleId && vehicle.id !== options.vehicleId)
-                            continue;
-                        if (vehicle.position) {
-                            vehicles.push(vehicle);
-                        }
-                    }
-                }
-            }
-            catch (error) {
-                continue;
-            }
+    async getLiveVehicles(routeId) {
+        const response = await axios_1.default.get(config_1.default.gtfsRtUrl, { headers: config_1.headers, timeout: this.timeoutMs, responseType: 'arraybuffer' }).catch((err) => err.response);
+        if (!response || response.status !== 200)
+            throw new Error(`Failed to fetch GTFS-RT feed: ${response?.statusText || 'Unknown error'}`);
+        const allVehicles = (0, utils_1.parseGtfsRtVehicles)(response.data);
+        if (routeId !== undefined) {
+            const routeIdStr = routeId.toString();
+            return allVehicles.filter((vehicle) => vehicle.trip.routeId === routeIdStr);
         }
-        return vehicles;
-    }
-    async getVehicleById(vehicleId) {
-        const vehicles = await this.getLiveVehicles({ vehicleId });
-        return vehicles[0] || null;
+        return allVehicles;
     }
     // Cache.
     async refreshCache() {