diff --git a/pal/env/nodejs/env.ts b/pal/env/nodejs/env.ts index 634f920c4d..c594041645 100644 --- a/pal/env/nodejs/env.ts +++ b/pal/env/nodejs/env.ts @@ -33,9 +33,8 @@ export function findCanvas (): { frame: HTMLDivElement, container: HTMLDivElemen } export function loadJsFile (path: string): Promise { - return new Promise((resolve, reject) => { - reject("not supported"); - }); + // eslint-disable-next-line import/no-dynamic-require + return globalThis.nodeEnv.require(`${path}`); } checkPalIntegrity(withImpl()); diff --git a/pal/screen-adapter/nodejs/screen-adapter.ts b/pal/screen-adapter/nodejs/screen-adapter.ts index 4f582daee1..b51384dcc4 100644 --- a/pal/screen-adapter/nodejs/screen-adapter.ts +++ b/pal/screen-adapter/nodejs/screen-adapter.ts @@ -53,17 +53,9 @@ export interface IScreenOptions { isHeadlessMode: boolean; } -// these value is defined in the native layer -const orientationMap: Record = { - 0: Orientation.PORTRAIT, - '-90': Orientation.LANDSCAPE_LEFT, - 90: Orientation.LANDSCAPE_RIGHT, - 180: Orientation.PORTRAIT_UPSIDE_DOWN, -}; - class ScreenAdapter extends EventTarget { public isFrameRotated = false; - public handleResizeEvent = true; + public handleResizeEvent = false; public get supportFullScreen (): boolean { return false; @@ -77,8 +69,10 @@ class ScreenAdapter extends EventTarget { } public get windowSize (): Size { + // Simulate fake window size return new Size(960, 640); } + public set windowSize (size: Size) { warn('Setting window size is not supported yet.'); } @@ -88,9 +82,11 @@ class ScreenAdapter extends EventTarget { const resolutionScale = this.resolutionScale; return new Size(windowSize.width * resolutionScale, windowSize.height * resolutionScale); } + public get resolutionScale (): number { return this._resolutionScale; } + public set resolutionScale (v: number) { if (v === this._resolutionScale) { return; @@ -99,15 +95,13 @@ class ScreenAdapter extends EventTarget { } public get orientation (): Orientation { - warn('get orientation is not supported yet.'); - return Orientation.LANDSCAPE; + return Orientation.PORTRAIT; } public set orientation (value: Orientation) { warnID(1221); } public get safeAreaEdge (): SafeAreaEdge { - warn('get safeAreaEdge is not supported yet.'); return { top: 0, bottom: 0, diff --git a/pal/system-info/enum-type/platform.ts b/pal/system-info/enum-type/platform.ts index 113dae5d96..d9f30998b2 100644 --- a/pal/system-info/enum-type/platform.ts +++ b/pal/system-info/enum-type/platform.ts @@ -27,6 +27,7 @@ export enum Platform { // Web Based EDITOR_PAGE = 'EDITOR_PAGE', EDITOR_CORE = 'EDITOR_CORE', + NODEJS_PAGE = 'NODEJS_PAGE', MOBILE_BROWSER = 'MOBILE_BROWSER', DESKTOP_BROWSER = 'DESKTOP_BROWSER', // Native diff --git a/pal/system-info/nodejs/system-info.ts b/pal/system-info/nodejs/system-info.ts index 924978c28c..d4b42eccbb 100644 --- a/pal/system-info/nodejs/system-info.ts +++ b/pal/system-info/nodejs/system-info.ts @@ -21,8 +21,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - import { DEBUG } from 'internal:constants'; +import { IFeatureMap } from 'pal/system-info'; import { EventTarget } from '../../../cocos/core/event'; import { checkPalIntegrity, withImpl } from '../../integrity-check'; import { BrowserType, NetworkType, OS, Platform, Language, Feature } from '../enum-type'; @@ -43,17 +43,34 @@ class SystemInfo extends EventTarget { public declare readonly browserType: BrowserType; public declare readonly browserVersion: string; public declare readonly isXR: boolean; + private declare _featureMap: IFeatureMap; + private _initPromise: Promise[] = []; constructor () { super(); this.networkType = NetworkType.LAN; // TODO this.isNative = false; - this.isBrowser = true; + this.isBrowser = false; this.isMobile = false; - this.platform = Platform.EDITOR_PAGE; // TODO + this.platform = Platform.NODEJS_PAGE; // TODO + + this.browserType = BrowserType.UNKNOWN; + this.browserVersion = ''; + const osInfo = globalThis.nodeEnv.require('os'); + let osName = OS.UNKNOWN; + if (osInfo.type().indexOf('wiWindows_NTn') !== -1) { + osName = OS.WINDOWS; + } else if (osInfo.type().indexOf('Darwin') !== -1) { + osName = OS.OSX; + } else if (osInfo.type().indexOf('Linux') !== -1) { + osName = OS.LINUX; + } + this.os = osName; + this.osVersion = osInfo.release(); + this.osMainVersion = parseInt(this.osVersion); // init isLittleEndian this.isLittleEndian = ((): boolean => { @@ -63,43 +80,62 @@ class SystemInfo extends EventTarget { return new Int16Array(buffer)[0] === 256; })(); - this.language = Language.CHINESE; - - this.os = OS.UNKNOWN; - this.osVersion = ""; - this.osMainVersion = 10; - - // TODO: use dack-type to determine the browserType - // init browserType and browserVersion - this.browserType = BrowserType.UNKNOWN; - // init browserVersion - this.browserVersion = ''; + // init languageCode and language + let currLanguage = globalThis.nodeEnv.systemLanguage; + this.nativeLanguage = currLanguage.toLowerCase(); + currLanguage = currLanguage ? currLanguage.split('-')[0] : Language.ENGLISH; + this.language = currLanguage as Language; this.isXR = false; + this._featureMap = { + [Feature.WEBP]: true, + [Feature.IMAGE_BITMAP]: false, + [Feature.WEB_VIEW]: false, + [Feature.VIDEO_PLAYER]: false, + [Feature.SAFE_AREA]: false, + [Feature.HPE]: false, + + [Feature.INPUT_TOUCH]: false, + [Feature.EVENT_KEYBOARD]: false, + [Feature.EVENT_MOUSE]: false, + [Feature.EVENT_TOUCH]: false, + [Feature.EVENT_ACCELEROMETER]: false, + // NOTE: webkitGetGamepads is not standard web interface + [Feature.EVENT_GAMEPAD]: false, + [Feature.EVENT_HANDLE]: false, + [Feature.EVENT_HMD]: false, + [Feature.EVENT_HANDHELD]: false, + [Feature.WASM]: true, + }; + } public init (): Promise { - warn("init is not supported."); - return Promise.resolve([]); + return Promise.all(this._initPromise); } public hasFeature (feature: Feature): boolean { - // warn("hasFeature is not supported."); - return false; + return this._featureMap[feature]; } public getBatteryLevel (): number { - warn("getBatteryLevel is not supported."); + if (DEBUG) { + warn("getBatteryLevel is not supported."); + } return 1; } + public triggerGC (): void { - if (DEBUG) { - warn('triggerGC is not supported.'); + if (global.gc) { + global.gc(); } } + public openURL (url: string): void { - warn("openURL is not supported."); + var open = globalThis.nodeEnv.require('open'); + open(url); } + public now (): number { if (Date.now) { return Date.now(); @@ -107,12 +143,15 @@ class SystemInfo extends EventTarget { return +(new Date()); } + public restartJSVM (): void { - warn("restartJSVM is not supported."); + if (DEBUG) { + warn('restartJSVM is not supported.'); + } } public exit (): void { - warn("exit is not supported."); + globalThis.nodeEnv.process.exit(); } public close (): void { diff --git a/pal/wasm/wasm-nodejs.ts b/pal/wasm/wasm-nodejs.ts index 6544cce762..78acbdd65b 100644 --- a/pal/wasm/wasm-nodejs.ts +++ b/pal/wasm/wasm-nodejs.ts @@ -30,9 +30,10 @@ export function instantiateWasm (wasmUrl: string, importObject: WebAssembly.Impo export function fetchBuffer (binaryUrl: string): Promise { return new Promise((resolve, reject) => { try { - const externalRoot = `${globalThis.window.enginePath}/native/external/`; + const externalRoot = `${globalThis.nodeEnv.enginePath}/native/external/`; binaryUrl = binaryUrl.replace('external:', externalRoot); - const arrayBuffer = globalThis.fs.readFileSync(binaryUrl) as ArrayBuffer; + const fs = globalThis.nodeEnv.require('fs-extra'); + const arrayBuffer = fs.readFileSync(binaryUrl) as ArrayBuffer; resolve(arrayBuffer); } catch (e) { reject(e); @@ -40,13 +41,15 @@ export function fetchBuffer (binaryUrl: string): Promise { }); } -/** - * @en Translate virtual addresses within the engine to actual addresses of paths, such as external:emscripten/webgpu/glslang.wasm - * @zh 把引擎内部的虚拟地址转为路径的实际地址,如external:emscripten/webgpu/glslang.wasm - */ -export function fetchUrl (binaryUrl: string): Promise { +export function fetchUrl(binaryUrl: string): Promise { return new Promise((resolve, reject) => { - reject(new Error('nodejs not supported.')); + try { + const externalRoot = `${globalThis.nodeEnv.enginePath}/native/external/`; + binaryUrl = binaryUrl.replace('external:', externalRoot); + resolve(binaryUrl); + } catch (e) { + reject(e); + } }); } diff --git a/platforms/nodejs/builtin/index.js b/platforms/nodejs/builtin/index.js index e227452d7e..c78abc7532 100644 --- a/platforms/nodejs/builtin/index.js +++ b/platforms/nodejs/builtin/index.js @@ -13,162 +13,16 @@ nodeWindow.Blob = Blob; nodeWindow.URL = URL; nodeWindow.DOMParser = require('./xmldom/dom-parser').DOMParser; -// nodeWindow.XMLHttpRequest = jsb.XMLHttpRequest; -// nodeWindow.SocketIO = jsb.SocketIO; -// nodeWindow.WebSocket = jsb.WebSocket; +nodeWindow.XMLHttpRequest = globalThis.nodeEnv.XMLHttpRequest; +nodeWindow.SocketIO = globalThis.nodeEnv.SocketIO; +nodeWindow.WebSocket = globalThis.nodeEnv.WebSocket; -//require('./jsb_prepare'); -require('./jsb-adapter'); -//require('./jsb_audioengine'); -//require('./jsb_input'); - -let _oldRequestFrameCallback = null; -let _requestAnimationFrameID = 0; -const _requestAnimationFrameCallbacks = {}; -let _firstTick = true; - -nodeWindow.requestAnimationFrame = function (cb) { - const id = ++_requestAnimationFrameID; - _requestAnimationFrameCallbacks[id] = cb; - return id; -}; - -nodeWindow.cancelAnimationFrame = function (id) { - delete _requestAnimationFrameCallbacks[id]; -}; - -function tick (nowMilliSeconds) { - if (_firstTick) { - _firstTick = false; - if (nodeWindow.onload) { - const event = new Event('load'); - event._target = globalThis; - nodeWindow.onload(event); - } - } - fireTimeout(nowMilliSeconds); - - for (const id in _requestAnimationFrameCallbacks) { - _oldRequestFrameCallback = _requestAnimationFrameCallbacks[id]; - if (_oldRequestFrameCallback) { - delete _requestAnimationFrameCallbacks[id]; - _oldRequestFrameCallback(nowMilliSeconds); - } - } -} - -let _timeoutIDIndex = 0; - -class TimeoutInfo { - constructor (cb, delay, isRepeat, target, args) { - this.cb = cb; - this.id = ++_timeoutIDIndex; - this.start = performance.now(); - this.delay = delay; - this.isRepeat = isRepeat; - this.target = target; - this.args = args; - } -} - -const _timeoutInfos = {}; - -function fireTimeout (nowMilliSeconds) { - let info; - for (const id in _timeoutInfos) { - info = _timeoutInfos[id]; - if (info && info.cb) { - if ((nowMilliSeconds - info.start) >= info.delay) { - // console.log(`fireTimeout: id ${id}, start: ${info.start}, delay: ${info.delay}, now: ${nowMilliSeconds}`); - if (info.isRepeat) { - info.start = nowMilliSeconds; - } else { - // The delete operation should be performed before the timeout callback. - // This is because if an error occurs during the timeout callback, - // it could be triggered indefinitely, leading to a game freeze. - delete _timeoutInfos[id]; - } - - if (typeof info.cb === 'string') { - Function(info.cb)(); - } else if (typeof info.cb === 'function') { - info.cb.apply(info.target, info.args); - } - } - } - } -} +require('./node-adapter'); nodeWindow.alert = console.error.bind(console); -// // File utils (Temporary, won't be accessible) -// if (typeof jsb.FileUtils !== 'undefined') { -// jsb.fileUtils = jsb.FileUtils.getInstance(); -// delete jsb.FileUtils; -// } - -// nodeWindow.XMLHttpRequest.prototype.addEventListener = function (eventName, listener, options) { -// this[`on${eventName}`] = listener; -// }; - -// nodeWindow.XMLHttpRequest.prototype.removeEventListener = function (eventName, listener, options) { -// this[`on${eventName}`] = null; -// }; - -// SocketIO -if (nodeWindow.SocketIO) { - nodeWindow.io = nodeWindow.SocketIO; - nodeWindow.SocketIO.prototype._Emit = nodeWindow.SocketIO.prototype.emit; - nodeWindow.SocketIO.prototype.emit = function (uri, delegate) { - if (typeof delegate === 'object') { - delegate = JSON.stringify(delegate); - } - this._Emit(uri, delegate); - }; -} - -nodeWindow.gameTick = tick; - -// // generate get set function -// jsb.generateGetSet = function (moduleObj) { -// for (const classKey in moduleObj) { -// const classProto = moduleObj[classKey] && moduleObj[classKey].prototype; -// if (!classProto) continue; -// for (const getName in classProto) { -// const getPos = getName.search(/^get/); -// if (getPos == -1) continue; -// let propName = getName.replace(/^get/, ''); -// const nameArr = propName.split(''); -// const lowerFirst = nameArr[0].toLowerCase(); -// const upperFirst = nameArr[0].toUpperCase(); -// nameArr.splice(0, 1); -// const left = nameArr.join(''); -// propName = lowerFirst + left; -// const setName = `set${upperFirst}${left}`; -// if (classProto.hasOwnProperty(propName)) continue; -// const setFunc = classProto[setName]; -// const hasSetFunc = typeof setFunc === 'function'; -// if (hasSetFunc) { -// Object.defineProperty(classProto, propName, { -// get () { -// return this[getName](); -// }, -// set (val) { -// this[setName](val); -// }, -// configurable: true, -// }); -// } else { -// Object.defineProperty(classProto, propName, { -// get () { -// return this[getName](); -// }, -// configurable: true, -// }); -// } -// } -// } -// }; +nodeWindow.requestAnimationFrame = function (cb) {} +nodeWindow.cancelAnimationFrame = function (cb) {} for (const key in nodeWindow) { if (globalThis[key] === undefined) { diff --git a/platforms/nodejs/builtin/jsb-adapter/window.js b/platforms/nodejs/builtin/jsb-adapter/window.js deleted file mode 100644 index 7e60fd00a3..0000000000 --- a/platforms/nodejs/builtin/jsb-adapter/window.js +++ /dev/null @@ -1,130 +0,0 @@ -const jsbWindow = globalThis.window; - -function inject () { - jsbWindow.ontouchstart = null; - jsbWindow.ontouchmove = null; - jsbWindow.ontouchend = null; - jsbWindow.ontouchcancel = null; - - jsbWindow.pageXOffset = jsbWindow.pageYOffset = jsbWindow.clientTop = jsbWindow.clientLeft = 0; - jsbWindow.outerWidth = jsbWindow.innerWidth; - jsbWindow.outerHeight = jsbWindow.innerHeight; - jsbWindow.clientWidth = jsbWindow.innerWidth; - jsbWindow.clientHeight = jsbWindow.innerHeight; - // if (!__EDITOR__) { - jsbWindow.top = jsbWindow.parent = jsbWindow; - jsbWindow.location = require('./location'); - jsbWindow.document = require('./document'); - // } - - jsbWindow.CanvasRenderingContext2D = require('./CanvasRenderingContext2D'); - jsbWindow.Element = require('./Element'); - jsbWindow.HTMLElement = require('./HTMLElement'); - jsbWindow.HTMLCanvasElement = require('./HTMLCanvasElement'); - jsbWindow.HTMLImageElement = require('./HTMLImageElement'); - jsbWindow.HTMLMediaElement = require('./HTMLMediaElement'); - jsbWindow.HTMLVideoElement = require('./HTMLVideoElement'); - jsbWindow.HTMLScriptElement = require('./HTMLScriptElement'); - jsbWindow.__canvas = new jsbWindow.HTMLCanvasElement(); - jsbWindow.__canvas._width = jsbWindow.innerWidth; - jsbWindow.__canvas._height = jsbWindow.innerHeight; - - jsbWindow.Image = require('./Image'); - jsbWindow.FileReader = require('./FileReader'); - jsbWindow.FontFace = require('./FontFace'); - jsbWindow.FontFaceSet = require('./FontFaceSet'); - jsbWindow.EventTarget = require('./EventTarget'); - jsbWindow.Event = jsbWindow.Event || require('./Event'); - jsbWindow.TouchEvent = require('./TouchEvent'); - jsbWindow.MouseEvent = require('./MouseEvent'); - jsbWindow.KeyboardEvent = require('./KeyboardEvent'); - jsbWindow.DeviceMotionEvent = require('./DeviceMotionEvent'); - - - // const PORTRAIT = 0; - // const LANDSCAPE_LEFT = -90; - // const PORTRAIT_UPSIDE_DOWN = 180; - // const LANDSCAPE_RIGHT = 90; - jsbWindow.orientation = 0; - - // jsb.window.devicePixelRatio is readonly - if (!__EDITOR__) { - Object.defineProperty(jsbWindow, 'devicePixelRatio', { - get () { - return 1; - }, - set (_dpr) { /* ignore */ }, - enumerable: true, - configurable: true, - }); - } - - jsbWindow.screen = { - availTop: 0, - availLeft: 0, - availHeight: jsbWindow.innerWidth, - availWidth: jsbWindow.innerHeight, - colorDepth: 8, - pixelDepth: 8, - left: 0, - top: 0, - width: jsbWindow.innerWidth, - height: jsbWindow.innerHeight, - orientation: { //FIXME:cjh - type: 'portrait-primary', // portrait-primary, portrait-secondary, landscape-primary, landscape-secondary - }, - onorientationchange (event) {}, - }; - - jsbWindow.addEventListener = function (eventName, listener, options) { - jsbWindow.__canvas.addEventListener(eventName, listener, options); - }; - - jsbWindow.removeEventListener = function (eventName, listener, options) { - jsbWindow.__canvas.removeEventListener(eventName, listener, options); - }; - - jsbWindow.dispatchEvent = function (event) { - jsbWindow.__canvas.dispatchEvent(event); - }; - - jsbWindow.getComputedStyle = function (element) { - return { - position: 'absolute', - left: '0px', - top: '0px', - height: '0px', - }; - }; - - jsbWindow.resize = function (width, height) { - jsbWindow.innerWidth = width; - jsbWindow.innerHeight = height; - jsbWindow.outerWidth = jsbWindow.innerWidth; - jsbWindow.outerHeight = jsbWindow.innerHeight; - jsbWindow.__canvas._width = jsbWindow.innerWidth; - jsbWindow.__canvas._height = jsbWindow.innerHeight; - jsbWindow.screen.availWidth = jsbWindow.innerWidth; - jsbWindow.screen.availHeight = jsbWindow.innerHeight; - jsbWindow.screen.width = jsbWindow.innerWidth; - jsbWindow.screen.height = jsbWindow.innerHeight; - jsbWindow.clientWidth = jsbWindow.innerWidth; - jsbWindow.clientHeight = jsbWindow.innerHeight; - // emit resize consistent with web behavior - const resizeEvent = new jsbWindow.Event('resize'); - resizeEvent._target = jsbWindow; - jsbWindow.dispatchEvent(resizeEvent); - }; - - jsbWindow.focus = function () {}; - jsbWindow.scroll = function () {}; - - jsbWindow._isInjected = true; -} - -if (!jsbWindow._isInjected) { - inject(); -} -if (!__EDITOR__) { - jsbWindow.localStorage = "zh"; -} diff --git a/platforms/nodejs/builtin/jsb_audioengine.js b/platforms/nodejs/builtin/jsb_audioengine.js deleted file mode 100644 index 82fc78dd98..0000000000 --- a/platforms/nodejs/builtin/jsb_audioengine.js +++ /dev/null @@ -1,21 +0,0 @@ -// (function (jsb) { - -// if (!jsb || !jsb.AudioEngine) -// return - -// jsb.AudioEngine.AudioState = { -// ERROR: -1, -// INITIALZING: 0, -// PLAYING: 1, -// PAUSED: 2, -// STOPPED: 3, -// } - -// jsb.AudioEngine.INVALID_AUDIO_ID = -1 -// jsb.AudioEngine.TIME_UNKNOWN = -1 - -// // Adapt to normal runtime based API -// jsb.AudioEngine.play = jsb.AudioEngine.play2d; -// jsb.AudioEngine.setErrorCallback = () => {}; - -// })(jsb) diff --git a/platforms/nodejs/builtin/jsb_input.js b/platforms/nodejs/builtin/jsb_input.js deleted file mode 100644 index 25ce6d6fd5..0000000000 --- a/platforms/nodejs/builtin/jsb_input.js +++ /dev/null @@ -1,99 +0,0 @@ -const EventTarget = require('./jsb-adapter/EventTarget'); -const Event = require('./jsb-adapter/Event'); - -const eventTarget = new EventTarget(); - -const callbackWrappers = {}; -const callbacks = {}; -let index = 1; -const callbackWrapper = function (cb) { - if (!cb) { return null; } - - const func = function (event) { - cb({ value: event.text }); - }; - cb.___index = index++; - callbackWrappers[cb.___index] = func; - - return func; -}; -const getCallbackWrapper = function (cb) { - if (cb && cb.___index) { - const ret = callbackWrappers[cb.___index]; - delete callbackWrappers[cb.___index]; - return ret; - } else { return null; } -}; -const removeListener = function (name, cb) { - if (cb) { - eventTarget.removeEventListener(name, getCallbackWrapper(cb)); - } else { - // remove all listeners of name - const cbs = callbacks[name]; - if (!cbs) { return; } - - for (let i = 0, len = cbs.length; i < len; ++i) { eventTarget.removeEventListener(name, cbs[i]); } - - delete callbacks[name]; - } -}; -const recordCallback = function (name, cb) { - if (!cb || !name || name === '') { return; } - - if (!callbacks[name]) { callbacks[name] = []; } - - callbacks[name].push(cb); -}; - -// jsb.inputBox = { -// onConfirm (cb) { -// const newCb = callbackWrapper(cb); -// eventTarget.addEventListener('confirm', newCb); -// recordCallback('confirm', newCb); -// }, -// offConfirm (cb) { -// removeListener('confirm', cb); -// }, - -// onComplete (cb) { -// const newCb = callbackWrapper(cb); -// eventTarget.addEventListener('complete', newCb); -// recordCallback('complete', newCb); -// }, -// offComplete (cb) { -// removeListener('complete', cb); -// }, - -// onInput (cb) { -// const newCb = callbackWrapper(cb); -// eventTarget.addEventListener('input', newCb); -// recordCallback('input', newCb); -// }, -// offInput (cb) { -// removeListener('input', cb); -// }, - -// /** -// * @param {string} options.defaultValue -// * @param {number} options.maxLength -// * @param {bool} options.multiple -// * @param {bool} options.confirmHold -// * @param {string} options.confirmType -// * @param {string} options.inputType -// * -// * Values of options.confirmType can be [done|next|search|go|send]. -// * Values of options.inputType can be [text|email|number|phone|password]. -// */ -// show (options) { -// jsb.showInputBox(options); -// }, -// hide () { -// jsb.hideInputBox(); -// }, -// }; - -// jsb.onTextInput = function (eventName, text) { -// const event = new Event(eventName); -// event.text = text; -// eventTarget.dispatchEvent(event); -// }; diff --git a/platforms/nodejs/builtin/jsb_prepare.js b/platforms/nodejs/builtin/jsb_prepare.js deleted file mode 100644 index 43f4219ff8..0000000000 --- a/platforms/nodejs/builtin/jsb_prepare.js +++ /dev/null @@ -1,48 +0,0 @@ -// jsb.__obj_ref_id = 0; - -// jsb.registerNativeRef = function (owner, target) { -// if (owner && target && owner !== target) { -// let targetID = target.__jsb_ref_id; -// if (targetID === undefined) -// targetID = target.__jsb_ref_id = jsb.__obj_ref_id++; - -// let refs = owner.__nativeRefs; -// if (!refs) { -// refs = owner.__nativeRefs = {}; -// } - -// refs[targetID] = target; -// } -// }; - -// jsb.unregisterNativeRef = function (owner, target) { -// if (owner && target && owner !== target) { -// let targetID = target.__jsb_ref_id; -// if (targetID === undefined) -// return; - -// let refs = owner.__nativeRefs; -// if (!refs) { -// return; -// } - -// delete refs[targetID]; -// } -// }; - -// jsb.unregisterAllNativeRefs = function (owner) { -// if (!owner) return; -// delete owner.__nativeRefs; -// }; - -// jsb.unregisterChildRefsForNode = function (node, recursive) { -// recursive = !!recursive; -// let children = node.getChildren(), i, l, child; -// for (i = 0, l = children.length; i < l; ++i) { -// child = children[i]; -// jsb.unregisterNativeRef(node, child); -// if (recursive) { -// jsb.unregisterChildRefsForNode(child, recursive); -// } -// } -// }; diff --git a/platforms/nodejs/builtin/jsb-adapter/Audio.js b/platforms/nodejs/builtin/node-adapter/Audio.js similarity index 100% rename from platforms/nodejs/builtin/jsb-adapter/Audio.js rename to platforms/nodejs/builtin/node-adapter/Audio.js diff --git a/platforms/nodejs/builtin/jsb-adapter/CanvasRenderingContext2D.js b/platforms/nodejs/builtin/node-adapter/CanvasRenderingContext2D.js similarity index 100% rename from platforms/nodejs/builtin/jsb-adapter/CanvasRenderingContext2D.js rename to platforms/nodejs/builtin/node-adapter/CanvasRenderingContext2D.js diff --git a/platforms/nodejs/builtin/jsb-adapter/DOMRect.js b/platforms/nodejs/builtin/node-adapter/DOMRect.js similarity index 100% rename from platforms/nodejs/builtin/jsb-adapter/DOMRect.js rename to platforms/nodejs/builtin/node-adapter/DOMRect.js diff --git a/platforms/nodejs/builtin/jsb-adapter/DeviceMotionEvent.js b/platforms/nodejs/builtin/node-adapter/DeviceMotionEvent.js similarity index 100% rename from platforms/nodejs/builtin/jsb-adapter/DeviceMotionEvent.js rename to platforms/nodejs/builtin/node-adapter/DeviceMotionEvent.js diff --git a/platforms/nodejs/builtin/jsb-adapter/Element.js b/platforms/nodejs/builtin/node-adapter/Element.js similarity index 100% rename from platforms/nodejs/builtin/jsb-adapter/Element.js rename to platforms/nodejs/builtin/node-adapter/Element.js diff --git a/platforms/nodejs/builtin/jsb-adapter/Event.js b/platforms/nodejs/builtin/node-adapter/Event.js similarity index 100% rename from platforms/nodejs/builtin/jsb-adapter/Event.js rename to platforms/nodejs/builtin/node-adapter/Event.js diff --git a/platforms/nodejs/builtin/jsb-adapter/EventTarget.js b/platforms/nodejs/builtin/node-adapter/EventTarget.js similarity index 100% rename from platforms/nodejs/builtin/jsb-adapter/EventTarget.js rename to platforms/nodejs/builtin/node-adapter/EventTarget.js diff --git a/platforms/nodejs/builtin/jsb-adapter/FileReader.js b/platforms/nodejs/builtin/node-adapter/FileReader.js similarity index 100% rename from platforms/nodejs/builtin/jsb-adapter/FileReader.js rename to platforms/nodejs/builtin/node-adapter/FileReader.js diff --git a/platforms/nodejs/builtin/jsb-adapter/FontFace.js b/platforms/nodejs/builtin/node-adapter/FontFace.js similarity index 100% rename from platforms/nodejs/builtin/jsb-adapter/FontFace.js rename to platforms/nodejs/builtin/node-adapter/FontFace.js diff --git a/platforms/nodejs/builtin/jsb-adapter/FontFaceSet.js b/platforms/nodejs/builtin/node-adapter/FontFaceSet.js similarity index 100% rename from platforms/nodejs/builtin/jsb-adapter/FontFaceSet.js rename to platforms/nodejs/builtin/node-adapter/FontFaceSet.js diff --git a/platforms/nodejs/builtin/jsb-adapter/HTMLAudioElement.js b/platforms/nodejs/builtin/node-adapter/HTMLAudioElement.js similarity index 100% rename from platforms/nodejs/builtin/jsb-adapter/HTMLAudioElement.js rename to platforms/nodejs/builtin/node-adapter/HTMLAudioElement.js diff --git a/platforms/nodejs/builtin/jsb-adapter/HTMLCanvasElement.js b/platforms/nodejs/builtin/node-adapter/HTMLCanvasElement.js similarity index 100% rename from platforms/nodejs/builtin/jsb-adapter/HTMLCanvasElement.js rename to platforms/nodejs/builtin/node-adapter/HTMLCanvasElement.js diff --git a/platforms/nodejs/builtin/jsb-adapter/HTMLElement.js b/platforms/nodejs/builtin/node-adapter/HTMLElement.js similarity index 100% rename from platforms/nodejs/builtin/jsb-adapter/HTMLElement.js rename to platforms/nodejs/builtin/node-adapter/HTMLElement.js diff --git a/platforms/nodejs/builtin/jsb-adapter/HTMLImageElement.js b/platforms/nodejs/builtin/node-adapter/HTMLImageElement.js similarity index 100% rename from platforms/nodejs/builtin/jsb-adapter/HTMLImageElement.js rename to platforms/nodejs/builtin/node-adapter/HTMLImageElement.js diff --git a/platforms/nodejs/builtin/jsb-adapter/HTMLMediaElement.js b/platforms/nodejs/builtin/node-adapter/HTMLMediaElement.js similarity index 100% rename from platforms/nodejs/builtin/jsb-adapter/HTMLMediaElement.js rename to platforms/nodejs/builtin/node-adapter/HTMLMediaElement.js diff --git a/platforms/nodejs/builtin/jsb-adapter/HTMLScriptElement.js b/platforms/nodejs/builtin/node-adapter/HTMLScriptElement.js similarity index 100% rename from platforms/nodejs/builtin/jsb-adapter/HTMLScriptElement.js rename to platforms/nodejs/builtin/node-adapter/HTMLScriptElement.js diff --git a/platforms/nodejs/builtin/jsb-adapter/HTMLVideoElement.js b/platforms/nodejs/builtin/node-adapter/HTMLVideoElement.js similarity index 100% rename from platforms/nodejs/builtin/jsb-adapter/HTMLVideoElement.js rename to platforms/nodejs/builtin/node-adapter/HTMLVideoElement.js diff --git a/platforms/nodejs/builtin/jsb-adapter/Image.js b/platforms/nodejs/builtin/node-adapter/Image.js similarity index 100% rename from platforms/nodejs/builtin/jsb-adapter/Image.js rename to platforms/nodejs/builtin/node-adapter/Image.js diff --git a/platforms/nodejs/builtin/jsb-adapter/ImageData.js b/platforms/nodejs/builtin/node-adapter/ImageData.js similarity index 100% rename from platforms/nodejs/builtin/jsb-adapter/ImageData.js rename to platforms/nodejs/builtin/node-adapter/ImageData.js diff --git a/platforms/nodejs/builtin/jsb-adapter/KeyboardEvent.js b/platforms/nodejs/builtin/node-adapter/KeyboardEvent.js similarity index 100% rename from platforms/nodejs/builtin/jsb-adapter/KeyboardEvent.js rename to platforms/nodejs/builtin/node-adapter/KeyboardEvent.js diff --git a/platforms/nodejs/builtin/jsb-adapter/MediaError.js b/platforms/nodejs/builtin/node-adapter/MediaError.js similarity index 100% rename from platforms/nodejs/builtin/jsb-adapter/MediaError.js rename to platforms/nodejs/builtin/node-adapter/MediaError.js diff --git a/platforms/nodejs/builtin/jsb-adapter/MouseEvent.js b/platforms/nodejs/builtin/node-adapter/MouseEvent.js similarity index 100% rename from platforms/nodejs/builtin/jsb-adapter/MouseEvent.js rename to platforms/nodejs/builtin/node-adapter/MouseEvent.js diff --git a/platforms/nodejs/builtin/jsb-adapter/Node.js b/platforms/nodejs/builtin/node-adapter/Node.js similarity index 100% rename from platforms/nodejs/builtin/jsb-adapter/Node.js rename to platforms/nodejs/builtin/node-adapter/Node.js diff --git a/platforms/nodejs/builtin/jsb-adapter/TouchEvent.js b/platforms/nodejs/builtin/node-adapter/TouchEvent.js similarity index 100% rename from platforms/nodejs/builtin/jsb-adapter/TouchEvent.js rename to platforms/nodejs/builtin/node-adapter/TouchEvent.js diff --git a/platforms/nodejs/builtin/jsb-adapter/document.js b/platforms/nodejs/builtin/node-adapter/document.js similarity index 100% rename from platforms/nodejs/builtin/jsb-adapter/document.js rename to platforms/nodejs/builtin/node-adapter/document.js diff --git a/platforms/nodejs/builtin/jsb-adapter/fetch.js b/platforms/nodejs/builtin/node-adapter/fetch.js similarity index 100% rename from platforms/nodejs/builtin/jsb-adapter/fetch.js rename to platforms/nodejs/builtin/node-adapter/fetch.js diff --git a/platforms/nodejs/builtin/jsb-adapter/index.js b/platforms/nodejs/builtin/node-adapter/index.js similarity index 100% rename from platforms/nodejs/builtin/jsb-adapter/index.js rename to platforms/nodejs/builtin/node-adapter/index.js diff --git a/platforms/nodejs/builtin/jsb-adapter/location.js b/platforms/nodejs/builtin/node-adapter/location.js similarity index 100% rename from platforms/nodejs/builtin/jsb-adapter/location.js rename to platforms/nodejs/builtin/node-adapter/location.js diff --git a/platforms/nodejs/builtin/jsb-adapter/util/index.js b/platforms/nodejs/builtin/node-adapter/util/index.js similarity index 100% rename from platforms/nodejs/builtin/jsb-adapter/util/index.js rename to platforms/nodejs/builtin/node-adapter/util/index.js diff --git a/platforms/nodejs/builtin/node-adapter/window.js b/platforms/nodejs/builtin/node-adapter/window.js new file mode 100644 index 0000000000..8383fad442 --- /dev/null +++ b/platforms/nodejs/builtin/node-adapter/window.js @@ -0,0 +1,131 @@ +const { glob } = require('fs'); + +const nodeWindow = globalThis.window; + +function inject () { + nodeWindow.ontouchstart = null; + nodeWindow.ontouchmove = null; + nodeWindow.ontouchend = null; + nodeWindow.ontouchcancel = null; + + nodeWindow.pageXOffset = nodeWindow.pageYOffset = nodeWindow.clientTop = nodeWindow.clientLeft = 0; + nodeWindow.outerWidth = nodeWindow.innerWidth; + nodeWindow.outerHeight = nodeWindow.innerHeight; + nodeWindow.clientWidth = nodeWindow.innerWidth; + nodeWindow.clientHeight = nodeWindow.innerHeight; + // if (!__EDITOR__) { + nodeWindow.top = nodeWindow.parent = nodeWindow; + nodeWindow.location = require('./location'); + nodeWindow.document = require('./document'); + // } + + nodeWindow.CanvasRenderingContext2D = require('./CanvasRenderingContext2D'); + nodeWindow.Element = require('./Element'); + nodeWindow.HTMLElement = require('./HTMLElement'); + nodeWindow.HTMLCanvasElement = require('./HTMLCanvasElement'); + nodeWindow.HTMLImageElement = require('./HTMLImageElement'); + nodeWindow.HTMLMediaElement = require('./HTMLMediaElement'); + nodeWindow.HTMLVideoElement = require('./HTMLVideoElement'); + nodeWindow.HTMLScriptElement = require('./HTMLScriptElement'); + nodeWindow.__canvas = new nodeWindow.HTMLCanvasElement(); + nodeWindow.__canvas._width = nodeWindow.innerWidth; + nodeWindow.__canvas._height = nodeWindow.innerHeight; + + nodeWindow.Image = require('./Image'); + nodeWindow.FileReader = require('./FileReader'); + nodeWindow.FontFace = require('./FontFace'); + nodeWindow.FontFaceSet = require('./FontFaceSet'); + nodeWindow.EventTarget = require('./EventTarget'); + nodeWindow.Event = nodeWindow.Event || require('./Event'); + nodeWindow.TouchEvent = require('./TouchEvent'); + nodeWindow.MouseEvent = require('./MouseEvent'); + nodeWindow.KeyboardEvent = require('./KeyboardEvent'); + nodeWindow.DeviceMotionEvent = require('./DeviceMotionEvent'); + + nodeWindow.fetch = globalThis.nodeEnv.fetch; + nodeWindow.Headers = globalThis.nodeEnv.Headers; + nodeWindow.Request = globalThis.nodeEnv.Request; + nodeWindow.Response = globalThis.nodeEnv.Response; + + // const PORTRAIT = 0; + // const LANDSCAPE_LEFT = -90; + // const PORTRAIT_UPSIDE_DOWN = 180; + // const LANDSCAPE_RIGHT = 90; + nodeWindow.orientation = 0; + Object.defineProperty(nodeWindow, 'devicePixelRatio', { + get () { + return 1; + }, + set (_dpr) { /* ignore */ }, + enumerable: true, + configurable: true, + }); + + nodeWindow.screen = { + availTop: 0, + availLeft: 0, + availHeight: nodeWindow.innerWidth, + availWidth: nodeWindow.innerHeight, + colorDepth: 8, + pixelDepth: 8, + left: 0, + top: 0, + width: nodeWindow.innerWidth, + height: nodeWindow.innerHeight, + orientation: { //FIXME:cjh + type: 'portrait-primary', // portrait-primary, portrait-secondary, landscape-primary, landscape-secondary + }, + onorientationchange (event) {}, + }; + + nodeWindow.addEventListener = function (eventName, listener, options) { + nodeWindow.__canvas.addEventListener(eventName, listener, options); + }; + + nodeWindow.removeEventListener = function (eventName, listener, options) { + nodeWindow.__canvas.removeEventListener(eventName, listener, options); + }; + + nodeWindow.dispatchEvent = function (event) { + nodeWindow.__canvas.dispatchEvent(event); + }; + + nodeWindow.getComputedStyle = function (element) { + return { + position: 'absolute', + left: '0px', + top: '0px', + height: '0px', + }; + }; + + nodeWindow.resize = function (width, height) { + nodeWindow.innerWidth = width; + nodeWindow.innerHeight = height; + nodeWindow.outerWidth = nodeWindow.innerWidth; + nodeWindow.outerHeight = nodeWindow.innerHeight; + nodeWindow.__canvas._width = nodeWindow.innerWidth; + nodeWindow.__canvas._height = nodeWindow.innerHeight; + nodeWindow.screen.availWidth = nodeWindow.innerWidth; + nodeWindow.screen.availHeight = nodeWindow.innerHeight; + nodeWindow.screen.width = nodeWindow.innerWidth; + nodeWindow.screen.height = nodeWindow.innerHeight; + nodeWindow.clientWidth = nodeWindow.innerWidth; + nodeWindow.clientHeight = nodeWindow.innerHeight; + // emit resize consistent with web behavior + const resizeEvent = new nodeWindow.Event('resize'); + resizeEvent._target = nodeWindow; + nodeWindow.dispatchEvent(resizeEvent); + }; + + nodeWindow.focus = function () {}; + nodeWindow.scroll = function () {}; + + nodeWindow._isInjected = true; +} + +if (!nodeWindow._isInjected) { + inject(); +} + +nodeWindow.localStorage = globalThis.nodeEnv.localStorage; diff --git a/platforms/nodejs/engine/asset-manager.js b/platforms/nodejs/engine/asset-manager.js index 7f5dd2b179..36492be04a 100644 --- a/platforms/nodejs/engine/asset-manager.js +++ b/platforms/nodejs/engine/asset-manager.js @@ -1,5 +1,5 @@ const cacheManager = require('./cache-manager'); -const { downloadFile, readText, readArrayBuffer, readJson, loadSubpackage, getUserDataPath, _subpackagesPath } = require('./fs-utils'); +const { readText, readArrayBuffer, readJson, loadSubpackage, getUserDataPath, _subpackagesPath } = require('./fs-utils'); //cc.assetManager.fsUtils = ral.fsUtils; @@ -17,9 +17,21 @@ const subpackages = {}; const loadedScripts = {}; function downloadScript (url, options, onComplete) { - // TODO(qgh): Skip loading the script. There are currently issues with script loading, so it's not needed here. - console.warn("Can not load scripts ".concat(url)); - onComplete && onComplete(null); + if (typeof options === 'function') { + onComplete = options; + options = null; + } + + if (loadedScripts[url]) { + onComplete && onComplete(); + return; + } + + download(url, (src, options, onComplete) => { + globalThis.nodeEnv.require(src); + loadedScripts[url] = true; + onComplete && onComplete(null); + }, options, options.onFileProgress, onComplete); } function loadAudioPlayer (url, options, onComplete) { @@ -49,7 +61,7 @@ function download (url, func, options, onFileProgress, onComplete) { onComplete(err, data); }); } else { - downloadFile(url, null, options.header, onFileProgress, (err, path) => { + downloader.downloadFile(url, options, onFileProgress, (err, path) => { if (err) { onComplete(err, null); return; diff --git a/platforms/nodejs/engine/fs-utils.js b/platforms/nodejs/engine/fs-utils.js index e8feb2f710..1ca94a3feb 100644 --- a/platforms/nodejs/engine/fs-utils.js +++ b/platforms/nodejs/engine/fs-utils.js @@ -19,16 +19,8 @@ THE SOFTWARE. ****************************************************************************/ -const path = require("path"); - -const fs = window.fs; -let jsb_downloader = null; -const downloading = new cc.AssetManager.Cache(); -let tempDir = ''; - -// jsb.Downloader.prototype._ctor = function () { -// this.__nativeRefs = {}; -// }; +const path = globalThis.nodeEnv.require('path'); +const fs = globalThis.nodeEnv.require('fs-extra'); const fsUtils = { @@ -37,10 +29,11 @@ const fsUtils = { initJsbDownloader(jsbDownloaderMaxTasks, jsbDownloaderTimeout) { console.log("initJsbDownloader: nodejs does not support") }, + getUserDataPath() { - console.log("getUserDataPath: nodejs does not support"); - return path.join('./', "writablePath"); + return path.join(globalThis.nodeEnv.userDataPath, "writablePath"); }, + checkFsValid() { if (!fs) { cc.warn('can not get the file system!'); @@ -50,9 +43,10 @@ const fsUtils = { }, deleteFile(filePath, onComplete) { - fs.unlink(filePath, (e) => { + const fullFilePath = fsUtils.fullPathForFilename(filePath); + fs.unlink(fullFilePath, (e) => { if (e) { - const err = new Error(`Delete file failed: path: ${filePath} errno: ${e.errno} message: ${e.message}`); + const err = new Error(`Delete file failed: "${filePath}" (resolved: "${fullFilePath}") - ${e.message}`); console.warn(err.message); onComplete && onComplete(err); } else { @@ -61,8 +55,7 @@ const fsUtils = { }); }, - fullPathForFilename(filename) { - const path = globalThis.window.path; + fullPathForFilename(filename, forceReturnFullpath = false) { if(filename.length <= 0){ return ""; } @@ -70,28 +63,22 @@ const fsUtils = { return filename; } const newFilename = path.normalize(filename); - const projectPath = globalThis.window.projectResourcePath; + const projectPath = ''; const fullpath = path.join(projectPath, newFilename); - if(fs.pathExistsSync(fullpath)) { + if(fs.pathExistsSync(fullpath) || forceReturnFullpath) { return fullpath; } return ""; }, - downloadFile(remoteUrl, filePath, header, onProgress, onComplete) { - cc.warn('can not downloadFile the file system!'); - // downloading.add(remoteUrl, { onProgress, onComplete }); - // let storagePath = filePath; - // if (!storagePath) storagePath = `${tempDir}/${performance.now()}${cc.path.extname(remoteUrl)}`; - // jsb_downloader.createDownloadTask(remoteUrl, storagePath, header); - }, - saveFile(srcPath, destPath, onComplete) { - srcPath = fsUtils.fullPathForFilename(srcPath); - destPath = fsUtils.fullPathForFilename(destPath); - fs.copyFile(srcPath, destPath, (e) => { + const fullSrcPath = fsUtils.fullPathForFilename(srcPath); + const fullDestPath = fsUtils.fullPathForFilename(destPath, true); + fs.copyFile(fullSrcPath, fullDestPath, (e) => { if (e) { - const err = new Error(`Save file failed: path: ${srcPath} errno: ${e.errno} message: ${e.message}`); + const err = new Error(`Save file failed: srcPath: "${srcPath}" (resolved: "${fullSrcPath}") \ + dstPath: "${destPath}" (resolved: "${fullDestPath}") + ${e.message}`); console.warn(err.message); onComplete && onComplete(err); } else { @@ -102,9 +89,13 @@ const fsUtils = { }, copyFile(srcPath, destPath, onComplete) { - fs.copyFile(srcPath, destPath, (e) => { + const fullSrcPath = fsUtils.fullPathForFilename(srcPath); + const fullDestPath = fsUtils.fullPathForFilename(destPath, true); + fs.copyFile(fullSrcPath, fullDestPath, (e) => { if (e) { - const err = new Error(`Copy file failed: path: ${srcPath} errno: ${e.errno} message: ${e.message}`); + const err = new Error(`Copy file failed: srcPath: "${srcPath}" (resolved: "${fullSrcPath}") \ + dstPath: "${destPath}" (resolved: "${fullDestPath}") + ${e.message}`); cc.warn(err.message); onComplete && onComplete(err); } else { @@ -114,9 +105,10 @@ const fsUtils = { }, writeFile(filePath, data, encoding, onComplete) { - fs.writeFile(filePath, data, encoding, (e) => { + const fullFilePath = fsUtils.fullPathForFilename(filePath, true); + fs.writeFile(fullFilePath, data, encoding, (e) => { if (e) { - const err = new Error(`Write file failed: path: ${filePath} errno: ${e.errno} message: ${e.message}`); + const err = new Error(`Write file failed: "${filePath}" (resolved: "${fullFilePath}") - ${e.message}`); cc.warn(err.message); onComplete && onComplete(err); } else { @@ -126,20 +118,22 @@ const fsUtils = { }, writeFileSync(filePath, data, encoding) { + const fullFilePath = fsUtils.fullPathForFilename(filePath, true); try { - fs.writeFile(filePath, data, encoding); + fs.writeFile(fullFilePath, data, encoding); return null; } catch (e) { - const err = new Error(`Write file sync failed: path: ${filePath} errno: ${e.errno} message: ${e.message}`); + const err = new Error(`Failed to write file synchronously: "${filePath}" (resolved: "${fullFilePath}") - ${e.message}`); cc.warn(err.message); return err; } }, readFile(filePath, encoding, onComplete) { - fs.readFile(filePath, encoding, (e, data) => { + const fullFilePath = fsUtils.fullPathForFilename(filePath); + fs.readFile(fullFilePath, encoding, (e, data) => { if (e) { - const err = new Error(`Read file failed: path: ${filePath} errno: ${e.errno} message: ${e.message}`); + const err = new Error(`Read file failed: "${filePath}" (resolved: "${fullFilePath}") - ${e.message}`); cc.warn(err.message); onComplete && onComplete(err, null); } else { @@ -148,10 +142,11 @@ const fsUtils = { }) }, - readDir(filePath, onComplete) { - fs.readdir(filePath, (e, files) => { + readDir(dirPath, onComplete) { + const fullDirPath = fsUtils.fullPathForFilename(dirPath); + fs.readdir(fullDirPath, (e, files) => { if (e) { - const err = new Error(`Read directory failed: path: ${filePath} errno: ${e.errno} message: ${e.message}`); + const err = new Error(`Read directory failed: "${dirPath}" (resolved: "${fullDirPath}") - ${e.message}`); cc.warn(err.message); onComplete && onComplete(err, null); } else { @@ -169,10 +164,10 @@ const fsUtils = { }, readJson(filePath, onComplete) { - filePath = fsUtils.fullPathForFilename(filePath); - fs.readJson(filePath, (e, jsonObj) => { + const fullFilePath = fsUtils.fullPathForFilename(filePath); + fs.readJson(fullFilePath, (e, jsonObj) => { if (e) { - const err = new Error(`Read json failed: path: ${filePath} errno: ${e.errno} message: ${e.message}`); + const err = new Error(`Read json failed: "${filePath}" (resolved: "${fullFilePath}") - ${e.message}`); cc.warn(err.message); onComplete && onComplete(err, null); } else { @@ -182,49 +177,54 @@ const fsUtils = { }, readJsonSync(filePath) { + const fullFilePath = fsUtils.fullPathForFilename(filePath); try { - return fs.readJsonSync(filePath); + return fs.readJsonSync(fullFilePath); } catch (e) { - const err = new Error(`Read json sync failed: path: ${filePath} errno: ${e.errno} message: ${e.message}`); + const err = new Error(`Failed to read JSON file synchronously: "${filePath}" (resolved: "${fullFilePath}") - ${e.message}`); cc.warn(err.message); return err; } }, - makeDirSync(filePath, recursive) { + makeDirSync(dirPath, recursive) { + const fullDirPath = fsUtils.fullPathForFilename(dirPath, true); try { - fs.mkdirSync(filePath, { recursive: recursive }); + fs.mkdirSync(fullDirPath, { recursive: recursive }); return null; - } catch (r) { - const err = new Error(`Make directory failed: path: ${filePath} errno: ${e.errno} message: ${e.message}`); + } catch (e) { + const err = new Error(`Make directory failed: "${dirPath}" (resolved: "${fullDirPath}") - ${e.message}`); cc.warn(err.message); return err; } }, rmdirSync(dirPath, recursive) { + const fullDirPath = fsUtils.fullPathForFilename(dirPath); try { - fs.rmSync(dirPath, { recursive: recursive }); + fs.rmSync(fullDirPath, { recursive: recursive }); return null; } catch (e) { - const err = new Error(`Remove directory failed: path: ${dirPath} errno: ${e.errno} message: ${e.message}`); + const err = new Error(`Remove directory failed: "${dirPath}" (resolved: "${fullDirPath}") - ${e.message}`); cc.warn(err.message); return err; } }, exists(filePath, onComplete) { - fs.pathExists(filePath, function (e, exists) { + const fullFilePath = fsUtils.fullPathForFilename(filePath); + fs.pathExists(fullFilePath, function (e, exists) { if(e) { - const err = new Error(`Path existence check failed: ${filePath} errno: ${e.errno} message: ${e.message}`); + const err = new Error(`File existence check failed: "${filePath}" (resolved: "${fullFilePath}") - ${e.message}`); cc.warn(err.message); return err; } onComplete && onComplete(exists); }); }, + loadSubpackage(name, onProgress, onComplete) { - throw new Error('not implement'); + throw new Error('nodejs not implement'); }, }; diff --git a/platforms/nodejs/engine/index.js b/platforms/nodejs/engine/index.js index 96f512dfe1..5eeb271c6b 100644 --- a/platforms/nodejs/engine/index.js +++ b/platforms/nodejs/engine/index.js @@ -1,5 +1 @@ -// require('../../../common/engine/fs-utils'); -// require('../../../common/engine/canvas'); require('./asset-manager.js'); -// require('../../../common/engine/EditBox.js'); -// require('../../../common/engine/game.js');