@jayfong/x-server 1.11.6 → 1.13.1

package/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.13.1](https://github.com/jfWorks/x-server/compare/v1.13.0...v1.13.1) (2022-04-26)
+
+
+### Bug Fixes
+
+* appname -> appid ([88d14d1](https://github.com/jfWorks/x-server/commit/88d14d18078c7bc19ddf2c973e53cc0353a533de))
+
+## [1.13.0](https://github.com/jfWorks/x-server/compare/v1.12.0...v1.13.0) (2022-04-26)
+
+
+### Features
+
+* **CaptchaService:** generate, generateImage ([22bf340](https://github.com/jfWorks/x-server/commit/22bf3404cfb7d3a530714471fe004fcd9ee60760))
+
+## [1.12.0](https://github.com/jfWorks/x-server/compare/v1.11.6...v1.12.0) (2022-04-25)
+
+
+### Features
+
+* add MailService ([e7a5337](https://github.com/jfWorks/x-server/commit/e7a53370af0dc29d6183fe66ffa3919ae55f0905))
+
 ### [1.11.6](https://github.com/jfWorks/x-server/compare/v1.11.5...v1.11.6) (2022-04-21)
 
 

package/lib/_cjs/core/define_task.js

@@ -12,7 +12,7 @@ var _x = require("../x");
 async function defineTask(options) {
   const queue = new _bull.default(options.name, {
     redis: _x.x.redis.options,
-    prefix: `${_x.x.appName}_task`
+    prefix: `${_x.x.appId}_task`
   });
   queue.process(async job => {
     return options.handle(job.data);

package/lib/_cjs/index.js

@@ -58,6 +58,14 @@ Object.keys(_http_error).forEach(function (key) {
   exports[key] = _http_error[key];
 });
 
+var _http_method = require("./core/http_method");
+
+Object.keys(_http_method).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _http_method[key]) return;
+  exports[key] = _http_method[key];
+});
+
 var _server = require("./core/server");
 
 Object.keys(_server).forEach(function (key) {
@@ -154,6 +162,14 @@ Object.keys(_jwt).forEach(function (key) {
   exports[key] = _jwt[key];
 });
 
+var _mail = require("./services/mail");
+
+Object.keys(_mail).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _mail[key]) return;
+  exports[key] = _mail[key];
+});
+
 var _redis = require("./services/redis");
 
 Object.keys(_redis).forEach(function (key) {

package/lib/_cjs/services/cache.js

@@ -16,7 +16,7 @@ class CacheService {
     this.options = options;
     this.serviceName = 'cache';
     this.prefix = void 0;
-    this.prefix = `${_x.x.appName}:`;
+    this.prefix = `${_x.x.appId}:`;
   }
 
   toRedisKey(key) {

package/lib/_cjs/services/captcha.js

@@ -16,6 +16,15 @@ class CaptchaService {
   }
 
   async generate() {
+    const text = Math.random().toString().slice(0 - this.options.size);
+    const token = await _x.x.cache.save(text, this.options.ttl);
+    return {
+      text: text,
+      token: token
+    };
+  }
+
+  async generateImage() {
     const res = _svgCaptcha.default.create({
       size: this.options.size
     });

package/lib/_cjs/services/mail.js

@@ -0,0 +1,40 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
+exports.__esModule = true;
+exports.MailService = void 0;
+
+var _nodemailer = _interopRequireDefault(require("nodemailer"));
+
+var _x = require("../x");
+
+class MailService {
+  constructor(options) {
+    this.options = options;
+    this.serviceName = 'mail';
+    this.transporter = void 0;
+  }
+
+  async send(data) {
+    if (!this.transporter) {
+      this.transporter = _nodemailer.default.createTransport({
+        host: this.options.host,
+        port: this.options.port,
+        secure: this.options.secure,
+        auth: {
+          user: this.options.user,
+          pass: this.options.pass
+        }
+      });
+      await this.transporter.verify();
+
+      _x.x.dispose.add(() => this.transporter.close());
+    }
+
+    return this.transporter.sendMail(data);
+  }
+
+}
+
+exports.MailService = MailService;

package/lib/_cjs/x.js

@@ -6,7 +6,7 @@ exports.x = void 0;
 var _dispose = require("./services/dispose");
 
 const x = {
-  appName: process.env.APP_NAME,
+  appId: process.env.APP_ID,
   register: (...services) => {
     for (const service of services) {
       // @ts-ignore

package/lib/core/define_task.js

@@ -3,7 +3,7 @@ import { x } from "../x";
 export async function defineTask(options) {
   const queue = new Queue(options.name, {
     redis: x.redis.options,
-    prefix: `${x.appName}_task`
+    prefix: `${x.appId}_task`
   });
   queue.process(async job => {
     return options.handle(job.data);

package/lib/index.d.ts

@@ -5,6 +5,7 @@ export * from './core/define_server';
 export * from './core/define_task';
 export * from './core/handler';
 export * from './core/http_error';
+export * from './core/http_method';
 export * from './core/server';
 export * from './core/types';
 export * from './plugins/base';
@@ -17,6 +18,7 @@ export * from './services/cache';
 export * from './services/captcha';
 export * from './services/dispose';
 export * from './services/jwt';
+export * from './services/mail';
 export * from './services/redis';
 export * from './x';
 export * from '.x/models';

package/lib/index.js

@@ -6,6 +6,7 @@ export * from "./core/define_server";
 export * from "./core/define_task";
 export * from "./core/handler";
 export * from "./core/http_error";
+export * from "./core/http_method";
 export * from "./core/server";
 export * from "./core/types";
 export * from "./plugins/base";
@@ -18,6 +19,7 @@ export * from "./services/cache";
 export * from "./services/captcha";
 export * from "./services/dispose";
 export * from "./services/jwt";
+export * from "./services/mail";
 export * from "./services/redis";
 export * from "./x"; // @endindex
 // @ts-ignore

package/lib/services/cache.js

@@ -6,7 +6,7 @@ export class CacheService {
     this.options = options;
     this.serviceName = 'cache';
     this.prefix = void 0;
-    this.prefix = `${x.appName}:`;
+    this.prefix = `${x.appId}:`;
   }
 
   toRedisKey(key) {

package/lib/services/captcha.d.ts

@@ -11,6 +11,10 @@ export interface CaptchaOptions {
     ttl: MsValue;
 }
 export interface CaptchaGenerateResult {
+    text: string;
+    token: string;
+}
+export interface CaptchaGenerateImageResult {
     text: string;
     svg: string;
     token: string;
@@ -24,6 +28,7 @@ export declare class CaptchaService implements BaseService {
     serviceName: string;
     constructor(options: CaptchaOptions);
     generate(): Promise<CaptchaGenerateResult>;
+    generateImage(): Promise<CaptchaGenerateImageResult>;
     verify(options: CaptchaVerifyOptions): Promise<boolean>;
 }
 declare module '../x' {

package/lib/services/captcha.js

@@ -7,6 +7,15 @@ export class CaptchaService {
   }
 
   async generate() {
+    const text = Math.random().toString().slice(0 - this.options.size);
+    const token = await x.cache.save(text, this.options.ttl);
+    return {
+      text: text,
+      token: token
+    };
+  }
+
+  async generateImage() {
     const res = svgCaptcha.create({
       size: this.options.size
     });

package/lib/services/mail.d.ts

@@ -0,0 +1,21 @@
+import nodemailer from 'nodemailer';
+import { BaseService } from './base';
+export interface MailServiceOptions {
+    host: string;
+    port: number;
+    secure: boolean;
+    user: string;
+    pass: string;
+}
+export declare class MailService implements BaseService {
+    private options;
+    serviceName: string;
+    private transporter;
+    constructor(options: MailServiceOptions);
+    send(data: nodemailer.SendMailOptions): Promise<any>;
+}
+declare module '../x' {
+    interface X {
+        mail: MailService;
+    }
+}

package/lib/services/mail.js

@@ -0,0 +1,28 @@
+import nodemailer from 'nodemailer';
+import { x } from "../x";
+export class MailService {
+  constructor(options) {
+    this.options = options;
+    this.serviceName = 'mail';
+    this.transporter = void 0;
+  }
+
+  async send(data) {
+    if (!this.transporter) {
+      this.transporter = nodemailer.createTransport({
+        host: this.options.host,
+        port: this.options.port,
+        secure: this.options.secure,
+        auth: {
+          user: this.options.user,
+          pass: this.options.pass
+        }
+      });
+      await this.transporter.verify();
+      x.dispose.add(() => this.transporter.close());
+    }
+
+    return this.transporter.sendMail(data);
+  }
+
+}

package/lib/x.d.ts

@@ -1,7 +1,7 @@
 import { BaseService } from './services/base';
 import './services/dispose';
 export interface X {
-    readonly appName: string;
+    readonly appId: string;
     readonly register: (...services: BaseService[]) => void;
 }
 export declare const x: X;

package/lib/x.js

@@ -1,6 +1,6 @@
 import { DisposeService } from "./services/dispose";
 export const x = {
-  appName: process.env.APP_NAME,
+  appId: process.env.APP_ID,
   register: (...services) => {
     for (const service of services) {
       // @ts-ignore

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "1.11.6",
+  "version": "1.13.1",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -31,6 +31,7 @@
     "@types/busboy": "^0.3.2",
     "@types/http-errors": "^1.8.2",
     "@types/jsonwebtoken": "^8.5.8",
+    "@types/nodemailer": "^6.4.4",
     "@types/ws": "^8.5.3",
     "bufferutil": "^4.0.6",
     "bull": "^4.8.1",
@@ -53,6 +54,7 @@
     "ioredis": "^4.28.5",
     "jsonwebtoken": "^8.5.1",
     "node-ssh": "^12.0.4",
+    "nodemailer": "^6.7.3",
     "pino-pretty": "^7.6.1",
     "prisma": "^3.12.0",
     "select-run": "^1.1.2",