(core) updates from grist-core

app/server/lib/ICreate.ts

@@ -30,6 +30,7 @@ export interface ICreate {
   // Return a string containing 1 or more HTML tags to insert into the head element of every
   // static page.
   getExtraHeadHtml?(): string;
+  getStorageOptions?(name: string): ICreateStorageOptions|undefined;
 }
 
 export interface ICreateActiveDocOptions {
@@ -40,6 +41,7 @@ export interface ICreateActiveDocOptions {
 }
 
 export interface ICreateStorageOptions {
+  name: string;
   check(): boolean;
   create(purpose: 'doc'|'meta', extraPrefix: string): ExternalStorage|undefined;
 }
@@ -117,5 +119,8 @@ export function makeSimpleCreator(opts: {
       elements.push(getThemeBackgroundSnippet());
       return elements.join('\n');
     },
+    getStorageOptions(name: string) {
+      return storage?.find(s => s.name === name);
+    }
   };
 }

app/server/lib/Triggers.ts

@@ -656,7 +656,6 @@ export class DocTriggers {
   private async _sendWebhookWithRetries(id: string, url: string, body: string, size: number, signal: AbortSignal) {
     const maxWait = 64;
     let wait = 1;
-    let now = Date.now();
     for (let attempt = 0; attempt < this._maxWebhookAttempts; attempt++) {
       if (this._shuttingDown) {
         return false;
@@ -673,12 +672,11 @@ export class DocTriggers {
           },
           signal,
         });
-        now = Date.now();
         if (response.status === 200) {
-          await this._stats.logBatch(id, 'success', now, { size, httpStatus: 200, error: null, attempts: attempt + 1 });
+          await this._stats.logBatch(id, 'success', { size, httpStatus: 200, error: null, attempts: attempt + 1 });
           return true;
         }
-        await this._stats.logBatch(id, 'failure', now, {
+        await this._stats.logBatch(id, 'failure', {
           httpStatus: response.status,
           error: await response.text(),
           attempts: attempt + 1,
@@ -686,7 +684,7 @@ export class DocTriggers {
         });
         this._log(`Webhook responded with non-200 status`, {level: 'warn', status: response.status, attempt});
       } catch (e) {
-        await this._stats.logBatch(id, 'failure', now, {
+        await this._stats.logBatch(id, 'failure', {
           httpStatus: null,
           error: (e.message || 'Unrecognized error during fetch'),
           attempts: attempt + 1,
@@ -874,7 +872,6 @@ class WebhookStatistics extends PersistedStore<StatsKey> {
   public async logBatch(
     id: string,
     status: WebhookBatchStatus,
-    now?: number|null,
     stats?: {
       httpStatus?: number|null,
       error?: string|null,
@@ -882,7 +879,7 @@ class WebhookStatistics extends PersistedStore<StatsKey> {
       attempts?: number|null,
     }
   ) {
-    now ??= Date.now();
+    const now = Date.now();
 
     // Update batchStats.
     const batchStats: [StatsKey, string][] = [

app/server/lib/configureMinIOExternalStorage.ts

@@ -37,9 +37,11 @@ export function checkMinIOExternalStorage() {
   }).getAsBool();
   const accessKey = settings.flag('accessKey').requireString({
     envVar: ['GRIST_DOCS_MINIO_ACCESS_KEY'],
+    censor: true,
   });
   const secretKey = settings.flag('secretKey').requireString({
     envVar: ['GRIST_DOCS_MINIO_SECRET_KEY'],
+    censor: true,
   });
   settings.flag('url').set(`minio://${bucket}/${prefix}`);
   settings.flag('active').set(true);