@whatcha/cli 0.1.0 → 0.3.0

package/dist/commands/wiki.js

@@ -0,0 +1,386 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseWikiArgs = parseWikiArgs;
+exports.appendedWikiBody = appendedWikiBody;
+exports.runWiki = runWiki;
+const node_util_1 = require("node:util");
+const session_1 = require("../auth/session");
+const errors_1 = require("../errors");
+const image_upload_1 = require("../lib/image-upload");
+const output_1 = require("../lib/output");
+/**
+ * `whatcha wiki list | read | write | cover` -- the Experience Wiki from a
+ * terminal (#1664), against the same routes the app uses:
+ *
+ *   Public Square   GET /experience-pages[?q]            GET|PUT /experience-pages/:tag
+ *   a group (#1348) GET /groups/:groupId/experience-pages GET|PUT /groups/:groupId/experience-pages/:tag
+ *   the cover       PUT|DELETE <page>/cover (#1667)
+ *
+ * Who may read or write which page -- a group's members, a page's Owner and
+ * edit policy (#1344), a lock -- is the API's call, not this file's: every
+ * refusal is the API's own error, printed as it came.
+ *
+ * Writing keeps the CLI's one promise: nothing somebody else wrote is
+ * removed. `wiki write` appends below the page's current text by default;
+ * `--replace` saves the given text as the page's new version, and the
+ * previous versions stay in the page's history either way (a wiki edit is a
+ * new revision, never an overwrite of one).
+ *
+ * Images (#1667): `--image <file>` uploads a local image into the page's
+ * group and appends `![<file name>](media:<id>)` for it below the text;
+ * `--cover <file>` uploads one and makes it the page's cover in the same
+ * save. See lib/image-upload.ts for the upload and its limits.
+ */
+const MAX_BODY = 20_000;
+const MAX_TAG = 64;
+const MAX_MESSAGE = 200;
+/** A page shows at most 50 images (the API's MAX_PAGE_IMAGES); one write adds at most this many. */
+const MAX_IMAGES_PER_WRITE = 20;
+const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+/** A stand-in media id, the length of a real one, for sizing a body before uploading. */
+const PLACEHOLDER_ID = "00000000-0000-0000-0000-000000000000";
+const USAGE = "Usage:\n" +
+    "  whatcha wiki list [--search <text>] [--group <group-id>] [--limit N] [--cursor <c>] [--json]\n" +
+    "  whatcha wiki read <page> [--group <group-id>] [--json]\n" +
+    '  whatcha wiki write <page> --text "..." [--image <file>]... [--cover <file>] [--replace] [--message "..."] [--group <group-id>] [--json]\n' +
+    "  whatcha wiki cover <page> <file> | --clear [--group <group-id>] [--json]";
+const FLAGS = ["search", "limit", "cursor", "text", "replace", "message", "image", "cover", "clear"];
+function parseWikiArgs(argv) {
+    const [action, ...rest] = argv;
+    let values, positionals;
+    try {
+        ({ values, positionals } = (0, node_util_1.parseArgs)({
+            args: rest,
+            options: {
+                json: { type: "boolean", default: false },
+                group: { type: "string" },
+                search: { type: "string" },
+                limit: { type: "string" },
+                cursor: { type: "string" },
+                text: { type: "string" },
+                replace: { type: "boolean", default: false },
+                message: { type: "string" },
+                image: { type: "string", multiple: true },
+                cover: { type: "string" },
+                clear: { type: "boolean", default: false },
+            },
+            allowPositionals: true,
+        }));
+    }
+    catch (err) {
+        throw new errors_1.CliUsageError(err.message);
+    }
+    const json = values.json;
+    const group = values.group;
+    if (group !== undefined && !UUID.test(group)) {
+        throw new errors_1.CliUsageError(`--group takes a group id (a UUID; \`whatcha diaries --json\` shows each diary's groupId), got "${group}".`);
+    }
+    const only = (allowed) => {
+        for (const name of FLAGS) {
+            const v = values[name];
+            if (!allowed.includes(name) && v !== undefined && v !== false) {
+                throw new errors_1.CliUsageError(`--${name} does not apply to \`whatcha wiki ${action}\`.\n${USAGE}`);
+            }
+        }
+    };
+    switch (action) {
+        case "list": {
+            only(["search", "limit", "cursor"]);
+            if (positionals.length > 0)
+                throw new errors_1.CliUsageError(`Unexpected argument: "${positionals[0]}"\n${USAGE}`);
+            let limit;
+            if (values.limit !== undefined) {
+                limit = Number(values.limit);
+                if (!Number.isInteger(limit) || limit < 1 || limit > 100)
+                    throw new errors_1.CliUsageError("--limit must be a whole number from 1 to 100.");
+            }
+            const search = values.search?.trim();
+            if (search !== undefined && search.length > MAX_TAG)
+                throw new errors_1.CliUsageError(`--search is at most ${MAX_TAG} characters.`);
+            return { action, json, group, search: search || undefined, limit, cursor: values.cursor };
+        }
+        case "read": {
+            only([]);
+            return { action, json, group, page: pageArg(positionals) };
+        }
+        case "write": {
+            only(["text", "replace", "message", "image", "cover"]);
+            const page = pageArg(positionals);
+            const images = values.image ?? [];
+            if (images.length > MAX_IMAGES_PER_WRITE)
+                throw new errors_1.CliUsageError(`At most ${MAX_IMAGES_PER_WRITE} --image files per write.`);
+            if (images.some((f) => !f.trim()))
+                throw new errors_1.CliUsageError("--image takes a file path.");
+            const cover = values.cover;
+            if (cover !== undefined && !cover.trim())
+                throw new errors_1.CliUsageError("--cover takes a file path.");
+            const text = values.text ?? "";
+            // Images alone are something to write; nothing at all is not.
+            if (text.trim().length === 0 && images.length === 0) {
+                throw new errors_1.CliUsageError("--text is required and must not be empty (or give at least one --image).");
+            }
+            if (text.length > MAX_BODY)
+                throw new errors_1.CliUsageError(`--text is at most ${MAX_BODY} characters.`);
+            const message = values.message?.trim();
+            if (message !== undefined && message.length > MAX_MESSAGE)
+                throw new errors_1.CliUsageError(`--message is at most ${MAX_MESSAGE} characters.`);
+            return {
+                action,
+                json,
+                group,
+                page,
+                text,
+                replace: values.replace,
+                message: message || undefined,
+                images,
+                cover,
+            };
+        }
+        case "cover": {
+            only(["clear"]);
+            const clear = values.clear;
+            const [pageRaw, image, extra] = positionals;
+            if (extra !== undefined)
+                throw new errors_1.CliUsageError(`Unexpected extra argument: "${extra}" (quote a page name that has spaces).`);
+            const page = pageArg(pageRaw === undefined ? [] : [pageRaw]);
+            if (clear && image !== undefined)
+                throw new errors_1.CliUsageError("Give an image file or --clear, not both.");
+            if (!clear && (image === undefined || !image.trim())) {
+                throw new errors_1.CliUsageError(`Which image? Give a file, or --clear to remove the cover.\n${USAGE}`);
+            }
+            return { action, json, group, page, image: clear ? undefined : image, clear };
+        }
+        default:
+            throw new errors_1.CliUsageError(action ? `Unknown wiki action "${action}".\n${USAGE}` : USAGE);
+    }
+}
+function pageArg(positionals) {
+    if (positionals.length === 0)
+        throw new errors_1.CliUsageError(`Which page? Give its tag, e.g. "Kyoto Tower".\n${USAGE}`);
+    if (positionals.length > 1)
+        throw new errors_1.CliUsageError(`Unexpected extra argument: "${positionals[1]}" (quote a page name that has spaces).`);
+    // A leading "#" is how a tag is written in an entry; the page is the tag itself.
+    const page = positionals[0].trim().replace(/^#/, "").trim();
+    if (!page)
+        throw new errors_1.CliUsageError("The page name must not be empty.");
+    if (page.length > MAX_TAG)
+        throw new errors_1.CliUsageError(`A page name is at most ${MAX_TAG} characters.`);
+    return page;
+}
+function pagesPath(group) {
+    return group ? `/groups/${group}/experience-pages` : "/experience-pages";
+}
+function pagePath(page, group) {
+    return `${pagesPath(group)}/${encodeURIComponent(page)}`;
+}
+/** The page, or null when it does not exist (yet) -- or this account cannot see it, which the API answers the same way. */
+async function findPage(client, page, group) {
+    try {
+        return await client.get(pagePath(page, group));
+    }
+    catch (err) {
+        if (err instanceof errors_1.ApiError && err.status === 404)
+            return null;
+        throw err;
+    }
+}
+/** Mirrors `whatcha write`'s own append: existing text, trimmed, a blank line, then the new text. */
+function appendedWikiBody(existing, text) {
+    const trimmed = existing.trimEnd();
+    return trimmed ? `${trimmed}\n\n${text}` : text;
+}
+/** The group a page's images are uploaded into: the page's own (Public Square's for the public wiki). */
+function uploadGroupOf(page, group) {
+    return page?.groupId ?? group ?? image_upload_1.PUBLIC_SQUARE_GROUP_ID;
+}
+async function runWiki(opts, deps = {}) {
+    const client = deps.client ?? (await (0, session_1.authenticatedClient)()).client;
+    switch (opts.action) {
+        case "list":
+            return listPages(client, opts);
+        case "read":
+            return readPage(client, opts);
+        case "write":
+            return writePage(client, opts);
+        case "cover":
+            return setCover(client, opts);
+    }
+}
+async function listPages(client, opts) {
+    const page = await client.getPage(pagesPath(opts.group), {
+        q: opts.search,
+        limit: opts.limit !== undefined ? String(opts.limit) : undefined,
+        cursor: opts.cursor,
+    });
+    if (opts.json) {
+        (0, output_1.printJson)({
+            ok: true,
+            groupId: opts.group ?? null,
+            pages: page.items.map((p) => ({ id: p.id, tag: p.tagLabel, slug: p.tagSlug, preview: p.preview, updatedAt: p.updatedAt })),
+            nextCursor: page.nextCursor,
+            hasNext: page.hasNext,
+        });
+        return { exitCode: 0 };
+    }
+    if (page.items.length === 0) {
+        (0, output_1.printLine)(opts.search ? `No wiki pages match "${opts.search}".` : "No wiki pages yet.");
+        return { exitCode: 0 };
+    }
+    for (const p of page.items) {
+        (0, output_1.printLine)(`${p.tagLabel}${p.preview ? `  -- ${p.preview.replace(/\s+/g, " ").slice(0, 80)}` : ""}`);
+    }
+    if (page.hasNext && page.nextCursor)
+        (0, output_1.printLine)(`(more: --cursor ${page.nextCursor})`);
+    return { exitCode: 0 };
+}
+async function readPage(client, opts) {
+    const page = await findPage(client, opts.page, opts.group);
+    if (!page) {
+        if (opts.json)
+            (0, output_1.printJson)({ ok: true, found: false, page: opts.page, groupId: opts.group ?? null });
+        else
+            (0, output_1.printLine)(`No wiki page "${opts.page}"${opts.group ? " in that group" : ""} (or this account cannot see it).`);
+        return { exitCode: 0 };
+    }
+    const media = page.media ?? [];
+    if (opts.json) {
+        (0, output_1.printJson)({
+            ok: true,
+            found: true,
+            id: page.id,
+            tag: page.tagLabel,
+            slug: page.tagSlug,
+            groupId: page.groupId,
+            revisionId: page.revisionId,
+            revisionCount: page.revisionCount,
+            isLocked: page.isLocked,
+            lastEditedAt: page.lastEditedAt,
+            lastEditedBy: page.lastEditedBy?.username ?? null,
+            body: page.body,
+            media: media.map((m) => ({ id: m.id, url: m.url, mimeType: m.mimeType ?? null, altText: m.altText ?? null })),
+            coverMediaAssetId: page.coverMediaAssetId ?? null,
+            coverUrl: page.coverUrl ?? null,
+        });
+        return { exitCode: 0 };
+    }
+    const by = page.lastEditedBy?.username ? ` by @${page.lastEditedBy.username}` : "";
+    (0, output_1.printLine)(`${page.tagLabel}  (${page.revisionCount} version${page.revisionCount === 1 ? "" : "s"}; last edited ${page.lastEditedAt ?? "?"}${by})`);
+    if (page.isLocked)
+        (0, output_1.printLine)("locked: only moderators can edit this page.");
+    if (page.coverUrl)
+        (0, output_1.printLine)(`cover: ${page.coverUrl}`);
+    (0, output_1.printLine)("");
+    (0, output_1.printLine)(page.body);
+    if (media.length > 0) {
+        // The body says `media:<id>`; this is where each one can be opened.
+        // Signed URLs, so they stop working after about an hour.
+        (0, output_1.printLine)("");
+        (0, output_1.printLine)("Images (links valid for about an hour):");
+        for (const m of media)
+            (0, output_1.printLine)(`  media:${m.id}  ${m.url}`);
+    }
+    return { exitCode: 0 };
+}
+/** Each --image file and the --cover file, read and checked before anything goes over the network. */
+async function readImages(opts) {
+    const inline = [];
+    for (const path of opts.images)
+        inline.push(await (0, image_upload_1.readImageFile)(path));
+    const cover = opts.cover !== undefined ? await (0, image_upload_1.readImageFile)(opts.cover) : undefined;
+    return { inline, cover };
+}
+async function writePage(client, opts) {
+    const files = await readImages(opts);
+    const before = await findPage(client, opts.page, opts.group);
+    const compose = (ids) => {
+        const added = [opts.text.trim() ? opts.text : "", ...files.inline.map((f, i) => (0, image_upload_1.wikiImageRef)(f.fileName, ids[i]))]
+            .filter((part) => part !== "")
+            .join("\n\n");
+        return opts.replace || !before ? added : appendedWikiBody(before.body, added);
+    };
+    // Checked before uploading, so a page that would be too long costs no
+    // orphaned uploads. Every reference is the same length whatever its id.
+    const sized = compose(files.inline.map(() => PLACEHOLDER_ID));
+    if (sized.length > MAX_BODY) {
+        throw new errors_1.CliUsageError(`The page would be ${sized.length} characters with this text; the limit is ${MAX_BODY}. Nothing was written.`);
+    }
+    const group = uploadGroupOf(before, opts.group);
+    const ids = [];
+    for (const file of files.inline)
+        ids.push(await (0, image_upload_1.uploadImage)(client, group, file));
+    const coverId = files.cover ? await (0, image_upload_1.uploadImage)(client, group, files.cover) : undefined;
+    const saved = await client.put(pagePath(opts.page, opts.group), {
+        body: compose(ids),
+        ...(opts.message ? { message: opts.message } : {}),
+        ...(coverId ? { coverMediaAssetId: coverId } : {}),
+    });
+    const mode = !before ? "created" : opts.replace ? "replaced" : "appended";
+    // The PUT carries no "expected revision", so an edit that landed between
+    // the read and the write would be left out of the new current text. It is
+    // not lost -- it is a revision in the page's history -- but say so loudly,
+    // the way `whatcha write` reports an append it could not confirm.
+    const raced = before !== null && saved.revisionCount !== before.revisionCount + 1;
+    if (opts.json) {
+        (0, output_1.printJson)({
+            ok: true,
+            mode,
+            id: saved.id,
+            tag: saved.tagLabel,
+            groupId: saved.groupId,
+            revisionId: saved.revisionId,
+            revisionCount: saved.revisionCount,
+            concurrentEdit: raced,
+            images: files.inline.map((f, i) => ({ file: f.path, mediaAssetId: ids[i] })),
+            coverMediaAssetId: coverId ?? null,
+        });
+    }
+    else {
+        const verb = mode === "created" ? "Created" : mode === "replaced" ? "Saved a new version of" : "Appended to";
+        const extras = [
+            ids.length > 0 ? `${ids.length} image${ids.length === 1 ? "" : "s"}` : "",
+            coverId ? "a new cover" : "",
+        ].filter(Boolean);
+        (0, output_1.printLine)(`${verb} the wiki page "${saved.tagLabel}" (version ${saved.revisionCount}${extras.length ? `; ${extras.join(", ")}` : ""}).`);
+    }
+    if (raced) {
+        (0, output_1.printErrorLine)(`WARNING: somebody else edited "${saved.tagLabel}" while whatcha was writing to it. Their version is in the ` +
+            "page's history; check the page and merge it back by hand if it is missing from the current text.");
+        return { exitCode: 2 };
+    }
+    return { exitCode: 0 };
+}
+async function setCover(client, opts) {
+    const file = opts.image !== undefined ? await (0, image_upload_1.readImageFile)(opts.image) : undefined;
+    const page = await findPage(client, opts.page, opts.group);
+    if (!page) {
+        throw new errors_1.CliUsageError(`No wiki page "${opts.page}"${opts.group ? " in that group" : ""} (or this account cannot see it). ` +
+            "Create it first: whatcha wiki write <page> --text \"...\" --cover <file>");
+    }
+    const path = `${pagePath(opts.page, opts.group)}/cover`;
+    let saved;
+    if (file) {
+        const mediaAssetId = await (0, image_upload_1.uploadImage)(client, uploadGroupOf(page, opts.group), file);
+        saved = await client.put(path, { mediaAssetId });
+    }
+    else {
+        saved = await client.delete(path);
+    }
+    if (opts.json) {
+        (0, output_1.printJson)({
+            ok: true,
+            id: saved.id,
+            tag: saved.tagLabel,
+            groupId: saved.groupId,
+            coverMediaAssetId: saved.coverMediaAssetId ?? null,
+            coverUrl: saved.coverUrl ?? null,
+        });
+    }
+    else if (file) {
+        (0, output_1.printLine)(`Set the cover of the wiki page "${saved.tagLabel}".${saved.coverUrl ? `\ncover: ${saved.coverUrl}` : ""}`);
+    }
+    else {
+        (0, output_1.printLine)(`Removed the cover of the wiki page "${saved.tagLabel}".`);
+    }
+    return { exitCode: 0 };
+}
+//# sourceMappingURL=wiki.js.map

package/dist/commands/wiki.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wiki.js","sourceRoot":"","sources":["../../src/commands/wiki.ts"],"names":[],"mappings":"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"}

package/dist/commands/write.js

@@ -19,6 +19,8 @@ function parseWriteArgs(argv) {
                 text: { type: "string" },
                 date: { type: "string" },
                 time: { type: "string" },
+                title: { type: "string" },
+                tag: { type: "string", multiple: true },
             },
             allowPositionals: true,
         }));
@@ -26,27 +28,47 @@ function parseWriteArgs(argv) {
     catch (err) {
         throw new errors_1.CliUsageError(err.message);
     }
-    if (positionals.length === 0)
-        throw new errors_1.CliUsageError("Usage: whatcha write <diary> --text \"...\" [--date YYYY-MM-DD] [--time HH:MM]");
+    if (positionals.length === 0) {
+        throw new errors_1.CliUsageError('Usage: whatcha write <diary> --text "..." [--title "..."] [--tag <tag>]... [--date YYYY-MM-DD] [--time HH:MM]');
+    }
     if (positionals.length > 1)
         throw new errors_1.CliUsageError(`Unexpected extra argument: "${positionals[1]}"`);
     if (!values.text)
         throw new errors_1.CliUsageError("--text is required.");
     if (values.text.trim().length === 0)
         throw new errors_1.CliUsageError("--text must not be empty.");
+    const title = values.title;
+    if (title !== undefined) {
+        if (title.trim().length === 0)
+            throw new errors_1.CliUsageError("--title must not be empty.");
+        if (title.trim().length > append_entry_1.MAX_TITLE_LENGTH)
+            throw new errors_1.CliUsageError(`--title is at most ${append_entry_1.MAX_TITLE_LENGTH} characters.`);
+    }
+    const rawTags = values.tag ?? [];
+    for (const t of rawTags) {
+        if (t.trim().length === 0)
+            throw new errors_1.CliUsageError("--tag must not be empty.");
+        if (t.trim().length > append_entry_1.MAX_TAG_LENGTH)
+            throw new errors_1.CliUsageError(`A --tag is at most ${append_entry_1.MAX_TAG_LENGTH} characters: "${t}".`);
+    }
+    const tags = (0, append_entry_1.normalizeTags)(rawTags);
+    if (tags.length > append_entry_1.MAX_TAGS)
+        throw new errors_1.CliUsageError(`At most ${append_entry_1.MAX_TAGS} tags per entry.`);
     return {
         json: values.json,
         diary: positionals[0],
         text: values.text,
         date: values.date,
         time: values.time,
+        title: title?.trim(),
+        tags,
     };
 }
 async function runWrite(opts, deps = {}) {
     const client = deps.client ?? (await (0, session_1.authenticatedClient)()).client;
     const diary = await (0, diary_resolve_1.resolveDiary)(client, opts.diary);
     const occurredAt = (0, entry_date_1.resolveOccurredAt)({ date: opts.date, time: opts.time }, diary.timezone);
-    const result = await (0, append_entry_1.writeEntry)(client, diary.id, occurredAt, opts.text);
+    const result = await (0, append_entry_1.writeEntry)(client, diary.id, occurredAt, opts.text, { title: opts.title, tags: opts.tags });
     if (opts.json) {
         (0, output_1.printJson)({
             ok: true,
@@ -55,12 +77,21 @@ async function runWrite(opts, deps = {}) {
             mode: result.mode,
             verified: result.verified,
             occurredAt: occurredAt.toISOString(),
+            title: result.title,
+            tags: result.tags,
+            titleKept: result.titleKept,
         });
     }
     else {
         const verb = result.mode === "created" ? "Created" : "Appended to";
         (0, output_1.printLine)(`${verb} the entry for ${diary.name} (${occurredAt.toISOString()}). entryId=${result.entryId}`);
     }
+    if (result.titleKept) {
+        // Not an error -- the text and tags landed -- but the person asked for
+        // a title and did not get it, so say why (on stderr, like the warning
+        // below, so --json stdout stays one object).
+        (0, output_1.printErrorLine)(`Note: this entry already has a title ("${result.title}"), which was kept; --title was not applied.`);
+    }
     if (result.verified === false) {
         // Loud on purpose, on stderr even in --json mode -- see
         // append-entry.ts's verifyAppend comment. stdout still carries only

package/dist/commands/write.js.map

@@ -1 +1 @@
-{"version":3,"file":"write.js","sourceRoot":"","sources":["../../src/commands/write.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"write.js","sourceRoot":"","sources":["../../src/commands/write.ts"],"names":[],"mappings":"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"}

package/dist/http-client.js

@@ -24,6 +24,9 @@ class FetchWhatchaClient {
     post(path, body) {
         return this.send("POST", path, body);
     }
+    put(path, body) {
+        return this.send("PUT", path, body);
+    }
     patch(path, body) {
         return this.send("PATCH", path, body);
     }
@@ -35,6 +38,19 @@ class FetchWhatchaClient {
         const env = await this.sendRaw("GET", path + qs, undefined);
         return { items: env.data, nextCursor: env.pagination.nextCursor, hasNext: env.pagination.hasNext };
     }
+    async putBytes(url, headers, bytes) {
+        let res;
+        try {
+            res = await fetch(url, { method: "PUT", headers, body: bytes });
+        }
+        catch (err) {
+            throw new errors_1.ApiError(0, "NETWORK_ERROR", `Could not upload to ${new URL(url).host}: ${err.message}`);
+        }
+        if (!res.ok) {
+            await res.text().catch(() => undefined);
+            throw new errors_1.ApiError(res.status, "UPLOAD_FAILED", `Uploading the file failed with status ${res.status}.`);
+        }
+    }
     queryString(query) {
         if (!query)
             return "";

package/dist/http-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"http-client.js","sourceRoot":"","sources":["../src/http-client.ts"],"names":[],"mappings":";;;AAAA,qCAAoC;AAwCpC,SAAS,eAAe,CAAC,IAAa;IACpC,OAAO,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,IAAI,OAAO,IAAI,IAAI,CAAC;AACtE,CAAC;AAED;;;;;GAKG;AACH,MAAa,kBAAkB;IAEV;IACA;IAFnB,YACmB,OAAe,EACf,UAA6C;QAD7C,YAAO,GAAP,OAAO,CAAQ;QACf,eAAU,GAAV,UAAU,CAAmC;IAC7D,CAAC;IAEJ,GAAG,CAAI,IAAY,EAAE,KAA0C;QAC7D,OAAO,IAAI,CAAC,IAAI,CAAI,KAAK,EAAE,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,CAAC;IACxE,CAAC;IAED,IAAI,CAAI,IAAY,EAAE,IAAc;QAClC,OAAO,IAAI,CAAC,IAAI,CAAI,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAI,IAAY,EAAE,IAAc;QACnC,OAAO,IAAI,CAAC,IAAI,CAAI,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC3C,CAAC;IAED,MAAM,CAAI,IAAY;QACpB,OAAO,IAAI,CAAC,IAAI,CAAI,QAAQ,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,OAAO,CAAI,IAAY,EAAE,KAA0C;QACvE,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACnC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAkB,KAAK,EAAE,IAAI,GAAG,EAAE,EAAE,SAAS,CAAC,CAAC;QAC7E,OAAO,EAAE,KAAK,EAAE,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,CAAC,UAAU,CAAC,UAAU,EAAE,OAAO,EAAE,GAAG,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;IACrG,CAAC;IAEO,WAAW,CAAC,KAA0C;QAC5D,IAAI,CAAC,KAAK;YAAE,OAAO,EAAE,CAAC;QACtB,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAyB,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC;QAC/F,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QACpC,OAAO,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,IAAI,kBAAkB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACtG,CAAC;IAEO,KAAK,CAAC,IAAI,CAAI,MAAc,EAAE,IAAY,EAAE,IAAa;QAC/D,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAkB,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QACpE,OAAO,GAAG,KAAK,SAAS,CAAC,CAAC,CAAE,SAAe,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;IACzD,CAAC;IAED,uIAAuI;IAC/H,KAAK,CAAC,OAAO,CAAI,MAAc,EAAE,IAAY,EAAE,IAAa;QAClE,MAAM,OAAO,GAA2B,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC;QACvE,IAAI,IAAI,KAAK,SAAS;YAAE,OAAO,CAAC,cAAc,CAAC,GAAG,kBAAkB,CAAC;QACrE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACrC,IAAI,IAAI;YAAE,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;QAEvC,IAAI,GAAa,CAAC;QAClB,IAAI,CAAC;YACH,GAAG,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,GAAG,IAAI,EAAE;gBACrC,MAAM;gBACN,OAAO;gBACP,IAAI,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;aAC5D,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,oEAAoE;YACpE,oEAAoE;YACpE,sCAAsC;YACtC,MAAM,IAAI,iBAAQ,CAAC,CAAC,EAAE,eAAe,EAAE,mBAAmB,IAAI,CAAC,OAAO,KAAM,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;QACvG,CAAC;QAED,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG;YAAE,OAAO,SAAc,CAAC;QAE9C,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAY,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAE1D,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;YACZ,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC1B,MAAM,IAAI,iBAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAgB,CAAC,CAAC;YACnG,CAAC;YACD,MAAM,IAAI,iBAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,IAAI,uBAAuB,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;QACrG,CAAC;QAED,OAAO,IAAS,CAAC;IACnB,CAAC;CACF;AA3ED,gDA2EC"}
+{"version":3,"file":"http-client.js","sourceRoot":"","sources":["../src/http-client.ts"],"names":[],"mappings":"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"}