Merge pull request #29 from AtomiCloud/pichu

upgrade from pichu
AtomiCloud · Nov 11, 2023 · 995f405 · 995f405
2 parents 78012a8 + 0a3e39a
commit 995f405
Show file tree

Hide file tree

Showing 5 changed files with 225 additions and 19 deletions.
diff --git a/src/lib/api/core/Api.ts b/src/lib/api/core/Api.ts
@@ -22,9 +22,14 @@ import type {
   PluginPrincipalResp,
   PluginResp,
   PluginVersionPrincipalResp,
+  PluginVersionResp,
   ProcessorPrincipalResp,
   ProcessorResp,
   ProcessorVersionPrincipalResp,
+  ProcessorVersionResp,
+  PushPluginReq,
+  PushProcessorReq,
+  PushTemplateReq,
   TemplatePrincipalResp,
   TemplateResp,
   TemplateVersionPrincipalResp,
@@ -336,14 +341,39 @@ export class Api<
     },
     params: RequestParams = {},
   ) =>
-    this.request<PluginVersionPrincipalResp, any>({
+    this.request<PluginVersionResp, any>({
       path: `/api/v${version}/Plugin/slug/${username}/${pluginName}/versions/${ver}`,
       method: "GET",
       query: query,
       secure: true,
       format: "json",
       ...params,
     });
+  /**
+   * No description
+   *
+   * @tags Plugin
+   * @name VPluginSlugVersionsLatestDetail
+   * @request GET:/api/v{version}/Plugin/slug/{username}/{pluginName}/versions/latest
+   * @secure
+   */
+  vPluginSlugVersionsLatestDetail = (
+    username: string,
+    pluginName: string,
+    version: string,
+    query?: {
+      bumpDownload?: boolean;
+    },
+    params: RequestParams = {},
+  ) =>
+    this.request<PluginVersionResp, any>({
+      path: `/api/v${version}/Plugin/slug/${username}/${pluginName}/versions/latest`,
+      method: "GET",
+      query: query,
+      secure: true,
+      format: "json",
+      ...params,
+    });
   /**
    * No description
    *
@@ -361,7 +391,7 @@ export class Api<
     version: string,
     params: RequestParams = {},
   ) =>
-    this.request<PluginVersionPrincipalResp, any>({
+    this.request<PluginVersionResp, any>({
       path: `/api/v${version}/Plugin/id/${userId}/${pluginId}/versions/${ver}`,
       method: "GET",
       secure: true,
@@ -393,6 +423,29 @@ export class Api<
       format: "json",
       ...params,
     });
+  /**
+   * No description
+   *
+   * @tags Plugin
+   * @name VPluginPushCreate
+   * @request POST:/api/v{version}/Plugin/push/{username}
+   * @secure
+   */
+  vPluginPushCreate = (
+    username: string,
+    version: string,
+    data: PushPluginReq,
+    params: RequestParams = {},
+  ) =>
+    this.request<PluginVersionPrincipalResp, any>({
+      path: `/api/v${version}/Plugin/push/${username}`,
+      method: "POST",
+      body: data,
+      secure: true,
+      type: ContentType.Json,
+      format: "json",
+      ...params,
+    });
   /**
    * No description
    *
@@ -680,14 +733,39 @@ export class Api<
     },
     params: RequestParams = {},
   ) =>
-    this.request<ProcessorVersionPrincipalResp, any>({
+    this.request<ProcessorVersionResp, any>({
       path: `/api/v${version}/Processor/slug/${username}/${processorName}/versions/${ver}`,
       method: "GET",
       query: query,
       secure: true,
       format: "json",
       ...params,
     });
+  /**
+   * No description
+   *
+   * @tags Processor
+   * @name VProcessorSlugVersionsLatestDetail
+   * @request GET:/api/v{version}/Processor/slug/{username}/{processorName}/versions/latest
+   * @secure
+   */
+  vProcessorSlugVersionsLatestDetail = (
+    username: string,
+    processorName: string,
+    version: string,
+    query?: {
+      bumpDownload?: boolean;
+    },
+    params: RequestParams = {},
+  ) =>
+    this.request<ProcessorVersionResp, any>({
+      path: `/api/v${version}/Processor/slug/${username}/${processorName}/versions/latest`,
+      method: "GET",
+      query: query,
+      secure: true,
+      format: "json",
+      ...params,
+    });
   /**
    * No description
    *
@@ -705,7 +783,7 @@ export class Api<
     version: string,
     params: RequestParams = {},
   ) =>
-    this.request<ProcessorVersionPrincipalResp, any>({
+    this.request<ProcessorVersionResp, any>({
       path: `/api/v${version}/Processor/id/${userId}/${processorId}/versions/${ver}`,
       method: "GET",
       secure: true,
@@ -737,6 +815,29 @@ export class Api<
       format: "json",
       ...params,
     });
+  /**
+   * No description
+   *
+   * @tags Processor
+   * @name VProcessorPushCreate
+   * @request POST:/api/v{version}/Processor/push/{username}
+   * @secure
+   */
+  vProcessorPushCreate = (
+    username: string,
+    version: string,
+    data: PushProcessorReq,
+    params: RequestParams = {},
+  ) =>
+    this.request<ProcessorVersionPrincipalResp, any>({
+      path: `/api/v${version}/Processor/push/${username}`,
+      method: "POST",
+      body: data,
+      secure: true,
+      type: ContentType.Json,
+      format: "json",
+      ...params,
+    });
   /**
    * No description
    *
@@ -1032,6 +1133,31 @@ export class Api<
       format: "json",
       ...params,
     });
+  /**
+   * No description
+   *
+   * @tags Template
+   * @name VTemplateSlugVersionsLatestDetail
+   * @request GET:/api/v{version}/Template/slug/{username}/{templateName}/versions/latest
+   * @secure
+   */
+  vTemplateSlugVersionsLatestDetail = (
+    username: string,
+    templateName: string,
+    version: string,
+    query?: {
+      bumpDownload?: boolean;
+    },
+    params: RequestParams = {},
+  ) =>
+    this.request<TemplateVersionResp, any>({
+      path: `/api/v${version}/Template/slug/${username}/${templateName}/versions/latest`,
+      method: "GET",
+      query: query,
+      secure: true,
+      format: "json",
+      ...params,
+    });
   /**
    * No description
    *
@@ -1081,6 +1207,29 @@ export class Api<
       format: "json",
       ...params,
     });
+  /**
+   * No description
+   *
+   * @tags Template
+   * @name VTemplatePushCreate
+   * @request POST:/api/v{version}/Template/push/{username}
+   * @secure
+   */
+  vTemplatePushCreate = (
+    username: string,
+    version: string,
+    data: PushTemplateReq,
+    params: RequestParams = {},
+  ) =>
+    this.request<TemplateVersionPrincipalResp, any>({
+      path: `/api/v${version}/Template/push/${username}`,
+      method: "POST",
+      body: data,
+      secure: true,
+      type: ContentType.Json,
+      format: "json",
+      ...params,
+    });
   /**
    * No description
    *

diff --git a/src/lib/api/core/data-contracts.ts b/src/lib/api/core/data-contracts.ts
@@ -22,7 +22,7 @@ export interface CreatePluginReq {
 export interface CreatePluginVersionReq {
   description?: string | null;
   dockerReference?: string | null;
-  dockerSha?: string | null;
+  dockerTag?: string | null;
 }
 
 export interface CreateProcessorReq {
@@ -38,7 +38,7 @@ export interface CreateProcessorReq {
 export interface CreateProcessorVersionReq {
   description?: string | null;
   dockerReference?: string | null;
-  dockerSha?: string | null;
+  dockerTag?: string | null;
 }
 
 export interface CreateTemplateReq {
@@ -54,9 +54,9 @@ export interface CreateTemplateReq {
 export interface CreateTemplateVersionReq {
   description?: string | null;
   blobDockerReference?: string | null;
-  blobDockerSha?: string | null;
+  blobDockerTag?: string | null;
   templateDockerReference?: string | null;
-  templateDockerSha?: string | null;
+  templateDockerTag?: string | null;
   plugins?: PluginReferenceReq[] | null;
   processors?: ProcessorReferenceReq[] | null;
 }
@@ -122,6 +122,12 @@ export interface PluginVersionPrincipalResp {
   description?: string | null;
   dockerReference?: string | null;
   dockerSha?: string | null;
+  dockerTag?: string | null;
+}
+
+export interface PluginVersionResp {
+  principal?: PluginVersionPrincipalResp;
+  plugin?: PluginPrincipalResp;
 }
 
 export interface ProcessorInfoResp {
@@ -170,6 +176,55 @@ export interface ProcessorVersionPrincipalResp {
   description?: string | null;
   dockerReference?: string | null;
   dockerSha?: string | null;
+  dockerTag?: string | null;
+}
+
+export interface ProcessorVersionResp {
+  principal?: ProcessorVersionPrincipalResp;
+  processor?: ProcessorPrincipalResp;
+}
+
+export interface PushPluginReq {
+  name?: string | null;
+  project?: string | null;
+  source?: string | null;
+  email?: string | null;
+  tags?: string[] | null;
+  description?: string | null;
+  readme?: string | null;
+  versionDescription?: string | null;
+  dockerReference?: string | null;
+  dockerTag?: string | null;
+}
+
+export interface PushProcessorReq {
+  name?: string | null;
+  project?: string | null;
+  source?: string | null;
+  email?: string | null;
+  tags?: string[] | null;
+  description?: string | null;
+  readme?: string | null;
+  versionDescription?: string | null;
+  dockerReference?: string | null;
+  dockerTag?: string | null;
+}
+
+export interface PushTemplateReq {
+  name?: string | null;
+  project?: string | null;
+  source?: string | null;
+  email?: string | null;
+  tags?: string[] | null;
+  description?: string | null;
+  readme?: string | null;
+  versionDescription?: string | null;
+  blobDockerReference?: string | null;
+  blobDockerTag?: string | null;
+  templateDockerReference?: string | null;
+  templateDockerTag?: string | null;
+  plugins?: PluginReferenceReq[] | null;
+  processors?: ProcessorReferenceReq[] | null;
 }
 
 export interface TemplateInfoResp {
@@ -211,6 +266,8 @@ export interface TemplateVersionPrincipalResp {
   blobDockerSha?: string | null;
   templateDockerReference?: string | null;
   templateDockerSha?: string | null;
+  blobDockerTag?: string | null;
+  templateDockerTag?: string | null;
 }
 
 export interface TemplateVersionResp {

diff --git a/src/lib/api/core/http-client.ts b/src/lib/api/core/http-client.ts
@@ -9,8 +9,6 @@
  * ---------------------------------------------------------------
  */
 
-import { browser } from "$app/environment";
-
 export type QueryParamsType = Record<string | number, any>;
 export type ResponseFormat = keyof Omit<Body, "body" | "bodyUsed">;
 
@@ -70,14 +68,12 @@ export class HttpClient<SecurityDataType = unknown> {
   private customFetch = (...fetchParams: Parameters<typeof fetch>) =>
     fetch(...fetchParams);
 
-  private baseApiParams: RequestParams = browser
-    ? {
-        credentials: "same-origin",
-        headers: {},
-        redirect: "follow",
-        referrerPolicy: "no-referrer",
-      }
-    : { headers: {} };
+  private baseApiParams: RequestParams = {
+    credentials: "same-origin",
+    headers: {},
+    redirect: "follow",
+    referrerPolicy: "no-referrer",
+  };
 
   constructor(apiConfig: ApiConfig<SecurityDataType> = {}) {
     Object.assign(this, apiConfig);
@@ -208,6 +204,7 @@ export class HttpClient<SecurityDataType = unknown> {
     const queryString = query && this.toQueryString(query);
     const payloadFormatter = this.contentFormatters[type || ContentType.Json];
     const responseFormat = format || requestParams.format;
+
     return this.customFetch(
       `${baseUrl || this.baseUrl || ""}${path}${
         queryString ? `?${queryString}` : ""
@@ -233,6 +230,7 @@ export class HttpClient<SecurityDataType = unknown> {
       const r = response as HttpResponse<T, E>;
       r.data = null as unknown as T;
       r.error = null as unknown as E;
+
       const data = !responseFormat
         ? r
         : await response[responseFormat]()