@sdkgen/node-runtime 1.5.4 → 1.6.2

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

@@ -1,4 +1,5 @@
 import type { AstJson } from "@sdkgen/parser";
+import type { PartialDeep } from "type-fest";
 import type { Context } from "./context";
 import type { SdkgenError, SdkgenErrorWithData } from "./error";
 import type { DeepReadonly } from "./utils";
@@ -11,6 +12,6 @@ export declare class SdkgenHttpClient {
     private baseUrl;
     extra: Map<string, unknown>;
     constructor(baseUrl: string, astJson: DeepReadonly<AstJson>, errClasses: ErrClasses);
-    makeRequest(ctx: Context | null, functionName: string, args: unknown): Promise<any>;
+    makeRequest(ctx: PartialDeep<Context> | null, functionName: string, args: unknown): Promise<any>;
 }
 export {};

package/dist/src/http-client.js

@@ -17,16 +17,21 @@ class SdkgenHttpClient {
         this.baseUrl = new url_1.URL(baseUrl);
     }
     async makeRequest(ctx, functionName, args) {
+        var _a, _b;
         const func = this.astJson.functionTable[functionName];
         if (!func) {
             throw new Error(`Unknown function ${functionName}`);
         }
+        const extra = {};
+        for (const [key, value] of this.extra) {
+            extra[key] = value;
+        }
         const requestBody = JSON.stringify({
             args: encode_decode_1.encode(this.astJson.typeTable, `${functionName}.args`, func.args, args),
-            deviceInfo: (ctx === null || ctx === void 0 ? void 0 : ctx.request) ? ctx.request.deviceInfo : { id: os_1.hostname(), type: "node" },
-            extra: Object.assign(Object.assign({}, this.extra), ((ctx === null || ctx === void 0 ? void 0 : ctx.request) ? ctx.request.extra : {})),
+            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 : {})),
             name: functionName,
-            requestId: (ctx === null || ctx === void 0 ? void 0 : ctx.request) ? ctx.request.id + crypto_1.randomBytes(6).toString("hex") : crypto_1.randomBytes(16).toString("hex"),
+            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"),
             version: 3,
         });
         const options = {
@@ -34,6 +39,9 @@ class SdkgenHttpClient {
             method: "POST",
             path: this.baseUrl.pathname,
             port: this.baseUrl.port,
+            headers: {
+                "content-type": "application/sdkgen",
+            },
         };
         const encodedRet = await new Promise((resolve, reject) => {
             const req = (this.baseUrl.protocol === "http:" ? http_1.request : https_1.request)(options, res => {

package/dist/src/http-server.js

@@ -73,7 +73,7 @@ class SdkgenHttpServer {
             res.write(JSON.stringify(apiConfig.astJson));
             res.end();
         });
-        this.addHttpHandler("GET", /^\/playground/u, (req, res) => {
+        this.addHttpHandler("GET", /^\/playground.*/u, (req, res) => {
             if (!this.introspection) {
                 res.statusCode = 404;
                 res.end();
@@ -214,11 +214,11 @@ class SdkgenHttpServer {
                 }
                 pathRegex += "/?$";
                 for (const header of ann.headers.keys()) {
-                    this.addHeader("Access-Control-Allow-Headers", header);
+                    this.addHeader("Access-Control-Allow-Headers", header.toLowerCase());
                 }
                 // eslint-disable-next-line @typescript-eslint/no-misused-promises
                 this.addHttpHandler(ann.method, new RegExp(pathRegex, "u"), async (req, res, body) => {
-                    var _a, _b, _c, _d, _e, _f;
+                    var _a, _b, _c, _d, _e, _f, _g;
                     try {
                         const args = {};
                         const files = [];
@@ -237,16 +237,26 @@ class SdkgenHttpServer {
                         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) {
+                                continue;
+                            }
                             simpleArgs.set(argName, Array.isArray(argValue) ? argValue.join("") : argValue);
                         }
                         for (const [headerName, argName] of ann.headers) {
-                            const argValue = (_c = req.headers[headerName]) !== null && _c !== void 0 ? _c : null;
+                            const argValue = (_c = req.headers[headerName.toLowerCase()]) !== null && _c !== void 0 ? _c : null;
+                            if (argValue === null) {
+                                continue;
+                            }
                             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);
                             for (const argName of ann.queryVariables) {
                                 const argValue = (_e = parsedBody[argName]) !== null && _e !== void 0 ? _e : null;
+                                if (argValue === null) {
+                                    continue;
+                                }
                                 simpleArgs.set(argName, Array.isArray(argValue) ? argValue.join("") : argValue);
                             }
                         }
@@ -292,7 +302,7 @@ class SdkgenHttpServer {
                         else if (ann.bodyVariable) {
                             const argName = ann.bodyVariable;
                             const arg = op.args.find(x => x.name === argName);
-                            if (req.headers["content-type"] === "application/json") {
+                            if (/application\/json/iu.test((_g = req.headers["content-type"]) !== null && _g !== void 0 ? _g : "")) {
                                 args[argName] = JSON.parse(body.toString());
                             }
                             else if (arg) {
@@ -529,17 +539,19 @@ class SdkgenHttpServer {
         console.log(`${new Date().toISOString()} ${message}`);
     }
     async handleRequestWithBody(req, res, body, hrStart) {
-        var _a;
+        var _a, _b;
         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);
         }
-        const externalHandler = this.findBestHandler(path, req);
-        if (externalHandler) {
-            this.log(`HTTP ${req.method} ${path}${query ? `?${query}` : ""}`);
-            externalHandler.handler(req, res, body);
-            return;
+        if (!((_b = req.headers["content-type"]) === null || _b === void 0 ? void 0 : _b.match(/application\/sdkgen/iu))) {
+            const externalHandler = this.findBestHandler(path, req);
+            if (externalHandler) {
+                this.log(`HTTP ${req.method} ${path}${query ? `?${query}` : ""}`);
+                externalHandler.handler(req, res, body);
+                return;
+            }
         }
         res.setHeader("Content-Type", "application/json; charset=utf-8");
         if (req.method === "HEAD") {

package/dist/src/swagger.js

@@ -108,6 +108,11 @@ function typeToSchema(definitions, type) {
             type: "string",
         };
     }
+    else if (type instanceof parser_1.BigIntPrimitiveType) {
+        return {
+            type: "string",
+        };
+    }
     else if (type instanceof parser_1.OptionalType) {
         return {
             oneOf: [typeToSchema(definitions, type.base), { type: "null" }],
@@ -191,7 +196,7 @@ function setupSwagger(server) {
         `);
         res.end();
     });
-    server.addHttpHandler("GET", /^\/swagger/u, (req, res) => {
+    server.addHttpHandler("GET", /^\/swagger.*/u, (req, res) => {
         if (!server.introspection) {
             res.statusCode = 404;
             res.end();