@jayfong/x-server 2.12.14 → 2.12.16

package/lib/_cjs/cli/env_util.js

@@ -1,18 +1,12 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 exports.__esModule = true;
 exports.EnvUtil = void 0;
-
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
 var _nodePath = _interopRequireDefault(require("node:path"));
-
 var _vtils = require("vtils");
-
 var _yaml = require("yaml");
-
 class EnvUtil {
   static normalizeValue(value) {
     if (typeof value === 'string') {
@@ -20,27 +14,21 @@ class EnvUtil {
         const [devValue, prodValue] = value.split(/\s+\|\|\s+/);
         return (0, _vtils.devOrProd)(() => EnvUtil.normalizeValue(devValue), () => EnvUtil.normalizeValue(prodValue));
       }
-
       return value === 'true' ? true : value === 'false' ? false : value.startsWith('[') && value.endsWith(']') || value.startsWith('{') && value.endsWith('}') ? JSON.parse(value) : (0, _vtils.isNumeric)(value) ? Number(value) : value;
     } else if (value && typeof value === 'object') {
       if (value.dev != null && value.prod != null) {
         return (0, _vtils.devOrProd)(() => value.dev, () => value.prod);
       }
-
       return value;
     }
-
     return value;
   }
-
   static parseContent(src, isYaml = false) {
     const envs = [];
-
     if (isYaml) {
       const envObj = (0, _yaml.parse)(src);
       Object.keys(envObj).forEach(key => {
         var _src$match;
-
         envs.push({
           key: key,
           value: this.normalizeValue(envObj[key]),
@@ -49,56 +37,54 @@ class EnvUtil {
       });
     } else {
       // https://github.com/andreialecu/dotenv/blob/feat-multiline/lib/main.js
-      const multilineLineBreaks = true; // convert Buffers before splitting into lines and processing
+      const multilineLineBreaks = true;
 
+      // convert Buffers before splitting into lines and processing
       const lines = src.split(EnvUtil.NEWLINES_MATCH);
       let lastComment = '';
-
       for (let idx = 0; idx < lines.length; idx++) {
-        let line = lines[idx]; // matching "KEY' and 'VAL' in 'KEY=VAL'
-
-        const keyValueArr = line.match(EnvUtil.RE_INI_KEY_VAL); // matched?
+        let line = lines[idx];
 
+        // matching "KEY' and 'VAL' in 'KEY=VAL'
+        const keyValueArr = line.match(EnvUtil.RE_INI_KEY_VAL);
+        // matched?
         if (keyValueArr != null) {
-          const key = keyValueArr[1]; // default undefined or missing values to empty string
-
+          const key = keyValueArr[1];
+          // default undefined or missing values to empty string
           let val = keyValueArr[2] || '';
           let end = val.length - 1;
           const isDoubleQuoted = val[0] === '"' && val[end] === '"';
           const isSingleQuoted = val[0] === "'" && val[end] === "'";
           const isMultilineDoubleQuoted = val[0] === '"' && (val.length === 1 || val[end] !== '"');
-          const isMultilineSingleQuoted = val[0] === "'" && (val.length === 1 || val[end] !== "'"); // if parsing line breaks and the value starts with a quote
+          const isMultilineSingleQuoted = val[0] === "'" && (val.length === 1 || val[end] !== "'");
 
+          // if parsing line breaks and the value starts with a quote
           if (multilineLineBreaks && (isMultilineDoubleQuoted || isMultilineSingleQuoted)) {
             const quoteChar = isMultilineDoubleQuoted ? '"' : "'";
             val = val.substring(1);
-
             while (idx++ < lines.length - 1) {
               line = lines[idx];
               end = line.length - 1;
-
               if (line[end] === quoteChar) {
                 val += EnvUtil.NEWLINE + line.substring(0, end);
                 break;
               }
-
               val += EnvUtil.NEWLINE + line;
             }
-
-            val = (0, _vtils.dedent)(val); // if single or double quoted, remove quotes
+            val = (0, _vtils.dedent)(val);
+            // if single or double quoted, remove quotes
           } else if (isSingleQuoted || isDoubleQuoted) {
-            val = val.substring(1, end); // if double quoted, expand newlines
+            val = val.substring(1, end);
 
+            // if double quoted, expand newlines
             if (isDoubleQuoted) {
               val = val.replace(EnvUtil.RE_NEWLINES, EnvUtil.NEWLINE);
             }
-
             val = (0, _vtils.dedent)(val);
           } else {
             // remove surrounding whitespace
             val = (0, _vtils.dedent)(val).trim();
           }
-
           envs.push({
             key: key,
             value: EnvUtil.normalizeValue(val),
@@ -107,61 +93,47 @@ class EnvUtil {
           lastComment = '';
         } else {
           const commentArr = line.match(EnvUtil.COMMENT_MATCH);
-
           if (commentArr) {
             lastComment = commentArr[1];
           }
         }
       }
     }
-
     return envs;
   }
-
   static async parseFile(options) {
     const envFile = _nodePath.default.join(options.cwd, options.file);
-
     const envYmlFile = _nodePath.default.join(options.cwd, `${options.file}.yml`);
-
     const envYamlFile = _nodePath.default.join(options.cwd, `${options.file}.yaml`);
-
     const file = (await _fsExtra.default.pathExists(envYmlFile)) ? envYmlFile : (await _fsExtra.default.pathExists(envYamlFile)) ? envYamlFile : (await _fsExtra.default.pathExists(envFile)) ? envFile : '';
-
     if (file) {
       const envContent = await _fsExtra.default.readFile(file, 'utf-8');
       const envs = EnvUtil.parseContent(envContent, /\.ya?ml$/i.test(file));
       return envs;
     }
-
     return [];
   }
-
   static async parseFileAsMap(options) {
     const envs = await EnvUtil.parseFile(options);
     const envsObj = {};
-
     for (const env of envs) {
       envsObj[env.key] = env.value;
     }
-
     return envsObj;
   }
-
   static async importFile(options) {
     const envs = await EnvUtil.parseFile(options);
     const envsObj = {};
-
     for (const env of envs) {
       envsObj[env.key] = env.value;
       process.env[env.key] = env.value;
     }
-
-    process.env.X_SERVER_ENVS = JSON.stringify({ // @ts-ignore
+    process.env.X_SERVER_ENVS = JSON.stringify({
+      // @ts-ignore
       ...JSON.parse(process.env.X_SERVER_ENVS || '{}'),
       ...envsObj
     });
   }
-
   static makeTypes(envs) {
     return (0, _vtils.dedent)`
       declare namespace NodeJS {
@@ -182,18 +154,13 @@ class EnvUtil {
       }
     `;
   }
-
   static async outputTypes(options) {
     const envs = await EnvUtil.parseFile(options);
-
     const outFile = _nodePath.default.join(options.cwd, options.outFile);
-
     const types = EnvUtil.makeTypes(envs);
     await _fsExtra.default.outputFile(outFile, types);
   }
-
 }
-
 exports.EnvUtil = EnvUtil;
 EnvUtil.NEWLINE = '\n';
 EnvUtil.RE_INI_KEY_VAL = /^\s*([\w.-]+)\s*=\s*(.*)?\s*$/;

package/lib/_cjs/cli/{register.js → esbuild_register.js}

@@ -1,7 +1,6 @@
 "use strict";
 
 var _node = require("esbuild-register/dist/node");
-
 (0, _node.register)({
   hookIgnoreNodeModules: false,
   hookMatcher: filename => filename.includes('/.x/') || !filename.includes('/node_modules/')

package/lib/_cjs/cli/template_util.js

@@ -1,18 +1,13 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 exports.__esModule = true;
 exports.TemplateUtil = void 0;
-
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
+var _globby = _interopRequireDefault(require("globby"));
 var _path = _interopRequireDefault(require("path"));
-
 var _vtils = require("vtils");
-
 var _vscodeGenerateIndexStandalone = require("vscode-generate-index-standalone");
-
 class TemplateUtil {
   /**
    * 初始化。
@@ -20,35 +15,39 @@ class TemplateUtil {
   static async init(cwd) {
     await Promise.all([this.initHelperPackage(cwd), this.initTasks(cwd)]);
   }
+
   /**
    * 初始化辅助包。
    */
-
-
   static async initHelperPackage(cwd) {
+    const prismaClientFile = TemplateUtil.getPrismaClientTypeFile();
     const fromDir = _path.default.join(__dirname, 'templates');
-
     const toDir = _path.default.join(cwd, 'node_modules/.x');
-
-    await _fsExtra.default.copy(fromDir, toDir, {
-      overwrite: true
+    const fromFiles = await (0, _globby.default)('*', {
+      cwd: fromDir,
+      onlyFiles: true,
+      absolute: true
     });
+    await _fsExtra.default.ensureDir(toDir);
+    await Promise.all(fromFiles.map(async fromFile => {
+      const toFile = fromFile.replace(fromDir, toDir);
+      let fromFileContent = await _fsExtra.default.readFile(fromFile, 'utf-8');
+      fromFileContent = fromFileContent.replaceAll('../.prisma/client/index.d.ts', _path.default.relative(toDir, prismaClientFile)).replaceAll('../../src', _path.default.relative(toDir, `${cwd}/src`));
+      await _fsExtra.default.writeFile(toFile, fromFileContent);
+    }));
     await (0, _vscodeGenerateIndexStandalone.generateManyIndex)({
       cwd: cwd,
       patterns: ['node_modules/.x/*.ts'],
       replaceFile: true
     });
   }
+
   /**
    * 初始化任务。
    */
-
-
   static async initTasks(cwd) {
     const tasksDir = _path.default.join(cwd, 'src/tasks');
-
     const tasksIndexFile = _path.default.join(tasksDir, 'index.ts');
-
     if (!(await _fsExtra.default.pathExists(tasksIndexFile))) {
       await _fsExtra.default.outputFile(tasksIndexFile, (0, _vtils.dedent)`
           // @index(['./**/*.ts', '!**/*.test.ts', '!**/_*'], f => \`export * from '\${f.path}'\`)
@@ -56,28 +55,21 @@ class TemplateUtil {
         `);
     }
   }
+
   /**
    * 初始化模型。
    */
-
-
   static async initModels(cwd) {
     const modelsDir = _path.default.join(cwd, 'src/models');
-
     const indexFile = _path.default.join(modelsDir, 'index.ts');
-
     const indexFile2 = _path.default.join(cwd, 'node_modules/.x/models.ts');
-
-    const prismaClientFile = _path.default.join(cwd, 'node_modules/.prisma/client/index.d.ts');
-
+    const prismaClientFile = TemplateUtil.getPrismaClientTypeFile();
     const prismaClientFileContent = await _fsExtra.default.readFile(prismaClientFile, 'utf8');
     const modelNames = [...prismaClientFileContent.match(/(?<=const ModelName:).+?(?=\})/s)[0].matchAll(/(\S+?):/g)].map(match => (0, _vtils.camelCase)(match[1]));
     await Promise.all(modelNames.map(async modelName => {
       const model_name = (0, _vtils.snakeCase)(modelName);
       const ModelName = (0, _vtils.upperFirst)(modelName);
-
       const modelFile = _path.default.join(modelsDir, `${model_name}.ts`);
-
       if (!(await _fsExtra.default.pathExists(modelFile))) {
         await _fsExtra.default.outputFile(modelFile, (0, _vtils.dedent)`
               import { ${ModelName}BaseModel } from '@jayfong/x-server'
@@ -88,21 +80,26 @@ class TemplateUtil {
             `);
       }
     }));
-
     if (!(await _fsExtra.default.pathExists(indexFile))) {
       await _fsExtra.default.outputFile(indexFile, (0, _vtils.dedent)`
           // @index(['./**/*.ts', '!**/*.test.ts', '!**/_*'], f => \`export * from '\${f.path}'\`)
           // @endindex
         `);
     }
-
     await (0, _vscodeGenerateIndexStandalone.generateManyIndex)({
       cwd: cwd,
       patterns: [indexFile, indexFile2],
       replaceFile: true
     });
   }
-
+  static getPrismaClientTypeFile() {
+    // const prismaClientFile = path.join(
+    //   cwd,
+    //   'node_modules/.prisma/client/index.d.ts',
+    // )
+    // 用 require.resolve 以兼容 pnpm
+    const prismaClientFile = require.resolve('@prisma/client/package.json').replace('@prisma/client/package.json', '.prisma/client/index.d.ts');
+    return prismaClientFile;
+  }
 }
-
 exports.TemplateUtil = TemplateUtil;

package/lib/_cjs/core/define_bus.js

@@ -2,22 +2,21 @@
 
 exports.__esModule = true;
 exports.defineBus = defineBus;
-
 var _nodeEvents = require("node:events");
-
 class EventBus extends _nodeEvents.EventEmitter {
   onReturnOff(event, listener) {
     this.on(event, listener);
     return () => this.off(event, listener);
   }
-
 }
-
 function defineBus() {
   const eventEmitter = new EventBus();
   return eventEmitter;
-} // strict-event-emitter-types
+}
+
+// strict-event-emitter-types
 // https://github.com/bterlson/strict-event-emitter-types/blob/9ed45fc68a69f0b7f85ce4e5fe11ff53cc6a009e/src/index.ts
+
 // the overridden signatures need to be assignment compatible, but
 // due to how tuple types work[0] it's not possible to be assignment
 // compatible anymore. This hack fixes it with a unique symbol that
@@ -25,4 +24,8 @@ function defineBus() {
 //
 // Unfortunately, this has the result of giving a poor error message when
 // you mix up types.
-// 0: https://github.com/Microsoft/TypeScript/issues/26013)
+// 0: https://github.com/Microsoft/TypeScript/issues/26013)
+
+// TODO: Stash under a symbol key once TS compiler bug is fixed
+
+// EventEmitter method overrides

package/lib/_cjs/core/define_cron.js

@@ -2,9 +2,7 @@
 
 exports.__esModule = true;
 exports.defineCron = defineCron;
-
 var _cron = require("cron");
-
 function defineCron(options) {
   return new _cron.CronJob({
     cronTime: options.expression,

package/lib/_cjs/core/define_handler.js

@@ -2,41 +2,39 @@
 
 exports.__esModule = true;
 exports.defineHandler = defineHandler;
-
 var _handler = require("./handler");
-
 function defineHandler(options) {
-  const handler = new _handler.Handler({ ...options,
+  const handler = new _handler.Handler({
+    ...options,
     requestMethod: 'POST'
   });
   return handler;
 }
-
 defineHandler.POST = defineHandler;
-
 defineHandler.GET = options => {
-  const handler = new _handler.Handler({ ...options,
+  const handler = new _handler.Handler({
+    ...options,
     requestMethod: 'GET'
   });
   return handler;
 };
-
 defineHandler.FILE = options => {
-  const handler = new _handler.Handler({ ...options,
+  const handler = new _handler.Handler({
+    ...options,
     requestMethod: 'FILE'
   });
   return handler;
 };
-
 defineHandler.WS = options => {
-  const handler = new _handler.Handler({ ...options,
+  const handler = new _handler.Handler({
+    ...options,
     requestMethod: 'WS'
   });
   return handler;
 };
-
 defineHandler.XML = options => {
-  const handler = new _handler.Handler({ ...options,
+  const handler = new _handler.Handler({
+    ...options,
     requestMethod: 'XML'
   });
   return handler;

package/lib/_cjs/core/define_hook.js

@@ -2,9 +2,7 @@
 
 exports.__esModule = true;
 exports.defineHook = defineHook;
-
 var _handler = require("./handler");
-
 function defineHook(hook) {
   _handler.Handler.addHook(hook);
 }

package/lib/_cjs/core/define_server.js

@@ -2,9 +2,7 @@
 
 exports.__esModule = true;
 exports.defineServer = defineServer;
-
 var _server = require("./server");
-
 async function defineServer(options) {
   const server = new _server.Server(options);
   await server.start();

package/lib/_cjs/core/define_task.js

@@ -1,22 +1,17 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 exports.__esModule = true;
 exports.defineSliceTask = defineSliceTask;
 exports.defineTask = defineTask;
-
 var _assert = _interopRequireDefault(require("assert"));
-
 var _bull = _interopRequireDefault(require("bull"));
-
 var _vtils = require("vtils");
-
 var _x = require("../x");
-
 function defineTask(options) {
   const queue = new _bull.default(options.name, {
-    redis: { ..._x.x.redis.options,
+    redis: {
+      ..._x.x.redis.options,
       // https://github.com/OptimalBits/bull/issues/2186
       maxRetriesPerRequest: null,
       enableReadyCheck: false
@@ -33,7 +28,6 @@ function defineTask(options) {
   });
   return queue;
 }
-
 function defineSliceTask(options) {
   const task = defineTask({
     name: options.name,
@@ -41,7 +35,6 @@ function defineSliceTask(options) {
     handle: async data => {
       const res = data.count ? await _x.x.redis.multi([['lrange', data.redisKey, `-${data.count}`, '-1'], ['ltrim', data.redisKey, '0', `-${data.count + 1}`]]).exec() : await _x.x.redis.multi([['lrange', data.redisKey, '0', '-1'], ['del', data.redisKey]]).exec();
       const list = res[0][1].reverse().map(item => JSON.parse(item));
-
       if (list.length) {
         return options.handle(list, data.key);
       }
@@ -57,9 +50,10 @@ function defineSliceTask(options) {
       (0, _assert.default)(duration != null || threshold != null, '参数 threshold 和 duration 必须至少设置 1 个');
       const redisKey = !key ? redisKeyPrefix : `${redisKeyPrefix}_${key}`;
       const res = await _x.x.redis.multi([['llen', redisKey], ['lpush', redisKey, JSON.stringify(data)]]).exec();
-      const count = parseInt(res[0][1], 10) + 1; // 仅时段
-      // 1分钟内的合并推送
+      const count = parseInt(res[0][1], 10) + 1;
 
+      // 仅时段
+      // 1分钟内的合并推送
       if (duration != null) {
         if (count === 1) {
           await task.add({
@@ -69,7 +63,8 @@ function defineSliceTask(options) {
             delay: duration
           });
         }
-      } // 仅阈值
+      }
+      // 仅阈值
       // 满10条推送
       else if (threshold != null) {
         if (thresholdTimeout) {
@@ -83,7 +78,6 @@ function defineSliceTask(options) {
             delay: thresholdTimeout
           });
         }
-
         if (count === threshold) {
           await task.add({
             key: key,

package/lib/_cjs/core/get_handler_url.js

@@ -2,10 +2,9 @@
 
 exports.__esModule = true;
 exports.getHandlerUrl = getHandlerUrl;
-
 var _vtils = require("vtils");
-
 var _x = require("../x");
+// @ts-ignore
 
 function getHandlerUrl(path, query) {
   return `${_x.x.env.APP_URL.replace(/\/+$/, '')}${path}${query ? `?${(0, _vtils.createUrlQueryString)(query)}` : ''}`;

package/lib/_cjs/core/handler.js

@@ -1,38 +1,30 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 exports.__esModule = true;
 exports.Handler = void 0;
-
 var _lzString = _interopRequireDefault(require("lz-string"));
-
 var _vtils = require("vtils");
-
 var _dispose = require("../services/dispose");
-
 var _http_error = require("../core/http_error");
-
 var _validator = require("vtils/validator");
+// @ts-ignore
+// prettier-ignore
 
 class Handler {
   constructor(options) {
     this.options = options;
     this.requestDataSchema = void 0;
-
     this.handle = async (data, ctx) => {
       // 前置 hook
       if (Handler.hooks.length) {
         await Promise.all(Handler.hooks.map(hook => hook(this.options, data, ctx)));
       }
-
       if (this.options.requestMethod === 'WS') {
         return this.handleWs(data, ctx);
       }
-
       return this.handleHttp(data, ctx);
     };
-
     this.handleHttp = async (data, ctx) => {
       // 请求数据验证
       if (this.requestDataSchema) {
@@ -45,45 +37,40 @@ class Handler {
           throw new _http_error.HttpError.BadRequest(err.message);
         }
       }
+      let res = await this.options.handle(data, ctx);
 
-      let res = await this.options.handle(data, ctx); // 设置响应的 Content-Type 头
-
+      // 设置响应的 Content-Type 头
       if (this.options.responseContentType) {
         ctx.setHeader('Content-Type', this.options.responseContentType);
-      } // 打包返回数据
-
+      }
 
+      // 打包返回数据
       if (this.options.responseDataPack) {
         res = _vtils.DataPacker.packAsRawType(res);
-      } // 混淆返回数据
-
+      }
 
+      // 混淆返回数据
       if (this.options.responseDataObfuscate) {
         res = {
           '_#': _lzString.default.compress(JSON.stringify(res))
         };
       }
-
       return res == null ? {} : res;
     };
-
     this.handleWs = async (data, ctx) => {
       const dispose = new _dispose.DisposeService();
       ctx.ws.socket.on('message', async payload => {
         try {
           const _ = JSON.parse(payload.toString('utf8'));
-
           const send = data => {
             ctx.ws.socket.send(JSON.stringify({
               id: _.id,
               data: data
             }));
           };
-
           const process = async (type, fn) => {
             if (_.type === type) {
               let sent = false;
-
               try {
                 await fn({
                   data: _.data,
@@ -93,13 +80,11 @@ class Handler {
                   },
                   dispose: dispose
                 });
-
                 if (!sent) {
                   send();
                 }
               } catch (err) {
                 const _err = _http_error.HttpError.isHttpError(err) ? err : new _http_error.HttpError.InternalServerError();
-
                 send({
                   statusCode: _err.statusCode,
                   error: _err.name,
@@ -108,7 +93,6 @@ class Handler {
               }
             }
           };
-
           if (_.type === 'ping') {
             send();
           } else {
@@ -116,7 +100,6 @@ class Handler {
           }
         } catch (err) {
           const _err = _http_error.HttpError.isHttpError(err) ? err : new _http_error.HttpError.InternalServerError();
-
           ctx.ws.socket.send(JSON.stringify({
             statusCode: _err.statusCode,
             error: _err.name,
@@ -128,17 +111,13 @@ class Handler {
         dispose.dispose();
       });
     };
-
     if (options.requestDataSchema) {
       this.requestDataSchema = options.requestDataSchema(_validator.yup);
     }
   }
-
   static addHook(hook) {
     this.hooks.push(hook);
   }
-
 }
-
 exports.Handler = Handler;
 Handler.hooks = [];