@sentio/sdk 1.30.0 → 1.30.1

package/lib/cli/webpack.config.js

@@ -26,15 +26,16 @@ module.exports = {
   mode: 'production',
   externals: [
     {
+      protobufjs: 'commonjs2 protobufjs',
       aptos: 'commonjs2 aptos-sdk',
       ethers: 'commonjs2 ethers',
       bs58: 'commonjs2 bs58',
       "bignumber.js": 'commonjs2 bignumber.js',
       'bn.js': 'commonjs2 bn.js',
-      'csv-parse': 'commonjs2 csv-parse'
+      'csv-parse': 'commonjs2 csv-parse',
     },
     function ({ context, request }, callback) {
-      if (/^@(ethersproject|solana|project-serum).*$/.test(request)) {
+      if (/^@(ethersproject|solana|project-serum|nice-grpc).*$/.test(request)) {
         return callback(null, 'commonjs ' + request)
       }
       if (request.startsWith("@sentio/sdk")) {

package/lib/utils/price.d.ts

@@ -1,5 +1,42 @@
-import { PriceServiceClient } from '../gen/service/price/protos/price';
-export declare function getPriceClient(address?: string): PriceServiceClient;
+import { RetryOptions } from 'nice-grpc-client-middleware-retry';
+export declare function getPriceClient(address?: string): import("nice-grpc").RawClient<import("nice-grpc/lib/service-definitions/ts-proto").FromTsProtoServiceDefinition<{
+    readonly name: "PriceService";
+    readonly fullName: "price_service.PriceService";
+    readonly methods: {
+        readonly getPrice: {
+            readonly name: "GetPrice";
+            readonly requestType: {
+                encode(message: import("../gen/service/price/protos/price").GetPriceRequest, writer?: import("protobufjs").Writer): import("protobufjs").Writer;
+                decode(input: Uint8Array | import("protobufjs").Reader, length?: number | undefined): import("../gen/service/price/protos/price").GetPriceRequest;
+                fromJSON(object: any): import("../gen/service/price/protos/price").GetPriceRequest;
+                toJSON(message: import("../gen/service/price/protos/price").GetPriceRequest): unknown;
+                fromPartial(object: {
+                    timestamp?: Date | undefined;
+                    coinId?: {
+                        symbol?: string | undefined;
+                        address?: {
+                            address?: string | undefined;
+                            chain?: string | undefined;
+                        } | undefined;
+                    } | undefined;
+                }): import("../gen/service/price/protos/price").GetPriceRequest;
+            };
+            readonly requestStream: false;
+            readonly responseType: {
+                encode(message: import("../gen/service/price/protos/price").GetPriceResponse, writer?: import("protobufjs").Writer): import("protobufjs").Writer;
+                decode(input: Uint8Array | import("protobufjs").Reader, length?: number | undefined): import("../gen/service/price/protos/price").GetPriceResponse;
+                fromJSON(object: any): import("../gen/service/price/protos/price").GetPriceResponse;
+                toJSON(message: import("../gen/service/price/protos/price").GetPriceResponse): unknown;
+                fromPartial(object: {
+                    price?: number | undefined;
+                    timestamp?: Date | undefined;
+                }): import("../gen/service/price/protos/price").GetPriceResponse;
+            };
+            readonly responseStream: false;
+            readonly options: {};
+        };
+    };
+}>, RetryOptions>;
 /**
  *
  * @param chainId chain id refers to CHAIN_MAP
@@ -7,4 +44,9 @@ export declare function getPriceClient(address?: string): PriceServiceClient;
  * @param date
  */
 export declare function getPriceByType(chainId: string, coinType: string, date: Date): Promise<number>;
-export declare function delay(ms: number): Promise<unknown>;
+/**
+ *
+ * @param symbol token symbol like BTC, etc
+ * @param date
+ */
+export declare function getPriceBySymbol(symbol: string, date: Date): Promise<number>;

package/lib/utils/price.js

@@ -1,14 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.delay = exports.getPriceByType = exports.getPriceClient = void 0;
+exports.getPriceBySymbol = exports.getPriceByType = exports.getPriceClient = void 0;
 const price_1 = require("../gen/service/price/protos/price");
 const nice_grpc_1 = require("nice-grpc");
+const nice_grpc_client_middleware_retry_1 = require("nice-grpc-client-middleware-retry");
 function getPriceClient(address) {
     if (!address) {
         address = global.ENDPOINTS.priceFeedAPI;
     }
     const channel = (0, nice_grpc_1.createChannel)(address);
-    return (0, nice_grpc_1.createClient)(price_1.PriceServiceDefinition, channel);
+    return (0, nice_grpc_1.createClientFactory)().use(nice_grpc_client_middleware_retry_1.retryMiddleware).create(price_1.PriceServiceDefinition, channel);
 }
 exports.getPriceClient = getPriceClient;
 const priceMap = new Map();
@@ -25,35 +26,54 @@ async function getPriceByType(chainId, coinType, date) {
     }
     const dateStr = [date.getUTCDate(), date.getUTCMonth() + 1, date.getUTCFullYear()].join('-');
     const key = `${coinType}-${dateStr}`;
-    const price = priceMap.get(key);
+    let price = priceMap.get(key);
     if (price) {
         return price;
     }
-    /*eslint no-constant-condition: ["error", { "checkLoops": false }]*/
-    while (true) {
-        try {
-            const response = await priceClient.getPrice({
-                timestamp: date,
-                coinId: {
-                    address: {
-                        chain: chainId,
-                        address: coinType,
-                    },
-                },
-            });
-            const price = response.price;
-            priceMap.set(key, price);
-            return price;
-        }
-        catch (e) {
-            console.log('error getting price', e, dateStr, coinType);
-            await delay(1000);
-        }
-    }
+    const response = await priceClient.getPrice({
+        timestamp: date,
+        coinId: {
+            address: {
+                chain: chainId,
+                address: coinType,
+            },
+        },
+    }, {
+        retry: true,
+        retryMaxAttempts: 8,
+    });
+    price = response.price;
+    priceMap.set(key, price);
+    return price;
 }
 exports.getPriceByType = getPriceByType;
-function delay(ms) {
-    return new Promise((resolve) => setTimeout(resolve, ms));
+/**
+ *
+ * @param symbol token symbol like BTC, etc
+ * @param date
+ */
+async function getPriceBySymbol(symbol, date) {
+    if (!priceClient) {
+        priceClient = getPriceClient();
+    }
+    const dateStr = [date.getUTCDate(), date.getUTCMonth() + 1, date.getUTCFullYear()].join('-');
+    const key = `${symbol}-${dateStr}`;
+    let price = priceMap.get(key);
+    if (price) {
+        return price;
+    }
+    const response = await priceClient.getPrice({
+        timestamp: date,
+        coinId: {
+            symbol,
+        },
+    }, {
+        retry: true,
+        retryMaxAttempts: 8,
+    });
+    price = response.price;
+    priceMap.set(key, price);
+    return price;
 }
-exports.delay = delay;
+exports.getPriceBySymbol = getPriceBySymbol;
 //# sourceMappingURL=price.js.map

package/lib/utils/price.js.map

@@ -1 +1 @@
-{"version":3,"file":"price.js","sourceRoot":"","sources":["../../src/utils/price.ts"],"names":[],"mappings":";;;AAAA,6DAA8F;AAC9F,yCAAuD;AAEvD,SAAgB,cAAc,CAAC,OAAgB;IAC7C,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,YAAY,CAAA;KACxC;IACD,MAAM,OAAO,GAAG,IAAA,yBAAa,EAAC,OAAO,CAAC,CAAA;IAEtC,OAAO,IAAA,wBAAY,EAAC,8BAAsB,EAAE,OAAO,CAAC,CAAA;AACtD,CAAC;AAPD,wCAOC;AAED,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAkB,CAAA;AAC1C,IAAI,WAA+B,CAAA;AAEnC;;;;;GAKG;AACI,KAAK,UAAU,cAAc,CAAC,OAAe,EAAE,QAAgB,EAAE,IAAU;IAChF,IAAI,CAAC,WAAW,EAAE;QAChB,WAAW,GAAG,cAAc,EAAE,CAAA;KAC/B;IAED,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC5F,MAAM,GAAG,GAAG,GAAG,QAAQ,IAAI,OAAO,EAAE,CAAA;IACpC,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAC/B,IAAI,KAAK,EAAE;QACT,OAAO,KAAK,CAAA;KACb;IAED,oEAAoE;IACpE,OAAO,IAAI,EAAE;QACX,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,QAAQ,CAAC;gBAC1C,SAAS,EAAE,IAAI;gBACf,MAAM,EAAE;oBACN,OAAO,EAAE;wBACP,KAAK,EAAE,OAAO;wBACd,OAAO,EAAE,QAAQ;qBAClB;iBACF;aACF,CAAC,CAAA;YACF,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAA;YAC5B,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;YACxB,OAAO,KAAK,CAAA;SACb;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;YACxD,MAAM,KAAK,CAAC,IAAI,CAAC,CAAA;SAClB;KACF;AACH,CAAC;AAhCD,wCAgCC;AAED,SAAgB,KAAK,CAAC,EAAU;IAC9B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAA;AAC1D,CAAC;AAFD,sBAEC","sourcesContent":["import { PriceServiceClient, PriceServiceDefinition } from '../gen/service/price/protos/price'\nimport { createChannel, createClient } from 'nice-grpc'\n\nexport function getPriceClient(address?: string): PriceServiceClient {\n  if (!address) {\n    address = global.ENDPOINTS.priceFeedAPI\n  }\n  const channel = createChannel(address)\n\n  return createClient(PriceServiceDefinition, channel)\n}\n\nconst priceMap = new Map<string, number>()\nlet priceClient: PriceServiceClient\n\n/**\n *\n * @param chainId chain id refers to CHAIN_MAP\n * @param coinType\n * @param date\n */\nexport async function getPriceByType(chainId: string, coinType: string, date: Date): Promise<number> {\n  if (!priceClient) {\n    priceClient = getPriceClient()\n  }\n\n  const dateStr = [date.getUTCDate(), date.getUTCMonth() + 1, date.getUTCFullYear()].join('-')\n  const key = `${coinType}-${dateStr}`\n  const price = priceMap.get(key)\n  if (price) {\n    return price\n  }\n\n  /*eslint no-constant-condition: [\"error\", { \"checkLoops\": false }]*/\n  while (true) {\n    try {\n      const response = await priceClient.getPrice({\n        timestamp: date,\n        coinId: {\n          address: {\n            chain: chainId,\n            address: coinType,\n          },\n        },\n      })\n      const price = response.price\n      priceMap.set(key, price)\n      return price\n    } catch (e) {\n      console.log('error getting price', e, dateStr, coinType)\n      await delay(1000)\n    }\n  }\n}\n\nexport function delay(ms: number) {\n  return new Promise((resolve) => setTimeout(resolve, ms))\n}\n"]}
+{"version":3,"file":"price.js","sourceRoot":"","sources":["../../src/utils/price.ts"],"names":[],"mappings":";;;AAAA,6DAA8F;AAC9F,yCAA8D;AAC9D,yFAAiF;AAEjF,SAAgB,cAAc,CAAC,OAAgB;IAC7C,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,YAAY,CAAA;KACxC;IACD,MAAM,OAAO,GAAG,IAAA,yBAAa,EAAC,OAAO,CAAC,CAAA;IAEtC,OAAO,IAAA,+BAAmB,GAAE,CAAC,GAAG,CAAC,mDAAe,CAAC,CAAC,MAAM,CAAC,8BAAsB,EAAE,OAAO,CAAC,CAAA;AAC3F,CAAC;AAPD,wCAOC;AAED,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAkB,CAAA;AAC1C,IAAI,WAA6C,CAAA;AAEjD;;;;;GAKG;AACI,KAAK,UAAU,cAAc,CAAC,OAAe,EAAE,QAAgB,EAAE,IAAU;IAChF,IAAI,CAAC,WAAW,EAAE;QAChB,WAAW,GAAG,cAAc,EAAE,CAAA;KAC/B;IAED,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC5F,MAAM,GAAG,GAAG,GAAG,QAAQ,IAAI,OAAO,EAAE,CAAA;IACpC,IAAI,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAC7B,IAAI,KAAK,EAAE;QACT,OAAO,KAAK,CAAA;KACb;IAED,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,QAAQ,CACzC;QACE,SAAS,EAAE,IAAI;QACf,MAAM,EAAE;YACN,OAAO,EAAE;gBACP,KAAK,EAAE,OAAO;gBACd,OAAO,EAAE,QAAQ;aAClB;SACF;KACF,EACD;QACE,KAAK,EAAE,IAAI;QACX,gBAAgB,EAAE,CAAC;KACpB,CACF,CAAA;IACD,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAA;IACtB,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;IACxB,OAAO,KAAK,CAAA;AACd,CAAC;AA9BD,wCA8BC;AAED;;;;GAIG;AACI,KAAK,UAAU,gBAAgB,CAAC,MAAc,EAAE,IAAU;IAC/D,IAAI,CAAC,WAAW,EAAE;QAChB,WAAW,GAAG,cAAc,EAAE,CAAA;KAC/B;IAED,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC5F,MAAM,GAAG,GAAG,GAAG,MAAM,IAAI,OAAO,EAAE,CAAA;IAClC,IAAI,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAC7B,IAAI,KAAK,EAAE;QACT,OAAO,KAAK,CAAA;KACb;IAED,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,QAAQ,CACzC;QACE,SAAS,EAAE,IAAI;QACf,MAAM,EAAE;YACN,MAAM;SACP;KACF,EACD;QACE,KAAK,EAAE,IAAI;QACX,gBAAgB,EAAE,CAAC;KACpB,CACF,CAAA;IACD,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAA;IACtB,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;IACxB,OAAO,KAAK,CAAA;AACd,CAAC;AA3BD,4CA2BC","sourcesContent":["import { PriceServiceClient, PriceServiceDefinition } from '../gen/service/price/protos/price'\nimport { createChannel, createClientFactory } from 'nice-grpc'\nimport { retryMiddleware, RetryOptions } from 'nice-grpc-client-middleware-retry'\n\nexport function getPriceClient(address?: string) {\n  if (!address) {\n    address = global.ENDPOINTS.priceFeedAPI\n  }\n  const channel = createChannel(address)\n\n  return createClientFactory().use(retryMiddleware).create(PriceServiceDefinition, channel)\n}\n\nconst priceMap = new Map<string, number>()\nlet priceClient: PriceServiceClient<RetryOptions>\n\n/**\n *\n * @param chainId chain id refers to CHAIN_MAP\n * @param coinType\n * @param date\n */\nexport async function getPriceByType(chainId: string, coinType: string, date: Date): Promise<number> {\n  if (!priceClient) {\n    priceClient = getPriceClient()\n  }\n\n  const dateStr = [date.getUTCDate(), date.getUTCMonth() + 1, date.getUTCFullYear()].join('-')\n  const key = `${coinType}-${dateStr}`\n  let price = priceMap.get(key)\n  if (price) {\n    return price\n  }\n\n  const response = await priceClient.getPrice(\n    {\n      timestamp: date,\n      coinId: {\n        address: {\n          chain: chainId,\n          address: coinType,\n        },\n      },\n    },\n    {\n      retry: true,\n      retryMaxAttempts: 8,\n    }\n  )\n  price = response.price\n  priceMap.set(key, price)\n  return price\n}\n\n/**\n *\n * @param symbol token symbol like BTC, etc\n * @param date\n */\nexport async function getPriceBySymbol(symbol: string, date: Date): Promise<number> {\n  if (!priceClient) {\n    priceClient = getPriceClient()\n  }\n\n  const dateStr = [date.getUTCDate(), date.getUTCMonth() + 1, date.getUTCFullYear()].join('-')\n  const key = `${symbol}-${dateStr}`\n  let price = priceMap.get(key)\n  if (price) {\n    return price\n  }\n\n  const response = await priceClient.getPrice(\n    {\n      timestamp: date,\n      coinId: {\n        symbol,\n      },\n    },\n    {\n      retry: true,\n      retryMaxAttempts: 8,\n    }\n  )\n  price = response.price\n  priceMap.set(key, price)\n  return price\n}\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentio/sdk",
   "license": "Apache-2.0",
-  "version": "1.30.0",
+  "version": "1.30.1",
   "scripts": {
     "compile_target": "yarn tsc -b src/target-ethers-sentio/tsconfig.json",
     "compile": "tsc -p . && cp src/cli/webpack.config.js lib/cli && cp src/utils/*.csv lib/utils",
@@ -41,6 +41,8 @@
     "google-protobuf": "^3.15.8",
     "js-yaml": "^4.1.0",
     "nice-grpc": "^2.0.0",
+    "nice-grpc-client-middleware-retry": "^2.0.1",
+    "nice-grpc-error-details": "^0.1.4",
     "node-fetch": "2",
     "p-queue": "^6.6.2",
     "ts-loader": "^9.3.0",

package/src/cli/webpack.config.js

@@ -26,15 +26,16 @@ module.exports = {
   mode: 'production',
   externals: [
     {
+      protobufjs: 'commonjs2 protobufjs',
       aptos: 'commonjs2 aptos-sdk',
       ethers: 'commonjs2 ethers',
       bs58: 'commonjs2 bs58',
       "bignumber.js": 'commonjs2 bignumber.js',
       'bn.js': 'commonjs2 bn.js',
-      'csv-parse': 'commonjs2 csv-parse'
+      'csv-parse': 'commonjs2 csv-parse',
     },
     function ({ context, request }, callback) {
-      if (/^@(ethersproject|solana|project-serum).*$/.test(request)) {
+      if (/^@(ethersproject|solana|project-serum|nice-grpc).*$/.test(request)) {
         return callback(null, 'commonjs ' + request)
       }
       if (request.startsWith("@sentio/sdk")) {

package/src/utils/price.ts

@@ -1,17 +1,18 @@
 import { PriceServiceClient, PriceServiceDefinition } from '../gen/service/price/protos/price'
-import { createChannel, createClient } from 'nice-grpc'
+import { createChannel, createClientFactory } from 'nice-grpc'
+import { retryMiddleware, RetryOptions } from 'nice-grpc-client-middleware-retry'
 
-export function getPriceClient(address?: string): PriceServiceClient {
+export function getPriceClient(address?: string) {
   if (!address) {
     address = global.ENDPOINTS.priceFeedAPI
   }
   const channel = createChannel(address)
 
-  return createClient(PriceServiceDefinition, channel)
+  return createClientFactory().use(retryMiddleware).create(PriceServiceDefinition, channel)
 }
 
 const priceMap = new Map<string, number>()
-let priceClient: PriceServiceClient
+let priceClient: PriceServiceClient<RetryOptions>
 
 /**
  *
@@ -26,33 +27,61 @@ export async function getPriceByType(chainId: string, coinType: string, date: Da
 
   const dateStr = [date.getUTCDate(), date.getUTCMonth() + 1, date.getUTCFullYear()].join('-')
   const key = `${coinType}-${dateStr}`
-  const price = priceMap.get(key)
+  let price = priceMap.get(key)
   if (price) {
     return price
   }
 
-  /*eslint no-constant-condition: ["error", { "checkLoops": false }]*/
-  while (true) {
-    try {
-      const response = await priceClient.getPrice({
-        timestamp: date,
-        coinId: {
-          address: {
-            chain: chainId,
-            address: coinType,
-          },
+  const response = await priceClient.getPrice(
+    {
+      timestamp: date,
+      coinId: {
+        address: {
+          chain: chainId,
+          address: coinType,
         },
-      })
-      const price = response.price
-      priceMap.set(key, price)
-      return price
-    } catch (e) {
-      console.log('error getting price', e, dateStr, coinType)
-      await delay(1000)
+      },
+    },
+    {
+      retry: true,
+      retryMaxAttempts: 8,
     }
-  }
+  )
+  price = response.price
+  priceMap.set(key, price)
+  return price
 }
 
-export function delay(ms: number) {
-  return new Promise((resolve) => setTimeout(resolve, ms))
+/**
+ *
+ * @param symbol token symbol like BTC, etc
+ * @param date
+ */
+export async function getPriceBySymbol(symbol: string, date: Date): Promise<number> {
+  if (!priceClient) {
+    priceClient = getPriceClient()
+  }
+
+  const dateStr = [date.getUTCDate(), date.getUTCMonth() + 1, date.getUTCFullYear()].join('-')
+  const key = `${symbol}-${dateStr}`
+  let price = priceMap.get(key)
+  if (price) {
+    return price
+  }
+
+  const response = await priceClient.getPrice(
+    {
+      timestamp: date,
+      coinId: {
+        symbol,
+      },
+    },
+    {
+      retry: true,
+      retryMaxAttempts: 8,
+    }
+  )
+  price = response.price
+  priceMap.set(key, price)
+  return price
 }