@scx-js/scx-http 0.0.1 → 0.0.2

package/ScxFetchOptions.js

@@ -1,45 +1,45 @@
-class ScxFetchOptions {
-
-    /**
-     * 方法
-     */
-    method;
-
-    /**
-     * 请求头
-     */
-    headers;
-
-    /**
-     * 默认想如何处理返回值 取值如下 [auto, arrayBuffer, blob, formData, json, text, ]
-     *
-     */
-    responseType;
-
-    /**
-     * 是否使用 BodyPromise 如果为 true 则 body 为 Promise 对象, false 则会将 body 数据读完再返回
-     * @type {boolean}
-     */
-    useBodyPromise;
-
-    /**
-     * 前置处理器
-     * @type {boolean}
-     */
-    usePreInterceptor;
-
-    /**
-     * 后置处理器
-     * @type {boolean}
-     */
-    usePostInterceptor;
-
-    /**
-     * 字符集
-     */
-    charset;
-}
-
-export {
-    ScxFetchOptions,
-};
+class ScxFetchOptions {
+
+    /**
+     * 方法
+     */
+    method;
+
+    /**
+     * 请求头
+     */
+    headers;
+
+    /**
+     * 默认想如何处理返回值 取值如下 [auto, arrayBuffer, blob, formData, json, text, ]
+     *
+     */
+    responseType;
+
+    /**
+     * 是否使用 BodyPromise 如果为 true 则 body 为 Promise 对象, false 则会将 body 数据读完再返回
+     * @type {boolean}
+     */
+    useBodyPromise;
+
+    /**
+     * 前置处理器
+     * @type {boolean}
+     */
+    usePreInterceptor;
+
+    /**
+     * 后置处理器
+     * @type {boolean}
+     */
+    usePostInterceptor;
+
+    /**
+     * 字符集
+     */
+    charset;
+}
+
+export {
+    ScxFetchOptions,
+};

package/ScxFetchPromise.js

@@ -1,33 +1,33 @@
-class ScxFetchPromise extends Promise {
-
-    abortController;
-
-    then(onfulfilled, onrejected) {
-        const s = super.then(onfulfilled, onrejected);
-        s.abortController = this.abortController;
-        return s;
-    }
-
-    catch(onrejected) {
-        const s = super.catch(onrejected);
-        s.abortController = this.abortController;
-        return s;
-    }
-
-    finally(onFinally) {
-        const s = super.finally(onFinally);
-        s.abortController = this.abortController;
-        return s;
-    }
-
-    cancel(reason) {
-        if (this.abortController) {
-            this.abortController.abort(reason);
-        }
-    }
-
-}
-
-export {
-    ScxFetchPromise,
-};
+class ScxFetchPromise extends Promise {
+
+    abortController;
+
+    then(onfulfilled, onrejected) {
+        const s = super.then(onfulfilled, onrejected);
+        s.abortController = this.abortController;
+        return s;
+    }
+
+    catch(onrejected) {
+        const s = super.catch(onrejected);
+        s.abortController = this.abortController;
+        return s;
+    }
+
+    finally(onFinally) {
+        const s = super.finally(onFinally);
+        s.abortController = this.abortController;
+        return s;
+    }
+
+    cancel(reason) {
+        if (this.abortController) {
+            this.abortController.abort(reason);
+        }
+    }
+
+}
+
+export {
+    ScxFetchPromise,
+};

package/ScxFetchResponse.js

@@ -1,68 +1,68 @@
-import {ScxFetchResponseType} from "./ScxFetchResponseType.js";
-
-/**
- * ScxFetch 响应体
- */
-class ScxFetchResponse {
-
-    headers;
-    type;
-    url;
-    responseType;
-    body;
-
-    constructor(headers, type, url, body, responseType) {
-        this.headers = headers;
-        this.type = type;
-        this.url = url;
-        this.body = body;
-        this.responseType = responseType;
-    }
-
-    /**
-     * 根据 响应类型 获取对应的 body 处理器
-     * @param responseType
-     * @param response
-     * @return {Promise<ArrayBuffer>|ArrayBuffer|Promise<Blob>|Blob|*|Promise<FormData>}
-     */
-    static getBodyPromise(responseType, response) {
-        if (responseType === ScxFetchResponseType.JSON) {
-            return response.json();
-        } else if (responseType === ScxFetchResponseType.ARRAY_BUFFER) {
-            return response.arrayBuffer();
-        } else if (responseType === ScxFetchResponseType.BLOB) {
-            return response.blob();
-        } else if (responseType === ScxFetchResponseType.FORM_DATA) {
-            return response.formData();
-        } else if (responseType === ScxFetchResponseType.TEXT) {
-            return response.text();
-        } else {
-            return response.arrayBuffer();
-        }
-    }
-
-    /**
-     * 创建 ScxFetchResponse
-     * @param response
-     * @param defaultResponseType
-     * @param useBodyPromise
-     * @return {Promise<unknown>}
-     */
-    static create(response, defaultResponseType, useBodyPromise) {
-        return new Promise((resolve, reject) => {
-            const responseType = ScxFetchResponseType.getByHeaders(response.headers, defaultResponseType);
-            if (useBodyPromise) {
-                resolve(new ScxFetchResponse(response.headers, response.type, response.url, ScxFetchResponse.getBodyPromise(responseType, response), responseType));
-            } else {
-                ScxFetchResponse.getBodyPromise(responseType, response)
-                        .then(body => resolve(new ScxFetchResponse(response.headers, response.type, response.url, body, responseType)))
-                        .catch(e => reject(e));
-            }
-        });
-    }
-
-}
-
-export {
-    ScxFetchResponse,
-};
+import {ScxFetchResponseType} from "./ScxFetchResponseType.js";
+
+/**
+ * ScxFetch 响应体
+ */
+class ScxFetchResponse {
+
+    headers;
+    type;
+    url;
+    responseType;
+    body;
+
+    constructor(headers, type, url, body, responseType) {
+        this.headers = headers;
+        this.type = type;
+        this.url = url;
+        this.body = body;
+        this.responseType = responseType;
+    }
+
+    /**
+     * 根据 响应类型 获取对应的 body 处理器
+     * @param responseType
+     * @param response
+     * @return {Promise<ArrayBuffer>|ArrayBuffer|Promise<Blob>|Blob|*|Promise<FormData>}
+     */
+    static getBodyPromise(responseType, response) {
+        if (responseType === ScxFetchResponseType.JSON) {
+            return response.json();
+        } else if (responseType === ScxFetchResponseType.ARRAY_BUFFER) {
+            return response.arrayBuffer();
+        } else if (responseType === ScxFetchResponseType.BLOB) {
+            return response.blob();
+        } else if (responseType === ScxFetchResponseType.FORM_DATA) {
+            return response.formData();
+        } else if (responseType === ScxFetchResponseType.TEXT) {
+            return response.text();
+        } else {
+            return response.arrayBuffer();
+        }
+    }
+
+    /**
+     * 创建 ScxFetchResponse
+     * @param response
+     * @param defaultResponseType
+     * @param useBodyPromise
+     * @return {Promise<unknown>}
+     */
+    static create(response, defaultResponseType, useBodyPromise) {
+        return new Promise((resolve, reject) => {
+            const responseType = ScxFetchResponseType.getByHeaders(response.headers, defaultResponseType);
+            if (useBodyPromise) {
+                resolve(new ScxFetchResponse(response.headers, response.type, response.url, ScxFetchResponse.getBodyPromise(responseType, response), responseType));
+            } else {
+                ScxFetchResponse.getBodyPromise(responseType, response)
+                        .then(body => resolve(new ScxFetchResponse(response.headers, response.type, response.url, body, responseType)))
+                        .catch(e => reject(e));
+            }
+        });
+    }
+
+}
+
+export {
+    ScxFetchResponse,
+};

package/ScxFetchResponseType.js

@@ -1,42 +1,42 @@
-import {HttpFieldName} from "./HttpFieldName.js";
-import {MediaType} from "./MediaType.js";
-
-class ScxFetchResponseType {
-
-    static ARRAY_BUFFER = "arrayBuffer";
-    static BLOB = "blob";
-    static FORM_DATA = "formData";
-    static JSON = "json";
-    static TEXT = "text";
-    static AUTO = "auto";
-
-    /**
-     * 获取 header 中的 CONTENT_TYPE 判断相应的类型
-     * @param headers
-     * @param defaultType 优先的返回值
-     */
-    static getByHeaders(headers, defaultType) {
-        if (defaultType && defaultType !== ScxFetchResponseType.AUTO) {
-            return defaultType;
-        }
-        let contentType = headers.get(HttpFieldName.CONTENT_TYPE);
-        if (contentType == null) {
-            return ScxFetchResponseType.ARRAY_BUFFER;
-        }
-        contentType = contentType.toLowerCase();
-        if (contentType.startsWith(MediaType.APPLICATION_JSON)) {
-            return ScxFetchResponseType.JSON;
-        } else if (contentType.startsWith(MediaType.TEXT_ANY) || contentType.startsWith(MediaType.APPLICATION_XML)) {
-            return ScxFetchResponseType.TEXT;
-        } else if (contentType.startsWith(MediaType.MULTIPART_FORM_DATA)) {
-            return ScxFetchResponseType.FORM_DATA;
-        } else {
-            return ScxFetchResponseType.ARRAY_BUFFER;
-        }
-    }
-
-}
-
-export {
-    ScxFetchResponseType,
-};
+import {HttpFieldName} from "./HttpFieldName.js";
+import {MediaType} from "./MediaType.js";
+
+class ScxFetchResponseType {
+
+    static ARRAY_BUFFER = "arrayBuffer";
+    static BLOB = "blob";
+    static FORM_DATA = "formData";
+    static JSON = "json";
+    static TEXT = "text";
+    static AUTO = "auto";
+
+    /**
+     * 获取 header 中的 CONTENT_TYPE 判断相应的类型
+     * @param headers
+     * @param defaultType 优先的返回值
+     */
+    static getByHeaders(headers, defaultType) {
+        if (defaultType && defaultType !== ScxFetchResponseType.AUTO) {
+            return defaultType;
+        }
+        let contentType = headers.get(HttpFieldName.CONTENT_TYPE);
+        if (contentType == null) {
+            return ScxFetchResponseType.ARRAY_BUFFER;
+        }
+        contentType = contentType.toLowerCase();
+        if (contentType.startsWith(MediaType.APPLICATION_JSON)) {
+            return ScxFetchResponseType.JSON;
+        } else if (contentType.startsWith(MediaType.TEXT_ANY) || contentType.startsWith(MediaType.APPLICATION_XML)) {
+            return ScxFetchResponseType.TEXT;
+        } else if (contentType.startsWith(MediaType.MULTIPART_FORM_DATA)) {
+            return ScxFetchResponseType.FORM_DATA;
+        } else {
+            return ScxFetchResponseType.ARRAY_BUFFER;
+        }
+    }
+
+}
+
+export {
+    ScxFetchResponseType,
+};

package/ScxReq.js

@@ -1,91 +1,91 @@
-import {ScxFetch} from "./ScxFetch.js";
-import {inject} from "vue";
-import {jsonVoProcessor, setResponseType} from "./ScxReqHelper.js";
-
-/**
- * 针对后台的 JsonVo 和 DataJsonVo 对 ScxFetch 进行一次包装
- * 1, 将 JsonVo.ok() 和 JsonVo.fail() 区分开
- * 2, 解构 JsonVo 返回的 data 字段
- */
-class ScxReq {
-
-    scxFetch;
-
-    baseURL;
-
-    constructor(scxFetch) {
-        if (scxFetch instanceof ScxFetch) {
-            this.scxFetch = scxFetch;
-        } else {
-            this.scxFetch = new ScxFetch(scxFetch);
-        }
-        this.baseURL = this.scxFetch.baseURL;
-    }
-
-    /**
-     * GET 方法
-     * @param url {URL | string}
-     * @param body {Object}
-     * @param options {ScxFetchOptions}
-     * @returns {ScxFetchPromise<unknown>}
-     */
-    get(url, body = null, options = {}) {
-        return jsonVoProcessor(this.scxFetch.get(url, body, setResponseType(options)));
-    }
-
-    /**
-     * POST 方法
-     * @param url {URL | string}
-     * @param body {Object}
-     * @param options {ScxFetchOptions}
-     * @returns {ScxFetchPromise<unknown>}
-     */
-    post(url, body = null, options = {}) {
-        return jsonVoProcessor(this.scxFetch.post(url, body, setResponseType(options)));
-    }
-
-    /**
-     * PUT 方法
-     * @param url {URL | string}
-     * @param body {Object}
-     * @param options {ScxFetchOptions}
-     * @returns {ScxFetchPromise<unknown>}
-     */
-    put(url, body = null, options = {}) {
-        return jsonVoProcessor(this.scxFetch.put(url, body, setResponseType(options)));
-    }
-
-    /**
-     * DELETE 方法
-     * @param url {URL | string}
-     * @param body {Object}
-     * @param options {ScxFetchOptions}
-     * @returns {ScxFetchPromise<unknown>}
-     */
-    delete(url, body = null, options = {}) {
-        return jsonVoProcessor(this.scxFetch.delete(url, body, setResponseType(options)));
-    }
-
-
-    install(app) {
-        app.provide(scxReqKey, this);
-    }
-
-}
-
-
-/**
- *
- * @type {string}
- */
-const scxReqKey = "scx-req";
-
-/**
- *
- * @returns {ScxReq}
- */
-function useScxReq() {
-    return inject(scxReqKey);
-}
-
-export {ScxReq, useScxReq};
+import {ScxFetch} from "./ScxFetch.js";
+import {inject} from "vue";
+import {jsonVoProcessor, setResponseType} from "./ScxReqHelper.js";
+
+/**
+ * 针对后台的 JsonVo 和 DataJsonVo 对 ScxFetch 进行一次包装
+ * 1, 将 JsonVo.ok() 和 JsonVo.fail() 区分开
+ * 2, 解构 JsonVo 返回的 data 字段
+ */
+class ScxReq {
+
+    scxFetch;
+
+    baseURL;
+
+    constructor(scxFetch) {
+        if (scxFetch instanceof ScxFetch) {
+            this.scxFetch = scxFetch;
+        } else {
+            this.scxFetch = new ScxFetch(scxFetch);
+        }
+        this.baseURL = this.scxFetch.baseURL;
+    }
+
+    /**
+     * GET 方法
+     * @param url {URL | string}
+     * @param body {Object}
+     * @param options {ScxFetchOptions}
+     * @returns {ScxFetchPromise<unknown>}
+     */
+    get(url, body = null, options = {}) {
+        return jsonVoProcessor(this.scxFetch.get(url, body, setResponseType(options)));
+    }
+
+    /**
+     * POST 方法
+     * @param url {URL | string}
+     * @param body {Object}
+     * @param options {ScxFetchOptions}
+     * @returns {ScxFetchPromise<unknown>}
+     */
+    post(url, body = null, options = {}) {
+        return jsonVoProcessor(this.scxFetch.post(url, body, setResponseType(options)));
+    }
+
+    /**
+     * PUT 方法
+     * @param url {URL | string}
+     * @param body {Object}
+     * @param options {ScxFetchOptions}
+     * @returns {ScxFetchPromise<unknown>}
+     */
+    put(url, body = null, options = {}) {
+        return jsonVoProcessor(this.scxFetch.put(url, body, setResponseType(options)));
+    }
+
+    /**
+     * DELETE 方法
+     * @param url {URL | string}
+     * @param body {Object}
+     * @param options {ScxFetchOptions}
+     * @returns {ScxFetchPromise<unknown>}
+     */
+    delete(url, body = null, options = {}) {
+        return jsonVoProcessor(this.scxFetch.delete(url, body, setResponseType(options)));
+    }
+
+
+    install(app) {
+        app.provide(scxReqKey, this);
+    }
+
+}
+
+
+/**
+ *
+ * @type {string}
+ */
+const scxReqKey = "scx-req";
+
+/**
+ *
+ * @returns {ScxReq}
+ */
+function useScxReq() {
+    return inject(scxReqKey);
+}
+
+export {ScxReq, useScxReq};

package/ScxReqHelper.js

@@ -1,45 +1,45 @@
-import {isNull} from "@scx-js/scx-common";
-import {ScxFetchResponseType} from "./ScxFetchResponseType.js";
-import {ScxFetchPromise} from "./ScxFetchPromise.js";
-import {JsonVOError} from "./JsonVOError.js";
-
-/**
- * 通过 scx-req 发送的请求我们默认都是 json 格式的
- * @param {ScxFetchOptions} options
- * @returns {ScxFetchOptions}
- */
-function setResponseType(options = {}) {
-    if (isNull(options.responseType)) {
-        options.responseType = ScxFetchResponseType.JSON;
-    }
-    return options;
-}
-
-
-function jsonVoProcessor(r) {
-    //这里是特殊处理
-    const result = new ScxFetchPromise((resolve, reject) => r.then(res => {
-        const {
-            responseType,
-            body,
-        } = res;
-        if (responseType === ScxFetchResponseType.JSON) {
-            if (body.message === "ok") {
-                resolve(body.data);
-            } else {
-                reject(new JsonVOError(body));
-            }
-        } else {
-            resolve(res);
-        }
-    }).catch(error => reject(error)));
-
-    result.abortController = r.abortController;
-
-    return result;
-}
-
-export {
-    setResponseType,
-    jsonVoProcessor,
-};
+import {isNull} from "@scx-js/scx-common";
+import {ScxFetchResponseType} from "./ScxFetchResponseType.js";
+import {ScxFetchPromise} from "./ScxFetchPromise.js";
+import {JsonVOError} from "./JsonVOError.js";
+
+/**
+ * 通过 scx-req 发送的请求我们默认都是 json 格式的
+ * @param {ScxFetchOptions} options
+ * @returns {ScxFetchOptions}
+ */
+function setResponseType(options = {}) {
+    if (isNull(options.responseType)) {
+        options.responseType = ScxFetchResponseType.JSON;
+    }
+    return options;
+}
+
+
+function jsonVoProcessor(r) {
+    //这里是特殊处理
+    const result = new ScxFetchPromise((resolve, reject) => r.then(res => {
+        const {
+            responseType,
+            body,
+        } = res;
+        if (responseType === ScxFetchResponseType.JSON) {
+            if (body.message === "ok") {
+                resolve(body.data);
+            } else {
+                reject(new JsonVOError(body));
+            }
+        } else {
+            resolve(res);
+        }
+    }).catch(error => reject(error)));
+
+    result.abortController = r.abortController;
+
+    return result;
+}
+
+export {
+    setResponseType,
+    jsonVoProcessor,
+};