Fix when print log string which contains special control characters in doric,cause native crash

doric-android/devkit/src/main/java/pub/doric/devkit/DoricDevMonitor.java

@@ -24,7 +24,6 @@ import java.io.StringWriter;
 
 import pub.doric.DoricContext;
 import pub.doric.IDoricMonitor;
-import pub.doric.utils.DoricLog;
 
 /**
  * @Description: pub.doric.devkit
@@ -55,15 +54,12 @@ public class DoricDevMonitor implements IDoricMonitor {
         String typeString = "DEFAULT";
         switch (type) {
             case Log.ERROR:
-                DoricLog.suffix_e("_js", message);
                 typeString = "ERROR";
                 break;
             case Log.WARN:
-                DoricLog.suffix_w("_js", message);
                 typeString = "WARN";
                 break;
             default:
-                DoricLog.suffix_d("_js", message);
                 break;
         }
         DoricDev.getInstance().sendDevCommand(

doric-android/doric/src/main/java/pub/doric/engine/DoricJSEngine.java

@@ -26,8 +26,6 @@ import android.os.Message;
 import android.text.TextUtils;
 import android.util.Log;
 
-import androidx.annotation.Nullable;
-
 import com.github.pengfeizhou.jscore.JSDecoder;
 import com.github.pengfeizhou.jscore.JSONBuilder;
 import com.github.pengfeizhou.jscore.JavaFunction;
@@ -39,6 +37,7 @@ import java.util.ArrayList;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import androidx.annotation.Nullable;
 import pub.doric.Doric;
 import pub.doric.DoricContext;
 import pub.doric.DoricContextManager;
@@ -343,13 +342,13 @@ public class DoricJSEngine implements Handler.Callback, DoricTimerExtension.Time
     public void onLog(int type, String message) {
         switch (type) {
             case Log.ERROR:
-                DoricLog.suffix_e("_js", "%s", message);
+                DoricLog.suffix_e("_js", message);
                 break;
             case Log.WARN:
-                DoricLog.suffix_w("_js", "%s", message);
+                DoricLog.suffix_w("_js", message);
                 break;
             default:
-                DoricLog.suffix_d("_js", "%s", message);
+                DoricLog.suffix_d("_js", message);
                 break;
         }
     }

doric-android/doric/src/main/java/pub/doric/utils/DoricLog.java

@@ -59,6 +59,9 @@ public class DoricLog {
     }
 
     private static String format(String message, Object... args) {
+        if (args.length > 0) {
             return String.format(message, args);
         }
+        return message;
+    }
 }

doric-demo/index.ts

@@ -1,7 +1,3 @@
 export default [
     'src/Counter',
-    'src/Snake',
-    'src/ComplicatedAnimations',
-    'src/.*Demo',
-    'src/Gobang',
 ]

doric-demo/src/Counter.ts

@@ -73,29 +73,12 @@ class CounterView extends ViewHolder {
 class CounterVM extends ViewModel<CountModel, CounterView> {
   onAttached(s: CountModel, vh: CounterView) {
     vh.counter.onClick = () => {
-      setInterval(() => {
-        // this.updateState(state => {
-        //   state.count++
-        // })
-        this.context.callNative("demo", "test2", "sdfsf")
-        //loge("setInterval")
-      }, 1)
+      this.updateState(state => state.count++)
     };
-    vh.number.onClick = () => {
-      setInterval(() => {
-        // this.updateState(state => {
-        //   state.count++
-        // })
-        this.context.callNative("demo", "test")
-      }, 1)
-    }
   }
   onBind(s: CountModel, vh: CounterView) {
     vh.number.text = `${s.count}`;
-    log(`Current count  is ${s.count}`);
-    logw(`Current count is ${s.count}`);
-    loge(`Current count is ${s.count}`);
-    console.log("This is from console.log")
+    console.error(` select * from production  %d where (title like '%s%' or rawHtml like '%s%') and id > 39  limit 15`)
   }
 }
 

doric-iOS/Pod/Classes/Engine/DoricJSEngine.m

@@ -41,7 +41,17 @@ - (void)onException:(NSException *)exception inContext:(DoricContext *)context {
 }
 
 - (void)onLog:(DoricLogType)type message:(NSString *)message {
-    DoricLog(message);
+    switch (type) {
+        case DoricLogTypeWarning:
+            DoricSafeLog([@"Doric-W: " stringByAppendingString:message]);
+            break;
+        case DoricLogTypeError:
+            DoricSafeLog([@"Doric-E: " stringByAppendingString:message]);
+            break;
+        default:
+            DoricSafeLog([@"Doric-D: " stringByAppendingString:message]);
+            break;
+    }
 }
 @end
 

doric-iOS/Pod/Classes/Util/DoricUtil.h

@@ -27,8 +27,11 @@
 extern "C"
 {
 #endif
+
 void DoricLog(NSString *_Nonnull format, ...);
 
+void DoricSafeLog(NSString *_Nonnull message);
+
 UIColor *_Nonnull DoricColor(NSNumber *_Nonnull number);
 
 NSNumber *_Nonnull DoricColorToNumber(UIColor *_Nonnull color);
@@ -50,6 +53,7 @@ void ShowToastInVC(UIViewController *_Nonnull vc, NSString *_Nonnull text, Doric
 UIImage *_Nonnull UIImageWithColor(UIColor *_Nonnull color);
 
 BOOL hasNotch(void);
+
 #ifdef __cplusplus
 }
 #endif

doric-iOS/Pod/Classes/Util/DoricUtil.m

@@ -31,6 +31,10 @@ void DoricLog(NSString *_Nonnull format, ...) {
     va_end(args);
 }
 
+void DoricSafeLog(NSString *_Nonnull message) {
+    NSLog(@"%@", message);
+}
+
 UIColor *DoricColor(NSNumber *number) {
     CGFloat r, g, b, a;
     long colorValue = [number longValue];

doric-js/bundle/doric-lib.es5.js

@@ -4360,7 +4360,7 @@ var __generator$1 = (undefined && undefined.__generator) || function (thisArg, b
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) { throw new TypeError("Generator is already executing."); }
-        while (g && (g = 0, op[0] && (_ = 0)), _) { try {
+        while (_) { try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) { return t; }
             if (y = 0, t) { op = [op[0] & 2, t.value]; }
             switch (op[0]) {
@@ -4589,7 +4589,7 @@ var __generator = (undefined && undefined.__generator) || function (thisArg, bod
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) { throw new TypeError("Generator is already executing."); }
-        while (g && (g = 0, op[0] && (_ = 0)), _) { try {
+        while (_) { try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) { return t; }
             if (y = 0, t) { op = [op[0] & 2, t.value]; }
             switch (op[0]) {

doric-js/bundle/doric-lib.js

@@ -161,24 +161,6 @@ function createRef() {
     return new Ref;
 }
 class View {
-    callback2Id(f) {
-        const id = uniqueId('Function');
-        this.callbacks.set(id, f);
-        return id;
-    }
-    id2Callback(id) {
-        let f = this.callbacks.get(id);
-        if (f === undefined) {
-            f = Reflect.get(this, id);
-        }
-        return f;
-    }
-    findViewByTag(tag) {
-        if (tag === this.tag) {
-            return this;
-        }
-        return undefined;
-    }
     constructor() {
         this.width = 0;
         this.height = 0;
@@ -210,6 +192,24 @@ class View {
             }
         });
     }
+    callback2Id(f) {
+        const id = uniqueId('Function');
+        this.callbacks.set(id, f);
+        return id;
+    }
+    id2Callback(id) {
+        let f = this.callbacks.get(id);
+        if (f === undefined) {
+            f = Reflect.get(this, id);
+        }
+        return f;
+    }
+    findViewByTag(tag) {
+        if (tag === this.tag) {
+            return this;
+        }
+        return undefined;
+    }
     /** Anchor start*/
     get left() {
         return this.x;

doric-js/bundle/doric-sandbox.js

@@ -1273,16 +1273,6 @@ var doric = (function (exports) {
         }
     }
     class Context {
-        hookBeforeNativeCall() {
-            if (this.entity && Reflect.has(this.entity, 'hookBeforeNativeCall')) {
-                Reflect.apply(Reflect.get(this.entity, 'hookBeforeNativeCall'), this.entity, []);
-            }
-        }
-        hookAfterNativeCall() {
-            if (this.entity && Reflect.has(this.entity, 'hookAfterNativeCall')) {
-                Reflect.apply(Reflect.get(this.entity, 'hookAfterNativeCall'), this.entity, []);
-            }
-        }
         constructor(id) {
             this.callbacks = new Map;
             this.classes = new Map;
@@ -1317,6 +1307,16 @@ var doric = (function (exports) {
                 }
             });
         }
+        hookBeforeNativeCall() {
+            if (this.entity && Reflect.has(this.entity, 'hookBeforeNativeCall')) {
+                Reflect.apply(Reflect.get(this.entity, 'hookBeforeNativeCall'), this.entity, []);
+            }
+        }
+        hookAfterNativeCall() {
+            if (this.entity && Reflect.has(this.entity, 'hookAfterNativeCall')) {
+                Reflect.apply(Reflect.get(this.entity, 'hookAfterNativeCall'), this.entity, []);
+            }
+        }
         callNative(namespace, method, args) {
             const callbackId = uniqueId('callback');
             return new Promise((resolve, reject) => {

doric-js/bundle/doric-vm.js

@@ -1284,16 +1284,6 @@ function jsCallReject(contextId, callbackId, args) {
     }
 }
 class Context {
-    hookBeforeNativeCall() {
-        if (this.entity && Reflect.has(this.entity, 'hookBeforeNativeCall')) {
-            Reflect.apply(Reflect.get(this.entity, 'hookBeforeNativeCall'), this.entity, []);
-        }
-    }
-    hookAfterNativeCall() {
-        if (this.entity && Reflect.has(this.entity, 'hookAfterNativeCall')) {
-            Reflect.apply(Reflect.get(this.entity, 'hookAfterNativeCall'), this.entity, []);
-        }
-    }
     constructor(id) {
         this.callbacks = new Map;
         this.classes = new Map;
@@ -1328,6 +1318,16 @@ class Context {
             }
         });
     }
+    hookBeforeNativeCall() {
+        if (this.entity && Reflect.has(this.entity, 'hookBeforeNativeCall')) {
+            Reflect.apply(Reflect.get(this.entity, 'hookBeforeNativeCall'), this.entity, []);
+        }
+    }
+    hookAfterNativeCall() {
+        if (this.entity && Reflect.has(this.entity, 'hookAfterNativeCall')) {
+            Reflect.apply(Reflect.get(this.entity, 'hookAfterNativeCall'), this.entity, []);
+        }
+    }
     callNative(namespace, method, args) {
         const callbackId = uniqueId('callback');
         return new Promise((resolve, reject) => {
@@ -1701,24 +1701,6 @@ function createRef() {
     return new Ref;
 }
 class View {
-    callback2Id(f) {
-        const id = uniqueId('Function');
-        this.callbacks.set(id, f);
-        return id;
-    }
-    id2Callback(id) {
-        let f = this.callbacks.get(id);
-        if (f === undefined) {
-            f = Reflect.get(this, id);
-        }
-        return f;
-    }
-    findViewByTag(tag) {
-        if (tag === this.tag) {
-            return this;
-        }
-        return undefined;
-    }
     constructor() {
         this.width = 0;
         this.height = 0;
@@ -1750,6 +1732,24 @@ class View {
             }
         });
     }
+    callback2Id(f) {
+        const id = uniqueId('Function');
+        this.callbacks.set(id, f);
+        return id;
+    }
+    id2Callback(id) {
+        let f = this.callbacks.get(id);
+        if (f === undefined) {
+            f = Reflect.get(this, id);
+        }
+        return f;
+    }
+    findViewByTag(tag) {
+        if (tag === this.tag) {
+            return this;
+        }
+        return undefined;
+    }
     /** Anchor start*/
     get left() {
         return this.x;

doric-js/index.d.ts

@@ -1,5 +1,5 @@
 declare module "doric" {
-	// Generated by dts-bundle-generator v6.13.0
+	// Generated by dts-bundle-generator v6.12.0
 	
 	export interface Modeling {
 		toModel(): Model;

doric-js/lib/index.web.d.ts

@@ -4,8 +4,8 @@ declare module NativeClient {
     function callNative(name: string, args: string): string;
     function fetchArrayBuffer(id: string): string;
 }
-type RawValue = number | string | boolean | object | undefined | ArrayBuffer;
-type WrappedValue = {
+declare type RawValue = number | string | boolean | object | undefined | ArrayBuffer;
+declare type WrappedValue = {
     type: "number" | "string" | "boolean" | "object" | "array" | "null" | "arrayBuffer";
     value: RawValue;
 };

doric-js/lib/src/pattern/mvvm.d.ts

@@ -5,7 +5,7 @@ import { ClassType } from "../util/types";
 export declare abstract class ViewHolder {
     abstract build(root: Group): void;
 }
-export type Setter<M> = (state: M) => void;
+export declare type Setter<M> = (state: M) => void;
 export declare abstract class ViewModel<M extends Object, V extends ViewHolder> {
     context: BridgeContext;
     private state;

doric-js/lib/src/pattern/provider.d.ts

@@ -1,5 +1,5 @@
-export type Observer<T> = (v: T) => void;
-export type Updater<T> = (v: T) => T;
+export declare type Observer<T> = (v: T) => void;
+export declare type Updater<T> = (v: T) => T;
 export interface IObservable<T> {
     addObserver(observer: Observer<T | undefined>): void;
     removeObserver(observer: Observer<T | undefined>): void;

doric-js/lib/src/runtime/global.d.ts

@@ -1,6 +1,6 @@
 import { Panel } from "../ui/panel";
 import { ClassType } from "../util/types";
-export type BridgeContext = {
+export declare type BridgeContext = {
     /**
      * The identify of current context
      */

doric-js/lib/src/runtime/sandbox.d.ts

@@ -23,9 +23,9 @@ export declare function jsObtainContext(id: string): Context | undefined;
 export declare function jsReleaseContext(id: string): void;
 export declare function __require__(name: string): any;
 export declare function jsRegisterModule(name: string, moduleObject: any): void;
-export declare function jsCallEntityMethod(contextId: string, methodName: string, args?: any): unknown;
-export declare function pureCallEntityMethod(contextId: string, methodName: string, args?: any): unknown;
-type ClassType<T> = new (...args: any) => T;
+export declare function jsCallEntityMethod(contextId: string, methodName: string, args?: any): any;
+export declare function pureCallEntityMethod(contextId: string, methodName: string, args?: any): any;
+declare type ClassType<T> = new (...args: any) => T;
 export declare function jsObtainEntry(contextId: string): () => ClassType<object> | ((constructor: ClassType<object>) => ClassType<object>);
 export declare function jsCallbackTimer(timerId: number): void;
 export declare function jsHookAfterNativeCall(): void;

doric-js/lib/src/runtime/sandbox.js

@@ -71,16 +71,6 @@ export function jsCallReject(contextId, callbackId, args) {
     }
 }
 export class Context {
-    hookBeforeNativeCall() {
-        if (this.entity && Reflect.has(this.entity, 'hookBeforeNativeCall')) {
-            Reflect.apply(Reflect.get(this.entity, 'hookBeforeNativeCall'), this.entity, []);
-        }
-    }
-    hookAfterNativeCall() {
-        if (this.entity && Reflect.has(this.entity, 'hookAfterNativeCall')) {
-            Reflect.apply(Reflect.get(this.entity, 'hookAfterNativeCall'), this.entity, []);
-        }
-    }
     constructor(id) {
         this.callbacks = new Map;
         this.classes = new Map;
@@ -115,6 +105,16 @@ export class Context {
             }
         });
     }
+    hookBeforeNativeCall() {
+        if (this.entity && Reflect.has(this.entity, 'hookBeforeNativeCall')) {
+            Reflect.apply(Reflect.get(this.entity, 'hookBeforeNativeCall'), this.entity, []);
+        }
+    }
+    hookAfterNativeCall() {
+        if (this.entity && Reflect.has(this.entity, 'hookAfterNativeCall')) {
+            Reflect.apply(Reflect.get(this.entity, 'hookAfterNativeCall'), this.entity, []);
+        }
+    }
     callNative(namespace, method, args) {
         const callbackId = uniqueId('callback');
         return new Promise((resolve, reject) => {

doric-js/lib/src/ui/animation.d.ts

@@ -1,6 +1,6 @@
 import { Color } from "../util/color";
 import { Modeling, Model } from "../util/types";
-export type AnimatedKey = "translationX" | "translationY" | "scaleX" | "scaleY" | "rotation" | "pivotX" | "pivotY" | "rotationX" | "rotationY" | "backgroundColor" | "alpha";
+export declare type AnimatedKey = "translationX" | "translationY" | "scaleX" | "scaleY" | "rotation" | "pivotX" | "pivotY" | "rotationX" | "rotationY" | "backgroundColor" | "alpha";
 export declare enum RepeatMode {
     RESTART = 1,
     REVERSE = 2

doric-js/lib/src/ui/view.d.ts

@@ -7,14 +7,14 @@ import { FlexConfig } from "../util/flexbox";
 export declare function Property(target: Object, propKey: string): void;
 export declare function InconsistProperty(target: Object, propKey: string): void;
 export declare function ViewComponent(constructor: ClassType<any>): void;
-export type NativeViewModel = {
+export declare type NativeViewModel = {
     id: string;
     type: string;
     props: {
         [index: string]: Model;
     };
 };
-type RefType<T> = T extends Ref<infer R> ? R : never;
+declare type RefType<T> = T extends Ref<infer R> ? R : never;
 export declare class Ref<T extends View> {
     private view?;
     set current(v: T);
@@ -151,8 +151,8 @@ export declare abstract class Superview extends View {
     clean(): void;
     toModel(): NativeViewModel;
 }
-export type ViewArray = View[];
-export type ViewFragment = View | ViewArray | undefined | null;
+export declare type ViewArray = View[];
+export declare type ViewFragment = View | ViewArray | undefined | null;
 export declare abstract class Group extends Superview implements JSX.ElementChildrenAttribute {
     padding?: {
         left?: number;

doric-js/lib/src/ui/view.js

@@ -43,24 +43,6 @@ export function createRef() {
     return new Ref;
 }
 export class View {
-    callback2Id(f) {
-        const id = uniqueId('Function');
-        this.callbacks.set(id, f);
-        return id;
-    }
-    id2Callback(id) {
-        let f = this.callbacks.get(id);
-        if (f === undefined) {
-            f = Reflect.get(this, id);
-        }
-        return f;
-    }
-    findViewByTag(tag) {
-        if (tag === this.tag) {
-            return this;
-        }
-        return undefined;
-    }
     constructor() {
         this.width = 0;
         this.height = 0;
@@ -92,6 +74,24 @@ export class View {
             }
         });
     }
+    callback2Id(f) {
+        const id = uniqueId('Function');
+        this.callbacks.set(id, f);
+        return id;
+    }
+    id2Callback(id) {
+        let f = this.callbacks.get(id);
+        if (f === undefined) {
+            f = Reflect.get(this, id);
+        }
+        return f;
+    }
+    findViewByTag(tag) {
+        if (tag === this.tag) {
+            return this;
+        }
+        return undefined;
+    }
     /** Anchor start*/
     get left() {
         return this.x;

doric-js/lib/src/util/flexbox.d.ts

@@ -64,7 +64,7 @@ export declare enum Display {
     FLEX = 0,
     NONE = 1
 }
-export type FlexValue = FlexTypedValue | number;
+export declare type FlexValue = FlexTypedValue | number;
 export interface FlexConfig {
     direction?: Direction;
     flexDirection?: FlexDirection;

doric-js/lib/src/util/types.d.ts

@@ -2,11 +2,11 @@ export interface Modeling {
     toModel(): Model;
 }
 export declare function obj2Model(obj: Model, convertor: (v: Function) => string): Model;
-type _M = string | number | boolean | Modeling | {
+declare type _M = string | number | boolean | Modeling | {
     [index: string]: Model;
 } | undefined;
-export type Model = _M | Array<_M>;
-export type Binder<T> = (v: T) => void;
+export declare type Model = _M | Array<_M>;
+export declare type Binder<T> = (v: T) => void;
 export declare class Mutable<T> {
     private val;
     private binders;
@@ -16,5 +16,5 @@ export declare class Mutable<T> {
     bind(binder: Binder<T>): void;
     static of<E>(v: E): Mutable<E>;
 }
-export type ClassType<T> = new (...args: any) => T;
+export declare type ClassType<T> = new (...args: any) => T;
 export {};

doric-web/dist/index.js

@@ -1278,16 +1278,6 @@ var doric = (function (exports) {
         }
     }
     class Context {
-        hookBeforeNativeCall() {
-            if (this.entity && Reflect.has(this.entity, 'hookBeforeNativeCall')) {
-                Reflect.apply(Reflect.get(this.entity, 'hookBeforeNativeCall'), this.entity, []);
-            }
-        }
-        hookAfterNativeCall() {
-            if (this.entity && Reflect.has(this.entity, 'hookAfterNativeCall')) {
-                Reflect.apply(Reflect.get(this.entity, 'hookAfterNativeCall'), this.entity, []);
-            }
-        }
         constructor(id) {
             this.callbacks = new Map;
             this.classes = new Map;
@@ -1322,6 +1312,16 @@ var doric = (function (exports) {
                 }
             });
         }
+        hookBeforeNativeCall() {
+            if (this.entity && Reflect.has(this.entity, 'hookBeforeNativeCall')) {
+                Reflect.apply(Reflect.get(this.entity, 'hookBeforeNativeCall'), this.entity, []);
+            }
+        }
+        hookAfterNativeCall() {
+            if (this.entity && Reflect.has(this.entity, 'hookAfterNativeCall')) {
+                Reflect.apply(Reflect.get(this.entity, 'hookAfterNativeCall'), this.entity, []);
+            }
+        }
         callNative(namespace, method, args) {
             const callbackId = uniqueId('callback');
             return new Promise((resolve, reject) => {
@@ -1776,24 +1776,6 @@ function createRef() {
     return new Ref;
 }
 class View {
-    callback2Id(f) {
-        const id = uniqueId('Function');
-        this.callbacks.set(id, f);
-        return id;
-    }
-    id2Callback(id) {
-        let f = this.callbacks.get(id);
-        if (f === undefined) {
-            f = Reflect.get(this, id);
-        }
-        return f;
-    }
-    findViewByTag(tag) {
-        if (tag === this.tag) {
-            return this;
-        }
-        return undefined;
-    }
     constructor() {
         this.width = 0;
         this.height = 0;
@@ -1825,6 +1807,24 @@ class View {
             }
         });
     }
+    callback2Id(f) {
+        const id = uniqueId('Function');
+        this.callbacks.set(id, f);
+        return id;
+    }
+    id2Callback(id) {
+        let f = this.callbacks.get(id);
+        if (f === undefined) {
+            f = Reflect.get(this, id);
+        }
+        return f;
+    }
+    findViewByTag(tag) {
+        if (tag === this.tag) {
+            return this;
+        }
+        return undefined;
+    }
     /** Anchor start*/
     get left() {
         return this.x;