fmode-ng 0.0.9 → 0.0.11

package/lib/aigc/avatar/comp-avatar-talk/comp-avatar-talk.component.d.ts

@@ -1,18 +1,40 @@
 import { AfterViewInit, ElementRef, OnDestroy } from '@angular/core';
 import { FmodeVoiceService } from '../../voice';
+import { ChatService } from '../../service-fmai/service-chat';
 import { FmodeAvatarRoleComp } from '../interface-avatar-role';
-import { Platform } from "@ionic/angular";
-import { ActivatedRoute } from '@angular/router';
+import { NavController, Platform } from "@ionic/angular";
+import { ActivatedRoute, Router } from '@angular/router';
 import * as Parse from "parse";
 import * as i0 from "@angular/core";
 export declare class CompAvatarTalkComponent implements AfterViewInit, OnDestroy {
     voiceServ: FmodeVoiceService;
     private platform;
+    private router;
+    private navCtrl;
     private route;
+    chatServ: ChatService;
     avatarComp: FmodeAvatarRoleComp;
+    roleId: string;
     avatarRole: Parse.Object;
-    constructor(voiceServ: FmodeVoiceService, platform: Platform, route: ActivatedRoute);
+    /**
+     * 开始讲话方式：click点击开始/点击结束 press按住讲话/松开结束
+     * @default click
+     */
+    talkMode: "click" | "press";
+    talkTips: string;
+    constructor(voiceServ: FmodeVoiceService, platform: Platform, router: Router, navCtrl: NavController, route: ActivatedRoute, chatServ: ChatService);
+    /**
+     * 初始化录音转录服务
+     * @desc
+     * 根据数字角色对话状态，设计语音转录各事件处理过程
+     * 嵌入提示音
+     * 嵌入动画
+     * 嵌入唤醒词切换逻辑
+     */
+    initVoiceSevice(): void;
+    ngOnInit(): void;
     ngOnDestroy(): void;
+    goBack(): void;
     loadAvatarRole(roleId: any): Promise<void>;
     player: HTMLAudioElement;
     playMusic(action: any): void;
@@ -21,25 +43,24 @@ export declare class CompAvatarTalkComponent implements AfterViewInit, OnDestroy
     listenDivChange(): void;
     scrollToBottom(comp: ElementRef): void;
     initAvatar(): Promise<void>;
-    onRecordButtonClick(): void;
-    tipsTalk: string;
-    startTalk(event?: any): Promise<void>;
-    cancelTalk(): void;
-    stopTalkAndSend(event?: any): void;
+    /**
+     * AI响应内容
+     */
     aiResponseText: string;
+    /**
+     * 发送消息逻辑
+     */
     sendMessage(): void;
-    playRecord(): void;
-    playBuffers(): void;
     /**
-     * ASR
+     * ASR - 唤醒词
      */
-    startASR(): Promise<void>;
+    startASRAwake(): Promise<void>;
     /**
-     * TTS
+     * TTS - 语音合成
      *
      */
     testTTS(sentence?: any): void;
     testXunfeiTTS(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<CompAvatarTalkComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<CompAvatarTalkComponent, "app-comp-avatar-talk", never, {}, {}, never, never, true, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<CompAvatarTalkComponent, "app-comp-avatar-talk", never, { "talkMode": "talkMode"; }, {}, never, never, true, never>;
 }

package/lib/aigc/comp-markdown-preview/clipboard.service.d.ts

@@ -0,0 +1,14 @@
+import { ToastController } from '@ionic/angular';
+import * as i0 from "@angular/core";
+/**
+ * 剪贴板服务：支持H5、微信、移动端
+ * @public
+ */
+export declare class ClipboardService {
+    private toastCtrl;
+    constructor(toastCtrl: ToastController);
+    copyToClipboard(content: any): Promise<void>;
+    copySuccess(): Promise<void>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<ClipboardService, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<ClipboardService>;
+}

package/lib/aigc/comp-markdown-preview/markdown-preview.component.d.ts

@@ -1,12 +1,21 @@
 import { AfterViewInit, ElementRef, Renderer2 } from '@angular/core';
 import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
 import * as i0 from "@angular/core";
+/**
+ * Markdown 文档高级渲染组件
+ * @name fm-markdown-preview
+ * @public
+ */
 export declare class MarkdownPreviewComponent implements AfterViewInit {
     private domSan;
     private renderer;
     content: string;
     safeHTML: SafeHtml;
     mdContent: ElementRef;
+    /**
+     * 是否开启MD渲染，默认开启
+     * @default true
+     */
     render: boolean;
     constructor(domSan: DomSanitizer, renderer: Renderer2);
     ngAfterViewInit(): void;

package/lib/aigc/index.d.ts

@@ -3,5 +3,6 @@ export * from "./service-fmai/service-imagine";
 export * from "./service-fmai/service-chat";
 export * from "./comp-markdown-preview/markdown-preview.module";
 export * from "./comp-markdown-preview/markdown-preview.component";
+export * from "./comp-markdown-preview/clipboard.service";
 export * from "./voice";
 export * from "./avatar";

package/lib/aigc/service-fmai/service-chat/chat-class.d.ts

@@ -1,14 +1,18 @@
-/// <reference types="node" />
 import { Observable } from "rxjs";
 import * as Parse from "parse";
 export interface FmodeChatMessage {
     role: string;
     content: string;
+    hidden?: boolean;
     createdAt?: Date;
     complete?: boolean;
     /**AI回复消息字段 */
     cid?: string;
 }
+/**
+ * FmodeChat 聊天对话类
+ * @public
+ */
 export declare class FmodeChat {
     title: string;
     sessionId: string;
@@ -16,9 +20,13 @@ export declare class FmodeChat {
     chatSession: Parse.Object;
     role: any;
     messageList: FmodeChatMessage[];
-    constructor(sessionId: string, role?: Parse.Object, chatSession?: Parse.Object);
+    chatServ: any;
+    userInput: string;
+    constructor(sessionId: string, role?: Parse.Object, chatSession?: Parse.Object, chatServ?: any);
+    addRolePrompt(): void;
     sendMessage(message?: string): void;
     saveChatSession(): Promise<void>;
+    getInviteUrl(url: any): any;
     genTitle(): string;
     fixMessageList(messages: FmodeChatMessage[]): {
         role: string;
@@ -26,18 +34,29 @@ export declare class FmodeChat {
     }[];
     nowStr(): string;
 }
+/**
+ * FmodeChatCompletion 文本补全类
+ * @public
+ */
 export declare class FmodeChatCompletion {
     indexOfList: number;
+    model: string;
     messages: FmodeChatMessage[];
     content: string;
     contentBuffer: string[];
-    contentPusher: NodeJS.Timeout;
+    contentPusher: any;
     isCompleted: boolean;
-    constructor(messages: FmodeChatMessage[]);
+    constructor(messages: FmodeChatMessage[], options?: {
+        model?: string;
+    });
     /**
-     *
-     * @param isDirect 是否不等待逐字获取，直接完成内容推送
+     * @param options
+     * @param options.isDirect 是否不等待逐字获取，直接完成内容推送
+     * @param options.intTime 是否不等待逐字获取，直接完成内容推送
      * @returns
      */
-    sendCompletion(isDirect?: boolean): Observable<FmodeChatMessage>;
+    sendCompletion(options?: {
+        isDirect?: boolean;
+        intTime?: number;
+    }): Observable<FmodeChatMessage>;
 }

package/lib/aigc/service-fmai/service-chat/chat.service.d.ts

@@ -1,14 +1,30 @@
 import { Router } from '@angular/router';
 import { FmodeChat } from './chat-class';
+import * as Parse from "parse";
 import { NovaCloudService } from '../../../nova-cloud';
+import { AlertController, NavController, Platform } from '@ionic/angular';
+import { CrossService } from '../../../platform';
 import * as i0 from "@angular/core";
 export declare class ChatService {
     private router;
     private ncloud;
+    private platform;
+    private alertCtrl;
+    private navCtrl;
+    private cross;
     chatMap: {
         [key: string]: FmodeChat;
     };
-    constructor(router: Router, ncloud: NovaCloudService);
+    isCapacitor: boolean;
+    constructor(router: Router, ncloud: NovaCloudService, platform: Platform, alertCtrl: AlertController, navCtrl: NavController, cross: CrossService);
+    modelList: Array<Parse.Object>;
+    currentModel: Parse.Object;
+    loadModelList(model?: Parse.Object): Promise<void>;
+    platformMap: {
+        pc: string;
+        mobile: string;
+    };
+    doButtonAction(button: any): Promise<void>;
     initChatMap(sessionId: any): Promise<FmodeChat>;
     chatList: Array<any>;
     getChatSession(): Promise<void>;
@@ -17,10 +33,12 @@ export declare class ChatService {
      * 重建新对话窗口
      */
     createChatPanel(role?: any, chat?: any): void;
+    createNewRoleChat(roleId: any): Promise<FmodeChat>;
     restoreChatPanel(options?: {
         rid: string;
         sid: string;
     }): Promise<void>;
+    callRole(role: any): Promise<void>;
     static ɵfac: i0.ɵɵFactoryDeclaration<ChatService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<ChatService>;
 }

package/lib/aigc/service-fmai/service-imagine/imagine.service.d.ts

@@ -1,7 +1,12 @@
 import { HttpClient } from '@angular/common/http';
 import { NovaCloudService } from '../../../nova-cloud/nova-cloud.service';
 import * as Parse from "parse";
+import { NovaUploadService } from '../../../storage/service-upload/nova-upload.service';
 import * as i0 from "@angular/core";
+/**
+ * DalleOptions 绘画参数接口
+ * @public
+ */
 export interface DalleOptions {
     prompt: string;
     quality?: null | "hd";
@@ -32,14 +37,24 @@ export interface StableDiffusionOptions {
         units?: ControlnetUnits[];
     };
 }
-interface imgOptions {
+/**
+ * imgOptions 图像配置参数
+ * @public
+ */
+export interface imgOptions {
     removeBackground?: boolean;
-    mainObjectType?: string;
+    redrawBackground?: boolean;
+    mainObjectType?: "human" | "general";
     facePreservation?: boolean;
     facePreservationCount?: number;
     genderDetect?: boolean;
 }
-interface ControlnetUnits {
+/**
+ * ControlnetUnits 控制网络单元
+ * @public
+ */
+export interface ControlnetUnits {
+    isOpen?: boolean;
     type?: string;
     preprocess?: boolean;
     image?: string;
@@ -49,14 +64,19 @@ interface ControlnetUnits {
     controlEnd?: number;
     paramsA?: number;
     paramsB?: number;
+    controlArray?: any[];
 }
+/**
+ * ImagineService AI绘画服务
+ */
 export declare class ImagineService {
     private http;
     private ncloud;
+    private uploadServ;
     /**
      * 图片生成接口主机地址
      */
-    constructor(http: HttpClient, ncloud: NovaCloudService);
+    constructor(http: HttpClient, ncloud: NovaCloudService, uploadServ: NovaUploadService);
     /**
      * DALL-E-3 图片生成函数
      * @description
@@ -72,6 +92,7 @@ export declare class ImagineService {
     */
     drawDalle(options: DalleOptions): Promise<any>;
     priceDalle(options: DalleOptions): any;
+    priceStableDiffusion(options: StableDiffusionOptions): number;
     b64DataToBase64Image(b64_json: any): void;
     /**
      * Huashi6专用绘图函数
@@ -96,7 +117,7 @@ export declare class ImagineService {
     myWorkList: Array<Parse.Object>;
     getMyWorkQuery(): Parse.Query<Parse.Object<Parse.Attributes>>;
     getWorkQuery(): Parse.Query<Parse.Object<Parse.Attributes>>;
+    getimg(): Promise<string>;
     static ɵfac: i0.ɵɵFactoryDeclaration<ImagineService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<ImagineService>;
 }
-export {};

package/lib/aigc/voice/fmode-voice.service.d.ts

@@ -20,6 +20,34 @@ export declare class FmodeVoiceService {
      */
     webSpeech: typeof WebSpeech;
     constructor(platform: Platform, diagnostic: Diagnostic);
+    /**
+     * 用户操作：录音按钮快捷触发操作
+     */
+    toggleRecord(): void;
+    /**
+      * 用户操作：完成录音，并处理转录结果
+     */
+    finishTalk(): void;
+    onBeforeFinishTalk: Function;
+    onAfterFinishTalk: Function;
+    /**
+     * 用户操作：开始讲话，实时转录语言
+     */
+    startTalk(evnet?: any): Promise<void>;
+    onBeforeStartTalk: Function;
+    onAfterStartTalk: Function;
+    /**
+     * 用户操作：取消讲话，且不发送结果
+     */
+    cancelTalk(): void;
+    /**
+     * 操作回调
+     */
+    onBeforeCancelTalk: Function;
+    onAfterCancelTalk: Function;
+    /**
+     * 程序逻辑
+     */
     recordStart(): Promise<void>;
     recordStop(): void;
     recordPcmBlob: Blob;
@@ -51,6 +79,9 @@ export declare class FmodeVoiceService {
     API_KEY: string;
     getWebSocketUrl(): string;
     toBase64(buffer: any): string;
+    /**
+     * 倒计时：最长支持60秒实时语音转录，如果持续7-10秒无声音，服务端将自动CLOSE链接
+     */
     countdown(): void;
     changeBtnStatus(status: any): void;
     renderResult(resultData: any): void;

package/lib/platform/cross.service.d.ts

@@ -1,11 +1,16 @@
+import { ModalController, NavController, Platform } from '@ionic/angular';
 import * as i0 from "@angular/core";
 export declare class CrossService {
+    private platform;
+    private modalCtrl;
+    private navCtrl;
     mobileWidth: number;
     clientWidth: number;
     leftMenuMode: string;
     navMenuType: string;
     fixInterval: any;
-    constructor();
+    constructor(platform: Platform, modalCtrl: ModalController, navCtrl: NavController);
+    dismisModalTop(event?: Event): Promise<void>;
     updateWidth(): void;
     onResizeScreen(ev?: any): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<CrossService, never>;

package/lib/storage/index.d.ts

@@ -1,3 +1,4 @@
 export * from "./storage.module";
 export * from "./service-hwobs/hwobs.service";
 export * from "./comp-hwobs-manager/hwobs-manager.component";
+export * from "./service-upload/nova-upload.service";

package/lib/storage/service-hwobs/hwobs.service.d.ts

@@ -1,9 +1,17 @@
 import ObsClient from "esdk-obs-browserjs";
 import * as Parse from "parse";
 import * as i0 from "@angular/core";
+/**
+ * HwobsDir 华为OBS目录接口
+ * @public
+ */
 export interface HwobsDir {
     Prefix: string;
 }
+/**
+ * HwobsDir 华为OBS文件接口
+ * @public
+ */
 export interface HwobsFile {
     ETag: "\"f0ec968fe51ab48348307e06476122eb\"";
     Key: string;
@@ -12,6 +20,10 @@ export interface HwobsFile {
     Size: string;
     StorageClass: string;
 }
+/**
+ * HwobsService 华为OBS文件服务
+ * @public
+ */
 export declare class HwobsService {
     obsClient: ObsClient;
     bucketName: string;

package/lib/storage/service-upload/nova-upload.service.d.ts

@@ -0,0 +1,122 @@
+import { Platform } from '@ionic/angular';
+import * as Parse from "parse";
+import { Diagnostic } from '@awesome-cordova-plugins/diagnostic/ngx';
+/**
+ * MediaCapture插件
+ * @private
+ * @description
+ * 依赖：File
+ * npm i -S cordova-plugin-file @awesome-cordova-plugins/file
+ */
+import { MediaFile } from "@awesome-cordova-plugins/media-capture";
+import * as i0 from "@angular/core";
+/**
+ * NovaFile 文件类型
+ * @public
+ */
+export interface NovaFile {
+    key: string;
+    url: string;
+    name: string;
+    type: string;
+    size: number;
+}
+/**
+ * NovaUploadService 上传服务
+ * @public
+ */
+export declare class NovaUploadService {
+    private platform;
+    private diagnostic;
+    company: string;
+    uptoken: string;
+    qiniuConf: any;
+    domain: string;
+    constructor(platform: Platform, diagnostic: Diagnostic);
+    /**
+     * 全端通用上传方法
+     * @params file:File 待上传文件
+     * @params onProgress:Function 上传进度回调函数
+     * @returns
+     * progressData {
+              "total": {
+                  "size": 8491,
+                  "loaded": 8490,
+                  "percent": 99.98822282416675
+              }
+          }
+     * novafileData {
+        "hash": "FoYHjpyTif1t8uOMv6N6sVIeGTvq",
+        "key": "E4KpGvTEto/20230901/053605467.jpg",
+        "url": "https://file-cloud.fmode.cn/E4KpGvTEto/20230901/053605467.jpg",
+        "name": "20230901173605.jpg",
+        "type": "image/jpg",
+        "size": 7853
+    }
+     */
+    upload(file: File, onProgress?: Function): Promise<NovaFile>;
+    /**
+     * 移动端上传专用方法
+     * @returns
+     */
+    isCapacitor(): boolean;
+    requestPermission(): Promise<void>;
+    requestStoagePermission(): Promise<void>;
+    requestCameraPermission(): Promise<void>;
+    /**
+     * 上传Token获取方法
+     * @returns
+     */
+    getUptoken(refresh?: boolean): Promise<void>;
+    /**
+     * 生成文件上传Key值：<公司id>/<yyyymmdd>/<file.id><hhMMss>.<ext>
+     * @desc 用于对象存储含全路径的文件名称
+     */
+    genFileKey(file: {
+        id: string;
+        name: string;
+    }, company?: any): string;
+    /**
+     * 获取当前登录用户公司ID
+     * @returns 公司ID
+     */
+    getCompanyId(): string;
+    qiniuDomain: string;
+    queryDomain(): Promise<void>;
+    /**
+     * 保存上传信息至附件表 Attachment
+     * @param file 附件信息
+     * @returns
+     */
+    saveAttachment(file: NovaFile | {
+        url: string;
+        size: string;
+        name: string;
+        type: string;
+    }, domain: any, cateId?: any, company?: any): Promise<Parse.Object>;
+    /**
+     * 录像并上传
+     */
+    captureVideo(conf: any): Promise<any>;
+    cameraCaptureVideoFile(): Promise<MediaFile | any | null>;
+    getMediaFileDataString(mediafile: any): Promise<Blob>;
+    /**
+     * 拍照并上传
+     * @returns -- {hash?:string,url:string,name:string,size:number,key:stirng}
+     */
+    takePicture(conf: any): Promise<any>;
+    cameraTakePictureDataUrl(): Promise<import("@capacitor/camera").Photo>;
+    maxSize: number;
+    /**
+     * 七牛上传函数：无需前端组件
+     * @param imageBlob: Blob
+     * @param format: string
+     */
+    saveQiniuImageFile(imageBlob: Blob, format: string, company?: string, onProgress?: Function): Promise<NovaFile | any>;
+    saveQiniuMediaFile(mediafile: any, fileBlob: Blob, company?: string, onProgress?: Function): Promise<NovaFile | any>;
+    base64ToBlobType(string: any, type: any): Promise<Blob>;
+    base64ToBlob(base64Img: string): Promise<Blob>;
+    fileToBlob(file: File): Blob;
+    static ɵfac: i0.ɵɵFactoryDeclaration<NovaUploadService, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<NovaUploadService>;
+}

package/package.json

@@ -1,15 +1,16 @@
 {
   "name": "fmode-ng",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "author": "未来全栈",
   "license": "COPYRIGHT © 未来飞马 未来全栈 www.fmode.cn All RIGHTS RESERVED",
   "peerDependencies": {
-    "@angular/common": "^15.0.0 || ^16.0.0 || ^17.0.0",
-    "@angular/core": "^15.0.0 || ^16.0.0 || ^17.0.0",
-    "@angular/forms": "^15.0.0 || ^16.0.0 || ^17.0.0",
-    "@angular/animations": "^15.0.0 || ^16.0.0 || ^17.0.0",
-    "ng-zorro-antd": "^15.0.0 || ^16.0.0 || ^17.0.0",
-    "parse": "^3.0.0 || ^4.0.0",
+    "@angular/common": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0",
+    "@angular/core": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0",
+    "@angular/forms": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0",
+    "@angular/animations": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0",
+    "ng-zorro-antd": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0",
+    "parse": "^5.0.0",
+    "@types/parse": "^3.0.9",
     "@ionic/angular": "^6.0.0 || ^7.0.0",
     "qiniu-js": "^3.4.1",
     "recorder-core": "^1.2.23070100",
@@ -25,7 +26,12 @@
     "markdown-it-ruby": "^0.1.1",
     "markdown-it-sub": "^1.0.0",
     "markdown-it-sup": "^1.0.0",
-    "esdk-obs-browserjs": "^3.23.5"
+    "esdk-obs-browserjs": "^3.23.5",
+    "plantuml-encoder": "^1.4.0",
+    "jquery": "^3.7.1",
+    "@awesome-cordova-plugins/diagnostic": "~6.6.0",
+    "@babylonjs/core": "^7.2.1",
+    "@babylonjs/loaders": "~7.2.1"
   },
   "dependencies": {
     "tslib": "^2.3.0"