Move githubREST constants and update cache generation

Signed-off-by: paulober <[email protected]>

Author: paulober

scripts/genCache.py

@@ -10,7 +10,7 @@
 os.chdir(f"{dir_path}/..")
 
 # Extract js for variables
-with open("dist/extension.cjs", "r") as f:
+with open("dist/utils/sharedConstants.mjs", "r") as f:
     keep = False
     txt = ""
     for line in f.readlines():

src/utils/download.mts

@@ -26,15 +26,9 @@ import {
   GithubRepository,
   getGithubReleaseByTag,
   getAuthorizationHeaders,
-  EXT_USER_AGENT,
-  GITHUB_API_BASE_URL,
   ownerOfRepository,
   repoNameOfRepository,
-  GITHUB_API_VERSION,
-  HTTP_STATUS_UNAUTHORIZED,
   githubApiUnauthorized,
-  HTTP_STATUS_FORBIDDEN,
-  HTTP_STATUS_OK,
 } from "./githubREST.mjs";
 import { unxzFile, unzipFile } from "./downloadHelpers.mjs";
 import type { Writable } from "stream";
@@ -43,6 +37,12 @@ import { got, type Progress } from "got";
 import { pipeline as streamPipeline } from "node:stream/promises";
 import {
   CURRENT_PYTHON_VERSION,
+  EXT_USER_AGENT,
+  GITHUB_API_BASE_URL,
+  GITHUB_API_VERSION,
+  HTTP_STATUS_FORBIDDEN,
+  HTTP_STATUS_OK,
+  HTTP_STATUS_UNAUTHORIZED,
   WINDOWS_ARM64_PYTHON_DOWNLOAD_URL,
   WINDOWS_X86_PYTHON_DOWNLOAD_URL,
 } from "./sharedConstants.mjs";

src/utils/downloadGit.mts

@@ -7,9 +7,11 @@ import { get } from "https";
 import { exec } from "child_process";
 import { HOME_VAR } from "../settings.mjs";
 import { unxzFile, unzipFile } from "./downloadHelpers.mjs";
-import { EXT_USER_AGENT } from "./githubREST.mjs";
 import { unknownErrorToString } from "./errorHelper.mjs";
-import { WINDOWS_X86_GIT_DOWNLOAD_URL } from "./sharedConstants.mjs";
+import {
+  EXT_USER_AGENT,
+  WINDOWS_X86_GIT_DOWNLOAD_URL,
+} from "./sharedConstants.mjs";
 
 /**
  * Downloads and installs a portable version of Git.

src/utils/githubREST.mts

@@ -6,15 +6,15 @@ import GithubApiCache, {
 import { type RequestOptions, request } from "https";
 import { unknownErrorToString, unknownToError } from "./errorHelper.mjs";
 import { window } from "vscode";
-
-// TODO: move into web consts
-export const HTTP_STATUS_OK = 200;
-export const HTTP_STATUS_NOT_MODIFIED = 304;
-export const HTTP_STATUS_UNAUTHORIZED = 401;
-export const HTTP_STATUS_FORBIDDEN = 403;
-export const EXT_USER_AGENT = "Raspberry Pi Pico VS Code Extension";
-export const GITHUB_API_BASE_URL = "https://api.github.com";
-export const GITHUB_API_VERSION = "2022-11-28";
+import {
+  EXT_USER_AGENT,
+  GITHUB_API_BASE_URL,
+  GITHUB_API_VERSION,
+  HTTP_STATUS_FORBIDDEN,
+  HTTP_STATUS_NOT_MODIFIED,
+  HTTP_STATUS_OK,
+  HTTP_STATUS_UNAUTHORIZED,
+} from "./sharedConstants.mjs";
 
 /**
  * Enum containing supported repositories on GitHub.

src/utils/sharedConstants.mts

@@ -40,3 +40,11 @@ export const LICENSE_URL_7ZIP = "https://7-zip.org/license.txt";
 export const WINDOWS_X86_7ZIP_DOWNLOAD_URL = "https://www.7-zip.org/a/7zr.exe";
 
 export const CMAKELISTS_ZEPHYR_HEADER = "#pico-zephyr-project";
+
+export const HTTP_STATUS_OK = 200;
+export const HTTP_STATUS_NOT_MODIFIED = 304;
+export const HTTP_STATUS_UNAUTHORIZED = 401;
+export const HTTP_STATUS_FORBIDDEN = 403;
+export const EXT_USER_AGENT = "Raspberry Pi Pico VS Code Extension";
+export const GITHUB_API_BASE_URL = "https://api.github.com";
+export const GITHUB_API_VERSION = "2022-11-28";