@openstax/ts-utils 1.44.2 → 1.44.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/aws/ssmService.js +2 -2
- package/dist/cjs/config/awsParameterConfig.d.ts +1 -1
- package/dist/cjs/config/awsParameterConfig.js +7 -7
- package/dist/cjs/config/envConfig.d.ts +1 -1
- package/dist/cjs/config/envConfig.js +2 -2
- package/dist/cjs/config/index.d.ts +5 -5
- package/dist/cjs/config/index.js +5 -5
- package/dist/cjs/config/lambdaParameterConfig.d.ts +1 -1
- package/dist/cjs/config/lambdaParameterConfig.js +10 -10
- package/dist/cjs/config/replaceConfig.d.ts +1 -1
- package/dist/cjs/config/replaceConfig.js +3 -3
- package/dist/cjs/config/resolveConfigValue.d.ts +1 -1
- package/dist/cjs/errors/index.d.ts +1 -1
- package/dist/cjs/fetch/fetchStatusRetry.d.ts +2 -2
- package/dist/cjs/fetch/fetchStatusRetry.js +2 -2
- package/dist/cjs/fetch/index.d.ts +1 -1
- package/dist/cjs/index.d.ts +5 -5
- package/dist/cjs/index.js +5 -5
- package/dist/cjs/middleware/apiErrorHandler.d.ts +3 -3
- package/dist/cjs/middleware/apiErrorHandler.js +12 -12
- package/dist/cjs/middleware/apiSlowResponseMiddleware.d.ts +3 -3
- package/dist/cjs/middleware/apiSlowResponseMiddleware.js +9 -9
- package/dist/cjs/middleware/index.d.ts +1 -1
- package/dist/cjs/middleware/lambdaCorsResponseMiddleware.d.ts +2 -2
- package/dist/cjs/middleware/lambdaCorsResponseMiddleware.js +5 -5
- package/dist/cjs/middleware/throwNotFoundMiddleware.js +2 -2
- package/dist/cjs/misc/helpers.d.ts +1 -1
- package/dist/cjs/misc/jwks.js +3 -3
- package/dist/cjs/misc/merge.d.ts +1 -1
- package/dist/cjs/misc/merge.js +2 -2
- package/dist/cjs/pagination/index.d.ts +1 -1
- package/dist/cjs/pagination/index.js +10 -10
- package/dist/cjs/routing/helpers.d.ts +1 -1
- package/dist/cjs/routing/helpers.js +7 -7
- package/dist/cjs/routing/index.d.ts +2 -2
- package/dist/cjs/routing/index.js +6 -6
- package/dist/cjs/routing/lambdaBatchRequestHandler.d.ts +2 -2
- package/dist/cjs/routing/lambdaBatchRequestHandler.js +6 -6
- package/dist/cjs/routing/validators/zod.js +2 -2
- package/dist/cjs/services/accountsGateway/index.d.ts +5 -5
- package/dist/cjs/services/accountsGateway/index.js +18 -18
- package/dist/cjs/services/apiGateway/index.d.ts +5 -5
- package/dist/cjs/services/apiGateway/index.js +12 -12
- package/dist/cjs/services/authProvider/browser.d.ts +4 -4
- package/dist/cjs/services/authProvider/browser.js +14 -14
- package/dist/cjs/services/authProvider/decryption.d.ts +3 -3
- package/dist/cjs/services/authProvider/decryption.js +17 -17
- package/dist/cjs/services/authProvider/index.d.ts +3 -3
- package/dist/cjs/services/authProvider/index.js +7 -7
- package/dist/cjs/services/authProvider/launchToken.d.ts +4 -4
- package/dist/cjs/services/authProvider/launchToken.js +6 -6
- package/dist/cjs/services/authProvider/subrequest.d.ts +3 -3
- package/dist/cjs/services/authProvider/subrequest.js +12 -12
- package/dist/cjs/services/authProvider/utils/decryptAndVerify.d.ts +1 -1
- package/dist/cjs/services/authProvider/utils/decryptAndVerify.js +3 -3
- package/dist/cjs/services/authProvider/utils/embeddedAuthProvider.d.ts +2 -2
- package/dist/cjs/services/authProvider/utils/userRoleValidator.d.ts +3 -3
- package/dist/cjs/services/authProvider/utils/userRoleValidator.js +7 -7
- package/dist/cjs/services/authProvider/utils/userSubrequest.d.ts +2 -2
- package/dist/cjs/services/documentStore/dynamoEncoding.d.ts +1 -1
- package/dist/cjs/services/documentStore/dynamoEncoding.js +2 -2
- package/dist/cjs/services/documentStore/unversioned/dynamodb.d.ts +2 -2
- package/dist/cjs/services/documentStore/unversioned/dynamodb.js +30 -30
- package/dist/cjs/services/documentStore/unversioned/file-system.d.ts +2 -2
- package/dist/cjs/services/documentStore/unversioned/file-system.js +13 -13
- package/dist/cjs/services/documentStore/unversioned/index.d.ts +1 -1
- package/dist/cjs/services/documentStore/versioned/dynamodb.d.ts +3 -3
- package/dist/cjs/services/documentStore/versioned/dynamodb.js +17 -17
- package/dist/cjs/services/documentStore/versioned/file-system.d.ts +3 -3
- package/dist/cjs/services/documentStore/versioned/file-system.js +2 -2
- package/dist/cjs/services/documentStore/versioned/index.d.ts +2 -2
- package/dist/cjs/services/exercisesGateway/index.d.ts +2 -2
- package/dist/cjs/services/exercisesGateway/index.js +14 -14
- package/dist/cjs/services/fileServer/index.js +3 -3
- package/dist/cjs/services/fileServer/localFileServer.d.ts +2 -2
- package/dist/cjs/services/fileServer/localFileServer.js +89 -28
- package/dist/cjs/services/fileServer/s3FileServer.d.ts +2 -2
- package/dist/cjs/services/fileServer/s3FileServer.js +14 -14
- package/dist/cjs/services/httpMessageVerifier/index.d.ts +1 -1
- package/dist/cjs/services/httpMessageVerifier/index.js +20 -20
- package/dist/cjs/services/launchParams/index.d.ts +2 -2
- package/dist/cjs/services/launchParams/index.js +4 -4
- package/dist/cjs/services/launchParams/signer.d.ts +2 -2
- package/dist/cjs/services/launchParams/signer.js +9 -9
- package/dist/cjs/services/launchParams/verifier.d.ts +1 -1
- package/dist/cjs/services/launchParams/verifier.js +11 -11
- package/dist/cjs/services/logger/console.d.ts +1 -1
- package/dist/cjs/services/logger/console.js +2 -2
- package/dist/cjs/services/logger/index.d.ts +1 -1
- package/dist/cjs/services/lrsGateway/addStatementDefaultFields.d.ts +1 -1
- package/dist/cjs/services/lrsGateway/addStatementDefaultFields.js +2 -2
- package/dist/cjs/services/lrsGateway/attempt-utils.d.ts +8 -8
- package/dist/cjs/services/lrsGateway/batching.d.ts +2 -2
- package/dist/cjs/services/lrsGateway/batching.js +2 -2
- package/dist/cjs/services/lrsGateway/file-system.d.ts +3 -3
- package/dist/cjs/services/lrsGateway/file-system.js +12 -12
- package/dist/cjs/services/lrsGateway/index.d.ts +5 -5
- package/dist/cjs/services/lrsGateway/index.js +26 -26
- package/dist/cjs/services/lrsGateway/xapiUtils.d.ts +4 -4
- package/dist/cjs/services/lrsGateway/xapiUtils.js +7 -7
- package/dist/cjs/services/postgresConnection/index.d.ts +2 -2
- package/dist/cjs/services/postgresConnection/index.js +14 -14
- package/dist/cjs/services/queueProvider/local.d.ts +2 -2
- package/dist/cjs/services/queueProvider/local.js +6 -7
- package/dist/cjs/services/queueProvider/sqs.d.ts +2 -2
- package/dist/cjs/services/queueProvider/sqs.js +7 -7
- package/dist/cjs/services/searchProvider/memorySearchTheBadWay.d.ts +1 -1
- package/dist/cjs/services/searchProvider/memorySearchTheBadWay.js +9 -9
- package/dist/cjs/services/searchProvider/openSearch.d.ts +2 -2
- package/dist/cjs/services/searchProvider/openSearch.js +9 -9
- package/dist/cjs/services/searchProvider/streamIndexer.d.ts +2 -2
- package/dist/cjs/services/searchProvider/streamIndexer.js +3 -3
- package/dist/cjs/tsconfig.without-specs.cjs.tsbuildinfo +1 -1
- package/dist/esm/aws/ssmService.js +1 -1
- package/dist/esm/config/awsParameterConfig.d.ts +1 -1
- package/dist/esm/config/awsParameterConfig.js +3 -3
- package/dist/esm/config/envConfig.d.ts +1 -1
- package/dist/esm/config/envConfig.js +1 -1
- package/dist/esm/config/index.d.ts +5 -5
- package/dist/esm/config/index.js +5 -5
- package/dist/esm/config/lambdaParameterConfig.d.ts +1 -1
- package/dist/esm/config/lambdaParameterConfig.js +4 -4
- package/dist/esm/config/replaceConfig.d.ts +1 -1
- package/dist/esm/config/replaceConfig.js +1 -1
- package/dist/esm/config/resolveConfigValue.d.ts +1 -1
- package/dist/esm/errors/index.d.ts +1 -1
- package/dist/esm/fetch/fetchStatusRetry.d.ts +2 -2
- package/dist/esm/fetch/fetchStatusRetry.js +1 -1
- package/dist/esm/fetch/index.d.ts +1 -1
- package/dist/esm/index.d.ts +5 -5
- package/dist/esm/index.js +5 -5
- package/dist/esm/middleware/apiErrorHandler.d.ts +3 -3
- package/dist/esm/middleware/apiErrorHandler.js +3 -3
- package/dist/esm/middleware/apiSlowResponseMiddleware.d.ts +3 -3
- package/dist/esm/middleware/apiSlowResponseMiddleware.js +4 -4
- package/dist/esm/middleware/index.d.ts +1 -1
- package/dist/esm/middleware/lambdaCorsResponseMiddleware.d.ts +2 -2
- package/dist/esm/middleware/lambdaCorsResponseMiddleware.js +3 -3
- package/dist/esm/middleware/throwNotFoundMiddleware.js +1 -1
- package/dist/esm/misc/helpers.d.ts +1 -1
- package/dist/esm/misc/jwks.js +1 -1
- package/dist/esm/misc/merge.d.ts +1 -1
- package/dist/esm/misc/merge.js +1 -1
- package/dist/esm/pagination/index.d.ts +1 -1
- package/dist/esm/pagination/index.js +3 -3
- package/dist/esm/routing/helpers.d.ts +1 -1
- package/dist/esm/routing/helpers.js +3 -3
- package/dist/esm/routing/index.d.ts +2 -2
- package/dist/esm/routing/index.js +3 -3
- package/dist/esm/routing/lambdaBatchRequestHandler.d.ts +2 -2
- package/dist/esm/routing/lambdaBatchRequestHandler.js +3 -3
- package/dist/esm/routing/validators/zod.js +1 -1
- package/dist/esm/services/accountsGateway/index.d.ts +5 -5
- package/dist/esm/services/accountsGateway/index.js +5 -5
- package/dist/esm/services/apiGateway/index.d.ts +5 -5
- package/dist/esm/services/apiGateway/index.js +5 -5
- package/dist/esm/services/authProvider/browser.d.ts +4 -4
- package/dist/esm/services/authProvider/browser.js +6 -6
- package/dist/esm/services/authProvider/decryption.d.ts +3 -3
- package/dist/esm/services/authProvider/decryption.js +7 -7
- package/dist/esm/services/authProvider/index.d.ts +3 -3
- package/dist/esm/services/authProvider/index.js +2 -2
- package/dist/esm/services/authProvider/launchToken.d.ts +4 -4
- package/dist/esm/services/authProvider/launchToken.js +2 -2
- package/dist/esm/services/authProvider/subrequest.d.ts +3 -3
- package/dist/esm/services/authProvider/subrequest.js +5 -5
- package/dist/esm/services/authProvider/utils/decryptAndVerify.d.ts +1 -1
- package/dist/esm/services/authProvider/utils/decryptAndVerify.js +1 -1
- package/dist/esm/services/authProvider/utils/embeddedAuthProvider.d.ts +2 -2
- package/dist/esm/services/authProvider/utils/userRoleValidator.d.ts +3 -3
- package/dist/esm/services/authProvider/utils/userRoleValidator.js +4 -4
- package/dist/esm/services/authProvider/utils/userSubrequest.d.ts +2 -2
- package/dist/esm/services/documentStore/dynamoEncoding.d.ts +1 -1
- package/dist/esm/services/documentStore/dynamoEncoding.js +1 -1
- package/dist/esm/services/documentStore/unversioned/dynamodb.d.ts +2 -2
- package/dist/esm/services/documentStore/unversioned/dynamodb.js +5 -5
- package/dist/esm/services/documentStore/unversioned/file-system.d.ts +2 -2
- package/dist/esm/services/documentStore/unversioned/file-system.js +4 -4
- package/dist/esm/services/documentStore/unversioned/index.d.ts +1 -1
- package/dist/esm/services/documentStore/versioned/dynamodb.d.ts +3 -3
- package/dist/esm/services/documentStore/versioned/dynamodb.js +4 -4
- package/dist/esm/services/documentStore/versioned/file-system.d.ts +3 -3
- package/dist/esm/services/documentStore/versioned/file-system.js +1 -1
- package/dist/esm/services/documentStore/versioned/index.d.ts +2 -2
- package/dist/esm/services/exercisesGateway/index.d.ts +2 -2
- package/dist/esm/services/exercisesGateway/index.js +5 -5
- package/dist/esm/services/fileServer/index.js +1 -1
- package/dist/esm/services/fileServer/localFileServer.d.ts +2 -2
- package/dist/esm/services/fileServer/localFileServer.js +83 -22
- package/dist/esm/services/fileServer/s3FileServer.d.ts +2 -2
- package/dist/esm/services/fileServer/s3FileServer.js +5 -5
- package/dist/esm/services/httpMessageVerifier/index.d.ts +1 -1
- package/dist/esm/services/httpMessageVerifier/index.js +6 -6
- package/dist/esm/services/launchParams/index.d.ts +2 -2
- package/dist/esm/services/launchParams/index.js +2 -2
- package/dist/esm/services/launchParams/signer.d.ts +2 -2
- package/dist/esm/services/launchParams/signer.js +3 -3
- package/dist/esm/services/launchParams/verifier.d.ts +1 -1
- package/dist/esm/services/launchParams/verifier.js +5 -5
- package/dist/esm/services/logger/console.d.ts +1 -1
- package/dist/esm/services/logger/console.js +1 -1
- package/dist/esm/services/logger/index.d.ts +1 -1
- package/dist/esm/services/lrsGateway/addStatementDefaultFields.d.ts +1 -1
- package/dist/esm/services/lrsGateway/addStatementDefaultFields.js +1 -1
- package/dist/esm/services/lrsGateway/attempt-utils.d.ts +8 -8
- package/dist/esm/services/lrsGateway/batching.d.ts +2 -2
- package/dist/esm/services/lrsGateway/batching.js +1 -1
- package/dist/esm/services/lrsGateway/file-system.d.ts +3 -3
- package/dist/esm/services/lrsGateway/file-system.js +6 -6
- package/dist/esm/services/lrsGateway/index.d.ts +5 -5
- package/dist/esm/services/lrsGateway/index.js +11 -11
- package/dist/esm/services/lrsGateway/xapiUtils.d.ts +4 -4
- package/dist/esm/services/lrsGateway/xapiUtils.js +2 -2
- package/dist/esm/services/postgresConnection/index.d.ts +2 -2
- package/dist/esm/services/postgresConnection/index.js +4 -4
- package/dist/esm/services/queueProvider/local.d.ts +2 -2
- package/dist/esm/services/queueProvider/local.js +3 -4
- package/dist/esm/services/queueProvider/sqs.d.ts +2 -2
- package/dist/esm/services/queueProvider/sqs.js +3 -3
- package/dist/esm/services/searchProvider/memorySearchTheBadWay.d.ts +1 -1
- package/dist/esm/services/searchProvider/memorySearchTheBadWay.js +3 -3
- package/dist/esm/services/searchProvider/openSearch.d.ts +2 -2
- package/dist/esm/services/searchProvider/openSearch.js +4 -4
- package/dist/esm/services/searchProvider/streamIndexer.d.ts +2 -2
- package/dist/esm/services/searchProvider/streamIndexer.js +1 -1
- package/dist/esm/tsconfig.without-specs.esm.tsbuildinfo +1 -1
- package/package.json +39 -44
- package/script/build.bash +1 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { LrsGateway, UXapiStatement, XapiAgent } from '.';
|
|
1
|
+
import { LrsGateway, UXapiStatement, XapiAgent } from './index.js';
|
|
2
2
|
export declare const formatAgent: (agent: string | XapiAgent) => XapiAgent;
|
|
3
3
|
export declare const EXT_PENDING_SCORING = "https://openstax.org/xapi/extensions/pending-scoring";
|
|
4
4
|
export type AttemptEntry = {
|
|
@@ -42,7 +42,7 @@ export declare const loadStatementsForActivityAndFirstChildren: (gateway: LrsGat
|
|
|
42
42
|
attempt?: string;
|
|
43
43
|
ensureSync?: boolean;
|
|
44
44
|
user?: string;
|
|
45
|
-
}) => Promise<import(".").XapiStatement[]>;
|
|
45
|
+
}) => Promise<import("./index.js").XapiStatement[]>;
|
|
46
46
|
export declare const loadActivityAttemptInfo: (gateway: LrsGateway, activityIRI: string, options?: {
|
|
47
47
|
currentAttempt?: string;
|
|
48
48
|
parentActivityAttempt?: string;
|
|
@@ -77,14 +77,14 @@ export declare const putAttemptStatement: (gateway: LrsGateway, activity: {
|
|
|
77
77
|
}, parentActivity?: {
|
|
78
78
|
iri?: string;
|
|
79
79
|
attempt?: string;
|
|
80
|
-
}) => Promise<import(".").EagerXapiStatement>;
|
|
80
|
+
}) => Promise<import("./index.js").EagerXapiStatement>;
|
|
81
81
|
export declare const createAttemptActivityStatement: (attemptStatement: UXapiStatement, verb: UXapiStatement["verb"], result?: UXapiStatement["result"]) => Pick<UXapiStatement, "object" | "verb" | "context" | "result">;
|
|
82
|
-
export declare const putAttemptActivityStatement: (gateway: LrsGateway, attemptStatement: UXapiStatement, verb: UXapiStatement["verb"], result?: UXapiStatement["result"]) => Promise<import(".").EagerXapiStatement>;
|
|
82
|
+
export declare const putAttemptActivityStatement: (gateway: LrsGateway, attemptStatement: UXapiStatement, verb: UXapiStatement["verb"], result?: UXapiStatement["result"]) => Promise<import("./index.js").EagerXapiStatement>;
|
|
83
83
|
export declare const createCompletedStatement: (attemptStatement: UXapiStatement, result?: UXapiStatement["result"]) => Pick<UXapiStatement, "object" | "verb" | "context" | "result">;
|
|
84
|
-
export declare const putCompletedStatement: (gateway: LrsGateway, attemptStatement: UXapiStatement, result: UXapiStatement["result"], user?: string) => Promise<import(".").EagerXapiStatement>;
|
|
84
|
+
export declare const putCompletedStatement: (gateway: LrsGateway, attemptStatement: UXapiStatement, result: UXapiStatement["result"], user?: string) => Promise<import("./index.js").EagerXapiStatement>;
|
|
85
85
|
export declare const createCompletedPendingScoringStatement: (attemptStatement: UXapiStatement) => Pick<UXapiStatement, "object" | "verb" | "context" | "result">;
|
|
86
|
-
export declare const putCompletedPendingScoringStatement: (gateway: LrsGateway, attemptStatement: UXapiStatement, user?: string) => Promise<import(".").EagerXapiStatement>;
|
|
86
|
+
export declare const putCompletedPendingScoringStatement: (gateway: LrsGateway, attemptStatement: UXapiStatement, user?: string) => Promise<import("./index.js").EagerXapiStatement>;
|
|
87
87
|
export declare const createScoredStatement: (attemptStatement: UXapiStatement, result: UXapiStatement["result"], instructor?: string) => Pick<UXapiStatement, "object" | "verb" | "context" | "result">;
|
|
88
|
-
export declare const putScoredStatement: (gateway: LrsGateway, attemptStatement: UXapiStatement, result: UXapiStatement["result"], user?: string, instructor?: string) => Promise<import(".").EagerXapiStatement>;
|
|
88
|
+
export declare const putScoredStatement: (gateway: LrsGateway, attemptStatement: UXapiStatement, result: UXapiStatement["result"], user?: string, instructor?: string) => Promise<import("./index.js").EagerXapiStatement>;
|
|
89
89
|
export declare const createScoredPendingScoringStatement: (attemptStatement: UXapiStatement, result: UXapiStatement["result"]) => Pick<UXapiStatement, "object" | "verb" | "context" | "result">;
|
|
90
|
-
export declare const putScoredPendingScoringStatement: (gateway: LrsGateway, attemptStatement: UXapiStatement, result: UXapiStatement["result"], user?: string) => Promise<import(".").EagerXapiStatement>;
|
|
90
|
+
export declare const putScoredPendingScoringStatement: (gateway: LrsGateway, attemptStatement: UXapiStatement, result: UXapiStatement["result"], user?: string) => Promise<import("./index.js").EagerXapiStatement>;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { GenericFetch, Response } from '../../fetch';
|
|
2
|
-
import { METHOD } from '../../routing';
|
|
1
|
+
import { GenericFetch, Response } from '../../fetch/index.js';
|
|
2
|
+
import { METHOD } from '../../routing/index.js';
|
|
3
3
|
export interface BatchRequest {
|
|
4
4
|
id: string;
|
|
5
5
|
path: string;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.RequestBatcher = void 0;
|
|
4
|
-
const
|
|
4
|
+
const index_js_1 = require("../../routing/index.js");
|
|
5
5
|
/**
|
|
6
6
|
* Handles automatic request batching using microtask queue scheduling.
|
|
7
7
|
* Batches concurrent requests within the same event loop tick.
|
|
@@ -70,7 +70,7 @@ class RequestBatcher {
|
|
|
70
70
|
// Send batch request
|
|
71
71
|
const batchUrl = host.replace(/\/+$/, '') + this.config.batchEndpoint;
|
|
72
72
|
const batchResponse = await this.fetcher(batchUrl, {
|
|
73
|
-
method:
|
|
73
|
+
method: index_js_1.METHOD.POST,
|
|
74
74
|
headers: {
|
|
75
75
|
Authorization: authHeader,
|
|
76
76
|
'Content-Type': 'application/json',
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { ConfigProviderForConfig } from '../../config';
|
|
2
|
-
import { AuthProvider } from '../authProvider';
|
|
3
|
-
import { LrsGateway } from '.';
|
|
1
|
+
import { ConfigProviderForConfig } from '../../config/index.js';
|
|
2
|
+
import { AuthProvider } from '../authProvider/index.js';
|
|
3
|
+
import { LrsGateway } from './index.js';
|
|
4
4
|
type Config = {
|
|
5
5
|
name: string;
|
|
6
6
|
};
|
|
@@ -41,17 +41,17 @@ const fsModule = __importStar(require("fs"));
|
|
|
41
41
|
const path_1 = __importDefault(require("path"));
|
|
42
42
|
const formatISO_1 = __importDefault(require("date-fns/formatISO"));
|
|
43
43
|
const uuid_1 = require("uuid");
|
|
44
|
-
const
|
|
45
|
-
const
|
|
46
|
-
const
|
|
47
|
-
const
|
|
48
|
-
const
|
|
49
|
-
const
|
|
44
|
+
const index_js_1 = require("../../assertions/index.js");
|
|
45
|
+
const index_js_2 = require("../../config/index.js");
|
|
46
|
+
const index_js_3 = require("../../errors/index.js");
|
|
47
|
+
const index_js_4 = require("../../guards/index.js");
|
|
48
|
+
const hashValue_js_1 = require("../../misc/hashValue.js");
|
|
49
|
+
const attempt_utils_js_1 = require("./attempt-utils.js");
|
|
50
50
|
const pageSize = 5;
|
|
51
51
|
const fileSystemLrsGateway = (initializer) => (configProvider) => ({ authProvider }) => {
|
|
52
|
-
const name = (0,
|
|
52
|
+
const name = (0, index_js_2.resolveConfigValue)(configProvider[initializer.configSpace || 'fileSystem'].name);
|
|
53
53
|
const filePath = name.then((fileName) => path_1.default.join(initializer.dataDir, fileName));
|
|
54
|
-
const { readFile, writeFile } = (0,
|
|
54
|
+
const { readFile, writeFile } = (0, index_js_4.ifDefined)(initializer.fs, fsModule);
|
|
55
55
|
let data;
|
|
56
56
|
let stateData;
|
|
57
57
|
/**
|
|
@@ -59,7 +59,7 @@ const fileSystemLrsGateway = (initializer) => (configProvider) => ({ authProvide
|
|
|
59
59
|
*/
|
|
60
60
|
const makeStateKey = (activityId, agent, stateId, registration) => {
|
|
61
61
|
const agentName = typeof agent === 'string' ? agent : agent.account.name;
|
|
62
|
-
return (0,
|
|
62
|
+
return (0, hashValue_js_1.hashValue)({ activityId, agentName, stateId, registration });
|
|
63
63
|
};
|
|
64
64
|
const stateFilePath = name.then((fileName) => path_1.default.join(initializer.dataDir, `${fileName}-state`));
|
|
65
65
|
const load = filePath.then(filePath => new Promise(resolve => {
|
|
@@ -105,11 +105,11 @@ const fileSystemLrsGateway = (initializer) => (configProvider) => ({ authProvide
|
|
|
105
105
|
const putXapiStatements = async (statements, user) => {
|
|
106
106
|
const author = user
|
|
107
107
|
? { uuid: user }
|
|
108
|
-
: (0,
|
|
108
|
+
: (0, index_js_1.assertDefined)(await authProvider.getUser(), new index_js_3.UnauthorizedError);
|
|
109
109
|
const statementsWithDefaults = statements.map(statement => ({
|
|
110
110
|
...statement,
|
|
111
111
|
id: (0, uuid_1.v4)(),
|
|
112
|
-
actor: (0,
|
|
112
|
+
actor: (0, attempt_utils_js_1.formatAgent)(author.uuid),
|
|
113
113
|
timestamp: (0, formatISO_1.default)(new Date()),
|
|
114
114
|
}));
|
|
115
115
|
await load;
|
|
@@ -131,7 +131,7 @@ const fileSystemLrsGateway = (initializer) => (configProvider) => ({ authProvide
|
|
|
131
131
|
const statementDate = new Date(statement.timestamp);
|
|
132
132
|
const sinceDate = options.since ? new Date(options.since) : null;
|
|
133
133
|
const untilDate = options.until ? new Date(options.until) : null;
|
|
134
|
-
return (anyUser === true || statement.actor.account.name === (user || (0,
|
|
134
|
+
return (anyUser === true || statement.actor.account.name === (user || (0, index_js_1.assertDefined)(authUser, new index_js_3.UnauthorizedError()).uuid))
|
|
135
135
|
&& (!options.verb || statement.verb.id === options.verb)
|
|
136
136
|
&& (!options.registration || ((_a = statement.context) === null || _a === void 0 ? void 0 : _a.registration) === options.registration)
|
|
137
137
|
&& (!options.activity || (options.related_activities
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { ConfigProviderForConfig } from '../../config';
|
|
2
|
-
import { GenericFetch } from '../../fetch';
|
|
3
|
-
import { WithRequired } from '../../types';
|
|
4
|
-
import { AuthProvider } from '../authProvider';
|
|
5
|
-
import { Logger } from '../logger';
|
|
1
|
+
import { ConfigProviderForConfig } from '../../config/index.js';
|
|
2
|
+
import { GenericFetch } from '../../fetch/index.js';
|
|
3
|
+
import { WithRequired } from '../../types.js';
|
|
4
|
+
import { AuthProvider } from '../authProvider/index.js';
|
|
5
|
+
import { Logger } from '../logger/index.js';
|
|
6
6
|
type Config = {
|
|
7
7
|
lrsHost: string;
|
|
8
8
|
lrsAuthorization: string;
|
|
@@ -1,23 +1,23 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.lrsGateway = void 0;
|
|
4
|
-
const
|
|
5
|
-
const
|
|
6
|
-
const
|
|
7
|
-
const
|
|
8
|
-
const
|
|
9
|
-
const
|
|
10
|
-
const
|
|
11
|
-
const
|
|
12
|
-
const
|
|
13
|
-
const
|
|
14
|
-
const
|
|
4
|
+
const index_js_1 = require("../../assertions/index.js");
|
|
5
|
+
const index_js_2 = require("../../config/index.js");
|
|
6
|
+
const index_js_3 = require("../../errors/index.js");
|
|
7
|
+
const fetchStatusRetry_js_1 = require("../../fetch/fetchStatusRetry.js");
|
|
8
|
+
const index_js_4 = require("../../guards/index.js");
|
|
9
|
+
const index_js_5 = require("../../index.js");
|
|
10
|
+
const helpers_js_1 = require("../../misc/helpers.js");
|
|
11
|
+
const index_js_6 = require("../../routing/index.js");
|
|
12
|
+
const addStatementDefaultFields_js_1 = require("./addStatementDefaultFields.js");
|
|
13
|
+
const attempt_utils_js_1 = require("./attempt-utils.js");
|
|
14
|
+
const batching_js_1 = require("./batching.js");
|
|
15
15
|
const lrsGateway = (initializer) => (configProvider) => {
|
|
16
|
-
const config = configProvider[(0,
|
|
17
|
-
const lrsHost = (0,
|
|
18
|
-
const lrsAuthorization = (0,
|
|
16
|
+
const config = configProvider[(0, index_js_4.ifDefined)(initializer.configSpace, 'lrs')];
|
|
17
|
+
const lrsHost = (0, index_js_5.once)(() => (0, index_js_2.resolveConfigValue)(config.lrsHost));
|
|
18
|
+
const lrsAuthorization = (0, index_js_5.once)(() => (0, index_js_2.resolveConfigValue)(config.lrsAuthorization));
|
|
19
19
|
return ({ authProvider, logger }) => {
|
|
20
|
-
const fetcher = (0,
|
|
20
|
+
const fetcher = (0, fetchStatusRetry_js_1.fetchStatusRetry)(initializer.fetch, {
|
|
21
21
|
logger,
|
|
22
22
|
retries: 2,
|
|
23
23
|
wait: 1000,
|
|
@@ -25,7 +25,7 @@ const lrsGateway = (initializer) => (configProvider) => {
|
|
|
25
25
|
});
|
|
26
26
|
// Initialize request batcher if batching is enabled
|
|
27
27
|
const enableBatching = initializer.enableBatching !== false;
|
|
28
|
-
const batcher = new
|
|
28
|
+
const batcher = new batching_js_1.RequestBatcher(fetcher, {
|
|
29
29
|
batchEndpoint: '/api/batch',
|
|
30
30
|
getAuthHeader: lrsAuthorization,
|
|
31
31
|
getHost: lrsHost,
|
|
@@ -41,11 +41,11 @@ const lrsGateway = (initializer) => (configProvider) => {
|
|
|
41
41
|
const putXapiStatements = async (statements, user) => {
|
|
42
42
|
const userObj = user
|
|
43
43
|
? { uuid: user }
|
|
44
|
-
: (0,
|
|
45
|
-
const statementsWithDefaults = statements.map(statement => (0,
|
|
44
|
+
: (0, index_js_1.assertDefined)(await authProvider.getUser(), new index_js_3.UnauthorizedError);
|
|
45
|
+
const statementsWithDefaults = statements.map(statement => (0, addStatementDefaultFields_js_1.addStatementDefaultFields)(statement, userObj));
|
|
46
46
|
const response = await makeFetch({
|
|
47
47
|
path: '/data/xAPI/statements',
|
|
48
|
-
method:
|
|
48
|
+
method: index_js_6.METHOD.POST,
|
|
49
49
|
headers: {
|
|
50
50
|
Authorization: await lrsAuthorization(),
|
|
51
51
|
'Content-Type': 'application/json',
|
|
@@ -98,11 +98,11 @@ ${await response.text()}`);
|
|
|
98
98
|
queryParams.until = options.until;
|
|
99
99
|
// Add agent unless anyUser is true
|
|
100
100
|
if (anyUser !== true) {
|
|
101
|
-
queryParams.agent = JSON.stringify((0,
|
|
101
|
+
queryParams.agent = JSON.stringify((0, attempt_utils_js_1.formatAgent)(user || (0, index_js_1.assertDefined)(await authProvider.getUser(), new index_js_3.UnauthorizedError()).uuid));
|
|
102
102
|
}
|
|
103
103
|
return makeFetch({
|
|
104
104
|
path: '/data/xAPI/statements',
|
|
105
|
-
method:
|
|
105
|
+
method: index_js_6.METHOD.GET,
|
|
106
106
|
queryParams,
|
|
107
107
|
headers: {
|
|
108
108
|
Authorization: await lrsAuthorization(),
|
|
@@ -114,7 +114,7 @@ ${await response.text()}`);
|
|
|
114
114
|
const { ensureSync, ...fetchParams } = params;
|
|
115
115
|
if (ensureSync) {
|
|
116
116
|
const date = new Date();
|
|
117
|
-
return (0,
|
|
117
|
+
return (0, helpers_js_1.retryWithDelay)(async (abort) => {
|
|
118
118
|
// this function retries for the consistency, if the fetch errors just abort
|
|
119
119
|
const response = await fetchXapiStatements(fetchParams).catch(abort);
|
|
120
120
|
const consistentThrough = response.headers.get('X-Experience-API-Consistent-Through');
|
|
@@ -148,7 +148,7 @@ ${await response.text()}`);
|
|
|
148
148
|
* @returns The state document as a JSON object, or null if not found
|
|
149
149
|
*/
|
|
150
150
|
const getState = async (activityId, agent, stateId, registration) => {
|
|
151
|
-
const agentObj = (0,
|
|
151
|
+
const agentObj = (0, attempt_utils_js_1.formatAgent)(agent);
|
|
152
152
|
const queryParams = {
|
|
153
153
|
activityId,
|
|
154
154
|
agent: JSON.stringify(agentObj),
|
|
@@ -159,7 +159,7 @@ ${await response.text()}`);
|
|
|
159
159
|
}
|
|
160
160
|
const response = await makeFetch({
|
|
161
161
|
path: '/data/xAPI/activities/state',
|
|
162
|
-
method:
|
|
162
|
+
method: index_js_6.METHOD.GET,
|
|
163
163
|
queryParams,
|
|
164
164
|
headers: {
|
|
165
165
|
Authorization: await lrsAuthorization(),
|
|
@@ -186,7 +186,7 @@ ${await response.text()}`);
|
|
|
186
186
|
* @param registration - Optional registration UUID
|
|
187
187
|
*/
|
|
188
188
|
const setState = async (activityId, agent, stateId, body, registration) => {
|
|
189
|
-
const agentObj = (0,
|
|
189
|
+
const agentObj = (0, attempt_utils_js_1.formatAgent)(agent);
|
|
190
190
|
const queryParams = {
|
|
191
191
|
activityId,
|
|
192
192
|
agent: JSON.stringify(agentObj),
|
|
@@ -197,7 +197,7 @@ ${await response.text()}`);
|
|
|
197
197
|
}
|
|
198
198
|
const response = await makeFetch({
|
|
199
199
|
path: '/data/xAPI/activities/state',
|
|
200
|
-
method:
|
|
200
|
+
method: index_js_6.METHOD.PUT,
|
|
201
201
|
queryParams,
|
|
202
202
|
headers: {
|
|
203
203
|
Authorization: await lrsAuthorization(),
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { AccountsGateway, MappedUserInfo } from '../accountsGateway';
|
|
2
|
-
import { AuthProvider } from '../authProvider';
|
|
3
|
-
import { ActivityState, AttemptEntry } from './attempt-utils';
|
|
4
|
-
import { LrsGateway } from '.';
|
|
1
|
+
import { AccountsGateway, MappedUserInfo } from '../accountsGateway/index.js';
|
|
2
|
+
import { AuthProvider } from '../authProvider/index.js';
|
|
3
|
+
import { ActivityState, AttemptEntry } from './attempt-utils.js';
|
|
4
|
+
import { LrsGateway } from './index.js';
|
|
5
5
|
export interface Grade {
|
|
6
6
|
activityProgress: 'Initialized' | 'Started' | 'inProgress' | 'Submitted' | 'Completed';
|
|
7
7
|
comment?: string;
|
|
@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.getAssignmentGrades = exports.getCurrentGrade = exports.getCompletedUserInfosGradeAndProgress = exports.getScoreGrade = exports.getRegistrationAttemptInfo = void 0;
|
|
7
7
|
const partition_1 = __importDefault(require("lodash/fp/partition"));
|
|
8
|
-
const
|
|
9
|
-
const
|
|
8
|
+
const index_js_1 = require("../../index.js");
|
|
9
|
+
const attempt_utils_js_1 = require("./attempt-utils.js");
|
|
10
10
|
const getRegistrationAttemptInfo = async (lrs, registration, options) => {
|
|
11
11
|
const { currentPreference, ...xapiOptions } = options !== null && options !== void 0 ? options : {};
|
|
12
12
|
const allStatements = await lrs.getAllXapiStatements({ ...xapiOptions, registration });
|
|
@@ -21,7 +21,7 @@ const getRegistrationAttemptInfo = async (lrs, registration, options) => {
|
|
|
21
21
|
});
|
|
22
22
|
const result = {};
|
|
23
23
|
for (const [userUuid, userStatements] of Object.entries(statementsPerUser)) {
|
|
24
|
-
result[userUuid] = (0,
|
|
24
|
+
result[userUuid] = (0, attempt_utils_js_1.resolveAttemptInfo)(userStatements, { currentPreference });
|
|
25
25
|
}
|
|
26
26
|
return result;
|
|
27
27
|
};
|
|
@@ -41,8 +41,8 @@ const getScoreGrade = (entry, options) => {
|
|
|
41
41
|
? scaled * scoreMaximum
|
|
42
42
|
: 0;
|
|
43
43
|
const submission = {
|
|
44
|
-
startedAt: entry.attempt ? (0,
|
|
45
|
-
submittedAt: entry.completed ? (0,
|
|
44
|
+
startedAt: entry.attempt ? (0, attempt_utils_js_1.getStatementTimeString)(entry.attempt) : undefined,
|
|
45
|
+
submittedAt: entry.completed ? (0, attempt_utils_js_1.getStatementTimeString)(entry.completed) : undefined,
|
|
46
46
|
};
|
|
47
47
|
const pendingManual = entry.needsScoring;
|
|
48
48
|
return {
|
|
@@ -52,7 +52,7 @@ const getScoreGrade = (entry, options) => {
|
|
|
52
52
|
// if you warp your mind you can consider the portion of the assignment which is completed to be fully graded.
|
|
53
53
|
gradingProgress: pendingManual ? 'PendingManual' : 'FullyGraded',
|
|
54
54
|
scoreMaximum,
|
|
55
|
-
scoreGiven: (0,
|
|
55
|
+
scoreGiven: (0, index_js_1.roundToPrecision)(scoreGiven, -2),
|
|
56
56
|
submission,
|
|
57
57
|
};
|
|
58
58
|
};
|
|
@@ -97,7 +97,7 @@ const getCurrentGrade = async (services, registration, options) => {
|
|
|
97
97
|
return getCompletedActivityStateGradeAndProgress({
|
|
98
98
|
name,
|
|
99
99
|
scoreMaximum,
|
|
100
|
-
state: (0,
|
|
100
|
+
state: (0, attempt_utils_js_1.resolveAttemptInfo)([]),
|
|
101
101
|
userId,
|
|
102
102
|
gradePreference,
|
|
103
103
|
});
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import postgres, { Sql } from 'postgres';
|
|
2
|
-
import { ConfigProviderForConfig } from '../../config';
|
|
3
|
-
import type { Logger } from '../logger';
|
|
2
|
+
import { ConfigProviderForConfig } from '../../config/index.js';
|
|
3
|
+
import type { Logger } from '../logger/index.js';
|
|
4
4
|
type Config = {
|
|
5
5
|
host: string;
|
|
6
6
|
readHost: string;
|
|
@@ -5,31 +5,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.postgresConnection = void 0;
|
|
7
7
|
const postgres_1 = __importDefault(require("postgres"));
|
|
8
|
-
const
|
|
9
|
-
const
|
|
10
|
-
const
|
|
11
|
-
const
|
|
8
|
+
const index_js_1 = require("../../assertions/index.js");
|
|
9
|
+
const index_js_2 = require("../../config/index.js");
|
|
10
|
+
const index_js_3 = require("../../guards/index.js");
|
|
11
|
+
const helpers_js_1 = require("../../misc/helpers.js");
|
|
12
12
|
const postgresConnection = (initializer) => (configProvider) => {
|
|
13
|
-
const config = configProvider[(0,
|
|
14
|
-
const host = (0,
|
|
15
|
-
const readHost = (0,
|
|
16
|
-
const connectionOptions = (0,
|
|
17
|
-
port: (0,
|
|
18
|
-
database: await (0,
|
|
19
|
-
username: await (0,
|
|
20
|
-
password: await (0,
|
|
13
|
+
const config = configProvider[(0, index_js_3.ifDefined)(initializer.configSpace, 'local')];
|
|
14
|
+
const host = (0, helpers_js_1.once)(() => (0, index_js_2.resolveConfigValue)(config.host));
|
|
15
|
+
const readHost = (0, helpers_js_1.once)(() => (0, index_js_2.resolveConfigValue)(config.readHost));
|
|
16
|
+
const connectionOptions = (0, helpers_js_1.once)(async () => ({
|
|
17
|
+
port: (0, index_js_1.assertNotNaN)(parseInt(await (0, index_js_2.resolveConfigValue)(config.port), 10), new Error('port must be a number')),
|
|
18
|
+
database: await (0, index_js_2.resolveConfigValue)(config.database),
|
|
19
|
+
username: await (0, index_js_2.resolveConfigValue)(config.username),
|
|
20
|
+
password: await (0, index_js_2.resolveConfigValue)(config.password),
|
|
21
21
|
transform: {
|
|
22
22
|
column: { to: postgres_1.default.fromCamel, from: postgres_1.default.toCamel },
|
|
23
23
|
},
|
|
24
24
|
}));
|
|
25
25
|
const connections = [];
|
|
26
|
-
const sql = (0,
|
|
26
|
+
const sql = (0, helpers_js_1.once)(async () => {
|
|
27
27
|
const options = await connectionOptions();
|
|
28
28
|
const connection = (0, postgres_1.default)({ ...options, host: await host() });
|
|
29
29
|
connections.push(connection);
|
|
30
30
|
return connection;
|
|
31
31
|
});
|
|
32
|
-
const sqlRead = (0,
|
|
32
|
+
const sqlRead = (0, helpers_js_1.once)(async () => {
|
|
33
33
|
const options = await connectionOptions();
|
|
34
34
|
const connection = (0, postgres_1.default)({ ...options, host: await readHost() });
|
|
35
35
|
connections.push(connection);
|
|
@@ -1,18 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.localQueueProvider = void 0;
|
|
4
|
-
const
|
|
5
|
-
const
|
|
6
|
-
const
|
|
4
|
+
const index_js_1 = require("../../config/index.js");
|
|
5
|
+
const index_js_2 = require("../../guards/index.js");
|
|
6
|
+
const helpers_js_1 = require("../../misc/helpers.js");
|
|
7
7
|
const localQueueProvider = (initializer) => {
|
|
8
|
-
const init = (0,
|
|
8
|
+
const init = (0, index_js_2.ifDefined)(initializer, {});
|
|
9
9
|
return () => (configProvider) => {
|
|
10
|
-
const config = configProvider[(0,
|
|
11
|
-
const handlerModulePath = (0,
|
|
10
|
+
const config = configProvider[(0, index_js_2.ifDefined)(init.configSpace, 'local')];
|
|
11
|
+
const handlerModulePath = (0, helpers_js_1.once)(() => (0, index_js_1.resolveConfigValue)(config.handlerModulePath));
|
|
12
12
|
return {
|
|
13
13
|
enqueueMessage: async (payload, _options) => {
|
|
14
14
|
const modulePath = await handlerModulePath();
|
|
15
|
-
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
16
15
|
const module = require(modulePath);
|
|
17
16
|
await module.handler(payload);
|
|
18
17
|
},
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { SQS } from '@aws-sdk/client-sqs';
|
|
2
|
-
import { ConfigProviderForConfig } from '../../config';
|
|
3
|
-
import { QueueProvider } from '.';
|
|
2
|
+
import { ConfigProviderForConfig } from '../../config/index.js';
|
|
3
|
+
import { QueueProvider } from './index.js';
|
|
4
4
|
export type Config = {
|
|
5
5
|
queueUrl: string;
|
|
6
6
|
};
|
|
@@ -2,15 +2,15 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.sqsQueueProvider = void 0;
|
|
4
4
|
const client_sqs_1 = require("@aws-sdk/client-sqs");
|
|
5
|
-
const
|
|
6
|
-
const
|
|
7
|
-
const
|
|
5
|
+
const index_js_1 = require("../../config/index.js");
|
|
6
|
+
const index_js_2 = require("../../guards/index.js");
|
|
7
|
+
const helpers_js_1 = require("../../misc/helpers.js");
|
|
8
8
|
const sqsQueueProvider = (initializer) => {
|
|
9
|
-
const init = (0,
|
|
10
|
-
const sqs = (0,
|
|
9
|
+
const init = (0, index_js_2.ifDefined)(initializer, {});
|
|
10
|
+
const sqs = (0, helpers_js_1.once)(() => { var _a; return (_a = init.sqsClient) !== null && _a !== void 0 ? _a : new client_sqs_1.SQS({ apiVersion: '2012-11-05' }); });
|
|
11
11
|
return () => (configProvider) => {
|
|
12
|
-
const config = configProvider[(0,
|
|
13
|
-
const queueUrl = (0,
|
|
12
|
+
const config = configProvider[(0, index_js_2.ifDefined)(init.configSpace, 'deployed')];
|
|
13
|
+
const queueUrl = (0, helpers_js_1.once)(() => (0, index_js_1.resolveConfigValue)(config.queueUrl));
|
|
14
14
|
return {
|
|
15
15
|
enqueueMessage: async (payload, options) => {
|
|
16
16
|
const command = new client_sqs_1.SendMessageCommand({
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.memorySearchTheBadWay = void 0;
|
|
4
|
-
const
|
|
5
|
-
const
|
|
6
|
-
const
|
|
4
|
+
const index_js_1 = require("../../errors/index.js");
|
|
5
|
+
const index_js_2 = require("../../guards/index.js");
|
|
6
|
+
const index_js_3 = require("../../index.js");
|
|
7
7
|
const MIN_MATCH = 0.5;
|
|
8
8
|
const MAX_RESULTS = 10;
|
|
9
9
|
var MatchType;
|
|
@@ -48,7 +48,7 @@ const matchNested = (context, nested) => {
|
|
|
48
48
|
const nestedPath = nested.path;
|
|
49
49
|
const nestedDocuments = resolveField(context, nestedPath);
|
|
50
50
|
if (!Array.isArray(nestedDocuments)) {
|
|
51
|
-
throw new
|
|
51
|
+
throw new index_js_1.InvalidRequestError(`Nested path "${nestedPath}" is not an array`);
|
|
52
52
|
}
|
|
53
53
|
return nestedDocuments.some(nestedDocument => matchClause({
|
|
54
54
|
...context,
|
|
@@ -62,7 +62,7 @@ const matchExists = (context, exists) => {
|
|
|
62
62
|
};
|
|
63
63
|
const matchTerms = (context, terms) => {
|
|
64
64
|
for (const key in terms) {
|
|
65
|
-
const docValues = (0,
|
|
65
|
+
const docValues = (0, index_js_3.coerceArray)(resolveField(context, key));
|
|
66
66
|
const coerceValue = getFieldType(context, key) === 'boolean'
|
|
67
67
|
? (input) => {
|
|
68
68
|
if ([true, 'true', '1', 1].includes(input)) {
|
|
@@ -71,10 +71,10 @@ const matchTerms = (context, terms) => {
|
|
|
71
71
|
if ([false, 'false', '0', 0, ''].includes(input)) {
|
|
72
72
|
return false;
|
|
73
73
|
}
|
|
74
|
-
throw new
|
|
74
|
+
throw new index_js_1.InvalidRequestError('input is not a valid boolean filter');
|
|
75
75
|
}
|
|
76
76
|
: (x) => x;
|
|
77
|
-
const hasMatch = (0,
|
|
77
|
+
const hasMatch = (0, index_js_3.coerceArray)(terms[key]).map(coerceValue).some(v => docValues.includes(v));
|
|
78
78
|
if (!hasMatch) {
|
|
79
79
|
return false;
|
|
80
80
|
}
|
|
@@ -96,7 +96,7 @@ const matchClause = (context, clause) => {
|
|
|
96
96
|
else if ('nested' in filter)
|
|
97
97
|
return matchNested(context, filter.nested);
|
|
98
98
|
else
|
|
99
|
-
throw new
|
|
99
|
+
throw new index_js_1.InvalidRequestError('invalid filter type');
|
|
100
100
|
};
|
|
101
101
|
const matchFilters = (context, filters, matchType) => {
|
|
102
102
|
for (const field of filters) {
|
|
@@ -161,7 +161,7 @@ const memorySearchTheBadWay = () => ({ store, mappings }) => {
|
|
|
161
161
|
}
|
|
162
162
|
return { document, weight };
|
|
163
163
|
})
|
|
164
|
-
.filter(
|
|
164
|
+
.filter(index_js_2.isDefined)
|
|
165
165
|
.filter(r => !options.query || r.weight >= MIN_MATCH);
|
|
166
166
|
results.sort((a, b) => {
|
|
167
167
|
for (const sort of (options.sort || [])) {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ConfigProviderForConfig } from '../../config';
|
|
2
|
-
import { FieldMappings, IndexOptions, SearchOptions } from '.';
|
|
1
|
+
import { ConfigProviderForConfig } from '../../config/index.js';
|
|
2
|
+
import { FieldMappings, IndexOptions, SearchOptions } from './index.js';
|
|
3
3
|
export type Config = {
|
|
4
4
|
node: string;
|
|
5
5
|
region: string;
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.openSearchService = void 0;
|
|
4
|
-
|
|
4
|
+
/* spell-checker: ignore opensearch Sigv */
|
|
5
5
|
const credential_provider_node_1 = require("@aws-sdk/credential-provider-node");
|
|
6
6
|
const opensearch_1 = require("@opensearch-project/opensearch");
|
|
7
7
|
const aws_1 = require("@opensearch-project/opensearch/aws");
|
|
8
|
-
const
|
|
9
|
-
const
|
|
10
|
-
const
|
|
8
|
+
const index_js_1 = require("../../config/index.js");
|
|
9
|
+
const index_js_2 = require("../../guards/index.js");
|
|
10
|
+
const helpers_js_1 = require("../../misc/helpers.js");
|
|
11
11
|
const mapFilter = (filter) => {
|
|
12
12
|
if ('key' in filter && 'value' in filter) {
|
|
13
13
|
const { key } = filter;
|
|
@@ -19,17 +19,17 @@ const mapFilter = (filter) => {
|
|
|
19
19
|
}
|
|
20
20
|
};
|
|
21
21
|
const openSearchService = (initializer = {}) => (configProvider) => {
|
|
22
|
-
const config = configProvider[(0,
|
|
23
|
-
const client = (0,
|
|
22
|
+
const config = configProvider[(0, index_js_2.ifDefined)(initializer.configSpace, 'deployed')];
|
|
23
|
+
const client = (0, helpers_js_1.once)(async () => new opensearch_1.Client({
|
|
24
24
|
...(0, aws_1.AwsSigv4Signer)({
|
|
25
25
|
getCredentials: () => (0, credential_provider_node_1.defaultProvider)()(),
|
|
26
|
-
region: await (0,
|
|
26
|
+
region: await (0, index_js_1.resolveConfigValue)(config.region),
|
|
27
27
|
service: 'es',
|
|
28
28
|
}),
|
|
29
29
|
maxRetries: 4, // default is 3
|
|
30
30
|
requestTimeout: 5000, // default is 30000
|
|
31
31
|
pingTimeout: 2000, // default is 30000
|
|
32
|
-
node: await (0,
|
|
32
|
+
node: await (0, index_js_1.resolveConfigValue)(config.node),
|
|
33
33
|
}));
|
|
34
34
|
return (indexConfig) => {
|
|
35
35
|
const pageSize = indexConfig.pageSize || 10;
|
|
@@ -137,7 +137,7 @@ const openSearchService = (initializer = {}) => (configProvider) => {
|
|
|
137
137
|
throw new Error(`Unexpected status code: ${response.statusCode} from OpenSearch`);
|
|
138
138
|
}
|
|
139
139
|
const hits = response.body.hits;
|
|
140
|
-
const items = hits.hits.map((hit) => hit._source).filter(
|
|
140
|
+
const items = hits.hits.map((hit) => hit._source).filter(index_js_2.isDefined);
|
|
141
141
|
const currentPage = options.page || 1;
|
|
142
142
|
const { total } = hits;
|
|
143
143
|
const totalItems = typeof total === 'number' ? total : total.value;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { DynamoDBRecord } from 'aws-lambda';
|
|
2
|
-
import { Logger } from '../logger';
|
|
3
|
-
import { IndexOptions } from '../searchProvider';
|
|
2
|
+
import { Logger } from '../logger/index.js';
|
|
3
|
+
import { IndexOptions } from '../searchProvider/index.js';
|
|
4
4
|
export interface SearchProvider<T> {
|
|
5
5
|
index: (options: IndexOptions<T>) => Promise<void>;
|
|
6
6
|
bulkIndex: (items: IndexOptions<T>[]) => Promise<void>;
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateSearchIndexFromStream = void 0;
|
|
4
4
|
const util_dynamodb_1 = require("@aws-sdk/util-dynamodb");
|
|
5
|
-
const
|
|
5
|
+
const index_js_1 = require("../logger/index.js");
|
|
6
6
|
const VALID_EVENTS = new Set(['INSERT', 'MODIFY']);
|
|
7
7
|
/**
|
|
8
8
|
* Function to update search index from DynamoDB Stream records.
|
|
@@ -13,11 +13,11 @@ const updateSearchIndexFromStream = async (records, config) => {
|
|
|
13
13
|
const itemsToIndex = [];
|
|
14
14
|
for (const record of records) {
|
|
15
15
|
if (!record.eventName || !VALID_EVENTS.has(record.eventName)) {
|
|
16
|
-
logger.log(`Skipping ${record.eventName || 'undefined'} event`,
|
|
16
|
+
logger.log(`Skipping ${record.eventName || 'undefined'} event`, index_js_1.Level.Error);
|
|
17
17
|
continue;
|
|
18
18
|
}
|
|
19
19
|
if (!((_a = record.dynamodb) === null || _a === void 0 ? void 0 : _a.NewImage)) {
|
|
20
|
-
logger.log('Missing NewImage in record, skipping',
|
|
20
|
+
logger.log('Missing NewImage in record, skipping', index_js_1.Level.Error);
|
|
21
21
|
continue;
|
|
22
22
|
}
|
|
23
23
|
const document = (0, util_dynamodb_1.unmarshall)(record.dynamodb.NewImage);
|