@jsm-mit/tigi-sharded-package 0.19.0 → 0.21.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/declarations/tigi-driver/tigi-driver.did +11 -0
- package/declarations/tigi-driver/tigi-driver.did.d.ts +15 -6
- package/declarations/worker/worker.did +11 -0
- package/declarations/worker/worker.did.d.ts +12 -0
- package/declarations/worker/worker.did.js +49 -40
- package/dist/actors/rides-actor.d.ts +17 -1
- package/dist/actors/rides-actor.d.ts.map +1 -1
- package/dist/actors/rides-actor.js +33 -8
- package/dist/actors/scheduled-ride.d.ts +2 -0
- package/dist/actors/scheduled-ride.d.ts.map +1 -1
- package/dist/actors/scheduled-ride.js +1 -0
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/interfaces.d.ts +5 -0
- package/dist/interfaces.d.ts.map +1 -1
- package/dist/mappers.d.ts +5 -0
- package/dist/mappers.d.ts.map +1 -1
- package/dist/mappers.js +11 -0
- package/package.json +4 -3
|
@@ -169,6 +169,16 @@ type Quote = record {
|
|
|
169
169
|
// another — an offer or a booking of a ride at a chosen time (until "Jadę"), or a ride under
|
|
170
170
|
// way. The rider sees the new card; the ride and the booking follow `toKey`. `busy` while a
|
|
171
171
|
// booking order waits for the canister's answer, or when `toKey` is on a ride with one queued.
|
|
172
|
+
// P-26 (D-53, D-55, DRIVER-FLEET): the canister changes a booking of one of its drivers before
|
|
173
|
+
// "Jadę" — its card (another car) and/or its price (e.g. agreed with the rider). The rider sees
|
|
174
|
+
// them; the ride after "Jadę" has the new price. `expired` after "Jadę" or when it ended.
|
|
175
|
+
type BookingChange = record {
|
|
176
|
+
requestId : RequestId;
|
|
177
|
+
driverKey : DriverKey;
|
|
178
|
+
card : opt DriverCard;
|
|
179
|
+
price : opt Money;
|
|
180
|
+
};
|
|
181
|
+
|
|
172
182
|
type HandOver = record {
|
|
173
183
|
requestId : RequestId;
|
|
174
184
|
fromKey : DriverKey;
|
|
@@ -290,6 +300,7 @@ service : {
|
|
|
290
300
|
// unregisterDriver : (DriverKey) -> ();
|
|
291
301
|
// submitQuote : (Quote) -> (variant { ok; err : ProtocolError });
|
|
292
302
|
// handOver : (HandOver) -> (variant { ok; err : ProtocolError }); // P-24
|
|
303
|
+
// changeBooking : (BookingChange) -> (variant { ok; err : ProtocolError }); // P-26
|
|
293
304
|
// declineQuote : (QuoteDecline) -> ();
|
|
294
305
|
// answerOrder : (OrderAnswer) -> (variant { ok; err : ProtocolError });
|
|
295
306
|
// rideStatusChanged : (RideStatusChange) -> (variant { ok; err : ProtocolError });
|
|
@@ -2,6 +2,21 @@ import type { Principal } from '@icp-sdk/core/principal';
|
|
|
2
2
|
import type { ActorMethod } from '@icp-sdk/core/agent';
|
|
3
3
|
import type { IDL } from '@icp-sdk/core/candid';
|
|
4
4
|
|
|
5
|
+
/**
|
|
6
|
+
* P-24 (D-46, DRIVER-FLEET): the canister hands a request over from one of its drivers to
|
|
7
|
+
* another — an offer or a booking of a ride at a chosen time (until "Jadę"), or a ride under
|
|
8
|
+
* way. The rider sees the new card; the ride and the booking follow `toKey`. `busy` while a
|
|
9
|
+
* booking order waits for the canister's answer, or when `toKey` is on a ride with one queued.
|
|
10
|
+
* P-26 (D-53, D-55, DRIVER-FLEET): the canister changes a booking of one of its drivers before
|
|
11
|
+
* "Jadę" — its card (another car) and/or its price (e.g. agreed with the rider). The rider sees
|
|
12
|
+
* them; the ride after "Jadę" has the new price. `expired` after "Jadę" or when it ended.
|
|
13
|
+
*/
|
|
14
|
+
export interface BookingChange {
|
|
15
|
+
'requestId' : RequestId,
|
|
16
|
+
'card' : [] | [DriverCard],
|
|
17
|
+
'driverKey' : DriverKey,
|
|
18
|
+
'price' : [] | [Money],
|
|
19
|
+
}
|
|
5
20
|
/**
|
|
6
21
|
* P-22: a booking of a ride at a chosen time (the driver's "Jadę" / giving it up).
|
|
7
22
|
*/
|
|
@@ -77,12 +92,6 @@ export interface DriverCard {
|
|
|
77
92
|
export type DriverKey = string;
|
|
78
93
|
export interface Geo { 'lat' : number, 'lng' : number }
|
|
79
94
|
export type Geohash = string;
|
|
80
|
-
/**
|
|
81
|
-
* P-24 (D-46, DRIVER-FLEET): the canister hands a request over from one of its drivers to
|
|
82
|
-
* another — an offer or a booking of a ride at a chosen time (until "Jadę"), or a ride under
|
|
83
|
-
* way. The rider sees the new card; the ride and the booking follow `toKey`. `busy` while a
|
|
84
|
-
* booking order waits for the canister's answer, or when `toKey` is on a ride with one queued.
|
|
85
|
-
*/
|
|
86
95
|
export interface HandOver {
|
|
87
96
|
'toKey' : DriverKey,
|
|
88
97
|
'requestId' : RequestId,
|
|
@@ -33,6 +33,8 @@ type TigiWorker =
|
|
|
33
33
|
bookingStarted: (ref: BookingRef) -> (ProtocolResult);
|
|
34
34
|
/// ZT-13: the rider gives the ride at a chosen time up.
|
|
35
35
|
cancelScheduled: (ref: RequestRef) -> (Result_3);
|
|
36
|
+
/// P-26 (D-53, D-55): the canister changes a booking's car and/or price before "Jadę".
|
|
37
|
+
changeBooking: (args: BookingChange) -> (ProtocolResult);
|
|
36
38
|
/// ZO-13, ZO-14, ZO-17.
|
|
37
39
|
chooseOffer: (ref: OfferRef) -> (Result_10);
|
|
38
40
|
/// ZT-14: "Wybierz" on an offer for a ride at a chosen time — a booking order.
|
|
@@ -160,6 +162,7 @@ type ScheduledRideArgs =
|
|
|
160
162
|
record {
|
|
161
163
|
destination: Geo;
|
|
162
164
|
maxRadiusMeters: nat32;
|
|
165
|
+
onlyCanister: opt principal;
|
|
163
166
|
pickup: Geo;
|
|
164
167
|
pickupAtNs: nat64;
|
|
165
168
|
requestId: RequestId;
|
|
@@ -285,6 +288,7 @@ type RequestStateView =
|
|
|
285
288
|
type RequestRideArgs =
|
|
286
289
|
record {
|
|
287
290
|
destination: Geo;
|
|
291
|
+
onlyCanister: opt principal;
|
|
288
292
|
pickup: Geo;
|
|
289
293
|
radiusMeters: nat32;
|
|
290
294
|
realDriversOnly: opt bool;
|
|
@@ -607,6 +611,13 @@ type BookingRef =
|
|
|
607
611
|
driverKey: DriverKey;
|
|
608
612
|
requestId: RequestId;
|
|
609
613
|
};
|
|
614
|
+
type BookingChange =
|
|
615
|
+
record {
|
|
616
|
+
card: opt DriverCardIn;
|
|
617
|
+
driverKey: DriverKey;
|
|
618
|
+
price: opt Money;
|
|
619
|
+
requestId: RequestId;
|
|
620
|
+
};
|
|
610
621
|
type AreaMap =
|
|
611
622
|
record {
|
|
612
623
|
entries: vec PrefixEntry;
|
|
@@ -3,6 +3,12 @@ import type { ActorMethod } from '@icp-sdk/core/agent';
|
|
|
3
3
|
import type { IDL } from '@icp-sdk/core/candid';
|
|
4
4
|
|
|
5
5
|
export interface AreaMap { 'entries' : Array<PrefixEntry>, 'version' : bigint }
|
|
6
|
+
export interface BookingChange {
|
|
7
|
+
'requestId' : RequestId,
|
|
8
|
+
'card' : [] | [DriverCardIn],
|
|
9
|
+
'driverKey' : DriverKey,
|
|
10
|
+
'price' : [] | [Money],
|
|
11
|
+
}
|
|
6
12
|
export interface BookingRef { 'requestId' : RequestId, 'driverKey' : DriverKey }
|
|
7
13
|
export type CarColour = { 'red' : null } |
|
|
8
14
|
{ 'other' : null } |
|
|
@@ -242,6 +248,7 @@ export interface RequestRef { 'requestId' : RequestId }
|
|
|
242
248
|
export interface RequestRideArgs {
|
|
243
249
|
'destination' : Geo,
|
|
244
250
|
'requestId' : RequestId,
|
|
251
|
+
'onlyCanister' : [] | [Principal],
|
|
245
252
|
'realDriversOnly' : [] | [boolean],
|
|
246
253
|
'pickup' : Geo,
|
|
247
254
|
'radiusMeters' : number,
|
|
@@ -320,6 +327,7 @@ export interface RouteLine { 'ride' : string, 'toPickup' : string }
|
|
|
320
327
|
export interface ScheduledRideArgs {
|
|
321
328
|
'destination' : Geo,
|
|
322
329
|
'requestId' : RequestId,
|
|
330
|
+
'onlyCanister' : [] | [Principal],
|
|
323
331
|
'maxRadiusMeters' : number,
|
|
324
332
|
'pickup' : Geo,
|
|
325
333
|
'pickupAtNs' : bigint,
|
|
@@ -387,6 +395,10 @@ export interface TigiWorker {
|
|
|
387
395
|
* / ZT-13: the rider gives the ride at a chosen time up.
|
|
388
396
|
*/
|
|
389
397
|
'cancelScheduled' : ActorMethod<[RequestRef], Result_3>,
|
|
398
|
+
/**
|
|
399
|
+
* / P-26 (D-53, D-55): the canister changes a booking's car and/or price before "Jadę".
|
|
400
|
+
*/
|
|
401
|
+
'changeBooking' : ActorMethod<[BookingChange], ProtocolResult>,
|
|
390
402
|
/**
|
|
391
403
|
* / ZO-13, ZO-14, ZO-17.
|
|
392
404
|
*/
|
|
@@ -86,6 +86,52 @@ export const idlFactory = ({ IDL }) => {
|
|
|
86
86
|
});
|
|
87
87
|
const RequestRef = IDL.Record({ 'requestId' : RequestId });
|
|
88
88
|
const Result_3 = IDL.Variant({ 'ok' : IDL.Bool, 'err' : Error });
|
|
89
|
+
const CarColour = IDL.Variant({
|
|
90
|
+
'red' : IDL.Null,
|
|
91
|
+
'other' : IDL.Null,
|
|
92
|
+
'blue' : IDL.Null,
|
|
93
|
+
'gold' : IDL.Null,
|
|
94
|
+
'grey' : IDL.Null,
|
|
95
|
+
'orange' : IDL.Null,
|
|
96
|
+
'navy' : IDL.Null,
|
|
97
|
+
'purple' : IDL.Null,
|
|
98
|
+
'green' : IDL.Null,
|
|
99
|
+
'beige' : IDL.Null,
|
|
100
|
+
'black' : IDL.Null,
|
|
101
|
+
'silver' : IDL.Null,
|
|
102
|
+
'brown' : IDL.Null,
|
|
103
|
+
'maroon' : IDL.Null,
|
|
104
|
+
'white' : IDL.Null,
|
|
105
|
+
'yellow' : IDL.Null,
|
|
106
|
+
});
|
|
107
|
+
const CarInfo = IDL.Record({
|
|
108
|
+
'photoPath' : IDL.Opt(IDL.Text),
|
|
109
|
+
'name' : IDL.Text,
|
|
110
|
+
'plate' : IDL.Text,
|
|
111
|
+
'colour' : IDL.Opt(CarColour),
|
|
112
|
+
});
|
|
113
|
+
const CarrierKind = IDL.Variant({
|
|
114
|
+
'other' : IDL.Text,
|
|
115
|
+
'taxi' : IDL.Null,
|
|
116
|
+
'rideHailing' : IDL.Null,
|
|
117
|
+
'privateDriver' : IDL.Null,
|
|
118
|
+
});
|
|
119
|
+
const DriverCardIn = IDL.Record({
|
|
120
|
+
'car' : IDL.Opt(CarInfo),
|
|
121
|
+
'carDescription' : IDL.Text,
|
|
122
|
+
'name' : IDL.Text,
|
|
123
|
+
'carrierKind' : CarrierKind,
|
|
124
|
+
'driverKey' : DriverKey,
|
|
125
|
+
'carPhotoCount' : IDL.Nat8,
|
|
126
|
+
'hasLicencePhoto' : IDL.Bool,
|
|
127
|
+
});
|
|
128
|
+
const Money = IDL.Record({ 'currency' : IDL.Text, 'amount' : IDL.Nat64 });
|
|
129
|
+
const BookingChange = IDL.Record({
|
|
130
|
+
'requestId' : RequestId,
|
|
131
|
+
'card' : IDL.Opt(DriverCardIn),
|
|
132
|
+
'driverKey' : DriverKey,
|
|
133
|
+
'price' : IDL.Opt(Money),
|
|
134
|
+
});
|
|
89
135
|
const OfferRef = IDL.Record({
|
|
90
136
|
'requestId' : RequestId,
|
|
91
137
|
'driverKey' : DriverKey,
|
|
@@ -160,36 +206,6 @@ export const idlFactory = ({ IDL }) => {
|
|
|
160
206
|
const Result_7 = IDL.Variant({ 'ok' : RouteLine, 'err' : Error });
|
|
161
207
|
const PrefixCount = IDL.Record({ 'load' : IDL.Nat, 'prefix' : IDL.Text });
|
|
162
208
|
const Result_6 = IDL.Variant({ 'ok' : IDL.Vec(PrefixCount), 'err' : Error });
|
|
163
|
-
const CarColour = IDL.Variant({
|
|
164
|
-
'red' : IDL.Null,
|
|
165
|
-
'other' : IDL.Null,
|
|
166
|
-
'blue' : IDL.Null,
|
|
167
|
-
'gold' : IDL.Null,
|
|
168
|
-
'grey' : IDL.Null,
|
|
169
|
-
'orange' : IDL.Null,
|
|
170
|
-
'navy' : IDL.Null,
|
|
171
|
-
'purple' : IDL.Null,
|
|
172
|
-
'green' : IDL.Null,
|
|
173
|
-
'beige' : IDL.Null,
|
|
174
|
-
'black' : IDL.Null,
|
|
175
|
-
'silver' : IDL.Null,
|
|
176
|
-
'brown' : IDL.Null,
|
|
177
|
-
'maroon' : IDL.Null,
|
|
178
|
-
'white' : IDL.Null,
|
|
179
|
-
'yellow' : IDL.Null,
|
|
180
|
-
});
|
|
181
|
-
const CarInfo = IDL.Record({
|
|
182
|
-
'photoPath' : IDL.Opt(IDL.Text),
|
|
183
|
-
'name' : IDL.Text,
|
|
184
|
-
'plate' : IDL.Text,
|
|
185
|
-
'colour' : IDL.Opt(CarColour),
|
|
186
|
-
});
|
|
187
|
-
const CarrierKind = IDL.Variant({
|
|
188
|
-
'other' : IDL.Text,
|
|
189
|
-
'taxi' : IDL.Null,
|
|
190
|
-
'rideHailing' : IDL.Null,
|
|
191
|
-
'privateDriver' : IDL.Null,
|
|
192
|
-
});
|
|
193
209
|
const DriverCard = IDL.Record({
|
|
194
210
|
'carDescription' : IDL.Text,
|
|
195
211
|
'name' : IDL.Text,
|
|
@@ -198,7 +214,6 @@ export const idlFactory = ({ IDL }) => {
|
|
|
198
214
|
'carPhotoCount' : IDL.Nat8,
|
|
199
215
|
'hasLicencePhoto' : IDL.Bool,
|
|
200
216
|
});
|
|
201
|
-
const Money = IDL.Record({ 'currency' : IDL.Text, 'amount' : IDL.Nat64 });
|
|
202
217
|
const Geo = IDL.Record({ 'lat' : IDL.Float64, 'lng' : IDL.Float64 });
|
|
203
218
|
const OfferView = IDL.Record({
|
|
204
219
|
'car' : IDL.Opt(CarInfo),
|
|
@@ -318,15 +333,6 @@ export const idlFactory = ({ IDL }) => {
|
|
|
318
333
|
});
|
|
319
334
|
const Result_5 = IDL.Variant({ 'ok' : WorkerStatus, 'err' : Error });
|
|
320
335
|
const Result_4 = IDL.Variant({ 'ok' : IDL.Nat, 'err' : Error });
|
|
321
|
-
const DriverCardIn = IDL.Record({
|
|
322
|
-
'car' : IDL.Opt(CarInfo),
|
|
323
|
-
'carDescription' : IDL.Text,
|
|
324
|
-
'name' : IDL.Text,
|
|
325
|
-
'carrierKind' : CarrierKind,
|
|
326
|
-
'driverKey' : DriverKey,
|
|
327
|
-
'carPhotoCount' : IDL.Nat8,
|
|
328
|
-
'hasLicencePhoto' : IDL.Bool,
|
|
329
|
-
});
|
|
330
336
|
const HandOver = IDL.Record({
|
|
331
337
|
'toKey' : DriverKey,
|
|
332
338
|
'requestId' : RequestId,
|
|
@@ -366,6 +372,7 @@ export const idlFactory = ({ IDL }) => {
|
|
|
366
372
|
const RequestRideArgs = IDL.Record({
|
|
367
373
|
'destination' : Geo,
|
|
368
374
|
'requestId' : RequestId,
|
|
375
|
+
'onlyCanister' : IDL.Opt(IDL.Principal),
|
|
369
376
|
'realDriversOnly' : IDL.Opt(IDL.Bool),
|
|
370
377
|
'pickup' : Geo,
|
|
371
378
|
'radiusMeters' : IDL.Nat32,
|
|
@@ -374,6 +381,7 @@ export const idlFactory = ({ IDL }) => {
|
|
|
374
381
|
const ScheduledRideArgs = IDL.Record({
|
|
375
382
|
'destination' : Geo,
|
|
376
383
|
'requestId' : RequestId,
|
|
384
|
+
'onlyCanister' : IDL.Opt(IDL.Principal),
|
|
377
385
|
'maxRadiusMeters' : IDL.Nat32,
|
|
378
386
|
'pickup' : Geo,
|
|
379
387
|
'pickupAtNs' : IDL.Nat64,
|
|
@@ -413,6 +421,7 @@ export const idlFactory = ({ IDL }) => {
|
|
|
413
421
|
'bookingDropped' : IDL.Func([BookingRef], [], []),
|
|
414
422
|
'bookingStarted' : IDL.Func([BookingRef], [ProtocolResult], []),
|
|
415
423
|
'cancelScheduled' : IDL.Func([RequestRef], [Result_3], []),
|
|
424
|
+
'changeBooking' : IDL.Func([BookingChange], [ProtocolResult], []),
|
|
416
425
|
'chooseOffer' : IDL.Func([OfferRef], [Result_10], []),
|
|
417
426
|
'chooseScheduledOffer' : IDL.Func([OfferRef], [Result_10], []),
|
|
418
427
|
'clearLogs' : IDL.Func([], [], []),
|
|
@@ -7,6 +7,12 @@ import { ScheduledRide } from "./scheduled-ride.js";
|
|
|
7
7
|
/** U-29: the rider's radius, and the radius after `WIDEN_AFTER_MS` without offers. */
|
|
8
8
|
export declare const SEARCH_RADIUS_METERS = 3000;
|
|
9
9
|
export declare const WIDE_RADIUS_METERS = 6000;
|
|
10
|
+
/**
|
|
11
|
+
* ZO-27 (own site, stage 7, user 2026-11-18): a request narrowed to one driver canister starts
|
|
12
|
+
* at 6 km and widens to 15 km — a company has few drivers.
|
|
13
|
+
*/
|
|
14
|
+
export declare const ONLY_SEARCH_RADIUS_METERS = 6000;
|
|
15
|
+
export declare const ONLY_WIDE_RADIUS_METERS = 15000;
|
|
10
16
|
/** ZO-8: no offer from any worker this long after the request → 6 km. */
|
|
11
17
|
export declare const WIDEN_AFTER_MS = 25000;
|
|
12
18
|
/** ZO-11: the rhythm a front polls `getAsyncUnsafe` in while the request is open. */
|
|
@@ -33,6 +39,8 @@ interface RequestState {
|
|
|
33
39
|
sawOffer: boolean;
|
|
34
40
|
/** ZO-23: kept for the widening and "Szukaj ponownie". */
|
|
35
41
|
realDriversOnly?: boolean;
|
|
42
|
+
/** ZO-27: kept for the widening, the resumed request and "Szukaj ponownie". */
|
|
43
|
+
driverCanister?: string;
|
|
36
44
|
accepted?: {
|
|
37
45
|
worker: string;
|
|
38
46
|
canister: string;
|
|
@@ -51,7 +59,14 @@ export interface RequestRideArgs {
|
|
|
51
59
|
* canisters (the Test Manager's switch). Left out = everyone, as before.
|
|
52
60
|
*/
|
|
53
61
|
realDriversOnly?: boolean;
|
|
62
|
+
/**
|
|
63
|
+
* ZO-27 (own site, stage 7): only this driver canister's drivers are asked (a company's page
|
|
64
|
+
* frames the order). Left out = every driver. A filter, not a protection.
|
|
65
|
+
*/
|
|
66
|
+
driverCanister?: string;
|
|
54
67
|
}
|
|
68
|
+
/** ZO-27: a driver canister id checked before any call. */
|
|
69
|
+
export declare function checkedDriverCanister(id: string | undefined): string | undefined;
|
|
55
70
|
/**
|
|
56
71
|
* The refusal key of a worker's answer (WO-N9): `ALREADY_OPEN`, `NOT_MY_AREA`, `FULL`,
|
|
57
72
|
* `CLOSED`, `ORDERING`, `DRIVER_NOT_FREE`, `NOT_COMPLETED`, `EXPIRED`, `BLOCKED`; undefined
|
|
@@ -93,6 +108,7 @@ export declare class RidesActor {
|
|
|
93
108
|
destination: Geo;
|
|
94
109
|
pickupAtMs: number;
|
|
95
110
|
riderName?: string;
|
|
111
|
+
driverCanister?: string;
|
|
96
112
|
}): Promise<ScheduledRide>;
|
|
97
113
|
/**
|
|
98
114
|
* A ride at a chosen time again from its token (`ScheduledRide.token`).
|
|
@@ -287,7 +303,7 @@ export declare class RideRequest {
|
|
|
287
303
|
private mergeAsync;
|
|
288
304
|
/** ZO-15: the other workers close their copy (`otherOfferChosen`); tried again on the next poll if one fails. */
|
|
289
305
|
private closeOthersAsync;
|
|
290
|
-
/** ZO-8: 6 km in the workers of the new cells and in the old ones (the same `requestId`). */
|
|
306
|
+
/** ZO-8: 6 km (ZO-27 narrowed: 15 km) in the workers of the new cells and in the old ones (the same `requestId`). */
|
|
291
307
|
private widenAsync;
|
|
292
308
|
private onOfferAsyncUnsafe;
|
|
293
309
|
private acceptedAsyncUnsafe;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rides-actor.d.ts","sourceRoot":"","sources":["../../src/actors/rides-actor.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAKpD,OAAO,EAAgJ,KAAK,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC7M,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9C,OAAO,EAA2B,KAAK,GAAG,EAAE,MAAM,WAAW,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,aAAa,EAAE,WAAW,EAAa,eAAe,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEpJ,OAAO,EAAE,aAAa,EAAkH,MAAM,qBAAqB,CAAC;AAGpK,sFAAsF;AACtF,eAAO,MAAM,oBAAoB,OAAQ,CAAC;AAC1C,eAAO,MAAM,kBAAkB,OAAQ,CAAC;AACxC,yEAAyE;AACzE,eAAO,MAAM,cAAc,QAAS,CAAC;AACrC,qFAAqF;AACrF,eAAO,MAAM,eAAe,OAAQ,CAAC;AACrC;;;GAGG;AACH,eAAO,MAAM,eAAe,QAAS,CAAC;AACtC,+GAA+G;AAC/G,eAAO,MAAM,YAAY,OAAQ,CAAC;AAClC,eAAO,MAAM,iBAAiB,OAAQ,CAAC;AAEvC,wFAAwF;AACxF,UAAU,YAAY;IAClB,CAAC,EAAE,CAAC,CAAC;IACL,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,GAAG,CAAC;IACZ,WAAW,EAAE,GAAG,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,OAAO,CAAC;IACtB,QAAQ,EAAE,OAAO,CAAC;IAClB,0DAA0D;IAC1D,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;CACtE;AAED,MAAM,WAAW,eAAe;IAC5B,MAAM,EAAE,GAAG,CAAC;IACZ,WAAW,EAAE,GAAG,CAAC;IACjB,wGAAwG;IACxG,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iFAAiF;IACjF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"rides-actor.d.ts","sourceRoot":"","sources":["../../src/actors/rides-actor.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,12 @@ import { cardOf, closeReasonOf, decodeToken, driverOfOfferId, encodeToken, fresh
|
|
|
16
16
|
/** U-29: the rider's radius, and the radius after `WIDEN_AFTER_MS` without offers. */
|
|
17
17
|
export const SEARCH_RADIUS_METERS = 3_000;
|
|
18
18
|
export const WIDE_RADIUS_METERS = 6_000;
|
|
19
|
+
/**
|
|
20
|
+
* ZO-27 (own site, stage 7, user 2026-11-18): a request narrowed to one driver canister starts
|
|
21
|
+
* at 6 km and widens to 15 km — a company has few drivers.
|
|
22
|
+
*/
|
|
23
|
+
export const ONLY_SEARCH_RADIUS_METERS = 6_000;
|
|
24
|
+
export const ONLY_WIDE_RADIUS_METERS = 15_000;
|
|
19
25
|
/** ZO-8: no offer from any worker this long after the request → 6 km. */
|
|
20
26
|
export const WIDEN_AFTER_MS = 25_000;
|
|
21
27
|
/** ZO-11: the rhythm a front polls `getAsyncUnsafe` in while the request is open. */
|
|
@@ -28,6 +34,21 @@ export const REFRESH_WAIT_MS = 25_000;
|
|
|
28
34
|
/** K-3, PR-21: the rhythm of `getRideAsyncUnsafe`; `RIDE_POLL_NEAR_MS` when the driver is under 2 min away. */
|
|
29
35
|
export const RIDE_POLL_MS = 2_000;
|
|
30
36
|
export const RIDE_POLL_NEAR_MS = 1_000;
|
|
37
|
+
/** ZO-27: the first and the widened radius of a request. */
|
|
38
|
+
function radiiOf(state) {
|
|
39
|
+
return state.driverCanister === undefined ? { start: SEARCH_RADIUS_METERS, wide: WIDE_RADIUS_METERS } : { start: ONLY_SEARCH_RADIUS_METERS, wide: ONLY_WIDE_RADIUS_METERS };
|
|
40
|
+
}
|
|
41
|
+
/** ZO-27: a driver canister id checked before any call. */
|
|
42
|
+
export function checkedDriverCanister(id) {
|
|
43
|
+
if (id === undefined)
|
|
44
|
+
return undefined;
|
|
45
|
+
try {
|
|
46
|
+
return Principal.fromText(id).toText();
|
|
47
|
+
}
|
|
48
|
+
catch {
|
|
49
|
+
throw canisterError("InvalidData", "driverCanister: not a canister id");
|
|
50
|
+
}
|
|
51
|
+
}
|
|
31
52
|
/**
|
|
32
53
|
* The refusal key of a worker's answer (WO-N9): `ALREADY_OPEN`, `NOT_MY_AREA`, `FULL`,
|
|
33
54
|
* `CLOSED`, `ORDERING`, `DRIVER_NOT_FREE`, `NOT_COMPLETED`, `EXPIRED`, `BLOCKED`; undefined
|
|
@@ -78,6 +99,7 @@ export class RidesActor {
|
|
|
78
99
|
async requestRideAsyncUnsafe(args) {
|
|
79
100
|
if (!isValidGeo(args.pickup) || !isValidGeo(args.destination))
|
|
80
101
|
throw canisterError("InvalidData", "pickup / destination out of range");
|
|
102
|
+
const driverCanister = checkedDriverCanister(args.driverCanister);
|
|
81
103
|
const riderName = args.riderName ?? (await this.riderNameAsyncUnsafe());
|
|
82
104
|
const state = {
|
|
83
105
|
v: 1,
|
|
@@ -91,9 +113,10 @@ export class RidesActor {
|
|
|
91
113
|
othersClosed: false,
|
|
92
114
|
sawOffer: false,
|
|
93
115
|
...(args.realDriversOnly ? { realDriversOnly: true } : {}),
|
|
116
|
+
...(driverCanister !== undefined ? { driverCanister } : {}),
|
|
94
117
|
};
|
|
95
118
|
const request = new RideRequest(this.group, this.identity, this.options, state, () => this.simulatorIdAsync());
|
|
96
|
-
await request.placeAsyncUnsafe(
|
|
119
|
+
await request.placeAsyncUnsafe(radiiOf(state).start);
|
|
97
120
|
return request;
|
|
98
121
|
}
|
|
99
122
|
/**
|
|
@@ -111,8 +134,9 @@ export class RidesActor {
|
|
|
111
134
|
throw canisterError("InvalidData", "TOO_SOON: at least 1 h ahead");
|
|
112
135
|
if (ahead > SCHEDULED_MAX_AHEAD_MS)
|
|
113
136
|
throw canisterError("InvalidData", "TOO_FAR: at most 7 days ahead");
|
|
137
|
+
const driverCanister = checkedDriverCanister(args.driverCanister);
|
|
114
138
|
const riderName = args.riderName ?? (await this.riderNameAsyncUnsafe());
|
|
115
|
-
const state = { v: 1, kind: "scheduled", requestId: globalThis.crypto.randomUUID(), pickup: args.pickup, destination: args.destination, riderName, pickupAtMs: args.pickupAtMs, workers: [] };
|
|
139
|
+
const state = { v: 1, kind: "scheduled", requestId: globalThis.crypto.randomUUID(), pickup: args.pickup, destination: args.destination, riderName, pickupAtMs: args.pickupAtMs, workers: [], ...(driverCanister !== undefined ? { driverCanister } : {}) };
|
|
116
140
|
const ride = this.scheduledOf(state);
|
|
117
141
|
await ride.placeAsyncUnsafe(await workersForAsync(this.group, args.pickup, SCHEDULED_RADIUS_METERS, false));
|
|
118
142
|
return ride;
|
|
@@ -236,7 +260,7 @@ export class RideRequest {
|
|
|
236
260
|
const workers = (await workersForAsync(this.group, this.state.pickup, radiusMeters, fresh)).filter((worker) => !tried.has(worker));
|
|
237
261
|
const results = await Promise.allSettled(workers.map(async (worker) => {
|
|
238
262
|
tried.add(worker);
|
|
239
|
-
await this.group.onWorkerAsyncUnsafe(worker, (actor) => actor.requestRide({ requestId: this.state.requestId, pickup: this.state.pickup, destination: this.state.destination, riderName: this.state.riderName, radiusMeters, realDriversOnly: this.state.realDriversOnly ? [true] : [] }));
|
|
263
|
+
await this.group.onWorkerAsyncUnsafe(worker, (actor) => actor.requestRide({ requestId: this.state.requestId, pickup: this.state.pickup, destination: this.state.destination, riderName: this.state.riderName, radiusMeters, realDriversOnly: this.state.realDriversOnly ? [true] : [], onlyCanister: this.state.driverCanister !== undefined ? [Principal.fromText(this.state.driverCanister)] : [] }));
|
|
240
264
|
return worker;
|
|
241
265
|
}));
|
|
242
266
|
let staleMap = false;
|
|
@@ -261,7 +285,7 @@ export class RideRequest {
|
|
|
261
285
|
// ZO-2, ZO-N9: one open request per rider across the workers — a worker that already
|
|
262
286
|
// holds another one refuses; the fresh copies are closed again.
|
|
263
287
|
const blocking = errors.find((error) => refusalKeyOf(error) === "ALREADY_OPEN" || refusalKeyOf(error) === "BLOCKED");
|
|
264
|
-
if (blocking !== undefined && radiusMeters ===
|
|
288
|
+
if (blocking !== undefined && radiusMeters === radiiOf(this.state).start) {
|
|
265
289
|
await Promise.allSettled(placed.map((worker) => this.group.onWorkerAsyncUnsafe(worker, (actor) => actor.giveUp({ requestId: this.state.requestId }))));
|
|
266
290
|
throw blocking;
|
|
267
291
|
}
|
|
@@ -290,7 +314,7 @@ export class RideRequest {
|
|
|
290
314
|
if (snapshot.phase === "searching" && !this.state.widened && !this.state.sawOffer && Date.now() - this.state.createdMs >= WIDEN_AFTER_MS) {
|
|
291
315
|
await this.widenAsync();
|
|
292
316
|
snapshot.widened = true;
|
|
293
|
-
snapshot.radiusMeters =
|
|
317
|
+
snapshot.radiusMeters = radiiOf(this.state).wide;
|
|
294
318
|
}
|
|
295
319
|
this.lastSnapshot = snapshot;
|
|
296
320
|
return snapshot;
|
|
@@ -434,9 +458,10 @@ export class RideRequest {
|
|
|
434
458
|
othersClosed: false,
|
|
435
459
|
sawOffer: false,
|
|
436
460
|
...(this.state.realDriversOnly ? { realDriversOnly: true } : {}),
|
|
461
|
+
...(this.state.driverCanister !== undefined ? { driverCanister: this.state.driverCanister } : {}),
|
|
437
462
|
};
|
|
438
463
|
const request = new RideRequest(this.group, this.identity, this.options, state, this.simulatorIdAsync);
|
|
439
|
-
await request.placeAsyncUnsafe(
|
|
464
|
+
await request.placeAsyncUnsafe(radiiOf(state).start);
|
|
440
465
|
return request;
|
|
441
466
|
}
|
|
442
467
|
/**
|
|
@@ -659,11 +684,11 @@ export class RideRequest {
|
|
|
659
684
|
const results = await Promise.allSettled(others.map((worker) => this.group.onWorkerAsyncUnsafe(worker, (actor) => actor.closeRequest({ requestId: this.state.requestId, reason: { otherOfferChosen: null } }))));
|
|
660
685
|
this.state.othersClosed = results.every((result) => result.status === "fulfilled");
|
|
661
686
|
}
|
|
662
|
-
/** ZO-8: 6 km in the workers of the new cells and in the old ones (the same `requestId`). */
|
|
687
|
+
/** ZO-8: 6 km (ZO-27 narrowed: 15 km) in the workers of the new cells and in the old ones (the same `requestId`). */
|
|
663
688
|
async widenAsync() {
|
|
664
689
|
this.state.widened = true;
|
|
665
690
|
try {
|
|
666
|
-
await this.placeAsyncUnsafe(
|
|
691
|
+
await this.placeAsyncUnsafe(radiiOf(this.state).wide);
|
|
667
692
|
}
|
|
668
693
|
catch {
|
|
669
694
|
// The 3 km request still stands; the next poll shows what there is.
|
|
@@ -21,6 +21,8 @@ export interface ScheduledState {
|
|
|
21
21
|
pickupAtMs: number;
|
|
22
22
|
workers: string[];
|
|
23
23
|
othersClosed?: boolean;
|
|
24
|
+
/** ZT-23 (own site, stage 7): only this driver canister's bases are asked. */
|
|
25
|
+
driverCanister?: string;
|
|
24
26
|
}
|
|
25
27
|
/** ZT-12: one offer for a ride at a chosen time (no pin: the base is never shown, ZT-1). */
|
|
26
28
|
export interface ScheduledOfferView {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduled-ride.d.ts","sourceRoot":"","sources":["../../src/actors/scheduled-ride.ts"],"names":[],"mappings":"AAOA,OAAO,EAA6B,KAAK,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAG7E,sFAAsF;AACtF,eAAO,MAAM,uBAAuB,QAAS,CAAC;AAC9C,+CAA+C;AAC/C,eAAO,MAAM,sBAAsB,QAAc,CAAC;AAClD,eAAO,MAAM,sBAAsB,QAAuB,CAAC;AAC3D,6FAA6F;AAC7F,eAAO,MAAM,gBAAgB,QAAc,CAAC;AAC5C,uFAAuF;AACvF,eAAO,MAAM,iBAAiB,OAAQ,CAAC;AAEvC,MAAM,WAAW,cAAc;IAC3B,CAAC,EAAE,CAAC,CAAC;IACL,IAAI,EAAE,WAAW,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,GAAG,CAAC;IACZ,WAAW,EAAE,GAAG,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"scheduled-ride.d.ts","sourceRoot":"","sources":["../../src/actors/scheduled-ride.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,6 +57,7 @@ export class ScheduledRide {
|
|
|
57
57
|
riderName: this.state.riderName,
|
|
58
58
|
pickupAtNs: BigInt(this.state.pickupAtMs) * 1000000n,
|
|
59
59
|
maxRadiusMeters: SCHEDULED_RADIUS_METERS,
|
|
60
|
+
onlyCanister: this.state.driverCanister !== undefined ? [Principal.fromText(this.state.driverCanister)] : [],
|
|
60
61
|
}));
|
|
61
62
|
return worker;
|
|
62
63
|
}));
|
package/dist/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export { MAINNET_HOST, STOPPED_RETRY_ATTEMPTS, canisterError, errorKeyOf, isCanisterStoppedError, isMethodMissingError, retrySettings, type GroupOptions, type LogEntry, } from "./group/canister-actor.js";
|
|
2
|
-
export { RidesActor, RideRequest, refusalKeyOf, REFRESH_WAIT_MS, REQUEST_POLL_MS, RIDE_POLL_MS, RIDE_POLL_NEAR_MS, SEARCH_RADIUS_METERS, WIDE_RADIUS_METERS, WIDEN_AFTER_MS, type RequestRideArgs, } from "./actors/rides-actor.js";
|
|
2
|
+
export { RidesActor, RideRequest, refusalKeyOf, REFRESH_WAIT_MS, REQUEST_POLL_MS, RIDE_POLL_MS, RIDE_POLL_NEAR_MS, SEARCH_RADIUS_METERS, WIDE_RADIUS_METERS, ONLY_SEARCH_RADIUS_METERS, ONLY_WIDE_RADIUS_METERS, checkedDriverCanister, WIDEN_AFTER_MS, type RequestRideArgs, } from "./actors/rides-actor.js";
|
|
3
3
|
export { ScheduledRide, RESCUE_BEFORE_MS, SCHEDULED_MAX_AHEAD_MS, SCHEDULED_MIN_AHEAD_MS, SCHEDULED_POLL_MS, SCHEDULED_RADIUS_METERS, type ScheduledOfferView, type ScheduledPhase, type ScheduledSnapshot, } from "./actors/scheduled-ride.js";
|
|
4
4
|
export { ProfilesActor, RIDES_PAGE } from "./actors/profiles-actor.js";
|
|
5
5
|
export { TestManagerActor, SIMULATED_DRIVERS } from "./actors/test-manager-actor.js";
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAYA,OAAO,EACH,YAAY,EACZ,sBAAsB,EACtB,aAAa,EACb,UAAU,EACV,sBAAsB,EACtB,oBAAoB,EACpB,aAAa,EACb,KAAK,YAAY,EACjB,KAAK,QAAQ,GAChB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACH,UAAU,EACV,WAAW,EACX,YAAY,EACZ,eAAe,EACf,eAAe,EACf,YAAY,EACZ,iBAAiB,EACjB,oBAAoB,EACpB,kBAAkB,EAClB,cAAc,EACd,KAAK,eAAe,GACvB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACH,aAAa,EACb,gBAAgB,EAChB,sBAAsB,EACtB,sBAAsB,EACtB,iBAAiB,EACjB,uBAAuB,EACvB,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,KAAK,iBAAiB,GACzB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACrF,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AAClJ,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACrH,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,cAAc,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAC3G,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,mBAAmB,iBAAiB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAYA,OAAO,EACH,YAAY,EACZ,sBAAsB,EACtB,aAAa,EACb,UAAU,EACV,sBAAsB,EACtB,oBAAoB,EACpB,aAAa,EACb,KAAK,YAAY,EACjB,KAAK,QAAQ,GAChB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACH,UAAU,EACV,WAAW,EACX,YAAY,EACZ,eAAe,EACf,eAAe,EACf,YAAY,EACZ,iBAAiB,EACjB,oBAAoB,EACpB,kBAAkB,EAClB,yBAAyB,EACzB,uBAAuB,EACvB,qBAAqB,EACrB,cAAc,EACd,KAAK,eAAe,GACvB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACH,aAAa,EACb,gBAAgB,EAChB,sBAAsB,EACtB,sBAAsB,EACtB,iBAAiB,EACjB,uBAAuB,EACvB,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,KAAK,iBAAiB,GACzB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACrF,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AAClJ,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACrH,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,cAAc,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAC3G,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,mBAAmB,iBAAiB,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
// The driver's own canister (U-45): `DriverCanistersActor` (the demo lease, its extension,
|
|
11
11
|
// "mine", the one-time claim code and the claim from the canister's own front).
|
|
12
12
|
export { MAINNET_HOST, STOPPED_RETRY_ATTEMPTS, canisterError, errorKeyOf, isCanisterStoppedError, isMethodMissingError, retrySettings, } from "./group/canister-actor.js";
|
|
13
|
-
export { RidesActor, RideRequest, refusalKeyOf, REFRESH_WAIT_MS, REQUEST_POLL_MS, RIDE_POLL_MS, RIDE_POLL_NEAR_MS, SEARCH_RADIUS_METERS, WIDE_RADIUS_METERS, WIDEN_AFTER_MS, } from "./actors/rides-actor.js";
|
|
13
|
+
export { RidesActor, RideRequest, refusalKeyOf, REFRESH_WAIT_MS, REQUEST_POLL_MS, RIDE_POLL_MS, RIDE_POLL_NEAR_MS, SEARCH_RADIUS_METERS, WIDE_RADIUS_METERS, ONLY_SEARCH_RADIUS_METERS, ONLY_WIDE_RADIUS_METERS, checkedDriverCanister, WIDEN_AFTER_MS, } from "./actors/rides-actor.js";
|
|
14
14
|
export { ScheduledRide, RESCUE_BEFORE_MS, SCHEDULED_MAX_AHEAD_MS, SCHEDULED_MIN_AHEAD_MS, SCHEDULED_POLL_MS, SCHEDULED_RADIUS_METERS, } from "./actors/scheduled-ride.js";
|
|
15
15
|
export { ProfilesActor, RIDES_PAGE } from "./actors/profiles-actor.js";
|
|
16
16
|
export { TestManagerActor, SIMULATED_DRIVERS } from "./actors/test-manager-actor.js";
|
package/dist/interfaces.d.ts
CHANGED
|
@@ -24,6 +24,11 @@ export interface DriverCardView {
|
|
|
24
24
|
/** One text for fronts that do not show `car` (with a fleet car: "make and model · plate"). */
|
|
25
25
|
carDescription: string;
|
|
26
26
|
carPhotoUrls: string[];
|
|
27
|
+
/**
|
|
28
|
+
* FK-N77 (2026-11-17): the driver's own photo — show it instead of the car photo. A driver
|
|
29
|
+
* without one answers no picture there (load error): fall back to `carPhotoUrls`.
|
|
30
|
+
*/
|
|
31
|
+
avatarUrl: string;
|
|
27
32
|
hasLicencePhoto: boolean;
|
|
28
33
|
/** WO-N13 (D-42): the car apart; none from a driver canister before the fleet. */
|
|
29
34
|
car?: CarView;
|
package/dist/interfaces.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":"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"}
|
package/dist/mappers.d.ts
CHANGED
|
@@ -14,6 +14,11 @@ export declare function carrierOf(kind: CandidCarrierKind): {
|
|
|
14
14
|
* driver canister. An empty driverKey is `_` (a path cannot hold `//` everywhere).
|
|
15
15
|
*/
|
|
16
16
|
export declare function photoUrl(driverCanister: string, driverKey: string, index: number, host?: string, photoPath?: string): string;
|
|
17
|
+
/**
|
|
18
|
+
* FK-N77: the URL of a driver's avatar (`/avatars/<driverKey>`, the boss's `_`), served certified
|
|
19
|
+
* by the driver canister.
|
|
20
|
+
*/
|
|
21
|
+
export declare function avatarUrl(driverCanister: string, driverKey: string, host?: string): string;
|
|
17
22
|
/** WO-N13 (D-42): the car apart; the colour as its code (the front translates it). */
|
|
18
23
|
export declare function carOf(car: CandidCarInfo): CarView;
|
|
19
24
|
/**
|
package/dist/mappers.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mappers.d.ts","sourceRoot":"","sources":["../src/mappers.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,IAAI,aAAa,EAAE,WAAW,IAAI,iBAAiB,EAAE,UAAU,EAAE,KAAK,IAAI,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,gDAAgD,CAAC;AAC1L,OAAO,KAAK,EAAE,SAAS,IAAI,eAAe,EAAE,WAAW,IAAI,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAC3H,OAAO,KAAK,EAAE,eAAe,IAAI,qBAAqB,EAAE,QAAQ,IAAI,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAEhI,OAAO,KAAK,EAAa,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,cAAc,EAAE,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,YAAY,EAAW,gBAAgB,EAAkB,cAAc,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGzO,eAAO,MAAM,SAAS,WAAa,CAAC;AAEpC,wBAAgB,IAAI,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAEvC;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,WAAW,GAAG,KAAK,CAEjD;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,iBAAiB,GAAG;IAAE,WAAW,EAAE,WAAW,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,CAKtG;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,GAAE,MAAqB,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAQ1I;AAED,sFAAsF;AACtF,wBAAgB,KAAK,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAQjD;AAED;;;GAGG;AACH,wBAAgB,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,GAAG;IAAE,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,aAAa,CAAC,CAAA;CAAE,EAAE,cAAc,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,aAAa,CAAC,GAAG,cAAc,
|
|
1
|
+
{"version":3,"file":"mappers.d.ts","sourceRoot":"","sources":["../src/mappers.ts"],"names":[],"mappings":"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"}
|
package/dist/mappers.js
CHANGED
|
@@ -30,6 +30,16 @@ export function photoUrl(driverCanister, driverKey, index, host = MAINNET_HOST,
|
|
|
30
30
|
const path = photoPath === undefined ? key : photoPath.split("/").map(encodeURIComponent).join("/");
|
|
31
31
|
return `${origin}/photos/${path}/${index}`;
|
|
32
32
|
}
|
|
33
|
+
/**
|
|
34
|
+
* FK-N77: the URL of a driver's avatar (`/avatars/<driverKey>`, the boss's `_`), served certified
|
|
35
|
+
* by the driver canister.
|
|
36
|
+
*/
|
|
37
|
+
export function avatarUrl(driverCanister, driverKey, host = MAINNET_HOST) {
|
|
38
|
+
const key = driverKey === "" ? "_" : encodeURIComponent(driverKey);
|
|
39
|
+
const url = new URL(host);
|
|
40
|
+
const origin = isLocalHost(host) ? `${url.protocol}//${driverCanister}.localhost${url.port ? `:${url.port}` : ""}` : `${url.protocol}//${driverCanister}.${url.host}`;
|
|
41
|
+
return `${origin}/avatars/${key}`;
|
|
42
|
+
}
|
|
33
43
|
/** WO-N13 (D-42): the car apart; the colour as its code (the front translates it). */
|
|
34
44
|
export function carOf(car) {
|
|
35
45
|
const colour = car.colour[0];
|
|
@@ -51,6 +61,7 @@ export function cardOf(card, driverCanister, host, car) {
|
|
|
51
61
|
...carrierOf(card.carrierKind),
|
|
52
62
|
carDescription: card.carDescription,
|
|
53
63
|
carPhotoUrls: Array.from({ length: photos }, (_, index) => photoUrl(driverCanister, card.driverKey, index, host, info?.photoPath[0])),
|
|
64
|
+
avatarUrl: avatarUrl(driverCanister, card.driverKey, host),
|
|
54
65
|
hasLicencePhoto: card.hasLicencePhoto,
|
|
55
66
|
...(info === undefined ? {} : { car: carOf(info) }),
|
|
56
67
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jsm-mit/tigi-sharded-package",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.21.0",
|
|
4
4
|
"description": "The one package of the Tigi network group: takes the coordinator's id and hides the coordinator, the core and the workers — for a consumer the group is one canister; plus the rider's few driver-canister endpoints (U-14).",
|
|
5
5
|
"homepage": "https://github.com/JSM-Tigi/tigi-sharded/tree/master/package#readme",
|
|
6
6
|
"repository": {
|
|
@@ -40,6 +40,7 @@
|
|
|
40
40
|
"test-split": "bash scripts/run-tests-local.sh tests/test-split.ts",
|
|
41
41
|
"test-claim": "bash scripts/run-tests-local.sh tests/test-claim.ts",
|
|
42
42
|
"test-scheduled": "bash scripts/run-tests-local.sh tests/test-scheduled.ts",
|
|
43
|
+
"test-only-canister": "bash scripts/run-tests-local.sh tests/test-only-canister.ts",
|
|
43
44
|
"test-finishing": "bash scripts/run-tests-local.sh tests/test-finishing.ts",
|
|
44
45
|
"test-route-line": "bash scripts/run-tests-local.sh tests/test-route-line.ts",
|
|
45
46
|
"test-ride-history": "bash scripts/run-tests-local.sh tests/test-ride-history.ts",
|
|
@@ -61,11 +62,11 @@
|
|
|
61
62
|
"tigiSharded": {
|
|
62
63
|
"repo": "tigi-sharded",
|
|
63
64
|
"repoUrl": "https://github.com/JSM-Tigi/tigi-sharded",
|
|
64
|
-
"commit": "
|
|
65
|
+
"commit": "58883799d2a99a518856833720534b33e9b39334"
|
|
65
66
|
},
|
|
66
67
|
"tigiDriverRust": {
|
|
67
68
|
"repo": "tigi-driver-rust",
|
|
68
69
|
"repoUrl": "https://github.com/JSM-Tigi/tigi-driver-rust",
|
|
69
|
-
"commit": "
|
|
70
|
+
"commit": "6374cc6a4c2ff4f200ca2da389e1685c62eac31d"
|
|
70
71
|
}
|
|
71
72
|
}
|