alemonjs 2.1.47 → 2.1.48

package/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2013-present, Yuxi (Evan) You
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIdED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

package/lib/app/event-processor.js

@@ -2,7 +2,7 @@ import { getConfigValue } from '../core/config.js';
 import { processorRepeatedClearTimeMin, processorRepeatedClearTimeMax, processorRepeatedEventTime, processorRepeatedUserTime, processorRepeatedClearSize, processorMaxMapSize } from '../core/variable.js';
 import { expendCycle } from './event-processor-cycle.js';
 import { ProcessorEventAutoClearMap, ProcessorEventUserAutoClearMap } from './store.js';
-import { getCachedRegExp, fastHash } from '../core/utils.js';
+import { getCachedRegExp, matchIn, fastHash } from '../core/utils.js';
 
 const filter = ({ Now, store, INTERVAL }, MessageId) => {
     if (store.has(MessageId)) {
@@ -69,12 +69,12 @@ const onProcessor = (name, event, data) => {
     if (disabledSelects[name]) {
         return;
     }
-    const disabledUserId = value?.disabled_user_id ?? {};
-    if (event['UserId'] && disabledUserId[event['UserId']]) {
+    const disabledUserId = value?.disabled_user_id;
+    if (event['UserId'] && matchIn(disabledUserId, event['UserId'])) {
         return;
     }
-    const disabledUserKey = value?.disabled_user_key ?? {};
-    if (event['UserKey'] && disabledUserKey[event['UserKey']]) {
+    const disabledUserKey = value?.disabled_user_key;
+    if (event['UserKey'] && matchIn(disabledUserKey, event['UserKey'])) {
         return;
     }
     const redirectRegular = value?.redirect_regular ?? value?.redirect_text_regular;
@@ -98,20 +98,20 @@ const onProcessor = (name, event, data) => {
             }
         }
     }
-    const masterId = value?.master_id ?? {};
-    const masterKey = value?.master_key ?? {};
-    if (event['UserId'] && masterId[event['UserId']]) {
+    const masterId = value?.master_id;
+    const masterKey = value?.master_key;
+    if (event['UserId'] && matchIn(masterId, event['UserId'])) {
         event['isMaster'] = true;
     }
-    else if (event['UserKey'] && masterKey[event['UserKey']]) {
+    else if (event['UserKey'] && matchIn(masterKey, event['UserKey'])) {
         event['isMaster'] = true;
     }
-    const botId = value?.bot_id ?? {};
-    const botKey = value?.bot_key ?? {};
-    if (event['UserId'] && botId[event['UserId']]) {
+    const botId = value?.bot_id;
+    const botKey = value?.bot_key;
+    if (event['UserId'] && matchIn(botId, event['UserId'])) {
         event['isBot'] = true;
     }
-    else if (event['UserKey'] && botKey[event['UserKey']]) {
+    else if (event['UserKey'] && matchIn(botKey, event['UserKey'])) {
         event['isBot'] = true;
     }
     const Now = Date.now();

package/lib/app/message-format-old.d.ts

@@ -32,7 +32,7 @@ declare const Markdown: {
     italic(text: string): DataMarkdownItalic;
     italicStar(text: string): DataMarkdownItalicStar;
     strikethrough(text: string): DataMarkdownStrikethrough;
-    link(text: string, url: string): DataMarkdownLink;
+    link(text: string, url?: string): DataMarkdownLink;
     image(url: string, options?: {
         width?: number;
         height?: number;
@@ -56,7 +56,7 @@ export declare const MD: {
     italic(text: string): DataMarkdownItalic;
     italicStar(text: string): DataMarkdownItalicStar;
     strikethrough(text: string): DataMarkdownStrikethrough;
-    link(text: string, url: string): DataMarkdownLink;
+    link(text: string, url?: string): DataMarkdownLink;
     image(url: string, options?: {
         width?: number;
         height?: number;

package/lib/core/config.d.ts

@@ -1,6 +1,43 @@
 import type { Package } from '../types';
 type ConfigValue = {
     [key: string]: any;
+    master_key?: {
+        [key: string]: boolean;
+    } | string[];
+    master_id?: {
+        [key: string]: boolean;
+    } | string[];
+    bot_key?: {
+        [key: string]: boolean;
+    } | string[];
+    bot_id?: {
+        [key: string]: boolean;
+    } | string[];
+    disabled_text_regular?: string;
+    disabled_selects?: {
+        [key: string]: boolean;
+    };
+    disabled_user_id?: {
+        [key: string]: boolean;
+    } | string[];
+    disabled_user_key?: {
+        [key: string]: boolean;
+    } | string[];
+    redirect_regular?: string;
+    redirect_target?: string;
+    redirect_text_regular?: string;
+    redirect_text_target?: string;
+    mapping_text?: {
+        regular?: string;
+        target?: string;
+    }[];
+    processor?: {
+        repeated_event_time?: number;
+        repeated_user_time?: number;
+    };
+    apps?: string[] | {
+        [key: string]: boolean;
+    };
 };
 type ConfigListener<T extends ConfigValue = ConfigValue> = (value: T) => void;
 declare class ConfigCore<T extends ConfigValue = ConfigValue> {

package/lib/core/index.js

@@ -1,3 +1,3 @@
 export { ResultCode } from './variable.js';
 export { getConfig, getConfigValue, onWatchConfigValue } from './config.js';
-export { createEventName, createHash, createResult, createUserHashKey, fastHash, getCachedRegExp, getInputExportPath, getRecursiveDirFiles, isMaster, sanitizeForSerialization, showErrorModule, stringToNumber, useUserHashKey } from './utils.js';
+export { createEventName, createHash, createResult, createUserHashKey, fastHash, getCachedRegExp, getInputExportPath, getRecursiveDirFiles, isMaster, matchIn, sanitizeForSerialization, showErrorModule, stringToNumber, useUserHashKey } from './utils.js';

package/lib/core/utils.d.ts

@@ -14,7 +14,8 @@ export declare const useUserHashKey: (event: {
     UserId: string;
     Platform: string;
 }) => string;
-export declare const isMaster: (UserId: string, platform: string) => any;
+export declare const matchIn: (source: any, key: string) => boolean;
+export declare const isMaster: (UserId: string, platform: string) => boolean;
 export declare const createEventName: (url: string, appKey: string) => string;
 export declare const stringToNumber: (str: string, size?: number) => number;
 export declare const getRecursiveDirFiles: (dir: string, condition?: (func: Dirent) => boolean) => {

package/lib/core/utils.js

@@ -37,20 +37,23 @@ const createUserHashKey = (event) => {
     return fastHash(`${event.Platform}:${event.UserId}`);
 };
 const useUserHashKey = createUserHashKey;
+const matchIn = (source, key) => {
+    if (Array.isArray(source)) {
+        return source.includes(key);
+    }
+    if (source && typeof source === 'object') {
+        return Object.prototype.hasOwnProperty.call(source, key) && !!source[key];
+    }
+    return false;
+};
 const isMaster = (UserId, platform) => {
     const values = getConfigValue() || {};
-    const mainMasterKey = values.master_key || [];
-    const mainMasterId = values.master_id || [];
-    const value = values[platform] || {};
-    const masterKey = value.master_key || [];
-    const masterId = value.master_id || [];
+    const value = values[platform] && typeof values[platform] === 'object' ? values[platform] : {};
     const UserKey = createUserHashKey({
         Platform: platform,
         UserId: UserId
     });
-    const cMaster = mainMasterKey.concat(masterKey);
-    const cMasterId = mainMasterId.concat(masterId);
-    return cMaster.includes(UserKey) || cMasterId.includes(UserId);
+    return matchIn(values.master_key, UserKey) || matchIn(values.master_id, UserId) || matchIn(value.master_key, UserKey) || matchIn(value.master_id, UserId);
 };
 const createEventName = (url, appKey) => {
     let uri = url;
@@ -152,4 +155,4 @@ const createResult = (code, message, data) => {
     };
 };
 
-export { createEventName, createHash, createResult, createUserHashKey, fastHash, getCachedRegExp, getInputExportPath, getRecursiveDirFiles, isMaster, sanitizeForSerialization, showErrorModule, stringToNumber, useUserHashKey };
+export { createEventName, createHash, createResult, createUserHashKey, fastHash, getCachedRegExp, getInputExportPath, getRecursiveDirFiles, isMaster, matchIn, sanitizeForSerialization, showErrorModule, stringToNumber, useUserHashKey };

package/lib/global.d.ts

@@ -1,7 +1,9 @@
-import type { DefineChildrenFunc, OnResponseReversalFunc, OnMiddlewareReversalFunc, OnSelectsFunc, OnDataFormatFunc, OnResponseReversalFuncBack, OnGroupFunc, OnMiddlewareReversalFuncBack, DefineResponseFunc, defineMiddlewareFunc, StoreChildrenApp, StateSubscribeMap, SubscribeKeysMap, LoggerUtils, ResponseState } from './types';
+import type { DefineChildrenFunc, OnResponseReversalFunc, OnMiddlewareReversalFunc, OnSelectsFunc, OnDataFormatFunc, OnResponseReversalFuncBack, OnGroupFunc, OnMiddlewareReversalFuncBack, DefineResponseFunc, defineMiddlewareFunc, StoreChildrenApp, StateSubscribeMap, SubscribeKeysMap, LoggerUtils, ResponseState, StartOptions } from './types';
 import WebSocket, { Server } from 'ws';
 import { IncomingMessage } from 'http';
 declare global {
+    var __config: any;
+    var __options: StartOptions;
     var logger: LoggerUtils;
     var alemonjsCore: {
         storeState: ResponseState;

package/lib/index.js

@@ -1,7 +1,7 @@
 export { ActionsEventEnum } from './types/event/actions.js';
 export { ResultCode } from './core/variable.js';
 export { getConfig, getConfigValue, onWatchConfigValue } from './core/config.js';
-export { createEventName, createHash, createResult, createUserHashKey, fastHash, getCachedRegExp, getInputExportPath, getRecursiveDirFiles, isMaster, sanitizeForSerialization, showErrorModule, stringToNumber, useUserHashKey } from './core/utils.js';
+export { createEventName, createHash, createResult, createUserHashKey, fastHash, getCachedRegExp, getInputExportPath, getRecursiveDirFiles, isMaster, matchIn, sanitizeForSerialization, showErrorModule, stringToNumber, useUserHashKey } from './core/utils.js';
 export { cbpClient } from './cbp/connects/client.js';
 export { cbpPlatform } from './cbp/connects/platform.js';
 export { cbpServer } from './cbp/server/main.js';

package/lib/types/message/markdown.d.ts

@@ -51,7 +51,7 @@ export type DataMarkdownLink = {
     type: 'MD.link';
     value: {
         text: string;
-        url: string;
+        url?: string;
     };
 };
 export type DataMarkdownImage = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "2.1.47",
+  "version": "2.1.48",
   "description": "bot script",
   "author": "lemonade",
   "license": "MIT",
@@ -69,5 +69,5 @@
     "type": "git",
     "url": "https://github.com/lemonade-lab/alemonjs.git"
   },
-  "gitHead": "c6aa5616afe091a37610dad22fbb2d2618d943b8"
-}
+  "gitHead": "e50477125586204c6e56a8ecfe3391136f5fe74b"
+}