@gitpod/gitpod-protocol 0.1.5-svenefftinge-dashboard-invalid-2274.4 → 0.1.5-tarun-telemetry-users.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (346) hide show
  1. package/data/builtin-theia-plugins.json +28 -18
  2. package/data/gitpod-schema.json +25 -24
  3. package/lib/accounting-protocol.d.ts +155 -0
  4. package/lib/accounting-protocol.d.ts.map +1 -0
  5. package/lib/accounting-protocol.js +109 -0
  6. package/lib/accounting-protocol.js.map +1 -0
  7. package/lib/admin-protocol.d.ts +32 -5
  8. package/lib/admin-protocol.d.ts.map +1 -1
  9. package/lib/admin-protocol.js +16 -1
  10. package/lib/admin-protocol.js.map +1 -1
  11. package/lib/analytics.d.ts +45 -0
  12. package/lib/analytics.d.ts.map +1 -0
  13. package/lib/analytics.js +10 -0
  14. package/lib/analytics.js.map +1 -0
  15. package/lib/auth.d.ts +25 -0
  16. package/lib/auth.d.ts.map +1 -0
  17. package/lib/auth.js +16 -0
  18. package/lib/auth.js.map +1 -0
  19. package/lib/context-url.d.ts +19 -0
  20. package/lib/context-url.d.ts.map +1 -0
  21. package/lib/context-url.js +51 -0
  22. package/lib/context-url.js.map +1 -0
  23. package/lib/context-url.spec.d.ts +12 -0
  24. package/lib/context-url.spec.d.ts.map +1 -0
  25. package/lib/context-url.spec.js +73 -0
  26. package/lib/context-url.spec.js.map +1 -0
  27. package/lib/email-protocol.d.ts +2 -3
  28. package/lib/email-protocol.d.ts.map +1 -1
  29. package/lib/email-protocol.js +5 -5
  30. package/lib/email-protocol.js.map +1 -1
  31. package/lib/encryption/container-module.d.ts +1 -1
  32. package/lib/encryption/container-module.js +6 -5
  33. package/lib/encryption/container-module.js.map +1 -1
  34. package/lib/encryption/encryption-engine.d.ts +1 -1
  35. package/lib/encryption/encryption-engine.js +20 -21
  36. package/lib/encryption/encryption-engine.js.map +1 -1
  37. package/lib/encryption/encryption-engine.spec.d.ts +1 -1
  38. package/lib/encryption/encryption-engine.spec.js +30 -37
  39. package/lib/encryption/encryption-engine.spec.js.map +1 -1
  40. package/lib/encryption/encryption-service.d.ts +1 -1
  41. package/lib/encryption/encryption-service.js +30 -44
  42. package/lib/encryption/encryption-service.js.map +1 -1
  43. package/lib/encryption/key-provider.d.ts +1 -1
  44. package/lib/encryption/key-provider.js +26 -31
  45. package/lib/encryption/key-provider.js.map +1 -1
  46. package/lib/env.d.ts +2 -3
  47. package/lib/env.d.ts.map +1 -1
  48. package/lib/env.js +21 -22
  49. package/lib/env.js.map +1 -1
  50. package/lib/gitpod-file-parser.d.ts +1 -1
  51. package/lib/gitpod-file-parser.js +26 -42
  52. package/lib/gitpod-file-parser.js.map +1 -1
  53. package/lib/gitpod-file-parser.spec.d.ts +1 -1
  54. package/lib/gitpod-file-parser.spec.js +117 -117
  55. package/lib/gitpod-file-parser.spec.js.map +1 -1
  56. package/lib/gitpod-service.d.ts +155 -21
  57. package/lib/gitpod-service.d.ts.map +1 -1
  58. package/lib/gitpod-service.js +171 -257
  59. package/lib/gitpod-service.js.map +1 -1
  60. package/lib/headless-workspace-log.d.ts +9 -12
  61. package/lib/headless-workspace-log.d.ts.map +1 -1
  62. package/lib/headless-workspace-log.js +5 -8
  63. package/lib/headless-workspace-log.js.map +1 -1
  64. package/lib/ide-frontend-service.d.ts +5 -1
  65. package/lib/ide-frontend-service.d.ts.map +1 -1
  66. package/lib/ide-frontend-service.js +1 -1
  67. package/lib/ide-protocol.d.ts +101 -0
  68. package/lib/ide-protocol.d.ts.map +1 -0
  69. package/lib/{util/without.js → ide-protocol.js} +2 -2
  70. package/lib/ide-protocol.js.map +1 -0
  71. package/lib/index.d.ts +7 -1
  72. package/lib/index.d.ts.map +1 -1
  73. package/lib/index.js +8 -2
  74. package/lib/index.js.map +1 -1
  75. package/lib/installation-admin-protocol.d.ts +25 -0
  76. package/lib/installation-admin-protocol.d.ts.map +1 -0
  77. package/lib/installation-admin-protocol.js +30 -0
  78. package/lib/installation-admin-protocol.js.map +1 -0
  79. package/lib/license-protocol.d.ts +1 -1
  80. package/lib/license-protocol.js +1 -1
  81. package/lib/messaging/browser/connection.d.ts +5 -3
  82. package/lib/messaging/browser/connection.d.ts.map +1 -1
  83. package/lib/messaging/browser/connection.js +183 -33
  84. package/lib/messaging/browser/connection.js.map +1 -1
  85. package/lib/messaging/browser/window-connection.d.ts +1 -1
  86. package/lib/messaging/browser/window-connection.js +36 -56
  87. package/lib/messaging/browser/window-connection.js.map +1 -1
  88. package/lib/messaging/client-call-metrics.d.ts +35 -0
  89. package/lib/messaging/client-call-metrics.d.ts.map +1 -0
  90. package/lib/messaging/client-call-metrics.js +83 -0
  91. package/lib/messaging/client-call-metrics.js.map +1 -0
  92. package/lib/messaging/connection-error-handler.js +11 -23
  93. package/lib/messaging/connection-error-handler.js.map +1 -1
  94. package/lib/messaging/error.d.ts +7 -2
  95. package/lib/messaging/error.d.ts.map +1 -1
  96. package/lib/messaging/error.js +14 -4
  97. package/lib/messaging/error.js.map +1 -1
  98. package/lib/messaging/handler.d.ts +10 -0
  99. package/lib/messaging/handler.d.ts.map +1 -1
  100. package/lib/messaging/node/connection.d.ts +1 -17
  101. package/lib/messaging/node/connection.d.ts.map +1 -1
  102. package/lib/messaging/node/connection.js +23 -59
  103. package/lib/messaging/node/connection.js.map +1 -1
  104. package/lib/messaging/proxy-factory.d.ts +2 -0
  105. package/lib/messaging/proxy-factory.d.ts.map +1 -1
  106. package/lib/messaging/proxy-factory.js +74 -159
  107. package/lib/messaging/proxy-factory.js.map +1 -1
  108. package/lib/oss-allowlist.d.ts +14 -0
  109. package/lib/oss-allowlist.d.ts.map +1 -0
  110. package/lib/oss-allowlist.js +8 -0
  111. package/lib/oss-allowlist.js.map +1 -0
  112. package/lib/payment-protocol.d.ts +18 -0
  113. package/lib/payment-protocol.d.ts.map +1 -0
  114. package/lib/payment-protocol.js +13 -0
  115. package/lib/payment-protocol.js.map +1 -0
  116. package/lib/permission.d.ts +7 -5
  117. package/lib/permission.d.ts.map +1 -1
  118. package/lib/permission.js +20 -19
  119. package/lib/permission.js.map +1 -1
  120. package/lib/plans.d.ts +210 -0
  121. package/lib/plans.d.ts.map +1 -0
  122. package/lib/plans.js +570 -0
  123. package/lib/plans.js.map +1 -0
  124. package/lib/protocol.d.ts +133 -59
  125. package/lib/protocol.d.ts.map +1 -1
  126. package/lib/protocol.js +129 -118
  127. package/lib/protocol.js.map +1 -1
  128. package/lib/snapshot-url.d.ts +14 -0
  129. package/lib/snapshot-url.d.ts.map +1 -0
  130. package/lib/snapshot-url.js +26 -0
  131. package/lib/snapshot-url.js.map +1 -0
  132. package/{src/util/without.ts → lib/snapshot-url.spec.d.ts} +3 -4
  133. package/lib/snapshot-url.spec.d.ts.map +1 -0
  134. package/lib/snapshot-url.spec.js +41 -0
  135. package/lib/snapshot-url.spec.js.map +1 -0
  136. package/lib/team-subscription-protocol.d.ts +73 -0
  137. package/lib/team-subscription-protocol.d.ts.map +1 -0
  138. package/lib/team-subscription-protocol.js +63 -0
  139. package/lib/team-subscription-protocol.js.map +1 -0
  140. package/lib/teams-projects-protocol.d.ts +113 -0
  141. package/lib/teams-projects-protocol.d.ts.map +1 -0
  142. package/lib/teams-projects-protocol.js +30 -0
  143. package/lib/teams-projects-protocol.js.map +1 -0
  144. package/lib/theia-plugins.d.ts +1 -1
  145. package/lib/theia-plugins.js +1 -1
  146. package/lib/typings/globals.d.ts +1 -1
  147. package/lib/typings/globals.js +1 -1
  148. package/lib/util/analytics.d.ts +8 -0
  149. package/lib/util/analytics.d.ts.map +1 -0
  150. package/lib/util/analytics.js +79 -0
  151. package/lib/util/analytics.js.map +1 -0
  152. package/lib/util/async-iterator.d.ts +1 -1
  153. package/lib/util/async-iterator.js +56 -134
  154. package/lib/util/async-iterator.js.map +1 -1
  155. package/lib/util/cancelable.d.ts +1 -1
  156. package/lib/util/cancelable.js +18 -60
  157. package/lib/util/cancelable.js.map +1 -1
  158. package/lib/util/date-time.d.ts +1 -1
  159. package/lib/util/date-time.js +9 -9
  160. package/lib/util/date-time.js.map +1 -1
  161. package/lib/util/deep-partial.d.ts +1 -1
  162. package/lib/util/deep-partial.js +1 -1
  163. package/lib/util/deferred.d.ts +1 -1
  164. package/lib/util/deferred.js +11 -13
  165. package/lib/util/deferred.js.map +1 -1
  166. package/lib/util/disposable.js +26 -39
  167. package/lib/util/disposable.js.map +1 -1
  168. package/lib/util/event.js +58 -74
  169. package/lib/util/event.js.map +1 -1
  170. package/lib/util/garbage-collected-cache.d.ts +2 -1
  171. package/lib/util/garbage-collected-cache.d.ts.map +1 -1
  172. package/lib/util/garbage-collected-cache.js +27 -47
  173. package/lib/util/garbage-collected-cache.js.map +1 -1
  174. package/lib/util/generate-workspace-id.d.ts +4 -0
  175. package/lib/util/generate-workspace-id.d.ts.map +1 -0
  176. package/lib/util/generate-workspace-id.js +487 -0
  177. package/lib/util/generate-workspace-id.js.map +1 -0
  178. package/lib/util/generate-workspace-id.spec.d.ts +7 -0
  179. package/lib/util/generate-workspace-id.spec.d.ts.map +1 -0
  180. package/lib/util/generate-workspace-id.spec.js +87 -0
  181. package/lib/util/generate-workspace-id.spec.js.map +1 -0
  182. package/lib/util/gitpod-cookie.d.ts +20 -0
  183. package/lib/util/gitpod-cookie.d.ts.map +1 -0
  184. package/lib/util/gitpod-cookie.js +44 -0
  185. package/lib/util/gitpod-cookie.js.map +1 -0
  186. package/lib/util/gitpod-host-url.d.ts +5 -3
  187. package/lib/util/gitpod-host-url.d.ts.map +1 -1
  188. package/lib/util/gitpod-host-url.js +99 -92
  189. package/lib/util/gitpod-host-url.js.map +1 -1
  190. package/lib/util/gitpod-host-url.spec.d.ts +16 -0
  191. package/lib/util/gitpod-host-url.spec.d.ts.map +1 -0
  192. package/lib/util/gitpod-host-url.spec.js +124 -0
  193. package/lib/util/gitpod-host-url.spec.js.map +1 -0
  194. package/lib/util/grpc.d.ts +15 -0
  195. package/lib/util/grpc.d.ts.map +1 -0
  196. package/lib/util/grpc.js +18 -0
  197. package/lib/util/grpc.js.map +1 -0
  198. package/lib/util/jaeger-client-types.d.ts +68 -0
  199. package/lib/util/jaeger-client-types.d.ts.map +1 -0
  200. package/lib/util/jaeger-client-types.js +8 -0
  201. package/lib/util/jaeger-client-types.js.map +1 -0
  202. package/lib/util/logging.d.ts +57 -34
  203. package/lib/util/logging.d.ts.map +1 -1
  204. package/lib/util/logging.js +119 -111
  205. package/lib/util/logging.js.map +1 -1
  206. package/lib/util/make-link.d.ts +1 -1
  207. package/lib/util/make-link.js +3 -3
  208. package/lib/util/make-link.js.map +1 -1
  209. package/lib/util/parse-workspace-id.d.ts +14 -4
  210. package/lib/util/parse-workspace-id.d.ts.map +1 -1
  211. package/lib/util/parse-workspace-id.js +39 -9
  212. package/lib/util/parse-workspace-id.js.map +1 -1
  213. package/lib/util/parse-workspace-id.spec.d.ts +9 -1
  214. package/lib/util/parse-workspace-id.spec.d.ts.map +1 -1
  215. package/lib/util/parse-workspace-id.spec.js +128 -48
  216. package/lib/util/parse-workspace-id.spec.js.map +1 -1
  217. package/lib/util/queue.d.ts +1 -1
  218. package/lib/util/queue.js +17 -56
  219. package/lib/util/queue.js.map +1 -1
  220. package/lib/util/queue.spec.d.ts +1 -1
  221. package/lib/util/queue.spec.js +145 -289
  222. package/lib/util/queue.spec.js.map +1 -1
  223. package/lib/util/repeat.d.ts +15 -0
  224. package/lib/util/repeat.d.ts.map +1 -0
  225. package/lib/util/repeat.js +55 -0
  226. package/lib/util/repeat.js.map +1 -0
  227. package/lib/util/semaphore.d.ts +1 -1
  228. package/lib/util/semaphore.js +16 -47
  229. package/lib/util/semaphore.js.map +1 -1
  230. package/lib/util/skip-if.d.ts +1 -1
  231. package/lib/util/skip-if.js +7 -7
  232. package/lib/util/skip-if.js.map +1 -1
  233. package/lib/util/timeutil.d.ts +1 -1
  234. package/lib/util/timeutil.js +29 -17
  235. package/lib/util/timeutil.js.map +1 -1
  236. package/lib/util/timeutil.spec.d.ts +1 -1
  237. package/lib/util/timeutil.spec.js +22 -25
  238. package/lib/util/timeutil.spec.js.map +1 -1
  239. package/lib/util/tracing.d.ts +52 -6
  240. package/lib/util/tracing.d.ts.map +1 -1
  241. package/lib/util/tracing.js +197 -63
  242. package/lib/util/tracing.js.map +1 -1
  243. package/lib/util/tracing.spec.d.ts +7 -0
  244. package/lib/util/tracing.spec.d.ts.map +1 -0
  245. package/lib/util/tracing.spec.js +121 -0
  246. package/lib/util/tracing.spec.js.map +1 -0
  247. package/lib/util/workspace-port-authentication.d.ts +1 -1
  248. package/lib/util/workspace-port-authentication.js +4 -3
  249. package/lib/util/workspace-port-authentication.js.map +1 -1
  250. package/lib/workspace-cluster.d.ts +71 -0
  251. package/lib/workspace-cluster.d.ts.map +1 -0
  252. package/lib/workspace-cluster.js +16 -0
  253. package/lib/workspace-cluster.js.map +1 -0
  254. package/lib/workspace-instance.d.ts +27 -3
  255. package/lib/workspace-instance.d.ts.map +1 -1
  256. package/lib/workspace-instance.js +1 -1
  257. package/lib/wsready.d.ts +1 -1
  258. package/lib/wsready.js +2 -2
  259. package/package.json +33 -17
  260. package/pkg-yarn.lock +18 -9
  261. package/provenance-bundle.jsonl +2 -0
  262. package/src/accounting-protocol.ts +229 -0
  263. package/src/admin-protocol.ts +54 -6
  264. package/src/analytics.ts +54 -0
  265. package/src/auth.ts +27 -0
  266. package/src/context-url.spec.ts +39 -0
  267. package/src/context-url.ts +53 -0
  268. package/src/email-protocol.ts +3 -4
  269. package/src/encryption/container-module.ts +1 -1
  270. package/src/encryption/encryption-engine.spec.ts +1 -1
  271. package/src/encryption/encryption-engine.ts +1 -1
  272. package/src/encryption/encryption-service.ts +1 -1
  273. package/src/encryption/key-provider.ts +1 -1
  274. package/src/env.ts +11 -11
  275. package/src/gitpod-file-parser.spec.ts +1 -1
  276. package/src/gitpod-file-parser.ts +1 -1
  277. package/src/gitpod-service.ts +229 -40
  278. package/src/headless-workspace-log.ts +8 -12
  279. package/src/ide-frontend-service.ts +6 -2
  280. package/src/ide-protocol.ts +114 -0
  281. package/src/index.ts +8 -2
  282. package/src/installation-admin-protocol.ts +40 -0
  283. package/src/license-protocol.ts +1 -1
  284. package/src/messaging/browser/connection.ts +195 -14
  285. package/src/messaging/browser/window-connection.ts +1 -1
  286. package/src/messaging/client-call-metrics.ts +97 -0
  287. package/src/messaging/error.ts +19 -4
  288. package/src/messaging/handler.ts +12 -0
  289. package/src/messaging/node/connection.ts +21 -68
  290. package/src/messaging/proxy-factory.ts +14 -6
  291. package/src/oss-allowlist.ts +15 -0
  292. package/src/payment-protocol.ts +20 -0
  293. package/src/permission.ts +9 -8
  294. package/src/plans.ts +632 -0
  295. package/src/protocol.ts +222 -88
  296. package/src/snapshot-url.spec.ts +25 -0
  297. package/src/snapshot-url.ts +27 -0
  298. package/src/team-subscription-protocol.ts +113 -0
  299. package/src/teams-projects-protocol.ts +147 -0
  300. package/src/theia-plugins.ts +1 -1
  301. package/src/typings/globals.ts +1 -1
  302. package/src/util/analytics.ts +87 -0
  303. package/src/util/async-iterator.ts +1 -1
  304. package/src/util/cancelable.ts +1 -1
  305. package/src/util/date-time.ts +1 -1
  306. package/src/util/deep-partial.ts +1 -1
  307. package/src/util/deferred.ts +2 -2
  308. package/src/util/garbage-collected-cache.ts +10 -4
  309. package/src/util/generate-workspace-id.spec.ts +48 -0
  310. package/src/util/generate-workspace-id.ts +475 -0
  311. package/src/util/gitpod-cookie.ts +39 -0
  312. package/src/util/gitpod-host-url.spec.ts +49 -0
  313. package/src/util/gitpod-host-url.ts +36 -14
  314. package/src/util/grpc.ts +15 -0
  315. package/src/util/jaeger-client-types.ts +102 -0
  316. package/src/util/logging.ts +111 -39
  317. package/src/util/make-link.ts +1 -1
  318. package/src/util/parse-workspace-id.spec.ts +46 -5
  319. package/src/util/parse-workspace-id.ts +39 -8
  320. package/src/util/queue.spec.ts +2 -2
  321. package/src/util/queue.ts +1 -1
  322. package/src/util/repeat.ts +45 -0
  323. package/src/util/semaphore.ts +3 -3
  324. package/src/util/skip-if.ts +2 -2
  325. package/src/util/timeutil.spec.ts +1 -1
  326. package/src/util/timeutil.ts +5 -5
  327. package/src/util/tracing.spec.ts +83 -0
  328. package/src/util/tracing.ts +184 -19
  329. package/src/util/workspace-port-authentication.ts +1 -1
  330. package/src/workspace-cluster.ts +91 -0
  331. package/src/workspace-instance.ts +52 -14
  332. package/src/wsready.ts +2 -2
  333. package/lib/util/repeater.d.ts +0 -22
  334. package/lib/util/repeater.d.ts.map +0 -1
  335. package/lib/util/repeater.js +0 -118
  336. package/lib/util/repeater.js.map +0 -1
  337. package/lib/util/safe-promise.d.ts +0 -11
  338. package/lib/util/safe-promise.d.ts.map +0 -1
  339. package/lib/util/safe-promise.js +0 -34
  340. package/lib/util/safe-promise.js.map +0 -1
  341. package/lib/util/without.d.ts +0 -7
  342. package/lib/util/without.d.ts.map +0 -1
  343. package/lib/util/without.js.map +0 -1
  344. package/src/util/jaeger-client.d.ts +0 -105
  345. package/src/util/repeater.ts +0 -49
  346. package/src/util/safe-promise.ts +0 -26
@@ -1,5 +1,5 @@
1
1
  /**
2
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
2
+ * Copyright (c) 2020 Gitpod GmbH. All rights reserved.
3
3
  * Licensed under the GNU Affero General Public License (AGPL).
4
4
  * See License-AGPL.txt in the project root for license information.
5
5
  */
@@ -10,19 +10,24 @@ export declare namespace ErrorCodes {
10
10
  const NOT_FOUND = 404;
11
11
  const CONFLICT = 409;
12
12
  const SETUP_REQUIRED = 410;
13
+ const TOO_MANY_REQUESTS = 429;
13
14
  const REPOSITORY_NOT_WHITELISTED = 430;
14
15
  const CONTEXT_PARSE_ERROR = 460;
16
+ const INVALID_GITPOD_YML = 461;
15
17
  const PAYMENT_ERROR = 450;
16
18
  const USER_BLOCKED = 470;
17
19
  const USER_DELETED = 471;
20
+ const USER_TERMS_ACCEPTANCE_REQUIRED = 472;
18
21
  const PLAN_DOES_NOT_ALLOW_PRIVATE_REPOS = 480;
19
22
  const PLAN_PROFESSIONAL_REQUIRED = 481;
20
23
  const PLAN_ONLY_ALLOWED_FOR_STUDENTS = 485;
21
24
  const TOO_MANY_RUNNING_WORKSPACES = 490;
22
25
  const EE_FEATURE = 501;
23
26
  const EE_LICENSE_REQUIRED = 555;
27
+ const SAAS_FEATURE = 601;
24
28
  const TEAM_SUBSCRIPTION_INVALID_QUANTITY = 610;
25
29
  const TEAM_SUBSCRIPTION_ASSIGNMENT_FAILED = 620;
26
- const NOT_IMPLEMENTED = 666;
30
+ const SNAPSHOT_ERROR = 630;
31
+ const HEADLESS_LOG_NOT_YET_AVAILABLE = 640;
27
32
  }
28
33
  //# sourceMappingURL=error.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../src/messaging/error.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,yBAAiB,UAAU,CAAC;IAEjB,MAAM,iBAAiB,MAAM,CAAC;IAG9B,MAAM,iBAAiB,MAAM,CAAC;IAG9B,MAAM,iBAAiB,MAAM,CAAC;IAG9B,MAAM,SAAS,MAAM,CAAC;IAGtB,MAAM,QAAQ,MAAM,CAAC;IAGrB,MAAM,cAAc,MAAM,CAAC;IAG3B,MAAM,0BAA0B,MAAM,CAAC;IAGvC,MAAM,mBAAmB,MAAM,CAAC;IAGhC,MAAM,aAAa,MAAM,CAAC;IAG1B,MAAM,YAAY,MAAM,CAAC;IAGzB,MAAM,YAAY,MAAM,CAAC;IAGzB,MAAM,iCAAiC,MAAM,CAAC;IAG9C,MAAM,0BAA0B,MAAM,CAAC;IAGvC,MAAM,8BAA8B,MAAM,CAAC;IAG3C,MAAM,2BAA2B,MAAM,CAAC;IAGxC,MAAM,UAAU,MAAM,CAAC;IAGvB,MAAM,mBAAmB,MAAM,CAAC;IAGhC,MAAM,kCAAkC,MAAM,CAAC;IAG/C,MAAM,mCAAmC,MAAM,CAAC;IAGhD,MAAM,eAAe,MAAM,CAAC;CACtC"}
1
+ {"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../src/messaging/error.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,yBAAiB,UAAU,CAAC;IAEjB,MAAM,iBAAiB,MAAM,CAAC;IAG9B,MAAM,iBAAiB,MAAM,CAAC;IAG9B,MAAM,iBAAiB,MAAM,CAAC;IAG9B,MAAM,SAAS,MAAM,CAAC;IAGtB,MAAM,QAAQ,MAAM,CAAC;IAGrB,MAAM,cAAc,MAAM,CAAC;IAG3B,MAAM,iBAAiB,MAAM,CAAC;IAG9B,MAAM,0BAA0B,MAAM,CAAC;IAGvC,MAAM,mBAAmB,MAAM,CAAC;IAGhC,MAAM,kBAAkB,MAAM,CAAC;IAG/B,MAAM,aAAa,MAAM,CAAC;IAG1B,MAAM,YAAY,MAAM,CAAC;IAGzB,MAAM,YAAY,MAAM,CAAC;IAGzB,MAAM,8BAA8B,MAAM,CAAC;IAG3C,MAAM,iCAAiC,MAAM,CAAC;IAG9C,MAAM,0BAA0B,MAAM,CAAC;IAGvC,MAAM,8BAA8B,MAAM,CAAC;IAG3C,MAAM,2BAA2B,MAAM,CAAC;IAGxC,MAAM,UAAU,MAAM,CAAC;IAGvB,MAAM,mBAAmB,MAAM,CAAC;IAGhC,MAAM,YAAY,MAAM,CAAC;IAGzB,MAAM,kCAAkC,MAAM,CAAC;IAG/C,MAAM,mCAAmC,MAAM,CAAC;IAGhD,MAAM,cAAc,MAAM,CAAC;IAG3B,MAAM,8BAA8B,MAAM,CAAC;CACrD"}
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  /**
3
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
3
+ * Copyright (c) 2020 Gitpod GmbH. All rights reserved.
4
4
  * Licensed under the GNU Affero General Public License (AGPL).
5
5
  * See License-AGPL.txt in the project root for license information.
6
6
  */
@@ -20,16 +20,22 @@ var ErrorCodes;
20
20
  ErrorCodes.CONFLICT = 409;
21
21
  // 410 No User
22
22
  ErrorCodes.SETUP_REQUIRED = 410;
23
+ // 429 Too Many Requests
24
+ ErrorCodes.TOO_MANY_REQUESTS = 429;
23
25
  // 430 Repository not whitelisted (custom status code)
24
26
  ErrorCodes.REPOSITORY_NOT_WHITELISTED = 430;
25
27
  // 460 Context Parse Error (custom status code)
26
28
  ErrorCodes.CONTEXT_PARSE_ERROR = 460;
29
+ // 461 Invalid gitpod yml
30
+ ErrorCodes.INVALID_GITPOD_YML = 461;
27
31
  // 450 Payment error
28
32
  ErrorCodes.PAYMENT_ERROR = 450;
29
33
  // 470 User Blocked (custom status code)
30
34
  ErrorCodes.USER_BLOCKED = 470;
31
- // 471 User Blocked (custom status code)
35
+ // 471 User Deleted (custom status code)
32
36
  ErrorCodes.USER_DELETED = 471;
37
+ // 472 Terms Acceptance Required (custom status code)
38
+ ErrorCodes.USER_TERMS_ACCEPTANCE_REQUIRED = 472;
33
39
  // 480 Plan does not allow private repos
34
40
  ErrorCodes.PLAN_DOES_NOT_ALLOW_PRIVATE_REPOS = 480;
35
41
  // 481 Professional plan is required for this operation
@@ -42,11 +48,15 @@ var ErrorCodes;
42
48
  ErrorCodes.EE_FEATURE = 501;
43
49
  // 555 EE License Required
44
50
  ErrorCodes.EE_LICENSE_REQUIRED = 555;
51
+ // 601 SaaS Feature
52
+ ErrorCodes.SAAS_FEATURE = 601;
45
53
  // 610 Invalid Team Subscription Quantity
46
54
  ErrorCodes.TEAM_SUBSCRIPTION_INVALID_QUANTITY = 610;
47
55
  // 620 Team Subscription Assignment Failed
48
56
  ErrorCodes.TEAM_SUBSCRIPTION_ASSIGNMENT_FAILED = 620;
49
- // 666 Not Implemented TODO IO-SPLIT remove
50
- ErrorCodes.NOT_IMPLEMENTED = 666;
57
+ // 630 Snapshot Error
58
+ ErrorCodes.SNAPSHOT_ERROR = 630;
59
+ // 640 Headless logs are not available (yet)
60
+ ErrorCodes.HEADLESS_LOG_NOT_YET_AVAILABLE = 640;
51
61
  })(ErrorCodes = exports.ErrorCodes || (exports.ErrorCodes = {}));
52
62
  //# sourceMappingURL=error.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/messaging/error.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAIH,IAAiB,UAAU,CA4D1B;AA5DD,WAAiB,UAAU;IACvB,mBAAmB;IACN,4BAAiB,GAAG,GAAG,CAAC;IAErC,uBAAuB;IACV,4BAAiB,GAAG,GAAG,CAAC;IAErC,gBAAgB;IACH,4BAAiB,GAAG,GAAG,CAAC;IAErC,gBAAgB;IACH,oBAAS,GAAG,GAAG,CAAC;IAE7B,uCAAuC;IAC1B,mBAAQ,GAAG,GAAG,CAAC;IAE5B,cAAc;IACD,yBAAc,GAAG,GAAG,CAAC;IAElC,sDAAsD;IACzC,qCAA0B,GAAG,GAAG,CAAC;IAE9C,+CAA+C;IAClC,8BAAmB,GAAG,GAAG,CAAC;IAEvC,oBAAoB;IACP,wBAAa,GAAG,GAAG,CAAC;IAEjC,wCAAwC;IAC3B,uBAAY,GAAG,GAAG,CAAC;IAEhC,wCAAwC;IAC3B,uBAAY,GAAG,GAAG,CAAC;IAEhC,wCAAwC;IAC3B,4CAAiC,GAAG,GAAG,CAAC;IAErD,uDAAuD;IAC1C,qCAA0B,GAAG,GAAG,CAAC;IAE9C,wCAAwC;IAC3B,yCAA8B,GAAG,GAAG,CAAC;IAElD,iCAAiC;IACpB,sCAA2B,GAAG,GAAG,CAAC;IAE/C,iBAAiB;IACJ,qBAAU,GAAG,GAAG,CAAC;IAE9B,0BAA0B;IACb,8BAAmB,GAAG,GAAG,CAAC;IAEvC,yCAAyC;IAC5B,6CAAkC,GAAG,GAAG,CAAC;IAEtD,0CAA0C;IAC7B,8CAAmC,GAAG,GAAG,CAAC;IAEvD,2CAA2C;IAC9B,0BAAe,GAAG,GAAG,CAAC;AACvC,CAAC,EA5DgB,UAAU,GAAV,kBAAU,KAAV,kBAAU,QA4D1B"}
1
+ {"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/messaging/error.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAIH,IAAiB,UAAU,CA2E1B;AA3ED,WAAiB,UAAU;IACvB,mBAAmB;IACN,4BAAiB,GAAG,GAAG,CAAC;IAErC,uBAAuB;IACV,4BAAiB,GAAG,GAAG,CAAC;IAErC,gBAAgB;IACH,4BAAiB,GAAG,GAAG,CAAC;IAErC,gBAAgB;IACH,oBAAS,GAAG,GAAG,CAAC;IAE7B,uCAAuC;IAC1B,mBAAQ,GAAG,GAAG,CAAC;IAE5B,cAAc;IACD,yBAAc,GAAG,GAAG,CAAC;IAElC,wBAAwB;IACX,4BAAiB,GAAG,GAAG,CAAC;IAErC,sDAAsD;IACzC,qCAA0B,GAAG,GAAG,CAAC;IAE9C,+CAA+C;IAClC,8BAAmB,GAAG,GAAG,CAAC;IAEvC,yBAAyB;IACZ,6BAAkB,GAAG,GAAG,CAAC;IAEtC,oBAAoB;IACP,wBAAa,GAAG,GAAG,CAAC;IAEjC,wCAAwC;IAC3B,uBAAY,GAAG,GAAG,CAAC;IAEhC,wCAAwC;IAC3B,uBAAY,GAAG,GAAG,CAAC;IAEhC,qDAAqD;IACxC,yCAA8B,GAAG,GAAG,CAAC;IAElD,wCAAwC;IAC3B,4CAAiC,GAAG,GAAG,CAAC;IAErD,uDAAuD;IAC1C,qCAA0B,GAAG,GAAG,CAAC;IAE9C,wCAAwC;IAC3B,yCAA8B,GAAG,GAAG,CAAC;IAElD,iCAAiC;IACpB,sCAA2B,GAAG,GAAG,CAAC;IAE/C,iBAAiB;IACJ,qBAAU,GAAG,GAAG,CAAC;IAE9B,0BAA0B;IACb,8BAAmB,GAAG,GAAG,CAAC;IAEvC,mBAAmB;IACN,uBAAY,GAAG,GAAG,CAAC;IAEhC,yCAAyC;IAC5B,6CAAkC,GAAG,GAAG,CAAC;IAEtD,0CAA0C;IAC7B,8CAAmC,GAAG,GAAG,CAAC;IAEvD,qBAAqB;IACR,yBAAc,GAAG,GAAG,CAAC;IAElC,4CAA4C;IAC/B,yCAA8B,GAAG,GAAG,CAAC;AACtD,CAAC,EA3EgB,UAAU,GAAV,kBAAU,KAAV,kBAAU,QA2E1B"}
@@ -4,4 +4,14 @@ export interface ConnectionHandler {
4
4
  readonly path: string;
5
5
  onConnection(connection: MessageConnection, session?: object): void;
6
6
  }
7
+ export interface ConnectionEventHandler {
8
+ /**
9
+ * Called when the transport underpinning the connection got closed
10
+ */
11
+ onTransportDidClose(): void;
12
+ /**
13
+ * Called when the transport underpinning the connection is (re-)opened
14
+ */
15
+ onTransportDidOpen(): void;
16
+ }
7
17
  //# sourceMappingURL=handler.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../src/messaging/handler.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,eAAO,MAAM,iBAAiB,eAA8B,CAAC;AAE7D,MAAM,WAAW,iBAAiB;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,UAAU,EAAE,iBAAiB,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACvE"}
1
+ {"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../src/messaging/handler.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,eAAO,MAAM,iBAAiB,eAA8B,CAAC;AAE7D,MAAM,WAAW,iBAAiB;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,UAAU,EAAE,iBAAiB,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACvE;AAED,MAAM,WAAW,sBAAsB;IACnC;;OAEG;IACF,mBAAmB,IAAI,IAAI,CAAC;IAE5B;;OAEG;IACH,kBAAkB,IAAI,IAAI,CAAC;CAC/B"}
@@ -1,20 +1,4 @@
1
- /// <reference types="node" />
2
1
  import * as ws from "ws";
3
- import * as http from "http";
4
- import * as https from "https";
5
- import * as net from "net";
6
- import { MessageConnection } from "vscode-jsonrpc";
7
2
  import { IWebSocket } from "vscode-ws-jsonrpc";
8
- export interface IServerOptions {
9
- readonly server: http.Server | https.Server;
10
- readonly path?: string;
11
- matches?(request: http.IncomingMessage): boolean;
12
- }
13
- export declare function createServerWebSocketConnection(options: IServerOptions, onConnect: (connection: MessageConnection) => void): void;
14
- export declare function openJsonRpcSocket(options: IServerOptions, onOpen: (socket: IWebSocket) => void): void;
15
- export interface OnOpen {
16
- (webSocket: ws, request: http.IncomingMessage, socket: net.Socket, head: Buffer): void;
17
- }
18
- export declare function openSocket(options: IServerOptions, onOpen: OnOpen): void;
19
- export declare function toIWebSocket(webSocket: ws): IWebSocket;
3
+ export declare function toIWebSocket(ws: ws): IWebSocket;
20
4
  //# sourceMappingURL=connection.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../src/messaging/node/connection.ts"],"names":[],"mappings":";AAOA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAA6B,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAG1E,MAAM,WAAW,cAAc;IAC3B,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAC5C,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC;CACpD;AAED,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,CAAC,UAAU,EAAE,iBAAiB,KAAK,IAAI,GAAG,IAAI,CAIjI;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,GAAG,IAAI,CAKrG;AAED,MAAM,WAAW,MAAM;IACnB,CAAC,SAAS,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1F;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAoBxE;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,EAAE,cAyBzC"}
1
+ {"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../src/messaging/node/connection.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,wBAAgB,YAAY,CAAC,EAAE,EAAE,EAAE,cA6BlC"}
@@ -6,69 +6,33 @@
6
6
  * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
7
7
  */
8
8
  Object.defineProperty(exports, "__esModule", { value: true });
9
- exports.toIWebSocket = exports.openSocket = exports.openJsonRpcSocket = exports.createServerWebSocketConnection = void 0;
10
- var ws = require("ws");
11
- var url = require("url");
12
- var vscode_ws_jsonrpc_1 = require("vscode-ws-jsonrpc");
13
- var logging_1 = require("../../util/logging");
14
- function createServerWebSocketConnection(options, onConnect) {
15
- openJsonRpcSocket(options, function (socket) {
16
- onConnect(vscode_ws_jsonrpc_1.createWebSocketConnection(socket, console));
17
- });
18
- }
19
- exports.createServerWebSocketConnection = createServerWebSocketConnection;
20
- function openJsonRpcSocket(options, onOpen) {
21
- openSocket(options, function (socket) {
22
- var webSocket = toIWebSocket(socket);
23
- onOpen(webSocket);
24
- });
25
- }
26
- exports.openJsonRpcSocket = openJsonRpcSocket;
27
- function openSocket(options, onOpen) {
28
- var wss = new ws.Server({
29
- noServer: true,
30
- perMessageDeflate: {
31
- // don't compress if a message is less than 256kb
32
- threshold: 256 * 1024
33
- }
34
- });
35
- options.server.on('upgrade', function (request, socket, head) {
36
- var pathname = request.url ? url.parse(request.url).pathname : undefined;
37
- if (options.path && pathname === options.path || options.matches && options.matches(request)) {
38
- wss.handleUpgrade(request, socket, head, function (webSocket) {
39
- if (webSocket.readyState === webSocket.OPEN) {
40
- onOpen(webSocket, request, socket, head);
41
- }
42
- else {
43
- webSocket.on('open', function () { return onOpen(webSocket, request, socket, head); });
44
- }
45
- });
46
- }
47
- });
48
- }
49
- exports.openSocket = openSocket;
50
- function toIWebSocket(webSocket) {
51
- var sendsAfterOpen = 0;
9
+ exports.toIWebSocket = void 0;
10
+ function toIWebSocket(ws) {
52
11
  return {
53
- send: function (content) {
54
- if (webSocket.readyState !== ws.OPEN) {
55
- if (sendsAfterOpen++ > 3) {
56
- logging_1.log.error("Repeated try to send on closed web socket (readyState was " + webSocket.readyState + ")", { ws: ws });
57
- }
12
+ send: content => {
13
+ if (ws.readyState >= ws.CLOSING) {
14
+ // ws is already CLOSING/CLOSED, send() would just return an error.
58
15
  return;
59
16
  }
60
- webSocket.send(content, function (err) {
61
- if (err) {
62
- logging_1.log.error('Error in ws.send()', err, { ws: ws });
63
- }
64
- });
17
+ // in general send-errors should trigger an 'error' event already, we just make sure it actually happens.
18
+ try {
19
+ ws.send(content, err => {
20
+ if (!err) {
21
+ return;
22
+ }
23
+ ws.emit('error', err);
24
+ });
25
+ }
26
+ catch (err) {
27
+ ws.emit('error', err);
28
+ }
65
29
  },
66
- onMessage: function (cb) { return webSocket.on('message', cb); },
67
- onError: function (cb) { return webSocket.on('error', cb); },
68
- onClose: function (cb) { return webSocket.on('close', cb); },
69
- dispose: function () {
70
- if (webSocket.readyState < ws.CLOSING) {
71
- webSocket.close();
30
+ onMessage: cb => ws.on('message', cb),
31
+ onError: cb => ws.on('error', cb),
32
+ onClose: cb => ws.on('close', cb),
33
+ dispose: () => {
34
+ if (ws.readyState < ws.CLOSING) {
35
+ ws.close();
72
36
  }
73
37
  }
74
38
  };
@@ -1 +1 @@
1
- {"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../src/messaging/node/connection.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../src/messaging/node/connection.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAKH,SAAgB,YAAY,CAAC,EAAM;IAC/B,OAAmB;QACf,IAAI,EAAE,OAAO,CAAC,EAAE;YACZ,IAAI,EAAE,CAAC,UAAU,IAAI,EAAE,CAAC,OAAO,EAAE;gBAC7B,mEAAmE;gBACnE,OAAO;aACV;YAED,yGAAyG;YACzG,IAAI;gBACA,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE;oBACnB,IAAI,CAAC,GAAG,EAAE;wBACN,OAAO;qBACV;oBACD,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;gBAC1B,CAAC,CAAC,CAAC;aACN;YAAC,OAAO,GAAG,EAAE;gBACV,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;aACzB;QACL,CAAC;QACD,SAAS,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC;QACrC,OAAO,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC;QACjC,OAAO,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC;QACjC,OAAO,EAAE,GAAG,EAAE;YACV,IAAI,EAAE,CAAC,UAAU,GAAG,EAAE,CAAC,OAAO,EAAE;gBAC5B,EAAE,CAAC,KAAK,EAAE,CAAC;aACd;QACL,CAAC;KACJ,CAAC;AACN,CAAC;AA7BD,oCA6BC"}
@@ -77,6 +77,8 @@ export declare class JsonRpcProxyFactory<T extends object> implements ProxyHandl
77
77
  */
78
78
  constructor(target?: any);
79
79
  protected waitForConnection(): void;
80
+ fireConnectionClosed(): void;
81
+ fireConnectionOpened(): void;
80
82
  /**
81
83
  * Connect a MessageConnection to the factory.
82
84
  *
@@ -1 +1 @@
1
- {"version":3,"file":"proxy-factory.d.ts","sourceRoot":"","sources":["../../src/messaging/proxy-factory.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,iBAAiB,EAAiB,MAAM,gBAAgB,CAAC;AAClE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAG9C,oBAAY,aAAa,CAAC,MAAM,IAAI,UAAU,GAAG;IAC7C;;;;OAIG;IACH,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;CAC/C,CAAC;AAEF,MAAM,WAAW,6BAA6B;IAC1C,QAAQ,CAAC,mBAAmB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1C,QAAQ,CAAC,oBAAoB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;CAC9C;AACD,oBAAY,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,6BAA6B,CAAC;AAEhE,qBAAa,wBAAwB,CAAC,CAAC,SAAS,MAAM,CAAE,YAAW,iBAAiB;IAE5E,QAAQ,CAAC,IAAI,EAAE,MAAM;IACrB,QAAQ,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,GAAG;gBADhE,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,GAAG;IAG7E,YAAY,CAAC,UAAU,EAAE,iBAAiB,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;CAMtE;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,qBAAa,mBAAmB,CAAC,CAAC,SAAS,MAAM,CAAE,YAAW,YAAY,CAAC,CAAC,CAAC;IActD,MAAM,CAAC;IAZ1B,SAAS,CAAC,QAAQ,CAAC,0BAA0B,gBAAuB;IACpE,SAAS,CAAC,QAAQ,CAAC,2BAA2B,gBAAuB;IAErE,SAAS,CAAC,wBAAwB,EAAE,CAAC,UAAU,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC5E,SAAS,CAAC,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAExD;;;;;OAKG;gBACgB,MAAM,CAAC,KAAK;IAI/B,SAAS,CAAC,iBAAiB,IAAI,IAAI;IAYnC;;;;;OAKG;IACH,MAAM,CAAC,UAAU,EAAE,iBAAiB;IAQpC;;;;;;;;;;;OAWG;cACa,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAavE;;;;;OAKG;IACH,SAAS,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAI9D;;;;;;OAMG;IACH,WAAW,IAAI,YAAY,CAAC,CAAC,CAAC;IAK9B;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,GAAG,GAAG;IAiClD;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,CAAC,CAAC,EAAE,WAAW,GAAG,OAAO;CAGpD"}
1
+ {"version":3,"file":"proxy-factory.d.ts","sourceRoot":"","sources":["../../src/messaging/proxy-factory.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,iBAAiB,EAAiB,MAAM,gBAAgB,CAAC;AAClE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAG9C,oBAAY,aAAa,CAAC,MAAM,IAAI,UAAU,GAAG;IAC7C;;;;OAIG;IACH,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;CAC/C,CAAC;AAEF,MAAM,WAAW,6BAA6B;IAC1C,QAAQ,CAAC,mBAAmB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1C,QAAQ,CAAC,oBAAoB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;CAC9C;AACD,oBAAY,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,6BAA6B,CAAC;AAEhE,qBAAa,wBAAwB,CAAC,CAAC,SAAS,MAAM,CAAE,YAAW,iBAAiB;IAE5E,QAAQ,CAAC,IAAI,EAAE,MAAM;IACrB,QAAQ,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,GAAG;gBADhE,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,GAAG;IAG7E,YAAY,CAAC,UAAU,EAAE,iBAAiB,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;CAMtE;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,qBAAa,mBAAmB,CAAC,CAAC,SAAS,MAAM,CAAE,YAAW,YAAY,CAAC,CAAC,CAAC;IActD,MAAM,CAAC;IAZ1B,SAAS,CAAC,QAAQ,CAAC,0BAA0B,gBAAuB;IACpE,SAAS,CAAC,QAAQ,CAAC,2BAA2B,gBAAuB;IAErE,SAAS,CAAC,wBAAwB,EAAE,CAAC,UAAU,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC5E,SAAS,CAAC,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAExD;;;;;OAKG;gBACgB,MAAM,CAAC,KAAK;IAI/B,SAAS,CAAC,iBAAiB,IAAI,IAAI;IAUnC,oBAAoB;IAIpB,oBAAoB;IAIpB;;;;;OAKG;IACH,MAAM,CAAC,UAAU,EAAE,iBAAiB;IAQpC;;;;;;;;;;;OAWG;cACa,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAavE;;;;;OAKG;IACH,SAAS,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAM9D;;;;;;OAMG;IACH,WAAW,IAAI,YAAY,CAAC,CAAC,CAAC;IAK9B;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,GAAG,GAAG;IAiClD;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,CAAC,CAAC,EAAE,WAAW,GAAG,OAAO;CAGpD"}
@@ -14,71 +14,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
14
14
  step((generator = generator.apply(thisArg, _arguments || [])).next());
15
15
  });
16
16
  };
17
- var __generator = (this && this.__generator) || function (thisArg, body) {
18
- var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
19
- return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
20
- function verb(n) { return function (v) { return step([n, v]); }; }
21
- function step(op) {
22
- if (f) throw new TypeError("Generator is already executing.");
23
- while (_) try {
24
- if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
25
- if (y = 0, t) op = [op[0] & 2, t.value];
26
- switch (op[0]) {
27
- case 0: case 1: t = op; break;
28
- case 4: _.label++; return { value: op[1], done: false };
29
- case 5: _.label++; y = op[1]; op = [0]; continue;
30
- case 7: op = _.ops.pop(); _.trys.pop(); continue;
31
- default:
32
- if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
33
- if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
34
- if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
35
- if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
36
- if (t[2]) _.ops.pop();
37
- _.trys.pop(); continue;
38
- }
39
- op = body.call(thisArg, _);
40
- } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
41
- if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
42
- }
43
- };
44
- var __read = (this && this.__read) || function (o, n) {
45
- var m = typeof Symbol === "function" && o[Symbol.iterator];
46
- if (!m) return o;
47
- var i = m.call(o), r, ar = [], e;
48
- try {
49
- while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
50
- }
51
- catch (error) { e = { error: error }; }
52
- finally {
53
- try {
54
- if (r && !r.done && (m = i["return"])) m.call(i);
55
- }
56
- finally { if (e) throw e.error; }
57
- }
58
- return ar;
59
- };
60
- var __spread = (this && this.__spread) || function () {
61
- for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
62
- return ar;
63
- };
64
17
  Object.defineProperty(exports, "__esModule", { value: true });
65
18
  exports.JsonRpcProxyFactory = exports.JsonRpcConnectionHandler = void 0;
66
- var vscode_jsonrpc_1 = require("vscode-jsonrpc");
67
- var event_1 = require("../util/event");
68
- var logging_1 = require("../util/logging");
69
- var JsonRpcConnectionHandler = /** @class */ (function () {
70
- function JsonRpcConnectionHandler(path, targetFactory) {
19
+ const vscode_jsonrpc_1 = require("vscode-jsonrpc");
20
+ const event_1 = require("../util/event");
21
+ const logging_1 = require("../util/logging");
22
+ class JsonRpcConnectionHandler {
23
+ constructor(path, targetFactory) {
71
24
  this.path = path;
72
25
  this.targetFactory = targetFactory;
73
26
  }
74
- JsonRpcConnectionHandler.prototype.onConnection = function (connection, request) {
75
- var factory = new JsonRpcProxyFactory();
76
- var proxy = factory.createProxy();
27
+ onConnection(connection, request) {
28
+ const factory = new JsonRpcProxyFactory();
29
+ const proxy = factory.createProxy();
77
30
  factory.target = this.targetFactory(proxy, request);
78
31
  factory.listen(connection);
79
- };
80
- return JsonRpcConnectionHandler;
81
- }());
32
+ }
33
+ }
82
34
  exports.JsonRpcConnectionHandler = JsonRpcConnectionHandler;
83
35
  /**
84
36
  * Factory for JSON-RPC proxy objects.
@@ -122,57 +74,45 @@ exports.JsonRpcConnectionHandler = JsonRpcConnectionHandler;
122
74
  *
123
75
  * @param <T> - The type of the object to expose to JSON-RPC.
124
76
  */
125
- var JsonRpcProxyFactory = /** @class */ (function () {
77
+ class JsonRpcProxyFactory {
126
78
  /**
127
79
  * Build a new JsonRpcProxyFactory.
128
80
  *
129
81
  * @param target - The object to expose to JSON-RPC methods calls. If this
130
82
  * is omitted, the proxy won't be able to handle requests, only send them.
131
83
  */
132
- function JsonRpcProxyFactory(target) {
84
+ constructor(target) {
133
85
  this.target = target;
134
86
  this.onDidOpenConnectionEmitter = new event_1.Emitter();
135
87
  this.onDidCloseConnectionEmitter = new event_1.Emitter();
136
88
  this.waitForConnection();
137
89
  }
138
- JsonRpcProxyFactory.prototype.waitForConnection = function () {
139
- var _this = this;
140
- this.connectionPromise = new Promise(function (resolve) {
141
- return _this.connectionPromiseResolve = resolve;
142
- });
143
- this.connectionPromise.then(function (connection) {
144
- connection.onClose(function () {
145
- return _this.onDidCloseConnectionEmitter.fire(undefined);
146
- });
147
- _this.onDidOpenConnectionEmitter.fire(undefined);
90
+ waitForConnection() {
91
+ this.connectionPromise = new Promise(resolve => this.connectionPromiseResolve = resolve);
92
+ this.connectionPromise.then(connection => {
93
+ connection.onClose(() => this.fireConnectionClosed());
94
+ this.fireConnectionOpened();
148
95
  });
149
- };
96
+ }
97
+ fireConnectionClosed() {
98
+ this.onDidCloseConnectionEmitter.fire(undefined);
99
+ }
100
+ fireConnectionOpened() {
101
+ this.onDidOpenConnectionEmitter.fire(undefined);
102
+ }
150
103
  /**
151
104
  * Connect a MessageConnection to the factory.
152
105
  *
153
106
  * This connection will be used to send/receive JSON-RPC requests and
154
107
  * response.
155
108
  */
156
- JsonRpcProxyFactory.prototype.listen = function (connection) {
157
- var _this = this;
158
- connection.onRequest(function (method) {
159
- var params = [];
160
- for (var _i = 1; _i < arguments.length; _i++) {
161
- params[_i - 1] = arguments[_i];
162
- }
163
- return _this.onRequest.apply(_this, __spread([method], params));
164
- });
165
- connection.onNotification(function (method) {
166
- var params = [];
167
- for (var _i = 1; _i < arguments.length; _i++) {
168
- params[_i - 1] = arguments[_i];
169
- }
170
- return _this.onNotification.apply(_this, __spread([method], params));
171
- });
172
- connection.onDispose(function () { return _this.waitForConnection(); });
109
+ listen(connection) {
110
+ connection.onRequest((method, ...params) => this.onRequest(method, ...params));
111
+ connection.onNotification((method, ...params) => this.onNotification(method, ...params));
112
+ connection.onDispose(() => this.waitForConnection());
173
113
  connection.listen();
174
114
  this.connectionPromiseResolve(connection);
175
- };
115
+ }
176
116
  /**
177
117
  * Process an incoming JSON-RPC method call.
178
118
  *
@@ -185,48 +125,33 @@ var JsonRpcProxyFactory = /** @class */ (function () {
185
125
  *
186
126
  * @returns A promise of the method call completion.
187
127
  */
188
- JsonRpcProxyFactory.prototype.onRequest = function (method) {
189
- var args = [];
190
- for (var _i = 1; _i < arguments.length; _i++) {
191
- args[_i - 1] = arguments[_i];
192
- }
193
- return __awaiter(this, void 0, void 0, function () {
194
- var e_1;
195
- var _a;
196
- return __generator(this, function (_b) {
197
- switch (_b.label) {
198
- case 0:
199
- _b.trys.push([0, 2, , 3]);
200
- return [4 /*yield*/, (_a = this.target)[method].apply(_a, __spread(args))];
201
- case 1: return [2 /*return*/, _b.sent()];
202
- case 2:
203
- e_1 = _b.sent();
204
- if (e_1 instanceof vscode_jsonrpc_1.ResponseError) {
205
- logging_1.log.info("Request " + method + " unsuccessful: " + e_1.code + "/\"" + e_1.message + "\"", { method: method, args: args });
206
- }
207
- else {
208
- logging_1.log.error("Request " + method + " failed with internal server error", e_1, { method: method, args: args });
209
- }
210
- throw e_1;
211
- case 3: return [2 /*return*/];
128
+ onRequest(method, ...args) {
129
+ return __awaiter(this, void 0, void 0, function* () {
130
+ try {
131
+ return yield this.target[method](...args);
132
+ }
133
+ catch (e) {
134
+ if (e instanceof vscode_jsonrpc_1.ResponseError) {
135
+ logging_1.log.info(`Request ${method} unsuccessful: ${e.code}/"${e.message}"`, { method, args });
136
+ }
137
+ else {
138
+ logging_1.log.error(`Request ${method} failed with internal server error`, e, { method, args });
212
139
  }
213
- });
140
+ throw e;
141
+ }
214
142
  });
215
- };
143
+ }
216
144
  /**
217
145
  * Process an incoming JSON-RPC notification.
218
146
  *
219
147
  * Same as [[onRequest]], but called on incoming notifications rather than
220
148
  * methods calls.
221
149
  */
222
- JsonRpcProxyFactory.prototype.onNotification = function (method) {
223
- var _a;
224
- var args = [];
225
- for (var _i = 1; _i < arguments.length; _i++) {
226
- args[_i - 1] = arguments[_i];
150
+ onNotification(method, ...args) {
151
+ if (this.target[method]) {
152
+ this.target[method](...args);
227
153
  }
228
- (_a = this.target)[method].apply(_a, __spread(args));
229
- };
154
+ }
230
155
  /**
231
156
  * Create a Proxy exposing the interface of an object of type T. This Proxy
232
157
  * can be used to do JSON-RPC method calls on the remote target object as
@@ -234,10 +159,10 @@ var JsonRpcProxyFactory = /** @class */ (function () {
234
159
  *
235
160
  * If `T` implements `JsonRpcServer` then a client is used as a target object for a remote target object.
236
161
  */
237
- JsonRpcProxyFactory.prototype.createProxy = function () {
238
- var result = new Proxy(this, this);
162
+ createProxy() {
163
+ const result = new Proxy(this, this);
239
164
  return result;
240
- };
165
+ }
241
166
  /**
242
167
  * Get a callable object that executes a JSON-RPC method call.
243
168
  *
@@ -260,11 +185,10 @@ var JsonRpcProxyFactory = /** @class */ (function () {
260
185
  * @param receiver - unused.
261
186
  * @returns A callable that executes the JSON-RPC call.
262
187
  */
263
- JsonRpcProxyFactory.prototype.get = function (target, p, receiver) {
264
- var _this = this;
188
+ get(target, p, receiver) {
265
189
  if (p === 'setClient') {
266
- return function (client) {
267
- _this.target = client;
190
+ return (client) => {
191
+ this.target = client;
268
192
  };
269
193
  }
270
194
  if (p === 'onDidOpenConnection') {
@@ -273,33 +197,25 @@ var JsonRpcProxyFactory = /** @class */ (function () {
273
197
  if (p === 'onDidCloseConnection') {
274
198
  return this.onDidCloseConnectionEmitter.event;
275
199
  }
276
- var isNotify = this.isNotification(p);
277
- return function () {
278
- var args = [];
279
- for (var _i = 0; _i < arguments.length; _i++) {
280
- args[_i] = arguments[_i];
200
+ const isNotify = this.isNotification(p);
201
+ return (...args) => this.connectionPromise.then(connection => new Promise((resolve, reject) => {
202
+ try {
203
+ if (isNotify) {
204
+ connection.sendNotification(p.toString(), ...args);
205
+ resolve(undefined);
206
+ }
207
+ else {
208
+ const resultPromise = connection.sendRequest(p.toString(), ...args);
209
+ resultPromise
210
+ .catch((err) => reject(err))
211
+ .then((result) => resolve(result));
212
+ }
281
213
  }
282
- return _this.connectionPromise.then(function (connection) {
283
- return new Promise(function (resolve, reject) {
284
- try {
285
- if (isNotify) {
286
- connection.sendNotification.apply(connection, __spread([p.toString()], args));
287
- resolve();
288
- }
289
- else {
290
- var resultPromise = connection.sendRequest.apply(connection, __spread([p.toString()], args));
291
- resultPromise
292
- .catch(function (err) { return reject(err); })
293
- .then(function (result) { return resolve(result); });
294
- }
295
- }
296
- catch (err) {
297
- reject(err);
298
- }
299
- });
300
- });
301
- };
302
- };
214
+ catch (err) {
215
+ reject(err);
216
+ }
217
+ }));
218
+ }
303
219
  /**
304
220
  * Return whether the given property represents a notification.
305
221
  *
@@ -309,10 +225,9 @@ var JsonRpcProxyFactory = /** @class */ (function () {
309
225
  * @param p - The property being called on the proxy.
310
226
  * @return Whether `p` represents a notification.
311
227
  */
312
- JsonRpcProxyFactory.prototype.isNotification = function (p) {
228
+ isNotification(p) {
313
229
  return p.toString().startsWith("notify") || p.toString().startsWith("on");
314
- };
315
- return JsonRpcProxyFactory;
316
- }());
230
+ }
231
+ }
317
232
  exports.JsonRpcProxyFactory = JsonRpcProxyFactory;
318
233
  //# sourceMappingURL=proxy-factory.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"proxy-factory.js","sourceRoot":"","sources":["../../src/messaging/proxy-factory.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"proxy-factory.js","sourceRoot":"","sources":["../../src/messaging/proxy-factory.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;AAEH,mDAAkE;AAClE,yCAA+C;AAG/C,6CAAsC;AAiBtC,MAAa,wBAAwB;IACjC,YACa,IAAY,EACZ,aAAgE;QADhE,SAAI,GAAJ,IAAI,CAAQ;QACZ,kBAAa,GAAb,aAAa,CAAmD;IACzE,CAAC;IAEL,YAAY,CAAC,UAA6B,EAAE,OAAgB;QACxD,MAAM,OAAO,GAAG,IAAI,mBAAmB,EAAK,CAAC;QAC7C,MAAM,KAAK,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;QACpC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACpD,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAC/B,CAAC;CACJ;AAZD,4DAYC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,MAAa,mBAAmB;IAQ5B;;;;;OAKG;IACH,YAAmB,MAAY;QAAZ,WAAM,GAAN,MAAM,CAAM;QAZZ,+BAA0B,GAAG,IAAI,eAAO,EAAQ,CAAC;QACjD,gCAA2B,GAAG,IAAI,eAAO,EAAQ,CAAC;QAYjE,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC7B,CAAC;IAES,iBAAiB;QACvB,IAAI,CAAC,iBAAiB,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAC3C,IAAI,CAAC,wBAAwB,GAAG,OAAO,CAC1C,CAAC;QACF,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;YACrC,UAAU,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC;YACtD,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAChC,CAAC,CAAC,CAAC;IACP,CAAC;IAED,oBAAoB;QAChB,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACpD,CAAC;IAED,oBAAoB;QAChB,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACpD,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,UAA6B;QAChC,UAAU,CAAC,SAAS,CAAC,CAAC,MAAc,EAAE,GAAG,MAAa,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC;QAC9F,UAAU,CAAC,cAAc,CAAC,CAAC,MAAc,EAAE,GAAG,MAAa,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC;QACxG,UAAU,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;QACrD,UAAU,CAAC,MAAM,EAAE,CAAC;QACpB,IAAI,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;IAC9C,CAAC;IAED;;;;;;;;;;;OAWG;IACa,SAAS,CAAC,MAAc,EAAE,GAAG,IAAW;;YACpD,IAAI;gBACA,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;aAC7C;YAAC,OAAO,CAAC,EAAE;gBACR,IAAI,CAAC,YAAY,8BAAa,EAAE;oBAC5B,aAAG,CAAC,IAAI,CAAC,WAAW,MAAM,kBAAkB,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,OAAO,GAAG,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;iBAC1F;qBAAM;oBACH,aAAG,CAAC,KAAK,CAAC,WAAW,MAAM,oCAAoC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;iBACzF;gBACD,MAAM,CAAC,CAAC;aACX;QACL,CAAC;KAAA;IAED;;;;;OAKG;IACO,cAAc,CAAC,MAAc,EAAE,GAAG,IAAW;QACnD,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;YACrB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;SAChC;IACL,CAAC;IAED;;;;;;OAMG;IACH,WAAW;QACP,MAAM,MAAM,GAAG,IAAI,KAAK,CAAI,IAAW,EAAE,IAAI,CAAC,CAAC;QAC/C,OAAO,MAAa,CAAC;IACzB,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,GAAG,CAAC,MAAS,EAAE,CAAc,EAAE,QAAa;QACxC,IAAI,CAAC,KAAK,WAAW,EAAE;YACnB,OAAO,CAAC,MAAW,EAAE,EAAE;gBACnB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;YACzB,CAAC,CAAC;SACL;QACD,IAAI,CAAC,KAAK,qBAAqB,EAAE;YAC7B,OAAO,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC;SAChD;QACD,IAAI,CAAC,KAAK,sBAAsB,EAAE;YAC9B,OAAO,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC;SACjD;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;QACxC,OAAO,CAAC,GAAG,IAAW,EAAE,EAAE,CACtB,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CACrC,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC5B,IAAI;gBACA,IAAI,QAAQ,EAAE;oBACV,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;oBACnD,OAAO,CAAC,SAAS,CAAC,CAAC;iBACtB;qBAAM;oBACH,MAAM,aAAa,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,GAAG,IAAI,CAAiB,CAAC;oBACpF,aAAa;yBACR,KAAK,CAAC,CAAC,GAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;yBAChC,IAAI,CAAC,CAAC,MAAW,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;iBAC/C;aACJ;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,CAAC,GAAG,CAAC,CAAC;aACf;QACL,CAAC,CAAC,CACL,CAAC;IACV,CAAC;IAED;;;;;;;;OAQG;IACO,cAAc,CAAC,CAAc;QACnC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAC9E,CAAC;CACJ;AAtKD,kDAsKC"}
@@ -0,0 +1,14 @@
1
+ /**
2
+ * Copyright (c) 2021 Gitpod GmbH. All rights reserved.
3
+ * Licensed under the GNU Affero General Public License (AGPL).
4
+ * See License-AGPL.txt in the project root for license information.
5
+ */
6
+ export interface OssAllowList {
7
+ /**
8
+ * A string that identifies a GitHub/GitLab/Bitbucket identity of the form "<host>/<profilename>"
9
+ * E.g., "github.com/geropl"
10
+ */
11
+ identity: string;
12
+ deleted?: boolean;
13
+ }
14
+ //# sourceMappingURL=oss-allowlist.d.ts.map