@whook/gcp-functions 11.0.1 → 12.0.1
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 +1 -2
- package/dist/commands/testHTTPFunction.d.ts +3 -2
- package/dist/commands/testHTTPFunction.js +10 -9
- package/dist/commands/testHTTPFunction.js.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.js +4 -4
- package/dist/index.js.map +1 -1
- package/dist/libs/utils.d.ts +2 -2
- package/dist/libs/utils.js +3 -3
- package/dist/libs/utils.js.map +1 -1
- package/dist/services/_autoload.d.ts +3 -3
- package/dist/services/_autoload.js +2 -2
- package/dist/services/_autoload.js.map +1 -1
- package/dist/wrappers/googleHTTPFunction.d.ts +2 -2
- package/dist/wrappers/googleHTTPFunction.js +2 -1
- package/dist/wrappers/googleHTTPFunction.js.map +1 -1
- package/package.json +14 -15
- package/src/commands/testHTTPFunction.ts +18 -10
- package/src/index.ts +5 -5
- package/src/libs/utils.ts +4 -3
- package/src/services/_autoload.ts +2 -2
- package/src/wrappers/googleHTTPFunction.ts +4 -3
package/README.md
CHANGED
|
@@ -50,10 +50,9 @@ export async function prepareEnvironment(
|
|
|
50
50
|
// (...)
|
|
51
51
|
|
|
52
52
|
// Setup your own whook plugins or avoid whook defaults by leaving it empty
|
|
53
|
-
- $.register(constant('WHOOK_PLUGINS', ['@whook/
|
|
53
|
+
- $.register(constant('WHOOK_PLUGINS', ['@whook/whook']));
|
|
54
54
|
+ $.register(constant('WHOOK_PLUGINS', [
|
|
55
55
|
+ '@whook/gcp-functions',
|
|
56
|
-
+ '@whook/cli',
|
|
57
56
|
+ '@whook/whook',
|
|
58
57
|
+ ]));
|
|
59
58
|
|
|
@@ -1,12 +1,13 @@
|
|
|
1
|
-
import type { WhookCommandArgs, WhookCommandDefinition } from '@whook/
|
|
1
|
+
import type { WhookCommandArgs, WhookCommandDefinition } from '@whook/whook';
|
|
2
2
|
import type { LogService } from 'common-services';
|
|
3
3
|
import type { OpenAPIV3 } from 'openapi-types';
|
|
4
4
|
export declare const definition: WhookCommandDefinition;
|
|
5
5
|
declare const _default: import("knifecycle").ServiceInitializer<{
|
|
6
6
|
NODE_ENV: string;
|
|
7
7
|
PROJECT_DIR: string;
|
|
8
|
+
COMPILER_OPTIONS?: Partial<import("@whook/whook/dist/services/compiler.js").FullWhookCompilerOptions> | undefined;
|
|
8
9
|
API: OpenAPIV3.Document<{}>;
|
|
9
10
|
log: LogService;
|
|
10
|
-
args: WhookCommandArgs<Record<string, import("@whook/
|
|
11
|
+
args: WhookCommandArgs<Record<string, import("@whook/whook").WhookArgsTypes>>;
|
|
11
12
|
}, () => Promise<void>>;
|
|
12
13
|
export default _default;
|
|
@@ -1,26 +1,26 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { loadFunction } from '../libs/utils.js';
|
|
2
2
|
import { extra, autoService } from 'knifecycle';
|
|
3
|
-
import { readArgs } from '@whook/cli';
|
|
4
3
|
import { YError } from 'yerror';
|
|
5
4
|
import { dereferenceOpenAPIOperations, getOpenAPIOperations, } from '@whook/http-router';
|
|
6
5
|
import stream from 'stream';
|
|
7
6
|
import camelCase from 'camelcase';
|
|
7
|
+
import { DEFAULT_COMPILER_OPTIONS, readArgs } from '@whook/whook';
|
|
8
8
|
const SEARCH_SEPARATOR = '?';
|
|
9
9
|
const PATH_SEPARATOR = '/';
|
|
10
10
|
export const definition = {
|
|
11
|
-
description: 'A command for testing
|
|
12
|
-
example: `whook
|
|
11
|
+
description: 'A command for testing GCP HTTP function',
|
|
12
|
+
example: `whook testHTTPFunction --name getPing`,
|
|
13
13
|
arguments: {
|
|
14
14
|
type: 'object',
|
|
15
15
|
additionalProperties: false,
|
|
16
16
|
required: ['name'],
|
|
17
17
|
properties: {
|
|
18
18
|
name: {
|
|
19
|
-
description: 'Name of the
|
|
19
|
+
description: 'Name of the function to run',
|
|
20
20
|
type: 'string',
|
|
21
21
|
},
|
|
22
22
|
type: {
|
|
23
|
-
description: 'Type of
|
|
23
|
+
description: 'Type of function to test',
|
|
24
24
|
type: 'string',
|
|
25
25
|
enum: ['main', 'index'],
|
|
26
26
|
default: 'index',
|
|
@@ -38,11 +38,12 @@ export const definition = {
|
|
|
38
38
|
},
|
|
39
39
|
},
|
|
40
40
|
};
|
|
41
|
-
export default extra(definition, autoService(
|
|
42
|
-
async function
|
|
41
|
+
export default extra(definition, autoService(initTestHTTPFunctionCommand));
|
|
42
|
+
async function initTestHTTPFunctionCommand({ NODE_ENV, PROJECT_DIR, COMPILER_OPTIONS = DEFAULT_COMPILER_OPTIONS, API, log, args, }) {
|
|
43
43
|
return async () => {
|
|
44
44
|
const { namedArguments: { name, type, contentType, parameters: rawParameters }, } = readArgs(definition.arguments, args);
|
|
45
|
-
const
|
|
45
|
+
const extension = COMPILER_OPTIONS.format === 'cjs' ? '.cjs' : '.mjs';
|
|
46
|
+
const handler = await loadFunction({ PROJECT_DIR, log }, NODE_ENV, name, type, extension);
|
|
46
47
|
const OPERATION = (await dereferenceOpenAPIOperations(API, getOpenAPIOperations(API))).find(({ operationId }) => operationId === name);
|
|
47
48
|
if (!OPERATION) {
|
|
48
49
|
throw new YError('E_OPERATION_NOT_FOUND');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testHTTPFunction.js","sourceRoot":"","sources":["../../src/commands/testHTTPFunction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"testHTTPFunction.js","sourceRoot":"","sources":["../../src/commands/testHTTPFunction.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { Knifecycle } from 'knifecycle';
|
|
2
2
|
import type { WhookCompilerOptions } from '@whook/whook';
|
|
3
3
|
export declare const DEFAULT_BUILD_PARALLELISM = 10;
|
|
4
|
-
export
|
|
4
|
+
export type WhookGCPBuildConfig = {
|
|
5
5
|
BUILD_PARALLELISM?: number;
|
|
6
6
|
};
|
|
7
|
-
export
|
|
7
|
+
export type WhookAPIOperationGCPFunctionConfig = {
|
|
8
8
|
type?: 'http';
|
|
9
9
|
sourceOperationId?: string;
|
|
10
10
|
staticFiles?: string[];
|
package/dist/index.js
CHANGED
|
@@ -4,7 +4,7 @@ import util from 'util';
|
|
|
4
4
|
import path from 'path';
|
|
5
5
|
import mkdirp from 'mkdirp';
|
|
6
6
|
import cpr from 'cpr';
|
|
7
|
-
import { YError } from 'yerror';
|
|
7
|
+
import { printStackTrace, YError } from 'yerror';
|
|
8
8
|
import { createRequire } from 'module';
|
|
9
9
|
import { Knifecycle, SPECIAL_PROPS, constant, initInitializerBuilder, } from 'knifecycle';
|
|
10
10
|
import { initCompiler } from '@whook/whook';
|
|
@@ -21,7 +21,7 @@ const BUILD_DEFINITIONS = {
|
|
|
21
21
|
type: 'HTTP',
|
|
22
22
|
wrapper: {
|
|
23
23
|
name: 'wrapHandlerForGoogleHTTPFunction',
|
|
24
|
-
path: path.join(path.dirname(require.resolve('@whook/gcp-
|
|
24
|
+
path: path.join(path.dirname(require.resolve('@whook/gcp-functions')), 'wrappers/googleHTTPFunction.js'),
|
|
25
25
|
},
|
|
26
26
|
suffix: 'Wrapped',
|
|
27
27
|
},
|
|
@@ -78,7 +78,7 @@ export async function runBuild(aPrepareBuildEnvironment) {
|
|
|
78
78
|
}
|
|
79
79
|
catch (err) {
|
|
80
80
|
// eslint-disable-next-line
|
|
81
|
-
console.error('💀 - Cannot launch the build:', err
|
|
81
|
+
console.error('💀 - Cannot launch the build:', printStackTrace(err), JSON.stringify(err?.params, null, 2));
|
|
82
82
|
process.exit(1);
|
|
83
83
|
}
|
|
84
84
|
}
|
|
@@ -139,7 +139,7 @@ async function buildAnyLambda({ NODE_ENV, PROJECT_DIR, compiler, log, $autoload,
|
|
|
139
139
|
}
|
|
140
140
|
catch (err) {
|
|
141
141
|
log('error', `Error building "${operationId}"...`);
|
|
142
|
-
log('error-stack', err
|
|
142
|
+
log('error-stack', printStackTrace(err));
|
|
143
143
|
log('debug', JSON.stringify(err.params, null, 2));
|
|
144
144
|
throw YError.wrap(err, 'E_LAMBDA_BUILD', operationId);
|
|
145
145
|
}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/libs/utils.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { LogService } from 'common-services';
|
|
2
|
-
export declare function
|
|
2
|
+
export declare function loadFunction({ PROJECT_DIR, log, }: {
|
|
3
3
|
PROJECT_DIR: string;
|
|
4
4
|
log: LogService;
|
|
5
|
-
}, target: string, operationId: string, type: string): Promise<any>;
|
|
5
|
+
}, target: string, operationId: string, type: string, extension?: string): Promise<any>;
|
package/dist/libs/utils.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { YError } from 'yerror';
|
|
2
2
|
import path from 'path';
|
|
3
|
-
export async function
|
|
4
|
-
const modulePath = path.join(PROJECT_DIR, 'builds', target, operationId, type +
|
|
5
|
-
log('debug', `⛏️ - Loading
|
|
3
|
+
export async function loadFunction({ PROJECT_DIR, log, }, target, operationId, type, extension = '.mjs') {
|
|
4
|
+
const modulePath = path.join(PROJECT_DIR, 'builds', target, operationId, type + extension);
|
|
5
|
+
log('debug', `⛏️ - Loading function module at path "${modulePath}".`);
|
|
6
6
|
try {
|
|
7
7
|
const module = await import(modulePath);
|
|
8
8
|
if (!module) {
|
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,MAAM,CAAC;AAGxB,MAAM,CAAC,KAAK,UAAU,
|
|
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,MAAM,CAAC;AAGxB,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,EACE,WAAW,EACX,GAAG,GAIJ,EACD,MAAc,EACd,WAAmB,EACnB,IAAY,EACZ,SAAS,GAAG,MAAM;IAElB,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAC1B,WAAW,EACX,QAAQ,EACR,MAAM,EACN,WAAW,EACX,IAAI,GAAG,SAAS,CACjB,CAAC;IAEF,GAAG,CAAC,OAAO,EAAE,yCAAyC,UAAU,IAAI,CAAC,CAAC;IAEtE,IAAI;QACF,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;QAExC,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,IAAI,MAAM,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;SAChD;QAED,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;YACnB,MAAM,IAAI,MAAM,CAAC,oBAAoB,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;SACrE;QAED,OAAO,MAAM,CAAC,OAAO,CAAC;KACvB;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,MAAM,CAAC,IAAI,CAAC,GAAY,EAAE,eAAe,CAAC,CAAC;KAClD;AACH,CAAC"}
|
|
@@ -18,12 +18,12 @@ import type { LogService } from 'common-services';
|
|
|
18
18
|
declare const _default: import("knifecycle").ServiceInitializer<Dependencies<any> & import("@whook/whook/dist/services/_autoload.js").AutoloadConfig & {
|
|
19
19
|
PROJECT_SRC: string;
|
|
20
20
|
CONFIGS?: import("@whook/whook").CONFIGSService | undefined;
|
|
21
|
-
WRAPPERS?: import("@whook/whook").WhookWrapper<Dependencies<any>, import("@whook/http-transaction").WhookHandler<import("knifecycle").Parameters<any>, import("@whook/http-transaction").WhookResponse<number, void | import("@whook/http-transaction").WhookHeaders, void | import("
|
|
21
|
+
WRAPPERS?: import("@whook/whook").WhookWrapper<Dependencies<any>, import("@whook/http-transaction").WhookHandler<import("knifecycle").Parameters<any>, import("@whook/http-transaction").WhookResponse<number, void | import("@whook/http-transaction").WhookHeaders, void | import("stream").Readable | import("type-fest").JsonValue>, import("@whook/http-transaction").WhookOperation<Record<string, unknown>>>>[] | undefined;
|
|
22
22
|
$injector: Injector<any>;
|
|
23
|
-
importer: import("
|
|
23
|
+
importer: import("common-services").ImporterService<{
|
|
24
24
|
default: Initializer<any, Dependencies<any>>;
|
|
25
25
|
}>;
|
|
26
|
-
resolve: import("
|
|
26
|
+
resolve: import("common-services").ResolveService;
|
|
27
27
|
log?: LogService | undefined;
|
|
28
28
|
}, Autoloader<Initializer<unknown, Dependencies<any>>>>;
|
|
29
29
|
export default _default;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { initAutoload, noop, cleanupOpenAPI } from '@whook/whook';
|
|
2
2
|
import { SPECIAL_PROPS, wrapInitializer, constant, alsoInject, } from 'knifecycle';
|
|
3
|
-
import { YError } from 'yerror';
|
|
3
|
+
import { printStackTrace, YError } from 'yerror';
|
|
4
4
|
import { dereferenceOpenAPIOperations, getOpenAPIOperations, } from '@whook/http-router';
|
|
5
5
|
const initializerWrapper = (async ({ BUILD_CONSTANTS = {}, $injector, $instance, log = noop, }, $autoload) => {
|
|
6
6
|
let API;
|
|
@@ -78,7 +78,7 @@ const initializerWrapper = (async ({ BUILD_CONSTANTS = {}, $injector, $instance,
|
|
|
78
78
|
}
|
|
79
79
|
catch (err) {
|
|
80
80
|
log('error', `Build error while loading "${serviceName}".`);
|
|
81
|
-
log('error-stack', err
|
|
81
|
+
log('error-stack', printStackTrace(err));
|
|
82
82
|
throw err;
|
|
83
83
|
}
|
|
84
84
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_autoload.js","sourceRoot":"","sources":["../../src/services/_autoload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAClE,OAAO,EAEL,aAAa,EACb,eAAe,EACf,QAAQ,EACR,UAAU,GACX,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"_autoload.js","sourceRoot":"","sources":["../../src/services/_autoload.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import type { WhookQueryStringParser } from '@whook/http-router';
|
|
|
3
3
|
import type { ServiceInitializer, Dependencies, Service } from 'knifecycle';
|
|
4
4
|
import type { WhookHandler, ObfuscatorService, WhookOperation, WhookWrapper } from '@whook/whook';
|
|
5
5
|
import type { TimeService, LogService } from 'common-services';
|
|
6
|
-
|
|
6
|
+
type HTTPWrapperDependencies = {
|
|
7
7
|
NODE_ENV: string;
|
|
8
8
|
DEBUG_NODE_ENVS?: string[];
|
|
9
9
|
OPERATION: WhookOperation;
|
|
@@ -18,5 +18,5 @@ declare type HTTPWrapperDependencies = {
|
|
|
18
18
|
log?: LogService;
|
|
19
19
|
WRAPPERS: WhookWrapper<Dependencies, Service>[];
|
|
20
20
|
};
|
|
21
|
-
export default function wrapHandlerForAWSHTTPFunction<D extends Dependencies
|
|
21
|
+
export default function wrapHandlerForAWSHTTPFunction<D extends Dependencies, S extends WhookHandler>(initHandler: ServiceInitializer<D, S>): ServiceInitializer<D & HTTPWrapperDependencies, S>;
|
|
22
22
|
export {};
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { printStackTrace } from 'yerror';
|
|
1
2
|
import { DEFAULT_DEBUG_NODE_ENVS, DEFAULT_BUFFER_LIMIT, DEFAULT_PARSERS, DEFAULT_STRINGIFYERS, DEFAULT_DECODERS, DEFAULT_ENCODERS, extractOperationSecurityParameters, castParameters, } from '@whook/http-router';
|
|
2
3
|
import { reuseSpecialProps, alsoInject } from 'knifecycle';
|
|
3
4
|
import Ajv from 'ajv';
|
|
@@ -193,7 +194,7 @@ async function handleForAWSHTTPFunction({ OPERATION, DEBUG_NODE_ENVS, NODE_ENV,
|
|
|
193
194
|
code: castedError.code,
|
|
194
195
|
statusCode: castedError.httpCode,
|
|
195
196
|
params: castedError.params || [],
|
|
196
|
-
stack: castedError
|
|
197
|
+
stack: printStackTrace(castedError),
|
|
197
198
|
};
|
|
198
199
|
log?.('error', JSON.stringify(responseLog));
|
|
199
200
|
response = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"googleHTTPFunction.js","sourceRoot":"","sources":["../../src/wrappers/googleHTTPFunction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,oBAAoB,EACpB,eAAe,EACf,oBAAoB,EACpB,gBAAgB,EAChB,gBAAgB,EAChB,kCAAkC,EAClC,cAAc,GACf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,aAAa,MAAM,aAAa,CAAC;AACxC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EACL,2BAA2B,EAC3B,oBAAoB,EACpB,eAAe,EACf,aAAa,EACb,eAAe,EACf,mBAAmB,EACnB,oBAAoB,EACpB,sBAAsB,EACtB,cAAc,EACd,4BAA4B,EAC5B,2BAA2B,EAC3B,OAAO,EACP,QAAQ,GACT,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACzE,OAAO,MAAM,MAAM,QAAQ,CAAC;AAgC5B,MAAM,gBAAgB,GAAG,GAAG,CAAC;AAC7B,MAAM,cAAc,GAAG,GAAG,CAAC;AAE3B,MAAM,CAAC,OAAO,UAAU,6BAA6B,CAInD,WAAqC;IAErC,OAAO,UAAU,CACf;QACE,eAAe;QACf,UAAU;QACV,kBAAkB;QAClB,UAAU;QACV,WAAW;QACX,WAAW;QACX,UAAU;QACV,eAAe;QACf,eAAe;QACf,cAAc;QACd,YAAY;QACZ,MAAM;QACN,OAAO;KACR,EACD,iBAAiB,CACf,WAAW,EACV,6BAAqC,CAAC,IAAI,CACzC,IAAI,EACJ,WAAW,CACgB,CAC9B,CACF,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,6BAA6B,CAC1C,
|
|
1
|
+
{"version":3,"file":"googleHTTPFunction.js","sourceRoot":"","sources":["../../src/wrappers/googleHTTPFunction.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@whook/gcp-functions",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "12.0.1",
|
|
4
4
|
"description": "Build and deploy to GCP Cloud Functions with Whook.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -49,21 +49,20 @@
|
|
|
49
49
|
},
|
|
50
50
|
"homepage": "https://github.com/nfroidure/whook",
|
|
51
51
|
"dependencies": {
|
|
52
|
-
"@whook/
|
|
53
|
-
"@whook/
|
|
54
|
-
"@whook/
|
|
55
|
-
"
|
|
56
|
-
"ajv": "^8.11.0",
|
|
52
|
+
"@whook/cors": "^12.0.1",
|
|
53
|
+
"@whook/http-router": "^12.0.1",
|
|
54
|
+
"@whook/whook": "^12.0.1",
|
|
55
|
+
"ajv": "^8.11.2",
|
|
57
56
|
"ajv-formats": "^2.1.1",
|
|
58
|
-
"camelcase": "^7.0.
|
|
59
|
-
"common-services": "^12.
|
|
57
|
+
"camelcase": "^7.0.1",
|
|
58
|
+
"common-services": "^12.1.0",
|
|
60
59
|
"cpr": "3.0.1",
|
|
61
60
|
"knifecycle": "^14.1.0",
|
|
62
61
|
"mkdirp": "^1.0.4",
|
|
63
|
-
"openapi-types": "^12.0
|
|
62
|
+
"openapi-types": "^12.1.0",
|
|
64
63
|
"qs": "^6.11.0",
|
|
65
|
-
"strict-qs": "^7.0.
|
|
66
|
-
"yerror": "^6.
|
|
64
|
+
"strict-qs": "^7.0.2",
|
|
65
|
+
"yerror": "^6.2.1"
|
|
67
66
|
},
|
|
68
67
|
"devDependencies": {
|
|
69
68
|
"@typescript-eslint/eslint-plugin": "^5.36.0",
|
|
@@ -75,8 +74,8 @@
|
|
|
75
74
|
"eslint-plugin-prettier": "^4.2.1",
|
|
76
75
|
"jest": "^29.0.1",
|
|
77
76
|
"jsdoc-to-markdown": "^7.1.1",
|
|
78
|
-
"metapak": "^4.0.
|
|
79
|
-
"metapak-nfroidure": "
|
|
77
|
+
"metapak": "^4.0.6",
|
|
78
|
+
"metapak-nfroidure": "13.0.0",
|
|
80
79
|
"prettier": "^2.7.1",
|
|
81
80
|
"rimraf": "^3.0.2",
|
|
82
81
|
"typescript": "^4.8.2"
|
|
@@ -150,6 +149,7 @@
|
|
|
150
149
|
]
|
|
151
150
|
},
|
|
152
151
|
"moduleNameMapper": {
|
|
152
|
+
"#(.*)": "<rootDir>/../../node_modules/$1",
|
|
153
153
|
"(.+)\\.js": "$1"
|
|
154
154
|
},
|
|
155
155
|
"extensionsToTreatAsEsm": [
|
|
@@ -161,12 +161,11 @@
|
|
|
161
161
|
"cli": "env NODE_ENV=${NODE_ENV:-cli}",
|
|
162
162
|
"cover": "npm run jest -- --coverage",
|
|
163
163
|
"doc": "echo \"# API\" > API.md; jsdoc2md 'dist/**/*.js' >> API.md && git add API.md",
|
|
164
|
-
"genPackagelock": "npm i --package-lock-only",
|
|
165
164
|
"jest": "NODE_OPTIONS=--experimental-vm-modules NODE_ENV=test jest",
|
|
166
165
|
"lint": "eslint 'src/**/*.ts'",
|
|
167
166
|
"metapak": "metapak",
|
|
168
167
|
"prettier": "prettier --write 'src/**/*.ts'",
|
|
169
168
|
"test": "npm run jest"
|
|
170
169
|
},
|
|
171
|
-
"gitHead": "
|
|
170
|
+
"gitHead": "74e01e3e6169f0331b1b9cdc426cc679084579fd"
|
|
172
171
|
}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { loadFunction } from '../libs/utils.js';
|
|
2
2
|
import { extra, autoService } from 'knifecycle';
|
|
3
|
-
import { readArgs } from '@whook/cli';
|
|
4
3
|
import { YError } from 'yerror';
|
|
5
4
|
import {
|
|
6
5
|
dereferenceOpenAPIOperations,
|
|
@@ -8,7 +7,12 @@ import {
|
|
|
8
7
|
} from '@whook/http-router';
|
|
9
8
|
import stream from 'stream';
|
|
10
9
|
import camelCase from 'camelcase';
|
|
11
|
-
import
|
|
10
|
+
import { DEFAULT_COMPILER_OPTIONS, readArgs } from '@whook/whook';
|
|
11
|
+
import type {
|
|
12
|
+
WhookCommandArgs,
|
|
13
|
+
WhookCommandDefinition,
|
|
14
|
+
WhookCompilerOptions,
|
|
15
|
+
} from '@whook/whook';
|
|
12
16
|
import type { LogService } from 'common-services';
|
|
13
17
|
import type { OpenAPIV3 } from 'openapi-types';
|
|
14
18
|
|
|
@@ -16,19 +20,19 @@ const SEARCH_SEPARATOR = '?';
|
|
|
16
20
|
const PATH_SEPARATOR = '/';
|
|
17
21
|
|
|
18
22
|
export const definition: WhookCommandDefinition = {
|
|
19
|
-
description: 'A command for testing
|
|
20
|
-
example: `whook
|
|
23
|
+
description: 'A command for testing GCP HTTP function',
|
|
24
|
+
example: `whook testHTTPFunction --name getPing`,
|
|
21
25
|
arguments: {
|
|
22
26
|
type: 'object',
|
|
23
27
|
additionalProperties: false,
|
|
24
28
|
required: ['name'],
|
|
25
29
|
properties: {
|
|
26
30
|
name: {
|
|
27
|
-
description: 'Name of the
|
|
31
|
+
description: 'Name of the function to run',
|
|
28
32
|
type: 'string',
|
|
29
33
|
},
|
|
30
34
|
type: {
|
|
31
|
-
description: 'Type of
|
|
35
|
+
description: 'Type of function to test',
|
|
32
36
|
type: 'string',
|
|
33
37
|
enum: ['main', 'index'],
|
|
34
38
|
default: 'index',
|
|
@@ -47,17 +51,19 @@ export const definition: WhookCommandDefinition = {
|
|
|
47
51
|
},
|
|
48
52
|
};
|
|
49
53
|
|
|
50
|
-
export default extra(definition, autoService(
|
|
54
|
+
export default extra(definition, autoService(initTestHTTPFunctionCommand));
|
|
51
55
|
|
|
52
|
-
async function
|
|
56
|
+
async function initTestHTTPFunctionCommand({
|
|
53
57
|
NODE_ENV,
|
|
54
58
|
PROJECT_DIR,
|
|
59
|
+
COMPILER_OPTIONS = DEFAULT_COMPILER_OPTIONS,
|
|
55
60
|
API,
|
|
56
61
|
log,
|
|
57
62
|
args,
|
|
58
63
|
}: {
|
|
59
64
|
NODE_ENV: string;
|
|
60
65
|
PROJECT_DIR: string;
|
|
66
|
+
COMPILER_OPTIONS?: WhookCompilerOptions;
|
|
61
67
|
API: OpenAPIV3.Document;
|
|
62
68
|
log: LogService;
|
|
63
69
|
args: WhookCommandArgs;
|
|
@@ -71,11 +77,13 @@ async function initTestHTTPLambdaCommand({
|
|
|
71
77
|
contentType: string;
|
|
72
78
|
parameters: string;
|
|
73
79
|
}>(definition.arguments, args);
|
|
74
|
-
const
|
|
80
|
+
const extension = COMPILER_OPTIONS.format === 'cjs' ? '.cjs' : '.mjs';
|
|
81
|
+
const handler = await loadFunction(
|
|
75
82
|
{ PROJECT_DIR, log },
|
|
76
83
|
NODE_ENV,
|
|
77
84
|
name,
|
|
78
85
|
type,
|
|
86
|
+
extension,
|
|
79
87
|
);
|
|
80
88
|
const OPERATION = (
|
|
81
89
|
await dereferenceOpenAPIOperations(API, getOpenAPIOperations(API))
|
package/src/index.ts
CHANGED
|
@@ -4,7 +4,7 @@ import util from 'util';
|
|
|
4
4
|
import path from 'path';
|
|
5
5
|
import mkdirp from 'mkdirp';
|
|
6
6
|
import cpr from 'cpr';
|
|
7
|
-
import { YError } from 'yerror';
|
|
7
|
+
import { printStackTrace, YError } from 'yerror';
|
|
8
8
|
import { createRequire } from 'module';
|
|
9
9
|
import {
|
|
10
10
|
Knifecycle,
|
|
@@ -78,7 +78,7 @@ const BUILD_DEFINITIONS: Record<
|
|
|
78
78
|
wrapper: {
|
|
79
79
|
name: 'wrapHandlerForGoogleHTTPFunction',
|
|
80
80
|
path: path.join(
|
|
81
|
-
path.dirname(require.resolve('@whook/gcp-
|
|
81
|
+
path.dirname(require.resolve('@whook/gcp-functions')),
|
|
82
82
|
'wrappers/googleHTTPFunction.js',
|
|
83
83
|
),
|
|
84
84
|
},
|
|
@@ -179,8 +179,8 @@ export async function runBuild(
|
|
|
179
179
|
// eslint-disable-next-line
|
|
180
180
|
console.error(
|
|
181
181
|
'💀 - Cannot launch the build:',
|
|
182
|
-
(err
|
|
183
|
-
JSON.stringify((err as YError)
|
|
182
|
+
printStackTrace(err),
|
|
183
|
+
JSON.stringify((err as YError)?.params, null, 2),
|
|
184
184
|
);
|
|
185
185
|
process.exit(1);
|
|
186
186
|
}
|
|
@@ -315,7 +315,7 @@ async function buildAnyLambda(
|
|
|
315
315
|
await buildFinalLambda({ compiler, log }, lambdaPath, whookConfig);
|
|
316
316
|
} catch (err) {
|
|
317
317
|
log('error', `Error building "${operationId}"...`);
|
|
318
|
-
log('error-stack', (err
|
|
318
|
+
log('error-stack', printStackTrace(err));
|
|
319
319
|
log('debug', JSON.stringify((err as YError).params, null, 2));
|
|
320
320
|
throw YError.wrap(err as Error, 'E_LAMBDA_BUILD', operationId);
|
|
321
321
|
}
|
package/src/libs/utils.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { YError } from 'yerror';
|
|
|
2
2
|
import path from 'path';
|
|
3
3
|
import type { LogService } from 'common-services';
|
|
4
4
|
|
|
5
|
-
export async function
|
|
5
|
+
export async function loadFunction(
|
|
6
6
|
{
|
|
7
7
|
PROJECT_DIR,
|
|
8
8
|
log,
|
|
@@ -13,16 +13,17 @@ export async function loadLambda(
|
|
|
13
13
|
target: string,
|
|
14
14
|
operationId: string,
|
|
15
15
|
type: string,
|
|
16
|
+
extension = '.mjs',
|
|
16
17
|
): Promise<any> {
|
|
17
18
|
const modulePath = path.join(
|
|
18
19
|
PROJECT_DIR,
|
|
19
20
|
'builds',
|
|
20
21
|
target,
|
|
21
22
|
operationId,
|
|
22
|
-
type +
|
|
23
|
+
type + extension,
|
|
23
24
|
);
|
|
24
25
|
|
|
25
|
-
log('debug', `⛏️ - Loading
|
|
26
|
+
log('debug', `⛏️ - Loading function module at path "${modulePath}".`);
|
|
26
27
|
|
|
27
28
|
try {
|
|
28
29
|
const module = await import(modulePath);
|
|
@@ -6,7 +6,7 @@ import {
|
|
|
6
6
|
constant,
|
|
7
7
|
alsoInject,
|
|
8
8
|
} from 'knifecycle';
|
|
9
|
-
import { YError } from 'yerror';
|
|
9
|
+
import { printStackTrace, YError } from 'yerror';
|
|
10
10
|
import {
|
|
11
11
|
dereferenceOpenAPIOperations,
|
|
12
12
|
getOpenAPIOperations,
|
|
@@ -140,7 +140,7 @@ const initializerWrapper: ServiceInitializerWrapper<
|
|
|
140
140
|
return $autoload(serviceName);
|
|
141
141
|
} catch (err) {
|
|
142
142
|
log('error', `Build error while loading "${serviceName}".`);
|
|
143
|
-
log('error-stack', (err
|
|
143
|
+
log('error-stack', printStackTrace(err));
|
|
144
144
|
throw err;
|
|
145
145
|
}
|
|
146
146
|
};
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { printStackTrace } from 'yerror';
|
|
1
2
|
import {
|
|
2
3
|
DEFAULT_DEBUG_NODE_ENVS,
|
|
3
4
|
DEFAULT_BUFFER_LIMIT,
|
|
@@ -65,7 +66,7 @@ const SEARCH_SEPARATOR = '?';
|
|
|
65
66
|
const PATH_SEPARATOR = '/';
|
|
66
67
|
|
|
67
68
|
export default function wrapHandlerForAWSHTTPFunction<
|
|
68
|
-
D extends Dependencies
|
|
69
|
+
D extends Dependencies,
|
|
69
70
|
S extends WhookHandler,
|
|
70
71
|
>(
|
|
71
72
|
initHandler: ServiceInitializer<D, S>,
|
|
@@ -97,7 +98,7 @@ export default function wrapHandlerForAWSHTTPFunction<
|
|
|
97
98
|
}
|
|
98
99
|
|
|
99
100
|
async function initHandlerForAWSHTTPFunction(
|
|
100
|
-
initHandler: ServiceInitializer<Dependencies
|
|
101
|
+
initHandler: ServiceInitializer<Dependencies, WhookHandler>,
|
|
101
102
|
{
|
|
102
103
|
OPERATION_API,
|
|
103
104
|
WRAPPERS,
|
|
@@ -377,7 +378,7 @@ async function handleForAWSHTTPFunction(
|
|
|
377
378
|
code: castedError.code,
|
|
378
379
|
statusCode: castedError.httpCode,
|
|
379
380
|
params: castedError.params || [],
|
|
380
|
-
stack: castedError
|
|
381
|
+
stack: printStackTrace(castedError),
|
|
381
382
|
};
|
|
382
383
|
|
|
383
384
|
log?.('error', JSON.stringify(responseLog));
|