@openstax/ts-utils 1.31.0 → 1.31.2

package/dist/esm/services/apiGateway/index.d.ts

@@ -38,7 +38,7 @@ export type ApiClientResponse<Ro> = Ro extends any ? {
 } : never;
 export type ExpandRoute<T> = T extends ((...args: infer A) => infer R) & {
     renderUrl: (...args: infer Ar) => Promise<string>;
-} ? (...args: A) => R & {
+} ? ((...args: A) => R) & {
     renderUrl: (...args: Ar) => Promise<string>;
 } : never;
 export type MapRoutesToClient<Ru> = [Ru] extends [AnyRoute<Ru>] ? {

package/dist/esm/services/fileServer/index.d.ts

@@ -13,6 +13,18 @@ export declare const isFolderValue: (thing: any) => thing is FolderValue;
 export interface FileServerAdapter {
     putFileContent: (source: FileValue, content: string) => Promise<FileValue>;
     getSignedViewerUrl: (source: FileValue) => Promise<string>;
+    getPublicViewerUrl: (source: FileValue) => Promise<string>;
     getFileContent: (source: FileValue) => Promise<Buffer>;
+    getSignedFileUploadConfig: () => Promise<{
+        url: string;
+        payload: {
+            [key: string]: string;
+        };
+    }>;
+    copyFileTo: (source: FileValue, destinationPath: string) => Promise<FileValue>;
+    copyFileToDirectory: (source: FileValue, destinationDirectory: string) => Promise<FileValue>;
+    isTemporaryUpload: (source: FileValue) => boolean;
+    getFileChecksum: (source: FileValue) => Promise<string>;
+    filesEqual: (sourceA: FileValue, sourceB: FileValue) => Promise<boolean>;
 }
 export declare const isFileOrFolder: (thing: any) => thing is FileValue | FolderValue;

package/dist/esm/services/fileServer/localFileServer.js

@@ -1,16 +1,18 @@
 /* cspell:ignore originalname */
+import crypto from 'crypto';
 import fs from 'fs';
 import https from 'https';
 import path from 'path';
 import cors from 'cors';
 import express from 'express';
 import multer from 'multer';
+import { v4 as uuid } from 'uuid';
 import { assertString } from '../../assertions';
 import { resolveConfigValue } from '../../config';
 import { ifDefined } from '../../guards';
-import { once } from '../../misc/helpers';
+import { memoize } from '../../misc/helpers';
 /* istanbul ignore next */
-const startServer = once((port, uploadDir) => {
+const startServer = memoize((port, uploadDir) => {
     // TODO - re-evaluate the `preservePath` behavior to match whatever s3 does
     const upload = multer({ dest: uploadDir, preservePath: true });
     const fileServerApp = express();
@@ -55,6 +57,9 @@ export const localFileServer = (initializer) => (configProvider) => {
     const getSignedViewerUrl = async (source) => {
         return `https://${await host}:${await port}/${source.path}`;
     };
+    const getPublicViewerUrl = async (source) => {
+        return `https://${await host}:${await port}/${source.path}`;
+    };
     const getFileContent = async (source) => {
         const filePath = path.join(await fileDir, source.path);
         return fs.promises.readFile(filePath);
@@ -66,9 +71,55 @@ export const localFileServer = (initializer) => (configProvider) => {
         await fs.promises.writeFile(filePath, content);
         return source;
     };
+    const getSignedFileUploadConfig = async () => {
+        const prefix = 'uploads/' + uuid();
+        return {
+            url: `https://${await host}:${await port}/`,
+            payload: {
+                key: prefix + '/${filename}',
+            }
+        };
+    };
+    const copyFileTo = async (source, destinationPath) => {
+        const sourcePath = path.join(await fileDir, source.path);
+        const destPath = path.join(await fileDir, destinationPath);
+        const destDirectory = path.dirname(destPath);
+        await fs.promises.mkdir(destDirectory, { recursive: true });
+        await fs.promises.copyFile(sourcePath, destPath);
+        return {
+            ...source,
+            path: destinationPath
+        };
+    };
+    const copyFileToDirectory = async (source, destination) => {
+        const destinationPath = path.join(destination, source.label);
+        return copyFileTo(source, destinationPath);
+    };
+    const isTemporaryUpload = (source) => {
+        return source.path.indexOf('uploads/') === 0;
+    };
+    const getFileChecksum = async (source) => {
+        const filePath = path.join(await fileDir, source.path);
+        const fileContent = await fs.promises.readFile(filePath);
+        return crypto.createHash('md5').update(fileContent).digest('hex');
+    };
+    const filesEqual = async (sourceA, sourceB) => {
+        const [aSum, bSum] = await Promise.all([
+            getFileChecksum(sourceA),
+            getFileChecksum(sourceB)
+        ]);
+        return aSum === bSum;
+    };
     return {
         getSignedViewerUrl,
+        getPublicViewerUrl,
         getFileContent,
         putFileContent,
+        getSignedFileUploadConfig,
+        copyFileTo,
+        copyFileToDirectory,
+        isTemporaryUpload,
+        getFileChecksum,
+        filesEqual,
     };
 };

package/dist/esm/services/fileServer/s3FileServer.d.ts

@@ -4,6 +4,7 @@ import { FileServerAdapter } from '.';
 export type Config = {
     bucketName: string;
     bucketRegion: string;
+    publicViewerDomain?: string;
 };
 interface Initializer<C> {
     configSpace?: C;

package/dist/esm/services/fileServer/s3FileServer.js

@@ -1,6 +1,9 @@
 /* cspell:ignore presigner */
-import { GetObjectCommand, PutObjectCommand, S3Client } from '@aws-sdk/client-s3';
+import { CopyObjectCommand, GetObjectCommand, HeadObjectCommand, PutObjectCommand, S3Client } from '@aws-sdk/client-s3';
+import { createPresignedPost } from '@aws-sdk/s3-presigned-post';
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
+import path from 'path';
+import { v4 as uuid } from 'uuid';
 import { once } from '../..';
 import { assertDefined } from '../../assertions';
 import { resolveConfigValue } from '../../config';
@@ -9,6 +12,9 @@ export const s3FileServer = (initializer) => (configProvider) => {
     const config = configProvider[ifDefined(initializer.configSpace, 'deployed')];
     const bucketName = once(() => resolveConfigValue(config.bucketName));
     const bucketRegion = once(() => resolveConfigValue(config.bucketRegion));
+    const publicViewerDomain = once(() => 'publicViewerDomain' in config && config.publicViewerDomain
+        ? resolveConfigValue(config.publicViewerDomain)
+        : undefined);
     const s3Service = once(async () => {
         var _a, _b;
         const args = { apiVersion: '2012-08-10', region: await bucketRegion() };
@@ -24,6 +30,10 @@ export const s3FileServer = (initializer) => (configProvider) => {
             expiresIn: 3600, // 1 hour
         });
     };
+    const getPublicViewerUrl = async (source) => {
+        const host = assertDefined(await publicViewerDomain(), new Error(`Tried to get public viewer URL for ${source.path} but no publicViewerDomain configured`));
+        return `https://${host}/${source.path}`;
+    };
     const getFileContent = async (source) => {
         const bucket = await bucketName();
         const command = new GetObjectCommand({ Bucket: bucket, Key: source.path });
@@ -41,9 +51,74 @@ export const s3FileServer = (initializer) => (configProvider) => {
         await (await s3Service()).send(command);
         return source;
     };
+    /*
+     * https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/modules/_aws_sdk_s3_presigned_post.html
+     * https://docs.aws.amazon.com/AmazonS3/latest/userguide/HTTPPOSTExamples.html
+     * https://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-post-example.html
+     */
+    const getSignedFileUploadConfig = async () => {
+        const prefix = 'uploads/' + uuid();
+        const bucket = (await bucketName());
+        const Conditions = [
+            { acl: 'private' },
+            { bucket },
+            ['starts-with', '$key', prefix]
+        ];
+        const defaultFields = {
+            acl: 'private',
+        };
+        const { url, fields } = await createPresignedPost(await s3Service(), {
+            Bucket: bucket,
+            Key: prefix + '/${filename}',
+            Conditions,
+            Fields: defaultFields,
+            Expires: 3600, // 1 hour
+        });
+        return {
+            url, payload: fields
+        };
+    };
+    const copyFileTo = async (source, destinationPath) => {
+        const bucket = (await bucketName());
+        const destinationPathWithoutLeadingSlash = destinationPath.replace(/^\//, '');
+        const command = new CopyObjectCommand({
+            Bucket: bucket,
+            Key: destinationPathWithoutLeadingSlash,
+            CopySource: path.join(bucket, source.path),
+        });
+        await (await s3Service()).send(command);
+        return {
+            ...source,
+            path: destinationPathWithoutLeadingSlash
+        };
+    };
+    const copyFileToDirectory = async (source, destination) => {
+        const destinationPath = path.join(destination, source.label);
+        return copyFileTo(source, destinationPath);
+    };
+    const isTemporaryUpload = (source) => {
+        return source.path.indexOf('uploads/') === 0;
+    };
+    const getFileChecksum = async (source) => {
+        const bucket = (await bucketName());
+        const command = new HeadObjectCommand({ Bucket: bucket, Key: source.path });
+        const response = await (await s3Service()).send(command);
+        return assertDefined(response.ETag);
+    };
+    const filesEqual = async (sourceA, sourceB) => {
+        const [aSum, bSum] = await Promise.all([getFileChecksum(sourceA), getFileChecksum(sourceB)]);
+        return aSum === bSum;
+    };
     return {
         getFileContent,
         putFileContent,
         getSignedViewerUrl,
+        getPublicViewerUrl,
+        getSignedFileUploadConfig,
+        copyFileTo,
+        copyFileToDirectory,
+        isTemporaryUpload,
+        getFileChecksum,
+        filesEqual,
     };
 };

package/dist/esm/services/searchProvider/openSearch.js

@@ -26,10 +26,6 @@ export const openSearchService = (initializer = {}) => (configProvider) => {
         maxRetries: 4, // default is 3
         requestTimeout: 5000, // default is 30000
         pingTimeout: 2000, // default is 30000
-        sniffOnConnectionFault: true,
-        sniffOnStart: true,
-        resurrectStrategy: 'ping',
-        agent: { keepAlive: false },
         node: await resolveConfigValue(config.node),
     }));
     return (indexConfig) => {
@@ -65,6 +61,9 @@ export const openSearchService = (initializer = {}) => (configProvider) => {
                 body: params.body,
                 id: params.id,
                 refresh: true
+            }, {
+                requestTimeout: 10000,
+                maxRetries: 1,
             });
         };
         const bulkIndex = async (items) => {
@@ -76,6 +75,9 @@ export const openSearchService = (initializer = {}) => (configProvider) => {
                     item.body
                 ]),
                 refresh: true
+            }, {
+                requestTimeout: 10000,
+                maxRetries: 1,
             });
         };
         const search = async (options) => {