Merge branch 'main' into table-cell-bgcolor

Author: jacobmischka

src/classes/DuplexRPCClient.ts

@@ -278,7 +278,10 @@ export class DuplexRPCClient<
 
   public async send<MethodName extends keyof CallerSchema>(
     methodName: MethodName,
-    inputs: z.input<CallerSchema[MethodName]['inputs']>
+    inputs: z.input<CallerSchema[MethodName]['inputs']>,
+    options: {
+      timeoutFactor?: number
+    } = {}
   ) {
     const id = generateId()
 
@@ -335,7 +338,7 @@ export class DuplexRPCClient<
           }
         })
       } else {
-        this.communicator.send(msg).catch(err => {
+        this.communicator.send(msg, options).catch(err => {
           reject(err)
         })
       }

src/classes/ISocket.ts

@@ -224,15 +224,15 @@ export default class ISocket {
    * Send a `MESSAGE` containing data to the connected counterpart,
    * throwing an error if `ACK` is not received within `sendTimeout`.
    */
-  async send(data: string) {
+  async send(data: string, options: { timeoutFactor?: number } = {}) {
     if (this.isClosed) throw new NotConnectedError()
 
     return new Promise<void>((resolve, reject) => {
       const id = v4()
 
       const failTimeout = setTimeout(() => {
         reject(new TimeoutError())
-      }, this.sendTimeout)
+      }, this.sendTimeout * (options.timeoutFactor ?? 1))
 
       this.timeouts.add(failTimeout)
 
@@ -280,8 +280,8 @@ export default class ISocket {
 
     this.id = config?.id || v4()
     this.connectTimeout = config?.connectTimeout ?? 15_000
-    this.sendTimeout = config?.sendTimeout ?? 3000
-    this.pingTimeout = config?.pingTimeout ?? 3000
+    this.sendTimeout = config?.sendTimeout ?? 5000
+    this.pingTimeout = config?.pingTimeout ?? 5000
     this.isAuthenticated = false
 
     this.onClose.attach(() => {

src/classes/IntervalClient.ts

@@ -113,6 +113,7 @@ export default class IntervalClient {
   #completeHttpRequestDelayMs: number = 3000
   #completeShutdownDelayMs: number = 3000
   #retryIntervalMs: number = 3000
+  #maxResendAttempts: number = 10
   #pingIntervalMs: number = 30_000
   #closeUnresponsiveConnectionTimeoutMs: number = 3 * 60 * 1000 // 3 minutes
   #reinitializeBatchTimeoutMs: number = 200
@@ -175,6 +176,10 @@ export default class IntervalClient {
       this.#completeHttpRequestDelayMs = config.completeHttpRequestDelayMs
     }
 
+    if (config.maxResendAttempts && config.maxResendAttempts > 0) {
+      this.#maxResendAttempts = config.maxResendAttempts
+    }
+
     this.#httpEndpoint = getHttpEndpoint(this.#endpoint)
 
     if (config.setHostHandlers) {
@@ -499,7 +504,8 @@ export default class IntervalClient {
         )
       : new Map(this.#pendingIOCalls)
 
-    while (toResend.size > 0) {
+    let attemptNumber = 1
+    while (toResend.size > 0 && attemptNumber <= this.#maxResendAttempts) {
       await Promise.allSettled(
         Array.from(toResend.entries()).map(([transactionId, ioCall]) =>
           this.#send('SEND_IO_CALL', {
@@ -534,15 +540,16 @@ export default class IntervalClient {
                 this.#logger.debug('Failed resending pending IO call:', err)
               }
 
+              const retrySleepMs = this.#retryIntervalMs * attemptNumber
               this.#logger.debug(
-                `Trying again in ${Math.round(
-                  this.#retryIntervalMs / 1000
-                )}s...`
+                `Trying again in ${Math.round(retrySleepMs / 1000)}s...`
               )
-              await sleep(this.#retryIntervalMs)
+              await sleep(retrySleepMs)
             })
         )
       )
+
+      attemptNumber++
     }
   }
 
@@ -560,7 +567,8 @@ export default class IntervalClient {
         )
       : new Map(this.#pendingPageLayouts)
 
-    while (toResend.size > 0) {
+    let attemptNumber = 1
+    while (toResend.size > 0 && attemptNumber <= this.#maxResendAttempts) {
       await Promise.allSettled(
         Array.from(toResend.entries()).map(([pageKey, page]) =>
           this.#send('SEND_PAGE', {
@@ -595,15 +603,16 @@ export default class IntervalClient {
                 this.#logger.debug('Failed resending pending page layout:', err)
               }
 
+              const retrySleepMs = this.#retryIntervalMs * attemptNumber
               this.#logger.debug(
-                `Trying again in ${Math.round(
-                  this.#retryIntervalMs / 1000
-                )}s...`
+                `Trying again in ${Math.round(retrySleepMs / 1000)}s...`
               )
-              await sleep(this.#retryIntervalMs)
+              await sleep(retrySleepMs)
             })
         )
       )
+
+      attemptNumber++
     }
   }
 
@@ -621,7 +630,8 @@ export default class IntervalClient {
         )
       : new Map(this.#transactionLoadingStates)
 
-    while (toResend.size > 0) {
+    let attemptNumber = 0
+    while (toResend.size > 0 && attemptNumber <= this.#maxResendAttempts) {
       await Promise.allSettled(
         Array.from(toResend.entries()).map(([transactionId, loadingState]) =>
           this.#send('SEND_LOADING_CALL', {
@@ -657,15 +667,16 @@ export default class IntervalClient {
                 this.#logger.debug('Failed resending pending IO call:', err)
               }
 
+              const retrySleepMs = this.#retryIntervalMs * attemptNumber
               this.#logger.debug(
-                `Trying again in ${Math.round(
-                  this.#retryIntervalMs / 1000
-                )}s...`
+                `Trying again in ${Math.round(retrySleepMs / 1000)}s...`
               )
-              await sleep(this.#retryIntervalMs)
+              await sleep(retrySleepMs)
             })
         )
       )
+
+      attemptNumber++
     }
   }
 
@@ -2003,27 +2014,41 @@ export default class IntervalClient {
       this.#logger.debug('Error from peer RPC', err)
     }
 
-    while (true) {
+    for (
+      let attemptNumber = 1;
+      attemptNumber <= this.#maxResendAttempts;
+      attemptNumber++
+    ) {
       try {
         this.#logger.debug('Sending via server', methodName, inputs)
-        return await this.#serverRpc.send(methodName, {
-          ...inputs,
-          skipClientCall,
-        })
+        return await this.#serverRpc.send(
+          methodName,
+          {
+            ...inputs,
+            skipClientCall,
+          },
+          {
+            timeoutFactor: attemptNumber,
+          }
+        )
       } catch (err) {
+        const sleepTimeBeforeRetrying = this.#retryIntervalMs * attemptNumber
+
         if (err instanceof TimeoutError) {
           this.#log.debug(
             `RPC call timed out, retrying in ${Math.round(
-              this.#retryIntervalMs / 1000
+              sleepTimeBeforeRetrying / 1000
             )}s...`
           )
           this.#log.debug(err)
-          sleep(this.#retryIntervalMs)
+          sleep(sleepTimeBeforeRetrying)
         } else {
           throw err
         }
       }
     }
+
+    throw new IntervalError('Maximum failed resend attempts reached, aborting.')
   }
 
   /**

src/examples/basic/index.ts

@@ -114,7 +114,35 @@ const empty_page = new Page({
   },
   routes: {
     child_action: new Action(async () => {
-      return 'Hello!'
+      await io.group([
+        io.display.link('Go to unlisted action', {
+          route: 'empty_page/unlisted_action',
+          theme: 'secondary',
+        }),
+        io.display.link('Go to unlisted page', {
+          route: 'empty_page/unlisted_page',
+          theme: 'secondary',
+        }),
+      ])
+    }),
+    unlisted_action: new Action({
+      unlisted: true,
+      handler: async () => {
+        return 'Hello!'
+      },
+    }),
+    unlisted_page: new Page({
+      name: 'Unlisted page',
+      unlisted: true,
+      handler: async () => {
+        return new Layout({
+          children: [
+            io.display.markdown(
+              'This page is unlisted, but you can still access it!'
+            ),
+          ],
+        })
+      },
     }),
     show_layout: new Action(async () => {
       ctx.redirect({ route: 'empty_page', params: { show_layout: 1 } })

src/examples/basic/table.ts

@@ -227,7 +227,7 @@ export const multiple_tables: IntervalActionHandler = async io => {
 export const big_payload_table = new Page({
   name: 'Big table',
   handler: async () => {
-    const bigData = generateRows(100000)
+    const bigData = generateRows(10_000)
 
     return new Layout({
       children: [

src/examples/utils/helpers.ts

@@ -100,6 +100,11 @@ export function generateRows(count: number, offset = 0) {
         ~~~`,
       ]),
       number: faker.datatype.number(100),
+      ...Object.fromEntries(
+        Array(50)
+          .fill(null)
+          .map((_, i) => [`text_${i}`, faker.lorem.paragraph()])
+      ),
       boolean: faker.datatype.boolean(),
       date: faker.datatype.datetime(),
       image: faker.image.imageUrl(

src/index.ts

@@ -64,6 +64,7 @@ export interface InternalConfig {
   connectTimeoutMs?: number
   sendTimeoutMs?: number
   pingTimeoutMs?: number
+  maxResendAttempts?: number
   completeHttpRequestDelayMs?: number
 
   closeUnresponsiveConnectionTimeoutMs?: number