@sdkgen/node-runtime 0.0.0-dev.20210924122820 → 1.6.1

package/dist/src/http-server.js

@@ -35,7 +35,7 @@ class SdkgenHttpServer {
         this.introspection = true;
         this.hasSwagger = false;
         this.ignoredUrlPrefix = "";
-        this.httpServer = (0, http_1.createServer)(this.handleRequest.bind(this));
+        this.httpServer = http_1.createServer(this.handleRequest.bind(this));
         this.enableCors();
         this.attachRestHandlers();
         const targetTable = [
@@ -82,7 +82,7 @@ class SdkgenHttpServer {
             if (req.url) {
                 req.url = req.url.endsWith("/playground") ? req.url.replace(/\/playground/u, "/index.html") : req.url.replace(/\/playground/u, "");
             }
-            (0, serve_handler_1.default)(req, res, {
+            serve_handler_1.default(req, res, {
                 cleanUrls: false,
                 directoryListing: false,
                 etag: true,
@@ -132,7 +132,7 @@ class SdkgenHttpServer {
         });
     }
     async close() {
-        return (0, util_1.promisify)(this.httpServer.close.bind(this.httpServer))();
+        return util_1.promisify(this.httpServer.close.bind(this.httpServer))();
     }
     enableCors() {
         this.addHeader("Access-Control-Allow-Methods", "DELETE, HEAD, PUT, POST, PATCH, GET, OPTIONS");
@@ -201,7 +201,7 @@ class SdkgenHttpServer {
                     continue;
                 }
                 if (!this.hasSwagger) {
-                    (0, swagger_1.setupSwagger)(this);
+                    swagger_1.setupSwagger(this);
                     this.hasSwagger = true;
                 }
                 const pathFragments = ann.path.split(/\{\w+\}/u);
@@ -222,7 +222,7 @@ class SdkgenHttpServer {
                     try {
                         const args = {};
                         const files = [];
-                        const { pathname, query } = (0, url_1.parse)((_a = req.url) !== null && _a !== void 0 ? _a : "");
+                        const { pathname, query } = url_1.parse((_a = req.url) !== null && _a !== void 0 ? _a : "");
                         const match = pathname === null || pathname === void 0 ? void 0 : pathname.match(pathRegex);
                         if (!match) {
                             res.statusCode = 404;
@@ -234,7 +234,7 @@ class SdkgenHttpServer {
                             const argValue = match[i + 1];
                             simpleArgs.set(argName, argValue);
                         }
-                        const parsedQuery = query ? (0, querystring_1.parse)(query) : {};
+                        const parsedQuery = query ? querystring_1.parse(query) : {};
                         for (const argName of ann.queryVariables) {
                             const argValue = (_b = parsedQuery[argName]) !== null && _b !== void 0 ? _b : null;
                             if (argValue === null) {
@@ -250,7 +250,7 @@ class SdkgenHttpServer {
                             simpleArgs.set(argName, Array.isArray(argValue) ? argValue.join("") : argValue);
                         }
                         if (!ann.bodyVariable && ((_d = req.headers["content-type"]) === null || _d === void 0 ? void 0 : _d.match(/^application\/x-www-form-urlencoded/iu))) {
-                            const parsedBody = (0, querystring_1.parse)(body.toString());
+                            const parsedBody = querystring_1.parse(body.toString());
                             console.log("parsedBody", parsedBody);
                             for (const argName of ann.queryVariables) {
                                 const argValue = (_e = parsedBody[argName]) !== null && _e !== void 0 ? _e : null;
@@ -269,15 +269,15 @@ class SdkgenHttpServer {
                                 }
                             });
                             busboy.on("file", (_field, file, name) => {
-                                const tempName = (0, crypto_1.randomBytes)(32).toString("hex");
-                                const writeStream = (0, fs_1.createWriteStream)(tempName);
+                                const tempName = crypto_1.randomBytes(32).toString("hex");
+                                const writeStream = fs_1.createWriteStream(tempName);
                                 filePromises.push(new Promise((resolve, reject) => {
                                     writeStream.on("error", reject);
                                     writeStream.on("close", () => {
-                                        const contents = (0, fs_1.createReadStream)(tempName);
+                                        const contents = fs_1.createReadStream(tempName);
                                         files.push({ contents, name });
                                         contents.on("open", () => {
-                                            (0, fs_1.unlink)(tempName, err => {
+                                            fs_1.unlink(tempName, err => {
                                                 if (err) {
                                                     reject(err);
                                                 }
@@ -383,7 +383,7 @@ class SdkgenHttpServer {
                                 args[argName] = argValue;
                             }
                         }
-                        const ip = (0, request_ip_1.getClientIp)(req);
+                        const ip = request_ip_1.getClientIp(req);
                         if (!ip) {
                             throw new Error("Couldn't determine client IP");
                         }
@@ -391,7 +391,7 @@ class SdkgenHttpServer {
                             args,
                             deviceInfo: {
                                 fingerprint: null,
-                                id: (0, crypto_1.randomBytes)(16).toString("hex"),
+                                id: crypto_1.randomBytes(16).toString("hex"),
                                 language: null,
                                 platform: null,
                                 timezone: null,
@@ -401,7 +401,7 @@ class SdkgenHttpServer {
                             extra: {},
                             files,
                             headers: req.headers,
-                            id: (0, crypto_1.randomBytes)(16).toString("hex"),
+                            id: crypto_1.randomBytes(16).toString("hex"),
                             ip,
                             name: op.name,
                             version: 3,
@@ -474,8 +474,7 @@ class SdkgenHttpServer {
                                             .then(() => {
                                             res.write(buffer);
                                             res.end();
-                                        })
-                                            .catch(() => { });
+                                        });
                                     }
                                     else {
                                         res.setHeader("content-type", "application/json");
@@ -531,8 +530,9 @@ class SdkgenHttpServer {
         }
         const body = [];
         req.on("data", chunk => body.push(chunk));
+        // eslint-disable-next-line @typescript-eslint/no-misused-promises
         req.on("end", () => {
-            this.handleRequestWithBody(req, res, Buffer.concat(body), hrStart).catch((e) => this.writeReply(res, null, { error: e }, hrStart));
+            this.handleRequestWithBody(req, res, Buffer.concat(body), hrStart).catch(e => this.writeReply(res, null, { error: e }, hrStart));
         });
     }
     log(message) {
@@ -540,7 +540,7 @@ class SdkgenHttpServer {
     }
     async handleRequestWithBody(req, res, body, hrStart) {
         var _a, _b;
-        const { pathname, query } = (0, url_1.parse)((_a = req.url) !== null && _a !== void 0 ? _a : "");
+        const { pathname, query } = url_1.parse((_a = req.url) !== null && _a !== void 0 ? _a : "");
         let path = pathname !== null && pathname !== void 0 ? pathname : "";
         if (path.startsWith(this.ignoredUrlPrefix)) {
             path = path.slice(this.ignoredUrlPrefix.length);
@@ -565,8 +565,9 @@ class SdkgenHttpServer {
                 res.end();
                 return;
             }
-            let ok = true;
+            let ok;
             try {
+                ok = await this.apiConfig.hook.onHealthCheck();
                 for (const healthCheck of this.healthChecks) {
                     if (!ok) {
                         break;
@@ -587,7 +588,7 @@ class SdkgenHttpServer {
             res.end();
             return;
         }
-        const clientIp = (0, request_ip_1.getClientIp)(req);
+        const clientIp = request_ip_1.getClientIp(req);
         if (!clientIp) {
             this.writeReply(res, null, {
                 error: new error_1.Fatal("Couldn't determine client IP"),
@@ -605,7 +606,7 @@ class SdkgenHttpServer {
     }
     async executeRequest(request, writeReply) {
         const ctx = Object.assign(Object.assign({}, this.extraContext), { request });
-        writeReply(ctx, await (0, execute_1.executeRequest)(ctx, this.apiConfig));
+        writeReply(ctx, await execute_1.executeRequest(ctx, this.apiConfig));
     }
     parseRequest(req, body, ip) {
         switch (this.identifyRequestVersion(req, body)) {
@@ -621,13 +622,13 @@ class SdkgenHttpServer {
     }
     identifyRequestVersion(_req, body) {
         const parsed = JSON.parse(body);
-        if (typeof parsed === "object" && parsed && (0, utils_1.has)(parsed, "version") && typeof parsed.version === "number") {
+        if (typeof parsed === "object" && parsed && utils_1.has(parsed, "version") && typeof parsed.version === "number") {
             return parsed.version;
         }
-        else if (typeof parsed === "object" && parsed && (0, utils_1.has)(parsed, "requestId")) {
+        else if (typeof parsed === "object" && parsed && utils_1.has(parsed, "requestId")) {
             return 2;
         }
-        else if (typeof parsed === "object" && parsed && (0, utils_1.has)(parsed, "device")) {
+        else if (typeof parsed === "object" && parsed && utils_1.has(parsed, "device")) {
             return 1;
         }
         return 3;
@@ -635,24 +636,23 @@ class SdkgenHttpServer {
     // Old Sdkgen format
     parseRequestV1(req, body, ip) {
         var _a, _b;
-        const parsed = (0, encode_decode_1.decode)({
+        const parsed = encode_decode_1.decode({
             Request: {
                 args: "json",
-                device: "RequestDevice",
+                device: {
+                    fingerprint: "string?",
+                    id: "string?",
+                    language: "string?",
+                    platform: "json?",
+                    timezone: "string?",
+                    type: "string?",
+                    version: "string?",
+                },
                 id: "string",
                 name: "string",
             },
-            RequestDevice: {
-                fingerprint: "string?",
-                id: "string?",
-                language: "string?",
-                platform: "json?",
-                timezone: "string?",
-                type: "string?",
-                version: "string?",
-            },
         }, "root", "Request", JSON.parse(body));
-        const deviceId = (_a = parsed.device.id) !== null && _a !== void 0 ? _a : (0, crypto_1.randomBytes)(20).toString("hex");
+        const deviceId = (_a = parsed.device.id) !== null && _a !== void 0 ? _a : crypto_1.randomBytes(20).toString("hex");
         if (!parsed.args || Array.isArray(parsed.args) || typeof parsed.args !== "object") {
             throw new Error("Expected 'args' to be an object");
         }
@@ -679,22 +679,21 @@ class SdkgenHttpServer {
     // Maxima sdkgen format
     parseRequestV2(req, body, ip) {
         var _a, _b;
-        const parsed = (0, encode_decode_1.decode)({
+        const parsed = encode_decode_1.decode({
             Request: {
                 args: "json",
                 deviceFingerprint: "string?",
                 deviceId: "string",
-                info: "RequestInfo",
+                info: {
+                    browserUserAgent: "string?",
+                    language: "string",
+                    type: "string",
+                },
                 name: "string",
                 partnerId: "string?",
                 requestId: "string?",
                 sessionId: "string?",
             },
-            RequestInfo: {
-                browserUserAgent: "string?",
-                language: "string",
-                type: "string",
-            },
         }, "root", "Request", JSON.parse(body));
         if (!parsed.args || Array.isArray(parsed.args) || typeof parsed.args !== "object") {
             throw new Error("Expected 'args' to be an object");
@@ -718,7 +717,7 @@ class SdkgenHttpServer {
             },
             files: [],
             headers: req.headers,
-            id: `${parsed.deviceId}-${(_b = parsed.requestId) !== null && _b !== void 0 ? _b : (0, crypto_1.randomBytes)(16).toString("hex")}`,
+            id: `${parsed.deviceId}-${(_b = parsed.requestId) !== null && _b !== void 0 ? _b : crypto_1.randomBytes(16).toString("hex")}`,
             ip,
             name: parsed.name,
             version: 2,
@@ -727,7 +726,7 @@ class SdkgenHttpServer {
     // New sdkgen format
     parseRequestV3(req, body, ip) {
         var _a, _b, _c, _d;
-        const parsed = (0, encode_decode_1.decode)({
+        const parsed = encode_decode_1.decode({
             DeviceInfo: {
                 fingerprint: "string?",
                 id: "string?",
@@ -754,7 +753,7 @@ class SdkgenHttpServer {
             type: null,
             version: null,
         };
-        const deviceId = (_b = deviceInfo.id) !== null && _b !== void 0 ? _b : (0, crypto_1.randomBytes)(16).toString("hex");
+        const deviceId = (_b = deviceInfo.id) !== null && _b !== void 0 ? _b : crypto_1.randomBytes(16).toString("hex");
         if (!parsed.args || Array.isArray(parsed.args) || typeof parsed.args !== "object") {
             throw new Error("Expected 'args' to be an object");
         }
@@ -772,7 +771,7 @@ class SdkgenHttpServer {
             extra: typeof parsed.extra === "object" ? Object.assign({}, parsed.extra) : {},
             files: [],
             headers: req.headers,
-            id: `${deviceId}-${(_d = parsed.requestId) !== null && _d !== void 0 ? _d : (0, crypto_1.randomBytes)(16).toString("hex")}`,
+            id: `${deviceId}-${(_d = parsed.requestId) !== null && _d !== void 0 ? _d : crypto_1.randomBytes(16).toString("hex")}`,
             ip,
             name: parsed.name,
             version: 3,
@@ -780,11 +779,11 @@ class SdkgenHttpServer {
     }
     makeResponseError(err) {
         let type = "Fatal";
-        if (typeof err === "object" && err !== null && (0, utils_1.has)(err, "type") && typeof err.type === "string") {
+        if (typeof err === "object" && err !== null && utils_1.has(err, "type") && typeof err.type === "string") {
             ({ type } = err);
         }
         let message;
-        if (typeof err === "object" && err !== null && (0, utils_1.has)(err, "message") && typeof err.message === "string") {
+        if (typeof err === "object" && err !== null && utils_1.has(err, "message") && typeof err.message === "string") {
             ({ message } = err);
         }
         else if (err instanceof Error) {
@@ -797,14 +796,14 @@ class SdkgenHttpServer {
             message = `${err}`;
         }
         let data;
-        if (typeof err === "object" && err !== null && (0, utils_1.has)(err, "data")) {
+        if (typeof err === "object" && err !== null && utils_1.has(err, "data")) {
             ({ data } = err);
         }
         const error = this.apiConfig.ast.errors.find(x => x.name === type);
         if (error) {
             if (!(error.dataType instanceof parser_1.VoidPrimitiveType)) {
                 try {
-                    data = (0, encode_decode_1.encode)(this.apiConfig.astJson.typeTable, `error.${type}`, error.dataType.name, data);
+                    data = encode_decode_1.encode(this.apiConfig.astJson.typeTable, `error.${type}`, error.dataType.name, data);
                 }
                 catch (encodeError) {
                     message = `Failed to encode error ${type} because: ${encodeError}. Original message: ${message}`;
@@ -839,7 +838,7 @@ class SdkgenHttpServer {
                     deviceId: ctx.request.deviceInfo.id,
                     duration,
                     error: reply.error ? this.makeResponseError(reply.error) : null,
-                    host: (0, os_1.hostname)(),
+                    host: os_1.hostname(),
                     id: ctx.request.id,
                     ok: !reply.error,
                     result: reply.error ? null : reply.result,
@@ -871,7 +870,7 @@ class SdkgenHttpServer {
                 const response = {
                     duration,
                     error: reply.error ? this.makeResponseError(reply.error) : null,
-                    host: (0, os_1.hostname)(),
+                    host: os_1.hostname(),
                     result: reply.error ? null : reply.result,
                 };
                 if (response.error) {

package/dist/src/index.d.ts

@@ -1,8 +1,7 @@
-export { BaseApiConfig } from "./api-config";
-export { Context, ContextReply, ContextRequest } from "./context";
-export { decode, encode } from "./encode-decode";
-export { Fatal, SdkgenError, SdkgenErrorWithData } from "./error";
-export { useSdkgenContext } from "./context-storage";
-export { SdkgenHttpClient } from "./http-client";
-export { SdkgenHttpServer } from "./http-server";
-export { apiTestWrapper } from "./test-wrapper";
+export * from "./api-config";
+export * from "./context";
+export * from "./encode-decode";
+export * from "./error";
+export * from "./http-client";
+export * from "./http-server";
+export * from "./test-wrapper";

package/dist/src/index.js

@@ -1,20 +1,19 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.apiTestWrapper = exports.SdkgenHttpServer = exports.SdkgenHttpClient = exports.useSdkgenContext = exports.SdkgenErrorWithData = exports.SdkgenError = exports.Fatal = exports.encode = exports.decode = exports.BaseApiConfig = void 0;
-var api_config_1 = require("./api-config");
-Object.defineProperty(exports, "BaseApiConfig", { enumerable: true, get: function () { return api_config_1.BaseApiConfig; } });
-var encode_decode_1 = require("./encode-decode");
-Object.defineProperty(exports, "decode", { enumerable: true, get: function () { return encode_decode_1.decode; } });
-Object.defineProperty(exports, "encode", { enumerable: true, get: function () { return encode_decode_1.encode; } });
-var error_1 = require("./error");
-Object.defineProperty(exports, "Fatal", { enumerable: true, get: function () { return error_1.Fatal; } });
-Object.defineProperty(exports, "SdkgenError", { enumerable: true, get: function () { return error_1.SdkgenError; } });
-Object.defineProperty(exports, "SdkgenErrorWithData", { enumerable: true, get: function () { return error_1.SdkgenErrorWithData; } });
-var context_storage_1 = require("./context-storage");
-Object.defineProperty(exports, "useSdkgenContext", { enumerable: true, get: function () { return context_storage_1.useSdkgenContext; } });
-var http_client_1 = require("./http-client");
-Object.defineProperty(exports, "SdkgenHttpClient", { enumerable: true, get: function () { return http_client_1.SdkgenHttpClient; } });
-var http_server_1 = require("./http-server");
-Object.defineProperty(exports, "SdkgenHttpServer", { enumerable: true, get: function () { return http_server_1.SdkgenHttpServer; } });
-var test_wrapper_1 = require("./test-wrapper");
-Object.defineProperty(exports, "apiTestWrapper", { enumerable: true, get: function () { return test_wrapper_1.apiTestWrapper; } });
+__exportStar(require("./api-config"), exports);
+__exportStar(require("./context"), exports);
+__exportStar(require("./encode-decode"), exports);
+__exportStar(require("./error"), exports);
+__exportStar(require("./http-client"), exports);
+__exportStar(require("./http-server"), exports);
+__exportStar(require("./test-wrapper"), exports);

package/dist/src/swagger.js

@@ -7,7 +7,7 @@ exports.setupSwagger = void 0;
 const parser_1 = require("@sdkgen/parser");
 const serve_handler_1 = __importDefault(require("serve-handler"));
 const swagger_ui_dist_1 = require("swagger-ui-dist");
-const swaggerUiAssetPath = (0, swagger_ui_dist_1.getAbsoluteFSPath)();
+const swaggerUiAssetPath = swagger_ui_dist_1.getAbsoluteFSPath();
 function objectFromEntries(entries) {
     return Object.assign({}, ...Array.from(entries, ([k, v]) => ({ [k]: v })));
 }
@@ -201,7 +201,7 @@ function setupSwagger(server) {
             req.url = req.url.replace(/\/swagger/u, "");
         }
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
-        (0, serve_handler_1.default)(req, res, {
+        serve_handler_1.default(req, res, {
             cleanUrls: false,
             directoryListing: false,
             etag: true,

package/dist/src/test-wrapper.js

@@ -15,12 +15,12 @@ function apiTestWrapper(api) {
     for (const functionName of Object.keys(api.astJson.functionTable)) {
         wrappedApi.fn[functionName] = async (ctx, args) => {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-            const encodedArgs = (0, encode_decode_1.encode)(api.astJson.typeTable, `fn.${functionName}.args`, api.astJson.functionTable[functionName].args, args);
+            const encodedArgs = encode_decode_1.encode(api.astJson.typeTable, `fn.${functionName}.args`, api.astJson.functionTable[functionName].args, args);
             ctx.request = {
                 args: encodedArgs,
                 deviceInfo: (_b = (_a = ctx.request) === null || _a === void 0 ? void 0 : _a.deviceInfo) !== null && _b !== void 0 ? _b : {
                     fingerprint: null,
-                    id: (0, crypto_1.randomBytes)(16).toString("hex"),
+                    id: crypto_1.randomBytes(16).toString("hex"),
                     language: null,
                     platform: null,
                     timezone: null,
@@ -30,17 +30,17 @@ function apiTestWrapper(api) {
                 extra: (_d = (_c = ctx.request) === null || _c === void 0 ? void 0 : _c.extra) !== null && _d !== void 0 ? _d : {},
                 files: (_f = (_e = ctx.request) === null || _e === void 0 ? void 0 : _e.files) !== null && _f !== void 0 ? _f : [],
                 headers: (_h = (_g = ctx.request) === null || _g === void 0 ? void 0 : _g.headers) !== null && _h !== void 0 ? _h : {},
-                id: (_k = (_j = ctx.request) === null || _j === void 0 ? void 0 : _j.id) !== null && _k !== void 0 ? _k : (0, crypto_1.randomBytes)(16).toString("hex"),
+                id: (_k = (_j = ctx.request) === null || _j === void 0 ? void 0 : _j.id) !== null && _k !== void 0 ? _k : crypto_1.randomBytes(16).toString("hex"),
                 ip: (_m = (_l = ctx.request) === null || _l === void 0 ? void 0 : _l.ip) !== null && _m !== void 0 ? _m : "0.0.0.0",
                 name: functionName,
                 version: 3,
             };
-            const reply = await (0, execute_1.executeRequest)(ctx, api);
+            const reply = await execute_1.executeRequest(ctx, api);
             if (reply.error) {
                 throw reply.error;
             }
             else {
-                const decodedRet = (0, encode_decode_1.decode)(api.astJson.typeTable, `fn.${functionName}.ret`, api.astJson.functionTable[functionName].ret, JSON.parse(JSON.stringify(reply.result)));
+                const decodedRet = encode_decode_1.decode(api.astJson.typeTable, `fn.${functionName}.ret`, api.astJson.functionTable[functionName].ret, JSON.parse(JSON.stringify(reply.result)));
                 return decodedRet;
             }
         };