sahab-utils 1.8.3 → 1.8.5

package/dist/ts/orderActivity.d.ts

@@ -7,6 +7,8 @@ export declare const ORDER_LIVE_WINDOW_MS: number;
 /** How long the widget keeps saying the car is clean after the order finishes. */
 export declare const ORDER_DONE_VISIBLE_MS: number;
 export declare const ORDER_ACTIVITY_STALE_MS: number;
+/** A status nobody moved on a day after the booked time (on the way, washing) is stuck, not live. */
+export declare const ORDER_STUCK_MS: number;
 /** How long the widget trusts a status it was last told while the app was closed; after that it asks the customer to open the app. */
 export declare const ORDER_WIDGET_FRESH_MS: number;
 /** The id both the server and the app's token registration use for one order's activity. */
@@ -42,6 +44,11 @@ export declare const ACTIVE_ORDER_STATUSES: OrderStatus[];
 export declare function orderActivityLang(language?: string): OrderActivityLang;
 export declare function isOrderActive(status?: OrderStatus): boolean;
 export declare function orderActivityStep(status?: OrderStatus): OrderActivityStep | null;
+/**
+ * Whether an order is still worth showing: a booking nobody started stops mattering `ORDER_ACTIVITY_STALE_MS` after its time, and a
+ * status stuck on the way or washing stops mattering after `ORDER_STUCK_MS`. Orders left behind (test data, no-shows) otherwise pile up.
+ */
+export declare function isOrderCurrent(status: OrderStatus | undefined, orderDateMs: number, nowMs: number): boolean;
 /** Whether an order deserves a Live Activity right now: on the way / washing, or accepted and due within the live window. */
 export declare function isOrderLive(status: OrderStatus | undefined, orderDateMs: number, nowMs: number): boolean;
 /** What every surface (Live Activity, widget, Android notification) shows for an order. Never includes the driver's name. */

package/dist/ts/orderActivity.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ACTIVE_ORDER_STATUSES = exports.ORDER_ACTIVITY_TEXT = exports.orderIdFromDeepLink = exports.orderDeepLink = exports.orderActivityId = exports.ORDER_WIDGET_FRESH_MS = exports.ORDER_ACTIVITY_STALE_MS = exports.ORDER_DONE_VISIBLE_MS = exports.ORDER_LIVE_WINDOW_MS = exports.ORDER_ACTIVITY_STEP_COUNT = exports.ORDER_ACTIVITY_NAME = exports.ORDER_ACTIVITY_TYPE = void 0;
+exports.ACTIVE_ORDER_STATUSES = exports.ORDER_ACTIVITY_TEXT = exports.orderIdFromDeepLink = exports.orderDeepLink = exports.orderActivityId = exports.ORDER_WIDGET_FRESH_MS = exports.ORDER_STUCK_MS = exports.ORDER_ACTIVITY_STALE_MS = exports.ORDER_DONE_VISIBLE_MS = exports.ORDER_LIVE_WINDOW_MS = exports.ORDER_ACTIVITY_STEP_COUNT = exports.ORDER_ACTIVITY_NAME = exports.ORDER_ACTIVITY_TYPE = void 0;
 exports.orderActivityLang = orderActivityLang;
 exports.isOrderActive = isOrderActive;
 exports.orderActivityStep = orderActivityStep;
+exports.isOrderCurrent = isOrderCurrent;
 exports.isOrderLive = isOrderLive;
 exports.buildOrderActivityContent = buildOrderActivityContent;
 exports.pickPrimaryOrder = pickPrimaryOrder;
@@ -18,6 +19,8 @@ exports.ORDER_LIVE_WINDOW_MS = 15 * 60 * 1000;
 /** How long the widget keeps saying the car is clean after the order finishes. */
 exports.ORDER_DONE_VISIBLE_MS = 2 * 60 * 60 * 1000;
 exports.ORDER_ACTIVITY_STALE_MS = 3 * 60 * 60 * 1000;
+/** A status nobody moved on a day after the booked time (on the way, washing) is stuck, not live. */
+exports.ORDER_STUCK_MS = 24 * 60 * 60 * 1000;
 /** How long the widget trusts a status it was last told while the app was closed; after that it asks the customer to open the app. */
 exports.ORDER_WIDGET_FRESH_MS = 45 * 60 * 1000;
 /** The id both the server and the app's token registration use for one order's activity. */
@@ -84,6 +87,18 @@ function orderActivityStep(status) {
             return null;
     }
 }
+/**
+ * Whether an order is still worth showing: a booking nobody started stops mattering `ORDER_ACTIVITY_STALE_MS` after its time, and a
+ * status stuck on the way or washing stops mattering after `ORDER_STUCK_MS`. Orders left behind (test data, no-shows) otherwise pile up.
+ */
+function isOrderCurrent(status, orderDateMs, nowMs) {
+    const step = orderActivityStep(status);
+    if (step === null || step === 'DONE' || step === 'CANCELLED')
+        return false;
+    if (!hasDate(orderDateMs))
+        return true;
+    return nowMs - orderDateMs <= (step === 'SCHEDULED' ? exports.ORDER_ACTIVITY_STALE_MS : exports.ORDER_STUCK_MS);
+}
 const isWithinLiveWindow = (orderDateMs, nowMs) => orderDateMs - nowMs <= exports.ORDER_LIVE_WINDOW_MS;
 /** Whether an order deserves a Live Activity right now: on the way / washing, or accepted and due within the live window. */
 function isOrderLive(status, orderDateMs, nowMs) {
@@ -221,6 +236,7 @@ const widgetFreshUntil = (o, syncedAtMs) => {
 function buildOrderWidgetContent(active, lastFinished, lang, nowMs = Date.now(), syncedAtMs = nowMs) {
     var _a, _b, _c, _d;
     const text = WIDGET_TEXT[lang];
+    active = active.filter((o) => isOrderCurrent(o.orderStatus, o.orderDateMs, nowMs));
     const primary = pickPrimaryOrder(active, nowMs);
     const finish = (state, orderId, title, subtitle, stepIndex, moreText = '') => ({
         state,

package/dist/ts/push.d.ts

@@ -56,6 +56,13 @@ export type TestPushResult = {
     devices: number;
     accepted: number;
 };
+/** The customer app sends nothing. The provider app names who it is, so the server can check that it is that person. */
+export type TestPushBody = {
+    app?: PushApp;
+    role?: 'owner' | 'driver';
+    uid?: string;
+    providerUid?: string;
+};
 export declare const TEST_PUSH_COOLDOWN_S = 30;
 export declare const TEST_PUSH_DAILY_LIMIT = 20;
 export declare const PUSH_TOKENS_COLLECTION = "pushTokens";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sahab-utils",
-	"version": "1.8.3",
+	"version": "1.8.5",
 	"description": "This package contains types and utils functions",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",