From fad76fa8a0e72c6a6325b40be3cf48394b5ecb70 Mon Sep 17 00:00:00 2001 From: "Xc@centOs" Date: Fri, 15 Dec 2023 17:40:55 +0800 Subject: [PATCH] =?UTF-8?q?staging=E7=8E=AF=E5=A2=83=E4=B9=9F=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E8=B7=A8=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/server/start.js | 7 +++++-- lib/template.js | 8 ++++++-- src/server/start.ts | 8 ++++++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/lib/server/start.js b/lib/server/start.js index a09e9ee..8e84a29 100644 --- a/lib/server/start.js +++ b/lib/server/start.js @@ -15,6 +15,7 @@ const socket_io_1 = require("socket.io"); const cluster_adapter_1 = require("@socket.io/cluster-adapter"); const sticky_1 = require("@socket.io/sticky"); const DATA_SUBSCRIBER_NAMESPACE = '/ds'; +const SERVER_SUBSCRIBER_NAMESPACE = process.env.OAK_SSUB_NAMESPACE || '/ssub'; async function startup(path, contextBuilder, connector, omitWatchers, omitTimers, routine) { const koa = new koa_1.default(); // socket @@ -39,7 +40,9 @@ async function startup(path, contextBuilder, connector, omitWatchers, omitTimers else { console.log('以单实例模式启动'); } - const appLoader = clusterInfo.usingCluster ? new oak_backend_base_1.ClusterAppLoader(path, contextBuilder, io.of(DATA_SUBSCRIBER_NAMESPACE)) : new oak_backend_base_1.AppLoader(path, contextBuilder, io.of(DATA_SUBSCRIBER_NAMESPACE)); + const appLoader = clusterInfo.usingCluster + ? new oak_backend_base_1.ClusterAppLoader(path, contextBuilder, io.of(DATA_SUBSCRIBER_NAMESPACE), io.of(SERVER_SUBSCRIBER_NAMESPACE), connector.getSubscribeRouter()) + : new oak_backend_base_1.AppLoader(path, contextBuilder); await appLoader.mount(); await appLoader.execStartRoutines(); if (routine) { @@ -67,7 +70,7 @@ async function startup(path, contextBuilder, connector, omitWatchers, omitTimers const router = new koa_router_1.default(); const serverConfig = require(path_1.default.join(path, '/configuration/server.json')); // 如果是开发环境，允许options - if (process.env.NODE_ENV === 'development') { + if (['development', 'staging'].includes(process.env.NODE_ENV)) { koa.use(async (ctx, next) => { ctx.set('Access-Control-Allow-Origin', '*'); ctx.set('Access-Control-Allow-Headers', 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With, oak-cxt, oak-aspect'); diff --git a/lib/template.js b/lib/template.js index 1bd5f49..b9865bc 100644 --- a/lib/template.js +++ b/lib/template.js @@ -5,7 +5,9 @@ function packageJsonContent({ name, version, description, cliVersion, cliName, c let oakDependencyStr; let oakDevDependencyStr; if (isDev) { - oakDependencyStr = `"oak-common-aspect": "file:../oak-common-aspect", + oakDependencyStr = ` + "oak-backend-base": "file:../oak-backend-base", + "oak-common-aspect": "file:../oak-common-aspect", "oak-db": "file:../oak-db", "oak-domain": "file:../oak-domain", "oak-external-sdk": "file:../oak-external-sdk", @@ -16,7 +18,9 @@ function packageJsonContent({ name, version, description, cliVersion, cliName, c } else { // todo，这里从npmjs.org上获取最新版本 - oakDependencyStr = `"oak-common-aspect": "^2.1.0", + oakDependencyStr = ` + "oak-backend-base": "^3.2.0", + "oak-common-aspect": "^2.1.0", "oak-db": "^2.1.1", "oak-domain": "^2.1.0", "oak-external-sdk": "^1.0.5", diff --git a/src/server/start.ts b/src/server/start.ts index eac0c96..3a59f1b 100644 --- a/src/server/start.ts +++ b/src/server/start.ts @@ -16,6 +16,8 @@ import { createAdapter } from "@socket.io/cluster-adapter"; import { setupWorker } from "@socket.io/sticky"; const DATA_SUBSCRIBER_NAMESPACE = '/ds'; +const SERVER_SUBSCRIBER_NAMESPACE = process.env.OAK_SSUB_NAMESPACE || '/ssub'; + export async function startup, FrontCxt extends SyncContext>( path: string, contextBuilder: (scene?: string) => (store: AsyncRowStore, header?: IncomingHttpHeaders, clusterInfo?: ClusterInfo) => Promise, @@ -48,7 +50,9 @@ export async function startup { ctx.set('Access-Control-Allow-Origin', '*'); ctx.set('Access-Control-Allow-Headers', 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With, oak-cxt, oak-aspect');