@gryt/core 0.31.0 → 0.32.0

package/dist/import/discordImportJob.d.ts

@@ -41,6 +41,14 @@ export interface ImportDeps {
     /** The server's file size limit, so a file over it is never sealed and sent to be refused. */
     maxFileBytes?: number | null;
 }
+/** A file that didn't come over, for the receipt. */
+export interface ImportLeftOut {
+    url: string;
+    name: string;
+    /** Bytes, when it was downloaded. */
+    size: number | null;
+    reason: "too_large" | "not_downloaded";
+}
 export interface ImportProgress {
     messages: {
         done: number;
@@ -58,6 +66,7 @@ export interface ImportProgress {
     /** Files this server won't take, each left out with a note on its message. */
     tooLarge: number;
     bytes: number;
+    leftOut: ImportLeftOut[];
     startedAt: number;
 }
 export interface ImportControl {
@@ -67,5 +76,10 @@ export interface ImportControl {
 /** For a 429's Retry-After header. Only the seconds form: anything else gets the default wait. */
 export declare function retryAfterMs(header: string | null): number;
 export declare const importId: (discordId: string) => string;
+/**
+ * Another go at files left out: new entries beside the originals, holding only those files.
+ * A first run's message is already in history, and a repeat of its id is skipped there.
+ */
+export declare function retryLeftOut(messages: DiscordPackageMessage[], urls: ReadonlySet<string>): DiscordPackageMessage[];
 /** Text first, then 20 messages at a time: their files go straight through, then those messages go. */
 export declare function runDiscordImport(messages: DiscordPackageMessage[], deps: ImportDeps, control: ImportControl, report: (p: ImportProgress) => void): Promise<ImportProgress>;

package/dist/import/discordImportJob.js

@@ -24,6 +24,16 @@ function nameOf(url) {
         return "file";
     }
 }
+/**
+ * Another go at files left out: new entries beside the originals, holding only those files.
+ * A first run's message is already in history, and a repeat of its id is skipped there.
+ */
+export function retryLeftOut(messages, urls) {
+    return messages.flatMap((m) => {
+        const attachments = m.attachments.filter((u) => urls.has(u));
+        return attachments.length ? [{ ...m, discordId: `${m.discordId}-files`, text: "", attachments }] : [];
+    });
+}
 /** Text first, then 20 messages at a time: their files go straight through, then those messages go. */
 export async function runDiscordImport(messages, deps, control, report) {
     const fresh = [];
@@ -39,9 +49,10 @@ export async function runDiscordImport(messages, deps, control, report) {
         missing: 0,
         tooLarge: 0,
         bytes: 0,
+        leftOut: [],
         startedAt: Date.now(),
     };
-    const tick = () => report({ ...p, messages: { ...p.messages }, downloaded: { ...p.downloaded }, sent: { ...p.sent } });
+    const tick = () => report({ ...p, leftOut: [...p.leftOut], messages: { ...p.messages }, downloaded: { ...p.downloaded }, sent: { ...p.sent } });
     tick();
     const hold = async () => {
         while (control.paused() && !control.stopped())
@@ -118,6 +129,7 @@ export async function runDiscordImport(messages, deps, control, report) {
             else if (!control.stopped()) {
                 missing.add(url);
                 p.missing = missing.size;
+                p.leftOut.push({ url, name: nameOf(url), size: null, reason: "not_downloaded" });
             }
         }
         if (control.stopped()) {
@@ -143,6 +155,7 @@ export async function runDiscordImport(messages, deps, control, report) {
             if ("tooLarge" in up) {
                 tooLarge.add(url);
                 p.tooLarge = tooLarge.size;
+                p.leftOut.push({ url, name: nameOf(url), size: file.bytes.length, reason: "too_large" });
             }
             else
                 uploaded.set(url, up);

package/dist/index.d.ts

@@ -17,7 +17,7 @@ export { decodeMlsDmContent, encodeImportBundle, readImportBundle, encodeMlsDmCo
 export { applyMlsReaction, mlsReactionAction, type MlsReaction } from "./mls/reactions.js";
 export { type DiscordPackageDm, type DiscordPackageMessage, isDiscordPackage, linksExpireAt, listDiscordDms, type PackageFiles, readDiscordDm, } from "./import/discordPackage.js";
 export { inflateRaw, openZipBytes } from "./import/unzip.js";
-export { type ImportControl, type ImportDeps, type ImportFile, type ImportFileStore, importId, type ImportProgress, retryAfterMs, runDiscordImport, } from "./import/discordImportJob.js";
+export { type ImportControl, type ImportDeps, type ImportFile, type ImportFileStore, importId, type ImportProgress, retryAfterMs, retryLeftOut, runDiscordImport, type ImportLeftOut, } from "./import/discordImportJob.js";
 export type { DmSealingMode, MlsAddOwnDeviceOptions, MlsClaimedKeyPackage, MlsDecryptedMessage, MlsDeviceRecord, MlsDeviceRef, MlsDmDriver, MlsDmDriverOptions, MlsDmEvents, MlsGroupPosition, MlsGroupRecord, MlsGroupView, MlsKeyPackageRecord, MlsListedDevice, MlsLogEntry, MlsDmDiagnostics, MlsOwnDevice, MlsOwnDeviceAdd, MlsPins, MlsRefusal, MlsReply, MlsServerCapability, MlsStateStore, MlsTransport, MlsWelcomeDelivery, } from "./mls/interfaces.js";
 export { createApproverPairing, type ApproverOptions, type ApproverPairing, type ApproverState, } from "./pairing/approver.js";
 export { createNewDevicePairing, PAIRING_APPROVAL_MS, type NewDeviceOptions, type NewDevicePairing, type NewDeviceState, } from "./pairing/newDevice.js";

package/dist/index.js

@@ -19,7 +19,7 @@ export { decodeMlsDmContent, encodeImportBundle, readImportBundle, encodeMlsDmCo
 export { applyMlsReaction, mlsReactionAction } from "./mls/reactions.js";
 export { isDiscordPackage, linksExpireAt, listDiscordDms, readDiscordDm, } from "./import/discordPackage.js";
 export { inflateRaw, openZipBytes } from "./import/unzip.js";
-export { importId, retryAfterMs, runDiscordImport, } from "./import/discordImportJob.js";
+export { importId, retryAfterMs, retryLeftOut, runDiscordImport, } from "./import/discordImportJob.js";
 export { createApproverPairing, } from "./pairing/approver.js";
 export { createNewDevicePairing, PAIRING_APPROVAL_MS, } from "./pairing/newDevice.js";
 export { createPairingRelay, PairingRelayError } from "./pairing/relayClient.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gryt/core",
-  "version": "0.31.0",
+  "version": "0.32.0",
   "description": "Gryt's shared application logic: one implementation of the things the desktop and mobile apps both do.",
   "license": "AGPL-3.0-only",
   "repository": {