- Notifications
You must be signed in to change notification settings - Fork35
Add package scripts and cli library, enable integration testing#536
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes from1 commit
Commits
Show all changes
16 commits Select commitHold shift + click to select a range
7e1bce9 pretest working
jaggederestc693a46 enable vscode-test and bump tsconfig to modern settings
jaggederest240b649 Merge branch 'main' into jaggederest/integration_tests
jaggederest0e58a31 test: fix integration tests to run without Remote SSH extension
jaggederest872b7e8 Merge remote-tracking branch 'origin/jaggederest/integration_tests' i…
jaggederest01c2d80 autocorrect formatting
jaggederest8ddbf26 bump node version to 22
jaggederest9b74df4 fix: configure Vitest to properly exclude VS Code integration tests
jaggederestadec211 whitespace
jaggederestd9b543a fix: update tsconfig.json and convert pretty-bytes imports to standar…
jaggederesta7afdd6 Remove testmode flag in favor of checking existence of remote ssh ext…
jaggederest3097d8f remove superfluous async, enable lint rule
jaggederesta2d2bc8 fix: resolve ESLint @typescript-eslint/require-await errors
jaggederest32dfda4 Update configurations and remove pointless Promise.all
jaggederest12b0124 Tweak eslint config to better handle json/md, remove compile-tests sc…
jaggederest3ee92fe remove extraneous async/await
jaggederestFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
NextNext commit
pretest working
- Loading branch information
Uh oh!
There was an error while loading.Please reload this page.
commit7e1bce98c8086cd824a7bf5c0702b9b6e866c7ed
There are no files selected for viewing
7 changes: 5 additions & 2 deletionspackage.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -279,7 +279,10 @@ | ||
| "lint": "eslint . --ext ts,md", | ||
| "lint:fix": "yarn lint --fix", | ||
| "test": "vitest ./src", | ||
| "test:ci": "CI=true yarn test", | ||
| "test:integration": "vscode-test", | ||
| "pretest": "yarn run compile-tests && yarn run build && yarn run lint", | ||
| "compile-tests": "tsc -p . --outDir out" | ||
jaggederest marked this conversation as resolved. OutdatedShow resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| }, | ||
| "devDependencies": { | ||
| "@types/eventsource": "^3.0.0", | ||
| @@ -326,7 +329,7 @@ | ||
| "semver": "^7.7.1", | ||
| "ua-parser-js": "1.0.40", | ||
| "ws": "^8.18.2", | ||
| "zod": "^3.25.65" | ||
| }, | ||
| "resolutions": { | ||
| "semver": "7.7.1", | ||
14 changes: 10 additions & 4 deletionssrc/remote.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -6,7 +6,9 @@ import * as fs from "fs/promises"; | ||
| import * as jsonc from "jsonc-parser"; | ||
| import * as os from "os"; | ||
| import * as path from "path"; | ||
| // Dynamic import for ESM module | ||
| // eslint-disable-next-line @typescript-eslint/no-explicit-any | ||
| let prettyBytes: any; | ||
jaggederest marked this conversation as resolved. OutdatedShow resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| import * as semver from "semver"; | ||
| import * as vscode from "vscode"; | ||
| import { | ||
| @@ -841,7 +843,7 @@ export class Remote { | ||
| `${sshPid}.json`, | ||
| ); | ||
| const updateStatus =async(network: { | ||
jaggederest marked this conversation as resolved. OutdatedShow resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| p2p: boolean; | ||
| latency: number; | ||
| preferred_derp: string; | ||
| @@ -850,6 +852,10 @@ export class Remote { | ||
| download_bytes_sec: number; | ||
| using_coder_connect: boolean; | ||
| }) => { | ||
| // Load ESM module if not already loaded | ||
| if (!prettyBytes) { | ||
| prettyBytes = (await import("pretty-bytes")).default; | ||
jaggederest marked this conversation as resolved. OutdatedShow resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| } | ||
| let statusText = "$(globe) "; | ||
| // Coder Connect doesn't populate any other stats | ||
| @@ -910,9 +916,9 @@ export class Remote { | ||
| .then((content) => { | ||
| return JSON.parse(content); | ||
| }) | ||
| .then(async(parsed) => { | ||
| try { | ||
| awaitupdateStatus(parsed); | ||
jaggederest marked this conversation as resolved. OutdatedShow resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| } catch (ex) { | ||
| // Ignore | ||
| } | ||
8 changes: 7 additions & 1 deletionsrc/storage.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -3,7 +3,9 @@ import { createWriteStream } from "fs"; | ||
| import fs from "fs/promises"; | ||
| import { IncomingMessage } from "http"; | ||
| import path from "path"; | ||
| // Dynamic import for ESM module | ||
| // eslint-disable-next-line @typescript-eslint/no-explicit-any | ||
jaggederest marked this conversation as resolved. OutdatedShow resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| let prettyBytes: any; | ||
| import * as vscode from "vscode"; | ||
| import { errToStr } from "./api-helper"; | ||
| import * as cli from "./cliManager"; | ||
| @@ -122,6 +124,10 @@ export class Storage { | ||
| * downloads being disabled. | ||
| */ | ||
| public async fetchBinary(restClient: Api, label: string): Promise<string> { | ||
| // Load ESM module if not already loaded | ||
| if (!prettyBytes) { | ||
| prettyBytes = (await import("pretty-bytes")).default; | ||
| } | ||
jaggederest marked this conversation as resolved. OutdatedShow resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| const baseUrl = restClient.getAxiosInstance().defaults.baseURL; | ||
| // Settings can be undefined when set to their defaults (true in this case), | ||
12 changes: 5 additions & 7 deletionstsconfig.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,12 @@ | ||
| { | ||
| "compilerOptions": { | ||
| "module": "Node16", | ||
| "target": "ES2022", | ||
jaggederest marked this conversation as resolved. OutdatedShow resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| "outDir": "out", | ||
| // "dom" is required for importing the API from coder/coder. | ||
| "lib": ["ES2022", "dom"], | ||
| "sourceMap": true, | ||
| "strict": true, | ||
| "skipLibCheck": true | ||
| } | ||
| } | ||
78 changes: 12 additions & 66 deletionsyarn.lock
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.