@nocobase/server 1.4.0-beta.9 → 1.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/gateway/index.js +0 -5
- package/lib/plugin.js +2 -0
- package/package.json +14 -14
package/lib/gateway/index.js
CHANGED
|
@@ -161,9 +161,7 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
|
|
|
161
161
|
res.end(JSON.stringify({ error }));
|
|
162
162
|
}
|
|
163
163
|
responseErrorWithCode(code, res, options) {
|
|
164
|
-
const log = this.getLogger(options.appName, res);
|
|
165
164
|
const error = (0, import_errors.applyErrorWithArgs)((0, import_errors.getErrorWithCode)(code), options);
|
|
166
|
-
log.error(error.message, { method: "responseErrorWithCode", error });
|
|
167
165
|
this.responseError(res, error);
|
|
168
166
|
}
|
|
169
167
|
async requestHandler(req, res) {
|
|
@@ -206,14 +204,12 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
|
|
|
206
204
|
});
|
|
207
205
|
}
|
|
208
206
|
const handleApp = await this.getRequestHandleAppName(req);
|
|
209
|
-
const log = this.getLogger(handleApp, res);
|
|
210
207
|
const hasApp = import_app_supervisor.AppSupervisor.getInstance().hasApp(handleApp);
|
|
211
208
|
if (!hasApp) {
|
|
212
209
|
void import_app_supervisor.AppSupervisor.getInstance().bootStrapApp(handleApp);
|
|
213
210
|
}
|
|
214
211
|
let appStatus = import_app_supervisor.AppSupervisor.getInstance().getAppStatus(handleApp, "initializing");
|
|
215
212
|
if (appStatus === "not_found") {
|
|
216
|
-
log.warn(`app not found`, { method: "requestHandler" });
|
|
217
213
|
this.responseErrorWithCode("APP_NOT_FOUND", res, { appName: handleApp });
|
|
218
214
|
return;
|
|
219
215
|
}
|
|
@@ -228,7 +224,6 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
|
|
|
228
224
|
}
|
|
229
225
|
const app = await import_app_supervisor.AppSupervisor.getInstance().getApp(handleApp);
|
|
230
226
|
if (appStatus !== "running") {
|
|
231
|
-
log.warn(`app is not running`, { method: "requestHandler", status: appStatus });
|
|
232
227
|
this.responseErrorWithCode(`${appStatus}`, res, { app, appName: handleApp });
|
|
233
228
|
return;
|
|
234
229
|
}
|
package/lib/plugin.js
CHANGED
|
@@ -168,6 +168,7 @@ const _Plugin = class _Plugin {
|
|
|
168
168
|
}
|
|
169
169
|
async getPluginBasePath() {
|
|
170
170
|
if (!this.options.packageName) {
|
|
171
|
+
this.app.log.trace(`plugin '${this.name}' is missing packageName`);
|
|
171
172
|
return;
|
|
172
173
|
}
|
|
173
174
|
return (0, import_utils2.getPluginBasePath)(this.options.packageName);
|
|
@@ -182,6 +183,7 @@ const _Plugin = class _Plugin {
|
|
|
182
183
|
}
|
|
183
184
|
const directory = (0, import_path.resolve)(basePath, "server/collections");
|
|
184
185
|
if (await (0, import_utils.fsExists)(directory)) {
|
|
186
|
+
this.app.log.trace(`load plugin collections [${this.name}]`);
|
|
185
187
|
await this.db.import({
|
|
186
188
|
directory,
|
|
187
189
|
from: this.options.packageName
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nocobase/server",
|
|
3
|
-
"version": "1.4.
|
|
3
|
+
"version": "1.4.1",
|
|
4
4
|
"main": "lib/index.js",
|
|
5
5
|
"types": "./lib/index.d.ts",
|
|
6
6
|
"license": "AGPL-3.0",
|
|
@@ -10,18 +10,18 @@
|
|
|
10
10
|
"@koa/cors": "^3.1.0",
|
|
11
11
|
"@koa/multer": "^3.0.2",
|
|
12
12
|
"@koa/router": "^9.4.0",
|
|
13
|
-
"@nocobase/acl": "1.4.
|
|
14
|
-
"@nocobase/actions": "1.4.
|
|
15
|
-
"@nocobase/auth": "1.4.
|
|
16
|
-
"@nocobase/cache": "1.4.
|
|
17
|
-
"@nocobase/data-source-manager": "1.4.
|
|
18
|
-
"@nocobase/database": "1.4.
|
|
19
|
-
"@nocobase/evaluators": "1.4.
|
|
20
|
-
"@nocobase/logger": "1.4.
|
|
21
|
-
"@nocobase/resourcer": "1.4.
|
|
22
|
-
"@nocobase/sdk": "1.4.
|
|
23
|
-
"@nocobase/telemetry": "1.4.
|
|
24
|
-
"@nocobase/utils": "1.4.
|
|
13
|
+
"@nocobase/acl": "1.4.1",
|
|
14
|
+
"@nocobase/actions": "1.4.1",
|
|
15
|
+
"@nocobase/auth": "1.4.1",
|
|
16
|
+
"@nocobase/cache": "1.4.1",
|
|
17
|
+
"@nocobase/data-source-manager": "1.4.1",
|
|
18
|
+
"@nocobase/database": "1.4.1",
|
|
19
|
+
"@nocobase/evaluators": "1.4.1",
|
|
20
|
+
"@nocobase/logger": "1.4.1",
|
|
21
|
+
"@nocobase/resourcer": "1.4.1",
|
|
22
|
+
"@nocobase/sdk": "1.4.1",
|
|
23
|
+
"@nocobase/telemetry": "1.4.1",
|
|
24
|
+
"@nocobase/utils": "1.4.1",
|
|
25
25
|
"@types/decompress": "4.2.7",
|
|
26
26
|
"@types/ini": "^1.3.31",
|
|
27
27
|
"@types/koa-send": "^4.1.3",
|
|
@@ -54,5 +54,5 @@
|
|
|
54
54
|
"@types/serve-handler": "^6.1.1",
|
|
55
55
|
"@types/ws": "^8.5.5"
|
|
56
56
|
},
|
|
57
|
-
"gitHead": "
|
|
57
|
+
"gitHead": "db321e5213768ee9e357fbb55fc7120e2e308d6e"
|
|
58
58
|
}
|