@openstax/ts-utils 1.43.0 → 1.43.2
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 +4 -4
- package/dist/cjs/index.js +4 -4
- 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 +13 -13
- 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 +11 -11
- package/dist/cjs/services/fileServer/s3FileServer.d.ts +2 -2
- package/dist/cjs/services/fileServer/s3FileServer.js +13 -13
- package/dist/cjs/services/httpMessageVerifier/index.d.ts +1 -1
- package/dist/cjs/services/httpMessageVerifier/index.js +19 -19
- 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/attempt-utils.d.ts +7 -7
- 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 +10 -10
- package/dist/cjs/services/lrsGateway/index.d.ts +5 -5
- package/dist/cjs/services/lrsGateway/index.js +23 -23
- package/dist/cjs/services/lrsGateway/xapiUtils.d.ts +4 -4
- package/dist/cjs/services/lrsGateway/xapiUtils.js +8 -8
- 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 -6
- 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 +8 -8
- 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 +4 -4
- package/dist/esm/index.js +4 -4
- 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 +5 -5
- 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 +4 -4
- package/dist/esm/services/fileServer/s3FileServer.d.ts +2 -2
- package/dist/esm/services/fileServer/s3FileServer.js +4 -4
- package/dist/esm/services/httpMessageVerifier/index.d.ts +1 -1
- package/dist/esm/services/httpMessageVerifier/index.js +5 -5
- 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/attempt-utils.d.ts +7 -7
- 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 +5 -5
- package/dist/esm/services/lrsGateway/index.d.ts +5 -5
- package/dist/esm/services/lrsGateway/index.js +10 -10
- 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 -3
- 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 +3 -3
- 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 +1 -1
- package/script/bin/.init-params-script.bash.swp +0 -0
|
@@ -1,22 +1,22 @@
|
|
|
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
|
|
4
|
+
const index_js_1 = require("../../index.js");
|
|
5
|
+
const index_js_2 = require("../../assertions/index.js");
|
|
6
|
+
const index_js_3 = require("../../config/index.js");
|
|
7
|
+
const index_js_4 = require("../../errors/index.js");
|
|
8
|
+
const fetchStatusRetry_js_1 = require("../../fetch/fetchStatusRetry.js");
|
|
9
|
+
const index_js_5 = require("../../guards/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 batching_js_1 = require("./batching.js");
|
|
14
14
|
const lrsGateway = (initializer) => (configProvider) => {
|
|
15
|
-
const config = configProvider[(0,
|
|
16
|
-
const lrsHost = (0,
|
|
17
|
-
const lrsAuthorization = (0,
|
|
15
|
+
const config = configProvider[(0, index_js_5.ifDefined)(initializer.configSpace, 'lrs')];
|
|
16
|
+
const lrsHost = (0, index_js_1.once)(() => (0, index_js_3.resolveConfigValue)(config.lrsHost));
|
|
17
|
+
const lrsAuthorization = (0, index_js_1.once)(() => (0, index_js_3.resolveConfigValue)(config.lrsAuthorization));
|
|
18
18
|
return ({ authProvider, logger }) => {
|
|
19
|
-
const fetcher = (0,
|
|
19
|
+
const fetcher = (0, fetchStatusRetry_js_1.fetchStatusRetry)(initializer.fetch, {
|
|
20
20
|
logger,
|
|
21
21
|
retries: 2,
|
|
22
22
|
wait: 1000,
|
|
@@ -24,7 +24,7 @@ const lrsGateway = (initializer) => (configProvider) => {
|
|
|
24
24
|
});
|
|
25
25
|
// Initialize request batcher if batching is enabled
|
|
26
26
|
const enableBatching = initializer.enableBatching !== false;
|
|
27
|
-
const batcher = new
|
|
27
|
+
const batcher = new batching_js_1.RequestBatcher(fetcher, {
|
|
28
28
|
batchEndpoint: '/api/batch',
|
|
29
29
|
getAuthHeader: lrsAuthorization,
|
|
30
30
|
getHost: lrsHost,
|
|
@@ -56,11 +56,11 @@ const lrsGateway = (initializer) => (configProvider) => {
|
|
|
56
56
|
const putXapiStatements = async (statements, user) => {
|
|
57
57
|
const userObj = user
|
|
58
58
|
? { uuid: user }
|
|
59
|
-
: (0,
|
|
60
|
-
const statementsWithDefaults = statements.map(statement => (0,
|
|
59
|
+
: (0, index_js_2.assertDefined)(await authProvider.getUser(), new index_js_4.UnauthorizedError);
|
|
60
|
+
const statementsWithDefaults = statements.map(statement => (0, addStatementDefaultFields_js_1.addStatementDefaultFields)(statement, userObj));
|
|
61
61
|
const response = await makeFetch({
|
|
62
62
|
path: '/data/xAPI/statements',
|
|
63
|
-
method:
|
|
63
|
+
method: index_js_6.METHOD.POST,
|
|
64
64
|
headers: {
|
|
65
65
|
Authorization: await lrsAuthorization(),
|
|
66
66
|
'Content-Type': 'application/json',
|
|
@@ -116,14 +116,14 @@ ${await response.text()}`);
|
|
|
116
116
|
queryParams.agent = JSON.stringify({
|
|
117
117
|
account: {
|
|
118
118
|
homePage: 'https://openstax.org',
|
|
119
|
-
name: user || (0,
|
|
119
|
+
name: user || (0, index_js_2.assertDefined)(await authProvider.getUser(), new index_js_4.UnauthorizedError()).uuid,
|
|
120
120
|
},
|
|
121
121
|
objectType: 'Agent',
|
|
122
122
|
});
|
|
123
123
|
}
|
|
124
124
|
return makeFetch({
|
|
125
125
|
path: '/data/xAPI/statements',
|
|
126
|
-
method:
|
|
126
|
+
method: index_js_6.METHOD.GET,
|
|
127
127
|
queryParams,
|
|
128
128
|
headers: {
|
|
129
129
|
Authorization: await lrsAuthorization(),
|
|
@@ -135,7 +135,7 @@ ${await response.text()}`);
|
|
|
135
135
|
const { ensureSync, ...fetchParams } = params;
|
|
136
136
|
if (ensureSync) {
|
|
137
137
|
const date = new Date();
|
|
138
|
-
return (0,
|
|
138
|
+
return (0, helpers_js_1.retryWithDelay)(async (abort) => {
|
|
139
139
|
// this function retries for the consistency, if the fetch errors just abort
|
|
140
140
|
const response = await fetchXapiStatements(fetchParams).catch(abort);
|
|
141
141
|
const consistentThrough = response.headers.get('X-Experience-API-Consistent-Through');
|
|
@@ -180,7 +180,7 @@ ${await response.text()}`);
|
|
|
180
180
|
}
|
|
181
181
|
const response = await makeFetch({
|
|
182
182
|
path: '/data/xAPI/activities/state',
|
|
183
|
-
method:
|
|
183
|
+
method: index_js_6.METHOD.GET,
|
|
184
184
|
queryParams,
|
|
185
185
|
headers: {
|
|
186
186
|
Authorization: await lrsAuthorization(),
|
|
@@ -218,7 +218,7 @@ ${await response.text()}`);
|
|
|
218
218
|
}
|
|
219
219
|
const response = await makeFetch({
|
|
220
220
|
path: '/data/xAPI/activities/state',
|
|
221
|
-
method:
|
|
221
|
+
method: index_js_6.METHOD.PUT,
|
|
222
222
|
queryParams,
|
|
223
223
|
headers: {
|
|
224
224
|
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,11 +41,11 @@ 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.scored === undefined
|
|
48
|
-
&& ((_e = (_d = (_c = entry.completed) === null || _c === void 0 ? void 0 : _c.result) === null || _d === void 0 ? void 0 : _d.extensions) === null || _e === void 0 ? void 0 : _e[
|
|
48
|
+
&& ((_e = (_d = (_c = entry.completed) === null || _c === void 0 ? void 0 : _c.result) === null || _d === void 0 ? void 0 : _d.extensions) === null || _e === void 0 ? void 0 : _e[attempt_utils_js_1.EXT_PENDING_SCORING]) === 'true';
|
|
49
49
|
return {
|
|
50
50
|
userId,
|
|
51
51
|
activityProgress: entry.completed ? 'Completed' : 'Started',
|
|
@@ -53,7 +53,7 @@ const getScoreGrade = (entry, options) => {
|
|
|
53
53
|
// if you warp your mind you can consider the portion of the assignment which is completed to be fully graded.
|
|
54
54
|
gradingProgress: pendingManual ? 'PendingManual' : 'FullyGraded',
|
|
55
55
|
scoreMaximum,
|
|
56
|
-
scoreGiven: (0,
|
|
56
|
+
scoreGiven: (0, index_js_1.roundToPrecision)(scoreGiven, -2),
|
|
57
57
|
submission,
|
|
58
58
|
};
|
|
59
59
|
};
|
|
@@ -98,7 +98,7 @@ const getCurrentGrade = async (services, registration, options) => {
|
|
|
98
98
|
return getCompletedActivityStateGradeAndProgress({
|
|
99
99
|
name,
|
|
100
100
|
scoreMaximum,
|
|
101
|
-
state: (0,
|
|
101
|
+
state: (0, attempt_utils_js_1.resolveAttemptInfo)([]),
|
|
102
102
|
userId,
|
|
103
103
|
gradePreference,
|
|
104
104
|
});
|
|
@@ -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,14 +1,14 @@
|
|
|
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();
|
|
@@ -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("../../index.js");
|
|
5
|
+
const index_js_2 = require("../../errors/index.js");
|
|
6
|
+
const index_js_3 = require("../../guards/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_2.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_1.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_2.InvalidRequestError('input is not a valid boolean filter');
|
|
75
75
|
}
|
|
76
76
|
: (x) => x;
|
|
77
|
-
const hasMatch = (0,
|
|
77
|
+
const hasMatch = (0, index_js_1.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_2.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_3.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;
|
|
@@ -5,9 +5,9 @@ exports.openSearchService = void 0;
|
|
|
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);
|