kubernetesjs 0.5.0 → 0.5.1

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 Dan Lynch <pyramation@gmail.com>
+Copyright (c) 2024 Dan Lynch <pyramation@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -1,11 +1,11 @@
 # KubernetesJS
 
 <p align="center" width="100%">
-  <img src="https://github.com/cosmology-tech/interweb-utils/assets/545047/89c743c4-be88-409f-9a77-4b02cd7fe9a4" width="80">
+  <img src="https://github.com/hyperweb-io/interweb-utils/assets/545047/89c743c4-be88-409f-9a77-4b02cd7fe9a4" width="80">
   <br/>
   TypeScript Client for Kubernetes
   <br />
-   <a href="https://github.com/cosmology-tech/kubernetesjs/blob/main/LICENSE">
+   <a href="https://github.com/hyperweb-io/kubernetesjs/blob/main/LICENSE">
     <img height="20" src="https://img.shields.io/badge/license-MIT-blue.svg"/>
   </a>
 </p>
@@ -40,58 +40,49 @@ const client = new KubernetesClient({
   restEndpoint: 'http://127.0.0.1:8001'
 });
 
-client.listCoreV1NamespacedPod({
-  path: {
-    namespace: 'default'
-  },
-  query: {
-    // Add any necessary query parameters here
-  }
-}).then(result => {
-  if (result.items && result.items.length) {
-    result.items.forEach(item => {
-      console.log('NODE:', item.spec.nodeName);
-
-      const initContainers = item.status.initContainerStatuses?.map(ic => ({
-        image: ic.image,
-        name: ic.name,
-        ready: ic.ready,
-        state: ic.state
-      }));
-
-      const containers = item.status.containerStatuses?.map(c => ({
-        image: c.image,
-        name: c.name,
-        ready: c.ready,
-        state: c.state
-      }));
-
-      console.log({ containers });
-      console.log({ initContainers });
-    });
-  }
-}).catch(reason => {
-  console.error('Failed to fetch pods:', reason);
+const result = await client.listCoreV1NamespacedPod({
+  path: { namespace: 'default' }
 });
-```
 
+if (result.items && result.items.length) {
+  result.items.forEach(item => {
+    console.log('NODE:', item.spec.nodeName);
+
+    const initContainers = item.status.initContainerStatuses?.map(ic => ({
+      image: ic.image,
+      name: ic.name,
+      ready: ic.ready,
+      state: ic.state
+    }));
+
+    const containers = item.status.containerStatuses?.map(c => ({
+      image: c.image,
+      name: c.name,
+      ready: c.ready,
+      state: c.state
+    }));
+
+    console.log({ containers });
+    console.log({ initContainers });
+  });
+}
+```
 
 ## Related
 
 Checkout these related projects:
 
-* [`schema-typescript`](https://github.com/cosmology-tech/schema-typescript/tree/main/packages/schema-typescript)  
+* [`schema-typescript`](https://github.com/hyperweb-io/schema-typescript/tree/main/packages/schema-typescript)  
   Provides robust tools for handling JSON schemas and converting them to TypeScript interfaces with ease and efficiency.
-* [`@schema-typescript/cli`](https://github.com/cosmology-tech/schema-typescript/tree/main/packages/cli)  
+* [`@schema-typescript/cli`](https://github.com/hyperweb-io/schema-typescript/tree/main/packages/cli)  
   CLI is the command line utility for `schema-typescript`.
-* [`schema-sdk`](https://github.com/cosmology-tech/schema-typescript/tree/main/packages/schema-sdk)  
+* [`schema-sdk`](https://github.com/hyperweb-io/schema-typescript/tree/main/packages/schema-sdk)  
   Provides robust tools for handling OpenAPI schemas and converting them to TypeScript clients with ease and efficiency.
-* [`starship`](https://github.com/cosmology-tech/starship) Unified Testing and Development for the Interchain.
+* [`starship`](https://github.com/hyperweb-io/starship) Unified Testing and Development for the Interchain.
 
 ## Credits
 
-🛠 Built by Cosmology — if you like our tools, please consider delegating to [our validator ⚛️](https://cosmology.zone/validator)
-
+🛠 Built by Hyperweb — if you like our tools, please checkout and contribute to [our github ⚛️](https://github.com/hyperweb-io)
 
 ## Disclaimer
 

package/{main/client.js → client.js}

@@ -16,7 +16,7 @@ class APIClient {
         return url.toString();
     }
     async request(options) {
-        const { path, headers, method, params, timeout } = options;
+        const { path, headers, method, params, body, timeout } = options;
         const url = this.buildFullPath(path, method === 'GET' ? params : undefined);
         const controller = new AbortController();
         const id = setTimeout(() => controller.abort(), timeout || this.defaultTimeout);
@@ -24,13 +24,14 @@ class APIClient {
             method,
             headers,
             signal: controller.signal,
-            body: method !== 'GET' && method !== 'DELETE' ? JSON.stringify(params) : null,
+            body: method !== 'GET' && method !== 'DELETE' ? JSON.stringify(body) : null,
         };
         try {
             const response = await fetch(url, fetchOptions);
             clearTimeout(id);
             if (!response.ok) {
-                throw new Error(`HTTP error! status: ${response.status}`);
+                const errorBody = await response.text();
+                throw new Error(`HTTP error! status: ${response.status}\nResponse body: ${errorBody}`);
             }
             return response.json();
         }
@@ -50,25 +51,17 @@ class APIClient {
         });
     }
     post(endpoint, query, body, opts = {}) {
-        const headers = opts.isFormData
-            ? {
-                'Content-Type': 'application/x-www-form-urlencoded',
-                ...opts.headers,
-            }
-            : {
-                'Content-Type': 'application/json',
-                ...opts.headers,
-            };
-        const bodyContent = opts.isFormData
-            ? new url_1.URLSearchParams(body).toString()
-            : JSON.stringify(body);
+        const headers = {
+            'Content-Type': 'application/json',
+            ...(opts.headers || {})
+        };
         return this.request({
             path: endpoint,
             method: 'POST',
-            // @ts-ignore
             headers,
             timeout: opts.timeout || this.defaultTimeout,
-            params: bodyContent,
+            params: query,
+            body: body
         });
     }
     patch(endpoint, query, body, opts = {}) {

package/{module → esm}/client.js

@@ -13,7 +13,7 @@ export class APIClient {
         return url.toString();
     }
     async request(options) {
-        const { path, headers, method, params, timeout } = options;
+        const { path, headers, method, params, body, timeout } = options;
         const url = this.buildFullPath(path, method === 'GET' ? params : undefined);
         const controller = new AbortController();
         const id = setTimeout(() => controller.abort(), timeout || this.defaultTimeout);
@@ -21,13 +21,14 @@ export class APIClient {
             method,
             headers,
             signal: controller.signal,
-            body: method !== 'GET' && method !== 'DELETE' ? JSON.stringify(params) : null,
+            body: method !== 'GET' && method !== 'DELETE' ? JSON.stringify(body) : null,
         };
         try {
             const response = await fetch(url, fetchOptions);
             clearTimeout(id);
             if (!response.ok) {
-                throw new Error(`HTTP error! status: ${response.status}`);
+                const errorBody = await response.text();
+                throw new Error(`HTTP error! status: ${response.status}\nResponse body: ${errorBody}`);
             }
             return response.json();
         }
@@ -47,25 +48,17 @@ export class APIClient {
         });
     }
     post(endpoint, query, body, opts = {}) {
-        const headers = opts.isFormData
-            ? {
-                'Content-Type': 'application/x-www-form-urlencoded',
-                ...opts.headers,
-            }
-            : {
-                'Content-Type': 'application/json',
-                ...opts.headers,
-            };
-        const bodyContent = opts.isFormData
-            ? new URLSearchParams(body).toString()
-            : JSON.stringify(body);
+        const headers = {
+            'Content-Type': 'application/json',
+            ...(opts.headers || {})
+        };
         return this.request({
             path: endpoint,
             method: 'POST',
-            // @ts-ignore
             headers,
             timeout: opts.timeout || this.defaultTimeout,
-            params: bodyContent,
+            params: query,
+            body: body
         });
     }
     patch(endpoint, query, body, opts = {}) {

package/package.json

@@ -1,55 +1,46 @@
 {
   "name": "kubernetesjs",
-  "version": "0.5.0",
-  "description": "Fully Typed Kubernetes",
+  "version": "0.5.1",
   "author": "Dan Lynch <pyramation@gmail.com>",
-  "homepage": "https://github.com/cosmology-tech/kubernetesjs#readme",
+  "description": "Fully Typed Kubernetes",
+  "main": "index.js",
+  "module": "esm/index.js",
+  "types": "index.d.ts",
+  "homepage": "https://github.com/hyperweb-io/kubernetesjs",
   "license": "SEE LICENSE IN LICENSE",
-  "main": "main/index.js",
-  "module": "module/index.js",
-  "typings": "types/index.d.ts",
-  "directories": {
-    "lib": "src",
-    "test": "__tests__"
-  },
-  "files": [
-    "types",
-    "module",
-    "src",
-    "main"
-  ],
-  "scripts": {
-    "build:main": "yarn tsc -p tsconfig.json --outDir main --module commonjs",
-    "build:module": "yarn tsc -p tsconfig.json --outDir module --module es2022",
-    "build": "npm run build:module && npm run build:main",
-    "clean": "rimraf ./types && rimraf ./main && rimraf ./module",
-    "prepare": "npm run clean && npm run build",
-    "dev": "ts-node ./test/test.ts",
-    "codegen": "ts-node ./scripts/codegen.ts",
-    "lint": "eslint .",
-    "format": "eslint . --fix"
-  },
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "directory": "dist"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/cosmology-tech/kubernetesjs"
+    "url": "https://github.com/hyperweb-io/kubernetesjs"
   },
-  "keywords": [],
   "bugs": {
-    "url": "https://github.com/cosmology-tech/kubernetesjs/issues"
+    "url": "https://github.com/hyperweb-io/kubernetesjs/issues"
   },
+  "scripts": {
+    "copy": "copyfiles -f ../../LICENSE README.md package.json dist",
+    "clean": "rimraf dist/**",
+    "prepare": "npm run build",
+    "build": "npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy",
+    "build:dev": "npm run clean; tsc --declarationMap; tsc -p tsconfig.esm.json; npm run copy",
+    "lint": "eslint . --fix",
+    "dev": "ts-node ./test/test.ts",
+    "deploy": "ts-node ./test/deployment.ts",
+    "codegen": "ts-node ./scripts/codegen.ts",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:teardown": "ts-node scripts/teardown.ts",
+    "test:list": "ts-node scripts/list.ts",
+    "test:deploy": "ts-node scripts/deploy.ts"
+  },
+  "keywords": [
+    "kubernetes",
+    "k8s"
+  ],
   "devDependencies": {
-    "@types/node": "^20.12.12",
-    "eslint": "8.38.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "esprima": "4.0.1",
-    "prettier": "^2.8.7",
-    "rimraf": "5.0.0",
-    "schema-sdk": "^0.7.0",
-    "ts-node": "10.9.2",
-    "typescript": "^5.0.4"
-  }
+    "schema-sdk": "^0.7.0"
+  },
+  "gitHead": "559b940ad9838ef22e59b983def6e3db4659a359"
 }

package/src/client.ts

@@ -1,259 +0,0 @@
-import { URLSearchParams } from 'url';
-
-interface RequestOptions<Params> {
-  hostname: string;
-  path: string;
-  headers?: { [key: string]: string };
-  method?: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
-  params?: Params;
-  timeout?: number;
-}
-
-export interface APIClientOptions {
-  restEndpoint: string;
-}
-
-export interface APIClientRequestHeaders {
-  accept?: string | string[] | undefined;
-  'accept-charset'?: string | string[] | undefined;
-  'accept-encoding'?: string | string[] | undefined;
-  'accept-language'?: string | string[] | undefined;
-  'accept-ranges'?: string | undefined;
-  'access-control-allow-credentials'?: string | undefined;
-  'access-control-allow-headers'?: string | undefined;
-  'access-control-allow-methods'?: string | undefined;
-  'access-control-allow-origin'?: string | undefined;
-  'access-control-expose-headers'?: string | undefined;
-  'access-control-max-age'?: string | undefined;
-  'access-control-request-headers'?: string | undefined;
-  'access-control-request-method'?: string | undefined;
-  age?: string | undefined;
-  allow?: string | undefined;
-  authorization?: string | undefined;
-  'cache-control'?: string | undefined;
-  'cdn-cache-control'?: string | undefined;
-  connection?: string | string[] | undefined;
-  'content-disposition'?: string | undefined;
-  'content-encoding'?: string | undefined;
-  'content-language'?: string | undefined;
-  'content-length'?: string | number | undefined;
-  'content-location'?: string | undefined;
-  'content-range'?: string | undefined;
-  'content-security-policy'?: string | undefined;
-  'content-security-policy-report-only'?: string | undefined;
-  cookie?: string | string[] | undefined;
-  dav?: string | string[] | undefined;
-  dnt?: string | undefined;
-  date?: string | undefined;
-  etag?: string | undefined;
-  expect?: string | undefined;
-  expires?: string | undefined;
-  forwarded?: string | undefined;
-  from?: string | undefined;
-  host?: string | undefined;
-  'if-match'?: string | undefined;
-  'if-modified-since'?: string | undefined;
-  'if-none-match'?: string | undefined;
-  'if-range'?: string | undefined;
-  'if-unmodified-since'?: string | undefined;
-  'last-modified'?: string | undefined;
-  link?: string | string[] | undefined;
-  location?: string | undefined;
-  'max-forwards'?: string | undefined;
-  origin?: string | undefined;
-  prgama?: string | string[] | undefined;
-  'proxy-authenticate'?: string | string[] | undefined;
-  'proxy-authorization'?: string | undefined;
-  'public-key-pins'?: string | undefined;
-  'public-key-pins-report-only'?: string | undefined;
-  range?: string | undefined;
-  referer?: string | undefined;
-  'referrer-policy'?: string | undefined;
-  refresh?: string | undefined;
-  'retry-after'?: string | undefined;
-  'sec-websocket-accept'?: string | undefined;
-  'sec-websocket-extensions'?: string | string[] | undefined;
-  'sec-websocket-key'?: string | undefined;
-  'sec-websocket-protocol'?: string | string[] | undefined;
-  'sec-websocket-version'?: string | undefined;
-  server?: string | undefined;
-  'set-cookie'?: string | string[] | undefined;
-  'strict-transport-security'?: string | undefined;
-  te?: string | undefined;
-  trailer?: string | undefined;
-  'transfer-encoding'?: string | undefined;
-  'user-agent'?: string | undefined;
-  upgrade?: string | undefined;
-  'upgrade-insecure-requests'?: string | undefined;
-  vary?: string | undefined;
-  via?: string | string[] | undefined;
-  warning?: string | undefined;
-  'www-authenticate'?: string | string[] | undefined;
-  'x-content-type-options'?: string | undefined;
-  'x-dns-prefetch-control'?: string | undefined;
-  'x-frame-options'?: string | undefined;
-  'x-xss-protection'?: string | undefined;
-}
-export type APIClientRequestOpts = {
-  headers?: APIClientRequestHeaders;
-  timeout?: number;
-  isFormData?: boolean;
-};
-
-export class APIClient {
-  private baseUrl: string;
-  private defaultTimeout: number = 10000; // 10 seconds
-
-  constructor(options: APIClientOptions) {
-    this.baseUrl = options.restEndpoint;
-  }
-
-  private buildFullPath(endpoint: string, query?: { [key: string]: any }): string {
-    const url = new URL(endpoint, this.baseUrl);
-    if (query) {
-      Object.keys(query).forEach(key => url.searchParams.append(key, query[key]));
-    }
-    return url.toString();
-  }
-
-  private async request<Resp>(options: RequestOptions<any>): Promise<Resp> {
-    const { path, headers, method, params, timeout } = options;
-    const url = this.buildFullPath(path, method === 'GET' ? params : undefined);
-
-    const controller = new AbortController();
-    const id = setTimeout(() => controller.abort(), timeout || this.defaultTimeout);
-
-    const fetchOptions: RequestInit = {
-      method,
-      headers,
-      signal: controller.signal,
-      body: method !== 'GET' && method !== 'DELETE' ? JSON.stringify(params) : null,
-    };
-
-    try {
-      const response = await fetch(url, fetchOptions);
-      clearTimeout(id);
-
-      if (!response.ok) {
-        throw new Error(`HTTP error! status: ${response.status}`);
-      }
-
-      return response.json() as Promise<Resp>;
-    } catch (error) {
-      clearTimeout(id);
-      throw error;
-    }
-  }
-
-  get<Resp = unknown>(
-    endpoint: string,
-    query?: { [key: string]: any },
-    body?: void,
-    opts: APIClientRequestOpts = {}
-  ): Promise<Resp> {
-    return this.request<Resp>({
-      path: endpoint,
-      method: 'GET',
-      // @ts-ignore
-      headers: opts.headers,
-      timeout: opts.timeout || this.defaultTimeout,
-      params: query,
-    });
-  }
-
-  post<Resp = unknown, Params = any>(
-    endpoint: string,
-    query?: { [key: string]: any },
-    body?: Params,
-    opts: APIClientRequestOpts = {}
-  ): Promise<Resp> {
-    const headers = opts.isFormData
-      ? {
-        'Content-Type': 'application/x-www-form-urlencoded',
-        ...opts.headers,
-      }
-      : {
-        'Content-Type': 'application/json',
-        ...opts.headers,
-      };
-    const bodyContent = opts.isFormData
-      ? new URLSearchParams(body as any).toString()
-      : JSON.stringify(body);
-
-    return this.request<Resp>({
-      path: endpoint,
-      method: 'POST',
-      // @ts-ignore
-      headers,
-      timeout: opts.timeout || this.defaultTimeout,
-      params: bodyContent,
-    });
-  }
-
-  patch<Resp = unknown, Params = any>(
-    endpoint: string,
-    query?: { [key: string]: any },
-    body?: Params,
-    opts: APIClientRequestOpts = {}
-  ): Promise<Resp> {
-    const headers = opts.isFormData
-      ? {
-        'Content-Type': 'application/x-www-form-urlencoded',
-        ...opts.headers,
-      }
-      : {
-        'Content-Type': 'application/json',
-        ...opts.headers,
-      };
-    const bodyContent = opts.isFormData
-      ? new URLSearchParams(body as any).toString()
-      : JSON.stringify(body);
-
-    return this.request<Resp>({
-      path: endpoint,
-      method: 'PATCH',
-      // @ts-ignore
-      headers,
-      timeout: opts.timeout || this.defaultTimeout,
-      params: bodyContent,
-    });
-  }
-
-  put<Resp = unknown, Params = any>(
-    endpoint: string,
-    query?: { [key: string]: any },
-    body?: Params,
-    opts: APIClientRequestOpts = {}
-  ): Promise<Resp> {
-    const headers = {
-      'Content-Type': 'application/json',
-      ...opts.headers,
-    };
-    const bodyContent = JSON.stringify(body);
-
-    return this.request<Resp>({
-      path: endpoint,
-      method: 'PUT',
-      // @ts-ignore
-      headers,
-      timeout: opts.timeout || this.defaultTimeout,
-      params: bodyContent,
-    });
-  }
-
-  delete<Resp = unknown>(
-    endpoint: string,
-    query?: { [key: string]: any },
-    body?: void,
-    opts: APIClientRequestOpts = {}
-  ): Promise<Resp> {
-    return this.request<Resp>({
-      path: endpoint,
-      method: 'DELETE',
-      // @ts-ignore
-      headers: opts.headers,
-      timeout: opts.timeout || this.defaultTimeout,
-      params: query,
-    });
-  }
-}