oox 0.3.0-beta1 → 0.3.0-beta2

package/modules/http/index.js

@@ -1,180 +1,180 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HTTPConfig = void 0;
-const http = require("node:http");
-const utils_1 = require("./utils");
-const oox = require("../../index");
-const module_1 = require("../module");
-class HTTPConfig extends module_1.ModuleConfig {
-    // listen port
-    port = 0;
-    // service path
-    path = '/';
-    // browser cross origin
-    origin = '';
-}
-exports.HTTPConfig = HTTPConfig;
-class HTTPModule extends module_1.default {
-    name = 'oox:http';
-    config = new HTTPConfig;
-    server = null;
-    setConfig(config) {
-        Object.assign(this.config, config);
-    }
-    getConfig() {
-        return this.config;
-    }
-    /**
-     * start http service
-     */
-    async serve() {
-        await this.stop();
-        const { port } = this.config;
-        this.server = http.createServer(this.call.bind(this));
-        this.server.listen(port);
-        const address = this.server.address();
-        if (!address || 'object' !== typeof address)
-            throw new Error('Cannot read http server port');
-        this.config.port = address.port;
-    }
-    /**
-     * stop http service
-     */
-    stop() {
-        if (this.server && this.server.listening)
-            return new Promise((resolve, reject) => {
-                this.server.close(function (error) {
-                    if (error)
-                        reject(error);
-                    else
-                        resolve();
-                });
-            });
-    }
-    /**
-     * browser cross origin
-     */
-    cors(request, response) {
-        // origin checking
-        const origin = this.config.origin;
-        const requestOrigin = request.headers.origin;
-        if (origin && requestOrigin) {
-            if (origin === '*' || origin === requestOrigin || Array.isArray(origin) && origin.includes(requestOrigin)) {
-                response.setHeader('Access-Control-Allow-Origin', requestOrigin);
-                response.setHeader('Vary', 'Origin');
-            }
-            else {
-                response.statusCode = 403;
-                response.end();
-                return false;
-            }
-            response.setHeader('Access-Control-Max-Age', 3600);
-            response.setHeader('Access-Control-Allow-Headers', 'x-caller,content-type');
-            response.setHeader('Access-Control-Allow-Methods', '*');
-        }
-        if (request.method === 'OPTIONS') {
-            response.statusCode = 204;
-            response.end();
-            return false;
-        }
-        return true;
-    }
-    /**
-     * HTTP-RPC服务器请求监听方法
-     */
-    async call(request, response) {
-        if (request.url !== this.config.path) {
-            const error = {
-                message: 'Invalid URL',
-                stack: ''
-            };
-            Error.captureStackTrace(error);
-            return this.respond(request, response, {
-                success: false,
-                error
-            });
-        }
-        if (!this.cors(request, response))
-            return;
-        let body = Object.create(null);
-        try {
-            body = await (0, utils_1.parseHTTPBody)(request);
-            if (!body || 'object' !== typeof body)
-                throw new Error('Content Invalid');
-        }
-        catch (error) {
-            return this.respond(request, response, {
-                success: false,
-                error: {
-                    message: error.message,
-                    stack: error.stack
-                }
-            });
-        }
-        // global unique id
-        const traceId = String(request.headers['x-trace-id'] || '');
-        // service name, required
-        const caller = String(request.headers['x-caller'] || 'anonymous');
-        // client ip or caller service ip
-        const ip = String(request.headers['x-ip'] || request.socket.remoteAddress || '');
-        // startup client ip
-        const sourceIP = String(request.headers['x-real-ip'] || '');
-        const { action, params = [] } = body;
-        const context = oox.genContext({ traceId, caller, sourceIP, ip, callerId: '' });
-        const format = await oox.call(action, params, context);
-        this.respond(request, response, format);
-    }
-    /**
-     * HTTP Response Catch
-     */
-    respond(request, response, format) {
-        let formatString = '';
-        try {
-            formatString = JSON.stringify(format);
-        }
-        catch ({ message, stack }) {
-            delete format.body;
-            format.success = false;
-            format.error = {
-                message,
-                stack
-            };
-            formatString = JSON.stringify(format);
-        }
-        response.setHeader('Content-Type', 'application/json');
-        response.setHeader('Content-Length', Buffer.byteLength(formatString));
-        response.end(formatString);
-    }
-    /**
-     * HTTP RPC
-     */
-    async rpc(url, action, params, context) {
-        if (!context || !context.traceId) {
-            context = oox.getContext();
-        }
-        const { traceId, caller, sourceIP } = context;
-        const headers = {
-            'Content-Type': 'application/json',
-            'x-trace-id': String(traceId),
-        };
-        if (caller)
-            headers['x-caller'] = String(caller);
-        if (sourceIP)
-            headers['x-real-ip'] = sourceIP;
-        // headers [ 'x-ip' ] = getIPAddress ( 4 ) [ 0 ]
-        const format = await (0, utils_1.httpRequest)(url, {
-            headers
-        }, JSON.stringify({ action, params }));
-        if ('string' === typeof format)
-            throw new Error(format);
-        const { error, body } = format;
-        if (error) {
-            const asyncError = new Error(error.message);
-            throw asyncError;
-        }
-        else {
-            return body;
-        }
-    }
-}
-exports.default = HTTPModule;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HTTPConfig = void 0;
+const http = require("node:http");
+const utils_1 = require("./utils");
+const oox = require("../../index");
+const module_1 = require("../module");
+class HTTPConfig extends module_1.ModuleConfig {
+    // listen port
+    port = 0;
+    // service path
+    path = '/';
+    // browser cross origin
+    origin = '';
+}
+exports.HTTPConfig = HTTPConfig;
+class HTTPModule extends module_1.default {
+    name = 'oox:http';
+    config = new HTTPConfig;
+    server = null;
+    setConfig(config) {
+        Object.assign(this.config, config);
+    }
+    getConfig() {
+        return this.config;
+    }
+    /**
+     * start http service
+     */
+    async serve() {
+        await this.stop();
+        const { port } = this.config;
+        this.server = http.createServer(this.call.bind(this));
+        this.server.listen(port);
+        const address = this.server.address();
+        if (!address || 'object' !== typeof address)
+            throw new Error('Cannot read http server port');
+        this.config.port = address.port;
+    }
+    /**
+     * stop http service
+     */
+    stop() {
+        if (this.server && this.server.listening)
+            return new Promise((resolve, reject) => {
+                this.server.close(function (error) {
+                    if (error)
+                        reject(error);
+                    else
+                        resolve();
+                });
+            });
+    }
+    /**
+     * browser cross origin
+     */
+    cors(request, response) {
+        // origin checking
+        const origin = this.config.origin;
+        const requestOrigin = request.headers.origin;
+        if (origin && requestOrigin) {
+            if (origin === '*' || origin === requestOrigin || Array.isArray(origin) && origin.includes(requestOrigin)) {
+                response.setHeader('Access-Control-Allow-Origin', requestOrigin);
+                response.setHeader('Vary', 'Origin');
+            }
+            else {
+                response.statusCode = 403;
+                response.end();
+                return false;
+            }
+            response.setHeader('Access-Control-Max-Age', 3600);
+            response.setHeader('Access-Control-Allow-Headers', 'x-caller,content-type');
+            response.setHeader('Access-Control-Allow-Methods', '*');
+        }
+        if (request.method === 'OPTIONS') {
+            response.statusCode = 204;
+            response.end();
+            return false;
+        }
+        return true;
+    }
+    /**
+     * HTTP-RPC服务器请求监听方法
+     */
+    async call(request, response) {
+        if (request.url !== this.config.path) {
+            const error = {
+                message: 'Invalid URL',
+                stack: ''
+            };
+            Error.captureStackTrace(error);
+            return this.respond(request, response, {
+                success: false,
+                error
+            });
+        }
+        if (!this.cors(request, response))
+            return;
+        let body = Object.create(null);
+        try {
+            body = await (0, utils_1.parseHTTPBody)(request);
+            if (!body || 'object' !== typeof body)
+                throw new Error('Content Invalid');
+        }
+        catch (error) {
+            return this.respond(request, response, {
+                success: false,
+                error: {
+                    message: error.message,
+                    stack: error.stack
+                }
+            });
+        }
+        // global unique id
+        const traceId = String(request.headers['x-trace-id'] || '');
+        // service name, required
+        const caller = String(request.headers['x-caller'] || 'anonymous');
+        // client ip or caller service ip
+        const ip = String(request.headers['x-ip'] || request.socket.remoteAddress || '');
+        // startup client ip
+        const sourceIP = String(request.headers['x-real-ip'] || '');
+        const { action, params = [] } = body;
+        const context = oox.genContext({ traceId, caller, sourceIP, ip, callerId: '' });
+        const format = await oox.call(action, params, context);
+        this.respond(request, response, format);
+    }
+    /**
+     * HTTP Response Catch
+     */
+    respond(request, response, format) {
+        let formatString = '';
+        try {
+            formatString = JSON.stringify(format);
+        }
+        catch ({ message, stack }) {
+            delete format.body;
+            format.success = false;
+            format.error = {
+                message,
+                stack
+            };
+            formatString = JSON.stringify(format);
+        }
+        response.setHeader('Content-Type', 'application/json');
+        response.setHeader('Content-Length', Buffer.byteLength(formatString));
+        response.end(formatString);
+    }
+    /**
+     * HTTP RPC
+     */
+    async rpc(url, action, params, context) {
+        if (!context || !context.traceId) {
+            context = oox.getContext();
+        }
+        const { traceId, caller, sourceIP } = context;
+        const headers = {
+            'Content-Type': 'application/json',
+            'x-trace-id': String(traceId),
+        };
+        if (caller)
+            headers['x-caller'] = String(caller);
+        if (sourceIP)
+            headers['x-real-ip'] = sourceIP;
+        // headers [ 'x-ip' ] = getIPAddress ( 4 ) [ 0 ]
+        const format = await (0, utils_1.httpRequest)(url, {
+            headers
+        }, JSON.stringify({ action, params }));
+        if ('string' === typeof format)
+            throw new Error(format);
+        const { error, body } = format;
+        if (error) {
+            const asyncError = new Error(error.message);
+            throw asyncError;
+        }
+        else {
+            return body;
+        }
+    }
+}
+exports.default = HTTPModule;

package/modules/http/utils.js

@@ -1,73 +1,73 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.httpRequest = exports.parseHTTPBody = exports.stream2buffer = void 0;
-const http = require("node:http");
-/**
- * Stream => Buffer
- */
-function stream2buffer(stream, totalLength = 0) {
-    return new Promise(function (resolve, reject) {
-        let buffers = [];
-        stream.on('error', reject);
-        if (totalLength) {
-            stream.on('data', function (data) { buffers.push(data); });
-        }
-        else {
-            stream.on('data', function (data) {
-                buffers.push(data);
-                totalLength += data.length;
-            });
-        }
-        stream.on('end', function () { resolve(Buffer.concat(buffers, totalLength)); });
-    });
-}
-exports.stream2buffer = stream2buffer;
-/**
- * Request => JSONObject
- */
-async function parseHTTPBody(request) {
-    if (request.method === 'GET')
-        return null;
-    let contentType = request.headers['content-type'];
-    // application/json; charset=utf-8
-    if (contentType)
-        contentType = contentType.split(';')[0].trim();
-    const contentSize = request.headers['content-length'];
-    const buffer = await stream2buffer(request, +contentSize || 0);
-    if (contentSize && buffer.length !== +contentSize)
-        throw new Error('Content-Length Incorrect');
-    const bodyString = buffer.toString();
-    if ('application/json' === contentType) {
-        return JSON.parse(bodyString);
-    }
-    else {
-        return bodyString;
-    }
-}
-exports.parseHTTPBody = parseHTTPBody;
-/**
- * http request
- */
-function httpRequest(url, options, body) {
-    return new Promise(function (resolve, reject) {
-        const request = http.request(url, options, async function (response) {
-            try {
-                const result = await parseHTTPBody(response);
-                resolve(result);
-            }
-            catch (error) {
-                const decoration = new Error(`${response.statusCode} - ${error.message}`);
-                reject(decoration);
-            }
-        });
-        request.on('error', reject);
-        if (body) {
-            request.method = 'POST';
-            request.setHeader('Content-Type', 'application/json');
-            request.setHeader('Content-Length', Buffer.byteLength(body));
-            request.write(body);
-        }
-        request.end();
-    });
-}
-exports.httpRequest = httpRequest;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.httpRequest = exports.parseHTTPBody = exports.stream2buffer = void 0;
+const http = require("node:http");
+/**
+ * Stream => Buffer
+ */
+function stream2buffer(stream, totalLength = 0) {
+    return new Promise(function (resolve, reject) {
+        let buffers = [];
+        stream.on('error', reject);
+        if (totalLength) {
+            stream.on('data', function (data) { buffers.push(data); });
+        }
+        else {
+            stream.on('data', function (data) {
+                buffers.push(data);
+                totalLength += data.length;
+            });
+        }
+        stream.on('end', function () { resolve(Buffer.concat(buffers, totalLength)); });
+    });
+}
+exports.stream2buffer = stream2buffer;
+/**
+ * Request => JSONObject
+ */
+async function parseHTTPBody(request) {
+    if (request.method === 'GET')
+        return null;
+    let contentType = request.headers['content-type'];
+    // application/json; charset=utf-8
+    if (contentType)
+        contentType = contentType.split(';')[0].trim();
+    const contentSize = request.headers['content-length'];
+    const buffer = await stream2buffer(request, +contentSize || 0);
+    if (contentSize && buffer.length !== +contentSize)
+        throw new Error('Content-Length Incorrect');
+    const bodyString = buffer.toString();
+    if ('application/json' === contentType) {
+        return JSON.parse(bodyString);
+    }
+    else {
+        return bodyString;
+    }
+}
+exports.parseHTTPBody = parseHTTPBody;
+/**
+ * http request
+ */
+function httpRequest(url, options, body) {
+    return new Promise(function (resolve, reject) {
+        const request = http.request(url, options, async function (response) {
+            try {
+                const result = await parseHTTPBody(response);
+                resolve(result);
+            }
+            catch (error) {
+                const decoration = new Error(`${response.statusCode} - ${error.message}`);
+                reject(decoration);
+            }
+        });
+        request.on('error', reject);
+        if (body) {
+            request.method = 'POST';
+            request.setHeader('Content-Type', 'application/json');
+            request.setHeader('Content-Length', Buffer.byteLength(body));
+            request.write(body);
+        }
+        request.end();
+    });
+}
+exports.httpRequest = httpRequest;

package/modules/index.js

@@ -1,88 +1,68 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = require("node:path");
-const module_1 = require("./module");
-const http_1 = require("./http");
-const socketio_1 = require("./socketio");
-class Modules extends module_1.default {
-    /**
-     * the module unique name
-     */
-    name = 'oox:modules';
-    /**
-     * FIFO queue for modules starting
-     */
-    #queue = [];
-    /**
-     * all modules map
-     */
-    #map = new Map();
-    /**
-     * all builtin modules
-     */
-    builtins = {
-        http: new http_1.default,
-        socketio: new socketio_1.default
-    };
-    constructor() {
-        super();
-        this.add(this.builtins.http)
-            .add(this.builtins.socketio);
-    }
-    add(module) {
-        if (!module.name || 'string' !== typeof module.name)
-            throw new Error(`Module<${module.name}> has noname`);
-        if (this.#map.has(module.name))
-            throw new Error(`Module<${module.name}> has exists`);
-        this.#map.set(module.name, module);
-        this.#queue.push(module);
-        return this;
-    }
-    get(name) {
-        return this.#map.get(name);
-    }
-    async remove(name) {
-        const module = this.get(name);
-        if (!module)
-            return;
-        await module.stop();
-        const index = this.#queue.indexOf(module);
-        this.#queue.splice(index, 1);
-        this.#map.delete(name);
-    }
-    async serve() {
-        try {
-            for (const module of this.#queue) {
-                if (module.name === 'oox:socketio') {
-                    // http & socketio shared port
-                    const _socketio = module, _http = this.builtins.http;
-                    const httpConfig = this.builtins.http.getConfig(), socketioConfig = _socketio.getConfig();
-                    let isShareServer = false;
-                    // 都没设置端口
-                    isShareServer = !httpConfig.port && !socketioConfig.port;
-                    // 都设置相同端口
-                    isShareServer = isShareServer || httpConfig.port === socketioConfig.port;
-                    // http 模块未被禁用
-                    isShareServer = isShareServer && !httpConfig.disabled;
-                    if (isShareServer) {
-                        socketioConfig.path = path.posix.join(httpConfig.path, socketioConfig.path);
-                        _socketio.server = _http.server;
-                    }
-                }
-                if (!module.getConfig().disabled) {
-                    await module.serve();
-                }
-            }
-        }
-        catch (error) {
-            await this.stop();
-            throw error;
-        }
-    }
-    async stop() {
-        for (const module of this.#queue) {
-            await module.stop();
-        }
-    }
-}
-exports.default = Modules;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const module_1 = require("./module");
+const http_1 = require("./http");
+class Modules extends module_1.default {
+    /**
+     * the module unique name
+     */
+    name = 'oox:modules';
+    /**
+     * FIFO queue for modules starting
+     */
+    #queue = [];
+    /**
+     * all modules map
+     */
+    #map = new Map();
+    /**
+     * all builtin modules
+     */
+    builtins = {
+        http: new http_1.default,
+    };
+    constructor() {
+        super();
+        this.add(this.builtins.http);
+    }
+    add(module) {
+        if (!module.name || 'string' !== typeof module.name)
+            throw new Error(`Module<${module.name}> has noname`);
+        if (this.#map.has(module.name))
+            throw new Error(`Module<${module.name}> has exists`);
+        this.#map.set(module.name, module);
+        this.#queue.push(module);
+        return this;
+    }
+    get(name) {
+        return this.#map.get(name);
+    }
+    async remove(name) {
+        const module = this.get(name);
+        if (!module)
+            return;
+        await module.stop();
+        const index = this.#queue.indexOf(module);
+        this.#queue.splice(index, 1);
+        this.#map.delete(name);
+    }
+    async serve() {
+        try {
+            for (const module of this.#queue) {
+                if (!module.getConfig().disabled) {
+                    await module.serve();
+                }
+            }
+        }
+        catch (error) {
+            await this.stop();
+            throw error;
+        }
+    }
+    async stop() {
+        for (const module of this.#queue) {
+            await module.stop();
+        }
+    }
+}
+exports.default = Modules;