Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vue 3 infinite log warning with enumerating ownKeys #4573

Closed
wants to merge 14 commits into from
Closed

Vue 3 infinite log warning with enumerating ownKeys #4573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b48b256
Merge pull request #1 from ionic-team/main
bazuka5801 Apr 27, 2021
0cc9970
fix: vue3 support #4506
bazuka5801 Apr 27, 2021
4e7c18e
Merge branch 'main' into main
bazuka5801 Apr 28, 2021
f952fb7
Merge branch 'main' into main
bazuka5801 Apr 29, 2021
0cfd204
Merge branch 'main' into main
bazuka5801 Apr 29, 2021
3fb8204
fix: additional JSON.stringify lines
bazuka5801 May 6, 2021
d7870e0
Merge branch 'main' into main
bazuka5801 May 6, 2021
43b5121
fix: safeStringify method context
bazuka5801 May 6, 2021
6749464
fix: vue3 proxy logging support
bazuka5801 May 9, 2021
de66fd8
Merge branch 'main' of https://github.com/ionic-team/capacitor into main
bazuka5801 May 9, 2021
8eca451
update
bazuka5801 May 15, 2021
228c0ed
worked log
bazuka5801 May 15, 2021
5975e36
Delete yarn.lock
bazuka5801 May 15, 2021
968db70
Merge branch 'main' into main
bazuka5801 May 27, 2021
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
54 changes: 51 additions & 3 deletions android/capacitor/src/main/assets/native-bridge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,54 @@ const nativeBridge = (function (exports) {
win.Capacitor = cap;
win.Ionic.WebView = IonicWebView;
};
const shouldBeCloneable = (o) => {
const type = typeof o;
return (type === "undefined" ||
o === null ||
type === "boolean" ||
type === "number" ||
type === "string" ||
o instanceof Date ||
o instanceof RegExp ||
o instanceof Blob ||
o instanceof File ||
o instanceof FileList ||
o instanceof ArrayBuffer ||
o instanceof Array ||
o instanceof Map ||
o instanceof Set);
};
const isCloneable = (obj) => {
try {
postMessage(obj, "*");
}
catch (error) {
if ((error === null || error === void 0 ? void 0 : error.code) === 25)
return false; // DATA_CLONE_ERR
}
return true;
};
// https://stackoverflow.com/a/62544968
const isProxy = (obj) => {
const _shouldBeCloneable = shouldBeCloneable(obj);
const _isCloneable = isCloneable(obj);
if (_isCloneable) {
return false;
}
if (!_shouldBeCloneable) {
return "maybe";
}
return _shouldBeCloneable && !_isCloneable;
};
const safeStringify = (value) => {
if (isProxy(value)) {
return "proxy";
}
const seen = new Set();
return JSON.stringify(value, (_k, v) => {
if (isProxy(v)) {
return "proxy";
}
if (seen.has(v)) {
return '...';
}
Expand Down Expand Up @@ -242,6 +287,9 @@ const nativeBridge = (function (exports) {
typeof c.dir === 'function');
};
const serializeConsoleMessage = (msg) => {
if (isProxy(msg)) {
return "proxy";
}
if (typeof msg === 'object') {
try {
msg = safeStringify(msg);
Expand All @@ -258,12 +306,12 @@ const nativeBridge = (function (exports) {
if (win.console && isIos) {
for (const logfn of BRIDGED_CONSOLE_METHODS) {
win.console[logfn] = (...args) => {
const msgs = [...args];
originalConsole[logfn](...msgs);
// eslint-disable-next-line prefer-spread
originalConsole[logfn].apply(originalConsole, args);
try {
cap.toNative('Console', 'log', {
level: logfn,
message: msgs.map(serializeConsoleMessage).join(' '),
message: args.map(serializeConsoleMessage).join(' '),
});
}
catch (e) {
Expand Down
59 changes: 55 additions & 4 deletions core/native-bridge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,59 @@ const initBridge = (w: any): void => {
win.Ionic.WebView = IonicWebView;
};

const shouldBeCloneable = (o: any): boolean => {
const type = typeof o;
return (
type === "undefined" ||
o === null ||
type === "boolean" ||
type === "number" ||
type === "string" ||
o instanceof Date ||
o instanceof RegExp ||
o instanceof Blob ||
o instanceof File ||
o instanceof FileList ||
o instanceof ArrayBuffer ||
o instanceof Array ||
o instanceof Map ||
o instanceof Set
);
}

const isCloneable = (obj: any): boolean => {
try {
postMessage(obj, "*");
} catch (error) {
if (error?.code === 25) return false; // DATA_CLONE_ERR
}

return true;
}

// https://stackoverflow.com/a/62544968
const isProxy = (obj: any): string | boolean => {
const _shouldBeCloneable = shouldBeCloneable(obj);
const _isCloneable = isCloneable(obj);

if(_isCloneable) {
return false;
}

if(!_shouldBeCloneable) {
return "maybe";
}

return _shouldBeCloneable && !_isCloneable;
}

const safeStringify = (value: any): string => {
if (isProxy(value)) { return "proxy" }
const seen = new Set();
return JSON.stringify(value, (_k, v) => {
if (isProxy(v)) {
return "proxy"
}
if (seen.has(v)) {
return '...';
}
Expand Down Expand Up @@ -286,8 +336,9 @@ const initBridge = (w: any): void => {
typeof c.dir === 'function'
);
};

const serializeConsoleMessage = (msg: any): string => {
if (isProxy(msg)) { return "proxy" }
if (typeof msg === 'object') {
try {
msg = safeStringify(msg);
Expand All @@ -306,14 +357,14 @@ const initBridge = (w: any): void => {
if (win.console && isIos) {
for (const logfn of BRIDGED_CONSOLE_METHODS) {
win.console[logfn] = (...args: any[]) => {
const msgs = [...args];

originalConsole[logfn](...msgs);
// eslint-disable-next-line prefer-spread
originalConsole[logfn].apply(originalConsole, args);

try {
cap.toNative('Console', 'log', {
level: logfn,
message: msgs.map(serializeConsoleMessage).join(' '),
message: args.map(serializeConsoleMessage).join(' '),
});
} catch (e) {
// error converting/posting console messages
Expand Down
54 changes: 51 additions & 3 deletions ios/Capacitor/Capacitor/assets/native-bridge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,54 @@ const nativeBridge = (function (exports) {
win.Capacitor = cap;
win.Ionic.WebView = IonicWebView;
};
const shouldBeCloneable = (o) => {
const type = typeof o;
return (type === "undefined" ||
o === null ||
type === "boolean" ||
type === "number" ||
type === "string" ||
o instanceof Date ||
o instanceof RegExp ||
o instanceof Blob ||
o instanceof File ||
o instanceof FileList ||
o instanceof ArrayBuffer ||
o instanceof Array ||
o instanceof Map ||
o instanceof Set);
};
const isCloneable = (obj) => {
try {
postMessage(obj, "*");
}
catch (error) {
if ((error === null || error === void 0 ? void 0 : error.code) === 25)
return false; // DATA_CLONE_ERR
}
return true;
};
// https://stackoverflow.com/a/62544968
const isProxy = (obj) => {
const _shouldBeCloneable = shouldBeCloneable(obj);
const _isCloneable = isCloneable(obj);
if (_isCloneable) {
return false;
}
if (!_shouldBeCloneable) {
return "maybe";
}
return _shouldBeCloneable && !_isCloneable;
};
const safeStringify = (value) => {
if (isProxy(value)) {
return "proxy";
}
const seen = new Set();
return JSON.stringify(value, (_k, v) => {
if (isProxy(v)) {
return "proxy";
}
if (seen.has(v)) {
return '...';
}
Expand Down Expand Up @@ -242,6 +287,9 @@ const nativeBridge = (function (exports) {
typeof c.dir === 'function');
};
const serializeConsoleMessage = (msg) => {
if (isProxy(msg)) {
return "proxy";
}
if (typeof msg === 'object') {
try {
msg = safeStringify(msg);
Expand All @@ -258,12 +306,12 @@ const nativeBridge = (function (exports) {
if (win.console && isIos) {
for (const logfn of BRIDGED_CONSOLE_METHODS) {
win.console[logfn] = (...args) => {
const msgs = [...args];
originalConsole[logfn](...msgs);
// eslint-disable-next-line prefer-spread
originalConsole[logfn].apply(originalConsole, args);
try {
cap.toNative('Console', 'log', {
level: logfn,
message: msgs.map(serializeConsoleMessage).join(' '),
message: args.map(serializeConsoleMessage).join(' '),
});
}
catch (e) {
Expand Down