ozone-api-upload 6.2.5 → 6.3.0

package/dist/ozone-api-upload.d.ts

@@ -157,18 +157,15 @@ export declare class UploadFileRequest implements XMLHttpRequestLike {
     setRequestHeader(key: string, value: string): void;
     protected _createRequest(): OzoneAPIRequest;
     private _buildUrl;
+    private createBlob;
+    private submitTask;
     /**
      * alias to send method.
-     * @param {FormData} file
+     * @param {FormData} formData
      * @param {string} folderId
      * @param options TaskHandlerOption
      * @return {Promise<string | void>}
      */
-    uploadFile(file: FormData, folderId?: string, options?: TaskHandlerOption): Promise<TaskResult | null>;
-    private notifyOnError;
-    _startUploadSession(file: FormData, folderId: string): Promise<UploadSessionResult>;
-    _getUploadId(data: UploadSessionResult): Promise<UploadIdResult>;
-    _performUpload(data: UploadIdResult): Promise<UploadIdResult>;
-    _endUploadSession(data: UploadIdResult): Promise<UploadEndResult>;
+    uploadFile(formData: FormData, folderId?: string, options?: TaskHandlerOption): Promise<TaskResult | null>;
     _waitForTask(taskId: string, options: TaskHandlerOption): Promise<TaskResult | undefined>;
 }

package/dist/ozone-api-upload.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { OzoneConfig } from 'ozone-config';
 import { OzoneAPIRequest } from 'ozone-api-request';
 import { getDefaultClient } from 'ozone-default-client';
+import { Request } from 'typescript-http-client';
 /**
  * UploadFileRequest is a JavaScrip class that can be use as an
  * XMLHttpRequest to upload media using ozone v2 upload chanel.
@@ -154,123 +155,80 @@ export class UploadFileRequest {
                 .join('/');
         });
     }
-    /**
-     * alias to send method.
-     * @param {FormData} file
-     * @param {string} folderId
-     * @param options TaskHandlerOption
-     * @return {Promise<string | void>}
-     */
-    uploadFile(file, folderId = '0', options = {}) {
-        return this._startUploadSession(file, folderId)
-            .then((result) => this._getUploadId(result))
-            .then((result) => this._performUpload(result))
-            .then((result) => this._endUploadSession(result))
-            .then((result) => this._waitForTask(result.uploadFileId, options))
-            .then((result) => {
-            if (!(result === null || result === void 0 ? void 0 : result.mediaId)) {
-                throw Error('No media define in Ozone');
-            }
-            this.status = 200;
-            this._readyState = 4;
-            this._mediaId = result.mediaId;
-            if (this.eventTarget) {
-                this.eventTarget.dispatchEvent(new CustomEvent('ozone-upload-completed', { bubbles: true, detail: { mediaId: result.mediaId } }));
+    createBlob(file) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const url = yield this._buildUrl('blob');
+                const blobRequest = new Request(url).setMethod('PUT').setBody(file);
+                blobRequest.timeout = Infinity;
+                blobRequest.upload.onprogress = this.upload.onprogress;
+                blobRequest.contentType = 'application/octet-stream';
+                return yield getDefaultClient().call(blobRequest);
             }
-            return result;
-        }).catch((error) => {
-            this.status = 555;
-            this._readyState = 4;
-            console.error(error.message);
-            return null;
-        });
-    }
-    notifyOnError() {
-        const self = this;
-        return function (ev) {
-            if (this.status === 0
-                || this.status >= 500
-                || this.status >= 400) {
-                self.status = this.status;
-                self._readyState = 4;
+            catch (err) {
+                console.error('Error creating blob', err);
+                throw err;
             }
-        };
-    }
-    _startUploadSession(file, folderId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const request = this._createRequest();
-            request.url = yield this._buildUrl('uploadStart');
-            request.method = 'POST';
-            request.onreadystatechange = this.notifyOnError();
-            const config = yield OzoneConfig.get();
-            const body = {
-                mediaUploadChannelIdentifier: config.uploadChannel,
-                autoCommit: false
-            };
-            request.body = JSON.stringify(body);
-            return request.sendRequest()
-                .then((xhr) => {
-                const response = xhr.response;
-                return {
-                    file: file,
-                    sessionId: response.result
-                };
-            });
         });
     }
-    _getUploadId(data) {
+    submitTask(blobId, fileName, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const request = this._createRequest();
-            request.url = yield this._buildUrl('uploadId', data.sessionId);
-            request.method = 'GET';
-            request.onreadystatechange = this.notifyOnError();
-            return request.sendRequest()
-                .then((xhr) => {
-                const response = xhr.response;
-                const resultInfo = data;
-                resultInfo.uploadId = response.result;
-                resultInfo.folderId = response.folderId;
-                return resultInfo;
-            });
-        });
-    }
-    _performUpload(data) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const request = this._createRequest();
-            request.url = yield this._buildUrl('upload', data.uploadId);
-            request.method = 'POST';
-            request.onreadystatechange = this.notifyOnError();
-            const xhr = request.createXMLHttpRequest(false);
-            xhr.upload.onprogress = this.upload.onprogress;
-            request.body = data.file;
-            return request.sendRequest(xhr)
-                .then(() => {
-                return data;
-            });
+            try {
+                const url = yield this._buildUrl('task');
+                const taskRequest = new Request(url, {
+                    method: 'POST',
+                    body: JSON.stringify({
+                        $type: 'importblobasmedia',
+                        blob: blobId,
+                        media: { name: fileName, type: 'media' },
+                        mediaInputChannel: 'inputChannel'
+                    })
+                });
+                const taskId = yield getDefaultClient().call(taskRequest);
+                return yield getDefaultClient().taskClient().waitForTask(taskId, {
+                    skipWaitingOnSubTask: options.skipWaitingOnSubTask
+                }).waitResult;
+            }
+            catch (err) {
+                console.error('Error submit upload task', err);
+                throw err;
+            }
         });
     }
-    _endUploadSession(data) {
+    /**
+     * alias to send method.
+     * @param {FormData} formData
+     * @param {string} folderId
+     * @param options TaskHandlerOption
+     * @return {Promise<string | void>}
+     */
+    uploadFile(formData, folderId = '0', options = {}) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const request = this._createRequest();
-            request.url = yield this._buildUrl('uploadComplete', data.sessionId);
-            request.method = 'POST';
-            request.onreadystatechange = this.notifyOnError();
-            const info = {
-                'selectedFileFieldNames': [['files']],
-                mediaMetadatas: [
-                    {
-                        type: { type: 'PROPERTY', identifier: 'org.taktik.metadata.folderId' },
-                        valueObject: data.folderId
+            try {
+                const file = formData.get('file');
+                if (file instanceof File) {
+                    const blob = yield this.createBlob(file);
+                    if (blob.id) {
+                        const result = yield this.submitTask(blob.id, file.name, options);
+                        if (!(result === null || result === void 0 ? void 0 : result.mediaId)) {
+                            console.error('No media define in Ozone');
+                            return null;
+                        }
+                        this.status = 200;
+                        this._mediaId = result.mediaId;
+                        (_a = this.eventTarget) === null || _a === void 0 ? void 0 : _a.dispatchEvent(new CustomEvent('ozone-upload-completed', { bubbles: true, detail: { mediaId: result.mediaId } }));
+                        return result;
                     }
-                ]
-            };
-            request.body = JSON.stringify(info);
-            return request.sendRequest()
-                .then((xhr) => {
-                const response = data;
-                response.uploadFileId = xhr.response.file;
-                return response;
-            });
+                }
+                return null;
+            }
+            catch (err) {
+                this.status = 555;
+                this._readyState = 4;
+                console.error(err);
+                return null;
+            }
         });
     }
     _waitForTask(taskId, options) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ozone-api-upload",
-	"version": "6.2.5",
+	"version": "6.3.0",
 	"publishConfig": {
 		"access": "public"
 	},
@@ -25,10 +25,10 @@
 	},
 	"dependencies": {
 		"ozone-api-request": "^6.2.4",
-		"ozone-config": "^6.2.4",
-		"ozone-default-client": "^6.2.5",
-		"ozone-typescript-client": "^6.2.5"
+		"ozone-config": "^6.3.0",
+		"ozone-default-client": "^6.2.6",
+		"ozone-typescript-client": "^6.2.6"
 	},
 	"repository": "https://github.com/taktik/ozone-components/packages/ozone-api/ozone-api-upload",
-	"gitHead": "c8bbc5b6f832b1bda7cb9ba66a7ddebdf1bdca3d"
+	"gitHead": "3cf20be9cb77459d4fbecb82513db0b77b4bd8bb"
 }

package/src/ozone-api-upload.ts

@@ -3,7 +3,8 @@ import { OzoneAPIRequest } from 'ozone-api-request'
 import { getDefaultClient } from 'ozone-default-client'
 import { OzoneClient } from 'ozone-typescript-client'
 import TaskHandlerOption = OzoneClient.TaskHandlerOption
-
+import { Request } from 'typescript-http-client'
+import {Blob, UUID} from "ozone-type";
 export interface UploadSessionResult {
 	file: FormData
 	sessionId: string
@@ -44,6 +45,7 @@ export interface WaitResponse {
 	}
 }
 
+
 export interface XMLHttpRequestLike {
 	upload: {
 		onprogress: { (event: Event): void }
@@ -236,137 +238,78 @@ export class UploadFileRequest implements XMLHttpRequestLike {
 			.join('/')
 	}
 
+	private async createBlob(file: File): Promise<Blob> {
+		try {
+			const url = await this._buildUrl('blob')
+			const blobRequest = new Request(url).setMethod('PUT').setBody(file)
+			blobRequest.timeout = Infinity
+			blobRequest.upload.onprogress = this.upload.onprogress
+			blobRequest.contentType = 'application/octet-stream'
+			return await getDefaultClient().call<Blob>(blobRequest)
+		} catch (err) {
+			console.error('Error creating blob', err)
+			throw err
+		}
+	}
+
+	private async submitTask(blobId: UUID, fileName: string, options: TaskHandlerOption): Promise<TaskResult | undefined> {
+		try {
+			const url = await this._buildUrl('task')
+			const taskRequest = new Request(url, {
+				method: 'POST',
+				body: JSON.stringify({
+					$type: 'importblobasmedia',
+					blob: blobId,
+					media: { name: fileName, type: 'media' },
+					mediaInputChannel: 'inputChannel'
+				})
+			})
+			const taskId = await getDefaultClient().call<UUID>(taskRequest)
+			return await getDefaultClient().taskClient().waitForTask<TaskResult>(taskId, {
+				skipWaitingOnSubTask: options.skipWaitingOnSubTask
+			}).waitResult
+		} catch (err) {
+			console.error('Error submit upload task', err)
+			throw err
+		}
+	}
+
 	/**
 	 * alias to send method.
-	 * @param {FormData} file
+	 * @param {FormData} formData
 	 * @param {string} folderId
 	 * @param options TaskHandlerOption
 	 * @return {Promise<string | void>}
 	 */
-	uploadFile(file: FormData, folderId: string = '0', options: TaskHandlerOption = {}): Promise<TaskResult | null> {
-
-		return this._startUploadSession(file, folderId)
-			.then((result) => this._getUploadId(result))
-			.then((result) => this._performUpload(result))
-			.then((result) => this._endUploadSession(result))
-			.then((result) => this._waitForTask(result.uploadFileId, options))
-			.then((result) => {
-				if (!result?.mediaId) {
-					throw Error('No media define in Ozone')
-				}
-				this.status = 200
-				this._readyState = 4
-
-				this._mediaId = result.mediaId
-
-				if (this.eventTarget) {
-					this.eventTarget.dispatchEvent(
+	async uploadFile(formData: FormData, folderId: string = '0', options: TaskHandlerOption = {}): Promise<TaskResult | null> {
+		try {
+			const file = formData.get('file')
+			if (file instanceof File) {
+				const blob = await this.createBlob(file)
+				if (blob.id) {
+					const result = await this.submitTask(blob.id, file.name, options)
+					if (!result?.mediaId) {
+						console.error('No media define in Ozone')
+						return null
+					}
+					this.status = 200
+					this._mediaId = result.mediaId
+					this.eventTarget?.dispatchEvent(
 						new CustomEvent('ozone-upload-completed',
 							{ bubbles: true, detail: { mediaId: result.mediaId } })
 					)
+					return result
 				}
-				return result
-			}).catch((error: Error) => {
-				this.status = 555
-				this._readyState = 4
-				console.error(error.message)
-				return null
-			})
-	}
-
-	private notifyOnError(): ((this: XMLHttpRequest, ev: Event) => any) {
-		const self = this
-		return function(this: XMLHttpRequest, ev: Event) {
-			if (this.status === 0
-				|| this.status >= 500
-				|| this.status >= 400) {
-				self.status = this.status
-				self._readyState = 4
 			}
+			return null
+		} catch (err) {
+			this.status = 555
+			this._readyState = 4
+			console.error(err)
+			return null
 		}
 	}
 
-	async _startUploadSession(file: FormData, folderId: string): Promise<UploadSessionResult> {
-		const request = this._createRequest()
-		request.url = await this._buildUrl('uploadStart')
-		request.method = 'POST'
-
-		request.onreadystatechange = this.notifyOnError()
-
-		const config = await OzoneConfig.get()
-		const body = {
-			mediaUploadChannelIdentifier: config.uploadChannel,
-			autoCommit: false
-		}
-		request.body = JSON.stringify(body)
-		return request.sendRequest()
-			.then((xhr: XMLHttpRequest) => {
-				const response = xhr.response
-				return {
-					file: file,
-					sessionId: response.result as string
-				}
-			})
-	}
-
-	async _getUploadId(data: UploadSessionResult): Promise<UploadIdResult> {
-		const request = this._createRequest()
-		request.url = await this._buildUrl('uploadId', data.sessionId)
-		request.method = 'GET'
-
-		request.onreadystatechange = this.notifyOnError()
-
-		return request.sendRequest()
-			.then((xhr: XMLHttpRequest) => {
-				const response = xhr.response
-				const resultInfo: UploadIdResult = data as UploadIdResult
-				resultInfo.uploadId = response.result
-				resultInfo.folderId = response.folderId
-				return resultInfo
-			})
-	}
-
-	async _performUpload(data: UploadIdResult): Promise<UploadIdResult> {
-		const request = this._createRequest()
-		request.url = await this._buildUrl('upload', data.uploadId)
-		request.method = 'POST'
-
-		request.onreadystatechange = this.notifyOnError()
-		const xhr = request.createXMLHttpRequest(false)
-		xhr.upload.onprogress = this.upload.onprogress
-
-		request.body = data.file
-		return request.sendRequest(xhr)
-			.then(() => {
-				return data
-			})
-	}
-
-	async _endUploadSession(data: UploadIdResult): Promise<UploadEndResult> {
-		const request = this._createRequest()
-		request.url = await this._buildUrl('uploadComplete', data.sessionId)
-		request.method = 'POST'
-
-		request.onreadystatechange = this.notifyOnError()
-		const info = {
-			'selectedFileFieldNames': [['files']],
-			mediaMetadatas: [
-				{
-					type: { type: 'PROPERTY', identifier: 'org.taktik.metadata.folderId' },
-					valueObject: data.folderId
-				}
-			]
-		}
-		request.body = JSON.stringify(info)
-
-		return request.sendRequest()
-			.then((xhr: XMLHttpRequest) => {
-				const response: UploadEndResult = data as UploadEndResult
-				response.uploadFileId = xhr.response.file
-				return response
-			})
-	}
-
 	_waitForTask(taskId: string, options: TaskHandlerOption): Promise<TaskResult | undefined> {
 		const taskClient = getDefaultClient().taskClient()
 		const taskHandler = taskClient.waitForTask<TaskResult>(taskId, options)