npm - @microsoft/windows-admin-center-sdk - Versions diffs - 2.523.1 → 2.538.1 - Mend

@microsoft/windows-admin-center-sdk 2.523.1 → 2.538.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (67) hide show

package/core/notification/powershell-notification.js CHANGED Viewed

@@ -1,4 +1,3 @@
-/// <reference types='jquery' />
 import { of, Subject } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 import { Net } from '../data/net';
@@ -17,7 +16,7 @@ export class PowerShellNotification extends SocketSignalR {
      * Initializes a new instance of the GatewaySocket class.
      */
     constructor(gatewayUrl) {
-        super(gatewayUrl, PowerShellNotification.connectionUrl, PowerShellNotification.proxyName);
+        super(gatewayUrl, PowerShellNotification.connectionUrl);
     }
     /* tslint:disable:no-bitwise */
     static hasConnectionError(item) {
@@ -42,7 +41,7 @@ export class PowerShellNotification extends SocketSignalR {
      * Gets the subject observable to get notifications.
      */
     get subject() {
-        return this.subjectInternal;
+        return this.subjectInternal.asObservable();
     }
     /**
      * Submit PowerShell command as a work item.
@@ -117,7 +116,7 @@ export class PowerShellNotification extends SocketSignalR {
                 const powershellCommandId = response.id ? response.id : response.sessionId;
                 SmeWebTelemetry.addPowershellId(powershellCommandId, command);
             }
-            this.processData(response);
+            this.processPowerShellData(response);
             // sending back the client.
             const workItemResult = { id: result.id, state: result.state, error: error };
             // passing in the results as object of the workItemResult
@@ -178,9 +177,18 @@ export class PowerShellNotification extends SocketSignalR {
             return;
         }
         const data = JSON.parse(message);
-        this.processData(data);
+        if (data.sessionId) {
+            // PowerShell work item.
+            this.processPowerShellData(data);
+            return;
+        }
+        if (data.id) {
+            // Notification message.
+            this.processMessageData(data);
+            return;
+        }
     }
-    processData(data) {
+    processPowerShellData(data) {
         /* tslint:disable:no-bitwise */
         let type = SocketMessageFlags.None;
         if (data.results && data.results.length > 0) {
@@ -201,10 +209,13 @@ export class PowerShellNotification extends SocketSignalR {
         /* tslint:enable:no-bitwise */
         this.clientHandler({ type: type, message: data });
     }
+    processMessageData(message) {
+        const type = SocketMessageFlags.Data;
+        this.clientHandler({ type, message });
+    }
 }
 PowerShellNotification.connectionUrl = '/api/notifications';
-PowerShellNotification.proxyName = 'notificationHub';
-PowerShellNotification.notify = 'notify';
+PowerShellNotification.notify = 'Notify';
 PowerShellNotification.subscribe = 'Subscribe';
 //# sourceMappingURL=powershell-notification.js.map

package/core/notification/powershell-notification.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../../../packages/core/notification/powershell-notification.ts"],"names":[],"mappings":"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","file":"powershell-notification.js","sourcesContent":["/// <reference types='jquery' />\r\n\r\nimport { Observable, of, Subject } from 'rxjs';\r\nimport { AjaxError } from 'rxjs/ajax';\r\nimport { catchError, map } from 'rxjs/operators';\r\nimport { Net } from '../data/net';\r\nimport { NodeConnection, NodeRequestOptions } from '../data/node-connection';\r\nimport { PowerShellCommand } from '../data/powershell';\r\nimport { LogLevel } from '../diagnostics/log-level';\r\nimport { Logging } from '../diagnostics/logging';\r\nimport { SmeWebTelemetry } from '../diagnostics/sme-web-telemetry';\r\nimport { TelemetryEventStates } from '../diagnostics/sme-web-telemetry-models';\r\nimport { Strings } from '../generated/strings';\r\nimport { NotificationState } from './notification-state';\r\nimport { SocketMessage, SocketMessageFlags, SocketSignalR } from './socket-signalr';\r\nimport { WorkItemResult } from './work-item-request';\r\n\r\n/*\r\n PowerShell Submit result object.\r\n /\r\nexport interface PowerShellSubmitResult {\r\n id: string;\r\n completed: boolean;\r\n error: any;\r\n state: NotificationState;\r\n}\r\n\r\n/\r\n Powershell work item message.\r\n /\r\nexport interface PowerShellWorkItemMessage {\r\n sessionId?: string;\r\n completed?: string; // True, False\r\n results?: any[];\r\n progress?: any[];\r\n errors?: any[];\r\n exception?: string;\r\n}\r\n\r\n/\r\n The PowerShell script based notification class.\r\n /\r\nexport class PowerShellNotification extends SocketSignalR<PowerShellWorkItemMessage> {\r\n private static connectionUrl = '/api/notifications';\r\n private static proxyName = 'notificationHub';\r\n private static notify = 'notify';\r\n private static subscribe = 'Subscribe';\r\n private subjectInternal: Subject<SocketMessage<PowerShellWorkItemMessage>>;\r\n\r\n / tslint:disable:no-bitwise /\r\n public static hasConnectionError(item: SocketMessage<PowerShellWorkItemMessage>): boolean {\r\n return (item.type & SocketMessageFlags.ConnectionError) === SocketMessageFlags.ConnectionError;\r\n }\r\n\r\n public static hasError(item: SocketMessage<PowerShellWorkItemMessage>): boolean {\r\n return (item.type & SocketMessageFlags.Error) === SocketMessageFlags.Error;\r\n }\r\n\r\n public static hasException(item: SocketMessage<PowerShellWorkItemMessage>): boolean {\r\n return (item.type & SocketMessageFlags.Exception) === SocketMessageFlags.Exception;\r\n }\r\n\r\n public static hasCompleted(item: SocketMessage<PowerShellWorkItemMessage>): boolean {\r\n return (item.type & SocketMessageFlags.Completed) === SocketMessageFlags.Completed;\r\n }\r\n\r\n public static hasData(item: SocketMessage<PowerShellWorkItemMessage>): boolean {\r\n return (item.type & SocketMessageFlags.Data) === SocketMessageFlags.Data;\r\n }\r\n\r\n public static hasProgress(item: SocketMessage<PowerShellWorkItemMessage>): boolean {\r\n return (item.type & SocketMessageFlags.Progress) === SocketMessageFlags.Progress;\r\n }\r\n\r\n / tslint:enable:no-bitwise /\r\n\r\n /\r\n Initializes a new instance of the GatewaySocket class.\r\n /\r\n constructor(gatewayUrl: string) {\r\n super(gatewayUrl, PowerShellNotification.connectionUrl, PowerShellNotification.proxyName);\r\n }\r\n\r\n /\r\n Gets the subject observable to get notifications.\r\n /\r\n public get subject(): Subject<SocketMessage<PowerShellWorkItemMessage>> {\r\n return this.subjectInternal;\r\n }\r\n\r\n /\r\n Submit PowerShell command as a work item.\r\n \r\n @param nodeConnection The node connection.\r\n * @param command The PowerShell command.\r\n * @param metadata The meta data.\r\n * @param nodeRequestOptions The node request options.\r\n * @param create The callback to create new notification.\r\n * @return Observable the observable of initial powershell query result.\r\n /\r\n public submit(\r\n nodeConnection: NodeConnection,\r\n nodeName: string,\r\n command: PowerShellCommand,\r\n metadata: any,\r\n nodeRequestOptions?: NodeRequestOptions,\r\n create?: (result: PowerShellSubmitResult) => void): Observable<WorkItemResult> {\r\n // For a non-powershell long running task (eg: azure site recovery setup):\r\n // The 'command' parameter is null.\r\n // The metadata.id is the workitem id generated by a gateway api.\r\n if (!command && metadata.id) {\r\n const result = <PowerShellSubmitResult>{\r\n id: metadata.id,\r\n completed: false,\r\n error: null,\r\n state: NotificationState.Started\r\n };\r\n if (create) {\r\n create(result);\r\n }\r\n\r\n this.subscribeSession(metadata.id);\r\n return of(<WorkItemResult>{ id: metadata.id, state: NotificationState.Started, error: null });\r\n }\r\n\r\n const data: any = Net.createPropertiesJSONString({\r\n ...command,\r\n useInProcRunspace: nodeRequestOptions.useInProcRunspace,\r\n ...{ metadata: metadata } });\r\n return nodeConnection.post(nodeName, Net.powerShellApiInvokeCommand, data, nodeRequestOptions)\r\n .pipe(\r\n catchError((error: AjaxError, obj) => {\r\n SmeWebTelemetry.tracePowershellEvent(command, TelemetryEventStates.Error,\r\n {response: error.response});\r\n\r\n const result = <PowerShellSubmitResult>{\r\n id: MsftSme.newGuid(),\r\n completed: true,\r\n error: { message: Net.getErrorMessage(error) },\r\n state: NotificationState.Error\r\n };\r\n if (create) {\r\n create(result);\r\n }\r\n\r\n return of(<WorkItemResult>{ id: result.id, state: result.state, error: result.error });\r\n }),\r\n map((response: any) => {\r\n const completed = response.completed === 'True';\r\n\r\n if (response.id) {\r\n // sending back the client for the error.\r\n return <WorkItemResult>response;\r\n }\r\n\r\n let error: any = null;\r\n if (response.errors && response.errors.length > 0) {\r\n const errorObj: any = MsftSme.first(response.errors);\r\n error = { message: errorObj.message };\r\n\r\n SmeWebTelemetry.tracePowershellEvent(command,\r\n TelemetryEventStates.Error,\r\n {response: response});\r\n }\r\n\r\n const result = <PowerShellSubmitResult>{\r\n id: response.sessionId,\r\n completed: completed,\r\n error: error,\r\n state: completed ?\r\n (response.errors ? NotificationState.Error : NotificationState.Success)\r\n : NotificationState.Started\r\n };\r\n\r\n if (result.state === NotificationState.Success) {\r\n result.error = response.results[0];\r\n }\r\n\r\n if (create) {\r\n create(result);\r\n }\r\n\r\n if (!result.completed) {\r\n this.subscribeSession(response.sessionId);\r\n\r\n // store ID here to correlate command with the gateway notification later\r\n const powershellCommandId = response.id ? response.id : response.sessionId;\r\n SmeWebTelemetry.addPowershellId(powershellCommandId, command);\r\n }\r\n\r\n this.processData(response);\r\n\r\n // sending back the client.\r\n const workItemResult = <WorkItemResult>{ id: result.id, state: result.state, error: error };\r\n\r\n // passing in the results as object of the workItemResult\r\n if (response.results) {\r\n workItemResult.object = response.results;\r\n }\r\n\r\n return workItemResult;\r\n }));\r\n }\r\n\r\n /\r\n Initialize to subscribe the web socket connection.\r\n /\r\n public initialize(): JQueryPromise<any> {\r\n if (this.subjectInternal) {\r\n this.subjectInternal.complete();\r\n }\r\n\r\n this.subjectInternal = new Subject<SocketMessage<PowerShellWorkItemMessage>>();\r\n this.subscribe(PowerShellNotification.notify);\r\n return this.start();\r\n }\r\n\r\n /\r\n Uninitialize to subscribe the web socket connection.\r\n /\r\n public uninitialize(): void {\r\n if (this.subjectInternal) {\r\n this.subjectInternal.complete();\r\n this.subjectInternal = null;\r\n }\r\n\r\n this.unsubscribe(PowerShellNotification.notify);\r\n this.stop();\r\n }\r\n\r\n /\r\n Invoke subscribe method to a session.\r\n \r\n @param id the session ID of work item.\r\n * @return Promise the promise object.\r\n /\r\n public subscribeSession(id: string): JQueryPromise<any> {\r\n return this.invoke(PowerShellNotification.subscribe, id);\r\n }\r\n\r\n /\r\n The client handler to process message.\r\n \r\n @param notification the message notification.\r\n /\r\n protected clientHandler(notification: SocketMessage<PowerShellWorkItemMessage>): void {\r\n this.subjectInternal.next(notification);\r\n }\r\n\r\n /\r\n Process the message.\r\n \r\n @param messages the messages.\r\n /\r\n protected processMessage(message: string): void {\r\n if (!message) {\r\n const message2 = MsftSme.getStrings<Strings>().MsftSmeShell.Core.Error.NotificationEmptyMessage.message;\r\n Logging.log({ source: 'socket', level: LogLevel.Warning, message: message2 });\r\n return;\r\n }\r\n\r\n const data: any = JSON.parse(message);\r\n this.processData(data);\r\n }\r\n\r\n private processData(data: any): void {\r\n / tslint:disable:no-bitwise /\r\n let type: SocketMessageFlags = SocketMessageFlags.None;\r\n if (data.results && data.results.length > 0) {\r\n type \|= SocketMessageFlags.Data;\r\n }\r\n\r\n if (data.progress && data.progress.length > 0) {\r\n type \|= SocketMessageFlags.Progress;\r\n }\r\n\r\n if (data.errors && data.errors.length > 0) {\r\n type \|= SocketMessageFlags.Error;\r\n }\r\n\r\n if (data.exception) {\r\n type \|= SocketMessageFlags.Exception;\r\n }\r\n\r\n if (data.completed === 'True') {\r\n type \|= SocketMessageFlags.Completed;\r\n }\r\n\r\n / tslint:enable:no-bitwise */\r\n\r\n this.clientHandler({ type: type, message: data });\r\n }\r\n}\r\n"]}
1	+ {"version":3,"sources":["../../../packages/core/notification/powershell-notification.ts"],"names":[],"mappings":"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","file":"powershell-notification.js","sourcesContent":["import { Observable, of, Subject } from 'rxjs';\r\nimport { AjaxError } from 'rxjs/ajax';\r\nimport { catchError, map } from 'rxjs/operators';\r\nimport { Net } from '../data/net';\r\nimport { NodeConnection, NodeRequestOptions } from '../data/node-connection';\r\nimport { PowerShellCommand } from '../data/powershell';\r\nimport { LogLevel } from '../diagnostics/log-level';\r\nimport { Logging } from '../diagnostics/logging';\r\nimport { SmeWebTelemetry } from '../diagnostics/sme-web-telemetry';\r\nimport { TelemetryEventStates } from '../diagnostics/sme-web-telemetry-models';\r\nimport { Strings } from '../generated/strings';\r\nimport { NotificationMessage } from './notification-message';\r\nimport { NotificationState } from './notification-state';\r\nimport { SocketMessage, SocketMessageFlags, SocketSignalR } from './socket-signalr';\r\nimport { WorkItemResult } from './work-item-request';\r\n\r\n/*\r\n PowerShell Submit result object.\r\n /\r\nexport interface PowerShellSubmitResult {\r\n id: string;\r\n completed: boolean;\r\n error: any;\r\n state: NotificationState;\r\n}\r\n\r\n/\r\n Powershell work item message.\r\n /\r\nexport interface PowerShellWorkItemMessage {\r\n sessionId?: string;\r\n completed?: string; // True, False\r\n results?: any[];\r\n progress?: any[];\r\n errors?: any[];\r\n exception?: string;\r\n}\r\n\r\n/\r\n The PowerShell script based notification class.\r\n /\r\nexport class PowerShellNotification extends SocketSignalR<PowerShellWorkItemMessage \| NotificationMessage> {\r\n private static connectionUrl = '/api/notifications';\r\n private static notify = 'Notify';\r\n private static subscribe = 'Subscribe';\r\n private subjectInternal: Subject<SocketMessage<PowerShellWorkItemMessage \| NotificationMessage>>;\r\n\r\n / tslint:disable:no-bitwise /\r\n public static hasConnectionError(item: SocketMessage<PowerShellWorkItemMessage \| NotificationMessage>): boolean {\r\n return (item.type & SocketMessageFlags.ConnectionError) === SocketMessageFlags.ConnectionError;\r\n }\r\n\r\n public static hasError(item: SocketMessage<PowerShellWorkItemMessage \| NotificationMessage>): boolean {\r\n return (item.type & SocketMessageFlags.Error) === SocketMessageFlags.Error;\r\n }\r\n\r\n public static hasException(item: SocketMessage<PowerShellWorkItemMessage \| NotificationMessage>): boolean {\r\n return (item.type & SocketMessageFlags.Exception) === SocketMessageFlags.Exception;\r\n }\r\n\r\n public static hasCompleted(item: SocketMessage<PowerShellWorkItemMessage\| NotificationMessage>): boolean {\r\n return (item.type & SocketMessageFlags.Completed) === SocketMessageFlags.Completed;\r\n }\r\n\r\n public static hasData(item: SocketMessage<PowerShellWorkItemMessage\| NotificationMessage>): boolean {\r\n return (item.type & SocketMessageFlags.Data) === SocketMessageFlags.Data;\r\n }\r\n\r\n public static hasProgress(item: SocketMessage<PowerShellWorkItemMessage \| NotificationMessage>): boolean {\r\n return (item.type & SocketMessageFlags.Progress) === SocketMessageFlags.Progress;\r\n }\r\n\r\n / tslint:enable:no-bitwise /\r\n\r\n /\r\n Initializes a new instance of the GatewaySocket class.\r\n /\r\n constructor(gatewayUrl: string) {\r\n super(gatewayUrl, PowerShellNotification.connectionUrl);\r\n }\r\n\r\n /\r\n Gets the subject observable to get notifications.\r\n /\r\n public get subject(): Observable<SocketMessage<PowerShellWorkItemMessage \| NotificationMessage>> {\r\n return this.subjectInternal.asObservable();\r\n }\r\n\r\n /\r\n Submit PowerShell command as a work item.\r\n \r\n @param nodeConnection The node connection.\r\n * @param command The PowerShell command.\r\n * @param metadata The meta data.\r\n * @param nodeRequestOptions The node request options.\r\n * @param create The callback to create new notification.\r\n * @return Observable the observable of initial powershell query result.\r\n /\r\n public submit(\r\n nodeConnection: NodeConnection,\r\n nodeName: string,\r\n command: PowerShellCommand,\r\n metadata: any,\r\n nodeRequestOptions?: NodeRequestOptions,\r\n create?: (result: PowerShellSubmitResult) => void): Observable<WorkItemResult> {\r\n // For a non-powershell long running task (eg: azure site recovery setup):\r\n // The 'command' parameter is null.\r\n // The metadata.id is the workitem id generated by a gateway api.\r\n if (!command && metadata.id) {\r\n const result = <PowerShellSubmitResult>{\r\n id: metadata.id,\r\n completed: false,\r\n error: null,\r\n state: NotificationState.Started\r\n };\r\n if (create) {\r\n create(result);\r\n }\r\n\r\n this.subscribeSession(metadata.id);\r\n return of(<WorkItemResult>{ id: metadata.id, state: NotificationState.Started, error: null });\r\n }\r\n\r\n const data: any = Net.createPropertiesJSONString({\r\n ...command,\r\n useInProcRunspace: nodeRequestOptions.useInProcRunspace,\r\n ...{ metadata: metadata } });\r\n return nodeConnection.post(nodeName, Net.powerShellApiInvokeCommand, data, nodeRequestOptions)\r\n .pipe(\r\n catchError((error: AjaxError, obj) => {\r\n SmeWebTelemetry.tracePowershellEvent(command, TelemetryEventStates.Error,\r\n {response: error.response});\r\n\r\n const result = <PowerShellSubmitResult>{\r\n id: MsftSme.newGuid(),\r\n completed: true,\r\n error: { message: Net.getErrorMessage(error) },\r\n state: NotificationState.Error\r\n };\r\n if (create) {\r\n create(result);\r\n }\r\n\r\n return of(<WorkItemResult>{ id: result.id, state: result.state, error: result.error });\r\n }),\r\n map((response: any) => {\r\n const completed = response.completed === 'True';\r\n\r\n if (response.id) {\r\n // sending back the client for the error.\r\n return <WorkItemResult>response;\r\n }\r\n\r\n let error: any = null;\r\n if (response.errors && response.errors.length > 0) {\r\n const errorObj: any = MsftSme.first(response.errors);\r\n error = { message: errorObj.message };\r\n\r\n SmeWebTelemetry.tracePowershellEvent(command,\r\n TelemetryEventStates.Error,\r\n {response: response});\r\n }\r\n\r\n const result = <PowerShellSubmitResult>{\r\n id: response.sessionId,\r\n completed: completed,\r\n error: error,\r\n state: completed ?\r\n (response.errors ? NotificationState.Error : NotificationState.Success)\r\n : NotificationState.Started\r\n };\r\n\r\n if (result.state === NotificationState.Success) {\r\n result.error = response.results[0];\r\n }\r\n\r\n if (create) {\r\n create(result);\r\n }\r\n\r\n if (!result.completed) {\r\n this.subscribeSession(response.sessionId);\r\n\r\n // store ID here to correlate command with the gateway notification later\r\n const powershellCommandId = response.id ? response.id : response.sessionId;\r\n SmeWebTelemetry.addPowershellId(powershellCommandId, command);\r\n }\r\n\r\n this.processPowerShellData(response);\r\n\r\n // sending back the client.\r\n const workItemResult = <WorkItemResult>{ id: result.id, state: result.state, error: error };\r\n\r\n // passing in the results as object of the workItemResult\r\n if (response.results) {\r\n workItemResult.object = response.results;\r\n }\r\n\r\n return workItemResult;\r\n }));\r\n }\r\n\r\n /\r\n Initialize to subscribe the web socket connection.\r\n /\r\n public initialize(): Promise<any> {\r\n if (this.subjectInternal) {\r\n this.subjectInternal.complete();\r\n }\r\n\r\n this.subjectInternal = new Subject<SocketMessage<PowerShellWorkItemMessage \| NotificationMessage>>();\r\n this.subscribe(PowerShellNotification.notify);\r\n return this.start();\r\n }\r\n\r\n /\r\n Uninitialize to subscribe the web socket connection.\r\n /\r\n public uninitialize(): void {\r\n if (this.subjectInternal) {\r\n this.subjectInternal.complete();\r\n this.subjectInternal = null;\r\n }\r\n\r\n this.unsubscribe(PowerShellNotification.notify);\r\n this.stop();\r\n }\r\n\r\n /\r\n Invoke subscribe method to a session.\r\n \r\n @param id the session ID of work item.\r\n * @return Promise the promise object.\r\n /\r\n public subscribeSession(id: string): Promise<PowerShellWorkItemMessage \| NotificationMessage> {\r\n return this.invoke(PowerShellNotification.subscribe, id);\r\n }\r\n\r\n /\r\n The client handler to process message.\r\n \r\n @param notification the message notification.\r\n /\r\n protected clientHandler(notification: SocketMessage<PowerShellWorkItemMessage \| NotificationMessage>): void {\r\n this.subjectInternal.next(notification);\r\n }\r\n\r\n /\r\n Process the message.\r\n \r\n @param messages the messages.\r\n /\r\n protected processMessage(message: string): void {\r\n if (!message) {\r\n const message2 = MsftSme.getStrings<Strings>().MsftSmeShell.Core.Error.NotificationEmptyMessage.message;\r\n Logging.log({ source: 'socket', level: LogLevel.Warning, message: message2 });\r\n return;\r\n }\r\n\r\n const data: any = JSON.parse(message);\r\n if (data.sessionId) {\r\n // PowerShell work item.\r\n this.processPowerShellData(data);\r\n return;\r\n }\r\n\r\n if (data.id) {\r\n // Notification message.\r\n this.processMessageData(data);\r\n return;\r\n }\r\n }\r\n\r\n private processPowerShellData(data: PowerShellWorkItemMessage): void {\r\n / tslint:disable:no-bitwise /\r\n let type: SocketMessageFlags = SocketMessageFlags.None;\r\n if (data.results && data.results.length > 0) {\r\n type \|= SocketMessageFlags.Data;\r\n }\r\n\r\n if (data.progress && data.progress.length > 0) {\r\n type \|= SocketMessageFlags.Progress;\r\n }\r\n\r\n if (data.errors && data.errors.length > 0) {\r\n type \|= SocketMessageFlags.Error;\r\n }\r\n\r\n if (data.exception) {\r\n type \|= SocketMessageFlags.Exception;\r\n }\r\n\r\n if (data.completed === 'True') {\r\n type \|= SocketMessageFlags.Completed;\r\n }\r\n\r\n / tslint:enable:no-bitwise */\r\n\r\n this.clientHandler({ type: type, message: data });\r\n }\r\n\r\n private processMessageData(message: NotificationMessage): void {\r\n const type: SocketMessageFlags = SocketMessageFlags.Data;\r\n this.clientHandler({ type, message });\r\n }\r\n}\r\n"]}

package/core/notification/socket-signalr.d.ts CHANGED Viewed

@@ -1,5 +1,4 @@
-/// <reference types="signalr" />
-/// <reference types="jquery" />
+import { HttpError } from '@microsoft/signalr';
 /**
  * Socket message flags. These can be combined.
  */
@@ -17,7 +16,7 @@ export declare enum SocketMessageFlags {
  */
 export interface SocketMessage<T> {
     type: SocketMessageFlags;
-    connectionError?: SignalR.ConnectionError;
+    connectionError?: HttpError;
     message: T;
 }
 /**
@@ -26,9 +25,7 @@ export interface SocketMessage<T> {
 export declare abstract class SocketSignalR<T> {
     private gatewayUrl;
     private connectionUrl;
-    private proxyName;
     private connection;
-    private proxy;
     private started;
     private lastError;
     private processHandler;
@@ -39,14 +36,13 @@ export declare abstract class SocketSignalR<T> {
     /**
      * Instantiates a new instance of the SocketSignalR class.
      */
-    constructor(gatewayUrl: string, connectionUrl: string, proxyName: string);
+    constructor(gatewayUrl: string, connectionUrl: string);
     /**
      * Subscribe to the proxy with method name and handler.
      *
      * @param name the name of subscription for a method.
-     * @return SignalR.Hub.Proxy the proxy.
      */
-    subscribe(name: string): SignalR.Hub.Proxy;
+    subscribe(name: string): void;
     /**
      * Unsubscribe to the subscribed method call.
      *
@@ -56,11 +52,11 @@ export declare abstract class SocketSignalR<T> {
     /**
      * Start request connection.
      */
-    start(): JQueryPromise<any>;
+    start(): Promise<any>;
     /**
      * Stop request connection.
      */
-    stop(): SignalR.Connection;
+    stop(): void;
     /**
      * Invoke a method with parameters.
      *
@@ -68,7 +64,7 @@ export declare abstract class SocketSignalR<T> {
      * @param args the parameters to pass.
      * @return Promise the promise object.
      */
-    invoke(name: string, ...args: any[]): JQueryPromise<any>;
+    invoke(name: string, ...args: any[]): Promise<T>;
     /**
      * The client handler.
      */
@@ -80,9 +76,7 @@ export declare abstract class SocketSignalR<T> {
      */
     protected abstract processMessage(message: string): void;
     /**
-     * Initiate the connection to gateway and create a proxy.
-     *
-     * @param proxyName the proxy name.
+     * Initiate the connection to gateway.
      */
     private init;
     /**

package/core/notification/socket-signalr.js CHANGED Viewed

@@ -1,4 +1,4 @@
-/// <reference types='signalr' />
+import { HubConnectionBuilder, HubConnectionState } from '@microsoft/signalr';
 /**
  * Socket message flags. These can be combined.
  */
@@ -19,10 +19,9 @@ export class SocketSignalR {
     /**
      * Instantiates a new instance of the SocketSignalR class.
      */
-    constructor(gatewayUrl, connectionUrl, proxyName) {
+    constructor(gatewayUrl, connectionUrl) {
         this.gatewayUrl = gatewayUrl;
         this.connectionUrl = connectionUrl;
-        this.proxyName = proxyName;
         this.started = false;
         this.processHandler = (message) => this.processMessage(message);
         gatewayUrl = gatewayUrl ? gatewayUrl : '';
@@ -37,15 +36,14 @@ export class SocketSignalR {
      * Subscribe to the proxy with method name and handler.
      *
      * @param name the name of subscription for a method.
-     * @return SignalR.Hub.Proxy the proxy.
      */
     subscribe(name) {
-        this.init(this.proxyName);
+        this.init();
         if (this.lastError) {
             // send last error;
             this.clientHandler({ type: SocketMessageFlags.Error, connectionError: this.lastError, message: null });
         }
-        return this.proxy.on(name, this.processHandler);
+        this.connection.on(name, this.processHandler);
     }
     /**
      * Unsubscribe to the subscribed method call.
@@ -53,7 +51,7 @@ export class SocketSignalR {
      * @param name the name of subscription for a method.
      */
     unsubscribe(name) {
-        this.proxy.off(name, this.processHandler);
+        this.connection.off(name, this.processHandler);
     }
     /**
      * Start request connection.
@@ -66,7 +64,7 @@ export class SocketSignalR {
      */
     stop() {
         this.started = false;
-        return this.connection.stop(true);
+        this.connection.stop();
     }
     /**
      * Invoke a method with parameters.
@@ -79,21 +77,22 @@ export class SocketSignalR {
         if (!this.started) {
             throw new Error('request socket has not been started.');
         }
-        if (this.connection.state === 4 /* SignalR.ConnectionState.Disconnected: @types/signalr doesn't take conversion properly */) {
-            return this.start().then(() => this.proxy.invoke(name, ...args));
+        if (this.connection.state === HubConnectionState.Disconnected) {
+            return this.start().then(() => this.connection.invoke(name, ...args));
+        }
+        try {
+            return this.connection.invoke(name, ...args);
+        }
+        catch (error) {
+            this.errorMessage(error);
+            return Promise.reject(error);
         }
-        return this.proxy.invoke(name, ...args);
     }
     /**
-     * Initiate the connection to gateway and create a proxy.
-     *
-     * @param proxyName the proxy name.
+     * Initiate the connection to gateway.
      */
-    init(proxyName) {
-        this.connection = $.hubConnection(this.url);
-        this.connection.error((error) => this.errorMessage(error));
-        this.proxy = this.connection.createHubProxy(proxyName);
-        this.proxy.connection.error((error) => this.errorMessage(error));
+    init() {
+        this.connection = new HubConnectionBuilder().withUrl(this.url).build();
     }
     /**
      * Error message from signalr connection.

package/core/notification/socket-signalr.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../../../packages/core/notification/socket-signalr.ts"],"names":[],"mappings":"AAAA,~~iCAAiC~~;~~AAEjC~~;;GAEG;AACH,MAAM,CAAN,IAAY,kBAQX;AARD,WAAY,kBAAkB;IAC1B,2DAAQ,CAAA;IACR,2DAAQ,CAAA;IACR,mEAAY,CAAA;IACZ,qEAAa,CAAA;IACb,6DAAS,CAAA;IACT,kFAAoB,CAAA;IACpB,sEAAc,CAAA;AAClB,CAAC,EARW,kBAAkB,KAAlB,kBAAkB,QAQ7B;AAWD;;GAEG;AACH,MAAM,OAAgB,aAAa;~~IAc~~/B;;OAEG;IACH,YAAoB,UAAkB,EAAU,aAAqB~~,EAAU,SAAiB~~;~~QAA5E~~,eAAU,GAAV,UAAU,CAAQ;QAAU,kBAAa,GAAb,aAAa,CAAQ;~~QAAU~~,~~cAAS,GAAT,SAAS,CAAQ;QAdxF,~~YAAO,GAAG,KAAK,CAAC;QAEhB,mBAAc,GAAG,CAAC,OAAe,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAavE,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9C,CAAC;IAZD;;OAEG;IACH,IAAY,GAAG;QACX,OAAO,GAAG,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;IACrD,CAAC;IASD~~;;;;;OAKG~~;IACI,SAAS,CAAC,IAAY;QACzB,IAAI,CAAC,IAAI,~~CAAC~~,~~IAAI,~~CAAC~~,SAAS,CAAC,CAAC~~;~~QAC1B~~,IAAI,IAAI,CAAC,SAAS,EAAE;YAChB,mBAAmB;YACnB,IAAI,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,kBAAkB,CAAC,KAAK,EAAE,eAAe,EAAE,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SAC1G;QAED,~~OAAO,~~IAAI,CAAC,~~KAAK~~,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;~~IACpD~~,CAAC;IAED;;;;OAIG;IACI,WAAW,CAAC,IAAY;QAC3B,IAAI,CAAC,~~KAAK~~,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;~~IAC9C~~,CAAC;IAED;;OAEG;IACI,KAAK;QACR,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;IACnE,CAAC;IAED;;OAEG;IACI,IAAI;QACP,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,~~OAAO,~~IAAI,CAAC,UAAU,CAAC,IAAI,~~CAAC~~,~~IAAI,~~CAAC~~,CAAC~~;~~IACtC~~,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,IAAY,EAAE,GAAG,IAAW;QACtC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;SAC3D;QAED,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,KAAK,~~CAAC~~,CAAC,~~2FAA2F~~,EAAE;~~YACzH~~,OAAO,IAAI,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,~~KAAK~~,CAAC,MAAM,~~CAAC~~,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;~~SACpE~~;QAED,OAAO,IAAI,CAAC,~~KAAK~~,CAAC,MAAM,~~CAAC~~,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC;~~IAC5C,CAAC~~;~~IAcD;;;;OAIG;IACK~~,~~IAAI~~,~~CAAC~~,~~SAAiB~~;~~QAC1B~~,IAAI,CAAC,~~UAAU~~,~~GAAG,~~CAAC,~~CAAC~~,~~aAAa,~~CAAC,~~IAAI,~~CAAC,~~GAAG~~,~~CAAC~~,CAAC~~;QAC5C~~,~~IAAI~~,CAAC,~~UAAU,CAAC,~~KAAK,CAAC,CAAC,~~KAAK,EAAE,EAAE,~~CAAC,IAAI~~,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC~~;~~QAC3D~~,IAAI,CAAC,~~KAAK~~,GAAG,IAAI,~~CAAC~~,~~UAAU~~,CAAC,~~cAAc~~,CAAC,~~SAAS,CAAC,CAAC;QACvD,~~IAAI,CAAC,~~KAAK~~,CAAC,~~UAAU,~~CAAC,KAAK,~~CAAC,CAAC,KAAK,~~EAAE,~~EAAE,~~CAAC~~,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC~~;~~IACrE~~,CAAC;IAED;;;;OAIG;IACK,YAAY,CAAC,~~KAA8B~~;~~QAC/C~~,IAAI,IAAI,CAAC,aAAa,EAAE;YACpB,IAAI,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,kBAAkB,CAAC,eAAe,EAAG,eAAe,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SAC5G;aAAM;YACH,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;SAC1B;IACL,CAAC;CACJ","file":"socket-signalr.js","sourcesContent":["~~///~~ ~~<reference~~ ~~types=~~'signalr' ~~/>\~~r\n\r\n/*\r\n Socket message flags. These can be combined.\r\n /\r\nexport enum SocketMessageFlags {\r\n None = 0,\r\n Data = 1,\r\n Progress = 2,\r\n Completed = 4,\r\n Error = 8,\r\n ConnectionError = 16,\r\n Exception = 32\r\n}\r\n\r\n/\r\n Socket message.\r\n /\r\nexport interface SocketMessage<T> {\r\n type: SocketMessageFlags;\r\n connectionError?: ~~SignalR.ConnectionError~~;\r\n message: T;\r\n}\r\n\r\n/\r\n SignalR based socket class.\r\n /\r\nexport abstract class SocketSignalR<T> {\r\n private connection: ~~SignalR.Hub.Connection~~;\r\n private ~~proxy: SignalR.Hub.Proxy;\r\n private~~ started = false;\r\n private lastError: ~~SignalR.ConnectionError~~;\r\n private processHandler = (message: string) => this.processMessage(message);\r\n\r\n /\r\n Gets signalR connection URL.\r\n /\r\n private get url(): string {\r\n return `${this.gatewayUrl}${this.connectionUrl}`;\r\n }\r\n\r\n /\r\n Instantiates a new instance of the SocketSignalR class.\r\n /\r\n constructor(private gatewayUrl: string, private connectionUrl: string~~, private proxyName: string~~) {\r\n gatewayUrl = gatewayUrl ? gatewayUrl : '';\r\n }\r\n\r\n /\r\n Subscribe to the proxy with method name and handler.\r\n \r\n @param name the name of subscription for a method.\r\n * @return SignalR.Hub.Proxy the proxy.\r\n /\r\n public subscribe(name: string): ~~SignalR.Hub.Proxy~~ {\r\n this.init(~~this.proxyName~~);\r\n if (this.lastError) {\r\n // send last error;\r\n this.clientHandler({ type: SocketMessageFlags.Error, connectionError: this.lastError, message: null });\r\n }\r\n\r\n ~~return~~ this.~~proxy~~.on(name, this.processHandler);\r\n }\r\n\r\n /\r\n Unsubscribe to the subscribed method call.\r\n \r\n @param name the name of subscription for a method.\r\n /\r\n public unsubscribe(name: string): void {\r\n this.~~proxy~~.off(name, this.processHandler);\r\n }\r\n\r\n /\r\n Start request connection.\r\n /\r\n public start(): ~~JQueryPromise~~<any> {\r\n return this.connection.start().then(() => this.started = true);\r\n }\r\n\r\n /\r\n Stop request connection.\r\n /\r\n public stop(): ~~SignalR.Connection~~ {\r\n this.started = false;\r\n ~~return~~ this.connection.stop(~~true~~);\r\n }\r\n\r\n /\r\n Invoke a method with parameters.\r\n \r\n @param name the method name to execute.\r\n * @param args the parameters to pass.\r\n * @return Promise the promise object.\r\n /\r\n public invoke(name: string, ...args: any[]): ~~JQueryPromise~~<~~any~~> {\r\n if (!this.started) {\r\n throw new Error('request socket has not been started.');\r\n }\r\n\r\n if (this.connection.state === ~~4 / SignalR~~.~~ConnectionState.~~Disconnected~~: @types/signalr doesn't take conversion properly /~~) {\r\n return this.start().then(() => this.~~proxy~~.invoke(name, ...args));\r\n }\r\n\r\n return this.~~proxy~~.invoke(name, ...args);\r\n }\r\n\r\n /\r\n The client handler.\r\n /\r\n protected abstract clientHandler(messages: SocketMessage<T>): void;\r\n\r\n /\r\n Process the message.\r\n \r\n @param messages the messages.\r\n /\r\n protected abstract processMessage(message: string): void;\r\n\r\n /\r\n Initiate the connection to gateway ~~and create a proxy~~.\r\n \r\n @param proxyName the proxy name.\r\n /\r\n private init(~~proxyName: string~~): void {\r\n this.connection = ~~$.hubConnection(this.url);\r\n this.connection.error((error)~~ ~~=> this.errorMessage~~(~~error~~)~~);\r\n this~~.~~proxy = this.connection.createHubProxy~~(~~proxyName);\r\n~~ this.~~proxy.connection.error((error~~) ~~=> this~~.~~errorMessage~~(~~error~~));\r\n }\r\n\r\n /\r\n Error message from signalr connection.\r\n \r\n @param error the error produced on the connection.\r\n */\r\n private errorMessage(error: ~~SignalR.ConnectionError~~): void {\r\n if (this.clientHandler) {\r\n this.clientHandler({ type: SocketMessageFlags.ConnectionError, connectionError: error, message: null });\r\n } else {\r\n this.lastError = error;\r\n }\r\n }\r\n}\r\n"]}
1	+ {"version":3,"sources":["../../../packages/core/notification/socket-signalr.ts"],"names":[],"mappings":"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","file":"socket-signalr.js","sourcesContent":["import { HttpError, HubConnection, HubConnectionBuilder, HubConnectionState } from '@microsoft/signalr';\r\n\r\n/*\r\n Socket message flags. These can be combined.\r\n /\r\nexport enum SocketMessageFlags {\r\n None = 0,\r\n Data = 1,\r\n Progress = 2,\r\n Completed = 4,\r\n Error = 8,\r\n ConnectionError = 16,\r\n Exception = 32\r\n}\r\n\r\n/\r\n Socket message.\r\n /\r\nexport interface SocketMessage<T> {\r\n type: SocketMessageFlags;\r\n connectionError?: HttpError;\r\n message: T;\r\n}\r\n\r\n/\r\n SignalR based socket class.\r\n /\r\nexport abstract class SocketSignalR<T> {\r\n private connection: HubConnection;\r\n private started = false;\r\n private lastError: HttpError;\r\n private processHandler = (message: string) => this.processMessage(message);\r\n\r\n /\r\n Gets signalR connection URL.\r\n /\r\n private get url(): string {\r\n return `${this.gatewayUrl}${this.connectionUrl}`;\r\n }\r\n\r\n /\r\n Instantiates a new instance of the SocketSignalR class.\r\n /\r\n constructor(private gatewayUrl: string, private connectionUrl: string) {\r\n gatewayUrl = gatewayUrl ? gatewayUrl : '';\r\n }\r\n\r\n /\r\n Subscribe to the proxy with method name and handler.\r\n \r\n @param name the name of subscription for a method.\r\n /\r\n public subscribe(name: string): void {\r\n this.init();\r\n if (this.lastError) {\r\n // send last error;\r\n this.clientHandler({ type: SocketMessageFlags.Error, connectionError: this.lastError, message: null });\r\n }\r\n\r\n this.connection.on(name, this.processHandler);\r\n }\r\n\r\n /\r\n Unsubscribe to the subscribed method call.\r\n \r\n @param name the name of subscription for a method.\r\n /\r\n public unsubscribe(name: string): void {\r\n this.connection.off(name, this.processHandler);\r\n }\r\n\r\n /\r\n Start request connection.\r\n /\r\n public start(): Promise<any> {\r\n return this.connection.start().then(() => this.started = true);\r\n }\r\n\r\n /\r\n Stop request connection.\r\n /\r\n public stop(): void {\r\n this.started = false;\r\n this.connection.stop();\r\n }\r\n\r\n /\r\n Invoke a method with parameters.\r\n \r\n @param name the method name to execute.\r\n * @param args the parameters to pass.\r\n * @return Promise the promise object.\r\n /\r\n public invoke(name: string, ...args: any[]): Promise<T> {\r\n if (!this.started) {\r\n throw new Error('request socket has not been started.');\r\n }\r\n\r\n if (this.connection.state === HubConnectionState.Disconnected) {\r\n return this.start().then(() => this.connection.invoke<T>(name, ...args));\r\n }\r\n\r\n try {\r\n return this.connection.invoke<T>(name, ...args);\r\n } catch (error) {\r\n this.errorMessage(error);\r\n return Promise.reject(error);\r\n }\r\n }\r\n\r\n /\r\n The client handler.\r\n /\r\n protected abstract clientHandler(messages: SocketMessage<T>): void;\r\n\r\n /\r\n Process the message.\r\n \r\n @param messages the messages.\r\n /\r\n protected abstract processMessage(message: string): void;\r\n\r\n /\r\n Initiate the connection to gateway.\r\n /\r\n private init(): void {\r\n this.connection = new HubConnectionBuilder().withUrl(this.url).build();\r\n }\r\n\r\n /\r\n Error message from signalr connection.\r\n \r\n @param error the error produced on the connection.\r\n */\r\n private errorMessage(error: HttpError): void {\r\n if (this.clientHandler) {\r\n this.clientHandler({ type: SocketMessageFlags.ConnectionError, connectionError: error, message: null });\r\n } else {\r\n this.lastError = error;\r\n }\r\n }\r\n}\r\n"]}

package/core/notification/work-item-manager.d.ts CHANGED Viewed

@@ -14,6 +14,8 @@ export declare class WorkItemManager {
     private nodeConnection;
     notificationConnection: NotificationConnection;
     private static apiWorkItems24hours;
+    private static apiNotificationMessageStored;
+    private static apiNotificationMessageSubscriptionId;
     active: boolean;
     private startSubscription;
     private powerShellNotification;
@@ -23,6 +25,7 @@ export declare class WorkItemManager {
     private sequenceCounter;
     private sequencePackets;
     private rpcWorkItemSubjectServer;
+    private rootSubscriptionId;
     /**
      * Initializes a new instance of the WorkItemManager class.
      *
@@ -54,4 +57,5 @@ export declare class WorkItemManager {
      * @return Observable the WorkItemResult observable.
      */
     queryWorkItem(request: RpcWorkItem): Observable<WorkItemResult>;
+    private getErrorLevel;
 }

package/core/notification/work-item-manager.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { from, of, throwError } from 'rxjs';
+import { forkJoin, from, of, throwError } from 'rxjs';
 import { catchError, switchMap } from 'rxjs/operators';
 import { Net } from '../data/net';
 import { PowerShell } from '../data/powershell';
@@ -44,48 +44,71 @@ export class WorkItemManager {
         this.startSubscription = this.gatewayConnection.get(WorkItemManager.apiWorkItems24hours)
             .pipe(catchError((error, obj) => {
             const message = MsftSme.getStrings().MsftSmeShell.Core.Error.NotificationNoWorkItemFound.message;
-            Logging.log({
-                source: 'Notification',
-                level: LogLevel.Error,
-                message: message.format(Net.getErrorMessage(error))
-            });
+            Logging.logError('Notification', message.format(Net.getErrorMessage(error)));
             return of({ response: { value: null } });
         }), switchMap(response => {
             if (response.value) {
-                response.value.forEach(element => {
-                    this.notificationManager.addFromRecover(element);
-                });
+                response.value.forEach(element => this.notificationManager.addFromRecover(element));
             }
             // start websocket status query.
             this.powerShellNotification = new PowerShellNotification(this.gatewayConnection.gatewayUrl);
-            return from(
-            // converting jQueryPromise to native Promise.
-            new Promise((resolve, reject) => this.powerShellNotification.initialize().then(resolve, reject)));
+            return from(this.powerShellNotification.initialize());
         }))
             .subscribe(() => {
             // notification from the gateway...
             this.notificationSubscription = this.powerShellNotification.subject
                 .subscribe(item => {
-                if (item && item.message && item.message.sessionId) {
-                    const psSessionId = item.message.sessionId;
+                const message = item.message;
+                if (message && message.sessionId) {
+                    // PowerShell Work Item message.
+                    const workItem = message;
+                    const psSessionId = workItem.sessionId;
                     // Pass in psSessionId so telemetry can search up the PSCommand for this
                     if (PowerShellNotification.hasError(item)) {
-                        SmeWebTelemetry.tracePowershellEvent(null, TelemetryEventStates.Error, { response: item.message, id: psSessionId });
+                        SmeWebTelemetry.tracePowershellEvent(null, TelemetryEventStates.Error, { response: workItem, id: psSessionId });
                     }
                     else if (PowerShellNotification.hasCompleted(item)) {
                         SmeWebTelemetry.removePowershellId(psSessionId);
                     }
                     if (!this.notificationManager.updateFromMessage(psSessionId, item)) {
-                        const message = MsftSme.getStrings()
-                            .MsftSmeShell.Core.Error.NotificationUnexpectedReceived.message;
+                        const unexpectedMessage = MsftSme.getStrings().MsftSmeShell.Core.Error.NotificationUnexpectedReceived.message;
                         Logging.log({
-                            source: 'Notification',
-                            level: LogLevel.Warning,
-                            message: message.format(psSessionId)
+                            source: 'Notification', level: LogLevel.Warning, message: unexpectedMessage.format(psSessionId),
                         });
                     }
                 }
+                else if (message && message.id) {
+                    // PowerShell Work Item message.
+                    const notification = message;
+                    const state = this.getErrorLevel(notification);
+                    // Pass in psSessionId so telemetry can search up the PSCommand for this
+                    if (state === NotificationState.Error) {
+                        SmeWebTelemetry.tracePowershellEvent(null, TelemetryEventStates.Error, { response: message, id: message.id });
+                    }
+                    else if (state === NotificationState.Success) {
+                        SmeWebTelemetry.removePowershellId(message.id);
+                    }
+                    if (this.notificationManager.addForNotificationMessage(state, notification)) {
+                        this.powerShellNotification.subscribeSession(notification.id);
+                    }
+                    if (!this.notificationManager.updateFromNotificationMessage(state, message)) {
+                        const unexpectedMessage = MsftSme.getStrings().MsftSmeShell.Core.Error.NotificationUnexpectedReceived.message;
+                        Logging.logWarning('Notification', unexpectedMessage.format(message.id));
+                    }
+                }
             });
+            this.notificationSubscription.add(forkJoin([
+                this.gatewayConnection.get(WorkItemManager.apiNotificationMessageSubscriptionId),
+                this.gatewayConnection.get(WorkItemManager.apiNotificationMessageStored),
+            ]).subscribe(([idData, storedData]) => {
+                this.rootSubscriptionId = idData.id;
+                this.powerShellNotification.subscribeSession(this.rootSubscriptionId);
+                storedData.value.forEach(element => {
+                    const state = this.getErrorLevel(element);
+                    this.notificationManager.addForNotificationMessage(state, element);
+                    this.powerShellNotification.subscribeSession(element.id);
+                });
+            }));
             // workItem request from rpc...
             this.rpcWorkItemSubscription = this.rpcWorkItemSubjectServer.subject
                 .subscribe(item => {
@@ -237,7 +260,40 @@ export class WorkItemManager {
         const message = MsftSme.getStrings().MsftSmeShell.Core.Error.NotificationNoIdFound.message;
         return throwError(message.format(request.id));
     }
+    getErrorLevel(notification) {
+        switch (notification.errorLevel) {
+            // Notification is unknown.
+            case 0:
+            case 'None':
+                return NotificationState.Informational;
+            // Notification is in progress. (non-terminated message.)
+            case 1:
+            case 'InProgress':
+                return NotificationState.InProgress;
+            // Notification is success. (terminated message.)
+            case 2:
+            case 'Success':
+                return NotificationState.Success;
+            // Notification is informational. (terminated message.)
+            case 3:
+            case 'Informational':
+                return NotificationState.Informational;
+            // Notification is warning. (terminated message.)
+            case 4:
+            case 'Warning':
+                return NotificationState.Warning;
+            // Notification is error. (terminated message.)
+            case 5:
+            case 'Error':
+                return NotificationState.Error;
+            // Notification is unknown.
+            default:
+                throw new Error('Couldn\'t get expected error level from a message notification.');
+        }
+    }
 }
 WorkItemManager.apiWorkItems24hours = '/workitems?lastMinutes=1440';
+WorkItemManager.apiNotificationMessageStored = '/NotificationMessage/stored';
+WorkItemManager.apiNotificationMessageSubscriptionId = '/NotificationMessage/id';
 //# sourceMappingURL=work-item-manager.js.map