@itwin/core-frontend 4.0.0-dev.70 → 4.0.0-dev.73

package/lib/cjs/request/Request.js

@@ -1,319 +1,62 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getJson = exports.request = exports.ResponseError = exports.RequestGlobalOptions = exports.requestIdHeaderName = void 0;
 /*---------------------------------------------------------------------------------------------
 * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
 * See LICENSE.md in the project root for license terms and full copyright notice.
 *--------------------------------------------------------------------------------------------*/
-/** @packageDocumentation
- * @module iTwinServiceClients
- */
-const deepAssign = __importStar(require("deep-assign"));
-const qs_1 = require("qs");
-const sarequest = __importStar(require("superagent"));
-const core_bentley_1 = require("@itwin/core-bentley");
-const FrontendLoggerCategory_1 = require("../FrontendLoggerCategory");
-const loggerCategory = FrontendLoggerCategory_1.FrontendLoggerCategory.Request;
-// CMS TODO: Move this entire wrapper to the frontend for use in the map/tile requests. Replace it with
-// just using fetch directly as it is only ever used browser side.
-/** @internal */
-exports.requestIdHeaderName = "X-Correlation-Id";
-/** @internal */
-class RequestGlobalOptions {
-}
-RequestGlobalOptions.httpsProxy = undefined;
-/** Creates an agent for any user defined proxy using the supplied additional options. Returns undefined if user hasn't defined a proxy.
- * @internal
- */
-RequestGlobalOptions.createHttpsProxy = (_additionalOptions) => undefined;
-RequestGlobalOptions.maxRetries = 4;
-RequestGlobalOptions.timeout = {
-    deadline: 25000,
-    response: 10000,
-};
-// Assume application is online or offline. This hint skip retry/timeout
-RequestGlobalOptions.online = true;
-exports.RequestGlobalOptions = RequestGlobalOptions;
-/** Error object that's thrown/rejected if the Request fails due to a network error, or if the status is *not* in the range of 200-299 (inclusive)
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.request = exports.HttpResponseError = void 0;
+/** Error object that's thrown if the status is *not* in the range of 200-299 (inclusive).
  * @internal
  */
-class ResponseError extends core_bentley_1.BentleyError {
-    constructor(errorNumber, message, getMetaData) {
-        super(errorNumber, message, getMetaData);
-    }
-    /**
-     * Parses error from server's response
-     * @param response Http response from the server.
-     * @returns Parsed error.
-     * @internal
-     */
-    static parse(response, log = true) {
-        const error = new ResponseError(ResponseError.parseHttpStatus(response.statusType));
-        if (!response) {
-            error.message = "Couldn't get response object.";
-            return error;
-        }
-        if (response.response) {
-            if (response.response.error) {
-                error.name = response.response.error.name || error.name;
-                error.description = response.response.error.message;
-            }
-            if (response.response.res) {
-                error.message = response.response.res.statusMessage;
-            }
-            if (response.response.body && Object.keys(response.response.body).length > 0) {
-                error._data = {};
-                deepAssign.default(error._data, response.response.body);
-            }
-            else {
-                error._data = response.response.text;
-            }
-        }
-        error.status = response.status || response.statusCode;
-        error.name = response.code || response.name || error.name;
-        error.message = error.message || response.message || response.statusMessage;
-        if (log)
-            error.log();
-        return error;
-    }
-    /**
-     * Decides whether request should be retried or not
-     * @param error Error returned by request
-     * @param response Response returned by request
-     * @internal
-     */
-    static shouldRetry(error, response) {
-        if (error !== undefined && error !== null) {
-            if ((error.status === undefined || error.status === null) && (error.res === undefined || error.res === null)) {
-                return true;
-            }
-        }
-        return (response !== undefined && response.statusType === core_bentley_1.HttpStatus.ServerError);
-    }
-    /**
-     * @internal
-     */
-    static parseHttpStatus(statusType) {
-        switch (statusType) {
-            case 1:
-                return core_bentley_1.HttpStatus.Info;
-            case 2:
-                return core_bentley_1.HttpStatus.Success;
-            case 3:
-                return core_bentley_1.HttpStatus.Redirection;
-            case 4:
-                return core_bentley_1.HttpStatus.ClientError;
-            case 5:
-                return core_bentley_1.HttpStatus.ServerError;
-            default:
-                return core_bentley_1.HttpStatus.Success;
-        }
-    }
-    /**
-     * @internal
-     */
-    logMessage() {
-        return `${this.status} ${this.name}: ${this.message}`;
-    }
-    /**
-     * Logs this error
-     * @internal
-     */
-    log() {
-        core_bentley_1.Logger.logError(loggerCategory, this.logMessage(), () => this.getMetaData());
+class HttpResponseError extends Error {
+    constructor(status, responseText) {
+        let message = `HTTP response status code: ${status}.`;
+        if (responseText)
+            message += ` Response body: ${responseText}`;
+        super(message);
+        this.status = status;
+        this.responseText = responseText;
     }
 }
-exports.ResponseError = ResponseError;
-const logResponse = (req, startTime) => (res) => {
-    const elapsed = new Date().getTime() - startTime;
-    const elapsedTime = `${elapsed}ms`;
-    core_bentley_1.Logger.logTrace(loggerCategory, `${req.method.toUpperCase()} ${res.status} ${req.url} (${elapsedTime})`);
-};
-// eslint-disable-next-line @typescript-eslint/promise-function-async
-const logRequest = (req) => {
-    const startTime = new Date().getTime();
-    return req.on("response", logResponse(req, startTime));
-};
-/** Wrapper around making HTTP requests with the specific options.
- *
- * Usable in both a browser and node based environment.
- *
- * @param url Server URL to address the request
- * @param options Options to pass to the request
- * @returns Resolves to the response from the server
- * @throws ResponseError if the request fails due to network issues, or if the returned status is *outside* the range of 200-299 (inclusive)
- * @internal
- */
-async function request(url, options) {
-    if (!RequestGlobalOptions.online) {
-        throw new ResponseError(503, "Service unavailable");
-    }
-    let sareq = sarequest.default(options.method, url);
-    const retries = typeof options.retries === "undefined" ? RequestGlobalOptions.maxRetries : options.retries;
-    sareq = sareq.retry(retries, options.retryCallback);
-    if (core_bentley_1.Logger.isEnabled(loggerCategory, core_bentley_1.LogLevel.Trace))
-        sareq = sareq.use(logRequest);
-    if (options.headers)
-        sareq = sareq.set(options.headers);
-    let queryStr = "";
-    let fullUrl = "";
-    if (options.qs && Object.keys(options.qs).length > 0) {
-        const stringifyOptions = { delimiter: "&", encode: false };
-        queryStr = (0, qs_1.stringify)(options.qs, stringifyOptions);
-        sareq = sareq.query(queryStr);
-        fullUrl = `${url}?${queryStr}`;
-    }
-    else {
-        fullUrl = url;
-    }
-    core_bentley_1.Logger.logInfo(loggerCategory, fullUrl);
-    if (options.auth)
-        sareq = sareq.auth(options.auth.user, options.auth.password);
-    if (options.accept)
-        sareq = sareq.accept(options.accept);
-    if (options.body)
-        sareq = sareq.send(options.body);
-    if (options.timeout)
-        sareq = sareq.timeout(options.timeout);
-    else
-        sareq = sareq.timeout(RequestGlobalOptions.timeout);
-    if (options.responseType)
-        sareq = sareq.responseType(options.responseType);
-    if (options.redirects)
-        sareq = sareq.redirects(options.redirects);
-    else
-        sareq = sareq.redirects(0);
-    if (options.buffer)
-        sareq = sareq.buffer(options.buffer);
-    if (options.parser)
-        sareq = sareq.parse(options.parser);
-    /** Default to any globally supplied proxy, unless an agent is specified in this call */
-    if (options.agent)
-        sareq = sareq.agent(options.agent);
-    else if (RequestGlobalOptions.httpsProxy)
-        sareq = sareq.agent(RequestGlobalOptions.httpsProxy);
-    if (options.progressCallback) {
-        sareq = sareq.on("progress", (event) => {
-            if (event) {
-                options.progressCallback({
-                    loaded: event.loaded,
-                    total: event.total,
-                    percent: event.percent,
-                });
-            }
-        });
-    }
-    const errorCallback = options.errorCallback ? options.errorCallback : ResponseError.parse;
-    if (options.readStream) {
-        if (typeof window !== "undefined")
-            throw new Error("This option is not supported on browsers");
-        return new Promise((resolve, reject) => {
-            sareq = sareq.type("blob");
-            options
-                .readStream
-                .pipe(sareq)
-                .on("error", (error) => {
-                const parsedError = errorCallback(error);
-                reject(parsedError);
-            })
-                .on("end", () => {
-                const retResponse = {
-                    status: 201,
-                    header: undefined,
-                    body: undefined,
-                    text: undefined,
-                };
-                resolve(retResponse);
-            });
-        });
-    }
-    if (options.stream) {
-        if (typeof window !== "undefined")
-            throw new Error("This option is not supported on browsers");
-        return new Promise((resolve, reject) => {
-            sareq
-                .on("response", (res) => {
-                if (res.statusCode !== 200) {
-                    const parsedError = errorCallback(res);
-                    reject(parsedError);
-                    return;
-                }
-            })
-                .pipe(options.stream)
-                .on("error", (error) => {
-                const parsedError = errorCallback(error);
-                reject(parsedError);
-            })
-                .on("finish", () => {
-                const retResponse = {
-                    status: 200,
-                    header: undefined,
-                    body: undefined,
-                    text: undefined,
-                };
-                resolve(retResponse);
-            });
-        });
+exports.HttpResponseError = HttpResponseError;
+/** @internal */
+async function request(url, responseType, options) {
+    const headers = {
+        ...options?.headers,
+    };
+    if (options?.auth)
+        headers.authorization = `Basic ${window.btoa(`${options.auth.user}:${options.auth.password}`)}`;
+    const controller = new AbortController();
+    if (options?.timeout)
+        setTimeout(() => controller.abort(), options.timeout);
+    const fetchOptions = {
+        headers,
+        signal: controller.signal,
+    };
+    const fetchFunc = async () => fetch(url, fetchOptions);
+    const response = await fetchWithRetry(fetchFunc, options?.retryCount ?? 4);
+    if (!response.ok)
+        throw new HttpResponseError(response.status, await response.text());
+    switch (responseType) {
+        case "arraybuffer":
+            return response.arrayBuffer();
+        case "json":
+            return response.json();
+        case "text":
+            return response.text();
     }
-    // console.log("%s %s %s", url, options.method, queryStr);
-    /**
-    * Note:
-    * Javascript's fetch returns status.OK if error is between 200-299 inclusive, and doesn't reject in this case.
-    * Fetch only rejects if there's some network issue (permissions issue or similar)
-    * Superagent rejects network issues, and errors outside the range of 200-299. We are currently using
-    * superagent, but may eventually switch to JavaScript's fetch library.
-    */
+}
+exports.request = request;
+async function fetchWithRetry(fetchFunc, remainingRetries) {
     try {
-        const response = await sareq;
-        const retResponse = {
-            body: response.body,
-            text: response.text,
-            header: response.header,
-            status: response.status,
-        };
-        return retResponse;
+        return await fetchFunc();
     }
     catch (error) {
-        const parsedError = errorCallback(error);
-        throw parsedError;
+        if (error instanceof Error && error.name === "AbortError")
+            throw error;
+        if (remainingRetries === 0)
+            throw error;
+        return fetchWithRetry(fetchFunc, --remainingRetries);
     }
 }
-exports.request = request;
-/**
- * fetch json from HTTP request
- * @param url server URL to address the request
- * @internal
- */
-async function getJson(url) {
-    const options = {
-        method: "GET",
-        responseType: "json",
-    };
-    const data = await request(url, options);
-    return data.body;
-}
-exports.getJson = getJson;
 //# sourceMappingURL=Request.js.map

package/lib/cjs/request/Request.js.map

@@ -1 +1 @@
-{"version":3,"file":"Request.js","sourceRoot":"","sources":["../../../src/request/Request.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module iTwinServiceClients\r\n */\r\nimport * as deepAssign from \"deep-assign\";\r\nimport * as https from \"https\";\r\nimport { IStringifyOptions, stringify } from \"qs\";\r\nimport * as sarequest from \"superagent\";\r\nimport { BentleyError, GetMetaDataFunction, HttpStatus, Logger, LogLevel } from \"@itwin/core-bentley\";\r\nimport { FrontendLoggerCategory } from \"../FrontendLoggerCategory\";\r\n\r\nconst loggerCategory: string = FrontendLoggerCategory.Request;\r\n\r\n// CMS TODO: Move this entire wrapper to the frontend for use in the map/tile requests. Replace it with\r\n// just using fetch directly as it is only ever used browser side.\r\n\r\n/** @internal */\r\nexport const requestIdHeaderName = \"X-Correlation-Id\";\r\n\r\n/** @internal */\r\nexport interface RequestBasicCredentials { // axios: AxiosBasicCredentials\r\n  user: string; // axios: username\r\n  password: string; // axios: password\r\n}\r\n\r\n/** Typical option to query REST API. Note that services may not quite support these fields,\r\n * and the interface is only provided as a hint.\r\n * @internal\r\n */\r\nexport interface RequestQueryOptions {\r\n  /**\r\n   * Select string used by the query (use the mapped EC property names, and not TypeScript property names)\r\n   * Example: \"Name,Size,Description\"\r\n   */\r\n  $select?: string;\r\n\r\n  /**\r\n   * Filter string used by the query (use the mapped EC property names, and not TypeScript property names)\r\n   *  Example: \"Name like '*.pdf' and Size lt 1000\"\r\n   */\r\n  $filter?: string;\r\n\r\n  /** Sets the limit on the number of entries to be returned by the query */\r\n  $top?: number;\r\n\r\n  /** Sets the number of entries to be skipped */\r\n  $skip?: number;\r\n\r\n  /**\r\n   * Orders the return values (use the mapped EC property names, and not TypeScript property names)\r\n   * Example: \"Size desc\"\r\n   */\r\n  $orderby?: string;\r\n\r\n  /**\r\n   *  Sets the limit on the number of entries to be returned by a single response.\r\n   *  Can be used with a Top option. For example if Top is set to 1000 and PageSize\r\n   *  is set to 100 then 10 requests will be performed to get result.\r\n   */\r\n  $pageSize?: number;\r\n}\r\n\r\n/** @internal */\r\nexport interface RequestQueryStringifyOptions {\r\n  delimiter?: string;\r\n  encode?: boolean;\r\n}\r\n\r\n/** Option to control the time outs\r\n * Use a short response timeout to detect unresponsive networks quickly, and a long deadline to give time for downloads on slow,\r\n * but reliable, networks. Note that both of these timers limit how long uploads of attached files are allowed to take. Use long\r\n * timeouts if you're uploading files.\r\n * @internal\r\n */\r\nexport interface RequestTimeoutOptions {\r\n  /** Sets a deadline (in milliseconds) for the entire request (including all uploads, redirects, server processing time) to complete.\r\n   * If the response isn't fully downloaded within that time, the request will be aborted\r\n   */\r\n  deadline?: number;\r\n\r\n  /** Sets maximum time (in milliseconds) to wait for the first byte to arrive from the server, but it does not limit how long the entire\r\n   * download can take. Response timeout should be at least few seconds longer than just the time it takes the server to respond, because\r\n   * it also includes time to make DNS lookup, TCP/IP and TLS connections, and time to upload request data.\r\n   */\r\n  response?: number;\r\n}\r\n\r\n/** @internal */\r\nexport interface RequestOptions {\r\n  method: string;\r\n  headers?: any; // {Mas-App-Guid, Mas-UUid, User-Agent}\r\n  auth?: RequestBasicCredentials;\r\n  body?: any;\r\n  qs?: any | RequestQueryOptions;\r\n  responseType?: string;\r\n  timeout?: RequestTimeoutOptions; // Optional timeouts. If unspecified, an arbitrary default is setup.\r\n  stream?: any; // Optional stream to read the response to/from (only for NodeJs applications)\r\n  readStream?: any; // Optional stream to read input from (only for NodeJs applications)\r\n  buffer?: any;\r\n  parser?: any;\r\n  accept?: string;\r\n  redirects?: number;\r\n  errorCallback?: (response: any) => ResponseError;\r\n  retryCallback?: (error: any, response: any) => boolean;\r\n  progressCallback?: ProgressCallback;\r\n  agent?: https.Agent;\r\n  retries?: number;\r\n  useCorsProxy?: boolean;\r\n}\r\n\r\n/** Response object if the request was successful. Note that the status within the range of 200-299 are considered as a success.\r\n * @internal\r\n */\r\nexport interface Response {\r\n  body: any; // Parsed body of response\r\n  text: string | undefined; // Returned for responseType:text\r\n  header: any; // Parsed headers of response\r\n  status: number; // Status code of response\r\n}\r\n\r\n/** @internal */\r\nexport interface ProgressInfo {\r\n  percent?: number;\r\n  total?: number;\r\n  loaded: number;\r\n}\r\n\r\n/** @internal */\r\nexport type ProgressCallback = (progress: ProgressInfo) => void;\r\n\r\n/** @internal */\r\nexport class RequestGlobalOptions {\r\n  public static httpsProxy?: https.Agent = undefined;\r\n  /** Creates an agent for any user defined proxy using the supplied additional options. Returns undefined if user hasn't defined a proxy.\r\n   * @internal\r\n   */\r\n  public static createHttpsProxy: (additionalOptions?: https.AgentOptions) => https.Agent | undefined = (_additionalOptions?: https.AgentOptions) => undefined;\r\n  public static maxRetries: number = 4;\r\n  public static timeout: RequestTimeoutOptions = {\r\n    deadline: 25000,\r\n    response: 10000,\r\n  };\r\n  // Assume application is online or offline. This hint skip retry/timeout\r\n  public static online: boolean = true;\r\n}\r\n\r\n/** Error object that's thrown/rejected if the Request fails due to a network error, or if the status is *not* in the range of 200-299 (inclusive)\r\n * @internal\r\n */\r\nexport class ResponseError extends BentleyError {\r\n  protected _data?: any;\r\n  public status?: number;\r\n  public description?: string;\r\n  public constructor(errorNumber: number | HttpStatus, message?: string, getMetaData?: GetMetaDataFunction) {\r\n    super(errorNumber, message, getMetaData);\r\n  }\r\n\r\n  /**\r\n   * Parses error from server's response\r\n   * @param response Http response from the server.\r\n   * @returns Parsed error.\r\n   * @internal\r\n   */\r\n  public static parse(response: any, log = true): ResponseError {\r\n    const error = new ResponseError(ResponseError.parseHttpStatus(response.statusType));\r\n    if (!response) {\r\n      error.message = \"Couldn't get response object.\";\r\n      return error;\r\n    }\r\n\r\n    if (response.response) {\r\n      if (response.response.error) {\r\n        error.name = response.response.error.name || error.name;\r\n        error.description = response.response.error.message;\r\n      }\r\n      if (response.response.res) {\r\n        error.message = response.response.res.statusMessage;\r\n      }\r\n      if (response.response.body && Object.keys(response.response.body).length > 0) {\r\n        error._data = {};\r\n        deepAssign.default(error._data, response.response.body);\r\n      } else {\r\n        error._data = response.response.text;\r\n      }\r\n    }\r\n\r\n    error.status = response.status || response.statusCode;\r\n    error.name = response.code || response.name || error.name;\r\n    error.message = error.message || response.message || response.statusMessage;\r\n\r\n    if (log)\r\n      error.log();\r\n\r\n    return error;\r\n  }\r\n\r\n  /**\r\n   * Decides whether request should be retried or not\r\n   * @param error Error returned by request\r\n   * @param response Response returned by request\r\n   * @internal\r\n   */\r\n  public static shouldRetry(error: any, response: any): boolean {\r\n    if (error !== undefined && error !== null) {\r\n      if ((error.status === undefined || error.status === null) && (error.res === undefined || error.res === null)) {\r\n        return true;\r\n      }\r\n    }\r\n    return (response !== undefined && response.statusType === HttpStatus.ServerError);\r\n  }\r\n\r\n  /**\r\n   * @internal\r\n   */\r\n  public static parseHttpStatus(statusType: number): HttpStatus {\r\n    switch (statusType) {\r\n      case 1:\r\n        return HttpStatus.Info;\r\n      case 2:\r\n        return HttpStatus.Success;\r\n      case 3:\r\n        return HttpStatus.Redirection;\r\n      case 4:\r\n        return HttpStatus.ClientError;\r\n      case 5:\r\n        return HttpStatus.ServerError;\r\n      default:\r\n        return HttpStatus.Success;\r\n    }\r\n  }\r\n\r\n  /**\r\n   * @internal\r\n   */\r\n  public logMessage(): string {\r\n    return `${this.status} ${this.name}: ${this.message}`;\r\n  }\r\n\r\n  /**\r\n   * Logs this error\r\n   * @internal\r\n   */\r\n  public log(): void {\r\n    Logger.logError(loggerCategory, this.logMessage(), () => this.getMetaData());\r\n  }\r\n}\r\n\r\nconst logResponse = (req: sarequest.SuperAgentRequest, startTime: number) => (res: sarequest.Response) => {\r\n  const elapsed = new Date().getTime() - startTime;\r\n  const elapsedTime = `${elapsed}ms`;\r\n  Logger.logTrace(loggerCategory, `${req.method.toUpperCase()} ${res.status} ${req.url} (${elapsedTime})`);\r\n};\r\n\r\n// eslint-disable-next-line @typescript-eslint/promise-function-async\r\nconst logRequest = (req: sarequest.SuperAgentRequest): sarequest.SuperAgentRequest => {\r\n  const startTime = new Date().getTime();\r\n  return req.on(\"response\", logResponse(req, startTime));\r\n};\r\n\r\n/** Wrapper around making HTTP requests with the specific options.\r\n *\r\n * Usable in both a browser and node based environment.\r\n *\r\n * @param url Server URL to address the request\r\n * @param options Options to pass to the request\r\n * @returns Resolves to the response from the server\r\n * @throws ResponseError if the request fails due to network issues, or if the returned status is *outside* the range of 200-299 (inclusive)\r\n * @internal\r\n */\r\nexport async function request(url: string, options: RequestOptions): Promise<Response> {\r\n  if (!RequestGlobalOptions.online) {\r\n    throw new ResponseError(503, \"Service unavailable\");\r\n  }\r\n\r\n  let sareq: sarequest.SuperAgentRequest = sarequest.default(options.method, url);\r\n  const retries = typeof options.retries === \"undefined\" ? RequestGlobalOptions.maxRetries : options.retries;\r\n  sareq = sareq.retry(retries, options.retryCallback);\r\n\r\n  if (Logger.isEnabled(loggerCategory, LogLevel.Trace))\r\n    sareq = sareq.use(logRequest);\r\n\r\n  if (options.headers)\r\n    sareq = sareq.set(options.headers);\r\n\r\n  let queryStr: string = \"\";\r\n  let fullUrl: string = \"\";\r\n  if (options.qs && Object.keys(options.qs).length > 0) {\r\n    const stringifyOptions: IStringifyOptions = { delimiter: \"&\", encode: false };\r\n    queryStr = stringify(options.qs, stringifyOptions);\r\n    sareq = sareq.query(queryStr);\r\n    fullUrl = `${url}?${queryStr}`;\r\n  } else {\r\n    fullUrl = url;\r\n  }\r\n\r\n  Logger.logInfo(loggerCategory, fullUrl);\r\n\r\n  if (options.auth)\r\n    sareq = sareq.auth(options.auth.user, options.auth.password);\r\n\r\n  if (options.accept)\r\n    sareq = sareq.accept(options.accept);\r\n\r\n  if (options.body)\r\n    sareq = sareq.send(options.body);\r\n\r\n  if (options.timeout)\r\n    sareq = sareq.timeout(options.timeout);\r\n  else\r\n    sareq = sareq.timeout(RequestGlobalOptions.timeout);\r\n\r\n  if (options.responseType)\r\n    sareq = sareq.responseType(options.responseType);\r\n\r\n  if (options.redirects)\r\n    sareq = sareq.redirects(options.redirects);\r\n  else\r\n    sareq = sareq.redirects(0);\r\n\r\n  if (options.buffer)\r\n    sareq = sareq.buffer(options.buffer);\r\n\r\n  if (options.parser)\r\n    sareq = sareq.parse(options.parser);\r\n\r\n  /** Default to any globally supplied proxy, unless an agent is specified in this call */\r\n  if (options.agent)\r\n    sareq = sareq.agent(options.agent);\r\n  else if (RequestGlobalOptions.httpsProxy)\r\n    sareq = sareq.agent(RequestGlobalOptions.httpsProxy);\r\n\r\n  if (options.progressCallback) {\r\n    sareq = sareq.on(\"progress\", (event: sarequest.ProgressEvent) => {\r\n      if (event) {\r\n        options.progressCallback!({\r\n          loaded: event.loaded,\r\n          total: event.total,\r\n          percent: event.percent,\r\n        });\r\n      }\r\n    });\r\n  }\r\n\r\n  const errorCallback = options.errorCallback ? options.errorCallback : ResponseError.parse;\r\n\r\n  if (options.readStream) {\r\n    if (typeof window !== \"undefined\")\r\n      throw new Error(\"This option is not supported on browsers\");\r\n\r\n    return new Promise<Response>((resolve, reject) => {\r\n      sareq = sareq.type(\"blob\");\r\n      options\r\n        .readStream\r\n        .pipe(sareq)\r\n        .on(\"error\", (error: any) => {\r\n          const parsedError = errorCallback(error);\r\n          reject(parsedError);\r\n        })\r\n        .on(\"end\", () => {\r\n          const retResponse: Response = {\r\n            status: 201,\r\n            header: undefined,\r\n            body: undefined,\r\n            text: undefined,\r\n          };\r\n          resolve(retResponse);\r\n        });\r\n    });\r\n  }\r\n\r\n  if (options.stream) {\r\n    if (typeof window !== \"undefined\")\r\n      throw new Error(\"This option is not supported on browsers\");\r\n\r\n    return new Promise<Response>((resolve, reject) => {\r\n      sareq\r\n        .on(\"response\", (res: any) => {\r\n          if (res.statusCode !== 200) {\r\n            const parsedError = errorCallback(res);\r\n            reject(parsedError);\r\n            return;\r\n          }\r\n        })\r\n        .pipe(options.stream)\r\n        .on(\"error\", (error: any) => {\r\n          const parsedError = errorCallback(error);\r\n          reject(parsedError);\r\n        })\r\n        .on(\"finish\", () => {\r\n          const retResponse: Response = {\r\n            status: 200,\r\n            header: undefined,\r\n            body: undefined,\r\n            text: undefined,\r\n          };\r\n          resolve(retResponse);\r\n        });\r\n    });\r\n  }\r\n\r\n  // console.log(\"%s %s %s\", url, options.method, queryStr);\r\n\r\n  /**\r\n  * Note:\r\n  * Javascript's fetch returns status.OK if error is between 200-299 inclusive, and doesn't reject in this case.\r\n  * Fetch only rejects if there's some network issue (permissions issue or similar)\r\n  * Superagent rejects network issues, and errors outside the range of 200-299. We are currently using\r\n  * superagent, but may eventually switch to JavaScript's fetch library.\r\n  */\r\n  try {\r\n    const response = await sareq;\r\n    const retResponse: Response = {\r\n      body: response.body,\r\n      text: response.text,\r\n      header: response.header,\r\n      status: response.status,\r\n    };\r\n    return retResponse;\r\n  } catch (error) {\r\n    const parsedError = errorCallback(error);\r\n    throw parsedError;\r\n  }\r\n}\r\n\r\n/**\r\n * fetch json from HTTP request\r\n * @param url server URL to address the request\r\n * @internal\r\n */\r\nexport async function getJson(url: string): Promise<any> {\r\n  const options: RequestOptions = {\r\n    method: \"GET\",\r\n    responseType: \"json\",\r\n  };\r\n  const data = await request(url, options);\r\n  return data.body;\r\n}\r\n"]}
+{"version":3,"file":"Request.js","sourceRoot":"","sources":["../../../src/request/Request.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;;;AAQ/F;;GAEG;AACH,MAAa,iBAAkB,SAAQ,KAAK;IAE1C,YACS,MAAc,EACd,YAAqB;QAE5B,IAAI,OAAO,GAAG,8BAA8B,MAAM,GAAG,CAAC;QACtD,IAAI,YAAY;YACd,OAAO,IAAI,mBAAmB,YAAY,EAAE,CAAC;QAE/C,KAAK,CAAC,OAAO,CAAC,CAAC;QAPR,WAAM,GAAN,MAAM,CAAQ;QACd,iBAAY,GAAZ,YAAY,CAAS;IAO9B,CAAC;CACF;AAZD,8CAYC;AAmBD,gBAAgB;AACT,KAAK,UAAU,OAAO,CAAC,GAAW,EAAE,YAA6C,EAAE,OAAwB;IAChH,MAAM,OAAO,GAAQ;QACnB,GAAG,OAAO,EAAE,OAAO;KACpB,CAAC;IAEF,IAAI,OAAO,EAAE,IAAI;QACf,OAAO,CAAC,aAAa,GAAG,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC;IAElG,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;IACzC,IAAI,OAAO,EAAE,OAAO;QAClB,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAExD,MAAM,YAAY,GAAgB;QAChC,OAAO;QACP,MAAM,EAAE,UAAU,CAAC,MAAM;KAC1B,CAAC;IAEF,MAAM,SAAS,GAAG,KAAK,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IACvD,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,SAAS,EAAE,OAAO,EAAE,UAAU,IAAI,CAAC,CAAC,CAAC;IAE3E,IAAI,CAAC,QAAQ,CAAC,EAAE;QACd,MAAM,IAAI,iBAAiB,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IAEtE,QAAQ,YAAY,EAAE;QACpB,KAAK,aAAa;YAChB,OAAO,QAAQ,CAAC,WAAW,EAAE,CAAC;QAChC,KAAK,MAAM;YACT,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;QACzB,KAAK,MAAM;YACT,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;KAC1B;AACH,CAAC;AA/BD,0BA+BC;AAED,KAAK,UAAU,cAAc,CAAC,SAAkC,EAAE,gBAAwB;IACxF,IAAI;QACF,OAAO,MAAM,SAAS,EAAE,CAAC;KAC1B;IAAC,OAAO,KAAc,EAAE;QACvB,IAAI,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY;YACvD,MAAM,KAAK,CAAC;QAEd,IAAI,gBAAgB,KAAK,CAAC;YACxB,MAAM,KAAK,CAAC;QAEd,OAAO,cAAc,CAAC,SAAS,EAAE,EAAE,gBAAgB,CAAC,CAAC;KACtD;AACH,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n\r\n/** @internal */\r\nexport interface RequestBasicCredentials { // axios: AxiosBasicCredentials\r\n  user: string; // axios: username\r\n  password: string; // axios: password\r\n}\r\n\r\n/** Error object that's thrown if the status is *not* in the range of 200-299 (inclusive).\r\n * @internal\r\n */\r\nexport class HttpResponseError extends Error {\r\n\r\n  public constructor(\r\n    public status: number,\r\n    public responseText?: string,\r\n  ) {\r\n    let message = `HTTP response status code: ${status}.`;\r\n    if (responseText)\r\n      message += ` Response body: ${responseText}`;\r\n\r\n    super(message);\r\n  }\r\n}\r\n\r\n/** @internal */\r\nexport interface RequestOptions {\r\n  retryCount?: number;\r\n  headers?: any;\r\n  timeout?: number;\r\n  auth?: RequestBasicCredentials;\r\n}\r\n\r\n/** @internal */\r\nexport async function request(url: string, responseType: \"arraybuffer\", options?: RequestOptions): Promise<ArrayBuffer>;\r\n\r\n/** @internal */\r\nexport async function request(url: string, responseType: \"json\", options?: RequestOptions): Promise<any>;\r\n\r\n/** @internal */\r\nexport async function request(url: string, responseType: \"text\", options?: RequestOptions): Promise<string>;\r\n\r\n/** @internal */\r\nexport async function request(url: string, responseType: \"arraybuffer\" | \"json\" | \"text\", options?: RequestOptions): Promise<any> {\r\n  const headers: any = {\r\n    ...options?.headers,\r\n  };\r\n\r\n  if (options?.auth)\r\n    headers.authorization = `Basic ${window.btoa(`${options.auth.user}:${options.auth.password}`)}`;\r\n\r\n  const controller = new AbortController();\r\n  if (options?.timeout)\r\n    setTimeout(() => controller.abort(), options.timeout);\r\n\r\n  const fetchOptions: RequestInit = {\r\n    headers,\r\n    signal: controller.signal,\r\n  };\r\n\r\n  const fetchFunc = async () => fetch(url, fetchOptions);\r\n  const response = await fetchWithRetry(fetchFunc, options?.retryCount ?? 4);\r\n\r\n  if (!response.ok)\r\n    throw new HttpResponseError(response.status, await response.text());\r\n\r\n  switch (responseType) {\r\n    case \"arraybuffer\":\r\n      return response.arrayBuffer();\r\n    case \"json\":\r\n      return response.json();\r\n    case \"text\":\r\n      return response.text();\r\n  }\r\n}\r\n\r\nasync function fetchWithRetry(fetchFunc: () => Promise<Response>, remainingRetries: number): Promise<Response> {\r\n  try {\r\n    return await fetchFunc();\r\n  } catch (error: unknown) {\r\n    if (error instanceof Error && error.name === \"AbortError\")\r\n      throw error;\r\n\r\n    if (remainingRetries === 0)\r\n      throw error;\r\n\r\n    return fetchWithRetry(fetchFunc, --remainingRetries);\r\n  }\r\n}\r\n\r\n/**\r\n * @internal\r\n * @deprecated in 4.0. Use [[DownloadProgressInfo]].\r\n */\r\nexport interface ProgressInfo {\r\n  percent?: number;\r\n  total?: number;\r\n  loaded: number;\r\n}\r\n\r\n/**\r\n * @internal\r\n * @deprecated in 4.0. Use [[OnDownloadProgress]].\r\n */\r\n// eslint-disable-next-line deprecation/deprecation\r\nexport type ProgressCallback = (progress: ProgressInfo) => void;\r\n"]}

package/lib/cjs/tile/PntsReader.d.ts

@@ -2,6 +2,7 @@
  * @module Tiles
  */
 import { ByteStream, Id64String } from "@itwin/core-bentley";
+import { Point3d } from "@itwin/core-geometry";
 import { ElementAlignedBox3d } from "@itwin/core-common";
 import { IModelConnection } from "../IModelConnection";
 import { RenderGraphic } from "../render/RenderGraphic";
@@ -9,5 +10,8 @@ import { RenderSystem } from "../render/RenderSystem";
 /** Deserialize a point cloud tile and return it as a RenderGraphic.
  * @internal
  */
-export declare function readPointCloudTileContent(stream: ByteStream, iModel: IModelConnection, modelId: Id64String, _is3d: boolean, range: ElementAlignedBox3d, system: RenderSystem): Promise<RenderGraphic | undefined>;
+export declare function readPointCloudTileContent(stream: ByteStream, iModel: IModelConnection, modelId: Id64String, _is3d: boolean, range: ElementAlignedBox3d, system: RenderSystem): Promise<{
+    graphic: RenderGraphic | undefined;
+    rtcCenter: Point3d | undefined;
+}>;
 //# sourceMappingURL=PntsReader.d.ts.map

package/lib/cjs/tile/PntsReader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PntsReader.d.ts","sourceRoot":"","sources":["../../../src/tile/PntsReader.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,EAAE,UAAU,EAAE,UAAU,EAAwB,MAAM,qBAAqB,CAAC;AAEnF,OAAO,EAAa,mBAAmB,EAA4F,MAAM,oBAAoB,CAAC;AAE9J,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAsMtD;;GAEG;AACH,wBAAsB,yBAAyB,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,mBAAmB,EAAE,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAkEvN"}
+{"version":3,"file":"PntsReader.d.ts","sourceRoot":"","sources":["../../../src/tile/PntsReader.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,EAAE,UAAU,EAAE,UAAU,EAAwB,MAAM,qBAAqB,CAAC;AACnF,OAAO,EAAE,OAAO,EAAW,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAa,mBAAmB,EAA4F,MAAM,oBAAoB,CAAC;AAE9J,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAyLtD;;GAEG;AACH,wBAAsB,yBAAyB,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,mBAAmB,EAAE,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC;IAAE,OAAO,EAAE,aAAa,GAAG,SAAS,CAAC;IAAC,SAAS,EAAE,OAAO,GAAG,SAAS,CAAA;CAAE,CAAC,CAiFpQ"}

package/lib/cjs/tile/PntsReader.js

@@ -80,22 +80,10 @@ function readPnts(stream, dataOffset, pnts) {
         points = new Uint16Array(stream.arrayBuffer, dataOffset + qpos.byteOffset, 3 * nPts);
     }
     else {
-        const nCoords = nPts * 3;
-        const fpts = new Float32Array(stream.arrayBuffer, dataOffset + pnts.POSITION.byteOffset, 3 * nPts);
-        const range = core_geometry_1.Range3d.createNull();
-        for (let i = 0; i < nCoords; i += 3)
-            range.extendXYZ(fpts[i], fpts[i + 1], fpts[i + 2]);
-        params = core_common_1.QParams3d.fromRange(range);
-        const qpt = new core_common_1.QPoint3d();
-        const fpt = new core_geometry_1.Point3d();
-        points = new Uint16Array(3 * nPts);
-        for (let i = 0; i < nCoords; i += 3) {
-            fpt.set(fpts[i], fpts[i + 1], fpts[i + 2]);
-            qpt.init(fpt, params);
-            points[i] = qpt.x;
-            points[i + 1] = qpt.y;
-            points[i + 2] = qpt.z;
-        }
+        const qOrigin = new core_geometry_1.Point3d(0, 0, 0);
+        const qScale = new core_geometry_1.Point3d(1, 1, 1);
+        params = core_common_1.QParams3d.fromOriginAndScale(qOrigin, qScale);
+        points = new Float32Array(stream.arrayBuffer, dataOffset + pnts.POSITION.byteOffset, 3 * nPts);
     }
     const colors = readPntsColors(stream, dataOffset, pnts);
     return { params, points, colors };
@@ -157,15 +145,17 @@ async function decodeDracoPointCloud(buf) {
  * @internal
  */
 async function readPointCloudTileContent(stream, iModel, modelId, _is3d, range, system) {
+    let graphic;
+    let rtcCenter;
     const header = new core_common_1.PntsHeader(stream);
     if (!header.isValid)
-        return undefined;
+        return { graphic, rtcCenter };
     const featureTableJsonOffset = stream.curPos;
     const featureStrData = stream.nextBytes(header.featureTableJsonLength);
     const featureStr = (0, core_bentley_1.utf8ToString)(featureStrData);
     const featureValue = JSON.parse(featureStr);
     if (undefined === featureValue)
-        return undefined;
+        return { graphic, rtcCenter };
     let props;
     const dataOffset = featureTableJsonOffset + header.featureTableJsonLength;
     const draco = featureValue.extensions ? featureValue.extensions["3DTILES_draco_point_compression"] : undefined;
@@ -182,9 +172,14 @@ async function readPointCloudTileContent(stream, iModel, modelId, _is3d, range,
         props = readPnts(stream, dataOffset, featureValue);
     }
     if (!props)
-        return undefined;
-    if (featureValue.RTC_CENTER)
-        props.params = core_common_1.QParams3d.fromOriginAndScale(props.params.origin.plus(core_geometry_1.Vector3d.fromJSON(featureValue.RTC_CENTER)), props.params.scale);
+        return { graphic, rtcCenter };
+    let batchRange = range;
+    if (featureValue.RTC_CENTER) {
+        rtcCenter = core_geometry_1.Point3d.fromJSON(featureValue.RTC_CENTER);
+        batchRange = range.clone();
+        batchRange.low.minus(rtcCenter, batchRange.low);
+        batchRange.high.minus(rtcCenter, batchRange.high);
+    }
     if (!props.colors) {
         // ###TODO we really should support uniform color instead of allocating an RGB value per point...
         props.colors = new Uint8Array(3 * featureValue.POINTS_LENGTH);
@@ -205,8 +200,16 @@ async function readPointCloudTileContent(stream, iModel, modelId, _is3d, range,
     const featureTable = new core_common_1.FeatureTable(1, modelId, core_common_1.BatchType.Primary);
     const features = new MeshPrimitives_1.Mesh.Features(featureTable);
     features.add(new core_common_1.Feature(modelId), 1);
-    const voxelSize = props.params.rangeDiagonal.maxAbs() / 256;
-    let renderGraphic = system.createPointCloud({
+    let params = props.params;
+    if (props.points instanceof Float32Array) {
+        // we don't have a true range for unquantized points, so calc one here for voxelSize
+        const rng = core_geometry_1.Range3d.createNull();
+        for (let i = 0; i < props.points.length; i += 3)
+            rng.extendXYZ(props.points[i], props.points[i + 1], props.points[i + 2]);
+        params = core_common_1.QParams3d.fromRange(rng);
+    }
+    const voxelSize = params.rangeDiagonal.maxAbs() / 256;
+    graphic = system.createPointCloud({
         positions: props.points,
         qparams: props.params,
         colors: props.colors,
@@ -214,8 +217,8 @@ async function readPointCloudTileContent(stream, iModel, modelId, _is3d, range,
         voxelSize,
         colorFormat: "rgb",
     }, iModel);
-    renderGraphic = system.createBatch(renderGraphic, core_common_1.PackedFeatureTable.pack(featureTable), range);
-    return renderGraphic;
+    graphic = system.createBatch(graphic, core_common_1.PackedFeatureTable.pack(featureTable), batchRange);
+    return { graphic, rtcCenter };
 }
 exports.readPointCloudTileContent = readPointCloudTileContent;
 //# sourceMappingURL=PntsReader.js.map