@sdkgen/node-runtime 1.6.1 → 2.0.1

package/dist/src/encode-decode.js

@@ -1,7 +1,11 @@
 "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]; } });
+    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];
@@ -18,6 +22,17 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.decode = exports.encode = void 0;
 const CNPJ = __importStar(require("@fnando/cnpj"));
@@ -122,10 +137,35 @@ function encode(typeTable, path, type, value) {
         throw new Error(`Invalid type at '${path}', cannot be null`);
     }
     else if (Array.isArray(type)) {
-        if (typeof value !== "string" || !type.includes(value)) {
-            throw new ParseError(path, type, value);
+        if (type.every(tag => typeof tag === "string")) {
+            for (const tag of type) {
+                if (tag === value) {
+                    return tag;
+                }
+            }
         }
-        return value;
+        else if (typeof value === "object" && value && "tag" in value) {
+            const _a = value, { tag: tagValue } = _a, restValue = __rest(_a, ["tag"]);
+            for (const entry of type) {
+                if (typeof entry === "string") {
+                    if (entry === tagValue) {
+                        return entry;
+                    }
+                }
+                else {
+                    const [tag, valueType] = entry;
+                    if (tag === tagValue) {
+                        const encodedValues = encode(typeTable, `${path}.${tag}`, valueType, restValue);
+                        // eslint-disable-next-line max-depth
+                        if (Object.values(encodedValues).every(v => v === null)) {
+                            return tag;
+                        }
+                        return [tag, encodedValues];
+                    }
+                }
+            }
+        }
+        throw new ParseError(path, type, value);
     }
     else if (typeof type === "object") {
         if (typeof value !== "object") {
@@ -191,6 +231,7 @@ function encode(typeTable, path, type, value) {
         return (typeof value === "string" ? new Date(value) : value).toISOString().replace("Z", "");
     }
     else {
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
         const resolved = typeTable[type];
         if (resolved) {
             return encode(typeTable, path, resolved, value);
@@ -204,10 +245,34 @@ function decode(typeTable, path, type, value) {
         throw new Error(`Invalid type at '${path}', cannot be null`);
     }
     else if (Array.isArray(type)) {
-        if (typeof value !== "string" || !type.includes(value)) {
-            throw new ParseError(path, type, value);
+        if (type.every(tag => typeof tag === "string")) {
+            for (const tag of type) {
+                if (tag === value) {
+                    return tag;
+                }
+            }
         }
-        return value;
+        else {
+            for (const entry of type) {
+                if (typeof entry === "string") {
+                    if (entry === value) {
+                        return { tag: entry };
+                    }
+                }
+                else {
+                    const [tag, valueType] = entry;
+                    if (tag === value) {
+                        const decodedValues = decode(typeTable, `${path}.${tag}`, valueType, {});
+                        return Object.assign(Object.assign({}, decodedValues), { tag });
+                    }
+                    else if (Array.isArray(value) && value.length === 2 && tag === value[0]) {
+                        const decodedValues = decode(typeTable, `${path}.${tag}`, valueType, value[1]);
+                        return Object.assign(Object.assign({}, decodedValues), { tag });
+                    }
+                }
+            }
+        }
+        throw new ParseError(path, type, value);
     }
     else if (typeof type === "object") {
         if (typeof value !== "object") {
@@ -282,6 +347,7 @@ function decode(typeTable, path, type, value) {
         return new Date(`${value.endsWith("Z") ? value : value.concat("Z")}`);
     }
     else {
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
         const resolved = typeTable[type];
         if (resolved) {
             // eslint-disable-next-line @typescript-eslint/no-unsafe-return

package/dist/src/execute.js

@@ -14,9 +14,9 @@ async function executeRequest(ctx, apiConfig) {
             if (!functionDescription || !functionImplementation) {
                 throw new error_1.Fatal(`Function does not exist: ${ctx.request.name}`);
             }
-            const args = encode_decode_1.decode(apiConfig.astJson.typeTable, `${ctx.request.name}.args`, functionDescription.args, ctx.request.args);
-            const ret = await functionImplementation(ctx, args);
-            const encodedRet = encode_decode_1.encode(apiConfig.astJson.typeTable, `${ctx.request.name}.ret`, functionDescription.ret, ret);
+            const args = (0, encode_decode_1.decode)(apiConfig.astJson.typeTable, `${ctx.request.name}.args`, functionDescription.args, ctx.request.args);
+            const ret = (await functionImplementation(ctx, args));
+            const encodedRet = (0, encode_decode_1.encode)(apiConfig.astJson.typeTable, `${ctx.request.name}.ret`, functionDescription.ret, ret);
             return { result: encodedRet };
         }
         catch (error) {
@@ -43,7 +43,7 @@ async function executeRequest(ctx, apiConfig) {
             const allowedErrors = functionAst.annotations.filter(ann => ann instanceof parser_1.ThrowsAnnotation).map(ann => ann.error);
             if (typeof reply.error !== "object" ||
                 reply.error === null ||
-                !utils_1.has(reply.error, "type") ||
+                !(0, utils_1.has)(reply.error, "type") ||
                 typeof reply.error.type !== "string" ||
                 (allowedErrors.length > 0 && !allowedErrors.includes(reply.error.type)) ||
                 !apiConfig.astJson.errors.map(error => (typeof error === "string" ? error : error[0])).includes(reply.error.type)) {

package/dist/src/http-client.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SdkgenHttpClient = void 0;
+/* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable prefer-promise-reject-errors */
 const crypto_1 = require("crypto");
 const http_1 = require("http");
@@ -17,7 +18,7 @@ class SdkgenHttpClient {
         this.baseUrl = new url_1.URL(baseUrl);
     }
     async makeRequest(ctx, functionName, args) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         const func = this.astJson.functionTable[functionName];
         if (!func) {
             throw new Error(`Unknown function ${functionName}`);
@@ -27,11 +28,11 @@ class SdkgenHttpClient {
             extra[key] = value;
         }
         const requestBody = JSON.stringify({
-            args: encode_decode_1.encode(this.astJson.typeTable, `${functionName}.args`, func.args, args),
-            deviceInfo: ((_a = ctx === null || ctx === void 0 ? void 0 : ctx.request) === null || _a === void 0 ? void 0 : _a.deviceInfo) ? ctx.request.deviceInfo : { id: os_1.hostname(), type: "node" },
-            extra: Object.assign(Object.assign({}, extra), ((ctx === null || ctx === void 0 ? void 0 : ctx.request) ? ctx.request.extra : {})),
+            args: (0, encode_decode_1.encode)(this.astJson.typeTable, `${functionName}.args`, func.args, args),
+            deviceInfo: (_b = (_a = ctx === null || ctx === void 0 ? void 0 : ctx.request) === null || _a === void 0 ? void 0 : _a.deviceInfo) !== null && _b !== void 0 ? _b : { id: (0, os_1.hostname)(), type: "node" },
+            extra: Object.assign(Object.assign({}, extra), (_c = ctx === null || ctx === void 0 ? void 0 : ctx.request) === null || _c === void 0 ? void 0 : _c.extra),
             name: functionName,
-            requestId: ((_b = ctx === null || ctx === void 0 ? void 0 : ctx.request) === null || _b === void 0 ? void 0 : _b.id) ? ctx.request.id + crypto_1.randomBytes(6).toString("hex") : crypto_1.randomBytes(16).toString("hex"),
+            requestId: ((_d = ctx === null || ctx === void 0 ? void 0 : ctx.request) === null || _d === void 0 ? void 0 : _d.id) ? ctx.request.id + (0, crypto_1.randomBytes)(6).toString("hex") : (0, crypto_1.randomBytes)(16).toString("hex"),
             version: 3,
         });
         const options = {
@@ -52,11 +53,11 @@ class SdkgenHttpClient {
                 res.on("end", () => {
                     try {
                         const response = JSON.parse(data);
-                        if (utils_1.has(response, "error") && response.error) {
+                        if ((0, utils_1.has)(response, "error") && response.error) {
                             reject(response.error);
                         }
                         else {
-                            resolve(utils_1.has(response, "result") ? response.result : null);
+                            resolve((0, utils_1.has)(response, "result") ? response.result : null);
                         }
                     }
                     catch (error) {
@@ -76,13 +77,13 @@ class SdkgenHttpClient {
             req.write(requestBody);
             req.end();
         }).catch(error => {
-            if (utils_1.has(error, "type") && utils_1.has(error, "message") && typeof error.type === "string" && typeof error.message === "string") {
+            if ((0, utils_1.has)(error, "type") && (0, utils_1.has)(error, "message") && typeof error.type === "string" && typeof error.message === "string") {
                 const errClass = this.errClasses[error.type];
                 if (errClass) {
                     const errorJson = this.astJson.errors.find(err => (Array.isArray(err) ? err[0] === error.type : err === error.type));
                     if (errorJson) {
-                        if (Array.isArray(errorJson) && utils_1.has(error, "data")) {
-                            throw new errClass(error.message, encode_decode_1.decode(this.astJson.typeTable, `${errClass.name}.data`, errorJson[1], error.data));
+                        if (Array.isArray(errorJson) && (0, utils_1.has)(error, "data")) {
+                            throw new errClass(error.message, (0, encode_decode_1.decode)(this.astJson.typeTable, `${errClass.name}.data`, errorJson[1], error.data));
                         }
                         else {
                             throw new errClass(error.message, undefined);
@@ -96,7 +97,7 @@ class SdkgenHttpClient {
             }
         });
         // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-        return encode_decode_1.decode(this.astJson.typeTable, `${functionName}.ret`, func.ret, encodedRet);
+        return (0, encode_decode_1.decode)(this.astJson.typeTable, `${functionName}.ret`, func.ret, encodedRet);
     }
 }
 exports.SdkgenHttpClient = SdkgenHttpClient;

package/dist/src/http-server.d.ts

@@ -10,6 +10,7 @@ export declare class SdkgenHttpServer<ExtraContextT = unknown> {
     private handlers;
     dynamicCorsOrigin: boolean;
     introspection: boolean;
+    log: (message: string) => void;
     private hasSwagger;
     private ignoredUrlPrefix;
     constructor(apiConfig: BaseApiConfig<ExtraContextT>, extraContext: ExtraContextT);
@@ -23,7 +24,6 @@ export declare class SdkgenHttpServer<ExtraContextT = unknown> {
     private findBestHandler;
     private attachRestHandlers;
     private handleRequest;
-    private log;
     private handleRequestWithBody;
     private executeRequest;
     private parseRequest;

package/dist/src/http-server.js

@@ -11,9 +11,13 @@ const os_1 = require("os");
 const querystring_1 = require("querystring");
 const url_1 = require("url");
 const util_1 = require("util");
+const csharp_generator_1 = require("@sdkgen/csharp-generator");
 const dart_generator_1 = require("@sdkgen/dart-generator");
+const fsharp_generator_1 = require("@sdkgen/fsharp-generator");
+const kotlin_generator_1 = require("@sdkgen/kotlin-generator");
 const parser_1 = require("@sdkgen/parser");
 const playground_1 = require("@sdkgen/playground");
+const swift_generator_1 = require("@sdkgen/swift-generator");
 const typescript_generator_1 = require("@sdkgen/typescript-generator");
 const busboy_1 = __importDefault(require("busboy"));
 const file_type_1 = __importDefault(require("file-type"));
@@ -33,16 +37,25 @@ class SdkgenHttpServer {
         this.handlers = [];
         this.dynamicCorsOrigin = true;
         this.introspection = true;
+        this.log = (message) => {
+            console.log(`${new Date().toISOString()} ${message}`);
+        };
         this.hasSwagger = false;
         this.ignoredUrlPrefix = "";
-        this.httpServer = http_1.createServer(this.handleRequest.bind(this));
+        this.httpServer = (0, http_1.createServer)(this.handleRequest.bind(this));
         this.enableCors();
         this.attachRestHandlers();
         const targetTable = [
+            ["/targets/android/client.kt", (ast) => (0, kotlin_generator_1.generateAndroidClientSource)(ast, true)],
+            ["/targets/android/client_without_callbacks.kt", (ast) => (0, kotlin_generator_1.generateAndroidClientSource)(ast, false)],
+            ["/targets/dotnet/api.cs", csharp_generator_1.generateCSharpServerSource],
+            ["/targets/dotnet/api.fs", fsharp_generator_1.generateFSharpServerSource],
+            ["/targets/flutter/client.dart", dart_generator_1.generateDartClientSource],
+            ["/targets/ios/client.swift", (ast) => (0, swift_generator_1.generateSwiftClientSource)(ast, false)],
+            ["/targets/ios/client-rx.swift", (ast) => (0, swift_generator_1.generateSwiftClientSource)(ast, true)],
             ["/targets/node/api.ts", typescript_generator_1.generateNodeServerSource],
             ["/targets/node/client.ts", typescript_generator_1.generateNodeClientSource],
             ["/targets/web/client.ts", typescript_generator_1.generateBrowserClientSource],
-            ["/targets/flutter/client.dart", dart_generator_1.generateDartClientSource],
         ];
         for (const [path, generateFn] of targetTable) {
             this.addHttpHandler("GET", path, (_req, res) => {
@@ -82,7 +95,7 @@ class SdkgenHttpServer {
             if (req.url) {
                 req.url = req.url.endsWith("/playground") ? req.url.replace(/\/playground/u, "/index.html") : req.url.replace(/\/playground/u, "");
             }
-            serve_handler_1.default(req, res, {
+            (0, serve_handler_1.default)(req, res, {
                 cleanUrls: false,
                 directoryListing: false,
                 etag: true,
@@ -132,7 +145,7 @@ class SdkgenHttpServer {
         });
     }
     async close() {
-        return util_1.promisify(this.httpServer.close.bind(this.httpServer))();
+        return (0, 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 +214,7 @@ class SdkgenHttpServer {
                     continue;
                 }
                 if (!this.hasSwagger) {
-                    swagger_1.setupSwagger(this);
+                    (0, swagger_1.setupSwagger)(this);
                     this.hasSwagger = true;
                 }
                 const pathFragments = ann.path.split(/\{\w+\}/u);
@@ -222,7 +235,7 @@ class SdkgenHttpServer {
                     try {
                         const args = {};
                         const files = [];
-                        const { pathname, query } = url_1.parse((_a = req.url) !== null && _a !== void 0 ? _a : "");
+                        const { pathname, query } = (0, 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 +247,7 @@ class SdkgenHttpServer {
                             const argValue = match[i + 1];
                             simpleArgs.set(argName, argValue);
                         }
-                        const parsedQuery = query ? querystring_1.parse(query) : {};
+                        const parsedQuery = query ? (0, 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,8 +263,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 = querystring_1.parse(body.toString());
-                            console.log("parsedBody", parsedBody);
+                            const parsedBody = (0, querystring_1.parse)(body.toString());
                             for (const argName of ann.queryVariables) {
                                 const argValue = (_e = parsedBody[argName]) !== null && _e !== void 0 ? _e : null;
                                 if (argValue === null) {
@@ -261,23 +273,23 @@ class SdkgenHttpServer {
                             }
                         }
                         else if (!ann.bodyVariable && ((_f = req.headers["content-type"]) === null || _f === void 0 ? void 0 : _f.match(/^multipart\/form-data/iu))) {
-                            const busboy = new busboy_1.default({ headers: req.headers });
+                            const busboy = (0, busboy_1.default)({ headers: req.headers });
                             const filePromises = [];
                             busboy.on("field", (field, value) => {
                                 if (ann.queryVariables.includes(field)) {
                                     simpleArgs.set(field, `${value}`);
                                 }
                             });
-                            busboy.on("file", (_field, file, name) => {
-                                const tempName = crypto_1.randomBytes(32).toString("hex");
-                                const writeStream = fs_1.createWriteStream(tempName);
+                            busboy.on("file", (_field, stream, info) => {
+                                const tempName = (0, crypto_1.randomBytes)(32).toString("hex");
+                                const writeStream = (0, fs_1.createWriteStream)(tempName);
                                 filePromises.push(new Promise((resolve, reject) => {
                                     writeStream.on("error", reject);
                                     writeStream.on("close", () => {
-                                        const contents = fs_1.createReadStream(tempName);
-                                        files.push({ contents, name });
+                                        const contents = (0, fs_1.createReadStream)(tempName);
+                                        files.push({ contents, name: info.filename });
                                         contents.on("open", () => {
-                                            fs_1.unlink(tempName, err => {
+                                            (0, fs_1.unlink)(tempName, err => {
                                                 if (err) {
                                                     reject(err);
                                                 }
@@ -288,7 +300,7 @@ class SdkgenHttpServer {
                                         });
                                     });
                                     writeStream.on("open", () => {
-                                        file.pipe(writeStream);
+                                        stream.pipe(writeStream);
                                     });
                                 }));
                             });
@@ -383,7 +395,7 @@ class SdkgenHttpServer {
                                 args[argName] = argValue;
                             }
                         }
-                        const ip = request_ip_1.getClientIp(req);
+                        const ip = (0, request_ip_1.getClientIp)(req);
                         if (!ip) {
                             throw new Error("Couldn't determine client IP");
                         }
@@ -391,7 +403,7 @@ class SdkgenHttpServer {
                             args,
                             deviceInfo: {
                                 fingerprint: null,
-                                id: crypto_1.randomBytes(16).toString("hex"),
+                                id: (0, crypto_1.randomBytes)(16).toString("hex"),
                                 language: null,
                                 platform: null,
                                 timezone: null,
@@ -401,7 +413,7 @@ class SdkgenHttpServer {
                             extra: {},
                             files,
                             headers: req.headers,
-                            id: crypto_1.randomBytes(16).toString("hex"),
+                            id: (0, crypto_1.randomBytes)(16).toString("hex"),
                             ip,
                             name: op.name,
                             version: 3,
@@ -474,7 +486,8 @@ class SdkgenHttpServer {
                                             .then(() => {
                                             res.write(buffer);
                                             res.end();
-                                        });
+                                        })
+                                            .catch(() => { });
                                     }
                                     else {
                                         res.setHeader("content-type", "application/json");
@@ -530,17 +543,13 @@ 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) {
-        console.log(`${new Date().toISOString()} ${message}`);
-    }
     async handleRequestWithBody(req, res, body, hrStart) {
         var _a, _b;
-        const { pathname, query } = url_1.parse((_a = req.url) !== null && _a !== void 0 ? _a : "");
+        const { pathname, query } = (0, 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,9 +574,8 @@ class SdkgenHttpServer {
                 res.end();
                 return;
             }
-            let ok;
+            let ok = true;
             try {
-                ok = await this.apiConfig.hook.onHealthCheck();
                 for (const healthCheck of this.healthChecks) {
                     if (!ok) {
                         break;
@@ -588,7 +596,7 @@ class SdkgenHttpServer {
             res.end();
             return;
         }
-        const clientIp = request_ip_1.getClientIp(req);
+        const clientIp = (0, request_ip_1.getClientIp)(req);
         if (!clientIp) {
             this.writeReply(res, null, {
                 error: new error_1.Fatal("Couldn't determine client IP"),
@@ -606,7 +614,7 @@ class SdkgenHttpServer {
     }
     async executeRequest(request, writeReply) {
         const ctx = Object.assign(Object.assign({}, this.extraContext), { request });
-        writeReply(ctx, await execute_1.executeRequest(ctx, this.apiConfig));
+        writeReply(ctx, await (0, execute_1.executeRequest)(ctx, this.apiConfig));
     }
     parseRequest(req, body, ip) {
         switch (this.identifyRequestVersion(req, body)) {
@@ -622,13 +630,13 @@ class SdkgenHttpServer {
     }
     identifyRequestVersion(_req, body) {
         const parsed = JSON.parse(body);
-        if (typeof parsed === "object" && parsed && utils_1.has(parsed, "version") && typeof parsed.version === "number") {
+        if (typeof parsed === "object" && parsed && (0, utils_1.has)(parsed, "version") && typeof parsed.version === "number") {
             return parsed.version;
         }
-        else if (typeof parsed === "object" && parsed && utils_1.has(parsed, "requestId")) {
+        else if (typeof parsed === "object" && parsed && (0, utils_1.has)(parsed, "requestId")) {
             return 2;
         }
-        else if (typeof parsed === "object" && parsed && utils_1.has(parsed, "device")) {
+        else if (typeof parsed === "object" && parsed && (0, utils_1.has)(parsed, "device")) {
             return 1;
         }
         return 3;
@@ -636,23 +644,24 @@ class SdkgenHttpServer {
     // Old Sdkgen format
     parseRequestV1(req, body, ip) {
         var _a, _b;
-        const parsed = encode_decode_1.decode({
+        const parsed = (0, encode_decode_1.decode)({
             Request: {
                 args: "json",
-                device: {
-                    fingerprint: "string?",
-                    id: "string?",
-                    language: "string?",
-                    platform: "json?",
-                    timezone: "string?",
-                    type: "string?",
-                    version: "string?",
-                },
+                device: "RequestDevice",
                 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 : crypto_1.randomBytes(20).toString("hex");
+        const deviceId = (_a = parsed.device.id) !== null && _a !== void 0 ? _a : (0, 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,21 +688,22 @@ class SdkgenHttpServer {
     // Maxima sdkgen format
     parseRequestV2(req, body, ip) {
         var _a, _b;
-        const parsed = encode_decode_1.decode({
+        const parsed = (0, encode_decode_1.decode)({
             Request: {
                 args: "json",
                 deviceFingerprint: "string?",
                 deviceId: "string",
-                info: {
-                    browserUserAgent: "string?",
-                    language: "string",
-                    type: "string",
-                },
+                info: "RequestInfo",
                 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");
@@ -717,7 +727,7 @@ class SdkgenHttpServer {
             },
             files: [],
             headers: req.headers,
-            id: `${parsed.deviceId}-${(_b = parsed.requestId) !== null && _b !== void 0 ? _b : crypto_1.randomBytes(16).toString("hex")}`,
+            id: `${parsed.deviceId}-${(_b = parsed.requestId) !== null && _b !== void 0 ? _b : (0, crypto_1.randomBytes)(16).toString("hex")}`,
             ip,
             name: parsed.name,
             version: 2,
@@ -726,7 +736,7 @@ class SdkgenHttpServer {
     // New sdkgen format
     parseRequestV3(req, body, ip) {
         var _a, _b, _c, _d;
-        const parsed = encode_decode_1.decode({
+        const parsed = (0, encode_decode_1.decode)({
             DeviceInfo: {
                 fingerprint: "string?",
                 id: "string?",
@@ -753,7 +763,7 @@ class SdkgenHttpServer {
             type: null,
             version: null,
         };
-        const deviceId = (_b = deviceInfo.id) !== null && _b !== void 0 ? _b : crypto_1.randomBytes(16).toString("hex");
+        const deviceId = (_b = deviceInfo.id) !== null && _b !== void 0 ? _b : (0, 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");
         }
@@ -771,7 +781,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 : crypto_1.randomBytes(16).toString("hex")}`,
+            id: `${deviceId}-${(_d = parsed.requestId) !== null && _d !== void 0 ? _d : (0, crypto_1.randomBytes)(16).toString("hex")}`,
             ip,
             name: parsed.name,
             version: 3,
@@ -779,11 +789,11 @@ class SdkgenHttpServer {
     }
     makeResponseError(err) {
         let type = "Fatal";
-        if (typeof err === "object" && err !== null && utils_1.has(err, "type") && typeof err.type === "string") {
+        if (typeof err === "object" && err !== null && (0, utils_1.has)(err, "type") && typeof err.type === "string") {
             ({ type } = err);
         }
         let message;
-        if (typeof err === "object" && err !== null && utils_1.has(err, "message") && typeof err.message === "string") {
+        if (typeof err === "object" && err !== null && (0, utils_1.has)(err, "message") && typeof err.message === "string") {
             ({ message } = err);
         }
         else if (err instanceof Error) {
@@ -796,14 +806,14 @@ class SdkgenHttpServer {
             message = `${err}`;
         }
         let data;
-        if (typeof err === "object" && err !== null && utils_1.has(err, "data")) {
+        if (typeof err === "object" && err !== null && (0, 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 = encode_decode_1.encode(this.apiConfig.astJson.typeTable, `error.${type}`, error.dataType.name, data);
+                    data = (0, 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}`;
@@ -838,7 +848,7 @@ class SdkgenHttpServer {
                     deviceId: ctx.request.deviceInfo.id,
                     duration,
                     error: reply.error ? this.makeResponseError(reply.error) : null,
-                    host: os_1.hostname(),
+                    host: (0, os_1.hostname)(),
                     id: ctx.request.id,
                     ok: !reply.error,
                     result: reply.error ? null : reply.result,
@@ -870,7 +880,7 @@ class SdkgenHttpServer {
                 const response = {
                     duration,
                     error: reply.error ? this.makeResponseError(reply.error) : null,
-                    host: os_1.hostname(),
+                    host: (0, os_1.hostname)(),
                     result: reply.error ? null : reply.result,
                 };
                 if (response.error) {

package/dist/src/index.d.ts

@@ -1,7 +1,7 @@
-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";
+export { BaseApiConfig } from "./api-config";
+export { Context, ContextReply, ContextRequest } from "./context";
+export { decode, encode } from "./encode-decode";
+export { Fatal, SdkgenError, SdkgenErrorWithData } from "./error";
+export { SdkgenHttpClient } from "./http-client";
+export { SdkgenHttpServer } from "./http-server";
+export { apiTestWrapper } from "./test-wrapper";