2338712688

Build Type

push

github

Committed by GitHub

Commit Message

fix: send correct command during auto-pipelining of .call() operations (#1579)

Run Details

1104 of 1255 branches covered (87.97%)

Branch coverage included in aggregate %.

2 of 2 new or added lines in 1 file covered. (100.0%)

3 existing lines in 2 files now uncovered.

2142 of 2285 relevant lines covered (93.74%)

4075.45 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

94.64

/lib/connectors/StandaloneConnector.ts

import { createConnection, IpcNetConnectOpts, TcpNetConnectOpts } from "net";
import { connect as createTLSConnection, ConnectionOptions } from "tls";
import { NetStream } from "../types";
import { CONNECTION_CLOSED_ERROR_MSG } from "../utils";
import AbstractConnector, { ErrorEmitter } from "./AbstractConnector";

export type StandaloneConnectionOptions = (Partial<TcpNetConnectOpts> &
  Partial<IpcNetConnectOpts>) & {
  disconnectTimeout?: number;
  tls?: ConnectionOptions;
};

export default class StandaloneConnector extends AbstractConnector {
  constructor(protected options: StandaloneConnectionOptions) {
    super(options.disconnectTimeout);
  }

  connect(_: ErrorEmitter) {
    const { options } = this;
    this.connecting = true;

    let connectionOptions: TcpNetConnectOpts | IpcNetConnectOpts;
    if ("path" in options && options.path) {
      connectionOptions = {
        path: options.path,
      } as IpcNetConnectOpts;
    } else {
      connectionOptions = {} as TcpNetConnectOpts;
      if ("port" in options && options.port != null) {
        connectionOptions.port = options.port;
      }
      if ("host" in options && options.host != null) {
        connectionOptions.host = options.host;
      }
      if ("family" in options && options.family != null) {
        connectionOptions.family = options.family;
      }
    }

    if (options.tls) {
      Object.assign(connectionOptions, options.tls);
    }

    // TODO:
    // We use native Promise here since other Promise
    // implementation may use different schedulers that
    // cause issue when the stream is resolved in the
    // next tick.
    // Should use the provided promise in the next major
    // version and do not connect before resolved.
    return new Promise<NetStream>((resolve, reject) => {
      process.nextTick(() => {
        if (!this.connecting) {
          reject(new Error(CONNECTION_CLOSED_ERROR_MSG));
          return;
        }

        try {
          if (options.tls) {
            this.stream = createTLSConnection(connectionOptions);
          } else {
            this.stream = createConnection(connectionOptions);
          }
        } catch (err) {
          reject(err);
          return;
        }

        this.stream.once("error", (err) => {
          this.firstError = err;
        });

        resolve(this.stream);
      });
    });
  }
}

1	import { createConnection, IpcNetConnectOpts, TcpNetConnectOpts } from "net";	1✔
2	import { connect as createTLSConnection, ConnectionOptions } from "tls";	1✔
3	import { NetStream } from "../types";
4	import { CONNECTION_CLOSED_ERROR_MSG } from "../utils";	1✔
5	import AbstractConnector, { ErrorEmitter } from "./AbstractConnector";	1✔
6
7	export type StandaloneConnectionOptions = (Partial<TcpNetConnectOpts> &
8	Partial<IpcNetConnectOpts>) & {
9	disconnectTimeout?: number;
10	tls?: ConnectionOptions;
11	};
12
13	export default class StandaloneConnector extends AbstractConnector {	1✔
14	constructor(protected options: StandaloneConnectionOptions) {	1,332✔
15	super(options.disconnectTimeout);	1,332✔
16	}
17
18	connect(_: ErrorEmitter) {
19	const { options } = this;	1,227✔
20	this.connecting = true;	1,227✔
21
22	let connectionOptions: TcpNetConnectOpts \| IpcNetConnectOpts;
23	if ("path" in options && options.path) {	1,227✔
24	connectionOptions = {	1✔
25	path: options.path,
26	} as IpcNetConnectOpts;
27	} else {
28	connectionOptions = {} as TcpNetConnectOpts;	1,226✔
29	if ("port" in options && options.port != null) {	1,226!
30	connectionOptions.port = options.port;	1,226✔
31	}
32	if ("host" in options && options.host != null) {	1,226✔
33	connectionOptions.host = options.host;	1,224✔
34	}
35	if ("family" in options && options.family != null) {	1,226✔
36	connectionOptions.family = options.family;	1,224✔
37	}
38	}
39
40	if (options.tls) {	1,227✔
41	Object.assign(connectionOptions, options.tls);	5✔
42	}
43
44	// TODO:
45	// We use native Promise here since other Promise
46	// implementation may use different schedulers that
47	// cause issue when the stream is resolved in the
48	// next tick.
49	// Should use the provided promise in the next major
50	// version and do not connect before resolved.
51	return new Promise<NetStream>((resolve, reject) => {	1,227✔
52	process.nextTick(() => {	1,227✔
53	if (!this.connecting) {	1,227✔
54	reject(new Error(CONNECTION_CLOSED_ERROR_MSG));	49✔
55	return;	49✔
56	}
57
58	try {	1,178✔
59	if (options.tls) {	1,178✔
60	this.stream = createTLSConnection(connectionOptions);	5✔
61	} else {
62	this.stream = createConnection(connectionOptions);	1,173✔
63	}
64	} catch (err) {
UNCOV 65	reject(err);	×
UNCOV 66	return;	×
67	}
68
69	this.stream.once("error", (err) => {	1,178✔
70	this.firstError = err;	249✔
71	});
72
73	resolve(this.stream);	1,178✔
74	});
75	});
76	}
77	}

luin / ioredis / 2338712688

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous