@soga/types 0.1.13 → 0.1.24

package/dist/host.d.ts

@@ -6,12 +6,11 @@ export declare enum CloudType {
     BAIDU = 1,
     ALI = 2
 }
-export type HostListItem = {
+interface CommonHostDetail {
     id: number;
     access_token: string;
     account_level: string;
     account_name: string;
-    api_info: string;
     avatar_url: string;
     cloud_type: CloudType;
     created_at: string;
@@ -23,4 +22,20 @@ export type HostListItem = {
     remark: string;
     uk: string;
     is_save: number;
-};
+}
+export interface BaiduHostDetail extends CommonHostDetail {
+    cloud_type: CloudType.BAIDU;
+    api_info: null;
+}
+export interface AliHostDetail extends CommonHostDetail {
+    cloud_type: CloudType.ALI;
+    api_info: {
+        drive_id: string;
+        dpan_file_id: string;
+        cache_file_id: string;
+        space_file_id: string;
+    };
+}
+export type HostDetail = BaiduHostDetail | AliHostDetail;
+export type HostListItem = HostDetail;
+export {};

package/dist/member.d.ts

@@ -1,10 +1,13 @@
 export type MemberInfo = {
     id: number;
     name: string;
+    phone: string;
     email: string;
     nick: string;
     avatar: string;
+    invite_code: string;
+    points: number;
+    private_space_id: number;
     created_at: string;
     updated_at: string;
-    private_space_id: number;
 };

package/dist/record-manifest.d.ts

@@ -45,11 +45,11 @@ export type ManifestImgType = {
     parts: string[];
 };
 export type ManifestMetaType = {
-    birthtime: number;
+    btime: number;
     ctime: number;
+    mtime: number;
     filename: string;
     filesize: number;
-    mtime: number;
     host_size: number;
     preview_size: number;
     source_size: number;

package/dist/record.d.ts

@@ -6,7 +6,8 @@ export declare enum RecordType {
     IMAGE = 3,
     TXT = 4,
     TEXT = 5,
-    OTHER = 6
+    OTHER = 6,
+    AFFIX = 127
 }
 export declare enum RecordFtype {
     NONE = 0,

package/dist/record.js

@@ -10,6 +10,7 @@ var RecordType;
     RecordType[RecordType["TXT"] = 4] = "TXT";
     RecordType[RecordType["TEXT"] = 5] = "TEXT";
     RecordType[RecordType["OTHER"] = 6] = "OTHER";
+    RecordType[RecordType["AFFIX"] = 127] = "AFFIX";
 })(RecordType || (exports.RecordType = RecordType = {}));
 var RecordFtype;
 (function (RecordFtype) {

package/dist/upload-process.d.ts

@@ -1,3 +1,4 @@
+import { HostType } from './host';
 import { ManifestAudioMetaInfo, ManifestTextItem, ManifestVideoMetaInfo } from './record-manifest';
 export declare enum UploadProcessStep {
     prepare = "PREPARE",
@@ -10,18 +11,19 @@ export declare enum UploadProcessStep {
     transcode_source = "TRANSCODE_SOURCE",
     transcode_txt = "TRANSCODE_TXT",
     transcode_img = "TRANSCODE_IMG",
+    transcode_affix = "TRANSCODE_AFFIX",
     group_media = "GROUP_MEDIA",
     upload_baidu = "UPLOAD_BAIDU",
     upload_ali = "UPLOAD_ALI",
     end = "END"
 }
-export type UploadPrepareData = Record<UploadProcessStep, {
+export type UploadPrepareData = Partial<Record<UploadProcessStep, {
     weight: number;
     percent: number;
-}>;
+}>>;
 export type UploadPrepareOptions = {
-    keep_preview: boolean;
-    keep_source: boolean;
+    keep_preview?: boolean;
+    keep_source?: boolean;
 };
 export type PrepareResult = {
     options: UploadPrepareOptions;
@@ -91,6 +93,20 @@ export type MediaGroupData = {
 export type SourceGroupData = {
     size: number;
     head: string;
+    filename: string;
+    btime: number;
+    ctime: number;
+    mtime: number;
+    parts: FilePartItem[];
+};
+export type AffixItemData = {
+    filename: string;
+    uuid: string;
+    size: number;
+    head: string;
+    btime: number;
+    ctime: number;
+    mtime: number;
     parts: FilePartItem[];
 };
 export type TxtGroupData = {
@@ -107,12 +123,24 @@ export type EncoderResult = {
     source?: SourceGroupData;
     media?: MediaGroupData;
 };
-export type WorkerEncodePrepare = {
-    id: number;
-    type: 'prepare';
-    data: PrepareResult;
+export type ImgGroupData = {
+    meta: {
+        width: number;
+        height: number;
+        size: number;
+        t_width: number;
+        t_height: number;
+        t_size: number;
+    };
+    parts: FilePartItem[];
 };
-export type WorkerPercent = {
+export type EncodeResult = {
+    source?: SourceGroupData;
+    media?: MediaGroupData;
+    txt?: TxtGroupData;
+    img?: ImgGroupData;
+};
+export type EncodeWorkerPercent = {
     id: number;
     type: 'percent';
     data: {
@@ -120,6 +148,15 @@ export type WorkerPercent = {
         percent: number;
     };
 };
+export type UploadWorkerPercent = {
+    id: number;
+    type: 'percent';
+    data: {
+        part_id: number;
+        host_type: HostType;
+        percent: number;
+    };
+};
 export type WorkerError = {
     id: number;
     type: 'error';
@@ -130,21 +167,6 @@ export type WorkerError = {
         stack?: string;
     };
 };
-export type ImgGroupData = {
-    meta: {
-        width: number;
-        height: number;
-        size: number;
-        t_width: number;
-        t_height: number;
-        t_size: number;
-    };
-    parts: FilePartItem[];
-};
-export type EncodeResult = {
-    source?: SourceGroupData;
-    media?: MediaGroupData;
-    txt?: TxtGroupData;
-    img?: ImgGroupData;
-};
+export type EncodeWorkerMessage = EncodeWorkerPercent | WorkerError;
+export type UploadWorkerMessage = UploadWorkerPercent | WorkerError;
 export {};

package/dist/upload-process.js

@@ -13,6 +13,7 @@ var UploadProcessStep;
     UploadProcessStep["transcode_source"] = "TRANSCODE_SOURCE";
     UploadProcessStep["transcode_txt"] = "TRANSCODE_TXT";
     UploadProcessStep["transcode_img"] = "TRANSCODE_IMG";
+    UploadProcessStep["transcode_affix"] = "TRANSCODE_AFFIX";
     UploadProcessStep["group_media"] = "GROUP_MEDIA";
     UploadProcessStep["upload_baidu"] = "UPLOAD_BAIDU";
     UploadProcessStep["upload_ali"] = "UPLOAD_ALI";

package/dist/upload.d.ts

@@ -1,130 +1,74 @@
-import { RecordType } from './record';
-export declare enum UploadFileStage {
-    ALL = 0,
-    NULL = 1,
-    ENCODE_READY = 2,
-    ENCODING = 3,
-    ENCODE_PAUSED = 4,
-    UPLOAD_READY = 5,
-    UPLOADING = 6,
-    UPLOAD_PAUSED = 7,
-    SUCCESS = 8,
-    ERROR = 9
-}
+import { HostType } from './host';
+import { CloudInfoField, RecordFolderConfig, RecordType } from './record';
+import { AffixItemData, ImgGroupData, MediaGroupData, SourceGroupData, TxtGroupData, UploadPrepareData } from './upload-process';
 export declare enum EncodeStatus {
-    NULL = 0,
+    NULL,
     PROCESS = 1,
     SUCCESS = 2,
     ERROR = 4
 }
 export declare enum UploadStatus {
-    NULL = 0,
+    NULL,
     PROCESS = 1,
-    SUCCESS = 2,
+    PAUSED = 2,
+    SUCCESS = 3,
     ERROR = 4
 }
-export declare enum RootStatus {
-    NULL = 0,
+export declare enum GroupStatus {
+    NULL,
     PROCESS = 1,
     SUCCESS = 2,
     ERROR = 4
 }
-export declare enum UploadStep {
-    NULL = 0,
-    PROCESS = 1,
-    PRESUCCESS = 2,
-    SUCCESS = 3,
-    ERROR = 4
-}
-export declare enum UploadTaskStage {
-    ALL = 0,
-    NULL = 1,
-    READY = 2,
-    PROCESS = 3,
-    SUCCESS = 8,
-    ERROR = 9
-}
-export type UploadControlConfig = {
-    id: number;
-    uid: number;
-    encode_id: number;
-    upload_id: number;
-    encoder_manual_stop: boolean;
-    uploader_manual_stop: boolean;
-    created_at: string;
-    updated_at: string;
+export type UploadInputItem = {
+    filename: string;
+    filepath: string;
+    filesize: number;
+    local_btime: number;
+    local_ctime: number;
+    local_mtime: number;
 };
-export type UploadTaskItem = {
-    aid: number;
-    created_at: string;
-    id: number;
-    paths: {
-        name: string;
-        path: string;
-        is_folder: boolean;
-        type: RecordType;
-    }[];
-    record_id: number;
-    record_navs: {
-        id: number;
-        title: string;
-    }[];
-    space_id: number;
-    space_name: string;
-    stage: UploadTaskStage;
-    uid: number;
+export type EncodedData = {
+    media?: MediaGroupData;
+    txt?: TxtGroupData;
+    img?: ImgGroupData;
+    source?: SourceGroupData;
+    affix?: AffixItemData[];
 };
+export type UploadedData = Record<HostType, Record<string, object>>;
 export type UploadFileItem = {
     id: number;
-    is_paused: boolean;
-    file_total: number;
-    file_successed: number;
-    encode_status: EncodeStatus;
-    upload_status: UploadStatus;
-    root_status: RootStatus;
-    is_folder: boolean;
-    keep_source: boolean;
+    group_id: number;
+    group_status: GroupStatus;
+    space_id: number;
+    space_name: string;
+    task_id: string;
+    handle_paused: boolean;
+    config: RecordFolderConfig;
+    can_stop: boolean;
     uid: number;
     aid: number;
-    task_id: number;
-    stage: UploadFileStage;
+    encode_status: EncodeStatus;
     baidu_host_id: number;
+    baidu_upload_status: UploadStatus;
     ali_host_id: number;
+    ali_upload_status: UploadStatus;
     pid: number;
     type: RecordType;
-    path: string;
-    filename: string;
-    title: string;
-    size: number;
-    local_birthtime: number;
-    local_ctime: number;
-    percent: number;
-    local_mtime: number;
+    inputs: UploadInputItem[];
     task_record_id: number;
-    text_tracks: unknown;
-    record_folder_info: unknown;
-    output_root: string | null;
-    encode_paused: boolean;
-    upload_paused: boolean;
-    external_texts: {
-        lang: string;
-        title: string;
-        path: string;
-    }[];
-    progress: unknown;
-    error: unknown;
-    mediainfo: unknown;
-    m3u8_info: unknown;
-    media_thumbnailer: unknown;
-    media_grouper: unknown;
-    file_processor: unknown;
-    baidu_data: unknown;
-    ali_data: unknown;
+    cloud_info: CloudInfoField;
+    output_root: string;
+    external_texts: string[];
+    progress: UploadPrepareData;
+    percent: number;
+    encoded: EncodedData;
+    uploaded: UploadedData;
+    first_order: number;
+    second_order: number;
     updated_at: string;
     created_at: string;
-    order: number;
-    space_id: number;
-    space_name: string;
+    is_paused: boolean;
 };
 export type UploadFileSuceessItem = {
     id: number;

package/dist/upload.js

@@ -1,54 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UploadTaskStage = exports.UploadStep = exports.RootStatus = exports.UploadStatus = exports.EncodeStatus = exports.UploadFileStage = void 0;
-var UploadFileStage;
-(function (UploadFileStage) {
-    UploadFileStage[UploadFileStage["ALL"] = 0] = "ALL";
-    UploadFileStage[UploadFileStage["NULL"] = 1] = "NULL";
-    UploadFileStage[UploadFileStage["ENCODE_READY"] = 2] = "ENCODE_READY";
-    UploadFileStage[UploadFileStage["ENCODING"] = 3] = "ENCODING";
-    UploadFileStage[UploadFileStage["ENCODE_PAUSED"] = 4] = "ENCODE_PAUSED";
-    UploadFileStage[UploadFileStage["UPLOAD_READY"] = 5] = "UPLOAD_READY";
-    UploadFileStage[UploadFileStage["UPLOADING"] = 6] = "UPLOADING";
-    UploadFileStage[UploadFileStage["UPLOAD_PAUSED"] = 7] = "UPLOAD_PAUSED";
-    UploadFileStage[UploadFileStage["SUCCESS"] = 8] = "SUCCESS";
-    UploadFileStage[UploadFileStage["ERROR"] = 9] = "ERROR";
-})(UploadFileStage || (exports.UploadFileStage = UploadFileStage = {}));
+exports.GroupStatus = exports.UploadStatus = exports.EncodeStatus = void 0;
 var EncodeStatus;
 (function (EncodeStatus) {
-    EncodeStatus[EncodeStatus["NULL"] = 0] = "NULL";
+    EncodeStatus[EncodeStatus["NULL"] = null] = "NULL";
     EncodeStatus[EncodeStatus["PROCESS"] = 1] = "PROCESS";
     EncodeStatus[EncodeStatus["SUCCESS"] = 2] = "SUCCESS";
     EncodeStatus[EncodeStatus["ERROR"] = 4] = "ERROR";
 })(EncodeStatus || (exports.EncodeStatus = EncodeStatus = {}));
 var UploadStatus;
 (function (UploadStatus) {
-    UploadStatus[UploadStatus["NULL"] = 0] = "NULL";
+    UploadStatus[UploadStatus["NULL"] = null] = "NULL";
     UploadStatus[UploadStatus["PROCESS"] = 1] = "PROCESS";
-    UploadStatus[UploadStatus["SUCCESS"] = 2] = "SUCCESS";
+    UploadStatus[UploadStatus["PAUSED"] = 2] = "PAUSED";
+    UploadStatus[UploadStatus["SUCCESS"] = 3] = "SUCCESS";
     UploadStatus[UploadStatus["ERROR"] = 4] = "ERROR";
 })(UploadStatus || (exports.UploadStatus = UploadStatus = {}));
-var RootStatus;
-(function (RootStatus) {
-    RootStatus[RootStatus["NULL"] = 0] = "NULL";
-    RootStatus[RootStatus["PROCESS"] = 1] = "PROCESS";
-    RootStatus[RootStatus["SUCCESS"] = 2] = "SUCCESS";
-    RootStatus[RootStatus["ERROR"] = 4] = "ERROR";
-})(RootStatus || (exports.RootStatus = RootStatus = {}));
-var UploadStep;
-(function (UploadStep) {
-    UploadStep[UploadStep["NULL"] = 0] = "NULL";
-    UploadStep[UploadStep["PROCESS"] = 1] = "PROCESS";
-    UploadStep[UploadStep["PRESUCCESS"] = 2] = "PRESUCCESS";
-    UploadStep[UploadStep["SUCCESS"] = 3] = "SUCCESS";
-    UploadStep[UploadStep["ERROR"] = 4] = "ERROR";
-})(UploadStep || (exports.UploadStep = UploadStep = {}));
-var UploadTaskStage;
-(function (UploadTaskStage) {
-    UploadTaskStage[UploadTaskStage["ALL"] = 0] = "ALL";
-    UploadTaskStage[UploadTaskStage["NULL"] = 1] = "NULL";
-    UploadTaskStage[UploadTaskStage["READY"] = 2] = "READY";
-    UploadTaskStage[UploadTaskStage["PROCESS"] = 3] = "PROCESS";
-    UploadTaskStage[UploadTaskStage["SUCCESS"] = 8] = "SUCCESS";
-    UploadTaskStage[UploadTaskStage["ERROR"] = 9] = "ERROR";
-})(UploadTaskStage || (exports.UploadTaskStage = UploadTaskStage = {}));
+var GroupStatus;
+(function (GroupStatus) {
+    GroupStatus[GroupStatus["NULL"] = null] = "NULL";
+    GroupStatus[GroupStatus["PROCESS"] = 1] = "PROCESS";
+    GroupStatus[GroupStatus["SUCCESS"] = 2] = "SUCCESS";
+    GroupStatus[GroupStatus["ERROR"] = 4] = "ERROR";
+})(GroupStatus || (exports.GroupStatus = GroupStatus = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@soga/types",
-  "version": "0.1.13",
+  "version": "0.1.24",
   "publishConfig": {
     "access": "public"
   },
@@ -31,5 +31,5 @@
   "keywords": [],
   "author": "",
   "license": "ISC",
-  "gitHead": "fd0b51d9ccc8001c61e746974666be04e72e5665"
+  "gitHead": "97c8d6fe761d40f44e885b5a2bd75d66419c62c9"
 }