@openstax/ts-utils 1.31.1 → 1.31.2

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

@@ -13,6 +13,7 @@ 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;

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

@@ -63,6 +63,9 @@ 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_1.default.join(await fileDir, source.path);
         return fs_1.default.promises.readFile(filePath);
@@ -115,6 +118,7 @@ const localFileServer = (initializer) => (configProvider) => {
     };
     return {
         getSignedViewerUrl,
+        getPublicViewerUrl,
         getFileContent,
         putFileContent,
         getSignedFileUploadConfig,

package/dist/cjs/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/cjs/services/fileServer/s3FileServer.js

@@ -18,6 +18,9 @@ const s3FileServer = (initializer) => (configProvider) => {
     const config = configProvider[(0, guards_1.ifDefined)(initializer.configSpace, 'deployed')];
     const bucketName = (0, __1.once)(() => (0, config_1.resolveConfigValue)(config.bucketName));
     const bucketRegion = (0, __1.once)(() => (0, config_1.resolveConfigValue)(config.bucketRegion));
+    const publicViewerDomain = (0, __1.once)(() => 'publicViewerDomain' in config && config.publicViewerDomain
+        ? (0, config_1.resolveConfigValue)(config.publicViewerDomain)
+        : undefined);
     const s3Service = (0, __1.once)(async () => {
         var _a, _b;
         const args = { apiVersion: '2012-08-10', region: await bucketRegion() };
@@ -33,6 +36,10 @@ const s3FileServer = (initializer) => (configProvider) => {
             expiresIn: 3600, // 1 hour
         });
     };
+    const getPublicViewerUrl = async (source) => {
+        const host = (0, assertions_1.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 client_s3_1.GetObjectCommand({ Bucket: bucket, Key: source.path });
@@ -71,7 +78,7 @@ const s3FileServer = (initializer) => (configProvider) => {
             Key: prefix + '/${filename}',
             Conditions,
             Fields: defaultFields,
-            Expires: 3600, // 1 hour 
+            Expires: 3600, // 1 hour
         });
         return {
             url, payload: fields
@@ -112,6 +119,7 @@ const s3FileServer = (initializer) => (configProvider) => {
         getFileContent,
         putFileContent,
         getSignedViewerUrl,
+        getPublicViewerUrl,
         getSignedFileUploadConfig,
         copyFileTo,
         copyFileToDirectory,

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

@@ -29,9 +29,6 @@ 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',
         node: await (0, config_1.resolveConfigValue)(config.node),
     }));
     return (indexConfig) => {
@@ -67,6 +64,9 @@ const openSearchService = (initializer = {}) => (configProvider) => {
                 body: params.body,
                 id: params.id,
                 refresh: true
+            }, {
+                requestTimeout: 10000,
+                maxRetries: 1,
             });
         };
         const bulkIndex = async (items) => {
@@ -78,6 +78,9 @@ const openSearchService = (initializer = {}) => (configProvider) => {
                     item.body
                 ]),
                 refresh: true
+            }, {
+                requestTimeout: 10000,
+                maxRetries: 1,
             });
         };
         const search = async (options) => {