Skip to content

Commit 327da95

Browse files
Fongermbroadst
authored andcommitted
fix(buffer): use safe-buffer polyfill to maintain compatibility
node.js < 4.5 and node.js < 5.9 doesn't support Buffer.alloc and Buffer.from
1 parent c43a34b commit 327da95

14 files changed

+20
-7
lines changed

lib/gridfs-stream/upload.js

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ var core = require('mongodb-core');
44
var crypto = require('crypto');
55
var stream = require('stream');
66
var util = require('util');
7+
var Buffer = require('safe-buffer').Buffer;
78

89
var ERROR_NAMESPACE_NOT_FOUND = 26;
910

lib/gridfs/chunk.js

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
var Binary = require('mongodb-core').BSON.Binary,
44
ObjectID = require('mongodb-core').BSON.ObjectID;
55

6+
var Buffer = require('safe-buffer').Buffer;
7+
68
/**
79
* Class for representing a single chunk in GridFS.
810
*

lib/gridfs/grid_store.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
const Chunk = require('./chunk');
3939
const ObjectID = require('mongodb-core').BSON.ObjectID;
4040
const ReadPreference = require('mongodb-core').ReadPreference;
41-
const Buffer = require('buffer').Buffer;
41+
const Buffer = require('safe-buffer').Buffer;
4242
const fs = require('fs');
4343
const f = require('util').format;
4444
const util = require('util');

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"official"
1414
],
1515
"dependencies": {
16-
"mongodb-core": "3.1.2"
16+
"mongodb-core": "3.1.2",
17+
"safe-buffer": "^5.1.2"
1718
},
1819
"devDependencies": {
1920
"bluebird": "3.5.0",

test/functional/cursor_tests.js

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ const expect = require('chai').expect;
66
const Long = require('bson').Long;
77
const sinon = require('sinon');
88
const ReadPreference = require('mongodb-core').ReadPreference;
9+
const Buffer = require('safe-buffer').Buffer;
910

1011
describe('Cursor', function() {
1112
before(function() {

test/functional/cursorstream_tests.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
'use strict';
22
var expect = require('chai').expect;
3+
var Buffer = require('safe-buffer').Buffer;
34

45
describe('Cursor Streams', function() {
56
before(function() {

test/functional/find_tests.js

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ const test = require('./shared').assert;
33
const setupDatabase = require('./shared').setupDatabase;
44
const expect = require('chai').expect;
55
const MongoClient = require('../../lib/mongo_client');
6+
const Buffer = require('safe-buffer').Buffer;
67

78
describe('Find', function() {
89
before(function() {

test/functional/gridfs_stream_tests.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ const crypto = require('crypto'),
55
fs = require('fs'),
66
test = require('./shared').assert,
77
setupDatabase = require('./shared').setupDatabase,
8-
expect = require('chai').expect;
8+
expect = require('chai').expect,
9+
Buffer = require('safe-buffer').Buffer;
910

1011
describe('GridFS Stream', function() {
1112
before(function() {

test/functional/gridfs_tests.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ const test = require('./shared').assert,
55
fs = require('fs'),
66
format = require('util').format,
77
child_process = require('child_process'),
8-
expect = require('chai').expect;
8+
expect = require('chai').expect,
9+
Buffer = require('safe-buffer').Buffer;
910

1011
describe('GridFS', function() {
1112
before(function() {

test/functional/insert_tests.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ const test = require('./shared').assert,
33
setupDatabase = require('./shared').setupDatabase,
44
Script = require('vm'),
55
expect = require('chai').expect,
6-
normalizedFunctionString = require('bson/lib/bson/parser/utils').normalizedFunctionString;
6+
normalizedFunctionString = require('bson/lib/bson/parser/utils').normalizedFunctionString,
7+
Buffer = require('safe-buffer').Buffer;
78

89
/**
910
* Module for parsing an ISO 8601 formatted string into a Date object.

test/functional/operation_example_tests.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
const test = require('./shared').assert,
33
setupDatabase = require('./shared').setupDatabase,
44
f = require('util').format,
5-
expect = require('chai').expect;
5+
expect = require('chai').expect,
6+
Buffer = require('safe-buffer').Buffer;
67

78
describe('Operation Examples', function() {
89
before(function() {

test/functional/operation_generators_example_tests.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
'use strict';
22
var test = require('./shared').assert;
33
var setupDatabase = require('./shared').setupDatabase;
4+
var Buffer = require('safe-buffer').Buffer;
45

56
/**************************************************************************
67
*

test/functional/operation_promises_example_tests.js

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ var fs = require('fs');
33
var f = require('util').format;
44
var test = require('./shared').assert;
55
var setupDatabase = require('./shared').setupDatabase;
6+
var Buffer = require('safe-buffer').Buffer;
67

78
var delay = function(ms) {
89
return new Promise(function(resolve) {

test/functional/promote_buffers_tests.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22
var test = require('./shared').assert;
33
var setupDatabase = require('./shared').setupDatabase;
4-
var Buffer = require('buffer').Buffer;
4+
var Buffer = require('safe-buffer').Buffer;
55

66
describe('Promote Buffers', function() {
77
before(function() {

0 commit comments

Comments
 (0)