@maiyunnet/kebab 8.0.6 → 8.2.0

package/index.d.ts

@@ -5,7 +5,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export declare const VER = "8.0.6";
+export declare const VER = "8.2.0";
 /** --- 框架根目录，以 / 结尾  --- */
 export declare const ROOT_PATH: string;
 export declare const LIB_PATH: string;

package/index.js

@@ -6,7 +6,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export const VER = '8.0.6';
+export const VER = '8.2.0';
 // --- 服务端用的路径 ---
 const imu = decodeURIComponent(import.meta.url).replace('file://', '').replace(/^\/(\w:)/, '$1');
 /** --- /xxx/xxx --- */

package/lib/ai.d.ts

@@ -22,7 +22,15 @@ export declare enum ESERVICE {
     /** --- 微软 Azure 2 --- */
     'AZURE2' = 3,
     /** --- 微软 Azure 3 --- */
-    'AZURE3' = 4
+    'AZURE3' = 4,
+    /** --- Gemini --- */
+    'GEMINI' = 5,
+    /** --- Grok --- */
+    'GROK' = 6,
+    /** --- 火山引擎中国大陆区 --- */
+    'VOLCN' = 7,
+    /** --- 火山引擎国际区 --- */
+    'VOLAS' = 8
 }
 /** --- 选项 --- */
 export interface IOptions {
@@ -36,16 +44,97 @@ export interface IOptions {
     'fetch'?: (input: string | URL | Request, init?: RequestInit) => Promise<Response>;
 }
 export declare class Ai {
-    /** --- openai 原生对象，建议只读 --- */
+    /** --- openai 原生对象 --- */
     readonly link: openai.OpenAI;
+    private readonly _fetch;
+    private readonly _service;
+    private readonly _endpoint;
     private readonly _ctr?;
     constructor(ctrEtc: sCtr.Ctr | kebab.IConfigAi, opt: IOptions);
+    /** --- 获取当前服务商 --- */
+    get service(): ESERVICE;
     /** --- 创建非流式对话 --- */
     chat(body: openai.default.Chat.Completions.ChatCompletionCreateParamsNonStreaming): Promise<openai.APIPromise<openai.default.Chat.ChatCompletion> | false>;
     /** --- 创建流式对话 --- */
     chat(body: openai.default.Chat.Completions.ChatCompletionCreateParamsStreaming): Promise<openai.APIPromise<streaming.Stream<openai.default.Chat.ChatCompletionChunk>> | false>;
     /** --- 创建向量 --- */
     embedding(body: openai.default.EmbeddingCreateParams): Promise<openai.APIPromise<openai.default.CreateEmbeddingResponse> | false>;
+    /** --- 生成图像，不支持 GEMINI、GROK 服务商 --- */
+    image(opt: {
+        'model': string;
+        /** --- 提示词 --- */
+        'prompt': string;
+        /** --- 参考图，请注意模型是否支持，以及是否支持多张，仅支持 ALICN、ALIAS、VOLCN、VOLAS 服务商 --- */
+        'imgs'?: string[];
+        /** --- 模型是否自动优化提示词，默认为 false，但有些服务商可能无效 --- */
+        'extend'?: boolean;
+        /** --- 负面提示词，用于引导模型避免生成某些内容 --- */
+        'negative'?: string;
+        /** --- 长 x 宽，不同模型要求不同，如 [1664, 928] --- */
+        'size': number[];
+        'n'?: number;
+        /** --- 随机种子，默认为随机 --- */
+        'seed'?: number;
+    }): Promise<{
+        /** --- 图像列表 --- */
+        'list': Array<{
+            'url': string;
+            /** --- 优化后的提示词 --- */
+            'text': string;
+        }>;
+        /** --- 随机种子 --- */
+        'seed': number;
+        /** --- 请求编号 --- */
+        'request': string;
+    } | false>;
+    /** --- 异步生成视频，仅支持 ALICN、ALIAS --- */
+    video(opt: {
+        'model': string;
+        /** --- 提示词，参考类可用 [I1] 指代图片，如 `[I1] 看向 [I2]` --- */
+        'prompt': string;
+        /** --- 文本(默认)、首尾帧、参考图 --- */
+        'mode'?: 'text' | 'frame' | 'ref';
+        'imgs'?: string[];
+        /** --- 负面提示词，用于引导模型避免生成某些内容 --- */
+        'negative'?: string;
+        /** --- 模型是否自动优化提示词，默认为 false，但有些服务商可能无效 --- */
+        'extend'?: boolean;
+        /** --- 分辨率，默认 720p --- */
+        'resolution'?: '480p' | '720p' | '1080p';
+        /** --- 比例，默认 16:9 --- */
+        'ratio'?: '16:9' | '9:16' | '4:3' | '3:4' | '1:1' | '21:9';
+        /** --- 视频时长，默认 2 秒 --- */
+        'duration'?: number;
+        /** --- 镜头，默认单镜头 single --- */
+        'shot'?: 'single' | 'multi';
+        /** --- 视频声音，默认 false，true 代表自动配音，字符串代表自定义音频网址 --- */
+        'audio'?: boolean | string;
+        /** --- 随机种子，默认为随机，范围 0 - 2147483647 --- */
+        'seed'?: number;
+    }): Promise<{
+        'task': string;
+        'status': 'PENDING' | 'RUNNING' | 'SUCCEEDED' | 'FAILED' | 'CANCELED' | 'UNKNOWN';
+        'seed': number;
+        'request': string;
+    } | false>;
+    /** --- 轮询任务 --- */
+    poll(opt: {
+        'type': 'video';
+        'task': string;
+    }): Promise<{
+        'task': string;
+        'status': 'PENDING' | 'RUNNING' | 'SUCCEEDED' | 'FAILED' | 'CANCELED' | 'UNKNOWN';
+        /** --- 任务提交时间 --- */
+        'add'?: number;
+        /** --- 任务开始时间 --- */
+        'start'?: number;
+        /** --- 任务结束时间 --- */
+        'end'?: number;
+        /** --- 文件地址 --- */
+        'url'?: string;
+        /** --- 错误信息，成功时不返回 --- */
+        'error'?: string;
+    } | false>;
 }
 /**
  * --- 创建一个 AI 对象 ---

package/lib/ai.js

@@ -5,6 +5,7 @@
  */
 import * as openai from 'openai';
 import * as lCore from '#kebab/lib/core.js';
+import * as lText from '#kebab/lib/text.js';
 import * as sCtr from '#kebab/sys/ctr.js';
 /**
  * --- 参考：https://help.aliyun.com/zh/model-studio/what-is-model-studio ---
@@ -23,12 +24,23 @@ export var ESERVICE;
     ESERVICE[ESERVICE["AZURE2"] = 3] = "AZURE2";
     /** --- 微软 Azure 3 --- */
     ESERVICE[ESERVICE["AZURE3"] = 4] = "AZURE3";
+    /** --- Gemini --- */
+    ESERVICE[ESERVICE["GEMINI"] = 5] = "GEMINI";
+    /** --- Grok --- */
+    ESERVICE[ESERVICE["GROK"] = 6] = "GROK";
+    /** --- 火山引擎中国大陆区 --- */
+    ESERVICE[ESERVICE["VOLCN"] = 7] = "VOLCN";
+    /** --- 火山引擎国际区 --- */
+    ESERVICE[ESERVICE["VOLAS"] = 8] = "VOLAS";
 })(ESERVICE || (ESERVICE = {}));
 /** --- openai 的连接对象 --- */
 const links = [];
 export class Ai {
-    /** --- openai 原生对象，建议只读 --- */
+    /** --- openai 原生对象 --- */
     link;
+    _fetch;
+    _service;
+    _endpoint;
     _ctr;
     constructor(ctrEtc, opt) {
         let configAi = null;
@@ -41,6 +53,7 @@ export class Ai {
             configAi = ctrEtc;
         }
         const secretKey = opt.secretKey ?? configAi.skey ?? '';
+        const token = `${opt.service}-${secretKey}`;
         let endpoint;
         switch (opt.service) {
             case ESERVICE.ALICN: {
@@ -59,16 +72,32 @@ export class Ai {
                 endpoint = opt.endpoint ?? configAi.endpoint ?? '';
                 break;
             }
-            case ESERVICE.AZURE3: {
-                endpoint = opt.endpoint ?? configAi.endpoint ?? '';
+            case ESERVICE.GEMINI: {
+                endpoint = opt.endpoint ?? `https://generativelanguage.googleapis.com/v1beta/openai/`;
+                break;
+            }
+            case ESERVICE.GROK: {
+                endpoint = opt.endpoint ?? `https://api.x.ai/v1`;
+                break;
+            }
+            case ESERVICE.VOLCN: {
+                endpoint = opt.endpoint ?? `https://ark.cn-beijing.volces.com/api/v3`;
+                break;
+            }
+            case ESERVICE.VOLAS: {
+                endpoint = opt.endpoint ?? `https://ark.ap-southeast.bytepluses.com/api/v3`;
                 break;
             }
             default: {
-                endpoint = undefined;
+                // --- ESERVICE.AZURE3 ---
+                endpoint = opt.endpoint ?? configAi.endpoint ?? '';
             }
         }
-        const token = `${opt.service}-${secretKey}`;
-        const link = links.find((item) => item.token === token);
+        this._fetch = opt.fetch ?? fetch;
+        this._service = opt.service;
+        this._endpoint = endpoint;
+        // --- 处理连接 ---
+        const link = links.find(item => item.token === token);
         if (link) {
             this.link = link.link;
             return;
@@ -83,6 +112,10 @@ export class Ai {
             'link': this.link,
         });
     }
+    /** --- 获取当前服务商 --- */
+    get service() {
+        return this._service;
+    }
     /** --- 创建对话 --- */
     async chat(body) {
         try {
@@ -105,6 +138,327 @@ export class Ai {
             return false;
         }
     }
+    /** --- 生成图像，不支持 GEMINI、GROK 服务商 --- */
+    async image(opt) {
+        const seed = opt.seed ?? lCore.rand(0, 2147483647);
+        switch (this._service) {
+            case ESERVICE.ALICN:
+            case ESERVICE.ALIAS: {
+                try {
+                    const res = await this._fetch(`https://dashscope${this._service === ESERVICE.ALIAS ? '-intl' : ''}.aliyuncs.com/api/v1/services/aigc/multimodal-generation/generation`, {
+                        'method': 'POST',
+                        'headers': {
+                            'authorization': `Bearer ${this.link.apiKey}`,
+                            'content-type': 'application/json',
+                        },
+                        'body': lText.stringifyJson({
+                            'model': opt.model,
+                            'input': {
+                                'messages': [
+                                    {
+                                        'role': 'user',
+                                        'content': [
+                                            ...(opt.imgs?.map(url => ({
+                                                'image': url,
+                                            })) ?? []),
+                                            {
+                                                'text': opt.prompt,
+                                            }
+                                        ]
+                                    }
+                                ]
+                            },
+                            'parameters': {
+                                'negative_prompt': opt.negative ?? ' ',
+                                'prompt_extend': opt.extend ?? false,
+                                'watermark': false,
+                                'size': `${opt.size[0]}*${opt.size[1]}`,
+                                'n': opt.n ?? 1,
+                                'seed': seed,
+                            },
+                        }),
+                    });
+                    const json = await res.json();
+                    if (!json.output?.choices?.[0]) {
+                        lCore.debug('[AI][IMAGE]', json);
+                        lCore.log(this._ctr ?? {}, `[AI][IMAGE] ${lText.stringifyJson(json)}`, '-error');
+                        return false;
+                    }
+                    return {
+                        'list': json.output.choices[0].message.content.filter((item) => item.image).map((item) => {
+                            const content = json.output.choices[0].message.content;
+                            const itemIndex = content.indexOf(item);
+                            return {
+                                'url': item.image,
+                                'text': content[itemIndex + 1]?.text ?? '',
+                            };
+                        }),
+                        'seed': seed,
+                        'request': json.request_id,
+                    };
+                }
+                catch (e) {
+                    lCore.debug('[AI][IMAGE]', e);
+                    lCore.log(this._ctr ?? {}, `[AI][IMAGE] ${e.message}`, '-error');
+                    return false;
+                }
+            }
+            case ESERVICE.AZURE:
+            case ESERVICE.AZURE2:
+            case ESERVICE.AZURE3: {
+                try {
+                    const json = await this.link.images.generate({
+                        'model': opt.model,
+                        'prompt': opt.prompt,
+                        'size': `${opt.size[0]}x${opt.size[1]}`,
+                        'n': opt.n ?? 1,
+                    });
+                    if (!json.data?.[0]) {
+                        lCore.debug('[AI][IMAGE]', json);
+                        lCore.log(this._ctr ?? {}, `[AI][IMAGE] ${lText.stringifyJson(json)}`, '-error');
+                        return false;
+                    }
+                    return {
+                        'list': json.data.map((item) => ({
+                            'url': item.url ?? item.b64_json,
+                            'text': item.revised_prompt ?? opt.prompt,
+                        })),
+                        'seed': seed,
+                        'request': json.created.toString(),
+                    };
+                }
+                catch (e) {
+                    lCore.debug('[AI][IMAGE]', e);
+                    lCore.log(this._ctr ?? {}, `[AI][IMAGE] ${e.message}`, '-error');
+                    return false;
+                }
+            }
+            case ESERVICE.GEMINI: {
+                return false;
+            }
+            case ESERVICE.GROK: {
+                return false;
+            }
+            case ESERVICE.VOLCN:
+            case ESERVICE.VOLAS: {
+                try {
+                    const res = await this._fetch(`${this._endpoint}/images/generations`, {
+                        'method': 'POST',
+                        'headers': {
+                            'authorization': `Bearer ${this.link.apiKey}`,
+                            'content-type': 'application/json',
+                        },
+                        'body': lText.stringifyJson({
+                            'model': opt.model,
+                            'prompt': opt.prompt,
+                            'watermark': false,
+                            'size': `${opt.size[0]}x${opt.size[1]}`,
+                            'seed': seed,
+                            ...(opt.n && opt.n > 1 ? {
+                                'sequential_image_generation': 'auto',
+                                'sequential_image_generation_options': {
+                                    'max_images': 4,
+                                },
+                            } : {
+                                'sequential_image_generation': 'disabled',
+                            }),
+                            ...(opt.imgs?.length ? {
+                                'image': opt.imgs.length === 1 ? opt.imgs[0] : opt.imgs,
+                            } : {}),
+                        }),
+                    });
+                    const json = await res.json();
+                    if (!json.data?.[0]) {
+                        lCore.debug('[AI][IMAGE]', json);
+                        lCore.log(this._ctr ?? {}, `[AI][IMAGE] ${lText.stringifyJson(json)}`, '-error');
+                        return false;
+                    }
+                    return {
+                        'list': json.data.map((item) => ({
+                            'url': item.url,
+                            'text': opt.prompt,
+                        })),
+                        'seed': seed,
+                        'request': json.created.toString(),
+                    };
+                }
+                catch (e) {
+                    lCore.debug('[AI][IMAGE]', e);
+                    lCore.log(this._ctr ?? {}, `[AI][IMAGE] ${e.message}`, '-error');
+                    return false;
+                }
+            }
+        }
+    }
+    /** --- 异步生成视频，仅支持 ALICN、ALIAS --- */
+    async video(opt) {
+        if (this._service !== ESERVICE.ALICN && this._service !== ESERVICE.ALIAS) {
+            return false;
+        }
+        const mode = opt.mode ?? 'text';
+        const imgs = opt.imgs ?? [];
+        const resolution = opt.resolution ?? '720p';
+        const ratio = opt.ratio ?? '16:9';
+        const duration = opt.duration ?? 2;
+        const shot = opt.shot ?? 'single';
+        const audio = opt.audio ?? false;
+        const seed = opt.seed ?? lCore.rand(0, 2147483647);
+        const extend = opt.extend ?? false;
+        /** --- x*x --- */
+        let size = '';
+        if (resolution === '480p') {
+            // --- 不支持 ---
+            return false;
+        }
+        else if (resolution === '720p') {
+            switch (ratio) {
+                case '21:9': {
+                    // --- 不支持 ---
+                    return false;
+                }
+                case '16:9': {
+                    size = '1280*720';
+                    break;
+                }
+                case '9:16': {
+                    size = '720*1280';
+                    break;
+                }
+                case '4:3': {
+                    size = '1088*832';
+                    break;
+                }
+                case '3:4': {
+                    size = '832*1088';
+                    break;
+                }
+                default: {
+                    // --- 1:1 ---
+                    size = '960*960';
+                }
+            }
+        }
+        else {
+            // --- 1080p ---
+            switch (ratio) {
+                case '21:9': {
+                    // --- 不支持 ---
+                    return false;
+                }
+                case '16:9': {
+                    size = '1920*1080';
+                    break;
+                }
+                case '9:16': {
+                    size = '1080*1920';
+                    break;
+                }
+                case '4:3': {
+                    size = '1632*1248';
+                    break;
+                }
+                case '3:4': {
+                    size = '1248*1632';
+                    break;
+                }
+                default: {
+                    // --- 1:1 ---
+                    size = '1440*1440';
+                }
+            }
+        }
+        try {
+            const res = await this._fetch(`https://dashscope${this._service === ESERVICE.ALIAS ? '-intl' : ''}.aliyuncs.com/api/v1/services/aigc/video-generation/video-synthesis`, {
+                'method': 'POST',
+                'headers': {
+                    'authorization': `Bearer ${this.link.apiKey}`,
+                    'content-type': 'application/json',
+                    'X-DashScope-Async': 'enable',
+                },
+                'body': lText.stringifyJson({
+                    'model': opt.model,
+                    'input': {
+                        'prompt': opt.prompt.replace(/\[I(\d+)\]/g, 'Character$1'),
+                        ...(typeof audio === 'string' ? {
+                            'audio_url': audio,
+                        } : {})
+                    },
+                    'parameters': {
+                        'negative_prompt': opt.negative ?? ' ',
+                        'watermark': false,
+                        'size': size,
+                        'seed': seed,
+                        'audio': audio ? true : false,
+                        'duration': duration,
+                        'shot_type': shot,
+                        'prompt_extend': extend,
+                        ...((mode !== 'text') && (mode === 'frame' ? (imgs.length > 1 ? {
+                            // --- 首尾帧 ---
+                            'first_frame_url': imgs[0],
+                            'last_frame_url': imgs[1],
+                        } : {
+                            // --- 首帧 ---
+                            'img_url': imgs[0],
+                        }) : {
+                            'reference_urls': imgs,
+                        })),
+                    },
+                }),
+            });
+            const json = await res.json();
+            if (!json.output?.task_id) {
+                lCore.debug('[AI][VIDEO]', json);
+                lCore.log(this._ctr ?? {}, `[AI][VIDEO] ${lText.stringifyJson(json)}`, '-error');
+                return false;
+            }
+            const task = json.output.task_id;
+            return {
+                'task': task,
+                'status': json.output.task_status,
+                'seed': seed,
+                'request': json.request_id,
+            };
+        }
+        catch (e) {
+            lCore.debug('[AI][VIDEO]', e);
+            lCore.log(this._ctr ?? {}, `[AI][VIDEO] ${e.message}`, '-error');
+            return false;
+        }
+    }
+    /** --- 轮询任务 --- */
+    async poll(opt) {
+        if (this._service !== ESERVICE.ALICN && this._service !== ESERVICE.ALIAS) {
+            return false;
+        }
+        try {
+            const res = await this._fetch(`https://dashscope${this._service === ESERVICE.ALIAS ? '-intl' : ''}.aliyuncs.com/api/v1/tasks/${opt.task}`, {
+                'method': 'GET',
+                'headers': {
+                    'authorization': `Bearer ${this.link.apiKey}`,
+                },
+            });
+            const json = await res.json();
+            if (!json.output?.task_status) {
+                lCore.debug('[AI][POLL]', json);
+                lCore.log(this._ctr ?? {}, `[AI][POLL] ${lText.stringifyJson(json)}`, '-error');
+                return false;
+            }
+            return {
+                'task': json.output.task_id,
+                'status': json.output.task_status,
+                'add': json.output.submit_time,
+                'start': json.output.scheduled_time,
+                'end': json.output.end_time,
+                'url': json.output.video_url,
+                'error': json.output.message ? `(${json.output.code})${json.output.message}` : undefined,
+            };
+        }
+        catch (e) {
+            lCore.debug('[AI][POLL]', e);
+            lCore.log(this._ctr ?? {}, `[AI][POLL] ${e.message}`, '-error');
+            return false;
+        }
+    }
 }
 /**
  * --- 创建一个 AI 对象 ---

package/lib/net.js

@@ -452,12 +452,25 @@ async function buildCookieObject(cookie, setCookies, uri) {
         for (let index = 0; index < list.length; ++index) {
             const item = list[index];
             const arr = item.split('=');
+            /** --- 提取 key 并修整 --- */
             const key = arr[0].trim();
-            const val = arr[1] ?? '';
+            if (key === '') {
+                continue;
+            }
+            /** --- 提取 value --- */
+            let val = '';
+            if (arr.length > 1) {
+                val = item.slice(item.indexOf('=') + 1).trim();
+            }
             if (index === 0) {
                 // --- 用户定义的信息 ---
                 cookieTmp['name'] = key;
-                cookieTmp['value'] = decodeURIComponent(val);
+                try {
+                    cookieTmp['value'] = decodeURIComponent(val);
+                }
+                catch {
+                    cookieTmp['value'] = val;
+                }
             }
             else {
                 // --- cookie 配置信息，可转小写方便读取 ---
@@ -507,15 +520,26 @@ async function buildCookieObject(cookie, setCookies, uri) {
             }
         }
         const cookieKey = cookieTmp['name'] + '-' + domainN;
-        if (cookieTmp['max-age'] && (Number(cookieTmp['max-age']) <= 0)) {
-            if (cookie[cookieKey]) {
-                delete cookie[cookieKey];
-                continue;
+        let exp = -1992199400;
+        if (cookieTmp['max-age'] !== undefined) {
+            const maxAge = Number(cookieTmp['max-age']);
+            if (!(isNaN(maxAge))) {
+                if (maxAge <= 0) {
+                    delete cookie[cookieKey];
+                    continue;
+                }
+                exp = tim + maxAge;
             }
         }
-        let exp = -1992199400;
-        if (cookieTmp['max-age']) {
-            exp = tim + Number(cookieTmp['max-age']);
+        if ((exp === -1992199400) && cookieTmp['expires']) {
+            const expires = lTime.stamp(cookieTmp['expires']);
+            if (!(isNaN(expires))) {
+                if (expires <= tim) {
+                    delete cookie[cookieKey];
+                    continue;
+                }
+                exp = expires;
+            }
         }
         // --- path ---
         let path = cookieTmp['path'] ?? '';

package/lib/session.d.ts

@@ -10,6 +10,7 @@ export interface IOptions {
     'name'?: string;
     'ttl'?: number;
     'ssl'?: boolean;
+    'domain'?: string;
     'sqlPre'?: string;
 }
 export declare class Session {

package/lib/session.js

@@ -155,7 +155,8 @@ export class Session {
         }
         lCore.setCookie(ctr, this._name, this._token, {
             'ttl': this._ttl,
-            'ssl': ssl
+            'domain': opt.domain,
+            'ssl': ssl,
         });
         return true;
     }

package/lib/time.js

@@ -105,6 +105,12 @@ export function stamp(date, zone) {
             return Math.floor(date.getTime() / 1000);
         }
         if (zone === null || zone === undefined) {
+            /** --- 如果不传 zone，则尝试由 Date 自行解析（能自动识别字符串内的时区） --- */
+            const t = (new Date(date)).getTime();
+            if (!isNaN(t)) {
+                return Math.floor(t / 1000);
+            }
+            /** --- 解析不到的情况下走系统默认时区 --- */
             zone = -(new Date()).getTimezoneOffset();
         }
         else if (zone instanceof sCtr.Ctr) {