@or-sdk/files 0.20.1-createfilespackage.2 → 0.20.1-createfilespackage.3

package/dist/cjs/Files.js

@@ -265,71 +265,43 @@ var Files = (function (_super) {
         });
     };
     Files.prototype.getUploadUrl = function (data, isPublic) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4, this.callApi({
-                            method: 'post',
-                            route: 'api/url',
-                            params: {
-                                isPublic: isPublic,
-                            },
-                            data: __assign({}, data),
-                        })];
-                    case 1: return [2, _a.sent()];
-                }
-            });
-        });
-    };
-    Files.prototype.getSystemUploadUrl = function (postfix, files) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4, this.callApi({
-                            method: 'post',
-                            route: 'uploadfile',
-                            data: {
-                                postfix: postfix,
-                                files: files,
-                            },
-                        })];
-                    case 1: return [2, _a.sent()];
-                }
-            });
+        return this.callApi({
+            method: 'post',
+            route: 'api/url',
+            params: {
+                isPublic: isPublic,
+                prefix: '',
+            },
+            data: __assign({}, data),
         });
     };
     Files.prototype.uploadFile = function (file) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, type, name, contentType, cacheControl, _b, url, fields, FormDataLib, formData;
+            var _a, type, name, contentType, _b, url, fields, formData, route;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
                         _a = file.fileModel, type = _a.type, name = _a.name;
                         contentType = type || 'binary/octet-stream';
-                        cacheControl = file.ttl ? "max-age=".concat(file.ttl) : 'no-cache';
                         return [4, this.getUploadUrl({
                                 contentType: contentType,
                                 key: file.prefix + name,
-                                maxFileSize: file.maxFileSize,
-                                cacheControl: cacheControl,
+                                cacheControl: 'no-cache',
                             }, file.isPublic)];
                     case 1:
                         _b = _c.sent(), url = _b.url, fields = _b.fields;
-                        FormDataLib = FormData;
-                        formData = new FormDataLib();
-                        fields.forEach(function (field) {
-                            formData.append(field.key, field.value);
+                        formData = new FormData();
+                        Object.entries(fields).forEach(function (value) {
+                            formData.append(value[0], value[1]);
                         });
-                        formData.append('cache-control', cacheControl);
+                        formData.append('cache-control', 'no-cache');
                         formData.append('content-type', contentType);
-                        formData.append('File', file.fileModel.file, name);
+                        formData.append('File', file.fileModel, name);
+                        route = url.split('api.onereach.ai/')[1];
                         return [4, this.callApi({
                                 method: 'post',
-                                route: url,
-                                params: {
-                                    isPublic: file.isPublic,
-                                },
-                                data: { formData: formData },
+                                route: route,
+                                data: formData,
                             })];
                     case 2: return [2, _c.sent()];
                 }

package/dist/cjs/Files.js.map

@@ -1 +1 @@
-{"version":3,"file":"Files.js","sourceRoot":"","sources":["../../src/Files.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Files.js","sourceRoot":"","sources":["../../src/Files.ts"],"names":[],"mappings":"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"}

package/dist/esm/Files.js

@@ -133,55 +133,37 @@ export class Files extends Base {
         });
     }
     getUploadUrl(data, isPublic) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.callApi({
-                method: 'post',
-                route: 'api/url',
-                params: {
-                    isPublic,
-                },
-                data: Object.assign({}, data),
-            });
-        });
-    }
-    getSystemUploadUrl(postfix, files) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.callApi({
-                method: 'post',
-                route: 'uploadfile',
-                data: {
-                    postfix,
-                    files,
-                },
-            });
+        return this.callApi({
+            method: 'post',
+            route: 'api/url',
+            params: {
+                isPublic,
+                prefix: '',
+            },
+            data: Object.assign({}, data),
         });
     }
     uploadFile(file) {
         return __awaiter(this, void 0, void 0, function* () {
             const { type, name } = file.fileModel;
             const contentType = type || 'binary/octet-stream';
-            const cacheControl = file.ttl ? `max-age=${file.ttl}` : 'no-cache';
             const { url, fields } = yield this.getUploadUrl({
                 contentType,
                 key: file.prefix + name,
-                maxFileSize: file.maxFileSize,
-                cacheControl,
+                cacheControl: 'no-cache',
             }, file.isPublic);
-            const FormDataLib = FormData;
-            const formData = new FormDataLib();
-            fields.forEach(field => {
-                formData.append(field.key, field.value);
+            const formData = new FormData();
+            Object.entries(fields).forEach(value => {
+                formData.append(value[0], value[1]);
             });
-            formData.append('cache-control', cacheControl);
+            formData.append('cache-control', 'no-cache');
             formData.append('content-type', contentType);
-            formData.append('File', file.fileModel.file, name);
+            formData.append('File', file.fileModel, name);
+            const route = url.split('api.onereach.ai/')[1];
             return yield this.callApi({
                 method: 'post',
-                route: url,
-                params: {
-                    isPublic: file.isPublic,
-                },
-                data: { formData },
+                route: route,
+                data: formData,
             });
         });
     }

package/dist/esm/Files.js.map

@@ -1 +1 @@
-{"version":3,"file":"Files.js","sourceRoot":"","sources":["../../src/Files.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Files.js","sourceRoot":"","sources":["../../src/Files.ts"],"names":[],"mappings":"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"}

package/dist/types/Files.d.ts

@@ -1,5 +1,5 @@
 import { Base } from '@or-sdk/base';
-import { FilesConfig, FileItem, UploadUrlProps, UploadFile, UploadFileProps, UploadUrlResponse } from './types';
+import { FilesConfig, FileItem, UploadUrlProps, UploadFileProps, UploadUrlResponse } from './types';
 export declare class Files extends Base {
     constructor(params: FilesConfig);
     getFolderSize(key: string): Promise<number>;
@@ -12,6 +12,5 @@ export declare class Files extends Base {
     getObjectSize(key: string, isPublic: boolean): Promise<void>;
     getDownloadUrl(key: string, isPublic: boolean): Promise<string>;
     getUploadUrl(data: UploadUrlProps, isPublic: boolean): Promise<UploadUrlResponse>;
-    getSystemUploadUrl(postfix: string, files: UploadFile[]): Promise<unknown>;
     uploadFile(file: UploadFileProps): Promise<unknown>;
 }

package/dist/types/types.d.ts

@@ -31,33 +31,24 @@ export declare type getItemsListResponse = {
 export declare type UploadUrlProps = {
     key: string;
     contentType: string;
-    maxFileSize: number;
+    maxFileSize?: number;
     cacheControl: string;
 };
 export declare type UploadUrlResponse = {
     url: string;
     fields: {
         key: string;
-        value: any;
+        bucket: string;
+        Policy: string;
+        'X-Amz-Date': string;
+        'X-Amz-Signature': string;
+        'X-Amz-Algorithm': string;
+        'X-Amz-Credential': string;
+        'X-Amz-Security-Token': string;
     }[];
 };
-export declare type UploadFile = {
-    name: string;
-    size: number;
-    contentType: string;
-    cacheControl: string;
-    ttl: number;
-};
 export declare type UploadFileProps = {
-    fileModel: {
-        type: string;
-        name: string;
-        file: any;
-    };
+    fileModel: File;
     prefix: string;
     isPublic: boolean;
-    expires: any;
-    progress: any;
-    maxFileSize: number;
-    ttl: number;
 };

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.20.1-createfilespackage.2",
+  "version": "0.20.1-createfilespackage.3",
   "name": "@or-sdk/files",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@or-sdk/base": "^0.20.1-createfilespackage.2"
+    "@or-sdk/base": "^0.20.1-createfilespackage.3"
   },
-  "gitHead": "ad802277a99d7af5b7a92856f4917c0c6f4c9604"
+  "gitHead": "2ef1c4ba727a370fe5aecea18be8fbaf0e2b1de5"
 }

package/src/Files.ts

@@ -1,5 +1,5 @@
 import { Base } from '@or-sdk/base';
-import { FilesConfig, LsQuery, FileItem, getItemsListResponse, UploadUrlProps, UploadFile, UploadFileProps, UploadUrlResponse } from './types';
+import { FilesConfig, LsQuery, FileItem, getItemsListResponse, UploadUrlProps, UploadFileProps, UploadUrlResponse } from './types';
 import { SERVICE_KEY } from './constants';
 
 /**
@@ -128,7 +128,6 @@ export class Files extends Base {
   }
 
   async getDownloadUrl(key: string, isPublic: boolean): Promise<string> {
-    // TODO: test it, it's used in old-files-ui
     return await this.callApi({
       method: 'get',
       route: 'api/url',
@@ -139,62 +138,46 @@ export class Files extends Base {
     });
   }
 
-  async getUploadUrl(data: UploadUrlProps, isPublic: boolean): Promise<UploadUrlResponse> {
-    return await this.callApi({
+  getUploadUrl(data: UploadUrlProps, isPublic: boolean): Promise<UploadUrlResponse> {
+    return this.callApi({
       method: 'post',
       route: 'api/url',
       params: {
         isPublic,
+        prefix: '',
       },
       data: { ...data },
     });
   }
 
-  async getSystemUploadUrl(postfix: string, files: UploadFile[]) {
-    return await this.callApi({
-      method: 'post',
-      route: 'uploadfile',
-      data: {
-        postfix,
-        files,
-        // old version
-        // files: _.map(files, file => _.omit(file, ['fileDescriptor'])),
-        // ...(!_.isEmpty(options) && options),
-      },
-    });
-  }
-
   async uploadFile(file: UploadFileProps) {
     const { type, name } = file.fileModel;
     const contentType = type || 'binary/octet-stream';
-    const cacheControl = file.ttl ? `max-age=${file.ttl}` : 'no-cache';
 
     const { url, fields } = await this.getUploadUrl({
       contentType,
       key: file.prefix + name,
-      maxFileSize: file.maxFileSize,
-      cacheControl,
+      cacheControl: 'no-cache',
     }, file.isPublic);
 
-    const FormDataLib = FormData;
-    const formData = new FormDataLib();
+    const formData = new FormData();
 
-    fields.forEach(field => {
-      formData.append(field.key, field.value);
+    Object.entries(fields).forEach(value => {
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      formData.append(value[0], value[1]);
     });
 
-    formData.append('cache-control', cacheControl);
+    formData.append('cache-control', 'no-cache');
     formData.append('content-type', contentType);
-    formData.append('File', file.fileModel.file, name);
+    formData.append('File', file.fileModel, name);
 
+    const route = url.split('api.onereach.ai/')[1];
 
     return await this.callApi({
       method: 'post',
-      route: url,
-      params: {
-        isPublic: file.isPublic,
-      },
-      data: { formData },
+      route: route,
+      data: formData,
     });
   }
 }

package/src/types.ts

@@ -48,7 +48,7 @@ export type getItemsListResponse = {
 export type UploadUrlProps = {
   key: string;
   contentType: string;
-  maxFileSize: number;
+  maxFileSize?: number;
   cacheControl: string;
 };
 
@@ -56,25 +56,19 @@ export type UploadUrlResponse = {
   url: string;
   fields: {
     key: string;
-    value: any;
+    bucket: string;
+    Policy: string;
+    'X-Amz-Date': string;
+    'X-Amz-Signature': string;
+    'X-Amz-Algorithm': string;
+    'X-Amz-Credential': string;
+    'X-Amz-Security-Token': string;
   }[];
 };
 
-export type UploadFile = {
-  name: string;
-  size: number;
-  contentType: string;
-  cacheControl: string;
-  ttl: number;
-};
-
 export type UploadFileProps = {
-  fileModel: { type: string; name: string; file: any; };
+  fileModel: File;
   prefix: string;
   isPublic: boolean;
-  expires: any;
-  progress: any;
-  maxFileSize: number;
-  ttl: number;
 };