node-easywechat 3.0.0-beta.1 → 3.0.0-beta.2

package/CHANGELOG.md

@@ -1,7 +1,11 @@
 # CHANGELOG
 
 
-## v3.0.0-beta.1 (2022-06-21)
+## v3.0.0-beta.2 (2022-06-21)
+
+- Fix: 修复获取的服务端实例没有代码提示的问题
+
+## v3.0.0-beta.1, origin/3.x (2022-06-21)
 
 - Feat: 新增设置预置参数相关方法
 - Feat: 增加设置日志处理器的方法

package/dist/Core/Contracts/CacheInterface.d.ts

@@ -1,3 +1,6 @@
+/**
+ * 缓存接口
+ */
 declare abstract class CacheInterface {
     /**
      * 获取缓存

package/dist/Core/Contracts/CacheInterface.js

@@ -8,6 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+/**
+ * 缓存接口
+ */
 class CacheInterface {
     /**
      * 获取缓存

package/dist/Core/Contracts/ServerInterface.d.ts

@@ -1,8 +1,14 @@
 import ResponseInterface from "../Http/Contracts/ResponseInterface";
+import DecryptXmlMessageMixin from "../Mixins/DecryptXmlMessageMixin";
+import HandlersMixin from "../Mixins/HandlersMixin";
+import ResponseXmlMessageMixin from "../Mixins/ResponseXmlMessageMixin";
 declare abstract class ServerInterface {
+    constructor();
     /**
      * 处理消息
      */
     serve(): Promise<ResponseInterface>;
 }
+interface ServerInterface extends HandlersMixin, DecryptXmlMessageMixin, ResponseXmlMessageMixin {
+}
 export = ServerInterface;

package/dist/Core/Contracts/ServerInterface.js

@@ -8,7 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+const DecryptXmlMessageMixin_1 = __importDefault(require("../Mixins/DecryptXmlMessageMixin"));
+const HandlersMixin_1 = __importDefault(require("../Mixins/HandlersMixin"));
+const ResponseXmlMessageMixin_1 = __importDefault(require("../Mixins/ResponseXmlMessageMixin"));
+const Utils_1 = require("../Support/Utils");
 class ServerInterface {
+    constructor() {
+        this.handlers = [];
+    }
     /**
      * 处理消息
      */
@@ -17,4 +27,6 @@ class ServerInterface {
     }
 }
 ;
+;
+(0, Utils_1.applyMixins)(ServerInterface, [HandlersMixin_1.default, DecryptXmlMessageMixin_1.default, ResponseXmlMessageMixin_1.default]);
 module.exports = ServerInterface;

package/dist/Core/Http/ServerRequest.d.ts

@@ -3,6 +3,9 @@ import { IncomingMessage } from "http";
 import ServerRequestInterface from "./Contracts/ServerRequestInterface";
 import MessageMixin from "./Minxins/MessageMixin";
 import RequestMixin from "./Minxins/RequestMixin";
+/**
+ * 服务器收到的请求对象
+ */
 declare class ServerRequest implements ServerRequestInterface {
     protected attributes: Record<string, any>;
     protected cookieParams: Record<string, any>;

package/dist/Core/Http/ServerRequest.js

@@ -8,6 +8,9 @@ const url_1 = require("url");
 const Utils_1 = require("../Support/Utils");
 const MessageMixin_1 = __importDefault(require("./Minxins/MessageMixin"));
 const RequestMixin_1 = __importDefault(require("./Minxins/RequestMixin"));
+/**
+ * 服务器收到的请求对象
+ */
 class ServerRequest {
     constructor(method, url, headers = {}, body = null, version = 'v1.1', serverParams = {}) {
         this.attributes = {};

package/dist/Core/HttpClient/HttpClientResponse.js

@@ -117,7 +117,7 @@ class HttpClientResponse {
      * @returns
      */
     toDataUrl() {
-        return 'data:' + this.getHeader('content-type') + ';base64,' + this.response.data;
+        return 'data:' + this.getHeader('content-type') + ';base64,' + this.response.data.toString('base64');
     }
     /**
      * 判断 content-type 是否指定类型

package/dist/Core/Message.d.ts

@@ -1,5 +1,8 @@
 import ServerRequestInterface from "./Http/Contracts/ServerRequestInterface";
 import HasAttributesMixin from "./Mixins/HasAttributesMixin";
+/**
+ * 消息对象
+ */
 declare class Message {
     /**
      * 原始消息内容

package/dist/Core/Message.js

@@ -13,6 +13,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 const HasAttributesMixin_1 = __importDefault(require("./Mixins/HasAttributesMixin"));
 const Utils_1 = require("./Support/Utils");
+/**
+ * 消息对象
+ */
 class Message {
     constructor(attributes, originContent = '') {
         /**

package/dist/MiniApp/Application.d.ts

@@ -12,6 +12,9 @@ import { MiniAppConfig } from '../Types/global';
 import AccountInterface from './Contracts/AccountInterface';
 import ApplicationInterface from './Contracts/ApplicationInterface';
 import Utils from './Utils';
+/**
+ * 小程序应用
+ */
 declare class Application implements ApplicationInterface {
     constructor(config: ConfigInterface | MiniAppConfig);
     protected account: AccountInterface;

package/dist/MiniApp/Application.js

@@ -17,6 +17,9 @@ const Account_1 = __importDefault(require("./Account"));
 const Server_1 = __importDefault(require("./Server"));
 const Utils_2 = __importDefault(require("./Utils"));
 const Config_1 = __importDefault(require("../OfficialAccount/Config"));
+/**
+ * 小程序应用
+ */
 class Application {
     constructor(config) {
         this.account = null;

package/dist/OfficialAccount/Application.d.ts

@@ -14,6 +14,9 @@ import AccountInterface from './Contracts/AccountInterface';
 import ApplicationInterface from './Contracts/ApplicationInterface';
 import JsApiTicket from './JsApiTicket';
 import Utils from './Utils';
+/**
+ * 公众号应用
+ */
 declare class Application implements ApplicationInterface {
     constructor(config: ConfigInterface | OfficialAccountConfig);
     protected account: AccountInterface;

package/dist/OfficialAccount/Application.js

@@ -20,6 +20,9 @@ const Account_1 = __importDefault(require("./Account"));
 const JsApiTicket_1 = __importDefault(require("./JsApiTicket"));
 const Server_1 = __importDefault(require("./Server"));
 const Utils_2 = __importDefault(require("./Utils"));
+/**
+ * 公众号应用
+ */
 class Application {
     constructor(config) {
         this.account = null;

package/dist/OfficialAccount/Server.d.ts

@@ -3,11 +3,8 @@ import Encryptor from '../Core/Encryptor';
 import ServerInterface from '../Core/Contracts/ServerInterface';
 import Response from '../Core/Http/Response';
 import Message from './Message';
-import HandlersMixin from '../Core/Mixins/HandlersMixin';
-import DecryptXmlMessageMixin from '../Core/Mixins/DecryptXmlMessageMixin';
 import { ServerEventType, ServerHandlerClosure, ServerMessageType } from '../Types/global';
-import ResponseXmlMessageMixin from '../Core/Mixins/ResponseXmlMessageMixin';
-declare class Server implements ServerInterface {
+declare class Server extends ServerInterface {
     protected request: ServerRequestInterface;
     protected encryptor: Encryptor;
     constructor(request?: ServerRequestInterface, encryptor?: Encryptor);
@@ -38,6 +35,4 @@ declare class Server implements ServerInterface {
     getRequestMessage(request?: ServerRequestInterface): Promise<Message>;
     protected decryptRequestMessage(query: Record<string, any>): ServerHandlerClosure;
 }
-interface Server extends HandlersMixin, DecryptXmlMessageMixin, ResponseXmlMessageMixin {
-}
 export = Server;

package/dist/OfficialAccount/Server.js

@@ -11,17 +11,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+const ServerInterface_1 = __importDefault(require("../Core/Contracts/ServerInterface"));
 const Response_1 = __importDefault(require("../Core/Http/Response"));
 const Message_1 = __importDefault(require("./Message"));
-const HandlersMixin_1 = __importDefault(require("../Core/Mixins/HandlersMixin"));
-const Utils_1 = require("../Core/Support/Utils");
-const DecryptXmlMessageMixin_1 = __importDefault(require("../Core/Mixins/DecryptXmlMessageMixin"));
-const ResponseXmlMessageMixin_1 = __importDefault(require("../Core/Mixins/ResponseXmlMessageMixin"));
-class Server {
+class Server extends ServerInterface_1.default {
     constructor(request = null, encryptor = null) {
+        super();
         this.request = request;
         this.encryptor = encryptor;
-        this.handlers = [];
     }
     /**
      * 服务端消息处理
@@ -89,6 +86,4 @@ class Server {
     }
 }
 ;
-;
-(0, Utils_1.applyMixins)(Server, [HandlersMixin_1.default, DecryptXmlMessageMixin_1.default, ResponseXmlMessageMixin_1.default]);
 module.exports = Server;

package/dist/index.d.ts

@@ -1,6 +1,14 @@
-import { OfficialAccountConfig, MiniAppConfig, LogHandler } from './Types/global';
+import { OfficialAccountConfig, MiniAppConfig, LogHandler, ServerEventType, ServerHandlerClosure } from './Types/global';
 import OfficialAccount from './OfficialAccount/Application';
 import MiniApp from './MiniApp/Application';
 import CacheInterface from './Core/Contracts/CacheInterface';
 import ServerRequest from './Core/Http/ServerRequest';
-export { OfficialAccount, OfficialAccountConfig, MiniApp, MiniAppConfig, CacheInterface, ServerRequest, LogHandler, };
+import Message from './Core/Message';
+import FormData from 'form-data';
+export { OfficialAccount, OfficialAccountConfig, MiniApp, MiniAppConfig, CacheInterface, ServerRequest, LogHandler, ServerEventType, ServerHandlerClosure, Message, 
+/**
+ * 表单对象
+ * @see https://github.com/axios/axios#formdata
+ * @see https://github.com/form-data/form-data#readme
+ */
+FormData, };

package/dist/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ServerRequest = exports.CacheInterface = exports.MiniApp = exports.OfficialAccount = void 0;
+exports.FormData = exports.Message = exports.ServerRequest = exports.CacheInterface = exports.MiniApp = exports.OfficialAccount = void 0;
 const Application_1 = __importDefault(require("./OfficialAccount/Application"));
 exports.OfficialAccount = Application_1.default;
 const Application_2 = __importDefault(require("./MiniApp/Application"));
@@ -12,3 +12,7 @@ const CacheInterface_1 = __importDefault(require("./Core/Contracts/CacheInterfac
 exports.CacheInterface = CacheInterface_1.default;
 const ServerRequest_1 = __importDefault(require("./Core/Http/ServerRequest"));
 exports.ServerRequest = ServerRequest_1.default;
+const Message_1 = __importDefault(require("./Core/Message"));
+exports.Message = Message_1.default;
+const form_data_1 = __importDefault(require("form-data"));
+exports.FormData = form_data_1.default;

package/mini_app.access_token.mock-access_token-appid.cache

@@ -1 +1 @@
-{"data":"mock-access_token","lifeTime":1655744193}
+{"data":"mock-access_token","lifeTime":1655828727}

package/official_account.access_token.mock-access_token-appid.cache

@@ -1 +1 @@
-{"data":"mock-access_token","lifeTime":1655744193}
+{"data":"mock-access_token","lifeTime":1655828727}

package/official_account.jsapi_ticket.mock-ticket-appid.cache

@@ -1 +1 @@
-{"data":"mock-ticket","lifeTime":1655749893}
+{"data":"mock-ticket","lifeTime":1655834427}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-easywechat",
-  "version": "3.0.0-beta.1",
+  "version": "3.0.0-beta.2",
   "description": "EasyWechat SDK for Node.js (NOT OFFICIAL)",
   "main": "dist/index.js",
   "scripts": {