@pi-r/gcp 0.6.1 → 0.6.3

package/README.md

@@ -1,5 +1,7 @@
 ### @pi-r/gcp
 
+https://e-mc.readthedocs.io/en/latest/cloud/gcp.html
+
 ### LICENSE
 
 MIT

package/client/index.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getProjectId = exports.createBucketRequest = exports.setPredefinedAcl = exports.setPublicRead = exports.executeBatchQuery = exports.executeQuery = exports.deleteObjectsV2 = exports.deleteObjects = exports.setBucketWebsite = exports.setBucketPolicy = exports.createBucketV2 = exports.createBucket = exports.createDatabaseClient = exports.createStorageClient = exports.validateDatabase = exports.validateStorage = exports.isFirebaseApp = void 0;
 const path = require("path");
 const storage = require("@google-cloud/storage");
-const firestore = require("@google-cloud/firestore");
+const firestore_1 = require("@google-cloud/firestore");
 const util_1 = require("@e-mc/cloud/util");
 const types_1 = require("@e-mc/types");
 const Module = require("@e-mc/module");
@@ -106,18 +106,18 @@ async function setUniformBucketLevel(bucket, enabled) {
     return bucket.setMetadata({ iamConfiguration: { uniformBucketLevelAccess: { enabled } } });
 }
 const getFirebasePackageName = (credential) => credential.apiKey && credential.authDomain ? 'firebase' : 'firebase-admin';
-const hasKeyFile = (credential) => !!(credential.keyFile || credential.keyFilename || process.env.GOOGLE_APPLICATION_CREDENTIALS);
+const hasKeyFile = (credential) => (0, types_1.isString)(credential.keyFilename || credential.keyFile || process.env.GOOGLE_APPLICATION_CREDENTIALS) || (0, types_1.isObject)(credential.credentials);
 const isErrorConflict = (err) => (err instanceof Error) && err.code === 409;
 function isFirebaseApp(credential, store, admin) {
     return !!(credential.apiKey && credential.authDomain && (store || credential.databaseURL) || credential.product === 'firebase' && process.env.GOOGLE_APPLICATION_CREDENTIALS) && (!admin || !credential.admin);
 }
 exports.isFirebaseApp = isFirebaseApp;
 function validateStorage(credential) {
-    return hasKeyFile(credential) || isFirebaseApp(credential, true);
+    return hasKeyFile(credential) || !!credential.authClient || isFirebaseApp(credential, true);
 }
 exports.validateStorage = validateStorage;
 function validateDatabase(credential, data) {
-    return hasKeyFile(credential) && !!(data.product || data.database || data.table || data.query || data.id || data.keys || data.kind || data.options?.query) || isFirebaseApp(credential);
+    return (hasKeyFile(credential) || !!credential.authClient) && !!(data.product || data.database || data.table || data.query || data.id || data.keys || data.kind || data.options?.query) || isFirebaseApp(credential);
 }
 exports.validateDatabase = validateDatabase;
 function createStorageClient(credential, bucket) {
@@ -135,7 +135,7 @@ function createStorageClient(credential, bucket) {
             throw err;
         }
     }
-    getProjectId(credential);
+    getProjectId(credential, false);
     return new storage.Storage(credential);
 }
 exports.createStorageClient = createStorageClient;
@@ -144,13 +144,13 @@ function createDatabaseClient(credential, data) {
     try {
         let product, name, database, table, query;
         if (data) {
-            ({ product, name, table, query } = data);
+            ({ product, name, table, query, database } = data);
         }
         if (product === 'firebase' || isFirebaseApp(credential)) {
             packageName = getFirebasePackageName(credential);
             return getApp(credential, true);
         }
-        getProjectId(credential);
+        getProjectId(credential, true);
         if (data) {
             if (product === 'spanner' || !product && name && database && (query || table)) {
                 const { Spanner } = require(packageName = '@google-cloud/spanner');
@@ -174,7 +174,7 @@ function createDatabaseClient(credential, data) {
         this.checkPackage(err, packageName, { passThrough: true });
         throw err;
     }
-    return new firestore.Firestore(credential);
+    return new firestore_1.Firestore(credential);
 }
 exports.createDatabaseClient = createDatabaseClient;
 async function createBucket(credential, bucket, publicRead, service = 'gcp') {
@@ -407,7 +407,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
     };
     for (let i = 0; i < length; ++i) {
         const item = batch[i];
-        const { service, product, name, database, table, id, query, orderBy, limit = 0, update, ignoreCache } = item;
+        const { service, product, name, database, table, id, query, limit = 0, update, ignoreCache } = item;
         const useCache = caching && ignoreCache !== true;
         const getCache = (value) => {
             if (ignoreCache !== 1) {
@@ -422,6 +422,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 closeClient();
                 throw (0, util_1.formatError)(item, "Missing database query" /* ERR_DB.QUERY */);
             }
+            const orderBy = item.orderBy;
             if (useCache) {
                 queryString = query + Module.asString(orderBy, true);
                 if (!update && (rows = getCache(queryString))) {
@@ -435,30 +436,29 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             if ((0, types_1.isArray)(orderBy)) {
                 const sort = require('@firebase/database');
                 for (const items of orderBy) {
-                    if (!(0, types_1.isArray)(items)) {
-                        continue;
-                    }
-                    const method = items[0];
-                    switch (method) {
-                        case 'orderByChild':
-                            constraints.push(sort.orderByChild(items[1]));
-                            break;
-                        case 'orderByKey':
-                        case 'orderByValue':
-                        case 'orderByPriority':
-                            constraints.push(sort[method]());
-                            break;
-                        case 'limitToFirst':
-                        case 'limitToLast':
-                            constraints.push(sort[method](limiter = +items[1]));
-                            break;
-                        case 'startAt':
-                        case 'startAfter':
-                        case 'endAt':
-                        case 'endBefore':
-                        case 'equalTo':
-                            constraints.push(sort[method](items[1], items[2]));
-                            break;
+                    if ((0, types_1.isArray)(items)) {
+                        const method = items[0];
+                        switch (method) {
+                            case 'orderByChild':
+                                constraints.push(sort.orderByChild(items[1]));
+                                break;
+                            case 'orderByKey':
+                            case 'orderByValue':
+                            case 'orderByPriority':
+                                constraints.push(sort[method]());
+                                break;
+                            case 'limitToFirst':
+                            case 'limitToLast':
+                                constraints.push(sort[method](limiter = +items[1]));
+                                break;
+                            case 'startAt':
+                            case 'startAfter':
+                            case 'endAt':
+                            case 'endBefore':
+                            case 'equalTo':
+                                constraints.push(sort[method](items[1], items[2]));
+                                break;
+                        }
                     }
                 }
             }
@@ -496,10 +496,10 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 if ((0, types_1.isPlainObject)(update)) {
                     await db.table(table)[updateType === 1 ? 'insert' : updateType === 2 ? 'replace' : 'update'](update, options.tableUpdate);
                 }
-                const request = (0, types_1.isPlainObject)(query) ? query : { columns };
+                const request = (0, types_1.isPlainObject)(query) ? query : {};
                 request.json = true;
-                if ((0, types_1.isObject)(item.columns)) {
-                    request.columns = item.columns;
+                if ((0, types_1.isObject)(columns)) {
+                    request.columns = columns;
                 }
                 request.keySet = { all: true };
                 if (limit > 0) {
@@ -543,14 +543,14 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 (options.gaxOptions || (options.gaxOptions = {})).maxResults = limit;
             }
             if (useCache) {
-                queryString = name + '_' + table + '_' + (id ? id + ((0, types_1.isArray)(columns) ? '_' + Module.asString(columns, true) : '') : '') + Module.asString(options, true);
+                queryString = name + '_' + table + '_' + ((0, types_1.isString)(id) ? id + ((0, types_1.isArray)(columns) ? '_' + Module.asString(columns, true) : '') : '') + Module.asString(options, true);
                 if (!(update && id) && (rows = getCache(queryString))) {
                     result[i] = rows;
                     continue;
                 }
             }
             const db = createClient(item, 4 /* DB.BIGTABLE */).instance(name).table(table);
-            if (id) {
+            if ((0, types_1.isString)(id)) {
                 const row = db.row(id);
                 if (update) {
                     await row.save(update);
@@ -615,12 +615,12 @@ async function executeBatchQuery(credential, batch, sessionKey) {
         }
         else if (product === 'datastore' || !product && (item.keys || item.kind || query && !table && !id)) {
             const { keys, kind } = item;
-            if (!keys && !Array.isArray(query)) {
+            if (!keys && !kind && !Array.isArray(query)) {
                 closeClient();
                 throw (0, util_1.formatError)(item, "Missing database query" /* ERR_DB.QUERY */);
             }
             if (useCache) {
-                queryString = (keys ? Module.asString(keys, true) : Module.asString(query, true) + (kind || '')) + Module.asString(item.options, true) + (limit > 0 ? limit : 0);
+                queryString = (keys ? Cloud.asString(keys, true) : (kind ? (name ? name + '_' : '') + Cloud.asString(kind, true) : '') + (limit > 0 ? '_' + limit : 0) + Cloud.asString(query, true)) + Cloud.asString(item.options, true);
                 if (!update && (rows = getCache(queryString))) {
                     result[i] = rows;
                     continue;
@@ -638,22 +638,26 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 }
             }
             else {
-                const task = db.createQuery(kind);
-                for (const args of query) {
-                    if ((0, types_1.isArray)(args)) {
-                        const method = args[0];
-                        switch (method) {
-                            case 'end':
-                            case 'filter':
-                            case 'groupBy':
-                            case 'hasAncestor':
-                            case 'limit':
-                            case 'offset':
-                            case 'order':
-                            case 'select':
-                            case 'start':
-                                task[method].apply(task, args.slice(1)); // eslint-disable-line prefer-spread
-                                break;
+                const task = name && kind ? db.createQuery(name, kind) : db.createQuery(kind);
+                if ((0, types_1.isArray)(query)) {
+                    for (const args of query) {
+                        if ((0, types_1.isArray)(args)) {
+                            const method = args[0];
+                            switch (method) {
+                                case 'end':
+                                case 'filter':
+                                case 'groupBy':
+                                case 'limit':
+                                case 'offset':
+                                case 'order':
+                                case 'select':
+                                case 'start':
+                                    task[method].apply(task, args.slice(1)); // eslint-disable-line prefer-spread
+                                    break;
+                                case 'hasAncestor':
+                                    task.hasAncestor(db.key(args[1]));
+                                    break;
+                            }
                         }
                     }
                 }
@@ -685,21 +689,32 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             if (id) {
                 if (useCache) {
                     queryString = table + '_' + id;
-                    if (!update && (rows = getCache(queryString))) {
+                    if ((!update || Array.isArray(id)) && (rows = getCache(queryString))) {
                         result[i] = rows;
                         continue;
                     }
                 }
-                const db = createClient(item, 3 /* DB.FIRESTORE */).collection(table).doc(id);
-                if ((0, types_1.isPlainObject)(update)) {
-                    await db.update(update, { exists: true });
+                const db = createClient(item, 3 /* DB.FIRESTORE */);
+                if (Array.isArray(id)) {
+                    const items = id.map(ref => db.doc(table + '/' + ref));
+                    if ((0, types_1.isPlainObject)(item.options)) {
+                        items.push(item.options);
+                    }
+                    rows = (await db.getAll(...items)).filter(value => value.exists).map(value => value.data());
                 }
-                const data = (await db.get()).data();
-                if (data) {
-                    rows = [data];
+                else {
+                    const doc = db.collection(table).doc(id);
+                    if ((0, types_1.isPlainObject)(update)) {
+                        await doc.update(update, { exists: true });
+                    }
+                    const data = (await doc.get()).data();
+                    if (data) {
+                        rows = [data];
+                    }
                 }
             }
             else if (Array.isArray(query)) {
+                const orderBy = item.orderBy;
                 if (useCache && (rows = getCache(queryString = table + '_' + Module.asString(query, true) + Module.asString(orderBy, true) + (limit > 0 ? limit : '')))) {
                     result[i] = rows;
                     continue;
@@ -708,7 +723,17 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 for (const args of query) {
                     if ((0, types_1.isArray)(args)) {
                         const method = args[0];
+                        const params = args.slice(1);
                         switch (method) {
+                            case 'whereAnd':
+                            case 'whereOr':
+                                if (params.every(p => Array.isArray(p))) {
+                                    db = db.where(firestore_1.Filter[method === 'whereAnd' ? 'and' : 'or'](...params.map((p) => firestore_1.Filter.where(p[0], p[1], p[2]))));
+                                }
+                                else {
+                                    throw (0, types_1.errorMessage)(method, 'Conditionals are not in array format', Cloud.asString(params));
+                                }
+                                break;
                             case 'endAt':
                             case 'endBefore':
                             case 'limit':
@@ -720,7 +745,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                             case 'startAt':
                             case 'where':
                             case 'withConverter':
-                                db = db[method].apply(db, args.slice(1)); // eslint-disable-line prefer-spread
+                                db = db[method].apply(db, params); // eslint-disable-line prefer-spread
                                 break;
                         }
                     }
@@ -873,19 +898,24 @@ function createBucketRequest(credential) {
     return options;
 }
 exports.createBucketRequest = createBucketRequest;
-function getProjectId(credential) {
+function getProjectId(credential, cache) {
+    let projectId = credential.projectId;
+    if (!cache && projectId) {
+        return projectId;
+    }
     let pathname = credential.keyFilename || credential.keyFile;
-    if (pathname && Module.isPath(pathname = path.resolve(pathname)) || (pathname = process.env.GOOGLE_APPLICATION_CREDENTIALS) && Module.isPath(pathname = path.resolve(pathname))) {
+    if (pathname && Cloud.isPath(pathname = path.resolve(pathname)) || (pathname = process.env.GOOGLE_APPLICATION_CREDENTIALS) && Cloud.isPath(pathname = path.resolve(pathname))) {
         if (credential.keyFilename) {
             credential.keyFilename = pathname;
         }
         else {
             credential.keyFile = pathname;
         }
-        if (!credential.projectId) {
+        if (!projectId) {
             try {
-                const projectId = require(pathname).project_id;
-                if ((0, types_1.isString)(projectId)) {
+                const id = require(pathname).project_id;
+                if ((0, types_1.isString)(id)) {
+                    projectId = id;
                     credential.projectId = projectId;
                 }
             }
@@ -893,5 +923,6 @@ function getProjectId(credential) {
             }
         }
     }
+    return projectId;
 }
 exports.getProjectId = getProjectId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/gcp",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "description": "Google (GCP) cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -8,7 +8,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/anpham6/pi-r.git",
+    "url": "git+https://github.com/anpham6/pi-r.git",
     "directory": "src/cloud/gcp"
   },
   "keywords": [
@@ -20,10 +20,10 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.8.1",
-    "@e-mc/module": "^0.8.1",
-    "@e-mc/types": "^0.8.1",
-    "@google-cloud/firestore": "^7.1.0",
+    "@e-mc/cloud": "^0.8.3",
+    "@e-mc/module": "^0.8.3",
+    "@e-mc/types": "^0.8.3",
+    "@google-cloud/firestore": "^7.2.0",
     "@google-cloud/storage": "^7.7.0"
   }
 }

package/upload/index.js

@@ -184,6 +184,9 @@ function upload(credential, service = 'gcp') {
                     if (first) {
                         uploadResponse(err);
                     }
+                    else {
+                        addLog(err);
+                    }
                 });
             }
         }