@sentio/sdk 1.26.4 → 1.27.1

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

@@ -0,0 +1,134 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.startServer = void 0;
+const express_1 = __importDefault(require("express"));
+const config_1 = require("../config");
+const url_1 = __importStar(require("url"));
+const node_fetch_1 = __importDefault(require("node-fetch"));
+const utils_1 = require("../utils");
+const key_1 = require("../key");
+const chalk_1 = __importDefault(require("chalk"));
+const os_1 = __importDefault(require("os"));
+const crypto = __importStar(require("crypto"));
+const app = (0, express_1.default)();
+let server;
+let authParams;
+function startServer(params) {
+    authParams = params;
+    server = app.listen(params.serverPort);
+}
+exports.startServer = startServer;
+app.get('/callback', async (req, res) => {
+    res.end('login success, please go back to CLI to continue');
+    const host = authParams.sentioHost;
+    const code = req.query.code;
+    if (!code || code.length == 0) {
+        return;
+    }
+    // exchange token
+    const tokenResRaw = await getToken(host, code);
+    if (!tokenResRaw.ok) {
+        console.error(chalk_1.default.red('request token error, code:', tokenResRaw.status, tokenResRaw.statusText));
+        return;
+    }
+    const tokenRes = await tokenResRaw.json();
+    const accessToken = tokenRes['access_token'];
+    // check if the account is ready
+    const realHost = (0, config_1.getFinalizedHost)(host);
+    const userResRaw = await getUser(realHost, accessToken);
+    if (!userResRaw.ok) {
+        if (userResRaw.status == 401) {
+            console.error(chalk_1.default.red('please sign up on sentio first'));
+        }
+        else {
+            console.error(chalk_1.default.red('get user error, code:', userResRaw.status, userResRaw.statusText));
+        }
+        return;
+    }
+    const userRes = await userResRaw.json();
+    if (!userRes.emailVerified) {
+        console.error(chalk_1.default.red('please verify your email first'));
+        return;
+    }
+    // create API key
+    const apiKeyName = `${os_1.default.hostname()}-${crypto.randomBytes(4).toString('hex')}`;
+    const createApiKeyResRaw = await createApiKey(realHost, apiKeyName, 'sdk_generated', accessToken);
+    if (!createApiKeyResRaw.ok) {
+        console.error(chalk_1.default.red('create api key error, code:', createApiKeyResRaw.status, createApiKeyResRaw.statusText));
+        return;
+    }
+    const createApiKeyRes = await createApiKeyResRaw.json();
+    const apiKey = createApiKeyRes['key'];
+    (0, key_1.WriteKey)(realHost, apiKey);
+    console.log(chalk_1.default.green('login success, new API key: ' + apiKey));
+    server.close();
+});
+async function getToken(host, code) {
+    const authConf = (0, config_1.getAuthConfig)(host);
+    const params = new url_1.default.URLSearchParams({
+        grant_type: 'authorization_code',
+        client_id: authConf.clientId,
+        code_verifier: authParams.codeVerifier,
+        code: code,
+        redirect_uri: `http://localhost:${authParams.serverPort}/callback`,
+    });
+    return (0, node_fetch_1.default)(`${authConf.domain}/oauth/token`, {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+        },
+        body: params.toString(),
+    });
+}
+async function createApiKey(host, name, source, accessToken) {
+    const createApiKeyUrl = new url_1.URL('/api/v1/keys', host);
+    return (0, node_fetch_1.default)(createApiKeyUrl, {
+        method: 'POST',
+        headers: {
+            Authorization: 'Bearer ' + accessToken,
+            version: (0, utils_1.getCliVersion)(),
+        },
+        body: JSON.stringify({
+            name: name,
+            scopes: ['write:project'],
+            source: source,
+        }),
+    });
+}
+async function getUser(host, accessToken) {
+    const getUserUrl = new url_1.URL('/api/v1/users', host);
+    return (0, node_fetch_1.default)(getUserUrl, {
+        method: 'GET',
+        headers: {
+            Authorization: 'Bearer ' + accessToken,
+            version: (0, utils_1.getCliVersion)(),
+        },
+    });
+}
+//# sourceMappingURL=login-server.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"login-server.js","sourceRoot":"","sources":["../../../src/cli/commands/login-server.ts"],"names":[],"mappings":"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","sourcesContent":["import express from 'express'\nimport { getAuthConfig, getFinalizedHost } from '../config'\nimport url, { URL } from 'url'\nimport fetch from 'node-fetch'\nimport { getCliVersion } from '../utils'\nimport { WriteKey } from '../key'\nimport chalk from 'chalk'\nimport http from 'http'\nimport os from 'os'\nimport * as crypto from 'crypto'\n\ninterface AuthParams {\n  serverPort: number\n  sentioHost: string\n  codeVerifier: string\n}\n\nconst app = express()\n\nlet server: http.Server\nlet authParams: AuthParams\n\nexport function startServer(params: AuthParams) {\n  authParams = params\n  server = app.listen(params.serverPort)\n}\n\napp.get('/callback', async (req, res) => {\n  res.end('login success, please go back to CLI to continue')\n  const host = authParams.sentioHost\n  const code = req.query.code\n  if (!code || (code as string).length == 0) {\n    return\n  }\n\n  // exchange token\n  const tokenResRaw = await getToken(host, code as string)\n  if (!tokenResRaw.ok) {\n    console.error(chalk.red('request token error, code:', tokenResRaw.status, tokenResRaw.statusText))\n    return\n  }\n  const tokenRes = await tokenResRaw.json()\n  const accessToken = tokenRes['access_token']\n\n  // check if the account is ready\n  const realHost = getFinalizedHost(host)\n  const userResRaw = await getUser(realHost, accessToken)\n  if (!userResRaw.ok) {\n    if (userResRaw.status == 401) {\n      console.error(chalk.red('please sign up on sentio first'))\n    } else {\n      console.error(chalk.red('get user error, code:', userResRaw.status, userResRaw.statusText))\n    }\n    return\n  }\n  const userRes = await userResRaw.json()\n  if (!userRes.emailVerified) {\n    console.error(chalk.red('please verify your email first'))\n    return\n  }\n\n  // create API key\n  const apiKeyName = `${os.hostname()}-${crypto.randomBytes(4).toString('hex')}`\n  const createApiKeyResRaw = await createApiKey(realHost, apiKeyName, 'sdk_generated', accessToken)\n  if (!createApiKeyResRaw.ok) {\n    console.error(chalk.red('create api key error, code:', createApiKeyResRaw.status, createApiKeyResRaw.statusText))\n    return\n  }\n  const createApiKeyRes = await createApiKeyResRaw.json()\n  const apiKey = createApiKeyRes['key']\n  WriteKey(realHost, apiKey)\n  console.log(chalk.green('login success, new API key: ' + apiKey))\n\n  server.close()\n})\n\nasync function getToken(host: string, code: string) {\n  const authConf = getAuthConfig(host)\n  const params = new url.URLSearchParams({\n    grant_type: 'authorization_code',\n    client_id: authConf.clientId,\n    code_verifier: authParams.codeVerifier,\n    code: code,\n    redirect_uri: `http://localhost:${authParams.serverPort}/callback`,\n  })\n  return fetch(`${authConf.domain}/oauth/token`, {\n    method: 'POST',\n    headers: {\n      'Content-Type': 'application/x-www-form-urlencoded',\n    },\n    body: params.toString(),\n  })\n}\n\nasync function createApiKey(host: string, name: string, source: string, accessToken: string) {\n  const createApiKeyUrl = new URL('/api/v1/keys', host)\n  return fetch(createApiKeyUrl, {\n    method: 'POST',\n    headers: {\n      Authorization: 'Bearer ' + accessToken,\n      version: getCliVersion(),\n    },\n    body: JSON.stringify({\n      name: name,\n      scopes: ['write:project'],\n      source: source,\n    }),\n  })\n}\n\nasync function getUser(host: string, accessToken: string) {\n  const getUserUrl = new URL('/api/v1/users', host)\n  return fetch(getUserUrl, {\n    method: 'GET',\n    headers: {\n      Authorization: 'Bearer ' + accessToken,\n      version: getCliVersion(),\n    },\n  })\n}\n"]}

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

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -7,10 +30,13 @@ exports.runLogin = void 0;
 const command_line_args_1 = __importDefault(require("command-line-args"));
 const command_line_usage_1 = __importDefault(require("command-line-usage"));
 const config_1 = require("../config");
+const login_server_1 = require("./login-server");
+const url_1 = __importStar(require("url"));
+const crypto = __importStar(require("crypto"));
 const chalk_1 = __importDefault(require("chalk"));
-const https_1 = __importDefault(require("https"));
-const http_1 = __importDefault(require("http"));
 const key_1 = require("../key");
+const node_fetch_1 = __importDefault(require("node-fetch"));
+const port = 20000;
 function runLogin(argv) {
     const optionDefinitions = [
         {
@@ -20,22 +46,22 @@ function runLogin(argv) {
             description: 'Display this usage guide.',
         },
         {
-            name: 'api-key',
+            name: 'host',
+            description: '(Optional) Override Sentio Host name',
             type: String,
-            description: '(Required) Your API key',
         },
         {
-            name: 'host',
-            description: '(Optional) Override Sentio Host name',
+            name: 'api-key',
             type: String,
+            description: '(Optional) Your API key',
         },
     ];
     const options = (0, command_line_args_1.default)(optionDefinitions, { argv });
-    if (options.help || !options['api-key']) {
+    if (options.help) {
         const usage = (0, command_line_usage_1.default)([
             {
                 header: 'Login to Sentio',
-                content: 'sentio login --api-key=<key>',
+                content: 'sentio login',
             },
             {
                 header: 'Options',
@@ -44,34 +70,58 @@ function runLogin(argv) {
         ]);
         console.log(usage);
     }
-    else {
+    else if (options['api-key']) {
         const host = (0, config_1.getFinalizedHost)(options.host);
         console.log(chalk_1.default.blue('login to ' + host));
-        const url = new URL(host);
-        const reqOptions = {
-            hostname: url.hostname,
-            port: url.port,
-            path: '/api/v1/processors/check_key',
-            method: 'HEAD',
-            headers: {
-                'api-key': options['api-key'],
-            },
-        };
-        const h = url.protocol == 'https:' ? https_1.default : http_1.default;
-        const req = h.request(reqOptions, (res) => {
-            if (res.statusCode == 200) {
-                (0, key_1.WriteKey)(host, options['api-key']);
+        const apiKey = options['api-key'];
+        checkKey(host, apiKey).then((res) => {
+            if (res.status == 200) {
+                (0, key_1.WriteKey)(host, apiKey);
                 console.log(chalk_1.default.green('login success'));
             }
             else {
-                console.error(chalk_1.default.red('login failed, code:', res.statusCode, res.statusMessage));
+                console.error(chalk_1.default.red('login failed, code:', res.status, res.statusText));
             }
         });
-        req.on('error', (error) => {
-            console.error(error);
+    }
+    else {
+        // https://auth0.com/docs/get-started/authentication-and-authorization-flow/call-your-api-using-the-authorization-code-flow-with-pkce
+        const verifier = base64URLEncode(crypto.randomBytes(32));
+        const challenge = base64URLEncode(sha256(verifier));
+        const conf = (0, config_1.getAuthConfig)(options.host);
+        const authURL = new url_1.URL(conf.domain + `/authorize?`);
+        const params = new url_1.default.URLSearchParams({
+            response_type: 'code',
+            code_challenge: challenge,
+            code_challenge_method: 'S256',
+            client_id: conf.clientId,
+            redirect_uri: `http://localhost:${port}/callback`,
+            audience: conf.audience,
+            prompt: 'login',
+        });
+        authURL.search = params.toString();
+        console.log('Continue your authorization here: ' + authURL.toString());
+        (0, login_server_1.startServer)({
+            serverPort: port,
+            sentioHost: options.host,
+            codeVerifier: verifier,
         });
-        req.end();
     }
 }
 exports.runLogin = runLogin;
+function base64URLEncode(str) {
+    return str.toString('base64').replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
+}
+function sha256(str) {
+    return crypto.createHash('sha256').update(str).digest();
+}
+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',
+        headers: {
+            'api-key': apiKey,
+        },
+    });
+}
 //# sourceMappingURL=run-login.js.map

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":";;;;;;AAAA,0EAA+C;AAC/C,4EAAiD;AACjD,sCAA4C;AAC5C,kDAAyB;AACzB,kDAAyB;AACzB,gDAAuB;AACvB,gCAAiC;AAEjC,SAAgB,QAAQ,CAAC,IAAc;IACrC,MAAM,iBAAiB,GAAG;QACxB;YACE,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,GAAG;YACV,IAAI,EAAE,OAAO;YACb,WAAW,EAAE,2BAA2B;SACzC;QACD;YACE,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,MAAM;YACZ,WAAW,EAAE,yBAAyB;SACvC;QACD;YACE,IAAI,EAAE,MAAM;YACZ,WAAW,EAAE,sCAAsC;YACnD,IAAI,EAAE,MAAM;SACb;KACF,CAAA;IACD,MAAM,OAAO,GAAG,IAAA,2BAAe,EAAC,iBAAiB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;IAE5D,IAAI,OAAO,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QACvC,MAAM,KAAK,GAAG,IAAA,4BAAgB,EAAC;YAC7B;gBACE,MAAM,EAAE,iBAAiB;gBACzB,OAAO,EAAE,8BAA8B;aACxC;YACD;gBACE,MAAM,EAAE,SAAS;gBACjB,UAAU,EAAE,iBAAiB;aAC9B;SACF,CAAC,CAAA;QACF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;KACnB;SAAM;QACL,MAAM,IAAI,GAAG,IAAA,yBAAgB,EAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QAC3C,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC,CAAA;QAC3C,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,CAAA;QACzB,MAAM,UAAU,GAAG;YACjB,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,IAAI,EAAE,8BAA8B;YACpC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC;aAC9B;SACF,CAAA;QACD,MAAM,CAAC,GAAG,GAAG,CAAC,QAAQ,IAAI,QAAQ,CAAC,CAAC,CAAC,eAAK,CAAC,CAAC,CAAC,cAAI,CAAA;QACjD,MAAM,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,GAAG,EAAE,EAAE;YACxC,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,EAAE;gBACzB,IAAA,cAAQ,EAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAA;gBAClC,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAA;aAC1C;iBAAM;gBACL,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,qBAAqB,EAAE,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,aAAa,CAAC,CAAC,CAAA;aACnF;QACH,CAAC,CAAC,CAAA;QAEF,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YACxB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QACtB,CAAC,CAAC,CAAA;QACF,GAAG,CAAC,GAAG,EAAE,CAAA;KACV;AACH,CAAC;AA7DD,4BA6DC","sourcesContent":["import commandLineArgs from 'command-line-args'\nimport commandLineUsage from 'command-line-usage'\nimport { getFinalizedHost } from '../config'\nimport chalk from 'chalk'\nimport https from 'https'\nimport http from 'http'\nimport { WriteKey } from '../key'\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: 'api-key',\n      type: String,\n      description: '(Required) Your API key',\n    },\n    {\n      name: 'host',\n      description: '(Optional) Override Sentio Host name',\n      type: String,\n    },\n  ]\n  const options = commandLineArgs(optionDefinitions, { argv })\n\n  if (options.help || !options['api-key']) {\n    const usage = commandLineUsage([\n      {\n        header: 'Login to Sentio',\n        content: 'sentio login --api-key=<key>',\n      },\n      {\n        header: 'Options',\n        optionList: optionDefinitions,\n      },\n    ])\n    console.log(usage)\n  } else {\n    const host = getFinalizedHost(options.host)\n    console.log(chalk.blue('login to ' + host))\n    const url = new URL(host)\n    const reqOptions = {\n      hostname: url.hostname,\n      port: url.port,\n      path: '/api/v1/processors/check_key',\n      method: 'HEAD',\n      headers: {\n        'api-key': options['api-key'],\n      },\n    }\n    const h = url.protocol == 'https:' ? https : http\n    const req = h.request(reqOptions, (res) => {\n      if (res.statusCode == 200) {\n        WriteKey(host, options['api-key'])\n        console.log(chalk.green('login success'))\n      } else {\n        console.error(chalk.red('login failed, code:', res.statusCode, res.statusMessage))\n      }\n    })\n\n    req.on('error', (error) => {\n      console.error(error)\n    })\n    req.end()\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: 'HEAD',\n    headers: {\n      'api-key': apiKey,\n    },\n  })\n}\n"]}

package/lib/cli/config.d.ts

@@ -4,5 +4,10 @@ export interface SentioProjectConfig {
     build: boolean;
 }
 export declare function getFinalizedHost(host: string): string;
+export declare function getAuthConfig(host: string): {
+    domain: string;
+    clientId: string;
+    audience: string;
+};
 export declare function finalizeHost(config: SentioProjectConfig): void;
 export declare function FinalizeProjectName(config: SentioProjectConfig, owner: string | undefined): void;

package/lib/cli/config.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FinalizeProjectName = exports.finalizeHost = exports.getFinalizedHost = void 0;
+exports.FinalizeProjectName = exports.finalizeHost = exports.getAuthConfig = exports.getFinalizedHost = void 0;
 function getFinalizedHost(host) {
     switch (host) {
         case undefined:
@@ -17,6 +17,33 @@ function getFinalizedHost(host) {
     return host;
 }
 exports.getFinalizedHost = getFinalizedHost;
+function getAuthConfig(host) {
+    let domain = '', clientId = '', audience = '';
+    switch (host) {
+        case 'local':
+            domain = 'https://sentio-dev.us.auth0.com';
+            clientId = 'qGDisObqQbcPeRA8k02POPZ2Df4KVCna';
+            audience = 'http://localhost:8080/v1';
+            break;
+        case '':
+        case undefined:
+        case 'prod':
+            domain = 'https://auth.sentio.xyz';
+            clientId = 'xd80PeuvuZVHpBFh7yEdlSZdtE5mTpGe';
+            audience = 'https://app.sentio.xyz/api/v1';
+            break;
+        case 'test':
+        case 'staging':
+            domain = 'https://auth.test.sentio.xyz';
+            clientId = 'qXVvovHaOE37SndxTZJxCKgZjw1axPax';
+            audience = 'https://test.sentio.xyz/api/v1';
+            break;
+        default:
+            break;
+    }
+    return { domain, clientId, audience };
+}
+exports.getAuthConfig = getAuthConfig;
 function finalizeHost(config) {
     config.host = getFinalizedHost(config.host);
 }

package/lib/cli/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/cli/config.ts"],"names":[],"mappings":";;;AAQA,SAAgB,gBAAgB,CAAC,IAAY;IAC3C,QAAQ,IAAI,EAAE;QACZ,KAAK,SAAS,CAAC;QACf,KAAK,EAAE,CAAC;QACR,KAAK,MAAM;YACT,OAAO,wBAAwB,CAAA;QACjC,KAAK,MAAM;YACT,OAAO,yBAAyB,CAAA;QAClC,KAAK,SAAS;YACZ,OAAO,4BAA4B,CAAA;QACrC,KAAK,OAAO;YACV,OAAO,wBAAwB,CAAA;KAClC;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAdD,4CAcC;AAED,SAAgB,YAAY,CAAC,MAA2B;IACtD,MAAM,CAAC,IAAI,GAAG,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;AAC7C,CAAC;AAFD,oCAEC;AAED,SAAgB,mBAAmB,CAAC,MAA2B,EAAE,KAAyB;IACxF,IAAI,KAAK,EAAE;QACT,IAAI,IAAI,GAAG,MAAM,CAAC,OAAO,CAAA;QACzB,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACtB,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;SACpC;QACD,MAAM,CAAC,OAAO,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;KACzC;AACH,CAAC;AARD,kDAQC;AAED,4BAA4B;AAC5B,kBAAkB;AAClB,qBAAqB;AACrB,IAAI;AACJ,EAAE;AACF,wCAAwC;AACxC,2BAA2B;AAC3B,iCAAiC","sourcesContent":["export interface SentioProjectConfig {\n  project: string\n  host: string\n  // source: string\n  build: boolean\n  // targets: Target[]\n}\n\nexport function getFinalizedHost(host: string): string {\n  switch (host) {\n    case undefined:\n    case '':\n    case 'prod':\n      return 'https://app.sentio.xyz'\n    case 'test':\n      return 'https://test.sentio.xyz'\n    case 'staging':\n      return 'https://staging.sentio.xyz'\n    case 'local':\n      return 'http://localhost:10000'\n  }\n  return host\n}\n\nexport function finalizeHost(config: SentioProjectConfig) {\n  config.host = getFinalizedHost(config.host)\n}\n\nexport function FinalizeProjectName(config: SentioProjectConfig, owner: string | undefined) {\n  if (owner) {\n    let name = config.project\n    if (name.includes('/')) {\n      name = config.project.split('/')[1]\n    }\n    config.project = [owner, name].join('/')\n  }\n}\n\n// export interface Target {\n//   chain: string\n//   abisDir?: string\n// }\n//\n// // Supported target chain, lower case\n// export const EVM = 'evm'\n// export const SOLANA = 'solana'\n"]}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/cli/config.ts"],"names":[],"mappings":";;;AAQA,SAAgB,gBAAgB,CAAC,IAAY;IAC3C,QAAQ,IAAI,EAAE;QACZ,KAAK,SAAS,CAAC;QACf,KAAK,EAAE,CAAC;QACR,KAAK,MAAM;YACT,OAAO,wBAAwB,CAAA;QACjC,KAAK,MAAM;YACT,OAAO,yBAAyB,CAAA;QAClC,KAAK,SAAS;YACZ,OAAO,4BAA4B,CAAA;QACrC,KAAK,OAAO;YACV,OAAO,wBAAwB,CAAA;KAClC;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAdD,4CAcC;AAED,SAAgB,aAAa,CAAC,IAAY;IACxC,IAAI,MAAM,GAAG,EAAE,EACb,QAAQ,GAAG,EAAE,EACb,QAAQ,GAAG,EAAE,CAAA;IACf,QAAQ,IAAI,EAAE;QACZ,KAAK,OAAO;YACV,MAAM,GAAG,iCAAiC,CAAA;YAC1C,QAAQ,GAAG,kCAAkC,CAAA;YAC7C,QAAQ,GAAG,0BAA0B,CAAA;YACrC,MAAK;QACP,KAAK,EAAE,CAAC;QACR,KAAK,SAAS,CAAC;QACf,KAAK,MAAM;YACT,MAAM,GAAG,yBAAyB,CAAA;YAClC,QAAQ,GAAG,kCAAkC,CAAA;YAC7C,QAAQ,GAAG,+BAA+B,CAAA;YAC1C,MAAK;QACP,KAAK,MAAM,CAAC;QACZ,KAAK,SAAS;YACZ,MAAM,GAAG,8BAA8B,CAAA;YACvC,QAAQ,GAAG,kCAAkC,CAAA;YAC7C,QAAQ,GAAG,gCAAgC,CAAA;YAC3C,MAAK;QACP;YACE,MAAK;KACR;IACD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAA;AACvC,CAAC;AA3BD,sCA2BC;AAED,SAAgB,YAAY,CAAC,MAA2B;IACtD,MAAM,CAAC,IAAI,GAAG,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;AAC7C,CAAC;AAFD,oCAEC;AAED,SAAgB,mBAAmB,CAAC,MAA2B,EAAE,KAAyB;IACxF,IAAI,KAAK,EAAE;QACT,IAAI,IAAI,GAAG,MAAM,CAAC,OAAO,CAAA;QACzB,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACtB,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;SACpC;QACD,MAAM,CAAC,OAAO,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;KACzC;AACH,CAAC;AARD,kDAQC;AAED,4BAA4B;AAC5B,kBAAkB;AAClB,qBAAqB;AACrB,IAAI;AACJ,EAAE;AACF,wCAAwC;AACxC,2BAA2B;AAC3B,iCAAiC","sourcesContent":["export interface SentioProjectConfig {\n  project: string\n  host: string\n  // source: string\n  build: boolean\n  // targets: Target[]\n}\n\nexport function getFinalizedHost(host: string): string {\n  switch (host) {\n    case undefined:\n    case '':\n    case 'prod':\n      return 'https://app.sentio.xyz'\n    case 'test':\n      return 'https://test.sentio.xyz'\n    case 'staging':\n      return 'https://staging.sentio.xyz'\n    case 'local':\n      return 'http://localhost:10000'\n  }\n  return host\n}\n\nexport function getAuthConfig(host: string): { domain: string; clientId: string; audience: string } {\n  let domain = '',\n    clientId = '',\n    audience = ''\n  switch (host) {\n    case 'local':\n      domain = 'https://sentio-dev.us.auth0.com'\n      clientId = 'qGDisObqQbcPeRA8k02POPZ2Df4KVCna'\n      audience = 'http://localhost:8080/v1'\n      break\n    case '':\n    case undefined:\n    case 'prod':\n      domain = 'https://auth.sentio.xyz'\n      clientId = 'xd80PeuvuZVHpBFh7yEdlSZdtE5mTpGe'\n      audience = 'https://app.sentio.xyz/api/v1'\n      break\n    case 'test':\n    case 'staging':\n      domain = 'https://auth.test.sentio.xyz'\n      clientId = 'qXVvovHaOE37SndxTZJxCKgZjw1axPax'\n      audience = 'https://test.sentio.xyz/api/v1'\n      break\n    default:\n      break\n  }\n  return { domain, clientId, audience }\n}\n\nexport function finalizeHost(config: SentioProjectConfig) {\n  config.host = getFinalizedHost(config.host)\n}\n\nexport function FinalizeProjectName(config: SentioProjectConfig, owner: string | undefined) {\n  if (owner) {\n    let name = config.project\n    if (name.includes('/')) {\n      name = config.project.split('/')[1]\n    }\n    config.project = [owner, name].join('/')\n  }\n}\n\n// export interface Target {\n//   chain: string\n//   abisDir?: string\n// }\n//\n// // Supported target chain, lower case\n// export const EVM = 'evm'\n// export const SOLANA = 'solana'\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentio/sdk",
   "license": "Apache-2.0",
-  "version": "1.26.4",
+  "version": "1.27.1",
   "scripts": {
     "compile_target": "yarn tsc -b src/target-ethers-sentio/tsconfig.json",
     "compile": "tsc -p . && cp src/cli/webpack.config.js lib/cli && cp src/utils/*.csv lib/utils",
@@ -25,6 +25,7 @@
     "@solana/web3.js": "^1.47.3",
     "@typechain/ethers-v5": "^10.0.0",
     "@types/bn.js": "^5.1.0",
+    "@types/express": "^4.17.14",
     "@types/node-fetch": "^2.6.2",
     "aptos-sdk": "npm:aptos@^1.3.16",
     "bignumber.js": "^9.1.0",
@@ -34,6 +35,7 @@
     "command-line-usage": "^6.1.3",
     "csv-parse": "^5.3.0",
     "ethers": "~5.7.1",
+    "express": "^4.18.2",
     "form-data": "^4.0.0",
     "fs-extra": "^10.1.0",
     "google-protobuf": "^3.15.8",
@@ -78,5 +80,8 @@
     "lib/**/*",
     "src/**/*",
     "templates/**/*"
-  ]
+  ],
+  "engines": {
+    "node": ">=16"
+  }
 }

package/src/aptos/aptos-processor.ts

@@ -251,9 +251,9 @@ export class AptosAccountProcessor {
   public onTimeInterval(
     handler: (resources: MoveResource[], ctx: AptosResourceContext) => void,
     timeIntervalInMinutes = 60,
-    typpe?: string
+    type?: string
   ) {
-    return this.onInterval(handler, timeIntervalInMinutes, undefined, typpe)
+    return this.onInterval(handler, timeIntervalInMinutes, undefined, type)
   }
 
   public onVersionInterval(

package/src/aptos/index.ts

@@ -3,5 +3,5 @@ export type { EventInstance, TypedEventInstance, TypedEntryFunctionPayload } fro
 export { TYPE_REGISTRY, TypeRegistry } from './types'
 export type { FunctionNameAndCallFilter, EventFilter, CallFilter, ArgumentsFilter } from './aptos-processor'
 export { AptosBaseProcessor, AptosAccountProcessor } from './aptos-processor'
-export { AptosContext } from './context'
+export { AptosContext, AptosResourceContext } from './context'
 export { AptosBindOptions, AptosNetwork, getRpcClient } from './network'

package/src/aptos-codegen/codegen.ts

@@ -56,7 +56,7 @@ export async function generateForNetwork(srcDir: string, outputDir: string, netw
 
   while (loader.pendingAccounts.size > 0) {
     for (const account of loader.pendingAccounts) {
-      console.log(`download depended module for account ${account} at ${getChainName(network)}`)
+      console.log(`download dependent module for account ${account} at ${getChainName(network)}`)
 
       try {
         const modules = await client.getAccountModules(account)
@@ -326,7 +326,12 @@ function generateCallArgsStructs(module: MoveModule, func: MoveFunction) {
 
   // the first param is always signer so ignore
   // TODO check if there is any edge case
-  const fields = func.params.slice(1).map((param) => {
+  let params = func.params
+  if (func.params[0] === '&signer') {
+    params = params.slice(1)
+  }
+
+  const fields = params.map((param) => {
     return `${generateType(param)}`
   })
 
@@ -387,27 +392,6 @@ function getEventStructs(module: MoveModule) {
   return eventMap
 }
 
-function isEvent(struct: MoveStruct, module: MoveModule) {
-  const hasAbility = struct.abilities.includes('drop') && struct.abilities.includes('store')
-
-  if (!hasAbility) {
-    return false
-  }
-  if (struct.name.endsWith('Event')) {
-    return true
-  }
-
-  // for (const struct of module.structs) {
-  //   for (const field of struct.fields) {
-  //     if (field.type.startsWith('0x1::event::EventHandle')
-  //   }
-  // }
-
-  return false
-
-  //&&
-}
-
 function generateOnEvents(module: MoveModule, struct: MoveStruct): string {
   // for struct that has drop + store
   // if (!isEvent(struct, module)) {

package/src/builtin/aptos/0x1.ts

@@ -282,8 +282,8 @@ export namespace coin {
   }
 
   export interface FreezeCoinStorePayload
-    extends aptos.TypedEntryFunctionPayload<[Address]> {
-    arguments_typed: [Address];
+    extends aptos.TypedEntryFunctionPayload<[Address, Address]> {
+    arguments_typed: [Address, Address];
     type_arguments: [string];
   }
 
@@ -294,8 +294,8 @@ export namespace coin {
   }
 
   export interface UnfreezeCoinStorePayload
-    extends aptos.TypedEntryFunctionPayload<[Address]> {
-    arguments_typed: [Address];
+    extends aptos.TypedEntryFunctionPayload<[Address, Address]> {
+    arguments_typed: [Address, Address];
     type_arguments: [string];
   }
 
@@ -2163,8 +2163,8 @@ export namespace vesting {
   }
 
   export interface DistributePayload
-    extends aptos.TypedEntryFunctionPayload<[]> {
-    arguments_typed: [];
+    extends aptos.TypedEntryFunctionPayload<[Address]> {
+    arguments_typed: [Address];
     type_arguments: [];
   }
 
@@ -2205,8 +2205,8 @@ export namespace vesting {
   }
 
   export interface UnlockRewardsPayload
-    extends aptos.TypedEntryFunctionPayload<[]> {
-    arguments_typed: [];
+    extends aptos.TypedEntryFunctionPayload<[Address]> {
+    arguments_typed: [Address];
     type_arguments: [];
   }
 
@@ -2228,8 +2228,9 @@ export namespace vesting {
     type_arguments: [];
   }
 
-  export interface VestPayload extends aptos.TypedEntryFunctionPayload<[]> {
-    arguments_typed: [];
+  export interface VestPayload
+    extends aptos.TypedEntryFunctionPayload<[Address]> {
+    arguments_typed: [Address];
     type_arguments: [];
   }
 
@@ -2486,8 +2487,8 @@ export namespace aptos_coin {
   }
 
   export interface DelegateMintCapabilityPayload
-    extends aptos.TypedEntryFunctionPayload<[Address]> {
-    arguments_typed: [Address];
+    extends aptos.TypedEntryFunctionPayload<[Address, Address]> {
+    arguments_typed: [Address, Address];
     type_arguments: [];
   }
 
@@ -2869,8 +2870,8 @@ export class aptos_account extends aptos.AptosBaseProcessor {
 
 export namespace aptos_account {
   export interface CreateAccountPayload
-    extends aptos.TypedEntryFunctionPayload<[]> {
-    arguments_typed: [];
+    extends aptos.TypedEntryFunctionPayload<[Address]> {
+    arguments_typed: [Address];
     type_arguments: [];
   }
 
@@ -3414,8 +3415,8 @@ export namespace aptos_governance {
   }
 
   export interface AddApprovedScriptHashScriptPayload
-    extends aptos.TypedEntryFunctionPayload<[]> {
-    arguments_typed: [];
+    extends aptos.TypedEntryFunctionPayload<[bigint]> {
+    arguments_typed: [bigint];
     type_arguments: [];
   }
 
@@ -3982,8 +3983,8 @@ export namespace staking_contract {
   }
 
   export interface DistributePayload
-    extends aptos.TypedEntryFunctionPayload<[Address]> {
-    arguments_typed: [Address];
+    extends aptos.TypedEntryFunctionPayload<[Address, Address]> {
+    arguments_typed: [Address, Address];
     type_arguments: [];
   }
 

package/src/builtin/aptos/0x3.ts

@@ -837,25 +837,33 @@ export namespace token_transfers {
 
   export interface CancelOfferScriptPayload
     extends aptos.TypedEntryFunctionPayload<
-      [Address, Address, string, string, bigint]
+      [Address, Address, Address, string, string, bigint]
     > {
-    arguments_typed: [Address, Address, string, string, bigint];
+    arguments_typed: [Address, Address, Address, string, string, bigint];
     type_arguments: [];
   }
 
   export interface ClaimScriptPayload
     extends aptos.TypedEntryFunctionPayload<
-      [Address, Address, string, string, bigint]
+      [Address, Address, Address, string, string, bigint]
     > {
-    arguments_typed: [Address, Address, string, string, bigint];
+    arguments_typed: [Address, Address, Address, string, string, bigint];
     type_arguments: [];
   }
 
   export interface OfferScriptPayload
     extends aptos.TypedEntryFunctionPayload<
-      [Address, Address, string, string, bigint, bigint]
+      [Address, Address, Address, string, string, bigint, bigint]
     > {
-    arguments_typed: [Address, Address, string, string, bigint, bigint];
+    arguments_typed: [
+      Address,
+      Address,
+      Address,
+      string,
+      string,
+      bigint,
+      bigint
+    ];
     type_arguments: [];
   }