@jayfong/x-server 2.116.0 → 2.117.0

package/lib/_cjs/exports.js

@@ -139,6 +139,12 @@ Object.keys(_xml_parser).forEach(function (key) {
   if (key in exports && exports[key] === _xml_parser[key]) return;
   exports[key] = _xml_parser[key];
 });
+var _ai = require("./services/ai");
+Object.keys(_ai).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _ai[key]) return;
+  exports[key] = _ai[key];
+});
 var _base2 = require("./services/base");
 Object.keys(_base2).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -187,6 +193,18 @@ Object.keys(_emoji).forEach(function (key) {
   if (key in exports && exports[key] === _emoji[key]) return;
   exports[key] = _emoji[key];
 });
+var _file_store = require("./services/file_store");
+Object.keys(_file_store).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _file_store[key]) return;
+  exports[key] = _file_store[key];
+});
+var _html = require("./services/html");
+Object.keys(_html).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _html[key]) return;
+  exports[key] = _html[key];
+});
 var _jwt = require("./services/jwt");
 Object.keys(_jwt).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -211,6 +229,12 @@ Object.keys(_pay).forEach(function (key) {
   if (key in exports && exports[key] === _pay[key]) return;
   exports[key] = _pay[key];
 });
+var _random = require("./services/random");
+Object.keys(_random).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _random[key]) return;
+  exports[key] = _random[key];
+});
 var _rate_limit = require("./services/rate_limit");
 Object.keys(_rate_limit).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/lib/_cjs/services/ai.js

@@ -0,0 +1,48 @@
+"use strict";
+
+exports.__esModule = true;
+exports.AiService = void 0;
+var _xRequest = require("@jayfong/x-request");
+var _vtils = require("vtils");
+class AiService {
+  static async ask(payload) {
+    const res = await _xRequest.xr.postJson({
+      url: `${payload.baseUrl}/chat/completions`,
+      headers: {
+        Authorization: `Bearer ${payload.apiKey}`,
+        ...payload.headers
+      },
+      data: {
+        model: payload.model,
+        messages: [...(payload.prompt ? [{
+          role: 'system',
+          content: payload.prompt
+        }] : []), {
+          role: 'user',
+          content: payload.question
+        }],
+        stream: false
+      },
+      timeoutMs: (0, _vtils.ms)('1m'),
+      noThrowHttpErrors: true
+    });
+    if (res.status !== 200) {
+      console.error(res.data);
+      throw new Error(JSON.stringify(res.data));
+    }
+    return {
+      answer: res.data.choices[0].message.content
+    };
+  }
+  constructor(options) {
+    this.options = options;
+    this.serviceName = 'ai';
+  }
+  ask(payload) {
+    return AiService.ask({
+      ...this.options,
+      ...payload
+    });
+  }
+}
+exports.AiService = AiService;

package/lib/_cjs/services/file_store.js

@@ -0,0 +1,67 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+exports.__esModule = true;
+exports.FileStoreService = void 0;
+var _clientS = require("@aws-sdk/client-s3");
+var _s3RequestPresigner = require("@aws-sdk/s3-request-presigner");
+var _xRequest = require("@jayfong/x-request");
+var _mime = _interopRequireDefault(require("mime"));
+var _vtils = require("vtils");
+var _x = require("../x");
+class FileStoreService {
+  constructor(options) {
+    this.options = options;
+    this.serviceName = 'fileStore';
+    this.endpoint = '';
+    this.dir = '';
+    this.cdnUrl = '';
+    this.endpoint = (0, _vtils.isUrl)(this.options.endpoint) ? this.options.endpoint : `https://${this.options.endpoint}`;
+    this.dir = this.options.dir ? `${this.options.dir.replace(/^\/+/, '').replace(/\/+$/, '')}` : '';
+    this.cdnUrl = ((0, _vtils.isUrl)(this.options.cdnUrl) ? this.options.cdnUrl : `https://${this.options.cdnUrl}`).replace(/\/+$/, '');
+  }
+  async getUploadUrl(payload) {
+    const s3Client = new _clientS.S3Client({
+      credentials: {
+        accessKeyId: this.options.accessKey,
+        secretAccessKey: this.options.secretKey
+      },
+      endpoint: this.endpoint,
+      region: 'x'
+    });
+    const contentType = _mime.default.getType(payload.fileName) || 'application/octet-stream';
+    const fileName = payload.keepName ? payload.fileName : `${_x.x.random.cuid2()}.${_mime.default.getExtension(contentType)}`;
+    const dir = this.dir ? `${this.dir}/` : '';
+    const command = new _clientS.PutObjectCommand({
+      Bucket: this.options.bucket,
+      Key: `${dir}${fileName}`,
+      ContentType: contentType
+    });
+    const uploadUrl = await (0, _s3RequestPresigner.getSignedUrl)(s3Client, command, {
+      expiresIn: (0, _vtils.ms)(payload.ttl, true)
+    });
+    const publicUrl = `${this.cdnUrl}/${dir}${fileName}`;
+    return {
+      contentType,
+      uploadUrl,
+      publicUrl
+    };
+  }
+  async upload(payload) {
+    const res = await this.getUploadUrl({
+      fileName: payload.fileName,
+      ttl: (0, _vtils.ms)('1m'),
+      keepName: payload.keepName
+    });
+    await _xRequest.xr.post({
+      url: res.uploadUrl,
+      method: 'PUT',
+      headers: {
+        'Content-Type': res.contentType
+      },
+      data: payload.content
+    });
+    return res;
+  }
+}
+exports.FileStoreService = FileStoreService;

package/lib/exports.d.ts

@@ -21,6 +21,7 @@ export * from './plugins/file_parser';
 export * from './plugins/form_body_parser';
 export * from './plugins/ws_parser';
 export * from './plugins/xml_parser';
+export * from './services/ai';
 export * from './services/base';
 export * from './services/cache';
 export * from './services/captcha';
@@ -29,10 +30,13 @@ export * from './services/db_value';
 export * from './services/dingtalk';
 export * from './services/dispose';
 export * from './services/emoji';
+export * from './services/file_store';
+export * from './services/html';
 export * from './services/jwt';
 export * from './services/log';
 export * from './services/mail';
 export * from './services/pay';
+export * from './services/random';
 export * from './services/rate_limit';
 export * from './services/redis';
 export * from './services/sensitive_words';

package/lib/exports.js

@@ -22,6 +22,7 @@ export * from "./plugins/file_parser";
 export * from "./plugins/form_body_parser";
 export * from "./plugins/ws_parser";
 export * from "./plugins/xml_parser";
+export * from "./services/ai";
 export * from "./services/base";
 export * from "./services/cache";
 export * from "./services/captcha";
@@ -30,10 +31,13 @@ export * from "./services/db_value";
 export * from "./services/dingtalk";
 export * from "./services/dispose";
 export * from "./services/emoji";
+export * from "./services/file_store";
+export * from "./services/html";
 export * from "./services/jwt";
 export * from "./services/log";
 export * from "./services/mail";
 export * from "./services/pay";
+export * from "./services/random";
 export * from "./services/rate_limit";
 export * from "./services/redis";
 export * from "./services/sensitive_words";

package/lib/services/ai.d.ts

@@ -0,0 +1,31 @@
+import type { PartialBy } from 'vtils/types';
+import type { BaseService } from './base';
+export type AiServiceOptions = {
+    /** 基础路径，如: https://dashscope.aliyuncs.com/compatible-mode/v1 */
+    baseUrl: string;
+    /** API密钥，如: sk-xxx */
+    apiKey: string;
+    /** 模型名称，如: deepseek-v3.1 */
+    model: string;
+    /** 额外请求头 */
+    headers?: Record<string, string>;
+};
+export type AiServiceAskPayload = AiServiceOptions & {
+    prompt?: string;
+    question: string;
+};
+export type AiServiceAskResult = {
+    answer: string;
+};
+export declare class AiService implements BaseService {
+    private options;
+    serviceName: string;
+    static ask(payload: AiServiceAskPayload): Promise<AiServiceAskResult>;
+    constructor(options: AiServiceOptions);
+    ask(payload: PartialBy<AiServiceAskPayload, keyof AiServiceOptions>): Promise<AiServiceAskResult>;
+}
+declare module '../x' {
+    interface X {
+        ai: AiService;
+    }
+}

package/lib/services/ai.js

@@ -0,0 +1,43 @@
+import { xr } from '@jayfong/x-request';
+import { ms } from 'vtils';
+export class AiService {
+  static async ask(payload) {
+    const res = await xr.postJson({
+      url: `${payload.baseUrl}/chat/completions`,
+      headers: {
+        Authorization: `Bearer ${payload.apiKey}`,
+        ...payload.headers
+      },
+      data: {
+        model: payload.model,
+        messages: [...(payload.prompt ? [{
+          role: 'system',
+          content: payload.prompt
+        }] : []), {
+          role: 'user',
+          content: payload.question
+        }],
+        stream: false
+      },
+      timeoutMs: ms('1m'),
+      noThrowHttpErrors: true
+    });
+    if (res.status !== 200) {
+      console.error(res.data);
+      throw new Error(JSON.stringify(res.data));
+    }
+    return {
+      answer: res.data.choices[0].message.content
+    };
+  }
+  constructor(options) {
+    this.options = options;
+    this.serviceName = 'ai';
+  }
+  ask(payload) {
+    return AiService.ask({
+      ...this.options,
+      ...payload
+    });
+  }
+}

package/lib/services/file_store.d.ts

@@ -0,0 +1,49 @@
+import type { BaseService } from './base';
+export type FileStoreServiceOptions = {
+    accessKey: string;
+    secretKey: string;
+    /** 如: cos.ap-guangzhou.myqcloud.com */
+    endpoint: string;
+    /** 如: image-311111 */
+    bucket: string;
+    /** 如: x */
+    dir: string;
+    /** 如: cdn.com */
+    cdnUrl: string;
+};
+export type FileStoreServiceGetUploadUrlPayload = {
+    fileName: string;
+    ttl: number;
+    keepName?: boolean;
+};
+export type FileStoreServiceGetUploadUrlResult = {
+    /** 文件类型 */
+    contentType: string;
+    /** 文件上传地址 */
+    uploadUrl: string;
+    /** 文件公开访问地址 */
+    publicUrl: string;
+};
+export type FileStoreServiceUploadPayload = {
+    /** 文件名 */
+    fileName: string;
+    /** 文件内容 */
+    content: Buffer;
+    keepName?: boolean;
+};
+export type FileStoreServiceUploadResult = FileStoreServiceGetUploadUrlResult;
+export declare class FileStoreService implements BaseService {
+    private options;
+    serviceName: string;
+    private endpoint;
+    private dir;
+    private cdnUrl;
+    constructor(options: FileStoreServiceOptions);
+    getUploadUrl(payload: FileStoreServiceGetUploadUrlPayload): Promise<FileStoreServiceGetUploadUrlResult>;
+    upload(payload: FileStoreServiceUploadPayload): Promise<FileStoreServiceUploadResult>;
+}
+declare module '../x' {
+    interface X {
+        fileStore: FileStoreService;
+    }
+}

package/lib/services/file_store.js

@@ -0,0 +1,61 @@
+import { PutObjectCommand, S3Client } from '@aws-sdk/client-s3';
+import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
+import { xr } from '@jayfong/x-request';
+import mime from 'mime';
+import { isUrl, ms } from 'vtils';
+import { x } from "../x";
+export class FileStoreService {
+  constructor(options) {
+    this.options = options;
+    this.serviceName = 'fileStore';
+    this.endpoint = '';
+    this.dir = '';
+    this.cdnUrl = '';
+    this.endpoint = isUrl(this.options.endpoint) ? this.options.endpoint : `https://${this.options.endpoint}`;
+    this.dir = this.options.dir ? `${this.options.dir.replace(/^\/+/, '').replace(/\/+$/, '')}` : '';
+    this.cdnUrl = (isUrl(this.options.cdnUrl) ? this.options.cdnUrl : `https://${this.options.cdnUrl}`).replace(/\/+$/, '');
+  }
+  async getUploadUrl(payload) {
+    const s3Client = new S3Client({
+      credentials: {
+        accessKeyId: this.options.accessKey,
+        secretAccessKey: this.options.secretKey
+      },
+      endpoint: this.endpoint,
+      region: 'x'
+    });
+    const contentType = mime.getType(payload.fileName) || 'application/octet-stream';
+    const fileName = payload.keepName ? payload.fileName : `${x.random.cuid2()}.${mime.getExtension(contentType)}`;
+    const dir = this.dir ? `${this.dir}/` : '';
+    const command = new PutObjectCommand({
+      Bucket: this.options.bucket,
+      Key: `${dir}${fileName}`,
+      ContentType: contentType
+    });
+    const uploadUrl = await getSignedUrl(s3Client, command, {
+      expiresIn: ms(payload.ttl, true)
+    });
+    const publicUrl = `${this.cdnUrl}/${dir}${fileName}`;
+    return {
+      contentType,
+      uploadUrl,
+      publicUrl
+    };
+  }
+  async upload(payload) {
+    const res = await this.getUploadUrl({
+      fileName: payload.fileName,
+      ttl: ms('1m'),
+      keepName: payload.keepName
+    });
+    await xr.post({
+      url: res.uploadUrl,
+      method: 'PUT',
+      headers: {
+        'Content-Type': res.contentType
+      },
+      data: payload.content
+    });
+    return res;
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.116.0",
+  "version": "2.117.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -21,6 +21,8 @@
     "test_api_qiqi": "cd /Users/admin/Documents/jfWorks/qiqi-server && DEBUG=api tsx /Users/admin/Documents/jfWorks/x/packages/x-server/src/cli/cli.ts api"
   },
   "dependencies": {
+    "@aws-sdk/client-s3": "^3.1079.0",
+    "@aws-sdk/s3-request-presigner": "^3.1079.0",
     "@fastify/compress": "^7.0.3",
     "@fastify/cookie": "^9.4.0",
     "@fastify/cors": "^8.3.0",
@@ -61,6 +63,7 @@
     "jsonwebtoken": "^8.5.1",
     "lru-cache": "^10.0.0",
     "lz-string": "^1.4.4",
+    "mime": "^4.1.0",
     "mini-svg-data-uri": "^1.4.4",
     "node-ssh": "^13.1.0",
     "nodemailer": "^6.7.3",