@naturalcycles/datastore-lib 3.18.0 → 3.18.1

package/dist/datastore.db.js

@@ -57,7 +57,16 @@ class DatastoreDB extends db_lib_1.BaseCommonDB {
         const keys = ids.map(id => this.key(table, id));
         let rows;
         try {
-            rows = (await this.ds().get(keys))[0];
+            if (this.cfg.timeout) {
+                const r = await (0, js_lib_1.pTimeout)(this.ds().get(keys), {
+                    timeout: this.cfg.timeout,
+                    name: `datastore.getByIds(${table})`,
+                });
+                rows = r[0];
+            }
+            else {
+                rows = (await this.ds().get(keys))[0];
+            }
         }
         catch (err) {
             this.cfg.logger.log('datastore recreated on error');

package/dist/datastore.model.d.ts

@@ -34,6 +34,13 @@ export interface DatastoreDBCfg extends DatastoreOptions {
      * Default to `console`
      */
     logger?: CommonLogger;
+    /**
+     * Experimental option, currently only applies to `getByIds`.
+     * Applies pTimeout to Datastore operation, re-creates Datastore on any error.
+     *
+     * @experimental
+     */
+    timeout?: number;
 }
 export interface DatastoreCredentials {
     type?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/datastore-lib",
-  "version": "3.18.0",
+  "version": "3.18.1",
   "description": "Opinionated library to work with Google Datastore",
   "scripts": {
     "prepare": "husky install"

package/src/datastore.db.ts

@@ -24,6 +24,7 @@ import {
   JsonSchemaRootObject,
   CommonLogger,
   commonLoggerMinLevel,
+  pTimeout,
 } from '@naturalcycles/js-lib'
 import { ReadableTyped } from '@naturalcycles/nodejs-lib'
 import { boldWhite } from '@naturalcycles/nodejs-lib/dist/colors'
@@ -116,7 +117,15 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
     let rows: any[]
 
     try {
-      rows = (await this.ds().get(keys))[0]
+      if (this.cfg.timeout) {
+        const r = await pTimeout(this.ds().get(keys), {
+          timeout: this.cfg.timeout,
+          name: `datastore.getByIds(${table})`,
+        })
+        rows = r[0]
+      } else {
+        rows = (await this.ds().get(keys))[0]
+      }
     } catch (err) {
       this.cfg.logger.log('datastore recreated on error')
 

package/src/datastore.model.ts

@@ -41,6 +41,14 @@ export interface DatastoreDBCfg extends DatastoreOptions {
    * Default to `console`
    */
   logger?: CommonLogger
+
+  /**
+   * Experimental option, currently only applies to `getByIds`.
+   * Applies pTimeout to Datastore operation, re-creates Datastore on any error.
+   *
+   * @experimental
+   */
+  timeout?: number
 }
 
 export interface DatastoreCredentials {