alemonjs 2.1.83-alpha.1 → 2.1.83-alpha.2

package/lib/{cbp/connects/platform.js → platform/cbp-platform.js}

@@ -1,14 +1,15 @@
 import * as flattedJSON from 'flatted';
 import { WebSocket } from 'ws';
-import { deviceId } from '../processor/config.js';
-import { ResultCode } from '../../core/variable.js';
 import 'fs';
 import 'path';
 import 'yaml';
-import { sanitizeForSerialization } from '../../core/utils.js';
-import { createWSConnector } from './base.js';
-import { createDirectClient } from '../../process/direct-channel.js';
-import { createEventEnvelope, normalizeInboundMessage, isNormalizedApiRequest, toLegacyApiData, createApiResponseEnvelope, isNormalizedActionRequest, toLegacyActionData, createActionResponseEnvelope } from '../normalize.js';
+import '../common/logger.js';
+import { ResultCode } from '../common/variable.js';
+import { sanitizeForSerialization } from '../common/utils.js';
+import { createDirectClient } from '../common/direct-channel.js';
+import { deviceId } from '../common/cbp/runtime.js';
+import { createWSConnector } from '../common/cbp/ws-connector.js';
+import { createEventEnvelope, normalizeInboundMessage, isNormalizedApiRequest, toLegacyApiData, isNormalizedActionRequest, toLegacyActionData, createApiResponseEnvelope, createActionResponseEnvelope } from '../common/cbp/normalize.js';
 
 const dispatchLegacyActionHandlers = (actionReplys, replyAction, input) => {
     const normalized = normalizeInboundMessage(input);
@@ -224,12 +225,11 @@ const cbpPlatform = (url, options = {
             }
         }
     });
-    const client = {
+    return {
         send,
         onactions,
         onapis
     };
-    return client;
 };
 
 export { cbpPlatform };

package/lib/{app → platform}/define-platform.js

@@ -1,3 +1,5 @@
+import { logger } from '../common/logger.js';
+
 const definePlatform = (options) => {
     const platformName = options.name || process.env.platform || 'unknown';
     const mainProcess = () => {

package/lib/platform/event-value.d.ts

@@ -0,0 +1,7 @@
+type BaseMap = {
+    [key: string]: unknown;
+};
+export declare const createEventValue: <T extends keyof R, R extends BaseMap>(event: {
+    value: R[T];
+}) => R[T];
+export {};

package/lib/platform/event-value.js

@@ -0,0 +1,5 @@
+const createEventValue = (event) => {
+    return event.value;
+};
+
+export { createEventValue };

package/lib/platform/index.d.ts

@@ -0,0 +1,5 @@
+export * from '../types/index.js';
+export { definePlatform } from './define-platform.js';
+export { cbpPlatform } from './cbp-platform.js';
+export { FormatEvent, wrapEvent } from './event-format.js';
+export { createEventValue } from './event-value.js';

package/lib/platform/index.js

@@ -0,0 +1,5 @@
+export { ActionsEventEnum } from '../types/event/actions.js';
+export { definePlatform } from './define-platform.js';
+export { cbpPlatform } from './cbp-platform.js';
+export { FormatEvent, wrapEvent } from './event-format.js';
+export { createEventValue } from './event-value.js';

package/lib/types/client/index.d.ts

@@ -1,4 +1,4 @@
-import { Result } from '../../core/utils';
+import { Result } from '../../common/result';
 import { User } from '../event/base/user';
 import { EventKeys, Events } from '../event/map';
 import { DataEnums } from '../message';

package/lib/types/event/index.d.ts

@@ -2,7 +2,7 @@ import { ChildrenCycle, Next } from '../cycle';
 import { ClientAPI } from '../client';
 import { EventKeys, Events } from './map';
 import { DataEnums } from '../message';
-import { Expose } from '../../app/expose';
+import { Expose } from '../../application/expose';
 import type KoaRouter from 'koa-router';
 export type Current<T extends EventKeys> = (event: Events[T], next: Next) => Promise<boolean | void | undefined> | boolean | void | undefined;
 export type OnResponseValue<C, T extends EventKeys> = {

package/lib/types/subscribe/index.d.ts

@@ -1,4 +1,4 @@
-import { SinglyLinkedList } from '../../app/SinglyLinkedList';
+import { SinglyLinkedList } from '../../common/SinglyLinkedList';
 import { EventCycleEnum } from '../cycle';
 import { EventKeys } from '../event/map';
 export type SubscribeValue = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "2.1.83-alpha.1",
+  "version": "2.1.83-alpha.2",
   "description": "bot script",
   "author": "lemonade",
   "license": "MIT",
@@ -22,6 +22,26 @@
       "types": "./lib/utils.d.ts",
       "require": "./lib/utils.js"
     },
+    "./platform": {
+      "import": "./lib/platform/index.js",
+      "types": "./lib/platform/index.d.ts",
+      "require": "./lib/platform/index.js"
+    },
+    "./common": {
+      "import": "./lib/common/index.js",
+      "types": "./lib/common/index.d.ts",
+      "require": "./lib/common/index.js"
+    },
+    "./core": {
+      "import": "./lib/core/index.js",
+      "types": "./lib/core/index.d.ts",
+      "require": "./lib/core/index.js"
+    },
+    "./application": {
+      "import": "./lib/application/index.js",
+      "types": "./lib/application/index.d.ts",
+      "require": "./lib/application/index.js"
+    },
     "./env": {
       "types": "./lib/global.d.ts"
     }
@@ -57,6 +77,7 @@
     "@types/uuid": "^10.0.0"
   },
   "bin": {
+    "alemonjs": "./bin/alemonjs.js",
     "alemonc": "./bin/alemonc.js"
   },
   "keywords": [

package/lib/app/api/schedule.d.ts

@@ -1,17 +0,0 @@
-import { ScheduleCallback, CronExpression } from '../../types/schedule';
-export declare const setInterval: (callback: ScheduleCallback, ms: number) => string;
-export declare const setTimeout: (callback: ScheduleCallback, ms: number) => string;
-export declare const setCron: (expression: CronExpression, callback: ScheduleCallback) => string;
-export declare const clearInterval: (id: import("../..").ScheduleId) => boolean;
-export declare const clearTimeout: (id: import("../..").ScheduleId) => boolean;
-export declare const pauseSchedule: (id: import("../..").ScheduleId) => boolean;
-export declare const resumeSchedule: (id: import("../..").ScheduleId) => boolean;
-export declare const listSchedule: (appName?: string) => Array<{
-    id: import("../..").ScheduleId;
-    type: import("../..").ScheduleItem["type"];
-    status: import("../..").ScheduleStatus;
-    ms?: number;
-    cron?: string;
-    appName?: string;
-    createdAt: number;
-}>;

package/lib/app/index.d.ts

@@ -1,25 +0,0 @@
-export * from './store.js';
-export * from './expose.js';
-export * from './load_modules/index.js';
-export * from './define-children.js';
-export * from './define-platform.js';
-export * from './define-response.js';
-export * from './define-middleware.js';
-export * from './define-router.js';
-export * from './event-format.js';
-export * from './event-group.js';
-export * from './event-middleware';
-export * from './event-processor';
-export * from './event-response.js';
-export * from './event-processor-cycle.js';
-export * from './event-processor-event.js';
-export * from './event-processor-middleware.js';
-export * from './event-processor-subscribe.js';
-export * from './hook-use/index.js';
-export * from './api/schedule.js';
-export * from './hook-event-context.js';
-export * from './schedule-store.js';
-export * from './event-utils.js';
-export * from './message-api.js';
-export * from './message-format.js';
-export * from './router/main.js';

package/lib/app/index.js

@@ -1,47 +0,0 @@
-export { ChildrenApp, Core, Logger, Middleware, MiddlewareRouter, MiddlewareTree, ProcessorEventAutoClearMap, ProcessorEventUserAutoClearMap, Response, ResponseMiddleware, ResponseRouter, ResponseTree, State, StateSubscribe, SubscribeList, bumpStoreVersion, clearRuntimeAppKoaRouters, core, disposeAllRuntimeApps, disposeRuntimeApp, getChildrenApp, getRuntimeApp, getRuntimeAppKoaRouters, getSubscribeList, hasRuntimeAppCapability, listChildrenApps, listRuntimeAppKoaRouters, listRuntimeApps, logger, registerRuntimeApp, setRuntimeAppKoaRouters, toRuntimeAppSnapshot, updateRuntimeAppCapabilities, updateRuntimeAppStatus } from './store.js';
-export { Expose, clearAllExpose, disposeExpose, registerExpose } from './expose.js';
-export { loadModels, run } from './load_modules/load.js';
-export { loadChildren, loadChildrenFile } from './load_modules/loadChild.js';
-export { defineChildren } from './define-children.js';
-export { definePlatform } from './define-platform.js';
-export { defineResponse } from './define-response.js';
-export { defineMiddleware } from './define-middleware.js';
-export { defineRouter, lazy, runHandler } from './define-router.js';
-export { FormatEvent, wrapEvent } from './event-format.js';
-export { onGroup } from './event-group.js';
-export { OnMiddleware, onMiddleware } from './event-middleware.js';
-export { OnProcessor, onProcessor } from './event-processor.js';
-export { OnResponse, onResponse } from './event-response.js';
-export { expendCycle } from './event-processor-cycle.js';
-export { expendEvent } from './event-processor-event.js';
-export { expendMiddleware } from './event-processor-middleware.js';
-export { expendSubscribe, expendSubscribeCreate, expendSubscribeMount, expendSubscribeUnmount } from './event-processor-subscribe.js';
-export { useAnnounce } from './hook-use/announce.js';
-export { useChannel } from './hook-use/channel.js';
-export { useClient } from './hook-use/client.js';
-export { useGuild } from './hook-use/guild.js';
-export { useHistory } from './hook-use/history.js';
-export { useMedia } from './hook-use/media.js';
-export { useMe } from './hook-use/me.js';
-export { useMember } from './hook-use/member.js';
-export { useMention } from './hook-use/mention.js';
-export { useMessage, useSend, useSends } from './hook-use/message.js';
-export { usePermission } from './hook-use/permission.js';
-export { useReaction } from './hook-use/reaction.js';
-export { useRequest } from './hook-use/request.js';
-export { useRole } from './hook-use/role.js';
-export { useRoute } from './hook-use/route.js';
-export { useUser } from './hook-use/user.js';
-export { useObserver, useSubscribe } from './hook-use/subscribe.js';
-export { createEvent, useEvent } from './hook-use/event.js';
-export { clearInterval, clearTimeout, listSchedule, pauseSchedule, resumeSchedule, setCron, setInterval, setTimeout } from './api/schedule.js';
-export { finishCurrentTrace, getCurrentAppName, getCurrentEvent, getCurrentNext, getCurrentPhase, markEventSendAttempt, markEventSendFailure, markEventSendSuccess, recordEventSendResults, withEventContext, withProcessorTrace } from './hook-event-context.js';
-export { registerAppDir, scheduleCancel, scheduleCancelAll, scheduleCancelByApp, scheduleCron, scheduleInterval, scheduleList, schedulePause, scheduleResume, scheduleTimeout, unregisterAppDir } from './schedule-store.js';
-export { createEventValue, createSelects, onSelects, onState, unChildren, unState, useState } from './event-utils.js';
-export { MessageDirect, createDataFormat, format, getMessageIntent, sendToChannel, sendToUser } from './message-api.js';
-export { Format, FormatButtonGroup, FormatMarkDown, FormatSelect } from './message-format.js';
-export { Router } from './router/dsl.js';
-export { checkFallbackHint } from './router/fallback.js';
-export { normalizeRoutePath, parseMessageText } from './router/parser.js';
-export { validateRouteArgs } from './router/validator.js';
-export { Attachment, Audio, BT, Button, Image, ImageFile, ImageURL, Link, MD, Markdown, MarkdownOriginal, Mention, Text, Video } from './message-format-old.js';

package/lib/cbp/index.d.ts

@@ -1,3 +0,0 @@
-export { cbpClient } from './connects/client.js';
-export { cbpPlatform } from './connects/platform.js';
-export { cbpServer } from './server/main.js';

package/lib/cbp/index.js

@@ -1,3 +0,0 @@
-export { cbpClient } from './connects/client.js';
-export { cbpPlatform } from './connects/platform.js';
-export { cbpServer } from './server/main.js';

package/lib/cbp/processor/actions.d.ts

@@ -1,3 +0,0 @@
-import { Result } from '../../core';
-import type { Actions } from '../../types';
-export declare const sendAction: (data: Actions) => Promise<Result[]>;

package/lib/cbp/processor/api.d.ts

@@ -1,3 +0,0 @@
-import { Result } from '../../core';
-import type { Apis } from '../../types';
-export declare const sendAPI: (data: Apis) => Promise<Result[]>;

package/lib/cbp/processor/config.d.ts

@@ -1,33 +0,0 @@
-import { WebSocket } from 'ws';
-import { Result } from '../../core';
-export declare const childrenClient: Map<string, WebSocket>;
-export declare const platformClient: Map<string, WebSocket>;
-export declare const fullClient: Map<string, WebSocket>;
-export declare const deviceId: `${string}-${string}-${string}-${string}-${string}`;
-export declare const USER_AGENT_HEADER = "user-agent";
-export declare const USER_AGENT_HEADER_VALUE_MAP: {
-    platform: string;
-    client: string;
-    testone: string;
-};
-export declare const DEVICE_ID_HEADER = "x-device-id";
-export declare const FULL_RECEIVE_HEADER = "x-full-receive";
-type RequestReplyValue = Result[] | PromiseLike<Result[]>;
-type RequestReplyResolve = (value: RequestReplyValue) => void;
-export declare const actionRequestResolves: Map<string, RequestReplyResolve>;
-export declare const apiRequestResolves: Map<string, RequestReplyResolve>;
-export declare const actionRequestTimeouts: Map<string, NodeJS.Timeout>;
-export declare const apiRequestTimeouts: Map<string, NodeJS.Timeout>;
-export declare const actionResolves: Map<string, RequestReplyResolve>;
-export declare const apiResolves: Map<string, RequestReplyResolve>;
-export declare const actionTimeouts: Map<string, NodeJS.Timeout>;
-export declare const apiTimeouts: Map<string, NodeJS.Timeout>;
-export declare const childrenBind: Map<string, string>;
-export declare const clientBindCount: Map<string, number>;
-export declare const bindChannelToClient: (channelId: string, clientId: string) => void;
-export declare const unbindClient: (clientId: string) => void;
-export declare const generateUniqueId: () => string;
-export declare const timeoutTime: number;
-export declare const reconnectInterval: number;
-export declare const HEARTBEAT_INTERVAL: number;
-export {};

package/lib/cbp/processor/config.js

@@ -1,56 +0,0 @@
-import { randomUUID } from 'node:crypto';
-
-const childrenClient = new Map();
-const platformClient = new Map();
-const fullClient = new Map();
-const deviceId = randomUUID();
-const USER_AGENT_HEADER = 'user-agent';
-const USER_AGENT_HEADER_VALUE_MAP = {
-    platform: 'platform',
-    client: 'client',
-    testone: 'testone'
-};
-const DEVICE_ID_HEADER = 'x-device-id';
-const FULL_RECEIVE_HEADER = 'x-full-receive';
-const actionRequestResolves = new Map();
-const apiRequestResolves = new Map();
-const actionRequestTimeouts = new Map();
-const apiRequestTimeouts = new Map();
-const actionResolves = actionRequestResolves;
-const apiResolves = apiRequestResolves;
-const actionTimeouts = actionRequestTimeouts;
-const apiTimeouts = apiRequestTimeouts;
-const childrenBind = new Map();
-const clientBindCount = new Map();
-const bindChannelToClient = (channelId, clientId) => {
-    const oldClientId = childrenBind.get(channelId);
-    if (oldClientId && oldClientId !== clientId) {
-        const oldCount = clientBindCount.get(oldClientId) ?? 0;
-        if (oldCount > 1) {
-            clientBindCount.set(oldClientId, oldCount - 1);
-        }
-        else {
-            clientBindCount.delete(oldClientId);
-        }
-    }
-    childrenBind.set(channelId, clientId);
-    clientBindCount.set(clientId, (clientBindCount.get(clientId) ?? 0) + 1);
-};
-const unbindClient = (clientId) => {
-    for (const [channelId, boundClientId] of childrenBind.entries()) {
-        if (boundClientId === clientId) {
-            childrenBind.delete(channelId);
-        }
-    }
-    clientBindCount.delete(clientId);
-};
-let _idCounter = 0;
-const _idPrefix = process.pid.toString(36) + Date.now().toString(36);
-const generateUniqueId = () => {
-    return _idPrefix + (++_idCounter).toString(36);
-};
-const timeoutTime = 1000 * 60 * 3;
-const reconnectInterval = 1000 * 6;
-const HEARTBEAT_INTERVAL = 1000 * 18;
-
-export { DEVICE_ID_HEADER, FULL_RECEIVE_HEADER, HEARTBEAT_INTERVAL, USER_AGENT_HEADER, USER_AGENT_HEADER_VALUE_MAP, actionRequestResolves, actionRequestTimeouts, actionResolves, actionTimeouts, apiRequestResolves, apiRequestTimeouts, apiResolves, apiTimeouts, bindChannelToClient, childrenBind, childrenClient, clientBindCount, deviceId, fullClient, generateUniqueId, platformClient, reconnectInterval, timeoutTime, unbindClient };

package/lib/process/index.d.ts

@@ -1,4 +0,0 @@
-export * from './module';
-export * from './platform';
-export * from './ipc-bridge';
-export * from './direct-channel';