ag-common 0.0.892 → 0.0.894

package/dist/api/helpers/google/gemini.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveGroundedUrl = exports.geminiPromptDirect = exports.geminiPromptImage = void 0;
 const genai_1 = require("@google/genai");
@@ -59,28 +50,27 @@ const sortModelsByPreference = (models, prefer) => {
     return modelArray;
 };
 const normalizeModelName = (name) => name.replace(/^models\//, '');
-const getAvailableGeminiModels = () => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b;
+const getAvailableGeminiModels = async () => {
     const cachedModels = geminiModelsCache.get(geminiModelsCacheKey);
     if (cachedModels && cachedModels.length > 0) {
         return cachedModels;
     }
     const keyServiceCombinations = (0, apikey_1.getAvailableCombinations)('gemini');
-    const key = (_a = keyServiceCombinations[0]) === null || _a === void 0 ? void 0 : _a.key;
+    const key = keyServiceCombinations[0]?.key;
     if (!key) {
         (0, log_1.warn)('No GOOGLE_API_KEY available. Falling back to default Gemini models.');
         return [...FALLBACK_GEMINI_MODELS];
     }
     try {
-        const response = yield fetch(`https://generativelanguage.googleapis.com/v1beta/models?key=${encodeURIComponent(key)}`);
+        const response = await fetch(`https://generativelanguage.googleapis.com/v1beta/models?key=${encodeURIComponent(key)}`);
         if (!response.ok) {
             throw new Error(`model list fetch failed with status ${response.status}`);
         }
-        const payload = (yield response.json());
+        const payload = (await response.json());
         const discoveredModels = [
-            ...new Set(((_b = payload.models) !== null && _b !== void 0 ? _b : [])
-                .filter((m) => { var _a; return ((_a = m.supportedGenerationMethods) !== null && _a !== void 0 ? _a : []).includes('generateContent'); })
-                .map((m) => { var _a; return normalizeModelName((_a = m.name) !== null && _a !== void 0 ? _a : ''); })
+            ...new Set((payload.models ?? [])
+                .filter((m) => (m.supportedGenerationMethods ?? []).includes('generateContent'))
+                .map((m) => normalizeModelName(m.name ?? ''))
                 .filter((name) => name.startsWith('gemini') && !name.includes('embedding'))),
         ];
         if (discoveredModels.length === 0) {
@@ -94,16 +84,16 @@ const getAvailableGeminiModels = () => __awaiter(void 0, void 0, void 0, functio
         (0, log_1.warn)(`Failed to load Gemini models from API. Falling back to defaults. ${String(e)}`);
         return [...FALLBACK_GEMINI_MODELS];
     }
-});
+};
 // Helper to get available key+model combinations
-const getAvailableGeminiCombinations = (prefer) => __awaiter(void 0, void 0, void 0, function* () {
+const getAvailableGeminiCombinations = async (prefer) => {
     // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     if (!genAIs || genAIs.length === 0) {
         const keyServiceCombinations = (0, apikey_1.getAvailableCombinations)('gemini');
         const keys = keyServiceCombinations.map((combo) => combo.key);
         genAIs = keys.map((k) => [k, new genai_1.GoogleGenAI({ apiKey: k })]);
     }
-    const availableModels = yield getAvailableGeminiModels();
+    const availableModels = await getAvailableGeminiModels();
     const sortedModels = sortModelsByPreference(availableModels, prefer);
     const combinations = [];
     for (const [key, ai] of genAIs) {
@@ -116,35 +106,34 @@ const getAvailableGeminiCombinations = (prefer) => __awaiter(void 0, void 0, voi
         }
     }
     return combinations;
-});
-const geminiPromptImage = (_a) => __awaiter(void 0, [_a], void 0, function* ({ prompt, urls, ident, prefer, }) {
+};
+const geminiPromptImage = async ({ prompt, urls, ident, prefer, }) => {
     let images = [];
     if (urls && urls.length > 0) {
-        images = yield (0, async_1.asyncMap)(urls, (i) => (0, fetch_1.fetchToMemory)(i));
+        images = await (0, async_1.asyncMap)(urls, (i) => (0, fetch_1.fetchToMemory)(i));
     }
     // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     if (images.find((a) => !a)) {
         throw new Error('image not downloaded correctly');
     }
-    const r = yield (0, exports.geminiPromptDirect)({
+    const r = await (0, exports.geminiPromptDirect)({
         prompt,
         images: images.filter(array_1.notEmpty),
         ident,
         prefer,
     });
     return r;
-});
+};
 exports.geminiPromptImage = geminiPromptImage;
-const geminiPromptDirect = (_a) => __awaiter(void 0, [_a], void 0, function* ({ prompt, images = [], ident, prefer, groundedSearch = false, }) {
+const geminiPromptDirect = async ({ prompt, images = [], ident, prefer, groundedSearch = false, }) => {
     const parts = images.map((i) => ({
         inlineData: {
             data: Buffer.from(i.arraybuffer).toString('base64'),
             mimeType: i.type,
         },
     }));
-    return (0, retryOnError_1.retryOnError)(`geminiPromptDirect:${ident !== null && ident !== void 0 ? ident : 'unknown'}`, () => __awaiter(void 0, void 0, void 0, function* () {
-        var _a;
-        const combinations = yield getAvailableGeminiCombinations(prefer);
+    return (0, retryOnError_1.retryOnError)(`geminiPromptDirect:${ident ?? 'unknown'}`, async () => {
+        const combinations = await getAvailableGeminiCombinations(prefer);
         if (combinations.length === 0) {
             throw new Error('No available API key and model combinations');
         }
@@ -161,8 +150,8 @@ const geminiPromptDirect = (_a) => __awaiter(void 0, [_a], void 0, function* ({
         }
         (0, log_1.info)('gem query on:' + selectedModel, requestConfig);
         try {
-            const response = yield ai.models.generateContent(requestConfig);
-            const rawtext = ((_a = response.text) !== null && _a !== void 0 ? _a : '')
+            const response = await ai.models.generateContent(requestConfig);
+            const rawtext = (response.text ?? '')
                 .replace(/```(json)?/gi, '')
                 .replace(/:[ ]+undefined/gim, ': null');
             (0, log_1.info)('gem response');
@@ -179,10 +168,10 @@ const geminiPromptDirect = (_a) => __awaiter(void 0, [_a], void 0, function* ({
             }
             throw e;
         }
-    }), 1, 5000);
-});
+    }, 1, 5000);
+};
 exports.geminiPromptDirect = geminiPromptDirect;
-const resolveGroundedUrl = (url) => __awaiter(void 0, void 0, void 0, function* () {
+const resolveGroundedUrl = async (url) => {
     if (!url.includes('vertexaisearch.cloud.google.com')) {
         (0, log_1.debug)('not a grounded url', url);
         return url;
@@ -190,7 +179,7 @@ const resolveGroundedUrl = (url) => __awaiter(void 0, void 0, void 0, function*
     try {
         (0, log_1.debug)('resolving grounded url', url);
         // Fetch the grounded URL with redirect following disabled
-        const response = yield fetch(url, {
+        const response = await fetch(url, {
             method: 'HEAD',
             redirect: 'manual',
         });
@@ -203,7 +192,7 @@ const resolveGroundedUrl = (url) => __awaiter(void 0, void 0, void 0, function*
             }
         }
         // If no redirect, try a GET request to follow any JavaScript redirects
-        const fullResponse = yield fetch(url, {
+        const fullResponse = await fetch(url, {
             redirect: 'follow',
         });
         const finalUrl = fullResponse.url;
@@ -215,5 +204,5 @@ const resolveGroundedUrl = (url) => __awaiter(void 0, void 0, void 0, function*
         // Return original URL if resolution fails
         return url;
     }
-});
+};
 exports.resolveGroundedUrl = resolveGroundedUrl;

package/dist/api/helpers/retryOnError.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sleep = exports.isRetryableApiError = exports.isOverloadedApiKeyError = exports.retryableErrorMessages = exports.overloadedMessages = void 0;
 exports.retryOnError = retryOnError;
@@ -34,24 +25,22 @@ const isOverloadedApiKeyError = (error) => errorContainsAnyMessage(error, export
 exports.isOverloadedApiKeyError = isOverloadedApiKeyError;
 const isRetryableApiError = (error) => errorContainsAnyMessage(error, exports.retryableErrorMessages);
 exports.isRetryableApiError = isRetryableApiError;
-function retryOnError(debugIdent_1, fn_1) {
-    return __awaiter(this, arguments, void 0, function* (
-    /** so we can log retries with useful info */
-    debugIdent, fn, retries = 1, errorDelay = 2000, errorCheck = exports.isRetryableApiError) {
-        try {
-            return yield fn();
-        }
-        catch (error) {
-            const e = error;
-            const em = e.message;
-            if (retries > 0 && errorCheck(e)) {
-                (0, log_1.info)(`Operation ${debugIdent} failed. Retrying after ${errorDelay}ms...`, em);
-                yield (0, exports.sleep)(errorDelay);
-                return retryOnError(debugIdent, fn, retries - 1, errorDelay, errorCheck);
-            }
-            throw error;
+async function retryOnError(
+/** so we can log retries with useful info */
+debugIdent, fn, retries = 1, errorDelay = 2000, errorCheck = exports.isRetryableApiError) {
+    try {
+        return await fn();
+    }
+    catch (error) {
+        const e = error;
+        const em = e.message;
+        if (retries > 0 && errorCheck(e)) {
+            (0, log_1.info)(`Operation ${debugIdent} failed. Retrying after ${errorDelay}ms...`, em);
+            await (0, exports.sleep)(errorDelay);
+            return retryOnError(debugIdent, fn, retries - 1, errorDelay, errorCheck);
         }
-    });
+        throw error;
+    }
 }
 const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 exports.sleep = sleep;

package/dist/api/helpers/s3.js

@@ -1,26 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __await = (this && this.__await) || function (v) { return this instanceof __await ? (this.v = v, this) : new __await(v); }
-var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var g = generator.apply(thisArg, _arguments || []), i, q = [];
-    return i = Object.create((typeof AsyncIterator === "function" ? AsyncIterator : Object).prototype), verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function () { return this; }, i;
-    function awaitReturn(f) { return function (v) { return Promise.resolve(v).then(f, reject); }; }
-    function verb(n, f) { if (g[n]) { i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; if (f) i[n] = f(i[n]); } }
-    function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
-    function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
-    function fulfill(value) { resume("next", value); }
-    function reject(value) { resume("throw", value); }
-    function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.copyFile = exports.deleteFiles = exports.deleteFile = exports.putS3Object = exports.getS3Object = exports.setS3 = exports.createStorageClient = void 0;
 exports.getS3Objects = getS3Objects;
@@ -50,7 +28,6 @@ const getCacheKey = (config) => {
     });
 };
 const createStorageClient = (config) => {
-    var _a;
     const cacheKey = getCacheKey(config);
     const cachedClient = clientCache.get(cacheKey);
     if (cachedClient) {
@@ -62,14 +39,19 @@ const createStorageClient = (config) => {
         if (!accountId) {
             throw new Error('Account ID is required for R2. Set CLOUDFLARE_ACCOUNT_ID env var or provide accountId in config');
         }
-        client = new client_s3_1.S3Client(Object.assign(Object.assign({ endpoint: `https://${accountId}.r2.cloudflarestorage.com`, forcePathStyle: true }, (config.accessKeyId && config.secretAccessKey
-            ? {
-                credentials: {
-                    accessKeyId: config.accessKeyId,
-                    secretAccessKey: config.secretAccessKey,
-                },
-            }
-            : {})), { region: (_a = config.region) !== null && _a !== void 0 ? _a : 'auto' }));
+        client = new client_s3_1.S3Client({
+            endpoint: `https://${accountId}.r2.cloudflarestorage.com`,
+            forcePathStyle: true,
+            ...(config.accessKeyId && config.secretAccessKey
+                ? {
+                    credentials: {
+                        accessKeyId: config.accessKeyId,
+                        secretAccessKey: config.secretAccessKey,
+                    },
+                }
+                : {}),
+            region: config.region ?? 'auto',
+        });
     }
     else {
         client = new client_s3_1.S3Client({
@@ -89,9 +71,9 @@ exports.setS3 = setS3;
     provider: 's3',
     region: 'ap-southeast-2',
 });
-const getS3Object = (_a) => __awaiter(void 0, [_a], void 0, function* ({ fileurl: { Bucket, Key }, }) {
+const getS3Object = async ({ fileurl: { Bucket, Key }, }) => {
     try {
-        const r = yield s3.send(new client_s3_1.GetObjectCommand({ Bucket, Key }));
+        const r = await s3.send(new client_s3_1.GetObjectCommand({ Bucket, Key }));
         if (!r.Body) {
             throw new Error('no body returned');
         }
@@ -105,32 +87,30 @@ const getS3Object = (_a) => __awaiter(void 0, [_a], void 0, function* ({ fileurl
     catch (e) {
         return { error: e.toString() };
     }
-});
+};
 exports.getS3Object = getS3Object;
 /** function generator to get s3 files */
-function getS3Objects(_a) {
-    return __asyncGenerator(this, arguments, function* getS3Objects_1({ bucket, keys, }) {
-        let toProcess = keys.map((Key) => ({
-            Bucket: bucket,
-            Key,
-        }));
-        while (toProcess.length > 0) {
-            const { part, rest } = (0, array_1.take)(toProcess, 1);
-            toProcess = rest;
-            const fileurl = part[0];
-            const g = yield __await((0, exports.getS3Object)({ fileurl }));
-            if ('error' in g) {
-                yield yield __await({ error: g.error });
-            }
-            else {
-                yield yield __await({ data: g.data });
-            }
+async function* getS3Objects({ bucket, keys, }) {
+    let toProcess = keys.map((Key) => ({
+        Bucket: bucket,
+        Key,
+    }));
+    while (toProcess.length > 0) {
+        const { part, rest } = (0, array_1.take)(toProcess, 1);
+        toProcess = rest;
+        const fileurl = part[0];
+        const g = await (0, exports.getS3Object)({ fileurl });
+        if ('error' in g) {
+            yield { error: g.error };
         }
-    });
+        else {
+            yield { data: g.data };
+        }
+    }
 }
-const putS3Object = (_a) => __awaiter(void 0, [_a], void 0, function* ({ Body, Bucket, Key, ContentType, CacheControl = 'public, max-age=300', }) {
+const putS3Object = async ({ Body, Bucket, Key, ContentType, CacheControl = 'public, max-age=300', }) => {
     try {
-        const r = yield s3.send(new client_s3_1.PutObjectCommand({ Body, Bucket, Key, ContentType, CacheControl }));
+        const r = await s3.send(new client_s3_1.PutObjectCommand({ Body, Bucket, Key, ContentType, CacheControl }));
         const code = r.$metadata.httpStatusCode;
         if (code !== 200) {
             return {
@@ -142,31 +122,30 @@ const putS3Object = (_a) => __awaiter(void 0, [_a], void 0, function* ({ Body, B
     catch (e) {
         return { error: e.toString() };
     }
-});
+};
 exports.putS3Object = putS3Object;
-const deleteFile = (_a) => __awaiter(void 0, [_a], void 0, function* ({ Bucket, Key, }) {
+const deleteFile = async ({ Bucket, Key, }) => {
     try {
-        yield s3.send(new client_s3_1.DeleteObjectCommand({ Bucket, Key }));
+        await s3.send(new client_s3_1.DeleteObjectCommand({ Bucket, Key }));
         return {};
     }
     catch (e) {
         return { error: e.toString() };
     }
-});
+};
 exports.deleteFile = deleteFile;
-const deleteFiles = (_a) => __awaiter(void 0, [_a], void 0, function* ({ Bucket, Keys, }) {
-    var _b;
+const deleteFiles = async ({ Bucket, Keys, }) => {
     try {
         let toDelete = Keys.map((Key) => ({ Key }));
         let deleted = 0;
         while (toDelete.length > 0) {
             const { part, rest } = (0, array_1.take)(toDelete, 900);
             toDelete = rest;
-            const res = yield s3.send(new client_s3_1.DeleteObjectsCommand({
+            const res = await s3.send(new client_s3_1.DeleteObjectsCommand({
                 Bucket,
                 Delete: { Objects: part },
             }));
-            if (!((_b = res.Deleted) === null || _b === void 0 ? void 0 : _b.length)) {
+            if (!res.Deleted?.length) {
                 throw new Error('no deleted files');
             }
             deleted += res.Deleted.length;
@@ -177,12 +156,12 @@ const deleteFiles = (_a) => __awaiter(void 0, [_a], void 0, function* ({ Bucket,
     catch (e) {
         return { error: e.toString() };
     }
-});
+};
 exports.deleteFiles = deleteFiles;
-const copyFile = (_a) => __awaiter(void 0, [_a], void 0, function* ({ Bucket, fromKey, toKey, deleteSource = false, }) {
+const copyFile = async ({ Bucket, fromKey, toKey, deleteSource = false, }) => {
     try {
         (0, log_1.debug)(`copying s3 file from ${Bucket}- ${fromKey} to ${toKey}`);
-        yield s3.send(new client_s3_1.CopyObjectCommand({
+        await s3.send(new client_s3_1.CopyObjectCommand({
             //incl bucket
             CopySource: Bucket + '/' + fromKey,
             //dest
@@ -190,7 +169,7 @@ const copyFile = (_a) => __awaiter(void 0, [_a], void 0, function* ({ Bucket, fr
             Key: toKey,
         }));
         if (deleteSource) {
-            const df = yield (0, exports.deleteFile)({ Bucket, Key: fromKey });
+            const df = await (0, exports.deleteFile)({ Bucket, Key: fromKey });
             if (df.error) {
                 return { error: df.error };
             }
@@ -200,31 +179,28 @@ const copyFile = (_a) => __awaiter(void 0, [_a], void 0, function* ({ Bucket, fr
     catch (e) {
         return { error: e.toString() };
     }
-});
+};
 exports.copyFile = copyFile;
-function listFiles(bucketName, opt) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        try {
-            const ret = [];
-            let response;
-            do {
-                response = yield s3.send(new client_s3_1.ListObjectsV2Command({
-                    Bucket: bucketName,
-                    ContinuationToken: response === null || response === void 0 ? void 0 : response.NextContinuationToken,
-                    Prefix: opt === null || opt === void 0 ? void 0 : opt.prefix,
-                }));
-                (_a = response.Contents) === null || _a === void 0 ? void 0 : _a.filter((r) => r.Key).map((c) => {
-                    ret.push(c.Key);
-                });
-            } while (response.IsTruncated);
-            return { data: (0, array_1.distinct)(ret.filter((r) => r)) };
-        }
-        catch (err) {
-            (0, log_1.error)('Error', err);
-            return { error: err.toString() };
-        }
-    });
+async function listFiles(bucketName, opt) {
+    try {
+        const ret = [];
+        let response;
+        do {
+            response = await s3.send(new client_s3_1.ListObjectsV2Command({
+                Bucket: bucketName,
+                ContinuationToken: response?.NextContinuationToken,
+                Prefix: opt?.prefix,
+            }));
+            response.Contents?.filter((r) => r.Key).map((c) => {
+                ret.push(c.Key);
+            });
+        } while (response.IsTruncated);
+        return { data: (0, array_1.distinct)(ret.filter((r) => r)) };
+    }
+    catch (err) {
+        (0, log_1.error)('Error', err);
+        return { error: err.toString() };
+    }
 }
 /**
  * allow uploading of file directly to s3
@@ -239,25 +215,23 @@ function listFiles(bucketName, opt) {
       formData.append('file', file);
       fetch.POST(url,formData)
  */
-function getPresignedPostURL(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ bucket, key, maxMb = 5, }) {
-        try {
-            const ps = yield (0, s3_presigned_post_1.createPresignedPost)(s3, {
-                Bucket: bucket,
-                Key: key,
-                Expires: 600,
-                Conditions: [
-                    ['content-length-range', 0, maxMb * 1049000], // content length restrictions: 0-5MB
-                    ['starts-with', '$Content-Type', 'image/'],
-                ],
-            });
-            const fields = (0, object_1.copy)(ps.fields);
-            return { data: { fields, url: ps.url } };
-        }
-        catch (e) {
-            return { error: e.toString() };
-        }
-    });
+async function getPresignedPostURL({ bucket, key, maxMb = 5, }) {
+    try {
+        const ps = await (0, s3_presigned_post_1.createPresignedPost)(s3, {
+            Bucket: bucket,
+            Key: key,
+            Expires: 600,
+            Conditions: [
+                ['content-length-range', 0, maxMb * 1049000], // content length restrictions: 0-5MB
+                ['starts-with', '$Content-Type', 'image/'],
+            ],
+        });
+        const fields = (0, object_1.copy)(ps.fields);
+        return { data: { fields, url: ps.url } };
+    }
+    catch (e) {
+        return { error: e.toString() };
+    }
 }
 /**
  * Generate a presigned PUT URL for direct browser upload.
@@ -267,17 +241,24 @@ function getPresignedPostURL(_a) {
  * If contentLength is provided, the upload MUST match that exact size
  * or the request will be rejected (signature mismatch).
  */
-function getPresignedPutUrl(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ bucket, key, contentType, contentLength, expiresIn = 600, }) {
-        try {
-            const command = new client_s3_1.PutObjectCommand(Object.assign({ Bucket: bucket, Key: key, ContentType: contentType }, (contentLength !== undefined && { ContentLength: contentLength })));
-            const url = yield (0, s3_request_presigner_1.getSignedUrl)(s3, command, Object.assign({ expiresIn }, (contentLength !== undefined && {
+async function getPresignedPutUrl({ bucket, key, contentType, contentLength, expiresIn = 600, }) {
+    try {
+        const command = new client_s3_1.PutObjectCommand({
+            Bucket: bucket,
+            Key: key,
+            ContentType: contentType,
+            ...(contentLength !== undefined && { ContentLength: contentLength }),
+        });
+        const url = await (0, s3_request_presigner_1.getSignedUrl)(s3, command, {
+            expiresIn,
+            // Sign the Content-Length header so it's enforced
+            ...(contentLength !== undefined && {
                 signableHeaders: new Set(['content-length']),
-            })));
-            return { data: url };
-        }
-        catch (e) {
-            return { error: e.toString() };
-        }
-    });
+            }),
+        });
+        return { data: url };
+    }
+    catch (e) {
+        return { error: e.toString() };
+    }
 }

package/dist/api/helpers/ses.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendEmails = exports.sendEmail = exports.ses = exports.setSes = void 0;
 const client_ses_1 = require("@aws-sdk/client-ses");
@@ -19,33 +10,35 @@ const setSes = (region) => {
 };
 exports.setSes = setSes;
 exports.ses = (0, exports.setSes)('ap-southeast-2');
-const sendEmail = (_a) => __awaiter(void 0, [_a], void 0, function* ({ to, message, subject, sourceArn, from, }) {
-    var _b;
+const sendEmail = async ({ to, message, subject, sourceArn, from, }) => {
     try {
-        const sourceArnRegion = (_b = sourceArn.match(':ses:(.*?):')) === null || _b === void 0 ? void 0 : _b[1];
+        const sourceArnRegion = sourceArn.match(':ses:(.*?):')?.[1];
         if (sourceArn !== exports.ses.config.region && sourceArnRegion) {
             (0, log_1.warn)('ses arn not equal to config region changing to:' + sourceArnRegion);
             (0, exports.setSes)(sourceArnRegion);
         }
         const ishtml = message.startsWith('<!DOCTYPE HTML') || message.startsWith('<html');
         (0, log_1.warn)('sending email. html=' + ishtml);
-        yield exports.ses.send(new client_ses_1.SendEmailCommand({
+        await exports.ses.send(new client_ses_1.SendEmailCommand({
             Destination: {
                 CcAddresses: [],
                 ToAddresses: [to],
             },
             Message: {
-                Body: Object.assign(Object.assign({}, (ishtml && {
-                    Html: {
-                        Data: message,
-                        Charset: 'UTF-8',
-                    },
-                })), (!ishtml && {
-                    Text: {
-                        Data: message,
-                        Charset: 'UTF-8',
-                    },
-                })),
+                Body: {
+                    ...(ishtml && {
+                        Html: {
+                            Data: message,
+                            Charset: 'UTF-8',
+                        },
+                    }),
+                    ...(!ishtml && {
+                        Text: {
+                            Data: message,
+                            Charset: 'UTF-8',
+                        },
+                    }),
+                },
                 Subject: {
                     Charset: 'UTF-8',
                     Data: subject,
@@ -61,7 +54,7 @@ const sendEmail = (_a) => __awaiter(void 0, [_a], void 0, function* ({ to, messa
         (0, log_1.warn)('ses send error:' + JSON.stringify(e));
         return { error: e.toString() };
     }
-});
+};
 exports.sendEmail = sendEmail;
-const sendEmails = (emails) => __awaiter(void 0, void 0, void 0, function* () { return Promise.all(emails.map(exports.sendEmail)); });
+const sendEmails = async (emails) => Promise.all(emails.map(exports.sendEmail));
 exports.sendEmails = sendEmails;

package/dist/api/helpers/sqs.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendMessages = exports.sqs = exports.setSqs = void 0;
 const client_sqs_1 = require("@aws-sdk/client-sqs");
@@ -18,18 +9,17 @@ const setSqs = (region) => {
 };
 exports.setSqs = setSqs;
 exports.sqs = (0, exports.setSqs)('ap-southeast-2');
-const sendMessages = (items, queueUrl) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b;
-    const p = yield exports.sqs.send(new client_sqs_1.SendMessageBatchCommand({
+const sendMessages = async (items, queueUrl) => {
+    const p = await exports.sqs.send(new client_sqs_1.SendMessageBatchCommand({
         QueueUrl: queueUrl,
         Entries: items.map((i) => ({
             MessageBody: JSON.stringify(i),
             Id: (0, hashCode_1.hashCode)(JSON.stringify(i)),
         })),
     }));
-    if (((_a = p.Failed) !== null && _a !== void 0 ? _a : []).length > 0) {
-        return { error: `failed: ${JSON.stringify((_b = p.Failed) !== null && _b !== void 0 ? _b : [], null, 2)}` };
+    if ((p.Failed ?? []).length > 0) {
+        return { error: `failed: ${JSON.stringify(p.Failed ?? [], null, 2)}` };
     }
     return {};
-});
+};
 exports.sendMessages = sendMessages;