Skip to content

Commit d1c0327

Browse files
Smeagolworms4Smeagolworms4
committed
Fetch 2 and 3 dependencie
1 parent 44dfbed commit d1c0327

10 files changed

Lines changed: 39 additions & 23 deletions

File tree

‎dist/cjs/RequestWrapper.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,12 @@ function _fetchWithTimeout() {
109109
});
110110
}(__transformExtension('node-fetch', {
111111
".mjs": ""
112-
}));
112+
})).then(function (m) {
113+
var _m$default;
114+
return (_m$default = m["default"]) !== null && _m$default !== void 0 ? _m$default : m;
115+
});
113116
case 4:
114-
fetch = _context.sent["default"];
117+
fetch = _context.sent;
115118
case 5:
116119
_context.next = 7;
117120
return Promise.race([fetch(url, options), new Promise(function (_, reject) {

‎dist/cjs/RestClient.js‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
66
exports["default"] = void 0;
77
var _crypto = _interopRequireDefault(require("crypto"));
88
var _Constants = require("./Constants");
9-
var _package = _interopRequireDefault(require("../../package.json"));
9+
var _Util = require("./Util");
1010
function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
1111
function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
1212
function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
@@ -25,18 +25,20 @@ var RestClient = exports["default"] = /*#__PURE__*/function () {
2525
var restEndpoint = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : "https://rest-api.telesign.com";
2626
var timeout = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 15000;
2727
var userAgent = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : null;
28-
var contentType = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : "application/x-www-form-urlencoded";
28+
var source = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : "node_telesign";
29+
var sdkVersionOrigin = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : null;
30+
var sdkVersionDependency = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : null;
31+
var contentType = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : "application/x-www-form-urlencoded";
2932
_classCallCheck(this, RestClient);
3033
this.requestWrapper = requestWrapper;
3134
this.customerId = customerId;
3235
this.apiKey = apiKey;
3336
this.restEndpoint = restEndpoint === null ? "https://rest-api.telesign.com" : restEndpoint;
3437
this.timeout = timeout;
3538
this.contentType = contentType;
36-
if (userAgent === null) {
37-
var version = _package["default"].version;
38-
this.userAgent = "TeleSignSDK/ECMAScript-Node v ".concat(version) + " ".concat(process.arch) + "/".concat(process.platform) + " ".concat(process.release.name) + "/".concat(process.version); // Generates a Node useragent - helpful in diagnosing errors
39-
}
39+
var currentVersionSdk = sdkVersionOrigin || (0, _Util.getInstalledVersion)();
40+
this.userAgent = "TeleSignSDK/ECMAScript-Node" + " ".concat(process.arch) + "/".concat(process.platform) + " ".concat(process.release.name) + "/".concat(process.version) // Generates a Node useragent - helpful in diagnosing errors
41+
+ " OriginatingSDK/".concat(source) + " SDKVersion/".concat(currentVersionSdk) + (source !== "node_telesign" ? " DependencySDKVersion/".concat(sdkVersionDependency) : "");
4042
}
4143

4244
/***

‎dist/cjs/TeleSign.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,12 @@ var TeleSign = exports["default"] = /*#__PURE__*/_createClass(function TeleSign(
2323
var restEndpoint = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "https://rest-api.telesign.com";
2424
var timeout = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 15000;
2525
var useragent = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
26+
var source = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : "node_telesign";
27+
var sdkVersionOrigin = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : null;
28+
var sdkVersionDependency = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : null;
2629
_classCallCheck(this, TeleSign);
2730
var requestWrapper = new _RequestWrapper.FetchRequestWrapper();
28-
this.rest = new _RestClient["default"](requestWrapper, customerId, apiKey, restEndpoint, timeout, useragent);
31+
this.rest = new _RestClient["default"](requestWrapper, customerId, apiKey, restEndpoint, timeout, useragent, source, sdkVersionOrigin, sdkVersionDependency);
2932
this.sms = new _MessagingClient["default"](requestWrapper, customerId, apiKey, restEndpoint, timeout, useragent);
3033
this.voice = new _VoiceClient["default"](requestWrapper, customerId, apiKey, restEndpoint, timeout, useragent);
3134
this.score = new _ScoreClient["default"](requestWrapper, customerId, apiKey, restEndpoint, timeout, useragent);

‎dist/esm/RequestWrapper.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,12 @@ function _fetchWithTimeout() {
4545
/** @type {any} */
4646
var fetch = (typeof window !== 'undefined' ? window : global).fetch || null;
4747
if (!fetch) {
48-
fetch = (yield import(__transformExtension('node-fetch', {
48+
fetch = yield import(__transformExtension('node-fetch', {
4949
".mjs": ""
50-
}))).default;
50+
})).then(m => {
51+
var _m$default;
52+
return (_m$default = m.default) !== null && _m$default !== void 0 ? _m$default : m;
53+
});
5154
}
5255
return yield Promise.race([fetch(url, options), new Promise((_, reject) => setTimeout(() => reject({
5356
code: 408,

‎dist/esm/RestClient.js‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import crypto from 'crypto';
22
import { AuthMethodNames } from "./Constants";
3-
import packageData from "../../package.json" assert { type: 'json' };
3+
import { getInstalledVersion } from "./Util";
44

55
/***
66
* The TeleSign RestClient is a generic HTTP REST client that can be extended to make
@@ -13,17 +13,19 @@ export default class RestClient {
1313
var restEndpoint = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : "https://rest-api.telesign.com";
1414
var timeout = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 15000;
1515
var userAgent = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : null;
16-
var contentType = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : "application/x-www-form-urlencoded";
16+
var source = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : "node_telesign";
17+
var sdkVersionOrigin = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : null;
18+
var sdkVersionDependency = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : null;
19+
var contentType = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : "application/x-www-form-urlencoded";
1720
this.requestWrapper = requestWrapper;
1821
this.customerId = customerId;
1922
this.apiKey = apiKey;
2023
this.restEndpoint = restEndpoint === null ? "https://rest-api.telesign.com" : restEndpoint;
2124
this.timeout = timeout;
2225
this.contentType = contentType;
23-
if (userAgent === null) {
24-
var version = packageData.version;
25-
this.userAgent = "TeleSignSDK/ECMAScript-Node v ".concat(version) + " ".concat(process.arch) + "/".concat(process.platform) + " ".concat(process.release.name) + "/".concat(process.version); // Generates a Node useragent - helpful in diagnosing errors
26-
}
26+
var currentVersionSdk = sdkVersionOrigin || getInstalledVersion();
27+
this.userAgent = "TeleSignSDK/ECMAScript-Node" + " ".concat(process.arch) + "/".concat(process.platform) + " ".concat(process.release.name) + "/".concat(process.version) // Generates a Node useragent - helpful in diagnosing errors
28+
+ " OriginatingSDK/".concat(source) + " SDKVersion/".concat(currentVersionSdk) + (source !== "node_telesign" ? " DependencySDKVersion/".concat(sdkVersionDependency) : "");
2729
}
2830

2931
/***

‎dist/esm/TeleSign.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,11 @@ export default class TeleSign {
1111
var restEndpoint = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "https://rest-api.telesign.com";
1212
var timeout = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 15000;
1313
var useragent = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
14+
var source = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : "node_telesign";
15+
var sdkVersionOrigin = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : null;
16+
var sdkVersionDependency = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : null;
1417
var requestWrapper = new FetchRequestWrapper();
15-
this.rest = new RestClient(requestWrapper, customerId, apiKey, restEndpoint, timeout, useragent);
18+
this.rest = new RestClient(requestWrapper, customerId, apiKey, restEndpoint, timeout, useragent, source, sdkVersionOrigin, sdkVersionDependency);
1619
this.sms = new MessagingClient(requestWrapper, customerId, apiKey, restEndpoint, timeout, useragent);
1720
this.voice = new VoiceClient(requestWrapper, customerId, apiKey, restEndpoint, timeout, useragent);
1821
this.score = new ScoreClient(requestWrapper, customerId, apiKey, restEndpoint, timeout, useragent);

‎dist/types/RestClient.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export default class RestClient {
3434
"x-ts-auth-method": any;
3535
"x-ts-nonce": any;
3636
};
37-
constructor(requestWrapper: any, customerId: any, apiKey: any, restEndpoint?: string, timeout?: number, userAgent?: any, contentType?: string);
37+
constructor(requestWrapper: any, customerId: any, apiKey: any, restEndpoint?: string, timeout?: number, userAgent?: any, source?: string, sdkVersionOrigin?: any, sdkVersionDependency?: any, contentType?: string);
3838
requestWrapper: any;
3939
customerId: any;
4040
apiKey: any;

‎dist/types/TeleSign.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export default class TeleSign {
2-
constructor(customerId: any, apiKey: any, restEndpoint?: string, timeout?: number, useragent?: any);
2+
constructor(customerId: any, apiKey: any, restEndpoint?: string, timeout?: number, useragent?: any, source?: string, sdkVersionOrigin?: any, sdkVersionDependency?: any);
33
rest: RestClient;
44
sms: MessagingClient;
55
voice: VoiceClient;

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
"build:fix-file": "mv -f dist/src dist/types && find dist/types -name \"*.d.mts\" -exec sh -c 'mv \"$0\" \"${0%.d.mts}.d.ts\"' {} \\; && find dist/types -name \"*.d.ts\" -exec sed -i 's/\\.mjs//g' {} \\;",
2424
"build": "rm -rf dist && npm run build:cjs && npm run build:esm && npm run build:types && npm run build:fix-file"
2525
},
26-
"dependencies": {
27-
"node-fetch": "^3.3.2"
26+
"peerDependencies": {
27+
"node-fetch": "^2.6.0 || ^3.0.0"
2828
},
2929
"keywords": [
3030
"Telesign",

‎src/RequestWrapper.mjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ async function fetchWithTimeout(url, options) {
2121
/** @type {any} */
2222
let fetch = (typeof window !== 'undefined' ? window : global).fetch || null;
2323
if (!fetch) {
24-
fetch = (await import('node-fetch')).default;
24+
fetch = await import('node-fetch').then(m => m.default ?? m);
2525
}
2626
return await Promise.race([
2727
fetch(url, options),

0 commit comments

Comments
 (0)