Skip to content

Commit 0f0de81

Browse files
committed
fix: electron-updater throws "Cannot find namespace 'debug'" on TypeScript compile
Close #1405
1 parent b4462a2 commit 0f0de81

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

packages/electron-builder-http/src/httpExecutor.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import { parse as parseUrl } from "url"
1010
import { CancellationToken } from "./CancellationToken"
1111
import { ProgressCallbackTransform, ProgressInfo } from "./ProgressCallbackTransform"
1212

13+
const debug = _debug("electron-builder")
14+
1315
export interface RequestHeaders {
1416
[key: string]: any
1517
}
@@ -64,8 +66,7 @@ export class HttpError extends Error {
6466

6567
export abstract class HttpExecutor<REQUEST_OPTS, REQUEST> {
6668
protected readonly maxRedirects = 10
67-
protected readonly debug = _debug("electron-builder")
68-
69+
6970
request<T>(options: RequestOptions, cancellationToken: CancellationToken, data?: { [name: string]: any; } | null): Promise<T> {
7071
configureRequestOptions(options)
7172
const encodedData = data == null ? undefined : new Buffer(JSON.stringify(data))
@@ -82,8 +83,8 @@ export abstract class HttpExecutor<REQUEST_OPTS, REQUEST> {
8283
abstract download(url: string, destination: string, options: DownloadOptions): Promise<string>
8384

8485
protected handleResponse(response: Response, options: RequestOptions, cancellationToken: CancellationToken, resolve: (data?: any) => void, reject: (error: Error) => void, redirectCount: number, requestProcessor: (request: REQUEST, reject: (error: Error) => void) => void) {
85-
if (this.debug.enabled) {
86-
this.debug(`Response status: ${response.statusCode} ${response.statusMessage}, request options: ${dumpRequestOptions(options)}`)
86+
if (debug.enabled) {
87+
debug(`Response status: ${response.statusCode} ${response.statusMessage}, request options: ${dumpRequestOptions(options)}`)
8788
}
8889

8990
// we handle any other >= 400 error on request end (read detailed message in the response body)

packages/electron-builder-util/src/nodeHttpExecutor.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import _debug from "debug"
12
import { configureRequestOptions, DownloadOptions, HttpExecutor } from "electron-builder-http"
23
import { CancellationToken } from "electron-builder-http/out/CancellationToken"
34
import { ensureDir, readFile } from "fs-extra-p"
@@ -9,6 +10,8 @@ import { homedir } from "os"
910
import * as path from "path"
1011
import { parse as parseUrl } from "url"
1112

13+
const debug = _debug("electron-builder")
14+
1215
export class NodeHttpExecutor extends HttpExecutor<RequestOptions, ClientRequest> {
1316
private httpsAgentPromise: Promise<Agent> | null
1417

@@ -41,8 +44,8 @@ export class NodeHttpExecutor extends HttpExecutor<RequestOptions, ClientRequest
4144
}
4245

4346
doApiRequest<T>(options: RequestOptions, cancellationToken: CancellationToken, requestProcessor: (request: ClientRequest, reject: (error: Error) => void) => void, redirectCount: number = 0): Promise<T> {
44-
if (this.debug.enabled) {
45-
this.debug(`HTTPS request: ${JSON.stringify(options, null, 2)}`)
47+
if (debug.enabled) {
48+
debug(`HTTPS request: ${JSON.stringify(options, null, 2)}`)
4649
}
4750

4851
return cancellationToken.createPromise((resolve, reject, onCancel) => {

packages/electron-updater/src/electronHttpExecutor.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import _debug from "debug"
12
import { net, session } from "electron"
23
import { configureRequestOptions, DownloadOptions, dumpRequestOptions, HttpExecutor } from "electron-builder-http"
34
import { CancellationToken } from "electron-builder-http/out/CancellationToken"
@@ -7,6 +8,8 @@ import { parse as parseUrl } from "url"
78

89
export const NET_SESSION_NAME = "electron-updater"
910

11+
const debug = _debug("electron-builder")
12+
1013
export class ElectronHttpExecutor extends HttpExecutor<Electron.RequestOptions, Electron.ClientRequest> {
1114
async download(url: string, destination: string, options: DownloadOptions): Promise<string> {
1215
if (options == null || !options.skipDirCreation) {
@@ -34,8 +37,8 @@ export class ElectronHttpExecutor extends HttpExecutor<Electron.RequestOptions,
3437
}
3538

3639
doApiRequest<T>(options: Electron.RequestOptions, cancellationToken: CancellationToken, requestProcessor: (request: Electron.ClientRequest, reject: (error: Error) => void) => void, redirectCount: number = 0): Promise<T> {
37-
if (this.debug.enabled) {
38-
this.debug(`request: ${dumpRequestOptions(options)}`)
40+
if (debug.enabled) {
41+
debug(`request: ${dumpRequestOptions(options)}`)
3942
}
4043

4144
return cancellationToken.createPromise<T>((resolve, reject, onCancel) => {

0 commit comments

Comments
 (0)