@jsm-mit/tigi-sharded-package 0.5.0 → 0.6.0

package/declarations/tigi-simulator/tigi-simulator.did

@@ -206,9 +206,10 @@ type RequestClosed = record {
   driverKey : text;
   reason : CloseReason;
 };
-type Result = variant { Ok : vec RouteTaskView; Err : SimulatorError };
-type Result_1 = variant { Ok; Err : SimulatorError };
-type Result_2 = variant { Ok : SpawnResult; Err : SimulatorError };
+type Result = variant { Ok : opt SpawnPlace; Err : SimulatorError };
+type Result_1 = variant { Ok : vec RouteTaskView; Err : SimulatorError };
+type Result_2 = variant { Ok; Err : SimulatorError };
+type Result_3 = variant { Ok : SpawnResult; Err : SimulatorError };
 // `variant { ok : RideView; err : ProtocolError }`.
 type RideAnswer = variant { ok : RideView; err : ProtocolError };
 type RideOrder = record {
@@ -296,6 +297,8 @@ type SpawnArgs = record {
   // None = 12.
   count : opt nat8;
 };
+// S-N15: the centre of the last `spawnDrivers` and its time.
+type SpawnPlace = record { center : Geo; atNs : nat64 };
 type SpawnResult = record {
   // Why some were not registered.
   problems : vec text;
@@ -312,12 +315,16 @@ type SpeedUpArgs = record {
 service : (InitArgs) -> {
   // S-14 (KK-33): the rider cancels before `inProgress`, once.
   cancelRide : (RideRef) -> (ProtocolAnswer);
+  // S-N15: where testers last asked for drivers — the router moves the automat driver
+  // canister near it (TIGI-DRIVER-MODES). None until the first search after an install or
+  // an upgrade.
+  getLastSpawn : () -> (Result) query;
   getLicence : (RideRef) -> (LicenceAnswer) query;
   getRide : (RideRef) -> (RideAnswer) query;
   // S-N14 (P-19): the line of the ride for its rider, while the ride is active.
   getRideRoute : (RideRef) -> (RouteAnswer) query;
-  // S-N13: the quote requests that wait for a route (at most 5 s each), the oldest first.
-  getRouteTasks : () -> (Result) query;
+  // S-N13: the quote requests that wait for a route (at most 10 s each), the oldest first.
+  getRouteTasks : () -> (Result_1) query;
   getStatus : () -> (SimulatorStatus) query;
   http_request : (HttpRequest) -> (HttpResponse) query;
   protocolVersion : () -> (nat32) query;
@@ -330,13 +337,13 @@ service : (InitArgs) -> {
   rideOrder : (RideOrder) -> (ProtocolAnswer);
   // S-N13: the core only (an admin's `setSimulatorRouter`): the one principal that routes the
   // virtual drivers' quotes, like a driver's front; none = the straight line again.
-  setRouter : (SetRouterArgs) -> (Result_1);
+  setRouter : (SetRouterArgs) -> (Result_2);
   // S-15: ×10 for one request (`requestId`), not the whole canister.
-  setSpeedUp : (SpeedUpArgs) -> (Result_1);
+  setSpeedUp : (SpeedUpArgs) -> (Result_2);
   // S-2, S-3: virtual drivers around a point, each registered in the worker of its cell
   // with `validUntilNs` (30 min) instead of a pulse.
-  spawnDrivers : (SpawnArgs) -> (Result_2);
+  spawnDrivers : (SpawnArgs) -> (Result_3);
   // S-N13: the router's route for one virtual driver — metres, seconds, the line. The quote
   // goes with it at its moment (S-8), or at once when that moment has passed.
-  submitRoute : (SimRouteResult) -> (Result_1);
+  submitRoute : (SimRouteResult) -> (Result_2);
 }

package/declarations/tigi-simulator/tigi-simulator.did.d.ts

@@ -288,11 +288,13 @@ export interface RequestClosed {
   'driverKey' : string,
   'reason' : CloseReason,
 }
-export type Result = { 'Ok' : Array<RouteTaskView> } |
+export type Result = { 'Ok' : [] | [SpawnPlace] } |
   { 'Err' : SimulatorError };
-export type Result_1 = { 'Ok' : null } |
+export type Result_1 = { 'Ok' : Array<RouteTaskView> } |
   { 'Err' : SimulatorError };
-export type Result_2 = { 'Ok' : SpawnResult } |
+export type Result_2 = { 'Ok' : null } |
+  { 'Err' : SimulatorError };
+export type Result_3 = { 'Ok' : SpawnResult } |
   { 'Err' : SimulatorError };
 /**
  * `variant { ok : RideView; err : ProtocolError }`.
@@ -409,6 +411,10 @@ export interface SpawnArgs {
    */
   'count' : [] | [number],
 }
+/**
+ * S-N15: the centre of the last `spawnDrivers` and its time.
+ */
+export interface SpawnPlace { 'center' : Geo, 'atNs' : bigint }
 export interface SpawnResult {
   /**
    * Why some were not registered.
@@ -433,6 +439,12 @@ export interface _SERVICE {
    * S-14 (KK-33): the rider cancels before `inProgress`, once.
    */
   'cancelRide' : ActorMethod<[RideRef], ProtocolAnswer>,
+  /**
+   * S-N15: where testers last asked for drivers — the router moves the automat driver
+   * canister near it (TIGI-DRIVER-MODES). None until the first search after an install or
+   * an upgrade.
+   */
+  'getLastSpawn' : ActorMethod<[], Result>,
   'getLicence' : ActorMethod<[RideRef], LicenceAnswer>,
   'getRide' : ActorMethod<[RideRef], RideAnswer>,
   /**
@@ -440,9 +452,9 @@ export interface _SERVICE {
    */
   'getRideRoute' : ActorMethod<[RideRef], RouteAnswer>,
   /**
-   * S-N13: the quote requests that wait for a route (at most 5 s each), the oldest first.
+   * S-N13: the quote requests that wait for a route (at most 10 s each), the oldest first.
    */
-  'getRouteTasks' : ActorMethod<[], Result>,
+  'getRouteTasks' : ActorMethod<[], Result_1>,
   'getStatus' : ActorMethod<[], SimulatorStatus>,
   'http_request' : ActorMethod<[HttpRequest], HttpResponse>,
   'protocolVersion' : ActorMethod<[], number>,
@@ -463,21 +475,21 @@ export interface _SERVICE {
    * S-N13: the core only (an admin's `setSimulatorRouter`): the one principal that routes the
    * virtual drivers' quotes, like a driver's front; none = the straight line again.
    */
-  'setRouter' : ActorMethod<[SetRouterArgs], Result_1>,
+  'setRouter' : ActorMethod<[SetRouterArgs], Result_2>,
   /**
    * S-15: ×10 for one request (`requestId`), not the whole canister.
    */
-  'setSpeedUp' : ActorMethod<[SpeedUpArgs], Result_1>,
+  'setSpeedUp' : ActorMethod<[SpeedUpArgs], Result_2>,
   /**
    * S-2, S-3: virtual drivers around a point, each registered in the worker of its cell
    * with `validUntilNs` (30 min) instead of a pulse.
    */
-  'spawnDrivers' : ActorMethod<[SpawnArgs], Result_2>,
+  'spawnDrivers' : ActorMethod<[SpawnArgs], Result_3>,
   /**
    * S-N13: the router's route for one virtual driver — metres, seconds, the line. The quote
    * goes with it at its moment (S-8), or at once when that moment has passed.
    */
-  'submitRoute' : ActorMethod<[SimRouteResult], Result_1>,
+  'submitRoute' : ActorMethod<[SimRouteResult], Result_2>,
 }
 export declare const idlFactory: IDL.InterfaceFactory;
 export declare const init: (args: { IDL: typeof IDL }) => IDL.Type[];

package/declarations/tigi-simulator/tigi-simulator.did.js

@@ -28,6 +28,18 @@ export const idlFactory = ({ IDL }) => {
     'ok' : IDL.Null,
     'err' : ProtocolError,
   });
+  const Geo = IDL.Record({ 'lat' : IDL.Float64, 'lng' : IDL.Float64 });
+  const SpawnPlace = IDL.Record({ 'center' : Geo, 'atNs' : IDL.Nat64 });
+  const SimulatorError = IDL.Variant({
+    'RemoteCanisterError' : IDL.Text,
+    'NotFound' : IDL.Null,
+    'NotAuthorized' : IDL.Text,
+    'InvalidData' : IDL.Text,
+  });
+  const Result = IDL.Variant({
+    'Ok' : IDL.Opt(SpawnPlace),
+    'Err' : SimulatorError,
+  });
   const Licence = IDL.Record({
     'mimeType' : IDL.Text,
     'image' : IDL.Vec(IDL.Nat8),
@@ -59,7 +71,6 @@ export const idlFactory = ({ IDL }) => {
     'carPhotoCount' : IDL.Nat8,
     'hasLicencePhoto' : IDL.Bool,
   });
-  const Geo = IDL.Record({ 'lat' : IDL.Float64, 'lng' : IDL.Float64 });
   const RideView = IDL.Record({
     'status' : RideStatus,
     'requestId' : IDL.Text,
@@ -80,13 +91,7 @@ export const idlFactory = ({ IDL }) => {
     'pickup' : Geo,
     'driverKey' : IDL.Text,
   });
-  const SimulatorError = IDL.Variant({
-    'RemoteCanisterError' : IDL.Text,
-    'NotFound' : IDL.Null,
-    'NotAuthorized' : IDL.Text,
-    'InvalidData' : IDL.Text,
-  });
-  const Result = IDL.Variant({
+  const Result_1 = IDL.Variant({
     'Ok' : IDL.Vec(RouteTaskView),
     'Err' : SimulatorError,
   });
@@ -150,7 +155,7 @@ export const idlFactory = ({ IDL }) => {
     'rider' : IDL.Principal,
   });
   const SetRouterArgs = IDL.Record({ 'router' : IDL.Opt(IDL.Principal) });
-  const Result_1 = IDL.Variant({ 'Ok' : IDL.Null, 'Err' : SimulatorError });
+  const Result_2 = IDL.Variant({ 'Ok' : IDL.Null, 'Err' : SimulatorError });
   const SpeedUpArgs = IDL.Record({
     'requestId' : IDL.Text,
     'factor' : IDL.Nat8,
@@ -162,7 +167,7 @@ export const idlFactory = ({ IDL }) => {
     'registered' : IDL.Nat32,
     'validUntilNs' : IDL.Nat64,
   });
-  const Result_2 = IDL.Variant({ 'Ok' : SpawnResult, 'Err' : SimulatorError });
+  const Result_3 = IDL.Variant({ 'Ok' : SpawnResult, 'Err' : SimulatorError });
   const SimRouteResult = IDL.Record({
     'requestId' : IDL.Text,
     'rideMeters' : IDL.Nat32,
@@ -174,20 +179,21 @@ export const idlFactory = ({ IDL }) => {
   });
   return IDL.Service({
     'cancelRide' : IDL.Func([RideRef], [ProtocolAnswer], []),
+    'getLastSpawn' : IDL.Func([], [Result], ['query']),
     'getLicence' : IDL.Func([RideRef], [LicenceAnswer], ['query']),
     'getRide' : IDL.Func([RideRef], [RideAnswer], ['query']),
     'getRideRoute' : IDL.Func([RideRef], [RouteAnswer], ['query']),
-    'getRouteTasks' : IDL.Func([], [Result], ['query']),
+    'getRouteTasks' : IDL.Func([], [Result_1], ['query']),
     'getStatus' : IDL.Func([], [SimulatorStatus], ['query']),
     'http_request' : IDL.Func([HttpRequest], [HttpResponse], ['query']),
     'protocolVersion' : IDL.Func([], [IDL.Nat32], ['query']),
     'quoteRequest' : IDL.Func([QuoteRequest], [ProtocolAnswer], []),
     'requestClosed' : IDL.Func([RequestClosed], [], []),
     'rideOrder' : IDL.Func([RideOrder], [ProtocolAnswer], []),
-    'setRouter' : IDL.Func([SetRouterArgs], [Result_1], []),
-    'setSpeedUp' : IDL.Func([SpeedUpArgs], [Result_1], []),
-    'spawnDrivers' : IDL.Func([SpawnArgs], [Result_2], []),
-    'submitRoute' : IDL.Func([SimRouteResult], [Result_1], []),
+    'setRouter' : IDL.Func([SetRouterArgs], [Result_2], []),
+    'setSpeedUp' : IDL.Func([SpeedUpArgs], [Result_2], []),
+    'spawnDrivers' : IDL.Func([SpawnArgs], [Result_3], []),
+    'submitRoute' : IDL.Func([SimRouteResult], [Result_2], []),
   });
 };
 export const init = ({ IDL }) => {

package/declarations/worker/worker.did

@@ -203,6 +203,7 @@ type RequestRideArgs =
    destination: Geo;
    pickup: Geo;
    radiusMeters: nat32;
+   realDriversOnly: opt bool;
    requestId: RequestId;
    riderName: text;
  };

package/declarations/worker/worker.did.d.ts

@@ -193,6 +193,7 @@ export interface RequestRef { 'requestId' : RequestId }
 export interface RequestRideArgs {
   'destination' : Geo,
   'requestId' : RequestId,
+  'realDriversOnly' : [] | [boolean],
   'pickup' : Geo,
   'radiusMeters' : number,
   'riderName' : string,

package/declarations/worker/worker.did.js

@@ -272,6 +272,7 @@ export const idlFactory = ({ IDL }) => {
   const RequestRideArgs = IDL.Record({
     'destination' : Geo,
     'requestId' : RequestId,
+    'realDriversOnly' : IDL.Opt(IDL.Bool),
     'pickup' : Geo,
     'radiusMeters' : IDL.Nat32,
     'riderName' : IDL.Text,

package/dist/actors/rides-actor.d.ts

@@ -30,6 +30,8 @@ interface RequestState {
     widened: boolean;
     othersClosed: boolean;
     sawOffer: boolean;
+    /** ZO-23: kept for the widening and "Szukaj ponownie". */
+    realDriversOnly?: boolean;
     accepted?: {
         worker: string;
         canister: string;
@@ -43,6 +45,11 @@ export interface RequestRideArgs {
     riderName?: string;
     /** Only for tests and resumed flows: the id of the request (1–64 characters). */
     requestId?: string;
+    /**
+     * ZO-23 (test builds): true = the simulator's drivers are not asked, only real driver
+     * canisters (the Test Manager's switch). Left out = everyone, as before.
+     */
+    realDriversOnly?: boolean;
 }
 /**
  * The refusal key of a worker's answer (WO-N9): `ALREADY_OPEN`, `NOT_MY_AREA`, `FULL`,

package/dist/actors/rides-actor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rides-actor.d.ts","sourceRoot":"","sources":["../../src/actors/rides-actor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rides-actor.d.ts","sourceRoot":"","sources":["../../src/actors/rides-actor.ts"],"names":[],"mappings":"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"}

package/dist/actors/rides-actor.js

@@ -89,6 +89,7 @@ export class RidesActor {
             widened: false,
             othersClosed: false,
             sawOffer: false,
+            ...(args.realDriversOnly ? { realDriversOnly: true } : {}),
         };
         const request = new RideRequest(this.group, this.identity, this.options, state, () => this.simulatorIdAsync());
         await request.placeAsyncUnsafe(SEARCH_RADIUS_METERS);
@@ -193,7 +194,7 @@ export class RideRequest {
             const workers = (await workersForAsync(this.group, this.state.pickup, radiusMeters, fresh)).filter((worker) => !tried.has(worker));
             const results = await Promise.allSettled(workers.map(async (worker) => {
                 tried.add(worker);
-                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 }));
+                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] : [] }));
                 return worker;
             }));
             let staleMap = false;
@@ -387,6 +388,7 @@ export class RideRequest {
             widened: false,
             othersClosed: false,
             sawOffer: false,
+            ...(this.state.realDriversOnly ? { realDriversOnly: true } : {}),
         };
         const request = new RideRequest(this.group, this.identity, this.options, state, this.simulatorIdAsync);
         await request.placeAsyncUnsafe(SEARCH_RADIUS_METERS);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jsm-mit/tigi-sharded-package",
-    "version": "0.5.0",
+    "version": "0.6.0",
     "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).",
     "homepage": "https://github.com/JSM-Tigi/tigi-sharded/tree/master/package#readme",
     "repository": {
@@ -59,11 +59,11 @@
     "tigiSharded": {
         "repo": "tigi-sharded",
         "repoUrl": "https://github.com/JSM-Tigi/tigi-sharded",
-        "commit": "45ef3143fba15b541f6a7eeb710791ba95716964"
+        "commit": "148160dc78284db42f421146b0b68d5404bb6926"
     },
     "tigiDriverRust": {
         "repo": "tigi-driver-rust",
         "repoUrl": "https://github.com/JSM-Tigi/tigi-driver-rust",
-        "commit": "f7aca49c36c7eddeea623e69f10d15203100a67e"
+        "commit": "d39d7dc2b06358a570c3f07cbba17900297047a3"
     }
 }