@sentio/sdk 1.31.1 → 1.31.3

package/lib/binds.d.ts

@@ -2,6 +2,10 @@ import { BindOptions } from './core/bind-options';
 import { BaseProcessor, ContractView } from './core';
 import { Networkish } from '@ethersproject/networks';
 import { BaseContract } from 'ethers';
+import { MapStateStorage } from './state/state-storage';
+export declare class ProcessorState extends MapStateStorage<BaseProcessor<any, any>> {
+    static INSTANCE: ProcessorState;
+}
 export declare function getProcessor(opts: BindOptions): BaseProcessor<any, any> | undefined;
 export declare function addProcessor(opts: BindOptions, processor: BaseProcessor<any, any>): void;
 export declare function getContractByABI(abiName: string, address: string, network: Networkish): ContractView<BaseContract> | undefined;

package/lib/binds.js

@@ -1,8 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addContractByABI = exports.getContractByABI = exports.addProcessor = exports.getProcessor = void 0;
+exports.addContractByABI = exports.getContractByABI = exports.addProcessor = exports.getProcessor = exports.ProcessorState = void 0;
 const bind_options_1 = require("./core/bind-options");
 const providers_1 = require("@ethersproject/providers");
+const state_storage_1 = require("./state/state-storage");
+class ProcessorState extends state_storage_1.MapStateStorage {
+    static INSTANCE = new ProcessorState();
+}
+exports.ProcessorState = ProcessorState;
+// from abiName_address_chainId => contract wrapper
+const contracts = new Map();
 function getKey(abiName, address, network) {
     const chainId = (0, providers_1.getNetwork)(network).chainId.toString();
     return [abiName, address.toLowerCase(), chainId].join('_');
@@ -10,23 +17,22 @@ function getKey(abiName, address, network) {
 // Dedup processor that bind multiple times
 function getProcessor(opts) {
     const sig = (0, bind_options_1.getOptionsSignature)(opts);
-    return global.PROCESSOR_STATE.processorMap.get(sig);
+    return ProcessorState.INSTANCE.getValue(sig);
 }
 exports.getProcessor = getProcessor;
 function addProcessor(opts, processor) {
     const sig = (0, bind_options_1.getOptionsSignature)(opts);
-    global.PROCESSOR_STATE.processors.push(processor);
-    global.PROCESSOR_STATE.processorMap.set(sig, processor);
+    ProcessorState.INSTANCE.getOrSetValue(sig, processor);
 }
 exports.addProcessor = addProcessor;
 function getContractByABI(abiName, address, network) {
     const key = getKey(abiName, address, network);
-    return global.PROCESSOR_STATE.contracts.get(key);
+    return contracts.get(key);
 }
 exports.getContractByABI = getContractByABI;
 function addContractByABI(abiName, address, network, contract) {
     const key = getKey(abiName, address, network);
-    return global.PROCESSOR_STATE.contracts.set(key, contract);
+    return contracts.set(key, contract);
 }
 exports.addContractByABI = addContractByABI;
 //# sourceMappingURL=binds.js.map

package/lib/binds.js.map

@@ -1 +1 @@
-{"version":3,"file":"binds.js","sourceRoot":"","sources":["../src/binds.ts"],"names":[],"mappings":";;;AAAA,sDAAsE;AAGtE,wDAAqD;AAGrD,SAAS,MAAM,CAAC,OAAe,EAAE,OAAe,EAAE,OAAmB;IACnE,MAAM,OAAO,GAAG,IAAA,sBAAU,EAAC,OAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAA;IACtD,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,WAAW,EAAE,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC5D,CAAC;AAED,2CAA2C;AAC3C,SAAgB,YAAY,CAAC,IAAiB;IAC5C,MAAM,GAAG,GAAG,IAAA,kCAAmB,EAAC,IAAI,CAAC,CAAA;IACrC,OAAO,MAAM,CAAC,eAAe,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;AACrD,CAAC;AAHD,oCAGC;AAED,SAAgB,YAAY,CAAC,IAAiB,EAAE,SAAkC;IAChF,MAAM,GAAG,GAAG,IAAA,kCAAmB,EAAC,IAAI,CAAC,CAAA;IAErC,MAAM,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACjD,MAAM,CAAC,eAAe,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;AACzD,CAAC;AALD,oCAKC;AAED,SAAgB,gBAAgB,CAAC,OAAe,EAAE,OAAe,EAAE,OAAmB;IACpF,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;IAC7C,OAAO,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;AAClD,CAAC;AAHD,4CAGC;AAED,SAAgB,gBAAgB,CAC9B,OAAe,EACf,OAAe,EACf,OAAmB,EACnB,QAAoC;IAEpC,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;IAC7C,OAAO,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;AAC5D,CAAC;AARD,4CAQC","sourcesContent":["import { BindOptions, getOptionsSignature } from './core/bind-options'\nimport { BaseProcessor, ContractView } from './core'\nimport { Networkish } from '@ethersproject/networks'\nimport { getNetwork } from '@ethersproject/providers'\nimport { BaseContract } from 'ethers'\n\nfunction getKey(abiName: string, address: string, network: Networkish) {\n  const chainId = getNetwork(network).chainId.toString()\n  return [abiName, address.toLowerCase(), chainId].join('_')\n}\n\n// Dedup processor that bind multiple times\nexport function getProcessor(opts: BindOptions) {\n  const sig = getOptionsSignature(opts)\n  return global.PROCESSOR_STATE.processorMap.get(sig)\n}\n\nexport function addProcessor(opts: BindOptions, processor: BaseProcessor<any, any>) {\n  const sig = getOptionsSignature(opts)\n\n  global.PROCESSOR_STATE.processors.push(processor)\n  global.PROCESSOR_STATE.processorMap.set(sig, processor)\n}\n\nexport function getContractByABI(abiName: string, address: string, network: Networkish) {\n  const key = getKey(abiName, address, network)\n  return global.PROCESSOR_STATE.contracts.get(key)\n}\n\nexport function addContractByABI(\n  abiName: string,\n  address: string,\n  network: Networkish,\n  contract: ContractView<BaseContract>\n) {\n  const key = getKey(abiName, address, network)\n  return global.PROCESSOR_STATE.contracts.set(key, contract)\n}\n"]}
+{"version":3,"file":"binds.js","sourceRoot":"","sources":["../src/binds.ts"],"names":[],"mappings":";;;AAAA,sDAAsE;AAGtE,wDAAqD;AAErD,yDAAuD;AAEvD,MAAa,cAAe,SAAQ,+BAAwC;IAC1E,MAAM,CAAC,QAAQ,GAAG,IAAI,cAAc,EAAE,CAAA;;AADxC,wCAEC;AAED,mDAAmD;AACnD,MAAM,SAAS,GAAG,IAAI,GAAG,EAAsC,CAAA;AAE/D,SAAS,MAAM,CAAC,OAAe,EAAE,OAAe,EAAE,OAAmB;IACnE,MAAM,OAAO,GAAG,IAAA,sBAAU,EAAC,OAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAA;IACtD,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,WAAW,EAAE,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC5D,CAAC;AAED,2CAA2C;AAC3C,SAAgB,YAAY,CAAC,IAAiB;IAC5C,MAAM,GAAG,GAAG,IAAA,kCAAmB,EAAC,IAAI,CAAC,CAAA;IACrC,OAAO,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;AAC9C,CAAC;AAHD,oCAGC;AAED,SAAgB,YAAY,CAAC,IAAiB,EAAE,SAAkC;IAChF,MAAM,GAAG,GAAG,IAAA,kCAAmB,EAAC,IAAI,CAAC,CAAA;IAErC,cAAc,CAAC,QAAQ,CAAC,aAAa,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;AACvD,CAAC;AAJD,oCAIC;AAED,SAAgB,gBAAgB,CAAC,OAAe,EAAE,OAAe,EAAE,OAAmB;IACpF,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;IAC7C,OAAO,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;AAC3B,CAAC;AAHD,4CAGC;AAED,SAAgB,gBAAgB,CAC9B,OAAe,EACf,OAAe,EACf,OAAmB,EACnB,QAAoC;IAEpC,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;IAC7C,OAAO,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;AACrC,CAAC;AARD,4CAQC","sourcesContent":["import { BindOptions, getOptionsSignature } from './core/bind-options'\nimport { BaseProcessor, ContractView } from './core'\nimport { Networkish } from '@ethersproject/networks'\nimport { getNetwork } from '@ethersproject/providers'\nimport { BaseContract } from 'ethers'\nimport { MapStateStorage } from './state/state-storage'\n\nexport class ProcessorState extends MapStateStorage<BaseProcessor<any, any>> {\n  static INSTANCE = new ProcessorState()\n}\n\n// from abiName_address_chainId => contract wrapper\nconst contracts = new Map<string, ContractView<BaseContract>>()\n\nfunction getKey(abiName: string, address: string, network: Networkish) {\n  const chainId = getNetwork(network).chainId.toString()\n  return [abiName, address.toLowerCase(), chainId].join('_')\n}\n\n// Dedup processor that bind multiple times\nexport function getProcessor(opts: BindOptions) {\n  const sig = getOptionsSignature(opts)\n  return ProcessorState.INSTANCE.getValue(sig)\n}\n\nexport function addProcessor(opts: BindOptions, processor: BaseProcessor<any, any>) {\n  const sig = getOptionsSignature(opts)\n\n  ProcessorState.INSTANCE.getOrSetValue(sig, processor)\n}\n\nexport function getContractByABI(abiName: string, address: string, network: Networkish) {\n  const key = getKey(abiName, address, network)\n  return contracts.get(key)\n}\n\nexport function addContractByABI(\n  abiName: string,\n  address: string,\n  network: Networkish,\n  contract: ContractView<BaseContract>\n) {\n  const key = getKey(abiName, address, network)\n  return contracts.set(key, contract)\n}\n"]}

package/lib/cli/commands/run-login.js

@@ -118,7 +118,7 @@ function sha256(str) {
 async function checkKey(host, apiKey) {
     const checkApiKeyUrl = new url_1.URL('/api/v1/processors/check_key', host);
     return (0, node_fetch_1.default)(checkApiKeyUrl, {
-        method: 'HEAD',
+        method: 'GET',
         headers: {
             'api-key': apiKey,
         },

package/lib/cli/commands/run-login.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-login.js","sourceRoot":"","sources":["../../../src/cli/commands/run-login.ts"],"names":[],"mappings":"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","sourcesContent":["import commandLineArgs from 'command-line-args'\nimport commandLineUsage from 'command-line-usage'\nimport { getAuthConfig, getFinalizedHost } from '../config'\nimport { startServer } from './login-server'\nimport url, { URL } from 'url'\nimport * as crypto from 'crypto'\nimport chalk from 'chalk'\nimport { WriteKey } from '../key'\nimport fetch from 'node-fetch'\n\nconst port = 20000\n\nexport function runLogin(argv: string[]) {\n  const optionDefinitions = [\n    {\n      name: 'help',\n      alias: 'h',\n      type: Boolean,\n      description: 'Display this usage guide.',\n    },\n    {\n      name: 'host',\n      description: '(Optional) Override Sentio Host name',\n      type: String,\n    },\n    {\n      name: 'api-key',\n      type: String,\n      description: '(Optional) Your API key',\n    },\n  ]\n  const options = commandLineArgs(optionDefinitions, { argv })\n\n  if (options.help) {\n    const usage = commandLineUsage([\n      {\n        header: 'Login to Sentio',\n        content: 'sentio login',\n      },\n      {\n        header: 'Options',\n        optionList: optionDefinitions,\n      },\n    ])\n    console.log(usage)\n  } else if (options['api-key']) {\n    const host = getFinalizedHost(options.host)\n    console.log(chalk.blue('login to ' + host))\n    const apiKey = options['api-key']\n    checkKey(host, apiKey).then((res) => {\n      if (res.status == 200) {\n        WriteKey(host, apiKey)\n        console.log(chalk.green('login success'))\n      } else {\n        console.error(chalk.red('login failed, code:', res.status, res.statusText))\n      }\n    })\n  } else {\n    // https://auth0.com/docs/get-started/authentication-and-authorization-flow/call-your-api-using-the-authorization-code-flow-with-pkce\n    const verifier = base64URLEncode(crypto.randomBytes(32))\n    const challenge = base64URLEncode(sha256(verifier))\n\n    const conf = getAuthConfig(options.host)\n    const authURL = new URL(conf.domain + `/authorize?`)\n    const params = new url.URLSearchParams({\n      response_type: 'code',\n      code_challenge: challenge,\n      code_challenge_method: 'S256',\n      client_id: conf.clientId,\n      redirect_uri: `http://localhost:${port}/callback`,\n      audience: conf.audience,\n      prompt: 'login',\n    })\n    authURL.search = params.toString()\n    console.log('Continue your authorization here: ' + authURL.toString())\n\n    startServer({\n      serverPort: port,\n      sentioHost: options.host,\n      codeVerifier: verifier,\n    })\n  }\n}\n\nfunction base64URLEncode(str: Buffer) {\n  return str.toString('base64').replace(/\\+/g, '-').replace(/\\//g, '_').replace(/=/g, '')\n}\n\nfunction sha256(str: string) {\n  return crypto.createHash('sha256').update(str).digest()\n}\n\nasync function checkKey(host: string, apiKey: string) {\n  const checkApiKeyUrl = new URL('/api/v1/processors/check_key', host)\n  return fetch(checkApiKeyUrl, {\n    method: 'HEAD',\n    headers: {\n      'api-key': apiKey,\n    },\n  })\n}\n"]}
+{"version":3,"file":"run-login.js","sourceRoot":"","sources":["../../../src/cli/commands/run-login.ts"],"names":[],"mappings":"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","sourcesContent":["import commandLineArgs from 'command-line-args'\nimport commandLineUsage from 'command-line-usage'\nimport { getAuthConfig, getFinalizedHost } from '../config'\nimport { startServer } from './login-server'\nimport url, { URL } from 'url'\nimport * as crypto from 'crypto'\nimport chalk from 'chalk'\nimport { WriteKey } from '../key'\nimport fetch from 'node-fetch'\n\nconst port = 20000\n\nexport function runLogin(argv: string[]) {\n  const optionDefinitions = [\n    {\n      name: 'help',\n      alias: 'h',\n      type: Boolean,\n      description: 'Display this usage guide.',\n    },\n    {\n      name: 'host',\n      description: '(Optional) Override Sentio Host name',\n      type: String,\n    },\n    {\n      name: 'api-key',\n      type: String,\n      description: '(Optional) Your API key',\n    },\n  ]\n  const options = commandLineArgs(optionDefinitions, { argv })\n\n  if (options.help) {\n    const usage = commandLineUsage([\n      {\n        header: 'Login to Sentio',\n        content: 'sentio login',\n      },\n      {\n        header: 'Options',\n        optionList: optionDefinitions,\n      },\n    ])\n    console.log(usage)\n  } else if (options['api-key']) {\n    const host = getFinalizedHost(options.host)\n    console.log(chalk.blue('login to ' + host))\n    const apiKey = options['api-key']\n    checkKey(host, apiKey).then((res) => {\n      if (res.status == 200) {\n        WriteKey(host, apiKey)\n        console.log(chalk.green('login success'))\n      } else {\n        console.error(chalk.red('login failed, code:', res.status, res.statusText))\n      }\n    })\n  } else {\n    // https://auth0.com/docs/get-started/authentication-and-authorization-flow/call-your-api-using-the-authorization-code-flow-with-pkce\n    const verifier = base64URLEncode(crypto.randomBytes(32))\n    const challenge = base64URLEncode(sha256(verifier))\n\n    const conf = getAuthConfig(options.host)\n    const authURL = new URL(conf.domain + `/authorize?`)\n    const params = new url.URLSearchParams({\n      response_type: 'code',\n      code_challenge: challenge,\n      code_challenge_method: 'S256',\n      client_id: conf.clientId,\n      redirect_uri: `http://localhost:${port}/callback`,\n      audience: conf.audience,\n      prompt: 'login',\n    })\n    authURL.search = params.toString()\n    console.log('Continue your authorization here: ' + authURL.toString())\n\n    startServer({\n      serverPort: port,\n      sentioHost: options.host,\n      codeVerifier: verifier,\n    })\n  }\n}\n\nfunction base64URLEncode(str: Buffer) {\n  return str.toString('base64').replace(/\\+/g, '-').replace(/\\//g, '_').replace(/=/g, '')\n}\n\nfunction sha256(str: string) {\n  return crypto.createHash('sha256').update(str).digest()\n}\n\nasync function checkKey(host: string, apiKey: string) {\n  const checkApiKeyUrl = new URL('/api/v1/processors/check_key', host)\n  return fetch(checkApiKeyUrl, {\n    method: 'GET',\n    headers: {\n      'api-key': apiKey,\n    },\n  })\n}\n"]}

package/lib/cli/upload.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.uploadFile = void 0;
 const child_process_1 = require("child_process");
 const crypto_1 = require("crypto");
-const form_data_1 = __importDefault(require("form-data"));
 const fs_1 = __importDefault(require("fs"));
 const readline_1 = __importDefault(require("readline"));
 const key_1 = require("./key");
@@ -15,8 +14,9 @@ const chalk_1 = __importDefault(require("chalk"));
 const build_1 = require("./build");
 const node_fetch_1 = __importDefault(require("node-fetch"));
 const utils_1 = require("./utils");
+const url_1 = require("url");
 async function createProject(options, apiKey) {
-    const url = new URL('/api/v1/projects', options.host);
+    const url = new url_1.URL('/api/v1/projects', options.host);
     const [ownerName, slug] = options.project.includes('/') ? options.project.split('/') : [undefined, options.project];
     return (0, node_fetch_1.default)(url, {
         method: 'POST',
@@ -32,7 +32,6 @@ async function uploadFile(options, apiKeyOverride) {
     }
     console.log(chalk_1.default.blue('Prepare to upload'));
     const PROCESSOR_FILE = path_1.default.join(process.cwd(), 'dist/lib.js');
-    const url = new URL('/api/v1/processors', options.host);
     const apiKey = apiKeyOverride || (0, key_1.ReadKey)(options.host);
     const isProd = options.host === 'https://app.sentio.xyz';
     if (!apiKey) {
@@ -52,47 +51,29 @@ async function uploadFile(options, apiKeyOverride) {
     const digest = hash.digest('hex');
     let triedCount = 0;
     const upload = async () => {
-        const data = new form_data_1.default();
-        data.append('attachment', fs_1.default.createReadStream(PROCESSOR_FILE));
-        data.append('sha256', digest);
         let commitSha = '';
+        let gitUrl = '';
+        const sha256 = digest;
         try {
             commitSha = (0, child_process_1.execSync)('git rev-parse HEAD').toString().trim();
-            data.append('commitSha', commitSha);
         }
         catch (e) {
             chalk_1.default.yellow(e);
         }
         try {
-            const gitUrl = (0, child_process_1.execSync)('git remote get-url origin').toString().trim();
-            data.append('gitUrl', gitUrl);
+            gitUrl = (0, child_process_1.execSync)('git remote get-url origin').toString().trim();
         }
         catch (e) {
             // skip errors
         }
         console.log(chalk_1.default.blue(triedCount > 1 ? 'Retry uploading' : 'Uploading'));
-        const res = await (0, node_fetch_1.default)(url, {
-            method: 'POST',
-            headers: {
-                'api-key': apiKey,
-                project: options.project,
-                version: (0, utils_1.getCliVersion)(),
-            },
-            body: data,
-        });
-        if (res.ok) {
-            console.log(chalk_1.default.green('Upload success: '));
-            console.log('\t', chalk_1.default.blue('sha256:'), digest);
-            if (commitSha) {
-                console.log('\t', chalk_1.default.blue('Git commit SHA:'), commitSha);
-            }
-            const { ProjectSlug } = await res.json();
-            console.log('\t', chalk_1.default.blue('Check status:'), `${options.host}/${ProjectSlug}/datasource`);
-        }
-        else {
-            console.error(chalk_1.default.red('Upload Failed'));
-            console.error(chalk_1.default.red(await res.text()));
-            if (res.status === 404) {
+        // get gcs upload url
+        const initUploadResRaw = await initUpload(options.host, apiKey, options.project, (0, utils_1.getCliVersion)());
+        if (!initUploadResRaw.ok) {
+            console.error(chalk_1.default.red('Failed to get upload url'));
+            console.error(chalk_1.default.red(await initUploadResRaw.text()));
+            if (initUploadResRaw.status === 404) {
+                // create project if not exist
                 const rl = readline_1.default.createInterface({
                     input: process.stdin,
                     output: process.stdout,
@@ -119,7 +100,38 @@ async function uploadFile(options, apiKeyOverride) {
                 };
                 await prompt();
             }
+            return;
+        }
+        const initUploadRes = await initUploadResRaw.json();
+        const uploadUrl = initUploadRes['url'];
+        // do actual uploading
+        const file = fs_1.default.createReadStream(PROCESSOR_FILE);
+        const uploadResRaw = await (0, node_fetch_1.default)(uploadUrl, {
+            method: 'PUT',
+            headers: {
+                'Content-Type': 'application/octet-stream',
+            },
+            body: file,
+        });
+        if (!uploadResRaw.ok) {
+            console.error(chalk_1.default.red('Failed to upload'));
+            console.error(chalk_1.default.red(await uploadResRaw.text()));
+            return;
+        }
+        // finish uploading
+        const finishUploadResRaw = await finishUpload(options.host, apiKey, options.project, (0, utils_1.getCliVersion)(), sha256, commitSha, gitUrl);
+        if (!finishUploadResRaw.ok) {
+            console.error(chalk_1.default.red('Failed to finish uploading'));
+            console.error(chalk_1.default.red(await finishUploadResRaw.text()));
+            return;
         }
+        console.log(chalk_1.default.green('Upload success: '));
+        console.log('\t', chalk_1.default.blue('sha256:'), digest);
+        if (commitSha) {
+            console.log('\t', chalk_1.default.blue('Git commit SHA:'), commitSha);
+        }
+        const { ProjectFullSlug } = await finishUploadResRaw.json();
+        console.log('\t', chalk_1.default.blue('Check status:'), `${options.host}/${ProjectFullSlug}/datasource`);
     };
     let error;
     const tryUploading = async () => {
@@ -144,4 +156,31 @@ async function uploadFile(options, apiKeyOverride) {
     await tryUploading();
 }
 exports.uploadFile = uploadFile;
+async function initUpload(host, apiKey, projectSlug, sdkVersion) {
+    const initUploadUrl = new url_1.URL(`/api/v1/processors/${projectSlug}/init_upload`, host);
+    return (0, node_fetch_1.default)(initUploadUrl, {
+        method: 'POST',
+        headers: {
+            'api-key': apiKey,
+        },
+        body: JSON.stringify({
+            sdk_version: sdkVersion,
+        }),
+    });
+}
+async function finishUpload(host, apiKey, projectSlug, sdkVersion, sha256, commitSha, gitUrl) {
+    const finishUploadUrl = new url_1.URL(`/api/v1/processors/${projectSlug}/finish_upload`, host);
+    return (0, node_fetch_1.default)(finishUploadUrl, {
+        method: 'POST',
+        headers: {
+            'api-key': apiKey,
+        },
+        body: JSON.stringify({
+            sdk_version: sdkVersion,
+            sha256: sha256,
+            commit_sha: commitSha,
+            git_url: gitUrl,
+        }),
+    });
+}
 //# sourceMappingURL=upload.js.map

package/lib/cli/upload.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../src/cli/upload.ts"],"names":[],"mappings":";;;;;;AAAA,iDAAwC;AACxC,mCAAmC;AACnC,0DAAgC;AAChC,4CAAmB;AACnB,wDAA+B;AAE/B,+BAA+B;AAC/B,gDAAuB;AACvB,kDAAyB;AACzB,mCAAwC;AACxC,4DAA8B;AAC9B,mCAAuC;AAEvC,KAAK,UAAU,aAAa,CAAC,OAA4B,EAAE,MAAc;IACvE,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,kBAAkB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;IACrD,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;IACnH,OAAO,IAAA,oBAAK,EAAC,GAAG,EAAE;QAChB,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,SAAS,EAAE,MAAM;SAClB;QACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;KACjE,CAAC,CAAA;AACJ,CAAC;AAEM,KAAK,UAAU,UAAU,CAAC,OAA4B,EAAE,cAAsB;IACnF,IAAI,OAAO,CAAC,KAAK,EAAE;QACjB,MAAM,IAAA,sBAAc,EAAC,KAAK,CAAC,CAAA;KAC5B;IAED,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAA;IAE5C,MAAM,cAAc,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,CAAC,CAAA;IAE9D,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,oBAAoB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;IACvD,MAAM,MAAM,GAAG,cAAc,IAAI,IAAA,aAAO,EAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IAEtD,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,KAAK,wBAAwB,CAAA;IACxD,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAA;QAC3E,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,yBAAyB,EAAE,OAAO,CAAC,IAAI,EAAE,gBAAgB,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC,CAAA;QAChG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;KAChB;IAED,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE;QAClC,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,mBAAmB,EAAE,cAAc,EAAE,qBAAqB,CAAC,CAAC,CAAA;QACpF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;KAChB;IAED,MAAM,IAAI,GAAG,YAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAA;IACxC,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,kBAAkB,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;IACxG,MAAM,OAAO,GAAG,YAAE,CAAC,YAAY,CAAC,cAAc,CAAC,CAAA;IAC/C,MAAM,IAAI,GAAG,IAAA,mBAAU,EAAC,QAAQ,CAAC,CAAA;IACjC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IACpB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAEjC,IAAI,UAAU,GAAG,CAAC,CAAA;IAClB,MAAM,MAAM,GAAG,KAAK,IAAI,EAAE;QACxB,MAAM,IAAI,GAAG,IAAI,mBAAQ,EAAE,CAAA;QAC3B,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,YAAE,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC,CAAA;QAC9D,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;QAE7B,IAAI,SAAS,GAAG,EAAE,CAAA;QAClB,IAAI;YACF,SAAS,GAAG,IAAA,wBAAQ,EAAC,oBAAoB,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAA;YAC5D,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC,CAAA;SACpC;QAAC,OAAO,CAAC,EAAE;YACV,eAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;SAChB;QACD,IAAI;YACF,MAAM,MAAM,GAAG,IAAA,wBAAQ,EAAC,2BAA2B,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAA;YACtE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;SAC9B;QAAC,OAAO,CAAC,EAAE;YACV,cAAc;SACf;QACD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAA;QACzE,MAAM,GAAG,GAAG,MAAM,IAAA,oBAAK,EAAC,GAAG,EAAE;YAC3B,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,SAAS,EAAE,MAAM;gBACjB,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,OAAO,EAAE,IAAA,qBAAa,GAAE;aACzB;YACD,IAAI,EAAE,IAAI;SACX,CAAC,CAAA;QAEF,IAAI,GAAG,CAAC,EAAE,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAA;YAC5C,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,eAAK,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAAA;YAChD,IAAI,SAAS,EAAE;gBACb,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,eAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE,SAAS,CAAC,CAAA;aAC5D;YACD,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAA;YACxC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,eAAK,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,IAAI,WAAW,aAAa,CAAC,CAAA;SAC5F;aAAM;YACL,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;YACzC,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;YAE1C,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE;gBACtB,MAAM,EAAE,GAAG,kBAAQ,CAAC,eAAe,CAAC;oBAClC,KAAK,EAAE,OAAO,CAAC,KAAK;oBACpB,MAAM,EAAE,OAAO,CAAC,MAAM;iBACvB,CAAC,CAAA;gBAEF,MAAM,MAAM,GAAG,KAAK,IAAI,EAAE;oBACxB,MAAM,MAAM,GAAW,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CACnD,EAAE,CAAC,QAAQ,CAAC,wEAAwE,EAAE,OAAO,CAAC,CAC/F,CAAA;oBACD,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,EAAE;wBAC/C,EAAE,CAAC,KAAK,EAAE,CAAA;wBACV,MAAM,GAAG,GAAG,MAAM,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;wBAChD,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE;4BACX,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC,CAAA;4BACjD,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;4BACpD,OAAM;yBACP;wBACD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAA;wBAC3C,MAAM,MAAM,EAAE,CAAA;qBACf;yBAAM,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,EAAE;wBACrD,EAAE,CAAC,KAAK,EAAE,CAAA;qBACX;yBAAM;wBACL,MAAM,MAAM,EAAE,CAAA;qBACf;gBACH,CAAC,CAAA;gBACD,MAAM,MAAM,EAAE,CAAA;aACf;SACF;IACH,CAAC,CAAA;IAED,IAAI,KAAY,CAAA;IAChB,MAAM,YAAY,GAAG,KAAK,IAAI,EAAE;QAC9B,IAAI,UAAU,EAAE,IAAI,CAAC,EAAE;YACrB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;YACpB,OAAM;SACP;QACD,IAAI;YACF,MAAM,MAAM,EAAE,CAAA;SACf;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,CAAC,WAAW,CAAC,IAAI,KAAK,YAAY,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,EAAE;gBACpF,KAAK,GAAG,CAAC,CAAA;gBACT,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAA;gBACzD,MAAM,YAAY,EAAE,CAAA;aACrB;iBAAM;gBACL,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;aACjB;SACF;IACH,CAAC,CAAA;IAED,MAAM,YAAY,EAAE,CAAA;AACtB,CAAC;AA5HD,gCA4HC","sourcesContent":["import { execSync } from 'child_process'\nimport { createHash } from 'crypto'\nimport FormData from 'form-data'\nimport fs from 'fs'\nimport readline from 'readline'\nimport { SentioProjectConfig } from './config'\nimport { ReadKey } from './key'\nimport path from 'path'\nimport chalk from 'chalk'\nimport { buildProcessor } from './build'\nimport fetch from 'node-fetch'\nimport { getCliVersion } from './utils'\n\nasync function createProject(options: SentioProjectConfig, apiKey: string) {\n  const url = new URL('/api/v1/projects', options.host)\n  const [ownerName, slug] = options.project.includes('/') ? options.project.split('/') : [undefined, options.project]\n  return fetch(url, {\n    method: 'POST',\n    headers: {\n      'api-key': apiKey,\n    },\n    body: JSON.stringify({ slug, ownerName, visibility: 'PRIVATE' }),\n  })\n}\n\nexport async function uploadFile(options: SentioProjectConfig, apiKeyOverride: string) {\n  if (options.build) {\n    await buildProcessor(false)\n  }\n\n  console.log(chalk.blue('Prepare to upload'))\n\n  const PROCESSOR_FILE = path.join(process.cwd(), 'dist/lib.js')\n\n  const url = new URL('/api/v1/processors', options.host)\n  const apiKey = apiKeyOverride || ReadKey(options.host)\n\n  const isProd = options.host === 'https://app.sentio.xyz'\n  if (!apiKey) {\n    const cmd = isProd ? 'sentio login' : 'sentio login --host=' + options.host\n    console.error(chalk.red('No Credential found for', options.host, '. Please run `' + cmd + '`.'))\n    process.exit(1)\n  }\n\n  if (!fs.existsSync(PROCESSOR_FILE)) {\n    console.error(chalk.red('File not existed ', PROCESSOR_FILE, \"don't use --nobuild\"))\n    process.exit(1)\n  }\n\n  const stat = fs.statSync(PROCESSOR_FILE)\n  console.log('Packed processor file size', Math.floor(stat.size / 1024) + 'K, last modified', stat.mtime)\n  const content = fs.readFileSync(PROCESSOR_FILE)\n  const hash = createHash('sha256')\n  hash.update(content)\n  const digest = hash.digest('hex')\n\n  let triedCount = 0\n  const upload = async () => {\n    const data = new FormData()\n    data.append('attachment', fs.createReadStream(PROCESSOR_FILE))\n    data.append('sha256', digest)\n\n    let commitSha = ''\n    try {\n      commitSha = execSync('git rev-parse HEAD').toString().trim()\n      data.append('commitSha', commitSha)\n    } catch (e) {\n      chalk.yellow(e)\n    }\n    try {\n      const gitUrl = execSync('git remote get-url origin').toString().trim()\n      data.append('gitUrl', gitUrl)\n    } catch (e) {\n      // skip errors\n    }\n    console.log(chalk.blue(triedCount > 1 ? 'Retry uploading' : 'Uploading'))\n    const res = await fetch(url, {\n      method: 'POST',\n      headers: {\n        'api-key': apiKey,\n        project: options.project,\n        version: getCliVersion(),\n      },\n      body: data,\n    })\n\n    if (res.ok) {\n      console.log(chalk.green('Upload success: '))\n      console.log('\\t', chalk.blue('sha256:'), digest)\n      if (commitSha) {\n        console.log('\\t', chalk.blue('Git commit SHA:'), commitSha)\n      }\n      const { ProjectSlug } = await res.json()\n      console.log('\\t', chalk.blue('Check status:'), `${options.host}/${ProjectSlug}/datasource`)\n    } else {\n      console.error(chalk.red('Upload Failed'))\n      console.error(chalk.red(await res.text()))\n\n      if (res.status === 404) {\n        const rl = readline.createInterface({\n          input: process.stdin,\n          output: process.stdout,\n        })\n\n        const prompt = async () => {\n          const answer: string = await new Promise((resolve) =>\n            rl.question(`Do you want to create it and continue the uploading process? (yes/no) `, resolve)\n          )\n          if (['y', 'yes'].includes(answer.toLowerCase())) {\n            rl.close()\n            const res = await createProject(options, apiKey)\n            if (!res.ok) {\n              console.error(chalk.red('Create Project Failed'))\n              console.error(chalk.red((await res.json()).message))\n              return\n            }\n            console.log(chalk.green('Project created'))\n            await upload()\n          } else if (['n', 'no'].includes(answer.toLowerCase())) {\n            rl.close()\n          } else {\n            await prompt()\n          }\n        }\n        await prompt()\n      }\n    }\n  }\n\n  let error: Error\n  const tryUploading = async () => {\n    if (triedCount++ >= 5) {\n      console.error(error)\n      return\n    }\n    try {\n      await upload()\n    } catch (e) {\n      if (e.constructor.name === 'FetchError' && e.type === 'system' && e.code === 'EPIPE') {\n        error = e\n        await new Promise((resolve) => setTimeout(resolve, 1000))\n        await tryUploading()\n      } else {\n        console.error(e)\n      }\n    }\n  }\n\n  await tryUploading()\n}\n"]}
+{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../src/cli/upload.ts"],"names":[],"mappings":"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","sourcesContent":["import { execSync } from 'child_process'\nimport { createHash } from 'crypto'\nimport fs from 'fs'\nimport readline from 'readline'\nimport { SentioProjectConfig } from './config'\nimport { ReadKey } from './key'\nimport path from 'path'\nimport chalk from 'chalk'\nimport { buildProcessor } from './build'\nimport fetch from 'node-fetch'\nimport { getCliVersion } from './utils'\nimport { URL } from 'url'\n\nasync function createProject(options: SentioProjectConfig, apiKey: string) {\n  const url = new URL('/api/v1/projects', options.host)\n  const [ownerName, slug] = options.project.includes('/') ? options.project.split('/') : [undefined, options.project]\n  return fetch(url, {\n    method: 'POST',\n    headers: {\n      'api-key': apiKey,\n    },\n    body: JSON.stringify({ slug, ownerName, visibility: 'PRIVATE' }),\n  })\n}\n\nexport async function uploadFile(options: SentioProjectConfig, apiKeyOverride: string) {\n  if (options.build) {\n    await buildProcessor(false)\n  }\n\n  console.log(chalk.blue('Prepare to upload'))\n\n  const PROCESSOR_FILE = path.join(process.cwd(), 'dist/lib.js')\n\n  const apiKey = apiKeyOverride || ReadKey(options.host)\n\n  const isProd = options.host === 'https://app.sentio.xyz'\n  if (!apiKey) {\n    const cmd = isProd ? 'sentio login' : 'sentio login --host=' + options.host\n    console.error(chalk.red('No Credential found for', options.host, '. Please run `' + cmd + '`.'))\n    process.exit(1)\n  }\n\n  if (!fs.existsSync(PROCESSOR_FILE)) {\n    console.error(chalk.red('File not existed ', PROCESSOR_FILE, \"don't use --nobuild\"))\n    process.exit(1)\n  }\n\n  const stat = fs.statSync(PROCESSOR_FILE)\n  console.log('Packed processor file size', Math.floor(stat.size / 1024) + 'K, last modified', stat.mtime)\n  const content = fs.readFileSync(PROCESSOR_FILE)\n  const hash = createHash('sha256')\n  hash.update(content)\n  const digest = hash.digest('hex')\n\n  let triedCount = 0\n  const upload = async () => {\n    let commitSha = ''\n    let gitUrl = ''\n    const sha256 = digest\n    try {\n      commitSha = execSync('git rev-parse HEAD').toString().trim()\n    } catch (e) {\n      chalk.yellow(e)\n    }\n    try {\n      gitUrl = execSync('git remote get-url origin').toString().trim()\n    } catch (e) {\n      // skip errors\n    }\n    console.log(chalk.blue(triedCount > 1 ? 'Retry uploading' : 'Uploading'))\n\n    // get gcs upload url\n    const initUploadResRaw = await initUpload(options.host, apiKey, options.project, getCliVersion())\n    if (!initUploadResRaw.ok) {\n      console.error(chalk.red('Failed to get upload url'))\n      console.error(chalk.red(await initUploadResRaw.text()))\n\n      if (initUploadResRaw.status === 404) {\n        // create project if not exist\n        const rl = readline.createInterface({\n          input: process.stdin,\n          output: process.stdout,\n        })\n        const prompt = async () => {\n          const answer: string = await new Promise((resolve) =>\n            rl.question(`Do you want to create it and continue the uploading process? (yes/no) `, resolve)\n          )\n          if (['y', 'yes'].includes(answer.toLowerCase())) {\n            rl.close()\n            const res = await createProject(options, apiKey)\n            if (!res.ok) {\n              console.error(chalk.red('Create Project Failed'))\n              console.error(chalk.red((await res.json()).message))\n              return\n            }\n            console.log(chalk.green('Project created'))\n            await upload()\n          } else if (['n', 'no'].includes(answer.toLowerCase())) {\n            rl.close()\n          } else {\n            await prompt()\n          }\n        }\n        await prompt()\n      }\n      return\n    }\n    const initUploadRes = await initUploadResRaw.json()\n    const uploadUrl = initUploadRes['url'] as string\n\n    // do actual uploading\n    const file = fs.createReadStream(PROCESSOR_FILE)\n    const uploadResRaw = await fetch(uploadUrl, {\n      method: 'PUT',\n      headers: {\n        'Content-Type': 'application/octet-stream',\n      },\n      body: file,\n    })\n    if (!uploadResRaw.ok) {\n      console.error(chalk.red('Failed to upload'))\n      console.error(chalk.red(await uploadResRaw.text()))\n      return\n    }\n\n    // finish uploading\n    const finishUploadResRaw = await finishUpload(\n      options.host,\n      apiKey,\n      options.project,\n      getCliVersion(),\n      sha256,\n      commitSha,\n      gitUrl\n    )\n    if (!finishUploadResRaw.ok) {\n      console.error(chalk.red('Failed to finish uploading'))\n      console.error(chalk.red(await finishUploadResRaw.text()))\n      return\n    }\n\n    console.log(chalk.green('Upload success: '))\n    console.log('\\t', chalk.blue('sha256:'), digest)\n    if (commitSha) {\n      console.log('\\t', chalk.blue('Git commit SHA:'), commitSha)\n    }\n    const { ProjectFullSlug } = await finishUploadResRaw.json()\n    console.log('\\t', chalk.blue('Check status:'), `${options.host}/${ProjectFullSlug}/datasource`)\n  }\n\n  let error: Error\n  const tryUploading = async () => {\n    if (triedCount++ >= 5) {\n      console.error(error)\n      return\n    }\n    try {\n      await upload()\n    } catch (e) {\n      if (e.constructor.name === 'FetchError' && e.type === 'system' && e.code === 'EPIPE') {\n        error = e\n        await new Promise((resolve) => setTimeout(resolve, 1000))\n        await tryUploading()\n      } else {\n        console.error(e)\n      }\n    }\n  }\n\n  await tryUploading()\n}\n\nasync function initUpload(host: string, apiKey: string, projectSlug: string, sdkVersion: string) {\n  const initUploadUrl = new URL(`/api/v1/processors/${projectSlug}/init_upload`, host)\n  return fetch(initUploadUrl, {\n    method: 'POST',\n    headers: {\n      'api-key': apiKey,\n    },\n    body: JSON.stringify({\n      sdk_version: sdkVersion,\n    }),\n  })\n}\n\nasync function finishUpload(\n  host: string,\n  apiKey: string,\n  projectSlug: string,\n  sdkVersion: string,\n  sha256: string,\n  commitSha: string,\n  gitUrl: string\n) {\n  const finishUploadUrl = new URL(`/api/v1/processors/${projectSlug}/finish_upload`, host)\n  return fetch(finishUploadUrl, {\n    method: 'POST',\n    headers: {\n      'api-key': apiKey,\n    },\n    body: JSON.stringify({\n      sdk_version: sdkVersion,\n      sha256: sha256,\n      commit_sha: commitSha,\n      git_url: gitUrl,\n    }),\n  })\n}\n"]}

package/lib/core/meter.js

@@ -55,11 +55,11 @@ class Metric extends metadata_1.NamedResultDescriptor {
         this.type = type;
         this.descriptor = gen_1.MetricConfig.fromPartial({ name: this.name, ...option });
         const aggregationConfig = this.descriptor.aggregationConfig;
-        if (aggregationConfig && aggregationConfig.intervalInMinutes && aggregationConfig.intervalInMinutes.length) {
+        if (aggregationConfig && aggregationConfig.intervalInMinutes.length) {
             if (aggregationConfig.intervalInMinutes.length > 1) {
                 console.error('current only support one intervalInMinutes, only first interval will be used for', name);
             }
-            if (aggregationConfig.intervalInMinutes[0] > 0 && !aggregationConfig.types) {
+            if (aggregationConfig.intervalInMinutes[0] > 0 && aggregationConfig.types.length === 0) {
                 aggregationConfig.types = [gen_1.AggregationType.SUM, gen_1.AggregationType.COUNT];
             }
         }

package/lib/core/meter.js.map

@@ -1 +1 @@
-{"version":3,"file":"meter.js","sourceRoot":"","sources":["../../src/core/meter.ts"],"names":[],"mappings":"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","sourcesContent":["import { BaseContext } from './base-context'\nimport { Numberish, toMetricValue } from './numberish'\nimport { Labels, NamedResultDescriptor } from './metadata'\nimport { AggregationConfig, AggregationType, MetricConfig } from '../gen'\nimport { MapStateStorage } from '../state/state-storage'\n\nexport function normalizeName(name: string): string {\n  const regex = new RegExp('![_.a-zA-Z0-9]')\n  return name.slice(0, 100).replace(regex, '_')\n}\n\nexport function normalizeKey(name: string): string {\n  if (name === 'labels') {\n    return 'labels_'\n  }\n  return normalizeName(name)\n}\n\nexport function normalizeValue(name: string): string {\n  return name.slice(0, 100)\n}\n\nexport function normalizeLabels(labels: Labels): Labels {\n  const normLabels: Labels = {}\n  for (const key in labels) {\n    normLabels[normalizeKey(key)] = normalizeValue(labels[key])\n  }\n  return normLabels\n}\n\nexport class MetricOptions {\n  unit?: string\n  description?: string\n  sparse?: boolean\n  aggregationConfig?: Partial<AggregationConfig>\n}\n\nexport class CounterOptions {\n  unit?: string\n  description?: string\n  sparse?: boolean\n}\n\nenum MetricType {\n  Counter = 0,\n  Gauge = 1,\n}\n\nexport class Metric extends NamedResultDescriptor {\n  type: MetricType\n  descriptor: MetricConfig\n  constructor(type: MetricType, name: string, option?: MetricOptions) {\n    super(name)\n    this.type = type\n    this.descriptor = MetricConfig.fromPartial({ name: this.name, ...option })\n    const aggregationConfig = this.descriptor.aggregationConfig\n    if (aggregationConfig && aggregationConfig.intervalInMinutes && aggregationConfig.intervalInMinutes.length) {\n      if (aggregationConfig.intervalInMinutes.length > 1) {\n        console.error('current only support one intervalInMinutes, only first interval will be used for', name)\n      }\n      if (aggregationConfig.intervalInMinutes[0] > 0 && !aggregationConfig.types) {\n        aggregationConfig.types = [AggregationType.SUM, AggregationType.COUNT]\n      }\n    }\n  }\n}\n\nexport class MetricState extends MapStateStorage<Metric> {\n  static INSTANCE = new MetricState()\n\n  getOrRegisterMetric(type: MetricType, name: string, option?: CounterOptions | MetricOptions): Metric {\n    const metricMap = this.getOrRegister()\n    let metric = metricMap.get(name)\n    if (metric && metric.type !== type) {\n      throw Error(`redefine ${name} of metric type ${type} that is previously ${metric.type}`)\n    }\n\n    if (!metric) {\n      if (type === MetricType.Counter) {\n        metric = new Counter(name, option)\n      } else {\n        metric = new Gauge(name, option)\n      }\n    }\n    metricMap.set(name, metric)\n    return metric\n  }\n}\n\nexport class Counter extends Metric {\n  static register(name: string, option?: CounterOptions): Counter {\n    return MetricState.INSTANCE.getOrRegisterMetric(MetricType.Counter, name, option) as Counter\n  }\n\n  constructor(name: string, option?: MetricOptions) {\n    super(MetricType.Counter, name, option)\n  }\n\n  add(ctx: BaseContext, value: Numberish, labels: Labels = {}) {\n    this.record(ctx, value, labels, true)\n  }\n\n  sub(ctx: BaseContext, value: Numberish, labels: Labels = {}) {\n    this.record(ctx, value, labels, false)\n  }\n\n  private record(ctx: BaseContext, value: Numberish, labels: Labels, add: boolean) {\n    ctx.res.counters.push({\n      metadata: ctx.getMetaData(this.name, labels),\n      metricValue: toMetricValue(value),\n      add: add,\n      runtimeInfo: undefined,\n    })\n  }\n}\n\nexport class CounterBinding {\n  private readonly ctx: BaseContext\n  private readonly counter: Counter\n\n  constructor(name: string, ctx: BaseContext) {\n    this.counter = new Counter(name)\n    this.ctx = ctx\n  }\n\n  add(value: Numberish, labels: Labels = {}) {\n    this.counter.add(this.ctx, value, labels)\n  }\n\n  sub(value: Numberish, labels: Labels = {}) {\n    this.counter.sub(this.ctx, value, labels)\n  }\n}\n\nexport class Gauge extends Metric {\n  static register(name: string, option?: MetricOptions): Gauge {\n    return MetricState.INSTANCE.getOrRegisterMetric(MetricType.Gauge, name, option) as Gauge\n  }\n\n  constructor(name: string, option?: MetricOptions) {\n    super(MetricType.Counter, name, option)\n  }\n\n  record(ctx: BaseContext, value: Numberish, labels: Labels = {}) {\n    ctx.res.gauges.push({\n      metadata: ctx.getMetaData(this.descriptor.name, labels),\n      metricValue: toMetricValue(value),\n      runtimeInfo: undefined,\n    })\n  }\n}\n\nexport class GaugeBinding {\n  private readonly gauge: Gauge\n  private readonly ctx: BaseContext\n\n  constructor(name: string, ctx: BaseContext) {\n    this.gauge = new Gauge(name)\n    this.ctx = ctx\n  }\n\n  record(value: Numberish, labels: Labels = {}) {\n    this.gauge.record(this.ctx, value, labels)\n  }\n}\n\nexport class Meter {\n  private readonly ctx: BaseContext\n\n  constructor(ctx: BaseContext) {\n    this.ctx = ctx\n  }\n\n  Counter(name: string): CounterBinding {\n    return new CounterBinding(name, this.ctx)\n  }\n\n  Gauge(name: string): GaugeBinding {\n    return new GaugeBinding(name, this.ctx)\n  }\n}\n"]}
+{"version":3,"file":"meter.js","sourceRoot":"","sources":["../../src/core/meter.ts"],"names":[],"mappings":"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","sourcesContent":["import { BaseContext } from './base-context'\nimport { Numberish, toMetricValue } from './numberish'\nimport { Labels, NamedResultDescriptor } from './metadata'\nimport { AggregationConfig, AggregationType, MetricConfig } from '../gen'\nimport { MapStateStorage } from '../state/state-storage'\n\nexport function normalizeName(name: string): string {\n  const regex = new RegExp('![_.a-zA-Z0-9]')\n  return name.slice(0, 100).replace(regex, '_')\n}\n\nexport function normalizeKey(name: string): string {\n  if (name === 'labels') {\n    return 'labels_'\n  }\n  return normalizeName(name)\n}\n\nexport function normalizeValue(name: string): string {\n  return name.slice(0, 100)\n}\n\nexport function normalizeLabels(labels: Labels): Labels {\n  const normLabels: Labels = {}\n  for (const key in labels) {\n    normLabels[normalizeKey(key)] = normalizeValue(labels[key])\n  }\n  return normLabels\n}\n\nexport class MetricOptions {\n  unit?: string\n  description?: string\n  sparse?: boolean\n  aggregationConfig?: Partial<AggregationConfig>\n}\n\nexport class CounterOptions {\n  unit?: string\n  description?: string\n  sparse?: boolean\n}\n\nenum MetricType {\n  Counter = 0,\n  Gauge = 1,\n}\n\nexport class Metric extends NamedResultDescriptor {\n  type: MetricType\n  descriptor: MetricConfig\n  constructor(type: MetricType, name: string, option?: MetricOptions) {\n    super(name)\n    this.type = type\n    this.descriptor = MetricConfig.fromPartial({ name: this.name, ...option })\n    const aggregationConfig = this.descriptor.aggregationConfig\n    if (aggregationConfig && aggregationConfig.intervalInMinutes.length) {\n      if (aggregationConfig.intervalInMinutes.length > 1) {\n        console.error('current only support one intervalInMinutes, only first interval will be used for', name)\n      }\n      if (aggregationConfig.intervalInMinutes[0] > 0 && aggregationConfig.types.length === 0) {\n        aggregationConfig.types = [AggregationType.SUM, AggregationType.COUNT]\n      }\n    }\n  }\n}\n\nexport class MetricState extends MapStateStorage<Metric> {\n  static INSTANCE = new MetricState()\n\n  getOrRegisterMetric(type: MetricType, name: string, option?: CounterOptions | MetricOptions): Metric {\n    const metricMap = this.getOrRegister()\n    let metric = metricMap.get(name)\n    if (metric && metric.type !== type) {\n      throw Error(`redefine ${name} of metric type ${type} that is previously ${metric.type}`)\n    }\n\n    if (!metric) {\n      if (type === MetricType.Counter) {\n        metric = new Counter(name, option)\n      } else {\n        metric = new Gauge(name, option)\n      }\n    }\n    metricMap.set(name, metric)\n    return metric\n  }\n}\n\nexport class Counter extends Metric {\n  static register(name: string, option?: CounterOptions): Counter {\n    return MetricState.INSTANCE.getOrRegisterMetric(MetricType.Counter, name, option) as Counter\n  }\n\n  constructor(name: string, option?: MetricOptions) {\n    super(MetricType.Counter, name, option)\n  }\n\n  add(ctx: BaseContext, value: Numberish, labels: Labels = {}) {\n    this.record(ctx, value, labels, true)\n  }\n\n  sub(ctx: BaseContext, value: Numberish, labels: Labels = {}) {\n    this.record(ctx, value, labels, false)\n  }\n\n  private record(ctx: BaseContext, value: Numberish, labels: Labels, add: boolean) {\n    ctx.res.counters.push({\n      metadata: ctx.getMetaData(this.name, labels),\n      metricValue: toMetricValue(value),\n      add: add,\n      runtimeInfo: undefined,\n    })\n  }\n}\n\nexport class CounterBinding {\n  private readonly ctx: BaseContext\n  private readonly counter: Counter\n\n  constructor(name: string, ctx: BaseContext) {\n    this.counter = new Counter(name)\n    this.ctx = ctx\n  }\n\n  add(value: Numberish, labels: Labels = {}) {\n    this.counter.add(this.ctx, value, labels)\n  }\n\n  sub(value: Numberish, labels: Labels = {}) {\n    this.counter.sub(this.ctx, value, labels)\n  }\n}\n\nexport class Gauge extends Metric {\n  static register(name: string, option?: MetricOptions): Gauge {\n    return MetricState.INSTANCE.getOrRegisterMetric(MetricType.Gauge, name, option) as Gauge\n  }\n\n  constructor(name: string, option?: MetricOptions) {\n    super(MetricType.Counter, name, option)\n  }\n\n  record(ctx: BaseContext, value: Numberish, labels: Labels = {}) {\n    ctx.res.gauges.push({\n      metadata: ctx.getMetaData(this.descriptor.name, labels),\n      metricValue: toMetricValue(value),\n      runtimeInfo: undefined,\n    })\n  }\n}\n\nexport class GaugeBinding {\n  private readonly gauge: Gauge\n  private readonly ctx: BaseContext\n\n  constructor(name: string, ctx: BaseContext) {\n    this.gauge = new Gauge(name)\n    this.ctx = ctx\n  }\n\n  record(value: Numberish, labels: Labels = {}) {\n    this.gauge.record(this.ctx, value, labels)\n  }\n}\n\nexport class Meter {\n  private readonly ctx: BaseContext\n\n  constructor(ctx: BaseContext) {\n    this.ctx = ctx\n  }\n\n  Counter(name: string): CounterBinding {\n    return new CounterBinding(name, this.ctx)\n  }\n\n  Gauge(name: string): GaugeBinding {\n    return new GaugeBinding(name, this.ctx)\n  }\n}\n"]}

package/lib/core/solana-processor.d.ts

@@ -3,11 +3,15 @@ import { SolanaContext } from './context';
 import Long from 'long';
 import { Instruction } from '@project-serum/anchor';
 import { SolanaBindOptions } from './bind-options';
+import { ListStateStorage } from '../state/state-storage';
 declare type IndexConfigure = {
     startSlot: Long;
     endSlot?: Long;
 };
 export declare type SolanaInstructionHandler = (instruction: Instruction, ctx: SolanaContext, accounts?: string[]) => void;
+export declare class SolanaProcessorState extends ListStateStorage<SolanaBaseProcessor> {
+    static INSTANCE: SolanaProcessorState;
+}
 export declare class SolanaBaseProcessor {
     instructionHandlerMap: Map<string, SolanaInstructionHandler>;
     address: string;

package/lib/core/solana-processor.js

@@ -3,9 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SolanaBaseProcessor = void 0;
+exports.SolanaBaseProcessor = exports.SolanaProcessorState = void 0;
 const context_1 = require("./context");
 const long_1 = __importDefault(require("long"));
+const state_storage_1 = require("../state/state-storage");
+class SolanaProcessorState extends state_storage_1.ListStateStorage {
+    static INSTANCE = new SolanaProcessorState();
+}
+exports.SolanaProcessorState = SolanaProcessorState;
 class SolanaBaseProcessor {
     instructionHandlerMap = new Map();
     address;
@@ -19,7 +24,7 @@ class SolanaBaseProcessor {
         if (options) {
             this.bind(options);
         }
-        global.PROCESSOR_STATE.solanaProcessors.push(this);
+        SolanaProcessorState.INSTANCE.addValue(this);
     }
     bind(options) {
         this.address = options.address;

package/lib/core/solana-processor.js.map

@@ -1 +1 @@
-{"version":3,"file":"solana-processor.js","sourceRoot":"","sources":["../../src/core/solana-processor.ts"],"names":[],"mappings":"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","sourcesContent":["import { ProcessResult } from '../gen'\nimport { SolanaContext } from './context'\nimport Long from 'long'\nimport { Instruction } from '@project-serum/anchor'\nimport { SolanaBindOptions } from './bind-options'\n\ntype IndexConfigure = {\n  startSlot: Long\n  endSlot?: Long\n}\n\nexport type SolanaInstructionHandler = (instruction: Instruction, ctx: SolanaContext, accounts?: string[]) => void\n\nexport class SolanaBaseProcessor {\n  public instructionHandlerMap: Map<string, SolanaInstructionHandler> = new Map()\n  address: string\n  endpoint: string\n  contractName: string\n  processInnerInstruction: boolean\n  config: IndexConfigure = { startSlot: new Long(0) }\n  decodeInstruction: (rawInstruction: string) => Instruction | null\n  fromParsedInstruction: (instruction: { type: string; info: any }) => Instruction | null\n\n  constructor(options: SolanaBindOptions) {\n    if (options) {\n      this.bind(options)\n    }\n    global.PROCESSOR_STATE.solanaProcessors.push(this)\n  }\n\n  bind(options: SolanaBindOptions) {\n    this.address = options.address\n    this.contractName = options.name || ''\n    this.processInnerInstruction = options.processInnerInstruction || false\n    if (options.startBlock) {\n      this.startSlot(options.startBlock)\n    }\n    if (options.endBlock) {\n      this.endBlock(options.endBlock)\n    }\n    this.endpoint = options.network || 'https://api.mainnet-beta.solana.com'\n  }\n\n  innerInstruction(flag: boolean) {\n    this.processInnerInstruction = flag\n    return this\n  }\n\n  public onInstruction(instructionName: string, handler: SolanaInstructionHandler) {\n    if (!this.isBind()) {\n      throw new Error(\"Processor doesn't bind to an address\")\n    }\n\n    this.instructionHandlerMap.set(instructionName, handler)\n\n    return this\n  }\n\n  public getParsedInstruction(ins: string | { type: string; info: any }): Instruction | null {\n    if (ins) {\n      if ((ins as { type: string; info: any }).info) {\n        return this.fromParsedInstruction ? this.fromParsedInstruction(ins as { type: string; info: any }) : null\n      }\n      if (this.decodeInstruction != null) {\n        return this.decodeInstruction(ins as string)\n      }\n    }\n    return null\n  }\n\n  public getInstructionHandler(parsedInstruction: Instruction): SolanaInstructionHandler | undefined {\n    return this.instructionHandlerMap.get(parsedInstruction.name)\n  }\n\n  public handleInstruction(\n    parsedInstruction: Instruction,\n    accounts: string[],\n    handler: SolanaInstructionHandler,\n    slot: Long\n  ): ProcessResult {\n    const ctx = new SolanaContext(this.contractName, this.address, slot)\n    handler(parsedInstruction, ctx, accounts)\n    return ctx.getProcessResult()\n  }\n\n  public isBind() {\n    return this.address !== null\n  }\n\n  public startSlot(startSlot: Long | number) {\n    if (typeof startSlot === 'number') {\n      startSlot = Long.fromNumber(startSlot)\n    }\n    this.config.startSlot = startSlot\n    return this\n  }\n\n  public endBlock(endBlock: Long | number) {\n    if (typeof endBlock === 'number') {\n      endBlock = Long.fromNumber(endBlock)\n    }\n    this.config.endSlot = endBlock\n    return this\n  }\n}\n"]}
+{"version":3,"file":"solana-processor.js","sourceRoot":"","sources":["../../src/core/solana-processor.ts"],"names":[],"mappings":";;;;;;AACA,uCAAyC;AACzC,gDAAuB;AAGvB,0DAAyD;AASzD,MAAa,oBAAqB,SAAQ,gCAAqC;IAC7E,MAAM,CAAC,QAAQ,GAAyB,IAAI,oBAAoB,EAAE,CAAA;;AADpE,oDAEC;AAED,MAAa,mBAAmB;IACvB,qBAAqB,GAA0C,IAAI,GAAG,EAAE,CAAA;IAC/E,OAAO,CAAQ;IACf,QAAQ,CAAQ;IAChB,YAAY,CAAQ;IACpB,uBAAuB,CAAS;IAChC,MAAM,GAAmB,EAAE,SAAS,EAAE,IAAI,cAAI,CAAC,CAAC,CAAC,EAAE,CAAA;IACnD,iBAAiB,CAAgD;IACjE,qBAAqB,CAAkE;IAEvF,YAAY,OAA0B;QACpC,IAAI,OAAO,EAAE;YACX,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;SACnB;QACD,oBAAoB,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IAC9C,CAAC;IAED,IAAI,CAAC,OAA0B;QAC7B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;QAC9B,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,IAAI,IAAI,EAAE,CAAA;QACtC,IAAI,CAAC,uBAAuB,GAAG,OAAO,CAAC,uBAAuB,IAAI,KAAK,CAAA;QACvE,IAAI,OAAO,CAAC,UAAU,EAAE;YACtB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;SACnC;QACD,IAAI,OAAO,CAAC,QAAQ,EAAE;YACpB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;SAChC;QACD,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,OAAO,IAAI,qCAAqC,CAAA;IAC1E,CAAC;IAED,gBAAgB,CAAC,IAAa;QAC5B,IAAI,CAAC,uBAAuB,GAAG,IAAI,CAAA;QACnC,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,aAAa,CAAC,eAAuB,EAAE,OAAiC;QAC7E,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;SACxD;QAED,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,eAAe,EAAE,OAAO,CAAC,CAAA;QAExD,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,oBAAoB,CAAC,GAAyC;QACnE,IAAI,GAAG,EAAE;YACP,IAAK,GAAmC,CAAC,IAAI,EAAE;gBAC7C,OAAO,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,GAAkC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;aAC1G;YACD,IAAI,IAAI,CAAC,iBAAiB,IAAI,IAAI,EAAE;gBAClC,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAa,CAAC,CAAA;aAC7C;SACF;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,qBAAqB,CAAC,iBAA8B;QACzD,OAAO,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAA;IAC/D,CAAC;IAEM,iBAAiB,CACtB,iBAA8B,EAC9B,QAAkB,EAClB,OAAiC,EACjC,IAAU;QAEV,MAAM,GAAG,GAAG,IAAI,uBAAa,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;QACpE,OAAO,CAAC,iBAAiB,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAA;QACzC,OAAO,GAAG,CAAC,gBAAgB,EAAE,CAAA;IAC/B,CAAC;IAEM,MAAM;QACX,OAAO,IAAI,CAAC,OAAO,KAAK,IAAI,CAAA;IAC9B,CAAC;IAEM,SAAS,CAAC,SAAwB;QACvC,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;YACjC,SAAS,GAAG,cAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;SACvC;QACD,IAAI,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,CAAA;QACjC,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,QAAQ,CAAC,QAAuB;QACrC,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;YAChC,QAAQ,GAAG,cAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;SACrC;QACD,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,QAAQ,CAAA;QAC9B,OAAO,IAAI,CAAA;IACb,CAAC;CACF;AA3FD,kDA2FC","sourcesContent":["import { ProcessResult } from '../gen'\nimport { SolanaContext } from './context'\nimport Long from 'long'\nimport { Instruction } from '@project-serum/anchor'\nimport { SolanaBindOptions } from './bind-options'\nimport { ListStateStorage } from '../state/state-storage'\n\ntype IndexConfigure = {\n  startSlot: Long\n  endSlot?: Long\n}\n\nexport type SolanaInstructionHandler = (instruction: Instruction, ctx: SolanaContext, accounts?: string[]) => void\n\nexport class SolanaProcessorState extends ListStateStorage<SolanaBaseProcessor> {\n  static INSTANCE: SolanaProcessorState = new SolanaProcessorState()\n}\n\nexport class SolanaBaseProcessor {\n  public instructionHandlerMap: Map<string, SolanaInstructionHandler> = new Map()\n  address: string\n  endpoint: string\n  contractName: string\n  processInnerInstruction: boolean\n  config: IndexConfigure = { startSlot: new Long(0) }\n  decodeInstruction: (rawInstruction: string) => Instruction | null\n  fromParsedInstruction: (instruction: { type: string; info: any }) => Instruction | null\n\n  constructor(options: SolanaBindOptions) {\n    if (options) {\n      this.bind(options)\n    }\n    SolanaProcessorState.INSTANCE.addValue(this)\n  }\n\n  bind(options: SolanaBindOptions) {\n    this.address = options.address\n    this.contractName = options.name || ''\n    this.processInnerInstruction = options.processInnerInstruction || false\n    if (options.startBlock) {\n      this.startSlot(options.startBlock)\n    }\n    if (options.endBlock) {\n      this.endBlock(options.endBlock)\n    }\n    this.endpoint = options.network || 'https://api.mainnet-beta.solana.com'\n  }\n\n  innerInstruction(flag: boolean) {\n    this.processInnerInstruction = flag\n    return this\n  }\n\n  public onInstruction(instructionName: string, handler: SolanaInstructionHandler) {\n    if (!this.isBind()) {\n      throw new Error(\"Processor doesn't bind to an address\")\n    }\n\n    this.instructionHandlerMap.set(instructionName, handler)\n\n    return this\n  }\n\n  public getParsedInstruction(ins: string | { type: string; info: any }): Instruction | null {\n    if (ins) {\n      if ((ins as { type: string; info: any }).info) {\n        return this.fromParsedInstruction ? this.fromParsedInstruction(ins as { type: string; info: any }) : null\n      }\n      if (this.decodeInstruction != null) {\n        return this.decodeInstruction(ins as string)\n      }\n    }\n    return null\n  }\n\n  public getInstructionHandler(parsedInstruction: Instruction): SolanaInstructionHandler | undefined {\n    return this.instructionHandlerMap.get(parsedInstruction.name)\n  }\n\n  public handleInstruction(\n    parsedInstruction: Instruction,\n    accounts: string[],\n    handler: SolanaInstructionHandler,\n    slot: Long\n  ): ProcessResult {\n    const ctx = new SolanaContext(this.contractName, this.address, slot)\n    handler(parsedInstruction, ctx, accounts)\n    return ctx.getProcessResult()\n  }\n\n  public isBind() {\n    return this.address !== null\n  }\n\n  public startSlot(startSlot: Long | number) {\n    if (typeof startSlot === 'number') {\n      startSlot = Long.fromNumber(startSlot)\n    }\n    this.config.startSlot = startSlot\n    return this\n  }\n\n  public endBlock(endBlock: Long | number) {\n    if (typeof endBlock === 'number') {\n      endBlock = Long.fromNumber(endBlock)\n    }\n    this.config.endSlot = endBlock\n    return this\n  }\n}\n"]}

package/lib/core/sui-processor.d.ts

@@ -1,6 +1,7 @@
 import { SuiContext } from './context';
 import { ProcessResult } from '../gen';
 import Long from 'long';
+import { ListStateStorage } from '../state/state-storage';
 declare type IndexConfigure = {
     startSeqNumber: Long;
     endSeqNumber?: Long;
@@ -9,6 +10,9 @@ export declare class SuiBindOptions {
     address: string;
     startBlock?: Long | number;
 }
+export declare class SuiProcessorState extends ListStateStorage<SuiBaseProcessor> {
+    static INSTANCE: SuiProcessorState;
+}
 export declare class SuiBaseProcessor {
     transactionHanlder: (transaction: any, ctx: SuiContext) => void;
     address: string;

package/lib/core/sui-processor.js

@@ -3,9 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SuiBaseProcessor = exports.SuiBindOptions = void 0;
+exports.SuiBaseProcessor = exports.SuiProcessorState = exports.SuiBindOptions = void 0;
 const context_1 = require("./context");
 const long_1 = __importDefault(require("long"));
+const state_storage_1 = require("../state/state-storage");
 class SuiBindOptions {
     address;
     // network?: Networkish = 1
@@ -13,6 +14,10 @@ class SuiBindOptions {
     startBlock;
 }
 exports.SuiBindOptions = SuiBindOptions;
+class SuiProcessorState extends state_storage_1.ListStateStorage {
+    static INSTANCE = new SuiProcessorState();
+}
+exports.SuiProcessorState = SuiProcessorState;
 class SuiBaseProcessor {
     transactionHanlder;
     address;
@@ -22,7 +27,7 @@ class SuiBaseProcessor {
         if (options.startBlock) {
             this.startSlot(options.startBlock);
         }
-        global.PROCESSOR_STATE.suiProcessors.push(this);
+        SuiProcessorState.INSTANCE.addValue(this);
     }
     onTransaction(handler) {
         this.transactionHanlder = handler;

package/lib/core/sui-processor.js.map

@@ -1 +1 @@
-{"version":3,"file":"sui-processor.js","sourceRoot":"","sources":["../../src/core/sui-processor.ts"],"names":[],"mappings":";;;;;;AAAA,uCAAsC;AAEtC,gDAAuB;AAOvB,MAAa,cAAc;IACzB,OAAO,CAAQ;IACf,2BAA2B;IAC3B,gBAAgB;IAChB,UAAU,CAAgB;CAE3B;AAND,wCAMC;AAED,MAAa,gBAAgB;IACpB,kBAAkB,CAA6C;IACtE,OAAO,CAAQ;IACf,MAAM,GAAmB,EAAE,cAAc,EAAE,IAAI,cAAI,CAAC,CAAC,CAAC,EAAE,CAAA;IAExD,YAAY,IAAY,EAAE,OAAuB;QAC/C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;QAC9B,IAAI,OAAO,CAAC,UAAU,EAAE;YACtB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;SACnC;QACD,MAAM,CAAC,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACjD,CAAC;IAEM,aAAa,CAAC,OAAoD;QACvE,IAAI,CAAC,kBAAkB,GAAG,OAAO,CAAA;QACjC,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,iBAAiB,CAAC,GAAQ,EAAE,IAAU;QAC3C,MAAM,GAAG,GAAG,IAAI,oBAAU,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;QAE9C,IAAI,GAAG,EAAE;YACP,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;SAClC;QACD,OAAO,GAAG,CAAC,gBAAgB,EAAE,CAAA;IAC/B,CAAC;IAEM,SAAS,CAAC,SAAwB;QACvC,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;YACjC,SAAS,GAAG,cAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;SACvC;QACD,IAAI,CAAC,MAAM,CAAC,cAAc,GAAG,SAAS,CAAA;QACtC,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,QAAQ,CAAC,QAAuB;QACrC,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;YAChC,QAAQ,GAAG,cAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;SACrC;QACD,IAAI,CAAC,MAAM,CAAC,YAAY,GAAG,QAAQ,CAAA;QACnC,OAAO,IAAI,CAAA;IACb,CAAC;CACF;AA1CD,4CA0CC","sourcesContent":["import { SuiContext } from './context'\nimport { ProcessResult } from '../gen'\nimport Long from 'long'\n\ntype IndexConfigure = {\n  startSeqNumber: Long\n  endSeqNumber?: Long\n}\n\nexport class SuiBindOptions {\n  address: string\n  // network?: Networkish = 1\n  // name?: string\n  startBlock?: Long | number\n  // endBlock?: Long | number\n}\n\nexport class SuiBaseProcessor {\n  public transactionHanlder: (transaction: any, ctx: SuiContext) => void\n  address: string\n  config: IndexConfigure = { startSeqNumber: new Long(0) }\n\n  constructor(name: string, options: SuiBindOptions) {\n    this.address = options.address\n    if (options.startBlock) {\n      this.startSlot(options.startBlock)\n    }\n    global.PROCESSOR_STATE.suiProcessors.push(this)\n  }\n\n  public onTransaction(handler: (transaction: any, ctx: SuiContext) => void) {\n    this.transactionHanlder = handler\n    return this\n  }\n\n  public handleTransaction(txn: any, slot: Long): ProcessResult | null {\n    const ctx = new SuiContext(this.address, slot)\n\n    if (txn) {\n      this.transactionHanlder(txn, ctx)\n    }\n    return ctx.getProcessResult()\n  }\n\n  public startSlot(startSlot: Long | number) {\n    if (typeof startSlot === 'number') {\n      startSlot = Long.fromNumber(startSlot)\n    }\n    this.config.startSeqNumber = startSlot\n    return this\n  }\n\n  public endBlock(endBlock: Long | number) {\n    if (typeof endBlock === 'number') {\n      endBlock = Long.fromNumber(endBlock)\n    }\n    this.config.endSeqNumber = endBlock\n    return this\n  }\n}\n"]}
+{"version":3,"file":"sui-processor.js","sourceRoot":"","sources":["../../src/core/sui-processor.ts"],"names":[],"mappings":";;;;;;AAAA,uCAAsC;AAEtC,gDAAuB;AACvB,0DAAyD;AAOzD,MAAa,cAAc;IACzB,OAAO,CAAQ;IACf,2BAA2B;IAC3B,gBAAgB;IAChB,UAAU,CAAgB;CAE3B;AAND,wCAMC;AAED,MAAa,iBAAkB,SAAQ,gCAAkC;IACvE,MAAM,CAAC,QAAQ,GAAG,IAAI,iBAAiB,EAAE,CAAA;;AAD3C,8CAEC;AAED,MAAa,gBAAgB;IACpB,kBAAkB,CAA6C;IACtE,OAAO,CAAQ;IACf,MAAM,GAAmB,EAAE,cAAc,EAAE,IAAI,cAAI,CAAC,CAAC,CAAC,EAAE,CAAA;IAExD,YAAY,IAAY,EAAE,OAAuB;QAC/C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;QAC9B,IAAI,OAAO,CAAC,UAAU,EAAE;YACtB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;SACnC;QACD,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IAC3C,CAAC;IAEM,aAAa,CAAC,OAAoD;QACvE,IAAI,CAAC,kBAAkB,GAAG,OAAO,CAAA;QACjC,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,iBAAiB,CAAC,GAAQ,EAAE,IAAU;QAC3C,MAAM,GAAG,GAAG,IAAI,oBAAU,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;QAE9C,IAAI,GAAG,EAAE;YACP,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;SAClC;QACD,OAAO,GAAG,CAAC,gBAAgB,EAAE,CAAA;IAC/B,CAAC;IAEM,SAAS,CAAC,SAAwB;QACvC,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;YACjC,SAAS,GAAG,cAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;SACvC;QACD,IAAI,CAAC,MAAM,CAAC,cAAc,GAAG,SAAS,CAAA;QACtC,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,QAAQ,CAAC,QAAuB;QACrC,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;YAChC,QAAQ,GAAG,cAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;SACrC;QACD,IAAI,CAAC,MAAM,CAAC,YAAY,GAAG,QAAQ,CAAA;QACnC,OAAO,IAAI,CAAA;IACb,CAAC;CACF;AA1CD,4CA0CC","sourcesContent":["import { SuiContext } from './context'\nimport { ProcessResult } from '../gen'\nimport Long from 'long'\nimport { ListStateStorage } from '../state/state-storage'\n\ntype IndexConfigure = {\n  startSeqNumber: Long\n  endSeqNumber?: Long\n}\n\nexport class SuiBindOptions {\n  address: string\n  // network?: Networkish = 1\n  // name?: string\n  startBlock?: Long | number\n  // endBlock?: Long | number\n}\n\nexport class SuiProcessorState extends ListStateStorage<SuiBaseProcessor> {\n  static INSTANCE = new SuiProcessorState()\n}\n\nexport class SuiBaseProcessor {\n  public transactionHanlder: (transaction: any, ctx: SuiContext) => void\n  address: string\n  config: IndexConfigure = { startSeqNumber: new Long(0) }\n\n  constructor(name: string, options: SuiBindOptions) {\n    this.address = options.address\n    if (options.startBlock) {\n      this.startSlot(options.startBlock)\n    }\n    SuiProcessorState.INSTANCE.addValue(this)\n  }\n\n  public onTransaction(handler: (transaction: any, ctx: SuiContext) => void) {\n    this.transactionHanlder = handler\n    return this\n  }\n\n  public handleTransaction(txn: any, slot: Long): ProcessResult | null {\n    const ctx = new SuiContext(this.address, slot)\n\n    if (txn) {\n      this.transactionHanlder(txn, ctx)\n    }\n    return ctx.getProcessResult()\n  }\n\n  public startSlot(startSlot: Long | number) {\n    if (typeof startSlot === 'number') {\n      startSlot = Long.fromNumber(startSlot)\n    }\n    this.config.startSeqNumber = startSlot\n    return this\n  }\n\n  public endBlock(endBlock: Long | number) {\n    if (typeof endBlock === 'number') {\n      endBlock = Long.fromNumber(endBlock)\n    }\n    this.config.endSeqNumber = endBlock\n    return this\n  }\n}\n"]}

package/lib/service.js

@@ -14,6 +14,9 @@ const exporter_1 = require("./core/exporter");
 const event_tracker_1 = require("./core/event-tracker");
 const aptos_processor_1 = require("./aptos/aptos-processor");
 const account_processor_1 = require("./core/account-processor");
+const sui_processor_1 = require("./core/sui-processor");
+const solana_processor_1 = require("./core/solana-processor");
+const binds_1 = require("./binds");
 BigInt.prototype.toJSON = function () {
     return this.toString();
 };
@@ -90,7 +93,7 @@ class ProcessorServiceImpl {
             });
         }
         // Part 1.a, prepare EVM processors
-        for (const processor of global.PROCESSOR_STATE.processors) {
+        for (const processor of binds_1.ProcessorState.INSTANCE.getValues()) {
             // If server favor incremental update this need to change
             // Start basic config for contract
             const chainId = processor.getChainId();
@@ -212,7 +215,7 @@ class ProcessorServiceImpl {
             this.accountConfigs.push(accountConfig);
         }
         // Part 2, prepare solana constractors
-        for (const solanaProcessor of global.PROCESSOR_STATE.solanaProcessors) {
+        for (const solanaProcessor of solana_processor_1.SolanaProcessorState.INSTANCE.getValues()) {
             const contractConfig = {
                 processorType: USER_PROCESSOR,
                 contract: {
@@ -238,7 +241,7 @@ class ProcessorServiceImpl {
             this.contractConfigs.push(contractConfig);
         }
         // Part 3, prepare sui constractors
-        for (const suiProcessor of global.PROCESSOR_STATE.suiProcessors) {
+        for (const suiProcessor of sui_processor_1.SuiProcessorState.INSTANCE.getValues()) {
             const contractConfig = {
                 processorType: USER_PROCESSOR,
                 contract: {
@@ -449,11 +452,11 @@ class ProcessorServiceImpl {
             throw new nice_grpc_1.ServerError(nice_grpc_1.Status.UNAVAILABLE, 'Service not started.');
         }
         const result = gen_1.ProcessResult.fromPartial({});
-        if (request.chainId.toLowerCase().startsWith('sui') && global.PROCESSOR_STATE.suiProcessors) {
+        if (request.chainId.toLowerCase().startsWith('sui') && sui_processor_1.SuiProcessorState.INSTANCE.getValues()) {
             const processorPromises = [];
             for (const txn of request.transactions) {
                 processorPromises.push(new Promise((resolve, _) => {
-                    for (const processor of global.PROCESSOR_STATE.suiProcessors) {
+                    for (const processor of sui_processor_1.SuiProcessorState.INSTANCE.getValues()) {
                         const res = processor.handleTransaction(JSON.parse(new util_1.TextDecoder().decode(txn.raw)), txn.slot ?? long_1.default.fromNumber(0));
                         if (res) {
                             res.gauges.forEach((g) => result.gauges.push(g));
@@ -478,14 +481,14 @@ class ProcessorServiceImpl {
         }
         const result = gen_1.ProcessResult.fromPartial({});
         // Only have instruction handlers for solana processors
-        if (global.PROCESSOR_STATE.solanaProcessors) {
+        if (solana_processor_1.SolanaProcessorState.INSTANCE.getValues()) {
             const processorPromises = [];
             for (const instruction of request.instructions) {
                 if (!instruction) {
                     throw new nice_grpc_1.ServerError(nice_grpc_1.Status.INVALID_ARGUMENT, 'instruction cannot be null');
                 }
                 processorPromises.push(new Promise((resolve, _) => {
-                    for (const processor of global.PROCESSOR_STATE.solanaProcessors) {
+                    for (const processor of solana_processor_1.SolanaProcessorState.INSTANCE.getValues()) {
                         if (processor.address === instruction.programAccountId) {
                             let parsedInstruction = null;
                             if (instruction.parsed) {