curl & websocket

includes/curl.d.ts

@@ -7,6 +7,8 @@ declare module "curl" {
 
     export function curl_easy_init(): CurlHandle;
 
+    export type HttpHeaders = Record<string, string | Array<string>>;
+
     interface CurlOptToType {
         CURLOPT_URL: string;
         CURLOPT_DOH_URL: string;
@@ -38,6 +40,8 @@ declare module "curl" {
         CURLOPT_SEEKFUNCTION: SeekCallback;
         CURLOPT_XFERINFOFUNCTION: ProgressCallback;
         CURLOPT_HEADERFUNCTION: HeaderCallback;
+
+        CURLOPT_HTTPHEADER: HttpHeaders;
     }
 
     export type ReaadCallback = (this: CurlHandle, buffer: ArrayBuffer) => number;
@@ -68,11 +72,7 @@ declare module "curl" {
 
     export function curl_easy_pause(curl: CurlHandle, bitmask: number): void;
 
-    export function curl_easy_headers(
-        curl: CurlHandle,
-        origin: number,
-        request: number,
-    ): Record<string, string | Array<string>>;
+    export function curl_easy_headers(curl: CurlHandle, origin: number, request: number): HttpHeaders;
 
     export function curl_easy_cleanup(curl: CurlHandle): void;
 
@@ -113,18 +113,23 @@ declare module "curl" {
 
     export function curl_ws_recv(curl: CurlHandle, buffer: ArrayBuffer | Uint8Array): CurlRecvResult;
 
+    interface CurlSendResult {
+        result: CurlEConstants[keyof CurlEConstants];
+        sent: number;
+    }
+
     export function curl_ws_send(
         curl: CurlHandle,
         buffer: ArrayBuffer | Uint8Array,
         fragsize: number,
         flags: number,
-    ): void;
+    ): CurlSendResult;
 
     export function update(): void;
 
     export const constants: CurlEConstants & CurlConstants & CurlInfoConstants & CurlOptConstants;
 
-    type CurlEConstants = {
+    export type CurlEConstants = {
         readonly CURLE_OK: 0;
         readonly CURLE_UNSUPPORTED_PROTOCOL: 1;
         readonly CURLE_FAILED_INIT: 2;
@@ -227,7 +232,7 @@ declare module "curl" {
         readonly CURLE_UNRECOVERABLE_POLL: 99;
     };
 
-    type CurlConstants = {
+    export type CurlConstants = {
         readonly CURL_WRITEFUNC_ERROR: number;
         readonly CURL_WRITEFUNC_PAUSE: number;
         readonly CURL_MAX_WRITE_SIZE: number;
@@ -242,6 +247,7 @@ declare module "curl" {
         readonly CURLWS_CONT: number;
         readonly CURLWS_CLOSE: number;
         readonly CURLWS_PING: number;
+        readonly CURLWS_OFFSET: number;
         readonly CURLPAUSE_RECV: number;
         readonly CURLPAUSE_SEND: number;
         readonly CURLPAUSE_ALL: number;
@@ -253,7 +259,7 @@ declare module "curl" {
         readonly CURLH_PSEUDO: number;
     };
 
-    type CurlInfoConstants = {
+    export type CurlInfoConstants = {
         readonly CURLINFO_NONE: unique symbol;
         readonly CURLINFO_EFFECTIVE_URL: unique symbol;
         readonly CURLINFO_RESPONSE_CODE: unique symbol;
@@ -329,7 +335,7 @@ declare module "curl" {
         readonly CURLINFO_LASTONE: unique symbol;
     };
 
-    type CurlOptConstants = {
+    export type CurlOptConstants = {
         readonly CURLOPT_WRITEDATA: unique symbol;
         readonly CURLOPT_URL: unique symbol;
         readonly CURLOPT_PORT: unique symbol;

package.json

@@ -5,12 +5,12 @@
     "main": "index.js",
     "types": "index.d.ts",
     "scripts": {
-        "bundle-polyfill": "esbuild ./src/polyfill.ts --bundle --outfile=build/esbuild/polyfill.js --format=esm  --external:unsafe --target=es2020 --alias:@war3js/unsafe=unsafe",
-        "bundle-bootstrap": "esbuild ./src/index.ts --bundle --outfile=build/esbuild/bootstrap.js --format=esm  --external:unsafe --target=es2020 --alias:@war3js/unsafe=unsafe",
+        "bundle-polyfill": "esbuild ./src/polyfill.ts --bundle --outfile=build/esbuild/polyfill.js --format=esm --external:curl  --external:unsafe --target=es2020 --alias:@war3js/unsafe=unsafe",
+        "bundle-bootstrap": "esbuild ./src/index.ts --bundle --outfile=build/esbuild/bootstrap.js --format=esm --external:curl --external:unsafe --target=es2020 --alias:@war3js/unsafe=unsafe",
         "bundle": "npm run bundle-polyfill && npm run bundle-bootstrap",
         "start": "ts-node-esm ./src/test.ts",
         "lint": "eslint ./src/ --ext .ts --rulesdir ./eslint/rules/",
-        "typesgen": "tsc && dts-bundle-generator build/tsc/types/index.d.ts -o build/dts-bundle/out.d.ts --export-referenced-types=false --external-inlines=readable-stream --external-inlines=@war3js/events --external-imports=@war3js/unsafe --inline-declare-global=true && ts-node-esm ./src/typesAppener.ts && node ./utils/tsconfigPrepare.js && tsc -p ./build/fullTypes/tsconfig.json && node ./utils/tsconfigRemove.js",
+        "typesgen": "tsc && dts-bundle-generator build/tsc/types/index.d.ts -o build/dts-bundle/out.d.ts --export-referenced-types=false --external-inlines=readable-stream --external-inlines=@war3js/events --external-inlines=@war3js/headers-polyfill --external-imports=@war3js/unsafe --inline-declare-global=true && ts-node-esm ./src/typesAppener.ts && node ./utils/tsconfigPrepare.js && tsc -p ./build/fullTypes/tsconfig.json && node ./utils/tsconfigRemove.js",
         "docgen": "node ./utils/tsconfigPrepare.js && typedoc && node ./utils/tsconfigRemove.js",
         "clean": "node ./utils/clean.js",
         "build": "npm run bundle && npm run typesgen && npm run docgen"
@@ -28,6 +28,7 @@
         "dts-bundle-generator": "^8.1.1",
         "esbuild": "^0.19.4",
         "eslint": "^8.53.0",
+        "@war3js/headers-polyfill": "^4.0.3",
         "jass-to-ast": "^2.0.2",
         "prettier": "3.0.3",
         "readable-stream": "^4.5.1",

src/index.ts

@@ -54,6 +54,7 @@ builder.addMethods(Destructable, "destructable");
 builder.addMethods(Item, "item");
 
 export { TextDecoder, TextEncoder } from "text-decoding";
+export { Headers } from "@war3js/headers-polyfill";
 
 export * from "./handles/Widget.js";
 export * from "./handles/Unit.js";
@@ -74,6 +75,8 @@ export {
 
 export { UnitState, LimitOp } from "./services/emitters/UnitStateEmiter.js";
 
+export { Websocket } from "./services/websocket/Websocket.js";
+
 // -- ONLY FOR dts-bundle
 
 declare global {

src/services/fetch/FetchRequest.ts

@@ -0,0 +1,7 @@
+export interface FetchRequest {
+    method?: string;
+    headers?: Record<string, Array<string> | string>;
+    credentials?: "omit" | "include";
+    redirect?: "flow" | "error";
+    signal?: AbortSignal;
+}

src/services/fetch/fetch.ts

@@ -0,0 +1,6 @@
+import { consoleLog } from "@war3js/unsafe";
+import { FetchRequest } from "./FetchRequest.js";
+
+export const fetch = (url: string, options?: FetchRequest) => {
+    consoleLog(0, url, options);
+};