@jsm-mit/tigi-sharded-package 0.16.0 → 0.18.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/README.md +2 -2
- package/declarations/core/core.did +116 -59
- package/declarations/core/core.did.d.ts +98 -57
- package/declarations/core/core.did.js +91 -55
- package/declarations/tigi-driver/tigi-driver.did +15 -1
- package/declarations/tigi-driver/tigi-driver.did.d.ts +28 -0
- package/declarations/tigi-driver/tigi-driver.did.js +24 -0
- package/declarations/tigi-simulator/tigi-simulator.did +25 -2
- package/declarations/tigi-simulator/tigi-simulator.did.d.ts +33 -4
- package/declarations/tigi-simulator/tigi-simulator.did.js +24 -0
- package/declarations/worker/worker.did +39 -2
- package/declarations/worker/worker.did.d.ts +34 -2
- package/declarations/worker/worker.did.js +36 -2
- package/dist/actors/driver-canisters-actor.d.ts +9 -4
- package/dist/actors/driver-canisters-actor.d.ts.map +1 -1
- package/dist/actors/driver-canisters-actor.js +13 -1
- package/dist/actors/scheduled-ride.js +2 -2
- package/dist/interfaces.d.ts +25 -0
- package/dist/interfaces.d.ts.map +1 -1
- package/dist/mappers.d.ts +11 -3
- package/dist/mappers.d.ts.map +1 -1
- package/dist/mappers.js +17 -2
- package/package.json +3 -3
package/dist/mappers.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import type { CarrierKind as CandidCarrierKind, DriverCard, Money as CandidMoney, RideStatus, RouteLine } from "../declarations/tigi-driver/tigi-driver.did.js";
|
|
1
|
+
import type { CarInfo as CandidCarInfo, CarrierKind as CandidCarrierKind, DriverCard, Money as CandidMoney, RideStatus, RouteLine } from "../declarations/tigi-driver/tigi-driver.did.js";
|
|
2
2
|
import type { OfferView as CandidOfferView, RequestView as CandidRequestView } from "../declarations/worker/worker.did.js";
|
|
3
3
|
import type { RateRideOutcome as CandidRateRideOutcome, RideView as CandidHistoryRide } from "../declarations/core/core.did.js";
|
|
4
|
-
import type { CarrierKind, CloseReason, DriverCardView, Money, OfferView, RateRideOutcome, RequestPhase, RideHistoryEntry, RideStatusView, RideView, RouteLineView } from "./interfaces.js";
|
|
4
|
+
import type { CarView, CarrierKind, CloseReason, DriverCardView, Money, OfferView, RateRideOutcome, RequestPhase, RideHistoryEntry, RideStatusView, RideView, RouteLineView } from "./interfaces.js";
|
|
5
5
|
export declare const NS_PER_MS = 1000000n;
|
|
6
6
|
export declare function msOf(ns: bigint): number;
|
|
7
7
|
export declare function moneyOf(money: CandidMoney): Money;
|
|
@@ -14,7 +14,15 @@ 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): string;
|
|
17
|
-
|
|
17
|
+
/** WO-N13 (D-42): the car apart; the colour as its code (the front translates it). */
|
|
18
|
+
export declare function carOf(car: CandidCarInfo): CarView;
|
|
19
|
+
/**
|
|
20
|
+
* The card a rider sees. `car`: the car the worker keeps apart (an offer); without it, the
|
|
21
|
+
* card's own (a ride, from the driver canister). Old canisters send none.
|
|
22
|
+
*/
|
|
23
|
+
export declare function cardOf(card: Omit<DriverCard, "car"> & {
|
|
24
|
+
car?: [] | [CandidCarInfo];
|
|
25
|
+
}, driverCanister: string, host?: string, car?: [] | [CandidCarInfo]): DriverCardView;
|
|
18
26
|
export declare function rideStatusOf(status: RideStatus): RideStatusView;
|
|
19
27
|
export declare function closeReasonOf(reason: {
|
|
20
28
|
offerRejected: null;
|
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,WAAW,IAAI,iBAAiB,EAAE,UAAU,EAAE,KAAK,IAAI,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,gDAAgD,CAAC;
|
|
1
|
+
{"version":3,"file":"mappers.d.ts","sourceRoot":"","sources":["../src/mappers.ts"],"names":[],"mappings":"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"}
|
package/dist/mappers.js
CHANGED
|
@@ -28,14 +28,29 @@ export function photoUrl(driverCanister, driverKey, index, host = MAINNET_HOST)
|
|
|
28
28
|
const origin = isLocalHost(host) ? `${url.protocol}//${driverCanister}.localhost${url.port ? `:${url.port}` : ""}` : `${url.protocol}//${driverCanister}.${url.host}`;
|
|
29
29
|
return `${origin}/photos/${key}/${index}`;
|
|
30
30
|
}
|
|
31
|
-
|
|
31
|
+
/** WO-N13 (D-42): the car apart; the colour as its code (the front translates it). */
|
|
32
|
+
export function carOf(car) {
|
|
33
|
+
const colour = car.colour[0];
|
|
34
|
+
return {
|
|
35
|
+
name: car.name,
|
|
36
|
+
plate: car.plate,
|
|
37
|
+
...(colour === undefined ? {} : { colour: Object.keys(colour)[0] }),
|
|
38
|
+
};
|
|
39
|
+
}
|
|
40
|
+
/**
|
|
41
|
+
* The card a rider sees. `car`: the car the worker keeps apart (an offer); without it, the
|
|
42
|
+
* card's own (a ride, from the driver canister). Old canisters send none.
|
|
43
|
+
*/
|
|
44
|
+
export function cardOf(card, driverCanister, host, car) {
|
|
32
45
|
const photos = Math.min(6, card.carPhotoCount);
|
|
46
|
+
const info = (car ?? card.car)?.[0];
|
|
33
47
|
return {
|
|
34
48
|
name: card.name,
|
|
35
49
|
...carrierOf(card.carrierKind),
|
|
36
50
|
carDescription: card.carDescription,
|
|
37
51
|
carPhotoUrls: Array.from({ length: photos }, (_, index) => photoUrl(driverCanister, card.driverKey, index, host)),
|
|
38
52
|
hasLicencePhoto: card.hasLicencePhoto,
|
|
53
|
+
...(info === undefined ? {} : { car: carOf(info) }),
|
|
39
54
|
};
|
|
40
55
|
}
|
|
41
56
|
export function rideStatusOf(status) {
|
|
@@ -146,7 +161,7 @@ export function offerOf(offer, simulator, host) {
|
|
|
146
161
|
const pin = pinExact ? { lat: exact.lat, lng: exact.lng } : freeAtMs !== undefined ? undefined : (decodeGeohashCenter(offer.pinGeohash) ?? { lat: 0, lng: 0 });
|
|
147
162
|
return {
|
|
148
163
|
offerId: offerIdOf(canister, offer.driverKey),
|
|
149
|
-
card: cardOf(offer.card, canister, host),
|
|
164
|
+
card: cardOf(offer.card, canister, host, offer.car),
|
|
150
165
|
driverRating: offer.driverRating[0] === undefined ? undefined : offer.driverRating[0] / 100,
|
|
151
166
|
...(pin === undefined ? {} : { pin }),
|
|
152
167
|
pinExact,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jsm-mit/tigi-sharded-package",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.18.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": {
|
|
@@ -61,11 +61,11 @@
|
|
|
61
61
|
"tigiSharded": {
|
|
62
62
|
"repo": "tigi-sharded",
|
|
63
63
|
"repoUrl": "https://github.com/JSM-Tigi/tigi-sharded",
|
|
64
|
-
"commit": "
|
|
64
|
+
"commit": "97624ea87ce0f31368ec29dadd91686177adb99e"
|
|
65
65
|
},
|
|
66
66
|
"tigiDriverRust": {
|
|
67
67
|
"repo": "tigi-driver-rust",
|
|
68
68
|
"repoUrl": "https://github.com/JSM-Tigi/tigi-driver-rust",
|
|
69
|
-
"commit": "
|
|
69
|
+
"commit": "ad07a52fd72aa3a3bc815621b2f095dcaa760663"
|
|
70
70
|
}
|
|
71
71
|
}
|