sliftutils 1.7.113 → 1.7.115

package/storage/remoteStorage/intermediateManagement.ts

@@ -1,4 +1,5 @@
 import { lazy } from "socket-function/src/caching";
+import { formatDateTimeDetailed } from "socket-function/src/formatting/format";
 import { runInfinitePoll } from "socket-function/src/batching";
 import { RemoteConfig, SourceConfig, HostedConfig } from "../IArchives";
 import { ROUTING_FILE, getConfigVersion, serializeRemoteConfig, parseRoutingData, parseHostedUrl, replaceHostedUrlPort } from "./remoteConfig";
@@ -78,7 +79,7 @@ export function scheduleBoundaryWork(account: string, bucketName: string, routin
 /** Collects the writes that landed on the previous window's owners just before a boundary, into the store that has just taken over. Who owned what is worked out purely from the config (see previousWindowOwners); this only does the pulling. The config is read off the disk at FIRE time, not captured when the scan was armed - it may have changed in between, and the newest copy is the one the handover actually happened under. */
 async function runBoundaryScan(account: string, bucketName: string, windowStart: number, offset: number, offsetLabel?: string): Promise<void> {
     let key = `${account}/${bucketName}`;
-    let label = `bucket ${key}, window starting ${new Date(windowStart).toISOString()}, offset ${offsetLabel || `${offset / 1000}s`}`;
+    let label = `bucket ${key}, window starting ${formatDateTimeDetailed(windowStart)}, offset ${offsetLabel || `${offset / 1000}s`}`;
     if (boundaryScansRunning.has(key)) {
         console.log(`Skipping boundary scan (${label}): the previous boundary scan is still running`);
         return;
@@ -220,7 +221,7 @@ async function maintainIntermediates(): Promise<void> {
             alreadyCorrect.push(key);
             continue;
         }
-        await writeOwnRoutingConfig({ account, bucketName, storeName: newest.name, current: routing, updated: injected, reason: `we are a deploy successor: writes route to our alternate port ${takeover.altPort} from ${new Date(takeover.start).toISOString()} until our predecessor is killed at ${new Date(takeover.end).toISOString()}` });
+        await writeOwnRoutingConfig({ account, bucketName, storeName: newest.name, current: routing, updated: injected, reason: `we are a deploy successor: writes route to our alternate port ${takeover.altPort} from ${formatDateTimeDetailed(takeover.start)} until our predecessor is killed at ${formatDateTimeDetailed(takeover.end)}` });
         written.push(key);
     }
     if (!takeover) return;

package/storage/remoteStorage/sourceWrapper.ts

@@ -1,4 +1,5 @@
 import { isNode, sort } from "socket-function/src/misc";
+import { formatDateTimeDetailed } from "socket-function/src/formatting/format";
 import { delay } from "socket-function/src/batching";
 import { getSecret } from "../../misc/getSecret";
 import { IArchives, SourceConfig, RemoteConfig } from "../IArchives";
@@ -92,8 +93,8 @@ export class SourceWrapper {
         }
         let [start, end] = this.config.validWindow;
         if (start !== 0 || end !== Number.MAX_SAFE_INTEGER) {
-            let startText = start === 0 && "0" || new Date(start).toISOString();
-            let endText = end === Number.MAX_SAFE_INTEGER && "forever" || new Date(end).toISOString();
+            let startText = start === 0 && "0" || formatDateTimeDetailed(start);
+            let endText = end === Number.MAX_SAFE_INTEGER && "forever" || formatDateTimeDetailed(end);
             parts.push(`validWindow [${startText}, ${endText}]`);
         }
         return `source ${this.config.url}${parts.length && ` (${parts.join(", ")})` || ""}`;
@@ -121,7 +122,7 @@ export class SourceWrapper {
         if (this.disposed || this.isConnected()) return;
         let now = Date.now();
         if (now >= this.cooldownUntil && this.isConnectionProblemWorthReporting()) {
-            console.error(`Cannot connect to storage ${this.getDebugName()}; skipping it until ${new Date(now + SOURCE_FAILURE_COOLDOWN).toISOString()} (now ${new Date(now).toISOString()}) unless no other source can serve the request`);
+            console.error(`Cannot connect to storage ${this.getDebugName()}; skipping it until ${formatDateTimeDetailed(now + SOURCE_FAILURE_COOLDOWN)} (now ${formatDateTimeDetailed(now)}) unless no other source can serve the request`);
             // In a browser this is often an untrusted (self-signed) certificate the user hasn't accepted yet - offer them the trust flow (a no-op in Node, and shown at most once per server)
             showCertTrustModal(this.config.url);
         }

package/storage/remoteStorage/storageServer.ts

@@ -5,6 +5,7 @@ import path from "path";
 import fsp from "fs/promises";
 import { SocketFunction } from "socket-function/SocketFunction";
 import { getExternalIP } from "socket-function/src/networking";
+import { formatDateTimeDetailed } from "socket-function/src/formatting/format";
 import { RequireController } from "socket-function/require/RequireController";
 import { hostServer } from "../../misc/https/hostServer";
 import { RemoteStorageController } from "./storageController";
@@ -144,7 +145,7 @@ export async function hostStorageServer(config: HostStorageServerConfig): Promis
                 setAltPort(listeningPort);
                 let listenEnd = getAltPortListenEnd();
                 let timer = setTimeout(() => {
-                    console.log(`Alternate port ${listeningPort} reached its end of life at ${new Date(listenEnd).toISOString()}; it no longer counts as one of our addresses (the socket itself stays bound, as the main-port relay forwards into it)`);
+                    console.log(`Alternate port ${listeningPort} reached its end of life at ${formatDateTimeDetailed(listenEnd)}; it no longer counts as one of our addresses (the socket itself stays bound, as the main-port relay forwards into it)`);
                     removeExtraListenPort(listeningPort);
                 }, Math.max(0, listenEnd - Date.now()));
                 (timer as { unref?: () => void }).unref?.();

package/storage/remoteStorage/storeSync.ts

@@ -611,7 +611,7 @@ export class StoreSync {
             let etaText = "unknown (no bytes transferred yet)";
             if (bytesPerSecond > 0) {
                 let remainingMs = remainingBytes / bytesPerSecond * 1000;
-                etaText = `${formatTime(remainingMs)} remaining, completing around ${new Date(Date.now() + remainingMs).toISOString()}`;
+                etaText = `${formatTime(remainingMs)} remaining, completing around ${formatDateTimeDetailed(Date.now() + remainingMs)}`;
             }
             console.warn(`Delta sync from ${source.getDebugName()} (store ${this.store.folder}) has been running for ${formatTime(elapsed)}: ${doneFiles}/${pending.length} files (${(doneFiles / pending.length * 100).toFixed(1)}%), ${formatNumber(doneBytes)}B/${formatNumber(totalBytes)}B (${(totalBytes && doneBytes / totalBytes * 100 || 100).toFixed(1)}%), ${formatNumber(bytesPerSecond)}B/s. Estimated ${etaText}.`);
         }, FULL_SYNC_SLOW_ERROR_INTERVAL);

package/yarn.lock

@@ -1937,10 +1937,10 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-socket-function@^1.2.31:
-  version "1.2.31"
-  resolved "https://registry.yarnpkg.com/socket-function/-/socket-function-1.2.31.tgz#b9ced45d5c99c310ecbf775d13a731e2aefff8e2"
-  integrity sha512-TBAHfSS2iapdweD6sOt2wRvynlrZ9B9EYSYBpm1x84hgbn/xWJRu1yL3e4uHeC07Fun4l8+meUEM6nZkujls0A==
+socket-function@^1.2.32:
+  version "1.2.32"
+  resolved "https://registry.yarnpkg.com/socket-function/-/socket-function-1.2.32.tgz#9cd6ff3daf2e365bfaef5da0f35271f1c9fd89d3"
+  integrity sha512-d/nuXNXnikLG1eefi099+pG0Lqeibk7Pv92k01YXfTy3W1QjXCef0B9/0hrNJoSyB96r8mtSGk0JdKhCNMqGVQ==
   dependencies:
     "@types/pako" "^2.0.3"
     "@types/ws" "^8.5.3"