@microsoft/agents-hosting 1.8.1 → 1.9.0-beta.18.g6b8111bba5
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/README.md +179 -9
- package/dist/package.json +4 -4
- package/dist/src/app/agentApplication.d.ts +3 -3
- package/dist/src/app/agentApplication.js +6 -16
- package/dist/src/app/agentApplication.js.map +1 -1
- package/dist/src/app/agentApplicationOptions.d.ts +6 -0
- package/dist/src/app/auth/authorization.d.ts +54 -0
- package/dist/src/app/auth/authorization.js +63 -2
- package/dist/src/app/auth/authorization.js.map +1 -1
- package/dist/src/app/auth/authorizationManager.d.ts +0 -8
- package/dist/src/app/auth/authorizationManager.js +104 -178
- package/dist/src/app/auth/authorizationManager.js.map +1 -1
- package/dist/src/auth/authConfiguration.d.ts +10 -3
- package/dist/src/auth/authConfiguration.js +292 -259
- package/dist/src/auth/authConfiguration.js.map +1 -1
- package/dist/src/auth/delegatedTokenCredential.d.ts +29 -0
- package/dist/src/auth/delegatedTokenCredential.js +49 -0
- package/dist/src/auth/delegatedTokenCredential.js.map +1 -0
- package/dist/src/auth/msal/msalTokenCredential.js +1 -1
- package/dist/src/auth/msal/msalTokenCredential.js.map +1 -1
- package/dist/src/auth/settings.d.ts +8 -70
- package/dist/src/auth/settings.js +5 -67
- package/dist/src/auth/settings.js.map +1 -1
- package/dist/src/cloudAdapter.d.ts +5 -0
- package/dist/src/cloudAdapter.js +13 -103
- package/dist/src/cloudAdapter.js.map +1 -1
- package/dist/src/configuration/botFrameworkEnvironmentCompatibility.d.ts +23 -0
- package/dist/src/configuration/botFrameworkEnvironmentCompatibility.js +183 -0
- package/dist/src/configuration/botFrameworkEnvironmentCompatibility.js.map +1 -0
- package/dist/src/configuration/configuration.d.ts +83 -0
- package/dist/src/configuration/configuration.js +836 -0
- package/dist/src/configuration/configuration.js.map +1 -0
- package/dist/src/configuration/configurationSource.d.ts +57 -0
- package/dist/src/configuration/configurationSource.js +7 -0
- package/dist/src/configuration/configurationSource.js.map +1 -0
- package/dist/src/configuration/environmentConfiguration.d.ts +14 -0
- package/dist/src/configuration/environmentConfiguration.js +271 -0
- package/dist/src/configuration/environmentConfiguration.js.map +1 -0
- package/dist/src/configuration/index.d.ts +7 -0
- package/dist/src/configuration/index.js +14 -0
- package/dist/src/configuration/index.js.map +1 -0
- package/dist/src/configuration/jsonFileConfigurationSource.d.ts +15 -0
- package/dist/src/configuration/jsonFileConfigurationSource.js +58 -0
- package/dist/src/configuration/jsonFileConfigurationSource.js.map +1 -0
- package/dist/src/createCloudAdapter.d.ts +30 -5
- package/dist/src/createCloudAdapter.js +17 -10
- package/dist/src/createCloudAdapter.js.map +1 -1
- package/dist/src/errorHelper.js +90 -2
- package/dist/src/errorHelper.js.map +1 -1
- package/dist/src/index.d.ts +1 -0
- package/dist/src/index.js +1 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/outboundHostValidator.d.ts +4 -1
- package/dist/src/outboundHostValidator.js +25 -48
- package/dist/src/outboundHostValidator.js.map +1 -1
- package/dist/src/storage/fileStorage.d.ts +5 -2
- package/dist/src/storage/fileStorage.js +41 -3
- package/dist/src/storage/fileStorage.js.map +1 -1
- package/dist/src/storage/index.d.ts +1 -0
- package/dist/src/storage/index.js +1 -0
- package/dist/src/storage/index.js.map +1 -1
- package/dist/src/storage/memoryStorage.d.ts +4 -2
- package/dist/src/storage/memoryStorage.js +32 -6
- package/dist/src/storage/memoryStorage.js.map +1 -1
- package/dist/src/storage/storage.d.ts +14 -1
- package/dist/src/storage/storageExpiry.d.ts +6 -0
- package/dist/src/storage/storageExpiry.js +20 -0
- package/dist/src/storage/storageExpiry.js.map +1 -0
- package/dist/src/utils/env.d.ts +43 -0
- package/dist/src/utils/env.js +42 -6
- package/dist/src/utils/env.js.map +1 -1
- package/dist/src/utils.d.ts +1 -0
- package/dist/src/utils.js +10 -1
- package/dist/src/utils.js.map +1 -1
- package/package.json +4 -4
- package/src/app/agentApplication.ts +11 -14
- package/src/app/agentApplicationOptions.ts +7 -0
- package/src/app/auth/authorization.ts +67 -2
- package/src/app/auth/authorizationManager.ts +126 -204
- package/src/auth/authConfiguration.ts +415 -260
- package/src/auth/delegatedTokenCredential.ts +49 -0
- package/src/auth/msal/msalTokenCredential.ts +1 -1
- package/src/auth/settings.ts +5 -82
- package/src/cloudAdapter.ts +38 -113
- package/src/configuration/botFrameworkEnvironmentCompatibility.ts +245 -0
- package/src/configuration/configuration.ts +1076 -0
- package/src/configuration/configurationSource.ts +76 -0
- package/src/configuration/environmentConfiguration.ts +377 -0
- package/src/configuration/index.ts +19 -0
- package/src/configuration/jsonFileConfigurationSource.ts +74 -0
- package/src/createCloudAdapter.ts +52 -9
- package/src/errorHelper.ts +110 -2
- package/src/index.ts +1 -0
- package/src/outboundHostValidator.ts +37 -44
- package/src/storage/fileStorage.ts +43 -5
- package/src/storage/index.ts +1 -0
- package/src/storage/memoryStorage.ts +34 -8
- package/src/storage/storage.ts +15 -1
- package/src/storage/storageExpiry.ts +21 -0
- package/src/utils/env.ts +63 -0
- package/src/utils.ts +10 -0
|
@@ -6,16 +6,19 @@
|
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
7
|
exports.createCloudAdapter = void 0;
|
|
8
8
|
const activityHandler_1 = require("./activityHandler");
|
|
9
|
+
const agentApplication_1 = require("./app/agentApplication");
|
|
9
10
|
const cloudAdapter_1 = require("./cloudAdapter");
|
|
10
11
|
/**
|
|
11
12
|
* Creates a CloudAdapter for the given agent.
|
|
12
13
|
*
|
|
13
|
-
*
|
|
14
|
-
*
|
|
14
|
+
* An `AgentApplication`'s pre-configured adapter is always reused when available, preserving
|
|
15
|
+
* its identity, middleware, connection manager, and runtime policy. The auth configuration is
|
|
16
|
+
* used only when a new adapter must be created.
|
|
15
17
|
*
|
|
16
18
|
* @param agent - The AgentApplication or ActivityHandler instance.
|
|
17
|
-
* @param authConfig - Optional auth configuration used when creating a new
|
|
18
|
-
*
|
|
19
|
+
* @param authConfig - Optional auth configuration used when creating a new adapter. If the
|
|
20
|
+
* application already owns an adapter, this value does not replace or reconfigure it.
|
|
21
|
+
* @param options - Optional additional settings, such as a host-scoped {@link ConfigurationContext}.
|
|
19
22
|
* @returns An object containing the CloudAdapter and optional header propagation configuration.
|
|
20
23
|
*
|
|
21
24
|
* @example
|
|
@@ -29,16 +32,20 @@ const cloudAdapter_1 = require("./cloudAdapter");
|
|
|
29
32
|
* adapter.process(req, res, (context) => app.run(context), headerPropagation);
|
|
30
33
|
* ```
|
|
31
34
|
*/
|
|
32
|
-
const createCloudAdapter = (agent, authConfig) => {
|
|
35
|
+
const createCloudAdapter = (agent, authConfig, options) => {
|
|
33
36
|
var _a;
|
|
34
|
-
var _b;
|
|
37
|
+
var _b, _c;
|
|
38
|
+
const configurationContext = (_b = options === null || options === void 0 ? void 0 : options.configurationContext) !== null && _b !== void 0 ? _b : (agent instanceof agentApplication_1.AgentApplication ? agent.options.configurationContext : undefined);
|
|
35
39
|
if (agent instanceof activityHandler_1.ActivityHandler) {
|
|
36
|
-
return {
|
|
40
|
+
return {
|
|
41
|
+
adapter: new cloudAdapter_1.CloudAdapter(authConfig, undefined, undefined, { configurationContext }),
|
|
42
|
+
headerPropagation: undefined
|
|
43
|
+
};
|
|
37
44
|
}
|
|
38
|
-
//
|
|
39
|
-
//
|
|
45
|
+
// Preserve the application-owned processing adapter regardless of host authorization settings.
|
|
46
|
+
// Hosting integrations perform their independent inbound authorization stage before processing.
|
|
40
47
|
const headerPropagation = (_a = agent.options) === null || _a === void 0 ? void 0 : _a.headerPropagation;
|
|
41
|
-
const adapter = (
|
|
48
|
+
const adapter = (_c = agent.adapter) !== null && _c !== void 0 ? _c : new cloudAdapter_1.CloudAdapter(authConfig, undefined, undefined, { configurationContext });
|
|
42
49
|
return { adapter, headerPropagation };
|
|
43
50
|
};
|
|
44
51
|
exports.createCloudAdapter = createCloudAdapter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createCloudAdapter.js","sourceRoot":"","sources":["../../src/createCloudAdapter.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,uDAAmD;
|
|
1
|
+
{"version":3,"file":"createCloudAdapter.js","sourceRoot":"","sources":["../../src/createCloudAdapter.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,uDAAmD;AACnD,6DAAyD;AAEzD,iDAA6C;AAoC7C;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACI,MAAM,kBAAkB,GAAG,CAChC,KAA8D,EAC9D,UAA8B,EAC9B,OAAmC,EACf,EAAE;;;IACtB,MAAM,oBAAoB,SAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,oBAAoB,mCACxD,CAAC,KAAK,YAAY,mCAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;IAEtF,IAAI,KAAK,YAAY,iCAAe,EAAE,CAAC;QACrC,OAAO;YACL,OAAO,EAAE,IAAI,2BAAY,CACvB,UAAU,EACV,SAAS,EACT,SAAS,EACT,EAAE,oBAAoB,EAAE,CACzB;YACD,iBAAiB,EAAE,SAAS;SAC7B,CAAA;IACH,CAAC;IAED,+FAA+F;IAC/F,gGAAgG;IAChG,MAAM,iBAAiB,GAAG,MAAA,KAAK,CAAC,OAAO,0CAAE,iBAAiB,CAAA;IAC1D,MAAM,OAAO,SAAG,KAAK,CAAC,OAAO,mCAAI,IAAI,2BAAY,CAC/C,UAAU,EACV,SAAS,EACT,SAAS,EACT,EAAE,oBAAoB,EAAE,CACzB,CAAA;IACD,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAA;AACvC,CAAC,CAAA;AA9BY,QAAA,kBAAkB,GAAlB,kBAAkB,CA8B9B"}
|
package/dist/src/errorHelper.js
CHANGED
|
@@ -372,6 +372,13 @@ exports.Errors = {
|
|
|
372
372
|
code: -120391,
|
|
373
373
|
description: 'MSAL HTTP request failed: {message}'
|
|
374
374
|
},
|
|
375
|
+
/**
|
|
376
|
+
* Error thrown when a delegated token credential's provider returns a response without a usable token.
|
|
377
|
+
*/
|
|
378
|
+
NullTokenResponse: {
|
|
379
|
+
code: -120393,
|
|
380
|
+
description: 'The token response provider returned a null response or a response without a token.'
|
|
381
|
+
},
|
|
375
382
|
/**
|
|
376
383
|
* Error thrown when an MSAL HTTP response body cannot be parsed as JSON.
|
|
377
384
|
*/
|
|
@@ -379,6 +386,13 @@ exports.Errors = {
|
|
|
379
386
|
code: -120392,
|
|
380
387
|
description: 'MSAL returned an unparsable response body'
|
|
381
388
|
},
|
|
389
|
+
/**
|
|
390
|
+
* Error thrown when a security-sensitive boolean configuration value is invalid.
|
|
391
|
+
*/
|
|
392
|
+
InvalidBooleanConfigurationValue: {
|
|
393
|
+
code: -120394,
|
|
394
|
+
description: 'Configuration source "{sourceName}" returned an invalid boolean for "{path}". Expected one of true/false/1/0.'
|
|
395
|
+
},
|
|
382
396
|
FailedToAcquireTokenUsingCertificate: {
|
|
383
397
|
code: -120395,
|
|
384
398
|
description: 'Failed to acquire token using certificate'
|
|
@@ -491,11 +505,11 @@ exports.Errors = {
|
|
|
491
505
|
description: 'At least one scope must be specified for the Agentic authorization handler.'
|
|
492
506
|
},
|
|
493
507
|
/**
|
|
494
|
-
* Error thrown when authorization
|
|
508
|
+
* Error thrown when no authorization handlers were resolved.
|
|
495
509
|
*/
|
|
496
510
|
AuthorizationOptionNotAvailable: {
|
|
497
511
|
code: -120530,
|
|
498
|
-
description: 'The Application.authorization property is unavailable because no authorization
|
|
512
|
+
description: 'The Application.authorization property is unavailable because no authorization handlers were resolved.'
|
|
499
513
|
},
|
|
500
514
|
/**
|
|
501
515
|
* Error thrown when auth handler with specified ID cannot be found.
|
|
@@ -675,6 +689,13 @@ exports.Errors = {
|
|
|
675
689
|
code: -120702,
|
|
676
690
|
description: 'Changes are required when writing.'
|
|
677
691
|
},
|
|
692
|
+
/**
|
|
693
|
+
* Error thrown when a storage TTL value is invalid.
|
|
694
|
+
*/
|
|
695
|
+
InvalidStorageTtl: {
|
|
696
|
+
code: -120703,
|
|
697
|
+
description: 'StorageWriteOptions.ttl must be a finite number greater than zero.'
|
|
698
|
+
},
|
|
678
699
|
/**
|
|
679
700
|
* Error thrown when storage option is not available in app options.
|
|
680
701
|
*/
|
|
@@ -896,6 +917,73 @@ exports.Errors = {
|
|
|
896
917
|
description: 'The Entra Agent ID sidecar returned an unsupported authorization scheme `{scheme}`. Only the Bearer scheme is supported'
|
|
897
918
|
},
|
|
898
919
|
// ============================================================================
|
|
920
|
+
// Configuration Source Errors (-120812 to -120827)
|
|
921
|
+
// ============================================================================
|
|
922
|
+
ConfigurationAlreadyConsumed: {
|
|
923
|
+
code: -120812,
|
|
924
|
+
description: 'Configuration sources must be preloaded before the first configuration consumer is created.'
|
|
925
|
+
},
|
|
926
|
+
ConfigurationSourceNameRequired: {
|
|
927
|
+
code: -120813,
|
|
928
|
+
description: 'Configuration source name must be a non-empty string.'
|
|
929
|
+
},
|
|
930
|
+
DuplicateConfigurationSource: {
|
|
931
|
+
code: -120814,
|
|
932
|
+
description: 'Configuration source name `{sourceName}` is registered more than once.'
|
|
933
|
+
},
|
|
934
|
+
ConfigurationSourceLoadFailed: {
|
|
935
|
+
code: -120815,
|
|
936
|
+
description: 'Configuration source `{sourceName}` failed to load.'
|
|
937
|
+
},
|
|
938
|
+
InvalidConfigurationPath: {
|
|
939
|
+
code: -120816,
|
|
940
|
+
description: 'Configuration source `{sourceName}` returned unsupported canonical path `{path}`.'
|
|
941
|
+
},
|
|
942
|
+
InvalidConfigurationValue: {
|
|
943
|
+
code: -120817,
|
|
944
|
+
description: 'Configuration source `{sourceName}` returned an invalid value for canonical path `{path}`.'
|
|
945
|
+
},
|
|
946
|
+
ConfigurationPreloadInProgress: {
|
|
947
|
+
code: -120818,
|
|
948
|
+
description: 'Another configuration preload is already in progress.'
|
|
949
|
+
},
|
|
950
|
+
InvalidConnectionMapEntry: {
|
|
951
|
+
code: -120819,
|
|
952
|
+
description: 'Connection map entry at index {index} must define both serviceUrl and connection.'
|
|
953
|
+
},
|
|
954
|
+
ConfigurationAlreadyPreloaded: {
|
|
955
|
+
code: -120820,
|
|
956
|
+
description: 'Configuration sources have already been preloaded for this process.'
|
|
957
|
+
},
|
|
958
|
+
UnsupportedRuntimeConfigurationField: {
|
|
959
|
+
code: -120821,
|
|
960
|
+
description: 'Configuration source `{sourceName}` returned field `{path}`, which is not supported by the JavaScript SDK.'
|
|
961
|
+
},
|
|
962
|
+
InvalidConfigurationSourceResult: {
|
|
963
|
+
code: -120822,
|
|
964
|
+
description: 'Configuration source `{sourceName}` returned an invalid source result.'
|
|
965
|
+
},
|
|
966
|
+
InvalidConfigurationContext: {
|
|
967
|
+
code: -120823,
|
|
968
|
+
description: 'The configuration context is invalid. Create contexts with createConfigurationContext().'
|
|
969
|
+
},
|
|
970
|
+
InvalidConfigurationSourceMode: {
|
|
971
|
+
code: -120824,
|
|
972
|
+
description: 'Configuration source `{sourceName}` uses unsupported mode `{mode}`. Use `fallback`, `overrideEnvironment`, or `enforce`.'
|
|
973
|
+
},
|
|
974
|
+
JsonConfigurationFileReadFailed: {
|
|
975
|
+
code: -120825,
|
|
976
|
+
description: 'JSON configuration file `{filePath}` could not be read.'
|
|
977
|
+
},
|
|
978
|
+
InvalidJsonConfigurationFile: {
|
|
979
|
+
code: -120826,
|
|
980
|
+
description: 'JSON configuration file `{filePath}` does not contain valid JSON.'
|
|
981
|
+
},
|
|
982
|
+
JsonConfigurationDocumentRequired: {
|
|
983
|
+
code: -120827,
|
|
984
|
+
description: 'JSON configuration file `{filePath}` must contain an object at the document root.'
|
|
985
|
+
},
|
|
986
|
+
// ============================================================================
|
|
899
987
|
// Application Configuration Errors (-120850 to -120902)
|
|
900
988
|
// ============================================================================
|
|
901
989
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errorHelper.js","sourceRoot":"","sources":["../../src/errorHelper.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"errorHelper.js","sourceRoot":"","sources":["../../src/errorHelper.ts"],"names":[],"mappings":"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"}
|
package/dist/src/index.d.ts
CHANGED
|
@@ -6,6 +6,7 @@ export * from './auth/';
|
|
|
6
6
|
export { authorizeJWT, buildJwksUri, clearJwksClients } from './auth/jwt-middleware';
|
|
7
7
|
export * from './app';
|
|
8
8
|
export * from './cards';
|
|
9
|
+
export * from './configuration';
|
|
9
10
|
export * from './connector-client';
|
|
10
11
|
export { Errors as HostingErrors } from './errorHelper';
|
|
11
12
|
export * from './invoke';
|
package/dist/src/index.js
CHANGED
|
@@ -26,6 +26,7 @@ Object.defineProperty(exports, "buildJwksUri", { enumerable: true, get: function
|
|
|
26
26
|
Object.defineProperty(exports, "clearJwksClients", { enumerable: true, get: function () { return jwt_middleware_1.clearJwksClients; } });
|
|
27
27
|
__exportStar(require("./app"), exports);
|
|
28
28
|
__exportStar(require("./cards"), exports);
|
|
29
|
+
__exportStar(require("./configuration"), exports);
|
|
29
30
|
__exportStar(require("./connector-client"), exports);
|
|
30
31
|
var errorHelper_1 = require("./errorHelper");
|
|
31
32
|
Object.defineProperty(exports, "HostingErrors", { enumerable: true, get: function () { return errorHelper_1.Errors; } });
|
package/dist/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;;;;;;;;;;;;AAEH,0CAAuB;AACvB,wDAAoF;AAA3E,8GAAA,YAAY,OAAA;AAAE,8GAAA,YAAY,OAAA;AAAE,kHAAA,gBAAgB,OAAA;AAErD,wCAAqB;AACrB,0CAAuB;AACvB,qDAAkC;AAClC,6CAAuD;AAA9C,4GAAA,MAAM,OAAiB;AAChC,2CAAwB;AACxB,0CAAuB;AACvB,0CAAuB;AACvB,4CAAyB;AACzB,+CAA4B;AAE5B,oDAAiC;AACjC,gDAA6B;AAC7B,yEAAyE;AACzE,4EAA4E;AAC5E,iCAAiC;AACjC,+CAAuE;AAA9D,4GAAA,YAAY,OAAA;AACrB,uDAAoC;AACpC,kDAA+B;AAC/B,mDAAgC;AAChC,gDAA6B;AAC7B,gDAA6B;AAC7B,+DAA4C;AAC5C,oDAAiC;AACjC,sDAAmC;AACnC,+CAA4B;AAC5B,+CAA4B;AAC5B,0DAAuC;AAEvC,iDAA8B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;;;;;;;;;;;;AAEH,0CAAuB;AACvB,wDAAoF;AAA3E,8GAAA,YAAY,OAAA;AAAE,8GAAA,YAAY,OAAA;AAAE,kHAAA,gBAAgB,OAAA;AAErD,wCAAqB;AACrB,0CAAuB;AACvB,kDAA+B;AAC/B,qDAAkC;AAClC,6CAAuD;AAA9C,4GAAA,MAAM,OAAiB;AAChC,2CAAwB;AACxB,0CAAuB;AACvB,0CAAuB;AACvB,4CAAyB;AACzB,+CAA4B;AAE5B,oDAAiC;AACjC,gDAA6B;AAC7B,yEAAyE;AACzE,4EAA4E;AAC5E,iCAAiC;AACjC,+CAAuE;AAA9D,4GAAA,YAAY,OAAA;AACrB,uDAAoC;AACpC,kDAA+B;AAC/B,mDAAgC;AAChC,gDAA6B;AAC7B,gDAA6B;AAC7B,+DAA4C;AAC5C,oDAAiC;AACjC,sDAAmC;AACnC,+CAA4B;AAC5B,+CAA4B;AAC5B,0DAAuC;AAEvC,iDAA8B"}
|
|
@@ -2,8 +2,11 @@
|
|
|
2
2
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
|
+
import { ConfigurationContext } from './configuration/configuration';
|
|
5
6
|
/** Configuration for the shared outbound-host allowlist. */
|
|
6
7
|
export interface OutboundHostValidatorOptions {
|
|
8
|
+
/** Optional host-scoped external configuration. */
|
|
9
|
+
configurationContext?: ConfigurationContext;
|
|
7
10
|
/** Enables allowlist enforcement. Defaults to `false`. */
|
|
8
11
|
enabled?: boolean;
|
|
9
12
|
/**
|
|
@@ -43,5 +46,5 @@ export declare class OutboundHostValidator implements OutboundUrlPolicy {
|
|
|
43
46
|
* indexed values such as `Hosts__0`, `Hosts__1`, and so on.
|
|
44
47
|
*/
|
|
45
48
|
export declare function loadOutboundHostValidatorOptionsFromEnv(): OutboundHostValidatorOptions;
|
|
46
|
-
/** Creates
|
|
49
|
+
/** Creates a validator using the shared configuration precedence. */
|
|
47
50
|
export declare function createOutboundHostValidator(options?: OutboundHostValidatorOptions): OutboundHostValidator;
|
|
@@ -7,7 +7,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
7
7
|
exports.OutboundHostValidator = void 0;
|
|
8
8
|
exports.loadOutboundHostValidatorOptionsFromEnv = loadOutboundHostValidatorOptionsFromEnv;
|
|
9
9
|
exports.createOutboundHostValidator = createOutboundHostValidator;
|
|
10
|
-
const
|
|
10
|
+
const configuration_1 = require("./configuration/configuration");
|
|
11
|
+
const environmentConfiguration_1 = require("./configuration/environmentConfiguration");
|
|
12
|
+
const utils_1 = require("./utils");
|
|
11
13
|
/** Hosts used by Microsoft channel callbacks and hosted attachments. */
|
|
12
14
|
const DEFAULT_MICROSOFT_HOSTS = Object.freeze([
|
|
13
15
|
'botframework.com',
|
|
@@ -19,8 +21,6 @@ const DEFAULT_MICROSOFT_HOSTS = Object.freeze([
|
|
|
19
21
|
'svc.ms',
|
|
20
22
|
'blob.core.windows.net'
|
|
21
23
|
]);
|
|
22
|
-
const OUTBOUND_HOST_VALIDATOR_ENV_PREFIX = 'OutboundHostValidator__';
|
|
23
|
-
const OUTBOUND_HOST_VALIDATOR_ENV_PREFIX_UPPER = OUTBOUND_HOST_VALIDATOR_ENV_PREFIX.toUpperCase();
|
|
24
24
|
/**
|
|
25
25
|
* Shared allowlist policy for server-side outbound requests.
|
|
26
26
|
*
|
|
@@ -30,13 +30,16 @@ const OUTBOUND_HOST_VALIDATOR_ENV_PREFIX_UPPER = OUTBOUND_HOST_VALIDATOR_ENV_PRE
|
|
|
30
30
|
class OutboundHostValidator {
|
|
31
31
|
constructor(options = {}) {
|
|
32
32
|
var _a, _b, _c;
|
|
33
|
-
|
|
33
|
+
const resolved = options.configurationContext
|
|
34
|
+
? resolveOutboundHostValidatorOptions(options)
|
|
35
|
+
: options;
|
|
36
|
+
this.enabled = (_a = resolved.enabled) !== null && _a !== void 0 ? _a : false;
|
|
34
37
|
const suffixes = new Set();
|
|
35
|
-
if ((_b =
|
|
38
|
+
if ((_b = resolved.includeDefaultMicrosoftHosts) !== null && _b !== void 0 ? _b : true) {
|
|
36
39
|
for (const host of DEFAULT_MICROSOFT_HOSTS)
|
|
37
40
|
suffixes.add(host);
|
|
38
41
|
}
|
|
39
|
-
for (const host of (_c =
|
|
42
|
+
for (const host of (_c = resolved.hosts) !== null && _c !== void 0 ? _c : []) {
|
|
40
43
|
const normalized = normalizeConfiguredHost(host);
|
|
41
44
|
if (normalized)
|
|
42
45
|
suffixes.add(normalized);
|
|
@@ -65,50 +68,24 @@ exports.OutboundHostValidator = OutboundHostValidator;
|
|
|
65
68
|
* indexed values such as `Hosts__0`, `Hosts__1`, and so on.
|
|
66
69
|
*/
|
|
67
70
|
function loadOutboundHostValidatorOptionsFromEnv() {
|
|
68
|
-
|
|
69
|
-
const indexedHosts = new Map();
|
|
70
|
-
const hosts = [];
|
|
71
|
-
for (const [envKey, rawValue] of Object.entries(process.env)) {
|
|
72
|
-
const upperKey = envKey.toUpperCase();
|
|
73
|
-
if (!upperKey.startsWith(OUTBOUND_HOST_VALIDATOR_ENV_PREFIX_UPPER))
|
|
74
|
-
continue;
|
|
75
|
-
const property = envKey.substring(OUTBOUND_HOST_VALIDATOR_ENV_PREFIX.length);
|
|
76
|
-
const upperProperty = property.toUpperCase();
|
|
77
|
-
if (upperProperty === 'ENABLED') {
|
|
78
|
-
const value = (0, env_1.parseBooleanEnv)(rawValue);
|
|
79
|
-
if (value !== undefined)
|
|
80
|
-
result.enabled = value;
|
|
81
|
-
}
|
|
82
|
-
else if (upperProperty === 'INCLUDEDEFAULTMICROSOFTHOSTS') {
|
|
83
|
-
const value = (0, env_1.parseBooleanEnv)(rawValue);
|
|
84
|
-
if (value !== undefined)
|
|
85
|
-
result.includeDefaultMicrosoftHosts = value;
|
|
86
|
-
}
|
|
87
|
-
else if (upperProperty === 'HOSTS' && rawValue) {
|
|
88
|
-
hosts.push(...rawValue.split(',').map(host => host.trim()).filter(Boolean));
|
|
89
|
-
}
|
|
90
|
-
else {
|
|
91
|
-
const match = /^HOSTS__(\d+)$/i.exec(property);
|
|
92
|
-
if (match && (rawValue === null || rawValue === void 0 ? void 0 : rawValue.trim()))
|
|
93
|
-
indexedHosts.set(Number(match[1]), rawValue.trim());
|
|
94
|
-
}
|
|
95
|
-
}
|
|
96
|
-
for (const [, host] of [...indexedHosts.entries()].sort(([left], [right]) => left - right)) {
|
|
97
|
-
hosts.push(host);
|
|
98
|
-
}
|
|
99
|
-
if (hosts.length > 0)
|
|
100
|
-
result.hosts = hosts;
|
|
101
|
-
return result;
|
|
71
|
+
return { ...(0, environmentConfiguration_1.loadModernEnvironmentConfiguration)().outboundHostValidator };
|
|
102
72
|
}
|
|
103
|
-
/** Creates
|
|
104
|
-
function createOutboundHostValidator(options) {
|
|
105
|
-
|
|
73
|
+
/** Creates a validator using the shared configuration precedence. */
|
|
74
|
+
function createOutboundHostValidator(options = {}) {
|
|
75
|
+
return new OutboundHostValidator(resolveOutboundHostValidatorOptions(options));
|
|
76
|
+
}
|
|
77
|
+
function resolveOutboundHostValidatorOptions(options) {
|
|
78
|
+
const external = (0, configuration_1.getConfigurationSnapshot)(options.configurationContext);
|
|
106
79
|
const fromEnv = loadOutboundHostValidatorOptionsFromEnv();
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
80
|
+
const direct = {};
|
|
81
|
+
if (options.enabled !== undefined)
|
|
82
|
+
direct.enabled = options.enabled;
|
|
83
|
+
if (options.includeDefaultMicrosoftHosts !== undefined) {
|
|
84
|
+
direct.includeDefaultMicrosoftHosts = options.includeDefaultMicrosoftHosts;
|
|
85
|
+
}
|
|
86
|
+
if (options.hosts !== undefined)
|
|
87
|
+
direct.hosts = options.hosts;
|
|
88
|
+
return (0, utils_1.mergeDefined)(external.fallback.outboundHostValidator, fromEnv, external.overrideEnvironment.outboundHostValidator, direct, external.enforce.outboundHostValidator);
|
|
112
89
|
}
|
|
113
90
|
function getUrlHost(input) {
|
|
114
91
|
if (!input)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outboundHostValidator.js","sourceRoot":"","sources":["../../src/outboundHostValidator.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;AAEH,
|
|
1
|
+
{"version":3,"file":"outboundHostValidator.js","sourceRoot":"","sources":["../../src/outboundHostValidator.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;AAEH,iEAGsC;AACtC,uFAA6F;AAC7F,mCAAsC;AAEtC,wEAAwE;AACxE,MAAM,uBAAuB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC5C,kBAAkB;IAClB,yBAAyB;IACzB,qBAAqB;IACrB,oBAAoB;IACpB,qBAAqB;IACrB,gBAAgB;IAChB,QAAQ;IACR,uBAAuB;CACxB,CAAC,CAAA;AA8BF;;;;;GAKG;AACH;IAIE,YAAoB,OAAO,GAAiC,EAAE;;QAC5D,MAAM,QAAQ,GAAG,OAAO,CAAC,oBAAoB;YAC3C,CAAC,CAAC,mCAAmC,CAAC,OAAO,CAAC;YAC9C,CAAC,CAAC,OAAO,CAAA;QACX,IAAI,CAAC,OAAO,SAAG,QAAQ,CAAC,OAAO,mCAAI,KAAK,CAAA;QAExC,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAA;QAClC,UAAI,QAAQ,CAAC,4BAA4B,mCAAI,IAAI,EAAE,CAAC;YAClD,KAAK,MAAM,IAAI,IAAI,uBAAuB;gBAAE,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAChE,CAAC;QAED,KAAK,MAAM,IAAI,UAAI,QAAQ,CAAC,KAAK,mCAAI,EAAE,EAAE,CAAC;YACxC,MAAM,UAAU,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAA;YAChD,IAAI,UAAU;gBAAE,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;QAC1C,CAAC;QAED,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC1B,CAAC;IAEM,SAAS,CAAE,KAAsC;QACtD,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAA;QAE9B,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,CAAA;QAC9B,IAAI,CAAC,IAAI;YAAE,OAAO,KAAK,CAAA;QAEvB,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnC,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,MAAM,EAAE,CAAC;gBAAE,OAAO,IAAI,CAAA;QACjE,CAAC;QAED,OAAO,KAAK,CAAA;IACd,CAAC;CACF;;AAED;;;;;;GAMG;AACH;IACE,OAAO,EAAE,GAAG,IAAA,6DAAkC,GAAE,CAAC,qBAAqB,EAAE,CAAA;AAC1E,CAAC;AAED,qEAAqE;AACrE,qCAA6C,OAAO,GAAiC,EAAE;IACrF,OAAO,IAAI,qBAAqB,CAAC,mCAAmC,CAAC,OAAO,CAAC,CAAC,CAAA;AAChF,CAAC;AAED,SAAS,mCAAmC,CAC1C,OAAqC;IAErC,MAAM,QAAQ,GAAG,IAAA,wCAAwB,EAAC,OAAO,CAAC,oBAAoB,CAAC,CAAA;IACvE,MAAM,OAAO,GAAG,uCAAuC,EAAE,CAAA;IACzD,MAAM,MAAM,GAAiC,EAAE,CAAA;IAC/C,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS;QAAE,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;IACnE,IAAI,OAAO,CAAC,4BAA4B,KAAK,SAAS,EAAE,CAAC;QACvD,MAAM,CAAC,4BAA4B,GAAG,OAAO,CAAC,4BAA4B,CAAA;IAC5E,CAAC;IACD,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS;QAAE,MAAM,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAA;IAC7D,OAAO,IAAA,oBAAY,EACjB,QAAQ,CAAC,QAAQ,CAAC,qBAAqB,EACvC,OAAO,EACP,QAAQ,CAAC,mBAAmB,CAAC,qBAAqB,EAClD,MAAM,EACN,QAAQ,CAAC,OAAO,CAAC,qBAAqB,CACvC,CAAA;AACH,CAAC;AAED,SAAS,UAAU,CAAE,KAAsC;IACzD,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAA;IAE5B,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,KAAK,YAAY,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,CAAA;QACzD,OAAO,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IACxC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAA;IAClB,CAAC;AACH,CAAC;AAED,SAAS,uBAAuB,CAAE,KAAa;IAC7C,IAAI,SAAS,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,EAAE,CAAA;IAC7B,IAAI,CAAC,SAAS;QAAE,OAAO,SAAS,CAAA;IAChC,IAAI,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAE9D,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAA;QACnC,IAAI,QAAQ,CAAC,QAAQ;YAAE,OAAO,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;IACpE,CAAC;IAAC,MAAM,CAAC;QACP,yDAAyD;IAC3D,CAAC;IAED,IAAI,CAAC;QACH,OAAO,iBAAiB,CAAC,IAAI,GAAG,CAAC,UAAU,SAAS,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAA;IACnE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAA;IAClB,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CAAE,IAAY;IACtC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;IAC/D,OAAO,UAAU,IAAI,SAAS,CAAA;AAChC,CAAC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
|
-
import { Storage, StoreItem } from './storage';
|
|
5
|
+
import { Storage, StoreItem, StorageWriteOptions } from './storage';
|
|
6
6
|
/**
|
|
7
7
|
* A file-based storage implementation that persists data to the local filesystem.
|
|
8
8
|
*
|
|
@@ -47,6 +47,7 @@ import { Storage, StoreItem } from './storage';
|
|
|
47
47
|
export declare class FileStorage implements Storage {
|
|
48
48
|
private _folder;
|
|
49
49
|
private _stateFile;
|
|
50
|
+
private _metadataFile;
|
|
50
51
|
/**
|
|
51
52
|
* Creates a new FileStorage instance that stores data in the specified folder.
|
|
52
53
|
*
|
|
@@ -91,7 +92,7 @@ export declare class FileStorage implements Storage {
|
|
|
91
92
|
* > Any eTag values in the changes object are ignored.
|
|
92
93
|
*
|
|
93
94
|
*/
|
|
94
|
-
write(changes: StoreItem): Promise<void>;
|
|
95
|
+
write(changes: StoreItem, options?: StorageWriteOptions): Promise<void>;
|
|
95
96
|
/**
|
|
96
97
|
* Deletes store items from the filesystem storage.
|
|
97
98
|
*
|
|
@@ -107,4 +108,6 @@ export declare class FileStorage implements Storage {
|
|
|
107
108
|
*
|
|
108
109
|
*/
|
|
109
110
|
delete(keys: string[]): Promise<void>;
|
|
111
|
+
private isExpired;
|
|
112
|
+
private writeFiles;
|
|
110
113
|
}
|
|
@@ -10,8 +10,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
10
10
|
exports.FileStorage = void 0;
|
|
11
11
|
const path_1 = __importDefault(require("path"));
|
|
12
12
|
const fs_1 = __importDefault(require("fs"));
|
|
13
|
+
const storageExpiry_1 = require("./storageExpiry");
|
|
13
14
|
const agents_telemetry_1 = require("@microsoft/agents-telemetry");
|
|
14
15
|
const observability_1 = require("../observability");
|
|
16
|
+
const logger = (0, agents_telemetry_1.debug)('agents:file-storage');
|
|
15
17
|
/**
|
|
16
18
|
* A file-based storage implementation that persists data to the local filesystem.
|
|
17
19
|
*
|
|
@@ -68,6 +70,8 @@ class FileStorage {
|
|
|
68
70
|
*
|
|
69
71
|
*/
|
|
70
72
|
constructor(folder) {
|
|
73
|
+
var _a;
|
|
74
|
+
var _b;
|
|
71
75
|
this._folder = folder;
|
|
72
76
|
if (!fs_1.default.existsSync(folder)) {
|
|
73
77
|
fs_1.default.mkdirSync(folder, { recursive: true });
|
|
@@ -75,8 +79,14 @@ class FileStorage {
|
|
|
75
79
|
if (!fs_1.default.existsSync(path_1.default.join(folder, 'state.json'))) {
|
|
76
80
|
fs_1.default.writeFileSync(path_1.default.join(folder, 'state.json'), '{}');
|
|
77
81
|
}
|
|
82
|
+
if (!fs_1.default.existsSync(path_1.default.join(folder, 'state.metadata.json'))) {
|
|
83
|
+
fs_1.default.writeFileSync(path_1.default.join(folder, 'state.metadata.json'), '{}');
|
|
84
|
+
}
|
|
78
85
|
const data = fs_1.default.readFileSync(path_1.default.join(folder, 'state.json'), 'utf8');
|
|
79
86
|
this._stateFile = JSON.parse(data);
|
|
87
|
+
const metadata = fs_1.default.readFileSync(path_1.default.join(folder, 'state.metadata.json'), 'utf8');
|
|
88
|
+
this._metadataFile = JSON.parse(metadata);
|
|
89
|
+
(_a = (_b = this._metadataFile).expirations) !== null && _a !== void 0 ? _a : (_b.expirations = {});
|
|
80
90
|
}
|
|
81
91
|
/**
|
|
82
92
|
* Reads store items from the filesystem storage.
|
|
@@ -100,12 +110,23 @@ class FileStorage {
|
|
|
100
110
|
}
|
|
101
111
|
else {
|
|
102
112
|
const data = {};
|
|
113
|
+
let storageChanged = false;
|
|
103
114
|
for (const key of keys) {
|
|
115
|
+
if (this.isExpired(key)) {
|
|
116
|
+
logger.info('Item expired, deleting from storage', { key: (0, agents_telemetry_1.redactString)(key, true) });
|
|
117
|
+
delete this._stateFile[key];
|
|
118
|
+
delete this._metadataFile.expirations[key];
|
|
119
|
+
storageChanged = true;
|
|
120
|
+
continue;
|
|
121
|
+
}
|
|
104
122
|
const item = this._stateFile[key];
|
|
105
123
|
if (item) {
|
|
106
124
|
data[key] = item;
|
|
107
125
|
}
|
|
108
126
|
}
|
|
127
|
+
if (storageChanged) {
|
|
128
|
+
this.writeFiles();
|
|
129
|
+
}
|
|
109
130
|
resolve(data);
|
|
110
131
|
}
|
|
111
132
|
});
|
|
@@ -127,14 +148,21 @@ class FileStorage {
|
|
|
127
148
|
* > Any eTag values in the changes object are ignored.
|
|
128
149
|
*
|
|
129
150
|
*/
|
|
130
|
-
write(changes) {
|
|
151
|
+
write(changes, options) {
|
|
131
152
|
return (0, agents_telemetry_1.trace)(observability_1.StorageTraceDefinitions.write, async ({ record }) => {
|
|
153
|
+
const expiresAt = (0, storageExpiry_1.getStorageWriteExpiry)(options);
|
|
132
154
|
const keys = Object.keys(changes);
|
|
133
155
|
record({ keyCount: keys === null || keys === void 0 ? void 0 : keys.length });
|
|
134
156
|
for (const key of keys) {
|
|
135
157
|
this._stateFile[key] = changes[key];
|
|
158
|
+
if (expiresAt === undefined) {
|
|
159
|
+
delete this._metadataFile.expirations[key];
|
|
160
|
+
}
|
|
161
|
+
else {
|
|
162
|
+
this._metadataFile.expirations[key] = expiresAt;
|
|
163
|
+
}
|
|
136
164
|
}
|
|
137
|
-
|
|
165
|
+
this.writeFiles();
|
|
138
166
|
});
|
|
139
167
|
}
|
|
140
168
|
/**
|
|
@@ -161,13 +189,23 @@ class FileStorage {
|
|
|
161
189
|
else {
|
|
162
190
|
for (const key of keys) {
|
|
163
191
|
delete this._stateFile[key];
|
|
192
|
+
delete this._metadataFile.expirations[key];
|
|
164
193
|
}
|
|
165
|
-
|
|
194
|
+
this.writeFiles();
|
|
166
195
|
resolve(undefined);
|
|
167
196
|
}
|
|
168
197
|
});
|
|
169
198
|
});
|
|
170
199
|
}
|
|
200
|
+
isExpired(key) {
|
|
201
|
+
var _a;
|
|
202
|
+
const expiresAt = (_a = this._metadataFile.expirations) === null || _a === void 0 ? void 0 : _a[key];
|
|
203
|
+
return expiresAt !== undefined && expiresAt <= Date.now();
|
|
204
|
+
}
|
|
205
|
+
writeFiles() {
|
|
206
|
+
fs_1.default.writeFileSync(path_1.default.join(this._folder, 'state.json'), JSON.stringify(this._stateFile, null, 2));
|
|
207
|
+
fs_1.default.writeFileSync(path_1.default.join(this._folder, 'state.metadata.json'), JSON.stringify(this._metadataFile, null, 2));
|
|
208
|
+
}
|
|
171
209
|
}
|
|
172
210
|
exports.FileStorage = FileStorage;
|
|
173
211
|
//# sourceMappingURL=fileStorage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fileStorage.js","sourceRoot":"","sources":["../../../src/storage/fileStorage.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;AAEH,gDAAuB;AACvB,4CAAmB;AAEnB,
|
|
1
|
+
{"version":3,"file":"fileStorage.js","sourceRoot":"","sources":["../../../src/storage/fileStorage.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
__exportStar(require("./storage"), exports);
|
|
18
|
+
__exportStar(require("./storageExpiry"), exports);
|
|
18
19
|
__exportStar(require("./memoryStorage"), exports);
|
|
19
20
|
__exportStar(require("./fileStorage"), exports);
|
|
20
21
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/storage/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAAyB;AACzB,kDAA+B;AAC/B,gDAA6B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/storage/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAAyB;AACzB,kDAA+B;AAC/B,kDAA+B;AAC/B,gDAA6B"}
|