node-easywechat 3.7.0 → 3.7.2

package/dist/OpenPlatform/Application.js

@@ -1,13 +1,4 @@
 'use strict';
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -145,19 +136,17 @@ class Application {
      * @param authorizationCode
      * @returns
      */
-    getAuthorization(authorizationCode) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let response = (yield this.getClient().request('post', 'cgi-bin/component/api_query_auth', {
-                json: {
-                    component_appid: this.getAccount().getAppId(),
-                    authorization_code: authorizationCode,
-                }
-            })).toObject();
-            if (!response['authorization_info']) {
-                throw new Error('Failed to get authorization_info: ' + JSON.stringify(response));
+    async getAuthorization(authorizationCode) {
+        let response = (await this.getClient().request('post', 'cgi-bin/component/api_query_auth', {
+            json: {
+                component_appid: this.getAccount().getAppId(),
+                authorization_code: authorizationCode,
             }
-            return new Authorization_1.default(response);
-        });
+        })).toObject();
+        if (!response['authorization_info']) {
+            throw new Error('Failed to get authorization_info: ' + JSON.stringify(response));
+        }
+        return new Authorization_1.default(response);
     }
     /**
      * 获取/刷新接口调用令牌
@@ -166,38 +155,34 @@ class Application {
      * @param authorizerRefreshToken
      * @returns
      */
-    refreshAuthorizerToken(authorizerAppId, authorizerRefreshToken) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let response = (yield this.getClient().request('post', 'cgi-bin/component/api_authorizer_token', {
-                json: {
-                    component_appid: this.getAccount().getAppId(),
-                    authorizer_appid: authorizerAppId,
-                    authorizer_refresh_token: authorizerRefreshToken,
-                }
-            })).toObject();
-            if (!response['authorizer_access_token']) {
-                throw new Error('Failed to get authorizer_access_token: ' + JSON.stringify(response));
+    async refreshAuthorizerToken(authorizerAppId, authorizerRefreshToken) {
+        let response = (await this.getClient().request('post', 'cgi-bin/component/api_authorizer_token', {
+            json: {
+                component_appid: this.getAccount().getAppId(),
+                authorizer_appid: authorizerAppId,
+                authorizer_refresh_token: authorizerRefreshToken,
             }
-            return response;
-        });
+        })).toObject();
+        if (!response['authorizer_access_token']) {
+            throw new Error('Failed to get authorizer_access_token: ' + JSON.stringify(response));
+        }
+        return response;
     }
     /**
      * 获取预授权码
      * @see https://developers.weixin.qq.com/doc/oplatform/Third-party_Platforms/2.0/api/ThirdParty/token/pre_auth_code.html
      * @returns
      */
-    createPreAuthorizationCode() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let response = (yield this.getClient().request('post', 'cgi-bin/component/api_create_preauthcode', {
-                json: {
-                    component_appid: this.getAccount().getAppId(),
-                }
-            })).toObject();
-            if (!response['pre_auth_code']) {
-                throw new Error('Failed to get pre_auth_code: ' + JSON.stringify(response));
+    async createPreAuthorizationCode() {
+        let response = (await this.getClient().request('post', 'cgi-bin/component/api_create_preauthcode', {
+            json: {
+                component_appid: this.getAccount().getAppId(),
             }
-            return response;
-        });
+        })).toObject();
+        if (!response['pre_auth_code']) {
+            throw new Error('Failed to get pre_auth_code: ' + JSON.stringify(response));
+        }
+        return response;
     }
     /**
      * 生成授权页地址
@@ -205,24 +190,22 @@ class Application {
      * @param optional 预授权码，不传
      * @returns
      */
-    createPreAuthorizationUrl(callbackUrl, optional) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (typeof optional === 'string') {
-                optional = {
-                    pre_auth_code: optional,
-                };
-            }
-            else if (!optional || !optional['pre_auth_code']) {
-                optional = {
-                    pre_auth_code: (yield this.createPreAuthorizationCode()).pre_auth_code,
-                };
-            }
-            let queries = (0, merge_1.default)({
-                component_appid: this.getAccount().getAppId(),
-                redirect_uri: callbackUrl,
-            }, optional);
-            return `https://mp.weixin.qq.com/cgi-bin/componentloginpage?${(0, Utils_1.buildQueryString)(queries)}`;
-        });
+    async createPreAuthorizationUrl(callbackUrl, optional) {
+        if (typeof optional === 'string') {
+            optional = {
+                pre_auth_code: optional,
+            };
+        }
+        else if (!optional || !optional['pre_auth_code']) {
+            optional = {
+                pre_auth_code: (await this.createPreAuthorizationCode()).pre_auth_code,
+            };
+        }
+        let queries = (0, merge_1.default)({
+            component_appid: this.getAccount().getAppId(),
+            redirect_uri: callbackUrl,
+        }, optional);
+        return `https://mp.weixin.qq.com/cgi-bin/componentloginpage?${(0, Utils_1.buildQueryString)(queries)}`;
     }
     getOAuth() {
         let oauthFactory = ((app) => {
@@ -245,10 +228,8 @@ class Application {
      * @param config
      * @returns
      */
-    getOfficialAccountWithRefreshToken(appId_1, refreshToken_1) {
-        return __awaiter(this, arguments, void 0, function* (appId, refreshToken, config = {}) {
-            return this.getOfficialAccountWithAccessToken(appId, yield this.getAuthorizerAccessToken(appId, refreshToken), config);
-        });
+    async getOfficialAccountWithRefreshToken(appId, refreshToken, config = {}) {
+        return this.getOfficialAccountWithAccessToken(appId, await this.getAuthorizerAccessToken(appId, refreshToken), config);
     }
     /**
      * 根据访问令牌获取公众号实例
@@ -313,10 +294,8 @@ class Application {
      * @param config
      * @returns
      */
-    getMiniAppWithRefreshToken(appId_1, refreshToken_1) {
-        return __awaiter(this, arguments, void 0, function* (appId, refreshToken, config = {}) {
-            return this.getMiniAppWithAccessToken(appId, yield this.getAuthorizerAccessToken(appId, refreshToken), config);
-        });
+    async getMiniAppWithRefreshToken(appId, refreshToken, config = {}) {
+        return this.getMiniAppWithAccessToken(appId, await this.getAuthorizerAccessToken(appId, refreshToken), config);
     }
     /**
      * 根据访问令牌获取小程序实例
@@ -361,23 +340,20 @@ class Application {
      * @param refreshToken
      * @returns
      */
-    getAuthorizerAccessToken(appId, refreshToken) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            let md5RefreshToken = (0, Utils_1.createHash)(refreshToken, 'md5');
-            let cacheKey = `open-platform.authorizer_access_token.${appId}.${md5RefreshToken}`;
-            let cache = this.getCache();
-            let authorizerAccessToken = yield cache.get(cacheKey);
-            if (!authorizerAccessToken) {
-                let response = yield this.refreshAuthorizerToken(appId, refreshToken);
-                authorizerAccessToken = response['authorizer_access_token'];
-                yield cache.set(cacheKey, authorizerAccessToken, ((_a = parseInt(response['expires_in'])) !== null && _a !== void 0 ? _a : 7200) - 500);
-            }
-            return authorizerAccessToken;
-        });
+    async getAuthorizerAccessToken(appId, refreshToken) {
+        let md5RefreshToken = (0, Utils_1.createHash)(refreshToken, 'md5');
+        let cacheKey = `open-platform.authorizer_access_token.${appId}.${md5RefreshToken}`;
+        let cache = this.getCache();
+        let authorizerAccessToken = await cache.get(cacheKey);
+        if (!authorizerAccessToken) {
+            let response = await this.refreshAuthorizerToken(appId, refreshToken);
+            authorizerAccessToken = response['authorizer_access_token'];
+            await cache.set(cacheKey, authorizerAccessToken, (parseInt(response['expires_in']) ?? 7200) - 500);
+        }
+        return authorizerAccessToken;
     }
     createClient() {
-        return (new AccessTokenAwareClient_1.default(this.getHttpClient(), this.getAccessToken(), (response) => { var _a; return (_a = response.toObject()['errcode']) !== null && _a !== void 0 ? _a : 0; }, this.getConfig().get('http.throw', true)))
+        return (new AccessTokenAwareClient_1.default(this.getHttpClient(), this.getAccessToken(), (response) => response.toObject()['errcode'] ?? 0, this.getConfig().get('http.throw', true)))
             .setPresets(this.getConfig().all());
     }
     /**

package/dist/OpenPlatform/Authorizer/MiniApp/Utils.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -24,24 +15,22 @@ class Utils extends Utils_1.default {
      * @param code
      * @returns
      */
-    code2Session(code) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let client = this.app.getHttpClient();
-            let response = yield client.request('GET', '/sns/component/jscode2session', {
-                params: {
-                    component_access_token: yield this.app.getComponentApp().getAccessToken().getToken(),
-                    component_appid: this.app.getComponentApp().getAccount().getAppId(),
-                    appid: this.app.getAccount().getAppId(),
-                    js_code: code,
-                    grant_type: 'authorization_code',
-                }
-            });
-            let data = response.toObject();
-            if (!data['openid']) {
-                throw new Error(`code2Session error: ${JSON.stringify(data)}`);
+    async code2Session(code) {
+        let client = this.app.getHttpClient();
+        let response = await client.request('GET', '/sns/component/jscode2session', {
+            params: {
+                component_access_token: await this.app.getComponentApp().getAccessToken().getToken(),
+                component_appid: this.app.getComponentApp().getAccount().getAppId(),
+                appid: this.app.getAccount().getAppId(),
+                js_code: code,
+                grant_type: 'authorization_code',
             }
-            return data;
         });
+        let data = response.toObject();
+        if (!data['openid']) {
+            throw new Error(`code2Session error: ${JSON.stringify(data)}`);
+        }
+        return data;
     }
 }
 ;

package/dist/OpenPlatform/AuthorizerAccessToken.js

@@ -1,13 +1,4 @@
 'use strict';
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 class AuthorizerAccessToken {
     constructor(appId, accessToken) {
         this.appId = appId;
@@ -20,17 +11,13 @@ class AuthorizerAccessToken {
     getAppId() {
         return this.appId;
     }
-    getToken() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.accessToken;
-        });
+    async getToken() {
+        return this.accessToken;
     }
-    toQuery() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return {
-                'access_token': yield this.getToken(),
-            };
-        });
+    async toQuery() {
+        return {
+            'access_token': await this.getToken(),
+        };
     }
     /**
      * 转为字符串

package/dist/OpenPlatform/ComponentAccessToken.js

@@ -1,13 +1,4 @@
 'use strict';
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -45,42 +36,36 @@ class ComponentAccessToken {
         this.key = key;
         return this;
     }
-    getToken() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let token = '';
-            if (this.cache) {
-                token = yield this.cache.get(this.getKey());
-            }
-            if (!!token && typeof token === 'string') {
-                return token;
-            }
-            return this.refresh();
-        });
+    async getToken() {
+        let token = '';
+        if (this.cache) {
+            token = await this.cache.get(this.getKey());
+        }
+        if (!!token && typeof token === 'string') {
+            return token;
+        }
+        return this.refresh();
     }
-    toQuery() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return {
-                component_access_token: yield this.getToken(),
-            };
-        });
+    async toQuery() {
+        return {
+            component_access_token: await this.getToken(),
+        };
     }
-    refresh() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let response = (yield this.httpClient.request('post', 'cgi-bin/component/api_component_token', {
-                data: {
-                    component_appid: this.appId,
-                    component_appsecret: this.secret,
-                    component_verify_ticket: yield this.verifyTicket.getTicket(),
-                }
-            })).toObject();
-            if (!response['component_access_token']) {
-                throw new Error('Failed to get component_access_token: ' + JSON.stringify(response));
-            }
-            if (this.cache) {
-                yield this.cache.set(this.getKey(), response['component_access_token'], parseInt(response['expires_in']) - 100);
+    async refresh() {
+        let response = (await this.httpClient.request('post', 'cgi-bin/component/api_component_token', {
+            data: {
+                component_appid: this.appId,
+                component_appsecret: this.secret,
+                component_verify_ticket: await this.verifyTicket.getTicket(),
             }
-            return response['component_access_token'];
-        });
+        })).toObject();
+        if (!response['component_access_token']) {
+            throw new Error('Failed to get component_access_token: ' + JSON.stringify(response));
+        }
+        if (this.cache) {
+            await this.cache.set(this.getKey(), response['component_access_token'], parseInt(response['expires_in']) - 100);
+        }
+        return response['component_access_token'];
     }
 }
 module.exports = ComponentAccessToken;

package/dist/OpenPlatform/Server.d.ts

@@ -50,7 +50,7 @@ declare class Server extends ServerInterface {
      * @returns
      */
     handleThirdFastRegister(handler: ServerHandlerClosure<Message>): this;
-    protected decryptRequestMessage(): ServerHandlerClosure<Message>;
+    protected decryptRequestMessage(query: Record<string, any>): ServerHandlerClosure<Message>;
     /**
      * 获取来自微信服务器的推送消息
      * @param request 未设置该参数时，则从当前服务端收到的请求中获取

package/dist/OpenPlatform/Server.js

@@ -1,13 +1,4 @@
 'use strict';
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -25,20 +16,21 @@ class Server extends ServerInterface_1.default {
      * 服务端消息处理
      * @returns
      */
-    serve() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let echostr = this.request.getQueryParams()['echostr'] || '';
-            if (!!echostr) {
-                return new Response_1.default(200, { 'Content-Type': 'text/html' }, echostr);
-            }
-            let message = yield this.getRequestMessage(this.request);
-            this.prepend(this.decryptRequestMessage());
-            let response = yield this.handle(new Response_1.default(200, {}, 'success'), message);
-            if (!(response instanceof Response_1.default)) {
-                response = yield this.transformToReply(response, message, this.encryptor);
-            }
-            return response;
-        });
+    async serve() {
+        let query = this.request.getQueryParams();
+        let echostr = query['echostr'] || '';
+        if (!!echostr) {
+            return new Response_1.default(200, { 'Content-Type': 'text/html' }, echostr);
+        }
+        let message = await this.getRequestMessage(this.request);
+        if (this.encryptor && query['msg_signature']) {
+            this.prepend(this.decryptRequestMessage(query));
+        }
+        let response = await this.handle(new Response_1.default(200, {}, 'success'), message);
+        if (!(response instanceof Response_1.default)) {
+            response = await this.transformToReply(response, message, this.encryptor);
+        }
+        return response;
     }
     /**
      * 处理授权成功通知
@@ -46,10 +38,8 @@ class Server extends ServerInterface_1.default {
      * @returns
      */
     handleAuthorized(handler) {
-        return this.with(function (message, next) {
-            return __awaiter(this, void 0, void 0, function* () {
-                return message.InfoType === 'authorized' ? handler(message, next) : next(message);
-            });
+        return this.with(async function (message, next) {
+            return message.InfoType === 'authorized' ? handler(message, next) : next(message);
         });
     }
     /**
@@ -58,10 +48,8 @@ class Server extends ServerInterface_1.default {
      * @returns
      */
     handleUnauthorized(handler) {
-        return this.with(function (message, next) {
-            return __awaiter(this, void 0, void 0, function* () {
-                return message.InfoType === 'unauthorized' ? handler(message, next) : next(message);
-            });
+        return this.with(async function (message, next) {
+            return message.InfoType === 'unauthorized' ? handler(message, next) : next(message);
         });
     }
     /**
@@ -70,10 +58,8 @@ class Server extends ServerInterface_1.default {
      * @returns
      */
     handleAuthorizeUpdated(handler) {
-        return this.with(function (message, next) {
-            return __awaiter(this, void 0, void 0, function* () {
-                return message.InfoType === 'updateauthorized' ? handler(message, next) : next(message);
-            });
+        return this.with(async function (message, next) {
+            return message.InfoType === 'updateauthorized' ? handler(message, next) : next(message);
         });
     }
     /**
@@ -96,10 +82,8 @@ class Server extends ServerInterface_1.default {
         if (this.defaultVerifyTicketHandler) {
             this.withoutHandler(this.defaultVerifyTicketHandler);
         }
-        return this.with(function (message, next) {
-            return __awaiter(this, void 0, void 0, function* () {
-                return message.InfoType === 'component_verify_ticket' ? handler(message, next) : next(message);
-            });
+        return this.with(async function (message, next) {
+            return message.InfoType === 'component_verify_ticket' ? handler(message, next) : next(message);
         });
     }
     /**
@@ -108,18 +92,15 @@ class Server extends ServerInterface_1.default {
      * @returns
      */
     handleThirdFastRegister(handler) {
-        return this.with(function (message, next) {
-            return __awaiter(this, void 0, void 0, function* () {
-                return message.InfoType === 'notify_third_fasteregister' ? handler(message, next) : next(message);
-            });
+        return this.with(async function (message, next) {
+            return message.InfoType === 'notify_third_fasteregister' ? handler(message, next) : next(message);
         });
     }
-    decryptRequestMessage() {
-        let query = this.request.getQueryParams();
-        return (message, next) => __awaiter(this, void 0, void 0, function* () {
-            yield this.decryptMessage(message, this.encryptor, query['msg_signature'] || '', query['timestamp'] || '', query['nonce'] || '');
+    decryptRequestMessage(query) {
+        return async (message, next) => {
+            message = await this.decryptMessage(message, this.encryptor, query['msg_signature'] || '', query['timestamp'] || '', query['nonce'] || '');
             return next(message);
-        });
+        };
     }
     /**
      * 获取来自微信服务器的推送消息
@@ -134,14 +115,11 @@ class Server extends ServerInterface_1.default {
      * @param request 未设置该参数时，则从当前服务端收到的请求中获取
      * @returns
      */
-    getDecryptedMessage() {
-        return __awaiter(this, arguments, void 0, function* (request = null) {
-            if (!request)
-                request = this.request;
-            let message = yield Message_1.default.createFromRequest(request);
-            let query = request.getQueryParams();
-            return this.decryptMessage(message, this.encryptor, query['msg_signature'] || '', query['timestamp'] || '', query['nonce'] || '');
-        });
+    async getDecryptedMessage(request = null) {
+        request = request ?? this.request;
+        let message = await this.getRequestMessage(request);
+        let query = request.getQueryParams();
+        return this.decryptMessage(message, this.encryptor, query['msg_signature'] || '', query['timestamp'] || '', query['nonce'] || '');
     }
 }
 ;

package/dist/OpenPlatform/VerifyTicket.js

@@ -1,13 +1,4 @@
 'use strict';
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 class VerifyTicket {
     constructor(appId, key = null, cache = null) {
         this.appId = appId;
@@ -24,25 +15,21 @@ class VerifyTicket {
         this.key = key;
         return this;
     }
-    setTicket(ticket) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.cache) {
-                yield this.cache.set(this.getKey(), ticket, 6000);
-            }
-            return this;
-        });
+    async setTicket(ticket) {
+        if (this.cache) {
+            await this.cache.set(this.getKey(), ticket, 6000);
+        }
+        return this;
     }
-    getTicket() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let ticket = '';
-            if (this.cache) {
-                ticket = yield this.cache.get(this.getKey());
-            }
-            if (!ticket || typeof ticket != 'string') {
-                throw new Error('No component_verify_ticket found.');
-            }
-            return ticket;
-        });
+    async getTicket() {
+        let ticket = '';
+        if (this.cache) {
+            ticket = await this.cache.get(this.getKey());
+        }
+        if (!ticket || typeof ticket != 'string') {
+            throw new Error('No component_verify_ticket found.');
+        }
+        return ticket;
     }
 }
 ;