Skip to content

Commit 118a0fd

Browse files
calebmshaferpmconne
calebmshafer
and
pmconne
authored
Remove the itwin client package (#3021)
* Remove the `@bentley/itwin-client` package * Roll the request wrappers into packages that need it, including imodelhub client, core-mobile and core-frontend Co-authored-by: Paul Connelly <[email protected]>
1 parent a5f0cfc commit 118a0fd

File tree

184 files changed

+1454
-4306
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

184 files changed

+1454
-4306
lines changed

‎clients/imodelhub/package.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@
4242
"got": "~11.8.2",
4343
"js-base64": "^3.6.1",
4444
"lodash": "^4.17.10",
45+
"qs": "^6.5.1",
4546
"proper-lockfile": "^4.1.2",
46-
"semver": "^5.5.0"
47+
"semver": "^5.5.0",
48+
"superagent": "^7.0.1"
4749
},
4850
"peerDependencies": {
49-
"@bentley/itwin-client": "workspace:^3.0.0-dev.183",
5051
"@itwin/core-bentley": "workspace:^3.0.0-dev.183"
5152
},
5253
"devDependencies": {
53-
"@bentley/itwin-client": "workspace:*",
5454
"@itwin/core-backend": "workspace:*",
5555
"@itwin/core-bentley": "workspace:*",
5656
"@itwin/core-common": "workspace:*",
@@ -62,10 +62,12 @@
6262
"@types/deep-assign": "^0.1.0",
6363
"@types/fs-extra": "^4.0.7",
6464
"@types/jsonwebtoken": "^8.5.0",
65+
"@types/qs": "^6.5.0",
6566
"@types/semver": "^5.5.0",
6667
"@types/sinon": "^9.0.0",
6768
"@types/stream-buffers": "~3.0.2",
6869
"@types/proper-lockfile": "^4.1.1",
70+
"@types/superagent": "^4.1.14",
6971
"@types/lodash": "^4.14.0",
7072
"@types/mocha": "^8.2.2",
7173
"@types/node": "14.14.31",
@@ -84,4 +86,4 @@
8486
],
8587
"extends": "plugin:@itwin/itwinjs-recommended"
8688
}
87-
}
89+
}

‎clients/imodelhub/src/IModelClient.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/** @packageDocumentation
66
* @module iModelHubClient
77
*/
8-
import { FileHandler } from "@bentley/itwin-client";
8+
import { FileHandler } from "./itwin-client/FileHandler";
99
import { addApplicationVersion, HttpRequestOptionsTransformer, IModelBaseHandler } from "./imodelhub/BaseHandler";
1010
import { BriefcaseHandler } from "./imodelhub/Briefcases";
1111
import { ChangeSetHandler } from "./imodelhub/ChangeSets";

‎clients/imodelhub/src/IModelHubBackend.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
*/
88

99
import { join } from "path";
10-
import { ProgressCallback, UserCancelledError } from "@bentley/itwin-client";
10+
import { UserCancelledError } from "./itwin-client/FileHandler";
11+
import { ProgressCallback, ProgressInfo } from "./itwin-client/Request";
1112
import {
1213
AcquireNewBriefcaseIdArg, BackendHubAccess, BriefcaseDbArg, BriefcaseIdArg, BriefcaseLocalValue, BriefcaseManager, ChangesetArg, ChangesetRangeArg, CheckpointArg,
1314
CheckpointProps, CreateNewIModelProps, IModelDb, IModelHost, IModelIdArg, IModelJsFs, IModelNameArg, ITwinIdArg, LockMap, LockProps, LockState, SnapshotDb, TokenArg,
@@ -311,7 +312,7 @@ export class IModelHubBackend implements BackendHubAccess {
311312
throw new IModelError(BriefcaseStatus.VersionNotFound, "no checkpoints not found");
312313

313314
const cancelRequest: any = {};
314-
const progressCallback: ProgressCallback = (progress) => {
315+
const progressCallback: ProgressCallback = (progress: ProgressInfo) => {
315316
if (arg.onProgress && arg.onProgress(progress.loaded, progress.total!) !== 0)
316317
cancelRequest.cancel?.();
317318
};

‎clients/imodelhub/src/IModelHubClientLoggerCategories.ts

+7-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@ export enum IModelHubClientLoggerCategory {
1818
/** @internal */
1919
IModelBank = "imodelhub-client.iModelBank",
2020

21-
/** The logger category used for file handlers
22-
*/
21+
/** The logger category used for file handlers */
2322
FileHandlers = "imodelhub-client.FileHandlers",
23+
24+
/** The logger category used for requests. */
25+
Request = "imodelhub-client.Request",
26+
27+
/** The logger category used by base clients */
28+
Clients = "imodelhub-client.Clients",
2429
}

‎clients/imodelhub/src/imodelbank/IModelBankClient.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/** @packageDocumentation
66
* @module iModelBankClient
77
*/
8-
import { FileHandler } from "@bentley/itwin-client";
8+
import { FileHandler } from "../itwin-client/FileHandler";
99
import { IModelClient } from "../IModelClient";
1010
import { IModelBankHandler } from "./IModelBankHandler";
1111

‎clients/imodelhub/src/imodelbank/IModelBankFileSystemITwinClient.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88
import { AccessToken, IModelHubStatus, Logger } from "@itwin/core-bentley";
99
import { Project as ITwin } from "@itwin/projects-client";
10-
import { request, RequestOptions, Response } from "@bentley/itwin-client";
10+
import { request, RequestOptions, Response } from "../itwin-client/Request";
1111
import { WsgInstance } from "../wsg/ECJsonTypeMap";
1212
import { WsgError, WSStatus } from "../wsg/WsgClient";
1313
import { ITwinManagerClient } from "../IModelCloudEnvironment";

‎clients/imodelhub/src/imodelbank/IModelBankHandler.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/** @packageDocumentation
66
* @module iModelBankClient
77
*/
8-
import { FileHandler } from "@bentley/itwin-client";
8+
import { FileHandler } from "../itwin-client/FileHandler";
99
import { IModelBaseHandler } from "../imodelhub/BaseHandler";
1010

1111
/**

‎clients/imodelhub/src/imodelhub/BaseHandler.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
* @module iModelHubClient
77
*/
88
import { AccessToken } from "@itwin/core-bentley";
9-
import { FileHandler, RequestGlobalOptions, RequestOptions, RequestQueryOptions } from "@bentley/itwin-client";
9+
import { RequestGlobalOptions, RequestOptions, RequestQueryOptions } from "../itwin-client/Request";
10+
import { FileHandler } from "../itwin-client/FileHandler";
1011
import { ChunkedQueryContext } from "../wsg/ChunkedQueryContext";
1112
import { WsgInstance } from "../wsg/ECJsonTypeMap";
1213
import { DefaultWsgRequestOptionsProvider, HttpRequestOptions, WsgClient, WsgRequestOptions } from "../wsg/WsgClient";

‎clients/imodelhub/src/imodelhub/Briefcases.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
*/
88

99
import { AccessToken, GuidString, IModelHubStatus, Logger } from "@itwin/core-bentley";
10-
import { CancelRequest, FileHandler, ProgressCallback } from "@bentley/itwin-client";
10+
import { CancelRequest, FileHandler } from "../itwin-client/FileHandler";
11+
import { ProgressCallback } from "../itwin-client/Request";
1112
import { IModelClient } from "../IModelClient";
1213
import { IModelHubClientLoggerCategory } from "../IModelHubClientLoggerCategories";
1314
import { ECJsonTypeMap, WsgInstance } from "../wsg/ECJsonTypeMap";

‎clients/imodelhub/src/imodelhub/ChangeSets.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
*/
88

99
import { AccessToken, GuidString, Logger } from "@itwin/core-bentley";
10-
import { DownloadFailed, FileHandler, ProgressCallback, ProgressInfo, RequestQueryOptions, SasUrlExpired } from "@bentley/itwin-client";
10+
import { DownloadFailed, FileHandler, SasUrlExpired } from "../itwin-client/FileHandler";
11+
import { ProgressCallback, ProgressInfo, RequestQueryOptions } from "../itwin-client/Request";
1112
import { ECJsonTypeMap, WsgInstance } from "../wsg/ECJsonTypeMap";
1213
import { ChunkedQueryContext } from "../wsg/ChunkedQueryContext";
1314
import { IModelHubClientLoggerCategory } from "../IModelHubClientLoggerCategories";
@@ -529,7 +530,8 @@ export class ChangeSetHandler {
529530
const callback: ProgressCallback = (progress: ProgressInfo) => {
530531
downloadProgress.downloadedSize += (progress.loaded - previouslyDownloaded);
531532
previouslyDownloaded = progress.loaded;
532-
progressCallback!({ loaded: downloadProgress.downloadedSize, total: downloadProgress.totalSize, percent: downloadProgress.downloadedSize / downloadProgress.totalSize });
533+
if (progressCallback)
534+
progressCallback({ loaded: downloadProgress.downloadedSize, total: downloadProgress.totalSize, percent: downloadProgress.downloadedSize / downloadProgress.totalSize });
533535
};
534536

535537
if (this.wasChangeSetDownloaded(downloadPath, changeSet.fileSizeNumber, changeSet)) {

‎clients/imodelhub/src/imodelhub/Checkpoints.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
*/
88

99
import { AccessToken, GuidString, Logger, PerfLogger } from "@itwin/core-bentley";
10-
import { CancelRequest, FileHandler, ProgressCallback } from "@bentley/itwin-client";
10+
import { CancelRequest, FileHandler } from "../itwin-client/FileHandler";
11+
import { ProgressCallback } from "../itwin-client/Request";
1112
import { IModelHubClientLoggerCategory } from "../IModelHubClientLoggerCategories";
1213
import { ECJsonTypeMap, WsgInstance } from "../wsg/ECJsonTypeMap";
1314
import { WsgQuery } from "../wsg/WsgQuery";

‎clients/imodelhub/src/imodelhub/Client.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* @module iModelHubClient
77
*/
88

9-
import { FileHandler } from "@bentley/itwin-client";
9+
import { FileHandler } from "../itwin-client/FileHandler";
1010
import { IModelClient } from "../IModelClient";
1111
import { IModelBaseHandler } from "./BaseHandler";
1212
import { PermissionHandler } from "./Permissions";

‎clients/imodelhub/src/imodelhub/Codes.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import deepAssign from "deep-assign";
1010
import { AccessToken, GuidString, Id64String, IModelHubStatus, Logger } from "@itwin/core-bentley";
11-
import { ResponseError } from "@bentley/itwin-client";
11+
import { ResponseError } from "../itwin-client/Request";
1212
import { ECJsonTypeMap, WsgInstance } from "../wsg/ECJsonTypeMap";
1313
import { WsgQuery } from "../wsg/WsgQuery";
1414
import { WsgRequestOptions } from "../wsg/WsgClient";

‎clients/imodelhub/src/imodelhub/Errors.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import deepAssign from "deep-assign";
1010
import { GetMetaDataFunction, Guid, HttpStatus, IModelHubStatus, LogFunction, Logger } from "@itwin/core-bentley";
11-
import { ResponseError } from "@bentley/itwin-client";
11+
import { ResponseError } from "../itwin-client/Request";
1212
import { WsgError, WSStatus } from "../wsg/WsgClient";
1313
import { IModelHubClientLoggerCategory } from "../IModelHubClientLoggerCategories";
1414

‎clients/imodelhub/src/imodelhub/Events.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* @module iModelHubClient
77
*/
88
import { AccessToken, GuidString, Id64, Id64String, Logger } from "@itwin/core-bentley";
9-
import { request, Response } from "@bentley/itwin-client";
9+
import { request, Response } from "../itwin-client/Request";
1010
import { ECJsonTypeMap, WsgInstance } from "../wsg/ECJsonTypeMap";
1111
import { IModelHubClientLoggerCategory } from "../IModelHubClientLoggerCategories";
1212
import { IModelBaseHandler } from "./BaseHandler";

‎clients/imodelhub/src/imodelhub/EventsBase.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
*/
88

99
import { AccessToken, BeEvent } from "@itwin/core-bentley";
10-
import { DefaultRequestOptionsProvider, request, RequestOptions } from "@bentley/itwin-client";
10+
import { request, RequestOptions } from "../itwin-client/Request";
11+
import { DefaultRequestOptionsProvider } from "../request/Client";
1112
import { ECJsonTypeMap, WsgInstance } from "../wsg/ECJsonTypeMap";
1213
import { IModelBaseHandler } from "./BaseHandler";
1314

‎clients/imodelhub/src/imodelhub/GlobalEvents.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* @module iModelHubClient
77
*/
88
import { AccessToken, GuidString, Logger } from "@itwin/core-bentley";
9-
import { request, RequestOptions, Response } from "@bentley/itwin-client";
9+
import { request, RequestOptions, Response } from "../itwin-client/Request";
1010
import { ECJsonTypeMap, WsgInstance } from "../wsg/ECJsonTypeMap";
1111
import { IModelHubClientLoggerCategory } from "../IModelHubClientLoggerCategories";
1212
import { IModelBaseHandler } from "./BaseHandler";

‎clients/imodelhub/src/imodelhub/HubQuery.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import { GuidString } from "@itwin/core-bentley";
10-
import { RequestQueryOptions } from "@bentley/itwin-client";
10+
import { RequestQueryOptions } from "../itwin-client/Request";
1111
import { WsgQuery } from "../wsg/WsgQuery";
1212
import { ArgumentCheck } from "./Errors";
1313

‎clients/imodelhub/src/imodelhub/Locks.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import deepAssign from "deep-assign";
1010
import { AccessToken, GuidString, Id64String, IModelHubStatus, Logger } from "@itwin/core-bentley";
11-
import { ResponseError } from "@bentley/itwin-client";
11+
import { ResponseError } from "../itwin-client/Request";
1212
import { ECJsonTypeMap, WsgInstance } from "../wsg/ECJsonTypeMap";
1313
import { WsgQuery } from "../wsg/WsgQuery";
1414
import { HttpRequestOptions, WsgRequestOptions } from "../wsg/WsgClient";

‎clients/imodelhub/src/imodelhub/Thumbnails.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import { AccessToken, GuidString, Logger } from "@itwin/core-bentley";
10-
import { request, RequestOptions } from "@bentley/itwin-client";
10+
import { request, RequestOptions } from "../itwin-client/Request";
1111
import { ECJsonTypeMap, WsgInstance } from "../wsg/ECJsonTypeMap";
1212
import { Base64 } from "js-base64";
1313
import { IModelHubClientLoggerCategory } from "../IModelHubClientLoggerCategories";

‎clients/imodelhub/src/imodelhub/iModels.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
import deepAssign from "deep-assign";
1010
import { AccessToken, BentleyError, GuidString, IModelHubStatus, Logger } from "@itwin/core-bentley";
11-
import { FileHandler, ProgressCallback } from "@bentley/itwin-client";
11+
import { FileHandler } from "../itwin-client/FileHandler";
12+
import { ProgressCallback } from "../itwin-client/Request";
1213
import { ECJsonTypeMap, WsgInstance } from "../wsg/ECJsonTypeMap";
1314
import { IModelHubClientLoggerCategory } from "../IModelHubClientLoggerCategories";
1415
import { IModelBaseHandler } from "./BaseHandler";

‎clients/imodelhub/src/itwin-client/AzureFileHandler.ts

+5-3
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ import * as os from "os";
1313
import * as path from "path";
1414
import { Transform, TransformCallback } from "stream";
1515
import {
16-
CancelRequest, DownloadFailed, FileHandler, ProgressCallback, ProgressInfo, request, RequestOptions, SasUrlExpired, UserCancelledError,
17-
} from "@bentley/itwin-client";
16+
CancelRequest, DownloadFailed, FileHandler, SasUrlExpired, UserCancelledError,
17+
} from "./FileHandler";
18+
import { ProgressCallback, ProgressInfo, request, RequestOptions } from "./Request";
1819
import { AccessToken, Logger } from "@itwin/core-bentley";
1920
import { ArgumentCheck } from "../imodelhub/Errors";
2021
import { IModelHubClientLoggerCategory } from "../IModelHubClientLoggerCategories";
@@ -356,7 +357,8 @@ export class AzureFileHandler implements FileHandler {
356357
let i = 0;
357358
const callback: ProgressCallback = (progress: ProgressInfo) => {
358359
const uploaded = i * chunkSize + progress.loaded;
359-
progressCallback!({ loaded: uploaded, percent: uploaded / fileSize, total: fileSize });
360+
if (progressCallback)
361+
progressCallback({ loaded: uploaded, percent: uploaded / fileSize, total: fileSize });
360362
};
361363
for (; i * chunkSize < fileSize; ++i) {
362364
await this.uploadChunk(uploadUrlString, file, i, progressCallback ? callback : undefined);

‎clients/imodelhub/src/itwin-client/BlobDownloader.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { checkSync, lockSync } from "proper-lockfile";
1515
import * as stream from "stream";
1616
import * as util from "util";
1717
import { AsyncMutex, BeEvent, BentleyError, BriefcaseStatus } from "@itwin/core-bentley";
18-
import { CancelRequest, UserCancelledError } from "@bentley/itwin-client";
18+
import { CancelRequest, UserCancelledError } from "../itwin-client/FileHandler";
1919

2020
/** Configure download task
2121
* @internal

0 commit comments

Comments
 (0)