From a1934b1630ea562b8f37c46bf646a5f6756e793c Mon Sep 17 00:00:00 2001 From: wss-git Date: Fri, 16 Jul 2021 17:20:05 +0800 Subject: [PATCH] refactor: v0.0.12 --- doc/classes/default.html | 6 +-- doc/doc.json | 2 +- lib/common/help.d.ts | 21 ++++++++--- lib/common/help.js | 10 +++-- lib/index.js | 36 ++++++++---------- lib/interface/entity.d.ts | 1 + lib/interface/entity.js | 7 +++- lib/lib/remote-invoke.d.ts | 5 ++- lib/lib/remote-invoke.js | 77 ++++++++++++++++++++++++-------------- package.json | 2 +- publish.yaml | 2 +- src/index.ts | 2 +- 12 files changed, 102 insertions(+), 69 deletions(-) diff --git a/doc/classes/default.html b/doc/classes/default.html index 62629b9..5919d3f 100644 --- a/doc/classes/default.html +++ b/doc/classes/default.html @@ -123,7 +123,7 @@

  • Parameters

    @@ -146,7 +146,7 @@
  • @@ -174,7 +174,7 @@

  • Parameters

    diff --git a/doc/doc.json b/doc/doc.json index 8972273..704a96a 100644 --- a/doc/doc.json +++ b/doc/doc.json @@ -91,7 +91,7 @@ "sources": [ { "fileName": "index.ts", - "line": 101, + "line": 93, "character": 21 } ], diff --git a/lib/common/help.d.ts b/lib/common/help.d.ts index 9adf0ef..f5a0817 100644 --- a/lib/common/help.d.ts +++ b/lib/common/help.d.ts @@ -5,21 +5,30 @@ declare const _default: ({ } | { header: string; optionList: ({ + name: string; + description: string; + type: StringConstructor; + alias?: undefined; + } | { name: string; description: string; alias: string; type: StringConstructor; } | { + name: string; + description: string; + type: BooleanConstructor; + alias?: undefined; + })[]; + content?: undefined; +} | { + header: string; + optionList: { name: string; description: string; alias: string; type: BooleanConstructor; - } | { - name: string; - description: string; - type: StringConstructor; - alias?: undefined; - })[]; + }[]; content?: undefined; } | { header: string; diff --git a/lib/common/help.js b/lib/common/help.js index 410c83e..494a2f9 100644 --- a/lib/common/help.js +++ b/lib/common/help.js @@ -15,13 +15,11 @@ exports.default = [ { name: 'invocation-type', description: 'Invocation type: optional value "async"|"sync", default value "sync" (default: "sync")', - alias: 't', type: String, }, { name: 'event', description: 'Event data (strings) passed to the function during invocation (default: "").Http function format refers to [https://github.com/devsapp/fc-remote-invoke#特别说明]', - alias: 'e', type: String, }, { @@ -33,7 +31,6 @@ exports.default = [ { name: 'event-stdin', description: 'Read from standard input, to support script pipeline.Http function format refers to [https://github.com/devsapp/fc-remote-invoke#特别说明]', - alias: 's', type: Boolean, }, { @@ -51,6 +48,11 @@ exports.default = [ description: 'Specify function name in cli mode', type: String, }, + { + name: 'domain-name', + description: 'Specify custom domain name in cli mode', + type: String, + }, ], }, { @@ -98,4 +100,4 @@ exports.default = [ ], }, ]; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb21tb24vaGVscC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLGtCQUFlO0lBQ2I7UUFDRSxNQUFNLEVBQUUsUUFBUTtRQUNoQixPQUFPLEVBQUUsa0NBQWtDO0tBQzVDO0lBQ0Q7UUFDRSxNQUFNLEVBQUUsT0FBTztRQUNmLE9BQU8sRUFBRSxzQkFBc0I7S0FDaEM7SUFDRDtRQUNFLE1BQU0sRUFBRSxTQUFTO1FBQ2pCLFVBQVUsRUFBRTtZQUNWO2dCQUNFLElBQUksRUFBRSxpQkFBaUI7Z0JBQ3ZCLFdBQVcsRUFBRSx3RkFBd0Y7Z0JBQ3JHLEtBQUssRUFBRSxHQUFHO2dCQUNWLElBQUksRUFBRSxNQUFNO2FBQ2I7WUFDRDtnQkFDRSxJQUFJLEVBQUUsT0FBTztnQkFDYixXQUFXLEVBQUUsK0pBQStKO2dCQUM1SyxLQUFLLEVBQUUsR0FBRztnQkFDVixJQUFJLEVBQUUsTUFBTTthQUNiO1lBQ0Q7Z0JBQ0UsSUFBSSxFQUFFLFlBQVk7Z0JBQ2xCLFdBQVcsRUFBRSxtT0FBbU87Z0JBQ2hQLEtBQUssRUFBRSxHQUFHO2dCQUNWLElBQUksRUFBRSxNQUFNO2FBQ2I7WUFDRDtnQkFDRSxJQUFJLEVBQUUsYUFBYTtnQkFDbkIsV0FBVyxFQUFFLHdJQUF3STtnQkFDckosS0FBSyxFQUFFLEdBQUc7Z0JBQ1YsSUFBSSxFQUFFLE9BQU87YUFDZDtZQUNEO2dCQUNFLElBQUksRUFBRSxRQUFRO2dCQUNkLFdBQVcsRUFBRSw0QkFBNEI7Z0JBQ3pDLElBQUksRUFBRSxNQUFNO2FBQ2I7WUFDRDtnQkFDRSxJQUFJLEVBQUUsY0FBYztnQkFDcEIsV0FBVyxFQUFFLGtDQUFrQztnQkFDL0MsSUFBSSxFQUFFLE1BQU07YUFDYjtZQUNEO2dCQUNFLElBQUksRUFBRSxlQUFlO2dCQUNyQixXQUFXLEVBQUUsbUNBQW1DO2dCQUNoRCxJQUFJLEVBQUUsTUFBTTthQUNiO1NBQ0Y7S0FDRjtJQUNEO1FBQ0UsTUFBTSxFQUFFLGdCQUFnQjtRQUN4QixVQUFVLEVBQUU7WUFDVjtnQkFDRSxJQUFJLEVBQUUsUUFBUTtnQkFDZCxXQUFXLEVBQUUsb0JBQW9CO2dCQUNqQyxLQUFLLEVBQUUsR0FBRztnQkFDVixJQUFJLEVBQUUsT0FBTzthQUNkO1lBQ0Q7Z0JBQ0UsSUFBSSxFQUFFLE1BQU07Z0JBQ1osV0FBVyxFQUFFLG9DQUFvQztnQkFDakQsS0FBSyxFQUFFLEdBQUc7Z0JBQ1YsSUFBSSxFQUFFLE9BQU87YUFDZDtTQUNGO0tBQ0Y7SUFDRDtRQUNFLE1BQU0sRUFBRSxvQkFBb0I7UUFDNUIsT0FBTyxFQUFFO1lBQ1AsWUFBWTtZQUNaLDBCQUEwQjtZQUMxQiw2REFBNkQ7WUFDN0QsNkNBQTZDO1lBQzdDLGtDQUFrQztTQUNuQztLQUNGO0lBQ0Q7UUFDRSxNQUFNLEVBQUUsbUJBQW1CO1FBQzNCLE9BQU8sRUFBRTtZQUNQO2dCQUNFLE9BQU8sRUFBRSxpR0FBaUc7YUFDM0c7WUFDRDtnQkFDRSxPQUFPLEVBQUUsd0dBQXdHO2FBQ2xIO1lBQ0Q7Z0JBQ0UsT0FBTyxFQUFFLDZGQUE2RjthQUN2RztZQUNEO2dCQUNFLE9BQU8sRUFBRSx3SEFBd0g7YUFDbEk7U0FDRjtLQUNGO0NBQ0YsQ0FBQSJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb21tb24vaGVscC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLGtCQUFlO0lBQ2I7UUFDRSxNQUFNLEVBQUUsUUFBUTtRQUNoQixPQUFPLEVBQUUsa0NBQWtDO0tBQzVDO0lBQ0Q7UUFDRSxNQUFNLEVBQUUsT0FBTztRQUNmLE9BQU8sRUFBRSxzQkFBc0I7S0FDaEM7SUFDRDtRQUNFLE1BQU0sRUFBRSxTQUFTO1FBQ2pCLFVBQVUsRUFBRTtZQUNWO2dCQUNFLElBQUksRUFBRSxpQkFBaUI7Z0JBQ3ZCLFdBQVcsRUFBRSx3RkFBd0Y7Z0JBQ3JHLElBQUksRUFBRSxNQUFNO2FBQ2I7WUFDRDtnQkFDRSxJQUFJLEVBQUUsT0FBTztnQkFDYixXQUFXLEVBQUUsK0pBQStKO2dCQUM1SyxJQUFJLEVBQUUsTUFBTTthQUNiO1lBQ0Q7Z0JBQ0UsSUFBSSxFQUFFLFlBQVk7Z0JBQ2xCLFdBQVcsRUFBRSxtT0FBbU87Z0JBQ2hQLEtBQUssRUFBRSxHQUFHO2dCQUNWLElBQUksRUFBRSxNQUFNO2FBQ2I7WUFDRDtnQkFDRSxJQUFJLEVBQUUsYUFBYTtnQkFDbkIsV0FBVyxFQUFFLHdJQUF3STtnQkFDckosSUFBSSxFQUFFLE9BQU87YUFDZDtZQUNEO2dCQUNFLElBQUksRUFBRSxRQUFRO2dCQUNkLFdBQVcsRUFBRSw0QkFBNEI7Z0JBQ3pDLElBQUksRUFBRSxNQUFNO2FBQ2I7WUFDRDtnQkFDRSxJQUFJLEVBQUUsY0FBYztnQkFDcEIsV0FBVyxFQUFFLGtDQUFrQztnQkFDL0MsSUFBSSxFQUFFLE1BQU07YUFDYjtZQUNEO2dCQUNFLElBQUksRUFBRSxlQUFlO2dCQUNyQixXQUFXLEVBQUUsbUNBQW1DO2dCQUNoRCxJQUFJLEVBQUUsTUFBTTthQUNiO1lBQ0Q7Z0JBQ0UsSUFBSSxFQUFFLGFBQWE7Z0JBQ25CLFdBQVcsRUFBRSx3Q0FBd0M7Z0JBQ3JELElBQUksRUFBRSxNQUFNO2FBQ2I7U0FDRjtLQUNGO0lBQ0Q7UUFDRSxNQUFNLEVBQUUsZ0JBQWdCO1FBQ3hCLFVBQVUsRUFBRTtZQUNWO2dCQUNFLElBQUksRUFBRSxRQUFRO2dCQUNkLFdBQVcsRUFBRSxvQkFBb0I7Z0JBQ2pDLEtBQUssRUFBRSxHQUFHO2dCQUNWLElBQUksRUFBRSxPQUFPO2FBQ2Q7WUFDRDtnQkFDRSxJQUFJLEVBQUUsTUFBTTtnQkFDWixXQUFXLEVBQUUsb0NBQW9DO2dCQUNqRCxLQUFLLEVBQUUsR0FBRztnQkFDVixJQUFJLEVBQUUsT0FBTzthQUNkO1NBQ0Y7S0FDRjtJQUNEO1FBQ0UsTUFBTSxFQUFFLG9CQUFvQjtRQUM1QixPQUFPLEVBQUU7WUFDUCxZQUFZO1lBQ1osMEJBQTBCO1lBQzFCLDZEQUE2RDtZQUM3RCw2Q0FBNkM7WUFDN0Msa0NBQWtDO1NBQ25DO0tBQ0Y7SUFDRDtRQUNFLE1BQU0sRUFBRSxtQkFBbUI7UUFDM0IsT0FBTyxFQUFFO1lBQ1A7Z0JBQ0UsT0FBTyxFQUFFLGlHQUFpRzthQUMzRztZQUNEO2dCQUNFLE9BQU8sRUFBRSx3R0FBd0c7YUFDbEg7WUFDRDtnQkFDRSxPQUFPLEVBQUUsNkZBQTZGO2FBQ3ZHO1lBQ0Q7Z0JBQ0UsT0FBTyxFQUFFLHdIQUF3SDthQUNsSTtTQUNGO0tBQ0Y7Q0FDRixDQUFBIn0= \ No newline at end of file diff --git a/lib/index.js b/lib/index.js index ea80a37..d96fbeb 100644 --- a/lib/index.js +++ b/lib/index.js @@ -48,33 +48,29 @@ class FcRemoteInvoke { }); } handlerInputs(inputs) { - var _a, _b; + var _a, _b, _c, _d, _e, _f; return __awaiter(this, void 0, void 0, function* () { - const credentials = yield core.getCredential((_a = inputs === null || inputs === void 0 ? void 0 : inputs.project) === null || _a === void 0 ? void 0 : _a.access); // 去除 args 的行首以及行尾的空格 const args = ((inputs === null || inputs === void 0 ? void 0 : inputs.args) || '').replace(/(^\s*)|(\s*$)/g, ''); logger_1.default.debug(`input args: ${args}`); const parsedArgs = core.commandParse({ args }, { boolean: ['help', 'event-stdin'], - string: ['invocation-type', 'event', 'event-file', 'region', 'service-name', 'function-name', 'qualifier'], + string: ['invocation-type', 'event', 'event-file', 'region', 'domain-name', 'service-name', 'function-name', 'qualifier'], alias: { 'help': 'h', 'event': 'e', - 'invocation-type': 't', 'event-file': 'f', - 'event-stdin': 's', } }); const argsData = (parsedArgs === null || parsedArgs === void 0 ? void 0 : parsedArgs.data) || {}; logger_1.default.debug(`command parse: ${JSON.stringify(argsData)}`); if (argsData.help) { return { - credentials, + credentials: inputs.credentials, isHelp: true, }; } - // await StdoutFormatter.initStdout(); - const { e: event, f: eventFile, s: eventStdin, t: invocationType = 'sync', } = argsData; + const { e: event, f: eventFile, 'event-file': eventStdin, 'invocation-type': invocationType = 'sync', 'domain-name': domainName, } = argsData; const eventPayload = { event, eventFile, eventStdin }; // @ts-ignore: 判断三个值有几个真 const eventFlag = !!event + !!eventFile + !!eventStdin; @@ -87,24 +83,24 @@ class FcRemoteInvoke { if (!['sync', 'async'].includes(invocationType)) { throw new Error('invocation-type enum value sync, async.'); } + if (!domainName && !(inputs === null || inputs === void 0 ? void 0 : inputs.credentials)) { + inputs.credentials = yield core.getCredential((_a = inputs === null || inputs === void 0 ? void 0 : inputs.project) === null || _a === void 0 ? void 0 : _a.access); + } logger_1.default.debug(`input props: ${JSON.stringify(inputs.props)}`); - let props = { - region: argsData.region, - serviceName: argsData['service-name'], - functionName: argsData['function-name'], + const props = { + region: argsData.region || ((_b = inputs.props) === null || _b === void 0 ? void 0 : _b.region), + serviceName: argsData['service-name'] || ((_c = inputs.props) === null || _c === void 0 ? void 0 : _c.serviceName), + functionName: argsData['function-name'] || ((_d = inputs.props) === null || _d === void 0 ? void 0 : _d.functionName), + domainName: domainName || ((_e = inputs.props) === null || _e === void 0 ? void 0 : _e.domainName), + qualifier: argsData.qualifier || ((_f = inputs.props) === null || _f === void 0 ? void 0 : _f.qualifier), }; logger_1.default.debug(`input args props: ${JSON.stringify(props)}`); - if (!entity_1.isProperties(props)) { - props = inputs.props; - } - logger_1.default.debug(`props: ${JSON.stringify(props)}`); if (!entity_1.isProperties(props)) { throw new Error('region/serviceName(service-name)/functionName(function-name) can not be empty.'); } - props.qualifier = argsData.qualifier || ((_b = inputs.props) === null || _b === void 0 ? void 0 : _b.qualifier); return { props, - credentials, + credentials: inputs.credentials, eventPayload, isHelp: false, invocationType: lodash_1.default.upperFirst(invocationType), @@ -124,10 +120,10 @@ class FcRemoteInvoke { core.help(help_1.default); return; } - const remoteInvoke = new remote_invoke_1.default(props.region, credentials); + const remoteInvoke = new remote_invoke_1.default(props.region, credentials, props.domainName); yield remoteInvoke.invoke(props, eventPayload, { invocationType }); }); } } exports.default = FcRemoteInvoke; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsb0RBQXVCO0FBQ3ZCLDREQUE4QztBQUM5Qyw2REFBcUM7QUFDckMseURBQWlDO0FBQ2pDLCtDQUF5RjtBQUN6RiwyREFBMkQ7QUFDM0Qsd0VBQStDO0FBRS9DLE1BQXFCLGNBQWM7SUFDM0IsTUFBTSxDQUFDLGFBQXFCLEVBQUUsT0FBZSxFQUFFLFNBQWlCOztZQUNwRSxJQUFJLENBQUMsZUFBZSxDQUFDLGFBQWEsRUFBRTtnQkFDbEMsT0FBTztnQkFDUCxHQUFHLEVBQUUsU0FBUzthQUNmLENBQUMsQ0FBQztRQUNMLENBQUM7S0FBQTtJQUVLLGFBQWEsQ0FBQyxNQUFrQjs7O1lBQ3BDLE1BQU0sV0FBVyxHQUFpQixNQUFNLElBQUksQ0FBQyxhQUFhLE9BQUMsTUFBTSxhQUFOLE1BQU0sdUJBQU4sTUFBTSxDQUFFLE9BQU8sMENBQUUsTUFBTSxDQUFDLENBQUM7WUFFcEYscUJBQXFCO1lBQ3JCLE1BQU0sSUFBSSxHQUFXLENBQUMsQ0FBQSxNQUFNLGFBQU4sTUFBTSx1QkFBTixNQUFNLENBQUUsSUFBSSxLQUFJLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxnQkFBZ0IsRUFBRSxFQUFFLENBQUMsQ0FBQztZQUN4RSxnQkFBTSxDQUFDLEtBQUssQ0FBQyxlQUFlLElBQUksRUFBRSxDQUFDLENBQUM7WUFFcEMsTUFBTSxVQUFVLEdBQXlCLElBQUksQ0FBQyxZQUFZLENBQUMsRUFBRSxJQUFJLEVBQUUsRUFBRTtnQkFDbkUsT0FBTyxFQUFFLENBQUMsTUFBTSxFQUFFLGFBQWEsQ0FBQztnQkFDaEMsTUFBTSxFQUFFLENBQUMsaUJBQWlCLEVBQUUsT0FBTyxFQUFFLFlBQVksRUFBRSxRQUFRLEVBQUUsY0FBYyxFQUFFLGVBQWUsRUFBRSxXQUFXLENBQUM7Z0JB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 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsb0RBQXVCO0FBQ3ZCLDREQUE4QztBQUM5Qyw2REFBcUM7QUFDckMseURBQWlDO0FBQ2pDLCtDQUEyRTtBQUMzRSwyREFBMkQ7QUFDM0Qsd0VBQStDO0FBRS9DLE1BQXFCLGNBQWM7SUFDM0IsTUFBTSxDQUFDLGFBQXFCLEVBQUUsT0FBZSxFQUFFLFNBQWlCOztZQUNwRSxJQUFJLENBQUMsZUFBZSxDQUFDLGFBQWEsRUFBRTtnQkFDbEMsT0FBTztnQkFDUCxHQUFHLEVBQUUsU0FBUzthQUNmLENBQUMsQ0FBQztRQUNMLENBQUM7S0FBQTtJQUVLLGFBQWEsQ0FBQyxNQUFrQjs7O1lBQ3BDLHFCQUFxQjtZQUNyQixNQUFNLElBQUksR0FBVyxDQUFDLENBQUEsTUFBTSxhQUFOLE1BQU0sdUJBQU4sTUFBTSxDQUFFLElBQUksS0FBSSxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsZ0JBQWdCLEVBQUUsRUFBRSxDQUFDLENBQUM7WUFDeEUsZ0JBQU0sQ0FBQyxLQUFLLENBQUMsZUFBZSxJQUFJLEVBQUUsQ0FBQyxDQUFDO1lBRXBDLE1BQU0sVUFBVSxHQUF5QixJQUFJLENBQUMsWUFBWSxDQUFDLEVBQUUsSUFBSSxFQUFFLEVBQUU7Z0JBQ25FLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRSxhQUFhLENBQUM7Z0JBQ2hDLE1BQU0sRUFBRSxDQUFDLGlCQUFpQixFQUFFLE9BQU8sRUFBRSxZQUFZLEVBQUUsUUFBUSxFQUFFLGFBQWEsRUFBQyxjQUFjLEVBQUUsZUFBZSxFQUFFLFdBQVcsQ0FBQztnQkFDeEgsS0FBSyxFQUFFO29CQUNMLE1BQU0sRUFBRSxHQUFHO29CQUNYLE9BQU8sRUFBRSxHQUFHO29CQUNaLFlBQVksRUFBRSxHQUFHO2lCQUNsQjthQUNGLENBQUMs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 \ No newline at end of file diff --git a/lib/interface/entity.d.ts b/lib/interface/entity.d.ts index 76599c0..6c07118 100644 --- a/lib/interface/entity.d.ts +++ b/lib/interface/entity.d.ts @@ -24,6 +24,7 @@ export interface IProperties { serviceName: string; functionName: string; qualifier?: string; + domainName?: string; } export declare function isProperties(args: any): args is IProperties; export interface IEventPayload { diff --git a/lib/interface/entity.js b/lib/interface/entity.js index 1796d88..8cc5fac 100644 --- a/lib/interface/entity.js +++ b/lib/interface/entity.js @@ -2,7 +2,10 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.isProperties = void 0; function isProperties(args) { - return args && args.region && args.serviceName && args.functionName; + if (!args) { + return false; + } + return args.domainName || (args.region && args.serviceName && args.functionName); } exports.isProperties = isProperties; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW50aXR5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2ludGVyZmFjZS9lbnRpdHkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBNkJBLFNBQWdCLFlBQVksQ0FBQyxJQUFTO0lBQ3BDLE9BQU8sSUFBSSxJQUFJLElBQUksQ0FBQyxNQUFNLElBQUksSUFBSSxDQUFDLFdBQVcsSUFBSSxJQUFJLENBQUMsWUFBWSxDQUFDO0FBQ3RFLENBQUM7QUFGRCxvQ0FFQyJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW50aXR5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2ludGVyZmFjZS9lbnRpdHkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBOEJBLFNBQWdCLFlBQVksQ0FBQyxJQUFTO0lBQ3BDLElBQUksQ0FBQyxJQUFJLEVBQUU7UUFDVCxPQUFPLEtBQUssQ0FBQztLQUNkO0lBQ0QsT0FBTyxJQUFJLENBQUMsVUFBVSxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sSUFBSSxJQUFJLENBQUMsV0FBVyxJQUFJLElBQUksQ0FBQyxZQUFZLENBQUMsQ0FBRTtBQUNwRixDQUFDO0FBTEQsb0NBS0MifQ== \ No newline at end of file diff --git a/lib/lib/remote-invoke.d.ts b/lib/lib/remote-invoke.d.ts index bae89fc..7fede48 100644 --- a/lib/lib/remote-invoke.d.ts +++ b/lib/lib/remote-invoke.d.ts @@ -2,10 +2,11 @@ import { IProperties, IEventPayload } from '../interface/entity'; export default class RemoteInvoke { fcClient: any; accountId: string; - constructor(region: string, credentials: any); + constructor(region: string, credentials: any, domainName: any); invoke(props: IProperties, eventPayload: IEventPayload, { invocationType }: { invocationType: any; }): Promise; + requestDomain(url: string, event: string): Promise; getHttpTrigger(serviceName: any, functionName: any): Promise; eventInvoke({ serviceName, functionName, event, qualifier, invocationType }: { serviceName: any; @@ -33,4 +34,6 @@ export default class RemoteInvoke { path: any; body: any; }; + private showLog; + private getJsonEvent; } diff --git a/lib/lib/remote-invoke.js b/lib/lib/remote-invoke.js index 1b9950f..94661bc 100644 --- a/lib/lib/remote-invoke.js +++ b/lib/lib/remote-invoke.js @@ -13,19 +13,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) { }; Object.defineProperty(exports, "__esModule", { value: true }); const lodash_1 = __importDefault(require("lodash")); +const got_1 = __importDefault(require("got")); const client_1 = __importDefault(require("./client")); const event_1 = __importDefault(require("./event")); const logger_1 = __importDefault(require("../common/logger")); class RemoteInvoke { - constructor(region, credentials) { - this.accountId = credentials.AccountID; - this.fcClient = client_1.default.buildFcClient(region, credentials); + constructor(region, credentials, domainName) { + if (!domainName) { + this.accountId = credentials.AccountID; + this.fcClient = client_1.default.buildFcClient(region, credentials); + } } invoke(props, eventPayload, { invocationType }) { return __awaiter(this, void 0, void 0, function* () { const event = yield event_1.default.eventPriority(eventPayload); logger_1.default.debug(`event: ${event}`); - const { region, serviceName, functionName, qualifier, } = props; + const { region, serviceName, functionName, domainName, qualifier, } = props; + if (domainName) { + return this.requestDomain(domainName, event); + } const httpTriggers = yield this.getHttpTrigger(serviceName, functionName); const payload = { event, serviceName, functionName, qualifier }; if (lodash_1.default.isEmpty(httpTriggers)) { @@ -35,17 +41,25 @@ class RemoteInvoke { } else { payload.region = region; - try { - payload.event = event ? JSON.parse(event) : {}; - } - catch (ex) { - logger_1.default.debug(ex); - throw new Error('handler event error. Example: https://github.com/devsapp/fc-remote-invoke/blob/master/example/http.json'); - } + payload.event = this.getJsonEvent(event); yield this.httpInvoke(payload); } }); } + requestDomain(url, event) { + return __awaiter(this, void 0, void 0, function* () { + const payload = this.getJsonEvent(event); + if (lodash_1.default.isEmpty(payload.headers)) { + payload.headers = {}; + } + payload.headers['X-Fc-Log-Type'] = 'Tail'; + const { body, headers } = yield got_1.default(url, payload); + this.showLog(headers['x-fc-log-result']); + logger_1.default.log('\nFC Invoke Result:', 'green'); + console.log(body); + logger_1.default.log('\n'); + }); + } getHttpTrigger(serviceName, functionName) { return __awaiter(this, void 0, void 0, function* () { const { data } = yield this.fcClient.listTriggers(serviceName, functionName); @@ -67,16 +81,10 @@ class RemoteInvoke { 'X-Fc-Log-Type': 'Tail', 'X-Fc-Invocation-Type': invocationType }, qualifier); - const log = rs.headers['x-fc-log-result']; - if (log) { - logger_1.default.log('========= FC invoke Logs begin =========', 'yellow'); - const decodedLog = Buffer.from(log, 'base64'); - logger_1.default.log(decodedLog.toString()); - logger_1.default.log('========= FC invoke Logs end =========', 'yellow'); - logger_1.default.log('\nFC Invoke Result:', 'green'); - console.log(rs.data); - console.log('\n'); - } + this.showLog(rs.headers['x-fc-log-result']); + logger_1.default.log('\nFC Invoke Result:', 'green'); + console.log(rs.data); + console.log('\n'); } else { const { headers } = yield this.fcClient.invokeFunction(serviceName, functionName, event, { @@ -137,13 +145,7 @@ class RemoteInvoke { } logger_1.default.debug(`end invoke.`); if (resp) { - const log = resp.headers['x-fc-log-result']; - if (log) { - logger_1.default.log('\n========= FC invoke Logs begin =========', 'yellow'); - const decodedLog = Buffer.from(log, 'base64'); - logger_1.default.log(decodedLog.toString()); - logger_1.default.log('========= FC invoke Logs end =========', 'yellow'); - } + this.showLog(resp.headers['x-fc-log-result']); logger_1.default.log('\nFC Invoke Result:', 'green'); console.log(resp.data); console.log('\n'); @@ -184,6 +186,23 @@ class RemoteInvoke { body: postBody }; } + showLog(log) { + if (log) { + logger_1.default.log('========= FC invoke Logs begin =========', 'yellow'); + const decodedLog = Buffer.from(log, 'base64'); + logger_1.default.log(decodedLog.toString()); + logger_1.default.log('========= FC invoke Logs end =========', 'yellow'); + } + } + getJsonEvent(event) { + try { + return event ? JSON.parse(event) : {}; + } + catch (ex) { + logger_1.default.debug(ex); + throw new Error('handler event error. Example: https://github.com/devsapp/fc-remote-invoke/blob/master/example/http.json'); + } + } } exports.default = RemoteInvoke; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"remote-invoke.js","sourceRoot":"","sources":["../../src/lib/remote-invoke.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"remote-invoke.js","sourceRoot":"","sources":["../../src/lib/remote-invoke.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index 50d1b49..26cb28b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fc-remote-invoke", - "version": "0.0.11", + "version": "0.0.12", "description": "This is a component demo for Serverless Devs Tool ", "keywords": [ "Serverless", diff --git a/publish.yaml b/publish.yaml index d412d08..5af48a6 100644 --- a/publish.yaml +++ b/publish.yaml @@ -2,7 +2,7 @@ Type: Component Name: fc-remote-invoke Provider: - 其它 -Version: 0.0.11 +Version: 0.0.12 Description: 初始化component模板 HomePage: https://www.serverless-devs.com Tags: #标签详情 diff --git a/src/index.ts b/src/index.ts index 623935c..c929644 100644 --- a/src/index.ts +++ b/src/index.ts @@ -2,7 +2,7 @@ import _ from 'lodash'; import * as core from '@serverless-devs/core'; import logger from './common/logger'; import HELP from './common/help'; -import { InputProps, ICredentials, isProperties, IProperties } from './interface/entity'; +import { InputProps, isProperties, IProperties } from './interface/entity'; // import StdoutFormatter from './common/stdout-formatter'; import RemoteInvoke from './lib/remote-invoke';