Commit Graph

198 Commits

Author SHA1 Message Date
Asher
b9c80b8520
Merge pull request #3178 from code-asher/connections
Minor connections refactor
2021-04-21 12:22:45 -05:00
Asher
16fc315afa
Catch socket close during protocol handshake
zlib errors can cause the protocol handshake to not reject (until the
timeout).
2021-04-21 11:48:46 -05:00
Asher
f0bafa387f
Move connection logic into connection class
- Moved everything I could into the class itself.
- Improve the logging situation a bit.
- Switch some trace logs to debug.
- Get debug port from message arguments.
2021-04-21 11:48:45 -05:00
Asher
ae6089f852
Improve protocol class
- Move destroy logic into the class itself
- Improve logging a bit
- Remove the record option; we should always do this when using
  permessage-deflate.
- Let debug port be null (it can be null in the message args).
- Add setSocket so we don't have to initiate a connection to set it.
- Move inflate bytes logic into the class itself.
2021-04-21 11:48:43 -05:00
Akash Satheesan
f21884cce5
chore(deps): deduplicate deps in yarn.lock (#3167) 2021-04-19 22:22:07 +05:30
dependabot[bot]
818e2207f8
chore(deps): bump ssri from 6.0.1 to 6.0.2 in /lib/vscode (#3165)
Bumps [ssri](https://github.com/npm/ssri) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/npm/ssri/releases)
- [Changelog](https://github.com/npm/ssri/blob/v6.0.2/CHANGELOG.md)
- [Commits](https://github.com/npm/ssri/compare/v6.0.1...v6.0.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-04-19 20:35:48 +05:30
Akash Satheesan
578b2de131
chore(lib/vscode): clean up comments 2021-04-16 00:39:02 +05:30
Akash Satheesan
bdf555a06e
fix(lib/vscode): refactor productService 2021-04-16 00:14:16 +05:30
Akash Satheesan
8ffb87dbc9
fix(lib/vscode): restore localizatizons support 2021-04-16 00:06:38 +05:30
Akash Satheesan
2f6d256745 feat(lib/vscode): pull in changes for 1.55.2
Microsoft recently released an update that fixes some security
issues. Squash and pull these changes into our tree.
2021-04-14 19:00:56 +05:30
Akash Satheesan
9f256cd87a
fix(lib/vscode): fix lint errors 2021-04-14 18:58:41 +05:30
Akash Satheesan
093743e365
fix(.../platform/terminal): fix compile, add notes 2021-04-14 18:58:17 +05:30
Akash Satheesan
f472b000b5
fix(lib/vscode/test/smoke): update yarn.lock 2021-04-14 18:35:17 +05:30
Asher
5ebb096db5
Get terminals working
- Instead of a single listener per terminal that handles all events VS
  Code now has a single listener per event that handles that event for
  all terminals.
- Refactor Terminal to extend TerminalProcess to avoid duplicating
  methods. This required some modifications to TerminalProcess to access
  the pid and title and to set the ID.
- Remove our async change to shutdown. This was necessary to avoid
  disposing too early but shutdown already calls dispose so it turns out
  we didn't need to call it ourselves.
- Rename methods to match the command strings.
- Fix getting system shell (uses process.env).
- Use a single bufferer. Since it already supports buffering for
  multiple terminals there's no need to have one per terminal.
- Remove replay/reconnect logic. It's broken and unused so there doesn't
  seem much point in trying to refactor it to fit the changes right now.

While terminals work now there are still a lot of todos.
2021-04-13 16:35:13 -05:00
Akash Satheesan
b1fb9f780b
fix(lib/vscode): add listProcesses to terminal channel 2021-04-09 20:20:49 +05:30
Akash Satheesan
feb7013b3a
fix(lib/vscode): rename terminal events 2021-04-09 19:16:00 +05:30
Akash Satheesan
f3b1076f1d
fix(lib/vscode): get vscode to compile 2021-04-09 17:50:11 +05:30
Akash Satheesan
5e63b7f53c
fix(lib/vscode): fix merge conflicts in localizationsService.ts 2021-04-09 17:49:14 +05:30
Akash Satheesan
448ba0ccf2
fix(lib/vscode): fix conflicts in environmentService.ts 2021-04-09 12:50:53 +05:30
Akash Satheesan
b73260d561
fix(lib/vscode): fix conflicts in sandbox.simpleservices.ts 2021-04-09 12:50:45 +05:30
Akash Satheesan
15a5d20edf
fix(lib/vscode): fix conflicts in extensionsScanner.ts 2021-04-09 12:39:27 +05:30
Akash Satheesan
4ab306efeb
fix(lib/vscode): fix conflicts in workbench/workbench.web.main.ts 2021-04-09 12:09:36 +05:30
Akash Satheesan
5bd253709f
fix(lib/vscode): package.json and yarn.lock 2021-04-09 11:54:28 +05:30
Akash Satheesan
8fb96b9967 chore(vscode): update to 1.55.2 2021-04-09 11:32:27 +05:30
Joe Previte
003dc0feeb
chore(release): bump version to 3.9.3 2021-04-08 11:18:56 -07:00
Joe Previte
f241e38907
chore: fix typo in extensionDownloader 2021-04-06 15:46:57 -07:00
Asher
230b0dfce4
Ignore ipc.d.ts during VS Code lint
We already lint it on our side.
2021-04-02 11:12:13 -05:00
Asher
101c2a01f1
Fix tsc watch restarting when it shouldn't
It seems reaching into lib/vscode for the types caused tsc to establish
watches that caused it to restart over and over while vscode was
building.

The strategy used here is to symlink it instead which is the same thing
we do for the proxy agent.
2021-04-01 10:58:56 -05:00
Akash Satheesan
8332a6abc9
fix(lib/vscode): remove native-keymap and keytar (#2961)
native-keymap and keytar are only used in the electron process,
so we don't need them. This allows us to drop our dependencies on
libx11-dev, libxkbfile-dev, and libsecret-dev.
2021-03-25 22:20:58 +05:30
Joe Previte
090687d057
feat: add e2e test for logout 2021-03-23 10:02:03 -07:00
Joe Previte
5cec6208d0
refactor: add cookie.ts to lib/vscode 2021-03-23 10:02:03 -07:00
Joe Previte
9f790fd2f3
feat(lib/vscode): add log out to application menu
This adds a new option to the Application Menu called Log out.

It deletes the code-server cookie and logs a user out.
2021-03-23 10:02:02 -07:00
Joe Previte
aae17cb749
fixup: fix comment in server.ts 2021-03-22 10:43:02 -07:00
Joe Previte
19c2f31f22
fixup: remove comment in server.ts 2021-03-22 10:37:44 -07:00
Joe Previte
36714da613
fixup: move openHelpAbout 2021-03-17 11:25:33 -07:00
Joe Previte
d3df963d39
Merge branch 'main' into jsjoeio/upgrade-vscode-1.54 2021-03-16 14:42:51 -07:00
Joe Previte
bcdca86539
refactor: change goHome test to helpAbout 2021-03-16 14:25:28 -07:00
Joe Previte
ae02023454
fix(lib/vscode): register LogLevelChannel 2021-03-16 14:25:27 -07:00
Asher
050a1bb146
Fix localizations service import
It was moved from electron-browser to electron-sandbox.
2021-03-16 10:20:14 -07:00
Joe Previte
875dfb66a4
fix(lib/vscode): update path for logService 2021-03-16 10:20:14 -07:00
Joe Previte
8f414b5005
fix(lib/vscode): make mkdir recursive 2021-03-16 10:20:14 -07:00
Joe Previte
25dbb5b1b6
fix(lib/vscode0: localizations import in client 2021-03-16 10:20:14 -07:00
Joe Previte
34189e4d49
fix(lib/vscode): add getAppRoot to VariableResolverService
Not sure if it's used because it can return undefined, but it's
there now!
2021-03-16 10:20:13 -07:00
Joe Previte
dc08bc68c6
fix(lib/vscode): fix terminalLayoutInfoArgs
It looks like before, the ISetTerminalLAyoutInfoArgs and
IGetTerminalLayoutInfoArgs were part of the terminal interface, but now they're
just interfaces so this commit fixes the imports to get them from
vs/platform/terminal/common/terminalProcess.
2021-03-16 10:20:13 -07:00
Joe Previte
e5b7438695
fix(lib/vscode): update imports in channel.ts for terminal
It looks like they moved a bunch of terminal-related files around.

This only fixes the imports.
2021-03-16 10:20:13 -07:00
Joe Previte
c42240f182
fix(lib/vscode): refactor mkdirp to fs.promises
They removed mkdirp in favor of fs.promises.

Updated in marketplace.ts
2021-03-16 10:20:13 -07:00
Joe Previte
350ddc3c27
fix(lib/vscode): update log service in server.ts
This required a bit more work.

We moved a few things around and made use of multiplexLogService.
2021-03-16 10:20:13 -07:00
Joe Previte
eaf63deb56
fix(lib/vscode): fix return type shutdown in ptyService
In the squash/merge update, we forgot to update the return type.

Add Promise<void> instead of void for shutdown method.
2021-03-16 10:20:12 -07:00
Joe Previte
cc8e4ee97c
fix(lib/vscode): update extensionManagementService
Looks like a few import updates and one minor update for language packs.

We had made this change ourselves, but now it's officially in the vscode
codebase. Super cool.
2021-03-16 10:20:12 -07:00
Akash Satheesan
702485139a
chore: update vulnerable dependencies (#2861)
Cherry-pick dependencies with security issues to update.

Signed-off-by: Akash Satheesan <akash@coder.com>
2021-03-12 01:46:40 +05:30
Joe Previte
8512be85a5
fix(lib/vscode): update electron-sandbox localizationService
I'm not sure if we even use this but they changed the LocalizationService.o

It looks like it using one called ISharedProcessService now.
2021-03-11 11:09:37 -07:00
Joe Previte
42ff0ec5e7
fix(lib/vscode): update dialogHandler
Looks like a minor update to the localization for the detailString
which I believe shows up when you go to Help:About.
2021-03-11 11:06:05 -07:00
Joe Previte
d1ad3fad5e
fix(lib/vscode): update storageService getStorage methods
This change refactors a lot of the get methods in the storageService.

I think it simplies a lot. It removes a bunch of methods.
2021-03-11 11:02:32 -07:00
Joe Previte
325f21f73d
fix(lib/vscode): change doStore > doInitialize AbstractStorageService
Looks like they changed the doStore method to doInitialize in the
AbstractStorageService class.

It no longer accepts any parameters.
2021-03-11 10:58:48 -07:00
Joe Previte
dc5c271a0c
fix(lib/vscode): replace doStore with getSotrage
Inside the class BrowserStorageService, it looks like they replaced doStore with
getStorage.

However, at the time of writing this message, I am getting a TypeScript error
saying:
> Non-abstract class 'BrowserStorageService' does not implement inherited
> abstract member 'doStore' from class 'AbstractStorageService'.

Hopefully that will be disappear after I fix other errors.
2021-03-11 10:56:16 -07:00
Joe Previte
e79ca99466
feat(lib/vscode): update src/vs/base/node/languagePacks.js
It looks like a couple functions were added here
such as a readFile and writeFile.
2021-03-11 10:47:52 -07:00
Joe Previte
548b6fb628
fix(lib/vscode): package.json and yarn.lock
No new dependencies were added in the 1.54.2 update.
2021-03-11 10:46:08 -07:00
Joe Previte
0cd3e39492
chore(vscode): update to 1.54.2 2021-03-11 10:27:10 -07:00
Asher
01c3d1f53d
Implement missing terminal method 2021-03-10 13:15:23 -06:00
Asher
5a1f62a8fb
Support permessage-deflate web socket extension (#2846) 2021-03-10 13:14:24 -06:00
Joe Previte
925073db31
Merge pull request #2773 from cdr/upgrade-vscode-1.53
feat(vscode): update to version 1.53.2
2021-03-05 14:03:10 -07:00
Asher
61b5c09770
Allow our server code to be tracked in git 2021-03-04 13:54:04 -06:00
Asher
34b1e756f9
Remove old commented out postinstall steps 2021-03-04 13:54:03 -06:00
Asher
ad24edd2be
Revert remaining remote agent connection changes 2021-03-04 13:54:02 -06:00
Asher
32cbaf2ce3
Remove unused build import 2021-03-04 10:37:02 -06:00
Joe Previte
1632a19a76
chore: fix lint error in channel.ts 2021-03-03 11:52:36 -07:00
Asher
4d3d1b844d
Handle permessage-deflate on sockets
With this the extension host is working again.
2021-03-02 17:18:49 -06:00
Asher
150138e04b
Update env vars for extension host
They now are all prepended with VSCODE_. Also added the parent pid to
ensure it shuts down when the parent dies.
2021-03-02 15:59:47 -06:00
Asher
ba4448e72d
Implement terminal layouts
It doesn't mean much until we persist terminals though, I think.
2021-03-02 14:16:12 -06:00
Asher
3e081ea66c
Merge pull request #2801 from cdr/disappearing-dismiss 2021-03-02 10:14:19 -06:00
Asher
058e781b3f
Await newly promisified func 2021-03-01 16:39:57 -06:00
Asher
c7d59e81dd
Add tabIndex to extension help dismiss button
This makes it accessible via keyboard.
2021-03-01 13:39:34 -06:00
Asher
6dd8b63f4c
Add div for inner extension helper text
The theme callback would set innerHTML on the header which wipes out the
dismiss button. With an inner div we can replace the inner HTML without
worrying about other elements in the header.

Closes #2799.
2021-03-01 13:31:36 -06:00
Asher
f526ab87f8
Remove default home value
Closes #2742.
2021-03-01 13:16:09 -06:00
Joe Previte
a83c909b16
fix: update deps import in coder.js 2021-02-26 16:46:20 -07:00
Joe Previte
9dea2e79a0
chore: fix lint issues 2021-02-26 15:48:04 -07:00
Joe Previte
1bf3036597
fix(connection): onClose -> onDidDispose protocol 2021-02-26 12:55:04 -07:00
Joe Previte
52acb50ed7
fix: update WebSocketNodeSocket in protocol 2021-02-26 12:54:29 -07:00
Joe Previte
22e7173fa9
fix: update resolveCommonProperties in server 2021-02-26 12:54:03 -07:00
Joe Previte
0f18d1fddc
fix: update import in channel.ts getSystemShell 2021-02-25 16:44:08 -07:00
Joe Previte
b71c5061e1
chore: update electron types 2021-02-25 16:43:53 -07:00
Joe Previte
b7e112a78d
chore: reorder package.json lib/vscode 2021-02-25 16:43:45 -07:00
Joe Previte
e002f14423
revert: turn off two rules in eslint for vscode 2021-02-25 12:41:15 -07:00
Joe Previte
c6e6f8e2b3
chore: add missing semicolon in channel.ts 2021-02-25 12:41:01 -07:00
Joe Previte
1b9ed6eea3
chore: update yarn.lock for vscode 2021-02-25 12:31:20 -07:00
Joe Previte
6a6ab72414
fix: resolve conflicts in eslintrc.json
It looks like they turned some eslint warnings on. Or we had them off and I
turned them on. They also added a new target which had the name monaco in it.
2021-02-25 12:25:28 -07:00
Joe Previte
ccf2fe2a2e
fix: conflicts in remote.ts
Looks like they modified a few of the cases related to Reconnection.
2021-02-25 12:23:14 -07:00
Joe Previte
502323a9c8
fix: conflicts with remoteAgentConnection
As Asher pointed out, looks like it makes #2381 obsolete.

Hope this all works.
2021-02-25 12:19:21 -07:00
Joe Previte
f214235e2d
fix: resolve conflicts in build/lib/node.ts
It looks like they added a few more variables and cleaned this file up.

I removed the yarn and yarnRc stuff. Hope that doesn't break anything.
2021-02-25 12:08:12 -07:00
Joe Previte
40d0c88341
fix: extHostExtensionService
Looks like they modified the function signature for _loadCommonJSModule.

I believe the first param is now the extensionId or null. Probably for logging
reason guessing.
2021-02-25 12:02:35 -07:00
Joe Previte
2bd9b6e1bf
fix: update web.main.ts
Looks like they added two lines in the open method.
1. Logging for workbench configuration
2. Window - creating a BrowserWindow
2021-02-25 11:59:25 -07:00
Joe Previte
ce1a8c89dd
fix: postinstall.js conflicts
Again, hope this was correct.

It looks like they moved around a few lines here.

If there are issues with dependencies not installing, check here.
2021-02-25 11:57:35 -07:00
Joe Previte
9e61540840
fix: resolve conflicts in package.json
I hope this was done correctly.

It upgraded a few packages, we left out the electron packages and it added two
resolutions.
2021-02-25 11:52:27 -07:00
Joe Previte
b952616725
fix: resolve conflict browserSocketFactory 2021-02-25 11:47:02 -07:00
Joe Previte
3fd6187503
fix: update import in extensionsViewlet 2021-02-25 11:46:25 -07:00
Joe Previte
f255cdb2cc
fix: update text for Extension Host 2021-02-25 11:44:37 -07:00
Joe Previte
262963c9ec
fix: resolve conflict in extensionHostProcessSetup.ts
From what I can tell, they added these `performance.mark` calls. Not sure
exactly what they do, but my guess is they're supposed to help with measuring
extension performance?
2021-02-25 11:42:42 -07:00
Joe Previte
7bf1fd979e
fix: resolve conflicts in yarn.lock 2021-02-25 11:41:34 -07:00
Joe Previte
2c5c48525e
fix: resolve conflicts in .eslintignore 2021-02-25 11:36:01 -07:00
Joe Previte
c94697da98
fix: resolve conflicts in .gitignore 2021-02-25 11:35:23 -07:00