Skip to content

Commit

Permalink
process: refactor lib/internal/bootstrap/node.js
Browse files Browse the repository at this point in the history
- Use `deprecate` from `internal/util` instead of from `util`
- Split `setupGlobalVariables()` into `setupGlobalProxy()` and
  `setupBuffer()`, and move out manipulation of the process object.

PR-URL: #26033
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: James M Snell <[email protected]>
  • Loading branch information
joyeecheung committed Feb 12, 2019
1 parent e5da922 commit 006e78c
Showing 1 changed file with 18 additions and 15 deletions.
33 changes: 18 additions & 15 deletions lib/internal/bootstrap/node.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ const { internalBinding, NativeModule } = loaderExports;
const { Object, Symbol } = primordials;
const { getOptionValue } = NativeModule.require('internal/options');
const config = internalBinding('config');
const { deprecate } = NativeModule.require('internal/util');

setupTraceCategoryState();

Expand All @@ -63,7 +64,11 @@ setupProcessObject();
hasUncaughtExceptionCaptureCallback;
}

setupGlobalVariables();
setupGlobalProxy();
setupBuffer();

process.domain = null;
process._exiting = false;

// Bootstrappers for all threads, including worker threads and main thread
const perThreadSetup = NativeModule.require('internal/process/per_thread');
Expand Down Expand Up @@ -235,7 +240,6 @@ Object.defineProperty(process, 'allowedNodeEnvironmentFlags', {
configurable: true
});

const { deprecate } = NativeModule.require('internal/util');
// process.assert
process.assert = deprecate(
perThreadSetup.assert,
Expand Down Expand Up @@ -350,6 +354,13 @@ function setupProcessObject() {
const origProcProto = Object.getPrototypeOf(process);
Object.setPrototypeOf(origProcProto, EventEmitter.prototype);
EventEmitter.call(process);
// Make process globally available to users by putting it on the global proxy
Object.defineProperty(global, 'process', {
value: process,
enumerable: false,
writable: true,
configurable: true
});
}

function setupProcessStdio(getStdout, getStdin, getStderr) {
Expand Down Expand Up @@ -377,29 +388,22 @@ function setupProcessStdio(getStdout, getStdin, getStderr) {
};
}

function setupGlobalVariables() {
function setupGlobalProxy() {
Object.defineProperty(global, Symbol.toStringTag, {
value: 'global',
writable: false,
enumerable: false,
configurable: true
});
Object.defineProperty(global, 'process', {
value: process,
enumerable: false,
writable: true,
configurable: true
});
const util = NativeModule.require('util');

function makeGetter(name) {
return util.deprecate(function() {
return deprecate(function() {
return this;
}, `'${name}' is deprecated, use 'global'`, 'DEP0016');
}

function makeSetter(name) {
return util.deprecate(function(value) {
return deprecate(function(value) {
Object.defineProperty(this, name, {
configurable: true,
writable: true,
Expand All @@ -421,7 +425,9 @@ function setupGlobalVariables() {
set: makeSetter('root')
}
});
}

function setupBuffer() {
const { Buffer } = NativeModule.require('buffer');
const bufferBinding = internalBinding('buffer');

Expand All @@ -436,9 +442,6 @@ function setupGlobalVariables() {
writable: true,
configurable: true
});

process.domain = null;
process._exiting = false;
}

function setupGlobalTimeouts() {
Expand Down

0 comments on commit 006e78c

Please sign in to comment.