@mx-space/api-client 1.6.0 → 1.6.1

package/controllers/note.ts

@@ -8,11 +8,12 @@ import type {
   NoteWrappedPayload,
   NoteWrappedWithLikedPayload,
 } from '~/models/note'
-import type { HTTPClient } from '../core/client'
 import type { SortOptions } from './base'
 
 import { autoBind } from '~/utils/auto-bind'
 
+import { HTTPClient } from '../core/client'
+
 declare module '../core/client' {
   interface HTTPClient<
     T extends IRequestAdapter = IRequestAdapter,
@@ -110,13 +111,6 @@ export class NoteController<ResponseWrapper> implements IController {
     })
   }
 
-  /**
-   * 喜欢这篇日记
-   */
-  likeIt(id: string | number) {
-    return this.proxy.like(id).get<never>()
-  }
-
   /**
    * 获取专栏内的所有日记
    */

package/controllers/post.ts

@@ -4,10 +4,11 @@ import type { IRequestHandler, RequestProxyResult } from '~/interfaces/request'
 import type { SelectFields } from '~/interfaces/types'
 import type { ModelWithLiked, PaginateResult } from '~/models/base'
 import type { PostModel } from '~/models/post'
-import type { HTTPClient } from '../core/client'
 
 import { autoBind } from '~/utils/auto-bind'
 
+import { HTTPClient } from '../core/client'
+
 declare module '../core/client' {
   interface HTTPClient<
     T extends IRequestAdapter = IRequestAdapter,
@@ -85,11 +86,4 @@ export class PostController<ResponseWrapper> implements IController {
   getLatest() {
     return this.proxy.latest.get<ModelWithLiked<PostModel>>()
   }
-
-  /**
-   * 点赞
-   */
-  thumbsUp(id: string) {
-    return this.proxy('_thumbs-up').get<void>({ params: { id } })
-  }
 }

package/dist/adaptors/ky.cjs

@@ -56,7 +56,7 @@ var createKyAdaptor = (ky2) => {
     get(url, options) {
       return getDataFromKyResponse(ky2.get(url, options));
     },
-    post(url, options) {
+    async post(url, options) {
       const data = options.data;
       delete options.data;
       const kyOptions = {

package/dist/adaptors/ky.global.js

@@ -1,6 +1,6 @@
 "use strict";
 (() => {
-  // ../../node_modules/.pnpm/ky@0.33.3/node_modules/ky/distribution/errors/HTTPError.js
+  // ../../node_modules/.pnpm/ky@1.1.0/node_modules/ky/distribution/errors/HTTPError.js
   var HTTPError = class extends Error {
     constructor(response, request, options) {
       const code = response.status || response.status === 0 ? response.status : "";
@@ -33,7 +33,7 @@
     }
   };
 
-  // ../../node_modules/.pnpm/ky@0.33.3/node_modules/ky/distribution/errors/TimeoutError.js
+  // ../../node_modules/.pnpm/ky@1.1.0/node_modules/ky/distribution/errors/TimeoutError.js
   var TimeoutError = class extends Error {
     constructor(request) {
       super("Request timed out");
@@ -48,13 +48,13 @@
     }
   };
 
-  // ../../node_modules/.pnpm/ky@0.33.3/node_modules/ky/distribution/utils/is.js
+  // ../../node_modules/.pnpm/ky@1.1.0/node_modules/ky/distribution/utils/is.js
   var isObject = (value) => value !== null && typeof value === "object";
 
-  // ../../node_modules/.pnpm/ky@0.33.3/node_modules/ky/distribution/utils/merge.js
+  // ../../node_modules/.pnpm/ky@1.1.0/node_modules/ky/distribution/utils/merge.js
   var validateAndMerge = (...sources) => {
     for (const source of sources) {
-      if ((!isObject(source) || Array.isArray(source)) && typeof source !== "undefined") {
+      if ((!isObject(source) || Array.isArray(source)) && source !== void 0) {
         throw new TypeError("The `options` argument must be an object");
       }
     }
@@ -98,14 +98,14 @@
     return returnValue;
   };
 
-  // ../../node_modules/.pnpm/ky@0.33.3/node_modules/ky/distribution/core/constants.js
+  // ../../node_modules/.pnpm/ky@1.1.0/node_modules/ky/distribution/core/constants.js
   var supportsRequestStreams = (() => {
     let duplexAccessed = false;
     let hasContentType = false;
     const supportsReadableStream = typeof globalThis.ReadableStream === "function";
     const supportsRequest = typeof globalThis.Request === "function";
     if (supportsReadableStream && supportsRequest) {
-      hasContentType = new globalThis.Request("https://a.com", {
+      hasContentType = new globalThis.Request("https://empty.invalid", {
         body: new globalThis.ReadableStream(),
         method: "POST",
         // @ts-expect-error - Types are outdated.
@@ -133,7 +133,7 @@
   var maxSafeTimeout = 2147483647;
   var stop = Symbol("stop");
 
-  // ../../node_modules/.pnpm/ky@0.33.3/node_modules/ky/distribution/utils/normalize.js
+  // ../../node_modules/.pnpm/ky@1.1.0/node_modules/ky/distribution/utils/normalize.js
   var normalizeRequestMethod = (input) => requestMethods.includes(input) ? input.toUpperCase() : input;
   var retryMethods = ["get", "put", "head", "delete", "options", "trace"];
   var retryStatusCodes = [408, 413, 429, 500, 502, 503, 504];
@@ -144,7 +144,8 @@
     statusCodes: retryStatusCodes,
     afterStatusCodes: retryAfterStatusCodes,
     maxRetryAfter: Number.POSITIVE_INFINITY,
-    backoffLimit: Number.POSITIVE_INFINITY
+    backoffLimit: Number.POSITIVE_INFINITY,
+    delay: (attemptCount) => 0.3 * 2 ** (attemptCount - 1) * 1e3
   };
   var normalizeRetryOptions = (retry = {}) => {
     if (typeof retry === "number") {
@@ -166,7 +167,7 @@
     };
   };
 
-  // ../../node_modules/.pnpm/ky@0.33.3/node_modules/ky/distribution/utils/timeout.js
+  // ../../node_modules/.pnpm/ky@1.1.0/node_modules/ky/distribution/utils/timeout.js
   async function timeout(request, abortController, options) {
     return new Promise((resolve, reject) => {
       const timeoutId = setTimeout(() => {
@@ -181,45 +182,30 @@
     });
   }
 
-  // ../../node_modules/.pnpm/ky@0.33.3/node_modules/ky/distribution/errors/DOMException.js
-  var isDomExceptionSupported = Boolean(globalThis.DOMException);
-  function composeAbortError(signal) {
-    if (isDomExceptionSupported) {
-      return new DOMException(signal?.reason ?? "The operation was aborted.", "AbortError");
-    }
-    const error = new Error(signal?.reason ?? "The operation was aborted.");
-    error.name = "AbortError";
-    return error;
-  }
-
-  // ../../node_modules/.pnpm/ky@0.33.3/node_modules/ky/distribution/utils/delay.js
+  // ../../node_modules/.pnpm/ky@1.1.0/node_modules/ky/distribution/utils/delay.js
   async function delay(ms, { signal }) {
     return new Promise((resolve, reject) => {
       if (signal) {
-        if (signal.aborted) {
-          reject(composeAbortError(signal));
-          return;
-        }
-        signal.addEventListener("abort", handleAbort, { once: true });
+        signal.throwIfAborted();
+        signal.addEventListener("abort", abortHandler, { once: true });
       }
-      function handleAbort() {
-        reject(composeAbortError(signal));
+      function abortHandler() {
         clearTimeout(timeoutId);
+        reject(signal.reason);
       }
       const timeoutId = setTimeout(() => {
-        signal?.removeEventListener("abort", handleAbort);
+        signal?.removeEventListener("abort", abortHandler);
         resolve();
       }, ms);
     });
   }
 
-  // ../../node_modules/.pnpm/ky@0.33.3/node_modules/ky/distribution/core/Ky.js
+  // ../../node_modules/.pnpm/ky@1.1.0/node_modules/ky/distribution/core/Ky.js
   var Ky = class _Ky {
-    // eslint-disable-next-line @typescript-eslint/promise-function-async
     static create(input, options) {
       const ky2 = new _Ky(input, options);
       const fn = async () => {
-        if (ky2._options.timeout > maxSafeTimeout) {
+        if (typeof ky2._options.timeout === "number" && ky2._options.timeout > maxSafeTimeout) {
           throw new RangeError(`The \`timeout\` option cannot be greater than ${maxSafeTimeout}`);
         }
         await Promise.resolve();
@@ -323,7 +309,7 @@
         prefixUrl: String(options.prefixUrl || ""),
         retry: normalizeRetryOptions(options.retry),
         throwHttpErrors: options.throwHttpErrors !== false,
-        timeout: typeof options.timeout === "undefined" ? 1e4 : options.timeout,
+        timeout: options.timeout ?? 1e4,
         fetch: options.fetch ?? globalThis.fetch.bind(globalThis)
       };
       if (typeof this._input !== "string" && !(this._input instanceof URL || this._input instanceof globalThis.Request)) {
@@ -382,7 +368,7 @@
             } else {
               after *= 1e3;
             }
-            if (typeof this._options.retry.maxRetryAfter !== "undefined" && after > this._options.retry.maxRetryAfter) {
+            if (this._options.retry.maxRetryAfter !== void 0 && after > this._options.retry.maxRetryAfter) {
               return 0;
             }
             return after;
@@ -391,8 +377,8 @@
             return 0;
           }
         }
-        const BACKOFF_FACTOR = 0.3;
-        return Math.min(this._options.retry.backoffLimit, BACKOFF_FACTOR * 2 ** (this._retryCount - 1) * 1e3);
+        const retryDelay = this._options.retry.delay(this._retryCount);
+        return Math.min(this._options.retry.backoffLimit, retryDelay);
       }
       return 0;
     }
@@ -485,7 +471,7 @@
     }
   };
 
-  // ../../node_modules/.pnpm/ky@0.33.3/node_modules/ky/distribution/index.js
+  // ../../node_modules/.pnpm/ky@1.1.0/node_modules/ky/distribution/index.js
   var createInstance = (defaults) => {
     const ky2 = (input, options) => Ky.create(input, validateAndMerge(defaults, options));
     for (const method of requestMethods) {
@@ -520,7 +506,7 @@
       get(url, options) {
         return getDataFromKyResponse(ky2.get(url, options));
       },
-      post(url, options) {
+      async post(url, options) {
         const data = options.data;
         delete options.data;
         const kyOptions = {

package/dist/adaptors/ky.js

@@ -20,7 +20,7 @@ var createKyAdaptor = (ky2) => {
     get(url, options) {
       return getDataFromKyResponse(ky2.get(url, options));
     },
-    post(url, options) {
+    async post(url, options) {
       const data = options.data;
       delete options.data;
       const kyOptions = {

package/dist/index.cjs

@@ -485,12 +485,6 @@ var NoteController = class {
       params: { size }
     });
   }
-  /**
-   * 喜欢这篇日记
-   */
-  likeIt(id) {
-    return this.proxy.like(id).get();
-  }
   /**
    * 获取专栏内的所有日记
    */
@@ -586,12 +580,6 @@ var PostController = class {
   getLatest() {
     return this.proxy.latest.get();
   }
-  /**
-   * 点赞
-   */
-  thumbsUp(id) {
-    return this.proxy("_thumbs-up").get({ params: { id } });
-  }
 };
 
 // controllers/project.ts

package/dist/index.d.cts

@@ -884,17 +884,6 @@ declare class NoteController<ResponseWrapper> implements IController {
             size: number;
         };
     }>;
-    /**
-     * 喜欢这篇日记
-     */
-    likeIt(id: string | number): RequestProxyResult<never, ResponseWrapper, ResponseWrapper extends unknown ? {
-        [key: string]: any;
-        data: never;
-    } : ResponseWrapper extends {
-        data: never;
-    } ? ResponseWrapper : Omit<ResponseWrapper, "data"> & {
-        data: never;
-    }>;
     /**
      * 获取专栏内的所有日记
      */
@@ -1014,17 +1003,6 @@ declare class PostController<ResponseWrapper> implements IController {
     } ? ResponseWrapper : Omit<ResponseWrapper, "data"> & {
         data: ModelWithLiked<PostModel>;
     }>;
-    /**
-     * 点赞
-     */
-    thumbsUp(id: string): RequestProxyResult<void, ResponseWrapper, ResponseWrapper extends unknown ? {
-        [key: string]: any;
-        data: void;
-    } : ResponseWrapper extends {
-        data: void;
-    } ? ResponseWrapper : Omit<ResponseWrapper, "data"> & {
-        data: void;
-    }>;
 }
 
 interface ProjectModel extends BaseModel {

package/dist/index.d.ts

@@ -884,17 +884,6 @@ declare class NoteController<ResponseWrapper> implements IController {
             size: number;
         };
     }>;
-    /**
-     * 喜欢这篇日记
-     */
-    likeIt(id: string | number): RequestProxyResult<never, ResponseWrapper, ResponseWrapper extends unknown ? {
-        [key: string]: any;
-        data: never;
-    } : ResponseWrapper extends {
-        data: never;
-    } ? ResponseWrapper : Omit<ResponseWrapper, "data"> & {
-        data: never;
-    }>;
     /**
      * 获取专栏内的所有日记
      */
@@ -1014,17 +1003,6 @@ declare class PostController<ResponseWrapper> implements IController {
     } ? ResponseWrapper : Omit<ResponseWrapper, "data"> & {
         data: ModelWithLiked<PostModel>;
     }>;
-    /**
-     * 点赞
-     */
-    thumbsUp(id: string): RequestProxyResult<void, ResponseWrapper, ResponseWrapper extends unknown ? {
-        [key: string]: any;
-        data: void;
-    } : ResponseWrapper extends {
-        data: void;
-    } ? ResponseWrapper : Omit<ResponseWrapper, "data"> & {
-        data: void;
-    }>;
 }
 
 interface ProjectModel extends BaseModel {

package/dist/index.global.js

@@ -421,12 +421,6 @@
         params: { size }
       });
     }
-    /**
-     * 喜欢这篇日记
-     */
-    likeIt(id) {
-      return this.proxy.like(id).get();
-    }
     /**
      * 获取专栏内的所有日记
      */
@@ -522,12 +516,6 @@
     getLatest() {
       return this.proxy.latest.get();
     }
-    /**
-     * 点赞
-     */
-    thumbsUp(id) {
-      return this.proxy("_thumbs-up").get({ params: { id } });
-    }
   };
 
   // controllers/project.ts

package/dist/index.js

@@ -419,12 +419,6 @@ var NoteController = class {
       params: { size }
     });
   }
-  /**
-   * 喜欢这篇日记
-   */
-  likeIt(id) {
-    return this.proxy.like(id).get();
-  }
   /**
    * 获取专栏内的所有日记
    */
@@ -520,12 +514,6 @@ var PostController = class {
   getLatest() {
     return this.proxy.latest.get();
   }
-  /**
-   * 点赞
-   */
-  thumbsUp(id) {
-    return this.proxy("_thumbs-up").get({ params: { id } });
-  }
 };
 
 // controllers/project.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mx-space/api-client",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "type": "module",
   "description": "A api client for mx-space server@next",
   "author": "Innei",
@@ -46,18 +46,18 @@
   "devDependencies": {
     "@types/cors": "2.8.15",
     "@types/express": "4.17.20",
-    "@types/lodash": "4.14.199",
+    "@types/lodash": "4.14.200",
     "abort-controller": "3.0.0",
     "axios": "^1.5.1",
     "camelcase-keys": "^7.0.2",
     "cors": "2.8.5",
     "express": "4.18.2",
     "form-data": "4.0.0",
-    "ky": "0.33.3",
+    "ky": "1.1.0",
     "lodash": "4.17.21",
     "tsup": "7.2.0",
     "umi-request": "1.4.0",
-    "vite": "^4.4.11",
+    "vite": "^4.5.0",
     "vitest": "^0.34.6"
   }
 }