crm: set timeout when doing cohort queries

Author: williamstein

src/packages/frontend/client/query.ts

@@ -23,14 +23,15 @@ export class QueryClient {
   // opts.cb is NOT specified.  When opts.cb is specified,
   // it works like a cb and returns nothing.    For changefeeds
   // you MUST specify opts.cb, but can always optionally do so.
-  public async query(opts: {
+  query = async (opts: {
     query: object;
     options?: object[]; // if given must be an array of objects, e.g., [{limit:5}]
     changes?: boolean;
+    timeout?: number; // ms
     cb?: CB; // support old cb interface
-  }): Promise<any> {
+  }): Promise<any> => {
     // Deprecation warnings:
-    for (const field of ["standby", "timeout", "no_post", "ignore_response"]) {
+    for (const field of ["standby", "no_post", "ignore_response"]) {
       if (opts[field] != null) {
         console.trace(`WARNING: passing '${field}' to query is deprecated`);
       }
@@ -75,6 +76,7 @@ export class QueryClient {
         const query = await this.client.conat_client.hub.db.userQuery({
           query: opts.query,
           options: opts.options,
+          timeout: opts.timeout,
         });
 
         if (opts.cb == null) {
@@ -90,12 +92,12 @@ export class QueryClient {
         }
       }
     }
-  }
+  };
 
   // cancel a changefeed created above.  This is ONLY used
   // right now by the CRM code.
-  public async cancel(id: string): Promise<void> {
+  cancel = async (id: string): Promise<void> => {
     this.changefeeds[id]?.close();
     delete this.changefeeds[id];
-  }
+  };
 }

src/packages/frontend/conat/client.ts

@@ -303,6 +303,7 @@ export class ConatClient extends EventEmitter {
     args: any[];
     timeout?: number;
   }) => {
+    console.log("callHub", { name, args, timeout });
     const cn = this.conat();
     const subject = `hub.account.${this.client.account_id}.${service}`;
     try {

src/packages/frontend/frame-editors/crm-editor/views/retention/update.ts

@@ -33,7 +33,7 @@ export default async function update(
   { model, start, stop, period, dataEnd = new Date() }: Retention,
   setCancelRef,
   onProgress: (string, percentDone) => void,
-  cacheOnly?: boolean
+  cacheOnly?: boolean,
 ): Promise<Data[] | null> {
   start = startOfDayUTC(start);
   stop = startOfDayUTC(dayjs(stop).add(1, "day"));
@@ -70,11 +70,12 @@ export default async function update(
       `${
         last ? "Got " + last + ". " : ""
       }Processing cohort interval ${interval}...`,
-      progress
+      progress,
     );
 
     // Query the database for the current cohort interval
     const result = await webapp_client.async_query({
+      timeout: 2 * 60000, // it can take a while when there is a lot of data.
       query: {
         crm_retention: {
           start: intervalStart,
@@ -90,14 +91,14 @@ export default async function update(
     last = JSON.stringify(result.query.crm_retention);
     if (FAKE_DATA) {
       const size = (result.query.crm_retention.size = Math.round(
-        Math.random() * 1000
+        Math.random() * 1000,
       ));
       let n = size * Math.random();
       result.query.crm_retention.active = result.query.crm_retention.active.map(
         (_) => {
           n = Math.min(size, Math.round(n * 1.3 * Math.random()));
           return n;
-        }
+        },
       );
     }
     data.push(result.query.crm_retention);