@openstax/ts-utils 1.32.1 → 1.32.2

package/dist/cjs/routing/index.d.ts

@@ -25,20 +25,6 @@ export type RouteMatchRecord<R> = R extends AnyRoute<R> ? {
     route: R;
     params: ParamsForRoute<R>;
 } : never;
-type Flatten<T> = T extends any ? {
-    [K in keyof T]: T[K];
-} : never;
-export type ExternalRoute<R> = R extends Route<infer N, infer P, infer Sa, infer Sr, infer Ri, infer Ro> & infer E ? Route<N, P, Sa, Sr extends {
-    payload: any;
-} ? Flatten<Pick<Sr, 'payload'>> : Record<string, never>, Ri, Ro> & Flatten<Omit<E, 'name' | 'path' | 'handler' | 'requestServiceProvider'>> : never;
-/** this utility simplifies the route type to remove stuff that is only
- * relevant internal to the route, like the service types, keeping only
- * the payload type which is necessary for the apiGateway
- *
- * this helps avoid the "type too complicated" error that typescript throws
- * when there are a lot of routes with complex services
- **/
-export declare const routesList: <R>(routes: R[]) => ExternalRoute<R>[];
 /**
  * The conditional type for the payload for a given route, `R`. This isn't a route structure, its
  * a convention based on the request middleware
@@ -154,9 +140,7 @@ export declare const makeCreateRoute: <Sa, Ri, Ex = {}>() => CreateRoute<Sa, Ri,
  */
 export declare const makeRenderRouteUrl: <Ru extends {
     path: string;
-}>() => <R>(route: ExternalRoute<R> extends Ru ? R & {
-    path: string;
-} : R extends Ru ? R : never, params: ParamsForRoute<R>, query?: QueryParams) => string;
+}>() => <R extends Ru>(route: R, params: ParamsForRoute<R>, query?: QueryParams) => string;
 /**
  * A pre-made result from `makeRenderRouteUrl`, this function interpolates parameter and query
  * arguments into a route path.
@@ -169,9 +153,7 @@ export declare const makeRenderRouteUrl: <Ru extends {
  * @param query the query parameters to add to the route path
  * @returns the interpolated route path
  */
-export declare const renderAnyRouteUrl: <R>(route: ExternalRoute<R> extends any ? R & {
-    path: string;
-} : R extends any ? R : never, params: ParamsForRoute<R>, query?: QueryParams) => string;
+export declare const renderAnyRouteUrl: <R extends any>(route: R, params: ParamsForRoute<R>, query?: QueryParams) => string;
 type RequestPathExtractor<Ri> = (request: Ri) => string;
 type RequestLogExtractor<Ri> = (request: Ri) => JsonCompatibleStruct;
 type RequestRouteMatcher<Ri, R> = (request: Ri, route: R) => boolean;

package/dist/cjs/routing/index.js

@@ -39,20 +39,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.METHOD = exports.apiHtmlResponse = exports.apiTextResponse = exports.apiJsonResponse = exports.makeGetRequestResponder = exports.renderAnyRouteUrl = exports.makeRenderRouteUrl = exports.makeCreateRoute = exports.routesList = void 0;
+exports.METHOD = exports.apiHtmlResponse = exports.apiTextResponse = exports.apiJsonResponse = exports.makeGetRequestResponder = exports.renderAnyRouteUrl = exports.makeRenderRouteUrl = exports.makeCreateRoute = void 0;
 const pathToRegexp = __importStar(require("path-to-regexp"));
 const query_string_1 = __importDefault(require("query-string"));
 const helpers_1 = require("../misc/helpers");
 const console_1 = require("../services/logger/console");
-/** this utility simplifies the route type to remove stuff that is only
- * relevant internal to the route, like the service types, keeping only
- * the payload type which is necessary for the apiGateway
- *
- * this helps avoid the "type too complicated" error that typescript throws
- * when there are a lot of routes with complex services
- **/
-const routesList = (routes) => routes;
-exports.routesList = routesList;
 /**
  * Makes a createRoute function that can be used to create routes (this is a factory factory). The
  * `makeCreateRoute` function is typically called once in the backend and once in the frontend to

package/dist/cjs/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/cjs/services/authProvider/browser.d.ts

@@ -1,6 +1,7 @@
 import { ConfigProviderForConfig } from '../../config';
-import { FetchConfig, GenericFetch } from '../../fetch';
-import { ApiUser, User } from '.';
+import { GenericFetch } from '../../fetch';
+import { UserData } from './utils/embeddedAuthProvider';
+import { ApiUser, AuthProvider } from '.';
 type Config = {
     accountsBase: string;
 };
@@ -27,46 +28,13 @@ export interface Window {
     removeEventListener: (event: 'message', callback: EventHandler) => void;
 }
 export type UpdatableUserFields = Partial<Pick<ApiUser, 'consent_preferences' | 'first_name' | 'last_name'>>;
-export declare const browserAuthProvider: <C extends string = "auth">({ window, configSpace }: Initializer<C>) => (configProvider: { [_key in C]: ConfigProviderForConfig<Config>; }) => {
-    /**
-     * gets the authentication token
-     */
-    getAuthToken: () => Promise<string | null>;
-    /**
-     * adds auth parameters to the url. this is only safe to use when using javascript to navigate
-     * within the current window, eg `window.location = 'https://my.otherservice.com';` anchors
-     * should use getAuthorizedLinkUrl for their href.
-     *
-     * result unreliable unless `getUser` is resolved first.
-     */
+export type BrowserAuthProvider = AuthProvider & {
     getAuthorizedUrl: (urlString: string) => string;
-    /**
-     * all link href-s must be rendered with auth tokens so that they work when opened in a new tab
-     *
-     * result unreliable unless `getUser` is resolved first.
-     */
     getAuthorizedLinkUrl: (urlString: string) => string;
-    /**
-     * gets an authorized url for an iframe src. sets params on the url and saves its
-     * origin to trust releasing user identity to it
-     */
     getAuthorizedEmbedUrl: (urlString: string, extraParams?: {
         [key: string]: string;
     }) => string;
-    /**
-     * gets second argument for `fetch` that has authentication token or cookie
-     */
-    getAuthorizedFetchConfig: () => Promise<FetchConfig>;
-    /**
-     * loads current user identity. does not reflect changes in identity after being called the first time.
-     */
-    getUser: () => Promise<User | undefined>;
-    /**
-     * updates user settings, for example the cookie consent preferences
-     */
-    updateUser: (updates: UpdatableUserFields) => Promise<{
-        user: ApiUser;
-        token: string | null;
-    }>;
+    updateUser: (updates: UpdatableUserFields) => Promise<UserData<ApiUser>>;
 };
+export declare const browserAuthProvider: <C extends string = "auth">({ window, configSpace }: Initializer<C>) => (configProvider: { [_key in C]: ConfigProviderForConfig<Config>; }) => BrowserAuthProvider;
 export {};

package/dist/cjs/services/authProvider/browser.js

@@ -145,6 +145,7 @@ const browserAuthProvider = ({ window, configSpace }) => (configProvider) => {
          * loads current user identity. does not reflect changes in identity after being called the first time.
          */
         getUser,
+        loadUserData: getUser,
         /**
          * updates user settings, for example the cookie consent preferences
          */

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

@@ -43,6 +43,7 @@ export type AuthProvider = {
      * gets second argument for `fetch` that has authentication token or cookie
      */
     getAuthorizedFetchConfig: () => Promise<FetchConfig>;
+    loadUserData: () => Promise<ApiUser | undefined>;
 };
 export type CookieAuthProviderRequest = {
     cookies?: string[];

package/dist/cjs/services/authProvider/index.js

@@ -7,11 +7,16 @@ exports.getAuthTokenOrCookie = exports.stubAuthProvider = void 0;
 const cookie_1 = __importDefault(require("cookie"));
 const helpers_1 = require("../../misc/helpers");
 const helpers_2 = require("../../routing/helpers");
-const stubAuthProvider = (user) => ({
-    getAuthToken: () => Promise.resolve('authToken'),
-    getUser: () => Promise.resolve(user),
-    getAuthorizedFetchConfig: () => Promise.resolve(user ? { headers: { Authorization: user.uuid } } : {})
-});
+const stubAuthProvider = (user) => {
+    const getUser = () => Promise.resolve(user);
+    return {
+        getAuthToken: () => Promise.resolve('authToken'),
+        getUser,
+        getAuthorizedFetchConfig: () => Promise.resolve(user ? { headers: { Authorization: user.uuid } } : {}),
+        // This is not technically correct, but most tests won't care
+        loadUserData: getUser
+    };
+};
 exports.stubAuthProvider = stubAuthProvider;
 const getAuthTokenOrCookie = (request, cookieName, queryKey = 'auth') => {
     var _a, _b;

package/dist/cjs/services/authProvider/subrequest.js

@@ -32,15 +32,17 @@ const subrequestAuthProvider = (initializer) => (configProvider) => {
             }
             return user;
         };
+        const getUser = async () => {
+            if (!user) {
+                user = await loadUser();
+            }
+            return user;
+        };
         return {
             getAuthToken,
             getAuthorizedFetchConfig,
-            getUser: async () => {
-                if (!user) {
-                    user = await loadUser();
-                }
-                return user;
-            }
+            getUser,
+            loadUserData: getUser
         };
     };
 };

package/dist/cjs/services/authProvider/utils/embeddedAuthProvider.d.ts

@@ -1,7 +1,7 @@
 import { User } from '..';
 import { Window } from '../browser';
-export type UserData = {
-    user?: User;
+export type UserData<T = User> = {
+    user?: T;
     token: string | null;
 };
 type UserDataLoader = () => Promise<UserData>;

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

@@ -13,18 +13,6 @@ 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/cjs/services/fileServer/localFileServer.js

@@ -5,20 +5,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.localFileServer = void 0;
 /* cspell:ignore originalname */
-const crypto_1 = __importDefault(require("crypto"));
 const fs_1 = __importDefault(require("fs"));
 const https_1 = __importDefault(require("https"));
 const path_1 = __importDefault(require("path"));
 const cors_1 = __importDefault(require("cors"));
 const express_1 = __importDefault(require("express"));
 const multer_1 = __importDefault(require("multer"));
-const uuid_1 = require("uuid");
 const assertions_1 = require("../../assertions");
 const config_1 = require("../../config");
 const guards_1 = require("../../guards");
 const helpers_1 = require("../../misc/helpers");
 /* istanbul ignore next */
-const startServer = (0, helpers_1.memoize)((port, uploadDir) => {
+const startServer = (0, helpers_1.once)((port, uploadDir) => {
     // TODO - re-evaluate the `preservePath` behavior to match whatever s3 does
     const upload = (0, multer_1.default)({ dest: uploadDir, preservePath: true });
     const fileServerApp = (0, express_1.default)();
@@ -63,9 +61,6 @@ 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);
@@ -77,56 +72,10 @@ const localFileServer = (initializer) => (configProvider) => {
         await fs_1.default.promises.writeFile(filePath, content);
         return source;
     };
-    const getSignedFileUploadConfig = async () => {
-        const prefix = 'uploads/' + (0, uuid_1.v4)();
-        return {
-            url: `https://${await host}:${await port}/`,
-            payload: {
-                key: prefix + '/${filename}',
-            }
-        };
-    };
-    const copyFileTo = async (source, destinationPath) => {
-        const sourcePath = path_1.default.join(await fileDir, source.path);
-        const destPath = path_1.default.join(await fileDir, destinationPath);
-        const destDirectory = path_1.default.dirname(destPath);
-        await fs_1.default.promises.mkdir(destDirectory, { recursive: true });
-        await fs_1.default.promises.copyFile(sourcePath, destPath);
-        return {
-            ...source,
-            path: destinationPath
-        };
-    };
-    const copyFileToDirectory = async (source, destination) => {
-        const destinationPath = path_1.default.join(destination, source.label);
-        return copyFileTo(source, destinationPath);
-    };
-    const isTemporaryUpload = (source) => {
-        return source.path.indexOf('uploads/') === 0;
-    };
-    const getFileChecksum = async (source) => {
-        const filePath = path_1.default.join(await fileDir, source.path);
-        const fileContent = await fs_1.default.promises.readFile(filePath);
-        return crypto_1.default.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,
     };
 };
 exports.localFileServer = localFileServer;

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

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

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

@@ -1,15 +1,9 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.s3FileServer = void 0;
 /* cspell:ignore presigner */
-const path_1 = __importDefault(require("path"));
 const client_s3_1 = require("@aws-sdk/client-s3");
-const s3_presigned_post_1 = require("@aws-sdk/s3-presigned-post");
 const s3_request_presigner_1 = require("@aws-sdk/s3-request-presigner");
-const uuid_1 = require("uuid");
 const __1 = require("../..");
 const assertions_1 = require("../../assertions");
 const config_1 = require("../../config");
@@ -18,9 +12,6 @@ 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() };
@@ -36,10 +27,6 @@ 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 });
@@ -57,75 +44,10 @@ 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/' + (0, uuid_1.v4)();
-        const bucket = (await bucketName());
-        const Conditions = [
-            { acl: 'private' },
-            { bucket },
-            ['starts-with', '$key', prefix]
-        ];
-        const defaultFields = {
-            acl: 'private',
-        };
-        const { url, fields } = await (0, s3_presigned_post_1.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 client_s3_1.CopyObjectCommand({
-            Bucket: bucket,
-            Key: destinationPathWithoutLeadingSlash,
-            CopySource: path_1.default.join(bucket, source.path),
-        });
-        await (await s3Service()).send(command);
-        return {
-            ...source,
-            path: destinationPathWithoutLeadingSlash
-        };
-    };
-    const copyFileToDirectory = async (source, destination) => {
-        const destinationPath = path_1.default.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 client_s3_1.HeadObjectCommand({ Bucket: bucket, Key: source.path });
-        const response = await (await s3Service()).send(command);
-        return (0, assertions_1.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,
     };
 };
 exports.s3FileServer = s3FileServer;

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

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