@looker/sdk - npm Package Compare versions

Comparing version 0.1.3-beta.7 to 0.1.3-beta.8

dist/index.d.ts

@@ -12,3 +12,3 @@ export * from './rtl/apiMethods';
 export * from './rtl/transport';
-export * from './rtl/versions';
+export * from './rtl/constants';
 export * from './sdk/methods';
@@ -15,0 +15,0 @@ export * from './sdk/models';

dist/index.js

@@ -40,3 +40,3 @@ "use strict";
 __export(require("./rtl/transport"));
-__export(require("./rtl/versions"));
+__export(require("./rtl/constants"));
 __export(require("./sdk/methods"));
@@ -43,0 +43,0 @@ var methods_1 = require("./sdk/methods");

dist/rtl/apiSettings.js

@@ -27,7 +27,7 @@ "use strict";
 var transport_1 = require("./transport");
-var versions_1 = require("./versions");
-exports.strLookerBaseUrl = versions_1.environmentPrefix + "_BASE_URL";
-exports.strLookerApiVersion = versions_1.environmentPrefix + "_API_VERSION";
-exports.strLookerVerifySsl = versions_1.environmentPrefix + "_VERIFY_SSL";
-exports.strLookerTimeout = versions_1.environmentPrefix + "_TIMEOUT";
+var constants_1 = require("./constants");
+exports.strLookerBaseUrl = constants_1.environmentPrefix + "_BASE_URL";
+exports.strLookerApiVersion = constants_1.environmentPrefix + "_API_VERSION";
+exports.strLookerVerifySsl = constants_1.environmentPrefix + "_VERIFY_SSL";
+exports.strLookerTimeout = constants_1.environmentPrefix + "_TIMEOUT";
 exports.strBadConfiguration = transport_1.agentTag + " configuration error:\nMissing required configuration values like base_url and api_version\n";
@@ -34,0 +34,0 @@ /**

dist/rtl/nodeSession.js

@@ -64,7 +64,7 @@ "use strict";
 var nodeTransport_1 = require("./nodeTransport");
-var versions_1 = require("./versions");
+var constants_1 = require("./constants");
 var strPost = 'POST';
 var strDelete = 'DELETE';
-var strLookerClientId = versions_1.environmentPrefix + "_CLIENT_ID";
-var strLookerClientSecret = versions_1.environmentPrefix + "_CLIENT_SECRET";
+var strLookerClientId = constants_1.environmentPrefix + "_CLIENT_ID";
+var strLookerClientSecret = constants_1.environmentPrefix + "_CLIENT_SECRET";
 var NodeSession = /** @class */ (function () {
@@ -71,0 +71,0 @@ function NodeSession(settings, transport) {

dist/rtl/nodeTransport.d.ts

@@ -1,2 +0,2 @@
-import { SDKResponse, ITransport, ITransportSettings, Authenticator, HttpMethod } from './transport';
+import { Authenticator, HttpMethod, ITransport, ITransportSettings, SDKResponse } from './transport';
 export declare class NodeTransport implements ITransport {
@@ -3,0 +3,0 @@ private readonly options;

dist/rtl/nodeTransport.js

@@ -178,2 +178,3 @@ "use strict";
                             timeout: this.timeout(options) * 1000,
+                            encoding: null,
                             method: method,
@@ -202,38 +203,36 @@ };
     return __awaiter(this, void 0, void 0, function () {
-        var result, error_1, error_2;
+        var mode, result;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    if (!contentType.match(/application\/json/g)) return [3 /*break*/, 5];
-                    _a.label = 1;
+                    mode = transport_1.responseMode(contentType);
+                    return [4 /*yield*/, res.body];
                 case 1:
-                    _a.trys.push([1, 3, , 4]);
-                    return [4 /*yield*/, res.body];
-                case 2:
                     result = _a.sent();
-                    return [2 /*return*/, result instanceof Object ? result : JSON.parse(result)];
-                case 3:
-                    error_1 = _a.sent();
-                    console.log(res.body);
-                    return [2 /*return*/, Promise.reject(error_1)];
-                case 4: return [3 /*break*/, 9];
-                case 5:
-                    if (!(contentType === 'text' || contentType.startsWith('text/'))) return [3 /*break*/, 6];
-                    return [2 /*return*/, res.body
-                        // return res.text()
-                    ];
-                case 6:
-                    _a.trys.push([6, 8, , 9]);
-                    return [4 /*yield*/, res.body
-                        // return await res.blob()
-                    ];
-                case 7: 
-                // TODO figure out streaming? Or provide different method for streaming?
-                return [2 /*return*/, _a.sent()
-                    // return await res.blob()
-                ];
-                case 8:
-                    error_2 = _a.sent();
-                    return [2 /*return*/, Promise.reject(error_2)];
-                case 9: return [2 /*return*/];
+                    if (mode === transport_1.ResponseMode.string) {
+                        if (!transport_1.isUtf8(contentType)) {
+                            // always convert to UTF-8 from whatever it was
+                            result = Buffer.from(result.toString(), 'utf8');
+                        }
+                        if (contentType.match(/^application\/.*\bjson\b/g)) {
+                            try {
+                                result = result instanceof Object ? result : JSON.parse(result);
+                                return [2 /*return*/, result];
+                            }
+                            catch (error) {
+                                return [2 /*return*/, Promise.reject(error)];
+                            }
+                        }
+                        return [2 /*return*/, result.toString()];
+                    }
+                    else {
+                        try {
+                            // Return string result from buffer without any character encoding
+                            return [2 /*return*/, result.toString()];
+                        }
+                        catch (error) {
+                            return [2 /*return*/, Promise.reject(error)];
+                        }
+                    }
+                    return [2 /*return*/];
             }
@@ -240,0 +239,0 @@ });

dist/rtl/transport.d.ts

@@ -8,2 +8,25 @@ /// <reference types="node" />
 /**
+ * ResponseMode for an HTTP request - either binary or "string"
+ */
+export declare enum ResponseMode {
+    'binary' = 0,
+    'string' = 1,
+    'unknown' = 2
+}
+/**
+ * MIME patterns for string content types
+ * @type {RegExp}
+ */
+export declare const contentPatternString: RegExp;
+/**
+ * MIME patterns for "binary" content types
+ * @type {RegExp}
+ */
+export declare const contentPatternBinary: RegExp;
+/**
+ * MIME pattern for UTF8 charset attribute
+ * @type {RegExp}
+ */
+export declare const charsetUtf8Pattern: RegExp;
+/**
  * Default request timeout
@@ -14,9 +37,2 @@ * @type {number} default request timeout is 120 seconds, or two minutes
 /**
- * Request object options toggle for binary mode
- * @type {{encoding: null}}
- */
-export declare const binaryMode: {
-    encoding: null;
-};
-/**
  * Recognized HTTP methods
@@ -162,2 +178,14 @@ */
 }
+/**
+ * Is the content type binary or "string"?
+ * @param {string} contentType
+ * @returns {ResponseMode.binary | ResponseMode.string}
+ */
+export declare function responseMode(contentType: string): ResponseMode;
+/**
+ * Does this content type have a UTF-8 charset?
+ * @param {string} contentType
+ * @returns {RegExpMatchArray | null}
+ */
+export declare function isUtf8(contentType: string): RegExpMatchArray | null;
 /** constructs the path argument including any optional query parameters
@@ -164,0 +192,0 @@ @param {string} path the base path of the request

dist/rtl/transport.js

@@ -26,5 +26,29 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var versions_1 = require("./versions");
-exports.agentTag = "TS-SDK " + versions_1.sdkVersion;
+var constants_1 = require("./constants");
+exports.agentTag = "TS-SDK " + constants_1.sdkVersion;
 /**
+ * ResponseMode for an HTTP request - either binary or "string"
+ */
+var ResponseMode;
+(function (ResponseMode) {
+    ResponseMode[ResponseMode["binary"] = 0] = "binary";
+    ResponseMode[ResponseMode["string"] = 1] = "string";
+    ResponseMode[ResponseMode["unknown"] = 2] = "unknown"; // unrecognized response type
+})(ResponseMode = exports.ResponseMode || (exports.ResponseMode = {}));
+/**
+ * MIME patterns for string content types
+ * @type {RegExp}
+ */
+exports.contentPatternString = new RegExp(constants_1.matchModeString, "i");
+/**
+ * MIME patterns for "binary" content types
+ * @type {RegExp}
+ */
+exports.contentPatternBinary = new RegExp(constants_1.matchModeBinary, "i");
+/**
+ * MIME pattern for UTF8 charset attribute
+ * @type {RegExp}
+ */
+exports.charsetUtf8Pattern = new RegExp(constants_1.matchCharsetUtf8, "i");
+/**
  * Default request timeout
@@ -35,7 +59,2 @@ * @type {number} default request timeout is 120 seconds, or two minutes
 /**
- * Request object options toggle for binary mode
- * @type {{encoding: null}}
- */
-exports.binaryMode = { encoding: null };
-/**
  * HTTP status codes
@@ -106,2 +125,26 @@ * https://developer.mozilla.org/en-US/docs/Web/HTTP/Status for reference
 })(StatusCode = exports.StatusCode || (exports.StatusCode = {}));
+/**
+ * Is the content type binary or "string"?
+ * @param {string} contentType
+ * @returns {ResponseMode.binary | ResponseMode.string}
+ */
+function responseMode(contentType) {
+    if (contentType.match(exports.contentPatternString)) {
+        return ResponseMode.string;
+    }
+    if (contentType.match(exports.contentPatternBinary)) {
+        return ResponseMode.binary;
+    }
+    return ResponseMode.unknown;
+}
+exports.responseMode = responseMode;
+/**
+ * Does this content type have a UTF-8 charset?
+ * @param {string} contentType
+ * @returns {RegExpMatchArray | null}
+ */
+function isUtf8(contentType) {
+    return contentType.match(/;.*\bcharset\b=\butf-8\b/i);
+}
+exports.isUtf8 = isUtf8;
 /** constructs the path argument including any optional query parameters
@@ -131,8 +174,8 @@ @param {string} path the base path of the request
 function sdkError(result) {
-    if (typeof result.error.message === 'string') {
+    if ('message' in result && typeof result.message === 'string') {
+        return new Error(result.message);
+    }
+    if ('error' in result && 'message' in result.error && typeof result.error.message === 'string') {
         return new Error(result.error.message);
     }
-    else if (typeof result.message === 'string') {
-        return new Error(result.message);
-    }
     var error = JSON.stringify(result);
@@ -139,0 +182,0 @@ return new Error("Unknown error with SDK method " + error);

package.json

 {
     "name": "@looker/sdk",
-    "version": "0.1.3-beta.7",
+    "version": "0.1.3-beta.8",
     "description": "Looker SDK",
@@ -60,2 +60,2 @@ "main": "dist/index.js",
     ]
-}
+}

No alert changes

Improved metrics

Total package byte prevSize

664219

increased by0.37%

Lines of code

20684

increased by0.43%

No dependency changes