@gitpod/gitpod-protocol 0.1.5-se-workspace-for-teams.18 → 0.1.5-se-init.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.
- package/data/gitpod-schema.json +9 -2
- package/lib/accounting-protocol.d.ts +0 -1
- package/lib/accounting-protocol.d.ts.map +1 -1
- package/lib/accounting-protocol.js +10 -11
- package/lib/accounting-protocol.js.map +1 -1
- package/lib/admin-protocol.d.ts +8 -2
- package/lib/admin-protocol.d.ts.map +1 -1
- package/lib/admin-protocol.js +2 -13
- package/lib/admin-protocol.js.map +1 -1
- package/lib/analytics.d.ts +1 -0
- package/lib/analytics.d.ts.map +1 -1
- package/lib/context-url.js +4 -4
- package/lib/context-url.js.map +1 -1
- package/lib/context-url.spec.js +45 -48
- package/lib/context-url.spec.js.map +1 -1
- package/lib/email-protocol.js +4 -4
- package/lib/email-protocol.js.map +1 -1
- package/lib/encryption/container-module.js +4 -4
- package/lib/encryption/container-module.js.map +1 -1
- package/lib/encryption/encryption-engine.js +19 -20
- package/lib/encryption/encryption-engine.js.map +1 -1
- package/lib/encryption/encryption-engine.spec.js +29 -36
- package/lib/encryption/encryption-engine.spec.js.map +1 -1
- package/lib/encryption/encryption-service.js +29 -43
- package/lib/encryption/encryption-service.js.map +1 -1
- package/lib/encryption/key-provider.js +25 -30
- package/lib/encryption/key-provider.js.map +1 -1
- package/lib/env.d.ts +0 -1
- package/lib/env.d.ts.map +1 -1
- package/lib/env.js +12 -14
- package/lib/env.js.map +1 -1
- package/lib/gitpod-file-parser.js +25 -41
- package/lib/gitpod-file-parser.js.map +1 -1
- package/lib/gitpod-file-parser.spec.js +116 -116
- package/lib/gitpod-file-parser.spec.js.map +1 -1
- package/lib/gitpod-service.d.ts +24 -9
- package/lib/gitpod-service.d.ts.map +1 -1
- package/lib/gitpod-service.js +149 -295
- package/lib/gitpod-service.js.map +1 -1
- package/lib/ide-protocol.d.ts +81 -0
- package/lib/ide-protocol.d.ts.map +1 -0
- package/lib/ide-protocol.js +8 -0
- package/lib/ide-protocol.js.map +1 -0
- package/lib/index.d.ts +2 -0
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +2 -0
- package/lib/index.js.map +1 -1
- package/lib/messaging/browser/connection.d.ts +3 -3
- package/lib/messaging/browser/connection.d.ts.map +1 -1
- package/lib/messaging/browser/connection.js +172 -35
- package/lib/messaging/browser/connection.js.map +1 -1
- package/lib/messaging/browser/window-connection.js +35 -55
- package/lib/messaging/browser/window-connection.js.map +1 -1
- package/lib/messaging/client-call-metrics.js +17 -18
- package/lib/messaging/client-call-metrics.js.map +1 -1
- package/lib/messaging/connection-error-handler.js +11 -23
- package/lib/messaging/connection-error-handler.js.map +1 -1
- package/lib/messaging/error.d.ts +1 -1
- package/lib/messaging/error.d.ts.map +1 -1
- package/lib/messaging/error.js +2 -2
- package/lib/messaging/error.js.map +1 -1
- package/lib/messaging/handler.d.ts +10 -0
- package/lib/messaging/handler.d.ts.map +1 -1
- package/lib/messaging/node/connection.d.ts +0 -10
- package/lib/messaging/node/connection.d.ts.map +1 -1
- package/lib/messaging/node/connection.js +11 -49
- package/lib/messaging/node/connection.js.map +1 -1
- package/lib/messaging/proxy-factory.d.ts +2 -0
- package/lib/messaging/proxy-factory.d.ts.map +1 -1
- package/lib/messaging/proxy-factory.js +73 -160
- 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/permission.d.ts +1 -2
- package/lib/permission.d.ts.map +1 -1
- package/lib/permission.js +12 -13
- package/lib/permission.js.map +1 -1
- package/lib/plans.d.ts +1 -1
- package/lib/plans.d.ts.map +1 -1
- package/lib/plans.js +38 -57
- package/lib/plans.js.map +1 -1
- package/lib/protocol.d.ts +11 -7
- package/lib/protocol.d.ts.map +1 -1
- package/lib/protocol.js +44 -114
- package/lib/protocol.js.map +1 -1
- package/lib/snapshot-url.d.ts +14 -0
- package/lib/snapshot-url.d.ts.map +1 -0
- package/lib/snapshot-url.js +26 -0
- package/lib/snapshot-url.js.map +1 -0
- package/lib/snapshot-url.spec.d.ts +7 -0
- package/lib/snapshot-url.spec.d.ts.map +1 -0
- package/lib/snapshot-url.spec.js +41 -0
- package/lib/snapshot-url.spec.js.map +1 -0
- package/lib/team-subscription-protocol.js +13 -13
- package/lib/team-subscription-protocol.js.map +1 -1
- package/lib/teams-projects-protocol.d.ts +11 -1
- package/lib/teams-projects-protocol.d.ts.map +1 -1
- package/lib/teams-projects-protocol.js +4 -15
- package/lib/teams-projects-protocol.js.map +1 -1
- package/lib/util/analytics.js +25 -32
- package/lib/util/analytics.js.map +1 -1
- package/lib/util/async-iterator.js +55 -133
- package/lib/util/async-iterator.js.map +1 -1
- package/lib/util/cancelable.js +17 -59
- package/lib/util/cancelable.js.map +1 -1
- package/lib/util/date-time.js +8 -8
- package/lib/util/date-time.js.map +1 -1
- package/lib/util/deferred.js +10 -12
- package/lib/util/deferred.js.map +1 -1
- package/lib/util/disposable.js +26 -39
- package/lib/util/disposable.js.map +1 -1
- package/lib/util/event.js +58 -74
- package/lib/util/event.js.map +1 -1
- package/lib/util/garbage-collected-cache.d.ts +1 -0
- package/lib/util/garbage-collected-cache.d.ts.map +1 -1
- package/lib/util/garbage-collected-cache.js +26 -46
- package/lib/util/garbage-collected-cache.js.map +1 -1
- package/lib/util/generate-workspace-id.js +11 -67
- package/lib/util/generate-workspace-id.js.map +1 -1
- package/lib/util/generate-workspace-id.spec.js +34 -79
- package/lib/util/generate-workspace-id.spec.js.map +1 -1
- package/lib/util/gitpod-cookie.d.ts +20 -0
- package/lib/util/gitpod-cookie.d.ts.map +1 -0
- package/lib/util/gitpod-cookie.js +44 -0
- package/lib/util/gitpod-cookie.js.map +1 -0
- package/lib/util/gitpod-host-url.d.ts +1 -0
- package/lib/util/gitpod-host-url.d.ts.map +1 -1
- package/lib/util/gitpod-host-url.js +96 -103
- package/lib/util/gitpod-host-url.js.map +1 -1
- package/lib/util/gitpod-host-url.spec.js +87 -135
- package/lib/util/gitpod-host-url.spec.js.map +1 -1
- package/lib/util/grpc.js +3 -3
- 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/util/jaeger-client-types.js +8 -0
- package/lib/util/jaeger-client-types.js.map +1 -0
- package/lib/util/logging.d.ts +32 -32
- package/lib/util/logging.d.ts.map +1 -1
- package/lib/util/logging.js +51 -125
- package/lib/util/logging.js.map +1 -1
- package/lib/util/make-link.js +2 -2
- package/lib/util/make-link.js.map +1 -1
- package/lib/util/parse-workspace-id.d.ts +10 -0
- package/lib/util/parse-workspace-id.d.ts.map +1 -1
- package/lib/util/parse-workspace-id.js +31 -7
- package/lib/util/parse-workspace-id.js.map +1 -1
- package/lib/util/parse-workspace-id.spec.d.ts +4 -0
- package/lib/util/parse-workspace-id.spec.d.ts.map +1 -1
- package/lib/util/parse-workspace-id.spec.js +123 -84
- package/lib/util/parse-workspace-id.spec.js.map +1 -1
- package/lib/util/queue.js +16 -55
- package/lib/util/queue.js.map +1 -1
- package/lib/util/queue.spec.js +144 -288
- 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/safe-promise.js +9 -12
- package/lib/util/safe-promise.js.map +1 -1
- package/lib/util/semaphore.js +15 -46
- package/lib/util/semaphore.js.map +1 -1
- package/lib/util/skip-if.js +6 -6
- package/lib/util/skip-if.js.map +1 -1
- package/lib/util/timeutil.js +16 -16
- package/lib/util/timeutil.js.map +1 -1
- package/lib/util/timeutil.spec.js +21 -24
- package/lib/util/timeutil.spec.js.map +1 -1
- package/lib/util/tracing.d.ts +50 -5
- package/lib/util/tracing.d.ts.map +1 -1
- package/lib/util/tracing.js +171 -63
- 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.js +2 -2
- package/lib/util/workspace-port-authentication.js.map +1 -1
- package/lib/workspace-cluster.d.ts +11 -1
- package/lib/workspace-cluster.d.ts.map +1 -1
- package/lib/workspace-cluster.js +3 -3
- package/lib/workspace-cluster.js.map +1 -1
- package/lib/workspace-instance.d.ts +4 -2
- package/lib/workspace-instance.d.ts.map +1 -1
- package/lib/wsready.js +1 -1
- package/package.json +20 -12
- package/pkg-yarn.lock +12 -7
- package/src/accounting-protocol.ts +1 -3
- package/src/admin-protocol.ts +9 -3
- package/src/analytics.ts +2 -0
- package/src/email-protocol.ts +1 -1
- package/src/env.ts +0 -1
- package/src/gitpod-service.ts +27 -14
- package/src/ide-protocol.ts +92 -0
- package/src/index.ts +2 -0
- package/src/messaging/browser/connection.ts +176 -10
- package/src/messaging/error.ts +2 -2
- package/src/messaging/handler.ts +12 -0
- package/src/messaging/node/connection.ts +1 -45
- package/src/messaging/proxy-factory.ts +10 -4
- package/src/oss-allowlist.ts +15 -0
- package/src/permission.ts +0 -1
- package/src/protocol.ts +13 -8
- package/src/snapshot-url.spec.ts +25 -0
- package/src/snapshot-url.ts +27 -0
- package/src/team-subscription-protocol.ts +1 -1
- package/src/teams-projects-protocol.ts +14 -2
- package/src/util/garbage-collected-cache.ts +7 -1
- package/src/util/gitpod-cookie.ts +39 -0
- package/src/util/gitpod-host-url.ts +9 -5
- package/src/util/grpc.ts +3 -3
- package/src/util/jaeger-client-types.ts +102 -0
- package/src/util/logging.ts +36 -41
- package/src/util/parse-workspace-id.spec.ts +21 -1
- package/src/util/parse-workspace-id.ts +32 -6
- package/src/util/repeat.ts +45 -0
- package/src/util/tracing.spec.ts +83 -0
- package/src/util/tracing.ts +157 -18
- package/src/workspace-cluster.ts +8 -1
- package/src/workspace-instance.ts +12 -6
- package/src/wsready.ts +1 -1
- package/lib/util/repeater.d.ts +0 -22
- package/lib/util/repeater.d.ts.map +0 -1
- package/lib/util/repeater.js +0 -118
- package/lib/util/repeater.js.map +0 -1
- package/src/util/jaeger-client.d.ts +0 -105
- package/src/util/repeater.ts +0 -49
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copyright (c) 2020 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
|
+
import { opentracing } from "jaeger-client";
|
|
7
|
+
export interface TracingConfig {
|
|
8
|
+
serviceName?: string;
|
|
9
|
+
disable?: boolean;
|
|
10
|
+
sampler?: SamplerConfig;
|
|
11
|
+
reporter?: ReporterConfig;
|
|
12
|
+
}
|
|
13
|
+
export interface TracingOptions {
|
|
14
|
+
reporter?: Reporter;
|
|
15
|
+
metrics?: MetricsFactory;
|
|
16
|
+
logger?: Logger;
|
|
17
|
+
tags?: any;
|
|
18
|
+
}
|
|
19
|
+
export interface ReporterConfig {
|
|
20
|
+
logSpans?: boolean;
|
|
21
|
+
agentHost?: string;
|
|
22
|
+
agentPort?: number;
|
|
23
|
+
flushIntervalMs?: number;
|
|
24
|
+
}
|
|
25
|
+
export interface SamplerConfig {
|
|
26
|
+
type: string;
|
|
27
|
+
param: number;
|
|
28
|
+
host?: string;
|
|
29
|
+
port?: number;
|
|
30
|
+
refreshIntervalMs?: number;
|
|
31
|
+
}
|
|
32
|
+
export interface Logger {
|
|
33
|
+
info(msg: string): void;
|
|
34
|
+
error(msg: string): void;
|
|
35
|
+
}
|
|
36
|
+
export interface Reporter {
|
|
37
|
+
report(span: opentracing.Span): void;
|
|
38
|
+
close(callback?: () => void): void;
|
|
39
|
+
setProcess(serviceName: string, tags: any): void;
|
|
40
|
+
}
|
|
41
|
+
export interface MetricsFactory {
|
|
42
|
+
createCounter(name: string, tags: any): Counter;
|
|
43
|
+
createTimer(name: string, tags: any): Timer;
|
|
44
|
+
createGauge(name: string, tags: any): Gauge;
|
|
45
|
+
}
|
|
46
|
+
export interface Counter {
|
|
47
|
+
increment(delta: number): void;
|
|
48
|
+
}
|
|
49
|
+
export interface Timer {
|
|
50
|
+
record(value: number): void;
|
|
51
|
+
}
|
|
52
|
+
export interface Gauge {
|
|
53
|
+
update(value: number): void;
|
|
54
|
+
}
|
|
55
|
+
export interface SamplingDecision {
|
|
56
|
+
sample: boolean;
|
|
57
|
+
retryable: boolean;
|
|
58
|
+
tags: any;
|
|
59
|
+
}
|
|
60
|
+
export interface Sampler {
|
|
61
|
+
name(): string;
|
|
62
|
+
isSampled(operation: string, tags: any): boolean;
|
|
63
|
+
onCreateSpan(span: opentracing.Span): SamplingDecision;
|
|
64
|
+
onSetOperationName(span: opentracing.Span, operationName: string): SamplingDecision;
|
|
65
|
+
onSetTag(span: opentracing.Span, key: string, value: any): SamplingDecision;
|
|
66
|
+
close(callback: () => void): void;
|
|
67
|
+
}
|
|
68
|
+
//# sourceMappingURL=jaeger-client-types.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"jaeger-client-types.d.ts","sourceRoot":"","sources":["../../src/util/jaeger-client-types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAO5C,MAAM,WAAW,aAAa;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,QAAQ,CAAC,EAAE,cAAc,CAAC;CAC7B;AAED,MAAM,WAAW,cAAc;IAC3B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,GAAG,CAAC;CACd;AAED,MAAM,WAAW,cAAc;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,MAAM;IACnB,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAED,MAAM,WAAW,QAAQ;IACrB,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC,IAAI,GAAG,IAAI,CAAC;IACrC,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;IACnC,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,IAAI,CAAC;CACpD;AAED,MAAM,WAAW,cAAc;IAC3B,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC;IAChD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,KAAK,CAAC;IAC5C,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,KAAK,CAAC;CAC/C;AAGD,MAAM,WAAW,OAAO;IAEpB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC;AAGD,MAAM,WAAW,KAAK;IAElB,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAGD,MAAM,WAAW,KAAK;IAElB,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAYD,MAAM,WAAW,gBAAgB;IAC7B,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,IAAI,EAAE,GAAG,CAAC;CACb;AAGD,MAAM,WAAW,OAAO;IACpB,IAAI,IAAI,MAAM,CAAA;IACd,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC;IACjD,YAAY,CAAC,IAAI,EAAE,WAAW,CAAC,IAAI,GAAG,gBAAgB,CAAC;IACvD,kBAAkB,CAAC,IAAI,EAAE,WAAW,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,GAAG,gBAAgB,CAAC;IACpF,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,gBAAgB,CAAC;IAC5E,KAAK,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI,CAAA;CACpC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Copyright (c) 2020 Gitpod GmbH. All rights reserved.
|
|
4
|
+
* Licensed under the GNU Affero General Public License (AGPL).
|
|
5
|
+
* See License-AGPL.txt in the project root for license information.
|
|
6
|
+
*/
|
|
7
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
|
+
//# sourceMappingURL=jaeger-client-types.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"jaeger-client-types.js","sourceRoot":"","sources":["../../src/util/jaeger-client-types.ts"],"names":[],"mappings":";AAAA;;;;GAIG"}
|
package/lib/util/logging.d.ts
CHANGED
|
@@ -19,54 +19,54 @@ export declare namespace LogContext {
|
|
|
19
19
|
export interface LogPayload {
|
|
20
20
|
}
|
|
21
21
|
export declare namespace log {
|
|
22
|
-
function error(context: LogContext, message: string, error:
|
|
23
|
-
function error(context: LogContext, message: string, error:
|
|
22
|
+
function error(context: LogContext, message: string, error: any, payload: LogPayload): void;
|
|
23
|
+
function error(context: LogContext, message: string, error: any): void;
|
|
24
24
|
function error(context: LogContext, message: string, payload: LogPayload): void;
|
|
25
25
|
function error(context: LogContext, message: string): void;
|
|
26
|
-
function error(context: LogContext, error:
|
|
27
|
-
function error(context: LogContext, error:
|
|
28
|
-
function error(message: string, error:
|
|
29
|
-
function error(message: string, error:
|
|
26
|
+
function error(context: LogContext, error: any, payload: LogPayload): void;
|
|
27
|
+
function error(context: LogContext, error: any): void;
|
|
28
|
+
function error(message: string, error: any, payload: LogPayload): void;
|
|
29
|
+
function error(message: string, error: any): void;
|
|
30
30
|
function error(message: string, payload: LogPayload): void;
|
|
31
31
|
function error(message: string): void;
|
|
32
|
-
function error(error:
|
|
33
|
-
function error(error:
|
|
34
|
-
function warn(context: LogContext, message: string, error:
|
|
35
|
-
function warn(context: LogContext, message: string, error:
|
|
32
|
+
function error(error: any, payload: LogPayload): void;
|
|
33
|
+
function error(error: any): void;
|
|
34
|
+
function warn(context: LogContext, message: string, error: any, payload: LogPayload): void;
|
|
35
|
+
function warn(context: LogContext, message: string, error: any): void;
|
|
36
36
|
function warn(context: LogContext, message: string, payload: LogPayload): void;
|
|
37
37
|
function warn(context: LogContext, message: string): void;
|
|
38
|
-
function warn(context: LogContext, error:
|
|
39
|
-
function warn(context: LogContext, error:
|
|
40
|
-
function warn(message: string, error:
|
|
41
|
-
function warn(message: string, error:
|
|
38
|
+
function warn(context: LogContext, error: any, payload: LogPayload): void;
|
|
39
|
+
function warn(context: LogContext, error: any): void;
|
|
40
|
+
function warn(message: string, error: any, payload: LogPayload): void;
|
|
41
|
+
function warn(message: string, error: any): void;
|
|
42
42
|
function warn(message: string, payload: LogPayload): void;
|
|
43
43
|
function warn(message: string): void;
|
|
44
|
-
function warn(error:
|
|
45
|
-
function warn(error:
|
|
46
|
-
function info(context: LogContext, message: string, error:
|
|
47
|
-
function info(context: LogContext, message: string, error:
|
|
44
|
+
function warn(error: any, payload: LogPayload): void;
|
|
45
|
+
function warn(error: any): void;
|
|
46
|
+
function info(context: LogContext, message: string, error: any, payload: LogPayload): void;
|
|
47
|
+
function info(context: LogContext, message: string, error: any): void;
|
|
48
48
|
function info(context: LogContext, message: string, payload: LogPayload): void;
|
|
49
49
|
function info(context: LogContext, message: string): void;
|
|
50
|
-
function info(context: LogContext, error:
|
|
51
|
-
function info(context: LogContext, error:
|
|
52
|
-
function info(message: string, error:
|
|
53
|
-
function info(message: string, error:
|
|
50
|
+
function info(context: LogContext, error: any, payload: LogPayload): void;
|
|
51
|
+
function info(context: LogContext, error: any): void;
|
|
52
|
+
function info(message: string, error: any, payload: LogPayload): void;
|
|
53
|
+
function info(message: string, error: any): void;
|
|
54
54
|
function info(message: string, payload: LogPayload): void;
|
|
55
55
|
function info(message: string): void;
|
|
56
|
-
function info(error:
|
|
57
|
-
function info(error:
|
|
58
|
-
function debug(context: LogContext, message: string, error:
|
|
59
|
-
function debug(context: LogContext, message: string, error:
|
|
56
|
+
function info(error: any, payload: LogPayload): void;
|
|
57
|
+
function info(error: any): void;
|
|
58
|
+
function debug(context: LogContext, message: string, error: any, payload: LogPayload): void;
|
|
59
|
+
function debug(context: LogContext, message: string, error: any): void;
|
|
60
60
|
function debug(context: LogContext, message: string, payload: LogPayload): void;
|
|
61
61
|
function debug(context: LogContext, message: string): void;
|
|
62
|
-
function debug(context: LogContext, error:
|
|
63
|
-
function debug(context: LogContext, error:
|
|
64
|
-
function debug(message: string, error:
|
|
65
|
-
function debug(message: string, error:
|
|
62
|
+
function debug(context: LogContext, error: any, payload: LogPayload): void;
|
|
63
|
+
function debug(context: LogContext, error: any): void;
|
|
64
|
+
function debug(message: string, error: any, payload: LogPayload): void;
|
|
65
|
+
function debug(message: string, error: any): void;
|
|
66
66
|
function debug(message: string, payload: LogPayload): void;
|
|
67
67
|
function debug(message: string): void;
|
|
68
|
-
function debug(error:
|
|
69
|
-
function debug(error:
|
|
68
|
+
function debug(error: any, payload: LogPayload): void;
|
|
69
|
+
function debug(error: any): void;
|
|
70
70
|
/**
|
|
71
71
|
* Do not use in frontend.
|
|
72
72
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../../src/util/logging.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAQH,MAAM,WAAW,UAAU;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB;AACD,yBAAiB,UAAU,CAAC;IACxB,SAAgB,IAAI,CAAC,MAAM,EAAG;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,GAAG,CAAC;QAAC,OAAO,CAAC,EAAE,GAAG,CAAA;KAAE,cAK3E;CACJ;AAED,MAAM,WAAW,UAAU;CAE1B;AAED,yBAAiB,GAAG,CAAC;IACjB,SAAgB,KAAK,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../../src/util/logging.ts"],"names":[],"mappings":"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"}
|
package/lib/util/logging.js
CHANGED
|
@@ -4,43 +4,12 @@
|
|
|
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
|
*/
|
|
7
|
-
var __assign = (this && this.__assign) || function () {
|
|
8
|
-
__assign = Object.assign || function(t) {
|
|
9
|
-
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
10
|
-
s = arguments[i];
|
|
11
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
12
|
-
t[p] = s[p];
|
|
13
|
-
}
|
|
14
|
-
return t;
|
|
15
|
-
};
|
|
16
|
-
return __assign.apply(this, arguments);
|
|
17
|
-
};
|
|
18
|
-
var __read = (this && this.__read) || function (o, n) {
|
|
19
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
20
|
-
if (!m) return o;
|
|
21
|
-
var i = m.call(o), r, ar = [], e;
|
|
22
|
-
try {
|
|
23
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
24
|
-
}
|
|
25
|
-
catch (error) { e = { error: error }; }
|
|
26
|
-
finally {
|
|
27
|
-
try {
|
|
28
|
-
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
29
|
-
}
|
|
30
|
-
finally { if (e) throw e.error; }
|
|
31
|
-
}
|
|
32
|
-
return ar;
|
|
33
|
-
};
|
|
34
|
-
var __spread = (this && this.__spread) || function () {
|
|
35
|
-
for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
|
|
36
|
-
return ar;
|
|
37
|
-
};
|
|
38
7
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
8
|
exports.LogrusLogLevel = exports.LogrusLogLevels = exports.log = exports.LogContext = void 0;
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
9
|
+
const inspect = require('util').inspect; // undefined in frontend
|
|
10
|
+
let jsonLogging = false;
|
|
11
|
+
let component;
|
|
12
|
+
let version;
|
|
44
13
|
;
|
|
45
14
|
var LogContext;
|
|
46
15
|
(function (LogContext) {
|
|
@@ -56,35 +25,19 @@ var LogContext;
|
|
|
56
25
|
;
|
|
57
26
|
var log;
|
|
58
27
|
(function (log) {
|
|
59
|
-
function error() {
|
|
60
|
-
var args = [];
|
|
61
|
-
for (var _i = 0; _i < arguments.length; _i++) {
|
|
62
|
-
args[_i] = arguments[_i];
|
|
63
|
-
}
|
|
28
|
+
function error(...args) {
|
|
64
29
|
errorLog(false, args);
|
|
65
30
|
}
|
|
66
31
|
log.error = error;
|
|
67
|
-
function warn() {
|
|
68
|
-
var args = [];
|
|
69
|
-
for (var _i = 0; _i < arguments.length; _i++) {
|
|
70
|
-
args[_i] = arguments[_i];
|
|
71
|
-
}
|
|
32
|
+
function warn(...args) {
|
|
72
33
|
warnLog(false, args);
|
|
73
34
|
}
|
|
74
35
|
log.warn = warn;
|
|
75
|
-
function info() {
|
|
76
|
-
var args = [];
|
|
77
|
-
for (var _i = 0; _i < arguments.length; _i++) {
|
|
78
|
-
args[_i] = arguments[_i];
|
|
79
|
-
}
|
|
36
|
+
function info(...args) {
|
|
80
37
|
infoLog(false, args);
|
|
81
38
|
}
|
|
82
39
|
log.info = info;
|
|
83
|
-
function debug() {
|
|
84
|
-
var args = [];
|
|
85
|
-
for (var _i = 0; _i < arguments.length; _i++) {
|
|
86
|
-
args[_i] = arguments[_i];
|
|
87
|
-
}
|
|
40
|
+
function debug(...args) {
|
|
88
41
|
debugLog(false, args);
|
|
89
42
|
}
|
|
90
43
|
log.debug = debug;
|
|
@@ -99,51 +52,24 @@ var log;
|
|
|
99
52
|
log.enableJSONLogging = enableJSONLogging;
|
|
100
53
|
function setLogLevel(logLevel) {
|
|
101
54
|
jsonLogging = true;
|
|
102
|
-
console.error = function () {
|
|
103
|
-
var args = [];
|
|
104
|
-
for (var _i = 0; _i < arguments.length; _i++) {
|
|
105
|
-
args[_i] = arguments[_i];
|
|
106
|
-
}
|
|
55
|
+
console.error = function (...args) {
|
|
107
56
|
errorLog(true, args);
|
|
108
57
|
};
|
|
109
|
-
console.warn = function () {
|
|
110
|
-
var args = [];
|
|
111
|
-
for (var _i = 0; _i < arguments.length; _i++) {
|
|
112
|
-
args[_i] = arguments[_i];
|
|
113
|
-
}
|
|
58
|
+
console.warn = function (...args) {
|
|
114
59
|
warnLog(true, args);
|
|
115
60
|
};
|
|
116
|
-
console.info = function () {
|
|
117
|
-
var args = [];
|
|
118
|
-
for (var _i = 0; _i < arguments.length; _i++) {
|
|
119
|
-
args[_i] = arguments[_i];
|
|
120
|
-
}
|
|
61
|
+
console.info = function (...args) {
|
|
121
62
|
infoLog(true, args);
|
|
122
63
|
};
|
|
123
|
-
console.debug = function () {
|
|
124
|
-
var args = [];
|
|
125
|
-
for (var _i = 0; _i < arguments.length; _i++) {
|
|
126
|
-
args[_i] = arguments[_i];
|
|
127
|
-
}
|
|
64
|
+
console.debug = function (...args) {
|
|
128
65
|
debugLog(true, args);
|
|
129
66
|
};
|
|
130
67
|
console.log = console.info;
|
|
131
68
|
// FIXME wrap also other console methods (e.g. trace())
|
|
132
69
|
// set/unset log functions based on loglevel so we only have to evaluate once, not every call
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
return function () {
|
|
137
|
-
var args = [];
|
|
138
|
-
for (var _i = 0; _i < arguments.length; _i++) {
|
|
139
|
-
args[_i] = arguments[_i];
|
|
140
|
-
}
|
|
141
|
-
logFunc(true, args);
|
|
142
|
-
};
|
|
143
|
-
}
|
|
144
|
-
else {
|
|
145
|
-
return noop;
|
|
146
|
-
}
|
|
70
|
+
const noop = () => { };
|
|
71
|
+
const setLog = (logFunc, funcLevel) => {
|
|
72
|
+
return LogrusLogLevel.isGreatherOrEqual(funcLevel, logLevel) ? logFunc : noop;
|
|
147
73
|
};
|
|
148
74
|
errorLog = setLog(doErrorLog, "error");
|
|
149
75
|
warnLog = setLog(doWarnLog, "warning");
|
|
@@ -165,19 +91,19 @@ var log;
|
|
|
165
91
|
}
|
|
166
92
|
log.setVersion = setVersion;
|
|
167
93
|
})(log = exports.log || (exports.log = {}));
|
|
168
|
-
|
|
94
|
+
let errorLog = doErrorLog;
|
|
169
95
|
function doErrorLog(calledViaConsole, args) {
|
|
170
96
|
doLog(calledViaConsole, errorConsoleLog, 'ERROR', args);
|
|
171
97
|
}
|
|
172
|
-
|
|
98
|
+
let warnLog = doWarnLog;
|
|
173
99
|
function doWarnLog(calledViaConsole, args) {
|
|
174
100
|
doLog(calledViaConsole, warnConsoleLog, 'WARNING', args);
|
|
175
101
|
}
|
|
176
|
-
|
|
102
|
+
let infoLog = doInfoLog;
|
|
177
103
|
function doInfoLog(calledViaConsole, args) {
|
|
178
104
|
doLog(calledViaConsole, infoConsoleLog, 'INFO', args);
|
|
179
105
|
}
|
|
180
|
-
|
|
106
|
+
let debugLog = doDebugLog;
|
|
181
107
|
function doDebugLog(calledViaConsole, args) {
|
|
182
108
|
doLog(calledViaConsole, debugConsoleLog, 'DEBUG', args);
|
|
183
109
|
}
|
|
@@ -204,15 +130,15 @@ var LogrusLogLevel;
|
|
|
204
130
|
LogrusLogLevel.isGreatherOrEqual = isGreatherOrEqual;
|
|
205
131
|
function getLevelArity(lvl) {
|
|
206
132
|
return Object.keys(exports.LogrusLogLevels)
|
|
207
|
-
.findIndex(
|
|
133
|
+
.findIndex((l) => l === lvl);
|
|
208
134
|
}
|
|
209
135
|
function getFromEnv() {
|
|
210
|
-
|
|
136
|
+
const lvlStr = process.env.LOG_LEVEL;
|
|
211
137
|
if (!lvlStr) {
|
|
212
138
|
return undefined;
|
|
213
139
|
}
|
|
214
|
-
|
|
215
|
-
|
|
140
|
+
const lvl = lvlStr;
|
|
141
|
+
const exists = exports.LogrusLogLevels[lvl];
|
|
216
142
|
if (!exists) {
|
|
217
143
|
return undefined;
|
|
218
144
|
}
|
|
@@ -222,7 +148,7 @@ var LogrusLogLevel;
|
|
|
222
148
|
})(LogrusLogLevel = exports.LogrusLogLevel || (exports.LogrusLogLevel = {}));
|
|
223
149
|
var GoogleLogSeverity;
|
|
224
150
|
(function (GoogleLogSeverity) {
|
|
225
|
-
GoogleLogSeverity.isGreaterOrEqualThanWarning =
|
|
151
|
+
GoogleLogSeverity.isGreaterOrEqualThanWarning = (severity) => {
|
|
226
152
|
switch (severity) {
|
|
227
153
|
case 'INFO':
|
|
228
154
|
case 'DEBUG':
|
|
@@ -234,17 +160,17 @@ var GoogleLogSeverity;
|
|
|
234
160
|
})(GoogleLogSeverity || (GoogleLogSeverity = {}));
|
|
235
161
|
function doLog(calledViaConsole, consoleLog, severity, args) {
|
|
236
162
|
if (!jsonLogging) {
|
|
237
|
-
consoleLog
|
|
163
|
+
consoleLog(...args);
|
|
238
164
|
return;
|
|
239
165
|
}
|
|
240
166
|
if (args.length == 0) {
|
|
241
167
|
// console.xyz()
|
|
242
168
|
return;
|
|
243
169
|
}
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
170
|
+
let context;
|
|
171
|
+
let message;
|
|
172
|
+
let error;
|
|
173
|
+
let payloadArgs;
|
|
248
174
|
if (args[0] instanceof Error) {
|
|
249
175
|
// console.xyz(Error, ...any) / log.xyz(Error) / log.xyz(Error, LogPayload)
|
|
250
176
|
error = args[0];
|
|
@@ -292,7 +218,7 @@ function doLog(calledViaConsole, consoleLog, severity, args) {
|
|
|
292
218
|
payloadArgs = args;
|
|
293
219
|
}
|
|
294
220
|
}
|
|
295
|
-
|
|
221
|
+
const logItem = makeLogItem(severity, context, message, error, payloadArgs, calledViaConsole);
|
|
296
222
|
if (logItem !== undefined) {
|
|
297
223
|
consoleLog(logItem);
|
|
298
224
|
}
|
|
@@ -301,20 +227,20 @@ function makeLogItem(severity, context, message, error, payloadArgs, calledViaCo
|
|
|
301
227
|
if (context !== undefined && Object.keys(context).length == 0) {
|
|
302
228
|
context = undefined;
|
|
303
229
|
}
|
|
304
|
-
|
|
230
|
+
let reportedErrorEvent = {};
|
|
305
231
|
if (GoogleLogSeverity.isGreaterOrEqualThanWarning(severity)) {
|
|
306
232
|
reportedErrorEvent = makeReportedErrorEvent(error);
|
|
307
233
|
}
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
severity
|
|
311
|
-
message
|
|
312
|
-
error
|
|
313
|
-
payload
|
|
314
|
-
|
|
234
|
+
const payload = payloadArgs.length == 0 ? undefined : payloadArgs.length == 1 ? payloadArgs[0] : payloadArgs;
|
|
235
|
+
const logItem = Object.assign(Object.assign({}, reportedErrorEvent), { component,
|
|
236
|
+
severity, time: new Date().toISOString(), environment: process.env.KUBE_STAGE, context,
|
|
237
|
+
message,
|
|
238
|
+
error,
|
|
239
|
+
payload, loggedViaConsole: calledViaConsole ? true : undefined });
|
|
240
|
+
let result = stringifyLogItem(logItem);
|
|
315
241
|
if (result.length > maxAllowedLogItemLength && payload !== undefined) {
|
|
316
242
|
delete logItem.payload;
|
|
317
|
-
logItem.payloadStub =
|
|
243
|
+
logItem.payloadStub = `Payload stripped as log item was longer than ${maxAllowedLogItemLength} characters`;
|
|
318
244
|
result = stringifyLogItem(logItem);
|
|
319
245
|
if (result.length <= maxAllowedLogItemLength) {
|
|
320
246
|
log.warn('Log item too large, stripping payload', { logItemStub: makeLogItemStub(logItem) });
|
|
@@ -329,7 +255,7 @@ function makeLogItem(severity, context, message, error, payloadArgs, calledViaCo
|
|
|
329
255
|
// See https://cloud.google.com/error-reporting/docs/formatting-error-messages
|
|
330
256
|
// and https://cloud.google.com/error-reporting/reference/rest/v1beta1/projects.events/report#ReportedErrorEvent
|
|
331
257
|
function makeReportedErrorEvent(error) {
|
|
332
|
-
|
|
258
|
+
const result = {
|
|
333
259
|
// Serves as marker only
|
|
334
260
|
"@type": "type.googleapis.com/google.devtools.clouderrorreporting.v1beta1.ReportedErrorEvent",
|
|
335
261
|
// This is useful for filtering in the UI
|
|
@@ -340,7 +266,7 @@ function makeReportedErrorEvent(error) {
|
|
|
340
266
|
};
|
|
341
267
|
if (error) {
|
|
342
268
|
// According to: https://cloud.google.com/error-reporting/docs/formatting-error-messages#json_representation
|
|
343
|
-
|
|
269
|
+
const stackTrace = error.stack;
|
|
344
270
|
if (stackTrace) {
|
|
345
271
|
result.stack_trace = stackTrace;
|
|
346
272
|
}
|
|
@@ -348,7 +274,7 @@ function makeReportedErrorEvent(error) {
|
|
|
348
274
|
return result;
|
|
349
275
|
}
|
|
350
276
|
function makeLogItemStub(logItem) {
|
|
351
|
-
|
|
277
|
+
const result = {
|
|
352
278
|
component: logItem.component,
|
|
353
279
|
severity: logItem.severity,
|
|
354
280
|
time: logItem.time,
|
|
@@ -390,16 +316,16 @@ function stringifyLogItem(logItem) {
|
|
|
390
316
|
* Jsonifies Errors properly, not as {} only.
|
|
391
317
|
*/
|
|
392
318
|
function jsonStringifyWithErrors(value) {
|
|
393
|
-
return JSON.stringify(value,
|
|
319
|
+
return JSON.stringify(value, (key, value) => { return value instanceof Error ? value.stack : value; });
|
|
394
320
|
}
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
321
|
+
const logConsoleLog = console.log;
|
|
322
|
+
const errorConsoleLog = console.error;
|
|
323
|
+
const warnConsoleLog = console.warn;
|
|
324
|
+
const infoConsoleLog = console.info;
|
|
325
|
+
const debugConsoleLog = console.debug;
|
|
400
326
|
// according to https://cloud.google.com/logging/quotas#logging_usage_limits, the log item must fit in 100 KB (internal data
|
|
401
327
|
// size; its relation to the stringified JSON's size is unknown), so let's have a sufficient safe margin
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
328
|
+
const maxAllowedLogItemLength = 32 * 1024;
|
|
329
|
+
const maxMessageStubLength = 1024;
|
|
330
|
+
const maxErrorStubLength = 4096;
|
|
405
331
|
//# sourceMappingURL=logging.js.map
|
package/lib/util/logging.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../src/util/logging.ts"],"names":[],"mappings":";AAAA;;;;GAIG
|
|
1
|
+
{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../src/util/logging.ts"],"names":[],"mappings":"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"}
|
package/lib/util/make-link.js
CHANGED
|
@@ -10,8 +10,8 @@ function isOpenNewTab(event) {
|
|
|
10
10
|
return event.metaKey || (event.ctrlKey);
|
|
11
11
|
}
|
|
12
12
|
function makeLink(node, url, hover) {
|
|
13
|
-
node.onclick =
|
|
14
|
-
|
|
13
|
+
node.onclick = event => {
|
|
14
|
+
let target = '_self';
|
|
15
15
|
if (isOpenNewTab(event)) {
|
|
16
16
|
target = '_blank';
|
|
17
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"make-link.js","sourceRoot":"","sources":["../../src/util/make-link.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,SAAS,YAAY,CAAC,KAAiB;IACnC,OAAO,KAAK,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AAC5C,CAAC;AAED,SAAgB,QAAQ,CAAC,IAAiB,EAAE,GAAW,EAAE,KAAa;IAClE,IAAI,CAAC,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"make-link.js","sourceRoot":"","sources":["../../src/util/make-link.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,SAAS,YAAY,CAAC,KAAiB;IACnC,OAAO,KAAK,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AAC5C,CAAC;AAED,SAAgB,QAAQ,CAAC,IAAiB,EAAE,GAAW,EAAE,KAAa;IAClE,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,EAAE;QACnB,IAAI,MAAM,GAAG,OAAO,CAAC;QACrB,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE;YACrB,MAAM,GAAG,QAAQ,CAAC;SACrB;QACD,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC7B,CAAC,CAAA;IACD,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC;IAC9B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;AACvB,CAAC;AAVD,4BAUC"}
|
|
@@ -11,4 +11,14 @@
|
|
|
11
11
|
* @param hostname The hostname the request is headed to
|
|
12
12
|
*/
|
|
13
13
|
export declare const parseWorkspaceIdFromHostname: (hostname: string) => string | undefined;
|
|
14
|
+
/**
|
|
15
|
+
* @param maybeId
|
|
16
|
+
* @returns
|
|
17
|
+
*/
|
|
18
|
+
export declare const matchesInstanceIdOrLegacyWorkspaceIdExactly: (maybeId: string) => boolean;
|
|
19
|
+
/**
|
|
20
|
+
* @param maybeWorkspaceId
|
|
21
|
+
* @returns
|
|
22
|
+
*/
|
|
23
|
+
export declare const matchesNewWorkspaceIdExactly: (maybeWorkspaceId: string) => boolean;
|
|
14
24
|
//# sourceMappingURL=parse-workspace-id.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-workspace-id.d.ts","sourceRoot":"","sources":["../../src/util/parse-workspace-id.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"parse-workspace-id.d.ts","sourceRoot":"","sources":["../../src/util/parse-workspace-id.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAWH;;;;;;GAMG;AACH,eAAO,MAAM,4BAA4B,aAAsB,MAAM,uBAWpE,CAAC;AAMF;;;GAGG;AACH,eAAO,MAAM,2CAA2C,YAAqB,MAAM,KAAG,OAGrF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,4BAA4B,qBAA8B,MAAM,KAAG,OAE/E,CAAC"}
|