@whook/gcp-functions 20.1.2 → 21.0.0
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/commands/testGCPFunctionRoute.d.ts +2 -2
- package/dist/commands/testGCPFunctionRoute.js.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.js +5 -2
- package/dist/index.js.map +1 -1
- package/dist/libs/utils.js +2 -2
- package/dist/libs/utils.js.map +1 -1
- package/dist/services/_autoload.d.ts +6 -24
- package/dist/services/_autoload.js +7 -4
- package/dist/services/_autoload.js.map +1 -1
- package/dist/wrappers/wrapRouteHandlerForGoogleHTTPFunction.d.ts +8 -8
- package/dist/wrappers/wrapRouteHandlerForGoogleHTTPFunction.js +18 -12
- package/dist/wrappers/wrapRouteHandlerForGoogleHTTPFunction.js.map +1 -1
- package/package.json +43 -34
- package/src/commands/testGCPFunctionRoute.ts +1 -1
- package/src/index.ts +18 -13
- package/src/libs/utils.ts +2 -2
- package/src/services/_autoload.ts +11 -8
- package/src/wrappers/wrapRouteHandlerForGoogleHTTPFunction.ts +55 -30
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type WhookCommandHandler, type
|
|
1
|
+
import { type WhookCommandHandler, type WhookCompilerOptions, type WhookRoutesDefinitionsService } from '@whook/whook';
|
|
2
2
|
import { type LogService } from 'common-services';
|
|
3
3
|
export declare const definition: {
|
|
4
4
|
readonly name: "testGCPFunctionRoute";
|
|
@@ -46,5 +46,5 @@ declare const _default: import("knifecycle").ServiceInitializer<{
|
|
|
46
46
|
type: string;
|
|
47
47
|
contentType: string;
|
|
48
48
|
parameters: string;
|
|
49
|
-
}
|
|
49
|
+
}>>;
|
|
50
50
|
export default _default;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testGCPFunctionRoute.js","sourceRoot":"","sources":["../../src/commands/testGCPFunctionRoute.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"testGCPFunctionRoute.js","sourceRoot":"","sources":["../../src/commands/testGCPFunctionRoute.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -34,10 +34,10 @@ export { initWrapRouteHandlerForGoogleHTTPFunction };
|
|
|
34
34
|
export type WhookGCPFunctionBuildConfig = {
|
|
35
35
|
BUILD_PARALLELISM?: number;
|
|
36
36
|
};
|
|
37
|
-
export
|
|
37
|
+
export interface WhookGCPFunctionBaseConfig {
|
|
38
38
|
staticFiles?: string[];
|
|
39
39
|
compilerOptions?: WhookCompilerOptions;
|
|
40
|
-
}
|
|
40
|
+
}
|
|
41
41
|
export type WhookGCPFunctionRouteConfig = WhookGCPFunctionBaseConfig;
|
|
42
42
|
export declare function prepareBuildEnvironment<T extends Knifecycle>($?: T): Promise<T>;
|
|
43
43
|
export declare function runBuild(aPrepareBuildEnvironment: typeof prepareBuildEnvironment): Promise<void>;
|
package/dist/index.js
CHANGED
|
@@ -112,7 +112,7 @@ async function buildHandler({ APP_ENV, PROJECT_DIR, DEFINITIONS, compiler, log,
|
|
|
112
112
|
catch (err) {
|
|
113
113
|
log('error', `💥 - Error building "${handlerName}"...`);
|
|
114
114
|
log('error-stack', printStackTrace(err));
|
|
115
|
-
throw YError.wrap(err, 'E_HANDLER_BUILD', handlerName);
|
|
115
|
+
throw YError.wrap(err, 'E_HANDLER_BUILD', [handlerName]);
|
|
116
116
|
}
|
|
117
117
|
}
|
|
118
118
|
async function buildHandlerIndex(handlerName) {
|
|
@@ -129,7 +129,10 @@ export default function handler (req, res) {
|
|
|
129
129
|
}
|
|
130
130
|
async function buildFinalHandler({ DEFINITIONS, compiler, log, }, handlerPath, handlerName) {
|
|
131
131
|
const entryPoint = `${handlerPath}/main.js`;
|
|
132
|
-
const { extension, contents, mappings } = await compiler(entryPoint, DEFINITIONS[handlerName]?.config
|
|
132
|
+
const { extension, contents, mappings } = await compiler(entryPoint, DEFINITIONS.configs[handlerName]?.config &&
|
|
133
|
+
'compilerOptions' in DEFINITIONS.configs[handlerName].config
|
|
134
|
+
? DEFINITIONS.configs[handlerName]?.config.compilerOptions
|
|
135
|
+
: undefined);
|
|
133
136
|
await Promise.all([
|
|
134
137
|
ensureFile({ log }, join(handlerPath, `/index${extension}`), contents),
|
|
135
138
|
mappings
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACjD,OAAO,EACL,UAAU,EACV,QAAQ,EACR,sBAAsB,GAMvB,MAAM,YAAY,CAAC;AACpB,OAAO,mBAAmB,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EACL,kCAAkC,IAAI,uCAAuC,EAC7E,YAAY,GAIb,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAC3D,OAAO,yCAAyC,MAAM,qDAAqD,CAAC;AAE5G,MAAM,CAAC,MAAM,yBAAyB,GAAG,EAAE,CAAC;AAC5C,MAAM,CAAC,MAAM,kCAAkC,GAAG;IAChD,GAAG,uCAAuC;IAC1C,GAAG,EAAE,sCAAsC;CAC5C,CAAC;AAGF,OAAO,EAAE,yCAAyC,EAAE,CAAC;AAWrD,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAIR,CAAC;AAEvB,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,IAAO,IAAI,UAAU,EAAO;IAE5B,CAAC,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC;IACnC,CAAC,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IAChC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IACzB,CAAC,CAAC,QAAQ,CACR,QAAQ,CAAC,sBAAsB,EAAE,kCAAkC,CAAC,CACrE,CAAC;IACF,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5C,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;IACnC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;IAE1C,OAAO,CAAC,CAAC;AACX,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,QAAQ,CAC5B,wBAAwD;IAExD,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QAC5B,MAAM,CAAC,GAAG,MAAM,wBAAwB,EAAE,CAAC;QAC3C,MAAM,EACJ,OAAO,EACP,iBAAiB,EACjB,WAAW,EACX,QAAQ,EACR,GAAG,EACH,SAAS,EACT,WAAW,EACX,gBAAgB,GACjB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/libs/utils.js
CHANGED
|
@@ -6,10 +6,10 @@ export async function loadFunction({ PROJECT_DIR, APP_ENV, log, }, operationId,
|
|
|
6
6
|
try {
|
|
7
7
|
const module = await import(modulePath);
|
|
8
8
|
if (!module) {
|
|
9
|
-
throw new YError('E_MODULE_NOT_FOUND', module);
|
|
9
|
+
throw new YError('E_MODULE_NOT_FOUND', [module]);
|
|
10
10
|
}
|
|
11
11
|
if (!module.default) {
|
|
12
|
-
throw new YError('E_LAMBDA_NOT_FOUND', module, Object.keys(module));
|
|
12
|
+
throw new YError('E_LAMBDA_NOT_FOUND', [module, Object.keys(module)]);
|
|
13
13
|
}
|
|
14
14
|
return module.default;
|
|
15
15
|
}
|
package/dist/libs/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/libs/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,EACE,WAAW,EACX,OAAO,EACP,GAAG,GAKJ,EACD,WAAmB,EACnB,IAAY,EACZ,SAAS,GAAG,MAAM;IAGlB,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAC1B,WAAW,EACX,QAAQ,EACR,OAAO,EACP,WAAW,EACX,IAAI,GAAG,SAAS,CACjB,CAAC;IAEF,GAAG,CAAC,OAAO,EAAE,yCAAyC,UAAU,IAAI,CAAC,CAAC;IAEtE,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;QAExC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,MAAM,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/libs/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,EACE,WAAW,EACX,OAAO,EACP,GAAG,GAKJ,EACD,WAAmB,EACnB,IAAY,EACZ,SAAS,GAAG,MAAM;IAGlB,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAC1B,WAAW,EACX,QAAQ,EACR,OAAO,EACP,WAAW,EACX,IAAI,GAAG,SAAS,CACjB,CAAC;IAEF,GAAG,CAAC,OAAO,EAAE,yCAAyC,UAAU,IAAI,CAAC,CAAC;IAEtE,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;QAExC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,MAAM,CAAC,oBAAoB,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QACnD,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,MAAM,IAAI,MAAM,CAAC,oBAAoB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACxE,CAAC;QAED,OAAO,MAAM,CAAC,OAAO,CAAC;IACxB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,MAAM,CAAC,IAAI,CAAC,GAAY,EAAE,eAAe,CAAC,CAAC;IACnD,CAAC;AACH,CAAC"}
|
|
@@ -1,17 +1,17 @@
|
|
|
1
|
-
import { Knifecycle, type Injector, type
|
|
1
|
+
import { Knifecycle, type Injector, type Dependencies, type Service } from 'knifecycle';
|
|
2
2
|
import { type WhookOpenAPI, type WhookRouteDefinition } from '@whook/whook';
|
|
3
3
|
import { type LogService } from 'common-services';
|
|
4
|
-
export
|
|
4
|
+
export interface GCPFunctionDefinition {
|
|
5
5
|
name: string;
|
|
6
6
|
type: 'route';
|
|
7
7
|
definition: WhookRouteDefinition;
|
|
8
8
|
openAPI: WhookOpenAPI;
|
|
9
|
-
}
|
|
10
|
-
export
|
|
9
|
+
}
|
|
10
|
+
export interface WhookGoogleFunctionsAutoloadDependencies {
|
|
11
11
|
$injector: Injector<Service>;
|
|
12
12
|
$instance: Knifecycle;
|
|
13
13
|
log?: LogService;
|
|
14
|
-
}
|
|
14
|
+
}
|
|
15
15
|
/**
|
|
16
16
|
* Wrap the _autoload service in order to build for GCP
|
|
17
17
|
* Functions compatible code.
|
|
@@ -26,23 +26,5 @@ export type WhookGoogleFunctionsAutoloadDependencies = {
|
|
|
26
26
|
* @return {Promise<Object>}
|
|
27
27
|
* A promise of an object containing the reshaped env vars.
|
|
28
28
|
*/
|
|
29
|
-
declare const _default: import("knifecycle").ServiceInitializer<Dependencies<any> &
|
|
30
|
-
APP_CONFIG?: import("application-services").AppConfig;
|
|
31
|
-
INITIALIZER_PATH_MAP?: import("@whook/whook").WhookInitializerMap;
|
|
32
|
-
WHOOK_PLUGINS?: import("@whook/whook").WhookPluginName[];
|
|
33
|
-
WHOOK_RESOLVED_PLUGINS: import("@whook/whook").WhookResolvedPluginsService;
|
|
34
|
-
COMMANDS_DEFINITIONS_OPTIONS?: import("@whook/whook").WhookCommandsDefinitionsOptions;
|
|
35
|
-
ROUTES_DEFINITIONS_OPTIONS?: import("@whook/whook").WhookRoutesDefinitionsOptions;
|
|
36
|
-
CRONS_DEFINITIONS_OPTIONS?: import("@whook/whook").WhookCronDefinitionsOptions;
|
|
37
|
-
CONSUMERS_DEFINITIONS_OPTIONS?: import("@whook/whook").WhookConsumerDefinitionsOptions;
|
|
38
|
-
TRANSFORMERS_DEFINITIONS_OPTIONS?: import("@whook/whook").WhookTransformerDefinitionsOptions;
|
|
39
|
-
args: import("@whook/whook").WhookRawCommandArgs;
|
|
40
|
-
$injector: import("knifecycle").Injector<Service>;
|
|
41
|
-
importer: import("common-services").ImporterService<{
|
|
42
|
-
default: Initializer<Service, Dependencies>;
|
|
43
|
-
}>;
|
|
44
|
-
resolve: import("common-services").ResolveService;
|
|
45
|
-
access?: typeof import("fs/promises").access;
|
|
46
|
-
log?: LogService;
|
|
47
|
-
}, Autoloader<Initializer<unknown, Dependencies>>>;
|
|
29
|
+
declare const _default: import("knifecycle").ServiceInitializer<Dependencies<any> & Dependencies, any>;
|
|
48
30
|
export default _default;
|
|
@@ -20,13 +20,16 @@ const initializerWrapper = (async ({ $injector, log = noop }, $autoload) => {
|
|
|
20
20
|
const config = DEFINITIONS.configs[cleanedName];
|
|
21
21
|
if (!config) {
|
|
22
22
|
log('error', '💥 - Unable to find a GCP Function definition!');
|
|
23
|
-
throw new YError('E_DEFINITION_NOT_FOUND', serviceName, cleanedName);
|
|
23
|
+
throw new YError('E_DEFINITION_NOT_FOUND', [serviceName, cleanedName]);
|
|
24
24
|
}
|
|
25
25
|
if (!config || config.type !== 'route') {
|
|
26
26
|
log('error', '💥 - GCP Function only supports routes!');
|
|
27
|
-
throw new YError('E_UNSUPPORTED_DEFINITION',
|
|
27
|
+
throw new YError('E_UNSUPPORTED_DEFINITION', [
|
|
28
|
+
serviceName,
|
|
29
|
+
cleanedName,
|
|
30
|
+
]);
|
|
28
31
|
}
|
|
29
|
-
const openAPI =
|
|
32
|
+
const openAPI = await cleanupOpenAPI({
|
|
30
33
|
...API,
|
|
31
34
|
paths: {
|
|
32
35
|
[config.path]: {
|
|
@@ -34,7 +37,7 @@ const initializerWrapper = (async ({ $injector, log = noop }, $autoload) => {
|
|
|
34
37
|
[config.method]: API.paths?.[config.path]?.[config.method],
|
|
35
38
|
},
|
|
36
39
|
},
|
|
37
|
-
})
|
|
40
|
+
});
|
|
38
41
|
return {
|
|
39
42
|
name: cleanedName,
|
|
40
43
|
type: 'route',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_autoload.js","sourceRoot":"","sources":["../../src/services/_autoload.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD,OAAO,EAEL,eAAe,EACf,QAAQ,EACR,UAAU,EACV,QAAQ,GAOT,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,IAAI,GAKL,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,yCAAyC,MAAM,sDAAsD,CAAC;AAe7G,MAAM,kBAAkB,GAGpB,CAAC,KAAK,EACR,EAAE,SAAS,EAAE,GAAG,GAAG,IAAI,EAA4C,EACnE,SAAyD,EAGzD,EAAE;IACF,IAAI,GAAiB,CAAC;IACtB,IAAI,WAA6B,CAAC;IAClC,IAAI,kBAAiD,CAAC;IACtD,MAAM,aAAa,GAAG,CAAC,GAAG,EAAE;QAC1B,OAAO,KAAK,EAAE,WAAmB,EAAkC,EAAE;YACnE,MAAM,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAY,CAAC;YAE3D,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,SAAS,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;YAC5C,WAAW;gBACT,WAAW,IAAI,CAAC,MAAM,SAAS,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;YAChE,kBAAkB;gBAChB,kBAAkB;oBAClB,CAAC,MAAM,SAAS,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC;YAE/D,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,WAAqB,CAAC,CAAC;YAE1D,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,GAAG,CAAC,OAAO,EAAE,gDAAgD,CAAC,CAAC;gBAC/D,MAAM,IAAI,MAAM,CAAC,wBAAwB,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"_autoload.js","sourceRoot":"","sources":["../../src/services/_autoload.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { type WhookRouteHandler, type WhookObfuscatorService, type WhookRouteHandlerWrapper, type WhookErrorHandler, type WhookOpenAPI, type WhookCoercionOptions, type WhookRouteDefinition, type WhookSchemaValidatorsService, type WhookQueryParserBuilderService, type WhookStringifiers, type WhookParsers, type WhookEncoders, type WhookDecoders } from '@whook/whook';
|
|
2
2
|
import { type LogService } from 'common-services';
|
|
3
|
-
export
|
|
3
|
+
export interface WhookGCPFunctionRouteWrapperDependencies {
|
|
4
4
|
MAIN_DEFINITION: WhookRouteDefinition;
|
|
5
5
|
MAIN_API: WhookOpenAPI;
|
|
6
|
-
DECODERS?:
|
|
7
|
-
ENCODERS?:
|
|
8
|
-
PARSERS?:
|
|
9
|
-
STRINGIFIERS?:
|
|
6
|
+
DECODERS?: WhookDecoders;
|
|
7
|
+
ENCODERS?: WhookEncoders;
|
|
8
|
+
PARSERS?: WhookParsers;
|
|
9
|
+
STRINGIFIERS?: WhookStringifiers;
|
|
10
10
|
queryParserBuilder: WhookQueryParserBuilderService;
|
|
11
11
|
BUFFER_LIMIT?: string;
|
|
12
12
|
COERCION_OPTIONS: WhookCoercionOptions;
|
|
@@ -14,6 +14,6 @@ export type WhookGCPFunctionRouteWrapperDependencies = {
|
|
|
14
14
|
errorHandler: WhookErrorHandler;
|
|
15
15
|
schemaValidators: WhookSchemaValidatorsService;
|
|
16
16
|
log?: LogService;
|
|
17
|
-
}
|
|
18
|
-
declare const _default: import("knifecycle").ServiceInitializer<WhookGCPFunctionRouteWrapperDependencies, WhookRouteHandlerWrapper<WhookRouteHandler
|
|
17
|
+
}
|
|
18
|
+
declare const _default: import("knifecycle").ServiceInitializer<WhookGCPFunctionRouteWrapperDependencies, WhookRouteHandlerWrapper<WhookRouteHandler>>;
|
|
19
19
|
export default _default;
|
|
@@ -3,7 +3,7 @@ import stream from 'node:stream';
|
|
|
3
3
|
import { autoService } from 'knifecycle';
|
|
4
4
|
import bytes from 'bytes';
|
|
5
5
|
import { YHTTPError } from 'yhttperror';
|
|
6
|
-
import { DEFAULT_COERCION_OPTIONS, DEFAULT_BUFFER_LIMIT, DEFAULT_PARSERS, DEFAULT_STRINGIFIERS, DEFAULT_DECODERS, DEFAULT_ENCODERS, SEARCH_SEPARATOR, PATH_SEPARATOR, extractOperationSecurityParameters, prepareBodyValidator, extractBodySpec, extractResponseSpec, checkResponseCharset, checkResponseMediaType, executeHandler, extractProduceableMediaTypes, extractConsumableMediaTypes, getBody, sendBody, noop, identity, lowerCaseHeaders, resolveParameters, createParametersValidators, pickFirstHeaderValue, } from '@whook/whook';
|
|
6
|
+
import { DEFAULT_COERCION_OPTIONS, DEFAULT_BUFFER_LIMIT, DEFAULT_PARSERS, DEFAULT_STRINGIFIERS, DEFAULT_DECODERS, DEFAULT_ENCODERS, SEARCH_SEPARATOR, PATH_SEPARATOR, extractOperationSecurityParameters, prepareBodyValidator, extractBodySpec, extractResponseSpec, checkResponseCharset, checkResponseMediaType, executeHandler, extractProduceableMediaTypes, extractConsumableMediaTypes, getBody, sendBody, noop, identity, lowerCaseHeaders, resolveParameters, createParametersValidators, pickFirstHeaderValue, castWhookHeaders, } from '@whook/whook';
|
|
7
7
|
import { ensureResolvedObject, } from 'ya-open-api-types';
|
|
8
8
|
/**
|
|
9
9
|
* Wrap an handler to make it work with GCP Functions.
|
|
@@ -37,12 +37,12 @@ async function initWrapRouteHandlerForGoogleHTTPFunction({ MAIN_DEFINITION, MAIN
|
|
|
37
37
|
const path = MAIN_DEFINITION.path;
|
|
38
38
|
const pathItem = MAIN_API.paths?.[path];
|
|
39
39
|
if (typeof pathItem === 'undefined' || '$ref' in pathItem) {
|
|
40
|
-
throw new YError('E_BAD_OPERATION', 'pathItem', pathItem);
|
|
40
|
+
throw new YError('E_BAD_OPERATION', ['pathItem', pathItem]);
|
|
41
41
|
}
|
|
42
42
|
const method = MAIN_DEFINITION.method;
|
|
43
43
|
const operation = pathItem[method];
|
|
44
44
|
if (typeof operation === 'undefined' || '$ref' in operation) {
|
|
45
|
-
throw new YError('E_BAD_OPERATION', 'operation', operation);
|
|
45
|
+
throw new YError('E_BAD_OPERATION', ['operation', operation]);
|
|
46
46
|
}
|
|
47
47
|
const pathItemParameters = await resolveParameters({ API: MAIN_API, log }, pathItem.parameters || []);
|
|
48
48
|
const pathItemValidators = await createParametersValidators({
|
|
@@ -119,12 +119,15 @@ async function handleForAWSHTTPFunction({ MAIN_API, DECODERS, ENCODERS, PARSERS,
|
|
|
119
119
|
method: req.method,
|
|
120
120
|
body: req.body,
|
|
121
121
|
// body: obfuscateEventBody(obfuscator, req.body),
|
|
122
|
-
headers: obfuscator.obfuscateSensibleHeaders(req.headers
|
|
122
|
+
headers: obfuscator.obfuscateSensibleHeaders(castWhookHeaders(req.headers)),
|
|
123
123
|
}));
|
|
124
124
|
const request = await gcpfReqToRequest(req);
|
|
125
125
|
let response;
|
|
126
126
|
let responseLog;
|
|
127
|
-
let responseSpec
|
|
127
|
+
let responseSpec = {
|
|
128
|
+
contentTypes: ['binary'],
|
|
129
|
+
charsets: ['utf-8'],
|
|
130
|
+
};
|
|
128
131
|
log?.('debug', 'REQUEST', JSON.stringify({
|
|
129
132
|
...request,
|
|
130
133
|
body: request.body ? 'Stream' : undefined,
|
|
@@ -141,7 +144,7 @@ async function handleForAWSHTTPFunction({ MAIN_API, DECODERS, ENCODERS, PARSERS,
|
|
|
141
144
|
try {
|
|
142
145
|
const path = request.url.split(SEARCH_SEPARATOR)[0];
|
|
143
146
|
const parts = path.split(PATH_SEPARATOR).filter(identity);
|
|
144
|
-
const search = request.url.
|
|
147
|
+
const search = request.url.substring(request.url.split(SEARCH_SEPARATOR)[0].length);
|
|
145
148
|
const queryValues = queryParser(search);
|
|
146
149
|
const pathParameters = definition.path
|
|
147
150
|
.split(PATH_SEPARATOR)
|
|
@@ -199,7 +202,7 @@ async function handleForAWSHTTPFunction({ MAIN_API, DECODERS, ENCODERS, PARSERS,
|
|
|
199
202
|
}
|
|
200
203
|
}
|
|
201
204
|
catch (err) {
|
|
202
|
-
throw YHTTPError.cast(err, 400);
|
|
205
|
+
throw YHTTPError.cast(err, undefined, undefined, 400);
|
|
203
206
|
}
|
|
204
207
|
response = await executeHandler(definition, handler, parametersValues);
|
|
205
208
|
response.headers = response.headers || {};
|
|
@@ -226,7 +229,10 @@ async function handleForAWSHTTPFunction({ MAIN_API, DECODERS, ENCODERS, PARSERS,
|
|
|
226
229
|
responseSchema.type === 'string' &&
|
|
227
230
|
responseSchema.format === 'binary'));
|
|
228
231
|
if (responseHasSchema && !STRINGIFIERS[responseContentType]) {
|
|
229
|
-
throw new YHTTPError(500, 'E_STRINGIFYER_LACK',
|
|
232
|
+
throw new YHTTPError(500, 'E_STRINGIFYER_LACK', [
|
|
233
|
+
response.headers['content-type'],
|
|
234
|
+
response,
|
|
235
|
+
]);
|
|
230
236
|
}
|
|
231
237
|
if (response.body) {
|
|
232
238
|
checkResponseMediaType(request, responseSpec, produceableMediaTypes || []);
|
|
@@ -244,7 +250,7 @@ async function handleForAWSHTTPFunction({ MAIN_API, DECODERS, ENCODERS, PARSERS,
|
|
|
244
250
|
type: 'error',
|
|
245
251
|
code: err?.code || 'E_UNEXPECTED',
|
|
246
252
|
statusCode: response.status,
|
|
247
|
-
params: err?.
|
|
253
|
+
params: err?.debugValues || [],
|
|
248
254
|
stack: printStackTrace(err),
|
|
249
255
|
};
|
|
250
256
|
log?.('error', JSON.stringify(responseLog));
|
|
@@ -258,8 +264,8 @@ async function handleForAWSHTTPFunction({ MAIN_API, DECODERS, ENCODERS, PARSERS,
|
|
|
258
264
|
}
|
|
259
265
|
log?.('debug', 'RESPONSE', JSON.stringify({
|
|
260
266
|
...response,
|
|
261
|
-
body: obfuscateEventBody(obfuscator, response.body),
|
|
262
|
-
headers: obfuscator.obfuscateSensibleHeaders(response.headers),
|
|
267
|
+
body: obfuscateEventBody(obfuscator, response.body || {}),
|
|
268
|
+
headers: obfuscator.obfuscateSensibleHeaders(response.headers || {}),
|
|
263
269
|
}));
|
|
264
270
|
await pipeResponseInGCPFResponse(await sendBody({
|
|
265
271
|
ENCODERS,
|
|
@@ -269,7 +275,7 @@ async function handleForAWSHTTPFunction({ MAIN_API, DECODERS, ENCODERS, PARSERS,
|
|
|
269
275
|
async function gcpfReqToRequest(req) {
|
|
270
276
|
const request = {
|
|
271
277
|
method: req.method.toLowerCase(),
|
|
272
|
-
headers: lowerCaseHeaders(req.headers
|
|
278
|
+
headers: lowerCaseHeaders(castWhookHeaders(req.headers)),
|
|
273
279
|
url: req.originalUrl,
|
|
274
280
|
};
|
|
275
281
|
if (req.rawBody) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapRouteHandlerForGoogleHTTPFunction.js","sourceRoot":"","sources":["../../src/wrappers/wrapRouteHandlerForGoogleHTTPFunction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;AACjD,OAAO,MAAyB,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EACL,wBAAwB,EACxB,oBAAoB,EACpB,eAAe,EACf,oBAAoB,EACpB,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,cAAc,EACd,kCAAkC,EAClC,oBAAoB,EACpB,eAAe,EACf,mBAAmB,EACnB,oBAAoB,EACpB,sBAAsB,EACtB,cAAc,EACd,4BAA4B,EAC5B,2BAA2B,EAC3B,OAAO,EACP,QAAQ,EACR,IAAI,EACJ,QAAQ,EACR,gBAAgB,EAChB,iBAAiB,EACjB,0BAA0B,EAC1B,oBAAoB,GAerB,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,oBAAoB,GAIrB,MAAM,mBAAmB,CAAC;AAmB3B;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,KAAK,UAAU,yCAAyC,CAAC,EACvD,eAAe,EACf,QAAQ,EACR,QAAQ,GAAG,gBAAgB,EAC3B,QAAQ,GAAG,gBAAgB,EAC3B,OAAO,GAAG,eAAe,EACzB,YAAY,GAAG,oBAAoB,EACnC,YAAY,GAAG,oBAAoB,EACnC,kBAAkB,EAClB,gBAAgB,GAAG,wBAAwB,EAC3C,UAAU,EACV,YAAY,EACZ,gBAAgB,EAChB,GAAG,GAAG,IAAI,GAC+B;IAGzC,GAAG,CAAC,OAAO,EAAE,6CAA6C,CAAC,CAAC;IAE5D,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC;IAClC,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,CAAC;IAExC,IAAI,OAAO,QAAQ,KAAK,WAAW,IAAI,MAAM,IAAI,QAAQ,EAAE,CAAC;QAC1D,MAAM,IAAI,MAAM,CAAC,iBAAiB,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;IAC5D,CAAC;IAED,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC;IACtC,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;IAEnC,IAAI,OAAO,SAAS,KAAK,WAAW,IAAI,MAAM,IAAI,SAAS,EAAE,CAAC;QAC5D,MAAM,IAAI,MAAM,CAAC,iBAAiB,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;IAC9D,CAAC;IAED,MAAM,kBAAkB,GAAG,MAAM,iBAAiB,CAChD,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,EACtB,QAAQ,CAAC,UAAU,IAAI,EAAE,CAC1B,CAAC;IACF,MAAM,kBAAkB,GAAG,MAAM,0BAA0B,CACzD;QACE,GAAG,EAAE,QAAQ;QACb,gBAAgB;QAChB,gBAAgB;KACjB,EACD,kBAAkB,CACnB,CAAC;IAEF,MAAM,mBAAmB,GAAG,MAAM,iBAAiB,CACjD,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,EACtB,SAAS,CAAC,UAAU,IAAI,EAAE,CAC3B,CAAC;IACF,MAAM,kBAAkB,GAAG,MAAM,iBAAiB,CAChD,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,EACtB,MAAM,kCAAkC,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,SAAS,CAAC,CACvE,CAAC;IACF,MAAM,mBAAmB,GAAG,MAAM,0BAA0B,CAC1D;QACE,GAAG,EAAE,QAAQ;QACb,gBAAgB;QAChB,gBAAgB;KACjB,EACD,mBAAmB,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAC/C,CAAC;IACF,MAAM,aAAa,GAAG,MAAM,oBAAoB,CAC9C,EAAE,GAAG,EAAE,QAAQ,EAAE,gBAAgB,EAAE,EACnC,SAAS,CACV,CAAC;IACF,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACjD,MAAM,mBAAmB,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAClD,MAAM,oBAAoB,GAAG,MAAM,2BAA2B,CAC5D,QAAQ,EACR,SAAS,CACV,CAAC;IACF,MAAM,qBAAqB,GAAG,MAAM,4BAA4B,CAC9D,QAAQ,EACR,SAAS,CACV,CAAC;IACF,MAAM,UAAU,GAAG,kBAAkB;SAClC,MAAM,CAAC,kBAAkB,CAAC;SAC1B,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CACpB,mBAAmB,CAAC,KAAK,CACvB,CAAC,UAAU,EAAE,EAAE,CACb,UAAU,CAAC,EAAE,KAAK,SAAS,CAAC,EAAE,IAAI,UAAU,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,CACvE,CACF;SACA,MAAM,CAAC,mBAAmB,CAAC,CAAC;IAC/B,MAAM,WAAW,GAAG,MAAM,kBAAkB,CAAC,UAAU,CAAC,CAAC;IACzD,MAAM,OAAO,GAAG,KAAK,EACnB,OAA0B,EACE,EAAE;QAC9B,MAAM,cAAc,GAAG,wBAAwB,CAAC,IAAI,CAClD,IAAI,EACJ;YACE,eAAe;YACf,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,OAAO;YACP,YAAY;YACZ,YAAY;YACZ,UAAU;YACV,YAAY;YACZ,GAAG;SACJ,EACD;YACE,kBAAkB;YAClB,mBAAmB;YACnB,OAAO;YACP,SAAS;YACT,MAAM,EAAE,eAAe,CAAC,MAAM,IAAI,EAAE;YACpC,WAAW;YACX,oBAAoB,EAAE;gBACpB,IAAI,EAAE;oBACJ,GAAG,kBAAkB,CAAC,IAAI;oBAC1B,GAAG,mBAAmB,CAAC,IAAI;iBAC5B;gBACD,KAAK,EAAE;oBACL,GAAG,kBAAkB,CAAC,KAAK;oBAC3B,GAAG,mBAAmB,CAAC,KAAK;iBAC7B;gBACD,MAAM,EAAE;oBACN,GAAG,kBAAkB,CAAC,MAAM;oBAC5B,GAAG,mBAAmB,CAAC,MAAM;iBAC9B;gBACD,MAAM,EAAE;oBACN,GAAG,kBAAkB,CAAC,MAAM;oBAC5B,GAAG,mBAAmB,CAAC,MAAM;iBAC9B;aACF;YACD,oBAAoB;YACpB,qBAAqB;YACrB,aAAa;SACd,EACD,eAAe,CAChB,CAAC;QAEF,OAAO,cAA8C,CAAC;IACxD,CAAC,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,KAAK,UAAU,wBAAwB,CACrC,EACE,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,OAAO,EACP,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,YAAY,EACZ,GAAG,GAIJ,EACD,EACE,OAAO,EACP,SAAS,EACT,oBAAoB,EACpB,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,mBAAmB,EACnB,WAAW,EACX,aAAa,GAId,EACD,UAAgC,EAChC,GAAG,EACH,GAAG;IAEH,MAAM,WAAW,GACf,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,IAAK,KAAK,CAAC,KAAK,CAAC,oBAAoB,CAAY,CAAC;IAE7E,GAAG,EAAE,CACH,MAAM,EACN,uBAAuB,EACvB,IAAI,CAAC,SAAS,CAAC;QACb,GAAG,EAAE,GAAG,CAAC,WAAW;QACpB,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,kDAAkD;QAClD,OAAO,EAAE,UAAU,CAAC,wBAAwB,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;KAChE,CAAC,CACH,CAAC;IAEF,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAC5C,IAAI,QAAQ,CAAC;IACb,IAAI,WAAW,CAAC;IAChB,IAAI,YAAY,CAAC;IAEjB,GAAG,EAAE,CACH,OAAO,EACP,SAAS,EACT,IAAI,CAAC,SAAS,CAAC;QACb,GAAG,OAAO;QACV,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;QACzC,OAAO,EAAE,UAAU,CAAC,wBAAwB,CAAC,OAAO,CAAC,OAAO,CAAC;KAC9D,CAAC,CACH,CAAC;IAEF,MAAM,gBAAgB,GAAgC;QACpD,KAAK,EAAE,EAAE;QACT,OAAO,EAAE,EAAE;QACX,IAAI,EAAE,EAAE;QACR,OAAO,EAAE,EAAE;QACX,IAAI,EAAE,SAAwC;KAC/C,CAAC;IAEF,IAAI,CAAC;QACH,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;YACpD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC1D,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAC/B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAC9C,CAAC;YACF,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;YACxC,MAAM,cAAc,GAClB,UAAU,CAAC,IAAI;iBACZ,KAAK,CAAC,cAAc,CAAC;iBACrB,MAAM,CAAC,QAAQ,CAAC;iBAChB,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;gBACnB,MAAM,OAAO,GAAG,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAE9C,IAAI,OAAO,EAAE,CAAC;oBACZ,OAAO;wBACL,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;wBAChB,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC;qBACpB,CAAC;gBACJ,CAAC;YACH,CAAC,CACJ;iBACE,MAAM,CAAC,QAAQ,CAAC;iBAChB,MAAM,CACL,CAAC,aAAa,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;gBACnC,GAAG,aAAa;gBAChB,CAAC,IAAI,CAAC,EAAE,KAAK;aACd,CAAC,EACF,EAAE,CACH,CAAC;YAEJ,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC;gBACzD,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;oBACzB,KAAK,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAC5C,oBAAoB,CAAC,KAAK,CAC3B,EAAE,CAAC;wBACF,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,SAAS,CACtC,WAAW,IAAI,OAAO,WAAW,CAAC,IAAI,CAAC,KAAK,WAAW;4BACrD,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE;4BAC/B,CAAC,CAAC,SAAS,CACd,CAAC;oBACJ,CAAC;gBACH,CAAC;qBAAM,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;oBACjC,KAAK,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAC5C,oBAAoB,CAAC,MAAM,CAC5B,EAAE,CAAC;wBACF,oCAAoC;wBACpC,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;wBAEzC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS,CACxC,OAAO,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,WAAW;4BACnD,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE;4BAC3C,CAAC,CAAC,SAAS,CACd,CAAC;oBACJ,CAAC;gBACH,CAAC;qBAAM,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;oBAC/B,KAAK,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAC5C,oBAAoB,CAAC,IAAI,CAC1B,EAAE,CAAC;wBACF,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,SAAS,CACrC,cAAc,IAAI,OAAO,cAAc,CAAC,IAAI,CAAC,KAAK,WAAW;4BAC3D,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;4BACjC,CAAC,CAAC,SAAS,CACd,CAAC;oBACJ,CAAC;gBACH,CAAC;YACH,CAAC;YAED,MAAM,QAAQ,GAAG,eAAe,CAC9B,OAAO,EACP,oBAAoB,IAAI,EAAE,EAC1B,kBAAkB,CACnB,CAAC;YAEF,YAAY,GAAG,mBAAmB,CAChC,SAAS,EACT,OAAO,EACP,qBAAqB,IAAI,EAAE,EAC3B,mBAAmB,CACpB,CAAC;YAEF,MAAM,IAAI,GAAG,MAAM,OAAO,CACxB;gBACE,GAAG,EAAE,QAAQ;gBACb,QAAQ;gBACR,OAAO;gBACP,WAAW;aACZ,EACD,SAAS,EACT,OAAO,CAAC,IAAgB,EACxB,QAAQ,CACT,CAAC;YAEF,aAAa,CAAC,SAAS,EAAE,QAAQ,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;YAErD,IAAI,OAAO,IAAI,KAAK,WAAW,EAAE,CAAC;gBAChC,gBAAgB,CAAC,IAAI,GAAG,IAAI,CAAC;YAC/B,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,UAAU,CAAC,IAAI,CAAC,GAAY,EAAE,GAAG,CAAC,CAAC;QAC3C,CAAC;QAED,QAAQ,GAAG,MAAM,cAAc,CAAC,UAAU,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC;QAEvE,QAAQ,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAC;QAE1C,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;YAClB,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC;gBAC9B,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,YAAY,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACrE,CAAC;QAED,MAAM,mBAAmB,GACvB,oBAAoB,CAAC,cAAc,EAAE,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAC;YAC5D,YAAY,CAAC;QAEf,MAAM,cAAc,GAClB,SAAS,CAAC,SAAS,IAAI,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC;YACzD,CAAC,CAAC,MAAM,oBAAoB,CACxB,QAAQ,EACR,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAI9B,CACN;YACH,CAAC,CAAC,SAAS,CAAC;QAChB,MAAM,cAAc,GAClB,cAAc;YACd,cAAc,CAAC,OAAO;YACtB,cAAc,CAAC,OAAO,EAAE,CAAC,mBAAmB,CAAC;YAC7C,QAAQ,IAAI,cAAc,CAAC,OAAO,CAAC,mBAAmB,CAAC;YACtD,CAAC,MAAM,oBAAoB,CAC1B,QAAQ,EACR,cAAc,CAAC,OAAO,EAAE,CAAC,mBAAmB,CAAC,CAAC,MAAM,CACrD,CAA0B,CAAC;QAE9B,8CAA8C;QAC9C,uCAAuC;QACvC,MAAM,iBAAiB,GACrB,OAAO,cAAc,KAAK,SAAS;YACnC,CAAC,OAAO,cAAc,KAAK,QAAQ;gBACjC,cAAc;gBACd,CAAC,CACC,MAAM,IAAI,cAAc;oBACxB,cAAc,CAAC,IAAI,KAAK,QAAQ;oBAChC,cAAc,CAAC,MAAM,KAAK,QAAQ,CACnC,CAAC,CAAC;QAEP,IAAI,iBAAiB,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,EAAE,CAAC;YAC5D,MAAM,IAAI,UAAU,CAClB,GAAG,EACH,oBAAoB,EACpB,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,EAChC,QAAQ,CACT,CAAC;QACJ,CAAC;QACD,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;YAClB,sBAAsB,CACpB,OAAO,EACP,YAAY,EACZ,qBAAqB,IAAI,EAAE,CAC5B,CAAC;YACF,oBAAoB,CAAC,OAAO,EAAE,YAAY,EAAE,mBAAmB,CAAC,CAAC;QACnE,CAAC;QACD,WAAW,GAAG;YACZ,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,QAAQ,CAAC,MAAM;SACxB,CAAC;QACF,GAAG,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;IAC9C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,QAAQ,GAAG,MAAM,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,GAAY,CAAC,CAAC;QAClE,WAAW,GAAG;YACZ,IAAI,EAAE,OAAO;YACb,IAAI,EAAG,GAAc,EAAE,IAAI,IAAI,cAAc;YAC7C,UAAU,EAAE,QAAQ,CAAC,MAAM;YAC3B,MAAM,EAAG,GAAc,EAAE,MAAM,IAAI,EAAE;YACrC,KAAK,EAAE,eAAe,CAAC,GAAY,CAAC;SACrC,CAAC;QAEF,GAAG,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;QAE5C,QAAQ,GAAG;YACT,GAAG,QAAQ;YACX,OAAO,EAAE;gBACP,GAAG,QAAQ,CAAC,OAAO;gBACnB,cAAc,EAAE,kBAAkB;aACnC;SACF,CAAC;IACJ,CAAC;IAED,GAAG,EAAE,CACH,OAAO,EACP,UAAU,EACV,IAAI,CAAC,SAAS,CAAC;QACb,GAAG,QAAQ;QACX,IAAI,EAAE,kBAAkB,CAAC,UAAU,EAAE,QAAQ,CAAC,IAAI,CAAC;QACnD,OAAO,EAAE,UAAU,CAAC,wBAAwB,CAAC,QAAQ,CAAC,OAAO,CAAC;KAC/D,CAAC,CACH,CAAC;IAEF,MAAM,0BAA0B,CAC9B,MAAM,QAAQ,CACZ;QACE,QAAQ;QACR,YAAY;KACb,EACD,QAAQ,CACT,EACD,GAAG,CACJ,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,gBAAgB,CAAC,GAAG;IACjC,MAAM,OAAO,GAAiB;QAC5B,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE;QAChC,OAAO,EAAE,gBAAgB,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;QAC5C,GAAG,EAAE,GAAG,CAAC,WAAW;KACrB,CAAC;IAEF,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;QAChB,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QAClE,MAAM,UAAU,GAAG,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;QAE5C,OAAO,CAAC,IAAI,GAAG,UAAU,CAAC;QAC1B,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC9B,UAAU,CAAC,GAAG,EAAE,CAAC;IACnB,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,KAAK,UAAU,0BAA0B,CACvC,QAAuB,EACvB,GAAG;IAEH,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QACzD,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IACH,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAE5B,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;QACjB,QAAQ,CAAC,IAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACtC,OAAO;IACT,CAAC;IAED,GAAG,CAAC,GAAG,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,kBAAkB,CAAC,UAAU,EAAE,OAAO;IAC7C,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QAChC,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAErC,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,CAAC;YACnE,2BAA2B;QAC7B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC,CAAA,CAAC;IAClB,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,eAAe,WAAW,CAAC,yCAAyC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"wrapRouteHandlerForGoogleHTTPFunction.js","sourceRoot":"","sources":["../../src/wrappers/wrapRouteHandlerForGoogleHTTPFunction.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
}
|
|
30
30
|
},
|
|
31
31
|
"name": "@whook/gcp-functions",
|
|
32
|
-
"version": "
|
|
32
|
+
"version": "21.0.0",
|
|
33
33
|
"description": "Build and deploy to GCP Cloud Functions with Whook.",
|
|
34
34
|
"type": "module",
|
|
35
35
|
"main": "dist/index.js",
|
|
@@ -49,45 +49,44 @@
|
|
|
49
49
|
},
|
|
50
50
|
"homepage": "https://github.com/nfroidure/whook",
|
|
51
51
|
"dependencies": {
|
|
52
|
-
"@whook/cors": "^
|
|
53
|
-
"@whook/whook": "^
|
|
54
|
-
"ajv": "^8.
|
|
52
|
+
"@whook/cors": "^21.0.0",
|
|
53
|
+
"@whook/whook": "^21.0.0",
|
|
54
|
+
"ajv": "^8.18.0",
|
|
55
55
|
"ajv-formats": "^3.0.1",
|
|
56
|
-
"application-services": "^
|
|
57
|
-
"camelcase": "^
|
|
58
|
-
"common-services": "^
|
|
56
|
+
"application-services": "^8.0.1",
|
|
57
|
+
"camelcase": "^9.0.0",
|
|
58
|
+
"common-services": "^18.0.1",
|
|
59
59
|
"cpr": "3.0.1",
|
|
60
|
-
"knifecycle": "^
|
|
60
|
+
"knifecycle": "^20.0.0",
|
|
61
61
|
"mkdirp": "^3.0.1",
|
|
62
|
-
"qs": "^6.
|
|
63
|
-
"strict-qs": "^
|
|
64
|
-
"ya-json-schema-types": "^
|
|
65
|
-
"ya-open-api-types": "^1.
|
|
66
|
-
"yerror": "^
|
|
67
|
-
"yhttperror": "^
|
|
62
|
+
"qs": "^6.15.0",
|
|
63
|
+
"strict-qs": "^9.0.0",
|
|
64
|
+
"ya-json-schema-types": "^2.0.0",
|
|
65
|
+
"ya-open-api-types": "^2.1.0",
|
|
66
|
+
"yerror": "^9.1.1",
|
|
67
|
+
"yhttperror": "^9.0.1"
|
|
68
68
|
},
|
|
69
69
|
"devDependencies": {
|
|
70
|
-
"@eslint/js": "^
|
|
71
|
-
"@swc/cli": "^0.
|
|
72
|
-
"@swc/core": "^1.
|
|
73
|
-
"@swc/helpers": "^0.5.17",
|
|
70
|
+
"@eslint/js": "^10.0.1",
|
|
71
|
+
"@swc/cli": "^0.8.0",
|
|
72
|
+
"@swc/core": "^1.15.21",
|
|
74
73
|
"@swc/jest": "^0.2.39",
|
|
75
|
-
"eslint": "^
|
|
76
|
-
"eslint-config-prettier": "^10.1.
|
|
77
|
-
"eslint-plugin-jest": "^29.
|
|
78
|
-
"eslint-plugin-prettier": "^5.5.
|
|
79
|
-
"jest": "^30.0
|
|
80
|
-
"jsdoc-to-markdown": "^9.1.
|
|
81
|
-
"metapak": "^
|
|
82
|
-
"metapak-nfroidure": "
|
|
83
|
-
"prettier": "^3.
|
|
84
|
-
"rimraf": "^6.
|
|
85
|
-
"typescript": "^
|
|
86
|
-
"typescript-eslint": "^8.
|
|
74
|
+
"eslint": "^10.1.0",
|
|
75
|
+
"eslint-config-prettier": "^10.1.8",
|
|
76
|
+
"eslint-plugin-jest": "^29.15.1",
|
|
77
|
+
"eslint-plugin-prettier": "^5.5.5",
|
|
78
|
+
"jest": "^30.3.0",
|
|
79
|
+
"jsdoc-to-markdown": "^9.1.3",
|
|
80
|
+
"metapak": "^7.0.0",
|
|
81
|
+
"metapak-nfroidure": "22.0.2",
|
|
82
|
+
"prettier": "^3.8.1",
|
|
83
|
+
"rimraf": "^6.1.3",
|
|
84
|
+
"typescript": "^6.0.2",
|
|
85
|
+
"typescript-eslint": "^8.57.2"
|
|
87
86
|
},
|
|
88
87
|
"contributors": [],
|
|
89
88
|
"engines": {
|
|
90
|
-
"node": ">=
|
|
89
|
+
"node": ">=24.14.0"
|
|
91
90
|
},
|
|
92
91
|
"files": [
|
|
93
92
|
"dist",
|
|
@@ -127,8 +126,7 @@
|
|
|
127
126
|
},
|
|
128
127
|
"extensionsToTreatAsEsm": [
|
|
129
128
|
".ts"
|
|
130
|
-
]
|
|
131
|
-
"prettierPath": null
|
|
129
|
+
]
|
|
132
130
|
},
|
|
133
131
|
"scripts": {
|
|
134
132
|
"build": "rimraf 'dist' && tsc --outDir dist",
|
|
@@ -143,9 +141,20 @@
|
|
|
143
141
|
"rebuild": "swc ./src -s -d dist -C jsc.target=es2022",
|
|
144
142
|
"test": "node --run jest"
|
|
145
143
|
},
|
|
146
|
-
"gitHead": "
|
|
144
|
+
"gitHead": "72b075751624f2928dde6b0ea722931d7f914420",
|
|
147
145
|
"funding": {
|
|
148
146
|
"type": "individual",
|
|
149
147
|
"url": "https://github.com/sponsors/nfroidure"
|
|
148
|
+
},
|
|
149
|
+
"overrides": {
|
|
150
|
+
"typescript-eslint": {
|
|
151
|
+
"typescript": "^6"
|
|
152
|
+
},
|
|
153
|
+
"@typescript-eslint/eslint-plugin": {
|
|
154
|
+
"typescript": "^6"
|
|
155
|
+
},
|
|
156
|
+
"@typescript-eslint/parser": {
|
|
157
|
+
"typescript": "^6"
|
|
158
|
+
}
|
|
150
159
|
}
|
|
151
160
|
}
|
package/src/index.ts
CHANGED
|
@@ -41,10 +41,10 @@ export { initWrapRouteHandlerForGoogleHTTPFunction };
|
|
|
41
41
|
export type WhookGCPFunctionBuildConfig = {
|
|
42
42
|
BUILD_PARALLELISM?: number;
|
|
43
43
|
};
|
|
44
|
-
export
|
|
44
|
+
export interface WhookGCPFunctionBaseConfig {
|
|
45
45
|
staticFiles?: string[];
|
|
46
46
|
compilerOptions?: WhookCompilerOptions;
|
|
47
|
-
}
|
|
47
|
+
}
|
|
48
48
|
export type WhookGCPFunctionRouteConfig = WhookGCPFunctionBaseConfig;
|
|
49
49
|
|
|
50
50
|
const cprAsync = promisify(cpr) as (
|
|
@@ -84,15 +84,17 @@ export async function runBuild(
|
|
|
84
84
|
$autoload,
|
|
85
85
|
DEFINITIONS,
|
|
86
86
|
buildInitializer,
|
|
87
|
-
}
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
87
|
+
} = await $.run<
|
|
88
|
+
WhookGCPFunctionBuildConfig & {
|
|
89
|
+
APP_ENV: string;
|
|
90
|
+
PROJECT_DIR: string;
|
|
91
|
+
compiler: WhookCompilerService;
|
|
92
|
+
log: LogService;
|
|
93
|
+
$autoload: Autoloader<Initializer<Dependencies, Service>>;
|
|
94
|
+
DEFINITIONS: WhookDefinitions;
|
|
95
|
+
buildInitializer: BuildInitializer;
|
|
96
|
+
}
|
|
97
|
+
>([
|
|
96
98
|
'APP_ENV',
|
|
97
99
|
'?BUILD_PARALLELISM',
|
|
98
100
|
'PROJECT_DIR',
|
|
@@ -251,7 +253,7 @@ async function buildHandler(
|
|
|
251
253
|
} catch (err) {
|
|
252
254
|
log('error', `💥 - Error building "${handlerName}"...`);
|
|
253
255
|
log('error-stack', printStackTrace(err as Error));
|
|
254
|
-
throw YError.wrap(err as Error, 'E_HANDLER_BUILD', handlerName);
|
|
256
|
+
throw YError.wrap(err as Error, 'E_HANDLER_BUILD', [handlerName]);
|
|
255
257
|
}
|
|
256
258
|
}
|
|
257
259
|
|
|
@@ -284,7 +286,10 @@ async function buildFinalHandler(
|
|
|
284
286
|
const entryPoint = `${handlerPath}/main.js`;
|
|
285
287
|
const { extension, contents, mappings } = await compiler(
|
|
286
288
|
entryPoint,
|
|
287
|
-
DEFINITIONS[handlerName]?.config
|
|
289
|
+
DEFINITIONS.configs[handlerName]?.config &&
|
|
290
|
+
'compilerOptions' in DEFINITIONS.configs[handlerName].config
|
|
291
|
+
? DEFINITIONS.configs[handlerName]?.config.compilerOptions
|
|
292
|
+
: undefined,
|
|
288
293
|
);
|
|
289
294
|
|
|
290
295
|
await Promise.all([
|
package/src/libs/utils.ts
CHANGED
|
@@ -31,11 +31,11 @@ export async function loadFunction(
|
|
|
31
31
|
const module = await import(modulePath);
|
|
32
32
|
|
|
33
33
|
if (!module) {
|
|
34
|
-
throw new YError('E_MODULE_NOT_FOUND', module);
|
|
34
|
+
throw new YError('E_MODULE_NOT_FOUND', [module]);
|
|
35
35
|
}
|
|
36
36
|
|
|
37
37
|
if (!module.default) {
|
|
38
|
-
throw new YError('E_LAMBDA_NOT_FOUND', module, Object.keys(module));
|
|
38
|
+
throw new YError('E_LAMBDA_NOT_FOUND', [module, Object.keys(module)]);
|
|
39
39
|
}
|
|
40
40
|
|
|
41
41
|
return module.default;
|
|
@@ -26,18 +26,18 @@ import { type LogService } from 'common-services';
|
|
|
26
26
|
import { cleanupOpenAPI } from 'ya-open-api-types';
|
|
27
27
|
import initWrapRouteHandlerForGoogleHTTPFunction from '../wrappers/wrapRouteHandlerForGoogleHTTPFunction.js';
|
|
28
28
|
|
|
29
|
-
export
|
|
29
|
+
export interface GCPFunctionDefinition {
|
|
30
30
|
name: string;
|
|
31
31
|
type: 'route';
|
|
32
32
|
definition: WhookRouteDefinition;
|
|
33
33
|
openAPI: WhookOpenAPI;
|
|
34
|
-
}
|
|
34
|
+
}
|
|
35
35
|
|
|
36
|
-
export
|
|
36
|
+
export interface WhookGoogleFunctionsAutoloadDependencies {
|
|
37
37
|
$injector: Injector<Service>;
|
|
38
38
|
$instance: Knifecycle;
|
|
39
39
|
log?: LogService;
|
|
40
|
-
}
|
|
40
|
+
}
|
|
41
41
|
|
|
42
42
|
const initializerWrapper: ServiceInitializerWrapper<
|
|
43
43
|
Autoloader<Initializer<Dependencies, Service>>,
|
|
@@ -66,15 +66,18 @@ const initializerWrapper: ServiceInitializerWrapper<
|
|
|
66
66
|
|
|
67
67
|
if (!config) {
|
|
68
68
|
log('error', '💥 - Unable to find a GCP Function definition!');
|
|
69
|
-
throw new YError('E_DEFINITION_NOT_FOUND', serviceName, cleanedName);
|
|
69
|
+
throw new YError('E_DEFINITION_NOT_FOUND', [serviceName, cleanedName]);
|
|
70
70
|
}
|
|
71
71
|
|
|
72
72
|
if (!config || config.type !== 'route') {
|
|
73
73
|
log('error', '💥 - GCP Function only supports routes!');
|
|
74
|
-
throw new YError('E_UNSUPPORTED_DEFINITION',
|
|
74
|
+
throw new YError('E_UNSUPPORTED_DEFINITION', [
|
|
75
|
+
serviceName,
|
|
76
|
+
cleanedName,
|
|
77
|
+
]);
|
|
75
78
|
}
|
|
76
79
|
|
|
77
|
-
const openAPI =
|
|
80
|
+
const openAPI = await cleanupOpenAPI({
|
|
78
81
|
...API,
|
|
79
82
|
paths: {
|
|
80
83
|
[config.path]: {
|
|
@@ -82,7 +85,7 @@ const initializerWrapper: ServiceInitializerWrapper<
|
|
|
82
85
|
[config.method]: API.paths?.[config.path]?.[config.method],
|
|
83
86
|
},
|
|
84
87
|
},
|
|
85
|
-
}
|
|
88
|
+
} as WhookOpenAPI);
|
|
86
89
|
|
|
87
90
|
return {
|
|
88
91
|
name: cleanedName,
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { YError, printStackTrace } from 'yerror';
|
|
2
|
-
import stream, { type Readable } from 'node:stream';
|
|
2
|
+
import stream, { type Readable, type Writable } from 'node:stream';
|
|
3
3
|
import { autoService } from 'knifecycle';
|
|
4
4
|
import bytes from 'bytes';
|
|
5
5
|
import { YHTTPError } from 'yhttperror';
|
|
@@ -43,6 +43,12 @@ import {
|
|
|
43
43
|
type WhookSchemaValidatorsService,
|
|
44
44
|
type WhookRouteHandlerParameters,
|
|
45
45
|
type WhookQueryParserBuilderService,
|
|
46
|
+
castWhookHeaders,
|
|
47
|
+
type WhookStringifiers,
|
|
48
|
+
type WhookParsers,
|
|
49
|
+
type WhookEncoders,
|
|
50
|
+
type WhookDecoders,
|
|
51
|
+
type WhookResponseBodySpec,
|
|
46
52
|
} from '@whook/whook';
|
|
47
53
|
import { type LogService } from 'common-services';
|
|
48
54
|
import {
|
|
@@ -52,14 +58,27 @@ import {
|
|
|
52
58
|
type OpenAPIResponse,
|
|
53
59
|
} from 'ya-open-api-types';
|
|
54
60
|
import { type ExpressiveJSONSchema } from 'ya-json-schema-types';
|
|
61
|
+
import { type IncomingMessage } from 'node:http';
|
|
62
|
+
|
|
63
|
+
interface GCPRequest {
|
|
64
|
+
method: string;
|
|
65
|
+
originalUrl: string;
|
|
66
|
+
body: object;
|
|
67
|
+
rawBody: string;
|
|
68
|
+
headers: IncomingMessage['headers'];
|
|
69
|
+
}
|
|
70
|
+
interface GCPResponse extends Writable {
|
|
71
|
+
set(name: string, value: unknown): void;
|
|
72
|
+
status(value: number): void;
|
|
73
|
+
}
|
|
55
74
|
|
|
56
|
-
export
|
|
75
|
+
export interface WhookGCPFunctionRouteWrapperDependencies {
|
|
57
76
|
MAIN_DEFINITION: WhookRouteDefinition;
|
|
58
77
|
MAIN_API: WhookOpenAPI;
|
|
59
|
-
DECODERS?:
|
|
60
|
-
ENCODERS?:
|
|
61
|
-
PARSERS?:
|
|
62
|
-
STRINGIFIERS?:
|
|
78
|
+
DECODERS?: WhookDecoders;
|
|
79
|
+
ENCODERS?: WhookEncoders;
|
|
80
|
+
PARSERS?: WhookParsers;
|
|
81
|
+
STRINGIFIERS?: WhookStringifiers;
|
|
63
82
|
queryParserBuilder: WhookQueryParserBuilderService;
|
|
64
83
|
BUFFER_LIMIT?: string;
|
|
65
84
|
COERCION_OPTIONS: WhookCoercionOptions;
|
|
@@ -67,7 +86,7 @@ export type WhookGCPFunctionRouteWrapperDependencies = {
|
|
|
67
86
|
errorHandler: WhookErrorHandler;
|
|
68
87
|
schemaValidators: WhookSchemaValidatorsService;
|
|
69
88
|
log?: LogService;
|
|
70
|
-
}
|
|
89
|
+
}
|
|
71
90
|
|
|
72
91
|
/**
|
|
73
92
|
* Wrap an handler to make it work with GCP Functions.
|
|
@@ -120,14 +139,14 @@ async function initWrapRouteHandlerForGoogleHTTPFunction({
|
|
|
120
139
|
const pathItem = MAIN_API.paths?.[path];
|
|
121
140
|
|
|
122
141
|
if (typeof pathItem === 'undefined' || '$ref' in pathItem) {
|
|
123
|
-
throw new YError('E_BAD_OPERATION', 'pathItem', pathItem);
|
|
142
|
+
throw new YError('E_BAD_OPERATION', ['pathItem', pathItem]);
|
|
124
143
|
}
|
|
125
144
|
|
|
126
145
|
const method = MAIN_DEFINITION.method;
|
|
127
146
|
const operation = pathItem[method];
|
|
128
147
|
|
|
129
148
|
if (typeof operation === 'undefined' || '$ref' in operation) {
|
|
130
|
-
throw new YError('E_BAD_OPERATION', 'operation', operation);
|
|
149
|
+
throw new YError('E_BAD_OPERATION', ['operation', operation]);
|
|
131
150
|
}
|
|
132
151
|
|
|
133
152
|
const pathItemParameters = await resolveParameters(
|
|
@@ -268,8 +287,8 @@ async function handleForAWSHTTPFunction(
|
|
|
268
287
|
produceableCharsets: string[];
|
|
269
288
|
},
|
|
270
289
|
definition: WhookRouteDefinition,
|
|
271
|
-
req,
|
|
272
|
-
res,
|
|
290
|
+
req: GCPRequest,
|
|
291
|
+
res: GCPResponse,
|
|
273
292
|
) {
|
|
274
293
|
const bufferLimit =
|
|
275
294
|
bytes.parse(BUFFER_LIMIT) || (bytes.parse(DEFAULT_BUFFER_LIMIT) as number);
|
|
@@ -282,14 +301,19 @@ async function handleForAWSHTTPFunction(
|
|
|
282
301
|
method: req.method,
|
|
283
302
|
body: req.body,
|
|
284
303
|
// body: obfuscateEventBody(obfuscator, req.body),
|
|
285
|
-
headers: obfuscator.obfuscateSensibleHeaders(
|
|
304
|
+
headers: obfuscator.obfuscateSensibleHeaders(
|
|
305
|
+
castWhookHeaders(req.headers),
|
|
306
|
+
),
|
|
286
307
|
}),
|
|
287
308
|
);
|
|
288
309
|
|
|
289
310
|
const request = await gcpfReqToRequest(req);
|
|
290
|
-
let response;
|
|
311
|
+
let response: WhookResponse;
|
|
291
312
|
let responseLog;
|
|
292
|
-
let responseSpec
|
|
313
|
+
let responseSpec: WhookResponseBodySpec = {
|
|
314
|
+
contentTypes: ['binary'],
|
|
315
|
+
charsets: ['utf-8'],
|
|
316
|
+
};
|
|
293
317
|
|
|
294
318
|
log?.(
|
|
295
319
|
'debug',
|
|
@@ -313,7 +337,7 @@ async function handleForAWSHTTPFunction(
|
|
|
313
337
|
try {
|
|
314
338
|
const path = request.url.split(SEARCH_SEPARATOR)[0];
|
|
315
339
|
const parts = path.split(PATH_SEPARATOR).filter(identity);
|
|
316
|
-
const search = request.url.
|
|
340
|
+
const search = request.url.substring(
|
|
317
341
|
request.url.split(SEARCH_SEPARATOR)[0].length,
|
|
318
342
|
);
|
|
319
343
|
const queryValues = queryParser(search);
|
|
@@ -321,7 +345,7 @@ async function handleForAWSHTTPFunction(
|
|
|
321
345
|
definition.path
|
|
322
346
|
.split(PATH_SEPARATOR)
|
|
323
347
|
.filter(identity)
|
|
324
|
-
.map((part, index) => {
|
|
348
|
+
.map((part: string, index: number) => {
|
|
325
349
|
const matches = /^\{([\d\w]+)\}$/i.exec(part);
|
|
326
350
|
|
|
327
351
|
if (matches) {
|
|
@@ -330,7 +354,7 @@ async function handleForAWSHTTPFunction(
|
|
|
330
354
|
value: parts[index],
|
|
331
355
|
};
|
|
332
356
|
}
|
|
333
|
-
}) as
|
|
357
|
+
}) as { name: string; value: string }[]
|
|
334
358
|
)
|
|
335
359
|
.filter(identity)
|
|
336
360
|
.reduce(
|
|
@@ -338,7 +362,7 @@ async function handleForAWSHTTPFunction(
|
|
|
338
362
|
...accParameters,
|
|
339
363
|
[name]: value,
|
|
340
364
|
}),
|
|
341
|
-
{},
|
|
365
|
+
{} as Record<string, string>,
|
|
342
366
|
);
|
|
343
367
|
|
|
344
368
|
for (const location of Object.keys(parametersValidators)) {
|
|
@@ -409,7 +433,7 @@ async function handleForAWSHTTPFunction(
|
|
|
409
433
|
parametersValues.body = body;
|
|
410
434
|
}
|
|
411
435
|
} catch (err) {
|
|
412
|
-
throw YHTTPError.cast(err as Error, 400);
|
|
436
|
+
throw YHTTPError.cast(err as Error, undefined, undefined, 400);
|
|
413
437
|
}
|
|
414
438
|
|
|
415
439
|
response = await executeHandler(definition, handler, parametersValues);
|
|
@@ -459,12 +483,10 @@ async function handleForAWSHTTPFunction(
|
|
|
459
483
|
));
|
|
460
484
|
|
|
461
485
|
if (responseHasSchema && !STRINGIFIERS[responseContentType]) {
|
|
462
|
-
throw new YHTTPError(
|
|
463
|
-
500,
|
|
464
|
-
'E_STRINGIFYER_LACK',
|
|
486
|
+
throw new YHTTPError(500, 'E_STRINGIFYER_LACK', [
|
|
465
487
|
response.headers['content-type'],
|
|
466
488
|
response,
|
|
467
|
-
);
|
|
489
|
+
]);
|
|
468
490
|
}
|
|
469
491
|
if (response.body) {
|
|
470
492
|
checkResponseMediaType(
|
|
@@ -485,7 +507,7 @@ async function handleForAWSHTTPFunction(
|
|
|
485
507
|
type: 'error',
|
|
486
508
|
code: (err as YError)?.code || 'E_UNEXPECTED',
|
|
487
509
|
statusCode: response.status,
|
|
488
|
-
params: (err as YError)?.
|
|
510
|
+
params: ((err as YError)?.debugValues as string[]) || [],
|
|
489
511
|
stack: printStackTrace(err as Error),
|
|
490
512
|
};
|
|
491
513
|
|
|
@@ -505,8 +527,8 @@ async function handleForAWSHTTPFunction(
|
|
|
505
527
|
'RESPONSE',
|
|
506
528
|
JSON.stringify({
|
|
507
529
|
...response,
|
|
508
|
-
body: obfuscateEventBody(obfuscator, response.body),
|
|
509
|
-
headers: obfuscator.obfuscateSensibleHeaders(response.headers),
|
|
530
|
+
body: obfuscateEventBody(obfuscator, response.body || {}),
|
|
531
|
+
headers: obfuscator.obfuscateSensibleHeaders(response.headers || {}),
|
|
510
532
|
}),
|
|
511
533
|
);
|
|
512
534
|
|
|
@@ -522,10 +544,10 @@ async function handleForAWSHTTPFunction(
|
|
|
522
544
|
);
|
|
523
545
|
}
|
|
524
546
|
|
|
525
|
-
async function gcpfReqToRequest(req): Promise<WhookRequest> {
|
|
547
|
+
async function gcpfReqToRequest(req: GCPRequest): Promise<WhookRequest> {
|
|
526
548
|
const request: WhookRequest = {
|
|
527
549
|
method: req.method.toLowerCase(),
|
|
528
|
-
headers: lowerCaseHeaders(req.headers
|
|
550
|
+
headers: lowerCaseHeaders(castWhookHeaders(req.headers)),
|
|
529
551
|
url: req.originalUrl,
|
|
530
552
|
};
|
|
531
553
|
|
|
@@ -543,7 +565,7 @@ async function gcpfReqToRequest(req): Promise<WhookRequest> {
|
|
|
543
565
|
|
|
544
566
|
async function pipeResponseInGCPFResponse(
|
|
545
567
|
response: WhookResponse,
|
|
546
|
-
res,
|
|
568
|
+
res: GCPResponse,
|
|
547
569
|
): Promise<void> {
|
|
548
570
|
Object.keys(response.headers || {}).forEach((headerName) => {
|
|
549
571
|
res.set(headerName, response.headers?.[headerName]);
|
|
@@ -558,7 +580,10 @@ async function pipeResponseInGCPFResponse(
|
|
|
558
580
|
res.end();
|
|
559
581
|
}
|
|
560
582
|
|
|
561
|
-
function obfuscateEventBody(
|
|
583
|
+
function obfuscateEventBody<T>(
|
|
584
|
+
obfuscator: WhookObfuscatorService,
|
|
585
|
+
rawBody: T | string,
|
|
586
|
+
): T | string {
|
|
562
587
|
if (typeof rawBody === 'string') {
|
|
563
588
|
try {
|
|
564
589
|
const jsonBody = JSON.parse(rawBody);
|