Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .size-limit.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ module.exports = [
import: '{ record }',
gzip: true
},
{
name: 'rrweb - record & getCanvasManager only (gzipped)',
path: 'packages/rrweb/es/rrweb/packages/rrweb/src/entries/all.js',
import: '{ record, getCanvasManager }',
gzip: true
},
{
name: 'rrweb - record only (min)',
path: 'packages/rrweb/es/rrweb/packages/rrweb/src/entries/all.js',
Expand All @@ -21,7 +27,6 @@ module.exports = [
const webpack = require('webpack');
config.plugins.push(
new webpack.DefinePlugin({
__RRWEB_EXCLUDE_CANVAS__: true,
__RRWEB_EXCLUDE_SHADOW_DOM__: true,
__RRWEB_EXCLUDE_IFRAME__: true,
}),
Expand Down
9 changes: 8 additions & 1 deletion packages/rrweb/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import record from './record';

import { Replayer } from './replay';
import * as utils from './utils';

Expand All @@ -20,4 +21,10 @@ export type { recordOptions } from './types';

export { record, Replayer, utils };

export { takeFullSnapshot, mirror, freezePage, addCustomEvent } from './record';
export {
takeFullSnapshot,
mirror,
freezePage,
addCustomEvent,
getCanvasManager,
} from './record';
61 changes: 46 additions & 15 deletions packages/rrweb/src/record/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {
MaskInputOptions,
SlimDOMOptions,
createMirror,
DataURLOptions,
} from '@sentry-internal/rrweb-snapshot';
import { initObservers, mutationBuffers } from './observer';
import {
Expand Down Expand Up @@ -41,6 +42,7 @@ import {
} from './shadow-dom-manager';
import {
CanvasManager,
CanvasManagerConstructorOptions,
CanvasManagerInterface,
CanvasManagerNoop,
} from './observers/canvas/canvas-manager';
Expand All @@ -59,7 +61,6 @@ function wrapEvent(e: event): eventWithTime {
}

declare global {
const __RRWEB_EXCLUDE_CANVAS__: boolean;
const __RRWEB_EXCLUDE_SHADOW_DOM__: boolean;
const __RRWEB_EXCLUDE_IFRAME__: boolean;
}
Expand Down Expand Up @@ -112,6 +113,7 @@ function record<T = eventWithTime>(
ignoreCSSAttributes = new Set([]),
errorHandler,
onMutation,
getCanvasManager,
} = options;

registerErrorHandler(errorHandler);
Expand Down Expand Up @@ -322,20 +324,16 @@ function record<T = eventWithTime>(

const processedNodeManager = new ProcessedNodeManager();

const canvasManager: CanvasManagerInterface =
typeof __RRWEB_EXCLUDE_CANVAS__ === 'boolean' && __RRWEB_EXCLUDE_CANVAS__
? new CanvasManagerNoop()
: new CanvasManager({
recordCanvas,
mutationCb: wrappedCanvasMutationEmit,
win: window,
blockClass,
blockSelector,
unblockSelector,
mirror,
sampling: sampling.canvas,
dataURLOptions,
});
const canvasManager: CanvasManagerInterface = getCanvasManager
? getCanvasManager({
recordCanvas,
blockClass,
blockSelector,
unblockSelector,
sampling: sampling['canvas'],
dataURLOptions,
})
: new CanvasManagerNoop();

const shadowDomManager: ShadowDomManagerInterface =
typeof __RRWEB_EXCLUDE_SHADOW_DOM__ === 'boolean' &&
Expand Down Expand Up @@ -687,6 +685,14 @@ export function takeFullSnapshot(isCheckout?: boolean) {
_takeFullSnapshot(isCheckout);
}

function wrappedEmit(e: eventWithTime) {
if (!_wrappedEmit) {
return;
}

_wrappedEmit(e);
}

// record.addCustomEvent is removed because Sentry Session Replay does not use it
// record.freezePage is removed because Sentry Session Replay does not use it

Expand All @@ -695,3 +701,28 @@ record.mirror = mirror;
record.takeFullSnapshot = takeFullSnapshot;

export default record;

const wrappedCanvasMutationEmit = (p: canvasMutationParam) =>
wrappedEmit(
wrapEvent({
type: EventType.IncrementalSnapshot,
data: {
source: IncrementalSource.CanvasMutation,
...p,
},
}),
);

export function getCanvasManager(
options: Omit<
CanvasManagerConstructorOptions,
'mutationCb' | 'win' | 'mirror'
>,
): CanvasManagerInterface {
return new CanvasManager({
...options,
mutationCb: wrappedCanvasMutationEmit,
win: window,
mirror,
});
}
24 changes: 13 additions & 11 deletions packages/rrweb/src/record/observers/canvas/canvas-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,18 @@ export interface CanvasManagerInterface {
unlock(): void;
}

export interface CanvasManagerConstructorOptions {
recordCanvas: boolean;
mutationCb: canvasMutationCallback;
win: IWindow;
blockClass: blockClass;
blockSelector: string | null;
unblockSelector: string | null;
mirror: Mirror;
sampling?: 'all' | number;
dataURLOptions: DataURLOptions;
}

export class CanvasManagerNoop implements CanvasManagerInterface {
public reset() {
// noop
Expand Down Expand Up @@ -85,17 +97,7 @@ export class CanvasManager implements CanvasManagerInterface {
this.locked = false;
}

constructor(options: {
recordCanvas: boolean;
mutationCb: canvasMutationCallback;
win: IWindow;
blockClass: blockClass;
blockSelector: string | null;
unblockSelector: string | null;
mirror: Mirror;
sampling?: 'all' | number;
dataURLOptions: DataURLOptions;
}) {
constructor(options: CanvasManagerConstructorOptions) {
const {
sampling = 'all',
win,
Expand Down
11 changes: 10 additions & 1 deletion packages/rrweb/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ import type { IframeManagerInterface } from './record/iframe-manager';
import type { ShadowDomManagerInterface } from './record/shadow-dom-manager';
import type { Replayer } from './replay';
import type { RRNode } from '@sentry-internal/rrdom';
import type { CanvasManagerInterface } from './record/observers/canvas/canvas-manager';
import type {
CanvasManagerConstructorOptions,
CanvasManagerInterface,
} from './record/observers/canvas/canvas-manager';
import type { StylesheetManager } from './record/stylesheet-manager';
import type {
addedNodeMutation,
Expand Down Expand Up @@ -80,6 +83,12 @@ export type recordOptions<T> = {
keepIframeSrcFn?: KeepIframeSrcFn;
errorHandler?: ErrorHandler;
onMutation?: (mutations: MutationRecord[]) => boolean;
getCanvasManager?: (
options: Omit<
CanvasManagerConstructorOptions,
'mutationCb' | 'win' | 'mirror'
>,
) => CanvasManagerInterface;
};

export type observerParam = {
Expand Down
6 changes: 5 additions & 1 deletion packages/rrweb/test/record/cross-origin-iframes.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
} from '../utils';
import { unpack } from '../../src/packer/unpack';
import type * as http from 'http';
import type { CanvasManagerInterface } from '../../src/record/observers/canvas/canvas-manager';

interface ISuite {
code: string;
Expand All @@ -34,6 +35,7 @@ interface IWindow extends Window {
) => listenerHandler | undefined;
addCustomEvent<T>(tag: string, payload: T): void;
pack: (e: eventWithTime) => string;
getCanvasManager: () => CanvasManagerInterface;
};
emit: (e: eventWithTime) => undefined;
snapshots: eventWithTime[];
Expand All @@ -52,10 +54,12 @@ async function injectRecordScript(
options = options || {};
await frame.evaluate((options) => {
(window as unknown as IWindow).snapshots = [];
const { record, pack } = (window as unknown as IWindow).rrweb;
const { record, pack, getCanvasManager } = (window as unknown as IWindow)
.rrweb;
const config: recordOptions<eventWithTime> = {
recordCrossOriginIframes: true,
recordCanvas: true,
getCanvasManager,
emit(event) {
(window as unknown as IWindow).snapshots.push(event);
(window as unknown as IWindow).emit(event);
Expand Down
5 changes: 4 additions & 1 deletion packages/rrweb/test/record/webgl.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
waitForRAF,
} from '../utils';
import type { ICanvas } from '@sentry-internal/rrweb-snapshot';
import type { CanvasManagerInterface } from '../../src/record/observers/canvas/canvas-manager';

interface ISuite {
code: string;
Expand All @@ -30,6 +31,7 @@ interface IWindow extends Window {
options: recordOptions<eventWithTime>,
) => listenerHandler | undefined;
addCustomEvent<T>(tag: string, payload: T): void;
getCanvasManager: () => CanvasManagerInterface;
};
emit: (e: eventWithTime) => undefined;
}
Expand Down Expand Up @@ -64,9 +66,10 @@ const setup = function (
ctx.page.on('console', (msg) => console.log('PAGE LOG:', msg.text()));

await ctx.page.evaluate((canvasSample) => {
const { record } = (window as unknown as IWindow).rrweb;
const { record, getCanvasManager } = (window as unknown as IWindow).rrweb;
record({
recordCanvas: true,
getCanvasManager,
sampling: {
canvas: canvasSample,
},
Expand Down
5 changes: 4 additions & 1 deletion packages/rrweb/test/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,10 @@ export function generateRecordSnippet(options: recordOptions<eventWithTime>) {
recordCanvas: ${options.recordCanvas},
recordAfter: '${options.recordAfter || 'load'}',
inlineImages: ${options.inlineImages},
plugins: ${options.plugins}
plugins: ${options.plugins},
getCanvasManager: ${
options.recordCanvas ? 'rrweb.getCanvasManager' : 'undefined'
}
});
`;
}