From d6f23e2778e66ede1e63e9581f9c2e206be15025 Mon Sep 17 00:00:00 2001 From: wss-git Date: Thu, 8 Jul 2021 17:49:12 +0800 Subject: [PATCH] refactor: version 0.0.13 --- dist/common/logger.d.ts | 10 + dist/common/logger.js | 32 +++ dist/constant.d.ts | 22 +- dist/constant.js | 30 ++- dist/index.d.ts | 4 +- dist/index.js | 128 +++++++---- dist/interface.d.ts | 13 +- dist/interface.js | 2 +- dist/utils/addFcDomain/index.d.ts | 2 - dist/utils/addFcDomain/index.js | 64 +++--- dist/utils/addJamstack/index.d.ts | 7 + dist/utils/addJamstack/index.js | 209 ++++++++++++++++++ dist/utils/addOssDomain/cdn.d.ts | 11 - dist/utils/addOssDomain/cdn.js | 220 ------------------- dist/utils/addOssDomain/index.d.ts | 4 +- dist/utils/addOssDomain/index.js | 109 ++++------ dist/utils/addOssDomain/oss.d.ts | 12 -- dist/utils/api.d.ts | 4 + dist/utils/api.js | 136 ++++++++++++ dist/utils/cdn.d.ts | 13 ++ dist/utils/cdn.js | 310 +++++++++++++++++++++++++++ dist/utils/{addFcDomain => }/fc.d.ts | 2 - dist/utils/{addFcDomain => }/fc.js | 42 ++-- dist/utils/oss.d.ts | 4 + dist/utils/{addOssDomain => }/oss.js | 43 ++-- dist/utils/utils.d.ts | 1 - dist/utils/utils.js | 12 +- package.json | 2 +- publish.yaml | 2 +- 29 files changed, 979 insertions(+), 471 deletions(-) create mode 100644 dist/common/logger.d.ts create mode 100644 dist/common/logger.js create mode 100644 dist/utils/addJamstack/index.d.ts create mode 100644 dist/utils/addJamstack/index.js delete mode 100644 dist/utils/addOssDomain/cdn.d.ts delete mode 100644 dist/utils/addOssDomain/cdn.js delete mode 100644 dist/utils/addOssDomain/oss.d.ts create mode 100644 dist/utils/api.d.ts create mode 100644 dist/utils/api.js create mode 100644 dist/utils/cdn.d.ts create mode 100644 dist/utils/cdn.js rename dist/utils/{addFcDomain => }/fc.d.ts (83%) rename dist/utils/{addFcDomain => }/fc.js (61%) create mode 100644 dist/utils/oss.d.ts rename dist/utils/{addOssDomain => }/oss.js (57%) diff --git a/dist/common/logger.d.ts b/dist/common/logger.d.ts new file mode 100644 index 0000000..b48fda6 --- /dev/null +++ b/dist/common/logger.d.ts @@ -0,0 +1,10 @@ +export default class ComponentLogger { + private static CONTENT; + static setContent(content: any): void; + static log(m: any, color?: 'black' | 'red' | 'green' | 'yellow' | 'blue' | 'magenta' | 'cyan' | 'white' | 'whiteBright' | 'gray'): void; + static info(m: any): void; + static debug(m: any): void; + static error(m: any): void; + static warning(m: any): void; + static success(m: any): void; +} diff --git a/dist/common/logger.js b/dist/common/logger.js new file mode 100644 index 0000000..855b151 --- /dev/null +++ b/dist/common/logger.js @@ -0,0 +1,32 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +var core_1 = require("@serverless-devs/core"); +var ComponentLogger = /** @class */ (function () { + function ComponentLogger() { + } + ComponentLogger.setContent = function (content) { + ComponentLogger.CONTENT = content; + }; + ComponentLogger.log = function (m, color) { + core_1.Logger.log(m, color); + }; + ComponentLogger.info = function (m) { + core_1.Logger.info(ComponentLogger.CONTENT, m); + }; + ComponentLogger.debug = function (m) { + core_1.Logger.debug(ComponentLogger.CONTENT, m); + }; + ComponentLogger.error = function (m) { + core_1.Logger.error(ComponentLogger.CONTENT, m); + }; + ComponentLogger.warning = function (m) { + core_1.Logger.warn(ComponentLogger.CONTENT, m); + }; + ComponentLogger.success = function (m) { + core_1.Logger.log(m, 'green'); + }; + ComponentLogger.CONTENT = 'FC-DOMAIN'; + return ComponentLogger; +}()); +exports.default = ComponentLogger; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbW1vbi9sb2dnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSw4Q0FBK0M7QUFFL0M7SUFBQTtJQTZCQSxDQUFDO0lBM0JRLDBCQUFVLEdBQWpCLFVBQWtCLE9BQU87UUFDdkIsZUFBZSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUM7SUFDcEMsQ0FBQztJQUVNLG1CQUFHLEdBQVYsVUFBVyxDQUFDLEVBQUUsS0FBNkc7UUFDekgsYUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsS0FBSyxDQUFDLENBQUM7SUFDdkIsQ0FBQztJQUVNLG9CQUFJLEdBQVgsVUFBWSxDQUFDO1FBQ1gsYUFBTSxDQUFDLElBQUksQ0FBQyxlQUFlLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQzFDLENBQUM7SUFFTSxxQkFBSyxHQUFaLFVBQWEsQ0FBQztRQUNaLGFBQU0sQ0FBQyxLQUFLLENBQUMsZUFBZSxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUMsQ0FBQztJQUMzQyxDQUFDO0lBRU0scUJBQUssR0FBWixVQUFhLENBQUM7UUFDWixhQUFNLENBQUMsS0FBSyxDQUFDLGVBQWUsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFDM0MsQ0FBQztJQUVNLHVCQUFPLEdBQWQsVUFBZSxDQUFDO1FBQ2QsYUFBTSxDQUFDLElBQUksQ0FBQyxlQUFlLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQzFDLENBQUM7SUFFTSx1QkFBTyxHQUFkLFVBQWUsQ0FBQztRQUNkLGFBQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBQ3pCLENBQUM7SUEzQmMsdUJBQU8sR0FBRyxXQUFXLENBQUM7SUE0QnZDLHNCQUFDO0NBQUEsQUE3QkQsSUE2QkM7a0JBN0JvQixlQUFlIn0= \ No newline at end of file diff --git a/dist/constant.d.ts b/dist/constant.d.ts index eaf55b8..fd91da2 100644 --- a/dist/constant.d.ts +++ b/dist/constant.d.ts @@ -1,11 +1,5 @@ declare const _default: { CONTEXT: string; - DOMAIN: string; - HINT: { - loading: string; - success: string; - error: string; - }; RETRYOPTIONS: { retries: number; factor: number; @@ -28,5 +22,21 @@ declare const _default: { }[]; optionList?: undefined; })[]; + JAM_STACK_HELP: ({ + header: string; + optionList: { + name: string; + description: string; + alias: string; + type: BooleanConstructor; + }[]; + content?: undefined; + } | { + header: string; + content: { + example: string; + }[]; + optionList?: undefined; + })[]; }; export default _default; diff --git a/dist/constant.js b/dist/constant.js index 9ed7c65..5694bd0 100644 --- a/dist/constant.js +++ b/dist/constant.js @@ -2,12 +2,6 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.default = { CONTEXT: 'FC-DOMAIN', - DOMAIN: 'http://domain.devsapp.net', - HINT: { - loading: 'Get token....', - success: 'End of request', - error: 'Request failed', - }, RETRYOPTIONS: { retries: 5, factor: 2, @@ -36,5 +30,27 @@ exports.default = { ], }, ], + JAM_STACK_HELP: [ + { + header: 'Options', + optionList: [ + { + name: 'help', + description: '使用引导', + alias: 'h', + type: Boolean, + }, + ], + }, + { + header: 'Examples', + content: [ + { + // desc: 's exec -- get', + example: '$ s exec -- get', + }, + ], + }, + ], }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uc3RhbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFDQSxrQkFBZTtJQUNiLE9BQU8sRUFBRSxXQUFXO0lBQ3BCLE1BQU0sRUFBRSwyQkFBMkI7SUFDbkMsSUFBSSxFQUFFO1FBQ0osT0FBTyxFQUFFLGVBQWU7UUFDeEIsT0FBTyxFQUFFLGdCQUFnQjtRQUN6QixLQUFLLEVBQUUsZ0JBQWdCO0tBQ3hCO0lBQ0QsWUFBWSxFQUFFO1FBQ1osT0FBTyxFQUFFLENBQUM7UUFDVixNQUFNLEVBQUUsQ0FBQztRQUNULFVBQVUsRUFBRSxDQUFDLEdBQUcsSUFBSTtRQUNwQixTQUFTLEVBQUUsSUFBSTtLQUNoQjtJQUNELElBQUksRUFBRTtRQUNKO1lBQ0UsTUFBTSxFQUFFLFNBQVM7WUFDakIsVUFBVSxFQUFFO2dCQUNWO29CQUNFLElBQUksRUFBRSxNQUFNO29CQUNaLFdBQVcsRUFBRSxNQUFNO29CQUNuQixLQUFLLEVBQUUsR0FBRztvQkFDVixJQUFJLEVBQUUsT0FBTztpQkFDZDthQUNGO1NBQ0Y7UUFDRDtZQUNFLE1BQU0sRUFBRSxVQUFVO1lBQ2xCLE9BQU8sRUFBRTtnQkFDUDtvQkFDRSx5QkFBeUI7b0JBQ3pCLE9BQU8sRUFBRSxpQkFBaUI7aUJBQzNCO2FBQ0Y7U0FDRjtLQUNGO0NBQ0YsQ0FBQyJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uc3RhbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFDQSxrQkFBZTtJQUNiLE9BQU8sRUFBRSxXQUFXO0lBQ3BCLFlBQVksRUFBRTtRQUNaLE9BQU8sRUFBRSxDQUFDO1FBQ1YsTUFBTSxFQUFFLENBQUM7UUFDVCxVQUFVLEVBQUUsQ0FBQyxHQUFHLElBQUk7UUFDcEIsU0FBUyxFQUFFLElBQUk7S0FDaEI7SUFDRCxJQUFJLEVBQUU7UUFDSjtZQUNFLE1BQU0sRUFBRSxTQUFTO1lBQ2pCLFVBQVUsRUFBRTtnQkFDVjtvQkFDRSxJQUFJLEVBQUUsTUFBTTtvQkFDWixXQUFXLEVBQUUsTUFBTTtvQkFDbkIsS0FBSyxFQUFFLEdBQUc7b0JBQ1YsSUFBSSxFQUFFLE9BQU87aUJBQ2Q7YUFDRjtTQUNGO1FBQ0Q7WUFDRSxNQUFNLEVBQUUsVUFBVTtZQUNsQixPQUFPLEVBQUU7Z0JBQ1A7b0JBQ0UseUJBQXlCO29CQUN6QixPQUFPLEVBQUUsaUJBQWlCO2lCQUMzQjthQUNGO1NBQ0Y7S0FDRjtJQUNELGNBQWMsRUFBRTtRQUNkO1lBQ0UsTUFBTSxFQUFFLFNBQVM7WUFDakIsVUFBVSxFQUFFO2dCQUNWO29CQUNFLElBQUksRUFBRSxNQUFNO29CQUNaLFdBQVcsRUFBRSxNQUFNO29CQUNuQixLQUFLLEVBQUUsR0FBRztvQkFDVixJQUFJLEVBQUUsT0FBTztpQkFDZDthQUNGO1NBQ0Y7UUFDRDtZQUNFLE1BQU0sRUFBRSxVQUFVO1lBQ2xCLE9BQU8sRUFBRTtnQkFDUDtvQkFDRSx5QkFBeUI7b0JBQ3pCLE9BQU8sRUFBRSxpQkFBaUI7aUJBQzNCO2FBQ0Y7U0FDRjtLQUNGO0NBQ0YsQ0FBQyJ9 \ No newline at end of file diff --git a/dist/index.d.ts b/dist/index.d.ts index 4ced6d7..776f8eb 100644 --- a/dist/index.d.ts +++ b/dist/index.d.ts @@ -1,6 +1,6 @@ -import { ILogger } from '@serverless-devs/core'; import { IInputs } from './interface'; export default class Compoent { - logger: ILogger; get(inputs: IInputs): Promise; + jamstack(inputs: IInputs): Promise; + private hanlderInputs; } diff --git a/dist/index.js b/dist/index.js index 49a6c79..8ac1832 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1,12 +1,22 @@ "use strict"; -var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { - var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; - if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); - else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; - return c > 3 && r && Object.defineProperty(target, key, r), r; -}; -var __metadata = (this && this.__metadata) || function (k, v) { - if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); + __setModuleDefault(result, mod); + return result; }; var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } @@ -48,63 +58,95 @@ var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", { value: true }); -var core_1 = require("@serverless-devs/core"); +var core = __importStar(require("@serverless-devs/core")); var constant_1 = __importDefault(require("./constant")); var addFcDomain_1 = __importDefault(require("./utils/addFcDomain")); var addOssDomain_1 = __importDefault(require("./utils/addOssDomain")); +var addJamstack_1 = __importDefault(require("./utils/addJamstack")); var interface_1 = require("./interface"); +var logger_1 = __importDefault(require("./common/logger")); var Compoent = /** @class */ (function () { function Compoent() { } Compoent.prototype.get = function (inputs) { - var _a; return __awaiter(this, void 0, void 0, function () { - var apts, commandData, params, credential, addOssDomain; + var _a, props, credential, help; + return __generator(this, function (_b) { + switch (_b.label) { + case 0: return [4 /*yield*/, this.hanlderInputs(inputs, 'get')]; + case 1: + _a = _b.sent(), props = _a.props, credential = _a.credential, help = _a.help; + if (help) { + core.help(constant_1.default.HELP); + return [2 /*return*/]; + } + if (!interface_1.isFcToken(props)) return [3 /*break*/, 3]; + return [4 /*yield*/, addFcDomain_1.default.domain(props, credential)]; + case 2: return [2 /*return*/, _b.sent()]; + case 3: + if (!interface_1.isOssToken(props)) return [3 /*break*/, 5]; + return [4 /*yield*/, addOssDomain_1.default.domain(props, credential)]; + case 4: return [2 /*return*/, _b.sent()]; + case 5: throw new Error('Domain configuration error, please refer to https://github.com/devsapp/domain'); + } + }); + }); + }; + Compoent.prototype.jamstack = function (inputs) { + return __awaiter(this, void 0, void 0, function () { + var _a, props, credential, help; return __generator(this, function (_b) { switch (_b.label) { + case 0: return [4 /*yield*/, this.hanlderInputs(inputs, 'jamstack')]; + case 1: + _a = _b.sent(), props = _a.props, credential = _a.credential, help = _a.help; + if (help) { + core.help(constant_1.default.JAM_STACK_HELP); + return [2 /*return*/]; + } + return [4 /*yield*/, addJamstack_1.default.domain(props, credential)]; + case 2: return [2 /*return*/, _b.sent()]; + } + }); + }); + }; + Compoent.prototype.hanlderInputs = function (inputs, command) { + var _a; + return __awaiter(this, void 0, void 0, function () { + var apts, commandData, credential, _b; + return __generator(this, function (_c) { + switch (_c.label) { case 0: - // @ts-ignore - delete inputs.Credentials; - // @ts-ignore - delete inputs.credentials; - this.logger.debug("inputs params: " + JSON.stringify(inputs)); + logger_1.default.setContent(constant_1.default.CONTEXT); + logger_1.default.debug("inputs params: " + JSON.stringify(inputs.props)); apts = { boolean: ['help'], alias: { help: 'h' } }; - commandData = core_1.commandParse({ args: inputs.args }, apts); - this.logger.debug("Command data is: " + JSON.stringify(commandData)); + commandData = core.commandParse(inputs, apts); + logger_1.default.debug("Command data is: " + JSON.stringify(commandData)); if ((_a = commandData.data) === null || _a === void 0 ? void 0 : _a.help) { - core_1.help(constant_1.default.HELP); - return [2 /*return*/]; + core.reportComponent('domain', { uid: '', command: command }); + return [2 /*return*/, { help: true }]; } - params = inputs.props; - return [4 /*yield*/, core_1.getCredential(inputs.project.access)]; + _b = inputs.credential; + if (_b) return [3 /*break*/, 2]; + return [4 /*yield*/, core.getCredential(inputs.project.access)]; case 1: - credential = _b.sent(); - core_1.reportComponent('domain', { + _b = (_c.sent()); + _c.label = 2; + case 2: + credential = _b; + core.reportComponent('domain', { uid: credential.AccountID, - command: 'get', + command: command, }); - if (!interface_1.isFcToken(params)) return [3 /*break*/, 3]; - return [4 /*yield*/, addFcDomain_1.default.domain(params, credential)]; - case 2: - // @ts-ignore - return [2 /*return*/, _b.sent()]; - case 3: - if (!interface_1.isOssToken(params)) return [3 /*break*/, 5]; - addOssDomain = new addOssDomain_1.default(); - return [4 /*yield*/, addOssDomain.domain(params, credential)]; - case 4: - // @ts-ignore - return [2 /*return*/, _b.sent()]; - case 5: throw new Error('Domain configuration error, please refer to https://github.com/devsapp/domain'); + return [2 /*return*/, { + props: inputs.props, + credential: credential, + }]; } }); }); }; - __decorate([ - core_1.HLogger(constant_1.default.CONTEXT), - __metadata("design:type", Object) - ], Compoent.prototype, "logger", void 0); return Compoent; }()); exports.default = Compoent; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw4Q0FBNkc7QUFDN0csd0RBQWtDO0FBQ2xDLG9FQUE4QztBQUM5QyxzRUFBZ0Q7QUFDaEQseUNBQTZEO0FBRTdEO0lBQUE7SUF1Q0EsQ0FBQztJQXBDTyxzQkFBRyxHQUFULFVBQVUsTUFBZTs7Ozs7Ozt3QkFDdkIsYUFBYTt3QkFDYixPQUFPLE1BQU0sQ0FBQyxXQUFXLENBQUM7d0JBQzFCLGFBQWE7d0JBQ2IsT0FBTyxNQUFNLENBQUMsV0FBVyxDQUFDO3dCQUMxQixJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxvQkFBa0IsSUFBSSxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUcsQ0FBQyxDQUFDO3dCQUV4RCxJQUFJLEdBQUcsRUFBRSxPQUFPLEVBQUUsQ0FBQyxNQUFNLENBQUMsRUFBRSxLQUFLLEVBQUUsRUFBRSxJQUFJLEVBQUUsR0FBRyxFQUFFLEVBQUUsQ0FBQzt3QkFDbkQsV0FBVyxHQUFRLG1CQUFZLENBQUMsRUFBRSxJQUFJLEVBQUUsTUFBTSxDQUFDLElBQUksRUFBRSxFQUFFLElBQUksQ0FBQyxDQUFDO3dCQUNuRSxJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxzQkFBb0IsSUFBSSxDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUcsQ0FBQyxDQUFDO3dCQUNyRSxVQUFJLFdBQVcsQ0FBQyxJQUFJLDBDQUFFLElBQUksRUFBRTs0QkFDMUIsV0FBSSxDQUFDLGtCQUFRLENBQUMsSUFBSSxDQUFDLENBQUM7NEJBQ3BCLHNCQUFPO3lCQUNSO3dCQUVLLE1BQU0sR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFDO3dCQUVULHFCQUFNLG9CQUFhLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsRUFBQTs7d0JBQXZELFVBQVUsR0FBRyxTQUEwQzt3QkFDN0Qsc0JBQWUsQ0FBQyxRQUFRLEVBQUU7NEJBQ3hCLEdBQUcsRUFBRSxVQUFVLENBQUMsU0FBUzs0QkFDekIsT0FBTyxFQUFFLEtBQUs7eUJBQ2YsQ0FBQyxDQUFDOzZCQUVDLHFCQUFTLENBQUMsTUFBTSxDQUFDLEVBQWpCLHdCQUFpQjt3QkFFWixxQkFBTSxxQkFBVyxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUUsVUFBVSxDQUFDLEVBQUE7O29CQURuRCxhQUFhO29CQUNiLHNCQUFPLFNBQTRDLEVBQUM7OzZCQUdsRCxzQkFBVSxDQUFDLE1BQU0sQ0FBQyxFQUFsQix3QkFBa0I7d0JBQ2QsWUFBWSxHQUFHLElBQUksc0JBQVksRUFBRSxDQUFDO3dCQUVqQyxxQkFBTSxZQUFZLENBQUMsTUFBTSxDQUFDLE1BQU0sRUFBRSxVQUFVLENBQUMsRUFBQTs7b0JBRHBELGFBQWE7b0JBQ2Isc0JBQU8sU0FBNkMsRUFBQzs0QkFHdkQsTUFBTSxJQUFJLEtBQUssQ0FBQywrRUFBK0UsQ0FBQyxDQUFDOzs7O0tBQ2xHO0lBckMwQjtRQUExQixjQUFPLENBQUMsa0JBQVEsQ0FBQyxPQUFPLENBQUM7OzRDQUFpQjtJQXNDN0MsZUFBQztDQUFBLEFBdkNELElBdUNDO2tCQXZDb0IsUUFBUSJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsMERBQThDO0FBQzlDLHdEQUFrQztBQUNsQyxvRUFBOEM7QUFDOUMsc0VBQWdEO0FBQ2hELG9FQUE4QztBQUM5Qyx5Q0FBNkQ7QUFDN0QsMkRBQXFDO0FBRXJDO0lBQUE7SUE4REEsQ0FBQztJQTdETyxzQkFBRyxHQUFULFVBQVUsTUFBZTs7Ozs7NEJBS25CLHFCQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsTUFBTSxFQUFFLEtBQUssQ0FBQyxFQUFBOzt3QkFKckMsS0FJRixTQUF1QyxFQUh6QyxLQUFLLFdBQUEsRUFDTCxVQUFVLGdCQUFBLEVBQ1YsSUFBSSxVQUFBO3dCQUdOLElBQUksSUFBSSxFQUFFOzRCQUNSLElBQUksQ0FBQyxJQUFJLENBQUMsa0JBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQzs0QkFDekIsc0JBQU87eUJBQ1I7NkJBRUcscUJBQVMsQ0FBQyxLQUFLLENBQUMsRUFBaEIsd0JBQWdCO3dCQUNYLHFCQUFNLHFCQUFXLENBQUMsTUFBTSxDQUFDLEtBQUssRUFBRSxVQUFVLENBQUMsRUFBQTs0QkFBbEQsc0JBQU8sU0FBMkMsRUFBQzs7NkJBR2pELHNCQUFVLENBQUMsS0FBSyxDQUFDLEVBQWpCLHdCQUFpQjt3QkFDWixxQkFBTSxzQkFBWSxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUUsVUFBVSxDQUFDLEVBQUE7NEJBQW5ELHNCQUFPLFNBQTRDLEVBQUM7NEJBR3RELE1BQU0sSUFBSSxLQUFLLENBQUMsK0VBQStFLENBQUMsQ0FBQzs7OztLQUNsRztJQUVLLDJCQUFRLEdBQWQsVUFBZSxNQUFlOzs7Ozs0QkFLeEIscUJBQU0sSUFBSSxDQUFDLGFBQWEsQ0FBQyxNQUFNLEVBQUUsVUFBVSxDQUFDLEVBQUE7O3dCQUoxQyxLQUlGLFNBQTRDLEVBSDlDLEtBQUssV0FBQSxFQUNMLFVBQVUsZ0JBQUEsRUFDVixJQUFJLFVBQUE7d0JBR04sSUFBSSxJQUFJLEVBQUU7NEJBQ1IsSUFBSSxDQUFDLElBQUksQ0FBQyxrQkFBUSxDQUFDLGNBQWMsQ0FBQyxDQUFDOzRCQUNuQyxzQkFBTzt5QkFDUjt3QkFFTSxxQkFBTSxxQkFBVyxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUUsVUFBVSxDQUFDLEVBQUE7NEJBQWxELHNCQUFPLFNBQTJDLEVBQUM7Ozs7S0FDcEQ7SUFFYSxnQ0FBYSxHQUEzQixVQUE0QixNQUFlLEVBQUUsT0FBZTs7Ozs7Ozt3QkFDMUQsZ0JBQU0sQ0FBQyxVQUFVLENBQUMsa0JBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQzt3QkFDcEMsZ0JBQU0sQ0FBQyxLQUFLLENBQUMsb0JBQWtCLElBQUksQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBRyxDQUFDLENBQUM7d0JBQ3pELElBQUksR0FBRyxFQUFFLE9BQU8sRUFBRSxDQUFDLE1BQU0sQ0FBQyxFQUFFLEtBQUssRUFBRSxFQUFFLElBQUksRUFBRSxHQUFHLEVBQUUsRUFBRSxDQUFDO3dCQUNuRCxXQUFXLEdBQVEsSUFBSSxDQUFDLFlBQVksQ0FBQyxNQUFNLEVBQUUsSUFBSSxDQUFDLENBQUM7d0JBQ3pELGdCQUFNLENBQUMsS0FBSyxDQUFDLHNCQUFvQixJQUFJLENBQUMsU0FBUyxDQUFDLFdBQVcsQ0FBRyxDQUFDLENBQUM7d0JBRWhFLFVBQUksV0FBVyxDQUFDLElBQUksMENBQUUsSUFBSSxFQUFFOzRCQUMxQixJQUFJLENBQUMsZUFBZSxDQUFDLFFBQVEsRUFBRSxFQUFFLEdBQUcsRUFBRSxFQUFFLEVBQUUsT0FBTyxTQUFBLEVBQUUsQ0FBQyxDQUFDOzRCQUNyRCxzQkFBTyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsRUFBQzt5QkFDdkI7d0JBQ2tCLEtBQUEsTUFBTSxDQUFDLFVBQVUsQ0FBQTtnQ0FBakIsd0JBQWlCO3dCQUFJLHFCQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsRUFBQTs7OEJBQS9DLFNBQStDOzs7d0JBQWpGLFVBQVUsS0FBdUU7d0JBRXZGLElBQUksQ0FBQyxlQUFlLENBQUMsUUFBUSxFQUFFOzRCQUM3QixHQUFHLEVBQUUsVUFBVSxDQUFDLFNBQVM7NEJBQ3pCLE9BQU8sU0FBQTt5QkFDUixDQUFDLENBQUM7d0JBRUgsc0JBQU87Z0NBQ0wsS0FBSyxFQUFFLE1BQU0sQ0FBQyxLQUFLO2dDQUNuQixVQUFVLFlBQUE7NkJBQ1gsRUFBQzs7OztLQUNIO0lBQ0gsZUFBQztBQUFELENBQUMsQUE5REQsSUE4REMifQ== \ No newline at end of file diff --git a/dist/interface.d.ts b/dist/interface.d.ts index 921b1b2..d54f776 100644 --- a/dist/interface.d.ts +++ b/dist/interface.d.ts @@ -1,10 +1,11 @@ export interface IInputs { - props: IFCTOKEN | IOSSTOKEN; + props: any; project: { component: string; access: string; projectName: string; }; + credential?: ICredentials; appName: string; args: string; path: any; @@ -27,5 +28,15 @@ export interface IOSSTOKEN { bucket: string; region: string; } +export interface IJamstack { + type: 'jamstack-fc' | 'jamstack-oss'; + project: string; + region: string; + bucket?: string; + user?: number; + service?: string; + function?: string; + customDomain?: string; +} export declare function isFcToken(args: any): args is IFCTOKEN; export declare function isOssToken(args: any): args is IOSSTOKEN; diff --git a/dist/interface.js b/dist/interface.js index 6607f98..5bef654 100644 --- a/dist/interface.js +++ b/dist/interface.js @@ -9,4 +9,4 @@ function isOssToken(args) { return args.type === 'oss' && args.bucket !== undefined; } exports.isOssToken = isOssToken; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ludGVyZmFjZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFpQ0EsU0FBZ0IsU0FBUyxDQUFDLElBQVM7SUFDakMsT0FBTyxJQUFJLENBQUMsSUFBSSxLQUFLLElBQUksSUFBSSxJQUFJLENBQUMsT0FBTyxLQUFLLFNBQVMsQ0FBQztBQUMxRCxDQUFDO0FBRkQsOEJBRUM7QUFFRCxTQUFnQixVQUFVLENBQUMsSUFBUztJQUNsQyxPQUFPLElBQUksQ0FBQyxJQUFJLEtBQUssS0FBSyxJQUFJLElBQUksQ0FBQyxNQUFNLEtBQUssU0FBUyxDQUFDO0FBQzFELENBQUM7QUFGRCxnQ0FFQyJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ludGVyZmFjZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUE2Q0EsU0FBZ0IsU0FBUyxDQUFDLElBQVM7SUFDakMsT0FBTyxJQUFJLENBQUMsSUFBSSxLQUFLLElBQUksSUFBSSxJQUFJLENBQUMsT0FBTyxLQUFLLFNBQVMsQ0FBQztBQUMxRCxDQUFDO0FBRkQsOEJBRUM7QUFFRCxTQUFnQixVQUFVLENBQUMsSUFBUztJQUNsQyxPQUFPLElBQUksQ0FBQyxJQUFJLEtBQUssS0FBSyxJQUFJLElBQUksQ0FBQyxNQUFNLEtBQUssU0FBUyxDQUFDO0FBQzFELENBQUM7QUFGRCxnQ0FFQyJ9 \ No newline at end of file diff --git a/dist/utils/addFcDomain/index.d.ts b/dist/utils/addFcDomain/index.d.ts index 0f7f7f0..f9626f4 100644 --- a/dist/utils/addFcDomain/index.d.ts +++ b/dist/utils/addFcDomain/index.d.ts @@ -1,6 +1,4 @@ -import { ILogger } from '@serverless-devs/core'; import { IFCTOKEN } from '../../interface'; export default class AddFcDomain { - static logger: ILogger; static domain(params: IFCTOKEN, credential: any): Promise; } diff --git a/dist/utils/addFcDomain/index.js b/dist/utils/addFcDomain/index.js index 3c2b695..cf22ed3 100644 --- a/dist/utils/addFcDomain/index.js +++ b/dist/utils/addFcDomain/index.js @@ -10,14 +10,24 @@ var __assign = (this && this.__assign) || function () { }; return __assign.apply(this, arguments); }; -var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { - var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; - if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); - else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; - return c > 3 && r && Object.defineProperty(target, key, r), r; -}; -var __metadata = (this && this.__metadata) || function (k, v) { - if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); + __setModuleDefault(result, mod); + return result; }; var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } @@ -61,28 +71,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) { Object.defineProperty(exports, "__esModule", { value: true }); var core_1 = require("@serverless-devs/core"); var utils_1 = require("../utils"); -var constant_1 = __importDefault(require("../../constant")); -var fc_1 = __importDefault(require("./fc")); +var fc_1 = __importDefault(require("../fc")); +var api = __importStar(require("../api")); var AddFcDomain = /** @class */ (function () { function AddFcDomain() { } AddFcDomain.domain = function (params, credential) { return __awaiter(this, void 0, void 0, function () { - var tokenRs, token, vm, ex_1, domainRs; + var tokenRs, token, vm, ex_1; return __generator(this, function (_a) { switch (_a.label) { - case 0: - this.logger.debug("The request " + constant_1.default.DOMAIN + "/token parameter is: \n " + JSON.stringify(params, null, ' ') + " "); - return [4 /*yield*/, core_1.request(constant_1.default.DOMAIN + "/token", { - method: 'post', - body: params, - form: true, - hint: constant_1.default.HINT, - })]; + case 0: return [4 /*yield*/, api.token(params)]; case 1: tokenRs = _a.sent(); - this.logger.debug("Get token response is: \n " + JSON.stringify(tokenRs, null, ' ')); - utils_1.checkRs(tokenRs); token = tokenRs.Body.Token; vm = core_1.spinner('Deploy helper function.'); _a.label = 2; @@ -100,31 +101,18 @@ var AddFcDomain = /** @class */ (function () { ex_1 = _a.sent(); vm.fail('Failed to deploy helper function.'); throw ex_1; - case 6: - this.logger.debug("The request " + constant_1.default.DOMAIN + "/domain parameter is: \n " + JSON.stringify(__assign(__assign({}, params), { token: token }), null, ' ') + " "); - return [4 /*yield*/, core_1.request(constant_1.default.DOMAIN + "/domain", { - method: 'post', - body: __assign(__assign({}, params), { token: token }), - form: true, - hint: __assign(__assign({}, constant_1.default.HINT), { loading: 'Get domain....' }), - })]; + case 6: return [4 /*yield*/, api.domain(__assign(__assign({}, params), { token: token }))]; case 7: - domainRs = _a.sent(); - this.logger.debug("Get token response is: \n " + JSON.stringify(domainRs, null, ' ')); + _a.sent(); return [4 /*yield*/, fc_1.default.remove(credential, params.region)]; case 8: _a.sent(); - utils_1.checkRs(domainRs); - return [2 /*return*/, (params.function + "." + params.service + "." + params.user + "." + params.region + ".fc.devsapp.net").toLocaleLowerCase()]; + return [2 /*return*/, tokenRs.Body.Domain || (params.function + "." + params.service + "." + params.user + "." + params.region + ".fc.devsapp.net").toLocaleLowerCase()]; } }); }); }; - __decorate([ - core_1.HLogger(constant_1.default.CONTEXT), - __metadata("design:type", Object) - ], AddFcDomain, "logger", void 0); return AddFcDomain; }()); exports.default = AddFcDomain; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdXRpbHMvYWRkRmNEb21haW4vaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDhDQUEyRTtBQUMzRSxrQ0FBMEM7QUFDMUMsNERBQXNDO0FBQ3RDLDRDQUFzQjtBQUd0QjtJQUFBO0lBbURBLENBQUM7SUFoRGMsa0JBQU0sR0FBbkIsVUFBb0IsTUFBZ0IsRUFBRSxVQUFVOzs7Ozs7d0JBQzlDLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUNmLGlCQUFlLGtCQUFRLENBQUMsTUFBTSxnQ0FBMkIsSUFBSSxDQUFDLFNBQVMsQ0FDckUsTUFBTSxFQUNOLElBQUksRUFDSixJQUFJLENBQ0wsTUFBRyxDQUNMLENBQUM7d0JBQ2MscUJBQU0sY0FBTyxDQUFJLGtCQUFRLENBQUMsTUFBTSxXQUFRLEVBQUU7Z0NBQ3hELE1BQU0sRUFBRSxNQUFNO2dDQUNkLElBQUksRUFBRSxNQUFNO2dDQUNaLElBQUksRUFBRSxJQUFJO2dDQUNWLElBQUksRUFBRSxrQkFBUSxDQUFDLElBQUk7NkJBQ3BCLENBQUMsRUFBQTs7d0JBTEksT0FBTyxHQUFHLFNBS2Q7d0JBQ0YsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsK0JBQTZCLElBQUksQ0FBQyxTQUFTLENBQUMsT0FBTyxFQUFFLElBQUksRUFBRSxJQUFJLENBQUcsQ0FBQyxDQUFDO3dCQUN0RixlQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7d0JBRVgsS0FBSyxHQUFXLE9BQU8sQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDO3dCQUVuQyxFQUFFLEdBQUcsY0FBTyxDQUFDLHlCQUF5QixDQUFDLENBQUM7Ozs7d0JBRTVDLHFCQUFNLFlBQUUsQ0FBQyxNQUFNLENBQUMsVUFBVSxFQUFFLE1BQU0sQ0FBQyxNQUFNLEVBQUUsS0FBSyxDQUFDLEVBQUE7O3dCQUFqRCxTQUFpRCxDQUFDO3dCQUNsRCxxQkFBTSxhQUFLLENBQUMsSUFBSSxDQUFDLEVBQUE7O3dCQUFqQixTQUFpQixDQUFDO3dCQUNsQixFQUFFLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUFDOzs7O3dCQUV4QixFQUFFLENBQUMsSUFBSSxDQUFDLG1DQUFtQyxDQUFDLENBQUM7d0JBQzdDLE1BQU0sSUFBRSxDQUFDOzt3QkFHWCxJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FDZixpQkFBZSxrQkFBUSxDQUFDLE1BQU0saUNBQTRCLElBQUksQ0FBQyxTQUFTLHVCQUNqRSxNQUFNLEtBQUUsS0FBSyxPQUFBLEtBQ2xCLElBQUksRUFDSixJQUFJLENBQ0wsTUFBRyxDQUNMLENBQUM7d0JBQ2UscUJBQU0sY0FBTyxDQUFJLGtCQUFRLENBQUMsTUFBTSxZQUFTLEVBQUU7Z0NBQzFELE1BQU0sRUFBRSxNQUFNO2dDQUNkLElBQUksd0JBQU8sTUFBTSxLQUFFLEtBQUssT0FBQSxHQUFFO2dDQUMxQixJQUFJLEVBQUUsSUFBSTtnQ0FDVixJQUFJLHdCQUFPLGtCQUFRLENBQUMsSUFBSSxLQUFFLE9BQU8sRUFBRSxnQkFBZ0IsR0FBRTs2QkFDdEQsQ0FBQyxFQUFBOzt3QkFMSSxRQUFRLEdBQUcsU0FLZjt3QkFFRixJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQywrQkFBNkIsSUFBSSxDQUFDLFNBQVMsQ0FBQyxRQUFRLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBRyxDQUFDLENBQUM7d0JBQ3ZGLHFCQUFNLFlBQUUsQ0FBQyxNQUFNLENBQUMsVUFBVSxFQUFFLE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBQTs7d0JBQTFDLFNBQTBDLENBQUM7d0JBQzNDLGVBQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQzt3QkFDbEIsc0JBQU8sQ0FBRyxNQUFNLENBQUMsUUFBUSxTQUFJLE1BQU0sQ0FBQyxPQUFPLFNBQUksTUFBTSxDQUFDLElBQUksU0FBSSxNQUFNLENBQUMsTUFBTSxvQkFBaUIsQ0FBQSxDQUFDLGlCQUFpQixFQUFFLEVBQUM7Ozs7S0FDbEg7SUFqRDBCO1FBQTFCLGNBQU8sQ0FBQyxrQkFBUSxDQUFDLE9BQU8sQ0FBQzs7cUNBQXdCO0lBa0RwRCxrQkFBQztDQUFBLEFBbkRELElBbURDO2tCQW5Eb0IsV0FBVyJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdXRpbHMvYWRkRmNEb21haW4vaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw4Q0FBZ0Q7QUFDaEQsa0NBQWlDO0FBQ2pDLDZDQUF1QjtBQUN2QiwwQ0FBOEI7QUFHOUI7SUFBQTtJQXFCQSxDQUFDO0lBcEJjLGtCQUFNLEdBQW5CLFVBQW9CLE1BQWdCLEVBQUUsVUFBVTs7Ozs7NEJBQzlCLHFCQUFNLEdBQUcsQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLEVBQUE7O3dCQUFqQyxPQUFPLEdBQUcsU0FBdUI7d0JBRWpDLEtBQUssR0FBVyxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQzt3QkFFbkMsRUFBRSxHQUFHLGNBQU8sQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDOzs7O3dCQUU1QyxxQkFBTSxZQUFFLENBQUMsTUFBTSxDQUFDLFVBQVUsRUFBRSxNQUFNLENBQUMsTUFBTSxFQUFFLEtBQUssQ0FBQyxFQUFBOzt3QkFBakQsU0FBaUQsQ0FBQzt3QkFDbEQscUJBQU0sYUFBSyxDQUFDLElBQUksQ0FBQyxFQUFBOzt3QkFBakIsU0FBaUIsQ0FBQzt3QkFDbEIsRUFBRSxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQzs7Ozt3QkFFeEIsRUFBRSxDQUFDLElBQUksQ0FBQyxtQ0FBbUMsQ0FBQyxDQUFDO3dCQUM3QyxNQUFNLElBQUUsQ0FBQzs0QkFHWCxxQkFBTSxHQUFHLENBQUMsTUFBTSx1QkFBTSxNQUFNLEtBQUUsS0FBSyxPQUFBLElBQUcsRUFBQTs7d0JBQXRDLFNBQXNDLENBQUM7d0JBRXZDLHFCQUFNLFlBQUUsQ0FBQyxNQUFNLENBQUMsVUFBVSxFQUFFLE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBQTs7d0JBQTFDLFNBQTBDLENBQUM7d0JBQzNDLHNCQUFPLE9BQU8sQ0FBQyxJQUFJLENBQUMsTUFBTSxJQUFJLENBQUcsTUFBTSxDQUFDLFFBQVEsU0FBSSxNQUFNLENBQUMsT0FBTyxTQUFJLE1BQU0sQ0FBQyxJQUFJLFNBQUksTUFBTSxDQUFDLE1BQU0sb0JBQWlCLENBQUEsQ0FBQyxpQkFBaUIsRUFBRSxFQUFDOzs7O0tBQ3pJO0lBQ0gsa0JBQUM7QUFBRCxDQUFDLEFBckJELElBcUJDIn0= \ No newline at end of file diff --git a/dist/utils/addJamstack/index.d.ts b/dist/utils/addJamstack/index.d.ts new file mode 100644 index 0000000..22b4f82 --- /dev/null +++ b/dist/utils/addJamstack/index.d.ts @@ -0,0 +1,7 @@ +import { IJamstack, ICredentials } from '../../interface'; +export default class AddJamstack { + static domain(params: IJamstack, credential: ICredentials): Promise; + static jamstackFc(params: IJamstack, credential: ICredentials): Promise; + static jamstackOss(params: IJamstack, credential: ICredentials): Promise; + private static addCdnDomain; +} diff --git a/dist/utils/addJamstack/index.js b/dist/utils/addJamstack/index.js new file mode 100644 index 0000000..3c8f5f5 --- /dev/null +++ b/dist/utils/addJamstack/index.js @@ -0,0 +1,209 @@ +"use strict"; +var __assign = (this && this.__assign) || function () { + __assign = Object.assign || function(t) { + for (var s, i = 1, n = arguments.length; i < n; i++) { + s = arguments[i]; + for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) + t[p] = s[p]; + } + return t; + }; + return __assign.apply(this, arguments); +}; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); + __setModuleDefault(result, mod); + return result; +}; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __generator = (this && this.__generator) || function (thisArg, body) { + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; + return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; + function verb(n) { return function (v) { return step([n, v]); }; } + function step(op) { + if (f) throw new TypeError("Generator is already executing."); + while (_) try { + if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; + if (y = 0, t) op = [op[0] & 2, t.value]; + switch (op[0]) { + case 0: case 1: t = op; break; + case 4: _.label++; return { value: op[1], done: false }; + case 5: _.label++; y = op[1]; op = [0]; continue; + case 7: op = _.ops.pop(); _.trys.pop(); continue; + default: + if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } + if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } + if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } + if (t[2]) _.ops.pop(); + _.trys.pop(); continue; + } + op = body.call(thisArg, _); + } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } + if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; + } +}; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +var fs_extra_1 = __importDefault(require("fs-extra")); +var core_1 = require("@serverless-devs/core"); +var logger_1 = __importDefault(require("../../common/logger")); +var api = __importStar(require("../api")); +var utils_1 = require("../utils"); +var oss_1 = __importDefault(require("../oss")); +var cdn_1 = __importDefault(require("../cdn")); +var fc_1 = __importDefault(require("../fc")); +var JAMSTACK_OSS = 'jamstack-oss'; +var JAMSTACK_FC = 'jamstack-fc'; +var AddJamstack = /** @class */ (function () { + function AddJamstack() { + } + AddJamstack.domain = function (params, credential) { + return __awaiter(this, void 0, void 0, function () { + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + if (!(params.type === JAMSTACK_OSS)) return [3 /*break*/, 2]; + return [4 /*yield*/, this.jamstackOss(params, credential)]; + case 1: return [2 /*return*/, _a.sent()]; + case 2: + if (!(params.type === JAMSTACK_FC)) return [3 /*break*/, 4]; + return [4 /*yield*/, this.jamstackFc(params, credential)]; + case 3: return [2 /*return*/, _a.sent()]; + case 4: throw new Error('Domain configuration error, please refer to https://github.com/devsapp/domain'); + } + }); + }); + }; + AddJamstack.jamstackFc = function (params, credential) { + return __awaiter(this, void 0, void 0, function () { + var tokenRs, _a, token, _b, domain, vm, ex_1, sources, domainParams, _c; + return __generator(this, function (_d) { + switch (_d.label) { + case 0: return [4 /*yield*/, api.token(params)]; + case 1: + tokenRs = _d.sent(); + _a = tokenRs.Body, token = _a.Token, _b = _a.Domain, domain = _b === void 0 ? '' : _b; + vm = core_1.spinner('Deploy helper function.'); + _d.label = 2; + case 2: + _d.trys.push([2, 5, , 6]); + return [4 /*yield*/, fc_1.default.deploy(credential, params.region, token)]; + case 3: + _d.sent(); + return [4 /*yield*/, utils_1.sleep(1500)]; + case 4: + _d.sent(); + vm.succeed('Deployed.'); + return [3 /*break*/, 6]; + case 5: + ex_1 = _d.sent(); + vm.fail('Failed to deploy helper function.'); + throw ex_1; + case 6: + sources = [ + { type: 'fc_domain', port: 80, content: params.customDomain }, + ]; + if (params.bucket) { + sources.push({ type: 'oss', port: 80, content: params.bucket + ".oss-" + params.region + ".aliyuncs.com" }); + } + domainParams = __assign(__assign({}, params), { token: token }); + _c = domainParams; + return [4 /*yield*/, this.addCdnDomain(credential, domainParams, domain, sources)]; + case 7: + _c.cname = _d.sent(); + return [4 /*yield*/, api.domain(domainParams)]; + case 8: + _d.sent(); + return [4 /*yield*/, fc_1.default.remove(credential, params.region)]; + case 9: + _d.sent(); + return [2 /*return*/, domain]; + } + }); + }); + }; + AddJamstack.jamstackOss = function (params, credential) { + return __awaiter(this, void 0, void 0, function () { + var tokenRs, bucket, region, customDomain, _a, token, _b, domain, savePath, sources, domainParams, _c; + return __generator(this, function (_d) { + switch (_d.label) { + case 0: return [4 /*yield*/, api.token(params)]; + case 1: + tokenRs = _d.sent(); + bucket = params.bucket, region = params.region, customDomain = params.customDomain; + _a = tokenRs.Body, token = _a.Token, _b = _a.Domain, domain = _b === void 0 ? '' : _b; + return [4 /*yield*/, oss_1.default.saveFile(bucket, token)]; + case 2: + savePath = _d.sent(); + logger_1.default.debug('Put file to oss start...'); + return [4 /*yield*/, oss_1.default.put(region, bucket, credential, savePath)]; + case 3: + _d.sent(); + logger_1.default.debug('Put file to oss end.'); + sources = [ + { type: 'oss', port: 80, content: bucket + ".oss-" + region + ".aliyuncs.com" }, + ]; + if (customDomain) { + sources.push({ type: 'fc_domain', port: 80, content: params.customDomain }); + } + domainParams = __assign(__assign({}, params), { token: token }); + _c = domainParams; + return [4 /*yield*/, this.addCdnDomain(credential, domainParams, domain, sources)]; + case 4: + _c.cname = _d.sent(); + return [4 /*yield*/, api.domain(domainParams)]; + case 5: + _d.sent(); + return [4 /*yield*/, fs_extra_1.default.remove(savePath)]; + case 6: + _d.sent(); + return [2 /*return*/, domain]; + } + }); + }); + }; + AddJamstack.addCdnDomain = function (credential, domainParams, domain, sources) { + return __awaiter(this, void 0, void 0, function () { + var cdn; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + cdn = new cdn_1.default(credential); + return [4 /*yield*/, cdn.makeOwner(domainParams, { jamstack: domain.split('.')[0] })]; + case 1: + _a.sent(); + return [4 /*yield*/, cdn.mackCdnDomain(domain, sources)]; + case 2: return [2 /*return*/, _a.sent()]; + } + }); + }); + }; + return AddJamstack; +}()); +exports.default = AddJamstack; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdXRpbHMvYWRkSmFtc3RhY2svaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxzREFBMEI7QUFDMUIsOENBQWdEO0FBQ2hELCtEQUF5QztBQUN6QywwQ0FBOEI7QUFFOUIsa0NBQWlDO0FBQ2pDLCtDQUF5QjtBQUN6QiwrQ0FBeUI7QUFDekIsNkNBQXVCO0FBRXZCLElBQU0sWUFBWSxHQUFHLGNBQWMsQ0FBQztBQUNwQyxJQUFNLFdBQVcsR0FBRyxhQUFhLENBQUM7QUFFbEM7SUFBQTtJQTJFQSxDQUFDO0lBMUVjLGtCQUFNLEdBQW5CLFVBQW9CLE1BQWlCLEVBQUUsVUFBd0I7Ozs7OzZCQUN6RCxDQUFBLE1BQU0sQ0FBQyxJQUFJLEtBQUssWUFBWSxDQUFBLEVBQTVCLHdCQUE0Qjt3QkFDdkIscUJBQU0sSUFBSSxDQUFDLFdBQVcsQ0FBQyxNQUFNLEVBQUUsVUFBVSxDQUFDLEVBQUE7NEJBQWpELHNCQUFPLFNBQTBDLEVBQUM7OzZCQUN6QyxDQUFBLE1BQU0sQ0FBQyxJQUFJLEtBQUssV0FBVyxDQUFBLEVBQTNCLHdCQUEyQjt3QkFDN0IscUJBQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsVUFBVSxDQUFDLEVBQUE7NEJBQWhELHNCQUFPLFNBQXlDLEVBQUM7NEJBR25ELE1BQU0sSUFBSSxLQUFLLENBQUMsK0VBQStFLENBQUMsQ0FBQzs7OztLQUNsRztJQUVZLHNCQUFVLEdBQXZCLFVBQXdCLE1BQWlCLEVBQUUsVUFBd0I7Ozs7OzRCQUNqRCxxQkFBTSxHQUFHLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxFQUFBOzt3QkFBakMsT0FBTyxHQUFHLFNBQXVCO3dCQUNqQyxLQUdGLE9BQU8sQ0FBQyxJQUFJLEVB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 \ No newline at end of file diff --git a/dist/utils/addOssDomain/cdn.d.ts b/dist/utils/addOssDomain/cdn.d.ts deleted file mode 100644 index 3fb3b7c..0000000 --- a/dist/utils/addOssDomain/cdn.d.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { ILogger } from '@serverless-devs/core'; -import { ICredentials } from '../../interface'; -export default class Cdn { - logger: ILogger; - cdnClient: any; - constructor(credentials: ICredentials); - makeOwner(bucket: string, region: string, token: string): Promise; - verifyDomainOwner(domainName: string): Promise; - describeVerifyContent(domainName: string): Promise; - addCdnDomain(domainName: string, bucket: string, region: string): Promise; -} diff --git a/dist/utils/addOssDomain/cdn.js b/dist/utils/addOssDomain/cdn.js deleted file mode 100644 index 54a0344..0000000 --- a/dist/utils/addOssDomain/cdn.js +++ /dev/null @@ -1,220 +0,0 @@ -"use strict"; -var __assign = (this && this.__assign) || function () { - __assign = Object.assign || function(t) { - for (var s, i = 1, n = arguments.length; i < n; i++) { - s = arguments[i]; - for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) - t[p] = s[p]; - } - return t; - }; - return __assign.apply(this, arguments); -}; -var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { - var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; - if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); - else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; - return c > 3 && r && Object.defineProperty(target, key, r), r; -}; -var __metadata = (this && this.__metadata) || function (k, v) { - if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); -}; -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; - return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; - function verb(n) { return function (v) { return step([n, v]); }; } - function step(op) { - if (f) throw new TypeError("Generator is already executing."); - while (_) try { - if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; - if (y = 0, t) op = [op[0] & 2, t.value]; - switch (op[0]) { - case 0: case 1: t = op; break; - case 4: _.label++; return { value: op[1], done: false }; - case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; - default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } - if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } - if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } - if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } - if (t[2]) _.ops.pop(); - _.trys.pop(); continue; - } - op = body.call(thisArg, _); - } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } - if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; - } -}; -var __importDefault = (this && this.__importDefault) || function (mod) { - return (mod && mod.__esModule) ? mod : { "default": mod }; -}; -Object.defineProperty(exports, "__esModule", { value: true }); -var core_1 = require("@serverless-devs/core"); -var constant_1 = __importDefault(require("../../constant")); -var utils_1 = require("../utils"); -var POST = { method: 'POST' }; -var DOMAIN = 'devsapp.net'; -var Cdn = /** @class */ (function () { - function Cdn(credentials) { - this.cdnClient = utils_1.getPopClient(credentials, 'https://cdn.aliyuncs.com', '2018-05-10'); - } - Cdn.prototype.makeOwner = function (bucket, region, token) { - return __awaiter(this, void 0, void 0, function () { - var isDomainOwner, verify, dRs, rs; - return __generator(this, function (_a) { - switch (_a.label) { - case 0: - this.logger.debug('Check verify domain owner start...'); - return [4 /*yield*/, this.verifyDomainOwner(DOMAIN)]; - case 1: - isDomainOwner = _a.sent(); - this.logger.debug("Check verify domain owner end, response is: " + isDomainOwner); - if (!!isDomainOwner) return [3 /*break*/, 7]; - this.logger.debug('Get describe verify content start...'); - return [4 /*yield*/, this.describeVerifyContent(DOMAIN)]; - case 2: - verify = _a.sent(); - this.logger.debug("Get describe verify content end, response is: " + verify); - this.logger.debug("The request " + constant_1.default.DOMAIN + "/domain parameter is: { bucket: " + bucket + ", region: " + region + ", token: " + token + " }"); - return [4 /*yield*/, core_1.request(constant_1.default.DOMAIN + "/domain", { - method: 'post', - body: { bucket: bucket, region: region, token: token, type: 'oss' }, - form: true, - hint: __assign(__assign({}, constant_1.default.HINT), { loading: 'Get domain....' }), - })]; - case 3: - dRs = _a.sent(); - this.logger.debug("The request " + constant_1.default.DOMAIN + "/verify response is: \n " + JSON.stringify(dRs, null, ' ')); - utils_1.checkRs(dRs); - this.logger.debug("The request " + constant_1.default.DOMAIN + "/verify parameter is: { bucket: " + bucket + ", verify: " + verify + " }"); - return [4 /*yield*/, core_1.request(constant_1.default.DOMAIN + "/verify", { - method: 'post', - body: { bucket: bucket, verify: verify }, - form: true, - hint: __assign(__assign({}, constant_1.default.HINT), { loading: 'Request verify....' }), - })]; - case 4: - rs = _a.sent(); - this.logger.debug("The request " + constant_1.default.DOMAIN + "/verify response is: \n " + JSON.stringify(rs, null, ' ')); - utils_1.checkRs(rs); - return [4 /*yield*/, utils_1.sleep(1000)]; - case 5: - _a.sent(); - return [4 /*yield*/, this.makeOwner(bucket, region, token)]; - case 6: - _a.sent(); - _a.label = 7; - case 7: return [2 /*return*/]; - } - }); - }); - }; - Cdn.prototype.verifyDomainOwner = function (domainName) { - return __awaiter(this, void 0, void 0, function () { - var ex_1; - return __generator(this, function (_a) { - switch (_a.label) { - case 0: - _a.trys.push([0, 2, , 3]); - return [4 /*yield*/, this.cdnClient.request('VerifyDomainOwner', { - DomainName: domainName, - VerifyType: 'dnsCheck', - }, POST)]; - case 1: - _a.sent(); - return [2 /*return*/, true]; - case 2: - ex_1 = _a.sent(); - this.logger.debug("VerifyDomainOwner domain name is " + domainName + ", error is: \n " + ex_1); - if (ex_1.code !== 'DomainOwnerVerifyFail') { - throw ex_1; - } - return [2 /*return*/, false]; - case 3: return [2 /*return*/]; - } - }); - }); - }; - Cdn.prototype.describeVerifyContent = function (domainName) { - return __awaiter(this, void 0, void 0, function () { - var Content; - return __generator(this, function (_a) { - switch (_a.label) { - case 0: return [4 /*yield*/, this.cdnClient.request('DescribeVerifyContent', { DomainName: domainName }, POST)]; - case 1: - Content = (_a.sent()).Content; - return [2 /*return*/, Content]; - } - }); - }); - }; - Cdn.prototype.addCdnDomain = function (domainName, bucket, region) { - return __awaiter(this, void 0, void 0, function () { - var ex_2, i, cname, describeCdnDomainDetail; - return __generator(this, function (_a) { - switch (_a.label) { - case 0: - _a.trys.push([0, 2, , 3]); - return [4 /*yield*/, this.cdnClient.request('AddCdnDomain', { - DomainName: domainName, - Scope: 'global', - CdnType: 'web', - Sources: JSON.stringify([ - { type: 'oss', port: 80, content: bucket + "." + region + ".aliyuncs.com" }, - ]), - }, POST)]; - case 1: - _a.sent(); - return [3 /*break*/, 3]; - case 2: - ex_2 = _a.sent(); - if (ex_2.code !== 'DomainAlreadyExist') { - throw ex_2; - } - return [3 /*break*/, 3]; - case 3: - i = 0; - cname = ''; - _a.label = 4; - case 4: return [4 /*yield*/, utils_1.sleep(1000)]; - case 5: - _a.sent(); - return [4 /*yield*/, this.cdnClient.request('DescribeCdnDomainDetail', { - DomainName: domainName, - }, POST)]; - case 6: - describeCdnDomainDetail = _a.sent(); - this.logger.debug("DescribeCdnDomainDetail response is: " + JSON.stringify(describeCdnDomainDetail)); - i += 1; - cname = describeCdnDomainDetail.GetDomainDetailModel.Cname; - _a.label = 7; - case 7: - if (!(cname || i > 5)) return [3 /*break*/, 4]; - _a.label = 8; - case 8: - if (!cname) { - throw new Error('Not found cdn cname, please retry.'); - } - return [2 /*return*/, cname]; - } - }); - }); - }; - __decorate([ - core_1.HLogger(constant_1.default.CONTEXT), - __metadata("design:type", Object) - ], Cdn.prototype, "logger", void 0); - return Cdn; -}()); -exports.default = Cdn; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2RuLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3V0aWxzL2FkZE9zc0RvbWFpbi9jZG4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDhDQUFrRTtBQUNsRSw0REFBc0M7QUFDdEMsa0NBQXdEO0FBR3hELElBQU0sSUFBSSxHQUFHLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxDQUFDO0FBQ2hDLElBQU0sTUFBTSxHQUFHLGFBQWEsQ0FBQztBQUU3QjtJQUlFLGFBQVksV0FBeUI7UUFDbkMsSUFBSSxDQUFDLFNBQVMsR0FBRyxvQkFBWSxDQUFDLFdBQVcsRUFBRSwwQkFBMEIsRUFBRSxZQUFZLENBQUMsQ0FBQztJQUN2RixDQUFDO0lBRUssdUJBQVMsR0FBZixVQUFnQixNQUFjLEVBQUUsTUFBYyxFQUFFLEtBQWE7Ozs7Ozt3QkFDM0QsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsb0NBQW9DLENBQUMsQ0FBQzt3QkFDbEMscUJBQU0sSUFBSSxDQUFDLGlCQUFpQixDQUFDLE1BQU0sQ0FBQyxFQUFBOzt3QkFBcEQsYUFBYSxHQUFHLFNBQW9DO3dCQUMxRCxJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxpREFBK0MsYUFBZSxDQUFDLENBQUM7NkJBRTlFLENBQUMsYUFBYSxFQUFkLHdCQUFjO3dCQUNoQixJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxzQ0FBc0MsQ0FBQyxDQUFDO3dCQUMzQyxxQkFBTSxJQUFJLENBQUMscUJBQXFCLENBQUMsTUFBTSxDQUFDLEVBQUE7O3dCQUFqRCxNQUFNLEdBQUcsU0FBd0M7d0JBQ3ZELElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLG1EQUFpRCxNQUFRLENBQUMsQ0FBQzt3QkFFN0UsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQ2Ys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 \ No newline at end of file diff --git a/dist/utils/addOssDomain/index.d.ts b/dist/utils/addOssDomain/index.d.ts index e56d979..6451c05 100644 --- a/dist/utils/addOssDomain/index.d.ts +++ b/dist/utils/addOssDomain/index.d.ts @@ -1,4 +1,3 @@ -import { ILogger } from '@serverless-devs/core'; import { IOSSTOKEN } from '../../interface'; /** * VerifyDomainOwner 验证域名归属权 @@ -6,6 +5,5 @@ import { IOSSTOKEN } from '../../interface'; * VerifyDomainOwner 再次校验 */ export default class AddOssDomain { - logger: ILogger; - domain(params: IOSSTOKEN, credential: any): Promise; + static domain(params: IOSSTOKEN, credential: any): Promise; } diff --git a/dist/utils/addOssDomain/index.js b/dist/utils/addOssDomain/index.js index b790e9c..c7bbb80 100644 --- a/dist/utils/addOssDomain/index.js +++ b/dist/utils/addOssDomain/index.js @@ -1,23 +1,22 @@ "use strict"; -var __assign = (this && this.__assign) || function () { - __assign = Object.assign || function(t) { - for (var s, i = 1, n = arguments.length; i < n; i++) { - s = arguments[i]; - for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) - t[p] = s[p]; - } - return t; - }; - return __assign.apply(this, arguments); -}; -var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { - var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; - if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); - else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; - return c > 3 && r && Object.defineProperty(target, key, r), r; -}; -var __metadata = (this && this.__metadata) || function (k, v) { - if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); + __setModuleDefault(result, mod); + return result; }; var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } @@ -59,13 +58,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", { value: true }); -var core_1 = require("@serverless-devs/core"); var fs_extra_1 = __importDefault(require("fs-extra")); -var path_1 = __importDefault(require("path")); -var constant_1 = __importDefault(require("../../constant")); -var oss_1 = __importDefault(require("./oss")); -var cdn_1 = __importDefault(require("./cdn")); -var utils_1 = require("../utils"); +var logger_1 = __importDefault(require("../../common/logger")); +var oss_1 = __importDefault(require("../oss")); +var cdn_1 = __importDefault(require("../cdn")); +var api = __importStar(require("../api")); /** * VerifyDomainOwner 验证域名归属权 * DescribeVerifyContent 异常获取Content值 @@ -74,62 +71,40 @@ var utils_1 = require("../utils"); var AddOssDomain = /** @class */ (function () { function AddOssDomain() { } - AddOssDomain.prototype.domain = function (params, credential) { + AddOssDomain.domain = function (params, credential) { return __awaiter(this, void 0, void 0, function () { - var tokenRs, bucket, region, token, domain, savePath, ossCredential, cdn, cname, dRs; + var tokenRs, bucket, region, token, domain, savePath, cdn, sources, cname; return __generator(this, function (_a) { switch (_a.label) { - case 0: - this.logger.debug("The request " + constant_1.default.DOMAIN + "/token parameter is: \n " + JSON.stringify(params, null, ' ') + " "); - return [4 /*yield*/, core_1.request(constant_1.default.DOMAIN + "/token", { - method: 'post', - body: params, - form: true, - hint: constant_1.default.HINT, - })]; + case 0: return [4 /*yield*/, api.token(params)]; case 1: tokenRs = _a.sent(); - this.logger.debug("Get token response is: \n " + JSON.stringify(tokenRs, null, ' ')); - utils_1.checkRs(tokenRs); bucket = params.bucket, region = params.region; token = tokenRs.Body.Token; domain = bucket + ".oss.devsapp.net"; - savePath = path_1.default.join(process.cwd(), '.s', bucket + "-token"); - this.logger.debug("Save file path is: " + savePath + ", token is: " + token + "."); - return [4 /*yield*/, fs_extra_1.default.outputFile(savePath, token)]; + return [4 /*yield*/, oss_1.default.saveFile(bucket, token)]; case 2: - _a.sent(); - this.logger.debug('Put file to oss start...'); - ossCredential = { - region: "oss-" + region, - bucket: bucket, - accessKeyId: credential.AccessKeyID, - accessKeySecret: credential.AccessKeySecret, - stsToken: credential.SecurityToken, - }; - return [4 /*yield*/, oss_1.default.put(ossCredential, savePath)]; + savePath = _a.sent(); + logger_1.default.debug('Put file to oss start...'); + return [4 /*yield*/, oss_1.default.put(region, bucket, credential, savePath)]; case 3: _a.sent(); - this.logger.debug('Put file to oss end.'); + logger_1.default.debug('Put file to oss end.'); cdn = new cdn_1.default(credential); - return [4 /*yield*/, cdn.makeOwner(bucket, region, token)]; + return [4 /*yield*/, cdn.makeOwner({ bucket: bucket, region: region, token: token, type: 'oss' }, { bucket: bucket })]; case 4: _a.sent(); - this.logger.debug("Add cdn domain start, domain is: " + domain); - return [4 /*yield*/, cdn.addCdnDomain(domain, bucket, "oss-" + region)]; + logger_1.default.debug("Add cdn domain start, domain is: " + domain); + sources = [ + { type: 'oss', port: 80, content: bucket + ".oss-" + region + ".aliyuncs.com" }, + ]; + return [4 /*yield*/, cdn.mackCdnDomain(domain, sources)]; case 5: cname = _a.sent(); - this.logger.debug('Add cdn domain end.'); - this.logger.debug("The request " + constant_1.default.DOMAIN + "/domain parameter is: { bucket: " + bucket + ", region: " + region + ", cname: " + cname + ", token: " + token + " }"); - return [4 /*yield*/, core_1.request(constant_1.default.DOMAIN + "/domain", { - method: 'post', - body: { bucket: bucket, region: region, token: token, type: 'oss', cname: cname }, - form: true, - hint: __assign(__assign({}, constant_1.default.HINT), { loading: 'Get domain....' }), - })]; + logger_1.default.debug('Add cdn domain end.'); + return [4 /*yield*/, api.domain({ bucket: bucket, region: region, token: token, type: 'oss', cname: cname })]; case 6: - dRs = _a.sent(); - this.logger.debug("The request " + constant_1.default.DOMAIN + "/verify response is: \n " + JSON.stringify(dRs, null, ' ')); + _a.sent(); return [4 /*yield*/, fs_extra_1.default.remove(savePath)]; case 7: _a.sent(); @@ -138,11 +113,7 @@ var AddOssDomain = /** @class */ (function () { }); }); }; - __decorate([ - core_1.HLogger(constant_1.default.CONTEXT), - __metadata("design:type", Object) - ], AddOssDomain.prototype, "logger", void 0); return AddOssDomain; }()); exports.default = AddOssDomain; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdXRpbHMvYWRkT3NzRG9tYWluL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw4Q0FBa0U7QUFDbEUsc0RBQTBCO0FBQzFCLDhDQUF3QjtBQUN4Qiw0REFBc0M7QUFDdEMsOENBQXdCO0FBQ3hCLDhDQUF3QjtBQUN4QixrQ0FBbUM7QUFFbkM7Ozs7R0FJRztBQUVIO0lBQUE7SUE4REEsQ0FBQztJQTNETyw2QkFBTSxHQUFaLFVBQWEsTUFBaUIsRUFBRSxVQUFlOzs7Ozs7d0JBQzdDLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUNmLGlCQUFlLGtCQUFRLENBQUMsTUFBTSxnQ0FBMkIsSUFBSSxDQUFDLFNBQVMsQ0FDckUsTUFBTSxFQUNOLElBQUksRUFDSixJQUFJLENBQ0wsTUFBRyxDQUNMLENBQUM7d0JBQ2MscUJBQU0sY0FBTyxDQUFJLGtCQUFRLENBQUMsTUFBTSxXQUFRLEVBQUU7Z0NBQ3hELE1BQU0sRUFBRSxNQUFNO2dDQUNkLElBQUksRUFBRSxNQUFNO2dDQUNaLElBQUksRUFBRSxJQUFJO2dDQUNWLElBQUksRUFBRSxrQkFBUSxDQUFDLElBQUk7NkJBQ3BCLENBQUMsRUFBQTs7d0JBTEksT0FBTyxHQUFHLFNBS2Q7d0JBQ0YsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsK0JBQTZCLElBQUksQ0FBQyxTQUFTLENBQUMsT0FBTyxFQUFFLElBQUksRUFBRSxJQUFJLENBQUcsQ0FBQyxDQUFDO3dCQUN0RixlQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7d0JBRVQsTUFBTSxHQUFhLE1BQU0sT0FBbkIsRUFBRSxNQUFNLEdBQUssTUFBTSxPQUFYLENBQVk7d0JBQzVCLEtBQUssR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLEtB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 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdXRpbHMvYWRkT3NzRG9tYWluL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNEQUEwQjtBQUMxQiwrREFBeUM7QUFDekMsK0NBQXlCO0FBQ3pCLCtDQUF5QjtBQUN6QiwwQ0FBOEI7QUFFOUI7Ozs7R0FJRztBQUVIO0lBQUE7SUE0QkEsQ0FBQztJQTNCYyxtQkFBTSxHQUFuQixVQUFvQixNQUFpQixFQUFFLFVBQWU7Ozs7OzRCQUNwQyxxQkFBTSxHQUFHLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxFQUFBOzt3QkFBakMsT0FBTyxHQUFHLFNBQXVCO3dCQUUvQixNQUFNLEdBQWEsTUFBTSxPQUFuQixFQUFFLE1BQU0sR0FBSyxNQUFNLE9BQVgsQ0FBWTt3QkFDNUIsS0FBSyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDO3dCQUMzQixNQUFNLEdBQU0sTUFBTSxxQkFBa0IsQ0FBQzt3QkFDMUIscUJBQU0sYUFBRyxDQUFDLFFBQVEsQ0FBQyxNQUFNLEVBQUUsS0FBSyxDQUFDLEVBQUE7O3dCQUE1QyxRQUFRLEdBQUcsU0FBaUM7d0JBRWxELGdCQUFNLENBQUMsS0FBSyxDQUFDLDBCQUEwQixDQUFDLENBQUM7d0JBQ3pDLHFCQUFNLGFBQUcsQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQUUsUUFBUSxDQUFDLEVBQUE7O3dCQUFuRCxTQUFtRCxDQUFDO3dCQUNwRCxnQkFBTSxDQUFDLEtBQUssQ0FBQyxzQkFBc0IsQ0FBQyxDQUFDO3dCQUUvQixHQUFHLEdBQUcsSUFBSSxhQUFHLENBQUMsVUFBVSxDQUFDLENBQUM7d0JBQ2hDLHFCQUFNLEdBQUcsQ0FBQyxTQUFTLENBQUMsRUFBRSxNQUFNLFFBQUEsRUFBRSxNQUFNLFFBQUEsRUFBRSxLQUFLLE9BQUEsRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLFFBQUEsRUFBRSxDQUFDLEVBQUE7O3dCQUF2RSxTQUF1RSxDQUFDO3dCQUN4RSxnQkFBTSxDQUFDLEtBQUssQ0FBQyxzQ0FBb0MsTUFBUSxDQUFDLENBQUM7d0JBQ3JELE9BQU8sR0FBRzs0QkFDZCxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxPQUFPLEVBQUssTUFBTSxhQUFRLE1BQU0sa0JBQWUsRUFBRTt5QkFDM0UsQ0FBQzt3QkFDWSxxQkFBTSxHQUFHLENBQUMsYUFBYSxDQUFDLE1BQU0sRUFBRSxPQUFPLENBQUMsRUFBQTs7d0JBQWhELEtBQUssR0FBRyxTQUF3Qzt3QkFDdEQsZ0JBQU0sQ0FBQyxLQUFLLENBQUMscUJBQXFCLENBQUMsQ0FBQzt3QkFFcEMscUJBQU0sR0FBRyxDQUFDLE1BQU0sQ0FBQyxFQUFFLE1BQU0sUUFBQSxFQUFFLE1BQU0sUUFBQSxFQUFFLEtBQUssT0FBQSxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsS0FBSyxPQUFBLEVBQUUsQ0FBQyxFQUFBOzt3QkFBL0QsU0FBK0QsQ0FBQzt3QkFFaEUscUJBQU0sa0JBQUUsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLEVBQUE7O3dCQUF6QixTQUF5QixDQUFDO3dCQUUxQixzQkFBTyxNQUFNLEVBQUM7Ozs7S0FDZjtJQUNILG1CQUFDO0FBQUQsQ0FBQyxBQTVCRCxJQTRCQyJ9 \ No newline at end of file diff --git a/dist/utils/addOssDomain/oss.d.ts b/dist/utils/addOssDomain/oss.d.ts deleted file mode 100644 index 404bb95..0000000 --- a/dist/utils/addOssDomain/oss.d.ts +++ /dev/null @@ -1,12 +0,0 @@ -interface IOssClient { - region: string; - accessKeyId: string; - accessKeySecret: string; - bucket: string; - timeout?: number; - stsToken?: string; -} -export default class Oss { - static put(credential: IOssClient, filePath: any): Promise; -} -export {}; diff --git a/dist/utils/api.d.ts b/dist/utils/api.d.ts new file mode 100644 index 0000000..b642388 --- /dev/null +++ b/dist/utils/api.d.ts @@ -0,0 +1,4 @@ +import { IOSSTOKEN, IFCTOKEN, IJamstack } from '../interface'; +export declare function token(params: IOSSTOKEN | IFCTOKEN | IJamstack): Promise; +export declare function domain(params: any): Promise; +export declare function verify(params: any): Promise; diff --git a/dist/utils/api.js b/dist/utils/api.js new file mode 100644 index 0000000..2d67491 --- /dev/null +++ b/dist/utils/api.js @@ -0,0 +1,136 @@ +"use strict"; +var __assign = (this && this.__assign) || function () { + __assign = Object.assign || function(t) { + for (var s, i = 1, n = arguments.length; i < n; i++) { + s = arguments[i]; + for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) + t[p] = s[p]; + } + return t; + }; + return __assign.apply(this, arguments); +}; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __generator = (this && this.__generator) || function (thisArg, body) { + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; + return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; + function verb(n) { return function (v) { return step([n, v]); }; } + function step(op) { + if (f) throw new TypeError("Generator is already executing."); + while (_) try { + if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; + if (y = 0, t) op = [op[0] & 2, t.value]; + switch (op[0]) { + case 0: case 1: t = op; break; + case 4: _.label++; return { value: op[1], done: false }; + case 5: _.label++; y = op[1]; op = [0]; continue; + case 7: op = _.ops.pop(); _.trys.pop(); continue; + default: + if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } + if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } + if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } + if (t[2]) _.ops.pop(); + _.trys.pop(); continue; + } + op = body.call(thisArg, _); + } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } + if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; + } +}; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.verify = exports.domain = exports.token = void 0; +var core_1 = require("@serverless-devs/core"); +var logger_1 = __importDefault(require("../common/logger")); +var DOMAIN = 'http://domain.devsapp.net'; +var HINT = { + loading: 'Get token....', + success: 'End of request', + error: 'Request failed', +}; +function checkRs(rs) { + if (rs.Status !== 'Success') { + throw new Error(rs.Body); + } +} +function token(params) { + return __awaiter(this, void 0, void 0, function () { + var tokenRs; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + logger_1.default.debug("The request **/token parameter is: " + JSON.stringify(params)); + return [4 /*yield*/, core_1.request(DOMAIN + "/token", { + method: 'post', + body: params, + form: true, + hint: HINT, + })]; + case 1: + tokenRs = _a.sent(); + logger_1.default.debug("Get token response is: " + JSON.stringify(tokenRs)); + checkRs(tokenRs); + return [2 /*return*/, tokenRs]; + } + }); + }); +} +exports.token = token; +function domain(params) { + return __awaiter(this, void 0, void 0, function () { + var dRs; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + logger_1.default.debug("The request **/domain parameter is: " + JSON.stringify(params)); + return [4 /*yield*/, core_1.request(DOMAIN + "/domain", { + method: 'post', + body: params, + form: true, + hint: __assign(__assign({}, HINT), { loading: 'Get domain....' }), + })]; + case 1: + dRs = _a.sent(); + logger_1.default.debug("The request **/domain response is: " + JSON.stringify(dRs)); + checkRs(dRs); + return [2 /*return*/, dRs]; + } + }); + }); +} +exports.domain = domain; +function verify(params) { + return __awaiter(this, void 0, void 0, function () { + var rs; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + logger_1.default.debug("The request **/verify parameter is: " + JSON.stringify(params)); + return [4 /*yield*/, core_1.request(DOMAIN + "/verify", { + method: 'post', + body: params, + form: true, + hint: __assign(__assign({}, HINT), { loading: 'Request verify....' }), + })]; + case 1: + rs = _a.sent(); + logger_1.default.debug("The request **/verify response is: " + JSON.stringify(rs)); + checkRs(rs); + return [2 /*return*/, rs]; + } + }); + }); +} +exports.verify = verify; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBpLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2FwaS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDhDQUFnRDtBQUVoRCw0REFBc0M7QUFFdEMsSUFBTSxNQUFNLEdBQUcsMkJBQTJCLENBQUM7QUFDM0MsSUFBTSxJQUFJLEdBQUc7SUFDWCxPQUFPLEVBQUUsZUFBZTtJQUN4QixPQUFPLEVBQUUsZ0JBQWdCO0lBQ3pCLEtBQUssRUFBRSxnQkFBZ0I7Q0FDeEIsQ0FBQztBQUNGLFNBQVMsT0FBTyxDQUFDLEVBQU87SUFDdEIsSUFBSSxFQUFFLENBQUMsTUFBTSxLQUFLLFNBQVMsRUFBRTtRQUMzQixNQUFNLElBQUksS0FBSyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQztLQUMxQjtBQUNILENBQUM7QUFFRCxTQUFzQixLQUFLLENBQUMsTUFBd0M7Ozs7OztvQkFDbEUsZ0JBQU0sQ0FBQyxLQUFLLENBQUMsd0NBQXNDLElBQUksQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFHLENBQUMsQ0FBQztvQkFDN0QscUJBQU0sY0FBTyxDQUFJLE1BQU0sV0FBUSxFQUFFOzRCQUMvQyxNQUFNLEVBQUUsTUFBTTs0QkFDZCxJQUFJLEVBQUUsTUFBTTs0QkFDWixJQUFJLEVBQUUsSUFBSTs0QkFDVixJQUFJLEVBQUUsSUFBSTt5QkFDWCxDQUFDLEVBQUE7O29CQUxJLE9BQU8sR0FBRyxTQUtkO29CQUNGLGdCQUFNLENBQUMsS0FBSyxDQUFDLDRCQUEwQixJQUFJLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBRyxDQUFDLENBQUM7b0JBQ2xFLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQztvQkFDakIsc0JBQU8sT0FBTyxFQUFDOzs7O0NBQ2hCO0FBWEQsc0JBV0M7QUFFRCxTQUFzQixNQUFNLENBQUMsTUFBVzs7Ozs7O29CQUN0QyxnQkFBTSxDQUFDLEtBQUssQ0FBQyx5Q0FBdUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUcsQ0FBQyxDQUFDO29CQUNsRSxxQkFBTSxjQUFPLENBQUksTUFBTSxZQUFTLEVBQUU7NEJBQzVDLE1BQU0sRUFBRSxNQUFNOzRCQUNkLElBQUksRUFBRSxNQUFNOzRCQUNaLElBQUksRUFBRSxJQUFJOzRCQUNWLElBQUksd0JBQU8sSUFBSSxLQUFFLE9BQU8sRUFBRSxnQkFBZ0IsR0FBRTt5QkFDN0MsQ0FBQyxFQUFBOztvQkFMSSxHQUFHLEdBQUcsU0FLVjtvQkFDRixnQkFBTSxDQUFDLEtBQUssQ0FBQyx3Q0FBc0MsSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUcsQ0FBQyxDQUFDO29CQUMxRSxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUM7b0JBRWIsc0JBQU8sR0FBRyxFQUFDOzs7O0NBQ1o7QUFaRCx3QkFZQztBQUVELFNBQXNCLE1BQU0sQ0FBQyxNQUFXOzs7Ozs7b0JBQ3RDLGdCQUFNLENBQUMsS0FBSyxDQUFDLHlDQUF1QyxJQUFJLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBRyxDQUFDLENBQUM7b0JBQ25FLHFCQUFNLGNBQU8sQ0FBSSxNQUFNLFlBQVMsRUFBRTs0QkFDM0MsTUFBTSxFQUFFLE1BQU07NEJBQ2QsSUFBSSxFQUFFLE1BQU07NEJBQ1osSUFBSSxFQUFFLElBQUk7NEJBQ1YsSUFBSSx3QkFBTyxJQUFJLEtBQUUsT0FBTyxFQUFFLG9CQUFvQixHQUFFO3lCQUNqRCxDQUFDLEVBQUE7O29CQUxJLEVBQUUsR0FBRyxTQUtUO29CQUVGLGdCQUFNLENBQUMsS0FBSyxDQUFDLHdDQUFzQyxJQUFJLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBRyxDQUFDLENBQUM7b0JBQ3pFLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FBQztvQkFDWixzQkFBTyxFQUFFLEVBQUM7Ozs7Q0FDWDtBQVpELHdCQVlDIn0= \ No newline at end of file diff --git a/dist/utils/cdn.d.ts b/dist/utils/cdn.d.ts new file mode 100644 index 0000000..3392c1a --- /dev/null +++ b/dist/utils/cdn.d.ts @@ -0,0 +1,13 @@ +import { ICredentials } from '../interface'; +export default class Cdn { + cdnClient: any; + constructor(credentials: ICredentials); + makeOwner(domainParams: any, verifyParams: any): Promise; + verifyDomainOwner(domainName: string): Promise; + describeVerifyContent(domainName: string): Promise; + mackCdnDomain(domain: string, sources: any): Promise; + hasDomainName(domainName: any): Promise; + modifyCdnDomain(domainName: string, sources: any): Promise; + addCdnDomain(domainName: string, sources: any): Promise; + cdnDomainDetail(domainName: any, i: number): any; +} diff --git a/dist/utils/cdn.js b/dist/utils/cdn.js new file mode 100644 index 0000000..0be16ce --- /dev/null +++ b/dist/utils/cdn.js @@ -0,0 +1,310 @@ +"use strict"; +var __assign = (this && this.__assign) || function () { + __assign = Object.assign || function(t) { + for (var s, i = 1, n = arguments.length; i < n; i++) { + s = arguments[i]; + for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) + t[p] = s[p]; + } + return t; + }; + return __assign.apply(this, arguments); +}; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); + __setModuleDefault(result, mod); + return result; +}; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __generator = (this && this.__generator) || function (thisArg, body) { + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; + return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; + function verb(n) { return function (v) { return step([n, v]); }; } + function step(op) { + if (f) throw new TypeError("Generator is already executing."); + while (_) try { + if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; + if (y = 0, t) op = [op[0] & 2, t.value]; + switch (op[0]) { + case 0: case 1: t = op; break; + case 4: _.label++; return { value: op[1], done: false }; + case 5: _.label++; y = op[1]; op = [0]; continue; + case 7: op = _.ops.pop(); _.trys.pop(); continue; + default: + if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } + if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } + if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } + if (t[2]) _.ops.pop(); + _.trys.pop(); continue; + } + op = body.call(thisArg, _); + } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } + if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; + } +}; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +/* eslint-disable no-await-in-loop */ +var core_1 = require("@serverless-devs/core"); +var logger_1 = __importDefault(require("../common/logger")); +var utils_1 = require("./utils"); +var api = __importStar(require("./api")); +var POST = { method: 'POST' }; +var DOMAIN = 'devsapp.net'; +var Cdn = /** @class */ (function () { + function Cdn(credentials) { + this.cdnClient = utils_1.getPopClient(credentials, 'https://cdn.aliyuncs.com', '2018-05-10'); + } + Cdn.prototype.makeOwner = function (domainParams, verifyParams) { + return __awaiter(this, void 0, void 0, function () { + var isDomainOwner, verify; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + logger_1.default.debug('Check verify domain owner start...'); + return [4 /*yield*/, this.verifyDomainOwner(DOMAIN)]; + case 1: + isDomainOwner = _a.sent(); + logger_1.default.debug("Check verify domain owner end, response is: " + isDomainOwner); + if (!!isDomainOwner) return [3 /*break*/, 7]; + logger_1.default.debug('Get describe verify content start...'); + return [4 /*yield*/, this.describeVerifyContent(DOMAIN)]; + case 2: + verify = _a.sent(); + logger_1.default.debug("Get describe verify content end, response is: " + verify); + return [4 /*yield*/, api.domain(domainParams)]; + case 3: + _a.sent(); + return [4 /*yield*/, api.verify(__assign(__assign({}, verifyParams), { verify: verify }))]; + case 4: + _a.sent(); + return [4 /*yield*/, utils_1.sleep(1000)]; + case 5: + _a.sent(); + return [4 /*yield*/, this.makeOwner(domainParams, verifyParams)]; + case 6: + _a.sent(); + _a.label = 7; + case 7: return [2 /*return*/]; + } + }); + }); + }; + Cdn.prototype.verifyDomainOwner = function (domainName) { + return __awaiter(this, void 0, void 0, function () { + var ex_1; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + _a.trys.push([0, 2, , 3]); + return [4 /*yield*/, this.cdnClient.request('VerifyDomainOwner', { + DomainName: domainName, + VerifyType: 'dnsCheck', + }, POST)]; + case 1: + _a.sent(); + return [2 /*return*/, true]; + case 2: + ex_1 = _a.sent(); + logger_1.default.debug("VerifyDomainOwner domain name is " + domainName + ", error is: \n " + ex_1); + if (ex_1.code !== 'DomainOwnerVerifyFail') { + throw ex_1; + } + return [2 /*return*/, false]; + case 3: return [2 /*return*/]; + } + }); + }); + }; + Cdn.prototype.describeVerifyContent = function (domainName) { + return __awaiter(this, void 0, void 0, function () { + var Content; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: return [4 /*yield*/, this.cdnClient.request('DescribeVerifyContent', { DomainName: domainName }, POST)]; + case 1: + Content = (_a.sent()).Content; + return [2 /*return*/, Content]; + } + }); + }); + }; + Cdn.prototype.mackCdnDomain = function (domain, sources) { + return __awaiter(this, void 0, void 0, function () { + var cname; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + logger_1.default.debug("Add cdn domain start, domain is: " + domain); + return [4 /*yield*/, this.hasDomainName(domain)]; + case 1: + cname = _a.sent(); + logger_1.default.debug("has cname: " + cname); + if (!cname) return [3 /*break*/, 3]; + return [4 /*yield*/, this.modifyCdnDomain(domain, sources)]; + case 2: + _a.sent(); + return [3 /*break*/, 5]; + case 3: return [4 /*yield*/, this.addCdnDomain(domain, sources)]; + case 4: + cname = _a.sent(); + _a.label = 5; + case 5: + logger_1.default.debug("Add cdn domain end. cname: " + cname); + return [2 /*return*/, cname]; + } + }); + }); + }; + Cdn.prototype.hasDomainName = function (domainName) { + return __awaiter(this, void 0, void 0, function () { + var pageSize, pageNumber, totalCount, _a, Domains, TotalCount, _i, _b, _c, Cname, DomainName; + return __generator(this, function (_d) { + switch (_d.label) { + case 0: + pageSize = 50; + pageNumber = 0; + totalCount = 0; + _d.label = 1; + case 1: + pageNumber = pageNumber + 1; + return [4 /*yield*/, this.cdnClient.request('DescribeUserDomains', { + pageSize: pageSize, pageNumber: pageNumber, + }, POST)]; + case 2: + _a = _d.sent(), Domains = _a.Domains, TotalCount = _a.TotalCount; + logger_1.default.debug("DescribeUserDomains responses: " + JSON.stringify(Domains)); + for (_i = 0, _b = ((Domains === null || Domains === void 0 ? void 0 : Domains.PageData) || []); _i < _b.length; _i++) { + _c = _b[_i], Cname = _c.Cname, DomainName = _c.DomainName; + if (DomainName === domainName) { + return [2 /*return*/, Cname]; + } + } + totalCount = TotalCount; + _d.label = 3; + case 3: + if (totalCount >= pageNumber * pageSize) return [3 /*break*/, 1]; + _d.label = 4; + case 4: return [2 /*return*/, false]; + } + }); + }); + }; + Cdn.prototype.modifyCdnDomain = function (domainName, sources) { + return __awaiter(this, void 0, void 0, function () { + var ex_2; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + _a.trys.push([0, 2, , 3]); + return [4 /*yield*/, this.cdnClient.request('ModifyCdnDomain', { + DomainName: domainName, + Sources: JSON.stringify(sources), + }, POST)]; + case 1: + _a.sent(); + return [3 /*break*/, 3]; + case 2: + ex_2 = _a.sent(); + if (ex_2.code !== 'DomainAlreadyExist') { + throw ex_2; + } + return [3 /*break*/, 3]; + case 3: return [2 /*return*/]; + } + }); + }); + }; + Cdn.prototype.addCdnDomain = function (domainName, sources) { + return __awaiter(this, void 0, void 0, function () { + var ex_3, vm, cname, ex_4; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + _a.trys.push([0, 2, , 3]); + return [4 /*yield*/, this.cdnClient.request('AddCdnDomain', { + DomainName: domainName, + Scope: 'global', + CdnType: 'web', + Sources: JSON.stringify(sources), + }, POST)]; + case 1: + _a.sent(); + return [3 /*break*/, 3]; + case 2: + ex_3 = _a.sent(); + if (ex_3.code !== 'DomainAlreadyExist') { + throw ex_3; + } + return [3 /*break*/, 3]; + case 3: + vm = core_1.spinner('get cdn cname...'); + _a.label = 4; + case 4: + _a.trys.push([4, 6, , 7]); + return [4 /*yield*/, this.cdnDomainDetail(domainName, 0)]; + case 5: + cname = _a.sent(); + vm.succeed(); + return [2 /*return*/, cname]; + case 6: + ex_4 = _a.sent(); + vm.fail(); + throw ex_4; + case 7: return [2 /*return*/]; + } + }); + }); + }; + Cdn.prototype.cdnDomainDetail = function (domainName, i) { + return __awaiter(this, void 0, void 0, function () { + var describeCdnDomainDetail, cname; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: return [4 /*yield*/, this.cdnClient.request('DescribeCdnDomainDetail', { DomainName: domainName }, POST)]; + case 1: + describeCdnDomainDetail = _a.sent(); + logger_1.default.debug("DescribeCdnDomainDetail response is: " + JSON.stringify(describeCdnDomainDetail)); + cname = describeCdnDomainDetail.GetDomainDetailModel.Cname; + if (!!cname) return [3 /*break*/, 3]; + if (i > 90) { + throw new Error('Not found cdn cname, please retry.'); + } + return [4 /*yield*/, utils_1.sleep(1000)]; + case 2: + _a.sent(); + return [2 /*return*/, this.cdnDomainDetail(domainName, i + 1)]; + case 3: return [2 /*return*/, cname]; + } + }); + }); + }; + return Cdn; +}()); +exports.default = Cdn; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2RuLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2Nkbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHFDQUFxQztBQUNyQyw4Q0FBZ0Q7QUFDaEQsNERBQXNDO0FBQ3RDLGlDQUE4QztBQUU5Qyx5Q0FBNkI7QUFFN0IsSUFBTSxJQUFJLEdBQUcsRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLENBQUM7QUFDaEMsSUFBTSxNQUFNLEdBQUcsYUFBYSxDQUFDO0FBRTdCO0lBR0UsYUFBWSxXQUF5QjtRQUNuQyxJQUFJLENBQUMsU0FBUyxHQUFHLG9CQUFZLENBQUMsV0FBVyxFQUFFLDBCQUEwQixFQUFFLFlBQVksQ0FBQyxDQUFDO0lBQ3ZGLENBQUM7SUFFSyx1QkFBUyxHQUFmLFVBQWdCLFlBQWlCLEVBQUUsWUFBWTs7Ozs7O3dCQUM3QyxnQkFBTSxDQUFDLEtBQUssQ0FBQyxvQ0FBb0MsQ0FBQyxDQUFDO3dCQUM3QixxQkFBTSxJQUFJLENBQUMsaUJBQWlCLENBQUMsTUFBTSxDQUFDLEVBQUE7O3dCQUFwRCxhQUFhLEdBQUcsU0FBb0M7d0JBQzFELGdCQUFNLENBQUMsS0FBSyxDQUFDLGlEQUErQyxhQUFlLENBQUMsQ0FBQzs2QkFFekUsQ0FBQyxhQUFhLEVBQWQsd0JBQWM7d0JBQ2hCLGdCQUFNLENBQUMsS0FBSyxDQUFDLHNDQUFzQyxDQUFDLENBQUM7d0JBQ3RDLHFCQUFNLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxNQUFNLENBQUMsRUFBQTs7d0JBQWpELE1BQU0sR0FBRyxTQUF3Qzt3QkFDdkQsZ0JBQU0sQ0FBQyxLQUFLLENBQUMsbURBQWlELE1BQVEsQ0FBQyxDQUFDO3dCQUV4RSxxQkFBTSxHQUFHLENBQUMsTUFBTSxDQUFDLFlBQVksQ0FBQyxFQUFBOzt3QkFBOUIsU0FBOEIs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 \ No newline at end of file diff --git a/dist/utils/addFcDomain/fc.d.ts b/dist/utils/fc.d.ts similarity index 83% rename from dist/utils/addFcDomain/fc.d.ts rename to dist/utils/fc.d.ts index f953d30..d04f686 100644 --- a/dist/utils/addFcDomain/fc.d.ts +++ b/dist/utils/fc.d.ts @@ -1,7 +1,5 @@ -import { ILogger } from '@serverless-devs/core'; export default class Component { static client: any; - static logger: ILogger; static remove(profile: any, regionId: string): Promise; static deploy(profile: any, regionId: string, token: string): Promise; static makeService(serviceConfig: any): Promise; diff --git a/dist/utils/addFcDomain/fc.js b/dist/utils/fc.js similarity index 61% rename from dist/utils/addFcDomain/fc.js rename to dist/utils/fc.js index 18ddc33..fc60b93 100644 --- a/dist/utils/addFcDomain/fc.js +++ b/dist/utils/fc.js @@ -1,13 +1,4 @@ "use strict"; -var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { - var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; - if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); - else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; - return c > 3 && r && Object.defineProperty(target, key, r), r; -}; -var __metadata = (this && this.__metadata) || function (k, v) { - if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); -}; var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } return new (P || (P = Promise))(function (resolve, reject) { @@ -49,8 +40,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { }; Object.defineProperty(exports, "__esModule", { value: true }); var fc2_1 = __importDefault(require("@alicloud/fc2")); -var core_1 = require("@serverless-devs/core"); -var constant_1 = __importDefault(require("../../constant")); +var logger_1 = __importDefault(require("../common/logger")); var serviceName = 'serverless-devs-check'; var functionName = 'get-domain'; var triggerName = 'httpTrigger'; @@ -73,36 +63,36 @@ var Component = /** @class */ (function () { _a.label = 1; case 1: _a.trys.push([1, 3, , 4]); - this.logger.debug('Delete trigger...'); + logger_1.default.debug('Delete trigger...'); return [4 /*yield*/, client.deleteTrigger(serviceName, functionName, triggerName)]; case 2: _a.sent(); return [3 /*break*/, 4]; case 3: ex_1 = _a.sent(); - this.logger.debug("ex code: " + ex_1.code + ", ex: " + ex_1.message); + logger_1.default.debug("ex code: " + ex_1.code + ", ex: " + ex_1.message); return [3 /*break*/, 4]; case 4: _a.trys.push([4, 6, , 7]); - this.logger.debug('Delete function...'); + logger_1.default.debug('Delete function...'); return [4 /*yield*/, client.deleteFunction(serviceName, functionName)]; case 5: _a.sent(); return [3 /*break*/, 7]; case 6: ex_2 = _a.sent(); - this.logger.debug("ex code: " + ex_2.code + ", ex: " + ex_2.message); + logger_1.default.debug("ex code: " + ex_2.code + ", ex: " + ex_2.message); return [3 /*break*/, 7]; case 7: _a.trys.push([7, 9, , 10]); - this.logger.debug('Delete service...'); + logger_1.default.debug('Delete service...'); return [4 /*yield*/, client.deleteService(serviceName)]; case 8: _a.sent(); return [3 /*break*/, 10]; case 9: ex_3 = _a.sent(); - this.logger.debug("ex code: " + ex_3.code + ", ex: " + ex_3.message); + logger_1.default.debug("ex code: " + ex_3.code + ", ex: " + ex_3.message); return [3 /*break*/, 10]; case 10: return [2 /*return*/]; } @@ -153,7 +143,7 @@ var Component = /** @class */ (function () { switch (_a.label) { case 0: _a.trys.push([0, 2, , 3]); - this.logger.debug('Create service...'); + logger_1.default.debug('Create service...'); return [4 /*yield*/, this.client.createService(serviceName, serviceConfig)]; case 1: _a.sent(); @@ -161,7 +151,7 @@ var Component = /** @class */ (function () { case 2: ex_4 = _a.sent(); if (ex_4.code !== 'ServiceAlreadyExists') { - this.logger.debug("ex code: " + ex_4.code + ", ex: " + ex_4.message); + logger_1.default.debug("ex code: " + ex_4.code + ", ex: " + ex_4.message); throw ex_4; } return [3 /*break*/, 3]; @@ -177,7 +167,7 @@ var Component = /** @class */ (function () { switch (_a.label) { case 0: _a.trys.push([0, 2, , 5]); - this.logger.debug('Create function...'); + logger_1.default.debug('Create function...'); return [4 /*yield*/, this.client.updateFunction(serviceName, functionName, functionConfig)]; case 1: _a.sent(); @@ -192,7 +182,7 @@ var Component = /** @class */ (function () { _a.sent(); return [2 /*return*/]; case 4: - this.logger.debug("ex code: " + ex_5.code + ", ex: " + ex_5.message); + logger_1.default.debug("ex code: " + ex_5.code + ", ex: " + ex_5.message); throw ex_5; case 5: return [2 /*return*/]; } @@ -206,7 +196,7 @@ var Component = /** @class */ (function () { switch (_a.label) { case 0: _a.trys.push([0, 2, , 3]); - this.logger.debug('Create trigger...'); + logger_1.default.debug('Create trigger...'); return [4 /*yield*/, this.client.createTrigger(serviceName, functionName, triggerConfig)]; case 1: _a.sent(); @@ -214,7 +204,7 @@ var Component = /** @class */ (function () { case 2: ex_6 = _a.sent(); if (ex_6.code !== 'TriggerAlreadyExists') { - this.logger.debug("ex code: " + ex_6.code + ", ex: " + ex_6.message); + logger_1.default.debug("ex code: " + ex_6.code + ", ex: " + ex_6.message); throw ex_6; } return [3 /*break*/, 3]; @@ -223,11 +213,7 @@ var Component = /** @class */ (function () { }); }); }; - __decorate([ - core_1.HLogger(constant_1.default.CONTEXT), - __metadata("design:type", Object) - ], Component, "logger", void 0); return Component; }()); exports.default = Component; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdXRpbHMvYWRkRmNEb21haW4vZmMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxzREFBK0I7QUFDL0IsOENBQXlEO0FBQ3pELDREQUFzQztBQUV0QyxJQUFNLFdBQVcsR0FBRyx1QkFBdUIsQ0FBQztBQUM1QyxJQUFNLFlBQVksR0FBRyxZQUFZLENBQUM7QUFDbEMsSUFBTSxXQUFXLEdBQUcsYUFBYSxDQUFDO0FBRWxDO0lBQUE7SUFzR0EsQ0FBQztJQWxHYyxnQkFBTSxHQUFuQixVQUFvQixPQUFPLEVBQUUsUUFBZ0I7Ozs7Ozt3QkFDckMsTUFBTSxHQUFHLElBQUksYUFBRSxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUU7NEJBQ3ZDLFdBQVcsRUFBRSxPQUFPLENBQUMsV0FBVzs0QkFDaEMsZUFBZSxFQUFFLE9BQU8sQ0FBQyxlQUFlOzRCQUN4QyxhQUFhLEVBQUUsT0FBTyxDQUFDLGFBQWE7NEJBQ3BDLE1BQU0sRUFBRSxRQUFROzRCQUNoQixPQUFPLEVBQUUsR0FBRyxHQUFHLElBQUk7eUJBQ3BCLENBQUMsQ0FBQzs7Ozt3QkFHRCxJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDO3dCQUN2QyxxQkFBTSxNQUFNLENBQUMsYUFBYSxDQUFDLFdBQVcsRUFBRSxZQUFZLEVBQUUsV0FBVyxDQUFDLEVBQUE7O3dCQUFsRSxTQUFrRSxDQUFDOzs7O3dCQUVuRSxJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxjQUFZLElBQUUsQ0FBQyxJQUFJLGNBQVMsSUFBRSxDQUFDLE9BQVMsQ0FBQyxDQUFDOzs7O3dCQUk1RCxJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO3dCQUN4QyxxQkFBTSxNQUFNLENBQUMs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 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvZmMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxzREFBK0I7QUFDL0IsNERBQXNDO0FBRXRDLElBQU0sV0FBVyxHQUFHLHVCQUF1QixDQUFDO0FBQzVDLElBQU0sWUFBWSxHQUFHLFlBQVksQ0FBQztBQUNsQyxJQUFNLFdBQVcsR0FBRyxhQUFhLENBQUM7QUFFbEM7SUFBQTtJQXFHQSxDQUFDO0lBbEdjLGdCQUFNLEdBQW5CLFVBQW9CLE9BQU8sRUFBRSxRQUFnQjs7Ozs7O3dCQUNyQyxNQUFNLEdBQUcsSUFBSSxhQUFFLENBQUMsT0FBTyxDQUFDLFNBQVMsRUFBRTs0QkFDdkMsV0FBVyxFQUFFLE9BQU8sQ0FBQyxXQUFXOzRCQUNoQyxlQUFlLEVBQUUsT0FBTyxDQUFDLGVBQWU7NEJBQ3hDLGFBQWEsRUFBRSxPQUFPLENBQUMsYUFBYTs0QkFDcEMsTUFBTSxFQUFFLFFBQVE7NEJBQ2hCLE9BQU8sRUFBRSxHQUFHLEdBQUcsSUFBSTt5QkFDcEIsQ0FBQyxDQUFDOzs7O3dCQUdELGdCQUFNLENBQUMsS0FBSyxDQUFDLG1CQUFtQixDQUFDLENBQUM7d0JBQ2xDLHFCQUFNLE1BQU0sQ0FBQyxhQUFhLENBQUMsV0FBVyxFQUFFLFlBQVksRUFBRSxXQUFXLENBQUMsRUFBQTs7d0JBQWxFLFNBQWtFLENBQUM7Ozs7d0JBRW5FLGdCQUFNLENBQUMsS0FBSyxDQUFDLGNBQVksSUFBRSxDQUFDLElBQUksY0FBUyxJQUFFLENBQUMsT0FBUyxDQUFDLENBQUM7Ozs7d0JBSXZELGdCQUFNLENBQUMsS0FBSyxDQUFDLG9CQUFvQixDQUFDLENBQUM7d0JBQ25DLHFCQUFNLE1BQU0sQ0FBQyxjQUFjLENBQUMsV0FBVyxFQUFFLFlBQVksQ0FBQyxFQUFBOzt3QkFBdEQsU0FBc0QsQ0FBQzs7Ozt3QkFFdkQs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 \ No newline at end of file diff --git a/dist/utils/oss.d.ts b/dist/utils/oss.d.ts new file mode 100644 index 0000000..6d7580d --- /dev/null +++ b/dist/utils/oss.d.ts @@ -0,0 +1,4 @@ +export default class Oss { + static saveFile(bucket: any, token: any): Promise; + static put(region: any, bucket: any, credential: any, filePath: any): Promise; +} diff --git a/dist/utils/addOssDomain/oss.js b/dist/utils/oss.js similarity index 57% rename from dist/utils/addOssDomain/oss.js rename to dist/utils/oss.js index 138bec8..27888be 100644 --- a/dist/utils/addOssDomain/oss.js +++ b/dist/utils/oss.js @@ -1,15 +1,4 @@ "use strict"; -var __assign = (this && this.__assign) || function () { - __assign = Object.assign || function(t) { - for (var s, i = 1, n = arguments.length; i < n; i++) { - s = arguments[i]; - for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) - t[p] = s[p]; - } - return t; - }; - return __assign.apply(this, arguments); -}; var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } return new (P || (P = Promise))(function (resolve, reject) { @@ -51,16 +40,42 @@ var __importDefault = (this && this.__importDefault) || function (mod) { }; Object.defineProperty(exports, "__esModule", { value: true }); var ali_oss_1 = __importDefault(require("ali-oss")); +var fs_extra_1 = __importDefault(require("fs-extra")); +var path_1 = __importDefault(require("path")); +var logger_1 = __importDefault(require("../common/logger")); var Oss = /** @class */ (function () { function Oss() { } - Oss.put = function (credential, filePath) { + Oss.saveFile = function (bucket, token) { + return __awaiter(this, void 0, void 0, function () { + var savePath; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + savePath = path_1.default.join(process.cwd(), '.s', bucket + "-token"); + logger_1.default.debug("Save file path is: " + savePath + ", token is: " + token + "."); + return [4 /*yield*/, fs_extra_1.default.outputFile(savePath, token)]; + case 1: + _a.sent(); + return [2 /*return*/, savePath]; + } + }); + }); + }; + Oss.put = function (region, bucket, credential, filePath) { return __awaiter(this, void 0, void 0, function () { var ossClient; return __generator(this, function (_a) { switch (_a.label) { case 0: - ossClient = new ali_oss_1.default(__assign(__assign({}, credential), { timeout: credential.timeout || 7200000 })); + ossClient = new ali_oss_1.default({ + region: "oss-" + region, + bucket: bucket, + accessKeyId: credential.AccessKeyID, + accessKeySecret: credential.AccessKeySecret, + stsToken: credential.SecurityToken, + timeout: credential.timeout || 7200000, + }); return [4 /*yield*/, ossClient.put('token', filePath)]; case 1: _a.sent(); @@ -75,4 +90,4 @@ var Oss = /** @class */ (function () { return Oss; }()); exports.default = Oss; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3NzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3V0aWxzL2FkZE9zc0RvbWFpbi9vc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLG9EQUEwQjtBQVcxQjtJQUFBO0lBV0EsQ0FBQztJQVZjLE9BQUcsR0FBaEIsVUFBaUIsVUFBc0IsRUFBRSxRQUFROzs7Ozs7d0JBQ3pDLFNBQVMsR0FBRyxJQUFJLGlCQUFHLHVCQUNwQixVQUFVLEtBQ2IsT0FBTyxFQUFFLFVBQVUsQ0FBQyxPQUFPLElBQUksT0FBTyxJQUN0QyxDQUFDO3dCQUVILHFCQUFNLFNBQVMsQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLFFBQVEsQ0FBQyxFQUFBOzt3QkFBdEMsU0FBc0MsQ0FBQzt3QkFFdkMscUJBQU0sU0FBUyxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUUsYUFBYSxDQUFDLEVBQUE7O3dCQUE5QyxTQUE4QyxDQUFDOzs7OztLQUNoRDtJQUNILFVBQUM7QUFBRCxDQUFDLEFBWEQsSUFXQyJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3NzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL29zcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLG9EQUEwQjtBQUMxQixzREFBMEI7QUFDMUIsOENBQXdCO0FBQ3hCLDREQUFzQztBQUV0QztJQUFBO0lBdUJBLENBQUM7SUF0QmMsWUFBUSxHQUFyQixVQUFzQixNQUFNLEVBQUUsS0FBSzs7Ozs7O3dCQUMzQixRQUFRLEdBQUcsY0FBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLEVBQUUsSUFBSSxFQUFLLE1BQU0sV0FBUSxDQUFDLENBQUM7d0JBRW5FLGdCQUFNLENBQUMsS0FBSyxDQUFDLHdCQUFzQixRQUFRLG9CQUFlLEtBQUssTUFBRyxDQUFDLENBQUM7d0JBQ3BFLHFCQUFNLGtCQUFFLENBQUMsVUFBVSxDQUFDLFFBQVEsRUFBRSxLQUFLLENBQUMsRUFBQTs7d0JBQXBDLFNBQW9DLENBQUM7d0JBQ3JDLHNCQUFPLFFBQVEsRUFBQzs7OztLQUNqQjtJQUVZLE9BQUcsR0FBaEIsVUFBaUIsTUFBTSxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQUUsUUFBUTs7Ozs7O3dCQUM3QyxTQUFTLEdBQUcsSUFBSSxpQkFBRyxDQUFDOzRCQUN4QixNQUFNLEVBQUUsU0FBTyxNQUFROzRCQUN2QixNQUFNLFFBQUE7NEJBQ04sV0FBVyxFQUFFLFVBQVUsQ0FBQyxXQUFXOzRCQUNuQyxlQUFlLEVBQUUsVUFBVSxDQUFDLGVBQWU7NEJBQzNDLFFBQVEsRUFBRSxVQUFVLENBQUMsYUFBYTs0QkFDbEMsT0FBTyxFQUFFLFVBQVUsQ0FBQyxPQUFPLElBQUksT0FBTzt5QkFDdkMsQ0FBQyxDQUFDO3dCQUVILHFCQUFNLFNBQVMsQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLFFBQVEsQ0FBQyxFQUFBOzt3QkFBdEMsU0FBc0MsQ0FBQzt3QkFFdkMscUJBQU0sU0FBUyxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUUsYUFBYSxDQUFDLEVBQUE7O3dCQUE5QyxTQUE4QyxDQUFDOzs7OztLQUNoRDtJQUNILFVBQUM7QUFBRCxDQUFDLEFBdkJELElBdUJDIn0= \ No newline at end of file diff --git a/dist/utils/utils.d.ts b/dist/utils/utils.d.ts index 63d9408..76187f7 100644 --- a/dist/utils/utils.d.ts +++ b/dist/utils/utils.d.ts @@ -1,4 +1,3 @@ import Pop from '@alicloud/pop-core'; export declare const sleep: (ms: number) => Promise; -export declare function checkRs(rs: any): void; export declare const getPopClient: (credentials: any, endpoint: any, apiVersion: any) => Pop; diff --git a/dist/utils/utils.js b/dist/utils/utils.js index cae8362..94ecf0f 100644 --- a/dist/utils/utils.js +++ b/dist/utils/utils.js @@ -3,26 +3,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.getPopClient = exports.checkRs = exports.sleep = void 0; +exports.getPopClient = exports.sleep = void 0; var pop_core_1 = __importDefault(require("@alicloud/pop-core")); exports.sleep = function (ms) { return new Promise(function (resolve) { return setTimeout(resolve, ms); }); }; -function checkRs(rs) { - if (rs.Status !== 'Success') { - throw new Error(rs.Body); - } -} -exports.checkRs = checkRs; exports.getPopClient = function (credentials, endpoint, apiVersion) { return new pop_core_1.default({ endpoint: endpoint, apiVersion: apiVersion, accessKeyId: credentials.AccessKeyID, accessKeySecret: credentials.AccessKeySecret, - // @ts-ignore + // @ts-ignore: Set SecurityToken securityToken: credentials.SecurityToken, opts: { timeout: 10 * 1000, }, }); }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsZ0VBQXFDO0FBRXhCLFFBQUEsS0FBSyxHQUFHLFVBQUMsRUFBVSxJQUFLLE9BQUEsSUFBSSxPQUFPLENBQUMsVUFBQyxPQUFPLElBQUssT0FBQSxVQUFVLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQyxFQUF2QixDQUF1QixDQUFDLEVBQWpELENBQWlELENBQUM7QUFFdkYsU0FBZ0IsT0FBTyxDQUFDLEVBQU87SUFDN0IsSUFBSSxFQUFFLENBQUMsTUFBTSxLQUFLLFNBQVMsRUFBRTtRQUMzQixNQUFNLElBQUksS0FBSyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQztLQUMxQjtBQUNILENBQUM7QUFKRCwwQkFJQztBQUVZLFFBQUEsWUFBWSxHQUFHLFVBQUMsV0FBVyxFQUFFLFFBQVEsRUFBRSxVQUFVO0lBQzVELE9BQU8sSUFBSSxrQkFBRyxDQUFDO1FBQ2IsUUFBUSxVQUFBO1FBQ1IsVUFBVSxZQUFBO1FBQ1YsV0FBVyxFQUFFLFdBQVcsQ0FBQyxXQUFXO1FBQ3BDLGVBQWUsRUFBRSxXQUFXLENBQUMsZUFBZTtRQUM1QyxhQUFhO1FBQ2IsYUFBYSxFQUFFLFdBQVcsQ0FBQyxhQUFhO1FBQ3hDLElBQUksRUFBRTtZQUNKLE9BQU8sRUFBRSxFQUFFLEdBQUcsSUFBSTtTQUNuQjtLQUNGLENBQUMsQ0FBQztBQUNMLENBQUMsQ0FBQyJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsZ0VBQXFDO0FBRXhCLFFBQUEsS0FBSyxHQUFHLFVBQUMsRUFBVSxJQUFLLE9BQUEsSUFBSSxPQUFPLENBQUMsVUFBQyxPQUFPLElBQUssT0FBQSxVQUFVLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQyxFQUF2QixDQUF1QixDQUFDLEVBQWpELENBQWlELENBQUM7QUFFMUUsUUFBQSxZQUFZLEdBQUcsVUFBQyxXQUFXLEVBQUUsUUFBUSxFQUFFLFVBQVU7SUFDNUQsT0FBTyxJQUFJLGtCQUFHLENBQUM7UUFDYixRQUFRLFVBQUE7UUFDUixVQUFVLFlBQUE7UUFDVixXQUFXLEVBQUUsV0FBVyxDQUFDLFdBQVc7UUFDcEMsZUFBZSxFQUFFLFdBQVcsQ0FBQyxlQUFlO1FBQzVDLGdDQUFnQztRQUNoQyxhQUFhLEVBQUUsV0FBVyxDQUFDLGFBQWE7UUFDeEMsSUFBSSxFQUFFO1lBQ0osT0FBTyxFQUFFLEVBQUUsR0FBRyxJQUFJO1NBQ25CO0tBQ0YsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyxDQUFDIn0= \ No newline at end of file diff --git a/package.json b/package.json index a1f2b54..a96dc0a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "domain", "main": "./dist/index.js", - "version": "0.0.12", + "version": "0.0.13", "dependencies": { "@alicloud/fc2": "^2.2.2", "@alicloud/pop-core": "^1.7.10", diff --git a/publish.yaml b/publish.yaml index 290c604..82b58e4 100644 --- a/publish.yaml +++ b/publish.yaml @@ -2,7 +2,7 @@ Type: Component Name: domain Provider: - 阿里云 -Version: 0.0.12 +Version: 0.0.13 Description: 下发Serverless Devs默认域名 HomePage: https://github.com/devsapp/domain Tags: #标签详情