Skip to content

Commit f23b97e

Browse files
committed
Merge remote-tracking branch 'upstream/main' into fix/migrate-pnpm-resolve-dependency-vulnerabilities
# Conflicts: # AISKU/package.json # AISKULight/package.json # channels/1ds-post-js/package.json # channels/applicationinsights-channel-js/package.json # channels/offline-channel-js/package.json # channels/tee-channel-js/package.json # common/config/rush/npm-shrinkwrap.json # examples/AISKU/package.json # examples/cfgSync/package.json # examples/dependency/package.json # examples/shared-worker/package.json # examples/startSpan/package.json # extensions/applicationinsights-analytics-js/package.json # extensions/applicationinsights-cfgsync-js/package.json # extensions/applicationinsights-clickanalytics-js/package.json # extensions/applicationinsights-debugplugin-js/package.json # extensions/applicationinsights-dependencies-js/package.json # extensions/applicationinsights-osplugin-js/package.json # extensions/applicationinsights-perfmarkmeasure-js/package.json # extensions/applicationinsights-properties-js/package.json # shared/1ds-core-js/package.json # shared/AppInsightsCommon/package.json # shared/AppInsightsCore/Tests/Unit/src/trace/span.Tests.ts # shared/AppInsightsCore/package.json # tools/chrome-debug-extension/package.json # tools/shims/package.json
2 parents 4114b53 + 3f70bc5 commit f23b97e

38 files changed

Lines changed: 408 additions & 54 deletions

File tree

AISKU/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"@microsoft/applicationinsights-core-js": "3.4.1",
7878
"@microsoft/applicationinsights-dependencies-js": "3.4.1",
7979
"@microsoft/applicationinsights-properties-js": "3.4.1",
80-
"@nevware21/ts-utils": ">= 0.12.6 < 2.x",
80+
"@nevware21/ts-utils": ">= 0.14.0 < 2.x",
8181
"@nevware21/ts-async": ">= 0.5.5 < 2.x"
8282
},
8383
"license": "MIT"

AISKULight/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"@microsoft/applicationinsights-shims": "3.0.1",
6868
"@microsoft/applicationinsights-channel-js": "3.4.1",
6969
"@microsoft/applicationinsights-core-js": "3.4.1",
70-
"@nevware21/ts-utils": ">= 0.12.6 < 2.x",
70+
"@nevware21/ts-utils": ">= 0.14.0 < 2.x",
7171
"@nevware21/ts-async": ">= 0.5.5 < 2.x"
7272
},
7373
"license": "MIT"

channels/1ds-post-js/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"@microsoft/applicationinsights-shims": "3.0.1",
2929
"@microsoft/dynamicproto-js": "^2.0.3",
3030
"@microsoft/applicationinsights-core-js": "3.4.1",
31-
"@nevware21/ts-utils": ">= 0.12.6 < 2.x",
31+
"@nevware21/ts-utils": ">= 0.14.0 < 2.x",
3232
"@nevware21/ts-async": ">= 0.5.5 < 2.x"
3333
},
3434
"devDependencies": {

channels/applicationinsights-channel-js/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"@microsoft/dynamicproto-js": "^2.0.3",
6666
"@microsoft/applicationinsights-shims": "3.0.1",
6767
"@microsoft/applicationinsights-core-js": "3.4.1",
68-
"@nevware21/ts-utils": ">= 0.12.6 < 2.x",
68+
"@nevware21/ts-utils": ">= 0.14.0 < 2.x",
6969
"@nevware21/ts-async": ">= 0.5.5 < 2.x"
7070
},
7171
"license": "MIT"

channels/applicationinsights-channel-js/src/Sender.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1014,7 +1014,7 @@ export class Sender extends BaseTelemetryPlugin implements IChannelControls {
10141014
// }
10151015

10161016
return _getOnComplete(payload, status, headers, response);
1017-
}
1017+
};
10181018
let payloadData = _getPayload(payload);
10191019
// if (payloadData) {
10201020
// payloadData.statsBeatData = {startTime: dateNow()};

channels/offline-channel-js/Tests/Unit/src/offlinebatchhandler.tests.ts

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,6 +1022,84 @@ export class OfflineBatchHandlerTests extends AITestClass {
10221022
}, "Wait for get batch response" + new Date().toISOString(), 15, 1000))
10231023
}
10241024
});
1025+
1026+
this.testCase({
1027+
name: "Null Provider: storeBatch rejects and does not throw when provider is null",
1028+
test: () => {
1029+
let batchHandler = new OfflineBatchHandler();
1030+
// Do not initialize - provider will be null
1031+
let endpoint = DEFAULT_BREEZE_ENDPOINT + DEFAULT_BREEZE_PATH;
1032+
let evt = TestHelper.mockEvent(endpoint, 1, false);
1033+
1034+
doAwaitResponse(batchHandler.storeBatch(evt), (res) => {
1035+
this.ctx.storeBatchDone = true;
1036+
Assert.ok(res.rejected, "storeBatch should reject when provider is null");
1037+
Assert.ok(res.reason instanceof Error, "rejection reason should be an Error");
1038+
Assert.ok(res.reason.message.indexOf("No provider") > -1, "error message should indicate no provider");
1039+
});
1040+
1041+
return this._asyncQueue().concat(PollingAssert.asyncTaskPollingAssert(() => {
1042+
return !!this.ctx.storeBatchDone;
1043+
}, "Wait for storeBatch rejection" + new Date().toISOString(), 15, 1000))
1044+
}
1045+
});
1046+
1047+
this.testCase({
1048+
name: "Null Provider: sendNextBatch rejects and does not throw when provider is null",
1049+
test: () => {
1050+
let batchHandler = new OfflineBatchHandler();
1051+
// Do not initialize - provider will be null
1052+
1053+
doAwaitResponse(batchHandler.sendNextBatch(), (res) => {
1054+
this.ctx.sendNextDone = true;
1055+
Assert.ok(res.rejected, "sendNextBatch should reject when provider is null");
1056+
Assert.ok(res.reason instanceof Error, "rejection reason should be an Error");
1057+
Assert.ok(res.reason.message.indexOf("No provider") > -1, "error message should indicate no provider");
1058+
});
1059+
1060+
return this._asyncQueue().concat(PollingAssert.asyncTaskPollingAssert(() => {
1061+
return !!this.ctx.sendNextDone;
1062+
}, "Wait for sendNextBatch rejection" + new Date().toISOString(), 15, 1000))
1063+
}
1064+
});
1065+
1066+
this.testCase({
1067+
name: "Null Provider: hasStoredBatch rejects and does not throw when provider is null",
1068+
test: () => {
1069+
let batchHandler = new OfflineBatchHandler();
1070+
// Do not initialize - provider will be null
1071+
1072+
doAwaitResponse(batchHandler.hasStoredBatch(), (res) => {
1073+
this.ctx.hasStoredDone = true;
1074+
Assert.ok(res.rejected, "hasStoredBatch should reject when provider is null");
1075+
Assert.ok(res.reason instanceof Error, "rejection reason should be an Error");
1076+
Assert.ok(res.reason.message.indexOf("No provider") > -1, "error message should indicate no provider");
1077+
});
1078+
1079+
return this._asyncQueue().concat(PollingAssert.asyncTaskPollingAssert(() => {
1080+
return !!this.ctx.hasStoredDone;
1081+
}, "Wait for hasStoredBatch rejection" + new Date().toISOString(), 15, 1000))
1082+
}
1083+
});
1084+
1085+
this.testCase({
1086+
name: "Null Provider: cleanStorage rejects and does not throw when provider is null",
1087+
test: () => {
1088+
let batchHandler = new OfflineBatchHandler();
1089+
// Do not initialize - provider will be null
1090+
1091+
doAwaitResponse(batchHandler.cleanStorage(), (res) => {
1092+
this.ctx.cleanDone = true;
1093+
Assert.ok(res.rejected, "cleanStorage should reject when provider is null");
1094+
Assert.ok(res.reason instanceof Error, "rejection reason should be an Error");
1095+
Assert.ok(res.reason.message.indexOf("No provider") > -1, "error message should indicate no provider");
1096+
});
1097+
1098+
return this._asyncQueue().concat(PollingAssert.asyncTaskPollingAssert(() => {
1099+
return !!this.ctx.cleanDone;
1100+
}, "Wait for cleanStorage rejection" + new Date().toISOString(), 15, 1000))
1101+
}
1102+
});
10251103

10261104
}
10271105
}

channels/offline-channel-js/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"@microsoft/dynamicproto-js": "^2.0.3",
3333
"@microsoft/applicationinsights-shims": "3.0.1",
3434
"@microsoft/applicationinsights-core-js": "3.4.1",
35-
"@nevware21/ts-utils": ">= 0.12.6 < 2.x",
35+
"@nevware21/ts-utils": ">= 0.14.0 < 2.x",
3636
"@nevware21/ts-async": ">= 0.5.5 < 2.x"
3737
},
3838
"peerDependencies": {

channels/offline-channel-js/src/OfflineBatchHandler.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ export class OfflineBatchHandler implements IOfflineBatchHandler {
6868
}
6969
return createPromise((resolve, reject) => {
7070
if (!provider) {
71-
reject(new Error(NoProviderErrMsg))
71+
reject(new Error(NoProviderErrMsg));
72+
return;
7273
}
7374
let evt = _getOfflineEvt(batch);
7475
return doAwaitResponse(provider.addEvent(evt.id, evt, _itemCtx), (response: AwaitResponse<IStorageTelemetryItem>) => {
@@ -97,6 +98,7 @@ export class OfflineBatchHandler implements IOfflineBatchHandler {
9798
return createPromise((resolve, reject) => {
9899
if (!_provider && !_unloadProvider) {
99100
reject(new Error(NoProviderErrMsg));
101+
return;
100102
}
101103
function storeResolve(result) {
102104
try {
@@ -223,7 +225,8 @@ export class OfflineBatchHandler implements IOfflineBatchHandler {
223225
_self.hasStoredBatch = (cb?: (hasBatches: boolean) => void) => {
224226
return createPromise((resolve, reject) => {
225227
if (!_provider) {
226-
reject(new Error(NoProviderErrMsg))
228+
reject(new Error(NoProviderErrMsg));
229+
return;
227230
}
228231
return doAwaitResponse(_provider.getNextBatch(), (response: AwaitResponse<IStorageTelemetryItem[]>) => {
229232
try {
@@ -244,7 +247,8 @@ export class OfflineBatchHandler implements IOfflineBatchHandler {
244247
return createPromise((resolve, reject) => {
245248
// note: doawaitresponse currently returns undefined
246249
if (!_provider) {
247-
reject(new Error(NoProviderErrMsg))
250+
reject(new Error(NoProviderErrMsg));
251+
return;
248252
}
249253
return doAwaitResponse(_provider.clear(), (response: AwaitResponse<IStorageTelemetryItem[]>) => {
250254
try {

channels/tee-channel-js/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"@microsoft/dynamicproto-js": "^2.0.3",
6767
"@microsoft/applicationinsights-shims": "3.0.1",
6868
"@microsoft/applicationinsights-core-js": "3.4.1",
69-
"@nevware21/ts-utils": ">= 0.12.6 < 2.x",
69+
"@nevware21/ts-utils": ">= 0.14.0 < 2.x",
7070
"@nevware21/ts-async": ">= 0.5.5 < 2.x"
7171
},
7272
"license": "MIT"

common/Tests/Framework/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
},
5959
"dependencies": {
6060
"@microsoft/dynamicproto-js": "^2.0.3",
61-
"@nevware21/ts-utils": ">= 0.12.6 < 2.x",
61+
"@nevware21/ts-utils": ">= 0.14.0 < 2.x",
6262
"@nevware21/ts-async": ">= 0.5.5 < 2.x"
6363
}
6464
}

0 commit comments

Comments
 (0)