@jayfong/x-server 2.108.2 → 2.108.4

package/lib/_cjs/services/jwt.js

@@ -58,10 +58,7 @@ class JwtService {
     if (!authorization) {
       throw new _http_error.HttpError.Unauthorized('header');
     }
-    const [scheme, token] = authorization.split(' ');
-    if (scheme.toLowerCase() !== 'bearer') {
-      throw new _http_error.HttpError.Unauthorized('bearer');
-    }
+    const [scheme, token = scheme] = authorization.split(' ');
     return this.verify(token);
   }
 }

package/lib/core/define_handler.d.ts

@@ -13,7 +13,10 @@ export declare namespace defineHandler {
     }; }, void, "WS">) => Handler<{ [K in keyof TReqData]: {
         request: TReqData[K][0];
         response: TReqData[K][1];
-    }; }, void, "WS">;
+    }; }, void, "WS", import("vtils/types").RequiredDeep<{ [K in keyof TReqData]: {
+        request: TReqData[K][0];
+        response: TReqData[K][1];
+    }; }>>;
     var XML: typeof defineHandlerXML;
     var ANY: typeof defineHandlerANY;
 }

package/lib/core/handler.d.ts

@@ -1,10 +1,11 @@
+import type { RequiredDeep } from 'vtils/types';
 import * as vae from 'vtils/vae';
 import type { XHandler } from './types';
 export type { HandlerMethodMap, HandlerPath, HandlerPayloadMap, HandlerResultMap, } from '.x/routes';
-export declare class Handler<TReqData extends any = void, TResData extends any = void, TReqMethod extends XHandler.Method = XHandler.Method> {
+export declare class Handler<TReqData extends any = void, TResData extends any = void, TReqMethod extends XHandler.Method = XHandler.Method, TReqDataRequired = RequiredDeep<TReqData>> {
     readonly options: XHandler.Options<TReqData, TResData, TReqMethod>;
     private requestDataSchema;
-    readonly requestDataSchemaVae: vae.VaeSchemaOf<TReqData> | undefined;
+    readonly requestDataSchemaVae: vae.VaeSchemaOf<TReqDataRequired>;
     constructor(options: XHandler.Options<TReqData, TResData, TReqMethod>);
     handle: XHandler.Handle<TReqData, TResData, TReqMethod>;
     private handleHttp;

package/lib/core/handler.js

@@ -1,6 +1,6 @@
 import { HTTPError as GotHTTPError, ParseError as GotParseError, RequestError as GotRequestError, TimeoutError as GotTimeoutError } from 'got';
 import LZString from 'lz-string';
-import { DataPacker, base64UrlEncode, rot13, toSingleLineString } from 'vtils';
+import { base64UrlEncode, DataPacker, rot13, toSingleLineString } from 'vtils';
 import * as vae from 'vtils/vae';
 import { getZhCN, yup } from 'vtils/validator';
 import { HttpError } from "../core/http_error";

package/lib/services/jwt.js

@@ -53,10 +53,7 @@ export class JwtService {
     if (!authorization) {
       throw new HttpError.Unauthorized('header');
     }
-    const [scheme, token] = authorization.split(' ');
-    if (scheme.toLowerCase() !== 'bearer') {
-      throw new HttpError.Unauthorized('bearer');
-    }
+    const [scheme, token = scheme] = authorization.split(' ');
     return this.verify(token);
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.108.2",
+  "version": "2.108.4",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",