egg-wechat-sdk-x 1.0.7 → 2.0.0

package/LICENSE

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2019-present Alibaba Group Holding Limited and other contributors.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2019-present Alibaba Group Holding Limited and other contributors.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,65 +1,65 @@
-# egg-wechat-api
-
-[![NPM version][npm-image]][npm-url]
-[![build status][travis-image]][travis-url]
-[![Test coverage][codecov-image]][codecov-url]
-[![David deps][david-image]][david-url]
-[![Known Vulnerabilities][snyk-image]][snyk-url]
-[![npm download][download-image]][download-url]
-
-[npm-image]: https://img.shields.io/npm/v/egg-wechat-api.svg?style=flat-square
-[npm-url]: https://npmjs.org/package/egg-wechat-api
-[travis-image]: https://img.shields.io/travis/eggjs/egg-wechat-api.svg?style=flat-square
-[travis-url]: https://travis-ci.org/eggjs/egg-wechat-api
-[codecov-image]: https://img.shields.io/codecov/c/github/eggjs/egg-wechat-api.svg?style=flat-square
-[codecov-url]: https://codecov.io/github/eggjs/egg-wechat-api?branch=master
-[david-image]: https://img.shields.io/david/eggjs/egg-wechat-api.svg?style=flat-square
-[david-url]: https://david-dm.org/eggjs/egg-wechat-api
-[snyk-image]: https://snyk.io/test/npm/egg-wechat-api/badge.svg?style=flat-square
-[snyk-url]: https://snyk.io/test/npm/egg-wechat-api
-[download-image]: https://img.shields.io/npm/dm/egg-wechat-api.svg?style=flat-square
-[download-url]: https://npmjs.org/package/egg-wechat-api
-
-<!--
-Description here.
--->
-
-
-
-## Install
-
-```bash
-$ npm i egg-wechat-sdk-x --save
-```
-
-## Usage
-
-```js
-// {app_root}/config/plugin.js
-exports.wechatSdk = {
-  enable: true,
-  package: 'egg-wechat-sdk-x',
-};
-```
-
-## Configuration
-
-```js
-// {app_root}/config/config.default.js
-exports.wechatSdk = {
-};
-```
-
-see [config/config.default.js](config/config.default.js) for more detail.
-
-## Example
-
-<!-- example here -->
-
-## Questions & Suggestions
-
-Please open an issue [here](https://github.com/eggjs/egg/issues).
-
-## License
-
-[MIT](LICENSE)
+# egg-wechat-api
+
+[![NPM version][npm-image]][npm-url]
+[![build status][travis-image]][travis-url]
+[![Test coverage][codecov-image]][codecov-url]
+[![David deps][david-image]][david-url]
+[![Known Vulnerabilities][snyk-image]][snyk-url]
+[![npm download][download-image]][download-url]
+
+[npm-image]: https://img.shields.io/npm/v/egg-wechat-api.svg?style=flat-square
+[npm-url]: https://npmjs.org/package/egg-wechat-api
+[travis-image]: https://img.shields.io/travis/eggjs/egg-wechat-api.svg?style=flat-square
+[travis-url]: https://travis-ci.org/eggjs/egg-wechat-api
+[codecov-image]: https://img.shields.io/codecov/c/github/eggjs/egg-wechat-api.svg?style=flat-square
+[codecov-url]: https://codecov.io/github/eggjs/egg-wechat-api?branch=master
+[david-image]: https://img.shields.io/david/eggjs/egg-wechat-api.svg?style=flat-square
+[david-url]: https://david-dm.org/eggjs/egg-wechat-api
+[snyk-image]: https://snyk.io/test/npm/egg-wechat-api/badge.svg?style=flat-square
+[snyk-url]: https://snyk.io/test/npm/egg-wechat-api
+[download-image]: https://img.shields.io/npm/dm/egg-wechat-api.svg?style=flat-square
+[download-url]: https://npmjs.org/package/egg-wechat-api
+
+<!--
+Description here.
+-->
+
+
+
+## Install
+
+```bash
+$ npm i egg-wechat-sdk-x --save
+```
+
+## Usage
+
+```js
+// {app_root}/config/plugin.js
+exports.wechatSdk = {
+  enable: true,
+  package: 'egg-wechat-sdk-x',
+};
+```
+
+## Configuration
+
+```js
+// {app_root}/config/config.default.js
+exports.wechatSdk = {
+};
+```
+
+see [config/config.default.js](config/config.default.js) for more detail.
+
+## Example
+
+<!-- example here -->
+
+## Questions & Suggestions
+
+Please open an issue [here](https://github.com/eggjs/egg/issues).
+
+## License
+
+[MIT](LICENSE)

package/app.js

@@ -1,16 +1,16 @@
-/**
- * 
- * @param {Egg.Application} app 
- */
-
-const EggWechatApi = require("./lib/WechatApi");
-const EggWechatOAuth = require("./lib/WechatOauth");
-
-module.exports = app => {
-    if (app.config.wechatSdk) {
-
-
-        app.WechatApi = new EggWechatApi(app);
-        app.WechatOauth = new EggWechatOAuth(app);
-    }
+/**
+ * 
+ * @param {Egg.Application} app 
+ */
+
+const EggWechatApi = require("./lib/WechatApi");
+const EggWechatOAuth = require("./lib/WechatOauth");
+
+module.exports = app => {
+    if (app.config.wechatSdk) {
+
+
+        app.WechatApi = new EggWechatApi(app);
+        app.WechatOauth = new EggWechatOAuth(app);
+    }
 };

package/config/config.default.js

@@ -1,9 +1,9 @@
-'use strict';
-
-/**
- * egg-wechat-api default config
- * @member Config#wechatApi
- * @property {String} SOME_KEY - some description
- */
-exports.wechatApi = {
-};
+'use strict';
+
+/**
+ * egg-wechat-api default config
+ * @member Config#wechatApi
+ * @property {String} SOME_KEY - some description
+ */
+exports.wechatApi = {
+};

package/index.d.ts

@@ -1,39 +1,40 @@
-
-// interface DataSources {
-//     datasources: EggSequelizeMultitableOptions[];
-//   }
-// "name": "测试",
-// "appid": "wxd0944fd71221c19c",
-// "appsecret": "fe2574fdfce33dcaa5534d149b77c4a3",
-// "token": "31427543139566790626",
-import OAuth from "wechat-oauth";
-import WechatApiSdk from "wechat-api";
-import EggWechatApi from "./lib/WechatApi";
-import EggWechatOAuth from "./lib/WechatOauth";
-
-// "encodingAESKey": ""
-interface WechatSdkOptions {
-    name?: string,
-    appId: string,
-    appSecret: string,
-    token?: string,
-    encodingAESKey?: string
-}
-
-interface EggWechatSdkOptions {
-    defaultAppId: string,
-    [propname: string]: WechatSdkOptions,
-
-}
-
-declare module 'egg' {
-
-    interface Application {
-        WechatApi: EggWechatApi;
-        WechatOauth: EggWechatOAuth;
-    }
-    // extend your config
-    interface EggAppConfig {
-        wechatSdk: EggWechatSdkOptions;
-    }
-}
+
+// interface DataSources {
+//     datasources: EggSequelizeMultitableOptions[];
+//   }
+// "name": "测试",
+// "appid": "wxd0944fd71221c19c",
+// "appsecret": "fe2574fdfce33dcaa5534d149b77c4a3",
+// "token": "31427543139566790626",
+import OAuth from "wechat-oauth";
+import WechatApiSdk from "wechat-api";
+import EggWechatApi from "./lib/WechatApi";
+import EggWechatOAuth from "./lib/WechatOauth";
+
+// "encodingAESKey": ""
+interface WechatSdkOptions {
+    name?: string,
+    appId: string,
+    appSecret: string,
+    token?: string,
+    encodingAESKey?: string
+    isMiniProgram?: boolean
+}
+
+interface EggWechatSdkOptions {
+    defaultAppId: string,
+    [propname: string]: WechatSdkOptions,
+
+}
+
+declare module 'egg' {
+
+    interface Application {
+        WechatApi: EggWechatApi;
+        WechatOauth: EggWechatOAuth;
+    }
+    // extend your config
+    interface EggAppConfig {
+        wechatSdk: EggWechatSdkOptions;
+    }
+}

package/lib/WechatApi.js

@@ -1,101 +1,102 @@
-const WechatApiSdk = require('wechat-api');
-WechatApiSdk.patch("getCurrentAutoreplyInfo", "https://api.weixin.qq.com/cgi-bin/get_current_autoreply_info", true);
-class WechatApi {
-	/**
-	 * 
-	 * @param {Egg.Application} app 
-	 * @param {import("..").WechatOptions} _options 
-	 */
-	constructor(app, _options) {
-		this.app = app;
-		this.options = _options;
-		this.access_token = null;
-		this.weixin_ticketToken = {};
-		this.ACCESS_TOKEN = "access_token_" + _options.appid;
-		this.WEIXIN_TICKETTOKEN = "weixin_tickettoken_" + _options.appid;
-		this.api = new WechatApiSdk(_options.appId, _options.appSecret, this.getToken.bind(this), this.setToken.bind(this));
-		this.api.registerTicketHandle(this.getTicketToken.bind(this), this.saveTicketToken.bind(this));
-	}
-	async getToken(callback) {
-		if (this.access_token) {
-			callback(null, this.access_token);
-		} else {
-			try {
-				const reply = await this.app.redis.get(this.ACCESS_TOKEN);
-				this.access_token = JSON.parse(reply);
-				callback(null, this.access_token);
-			} catch (error) {
-				callback(error);
-			}
-
-
-		}
-	}
-	async setToken(token, callback) {
-		this.access_token = token;
-		try {
-			await this.app.redis.set(this.ACCESS_TOKEN, JSON.stringify(this.access_token));
-			await this.app.redis.expire(this.ACCESS_TOKEN, 7190);
-		} catch (error) {
-			callback(error);
-		}
-	}
-
-
-	async getTicketToken(type, callback) {
-
-		if (this.weixin_ticketToken[type]) {
-			callback(null, this.weixin_ticketToken[type]);
-		} else {
-
-			try {
-				let reply = await this.app.redis.get(`${this.WEIXIN_TICKETTOKEN}type`);
-				this.weixin_ticketToken[type] = JSON.parse(reply);
-				callback(null, this.weixin_ticketToken[type]);
-			} catch (error) {
-				callback(error);
-			}
-
-		}
-
-	}
-	// saveTicketToken
-	async saveTicketToken(type, _ticketToken, callback) {
-		this.weixin_ticketToken[type] = _ticketToken;
-		let key = `${this.WEIXIN_TICKETTOKEN}type`;
-		try {
-			await this.app.redis.set(key, JSON.stringify(this.weixin_ticketToken[type]));
-			await this.app.redis.expire(key, 7190);
-		} catch (error) {
-			callback(error);
-		}
-	}
-}
-const WechatMap = {};
-class EggWechatApi {
-	/**
-	 * 
-	 * @param {Egg.Application} app 
-	 */
-	constructor(app) {
-		this.app = app;
-	}
-	/**
-	 * 
-	 * @param {string | null} appId 
-	 * @returns {WechatApiSdk}
-	 */
-	getIns(appId) {
-		appId = appId || this.app.config.wechatSdk.defaultAppId;
-		if (!WechatMap[appId]) {
-			const options = this.app.config.wechatSdk[appId];
-			if (options) {
-				WechatMap[appId] = new WechatApi(this.app, options);
-			} else {
-				return null;
-			}
-		}
-		return WechatMap[appId].api;
-	}
-}
+const WechatApiSdk = require('wechat-api');
+WechatApiSdk.patch("getCurrentAutoreplyInfo", "https://api.weixin.qq.com/cgi-bin/get_current_autoreply_info", true);
+WechatApiSdk.patch("getPhonenumber", "https://api.weixin.qq.com/wxa/business/getuserphonenumber", true);
+class WechatApi {
+	/**
+	 * 
+	 * @param {Egg.Application} app 
+	 * @param {import("..").WechatSdkOptions} _options 
+	 */
+	constructor(app, _options) {
+		this.app = app;
+		this.options = _options;
+		this.access_token = null;
+		this.weixin_ticketToken = {};
+		this.ACCESS_TOKEN = "access_token_" + _options.appId;
+		this.WEIXIN_TICKETTOKEN = "weixin_tickettoken_" + _options.appId;
+		this.api = new WechatApiSdk(_options.appId, _options.appSecret, this.getToken.bind(this), this.setToken.bind(this));
+		this.api.registerTicketHandle(this.getTicketToken.bind(this), this.saveTicketToken.bind(this));
+	}
+	async getToken(callback) {
+		if (this.access_token) {
+			callback(null, this.access_token);
+		} else {
+			try {
+				const reply = await this.app.redis.get(this.ACCESS_TOKEN);
+				this.access_token = JSON.parse(reply);
+				callback(null, this.access_token);
+			} catch (error) {
+				callback(error);
+			}
+
+
+		}
+	}
+	async setToken(token, callback) {
+		this.access_token = token;
+		try {
+			await this.app.redis.set(this.ACCESS_TOKEN, JSON.stringify(this.access_token));
+			await this.app.redis.expire(this.ACCESS_TOKEN, 7190);
+		} catch (error) {
+			callback(error);
+		}
+	}
+
+
+	async getTicketToken(type, callback) {
+
+		if (this.weixin_ticketToken[type]) {
+			callback(null, this.weixin_ticketToken[type]);
+		} else {
+
+			try {
+				let reply = await this.app.redis.get(`${this.WEIXIN_TICKETTOKEN}type`);
+				this.weixin_ticketToken[type] = JSON.parse(reply);
+				callback(null, this.weixin_ticketToken[type]);
+			} catch (error) {
+				callback(error);
+			}
+
+		}
+
+	}
+	// saveTicketToken
+	async saveTicketToken(type, _ticketToken, callback) {
+		this.weixin_ticketToken[type] = _ticketToken;
+		let key = `${this.WEIXIN_TICKETTOKEN}type`;
+		try {
+			await this.app.redis.set(key, JSON.stringify(this.weixin_ticketToken[type]));
+			await this.app.redis.expire(key, 7190);
+		} catch (error) {
+			callback(error);
+		}
+	}
+}
+const WechatMap = {};
+class EggWechatApi {
+	/**
+	 * 
+	 * @param {Egg.Application} app 
+	 */
+	constructor(app) {
+		this.app = app;
+	}
+	/**
+	 * 
+	 * @param {string | null} appId 
+	 * @returns {WechatApiSdk}
+	 */
+	getIns(appId) {
+		appId = appId || this.app.config.wechatSdk.defaultAppId;
+		if (!WechatMap[appId]) {
+			const options = this.app.config.wechatSdk[appId];
+			if (options) {
+				WechatMap[appId] = new WechatApi(this.app, options);
+			} else {
+				return null;
+			}
+		}
+		return WechatMap[appId].api;
+	}
+}
 module.exports = EggWechatApi;

package/lib/WechatOauth.js

@@ -1,72 +1,72 @@
-const OAuth = require("wechat-oauth");
-class WechatOauth {
-	/**
-	 * 
-	 * @param {Egg.Application} app 
-	 * @param {import("..").WechatOptions} _options 
-	 */
-	constructor(app, _options) {
-		this.app = app;
-		this.options = _options;
-		this.OAUTH_TOKEN = "auth_token_";
-		this.api = new OAuth(_options.appId, _options.appSecret, this.getToken.bind(this), this.setToken.bind(this));
-	}
-	/**
-	 * 
-	 * @param {String} openid 
-	 * @param {Function} callback 
-	 */
-	async getToken(openid, callback) {
-		try {
-			let reply = await this.app.redis.get(`${this.OAUTH_TOKEN}${openid}`);
-			let token = JSON.parse(reply);
-			callback(null, token);
-		} catch (error) {
-			callback(error);
-		}
-	}
-	/**
-	 * 
-	 * @param {String} openid 
-	 * @param {Object} tokenData
-	 * @param {Function} callback 
-	 */
-	async setToken(openid, token, callback) {
-		try {
-			let key = `${this.OAUTH_TOKEN}${openid}`;
-			await this.app.redis.set(key, JSON.stringify(token));
-			// await redisClient.expire(this.ACCESS_TOKEN, 7190);
-			callback(null);
-		} catch (error) {
-			callback(error);
-		}
-	}
-}
-const WechatMap = {};
-class EggWechatOAuth {
-	/**
-	 * 
-	 * @param {Egg.Application} app 
-	 */
-	constructor(app) {
-		this.app = app;
-	}
-	/**
-	 * 
-	 * @param {string | null} appId 
-	 * @returns {OAuth}
-	 */
-	getIns(appId) {
-		appId = appId || this.app.config.wechatSdk.defaultAppId;
-		if (!WechatMap[appId]) {
-			const options = this.app.config.wechatSdk[appId];
-			if (options) {
-				WechatMap[appId] = new WechatOauth(this.app, options);
-			} else {
-				return null;
-			}
-		}
-		return WechatMap[appId].api;
-	}
-}
+const OAuth = require("wechat-oauth");
+class WechatOauth {
+	/**
+	 * 
+	 * @param {Egg.Application} app 
+	 * @param {import("..").WechatSdkOptions} _options 
+	 */
+	constructor(app, _options) {
+		this.app = app;
+		this.options = _options;
+		this.OAUTH_TOKEN = "auth_token_";
+		this.api = new OAuth(_options.appId, _options.appSecret, this.getToken.bind(this), this.setToken.bind(this),_options.isMiniProgram);
+	}
+	/**
+	 * 
+	 * @param {String} openid 
+	 * @param {Function} callback 
+	 */
+	async getToken(openid, callback) {
+		try {
+			let reply = await this.app.redis.get(`${this.OAUTH_TOKEN}${openid}`);
+			let token = JSON.parse(reply);
+			callback(null, token);
+		} catch (error) {
+			callback(error);
+		}
+	}
+	/**
+	 * 
+	 * @param {String} openid 
+	 * @param {Object} tokenData
+	 * @param {Function} callback 
+	 */
+	async setToken(openid, token, callback) {
+		try {
+			let key = `${this.OAUTH_TOKEN}${openid}`;
+			await this.app.redis.set(key, JSON.stringify(token));
+			// await redisClient.expire(this.ACCESS_TOKEN, 7190);
+			callback(null);
+		} catch (error) {
+			callback(error);
+		}
+	}
+}
+const WechatMap = {};
+class EggWechatOAuth {
+	/**
+	 * 
+	 * @param {Egg.Application} app 
+	 */
+	constructor(app) {
+		this.app = app;
+	}
+	/**
+	 * 
+	 * @param {string | null} appId 
+	 * @returns {OAuth}
+	 */
+	getIns(appId) {
+		appId = appId || this.app.config.wechatSdk.defaultAppId;
+		if (!WechatMap[appId]) {
+			const options = this.app.config.wechatSdk[appId];
+			if (options) {
+				WechatMap[appId] = new WechatOauth(this.app, options);
+			} else {
+				return null;
+			}
+		}
+		return WechatMap[appId].api;
+	}
+}
 module.exports = EggWechatOAuth;

package/package.json

@@ -1,58 +1,58 @@
-{
-  "name": "egg-wechat-sdk-x",
-  "version": "1.0.7",
-  "description": "",
-  "eggPlugin": {
-    "name": "wechatSdk",
-    "dependencies": [
-      "redis"
-    ]
-  },
-  "keywords": [
-    "egg",
-    "eggPlugin",
-    "egg-plugin"
-  ],
-  "dependencies": {
-    "egg-redis": "^2.4.0",
-    "wechat-api": "^1.35.1",
-    "wechat-oauth": "^1.5.0"
-  },
-  "devDependencies": {
-    "egg": "^3",
-    "egg-bin": "^5",
-    "egg-ci": "^2",
-    "egg-mock": "^5",
-    "eslint": "^8",
-    "eslint-config-egg": "^12"
-  },
-  "engines": {
-    "node": ">=16.0.0"
-  },
-  "scripts": {
-    "test": "npm run lint -- --fix && npm run test-local",
-    "test-local": "egg-bin test",
-    "cov": "egg-bin cov",
-    "lint": "eslint .",
-    "ci": "npm run lint && npm run cov"
-  },
-  "files": [
-    "app.js",
-    "lib",
-    "config",
-    "index.d.ts"
-  ],
-  "ci": {
-    "version": "16, 18"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/qoyf/egg-wechat-sdk.git"
-  },
-  "bugs": {
-    "url": "https://github.com/qoyf/egg-wechat-sdk/issues"
-  },
-  "homepage": "https://github.com/qoyf/egg-wechat-sdk#readme",
-  "author": "",
-  "license": "MIT"
-}
+{
+  "name": "egg-wechat-sdk-x",
+  "version": "2.0.0",
+  "description": "",
+  "eggPlugin": {
+    "name": "wechatSdk",
+    "dependencies": [
+      "redis"
+    ]
+  },
+  "keywords": [
+    "egg",
+    "eggPlugin",
+    "egg-plugin"
+  ],
+  "dependencies": {
+    "egg-redis": "^2.4.0",
+    "wechat-api": "^1.35.1",
+    "wechat-oauth": "^1.5.0"
+  },
+  "devDependencies": {
+    "egg": "^3",
+    "egg-bin": "^5",
+    "egg-ci": "^2",
+    "egg-mock": "^5",
+    "eslint": "^8",
+    "eslint-config-egg": "^12"
+  },
+  "engines": {
+    "node": ">=16.0.0"
+  },
+  "scripts": {
+    "test": "npm run lint -- --fix && npm run test-local",
+    "test-local": "egg-bin test",
+    "cov": "egg-bin cov",
+    "lint": "eslint .",
+    "ci": "npm run lint && npm run cov"
+  },
+  "files": [
+    "app.js",
+    "lib",
+    "config",
+    "index.d.ts"
+  ],
+  "ci": {
+    "version": "16, 18"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/qoyf/egg-wechat-sdk.git"
+  },
+  "bugs": {
+    "url": "https://github.com/qoyf/egg-wechat-sdk/issues"
+  },
+  "homepage": "https://github.com/qoyf/egg-wechat-sdk#readme",
+  "author": "",
+  "license": "MIT"
+}