@pisell/pisellos 3.0.74 → 3.0.76

package/dist/plugins/app-types/socket/socket.d.ts

@@ -0,0 +1,129 @@
+import { SocketOptions, SocketStatus } from "./types";
+import { SocketMonitor, SocketMonitorOptions } from "./monitor";
+/**
+ * Socket主类
+ * 负责管理WebSocket连接、消息收发、事件处理、心跳检测和断线重连
+ */
+export declare class Socket {
+    private ws;
+    private url;
+    private options;
+    private status;
+    private eventHandlers;
+    private heartbeatManager;
+    private reconnectManager;
+    private monitor;
+    private messageIdCounter;
+    /**
+     * 创建Socket实例
+     * @param options Socket配置选项
+     */
+    constructor(options: SocketOptions);
+    /**
+     * 建立WebSocket连接
+     */
+    connect(): Promise<void>;
+    /**
+     * 关闭WebSocket连接
+     */
+    disconnect(): void;
+    /**
+     * 发送消息到服务器
+     * @param event 事件名称
+     * @param data 消息数据
+     * @param id 消息ID（可选，默认自动生成）
+     */
+    send(type: string, data?: any, id?: string): void;
+    /**
+     * 发送原始消息
+     * @param message 消息对象
+     */
+    private sendRaw;
+    /**
+     * 注册事件监听器
+     * @param event 事件名称
+     * @param handler 事件处理函数
+     */
+    on(event: string, handler: (...args: any[]) => void): void;
+    /**
+     * 移除事件监听器
+     * @param event 事件名称
+     * @param handler 事件处理函数（可选，不提供则移除所有该事件的处理函数）
+     */
+    off(event: string, handler?: (...args: any[]) => void): void;
+    /**
+     * 触发事件
+     * @param event 事件名称
+     * @param args 事件参数
+     */
+    private emit;
+    /**
+     * 获取当前连接状态
+     */
+    getStatus(): SocketStatus;
+    /**
+     * 获取当前状态描述
+     */
+    getStatusText(): string;
+    /**
+     * 检查是否已连接
+     */
+    isConnected(): boolean;
+    /**
+     * 设置连接状态
+     */
+    private setStatus;
+    /**
+     * 设置WebSocket事件监听器
+     */
+    private setupWebSocketListeners;
+    /**
+     * 处理接收到的消息
+     */
+    private handleMessage;
+    /**
+     * 处理连接关闭
+     */
+    private handleConnectionClosed;
+    /**
+     * 处理连接失败
+     */
+    private handleConnectionFailure;
+    /**
+     * 处理心跳响应
+     */
+    private handleHeartbeatResponse;
+    /**
+     * 初始化心跳检测
+     */
+    private initHeartbeat;
+    /**
+     * 初始化重连管理
+     */
+    private initReconnect;
+    /**
+     * 开始重连过程
+     */
+    private startReconnection;
+    /**
+     * 生成消息ID
+     */
+    private generateMessageId;
+    /**
+     * 启用监控功能
+     * @param options 监控配置选项
+     */
+    enableMonitoring(options?: SocketMonitorOptions): SocketMonitor;
+    /**
+     * 禁用监控功能
+     */
+    disableMonitoring(): void;
+    /**
+     * 获取监控器实例
+     */
+    getMonitor(): SocketMonitor | null;
+    /**
+     * 释放资源
+     */
+    destroy(): void;
+}

package/dist/plugins/app-types/socket/types.d.ts

@@ -0,0 +1,85 @@
+/**
+ * Socket配置选项
+ */
+export interface SocketOptions {
+    /** 是否自动连接 */
+    autoConnect?: boolean;
+    /** 是否启用重连功能 */
+    reconnection?: boolean;
+    /** 最大重连尝试次数，默认无限 */
+    reconnectionAttempts?: number;
+    /** 重连延迟时间（毫秒） */
+    reconnectionDelay?: number;
+    /** 最大重连延迟时间（毫秒） */
+    reconnectionDelayMax?: number;
+    /** 是否启用心跳检测 */
+    heartbeat?: boolean;
+    /** 心跳间隔时间（毫秒） */
+    heartbeatInterval?: number;
+    /** 请求超时时间（毫秒） */
+    timeout?: number;
+    /** 心跳超时时间（毫秒） */
+    heartbeatTimeout?: number;
+    /** 自定义协议 */
+    protocols?: string | string[];
+    /** 连接URL */
+    url: string;
+}
+/**
+ * Socket连接状态
+ */
+export declare enum SocketStatus {
+    CONNECTING = 0,
+    OPEN = 1,
+    CLOSING = 2,
+    CLOSED = 3,
+    RECONNECTING = 4
+}
+/**
+ * Socket消息格式
+ */
+export interface SocketMessage<T = any> {
+    /** 事件类型 */
+    type: string;
+    /** 消息数据 */
+    data?: T;
+    /** 消息ID */
+    id?: string;
+    event?: any;
+}
+/**
+ * 心跳配置选项
+ */
+export interface HeartbeatOptions {
+    /** 心跳间隔时间（毫秒） */
+    interval: number;
+    /** 心跳超时时间（毫秒） */
+    timeout: number;
+    /** 心跳探测消息 */
+    message?: SocketMessage;
+}
+/**
+ * 重连配置选项
+ */
+export interface ReconnectOptions {
+    /** 是否启用重连 */
+    enabled: boolean;
+    /** 最大重连尝试次数 */
+    attempts?: number;
+    /** 重连延迟时间（毫秒） */
+    delay: number;
+    /** 最大重连延迟时间（毫秒） */
+    delayMax?: number;
+    /** 是否使用指数退避算法 */
+    jitter?: boolean;
+}
+/**
+ * 事件处理函数类型
+ */
+export type EventHandler = (...args: any[]) => void;
+/**
+ * 事件处理函数映射
+ */
+export interface EventHandlerMap {
+    [event: string]: EventHandler[];
+}

package/dist/plugins/app-types/storage/index.d.ts

@@ -0,0 +1,17 @@
+import App from '../app';
+export interface StorageOptions {
+    storageKey?: string;
+    removeStorageAfter?: (key: string) => void;
+    setStorageAfter?: (key: string, value: string) => void;
+}
+export declare class Storage {
+    private storageKey;
+    private app?;
+    private options;
+    constructor(app?: App, options?: StorageOptions);
+    createKey: (key: string) => string;
+    setStorage: (key: string, value: string) => void;
+    getStorage: (key: string) => string | null;
+    removeStorage: (key: string) => void;
+    clear: () => void;
+}

package/dist/plugins/app-types/tasks/index.d.ts

@@ -0,0 +1,77 @@
+import { Task, TasksModule, RunTaskParams, AddTaskParams, DeleteTaskParams } from "./type";
+import App from "../app";
+export declare class TasksManager {
+    private static instance;
+    private taskFunctions;
+    private tasks;
+    private app;
+    private db;
+    useTasks: () => {
+        tasks: TasksModule;
+    };
+    watchTaskCallback: (taskModule: TasksModule) => void;
+    constructor(app: App);
+    static getInstance(app?: App): TasksManager;
+    addTaskFunction<T>(name: string, fun: T): void;
+    addTaskFunctions<T>(tasks: {
+        name: string;
+        fun: T;
+    }[]): void;
+    getTasks(): TasksModule;
+    getTaskFunction(name: string): any;
+    init(): Promise<void>;
+    private saveTaskQueueToLocal;
+    private loadTaskQueueFromLocal;
+    /**
+     * @title: 执行任务
+     * @description:
+     * @param {Task} task
+     * @return {*}
+     * @Author: zhiwei.Wang
+     * @Date: 2024-09-26 13:53
+     */
+    private runTask;
+    /**
+     * @title: 启动轮询
+     * @description: 根据轮询间隔定期执行任务
+     * @param {Task} task
+     * @return {*}
+     */
+    private startPolling;
+    /**
+     * @title: 创建任务数据
+     * @description:
+     * @param {Partial} payload
+     * @return {*}
+     * @Author: zhiwei.Wang
+     * @Date: 2024-09-26 13:54
+     */
+    private createTaskData;
+    private getTaskQueue;
+    private timeout;
+    /**
+     * @title: 执行任务队列
+     * @description:
+     * @return {*}
+     * @Author: zhiwei.Wang
+     * @Date: 2024-09-26 13:52
+     */
+    run(payload: RunTaskParams): Promise<void>;
+    deleteTask(payload: DeleteTaskParams): void;
+    /**
+     * @title: 重试任务
+     * @description:
+     * @return {*}
+     * @Author: zhiwei.Wang
+     * @Date: 2024-09-26 13:53
+     */
+    retryTask(payload: RunTaskParams): void;
+    addTask(payload: AddTaskParams): void;
+    private updateTask;
+    private updateQueueStatus;
+    private setTasks;
+    clearAllTaskTimer(tasks: Task[]): void;
+    clearTasks(payload: RunTaskParams): void;
+    clearAllTasks(): void;
+    watchTask(callback: (taskModule: TasksModule) => void): void;
+}

package/dist/plugins/app-types/tasks/type.d.ts

@@ -0,0 +1,62 @@
+export type TaskRunStatus = "pending" | "in-progress" | "success" | "failure";
+export interface Task {
+    id?: string;
+    type?: "local" | "cloud";
+    retries?: number;
+    maxRetries?: number;
+    status?: TaskRunStatus;
+    action: string;
+    payload: any;
+    beforeAction?: string;
+    beforePayload?: any;
+    afterAction?: string;
+    afterPayload?: any;
+    polling?: {
+        interval?: number;
+    };
+    pollingResult?: {
+        count: number;
+        timerId?: any;
+    };
+    manual?: boolean;
+    destroy?: boolean;
+    [key: string]: any;
+}
+export interface TaskConfig {
+    tasks: Task[];
+}
+type TaskModuleName = string;
+type TaskQueueName = string;
+type TaskStatus = "uncompleted" | "completed";
+export interface TaskQueue {
+    status: TaskStatus;
+    tasks: Task[];
+}
+export interface RunTaskParams {
+    module: TaskModuleName;
+    queueId: TaskQueueName;
+    callback?: () => void;
+}
+export interface DeleteTaskParams {
+    module: TaskModuleName;
+    queueId: TaskQueueName;
+    taskId: string;
+}
+export interface AddTaskParams {
+    module: TaskModuleName;
+    queueId: TaskQueueName;
+    tasks: Task[];
+}
+export interface TaskRunResult {
+    status: TaskRunStatus;
+    [key: string]: any;
+}
+export interface TasksModule {
+    [key: TaskModuleName]: {
+        [key: TaskQueueName]: {
+            status: TaskStatus;
+            tasks: Task[];
+        };
+    };
+}
+export {};

package/dist/plugins/app-types/tasks/useTasks.d.ts

@@ -0,0 +1,5 @@
+import { TasksModule } from './type';
+declare const useTasks: () => {
+    tasks: TasksModule;
+};
+export default useTasks;

package/dist/plugins/app-types/type.d.ts

@@ -0,0 +1,2 @@
+export interface CoreConfig {
+}

package/dist/plugins/app-types/variables/VariablesProvider.d.ts

@@ -0,0 +1,7 @@
+import React from "react";
+export declare const useVariablesContext: () => any;
+interface VariablesProviderProps {
+    children: React.ReactNode;
+}
+export declare const VariablesProvider: React.FC<VariablesProviderProps>;
+export {};

package/dist/plugins/app-types/variables/config.d.ts

@@ -0,0 +1,3 @@
+import { VariablesConfig } from './type';
+export declare const setConfig: (newConfig: Partial<VariablesConfig>) => void;
+export declare const getConfig: () => VariablesConfig;

package/dist/plugins/app-types/variables/index.d.ts

@@ -0,0 +1,6 @@
+export type VariableMap = Record<string, string>;
+declare const _default: {
+    setConfig: (newConfig: Partial<import("./type").VariablesConfig>) => void;
+    getConfig: () => import("./type").VariablesConfig;
+};
+export default _default;

package/dist/plugins/app-types/variables/type.d.ts

@@ -0,0 +1,2 @@
+export interface VariablesConfig {
+}

package/dist/plugins/app-types/website/index.d.ts

@@ -0,0 +1,6 @@
+declare const _default: {
+    setTitle: (title: string) => void;
+    setIcon: (paramsIcon: string) => void;
+    setAppleWebAppTitle: (title: string) => void;
+};
+export default _default;

package/dist/plugins/app.d.ts

@@ -0,0 +1,8 @@
+import { Plugin } from '../types';
+import App from './app-types/app';
+/**
+ * AppPlugin 接口定义
+ */
+export interface AppPlugin extends Plugin {
+    getApp: () => App;
+}

package/dist/plugins/app.js

@@ -0,0 +1 @@
+export {};

package/dist/plugins/window.d.ts

@@ -13,6 +13,7 @@ export interface WindowPlugin extends Plugin {
     navigator: Partial<Navigator>;
     document: Partial<Document>;
     history: History;
+    interaction?: any;
 }
 /**
  * 简单的 Storage 接口实现

package/dist/solution/BookingByStep/index.js

@@ -29,9 +29,9 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../../modules/BaseModule";
-import { BookingByStepHooks, createModule } from "./types";
+import { createModule } from "./types";
 import { formatProductToCartItem, createCartItemOrigin, getUniqueId, handleVariantProduct, formatDateToCartItem, formatAccountToCartItem } from "../../modules/Cart/utils";
-import { getAvailableProductResources } from "./utils/products";
+import { getAvailableProductResources, isSessionProduct } from "./utils/products";
 import { getResourcesByProduct, getTimeSlicesByResource, getTimeSlicesByResources, getIsUsableByTimeItem, getOthersSelectedResources, getOthersCartSelectedResources, filterScheduleByDateRange, checkSessionProductLeadTime, sortCombinedResources, filterResourcesByFormItem, checkTwoResourcesIntersection, isConflict } from "./utils/resources";
 import dayjs from 'dayjs';
 import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
@@ -118,7 +118,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   this.otherData = ((_data$this$otherParam = data[this.otherParams.cacheId]) === null || _data$this$otherParam === void 0 || (_data$this$otherParam = _data$this$otherParam[this.name]) === null || _data$this$otherParam === void 0 ? void 0 : _data$this$otherParam['otherData']) || {};
                 }
               }
-              moduleArr = ['accountList', 'cart', 'schedule', 'summary', 'step', 'products', 'date', 'order', 'payment'];
+              moduleArr = ['accountList', 'cart', 'schedule', 'summary', 'step', 'products', 'date', 'order'];
               moduleArr.forEach(function (step) {
                 var targetModule = createModule(step, _this2.name);
                 if (targetModule) {
@@ -137,7 +137,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               });
               this.store.schedule.loadAllSchedule();
-              this.core.effects.emit(BookingByStepHooks.onInited, {});
+              this.core.effects.emit("".concat(this.name, ":onInited"), {});
             case 19:
             case "end":
               return _context.stop();
@@ -238,19 +238,29 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadProducts",
     value: (function () {
       var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref) {
-        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, schedule_date;
+        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, schedule_date, res;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, schedule_date = _ref.schedule_date;
-              return _context2.abrupt("return", this.store.products.loadProducts({
+              _context2.next = 3;
+              return this.store.products.loadProducts({
                 category_ids: category_ids,
                 product_ids: product_ids,
                 collection: collection,
                 schedule_date: schedule_date,
                 cacheId: this.cacheId
-              }));
-            case 2:
+              });
+            case 3:
+              res = _context2.sent;
+              // 预拉取当天的资源数据
+              this.getAvailableDate({
+                startDate: schedule_date || dayjs().format('YYYY-MM-DD'),
+                endDate: schedule_date || dayjs().format('YYYY-MM-DD'),
+                products: _toConsumableArray(res)
+              });
+              return _context2.abrupt("return", res);
+            case 6:
             case "end":
               return _context2.stop();
           }
@@ -282,7 +292,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _loadProductByScheduleDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref2) {
         var _schedule$product_ids;
-        var date, _ref2$product_ids, product_ids, _ref2$category_ids, category_ids, scheduleList, newProductIds, schedule, otherProductsIds, allProductIds;
+        var date, _ref2$product_ids, product_ids, _ref2$category_ids, category_ids, scheduleList, newProductIds, schedule, otherProductsIds, allProductIds, res;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -329,8 +339,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 schedule_date: date
               });
             case 10:
-              return _context3.abrupt("return", _context3.sent);
-            case 11:
+              res = _context3.sent;
+              return _context3.abrupt("return", res);
+            case 12:
             case "end":
               return _context3.stop();
           }
@@ -1150,6 +1161,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var productData = _objectSpread(_objectSpread({}, origin), {}, {
         product_variant_id: product_variant_id
       });
+      debugger;
+      // 保护，如果进来的是 session 商品，则必须要有 date 和时间片，否则不允许添加
+      if (isSessionProduct(productData)) {
+        if (!date || !date.startTime || !date.endTime) {
+          return {
+            success: false,
+            errorCode: 'date_or_time_required'
+          };
+        }
+      }
 
       // 库存检测
       var currentCartItems = this.store.cart.getItems();
@@ -1235,6 +1256,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             _this6.store.cart.removeItem(n._id);
           });
         }
+        // // 如果 date.startTime 和 dateRange 里的 startTime 不一样，需要修正 dateRange
+        // const dateRange = this.store.date.getDateRange()
+        // if (dateRange?.[0] && !dayjs(dateRange[0].date).isSame(dayjs(date.startTime), 'day')) {
+        //   this.setDateRange([
+        //     { date: dayjs(date.startTime).format('YYYY-MM-DD'), status: 'available', week: '', weekNum: 0 },
+        //     { date: dayjs(date.endTime).format('YYYY-MM-DD'), status: 'available', week: '', weekNum: 0 },
+        //   ]);
+        // }
       }
     }
   }, {
@@ -2455,9 +2484,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           // n.start_at 是 2025-06-30 15:00 end_at 2025-06-30 17:00
           // item.start 是 2025-06-30 16:00 item.end 是 2025-06-30 19:00
           // 需要判断 n.start_at 和 n.end_at 是否在 item.start 和 item.end 之间
-          // 如果 n.start_at 和 n.end_at 在 item.start 和 item.end 有交集，则此时间需要计算
+          // 如果是仅用于计算的资源， n.start_at 和 n.end_at 在 item.start 和 item.end 有交集，则此时间需要计算
+          // https://project.feishu.cn/v2qint/bug/detail/6657165010
           var mTimes = m.times.filter(function (n) {
-            return !dayjs(n.start_at).isAfter(dayjs(item.start), 'minute') && !dayjs(n.end_at).isBefore(dayjs(item.end), 'minute') || dayjs(n.start_at).isBefore(dayjs(item.end), 'minute') && dayjs(n.end_at).isAfter(dayjs(item.start), 'minute');
+            return !dayjs(n.start_at).isAfter(dayjs(item.start), 'minute') && !dayjs(n.end_at).isBefore(dayjs(item.end), 'minute') || m.onlyComputed && dayjs(n.start_at).isBefore(dayjs(item.end), 'minute') && dayjs(n.end_at).isAfter(dayjs(item.start), 'minute');
           });
           // 如果在这个区间的时间一个都没有，可以直接认为这个资源不可用
           if (mTimes.length === 0) {

package/dist/solution/BookingByStep/utils/capacity.js

@@ -320,7 +320,7 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
         resourcesInType.forEach(function (resource) {
           // 过滤出在时间段内的资源时间片
           var availableTimes = resource.times.filter(function (time) {
-            return !dayjs(time.start_at).isAfter(dayjs(timeSlotStart), 'minute') && !dayjs(time.end_at).isBefore(dayjs(timeSlotEnd), 'minute') || dayjs(time.start_at).isBefore(dayjs(timeSlotEnd), 'minute') && dayjs(time.end_at).isAfter(dayjs(timeSlotStart), 'minute');
+            return !dayjs(time.start_at).isAfter(dayjs(timeSlotStart), 'minute') && !dayjs(time.end_at).isBefore(dayjs(timeSlotEnd), 'minute') || resource.onlyComputed && dayjs(time.start_at).isBefore(dayjs(timeSlotEnd), 'minute') && dayjs(time.end_at).isAfter(dayjs(timeSlotStart), 'minute');
           });
           if (availableTimes.length > 0) {
             // 简化逻辑：如果资源在时间段内有可用时间，就计算其容量

package/dist/solution/BookingByStep/utils/products.d.ts

@@ -9,3 +9,9 @@ export declare const getAvailableProductResources: (products: ProductData[]) =>
     rules: any[];
     resourcesMap: Record<number, ProductResourceItem>;
 };
+/**
+ * 判断商品是否是 session 商品
+ * @param product 商品数据
+ * @returns 是否是 session 商品
+ */
+export declare const isSessionProduct: (product: ProductData) => boolean;

package/dist/solution/BookingByStep/utils/products.js

@@ -47,4 +47,14 @@ export var getAvailableProductResources = function getAvailableProductResources(
     rules: rules,
     resourcesMap: resourcesMap
   };
+};
+
+/**
+ * 判断商品是否是 session 商品
+ * @param product 商品数据
+ * @returns 是否是 session 商品
+ */
+export var isSessionProduct = function isSessionProduct(product) {
+  var _product$scheduleIds, _product$scheduleIds2;
+  return ((_product$scheduleIds = product === null || product === void 0 || (_product$scheduleIds2 = product['schedule.ids']) === null || _product$scheduleIds2 === void 0 ? void 0 : _product$scheduleIds2.length) !== null && _product$scheduleIds !== void 0 ? _product$scheduleIds : 0) > 0;
 };