miqro 7.2.6 → 7.2.7
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/README.md +1 -21
- package/build/esm/src/bin/compile.js +0 -1
- package/build/esm/src/bin/doc-md.js +0 -1
- package/build/esm/src/bin/generate-doc.js +0 -1
- package/build/esm/src/bin/test.js +0 -1
- package/build/esm/src/bin/types.js +0 -1
- package/build/esm/src/cluster.js +0 -1
- package/build/esm/src/common/arguments.js +0 -1
- package/build/esm/src/common/assets.js +2 -3
- package/build/esm/src/common/checksum.js +0 -1
- package/build/esm/src/common/constants.js +0 -1
- package/build/esm/src/common/content-type.js +0 -1
- package/build/esm/src/common/esbuild.js +0 -1
- package/build/esm/src/common/exit.js +0 -1
- package/build/esm/src/common/fs.js +0 -1
- package/build/esm/src/common/help.js +0 -1
- package/build/esm/src/common/jsx.js +0 -1
- package/build/esm/src/common/jwt.js +0 -1
- package/build/esm/src/common/paths.js +0 -1
- package/build/esm/src/common/watch.js +0 -1
- package/build/esm/src/inflate/inflate-sea.js +0 -1
- package/build/esm/src/inflate/inflate.js +0 -1
- package/build/esm/src/inflate/md.js +0 -1
- package/build/esm/src/inflate/setup-auth.js +0 -1
- package/build/esm/src/inflate/setup-cors.js +0 -1
- package/build/esm/src/inflate/setup-db.js +0 -1
- package/build/esm/src/inflate/setup-error.js +0 -1
- package/build/esm/src/inflate/setup-http.js +0 -1
- package/build/esm/src/inflate/setup-log.js +0 -1
- package/build/esm/src/inflate/setup-middleware.js +0 -1
- package/build/esm/src/inflate/setup-server-config.js +0 -1
- package/build/esm/src/inflate/setup-test.js +0 -1
- package/build/esm/src/inflate/setup-ws.js +0 -1
- package/build/esm/src/inflate/setup.doc.js +0 -1
- package/build/esm/src/inflate/utils/sea-utils.js +0 -1
- package/build/esm/src/lib.js +0 -1
- package/build/esm/src/main.js +0 -1
- package/build/esm/src/services/app.js +1 -1
- package/build/esm/src/services/editor.js +10 -12
- package/build/esm/src/services/hot-reload.js +0 -1
- package/build/esm/src/services/migrations.js +0 -1
- package/build/esm/src/services/utils/admin-interface.js +0 -1
- package/build/esm/src/services/utils/cache.js +0 -1
- package/build/esm/src/services/utils/cluster-cache.js +0 -1
- package/build/esm/src/services/utils/cluster-ws.js +0 -1
- package/build/esm/src/services/utils/db-manager.js +0 -1
- package/build/esm/src/services/utils/get-route.js +0 -1
- package/build/esm/src/services/utils/jwt.js +0 -1
- package/build/esm/src/services/utils/log-transport.js +0 -1
- package/build/esm/src/services/utils/log.js +0 -1
- package/build/esm/src/services/utils/middleware.js +0 -1
- package/build/esm/src/services/utils/server-interface.js +0 -1
- package/build/esm/src/services/utils/websocketmanager.d.ts +2 -0
- package/build/esm/src/services/utils/websocketmanager.js +8 -2
- package/build/esm/src/types.js +0 -1
- package/build/lib.cjs +27 -29
- package/build/style.css +3 -3
- package/package.json +2 -2
- package/build/esm/editor/auth.d.ts +0 -6
- package/build/esm/editor/auth.js +0 -43
- package/build/esm/editor/auth.js.map +0 -1
- package/build/esm/editor/common/admin-interface.d.ts +0 -36
- package/build/esm/editor/common/admin-interface.js +0 -45
- package/build/esm/editor/common/admin-interface.js.map +0 -1
- package/build/esm/editor/common/constants.d.ts +0 -4
- package/build/esm/editor/common/constants.js +0 -21
- package/build/esm/editor/common/constants.js.map +0 -1
- package/build/esm/editor/common/constants.server.d.ts +0 -2
- package/build/esm/editor/common/constants.server.js +0 -5
- package/build/esm/editor/common/constants.server.js.map +0 -1
- package/build/esm/editor/common/editor-index.d.ts +0 -2
- package/build/esm/editor/common/editor-index.js +0 -15
- package/build/esm/editor/common/editor-index.js.map +0 -1
- package/build/esm/editor/common/html-encode.d.ts +0 -1
- package/build/esm/editor/common/html-encode.js +0 -15
- package/build/esm/editor/common/html-encode.js.map +0 -1
- package/build/esm/editor/common/log-socket.d.ts +0 -15
- package/build/esm/editor/common/log-socket.js +0 -72
- package/build/esm/editor/common/log-socket.js.map +0 -1
- package/build/esm/editor/common/templates.d.ts +0 -11
- package/build/esm/editor/common/templates.js +0 -478
- package/build/esm/editor/common/templates.js.map +0 -1
- package/build/esm/editor/components/api-preview.d.ts +0 -11
- package/build/esm/editor/components/api-preview.js +0 -93
- package/build/esm/editor/components/api-preview.js.map +0 -1
- package/build/esm/editor/components/editor.d.ts +0 -16
- package/build/esm/editor/components/editor.js +0 -368
- package/build/esm/editor/components/editor.js.map +0 -1
- package/build/esm/editor/components/file-browser.d.ts +0 -37
- package/build/esm/editor/components/file-browser.js +0 -128
- package/build/esm/editor/components/file-browser.js.map +0 -1
- package/build/esm/editor/components/file-editor-toolbar.d.ts +0 -22
- package/build/esm/editor/components/file-editor-toolbar.js +0 -96
- package/build/esm/editor/components/file-editor-toolbar.js.map +0 -1
- package/build/esm/editor/components/file-editor.d.ts +0 -32
- package/build/esm/editor/components/file-editor.js +0 -62
- package/build/esm/editor/components/file-editor.js.map +0 -1
- package/build/esm/editor/components/filter-query.d.ts +0 -1
- package/build/esm/editor/components/filter-query.js +0 -24
- package/build/esm/editor/components/filter-query.js.map +0 -1
- package/build/esm/editor/components/highlight-text-area.d.ts +0 -11
- package/build/esm/editor/components/highlight-text-area.js +0 -128
- package/build/esm/editor/components/highlight-text-area.js.map +0 -1
- package/build/esm/editor/components/log-viewer.d.ts +0 -6
- package/build/esm/editor/components/log-viewer.js +0 -72
- package/build/esm/editor/components/log-viewer.js.map +0 -1
- package/build/esm/editor/components/new-file.d.ts +0 -10
- package/build/esm/editor/components/new-file.js +0 -120
- package/build/esm/editor/components/new-file.js.map +0 -1
- package/build/esm/editor/components/scroll-query.d.ts +0 -7
- package/build/esm/editor/components/scroll-query.js +0 -23
- package/build/esm/editor/components/scroll-query.js.map +0 -1
- package/build/esm/editor/components/start-page.d.ts +0 -13
- package/build/esm/editor/components/start-page.js +0 -33
- package/build/esm/editor/components/start-page.js.map +0 -1
- package/build/esm/editor/http/admin/editor/api/fs/delete.api.d.ts +0 -4
- package/build/esm/editor/http/admin/editor/api/fs/delete.api.js +0 -31
- package/build/esm/editor/http/admin/editor/api/fs/delete.api.js.map +0 -1
- package/build/esm/editor/http/admin/editor/api/fs/read.api.d.ts +0 -7
- package/build/esm/editor/http/admin/editor/api/fs/read.api.js +0 -51
- package/build/esm/editor/http/admin/editor/api/fs/read.api.js.map +0 -1
- package/build/esm/editor/http/admin/editor/api/fs/rename.api.d.ts +0 -7
- package/build/esm/editor/http/admin/editor/api/fs/rename.api.js +0 -41
- package/build/esm/editor/http/admin/editor/api/fs/rename.api.js.map +0 -1
- package/build/esm/editor/http/admin/editor/api/fs/scan.api.d.ts +0 -26
- package/build/esm/editor/http/admin/editor/api/fs/scan.api.js +0 -151
- package/build/esm/editor/http/admin/editor/api/fs/scan.api.js.map +0 -1
- package/build/esm/editor/http/admin/editor/api/fs/write.api.d.ts +0 -3
- package/build/esm/editor/http/admin/editor/api/fs/write.api.js +0 -40
- package/build/esm/editor/http/admin/editor/api/fs/write.api.js.map +0 -1
- package/build/esm/editor/http/admin/editor/api/server/reload.api.d.ts +0 -10
- package/build/esm/editor/http/admin/editor/api/server/reload.api.js +0 -47
- package/build/esm/editor/http/admin/editor/api/server/reload.api.js.map +0 -1
- package/build/esm/editor/http/admin/editor/api/server/restart.api.d.ts +0 -10
- package/build/esm/editor/http/admin/editor/api/server/restart.api.js +0 -47
- package/build/esm/editor/http/admin/editor/api/server/restart.api.js.map +0 -1
- package/build/esm/editor/http/admin/editor/editor.d.ts +0 -1
- package/build/esm/editor/http/admin/editor/editor.js +0 -9
- package/build/esm/editor/http/admin/editor/editor.js.map +0 -1
- package/build/esm/editor/http/admin/editor/index.api.d.ts +0 -3
- package/build/esm/editor/http/admin/editor/index.api.js +0 -23
- package/build/esm/editor/http/admin/editor/index.api.js.map +0 -1
- package/build/esm/editor/server.d.ts +0 -3
- package/build/esm/editor/server.js +0 -50
- package/build/esm/editor/server.js.map +0 -1
- package/build/esm/editor/ws.d.ts +0 -3
- package/build/esm/editor/ws.js +0 -12
- package/build/esm/editor/ws.js.map +0 -1
- package/build/esm/src/bin/compile.js.map +0 -1
- package/build/esm/src/bin/doc-md.js.map +0 -1
- package/build/esm/src/bin/generate-doc.js.map +0 -1
- package/build/esm/src/bin/test.js.map +0 -1
- package/build/esm/src/bin/types.js.map +0 -1
- package/build/esm/src/cluster.js.map +0 -1
- package/build/esm/src/common/arguments.js.map +0 -1
- package/build/esm/src/common/assets.js.map +0 -1
- package/build/esm/src/common/checksum.js.map +0 -1
- package/build/esm/src/common/constants.js.map +0 -1
- package/build/esm/src/common/content-type.js.map +0 -1
- package/build/esm/src/common/esbuild.js.map +0 -1
- package/build/esm/src/common/exit.js.map +0 -1
- package/build/esm/src/common/fs.js.map +0 -1
- package/build/esm/src/common/help.js.map +0 -1
- package/build/esm/src/common/jsx.js.map +0 -1
- package/build/esm/src/common/jwt.js.map +0 -1
- package/build/esm/src/common/paths.js.map +0 -1
- package/build/esm/src/common/watch.js.map +0 -1
- package/build/esm/src/inflate/inflate-sea.js.map +0 -1
- package/build/esm/src/inflate/inflate.js.map +0 -1
- package/build/esm/src/inflate/md.js.map +0 -1
- package/build/esm/src/inflate/setup-auth.js.map +0 -1
- package/build/esm/src/inflate/setup-cors.js.map +0 -1
- package/build/esm/src/inflate/setup-db.js.map +0 -1
- package/build/esm/src/inflate/setup-error.js.map +0 -1
- package/build/esm/src/inflate/setup-http.js.map +0 -1
- package/build/esm/src/inflate/setup-log.js.map +0 -1
- package/build/esm/src/inflate/setup-middleware.js.map +0 -1
- package/build/esm/src/inflate/setup-server-config.js.map +0 -1
- package/build/esm/src/inflate/setup-test.js.map +0 -1
- package/build/esm/src/inflate/setup-ws.js.map +0 -1
- package/build/esm/src/inflate/setup.doc.js.map +0 -1
- package/build/esm/src/inflate/utils/sea-utils.js.map +0 -1
- package/build/esm/src/lib.js.map +0 -1
- package/build/esm/src/main.js.map +0 -1
- package/build/esm/src/services/app.js.map +0 -1
- package/build/esm/src/services/editor.js.map +0 -1
- package/build/esm/src/services/hot-reload.js.map +0 -1
- package/build/esm/src/services/migrations.js.map +0 -1
- package/build/esm/src/services/utils/admin-interface.js.map +0 -1
- package/build/esm/src/services/utils/cache.js.map +0 -1
- package/build/esm/src/services/utils/cluster-cache.js.map +0 -1
- package/build/esm/src/services/utils/cluster-ws.js.map +0 -1
- package/build/esm/src/services/utils/db-manager.js.map +0 -1
- package/build/esm/src/services/utils/get-route.js.map +0 -1
- package/build/esm/src/services/utils/jwt.js.map +0 -1
- package/build/esm/src/services/utils/log-transport.js.map +0 -1
- package/build/esm/src/services/utils/log.js.map +0 -1
- package/build/esm/src/services/utils/middleware.js.map +0 -1
- package/build/esm/src/services/utils/server-interface.js.map +0 -1
- package/build/esm/src/services/utils/websocketmanager.js.map +0 -1
- package/build/esm/src/types.js.map +0 -1
- package/build/font.ttf +0 -0
- package/editor/auth.ts +0 -52
- package/editor/common/admin-interface.ts +0 -84
- package/editor/common/constants.server.ts +0 -5
- package/editor/common/constants.ts +0 -21
- package/editor/common/editor-index.tsx +0 -17
- package/editor/common/html-encode.ts +0 -14
- package/editor/common/log-socket.tsx +0 -87
- package/editor/common/templates.ts +0 -481
- package/editor/components/api-preview.tsx +0 -118
- package/editor/components/editor.tsx +0 -496
- package/editor/components/file-browser.tsx +0 -311
- package/editor/components/file-editor-toolbar.tsx +0 -194
- package/editor/components/file-editor.tsx +0 -125
- package/editor/components/filter-query.tsx +0 -26
- package/editor/components/highlight-text-area.tsx +0 -148
- package/editor/components/log-viewer.tsx +0 -113
- package/editor/components/new-file.tsx +0 -172
- package/editor/components/scroll-query.tsx +0 -25
- package/editor/components/start-page.tsx +0 -52
- package/editor/http/admin/editor/api/fs/delete.api.tsx +0 -32
- package/editor/http/admin/editor/api/fs/read.api.tsx +0 -55
- package/editor/http/admin/editor/api/fs/rename.api.tsx +0 -41
- package/editor/http/admin/editor/api/fs/scan.api.tsx +0 -181
- package/editor/http/admin/editor/api/fs/write.api.tsx +0 -41
- package/editor/http/admin/editor/api/server/reload.api.ts +0 -53
- package/editor/http/admin/editor/api/server/restart.api.tsx +0 -52
- package/editor/http/admin/editor/editor.tsx +0 -10
- package/editor/http/admin/editor/index.api.tsx +0 -42
- package/editor/server.ts +0 -57
- package/editor/ws.ts +0 -15
- package/src/bin/compile.ts +0 -35
- package/src/bin/doc-md.ts +0 -210
- package/src/bin/generate-doc.ts +0 -64
- package/src/bin/test.ts +0 -93
- package/src/bin/types.ts +0 -34
- package/src/cluster.ts +0 -27
- package/src/common/arguments.ts +0 -853
- package/src/common/assets.ts +0 -148
- package/src/common/checksum.ts +0 -58
- package/src/common/constants.ts +0 -19
- package/src/common/content-type.ts +0 -84
- package/src/common/esbuild.ts +0 -103
- package/src/common/exit.ts +0 -91
- package/src/common/fs.ts +0 -82
- package/src/common/help.ts +0 -65
- package/src/common/jsx.ts +0 -574
- package/src/common/jwt.ts +0 -85
- package/src/common/paths.ts +0 -107
- package/src/common/watch.ts +0 -88
- package/src/inflate/inflate-sea.ts +0 -268
- package/src/inflate/inflate.ts +0 -105
- package/src/inflate/md.ts +0 -25
- package/src/inflate/setup-auth.ts +0 -41
- package/src/inflate/setup-cors.ts +0 -42
- package/src/inflate/setup-db.ts +0 -117
- package/src/inflate/setup-error.ts +0 -44
- package/src/inflate/setup-http.ts +0 -720
- package/src/inflate/setup-log.ts +0 -45
- package/src/inflate/setup-middleware.ts +0 -47
- package/src/inflate/setup-server-config.ts +0 -48
- package/src/inflate/setup-test.ts +0 -23
- package/src/inflate/setup-ws.ts +0 -50
- package/src/inflate/setup.doc.ts +0 -92
- package/src/inflate/utils/sea-utils.ts +0 -14
- package/src/lib.ts +0 -35
- package/src/main.ts +0 -107
- package/src/services/app.ts +0 -750
- package/src/services/editor.tsx +0 -101
- package/src/services/globals.ts.ignore +0 -186
- package/src/services/hot-reload.ts +0 -55
- package/src/services/migrations.ts +0 -68
- package/src/services/utils/admin-interface.ts +0 -37
- package/src/services/utils/cache.ts +0 -88
- package/src/services/utils/cluster-cache.ts +0 -255
- package/src/services/utils/cluster-ws.ts +0 -202
- package/src/services/utils/db-manager.ts +0 -92
- package/src/services/utils/get-route.ts +0 -70
- package/src/services/utils/jwt.ts +0 -25
- package/src/services/utils/log-transport.ts +0 -81
- package/src/services/utils/log.ts +0 -92
- package/src/services/utils/middleware.ts +0 -10
- package/src/services/utils/server-interface.ts +0 -122
- package/src/services/utils/websocketmanager.ts +0 -158
- package/src/types.ts +0 -287
package/README.md
CHANGED
|
@@ -11,7 +11,7 @@ runtime dependencies: `jose`, `esbuild`, `cookie`, `showdown`
|
|
|
11
11
|
- **REST API** endpoints with request/response validation
|
|
12
12
|
- **database** — `sqlite3`, `node:sqlite`, `postgres` with migrations
|
|
13
13
|
- **cluster** — multi-worker with shared cache and hot reload
|
|
14
|
-
- **NODE:SEA** — single binary, no Node.js required on target machine
|
|
14
|
+
- **NODE:SEA** — compile to single binary, no Node.js required on target machine
|
|
15
15
|
- **built-in editor**, **test runner**, **API doc generation**
|
|
16
16
|
|
|
17
17
|
## packages
|
|
@@ -107,12 +107,6 @@ service folders can be npm packages:
|
|
|
107
107
|
|
|
108
108
|
## installation
|
|
109
109
|
|
|
110
|
-
### standalone binary (no Node.js required) ( Not Up-To-Date versions )
|
|
111
|
-
|
|
112
|
-
download from [releases](https://github.com/claukers/miqro/releases). (diff release cycle so expect OLD versions published)
|
|
113
|
-
|
|
114
|
-
for newer releases use the npm install and the npx miqro --compile to produce a standalone binary of the app
|
|
115
|
-
|
|
116
110
|
### npm
|
|
117
111
|
|
|
118
112
|
```
|
|
@@ -1097,18 +1091,4 @@ CLUSTER_COUNT number of cluster workers
|
|
|
1097
1091
|
```
|
|
1098
1092
|
npm install
|
|
1099
1093
|
npm run build
|
|
1100
|
-
```
|
|
1101
|
-
|
|
1102
|
-
### SEA binary
|
|
1103
|
-
|
|
1104
|
-
```
|
|
1105
|
-
npm install
|
|
1106
|
-
npm run precompile
|
|
1107
|
-
npm run compile
|
|
1108
|
-
```
|
|
1109
|
-
|
|
1110
|
-
binaries in `bin/`.
|
|
1111
|
-
|
|
1112
|
-
```
|
|
1113
|
-
./bin/linux-x64/miqro --help
|
|
1114
1094
|
```
|
package/build/esm/src/cluster.js
CHANGED
|
@@ -26,8 +26,8 @@ const ASSETS_ROUTER = {
|
|
|
26
26
|
// "types.json": "sea/types.json",
|
|
27
27
|
"assets.base64.json": "sea/assets.base64.json",
|
|
28
28
|
"editor-assets/editor.bundle.js": "build/editor.bundle.js",
|
|
29
|
-
"editor-assets/style.css": "build/style.css"
|
|
30
|
-
"editor-assets/font.ttf": "build/font.ttf"
|
|
29
|
+
"editor-assets/style.css": "build/style.css"
|
|
30
|
+
//"editor-assets/font.ttf": "build/font.ttf"
|
|
31
31
|
};
|
|
32
32
|
export function getAsset(key) {
|
|
33
33
|
if (isSea()) {
|
|
@@ -142,4 +142,3 @@ export async function initAsset(logger, path, buffer, executable, checksum, logI
|
|
|
142
142
|
}
|
|
143
143
|
}
|
|
144
144
|
}
|
|
145
|
-
//# sourceMappingURL=assets.js.map
|
|
@@ -12,4 +12,3 @@ export const HOT_RELOAD_PATH = "/hot-reload";
|
|
|
12
12
|
export const HOT_RELOAD_SCRIPT_PATH = "/hot-reload.js";
|
|
13
13
|
//export const SERVER_IDENTIFIER = cluster.isPrimary ? "SERVER" : process.env["CLUSTER_NODE_NUMBER"] ? `WORKER_${process.env["CLUSTER_NODE_NUMBER"]}` : "WORKER";
|
|
14
14
|
//export const DB_IDENTIFIER = cluster.isPrimary ? "DATABASE" : process.env["CLUSTER_NODE_NUMBER"] ? `WORKER_${process.env["CLUSTER_NODE_NUMBER"]}_DATABASE` : "WORKER_DATABASE";
|
|
15
|
-
//# sourceMappingURL=constants.js.map
|
|
@@ -60,4 +60,3 @@ DB_CONNECTION\n\toverride the default connection url
|
|
|
60
60
|
CLEAR_JSX_CACHE\n\tset to 1 or 0 to enable or disable the clearing of the esbuild cache defaults to 1.
|
|
61
61
|
JSX_TMP\n\tset custom location of esbuild builds defaults to /tmp/jsx_tmp.
|
|
62
62
|
`;
|
|
63
|
-
//# sourceMappingURL=help.js.map
|
|
@@ -64,4 +64,3 @@ export async function inflateApp({ inflateParallel, serverInterface, logger, hot
|
|
|
64
64
|
// router.use(assertGlobalTampered);
|
|
65
65
|
return errors.length === 0 ? [router, null, routeFileMap /*, migrations*/, wsConfigList /*, serverConfigMap*/, logConfigMap] : [router, errors, routeFileMap /*, migrations*/, wsConfigList /*, serverConfigMap*/, logConfigMap];
|
|
66
66
|
}
|
|
67
|
-
//# sourceMappingURL=inflate.js.map
|
package/build/esm/src/lib.js
CHANGED
package/build/esm/src/main.js
CHANGED
|
@@ -118,6 +118,7 @@ export class Miqro {
|
|
|
118
118
|
});
|
|
119
119
|
this.serverRequestHandler = ServerRequestHandler(this.serverInterface);
|
|
120
120
|
this.adminInterface = createAdminInterface(this);
|
|
121
|
+
this.webSocketManager.adminInterface = this.adminInterface;
|
|
121
122
|
setupExitHandlers(this);
|
|
122
123
|
}
|
|
123
124
|
static async import(inFile, options, inflate) {
|
|
@@ -631,4 +632,3 @@ function createEditorLoggerTransport(app) {
|
|
|
631
632
|
}
|
|
632
633
|
};
|
|
633
634
|
}
|
|
634
|
-
//# sourceMappingURL=app.js.map
|
|
@@ -2,7 +2,6 @@ import { Router, SessionHandler } from "@miqro/core";
|
|
|
2
2
|
import { getAsset } from "../common/assets.js";
|
|
3
3
|
import { BASEEDITOR_PATH } from "../../editor/common/constants.js";
|
|
4
4
|
import EDITOR_AUTH from "../../editor/auth.js";
|
|
5
|
-
import { CONTENT_TYPE_MAP } from "../common/content-type.js";
|
|
6
5
|
export async function createEditorRouter(adminInterface) {
|
|
7
6
|
const router = new Router();
|
|
8
7
|
const innerRouter = new Router();
|
|
@@ -10,7 +9,7 @@ export async function createEditorRouter(adminInterface) {
|
|
|
10
9
|
res.setHeader("x-uuid", req.uuid);
|
|
11
10
|
req.editor = adminInterface;
|
|
12
11
|
});
|
|
13
|
-
const editorFont = Buffer.from(getAsset("editor-assets/font.ttf"));
|
|
12
|
+
//const editorFont = Buffer.from(getAsset("editor-assets/font.ttf"));
|
|
14
13
|
const editorJS = Buffer.from(getAsset("editor-assets/editor.bundle.js")).toString().trim();
|
|
15
14
|
const editorCSS = Buffer.from(getAsset("editor-assets/style.css")).toString().trim().split("\n").map(l => l.trim()).filter(l => l).join("");
|
|
16
15
|
const writeAPI = (await import("../../editor/http/admin/editor/api/fs/write.api.js")).default;
|
|
@@ -30,15 +29,15 @@ export async function createEditorRouter(adminInterface) {
|
|
|
30
29
|
innerRouter.get(`/api/fs/scan`, getHandler(/*authHandler, */ scanAPI));
|
|
31
30
|
innerRouter.post(`/api/server/restart`, getHandler(/*authHandler, */ restartAPI));
|
|
32
31
|
innerRouter.post(`/api/server/reload`, getHandler(/*authHandler, */ reloadAPI));
|
|
33
|
-
innerRouter.get(`/font.ttf`, async (_req, res) => {
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
})
|
|
32
|
+
/*innerRouter.get(`/font.ttf`, async (_req, res) => {
|
|
33
|
+
return await res.asyncEnd({
|
|
34
|
+
status: 200,
|
|
35
|
+
headers: {
|
|
36
|
+
["Content-Type"]: CONTENT_TYPE_MAP[".ttf"]
|
|
37
|
+
},
|
|
38
|
+
body: editorFont
|
|
39
|
+
})
|
|
40
|
+
});*/
|
|
42
41
|
innerRouter.get("/", EditorIndex(editorCSS, editorJS, false));
|
|
43
42
|
innerRouter.use(async (req, res) => {
|
|
44
43
|
delete req.editor;
|
|
@@ -65,4 +64,3 @@ function getHandler(/*auth: Handler, */ router) {
|
|
|
65
64
|
handler: router.handler
|
|
66
65
|
};
|
|
67
66
|
}
|
|
68
|
-
//# sourceMappingURL=editor.js.map
|
|
@@ -2,6 +2,7 @@ import { Logger } from "@miqro/core";
|
|
|
2
2
|
import { ClusterWebSocketServer2 } from "./cluster-ws.js";
|
|
3
3
|
import { WSConfig } from "../../types.js";
|
|
4
4
|
import { LogProvider } from "./log.js";
|
|
5
|
+
import { EditorAdminInterface } from "../../../editor/common/admin-interface.js";
|
|
5
6
|
export interface WebSocketManagerOptions {
|
|
6
7
|
logger?: Logger | Console;
|
|
7
8
|
loggerProvider?: LogProvider;
|
|
@@ -11,6 +12,7 @@ export interface WebSocketManagerOptions {
|
|
|
11
12
|
export declare class WebSocketManager {
|
|
12
13
|
runningGlobalWSMap: Map<string, ClusterWebSocketServer2>;
|
|
13
14
|
logger?: Logger | Console | null;
|
|
15
|
+
adminInterface?: EditorAdminInterface;
|
|
14
16
|
name: string;
|
|
15
17
|
avoidLogSocket: boolean;
|
|
16
18
|
loggerProvider: LogProvider;
|
|
@@ -3,6 +3,7 @@ import { ClusterWebSocketServer2 } from "./cluster-ws.js";
|
|
|
3
3
|
export class WebSocketManager {
|
|
4
4
|
runningGlobalWSMap = new Map();
|
|
5
5
|
logger = null;
|
|
6
|
+
adminInterface;
|
|
6
7
|
name;
|
|
7
8
|
avoidLogSocket;
|
|
8
9
|
loggerProvider;
|
|
@@ -123,13 +124,19 @@ export class WebSocketManager {
|
|
|
123
124
|
try {
|
|
124
125
|
const wsServer = this.getWS(req.path);
|
|
125
126
|
if (wsServer) {
|
|
126
|
-
|
|
127
|
+
if (LOG_SOCKET_PATH === req.path) {
|
|
128
|
+
req.editor = this.adminInterface;
|
|
129
|
+
}
|
|
130
|
+
const ret = wsServer.onUpgrade(req, socket, head);
|
|
131
|
+
delete req.editor;
|
|
132
|
+
return ret;
|
|
127
133
|
}
|
|
128
134
|
else {
|
|
129
135
|
socket.destroy();
|
|
130
136
|
}
|
|
131
137
|
}
|
|
132
138
|
catch (e) {
|
|
139
|
+
delete req.editor;
|
|
133
140
|
this.logger?.error(e);
|
|
134
141
|
}
|
|
135
142
|
}
|
|
@@ -140,4 +147,3 @@ export class WebSocketManager {
|
|
|
140
147
|
options: WSConfig;
|
|
141
148
|
} | undefined;
|
|
142
149
|
}*/
|
|
143
|
-
//# sourceMappingURL=websocketmanager.js.map
|
package/build/esm/src/types.js
CHANGED
package/build/lib.cjs
CHANGED
|
@@ -9192,8 +9192,8 @@ var ASSETS_ROUTER = {
|
|
|
9192
9192
|
// "types.json": "sea/types.json",
|
|
9193
9193
|
"assets.base64.json": "sea/assets.base64.json",
|
|
9194
9194
|
"editor-assets/editor.bundle.js": "build/editor.bundle.js",
|
|
9195
|
-
"editor-assets/style.css": "build/style.css"
|
|
9196
|
-
"editor-assets/font.ttf": "build/font.ttf"
|
|
9195
|
+
"editor-assets/style.css": "build/style.css"
|
|
9196
|
+
//"editor-assets/font.ttf": "build/font.ttf"
|
|
9197
9197
|
};
|
|
9198
9198
|
function getAsset(key) {
|
|
9199
9199
|
if ((0, import_node_sea.isSea)()) {
|
|
@@ -12105,6 +12105,7 @@ init_constants();
|
|
|
12105
12105
|
var WebSocketManager = class {
|
|
12106
12106
|
runningGlobalWSMap = /* @__PURE__ */ new Map();
|
|
12107
12107
|
logger = null;
|
|
12108
|
+
adminInterface;
|
|
12108
12109
|
name;
|
|
12109
12110
|
avoidLogSocket;
|
|
12110
12111
|
loggerProvider;
|
|
@@ -12220,11 +12221,17 @@ var WebSocketManager = class {
|
|
|
12220
12221
|
try {
|
|
12221
12222
|
const wsServer = this.getWS(req.path);
|
|
12222
12223
|
if (wsServer) {
|
|
12223
|
-
|
|
12224
|
+
if (LOG_SOCKET_PATH === req.path) {
|
|
12225
|
+
req.editor = this.adminInterface;
|
|
12226
|
+
}
|
|
12227
|
+
const ret = wsServer.onUpgrade(req, socket, head);
|
|
12228
|
+
delete req.editor;
|
|
12229
|
+
return ret;
|
|
12224
12230
|
} else {
|
|
12225
12231
|
socket.destroy();
|
|
12226
12232
|
}
|
|
12227
12233
|
} catch (e) {
|
|
12234
|
+
delete req.editor;
|
|
12228
12235
|
this.logger?.error(e);
|
|
12229
12236
|
}
|
|
12230
12237
|
}
|
|
@@ -14032,22 +14039,6 @@ init_constants();
|
|
|
14032
14039
|
|
|
14033
14040
|
// editor/ws.ts
|
|
14034
14041
|
init_constants();
|
|
14035
|
-
var ws_default = {
|
|
14036
|
-
path: LOG_SOCKET_PATH,
|
|
14037
|
-
validate(req) {
|
|
14038
|
-
const admin = req.editor;
|
|
14039
|
-
const cache2 = admin ? admin.getCache() : req.server.cache;
|
|
14040
|
-
const KEY = cache2.get("AUTH_KEY");
|
|
14041
|
-
const cookieToken = req.cookies["auth"];
|
|
14042
|
-
return cookieToken && KEY && cookieToken === KEY ? true : false;
|
|
14043
|
-
}
|
|
14044
|
-
};
|
|
14045
|
-
|
|
14046
|
-
// editor/server.ts
|
|
14047
|
-
var import_node_crypto5 = require("node:crypto");
|
|
14048
|
-
init_constants();
|
|
14049
|
-
var import_node_fs17 = require("node:fs");
|
|
14050
|
-
var import_node_path18 = require("node:path");
|
|
14051
14042
|
|
|
14052
14043
|
// editor/auth.ts
|
|
14053
14044
|
var import_node_crypto4 = require("node:crypto");
|
|
@@ -14091,7 +14082,23 @@ var auth_default = {
|
|
|
14091
14082
|
}
|
|
14092
14083
|
};
|
|
14093
14084
|
|
|
14085
|
+
// editor/ws.ts
|
|
14086
|
+
var ws_default = {
|
|
14087
|
+
path: LOG_SOCKET_PATH,
|
|
14088
|
+
validate(req) {
|
|
14089
|
+
const admin = req.editor;
|
|
14090
|
+
const cache2 = admin ? admin.getCache() : req.server.cache;
|
|
14091
|
+
const KEY = cache2.get(ADMIN_EDITOR_AUTH_KEY);
|
|
14092
|
+
const cookieToken = req.cookies[ADMIN_EDITOR_AUTH_KEY];
|
|
14093
|
+
return cookieToken && KEY && cookieToken === KEY ? true : false;
|
|
14094
|
+
}
|
|
14095
|
+
};
|
|
14096
|
+
|
|
14094
14097
|
// editor/server.ts
|
|
14098
|
+
var import_node_crypto5 = require("node:crypto");
|
|
14099
|
+
init_constants();
|
|
14100
|
+
var import_node_fs17 = require("node:fs");
|
|
14101
|
+
var import_node_path18 = require("node:path");
|
|
14095
14102
|
var ADMIN_EDITOR_BROWSER_OPEN_KEY = "ADMIN_EDITOR_BROWSER_OPEN_KEY$$";
|
|
14096
14103
|
var server_default = {
|
|
14097
14104
|
preload: (serverInterface, adminInterface) => {
|
|
@@ -14138,7 +14145,6 @@ async function createEditorRouter(adminInterface) {
|
|
|
14138
14145
|
res.setHeader("x-uuid", req.uuid);
|
|
14139
14146
|
req.editor = adminInterface;
|
|
14140
14147
|
});
|
|
14141
|
-
const editorFont = Buffer.from(getAsset("editor-assets/font.ttf"));
|
|
14142
14148
|
const editorJS = Buffer.from(getAsset("editor-assets/editor.bundle.js")).toString().trim();
|
|
14143
14149
|
const editorCSS = Buffer.from(getAsset("editor-assets/style.css")).toString().trim().split("\n").map((l) => l.trim()).filter((l) => l).join("");
|
|
14144
14150
|
const writeAPI = (await Promise.resolve().then(() => (init_write_api(), write_api_exports))).default;
|
|
@@ -14179,15 +14185,6 @@ async function createEditorRouter(adminInterface) {
|
|
|
14179
14185
|
/*authHandler, */
|
|
14180
14186
|
reloadAPI
|
|
14181
14187
|
));
|
|
14182
|
-
innerRouter.get(`/font.ttf`, async (_req, res) => {
|
|
14183
|
-
return await res.asyncEnd({
|
|
14184
|
-
status: 200,
|
|
14185
|
-
headers: {
|
|
14186
|
-
["Content-Type"]: CONTENT_TYPE_MAP[".ttf"]
|
|
14187
|
-
},
|
|
14188
|
-
body: editorFont
|
|
14189
|
-
});
|
|
14190
|
-
});
|
|
14191
14188
|
innerRouter.get("/", EditorIndex2(editorCSS, editorJS, false));
|
|
14192
14189
|
innerRouter.use(async (req, res) => {
|
|
14193
14190
|
delete req.editor;
|
|
@@ -17378,6 +17375,7 @@ var Miqro = class _Miqro {
|
|
|
17378
17375
|
});
|
|
17379
17376
|
this.serverRequestHandler = ServerRequestHandler(this.serverInterface);
|
|
17380
17377
|
this.adminInterface = createAdminInterface(this);
|
|
17378
|
+
this.webSocketManager.adminInterface = this.adminInterface;
|
|
17381
17379
|
setupExitHandlers(this);
|
|
17382
17380
|
}
|
|
17383
17381
|
static async import(inFile, options, inflate) {
|
package/build/style.css
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "miqro",
|
|
3
|
-
"version": "7.2.
|
|
3
|
+
"version": "7.2.7",
|
|
4
4
|
"description": "",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "build/esm/src/lib.js",
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
"build": "tsc",
|
|
19
19
|
"postbuild": "npm run postbuild:lib && npm run postbuild:sh && npm run postbuild:assets && npm run postbuild:editor && npm run postbuild:editor-assets && npm run postbuild:versiontag",
|
|
20
20
|
"postbuild:versiontag": "node sea/version.tag.js",
|
|
21
|
-
"postbuild:editor-assets": "cp sea/editor-assets/
|
|
21
|
+
"postbuild:editor-assets": "cp sea/editor-assets/style.css build/style.css",
|
|
22
22
|
"postbuild:editor": "esbuild --external:node:process --external:node:path --bundle --loader:.js=jsx --jsx-factory=jsx.createElement --jsx-fragment=jsx.Fragment sea/editor-assets/editor.bundle.in.mjs --outfile=build/editor.bundle.js",
|
|
23
23
|
"postbuild:assets": "node sea/assets.js",
|
|
24
24
|
"postbuild:sh": "node sea/base64.js sea/basic-compile.sh > sea/basic-compile.base64.sh",
|
|
@@ -1,6 +0,0 @@
|
|
|
1
|
-
import { AuthConfig } from "../src/types.js";
|
|
2
|
-
export declare const ADMIN_EDITOR_AUTH_KEY = "$$ADMIN_EDITOR_AUTH_KEY$$";
|
|
3
|
-
export declare const ADMIN_EDITOR_AUTH_QUERY = "key";
|
|
4
|
-
export declare const ADMIN_EDITOR_AUTH_COOKIE = "$$ADMIN_EDITOR_AUTH_KEY$$";
|
|
5
|
-
declare const _default: AuthConfig;
|
|
6
|
-
export default _default;
|