@midwayjs/axios 3.3.4 → 3.4.0-beta.10

package/dist/configuration.js

@@ -11,7 +11,7 @@ const decorator_1 = require("@midwayjs/decorator");
 const serviceManager_1 = require("./serviceManager");
 let AxiosConfiguration = class AxiosConfiguration {
     async onReady(container) {
-        await container.getAsync(serviceManager_1.HttpService);
+        await container.getAsync(serviceManager_1.HttpServiceFactory);
     }
 };
 AxiosConfiguration = __decorate([

package/dist/serviceManager.d.ts

@@ -1,11 +1,15 @@
-import { AxiosRequestConfig, AxiosResponse } from 'axios';
-import { IMidwayApplication } from '@midwayjs/core';
+import { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
+import { ServiceFactory } from '@midwayjs/core';
 import { AxiosHttpService } from './interface';
+export declare class HttpServiceFactory extends ServiceFactory<AxiosInstance> {
+    axiosConfig: any;
+    init(): Promise<void>;
+    protected createClient(config: any, clientName: any): Promise<AxiosInstance>;
+    getName(): string;
+}
 export declare class HttpService implements AxiosHttpService {
     private instance;
-    protected ctx: any;
-    protected app: IMidwayApplication;
-    protected httpConfig: AxiosRequestConfig;
+    private serviceFactory;
     get interceptors(): {
         request: import("axios").AxiosInterceptorManager<AxiosRequestConfig<any>>;
         response: import("axios").AxiosInterceptorManager<AxiosResponse<any, any>>;

package/dist/serviceManager.js

@@ -9,44 +9,51 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpService = void 0;
+exports.HttpService = exports.HttpServiceFactory = void 0;
 const axios_1 = require("axios");
 const decorator_1 = require("@midwayjs/decorator");
-const interface_1 = require("./interface");
+const core_1 = require("@midwayjs/core");
+let HttpServiceFactory = class HttpServiceFactory extends core_1.ServiceFactory {
+    async init() {
+        let axiosConfig = this.axiosConfig;
+        if (!this.axiosConfig['clients']) {
+            axiosConfig = {
+                default: {},
+                clients: {
+                    default: this.axiosConfig,
+                },
+            };
+        }
+        await this.initClients(axiosConfig);
+    }
+    async createClient(config, clientName) {
+        return axios_1.default.create(config);
+    }
+    getName() {
+        return 'axios';
+    }
+};
+__decorate([
+    (0, decorator_1.Config)('axios'),
+    __metadata("design:type", Object)
+], HttpServiceFactory.prototype, "axiosConfig", void 0);
+__decorate([
+    (0, decorator_1.Init)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], HttpServiceFactory.prototype, "init", null);
+HttpServiceFactory = __decorate([
+    (0, decorator_1.Provide)(),
+    (0, decorator_1.Scope)(decorator_1.ScopeEnum.Singleton)
+], HttpServiceFactory);
+exports.HttpServiceFactory = HttpServiceFactory;
 let HttpService = class HttpService {
     get interceptors() {
         return this.instance.interceptors;
     }
     async init() {
-        var _a;
-        if (!this.app.getApplicationContext().registry.hasObject(interface_1.AXIOS_INSTANCE_KEY)) {
-            // 动态往全局容器中创建一个单例
-            const instance = axios_1.default.create((_a = this.httpConfig) !== null && _a !== void 0 ? _a : {});
-            // Add a request interceptor
-            instance.interceptors.request.use(config => {
-                // Do something before request is sent
-                return config;
-            }, error => {
-                // Do something with request error
-                return Promise.reject(error);
-            });
-            // Add a response interceptor
-            instance.interceptors.response.use(response => {
-                // Any status code that lie within the range of 2xx cause this function to trigger
-                // Do something with response data
-                return response;
-            }, error => {
-                // Any status codes that falls outside the range of 2xx cause this function to trigger
-                // Do something with response error
-                return Promise.reject(error);
-            });
-            this.app
-                .getApplicationContext()
-                .registry.registerObject(interface_1.AXIOS_INSTANCE_KEY, instance);
-        }
-        this.instance = this.app
-            .getApplicationContext()
-            .registry.getObject(interface_1.AXIOS_INSTANCE_KEY);
+        this.instance = this.serviceFactory.get('default');
     }
     getUri(config) {
         return this.instance.getUri(config);
@@ -78,16 +85,8 @@ let HttpService = class HttpService {
 };
 __decorate([
     (0, decorator_1.Inject)(),
-    __metadata("design:type", Object)
-], HttpService.prototype, "ctx", void 0);
-__decorate([
-    (0, decorator_1.App)(),
-    __metadata("design:type", Object)
-], HttpService.prototype, "app", void 0);
-__decorate([
-    (0, decorator_1.Config)('axios'),
-    __metadata("design:type", Object)
-], HttpService.prototype, "httpConfig", void 0);
+    __metadata("design:type", HttpServiceFactory)
+], HttpService.prototype, "serviceFactory", void 0);
 __decorate([
     (0, decorator_1.Init)(),
     __metadata("design:type", Function),
@@ -95,7 +94,8 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], HttpService.prototype, "init", null);
 HttpService = __decorate([
-    (0, decorator_1.Provide)()
+    (0, decorator_1.Provide)(),
+    (0, decorator_1.Scope)(decorator_1.ScopeEnum.Singleton)
 ], HttpService);
 exports.HttpService = HttpService;
 //# sourceMappingURL=serviceManager.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@midwayjs/axios",
   "description": "midway http client with axios",
-  "version": "3.3.4",
+  "version": "3.4.0-beta.10",
   "main": "dist/index",
   "typings": "index.d.ts",
   "files": [
@@ -10,12 +10,12 @@
     "index.d.ts"
   ],
   "devDependencies": {
-    "@midwayjs/core": "^3.3.4",
-    "@midwayjs/decorator": "^3.3.4",
-    "@midwayjs/mock": "^3.3.4"
+    "@midwayjs/core": "^3.4.0-beta.10",
+    "@midwayjs/decorator": "^3.4.0-beta.10",
+    "@midwayjs/mock": "^3.4.0-beta.10"
   },
   "dependencies": {
-    "axios": "^0.26.0"
+    "axios": "0.27.2"
   },
   "keywords": [
     "http client",
@@ -37,5 +37,5 @@
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "0c2785a87217f57a184a661c71b1d9562af02242"
+  "gitHead": "560a5fa311605e4008c55f31c31bc4e12eeff2a5"
 }