tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Add SSR mode and test on Android

Browse Source
This commit is contained in:
pengfei.zhou
2022-11-02 14:29:07 +08:00
committed by osborn
parent 5782a0d161
commit c3b9638434
18 changed files with 313 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
doric-js/bundle/doric-sandbox.es5.js
View File

@@ -17414,9 +17414,10 @@ var doric = (function (exports) {
};
}
var global$2 = Function('return this')();
if (Environment.platform === 'Android'
|| Environment.platform === 'iOS'
|| Environment.platform === 'Qt') {
if (global$2.Envrionemnt &&
(Environment.platform === 'Android'
|| Environment.platform === 'iOS'
|| Environment.platform === 'Qt')) {
Reflect.set(global$2, "console", {
warn: logw,
error: loge,

7
doric-js/bundle/doric-sandbox.js
View File

@@ -1478,9 +1478,10 @@ var doric = (function (exports) {
};
}
const global$1 = Function('return this')();
if (Environment.platform === 'Android'
|| Environment.platform === 'iOS'
|| Environment.platform === 'Qt') {
if (global$1.Environment
&& (Environment.platform === 'Android'
|| Environment.platform === 'iOS'
|| Environment.platform === 'Qt')) {
Reflect.set(global$1, "console", {
warn: logw,
error: loge,

61
doric-js/bundle/doric-vm.js
View File

@@ -4,11 +4,13 @@ Object.defineProperty(exports, '__esModule', { value: true });
var WebSocket = require('ws');
var path = require('path');
var fs = require('fs');
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
var WebSocket__default = /*#__PURE__*/_interopDefaultLegacy(WebSocket);
var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
/*
* Copyright [2019] [Doric.Pub]
@@ -1487,9 +1489,10 @@ function jsObtainEntry(contextId) {
};
}
const global$2 = Function('return this')();
if (Environment.platform === 'Android'
|| Environment.platform === 'iOS'
|| Environment.platform === 'Qt') {
if (global$2.Environment
&& (Environment.platform === 'Android'
|| Environment.platform === 'iOS'
|| Environment.platform === 'Qt')) {
Reflect.set(global$2, "console", {
warn: logw,
error: loge,
@@ -5349,6 +5352,8 @@ var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _argume
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
//Is in SSR Build Mode
const inSSRBuild = process.env["SSR_BUILD"] === "1";
let contextId = undefined;
let global$1 = new Function('return this')();
const originSetTimeout = global$1.setTimeout;
@@ -5498,15 +5503,34 @@ global$1.Entry = function () {
});
if (entryHooks.length <= 1) {
const source = path__default["default"].basename(jsFile);
console.log(`Debugging ${source}`);
initNativeEnvironment(source).then(ret => {
contextId = ret;
console.log("debugging context id: " + contextId);
if (inSSRBuild) {
console.log(`SSR build ${source} start`);
contextId = "SSR_CONTEXT";
const realContext = jsObtainContext(contextId);
global$1.context.id = contextId;
global$1.context = realContext;
entryHooks.forEach(e => e(contextId));
});
const panel = realContext === null || realContext === void 0 ? void 0 : realContext.entity;
panel.getRootView().apply({
layoutConfig: layoutConfig().most()
});
panel.onCreate();
panel.onShow();
panel.build(panel.getRootView());
fs__default["default"].writeFileSync(jsFile.replace(".js", ".ssr.json"), JSON.stringify(panel.getRootView().toModel()));
console.log(`SSR build ${source} end`);
}
else {
console.log(`Debugging ${source}`);
initNativeEnvironment(source).then(ret => {
contextId = ret;
console.log("debugging context id: " + contextId);
const realContext = jsObtainContext(contextId);
global$1.context.id = contextId;
global$1.context = realContext;
entryHooks.forEach(e => e(contextId));
});
}
return arguments[0];
}
}
@@ -5535,24 +5559,41 @@ global$1.nativeLog = (type, msg) => {
}
};
global$1.nativeRequire = () => {
if (inSSRBuild) {
console.error("Do not support nativeRequire in ssr mode", new Error().stack);
return false;
}
console.error("nativeRequire", new Error().stack);
console.error("Do not call here in debugging");
return false;
};
global$1.nativeBridge = () => {
if (inSSRBuild) {
console.error("Do not support nativeBridge in ssr mode", new Error().stack);
return false;
}
console.error("nativeBridge", new Error().stack);
console.error("Do not call here in debugging");
return false;
};
global$1.Environment = new Proxy({}, {
get: (target, p, receiver) => {
if (inSSRBuild) {
console.error("Do not support Environment in ssr mode", new Error().stack);
return undefined;
}
console.error("Environment Getter", new Error().stack);
console.error("Do not call here in debugging");
return undefined;
},
set: (target, p, v, receiver) => {
console.error("Environment Setter", new Error().stack);
console.error("Do not call here in debugging");
if (inSSRBuild) {
console.error("Do not support Environment in ssr mode", new Error().stack);
}
else {
console.error("Environment Setter", new Error().stack);
console.error("Do not call here in debugging");
}
return Reflect.set(target, p, v, receiver);
}
});

55
doric-js/index.debug.ts
View File

@@ -17,6 +17,10 @@ import * as doric from './src/runtime/sandbox'
import WebSocket from "ws"
import path from 'path'
import { Panel } from './src/ui/panel';
import { layoutConfig } from "./src/util/layoutconfig";
import fs from "fs";
//Is in SSR Build Mode
const inSSRBuild = process.env["SSR_BUILD"] === "1";
type MSG = {
type: "D2C" | "C2D" | "C2S" | "D2S" | "S2C" | "S2D",
@@ -164,15 +168,34 @@ global.Entry = function () {
})
if (entryHooks.length <= 1) {
const source = path.basename(jsFile)
console.log(`Debugging ${source}`)
initNativeEnvironment(source).then(ret => {
contextId = ret;
console.log("debugging context id: " + contextId);
if (inSSRBuild) {
console.log(`SSR build ${source} start`)
contextId = "SSR_CONTEXT";
const realContext = doric.jsObtainContext(contextId);
global.context.id = contextId;
global.context = realContext;
entryHooks.forEach(e => e(contextId))
});
entryHooks.forEach(e => e(contextId));
const panel = realContext?.entity as Panel;
panel.getRootView().apply({
layoutConfig: layoutConfig().most()
});
panel.onCreate();
panel.onShow();
panel.build(panel.getRootView());
fs.writeFileSync(jsFile.replace(".js", ".ssr.json"),
JSON.stringify(panel.getRootView().toModel()));
console.log(`SSR build ${source} end`);
} else {
console.log(`Debugging ${source}`)
initNativeEnvironment(source).then(ret => {
contextId = ret;
console.log("debugging context id: " + contextId);
const realContext = doric.jsObtainContext(contextId);
global.context.id = contextId;
global.context = realContext;
entryHooks.forEach(e => e(contextId));
});
}
return arguments[0];
}
}
@@ -206,12 +229,20 @@ global.nativeLog = (type: string, msg: string) => {
}
global.nativeRequire = () => {
if (inSSRBuild) {
console.error("Do not support nativeRequire in ssr mode", new Error().stack)
return false;
}
console.error("nativeRequire", new Error().stack);
console.error("Do not call here in debugging");
return false;
}
global.nativeBridge = () => {
if (inSSRBuild) {
console.error("Do not support nativeBridge in ssr mode", new Error().stack)
return false;
}
console.error("nativeBridge", new Error().stack);
console.error("Do not call here in debugging");
return false;
@@ -219,13 +250,21 @@ global.nativeBridge = () => {
global.Environment = new Proxy({}, {
get: (target, p, receiver) => {
if (inSSRBuild) {
console.error("Do not support Environment in ssr mode", new Error().stack)
return undefined;
}
console.error("Environment Getter", new Error().stack);
console.error("Do not call here in debugging");
return undefined
},
set: (target, p, v, receiver) => {
console.error("Environment Setter", new Error().stack)
console.error("Do not call here in debugging");
if (inSSRBuild) {
console.error("Do not support Environment in ssr mode", new Error().stack)
} else {
console.error("Environment Setter", new Error().stack)
console.error("Do not call here in debugging");
}
return Reflect.set(target, p, v, receiver);
}
})

54
doric-js/lib/index.debug.js
View File

@@ -26,6 +26,10 @@ import * as doric from './src/runtime/sandbox';
import WebSocket from "ws";
import path from 'path';
import { Panel } from './src/ui/panel';
import { layoutConfig } from "./src/util/layoutconfig";
import fs from "fs";
//Is in SSR Build Mode
const inSSRBuild = process.env["SSR_BUILD"] === "1";
let contextId = undefined;
let global = new Function('return this')();
const originSetTimeout = global.setTimeout;
@@ -175,15 +179,34 @@ global.Entry = function () {
});
if (entryHooks.length <= 1) {
const source = path.basename(jsFile);
console.log(`Debugging ${source}`);
initNativeEnvironment(source).then(ret => {
contextId = ret;
console.log("debugging context id: " + contextId);
if (inSSRBuild) {
console.log(`SSR build ${source} start`);
contextId = "SSR_CONTEXT";
const realContext = doric.jsObtainContext(contextId);
global.context.id = contextId;
global.context = realContext;
entryHooks.forEach(e => e(contextId));
});
const panel = realContext === null || realContext === void 0 ? void 0 : realContext.entity;
panel.getRootView().apply({
layoutConfig: layoutConfig().most()
});
panel.onCreate();
panel.onShow();
panel.build(panel.getRootView());
fs.writeFileSync(jsFile.replace(".js", ".ssr.json"), JSON.stringify(panel.getRootView().toModel()));
console.log(`SSR build ${source} end`);
}
else {
console.log(`Debugging ${source}`);
initNativeEnvironment(source).then(ret => {
contextId = ret;
console.log("debugging context id: " + contextId);
const realContext = doric.jsObtainContext(contextId);
global.context.id = contextId;
global.context = realContext;
entryHooks.forEach(e => e(contextId));
});
}
return arguments[0];
}
}
@@ -212,24 +235,41 @@ global.nativeLog = (type, msg) => {
}
};
global.nativeRequire = () => {
if (inSSRBuild) {
console.error("Do not support nativeRequire in ssr mode", new Error().stack);
return false;
}
console.error("nativeRequire", new Error().stack);
console.error("Do not call here in debugging");
return false;
};
global.nativeBridge = () => {
if (inSSRBuild) {
console.error("Do not support nativeBridge in ssr mode", new Error().stack);
return false;
}
console.error("nativeBridge", new Error().stack);
console.error("Do not call here in debugging");
return false;
};
global.Environment = new Proxy({}, {
get: (target, p, receiver) => {
if (inSSRBuild) {
console.error("Do not support Environment in ssr mode", new Error().stack);
return undefined;
}
console.error("Environment Getter", new Error().stack);
console.error("Do not call here in debugging");
return undefined;
},
set: (target, p, v, receiver) => {
console.error("Environment Setter", new Error().stack);
console.error("Do not call here in debugging");
if (inSSRBuild) {
console.error("Do not support Environment in ssr mode", new Error().stack);
}
else {
console.error("Environment Setter", new Error().stack);
console.error("Do not call here in debugging");
}
return Reflect.set(target, p, v, receiver);
}
});

7
doric-js/lib/src/runtime/sandbox.js
View File

@@ -276,9 +276,10 @@ export function jsObtainEntry(contextId) {
};
}
const global = Function('return this')();
if (Environment.platform === 'Android'
|| Environment.platform === 'iOS'
|| Environment.platform === 'Qt') {
if (global.Environment
&& (Environment.platform === 'Android'
|| Environment.platform === 'iOS'
|| Environment.platform === 'Qt')) {
Reflect.set(global, "console", {
warn: logw,
error: loge,

7
doric-js/src/runtime/sandbox.es5.ts
View File

@@ -295,9 +295,10 @@ export function jsObtainEntry(contextId: string) {
}
const global = Function('return this')()
if (Environment.platform === 'Android'
|| Environment.platform === 'iOS'
|| Environment.platform === 'Qt') {
if (global.Envrionemnt &&
(Environment.platform === 'Android'
|| Environment.platform === 'iOS'
|| Environment.platform === 'Qt')) {
Reflect.set(global, "console", {
warn: logw,
error: loge,

7
doric-js/src/runtime/sandbox.ts
View File

@@ -334,9 +334,10 @@ export function jsObtainEntry(contextId: string) {
}
const global = Function('return this')()
if (Environment.platform === 'Android'
|| Environment.platform === 'iOS'
|| Environment.platform === 'Qt') {
if (global.Environment
&& (Environment.platform === 'Android'
|| Environment.platform === 'iOS'
|| Environment.platform === 'Qt')) {
Reflect.set(global, "console", {
warn: logw,
error: loge,