@gitpod/gitpod-protocol 0.1.5-wth-argo.0 → 0.1.5-yh-vmoptions-fork.1

package/src/util/logging.ts

@@ -4,7 +4,7 @@
  * See License-AGPL.txt in the project root for license information.
  */
 
-const inspect: (object: any) => string = require('util').inspect;   // undefined in frontend
+const inspect: (object: any) => string = require("util").inspect; // undefined in frontend
 
 let jsonLogging: boolean = false;
 let component: string | undefined;
@@ -15,81 +15,81 @@ export interface LogContext {
     sessionId?: string;
     userId?: string;
     workspaceId?: string;
-};
+}
 export namespace LogContext {
-    export function from(params : { userId?: string, user?: any, request?: any } ) {
+    export function from(params: { userId?: string; user?: any; request?: any }) {
         return <LogContext>{
             sessionId: params.request?.requestID,
-            userId: params.userId || params.user?.id
-        }
+            userId: params.userId || params.user?.id,
+        };
     }
 }
 
 export interface LogPayload {
     // placeholder to indicate that only dictionary-style objects should be passed as payload
-};
+}
 
 export namespace log {
-    export function error(context: LogContext, message: string, error: Error, payload: LogPayload): void;
-    export function error(context: LogContext, message: string, error: Error): void;
+    export function error(context: LogContext, message: string, error: any, payload: LogPayload): void;
+    export function error(context: LogContext, message: string, error: any): void;
     export function error(context: LogContext, message: string, payload: LogPayload): void;
     export function error(context: LogContext, message: string): void;
-    export function error(context: LogContext, error: Error, payload: LogPayload): void;
-    export function error(context: LogContext, error: Error): void;
-    export function error(message: string, error: Error, payload: LogPayload): void;
-    export function error(message: string, error: Error): void;
+    export function error(context: LogContext, error: any, payload: LogPayload): void;
+    export function error(context: LogContext, error: any): void;
+    export function error(message: string, error: any, payload: LogPayload): void;
+    export function error(message: string, error: any): void;
     export function error(message: string, payload: LogPayload): void;
     export function error(message: string): void;
-    export function error(error: Error, payload: LogPayload): void;
-    export function error(error: Error): void;
+    export function error(error: any, payload: LogPayload): void;
+    export function error(error: any): void;
     export function error(...args: any[]): void {
         errorLog(false, args);
     }
 
-    export function warn(context: LogContext, message: string, error: Error, payload: LogPayload): void;
-    export function warn(context: LogContext, message: string, error: Error): void;
+    export function warn(context: LogContext, message: string, error: any, payload: LogPayload): void;
+    export function warn(context: LogContext, message: string, error: any): void;
     export function warn(context: LogContext, message: string, payload: LogPayload): void;
     export function warn(context: LogContext, message: string): void;
-    export function warn(context: LogContext, error: Error, payload: LogPayload): void;
-    export function warn(context: LogContext, error: Error): void;
-    export function warn(message: string, error: Error, payload: LogPayload): void;
-    export function warn(message: string, error: Error): void;
+    export function warn(context: LogContext, error: any, payload: LogPayload): void;
+    export function warn(context: LogContext, error: any): void;
+    export function warn(message: string, error: any, payload: LogPayload): void;
+    export function warn(message: string, error: any): void;
     export function warn(message: string, payload: LogPayload): void;
     export function warn(message: string): void;
-    export function warn(error: Error, payload: LogPayload): void;
-    export function warn(error: Error): void;
+    export function warn(error: any, payload: LogPayload): void;
+    export function warn(error: any): void;
     export function warn(...args: any[]): void {
         warnLog(false, args);
     }
 
-    export function info(context: LogContext, message: string, error: Error, payload: LogPayload): void;
-    export function info(context: LogContext, message: string, error: Error): void;
+    export function info(context: LogContext, message: string, error: any, payload: LogPayload): void;
+    export function info(context: LogContext, message: string, error: any): void;
     export function info(context: LogContext, message: string, payload: LogPayload): void;
     export function info(context: LogContext, message: string): void;
-    export function info(context: LogContext, error: Error, payload: LogPayload): void;
-    export function info(context: LogContext, error: Error): void;
-    export function info(message: string, error: Error, payload: LogPayload): void;
-    export function info(message: string, error: Error): void;
+    export function info(context: LogContext, error: any, payload: LogPayload): void;
+    export function info(context: LogContext, error: any): void;
+    export function info(message: string, error: any, payload: LogPayload): void;
+    export function info(message: string, error: any): void;
     export function info(message: string, payload: LogPayload): void;
     export function info(message: string): void;
-    export function info(error: Error, payload: LogPayload): void;
-    export function info(error: Error): void;
+    export function info(error: any, payload: LogPayload): void;
+    export function info(error: any): void;
     export function info(...args: any[]): void {
         infoLog(false, args);
     }
 
-    export function debug(context: LogContext, message: string, error: Error, payload: LogPayload): void;
-    export function debug(context: LogContext, message: string, error: Error): void;
+    export function debug(context: LogContext, message: string, error: any, payload: LogPayload): void;
+    export function debug(context: LogContext, message: string, error: any): void;
     export function debug(context: LogContext, message: string, payload: LogPayload): void;
     export function debug(context: LogContext, message: string): void;
-    export function debug(context: LogContext, error: Error, payload: LogPayload): void;
-    export function debug(context: LogContext, error: Error): void;
-    export function debug(message: string, error: Error, payload: LogPayload): void;
-    export function debug(message: string, error: Error): void;
+    export function debug(context: LogContext, error: any, payload: LogPayload): void;
+    export function debug(context: LogContext, error: any): void;
+    export function debug(message: string, error: any, payload: LogPayload): void;
+    export function debug(message: string, error: any): void;
     export function debug(message: string, payload: LogPayload): void;
     export function debug(message: string): void;
-    export function debug(error: Error, payload: LogPayload): void;
-    export function debug(error: Error): void;
+    export function debug(error: any, payload: LogPayload): void;
+    export function debug(error: any): void;
     export function debug(...args: any[]): void {
         debugLog(false, args);
     }
@@ -97,26 +97,46 @@ export namespace log {
     /**
      * Do not use in frontend.
      */
-    export function enableJSONLogging(componentArg: string, versionArg: string | undefined): void {
+    export function enableJSONLogging(
+        componentArg: string,
+        versionArg: string | undefined,
+        logLevel?: LogrusLogLevel,
+    ): void {
         component = componentArg;
         version = versionArg;
 
+        setLogLevel(logLevel);
+    }
+
+    export function setLogLevel(logLevel: LogrusLogLevel | undefined) {
         jsonLogging = true;
 
         console.error = function (...args: any[]): void {
             errorLog(true, args);
-        }
+        };
         console.warn = function (...args: any[]): void {
             warnLog(true, args);
-        }
+        };
         console.info = function (...args: any[]): void {
             infoLog(true, args);
-        }
+        };
         console.debug = function (...args: any[]): void {
             debugLog(true, args);
-        }
+        };
+
         console.log = console.info;
         // FIXME wrap also other console methods (e.g. trace())
+
+        // set/unset log functions based on loglevel so we only have to evaluate once, not every call
+        const noop = () => {};
+        const setLog = (logFunc: DoLogFunction, funcLevel: LogrusLogLevel): DoLogFunction => {
+            return LogrusLogLevel.isGreatherOrEqual(funcLevel, logLevel) ? logFunc : noop;
+        };
+
+        errorLog = setLog(doErrorLog, "error");
+        warnLog = setLog(doWarnLog, "warning");
+        infoLog = setLog(doInfoLog, "info");
+        debugLog = setLog(doDebugLog, "debug");
     }
 
     export function resetToDefaultLogging(): void {
@@ -128,31 +148,79 @@ export namespace log {
         console.info = infoConsoleLog;
         console.debug = debugConsoleLog;
     }
+
+    export function setVersion(versionArg: string) {
+        version = versionArg;
+    }
 }
 
-function errorLog(calledViaConsole: boolean, args: any[]): void {
-    doLog(calledViaConsole, errorConsoleLog, 'ERROR', args);
+type DoLogFunction = (calledViaConsole: boolean, args: any[]) => void;
+
+let errorLog = doErrorLog;
+function doErrorLog(calledViaConsole: boolean, args: any[]): void {
+    doLog(calledViaConsole, errorConsoleLog, "ERROR", args);
 }
 
-function warnLog(calledViaConsole: boolean, args: any[]): void {
-    doLog(calledViaConsole, warnConsoleLog, 'WARNING', args);
+let warnLog = doWarnLog;
+function doWarnLog(calledViaConsole: boolean, args: any[]): void {
+    doLog(calledViaConsole, warnConsoleLog, "WARNING", args);
 }
 
-function infoLog(calledViaConsole: boolean, args: any[]): void {
-    doLog(calledViaConsole, infoConsoleLog, 'INFO', args);
+let infoLog = doInfoLog;
+function doInfoLog(calledViaConsole: boolean, args: any[]): void {
+    doLog(calledViaConsole, infoConsoleLog, "INFO", args);
 }
 
-function debugLog(calledViaConsole: boolean, args: any[]): void {
-    doLog(calledViaConsole, debugConsoleLog, 'DEBUG', args);
+let debugLog = doDebugLog;
+function doDebugLog(calledViaConsole: boolean, args: any[]): void {
+    doLog(calledViaConsole, debugConsoleLog, "DEBUG", args);
+}
+
+// Ref: https://github.com/sirupsen/logrus#level-logging
+export type LogrusLogLevel = keyof typeof LogrusLogLevels;
+export const LogrusLogLevels = {
+    trace: true,
+    debug: true,
+    info: true,
+    warning: true,
+    error: true,
+    fatal: true,
+    panic: true,
+};
+export namespace LogrusLogLevel {
+    export function isGreatherOrEqual(lvl: LogrusLogLevel | undefined, ref: LogrusLogLevel | undefined): boolean {
+        if (lvl === undefined) {
+            return false;
+        }
+        if (ref === undefined) {
+            return true;
+        }
+        return getLevelArity(lvl) >= getLevelArity(ref);
+    }
+    function getLevelArity(lvl: LogrusLogLevel): number {
+        return Object.keys(LogrusLogLevels).findIndex((l) => l === lvl);
+    }
+    export function getFromEnv(): LogrusLogLevel | undefined {
+        const lvlStr = process.env.LOG_LEVEL;
+        if (!lvlStr) {
+            return undefined;
+        }
+        const lvl = lvlStr as LogrusLogLevel;
+        const exists = LogrusLogLevels[lvl];
+        if (!exists) {
+            return undefined;
+        }
+        return lvl;
+    }
 }
 
 // Source: https://cloud.google.com/logging/docs/reference/v2/rest/v2/LogEntry#LogSeverity
-type GoogleLogSeverity = 'EMERGENCY' | 'ALERT' | 'CRITICAL' | 'ERROR' | 'WARNING' | 'INFO' | 'DEBUG';
+type GoogleLogSeverity = "EMERGENCY" | "ALERT" | "CRITICAL" | "ERROR" | "WARNING" | "INFO" | "DEBUG";
 namespace GoogleLogSeverity {
     export const isGreaterOrEqualThanWarning = (severity: GoogleLogSeverity) => {
         switch (severity) {
-            case 'INFO':
-            case 'DEBUG':
+            case "INFO":
+            case "DEBUG":
                 return false;
             default:
                 return true;
@@ -180,7 +248,7 @@ function doLog(calledViaConsole: boolean, consoleLog: ConsoleLog, severity: Goog
         // console.xyz(Error, ...any) / log.xyz(Error) / log.xyz(Error, LogPayload)
         error = args[0];
         payloadArgs = args.slice(1);
-    } else if (typeof args[0] === 'string') {
+    } else if (typeof args[0] === "string") {
         message = args[0];
         if (args.length < 2 || !(args[1] instanceof Error)) {
             // console.xyz(string) / console.xyz(string, !Error, ...any) / log.xyz(string) / log.xyz(string, LogPayload)
@@ -200,7 +268,7 @@ function doLog(calledViaConsole: boolean, consoleLog: ConsoleLog, severity: Goog
             // log.xyz(LogContext, Error) / log.xyz(LogContext, Error, LogPayload)
             error = args[1];
             payloadArgs = args.slice(2);
-        } else if (typeof args[1] === 'string') {
+        } else if (typeof args[1] === "string") {
             message = args[1];
             if (args.length < 3 || !(args[2] instanceof Error)) {
                 // log.xyz(LogContext, string) / log.xyz(LogContext, string, LogPayload)
@@ -223,9 +291,14 @@ function doLog(calledViaConsole: boolean, consoleLog: ConsoleLog, severity: Goog
     }
 }
 
-function makeLogItem(severity: GoogleLogSeverity, context: LogContext | undefined, message: string | undefined,
-        error: Error | undefined, payloadArgs: any[], calledViaConsole: boolean): string | undefined {
-
+function makeLogItem(
+    severity: GoogleLogSeverity,
+    context: LogContext | undefined,
+    message: string | undefined,
+    error: Error | undefined,
+    payloadArgs: any[],
+    calledViaConsole: boolean,
+): string | undefined {
     if (context !== undefined && Object.keys(context).length == 0) {
         context = undefined;
     }
@@ -242,13 +315,11 @@ function makeLogItem(severity: GoogleLogSeverity, context: LogContext | undefine
         component,
         severity,
         time: new Date().toISOString(),
-        environment: process.env.KUBE_STAGE,
-        region: process.env.GITPOD_REGION,
         context,
         message,
         error,
         payload,
-        loggedViaConsole: calledViaConsole ? true : undefined
+        loggedViaConsole: calledViaConsole ? true : undefined,
     };
     let result: string = stringifyLogItem(logItem);
 
@@ -259,11 +330,11 @@ function makeLogItem(severity: GoogleLogSeverity, context: LogContext | undefine
         result = stringifyLogItem(logItem);
 
         if (result.length <= maxAllowedLogItemLength) {
-            log.warn('Log item too large, stripping payload', { logItemStub: makeLogItemStub(logItem) });
+            log.warn("Log item too large, stripping payload", { logItemStub: makeLogItemStub(logItem) });
         }
     }
     if (result.length > maxAllowedLogItemLength) {
-        log.error('Log item too large w/o payload, discarding', { logItemStub: makeLogItemStub(logItem) });
+        log.error("Log item too large w/o payload, discarding", { logItemStub: makeLogItemStub(logItem) });
         return undefined;
     }
 
@@ -277,10 +348,10 @@ function makeReportedErrorEvent(error: Error | undefined) {
         // Serves as marker only
         "@type": "type.googleapis.com/google.devtools.clouderrorreporting.v1beta1.ReportedErrorEvent",
         // This is useful for filtering in the UI
-        "serviceContext": {
-            "service": component || "<ts-not-set>",
-            "version": version || "<ts-not-set>",
-        }
+        serviceContext: {
+            service: component || "<ts-not-set>",
+            version: version || "<ts-not-set>",
+        },
     };
 
     if (error) {
@@ -300,9 +371,9 @@ function makeLogItemStub(logItem: any): any {
         severity: logItem.severity,
         time: logItem.time,
         environment: logItem.environment,
-        region: logItem.region
+        region: logItem.region,
     };
-    if (typeof (logItem.message) === 'string') {
+    if (typeof logItem.message === "string") {
         if (logItem.message.length <= maxMessageStubLength) {
             result.message = logItem.message;
         } else {
@@ -336,10 +407,12 @@ function stringifyLogItem(logItem: any): string {
  * Jsonifies Errors properly, not as {} only.
  */
 function jsonStringifyWithErrors(value: any): string {
-    return JSON.stringify(value, (key: string, value: any): any => { return value instanceof Error ? value.stack : value });
+    return JSON.stringify(value, (key: string, value: any): any => {
+        return value instanceof Error ? value.stack : value;
+    });
 }
 
-type ConsoleLog = (message?: any, ...optionalArgs: any[]) => void;  // signature of console.xyz
+type ConsoleLog = (message?: any, ...optionalArgs: any[]) => void; // signature of console.xyz
 const logConsoleLog: ConsoleLog = console.log;
 const errorConsoleLog: ConsoleLog = console.error;
 const warnConsoleLog: ConsoleLog = console.warn;

package/src/util/make-link.ts

@@ -5,18 +5,17 @@
  */
 
 function isOpenNewTab(event: MouseEvent): boolean {
-    return event.metaKey || (event.ctrlKey);
+    return event.metaKey || event.ctrlKey;
 }
 
 export function makeLink(node: HTMLElement, url: string, hover: string): void {
-    node.onclick = event => {
-        let target = '_self';
+    node.onclick = (event) => {
+        let target = "_self";
         if (isOpenNewTab(event)) {
-            target = '_blank';
+            target = "_blank";
         }
         window.open(url, target);
-    }
-    node.style.cursor = 'pointer';
+    };
+    node.style.cursor = "pointer";
     node.title = hover;
 }
-

package/src/util/parse-workspace-id.spec.ts

@@ -4,14 +4,17 @@
  * See License-AGPL.txt in the project root for license information.
  */
 
-import * as chai from 'chai';
-import { suite, test } from 'mocha-typescript';
-import { parseWorkspaceIdFromHostname } from './parse-workspace-id';
+import * as chai from "chai";
+import { suite, test } from "mocha-typescript";
+import {
+    matchesInstanceIdOrLegacyWorkspaceIdExactly,
+    matchesNewWorkspaceIdExactly,
+    parseWorkspaceIdFromHostname,
+} from "./parse-workspace-id";
 const expect = chai.expect;
 
 @suite
 export class ParseWorkspaceIdTest {
-
     @test public parseWorkspaceIdFromHostname_fromWorkspaceLocation() {
         const actual = parseWorkspaceIdFromHostname("moccasin-ferret-155799b3.ws-eu01.gitpod.io");
         expect(actual).to.equal("moccasin-ferret-155799b3");
@@ -28,7 +31,9 @@ export class ParseWorkspaceIdTest {
     }
 
     @test public parseWorkspaceIdFromHostname_fromWorkspacePortLocationWithWebviewPrefixCustomHost() {
-        const actual = parseWorkspaceIdFromHostname("webview-3000-moccasin-ferret-155799b3.ws-eu01.some.subdomain.somehost.com");
+        const actual = parseWorkspaceIdFromHostname(
+            "webview-3000-moccasin-ferret-155799b3.ws-eu01.some.subdomain.somehost.com",
+        );
         expect(actual).to.equal("moccasin-ferret-155799b3");
     }
 
@@ -44,13 +49,37 @@ export class ParseWorkspaceIdTest {
     }
 
     @test public parseLegacyWorkspaceIdFromHostname_fromWorkspacePortLocationWithWebviewPrefix() {
-        const actual = parseWorkspaceIdFromHostname("webview-3000-b7e0eaf8-ec73-44ec-81ea-04859263b656.ws-eu01.gitpod.io");
+        const actual = parseWorkspaceIdFromHostname(
+            "webview-3000-b7e0eaf8-ec73-44ec-81ea-04859263b656.ws-eu01.gitpod.io",
+        );
         expect(actual).to.equal("b7e0eaf8-ec73-44ec-81ea-04859263b656");
     }
 
     @test public parseLegacyWorkspaceIdFromHostname_fromWorkspacePortLocationWithWebviewPrefixCustomHost() {
-        const actual = parseWorkspaceIdFromHostname("webview-3000-ca81a50f-09d7-465c-acd9-264a747d5351.ws-eu01.some.subdomain.somehost.com");
+        const actual = parseWorkspaceIdFromHostname(
+            "webview-3000-ca81a50f-09d7-465c-acd9-264a747d5351.ws-eu01.some.subdomain.somehost.com",
+        );
         expect(actual).to.equal("ca81a50f-09d7-465c-acd9-264a747d5351");
     }
+
+    // match - instance ID
+    @test public matchesInstanceIdOrLegacyWorkspaceIdExactly_positive() {
+        const actual = matchesInstanceIdOrLegacyWorkspaceIdExactly("b7e0eaf8-ec73-44ec-81ea-04859263b656");
+        expect(actual).to.be.true;
+    }
+    @test public matchesInstanceIdOrLegacyWorkspaceIdExactly_negative() {
+        const actual = matchesInstanceIdOrLegacyWorkspaceIdExactly("b7e0eaf8-ec73-44ec-81a-04859263b656");
+        expect(actual).to.be.false;
+    }
+
+    // match - new workspace ID
+    @test public matchesWorkspaceIdExactly_new_positive() {
+        const actual = matchesNewWorkspaceIdExactly("moccasin-ferret-155799b3");
+        expect(actual).to.be.true;
+    }
+    @test public matchesWorkspaceIdExactly_new_negative() {
+        const actual = matchesNewWorkspaceIdExactly("moccasin-ferret-15599b3");
+        expect(actual).to.be.false;
+    }
 }
-module.exports = new ParseWorkspaceIdTest()
+module.exports = new ParseWorkspaceIdTest();

package/src/util/parse-workspace-id.ts

@@ -4,6 +4,14 @@
  * See License-AGPL.txt in the project root for license information.
  */
 
+const REGEX_WORKSPACE_ID = /[0-9a-z]{2,16}-[0-9a-z]{2,16}-[0-9a-z]{8,11}/;
+const REGEX_WORKSPACE_ID_EXACT = new RegExp(`^${REGEX_WORKSPACE_ID.source}$`);
+// We need to parse the workspace id precisely here to get the case '<some-str>-<port>-<wsid>.ws.' right
+const REGEX_WORKSPACE_ID_FROM_HOSTNAME = new RegExp(`(${REGEX_WORKSPACE_ID.source})\.ws`);
+
+const REGEX_WORKSPACE_ID_LEGACY = /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/;
+const REGEX_WORKSPACE_ID_LEGACY_EXACT = new RegExp(`^${REGEX_WORKSPACE_ID_LEGACY.source}$`);
+const REGEX_WORKSPACE_ID_LEGACY_FROM_HOSTNAME = new RegExp(`(${REGEX_WORKSPACE_ID_LEGACY.source})\.ws`);
 
 /**
  * Hostname may be of the form:
@@ -12,18 +20,35 @@
  *  - webview-1234-moccasin-ferret-155799b3.ws-eu01.gitpod.io (or any other string replacing webview)
  * @param hostname The hostname the request is headed to
  */
-export const parseWorkspaceIdFromHostname = function(hostname: string) {
-    // We need to parse the workspace id precisely here to get the case '<some-str>-<port>-<wsid>.ws.' right
-    const wsIdExpression = /([0-9a-z]{2,16}-[0-9a-z]{2,16}-[0-9a-z]{8})\.ws/g;
-    const match = wsIdExpression.exec(hostname);
+export const parseWorkspaceIdFromHostname = function (hostname: string) {
+    const match = REGEX_WORKSPACE_ID_FROM_HOSTNAME.exec(hostname);
     if (match && match.length >= 2) {
         return match[1];
     } else {
-        const legacyUrlFormat = /([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})\.ws/g;
-        const legacyMatch = legacyUrlFormat.exec(hostname);
+        const legacyMatch = REGEX_WORKSPACE_ID_LEGACY_FROM_HOSTNAME.exec(hostname);
         if (legacyMatch && legacyMatch.length >= 2) {
             return legacyMatch[1];
         }
         return undefined;
     }
-}
+};
+
+/** Equalls UUIDv4 (and REGEX_WORKSPACE_ID_LEGACY!) */
+const REGEX_INSTANCE_ID = /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/;
+const REGEX_INSTANCE_ID_EXACT = new RegExp(`^${REGEX_INSTANCE_ID.source}$`);
+
+/**
+ * @param maybeId
+ * @returns
+ */
+export const matchesInstanceIdOrLegacyWorkspaceIdExactly = function (maybeId: string): boolean {
+    return REGEX_INSTANCE_ID_EXACT.test(maybeId) || REGEX_WORKSPACE_ID_LEGACY_EXACT.test(maybeId);
+};
+
+/**
+ * @param maybeWorkspaceId
+ * @returns
+ */
+export const matchesNewWorkspaceIdExactly = function (maybeWorkspaceId: string): boolean {
+    return REGEX_WORKSPACE_ID_EXACT.test(maybeWorkspaceId);
+};

package/src/util/queue.spec.ts

@@ -4,19 +4,19 @@
  * See License-AGPL.txt in the project root for license information.
  */
 
-import { suite, test, slow, timeout } from 'mocha-typescript'
-import * as chai from 'chai'
-const chaiSubset = require('chai-subset');
+import { suite, test, slow, timeout } from "mocha-typescript";
+import * as chai from "chai";
+const chaiSubset = require("chai-subset");
 chai.use(chaiSubset);
 
-import { Queue } from '..';
-import { fail } from 'assert';
-import { Deferred } from './deferred';
+import { Queue } from "..";
+import { fail } from "assert";
+import { Deferred } from "./deferred";
 
-const expect = chai.expect
-
-@suite class QueueSpec {
+const expect = chai.expect;
 
+@suite
+class QueueSpec {
     queue: Queue;
     seq: number[];
 
@@ -32,11 +32,10 @@ const expect = chai.expect
                     return new Promise((resolve) => {
                         setTimeout(() => {
                             this.seq.push(seqNr);
-                            resolve();
+                            resolve(undefined);
                         }, sleep);
                     });
-                else
-                    this.seq.push(seqNr);
+                else this.seq.push(seqNr);
             };
 
             if (nextTick)
@@ -45,20 +44,22 @@ const expect = chai.expect
                         push().then(resolve);
                     });
                 });
-            else
-                await push();
+            else await push();
         });
     }
     execError(seqNr: number): Deferred<boolean> {
         const deferred = new Deferred<boolean>();
-        this.queue.enqueue(async () => {
-            this.seq.push(seqNr);
-            throw new Error('test error');
-        }).then(() => {
-            deferred.reject(false);
-        }).catch(() => {
-            deferred.resolve(true);
-        });
+        this.queue
+            .enqueue(async () => {
+                this.seq.push(seqNr);
+                throw new Error("test error");
+            })
+            .then(() => {
+                deferred.reject(false);
+            })
+            .catch(() => {
+                deferred.resolve(true);
+            });
 
         return deferred;
     }
@@ -67,7 +68,9 @@ const expect = chai.expect
         expect(actual).to.have.lengthOf(expected.length);
         const expIt = expected.entries();
         for (const act of actual) {
-            const { value: [, exp] } = expIt.next();
+            const {
+                value: [, exp],
+            } = expIt.next();
             expect(act).to.deep.equal(exp);
         }
     }
@@ -93,7 +96,6 @@ const expect = chai.expect
         this.expectArray(this.seq, [1, 2]);
     }
 
-
     @test public async continueDespiteError() {
         this.exec(1);
         const receivedError = this.execError(2);
@@ -107,7 +109,7 @@ const expect = chai.expect
     @test public async mustCatchError() {
         const f = async () => {
             throw new Error();
-        }
+        };
         try {
             const p = this.queue.enqueue(async () => {
                 return f();
@@ -124,7 +126,7 @@ const expect = chai.expect
     @test public async expectUncaughtError() {
         const f = async () => {
             throw new Error();
-        }
+        };
         const p = this.queue.enqueue(async () => {
             return f();
         });