@naturalcycles/datastore-lib 3.17.2 → 3.18.0

package/dist/datastore.db.js

@@ -55,9 +55,20 @@ class DatastoreDB extends db_lib_1.BaseCommonDB {
         if (!ids.length)
             return [];
         const keys = ids.map(id => this.key(table, id));
-        const [entities] = await this.ds().get(keys);
-        return (entities
-            .map(e => this.mapId(e))
+        let rows;
+        try {
+            rows = (await this.ds().get(keys))[0];
+        }
+        catch (err) {
+            this.cfg.logger.log('datastore recreated on error');
+            // This is to debug "GCP Datastore Timeout issue"
+            const datastoreLib = require('@google-cloud/datastore');
+            const DS = datastoreLib.Datastore;
+            this.cachedDatastore = new DS(this.cfg);
+            throw err;
+        }
+        return (rows
+            .map(r => this.mapId(r))
             // Seems like datastore .get() method doesn't return items properly sorted by input ids, so we gonna sort them here
             // same ids are not expected here
             .sort((a, b) => (a.id > b.id ? 1 : -1)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/datastore-lib",
-  "version": "3.17.2",
+  "version": "3.18.0",
   "description": "Opinionated library to work with Google Datastore",
   "scripts": {
     "prepare": "husky install"
@@ -17,7 +17,7 @@
   "devDependencies": {
     "@google-cloud/datastore": "^6.0.0",
     "@naturalcycles/dev-lib": "^12.0.1",
-    "@types/node": "^16.0.0",
+    "@types/node": "^17.0.8",
     "jest": "^27.0.4"
   },
   "files": [

package/src/datastore.db.ts

@@ -113,11 +113,24 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
   ): Promise<ROW[]> {
     if (!ids.length) return []
     const keys = ids.map(id => this.key(table, id))
-    const [entities] = await this.ds().get(keys)
+    let rows: any[]
+
+    try {
+      rows = (await this.ds().get(keys))[0]
+    } catch (err) {
+      this.cfg.logger.log('datastore recreated on error')
+
+      // This is to debug "GCP Datastore Timeout issue"
+      const datastoreLib = require('@google-cloud/datastore')
+      const DS = datastoreLib.Datastore as typeof Datastore
+      this.cachedDatastore = new DS(this.cfg)
+
+      throw err
+    }
 
     return (
-      (entities as any[])
-        .map(e => this.mapId<ROW>(e))
+      rows
+        .map(r => this.mapId<ROW>(r))
         // Seems like datastore .get() method doesn't return items properly sorted by input ids, so we gonna sort them here
         // same ids are not expected here
         .sort((a, b) => (a.id > b.id ? 1 : -1))