@gitpod/gitpod-protocol 0.1.5-tweak-workspaceconfig-origin-docs-fork.0 → 0.1.5-update-yarnlock.0
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.
- package/data/gitpod-schema.json +150 -8
- package/lib/accounting-protocol.d.ts +21 -11
- package/lib/accounting-protocol.d.ts.map +1 -1
- package/lib/accounting-protocol.js +44 -33
- package/lib/accounting-protocol.js.map +1 -1
- package/lib/admin-protocol.d.ts +29 -1
- package/lib/admin-protocol.d.ts.map +1 -1
- package/lib/admin-protocol.js +1 -1
- package/lib/admin-protocol.js.map +1 -1
- package/lib/analytics.d.ts +5 -6
- package/lib/analytics.d.ts.map +1 -1
- package/lib/analytics.js +1 -1
- package/lib/analytics.js.map +1 -1
- package/lib/attribution.d.ts +25 -0
- package/lib/attribution.d.ts.map +1 -0
- package/lib/attribution.js +58 -0
- package/lib/attribution.js.map +1 -0
- package/lib/auth.d.ts +1 -1
- package/lib/auth.d.ts.map +1 -1
- package/lib/auth.js +1 -1
- package/lib/billing-mode.d.ts +45 -0
- package/lib/billing-mode.d.ts.map +1 -0
- package/lib/billing-mode.js +44 -0
- package/lib/billing-mode.js.map +1 -0
- package/lib/blocked-repositories-protocol.d.ts +13 -0
- package/lib/blocked-repositories-protocol.d.ts.map +1 -0
- package/lib/blocked-repositories-protocol.js +8 -0
- package/lib/blocked-repositories-protocol.js.map +1 -0
- package/lib/context-url.d.ts +19 -7
- package/lib/context-url.d.ts.map +1 -1
- package/lib/context-url.js +60 -9
- package/lib/context-url.js.map +1 -1
- package/lib/context-url.spec.d.ts +3 -3
- package/lib/context-url.spec.d.ts.map +1 -1
- package/lib/context-url.spec.js +20 -12
- package/lib/context-url.spec.js.map +1 -1
- package/lib/encryption/container-module.d.ts +1 -1
- package/lib/encryption/container-module.d.ts.map +1 -1
- package/lib/encryption/container-module.js +2 -2
- package/lib/encryption/container-module.js.map +1 -1
- package/lib/encryption/encryption-engine.d.ts +1 -1
- package/lib/encryption/encryption-engine.d.ts.map +1 -1
- package/lib/encryption/encryption-engine.js +10 -10
- package/lib/encryption/encryption-engine.js.map +1 -1
- package/lib/encryption/encryption-engine.spec.d.ts +1 -1
- package/lib/encryption/encryption-engine.spec.d.ts.map +1 -1
- package/lib/encryption/encryption-engine.spec.js +3 -4
- package/lib/encryption/encryption-engine.spec.js.map +1 -1
- package/lib/encryption/encryption-service.d.ts +1 -1
- package/lib/encryption/encryption-service.d.ts.map +1 -1
- package/lib/encryption/encryption-service.js +2 -2
- package/lib/encryption/encryption-service.js.map +1 -1
- package/lib/encryption/key-provider.d.ts +1 -1
- package/lib/encryption/key-provider.d.ts.map +1 -1
- package/lib/encryption/key-provider.js +8 -10
- package/lib/encryption/key-provider.js.map +1 -1
- package/lib/env.d.ts +1 -6
- package/lib/env.d.ts.map +1 -1
- package/lib/env.js +2 -21
- package/lib/env.js.map +1 -1
- package/lib/experiments/always-default.d.ts +8 -0
- package/lib/experiments/always-default.d.ts.map +1 -0
- package/lib/experiments/always-default.js +20 -0
- package/lib/experiments/always-default.js.map +1 -0
- package/lib/experiments/configcat-server.d.ts +10 -0
- package/lib/experiments/configcat-server.d.ts.map +1 -0
- package/lib/experiments/configcat-server.js +37 -0
- package/lib/experiments/configcat-server.js.map +1 -0
- package/lib/experiments/configcat.d.ts +21 -0
- package/lib/experiments/configcat.d.ts.map +1 -0
- package/lib/experiments/configcat.js +51 -0
- package/lib/experiments/configcat.js.map +1 -0
- package/lib/experiments/types.d.ts +22 -0
- package/lib/experiments/types.d.ts.map +1 -0
- package/lib/experiments/types.js +10 -0
- package/lib/experiments/types.js.map +1 -0
- package/lib/frontend-dashboard-service.d.ts +99 -0
- package/lib/frontend-dashboard-service.d.ts.map +1 -0
- package/lib/frontend-dashboard-service.js +55 -0
- package/lib/frontend-dashboard-service.js.map +1 -0
- package/lib/gitpod-file-parser.d.ts +1 -1
- package/lib/gitpod-file-parser.d.ts.map +1 -1
- package/lib/gitpod-file-parser.js +7 -7
- package/lib/gitpod-file-parser.js.map +1 -1
- package/lib/gitpod-file-parser.spec.d.ts +1 -1
- package/lib/gitpod-file-parser.spec.js +43 -40
- package/lib/gitpod-file-parser.spec.js.map +1 -1
- package/lib/gitpod-service.d.ts +143 -51
- package/lib/gitpod-service.d.ts.map +1 -1
- package/lib/gitpod-service.js +78 -36
- package/lib/gitpod-service.js.map +1 -1
- package/lib/headless-workspace-log.d.ts +2 -1
- package/lib/headless-workspace-log.d.ts.map +1 -1
- package/lib/headless-workspace-log.js +3 -2
- package/lib/headless-workspace-log.js.map +1 -1
- package/lib/ide-frontend-service.d.ts +2 -2
- package/lib/ide-frontend-service.js +1 -1
- package/lib/ide-protocol.d.ts +53 -8
- package/lib/ide-protocol.d.ts.map +1 -1
- package/lib/ide-protocol.js +11 -1
- package/lib/ide-protocol.js.map +1 -1
- package/lib/index.d.ts +17 -15
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +4 -2
- package/lib/index.js.map +1 -1
- package/lib/installation-admin-protocol.d.ts +30 -0
- package/lib/installation-admin-protocol.d.ts.map +1 -0
- package/lib/installation-admin-protocol.js +31 -0
- package/lib/installation-admin-protocol.js.map +1 -0
- package/lib/license-protocol.d.ts +8 -1
- package/lib/license-protocol.d.ts.map +1 -1
- package/lib/license-protocol.js +1 -1
- package/lib/license-protocol.js.map +1 -1
- package/lib/messaging/browser/connection.d.ts +1 -1
- package/lib/messaging/browser/connection.d.ts.map +1 -1
- package/lib/messaging/browser/connection.js +19 -19
- package/lib/messaging/browser/connection.js.map +1 -1
- package/lib/messaging/browser/window-connection.d.ts +5 -5
- package/lib/messaging/browser/window-connection.d.ts.map +1 -1
- package/lib/messaging/browser/window-connection.js +10 -7
- package/lib/messaging/browser/window-connection.js.map +1 -1
- package/lib/messaging/client-call-metrics.d.ts +5 -19
- package/lib/messaging/client-call-metrics.d.ts.map +1 -1
- package/lib/messaging/client-call-metrics.js +35 -23
- package/lib/messaging/client-call-metrics.js.map +1 -1
- package/lib/messaging/error.d.ts +12 -2
- package/lib/messaging/error.d.ts.map +1 -1
- package/lib/messaging/error.js +26 -4
- package/lib/messaging/error.js.map +1 -1
- package/lib/messaging/handler.d.ts.map +1 -1
- package/lib/messaging/handler.js +1 -1
- package/lib/messaging/node/connection.d.ts +1 -17
- package/lib/messaging/node/connection.d.ts.map +1 -1
- package/lib/messaging/node/connection.js +23 -59
- package/lib/messaging/node/connection.js.map +1 -1
- package/lib/messaging/proxy-factory.d.ts +1 -1
- package/lib/messaging/proxy-factory.d.ts.map +1 -1
- package/lib/messaging/proxy-factory.js +7 -9
- package/lib/messaging/proxy-factory.js.map +1 -1
- package/lib/oss-allowlist.d.ts +14 -0
- package/lib/oss-allowlist.d.ts.map +1 -0
- package/lib/oss-allowlist.js +8 -0
- package/lib/oss-allowlist.js.map +1 -0
- package/lib/payment-protocol.d.ts +1 -1
- package/lib/payment-protocol.d.ts.map +1 -1
- package/lib/payment-protocol.js +2 -2
- package/lib/payment-protocol.js.map +1 -1
- package/lib/permission.d.ts +13 -4
- package/lib/permission.d.ts.map +1 -1
- package/lib/permission.js +38 -26
- package/lib/permission.js.map +1 -1
- package/lib/plans.d.ts +8 -5
- package/lib/plans.d.ts.map +1 -1
- package/lib/plans.js +227 -172
- package/lib/plans.js.map +1 -1
- package/lib/protocol.d.ts +238 -104
- package/lib/protocol.d.ts.map +1 -1
- package/lib/protocol.js +322 -105
- package/lib/protocol.js.map +1 -1
- package/lib/protocol.spec.d.ts +7 -0
- package/lib/protocol.spec.d.ts.map +1 -0
- package/lib/protocol.spec.js +127 -0
- package/lib/protocol.spec.js.map +1 -0
- package/lib/snapshot-url.d.ts +1 -1
- package/lib/snapshot-url.js +1 -1
- package/lib/snapshot-url.spec.d.ts +1 -1
- package/lib/snapshot-url.spec.js +1 -1
- package/lib/snapshot-url.spec.js.map +1 -1
- package/lib/team-subscription-protocol.d.ts +24 -4
- package/lib/team-subscription-protocol.d.ts.map +1 -1
- package/lib/team-subscription-protocol.js +25 -6
- package/lib/team-subscription-protocol.js.map +1 -1
- package/lib/teams-projects-protocol.d.ts +39 -6
- package/lib/teams-projects-protocol.d.ts.map +1 -1
- package/lib/teams-projects-protocol.js +21 -3
- package/lib/teams-projects-protocol.js.map +1 -1
- package/lib/typings/globals.d.ts +7 -3
- package/lib/typings/globals.d.ts.map +1 -1
- package/lib/typings/globals.js +1 -1
- package/lib/usage.d.ts +73 -0
- package/lib/usage.d.ts.map +1 -0
- package/lib/usage.js +20 -0
- package/lib/usage.js.map +1 -0
- package/lib/util/analytics.d.ts +1 -1
- package/lib/util/analytics.d.ts.map +1 -1
- package/lib/util/analytics.js +13 -4
- package/lib/util/analytics.js.map +1 -1
- package/lib/util/async-iterator.d.ts +1 -1
- package/lib/util/async-iterator.d.ts.map +1 -1
- package/lib/util/async-iterator.js +4 -4
- package/lib/util/async-iterator.js.map +1 -1
- package/lib/util/cancelable.d.ts +1 -1
- package/lib/util/cancelable.js +1 -1
- package/lib/util/cancelable.js.map +1 -1
- package/lib/util/date-time.d.ts +1 -1
- package/lib/util/date-time.js +7 -7
- package/lib/util/date-time.js.map +1 -1
- package/lib/util/debug-app.d.ts +25 -0
- package/lib/util/debug-app.d.ts.map +1 -0
- package/lib/util/debug-app.js +100 -0
- package/lib/util/debug-app.js.map +1 -0
- package/lib/util/deep-partial.d.ts +1 -1
- package/lib/util/deep-partial.js +1 -1
- package/lib/util/deferred.d.ts +1 -1
- package/lib/util/deferred.js +1 -1
- package/lib/util/deferred.js.map +1 -1
- package/lib/util/disposable.d.ts.map +1 -1
- package/lib/util/disposable.js +2 -2
- package/lib/util/disposable.js.map +1 -1
- package/lib/util/event.d.ts.map +1 -1
- package/lib/util/event.js +5 -3
- package/lib/util/event.js.map +1 -1
- package/lib/util/garbage-collected-cache.d.ts +2 -1
- package/lib/util/garbage-collected-cache.d.ts.map +1 -1
- package/lib/util/garbage-collected-cache.js +12 -3
- package/lib/util/garbage-collected-cache.js.map +1 -1
- package/lib/util/generate-workspace-id.d.ts +6 -1
- package/lib/util/generate-workspace-id.d.ts.map +1 -1
- package/lib/util/generate-workspace-id.js +461 -440
- package/lib/util/generate-workspace-id.js.map +1 -1
- package/lib/util/generate-workspace-id.spec.d.ts +1 -1
- package/lib/util/generate-workspace-id.spec.js +37 -2
- package/lib/util/generate-workspace-id.spec.js.map +1 -1
- package/lib/util/gitpod-cookie.d.ts +2 -2
- package/lib/util/gitpod-cookie.d.ts.map +1 -1
- package/lib/util/gitpod-cookie.js +1 -4
- package/lib/util/gitpod-cookie.js.map +1 -1
- package/lib/util/gitpod-host-url.d.ts +12 -5
- package/lib/util/gitpod-host-url.d.ts.map +1 -1
- package/lib/util/gitpod-host-url.js +69 -41
- package/lib/util/gitpod-host-url.js.map +1 -1
- package/lib/util/gitpod-host-url.spec.d.ts +1 -1
- package/lib/util/gitpod-host-url.spec.d.ts.map +1 -1
- package/lib/util/gitpod-host-url.spec.js +16 -6
- package/lib/util/gitpod-host-url.spec.js.map +1 -1
- package/lib/util/grpc.d.ts +21 -1
- package/lib/util/grpc.d.ts.map +1 -1
- package/lib/util/grpc.js +74 -2
- package/lib/util/grpc.js.map +1 -1
- package/lib/util/jaeger-client-types.d.ts +68 -0
- package/lib/util/jaeger-client-types.d.ts.map +1 -0
- package/lib/{theia-plugins.js → util/jaeger-client-types.js} +2 -2
- package/lib/util/jaeger-client-types.js.map +1 -0
- package/lib/util/logging.d.ts +2 -2
- package/lib/util/logging.d.ts.map +1 -1
- package/lib/util/logging.js +32 -26
- package/lib/util/logging.js.map +1 -1
- package/lib/util/logging.spec.d.ts +7 -0
- package/lib/util/logging.spec.d.ts.map +1 -0
- package/lib/util/logging.spec.js +52 -0
- package/lib/util/logging.spec.js.map +1 -0
- package/lib/util/make-link.d.ts +1 -1
- package/lib/util/make-link.js +6 -6
- package/lib/util/make-link.js.map +1 -1
- package/lib/util/nice-grpc.d.ts +9 -0
- package/lib/util/nice-grpc.d.ts.map +1 -0
- package/lib/util/nice-grpc.js +121 -0
- package/lib/util/nice-grpc.js.map +1 -0
- package/lib/util/parse-workspace-id.d.ts +1 -1
- package/lib/util/parse-workspace-id.d.ts.map +1 -1
- package/lib/util/parse-workspace-id.js +3 -4
- package/lib/util/parse-workspace-id.js.map +1 -1
- package/lib/util/parse-workspace-id.spec.d.ts +1 -1
- package/lib/util/parse-workspace-id.spec.d.ts.map +1 -1
- package/lib/util/parse-workspace-id.spec.js +1 -1
- package/lib/util/parse-workspace-id.spec.js.map +1 -1
- package/lib/util/queue.d.ts +1 -1
- package/lib/util/queue.js +1 -1
- package/lib/util/queue.spec.d.ts +1 -1
- package/lib/util/queue.spec.js +10 -7
- package/lib/util/queue.spec.js.map +1 -1
- package/lib/util/repeat.d.ts +15 -0
- package/lib/util/repeat.d.ts.map +1 -0
- package/lib/util/repeat.js +55 -0
- package/lib/util/repeat.js.map +1 -0
- package/lib/util/semaphore.d.ts +1 -1
- package/lib/util/semaphore.d.ts.map +1 -1
- package/lib/util/semaphore.js +1 -1
- package/lib/util/semaphore.js.map +1 -1
- package/lib/util/skip-if.d.ts +1 -1
- package/lib/util/skip-if.d.ts.map +1 -1
- package/lib/util/skip-if.js +1 -1
- package/lib/util/skip-if.js.map +1 -1
- package/lib/util/timeutil.d.ts +3 -1
- package/lib/util/timeutil.d.ts.map +1 -1
- package/lib/util/timeutil.js +16 -4
- package/lib/util/timeutil.js.map +1 -1
- package/lib/util/timeutil.spec.d.ts +3 -1
- package/lib/util/timeutil.spec.d.ts.map +1 -1
- package/lib/util/timeutil.spec.js +35 -1
- package/lib/util/timeutil.spec.js.map +1 -1
- package/lib/util/tracing.d.ts +47 -13
- package/lib/util/tracing.d.ts.map +1 -1
- package/lib/util/tracing.js +141 -32
- package/lib/util/tracing.js.map +1 -1
- package/lib/util/tracing.spec.d.ts +7 -0
- package/lib/util/tracing.spec.d.ts.map +1 -0
- package/lib/util/tracing.spec.js +121 -0
- package/lib/util/tracing.spec.js.map +1 -0
- package/lib/util/workspace-port-authentication.d.ts +8 -8
- package/lib/util/workspace-port-authentication.d.ts.map +1 -1
- package/lib/util/workspace-port-authentication.js +9 -12
- package/lib/util/workspace-port-authentication.js.map +1 -1
- package/lib/webhook-event.d.ts +44 -0
- package/lib/webhook-event.d.ts.map +1 -0
- package/lib/webhook-event.js +8 -0
- package/lib/webhook-event.js.map +1 -0
- package/lib/workspace-class.d.ts +14 -0
- package/lib/workspace-class.d.ts.map +1 -0
- package/lib/workspace-class.js +8 -0
- package/lib/workspace-class.js.map +1 -0
- package/lib/workspace-cluster.d.ts +24 -18
- package/lib/workspace-cluster.d.ts.map +1 -1
- package/lib/workspace-cluster.js +22 -2
- package/lib/workspace-cluster.js.map +1 -1
- package/lib/workspace-instance.d.ts +41 -4
- package/lib/workspace-instance.d.ts.map +1 -1
- package/lib/workspace-instance.js +1 -1
- package/lib/wsready.d.ts +8 -2
- package/lib/wsready.d.ts.map +1 -1
- package/lib/wsready.js +3 -3
- package/package.json +18 -8
- package/pkg-yarn.lock +11 -6
- package/provenance-bundle.jsonl +2 -0
- package/src/accounting-protocol.ts +76 -52
- package/src/admin-protocol.ts +59 -19
- package/src/analytics.ts +27 -29
- package/src/attribution.ts +67 -0
- package/src/auth.ts +3 -3
- package/src/billing-mode.ts +84 -0
- package/src/blocked-repositories-protocol.ts +13 -0
- package/src/context-url.spec.ts +25 -15
- package/src/context-url.ts +93 -37
- package/src/encryption/container-module.ts +3 -4
- package/src/encryption/encryption-engine.spec.ts +10 -9
- package/src/encryption/encryption-engine.ts +21 -17
- package/src/encryption/encryption-service.ts +5 -6
- package/src/encryption/key-provider.ts +17 -20
- package/src/env.ts +2 -25
- package/src/experiments/always-default.ts +24 -0
- package/src/experiments/configcat-server.ts +42 -0
- package/src/experiments/configcat.ts +56 -0
- package/src/experiments/types.ts +34 -0
- package/src/frontend-dashboard-service.ts +148 -0
- package/src/gitpod-file-parser.spec.ts +56 -62
- package/src/gitpod-file-parser.ts +17 -18
- package/src/gitpod-service.ts +315 -136
- package/src/headless-workspace-log.ts +7 -5
- package/src/ide-frontend-service.ts +3 -3
- package/src/ide-protocol.ts +63 -8
- package/src/index.ts +17 -15
- package/src/installation-admin-protocol.ts +45 -0
- package/src/license-protocol.ts +13 -7
- package/src/messaging/browser/connection.ts +45 -47
- package/src/messaging/browser/window-connection.ts +40 -30
- package/src/messaging/client-call-metrics.ts +79 -82
- package/src/messaging/error.ts +37 -8
- package/src/messaging/handler.ts +6 -6
- package/src/messaging/node/connection.ts +23 -70
- package/src/messaging/proxy-factory.ts +23 -30
- package/src/oss-allowlist.ts +15 -0
- package/src/payment-protocol.ts +3 -3
- package/src/permission.ts +45 -33
- package/src/plans.ts +257 -190
- package/src/protocol.spec.ts +97 -0
- package/src/protocol.ts +650 -305
- package/src/snapshot-url.spec.ts +10 -8
- package/src/snapshot-url.ts +1 -1
- package/src/team-subscription-protocol.ts +63 -23
- package/src/teams-projects-protocol.ts +60 -12
- package/src/typings/globals.ts +12 -5
- package/src/usage.ts +85 -0
- package/src/util/analytics.ts +47 -25
- package/src/util/async-iterator.ts +5 -6
- package/src/util/cancelable.ts +4 -4
- package/src/util/date-time.ts +9 -9
- package/src/util/debug-app.ts +81 -0
- package/src/util/deep-partial.ts +1 -1
- package/src/util/deferred.ts +7 -7
- package/src/util/disposable.ts +3 -6
- package/src/util/event.ts +9 -11
- package/src/util/garbage-collected-cache.ts +15 -7
- package/src/util/generate-workspace-id.spec.ts +35 -8
- package/src/util/generate-workspace-id.ts +465 -441
- package/src/util/gitpod-cookie.ts +9 -10
- package/src/util/gitpod-host-url.spec.ts +41 -14
- package/src/util/gitpod-host-url.ts +81 -46
- package/src/util/grpc.ts +94 -2
- package/src/util/jaeger-client-types.ts +102 -0
- package/src/util/logging.spec.ts +23 -0
- package/src/util/logging.ts +61 -43
- package/src/util/make-link.ts +7 -8
- package/src/util/nice-grpc.ts +96 -0
- package/src/util/parse-workspace-id.spec.ts +18 -9
- package/src/util/parse-workspace-id.ts +7 -8
- package/src/util/queue.spec.ts +28 -26
- package/src/util/queue.ts +1 -1
- package/src/util/repeat.ts +45 -0
- package/src/util/semaphore.ts +5 -7
- package/src/util/skip-if.ts +10 -7
- package/src/util/timeutil.spec.ts +41 -15
- package/src/util/timeutil.ts +28 -12
- package/src/util/tracing.spec.ts +88 -0
- package/src/util/tracing.ts +175 -59
- package/src/util/workspace-port-authentication.ts +11 -14
- package/src/webhook-event.ts +55 -0
- package/src/workspace-class.ts +14 -0
- package/src/workspace-cluster.ts +46 -21
- package/src/workspace-instance.ts +84 -22
- package/src/wsready.ts +11 -4
- package/data/builtin-theia-plugins.json +0 -372
- package/lib/email-protocol.d.ts +0 -49
- package/lib/email-protocol.d.ts.map +0 -1
- package/lib/email-protocol.js +0 -28
- package/lib/email-protocol.js.map +0 -1
- package/lib/messaging/connection-error-handler.d.ts +0 -27
- package/lib/messaging/connection-error-handler.d.ts.map +0 -1
- package/lib/messaging/connection-error-handler.js +0 -34
- package/lib/messaging/connection-error-handler.js.map +0 -1
- package/lib/theia-plugins.d.ts +0 -11
- package/lib/theia-plugins.d.ts.map +0 -1
- package/lib/theia-plugins.js.map +0 -1
- package/lib/util/repeater.d.ts +0 -22
- package/lib/util/repeater.d.ts.map +0 -1
- package/lib/util/repeater.js +0 -65
- package/lib/util/repeater.js.map +0 -1
- package/lib/util/safe-promise.d.ts +0 -11
- package/lib/util/safe-promise.d.ts.map +0 -1
- package/lib/util/safe-promise.js +0 -31
- package/lib/util/safe-promise.js.map +0 -1
- package/src/email-protocol.ts +0 -66
- package/src/messaging/connection-error-handler.ts +0 -62
- package/src/theia-plugins.ts +0 -11
- package/src/util/jaeger-client.d.ts +0 -105
- package/src/util/repeater.ts +0 -49
- package/src/util/safe-promise.ts +0 -26
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Copyright (c) 2020 Gitpod GmbH. All rights reserved.
|
|
3
3
|
* Licensed under the GNU Affero General Public License (AGPL).
|
|
4
|
-
* See License
|
|
4
|
+
* See License.AGPL.txt in the project root for license information.
|
|
5
5
|
*/
|
|
6
|
-
import { Message } from
|
|
7
|
-
import { AbstractMessageWriter, MessageWriter } from
|
|
8
|
-
import { AbstractMessageReader, MessageReader, DataCallback } from
|
|
9
|
-
import { MessageConnection } from
|
|
6
|
+
import { Message } from "vscode-jsonrpc/lib/messages";
|
|
7
|
+
import { AbstractMessageWriter, MessageWriter } from "vscode-jsonrpc/lib/messageWriter";
|
|
8
|
+
import { AbstractMessageReader, MessageReader, DataCallback } from "vscode-jsonrpc/lib/messageReader";
|
|
9
|
+
import { MessageConnection } from "vscode-jsonrpc/lib/main";
|
|
10
10
|
export declare class WindowMessageWriter extends AbstractMessageWriter implements MessageWriter {
|
|
11
11
|
readonly serviceId: string;
|
|
12
12
|
readonly window: Window;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"window-connection.d.ts","sourceRoot":"","sources":["../../../src/messaging/browser/window-connection.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACxF,OAAO,EAAE,qBAAqB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AACtG,OAAO,EAAE,iBAAiB,EAA2B,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"window-connection.d.ts","sourceRoot":"","sources":["../../../src/messaging/browser/window-connection.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACxF,OAAO,EAAE,qBAAqB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AACtG,OAAO,EAAE,iBAAiB,EAA2B,MAAM,yBAAyB,CAAC;AAiBrF,qBAAa,mBAAoB,SAAQ,qBAAsB,YAAW,aAAa;IACvE,QAAQ,CAAC,SAAS,EAAE,MAAM;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM;IAAE,QAAQ,CAAC,YAAY,EAAE,MAAM;gBAAzE,SAAS,EAAE,MAAM,EAAW,MAAM,EAAE,MAAM,EAAW,YAAY,EAAE,MAAM;IAI9F,KAAK,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;CAI5B;AAED,qBAAa,mBAAoB,SAAQ,qBAAsB,YAAW,aAAa;IAIvE,QAAQ,CAAC,SAAS,EAAE,MAAM;IAAE,QAAQ,CAAC,YAAY,EAAE,MAAM;IAHrE,SAAS,CAAC,QAAQ,CAAC,EAAE,YAAY,CAAC;IAClC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,CAAM;gBAErB,SAAS,EAAE,MAAM,EAAW,YAAY,EAAE,MAAM;IAqBrE,MAAM,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;CAQvC;AAED,wBAAgB,6BAA6B,CACzC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,YAAY,SAAe,GAC5B,iBAAiB,CAInB"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/**
|
|
3
3
|
* Copyright (c) 2020 Gitpod GmbH. All rights reserved.
|
|
4
4
|
* Licensed under the GNU Affero General Public License (AGPL).
|
|
5
|
-
* See License
|
|
5
|
+
* See License.AGPL.txt in the project root for license information.
|
|
6
6
|
*/
|
|
7
7
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
8
|
exports.createWindowMessageConnection = exports.WindowMessageReader = exports.WindowMessageWriter = void 0;
|
|
@@ -11,9 +11,12 @@ const messageReader_1 = require("vscode-jsonrpc/lib/messageReader");
|
|
|
11
11
|
const main_1 = require("vscode-jsonrpc/lib/main");
|
|
12
12
|
const vscode_ws_jsonrpc_1 = require("vscode-ws-jsonrpc");
|
|
13
13
|
function isWindowMessage(value) {
|
|
14
|
-
return !!value &&
|
|
15
|
-
|
|
16
|
-
|
|
14
|
+
return (!!value &&
|
|
15
|
+
typeof value === "object" &&
|
|
16
|
+
"jsonrpc" in value &&
|
|
17
|
+
typeof value["jsonrpc"] === "string" &&
|
|
18
|
+
"serviceId" in value &&
|
|
19
|
+
typeof value["serviceId"] === "string");
|
|
17
20
|
}
|
|
18
21
|
class WindowMessageWriter extends messageWriter_1.AbstractMessageWriter {
|
|
19
22
|
constructor(serviceId, window, targetOrigin) {
|
|
@@ -34,8 +37,8 @@ class WindowMessageReader extends messageReader_1.AbstractMessageReader {
|
|
|
34
37
|
this.serviceId = serviceId;
|
|
35
38
|
this.sourceOrigin = sourceOrigin;
|
|
36
39
|
this.buffer = [];
|
|
37
|
-
window.addEventListener(
|
|
38
|
-
if (this.sourceOrigin !==
|
|
40
|
+
window.addEventListener("message", (event) => {
|
|
41
|
+
if (this.sourceOrigin !== "*" && event.origin !== this.sourceOrigin) {
|
|
39
42
|
return;
|
|
40
43
|
}
|
|
41
44
|
if (!isWindowMessage(event.data) || event.data.serviceId !== this.serviceId) {
|
|
@@ -51,7 +54,7 @@ class WindowMessageReader extends messageReader_1.AbstractMessageReader {
|
|
|
51
54
|
}
|
|
52
55
|
listen(callback) {
|
|
53
56
|
let message;
|
|
54
|
-
while (message = this.buffer.pop()) {
|
|
57
|
+
while ((message = this.buffer.pop())) {
|
|
55
58
|
callback(message);
|
|
56
59
|
}
|
|
57
60
|
Object.freeze(this.buffer);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"window-connection.js","sourceRoot":"","sources":["../../../src/messaging/browser/window-connection.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAGH,oEAAwF;AACxF,oEAAsG;AACtG,kDAAqF;AACrF,yDAAkD;AAKlD,SAAS,eAAe,CAAC,KAAU;IAC/B,OAAO,CAAC,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"window-connection.js","sourceRoot":"","sources":["../../../src/messaging/browser/window-connection.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAGH,oEAAwF;AACxF,oEAAsG;AACtG,kDAAqF;AACrF,yDAAkD;AAKlD,SAAS,eAAe,CAAC,KAAU;IAC/B,OAAO,CACH,CAAC,CAAC,KAAK;QACP,OAAO,KAAK,KAAK,QAAQ;QACzB,SAAS,IAAI,KAAK;QAClB,OAAO,KAAK,CAAC,SAAS,CAAC,KAAK,QAAQ;QACpC,WAAW,IAAI,KAAK;QACpB,OAAO,KAAK,CAAC,WAAW,CAAC,KAAK,QAAQ,CACzC,CAAC;AACN,CAAC;AAED,MAAa,mBAAoB,SAAQ,qCAAqB;IAC1D,YAAqB,SAAiB,EAAW,MAAc,EAAW,YAAoB;QAC1F,KAAK,EAAE,CAAC;QADS,cAAS,GAAT,SAAS,CAAQ;QAAW,WAAM,GAAN,MAAM,CAAQ;QAAW,iBAAY,GAAZ,YAAY,CAAQ;IAE9F,CAAC;IAED,KAAK,CAAC,GAAY;QACd,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAClF,CAAC;CACJ;AATD,kDASC;AAED,MAAa,mBAAoB,SAAQ,qCAAqB;IAI1D,YAAqB,SAAiB,EAAW,YAAoB;QACjE,KAAK,EAAE,CAAC;QADS,cAAS,GAAT,SAAS,CAAQ;QAAW,iBAAY,GAAZ,YAAY,CAAQ;QAFlD,WAAM,GAAc,EAAE,CAAC;QAItC,MAAM,CAAC,gBAAgB,CACnB,SAAS,EACT,CAAC,KAAK,EAAE,EAAE;YACN,IAAI,IAAI,CAAC,YAAY,KAAK,GAAG,IAAI,KAAK,CAAC,MAAM,KAAK,IAAI,CAAC,YAAY,EAAE;gBACjE,OAAO;aACV;YACD,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC,SAAS,EAAE;gBACzE,OAAO;aACV;YACD,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACf,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aAC7B;iBAAM;gBACH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aAChC;QACL,CAAC,EACD,KAAK,CACR,CAAC;IACN,CAAC;IAED,MAAM,CAAC,QAAsB;QACzB,IAAI,OAAO,CAAC;QACZ,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE;YAClC,QAAQ,CAAC,OAAO,CAAC,CAAC;SACrB;QACD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;CACJ;AAjCD,kDAiCC;AAED,SAAgB,6BAA6B,CACzC,SAAiB,EACjB,MAAc,EACd,YAAoB,EACpB,YAAY,GAAG,YAAY;IAE3B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IAChE,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;IACxE,OAAO,IAAA,8BAAuB,EAAC,MAAM,EAAE,MAAM,EAAE,IAAI,iCAAa,EAAE,CAAC,CAAC;AACxE,CAAC;AATD,sEASC"}
|
|
@@ -1,35 +1,21 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Copyright (c) 2021 Gitpod GmbH. All rights reserved.
|
|
3
3
|
* Licensed under the GNU Affero General Public License (AGPL).
|
|
4
|
-
* See License
|
|
4
|
+
* See License.AGPL.txt in the project root for license information.
|
|
5
5
|
*/
|
|
6
|
-
import * as prometheusClient from
|
|
7
|
-
|
|
8
|
-
export interface IGrpcCallMetricsLabels {
|
|
9
|
-
service: string;
|
|
10
|
-
method: string;
|
|
11
|
-
type: GrpcMethodType;
|
|
12
|
-
}
|
|
13
|
-
export interface IGrpcCallMetricsLabelsWithCode extends IGrpcCallMetricsLabels {
|
|
14
|
-
code: string;
|
|
15
|
-
}
|
|
16
|
-
export declare const IClientCallMetrics: unique symbol;
|
|
17
|
-
export interface IClientCallMetrics {
|
|
18
|
-
started(labels: IGrpcCallMetricsLabels): void;
|
|
19
|
-
sent(labels: IGrpcCallMetricsLabels): void;
|
|
20
|
-
received(labels: IGrpcCallMetricsLabels): void;
|
|
21
|
-
handled(labels: IGrpcCallMetricsLabelsWithCode): void;
|
|
22
|
-
}
|
|
6
|
+
import * as prometheusClient from "prom-client";
|
|
7
|
+
import { IClientCallMetrics, IGrpcCallMetricsLabels, IGrpcCallMetricsLabelsWithCode } from "../util/grpc";
|
|
23
8
|
export declare class PrometheusClientCallMetrics implements IClientCallMetrics {
|
|
24
9
|
readonly startedCounter: prometheusClient.Counter<string>;
|
|
25
10
|
readonly sentCounter: prometheusClient.Counter<string>;
|
|
26
11
|
readonly receivedCounter: prometheusClient.Counter<string>;
|
|
27
12
|
readonly handledCounter: prometheusClient.Counter<string>;
|
|
13
|
+
readonly handledSecondsHistogram: prometheusClient.Histogram<string>;
|
|
28
14
|
constructor();
|
|
29
15
|
started(labels: IGrpcCallMetricsLabels): void;
|
|
30
16
|
sent(labels: IGrpcCallMetricsLabels): void;
|
|
31
17
|
received(labels: IGrpcCallMetricsLabels): void;
|
|
32
18
|
handled(labels: IGrpcCallMetricsLabelsWithCode): void;
|
|
19
|
+
startHandleTimer(labels: IGrpcCallMetricsLabelsWithCode): (labels?: Partial<Record<string, string | number>> | undefined) => number;
|
|
33
20
|
}
|
|
34
|
-
export {};
|
|
35
21
|
//# sourceMappingURL=client-call-metrics.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-call-metrics.d.ts","sourceRoot":"","sources":["../../src/messaging/client-call-metrics.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,gBAAgB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"client-call-metrics.d.ts","sourceRoot":"","sources":["../../src/messaging/client-call-metrics.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,gBAAgB,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,8BAA8B,EAAE,MAAM,cAAc,CAAC;AAE1G,qBACa,2BAA4B,YAAW,kBAAkB;IAClE,QAAQ,CAAC,cAAc,EAAE,gBAAgB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1D,QAAQ,CAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACvD,QAAQ,CAAC,eAAe,EAAE,gBAAgB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC3D,QAAQ,CAAC,cAAc,EAAE,gBAAgB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1D,QAAQ,CAAC,uBAAuB,EAAE,gBAAgB,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;;IAmCrE,OAAO,CAAC,MAAM,EAAE,sBAAsB,GAAG,IAAI;IAQ7C,IAAI,CAAC,MAAM,EAAE,sBAAsB,GAAG,IAAI;IAQ1C,QAAQ,CAAC,MAAM,EAAE,sBAAsB,GAAG,IAAI;IAQ9C,OAAO,CAAC,MAAM,EAAE,8BAA8B,GAAG,IAAI;IASrD,gBAAgB,CACZ,MAAM,EAAE,8BAA8B,GACvC,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC,GAAG,SAAS,KAAK,MAAM;CAO/E"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/**
|
|
3
3
|
* Copyright (c) 2021 Gitpod GmbH. All rights reserved.
|
|
4
4
|
* Licensed under the GNU Affero General Public License (AGPL).
|
|
5
|
-
* See License
|
|
5
|
+
* See License.AGPL.txt in the project root for license information.
|
|
6
6
|
*/
|
|
7
7
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
8
8
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
@@ -14,56 +14,61 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
14
14
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.PrometheusClientCallMetrics =
|
|
17
|
+
exports.PrometheusClientCallMetrics = void 0;
|
|
18
18
|
const inversify_1 = require("inversify");
|
|
19
19
|
const prometheusClient = require("prom-client");
|
|
20
|
-
exports.IClientCallMetrics = Symbol("IClientCallMetrics");
|
|
21
20
|
let PrometheusClientCallMetrics = class PrometheusClientCallMetrics {
|
|
22
21
|
constructor() {
|
|
23
22
|
this.startedCounter = new prometheusClient.Counter({
|
|
24
|
-
name:
|
|
25
|
-
help:
|
|
26
|
-
labelNames: [
|
|
27
|
-
registers: [prometheusClient.register]
|
|
23
|
+
name: "grpc_client_started_total",
|
|
24
|
+
help: "Total number of RPCs started on the client.",
|
|
25
|
+
labelNames: ["grpc_service", "grpc_method", "grpc_type"],
|
|
26
|
+
registers: [prometheusClient.register],
|
|
28
27
|
});
|
|
29
28
|
this.sentCounter = new prometheusClient.Counter({
|
|
30
|
-
name:
|
|
31
|
-
help:
|
|
32
|
-
labelNames: [
|
|
33
|
-
registers: [prometheusClient.register]
|
|
29
|
+
name: "grpc_client_msg_sent_total",
|
|
30
|
+
help: " Total number of gRPC stream messages sent by the client.",
|
|
31
|
+
labelNames: ["grpc_service", "grpc_method", "grpc_type"],
|
|
32
|
+
registers: [prometheusClient.register],
|
|
34
33
|
});
|
|
35
34
|
this.receivedCounter = new prometheusClient.Counter({
|
|
36
|
-
name:
|
|
37
|
-
help:
|
|
38
|
-
labelNames: [
|
|
39
|
-
registers: [prometheusClient.register]
|
|
35
|
+
name: "grpc_client_msg_received_total",
|
|
36
|
+
help: "Total number of RPC stream messages received by the client.",
|
|
37
|
+
labelNames: ["grpc_service", "grpc_method", "grpc_type"],
|
|
38
|
+
registers: [prometheusClient.register],
|
|
40
39
|
});
|
|
41
40
|
this.handledCounter = new prometheusClient.Counter({
|
|
42
|
-
name:
|
|
43
|
-
help:
|
|
44
|
-
labelNames: [
|
|
45
|
-
registers: [prometheusClient.register]
|
|
41
|
+
name: "grpc_client_handled_total",
|
|
42
|
+
help: "Total number of RPCs completed by the client, regardless of success or failure.",
|
|
43
|
+
labelNames: ["grpc_service", "grpc_method", "grpc_type", "grpc_code"],
|
|
44
|
+
registers: [prometheusClient.register],
|
|
45
|
+
});
|
|
46
|
+
this.handledSecondsHistogram = new prometheusClient.Histogram({
|
|
47
|
+
name: "grpc_client_handling_seconds",
|
|
48
|
+
help: "Histogram of response latency (seconds) of the gRPC until it is finished by the application.",
|
|
49
|
+
labelNames: ["grpc_service", "grpc_method", "grpc_type", "grpc_code"],
|
|
50
|
+
registers: [prometheusClient.register],
|
|
46
51
|
});
|
|
47
52
|
}
|
|
48
53
|
started(labels) {
|
|
49
54
|
this.startedCounter.inc({
|
|
50
55
|
grpc_service: labels.service,
|
|
51
56
|
grpc_method: labels.method,
|
|
52
|
-
grpc_type: labels.type
|
|
57
|
+
grpc_type: labels.type,
|
|
53
58
|
});
|
|
54
59
|
}
|
|
55
60
|
sent(labels) {
|
|
56
61
|
this.sentCounter.inc({
|
|
57
62
|
grpc_service: labels.service,
|
|
58
63
|
grpc_method: labels.method,
|
|
59
|
-
grpc_type: labels.type
|
|
64
|
+
grpc_type: labels.type,
|
|
60
65
|
});
|
|
61
66
|
}
|
|
62
67
|
received(labels) {
|
|
63
68
|
this.receivedCounter.inc({
|
|
64
69
|
grpc_service: labels.service,
|
|
65
70
|
grpc_method: labels.method,
|
|
66
|
-
grpc_type: labels.type
|
|
71
|
+
grpc_type: labels.type,
|
|
67
72
|
});
|
|
68
73
|
}
|
|
69
74
|
handled(labels) {
|
|
@@ -71,7 +76,14 @@ let PrometheusClientCallMetrics = class PrometheusClientCallMetrics {
|
|
|
71
76
|
grpc_service: labels.service,
|
|
72
77
|
grpc_method: labels.method,
|
|
73
78
|
grpc_type: labels.type,
|
|
74
|
-
grpc_code: labels.code
|
|
79
|
+
grpc_code: labels.code,
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
startHandleTimer(labels) {
|
|
83
|
+
return this.handledSecondsHistogram.startTimer({
|
|
84
|
+
grpc_service: labels.service,
|
|
85
|
+
grpc_method: labels.method,
|
|
86
|
+
grpc_type: labels.type,
|
|
75
87
|
});
|
|
76
88
|
}
|
|
77
89
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-call-metrics.js","sourceRoot":"","sources":["../../src/messaging/client-call-metrics.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;AAEH,yCAAuC;AACvC,gDAAgD;
|
|
1
|
+
{"version":3,"file":"client-call-metrics.js","sourceRoot":"","sources":["../../src/messaging/client-call-metrics.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;AAEH,yCAAuC;AACvC,gDAAgD;AAIhD,IAAa,2BAA2B,GAAxC,MAAa,2BAA2B;IAOpC;QACI,IAAI,CAAC,cAAc,GAAG,IAAI,gBAAgB,CAAC,OAAO,CAAC;YAC/C,IAAI,EAAE,2BAA2B;YACjC,IAAI,EAAE,6CAA6C;YACnD,UAAU,EAAE,CAAC,cAAc,EAAE,aAAa,EAAE,WAAW,CAAC;YACxD,SAAS,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC;SACzC,CAAC,CAAC;QACH,IAAI,CAAC,WAAW,GAAG,IAAI,gBAAgB,CAAC,OAAO,CAAC;YAC5C,IAAI,EAAE,4BAA4B;YAClC,IAAI,EAAE,2DAA2D;YACjE,UAAU,EAAE,CAAC,cAAc,EAAE,aAAa,EAAE,WAAW,CAAC;YACxD,SAAS,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC;SACzC,CAAC,CAAC;QACH,IAAI,CAAC,eAAe,GAAG,IAAI,gBAAgB,CAAC,OAAO,CAAC;YAChD,IAAI,EAAE,gCAAgC;YACtC,IAAI,EAAE,6DAA6D;YACnE,UAAU,EAAE,CAAC,cAAc,EAAE,aAAa,EAAE,WAAW,CAAC;YACxD,SAAS,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC;SACzC,CAAC,CAAC;QACH,IAAI,CAAC,cAAc,GAAG,IAAI,gBAAgB,CAAC,OAAO,CAAC;YAC/C,IAAI,EAAE,2BAA2B;YACjC,IAAI,EAAE,iFAAiF;YACvF,UAAU,EAAE,CAAC,cAAc,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,CAAC;YACrE,SAAS,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC;SACzC,CAAC,CAAC;QACH,IAAI,CAAC,uBAAuB,GAAG,IAAI,gBAAgB,CAAC,SAAS,CAAC;YAC1D,IAAI,EAAE,8BAA8B;YACpC,IAAI,EAAE,8FAA8F;YACpG,UAAU,EAAE,CAAC,cAAc,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,CAAC;YACrE,SAAS,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC;SACzC,CAAC,CAAC;IACP,CAAC;IAED,OAAO,CAAC,MAA8B;QAClC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC;YACpB,YAAY,EAAE,MAAM,CAAC,OAAO;YAC5B,WAAW,EAAE,MAAM,CAAC,MAAM;YAC1B,SAAS,EAAE,MAAM,CAAC,IAAI;SACzB,CAAC,CAAC;IACP,CAAC;IAED,IAAI,CAAC,MAA8B;QAC/B,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC;YACjB,YAAY,EAAE,MAAM,CAAC,OAAO;YAC5B,WAAW,EAAE,MAAM,CAAC,MAAM;YAC1B,SAAS,EAAE,MAAM,CAAC,IAAI;SACzB,CAAC,CAAC;IACP,CAAC;IAED,QAAQ,CAAC,MAA8B;QACnC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC;YACrB,YAAY,EAAE,MAAM,CAAC,OAAO;YAC5B,WAAW,EAAE,MAAM,CAAC,MAAM;YAC1B,SAAS,EAAE,MAAM,CAAC,IAAI;SACzB,CAAC,CAAC;IACP,CAAC;IAED,OAAO,CAAC,MAAsC;QAC1C,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC;YACpB,YAAY,EAAE,MAAM,CAAC,OAAO;YAC5B,WAAW,EAAE,MAAM,CAAC,MAAM;YAC1B,SAAS,EAAE,MAAM,CAAC,IAAI;YACtB,SAAS,EAAE,MAAM,CAAC,IAAI;SACzB,CAAC,CAAC;IACP,CAAC;IAED,gBAAgB,CACZ,MAAsC;QAEtC,OAAO,IAAI,CAAC,uBAAuB,CAAC,UAAU,CAAC;YAC3C,YAAY,EAAE,MAAM,CAAC,OAAO;YAC5B,WAAW,EAAE,MAAM,CAAC,MAAM;YAC1B,SAAS,EAAE,MAAM,CAAC,IAAI;SACzB,CAAC,CAAC;IACP,CAAC;CACJ,CAAA;AAlFY,2BAA2B;IADvC,IAAA,sBAAU,GAAE;;GACA,2BAA2B,CAkFvC;AAlFY,kEAA2B"}
|
package/lib/messaging/error.d.ts
CHANGED
|
@@ -1,20 +1,26 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Copyright (c) 2020 Gitpod GmbH. All rights reserved.
|
|
3
3
|
* Licensed under the GNU Affero General Public License (AGPL).
|
|
4
|
-
* See License
|
|
4
|
+
* See License.AGPL.txt in the project root for license information.
|
|
5
5
|
*/
|
|
6
6
|
export declare namespace ErrorCodes {
|
|
7
|
+
const BAD_REQUEST = 400;
|
|
7
8
|
const NOT_AUTHENTICATED = 401;
|
|
8
9
|
const NOT_ENOUGH_CREDIT = 402;
|
|
9
10
|
const PERMISSION_DENIED = 403;
|
|
10
11
|
const NOT_FOUND = 404;
|
|
11
12
|
const CONFLICT = 409;
|
|
12
13
|
const SETUP_REQUIRED = 410;
|
|
14
|
+
const NEEDS_VERIFICATION = 411;
|
|
13
15
|
const TOO_MANY_REQUESTS = 429;
|
|
14
16
|
const REPOSITORY_NOT_WHITELISTED = 430;
|
|
17
|
+
const PROJECT_REQUIRED = 440;
|
|
18
|
+
const PAYMENT_ERROR = 450;
|
|
19
|
+
const PAYMENT_SPENDING_LIMIT_REACHED = 451;
|
|
20
|
+
const SUBSCRIPTION_ERROR = 452;
|
|
21
|
+
const INVALID_COST_CENTER = 455;
|
|
15
22
|
const CONTEXT_PARSE_ERROR = 460;
|
|
16
23
|
const INVALID_GITPOD_YML = 461;
|
|
17
|
-
const PAYMENT_ERROR = 450;
|
|
18
24
|
const USER_BLOCKED = 470;
|
|
19
25
|
const USER_DELETED = 471;
|
|
20
26
|
const USER_TERMS_ACCEPTANCE_REQUIRED = 472;
|
|
@@ -22,11 +28,15 @@ export declare namespace ErrorCodes {
|
|
|
22
28
|
const PLAN_PROFESSIONAL_REQUIRED = 481;
|
|
23
29
|
const PLAN_ONLY_ALLOWED_FOR_STUDENTS = 485;
|
|
24
30
|
const TOO_MANY_RUNNING_WORKSPACES = 490;
|
|
31
|
+
const INTERNAL_SERVER_ERROR = 500;
|
|
25
32
|
const EE_FEATURE = 501;
|
|
26
33
|
const EE_LICENSE_REQUIRED = 555;
|
|
27
34
|
const SAAS_FEATURE = 601;
|
|
28
35
|
const TEAM_SUBSCRIPTION_INVALID_QUANTITY = 610;
|
|
29
36
|
const TEAM_SUBSCRIPTION_ASSIGNMENT_FAILED = 620;
|
|
30
37
|
const SNAPSHOT_ERROR = 630;
|
|
38
|
+
const HEADLESS_LOG_NOT_YET_AVAILABLE = 640;
|
|
39
|
+
const INVALID_VALUE = 650;
|
|
40
|
+
function isUserError(code: number): boolean;
|
|
31
41
|
}
|
|
32
42
|
//# sourceMappingURL=error.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../src/messaging/error.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../src/messaging/error.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,yBAAiB,UAAU,CAAC;IAEjB,MAAM,WAAW,MAAM,CAAC;IAGxB,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,kBAAkB,MAAM,CAAC;IAG/B,MAAM,iBAAiB,MAAM,CAAC;IAG9B,MAAM,0BAA0B,MAAM,CAAC;IAGvC,MAAM,gBAAgB,MAAM,CAAC;IAG7B,MAAM,aAAa,MAAM,CAAC;IAG1B,MAAM,8BAA8B,MAAM,CAAC;IAG3C,MAAM,kBAAkB,MAAM,CAAC;IAG/B,MAAM,mBAAmB,MAAM,CAAC;IAGhC,MAAM,mBAAmB,MAAM,CAAC;IAGhC,MAAM,kBAAkB,MAAM,CAAC;IAG/B,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,qBAAqB,MAAM,CAAC;IAGlC,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;IAG3C,MAAM,aAAa,MAAM,CAAC;IAEjC,SAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEjD;CACJ"}
|
package/lib/messaging/error.js
CHANGED
|
@@ -2,12 +2,14 @@
|
|
|
2
2
|
/**
|
|
3
3
|
* Copyright (c) 2020 Gitpod GmbH. All rights reserved.
|
|
4
4
|
* Licensed under the GNU Affero General Public License (AGPL).
|
|
5
|
-
* See License
|
|
5
|
+
* See License.AGPL.txt in the project root for license information.
|
|
6
6
|
*/
|
|
7
7
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
8
|
exports.ErrorCodes = void 0;
|
|
9
9
|
var ErrorCodes;
|
|
10
10
|
(function (ErrorCodes) {
|
|
11
|
+
// 400 Unauthorized
|
|
12
|
+
ErrorCodes.BAD_REQUEST = 400;
|
|
11
13
|
// 401 Unauthorized
|
|
12
14
|
ErrorCodes.NOT_AUTHENTICATED = 401;
|
|
13
15
|
// 402 Payment Required
|
|
@@ -20,16 +22,26 @@ var ErrorCodes;
|
|
|
20
22
|
ErrorCodes.CONFLICT = 409;
|
|
21
23
|
// 410 No User
|
|
22
24
|
ErrorCodes.SETUP_REQUIRED = 410;
|
|
25
|
+
// 411 No User
|
|
26
|
+
ErrorCodes.NEEDS_VERIFICATION = 411;
|
|
23
27
|
// 429 Too Many Requests
|
|
24
28
|
ErrorCodes.TOO_MANY_REQUESTS = 429;
|
|
25
29
|
// 430 Repository not whitelisted (custom status code)
|
|
26
30
|
ErrorCodes.REPOSITORY_NOT_WHITELISTED = 430;
|
|
31
|
+
// 440 Prebuilds now always require a project (custom status code)
|
|
32
|
+
ErrorCodes.PROJECT_REQUIRED = 440;
|
|
33
|
+
// 450 Payment error
|
|
34
|
+
ErrorCodes.PAYMENT_ERROR = 450;
|
|
35
|
+
// 451 Out of credits
|
|
36
|
+
ErrorCodes.PAYMENT_SPENDING_LIMIT_REACHED = 451;
|
|
37
|
+
// 451 Error creating a subscription
|
|
38
|
+
ErrorCodes.SUBSCRIPTION_ERROR = 452;
|
|
39
|
+
// 455 Invalid cost center (custom status code)
|
|
40
|
+
ErrorCodes.INVALID_COST_CENTER = 455;
|
|
27
41
|
// 460 Context Parse Error (custom status code)
|
|
28
42
|
ErrorCodes.CONTEXT_PARSE_ERROR = 460;
|
|
29
|
-
// 461 Invalid gitpod yml
|
|
43
|
+
// 461 Invalid gitpod yml (custom status code)
|
|
30
44
|
ErrorCodes.INVALID_GITPOD_YML = 461;
|
|
31
|
-
// 450 Payment error
|
|
32
|
-
ErrorCodes.PAYMENT_ERROR = 450;
|
|
33
45
|
// 470 User Blocked (custom status code)
|
|
34
46
|
ErrorCodes.USER_BLOCKED = 470;
|
|
35
47
|
// 471 User Deleted (custom status code)
|
|
@@ -44,6 +56,8 @@ var ErrorCodes;
|
|
|
44
56
|
ErrorCodes.PLAN_ONLY_ALLOWED_FOR_STUDENTS = 485;
|
|
45
57
|
// 490 Too Many Running Workspace
|
|
46
58
|
ErrorCodes.TOO_MANY_RUNNING_WORKSPACES = 490;
|
|
59
|
+
// 500 Internal Server Error
|
|
60
|
+
ErrorCodes.INTERNAL_SERVER_ERROR = 500;
|
|
47
61
|
// 501 EE Feature
|
|
48
62
|
ErrorCodes.EE_FEATURE = 501;
|
|
49
63
|
// 555 EE License Required
|
|
@@ -56,5 +70,13 @@ var ErrorCodes;
|
|
|
56
70
|
ErrorCodes.TEAM_SUBSCRIPTION_ASSIGNMENT_FAILED = 620;
|
|
57
71
|
// 630 Snapshot Error
|
|
58
72
|
ErrorCodes.SNAPSHOT_ERROR = 630;
|
|
73
|
+
// 640 Headless logs are not available (yet)
|
|
74
|
+
ErrorCodes.HEADLESS_LOG_NOT_YET_AVAILABLE = 640;
|
|
75
|
+
// 650 Invalid Value
|
|
76
|
+
ErrorCodes.INVALID_VALUE = 650;
|
|
77
|
+
function isUserError(code) {
|
|
78
|
+
return code >= 400 && code < 500;
|
|
79
|
+
}
|
|
80
|
+
ErrorCodes.isUserError = isUserError;
|
|
59
81
|
})(ErrorCodes = exports.ErrorCodes || (exports.ErrorCodes = {}));
|
|
60
82
|
//# sourceMappingURL=error.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/messaging/error.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;
|
|
1
|
+
{"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/messaging/error.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,IAAiB,UAAU,CAuG1B;AAvGD,WAAiB,UAAU;IACvB,mBAAmB;IACN,sBAAW,GAAG,GAAG,CAAC;IAE/B,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,cAAc;IACD,6BAAkB,GAAG,GAAG,CAAC;IAEtC,wBAAwB;IACX,4BAAiB,GAAG,GAAG,CAAC;IAErC,sDAAsD;IACzC,qCAA0B,GAAG,GAAG,CAAC;IAE9C,kEAAkE;IACrD,2BAAgB,GAAG,GAAG,CAAC;IAEpC,oBAAoB;IACP,wBAAa,GAAG,GAAG,CAAC;IAEjC,qBAAqB;IACR,yCAA8B,GAAG,GAAG,CAAC;IAElD,oCAAoC;IACvB,6BAAkB,GAAG,GAAG,CAAC;IAEtC,+CAA+C;IAClC,8BAAmB,GAAG,GAAG,CAAC;IAEvC,+CAA+C;IAClC,8BAAmB,GAAG,GAAG,CAAC;IAEvC,8CAA8C;IACjC,6BAAkB,GAAG,GAAG,CAAC;IAEtC,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,4BAA4B;IACf,gCAAqB,GAAG,GAAG,CAAC;IAEzC,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;IAElD,oBAAoB;IACP,wBAAa,GAAG,GAAG,CAAC;IAEjC,SAAgB,WAAW,CAAC,IAAY;QACpC,OAAO,IAAI,IAAI,GAAG,IAAI,IAAI,GAAG,GAAG,CAAC;IACrC,CAAC;IAFe,sBAAW,cAE1B,CAAA;AACL,CAAC,EAvGgB,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAuG1B"}
|
|
@@ -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;AAED,MAAM,WAAW,sBAAsB;IACnC;;OAEG;
|
|
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;IACH,mBAAmB,IAAI,IAAI,CAAC;IAE5B;;OAEG;IACH,kBAAkB,IAAI,IAAI,CAAC;CAC9B"}
|
package/lib/messaging/handler.js
CHANGED
|
@@ -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
|
|
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":"
|
|
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,71 +6,35 @@
|
|
|
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 =
|
|
10
|
-
|
|
11
|
-
const url = require("url");
|
|
12
|
-
const vscode_ws_jsonrpc_1 = require("vscode-ws-jsonrpc");
|
|
13
|
-
const logging_1 = require("../../util/logging");
|
|
14
|
-
function createServerWebSocketConnection(options, onConnect) {
|
|
15
|
-
openJsonRpcSocket(options, socket => {
|
|
16
|
-
onConnect((0, vscode_ws_jsonrpc_1.createWebSocketConnection)(socket, console));
|
|
17
|
-
});
|
|
18
|
-
}
|
|
19
|
-
exports.createServerWebSocketConnection = createServerWebSocketConnection;
|
|
20
|
-
function openJsonRpcSocket(options, onOpen) {
|
|
21
|
-
openSocket(options, socket => {
|
|
22
|
-
const webSocket = toIWebSocket(socket);
|
|
23
|
-
onOpen(webSocket);
|
|
24
|
-
});
|
|
25
|
-
}
|
|
26
|
-
exports.openJsonRpcSocket = openJsonRpcSocket;
|
|
27
|
-
function openSocket(options, onOpen) {
|
|
28
|
-
const 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', (request, socket, head) => {
|
|
36
|
-
const 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, webSocket => {
|
|
39
|
-
if (webSocket.readyState === webSocket.OPEN) {
|
|
40
|
-
onOpen(webSocket, request, socket, head);
|
|
41
|
-
}
|
|
42
|
-
else {
|
|
43
|
-
webSocket.on('open', () => onOpen(webSocket, request, socket, head));
|
|
44
|
-
}
|
|
45
|
-
});
|
|
46
|
-
}
|
|
47
|
-
});
|
|
48
|
-
}
|
|
49
|
-
exports.openSocket = openSocket;
|
|
50
|
-
function toIWebSocket(webSocket) {
|
|
51
|
-
let sendsAfterOpen = 0;
|
|
9
|
+
exports.toIWebSocket = void 0;
|
|
10
|
+
function toIWebSocket(ws) {
|
|
52
11
|
return {
|
|
53
|
-
send: content => {
|
|
54
|
-
if (
|
|
55
|
-
|
|
56
|
-
//log.debug(`Repeated try to send on closed web socket (readyState was ${webSocket.readyState})`, { 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
|
-
|
|
61
|
-
|
|
62
|
-
|
|
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: cb =>
|
|
67
|
-
onError: cb =>
|
|
68
|
-
onClose: cb =>
|
|
30
|
+
onMessage: (cb) => ws.on("message", cb),
|
|
31
|
+
onError: (cb) => ws.on("error", cb),
|
|
32
|
+
onClose: (cb) => ws.on("close", cb),
|
|
69
33
|
dispose: () => {
|
|
70
|
-
if (
|
|
71
|
-
|
|
34
|
+
if (ws.readyState < ws.CLOSING) {
|
|
35
|
+
ws.close();
|
|
72
36
|
}
|
|
73
|
-
}
|
|
37
|
+
},
|
|
74
38
|
};
|
|
75
39
|
}
|
|
76
40
|
exports.toIWebSocket = toIWebSocket;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../src/messaging/node/connection.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;
|
|
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,CAAC,OAAO,EAAE,EAAE;YACd,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,CAAC,GAAG,EAAE,EAAE;oBACrB,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,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC;QACvC,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC;QACnC,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC;QACnC,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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { MessageConnection } from "vscode-jsonrpc";
|
|
2
2
|
import { Event, Emitter } from "../util/event";
|
|
3
3
|
import { Disposable } from "../util/disposable";
|
|
4
|
-
import { ConnectionHandler } from
|
|
4
|
+
import { ConnectionHandler } from "./handler";
|
|
5
5
|
export declare type JsonRpcServer<Client> = Disposable & {
|
|
6
6
|
/**
|
|
7
7
|
* If this server is a proxy to a remote server then
|
|
@@ -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;
|
|
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;IACpE,QAAQ,CAAC,IAAI,EAAE,MAAM;IAAE,QAAQ,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,GAAG;gBAAvF,IAAI,EAAE,MAAM,EAAW,aAAa,EAAE,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,GAAG;IAE5G,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;IAatD,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;IAQnC,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;IAgClD;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,CAAC,CAAC,EAAE,WAAW,GAAG,OAAO;CAGpD"}
|
|
@@ -88,8 +88,8 @@ class JsonRpcProxyFactory {
|
|
|
88
88
|
this.waitForConnection();
|
|
89
89
|
}
|
|
90
90
|
waitForConnection() {
|
|
91
|
-
this.connectionPromise = new Promise(resolve => this.connectionPromiseResolve = resolve);
|
|
92
|
-
this.connectionPromise.then(connection => {
|
|
91
|
+
this.connectionPromise = new Promise((resolve) => (this.connectionPromiseResolve = resolve));
|
|
92
|
+
this.connectionPromise.then((connection) => {
|
|
93
93
|
connection.onClose(() => this.fireConnectionClosed());
|
|
94
94
|
this.fireConnectionOpened();
|
|
95
95
|
});
|
|
@@ -186,19 +186,19 @@ class JsonRpcProxyFactory {
|
|
|
186
186
|
* @returns A callable that executes the JSON-RPC call.
|
|
187
187
|
*/
|
|
188
188
|
get(target, p, receiver) {
|
|
189
|
-
if (p ===
|
|
189
|
+
if (p === "setClient") {
|
|
190
190
|
return (client) => {
|
|
191
191
|
this.target = client;
|
|
192
192
|
};
|
|
193
193
|
}
|
|
194
|
-
if (p ===
|
|
194
|
+
if (p === "onDidOpenConnection") {
|
|
195
195
|
return this.onDidOpenConnectionEmitter.event;
|
|
196
196
|
}
|
|
197
|
-
if (p ===
|
|
197
|
+
if (p === "onDidCloseConnection") {
|
|
198
198
|
return this.onDidCloseConnectionEmitter.event;
|
|
199
199
|
}
|
|
200
200
|
const isNotify = this.isNotification(p);
|
|
201
|
-
return (...args) => this.connectionPromise.then(connection => new Promise((resolve, reject) => {
|
|
201
|
+
return (...args) => this.connectionPromise.then((connection) => new Promise((resolve, reject) => {
|
|
202
202
|
try {
|
|
203
203
|
if (isNotify) {
|
|
204
204
|
connection.sendNotification(p.toString(), ...args);
|
|
@@ -206,9 +206,7 @@ class JsonRpcProxyFactory {
|
|
|
206
206
|
}
|
|
207
207
|
else {
|
|
208
208
|
const resultPromise = connection.sendRequest(p.toString(), ...args);
|
|
209
|
-
resultPromise
|
|
210
|
-
.catch((err) => reject(err))
|
|
211
|
-
.then((result) => resolve(result));
|
|
209
|
+
resultPromise.catch((err) => reject(err)).then((result) => resolve(result));
|
|
212
210
|
}
|
|
213
211
|
}
|
|
214
212
|
catch (err) {
|