@domain.js/main 0.7.15 → 1.0.0-alpha.10

package/.husky/pre-commit

@@ -1,8 +1,2 @@
-#!/bin/sh
-if [ ! -f "$(dirname "$0")/_/husky.sh" ]; then
-  npx husky install
-fi
-. "$(dirname "$0")/_/husky.sh"
-
 ts-node src/cli/index.ts loadDeps ./src/deps ts && npm run lint-staged && npm run build 
-npm tst
+# npm tst

package/.prettierignore

@@ -0,0 +1,34 @@
+# Dependencies
+node_modules/
+dist/
+coverage/
+
+# Build outputs
+*.min.js
+*.min.css
+
+# Lock files
+package-lock.json
+yarn.lock
+pnpm-lock.yaml
+
+# Generated files
+*.d.ts
+
+# Logs
+*.log
+
+# OS generated files
+.DS_Store
+Thumbs.db
+
+# IDE files
+.vscode/
+.idea/
+
+# Test coverage
+coverage/
+
+# Temporary files
+*.tmp
+*.temp 

package/.prettierrc

@@ -0,0 +1,11 @@
+{
+  "printWidth": 100,
+  "tabWidth": 2,
+  "useTabs": false,
+  "semi": true,
+  "singleQuote": true,
+  "trailingComma": "all",
+  "bracketSpacing": true,
+  "arrowParens": "avoid",
+  "endOfLine": "lf"
+} 

package/.vscode/extensions.json

@@ -0,0 +1,7 @@
+{
+  "recommendations": [
+    "esbenp.prettier-vscode",
+    "dbaeumer.vscode-eslint",
+    "ms-vscode.vscode-typescript-next"
+  ]
+} 

package/.vscode/settings.json

@@ -11,5 +11,31 @@
     "other": true,
     "comments": true,
     "strings": true
-  }
+  },
+  "editor.formatOnSave": true,
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "[typescript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.formatOnSave": true
+  },
+  "[javascript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.formatOnSave": true
+  },
+  "[json]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.formatOnSave": true
+  },
+  "[jsonc]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.formatOnSave": true
+  },
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": "explicit",
+    "source.organizeImports": "explicit"
+  },
+  "eslint.validate": [
+    "javascript",
+    "typescript"
+  ]
 }

package/dist/Errors/index.d.ts

@@ -6,7 +6,7 @@ export interface MyError extends Error {
 export interface ErrorFn {
     (...args: any): MyError;
 }
-declare type RemoveReadonlyArray<T extends readonly any[]> = T extends readonly (infer A)[] ? A extends readonly [infer key, any] ? key : never : never;
+type RemoveReadonlyArray<T extends readonly any[]> = T extends readonly (infer A)[] ? A extends readonly [infer key, any] ? key : never : never;
 /**
  * Convert error configuration to errors function
  * @param defines error configuration

package/dist/Errors/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Errors = void 0;
+exports.Errors = Errors;
 /**
  * Convert error configuration to errors function
  * @param defines error configuration
@@ -24,4 +24,3 @@ function Errors(defines) {
     }
     return errors;
 }
-exports.Errors = Errors;

package/dist/basic-errors.d.ts

@@ -1 +1 @@
-export declare const errors: Readonly<Record<"notFound" | "notAllowed" | "noAuth", import("./Errors").ErrorFn>>;
+export declare const errors: Readonly<Record<"notFound" | "notAllowed" | "noAuth" | "resourceDuplicateAdd", import("./Errors").ErrorFn>>;

package/dist/basic-errors.js

@@ -6,5 +6,6 @@ const defines = [
     ["notFound", "Resource not found"],
     ["notAllowed", "No access"],
     ["noAuth", "Not authentication"],
+    ["resourceDuplicateAdd", "Resource duplicate add"],
 ];
 exports.errors = Object.freeze((0, Errors_1.Errors)(defines));

package/dist/cfg/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Main = void 0;
+exports.Main = Main;
 const ajv_1 = __importDefault(require("ajv"));
 const ajv_formats_1 = __importDefault(require("ajv-formats"));
 const ajv_keywords_1 = __importDefault(require("ajv-keywords"));
@@ -28,4 +28,3 @@ function Main(object, schema) {
         return obj[key];
     };
 }
-exports.Main = Main;

package/dist/cli/index.js

@@ -2,7 +2,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -12,13 +16,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 const child_process_1 = require("child_process");
 const fs = __importStar(require("fs"));

package/dist/defaults.d.ts

@@ -1,31 +1,16 @@
 import * as ajv from "ajv";
 import * as ajvFormats from "ajv-formats";
 import ajvKeywords from "ajv-keywords";
-import * as async from "async";
-import * as axios from "axios";
 import * as cronParser from "cron-parser";
 import humanInterval from "human-interval";
 import IORedis from "ioredis";
-import _ from "lodash";
 import LRU from "lru-cache";
-import moment from "moment";
 import * as mysql from "mysql2";
 import * as Sequelize from "sequelize";
-import * as uuid from "uuid";
 import { errors } from "./basic-errors";
 import * as utils from "./utils";
 /** npm packages injection */
 export interface Defaults {
-    /**
-     * The Lodash library exported as Node.js modules.
-     * @link https://www.npmjs.com/package/lodash
-     */
-    _: typeof _;
-    /**
-     * For the creation of RFC4122 UUIDs
-     * @link https://www.npmjs.com/package/uuid
-     */
-    uuid: typeof uuid;
     /**
      * Ajv JSON schema validator
      * @link https://www.npmjs.com/package/ajv
@@ -37,17 +22,6 @@ export interface Defaults {
      */
     ajvFormats: typeof ajvFormats;
     ajvKeywords: typeof ajvKeywords;
-    /**
-     * Async is a utility module which provides straight-forward
-     * powerful functions for working with asynchronous JavaScript.
-     * @link https://www.npmjs.com/package/async
-     */
-    async: typeof async;
-    /**
-     * Promise based HTTP client for the browser and node.js
-     * @Link https://www.npmjs.com/package/axios
-     */
-    axios: typeof axios;
     /**
      * Node.js library for parsing and manipulating crontab instructions.
      * It includes support for timezones and DST transitions.
@@ -84,10 +58,6 @@ export interface Defaults {
      * @link https://www.npmjs.com/package/sequelize
      */
     Sequelize: typeof Sequelize;
-    /**
-     * A JavaScript date library for parsing, validating, manipulating, and formatting dates.
-     */
-    moment: typeof moment;
     /**
      * utils tools function
      */

package/dist/defaults.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -11,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -26,34 +40,24 @@ exports.defaults = void 0;
 const ajv = __importStar(require("ajv"));
 const ajvFormats = __importStar(require("ajv-formats"));
 const ajv_keywords_1 = __importDefault(require("ajv-keywords"));
-const async = __importStar(require("async"));
-const axios = __importStar(require("axios"));
 const cronParser = __importStar(require("cron-parser"));
 const human_interval_1 = __importDefault(require("human-interval"));
 const ioredis_1 = __importDefault(require("ioredis"));
-const lodash_1 = __importDefault(require("lodash"));
 const lru_cache_1 = __importDefault(require("lru-cache"));
-const moment_1 = __importDefault(require("moment"));
 const mysql = __importStar(require("mysql2"));
 const Sequelize = __importStar(require("sequelize"));
-const uuid = __importStar(require("uuid"));
 const basic_errors_1 = require("./basic-errors");
 const utils = __importStar(require("./utils"));
 exports.defaults = {
-    _: lodash_1.default,
-    uuid,
     ajv,
     ajvFormats,
     ajvKeywords: ajv_keywords_1.default,
-    async,
-    axios,
     cronParser,
     humanInterval: human_interval_1.default,
     IORedis: ioredis_1.default,
     LRU: lru_cache_1.default,
     mysql,
     Sequelize,
-    moment: moment_1.default,
     utils,
     U: utils,
     errors: basic_errors_1.errors,

package/dist/deps/aes/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -11,25 +15,70 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Main = void 0;
-const AES = __importStar(require("crypto-js/aes"));
-const cryptojs = __importStar(require("crypto-js/core"));
+exports.Main = Main;
+const crypto = __importStar(require("crypto"));
 function Main() {
     // aes-256-cbc encrypt
-    const encrypt = (message, key) => AES.encrypt(message, key).toString();
+    const encrypt = (message, key) => {
+        // 生成随机 IV
+        const iv = crypto.randomBytes(16);
+        // 使用 PBKDF2 从密钥生成固定长度的密钥
+        const derivedKey = crypto.pbkdf2Sync(key, "salt", 1000, 32, "sha256");
+        // 创建加密器
+        const cipher = crypto.createCipheriv("aes-256-cbc", derivedKey, iv);
+        cipher.setAutoPadding(true);
+        // 加密
+        let encrypted = cipher.update(message, "utf8", "hex");
+        encrypted += cipher.final("hex");
+        // 返回 IV + 加密数据的组合
+        const result = iv.toString("hex") + ":" + encrypted;
+        return result;
+    };
     // aes-256-cbc decrypt
-    const decrypt = (message, key) => AES.decrypt(message, key).toString(cryptojs.enc.Utf8);
+    const decrypt = (message, key) => {
+        try {
+            // 分离 IV 和加密数据
+            const parts = message.split(":");
+            if (parts.length !== 2) {
+                throw new Error("Invalid encrypted message format");
+            }
+            const iv = Buffer.from(parts[0], "hex");
+            const encrypted = parts[1];
+            // 使用相同的 PBKDF2 生成密钥
+            const derivedKey = crypto.pbkdf2Sync(key, "salt", 1000, 32, "sha256");
+            // 创建解密器
+            const decipher = crypto.createDecipheriv("aes-256-cbc", derivedKey, iv);
+            decipher.setAutoPadding(true);
+            // 解密
+            let decrypted = decipher.update(encrypted, "hex", "utf8");
+            decrypted += decipher.final("utf8");
+            return decrypted;
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : "Unknown error";
+            throw new Error("Decryption failed: " + errorMessage);
+        }
+    };
     return Object.freeze({
         encrypt,
         decrypt,
     });
 }
-exports.Main = Main;

package/dist/deps/cache/index.d.ts

@@ -1,5 +1,30 @@
-import { Cache, CnfDef, DepsDef, PubSubDef } from "./Define";
-export { After } from "./After";
-export { Before } from "./Before";
-export declare function Main(cnf: CnfDef, deps: DepsDef, pubsub?: PubSubDef): Cache;
+import { Redis, RedisOptions } from "ioredis";
+import { LRUCache } from "lru-cache";
+export interface CnfDef {
+    cache: {
+        isMulti?: boolean;
+        delSignalChannel?: string;
+    } & LRUCache.Options<{}, {}, unknown>;
+    redis?: RedisOptions;
+}
+export interface DepsDef {
+    IORedis: typeof Redis;
+    logger: {
+        info: (message: string, extra?: any) => void;
+        error: (error: Error, extra?: any) => void;
+    };
+}
+export interface Cache extends LRUCache<{}, {}, unknown> {
+    caching: <T extends (...args: any[]) => Promise<any>>(func: T, life: number, getKey: (...args: Parameters<T>) => string, hit?: (hited: boolean) => void) => T;
+    /**
+     * @deprecated use delete instead of del
+     */
+    del: (key: string) => boolean;
+    hitCount: () => {
+        hits: number;
+        misseds: number;
+    };
+    needToBroad: boolean;
+}
 export declare const Deps: string[];
+export declare function Main(cnf: CnfDef, deps: DepsDef): Cache;

package/dist/deps/cache/index.js

@@ -1,15 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Deps = exports.Main = exports.Before = exports.After = void 0;
-var After_1 = require("./After");
-Object.defineProperty(exports, "After", { enumerable: true, get: function () { return After_1.After; } });
-var Before_1 = require("./Before");
-Object.defineProperty(exports, "Before", { enumerable: true, get: function () { return Before_1.Before; } });
-function Main(cnf, deps, pubsub) {
+exports.Deps = void 0;
+exports.Main = Main;
+const lru_cache_1 = require("lru-cache");
+exports.Deps = ["logger", "LRU", "IORedis"];
+function Main(cnf, deps) {
     let hits = 0; // 击中次数
     let misseds = 0; // 未击中次数
-    const { LRU } = deps;
-    const lru = new LRU(cnf.cache);
+    const { logger, IORedis } = deps;
+    const lru = new lru_cache_1.LRUCache(cnf.cache);
     const isFunction = (arg) => typeof arg === "function";
     function caching(func, life, getKey, hit) {
         if (!isFunction(func))
@@ -32,19 +31,41 @@ function Main(cnf, deps, pubsub) {
                 hit(false);
             misseds += 1;
             const res = await func(...args);
-            lru.set(key, res, life);
+            lru.set(key, res, { ttl: life });
             return res;
         };
         return wrapped;
     }
     const hitCount = () => ({ hits, misseds });
-    const needToBroad = Boolean(pubsub);
+    const needToBroad = Boolean(cnf.cache.isMulti);
+    // 如果不是多节点分部署部署，则不需要处理
+    // 开启多节点分布式部署后，要通过redis广播cache的del事件，依次来保持cache的有效性
+    if (needToBroad && cnf.redis) {
+        const pub = new IORedis(cnf.redis);
+        const sub = new IORedis(cnf.redis);
+        const { delSignalChannel = "LRU_DEL_SIGNAL_CHANNEL" } = cnf.cache;
+        sub.subscribe(delSignalChannel, (err, count) => {
+            logger.info("cache.redis.subscribe", { chanels: delSignalChannel, count });
+            if (err)
+                return logger.error(err);
+            return logger.info(`cache.redis.subscribe succeed, channel count: ${count}`);
+        });
+        const del = lru.delete.bind(lru);
+        lru.delete = (key) => {
+            del(key);
+            pub.publish(delSignalChannel, key);
+            return true;
+        };
+        sub.on("message", async (channel, key) => {
+            if (channel === delSignalChannel)
+                del(key);
+        });
+    }
     const cache = Object.assign(lru, {
+        del: lru.delete.bind(lru),
         caching,
         hitCount,
-        needToBroad,
+        needToBroad: Boolean(cnf.cache.isMulti),
     });
     return cache;
 }
-exports.Main = Main;
-exports.Deps = ["logger", "LRU", "IORedis"];

package/dist/deps/counter/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Deps = exports.Main = void 0;
+exports.Deps = void 0;
+exports.Main = Main;
 function Main(cnf, deps) {
     const { counter: { key: REDIS_KEY }, } = cnf;
     const { redis } = deps;
@@ -38,5 +39,4 @@ function Main(cnf, deps) {
     };
     return { mget, get, set, incr, decr };
 }
-exports.Main = Main;
 exports.Deps = ["redis"];

package/dist/deps/cron/index.d.ts

@@ -1,4 +1,4 @@
-import * as cronParser from "cron-parser";
+import { CronExpressionParser } from "cron-parser";
 import human = require("human-interval");
 interface Cnf {
     cron?: {
@@ -14,7 +14,7 @@ interface callbackArg {
     cronJob: [Error | null, any, number];
 }
 interface Deps {
-    cronParser: typeof cronParser;
+    cronParser: typeof CronExpressionParser;
     humanInterval: typeof human;
     myCia: {
         regist: (name: string, validator: any, waiters: waiter[]) => void;
@@ -28,7 +28,7 @@ interface Deps {
  */
 export declare const timeout: (fn: Function, timeoutMS: number) => void;
 export declare function Main(cnf: Cnf, deps: Deps): {
-    regist: (name: string, intervalStr: string, startAt?: string | undefined) => void;
+    regist: (name: string, intervalStr: string, startAt?: string) => void;
     start: () => void;
     getStats: () => {
         name: string;

package/dist/deps/cron/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Deps = exports.Main = exports.timeout = void 0;
+exports.Deps = exports.timeout = void 0;
+exports.Main = Main;
 /**
  * 定时执行函数, 解决 setTimeout 第二个参数不能大于 2147483647 的问题
  * @param fn 要执行的函数
@@ -20,7 +21,7 @@ exports.timeout = timeout;
 function Main(cnf, deps) {
     const { cron = {} } = cnf;
     const ciaTaskType = "cronJob";
-    const { myCia, humanInterval: human, cronParser: parser } = deps;
+    const { myCia, humanInterval: human, cronParser: CronParser } = deps;
     const { tz = "Asia/Shanghai" } = cron;
     // 注册信息
     const registed = {};
@@ -28,7 +29,7 @@ function Main(cnf, deps) {
     let startedAt;
     // 计算具体下次执行还有多少毫秒
     const calcNextMS = (intervalStr) => {
-        const interval = human(intervalStr) || parser.parseExpression(intervalStr, { tz });
+        const interval = human(intervalStr) || CronParser.parse(intervalStr, { tz });
         if (typeof interval === "number")
             return interval;
         //  *    *    *    *    *    *
@@ -108,5 +109,4 @@ function Main(cnf, deps) {
     };
     return { regist, start, getStats };
 }
-exports.Main = Main;
 exports.Deps = ["myCia", "humanInterval", "cronParser"];

package/dist/deps/defines.d.ts

@@ -1,6 +1,5 @@
 import * as aes from "./aes";
 import * as cache from "./cache";
-import * as checker from "./checker";
 import * as counter from "./counter";
 import * as cron from "./cron";
 import * as frequency from "./frequency";
@@ -18,7 +17,6 @@ import * as signer from "./signer";
 declare const _default: {
     aes: typeof aes;
     cache: typeof cache;
-    checker: typeof checker;
     counter: typeof counter;
     cron: typeof cron;
     frequency: typeof frequency;