@e-mc/cloud 0.10.1 → 0.10.3

package/LICENSE

@@ -1,11 +1,11 @@
-Copyright 2024 An Pham
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
+Copyright 2024 An Pham
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

package/README.md

@@ -1,186 +1,186 @@
-# @e-mc/cloud
-
-* NodeJS 16
-* ES2020
-
-## General Usage
-
-* [Read the Docs](https://e-mc.readthedocs.io)
-
-## Interface
-
-* [View Source](https://www.unpkg.com/@e-mc/types@0.10.1/lib/index.d.ts)
-
-```typescript
-import type { IHost, IScopeOrigin } from "./index";
-import type { ExternalAsset } from "./asset";
-import type { BucketWebsiteOptions, CloudDatabase, CloudFeatures, CloudFunctions, CloudService, CloudStorage, CloudStorageDownload, CloudStorageUpload, UploadAssetOptions } from "./cloud";
-import type { ClientDbConstructor, IClientDb } from "./core";
-import type { BatchQueryResult, QueryResult } from "./db";
-import type { LogMessageOptions } from "./logger";
-import type { CloudAuthSettings, CloudModule, CloudServiceOptions, CloudSettings, DbCoerceSettings } from "./settings";
-
-interface ICloud extends IClientDb<IHost, CloudModule, CloudDatabase, CloudServiceOptions, DbCoerceSettings & CloudAuthSettings> {
-    module: CloudModule;
-    readonly uploaded: string[];
-    readonly downloaded: string[];
-    createBucket(service: string, credential: unknown, bucket: string, acl?: unknown, options?: unknown): Promise<boolean>;
-    createBucket(service: string, credential: unknown, bucket: string, publicRead?: boolean): Promise<boolean>;
-    setBucketPolicy(service: string, credential: unknown, bucket: string, options: unknown): Promise<boolean>;
-    setBucketTagging(service: string, credential: unknown, bucket: string, options: unknown): Promise<boolean>;
-    setBucketWebsite(service: string, credential: unknown, bucket: string, options: BucketWebsiteOptions): Promise<boolean>;
-    deleteObjects(service: string, credential: unknown, bucket: string, recursive?: boolean): Promise<void>;
-    uploadObject(service: string, credential: unknown, bucket: string, upload: CloudStorageUpload, localUri: string, beforeResolve?: ((value: string) => Promise<void> | void)): Promise<string>;
-    downloadObject(service: string, credential: unknown, bucket: string, download: CloudStorageDownload, beforeResolve?: ((value: Buffer | string | null) => Promise<string | undefined> | void)): Promise<Buffer | string>;
-    getStorage(action: CloudFunctions, data: CloudStorage[] | undefined): CloudStorage | undefined;
-    hasStorage(action: CloudFunctions, storage: CloudStorage): CloudStorageUpload | false;
-    getDatabaseRows(item: CloudDatabase, ignoreErrors: boolean, sessionKey?: string): Promise<QueryResult>;
-    getDatabaseRows(item: CloudDatabase, sessionKey?: string): Promise<QueryResult>;
-    getDatabaseBatchRows(batch: CloudDatabase[], ignoreErrors: boolean, sessionKey?: string): Promise<BatchQueryResult>;
-    getDatabaseBatchRows(batch: CloudDatabase[], sessionKey?: string): Promise<BatchQueryResult>;
-    hasCredential(feature: CloudFeatures, data: CloudService, credential?: unknown): boolean;
-    getCredential(item: CloudService, unused?: boolean): Record<string | number | symbol, unknown>;
-    getSettings(service: string): Record<string, unknown> | undefined;
-    settingsOf(service: string, name: "coerce", component: keyof DbCoerceSettings): unknown;
-    settingsOf(service: string, name: "auth", component: keyof CloudAuthSettings): unknown;
-    getUploadHandler(service: string, credential: unknown): (...args: unknown[]) => void;
-    getDownloadHandler(service: string, credential: unknown): (...args: unknown[]) => void;
-    resolveService(service: string, folder?: string): string;
-    get settings(): CloudSettings;
-}
-
-interface CloudConstructor extends ClientDbConstructor<IHost> {
-    LOG_CLOUD_FAIL: LogMessageOptions;
-    LOG_CLOUD_COMMAND: LogMessageOptions;
-    LOG_CLOUD_WARN: LogMessageOptions;
-    LOG_CLOUD_UPLOAD: LogMessageOptions;
-    LOG_CLOUD_DOWNLOAD: LogMessageOptions;
-    LOG_CLOUD_DELETE: LogMessageOptions;
-    LOG_CLOUD_DELAYED: LogMessageOptions;
-    finalize(this: IHost, instance: ICloud): Promise<void>;
-    uploadAsset(state: IScopeOrigin<IFileManager, ICloud>, file: ExternalAsset, options: UploadAssetOptions): Promise<void>[];
-    uploadAsset(state: IScopeOrigin<IFileManager, ICloud>, file: ExternalAsset, ignoreProcess: boolean): Promise<void>[];
-    uploadAsset(state: IScopeOrigin<IFileManager, ICloud>, file: ExternalAsset, contentType?: string, ignoreProcess?: boolean): Promise<void>[];
-    sanitizeAssets(assets: ExternalAsset[]): ExternalAsset[];
-    readonly prototype: ICloud;
-    new(module?: CloudModule, database?: CloudDatabase[], ...args: unknown[]): ICloud;
-}
-
-interface ICloudServiceClient {
-    CLOUD_SERVICE_NAME: string;
-    CLOUD_UPLOAD_DISK?: boolean;
-    CLOUD_UPLOAD_STREAM?: boolean;
-    CLOUD_UPLOAD_CHUNK?: boolean;
-    CLOUD_DOWNLOAD_CHUNK?: boolean;
-    validateStorage?(credential: unknown, data?: CloudService): boolean;
-    validateDatabase?(credential: unknown, data?: CloudService): boolean;
-    createStorageClient?(this: IModule, credential: unknown, service?: string): unknown;
-    createDatabaseClient?(this: IModule, credential: unknown, data?: CloudService): unknown;
-    createBucket?(this: IModule, credential: unknown, bucket: string, publicRead?: boolean, service?: string, sdk?: string): Promise<boolean>;
-    createBucketV2?(this: IModule, credential: unknown, bucket: string, acl?: unknown, options?: unknown, service?: string, sdk?: string): Promise<boolean>;
-    setBucketPolicy?(this: IModule, credential: unknown, bucket: string, options: unknown, service?: string, sdk?: string): Promise<boolean>;
-    setBucketTagging?(this: IModule, credential: unknown, bucket: string, options: unknown, service?: string, sdk?: string): Promise<boolean>;
-    setBucketWebsite?(this: IModule, credential: unknown, bucket: string, options: BucketWebsiteOptions, service?: string, sdk?: string): Promise<boolean>;
-    deleteObjects?(this: IModule, credential: unknown, bucket: string, service?: string, sdk?: string, recursive?: boolean): Promise<void>;
-    deleteObjectsV2?(this: IModule, credential: unknown, bucket: string, recursive?: boolean, service?: string, sdk?: string): Promise<void>;
-    executeQuery?(this: ICloud, credential: unknown, data: CloudDatabase, sessionKey?: string): Promise<QueryResult>;
-    executeBatchQuery?(this: ICloud, credential: unknown, batch: CloudDatabase[], sessionKey?: string): Promise<BatchQueryResult>;
-}
-```
-
-## Settings
-
-```typescript
-import type { PermittedDirectories } from "./core";
-import type { CloudServiceOptions, DbSourceOptions, PurgeComponent } from "./settings";
-
-interface CloudModule {
-    // handler: "@e-mc/cloud";
-    extensions?: string[];
-    atlas?: CloudStoredCredentials;
-    aws?: CloudStoredCredentials;
-    "aws-v3"?: CloudStoredCredentials;
-    azure?: CloudStoredCredentials; // az
-    gcp?: CloudStoredCredentials; // gcloud
-    ibm?: CloudStoredCredentials;
-    oci?: CloudStoredCredentials;
-    minio?: CloudStoredCredentials;
-    settings?: {
-        broadcast_id?: string | string[];
-        users?: Record<string, Record<string, unknown>>;
-        cache_dir?: string;
-        session_expires?: number;
-        user_key?: Record<string, DbSourceOptions>;
-        imports?: StringMap;
-        purge?: PurgeComponent;
-        atlas?: CloudServiceOptions;
-        aws?: CloudServiceOptions;
-        "aws-v3"?: CloudServiceOptions;
-        azure?: CloudServiceOptions;
-        gcp?: CloudServiceOptions;
-        ibm?: CloudServiceOptions;
-        oci?: CloudServiceOptions;
-        minio?: CloudServiceOptions;
-    };
-    permission?: PermittedDirectories;
-}
-
-type CloudStoredCredentials = Record<string, Record<string, unknown>>;
-```
-
-### Example usage
-
-```javascript
-const Cloud = require("@e-mc/cloud"); // Using @pi-r/aws
-
-const instance = new Cloud({
-    aws: {
-        main: {
-            accessKeyId: "**********",
-            secretAccessKey: "**********"
-        }
-    },
-    "aws-v3": {
-        main: {
-            credentials: {
-                accessKeyId: "**********",
-                secretAccessKey: "**********",
-                region: "ap-northeast-1"
-            }
-        }
-    }
-});
-// instance.host = new Host();
-instance.init();
-
-const options = {
-    contentType: "application/tar",
-    acl: "authenticated-read",
-    chunkSize: "8mb",
-    overwrite: false, // Default
-    tags: { key_1: "value", key_2: "value" }
-};
-Promise.all([
-    // nodejs-001/archive.tar
-    instance.uploadObject("aws", "main", "nodejs-001", options, "/tmp/archive.tar"),
-    // nodejs-001/2024/01-01.tar
-    instance.uploadObject("aws", "main", "nodejs-001", { ...options, publicRead: true, pathname: "2024", filename: "01-01.tar" }, "/tmp/archive.tar"),
-    // nodejs-001/archive_1.tar
-    instance.uploadObject("aws", { accessKeyId: "*****", secretAccessKey: "*****" }, "nodejs-001", { overwrite: false }, "/tmp/archive.tar")
-]);
-
-const rows = await instance.getDatabaseRows({ service: "aws-v3", credential: "main", table: "demo", key: { id: 1 } });
-```
-
-## References
-
-- https://www.unpkg.com/@e-mc/types@0.10.1/lib/asset.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.1/lib/cloud.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.1/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.1/lib/db.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.1/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.1/lib/settings.d.ts
-
-## LICENSE
-
+# @e-mc/cloud
+
+* NodeJS 16
+* ES2020
+
+## General Usage
+
+* [Read the Docs](https://e-mc.readthedocs.io)
+
+## Interface
+
+* [View Source](https://www.unpkg.com/@e-mc/types@0.10.3/lib/index.d.ts)
+
+```typescript
+import type { IHost, IScopeOrigin } from "./index";
+import type { ExternalAsset } from "./asset";
+import type { BucketWebsiteOptions, CloudDatabase, CloudFeatures, CloudFunctions, CloudService, CloudStorage, CloudStorageDownload, CloudStorageUpload, UploadAssetOptions } from "./cloud";
+import type { ClientDbConstructor, IClientDb } from "./core";
+import type { BatchQueryResult, QueryResult } from "./db";
+import type { LogMessageOptions } from "./logger";
+import type { CloudAuthSettings, CloudModule, CloudServiceOptions, CloudSettings, DbCoerceSettings } from "./settings";
+
+interface ICloud extends IClientDb<IHost, CloudModule, CloudDatabase, CloudServiceOptions, DbCoerceSettings & CloudAuthSettings> {
+    module: CloudModule;
+    readonly uploaded: string[];
+    readonly downloaded: string[];
+    createBucket(service: string, credential: unknown, bucket: string, acl?: unknown, options?: unknown): Promise<boolean>;
+    createBucket(service: string, credential: unknown, bucket: string, publicRead?: boolean): Promise<boolean>;
+    setBucketPolicy(service: string, credential: unknown, bucket: string, options: unknown): Promise<boolean>;
+    setBucketTagging(service: string, credential: unknown, bucket: string, options: unknown): Promise<boolean>;
+    setBucketWebsite(service: string, credential: unknown, bucket: string, options: BucketWebsiteOptions): Promise<boolean>;
+    deleteObjects(service: string, credential: unknown, bucket: string, recursive?: boolean): Promise<void>;
+    uploadObject(service: string, credential: unknown, bucket: string, upload: CloudStorageUpload, localUri: string, beforeResolve?: ((value: string) => Promise<void> | void)): Promise<string>;
+    downloadObject(service: string, credential: unknown, bucket: string, download: CloudStorageDownload, beforeResolve?: ((value: Buffer | string | null) => Promise<string | undefined> | void)): Promise<Buffer | string>;
+    getStorage(action: CloudFunctions, data: CloudStorage[] | undefined): CloudStorage | undefined;
+    hasStorage(action: CloudFunctions, storage: CloudStorage): CloudStorageUpload | false;
+    getDatabaseRows(item: CloudDatabase, ignoreErrors: boolean, sessionKey?: string): Promise<QueryResult>;
+    getDatabaseRows(item: CloudDatabase, sessionKey?: string): Promise<QueryResult>;
+    getDatabaseBatchRows(batch: CloudDatabase[], ignoreErrors: boolean, sessionKey?: string): Promise<BatchQueryResult>;
+    getDatabaseBatchRows(batch: CloudDatabase[], sessionKey?: string): Promise<BatchQueryResult>;
+    hasCredential(feature: CloudFeatures, data: CloudService, credential?: unknown): boolean;
+    getCredential(item: CloudService, unused?: boolean): Record<string | number | symbol, unknown>;
+    getSettings(service: string): Record<string, unknown> | undefined;
+    settingsOf(service: string, name: "coerce", component: keyof DbCoerceSettings): unknown;
+    settingsOf(service: string, name: "auth", component: keyof CloudAuthSettings): unknown;
+    getUploadHandler(service: string, credential: unknown): (...args: unknown[]) => void;
+    getDownloadHandler(service: string, credential: unknown): (...args: unknown[]) => void;
+    resolveService(service: string, folder?: string): string;
+    get settings(): CloudSettings;
+}
+
+interface CloudConstructor extends ClientDbConstructor<IHost> {
+    LOG_CLOUD_FAIL: LogMessageOptions;
+    LOG_CLOUD_COMMAND: LogMessageOptions;
+    LOG_CLOUD_WARN: LogMessageOptions;
+    LOG_CLOUD_UPLOAD: LogMessageOptions;
+    LOG_CLOUD_DOWNLOAD: LogMessageOptions;
+    LOG_CLOUD_DELETE: LogMessageOptions;
+    LOG_CLOUD_DELAYED: LogMessageOptions;
+    finalize(this: IHost, instance: ICloud): Promise<void>;
+    uploadAsset(state: IScopeOrigin<IFileManager, ICloud>, file: ExternalAsset, options: UploadAssetOptions): Promise<void>[];
+    uploadAsset(state: IScopeOrigin<IFileManager, ICloud>, file: ExternalAsset, ignoreProcess: boolean): Promise<void>[];
+    uploadAsset(state: IScopeOrigin<IFileManager, ICloud>, file: ExternalAsset, contentType?: string, ignoreProcess?: boolean): Promise<void>[];
+    sanitizeAssets(assets: ExternalAsset[]): ExternalAsset[];
+    readonly prototype: ICloud;
+    new(module?: CloudModule, database?: CloudDatabase[], ...args: unknown[]): ICloud;
+}
+
+interface ICloudServiceClient {
+    CLOUD_SERVICE_NAME: string;
+    CLOUD_UPLOAD_DISK?: boolean;
+    CLOUD_UPLOAD_STREAM?: boolean;
+    CLOUD_UPLOAD_CHUNK?: boolean;
+    CLOUD_DOWNLOAD_CHUNK?: boolean;
+    validateStorage?(credential: unknown, data?: CloudService): boolean;
+    validateDatabase?(credential: unknown, data?: CloudService): boolean;
+    createStorageClient?(this: IModule, credential: unknown, service?: string): unknown;
+    createDatabaseClient?(this: IModule, credential: unknown, data?: CloudService): unknown;
+    createBucket?(this: IModule, credential: unknown, bucket: string, publicRead?: boolean, service?: string, sdk?: string): Promise<boolean>;
+    createBucketV2?(this: IModule, credential: unknown, bucket: string, acl?: unknown, options?: unknown, service?: string, sdk?: string): Promise<boolean>;
+    setBucketPolicy?(this: IModule, credential: unknown, bucket: string, options: unknown, service?: string, sdk?: string): Promise<boolean>;
+    setBucketTagging?(this: IModule, credential: unknown, bucket: string, options: unknown, service?: string, sdk?: string): Promise<boolean>;
+    setBucketWebsite?(this: IModule, credential: unknown, bucket: string, options: BucketWebsiteOptions, service?: string, sdk?: string): Promise<boolean>;
+    deleteObjects?(this: IModule, credential: unknown, bucket: string, service?: string, sdk?: string, recursive?: boolean): Promise<void>;
+    deleteObjectsV2?(this: IModule, credential: unknown, bucket: string, recursive?: boolean, service?: string, sdk?: string): Promise<void>;
+    executeQuery?(this: ICloud, credential: unknown, data: CloudDatabase, sessionKey?: string): Promise<QueryResult>;
+    executeBatchQuery?(this: ICloud, credential: unknown, batch: CloudDatabase[], sessionKey?: string): Promise<BatchQueryResult>;
+}
+```
+
+## Settings
+
+```typescript
+import type { PermittedDirectories } from "./core";
+import type { CloudServiceOptions, DbSourceOptions, PurgeComponent } from "./settings";
+
+interface CloudModule {
+    // handler: "@e-mc/cloud";
+    extensions?: string[];
+    atlas?: CloudStoredCredentials;
+    aws?: CloudStoredCredentials;
+    "aws-v3"?: CloudStoredCredentials;
+    azure?: CloudStoredCredentials; // az
+    gcp?: CloudStoredCredentials; // gcloud
+    ibm?: CloudStoredCredentials;
+    oci?: CloudStoredCredentials;
+    minio?: CloudStoredCredentials;
+    settings?: {
+        broadcast_id?: string | string[];
+        users?: Record<string, Record<string, unknown>>;
+        cache_dir?: string;
+        session_expires?: number;
+        user_key?: Record<string, DbSourceOptions>;
+        imports?: StringMap;
+        purge?: PurgeComponent;
+        atlas?: CloudServiceOptions;
+        aws?: CloudServiceOptions;
+        "aws-v3"?: CloudServiceOptions;
+        azure?: CloudServiceOptions;
+        gcp?: CloudServiceOptions;
+        ibm?: CloudServiceOptions;
+        oci?: CloudServiceOptions;
+        minio?: CloudServiceOptions;
+    };
+    permission?: PermittedDirectories;
+}
+
+type CloudStoredCredentials = Record<string, Record<string, unknown>>;
+```
+
+### Example usage
+
+```javascript
+const Cloud = require("@e-mc/cloud"); // Using @pi-r/aws
+
+const instance = new Cloud({
+    aws: {
+        main: {
+            accessKeyId: "**********",
+            secretAccessKey: "**********"
+        }
+    },
+    "aws-v3": {
+        main: {
+            credentials: {
+                accessKeyId: "**********",
+                secretAccessKey: "**********",
+                region: "ap-northeast-1"
+            }
+        }
+    }
+});
+// instance.host = new Host();
+instance.init();
+
+const options = {
+    contentType: "application/tar",
+    acl: "authenticated-read",
+    chunkSize: "8mb",
+    overwrite: false, // Default
+    tags: { key_1: "value", key_2: "value" }
+};
+Promise.all([
+    // nodejs-001/archive.tar
+    instance.uploadObject("aws", "main", "nodejs-001", options, "/tmp/archive.tar"),
+    // nodejs-001/2024/01-01.tar
+    instance.uploadObject("aws", "main", "nodejs-001", { ...options, publicRead: true, pathname: "2024", filename: "01-01.tar" }, "/tmp/archive.tar"),
+    // nodejs-001/archive_1.tar
+    instance.uploadObject("aws", { accessKeyId: "*****", secretAccessKey: "*****" }, "nodejs-001", { overwrite: false }, "/tmp/archive.tar")
+]);
+
+const rows = await instance.getDatabaseRows({ service: "aws-v3", credential: "main", table: "demo", key: { id: 1 } });
+```
+
+## References
+
+- https://www.unpkg.com/@e-mc/types@0.10.3/lib/asset.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.3/lib/cloud.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.3/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.3/lib/db.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.3/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.3/lib/settings.d.ts
+
+## LICENSE
+
 BSD 3-Clause

package/index.d.ts

@@ -1,6 +1,6 @@
-import type { CloudConstructor, IFileManager } from '../types/lib';
-import type { CloudAsset } from '../types/lib/cloud';
-
-declare const Cloud: CloudConstructor<IFileManager<CloudAsset>>;
-
+import type { CloudConstructor, IFileManager } from '@e-mc/types/lib';
+import type { CloudAsset } from '@e-mc/types/lib/cloud';
+
+declare const Cloud: CloudConstructor<IFileManager<CloudAsset>>;
+
 export = Cloud;

package/index.js

@@ -2,8 +2,8 @@
 const path = require("path");
 const fs = require("fs");
 const crypto = require("crypto");
-const core_1 = require("@e-mc/core");
 const types_1 = require("@e-mc/types");
+const core_1 = require("@e-mc/core");
 const SERVICE_CLIENT = new Map();
 const SERVICE_UPLOAD = {};
 const SERVICE_DOWNLOAD = {};
@@ -51,7 +51,7 @@ function createUploadCallback(state, file, active) {
 }
 function renameTrailing(map, item, folder, value) {
     const location = folder + value;
-    map[location] || (map[location] = 1);
+    map[location] ||= 1;
     const index = value.indexOf('.');
     item.filename = (index !== -1 ? value.substring(0, index) : value) + '_' + map[location]++ + (index !== -1 ? value.substring(index) : '');
 }
@@ -117,7 +117,7 @@ class Cloud extends core_1.ClientDb {
                         const credential = instance.getCredential(storage, true);
                         const configBucket = admin.configBucket;
                         if (admin.emptyBucket) {
-                            const service = bucketDelete[name] || (bucketDelete[name] = {});
+                            const service = bucketDelete[name] ||= {};
                             const items = service[bucket];
                             if (!items) {
                                 service[bucket] = [{ ...credential }, admin.recursive];
@@ -129,11 +129,11 @@ class Cloud extends core_1.ClientDb {
                         if (configBucket) {
                             const { policy, tags } = configBucket;
                             if (policy) {
-                                const service = bucketPolicy[name] || (bucketPolicy[name] = {});
+                                const service = bucketPolicy[name] ||= {};
                                 service[bucket] = [{ ...credential }, policy];
                             }
                             if (tags) {
-                                const service = bucketTagging[name] || (bucketTagging[name] = {});
+                                const service = bucketTagging[name] ||= {};
                                 service[bucket] = [{ ...credential }, tags];
                             }
                         }
@@ -266,7 +266,7 @@ class Cloud extends core_1.ClientDb {
                     }
                     const service = data.service;
                     const location = service + '_' + data.bucket + '_' + (download.keyname || filename);
-                    let pending = (downloadMap || (downloadMap = {}))[location];
+                    let pending = (downloadMap ||= {})[location];
                     if (pending) {
                         pending.add(downloadUri);
                         continue;
@@ -298,7 +298,7 @@ class Cloud extends core_1.ClientDb {
                                 }
                                 this.add(destUri);
                                 this.formatMessage(64, service, ["Download success", (0, types_1.formatSize)(size)], destUri, { ...Cloud.LOG_CLOUD_DOWNLOAD });
-                                result || (result = destUri);
+                                result ||= destUri;
                             }
                             catch (err) {
                                 if (!copy && core_1.ClientDb.isErrorCode(err, 'EXDEV')) {
@@ -335,7 +335,7 @@ class Cloud extends core_1.ClientDb {
             ignoreProcess = contentType;
             contentType = undefined;
         }
-        contentType || (contentType = file.mimeType);
+        contentType ||= file.mimeType;
         const { host, instance } = state;
         const cloudStorage = file.cloudStorage;
         if (instance.aborted || !Array.isArray(cloudStorage)) {
@@ -649,7 +649,7 @@ class Cloud extends core_1.ClientDb {
             return (0, types_1.createAbortError)(true);
         }
         if ((service === 'gcp' || service === 'gcloud') && (0, types_1.isPlainObject)(credential)) {
-            credential.storageBucket || (credential.storageBucket = bucket);
+            credential.storageBucket ||= bucket;
         }
         let handler;
         try {
@@ -813,10 +813,10 @@ class Cloud extends core_1.ClientDb {
         return false;
     }
     getUploadHandler(service, credential) {
-        return (SERVICE_UPLOAD[service] || (SERVICE_UPLOAD[service] = require(this.resolveService(service, 'upload')))).call(this, credential, service);
+        return (SERVICE_UPLOAD[service] ||= require(this.resolveService(service, 'upload'))).call(this, credential, service);
     }
     getDownloadHandler(service, credential) {
-        return (SERVICE_DOWNLOAD[service] || (SERVICE_DOWNLOAD[service] = require(this.resolveService(service, 'download')))).call(this, credential, service);
+        return (SERVICE_DOWNLOAD[service] ||= require(this.resolveService(service, 'download'))).call(this, credential, service);
     }
     resolveService(service, folder) {
         let result;
@@ -824,7 +824,7 @@ class Cloud extends core_1.ClientDb {
             result = this.settings.imports?.[service] || types_1.IMPORT_MAP[service];
         }
         else {
-            folder || (folder = 'client');
+            folder ||= 'client';
         }
         return (result || service) + (folder ? '/' + folder : '');
     }
@@ -837,7 +837,7 @@ class Cloud extends core_1.ClientDb {
             return (0, types_1.createAbortError)(true);
         }
         const items = this.pending.filter(item => !item.document).map(async (data) => {
-            data.ignoreCache ?? (data.ignoreCache = true);
+            data.ignoreCache ??= true;
             return this.getDatabaseRows(data, true);
         });
         return items.length === 0 ? false : this.allSettled(items, ["Execute unassigned queries", this.moduleName]).then(result => result.length > 0).catch(() => false);

package/package.json

@@ -1,28 +1,28 @@
-{
-  "name": "@e-mc/cloud",
-  "version": "0.10.1",
-  "description": "Cloud constructor for E-mc.",
-  "main": "index.js",
-  "types": "index.d.ts",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/anpham6/e-mc.git",
-    "directory": "src/cloud"
-  },
-  "keywords": [
-    "squared",
-    "squared-functions"
-  ],
-  "author": "An Pham <anpham6@gmail.com>",
-  "license": "BSD 3-Clause",
-  "homepage": "https://github.com/anpham6/e-mc#readme",
-  "dependencies": {
-    "@e-mc/core": "0.10.1",
-    "@e-mc/db": "0.10.1",
-    "@e-mc/types": "0.10.1",
-    "mime-types": "^2.1.35"
-  }
-}
+{
+  "name": "@e-mc/cloud",
+  "version": "0.10.3",
+  "description": "Cloud constructor for E-mc.",
+  "main": "index.js",
+  "types": "index.d.ts",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/anpham6/e-mc.git",
+    "directory": "src/cloud"
+  },
+  "keywords": [
+    "squared",
+    "squared-functions"
+  ],
+  "author": "An Pham <anpham6@gmail.com>",
+  "license": "BSD-3-Clause",
+  "homepage": "https://github.com/anpham6/e-mc#readme",
+  "dependencies": {
+    "@e-mc/core": "0.10.3",
+    "@e-mc/db": "0.10.3",
+    "@e-mc/types": "0.10.3",
+    "mime-types": "^2.1.35"
+  }
+}

package/types/index.d.ts

@@ -1,35 +1,37 @@
-import type { ICloud, IFileManager, IModule, IScopeOrigin } from '../../types/lib';
-import type { BucketWebsiteOptions, CloudAsset, CloudDatabase, CloudService, CloudStorageUpload, DownloadData, UploadData } from '../../types/lib/cloud';
-import type { BatchQueryResult, QueryResult } from '../../types/lib/db';
-
-export interface ICloudServiceClient<T extends CloudDatabase = CloudDatabase, U = unknown, V = unknown> {
-    CLOUD_SERVICE_NAME: string;
-    CLOUD_UPLOAD_DISK?: boolean;
-    CLOUD_UPLOAD_STREAM?: boolean;
-    CLOUD_UPLOAD_CHUNK?: boolean;
-    CLOUD_DOWNLOAD_CHUNK?: boolean;
-    validateStorage?(credential: U, data?: CloudService): boolean;
-    validateDatabase?(credential: V, data?: CloudService): boolean;
-    createStorageClient?<W>(this: IModule, credential: U, service?: string): W;
-    createDatabaseClient?<W>(this: IModule, credential: V, data?: CloudService): W;
-    createBucket?(this: IModule, credential: U, bucket: string, publicRead?: boolean, service?: string, sdk?: string): Promise<boolean>;
-    createBucketV2?(this: IModule, credential: U, bucket: string, acl?: unknown, options?: unknown, service?: string, sdk?: string): Promise<boolean>;
-    setBucketPolicy?(this: IModule, credential: U, bucket: string, options: unknown, service?: string, sdk?: string): Promise<boolean>;
-    setBucketTagging?(this: IModule, credential: U, bucket: string, options: unknown, service?: string, sdk?: string): Promise<boolean>;
-    setBucketWebsite?(this: IModule, credential: U, bucket: string, options: BucketWebsiteOptions, service?: string, sdk?: string): Promise<boolean>;
-    deleteObjects?(this: IModule, credential: U, bucket: string, service?: string, sdk?: string, recursive?: boolean): Promise<void>;
-    deleteObjectsV2?(this: IModule, credential: U, bucket: string, recursive?: boolean, service?: string, sdk?: string): Promise<void>;
-    executeQuery?(this: ICloud, credential: V, data: T, sessionKey?: string): Promise<QueryResult>;
-    executeBatchQuery?(this: ICloud, credential: V, batch: T[], sessionKey?: string): Promise<BatchQueryResult>;
-}
-
-export interface CloudScopeOrigin<T extends IFileManager<U>, U extends CloudAsset = CloudAsset, V extends ICloud = ICloud<T>> extends Required<IScopeOrigin<T, V>> {
-    bucketGroup: string;
-    localStorage: Map<U, CloudStorageUpload>;
-}
-
-export type ServiceHost<T, U = unknown> = (this: IModule, credential: U, service?: string, sdk?: string) => T;
-export type UploadCallback = (data: UploadData, callback: (err: unknown, value?: string) => void) => void;
-export type DownloadCallback = (data: DownloadData, callback: (err: unknown, value?: Null<Bufferable>) => void) => void;
-export type UploadHost = ServiceHost<UploadCallback>;
+import type { ICloud, IFileManager, IModule, IScopeOrigin } from '@e-mc/types/lib';
+import type { BucketWebsiteOptions, CloudAsset, CloudDatabase, CloudService, CloudStorageUpload, DownloadData, UploadData } from '@e-mc/types/lib/cloud';
+import type { BatchQueryResult, QueryResult } from '@e-mc/types/lib/db';
+
+export interface ICloudServiceClient<T extends CloudDatabase = CloudDatabase, U = unknown, V = unknown> {
+    CLOUD_SERVICE_NAME: string;
+    CLOUD_UPLOAD_DISK?: boolean;
+    CLOUD_UPLOAD_STREAM?: boolean;
+    CLOUD_UPLOAD_CHUNK?: boolean;
+    CLOUD_DOWNLOAD_CHUNK?: boolean;
+    validateStorage?(credential: U, data?: CloudService): boolean;
+    validateDatabase?(credential: V, data?: CloudService): boolean;
+    createStorageClient?<W>(this: IModule, credential: U, service?: string): W;
+    createDatabaseClient?<W>(this: IModule, credential: V, data?: CloudService): W;
+    /** @deprecated */
+    createBucket?(this: IModule, credential: U, bucket: string, publicRead?: boolean, service?: string, sdk?: string): Promise<boolean>;
+    createBucketV2?(this: IModule, credential: U, bucket: string, acl?: unknown, options?: unknown, service?: string, sdk?: string): Promise<boolean>;
+    setBucketPolicy?(this: IModule, credential: U, bucket: string, options: unknown, service?: string, sdk?: string): Promise<boolean>;
+    setBucketTagging?(this: IModule, credential: U, bucket: string, options: unknown, service?: string, sdk?: string): Promise<boolean>;
+    setBucketWebsite?(this: IModule, credential: U, bucket: string, options: BucketWebsiteOptions, service?: string, sdk?: string): Promise<boolean>;
+    /** @deprecated */
+    deleteObjects?(this: IModule, credential: U, bucket: string, service?: string, sdk?: string, recursive?: boolean): Promise<void>;
+    deleteObjectsV2?(this: IModule, credential: U, bucket: string, recursive?: boolean, service?: string, sdk?: string): Promise<void>;
+    executeQuery?(this: ICloud, credential: V, data: T, sessionKey?: string): Promise<QueryResult>;
+    executeBatchQuery?(this: ICloud, credential: V, batch: T[], sessionKey?: string): Promise<BatchQueryResult>;
+}
+
+export interface CloudScopeOrigin<T extends IFileManager<U>, U extends CloudAsset = CloudAsset, V extends ICloud = ICloud<T>> extends Required<IScopeOrigin<T, V>> {
+    bucketGroup: string;
+    localStorage: Map<U, CloudStorageUpload>;
+}
+
+export type ServiceHost<T, U = unknown> = (this: IModule, credential: U, service?: string, sdk?: string) => T;
+export type UploadCallback = (data: UploadData, callback: (err: unknown, value?: string) => void) => void;
+export type DownloadCallback = (data: DownloadData, callback: (err: unknown, value?: Null<Bufferable>) => void) => void;
+export type UploadHost = ServiceHost<UploadCallback>;
 export type DownloadHost = ServiceHost<DownloadCallback>;

package/util.d.ts

@@ -1,18 +1,18 @@
-import type { UploadContent } from '../types/lib/cloud';
-import type { AuthValue } from '../types/lib/http';
-
-import type { Readable } from 'stream';
-
-declare namespace util {
-    /** @deprecated Types.IMPORT_MAP */
-    const IMPORTS: Record<string, string | undefined>;
-    function readableAsBuffer(from: Readable): Promise<Buffer | null>;
-    function createKeyAndBody<T = Buffer>(filename: string, items: UploadContent[], chunkSize?: number | string | FunctionType<void>, errorCallback?: FunctionType<void> | number, flags?: number): [string[], T[], string[]];
-    function generateFilename(filename: string): (i: number) => [string, boolean];
-    function getBasicAuth(auth: AuthValue): string;
-    function getBasicAuth(username: unknown, password?: unknown): string;
-    function hasBasicAuth(value: string): boolean;
-    function formatError(title: string | { service: string }, message: string, hint?: string): Error;
-}
-
+import type { UploadContent } from '@e-mc/types/lib/cloud';
+import type { AuthValue } from '@e-mc/types/lib/http';
+
+import type { Readable } from 'stream';
+
+declare namespace util {
+    /** @deprecated Types.IMPORT_MAP */
+    const IMPORTS: Record<string, string | undefined>;
+    function readableAsBuffer(from: Readable): Promise<Buffer | null>;
+    function createKeyAndBody<T = Buffer>(filename: string, items: UploadContent[], chunkSize?: number | string | FunctionType<void>, errorCallback?: FunctionType<void> | number, flags?: number): [string[], T[], string[]];
+    function generateFilename(filename: string): (i: number) => [string, boolean];
+    function getBasicAuth(auth: AuthValue): string;
+    function getBasicAuth(username: unknown, password?: unknown): string;
+    function hasBasicAuth(value: string): boolean;
+    function formatError(title: string | { service: string }, message: string, hint?: string): Error;
+}
+
 export = util;