@sentio/sdk 1.14.4 → 1.15.0

package/lib/cli/upload.js

@@ -8,19 +8,30 @@ 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");
 const path_1 = __importDefault(require("path"));
 const chalk_1 = __importDefault(require("chalk"));
 const build_1 = require("./build");
 const node_fetch_1 = __importDefault(require("node-fetch"));
 const utils_1 = require("./utils");
+async function createProject(options, apiKey) {
+    const url = new URL('/api/v1/projects', options.host);
+    return (0, node_fetch_1.default)(url, {
+        method: 'POST',
+        headers: {
+            'api-key': apiKey,
+        },
+        body: JSON.stringify({ slug: options.project, visibility: 'PRIVATE' }),
+    });
+}
 async function uploadFile(options, apiKeyOverride) {
     if (options.build) {
         await (0, build_1.buildProcessor)(false, options.targets);
     }
-    console.log(chalk_1.default.blue('Uploading'));
+    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(options.host);
+    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) {
@@ -38,47 +49,72 @@ async function uploadFile(options, apiKeyOverride) {
     const hash = (0, crypto_1.createHash)('sha256');
     hash.update(content);
     const digest = hash.digest('hex');
-    const data = new form_data_1.default();
-    data.append('attachment', fs_1.default.createReadStream(PROCESSOR_FILE));
-    data.append('sha256', digest);
-    let commitSha;
-    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);
-    }
-    catch (e) {
-        // skip errors
-    }
-    url.pathname = '/api/v1/processors';
-    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 upload = async () => {
+        const data = new form_data_1.default();
+        data.append('attachment', fs_1.default.createReadStream(PROCESSOR_FILE));
+        data.append('sha256', digest);
+        let commitSha = '';
+        try {
+            commitSha = (0, child_process_1.execSync)('git rev-parse HEAD').toString().trim();
+            data.append('commitSha', 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()));
-    }
+        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);
+        }
+        catch (e) {
+            // skip errors
+        }
+        console.log(chalk_1.default.blue('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) {
+                const rl = readline_1.default.createInterface({
+                    input: process.stdin,
+                    output: process.stdout,
+                });
+                const prompt = async () => {
+                    const answer = await new Promise((resolve) => rl.question(`Do you want to create it and continue the uploading process? (yes/no) `, resolve));
+                    if (['y', 'yes'].includes(answer.toLowerCase())) {
+                        rl.close();
+                        await createProject(options, apiKey);
+                        console.log(chalk_1.default.green('Project created'));
+                        await upload();
+                    }
+                    else if (['n', 'no'].includes(answer.toLowerCase())) {
+                        rl.close();
+                    }
+                    else {
+                        await prompt();
+                    }
+                };
+                await prompt();
+            }
+        }
+    };
+    await upload();
 }
 exports.uploadFile = uploadFile;
 //# 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":"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","sourcesContent":["import { execSync } from 'child_process'\nimport { createHash } from 'crypto'\nimport FormData from 'form-data'\nimport fs from 'fs'\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\nexport async function uploadFile(options: SentioProjectConfig, apiKeyOverride: string) {\n  if (options.build) {\n    await buildProcessor(false, options.targets)\n  }\n\n  console.log(chalk.blue('Uploading'))\n\n  const PROCESSOR_FILE = path.join(process.cwd(), 'dist/lib.js')\n\n  const url = new URL(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  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\n  url.pathname = '/api/v1/processors'\n\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}\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 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  return fetch(url, {\n    method: 'POST',\n    headers: {\n      'api-key': apiKey,\n    },\n    body: JSON.stringify({ slug: options.project, visibility: 'PRIVATE' }),\n  })\n}\n\nexport async function uploadFile(options: SentioProjectConfig, apiKeyOverride: string) {\n  if (options.build) {\n    await buildProcessor(false, options.targets)\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  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('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            await createProject(options, apiKey)\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  await upload()\n}\n"]}

package/lib/gen/processor/protos/processor.d.ts

@@ -94,6 +94,7 @@ export interface ProcessTracesResponse {
     result: ProcessResult | undefined;
 }
 export interface ProcessTransactionsRequest {
+    chainId: string;
     transactions: RawTransaction[];
 }
 export interface ProcessInstructionsRequest {
@@ -126,9 +127,9 @@ export interface RawTrace {
     raw: Uint8Array;
 }
 export interface RawTransaction {
-    txHash: string;
     raw: Uint8Array;
-    programAccountId: string;
+    programAccountId?: string | undefined;
+    slot?: Long | undefined;
 }
 export interface Instruction {
     instructionData: string;

package/lib/gen/processor/protos/processor.js

@@ -1218,12 +1218,15 @@ exports.ProcessTracesResponse = {
     },
 };
 function createBaseProcessTransactionsRequest() {
-    return { transactions: [] };
+    return { chainId: "", transactions: [] };
 }
 exports.ProcessTransactionsRequest = {
     encode(message, writer = minimal_1.default.Writer.create()) {
+        if (message.chainId !== "") {
+            writer.uint32(10).string(message.chainId);
+        }
         for (const v of message.transactions) {
-            exports.RawTransaction.encode(v, writer.uint32(10).fork()).ldelim();
+            exports.RawTransaction.encode(v, writer.uint32(18).fork()).ldelim();
         }
         return writer;
     },
@@ -1235,6 +1238,9 @@ exports.ProcessTransactionsRequest = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
+                    message.chainId = reader.string();
+                    break;
+                case 2:
                     message.transactions.push(exports.RawTransaction.decode(reader, reader.uint32()));
                     break;
                 default:
@@ -1246,6 +1252,7 @@ exports.ProcessTransactionsRequest = {
     },
     fromJSON(object) {
         return {
+            chainId: isSet(object.chainId) ? String(object.chainId) : "",
             transactions: Array.isArray(object?.transactions)
                 ? object.transactions.map((e) => exports.RawTransaction.fromJSON(e))
                 : [],
@@ -1253,6 +1260,7 @@ exports.ProcessTransactionsRequest = {
     },
     toJSON(message) {
         const obj = {};
+        message.chainId !== undefined && (obj.chainId = message.chainId);
         if (message.transactions) {
             obj.transactions = message.transactions.map((e) => e ? exports.RawTransaction.toJSON(e) : undefined);
         }
@@ -1263,6 +1271,7 @@ exports.ProcessTransactionsRequest = {
     },
     fromPartial(object) {
         const message = createBaseProcessTransactionsRequest();
+        message.chainId = object.chainId ?? "";
         message.transactions =
             object.transactions?.map((e) => exports.RawTransaction.fromPartial(e)) || [];
         return message;
@@ -1726,18 +1735,22 @@ exports.RawTrace = {
     },
 };
 function createBaseRawTransaction() {
-    return { txHash: "", raw: new Uint8Array(), programAccountId: "" };
+    return {
+        raw: new Uint8Array(),
+        programAccountId: undefined,
+        slot: undefined,
+    };
 }
 exports.RawTransaction = {
     encode(message, writer = minimal_1.default.Writer.create()) {
-        if (message.txHash !== "") {
-            writer.uint32(10).string(message.txHash);
-        }
         if (message.raw.length !== 0) {
-            writer.uint32(18).bytes(message.raw);
+            writer.uint32(10).bytes(message.raw);
         }
-        if (message.programAccountId !== "") {
-            writer.uint32(26).string(message.programAccountId);
+        if (message.programAccountId !== undefined) {
+            writer.uint32(18).string(message.programAccountId);
+        }
+        if (message.slot !== undefined) {
+            writer.uint32(24).uint64(message.slot);
         }
         return writer;
     },
@@ -1749,13 +1762,13 @@ exports.RawTransaction = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    message.txHash = reader.string();
+                    message.raw = reader.bytes();
                     break;
                 case 2:
-                    message.raw = reader.bytes();
+                    message.programAccountId = reader.string();
                     break;
                 case 3:
-                    message.programAccountId = reader.string();
+                    message.slot = reader.uint64();
                     break;
                 default:
                     reader.skipType(tag & 7);
@@ -1766,27 +1779,31 @@ exports.RawTransaction = {
     },
     fromJSON(object) {
         return {
-            txHash: isSet(object.txHash) ? String(object.txHash) : "",
             raw: isSet(object.raw) ? bytesFromBase64(object.raw) : new Uint8Array(),
             programAccountId: isSet(object.programAccountId)
                 ? String(object.programAccountId)
-                : "",
+                : undefined,
+            slot: isSet(object.slot) ? long_1.default.fromValue(object.slot) : undefined,
         };
     },
     toJSON(message) {
         const obj = {};
-        message.txHash !== undefined && (obj.txHash = message.txHash);
         message.raw !== undefined &&
             (obj.raw = base64FromBytes(message.raw !== undefined ? message.raw : new Uint8Array()));
         message.programAccountId !== undefined &&
             (obj.programAccountId = message.programAccountId);
+        message.slot !== undefined &&
+            (obj.slot = (message.slot || undefined).toString());
         return obj;
     },
     fromPartial(object) {
         const message = createBaseRawTransaction();
-        message.txHash = object.txHash ?? "";
         message.raw = object.raw ?? new Uint8Array();
-        message.programAccountId = object.programAccountId ?? "";
+        message.programAccountId = object.programAccountId ?? undefined;
+        message.slot =
+            object.slot !== undefined && object.slot !== null
+                ? long_1.default.fromValue(object.slot)
+                : undefined;
         return message;
     },
 };