@loaders.gl/tile-converter 4.0.0-alpha.14 → 4.0.0-alpha.16
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/bin/i3s-server.js +4 -0
- package/dist/converter.min.js +59 -59
- package/dist/dist.min.js +262 -162
- package/dist/es5/deps-installer/deps-installer.js +1 -1
- package/dist/es5/i3s-converter/i3s-converter.js +26 -22
- package/dist/es5/i3s-converter/i3s-converter.js.map +1 -1
- package/dist/es5/i3s-server/README.md +46 -2
- package/dist/es5/i3s-server/app.js +23 -15
- package/dist/es5/i3s-server/app.js.map +1 -1
- package/dist/es5/i3s-server/bin/www.js +33 -0
- package/dist/es5/i3s-server/bin/www.js.map +1 -0
- package/dist/es5/i3s-server/controllers/index-controller.js +23 -22
- package/dist/es5/i3s-server/controllers/index-controller.js.map +1 -1
- package/dist/es5/i3s-server/controllers/slpk-controller.js +35 -38
- package/dist/es5/i3s-server/controllers/slpk-controller.js.map +1 -1
- package/dist/es5/i3s-server/routes/index.js +2 -2
- package/dist/es5/i3s-server/routes/index.js.map +1 -1
- package/dist/es5/i3s-server/routes/slpk-router.js +14 -13
- package/dist/es5/i3s-server/routes/slpk-router.js.map +1 -1
- package/dist/es5/i3s-server/utils/create-scene-server.js +7 -4
- package/dist/es5/i3s-server/utils/create-scene-server.js.map +1 -1
- package/dist/es5/i3s-server/utils/server-utils.js +49 -0
- package/dist/es5/i3s-server/utils/server-utils.js.map +1 -0
- package/dist/es5/index.js +7 -0
- package/dist/es5/index.js.map +1 -1
- package/dist/es5/pgm-loader.js +1 -1
- package/dist/es5/slpk-extractor/helpers/file-handle-provider.js +59 -26
- package/dist/es5/slpk-extractor/helpers/file-handle-provider.js.map +1 -1
- package/dist/es5/slpk-extractor/helpers/fs-promises.js +77 -0
- package/dist/es5/slpk-extractor/helpers/fs-promises.js.map +1 -0
- package/dist/es5/slpk-extractor/slpk-extractor.js +9 -9
- package/dist/es5/slpk-extractor/slpk-extractor.js.map +1 -1
- package/dist/esm/deps-installer/deps-installer.js +1 -1
- package/dist/esm/i3s-converter/i3s-converter.js +5 -1
- package/dist/esm/i3s-converter/i3s-converter.js.map +1 -1
- package/dist/esm/i3s-server/README.md +46 -2
- package/dist/esm/i3s-server/app.js +13 -11
- package/dist/esm/i3s-server/app.js.map +1 -1
- package/dist/esm/i3s-server/bin/i3s-server.min.js +516 -0
- package/dist/esm/i3s-server/bin/www.js +30 -0
- package/dist/esm/i3s-server/bin/www.js.map +1 -0
- package/dist/esm/i3s-server/controllers/index-controller.js +4 -7
- package/dist/esm/i3s-server/controllers/index-controller.js.map +1 -1
- package/dist/esm/i3s-server/controllers/slpk-controller.js +9 -26
- package/dist/esm/i3s-server/controllers/slpk-controller.js.map +1 -1
- package/dist/esm/i3s-server/routes/index.js +1 -1
- package/dist/esm/i3s-server/routes/index.js.map +1 -1
- package/dist/esm/i3s-server/routes/slpk-router.js +5 -11
- package/dist/esm/i3s-server/routes/slpk-router.js.map +1 -1
- package/dist/esm/i3s-server/utils/create-scene-server.js +2 -5
- package/dist/esm/i3s-server/utils/create-scene-server.js.map +1 -1
- package/dist/esm/i3s-server/utils/server-utils.js +40 -0
- package/dist/esm/i3s-server/utils/server-utils.js.map +1 -0
- package/dist/esm/index.js +1 -0
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/pgm-loader.js +1 -1
- package/dist/esm/slpk-extractor/helpers/file-handle-provider.js +17 -6
- package/dist/esm/slpk-extractor/helpers/file-handle-provider.js.map +1 -1
- package/dist/esm/slpk-extractor/helpers/fs-promises.js +32 -0
- package/dist/esm/slpk-extractor/helpers/fs-promises.js.map +1 -0
- package/dist/esm/slpk-extractor/slpk-extractor.js +4 -4
- package/dist/esm/slpk-extractor/slpk-extractor.js.map +1 -1
- package/dist/i3s-converter/i3s-converter.d.ts.map +1 -1
- package/dist/i3s-converter/i3s-converter.js +5 -1
- package/dist/i3s-server/app.d.ts +1 -2
- package/dist/i3s-server/app.d.ts.map +1 -1
- package/dist/i3s-server/app.js +23 -16
- package/dist/i3s-server/bin/www.d.ts +3 -0
- package/dist/i3s-server/bin/www.d.ts.map +1 -0
- package/dist/i3s-server/bin/www.js +37 -0
- package/dist/i3s-server/controllers/index-controller.d.ts +6 -1
- package/dist/i3s-server/controllers/index-controller.d.ts.map +1 -1
- package/dist/i3s-server/controllers/index-controller.js +16 -8
- package/dist/i3s-server/controllers/slpk-controller.d.ts +13 -2
- package/dist/i3s-server/controllers/slpk-controller.d.ts.map +1 -1
- package/dist/i3s-server/controllers/slpk-controller.js +20 -19
- package/dist/i3s-server/routes/index.d.ts +1 -2
- package/dist/i3s-server/routes/index.d.ts.map +1 -1
- package/dist/i3s-server/routes/index.js +6 -2
- package/dist/i3s-server/routes/slpk-router.d.ts +2 -2
- package/dist/i3s-server/routes/slpk-router.d.ts.map +1 -1
- package/dist/i3s-server/routes/slpk-router.js +15 -14
- package/dist/i3s-server/utils/create-scene-server.d.ts +11 -5
- package/dist/i3s-server/utils/create-scene-server.d.ts.map +1 -1
- package/dist/i3s-server/utils/create-scene-server.js +11 -3
- package/dist/i3s-server/utils/server-utils.d.ts +24 -0
- package/dist/i3s-server/utils/server-utils.d.ts.map +1 -0
- package/dist/i3s-server/utils/server-utils.js +66 -0
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -1
- package/dist/slpk-extractor/helpers/file-handle-provider.d.ts +15 -12
- package/dist/slpk-extractor/helpers/file-handle-provider.d.ts.map +1 -1
- package/dist/slpk-extractor/helpers/file-handle-provider.js +25 -10
- package/dist/slpk-extractor/helpers/fs-promises.d.ts +38 -0
- package/dist/slpk-extractor/helpers/fs-promises.d.ts.map +1 -0
- package/dist/slpk-extractor/helpers/fs-promises.js +51 -0
- package/dist/slpk-extractor/slpk-extractor.d.ts +2 -2
- package/dist/slpk-extractor/slpk-extractor.d.ts.map +1 -1
- package/dist/slpk-extractor/slpk-extractor.js +5 -8
- package/dist/slpk-extractor.min.js +44 -44
- package/package.json +25 -20
- package/src/i3s-converter/i3s-converter.ts +5 -1
- package/src/i3s-server/README.md +46 -2
- package/src/i3s-server/{app.js → app.ts} +11 -9
- package/src/i3s-server/bin/www.ts +38 -0
- package/src/i3s-server/controllers/{index-controller.js → index-controller.ts} +10 -9
- package/src/i3s-server/controllers/slpk-controller.ts +32 -0
- package/src/i3s-server/routes/{index.js → index.ts} +2 -1
- package/src/i3s-server/routes/{slpk-router.js → slpk-router.ts} +5 -10
- package/src/i3s-server/utils/create-scene-server.ts +20 -0
- package/src/i3s-server/utils/server-utils.ts +70 -0
- package/src/index.ts +1 -0
- package/src/slpk-extractor/helpers/file-handle-provider.ts +36 -18
- package/src/slpk-extractor/helpers/fs-promises.ts +66 -0
- package/src/slpk-extractor/slpk-extractor.ts +6 -7
- package/dist/es5/i3s-server/bin/www +0 -102
- package/dist/esm/i3s-server/bin/www +0 -102
- package/src/i3s-server/bin/www +0 -102
- package/src/i3s-server/controllers/slpk-controller.js +0 -38
- package/src/i3s-server/utils/create-scene-server.js +0 -15
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@loaders.gl/tile-converter",
|
|
3
|
-
"version": "4.0.0-alpha.
|
|
3
|
+
"version": "4.0.0-alpha.16",
|
|
4
4
|
"description": "Converter",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"publishConfig": {
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
"bin": {
|
|
23
23
|
"tile-converter": "./bin/converter.js",
|
|
24
24
|
"slpk-extractor": "./bin/slpk-extractor.js",
|
|
25
|
-
"i3s-server": "./
|
|
25
|
+
"i3s-server": "./bin/i3s-server.js"
|
|
26
26
|
},
|
|
27
27
|
"files": [
|
|
28
28
|
"src",
|
|
@@ -38,24 +38,25 @@
|
|
|
38
38
|
"join-images": false
|
|
39
39
|
},
|
|
40
40
|
"scripts": {
|
|
41
|
-
"pre-build": "npm run build-bundle && npm run build-converter-bundle && npm run build-slpk-extractor-bundle",
|
|
41
|
+
"pre-build": "npm run build-bundle && npm run build-converter-bundle && npm run build-slpk-extractor-bundle && npm run build-i3s-server-bundle",
|
|
42
42
|
"build-bundle": "esbuild ./src/index.ts --bundle --outfile=dist/dist.min.js --platform=node --external:join-images",
|
|
43
43
|
"build-converter-bundle": "esbuild src/converter-cli.ts --outfile=dist/converter.min.js --platform=node --target=esnext,node14 --external:join-images --minify --bundle --define:__VERSION__=\\\"$npm_package_version\\\"",
|
|
44
|
-
"build-slpk-extractor-bundle": "esbuild src/slpk-extractor-cli.ts --outfile=dist/slpk-extractor.min.js --platform=node --target=esnext,node14 --external:join-images --minify --bundle --define:__VERSION__=\\\"$npm_package_version\\\""
|
|
44
|
+
"build-slpk-extractor-bundle": "esbuild src/slpk-extractor-cli.ts --outfile=dist/slpk-extractor.min.js --platform=node --target=esnext,node14 --external:join-images --minify --bundle --define:__VERSION__=\\\"$npm_package_version\\\"",
|
|
45
|
+
"build-i3s-server-bundle": "esbuild src/i3s-server/bin/www.ts --outfile=dist/esm/i3s-server/bin/i3s-server.min.js --platform=node --target=esnext,node14 --external:join-images --minify --bundle --define:__VERSION__=\\\"$npm_package_version\\\""
|
|
45
46
|
},
|
|
46
47
|
"dependencies": {
|
|
47
|
-
"@loaders.gl/3d-tiles": "4.0.0-alpha.
|
|
48
|
-
"@loaders.gl/crypto": "4.0.0-alpha.
|
|
49
|
-
"@loaders.gl/draco": "4.0.0-alpha.
|
|
50
|
-
"@loaders.gl/gltf": "4.0.0-alpha.
|
|
51
|
-
"@loaders.gl/i3s": "4.0.0-alpha.
|
|
52
|
-
"@loaders.gl/images": "4.0.0-alpha.
|
|
53
|
-
"@loaders.gl/loader-utils": "4.0.0-alpha.
|
|
54
|
-
"@loaders.gl/polyfills": "4.0.0-alpha.
|
|
55
|
-
"@loaders.gl/textures": "4.0.0-alpha.
|
|
56
|
-
"@loaders.gl/tiles": "4.0.0-alpha.
|
|
57
|
-
"@loaders.gl/worker-utils": "4.0.0-alpha.
|
|
58
|
-
"@loaders.gl/zip": "4.0.0-alpha.
|
|
48
|
+
"@loaders.gl/3d-tiles": "4.0.0-alpha.16",
|
|
49
|
+
"@loaders.gl/crypto": "4.0.0-alpha.16",
|
|
50
|
+
"@loaders.gl/draco": "4.0.0-alpha.16",
|
|
51
|
+
"@loaders.gl/gltf": "4.0.0-alpha.16",
|
|
52
|
+
"@loaders.gl/i3s": "4.0.0-alpha.16",
|
|
53
|
+
"@loaders.gl/images": "4.0.0-alpha.16",
|
|
54
|
+
"@loaders.gl/loader-utils": "4.0.0-alpha.16",
|
|
55
|
+
"@loaders.gl/polyfills": "4.0.0-alpha.16",
|
|
56
|
+
"@loaders.gl/textures": "4.0.0-alpha.16",
|
|
57
|
+
"@loaders.gl/tiles": "4.0.0-alpha.16",
|
|
58
|
+
"@loaders.gl/worker-utils": "4.0.0-alpha.16",
|
|
59
|
+
"@loaders.gl/zip": "4.0.0-alpha.16",
|
|
59
60
|
"@math.gl/core": "^3.5.1",
|
|
60
61
|
"@math.gl/culling": "^3.5.1",
|
|
61
62
|
"@math.gl/geoid": "^3.5.1",
|
|
@@ -63,13 +64,13 @@
|
|
|
63
64
|
"archiver": "^5.0.0",
|
|
64
65
|
"cors": "^2.8.5",
|
|
65
66
|
"crypt": "^0.0.2",
|
|
66
|
-
"debug": "~
|
|
67
|
-
"express": "~4.
|
|
67
|
+
"debug": "~4.3.4",
|
|
68
|
+
"express": "~4.18.2",
|
|
68
69
|
"json-map-transform": "^1.2.6",
|
|
69
70
|
"jszip": "^3.5.0",
|
|
70
71
|
"md5": "^2.3.0",
|
|
71
72
|
"morgan": "~1.9.1",
|
|
72
|
-
"uuid": "^
|
|
73
|
+
"uuid": "^9.0.0"
|
|
73
74
|
},
|
|
74
75
|
"peerDependencies": {
|
|
75
76
|
"@loaders.gl/core": "^4.0.0-alpha.8"
|
|
@@ -78,5 +79,9 @@
|
|
|
78
79
|
"join-images": "^1.1.3",
|
|
79
80
|
"sharp": "^0.31.3"
|
|
80
81
|
},
|
|
81
|
-
"gitHead": "
|
|
82
|
+
"gitHead": "87e9714165c3ce143a04ac45bbd9d922006f1b63",
|
|
83
|
+
"devDependencies": {
|
|
84
|
+
"@types/express": "^4.17.17",
|
|
85
|
+
"@types/node": "^20.4.2"
|
|
86
|
+
}
|
|
82
87
|
}
|
|
@@ -240,10 +240,14 @@ export default class I3SConverter {
|
|
|
240
240
|
|
|
241
241
|
try {
|
|
242
242
|
const preloadOptions = await this._fetchPreloadOptions();
|
|
243
|
+
let tilesetUrl = inputUrl;
|
|
244
|
+
if (preloadOptions.url) {
|
|
245
|
+
tilesetUrl = preloadOptions.url;
|
|
246
|
+
}
|
|
243
247
|
if (preloadOptions.headers) {
|
|
244
248
|
this.loadOptions.fetch = {headers: preloadOptions.headers};
|
|
245
249
|
}
|
|
246
|
-
this.sourceTileset = await load(
|
|
250
|
+
this.sourceTileset = await load(tilesetUrl, this.Loader, this.loadOptions);
|
|
247
251
|
|
|
248
252
|
const preprocessResult = await this.preprocessConversion();
|
|
249
253
|
|
package/src/i3s-server/README.md
CHANGED
|
@@ -8,12 +8,56 @@ The server provides I3S Rest endpoints per specification https://github.com/Esri
|
|
|
8
8
|
### Serve 3DTiles to I3S converted dataset
|
|
9
9
|
|
|
10
10
|
- Convert data set from 3DTiles to I3S without `--slpk` option
|
|
11
|
-
- Serve output folder
|
|
11
|
+
- Serve output folder
|
|
12
|
+
|
|
13
|
+
Example for path `./data/BatchTextured/SceneServer/layers/0/...`:
|
|
14
|
+
|
|
15
|
+
#### Start the server
|
|
16
|
+
|
|
17
|
+
```bash
|
|
18
|
+
PORT=8080 HTTPS_PORT=4443 I3sLayerPath="./data" DEBUG=i3s-server:* npx i3s-server
|
|
19
|
+
```
|
|
20
|
+
#### Check the layer availability
|
|
21
|
+
|
|
22
|
+
The layer should be available on URLs:
|
|
23
|
+
|
|
24
|
+
- `http://localhost:8080/BatchTextured/SceneServer/layers/0/...`
|
|
25
|
+
- `https://localhost:4443/BatchTextured/SceneServer/layers/0/...`
|
|
26
|
+
|
|
27
|
+
#### Open in ArcGIS
|
|
28
|
+
|
|
29
|
+
`https://www.arcgis.com/home/webscene/viewer.html?url=http://localhost:8080/BatchTextured/SceneServer/layers/0/`
|
|
30
|
+
|
|
31
|
+
#### Open in I3S Explorer
|
|
32
|
+
|
|
33
|
+
`https://i3s.loaders.gl/viewer?tileset=http://localhost:8080/BatchTextured/SceneServer/layers/0`
|
|
12
34
|
|
|
13
35
|
### Serve SLPK
|
|
14
36
|
|
|
15
|
-
|
|
37
|
+
Example for path `../datasets/Rancho_Mesh_mesh_v17_1.slpk`:
|
|
38
|
+
|
|
39
|
+
#### Start the server
|
|
40
|
+
|
|
41
|
+
```bash
|
|
42
|
+
PORT=8080 HTTPS_PORT=4443 I3sLayerPath="../datasets/Rancho_Mesh_mesh_v17_1.slpk" DEBUG=i3s-server:* npx i3s-server
|
|
43
|
+
```
|
|
44
|
+
#### Check the layer availability
|
|
45
|
+
|
|
46
|
+
The layer should be available on URLs:
|
|
47
|
+
|
|
48
|
+
- `http://localhost:8080/SceneServer/layers/0/...`
|
|
49
|
+
- `https://localhost:4443/SceneServer/layers/0/...`
|
|
50
|
+
|
|
51
|
+
#### Open in ArcGIS
|
|
52
|
+
|
|
53
|
+
`https://www.arcgis.com/home/webscene/viewer.html?url=http://localhost:8080/SceneServer`
|
|
54
|
+
|
|
55
|
+
#### Open in I3S Explorer
|
|
56
|
+
|
|
57
|
+
`https://i3s.loaders.gl/viewer?tileset=http://localhost:8080/SceneServer/layers/0`
|
|
16
58
|
|
|
17
59
|
## ENV variables
|
|
18
60
|
|
|
19
61
|
- `I3sLayerPath` - path to converted data or SLPK file.
|
|
62
|
+
- `PORT` - HTTP port. Eg for `PORT = 8080 npx i3s-server` the server will work on host `http://localhost:8080/...`. Default value is `80`;
|
|
63
|
+
- `HTTPS_PORT` - HTTPS port. Eg for `PORT = 4443 npx i3s-server` the server will work on host `https://localhost:4443/...`. Default value is `443`
|
|
@@ -1,13 +1,16 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
import express from 'express';
|
|
2
|
+
import path from 'path';
|
|
3
|
+
import logger from 'morgan';
|
|
4
|
+
import cors from 'cors';
|
|
5
|
+
import {loadArchive} from './controllers/slpk-controller';
|
|
6
|
+
|
|
7
|
+
const I3S_LAYER_PATH = process.env.I3sLayerPath || ''; // eslint-disable-line no-process-env, no-undef
|
|
8
|
+
const FULL_LAYER_PATH = path.join(process.cwd(), I3S_LAYER_PATH); // eslint-disable-line no-undef
|
|
9
|
+
loadArchive(FULL_LAYER_PATH);
|
|
5
10
|
|
|
6
11
|
const indexRouter = require('./routes/index');
|
|
7
|
-
const {sceneServerRouter, router} = require('./routes/slpk-router');
|
|
8
12
|
|
|
9
|
-
const
|
|
10
|
-
const app = express();
|
|
13
|
+
export const app = express();
|
|
11
14
|
|
|
12
15
|
app.use(logger('dev'));
|
|
13
16
|
app.use(express.json());
|
|
@@ -16,10 +19,9 @@ app.use(express.static(path.join(__dirname, 'public')));
|
|
|
16
19
|
app.use(cors());
|
|
17
20
|
|
|
18
21
|
if (/\.slpk$/.test(I3S_LAYER_PATH)) {
|
|
22
|
+
const {sceneServerRouter, router} = require('./routes/slpk-router');
|
|
19
23
|
app.use('/SceneServer/layers/0', router);
|
|
20
24
|
app.use('/SceneServer', sceneServerRouter);
|
|
21
25
|
} else {
|
|
22
26
|
app.use('/', indexRouter);
|
|
23
27
|
}
|
|
24
|
-
|
|
25
|
-
module.exports = app;
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
|
|
3
|
+
import {app} from '../app';
|
|
4
|
+
import https from 'https';
|
|
5
|
+
import http from 'http';
|
|
6
|
+
import fs from 'fs';
|
|
7
|
+
import path from 'path';
|
|
8
|
+
import {formErrorHandler, formListeningHandler, normalizePort} from '../utils/server-utils';
|
|
9
|
+
|
|
10
|
+
/** Get port from environment and store in Express. */
|
|
11
|
+
const httpPort = normalizePort(process.env.PORT || '80');
|
|
12
|
+
if (httpPort === false) {
|
|
13
|
+
console.error(`Incorrect HTTP port`);
|
|
14
|
+
process.exit(1);
|
|
15
|
+
}
|
|
16
|
+
const httpsPort = normalizePort(process.env.HTTPS_PORT || '443');
|
|
17
|
+
if (httpsPort === false) {
|
|
18
|
+
console.error(`Incorrect HTTPs port`);
|
|
19
|
+
process.exit(1);
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
/** Create HTTP server. */
|
|
23
|
+
const options = {
|
|
24
|
+
key: fs.readFileSync(path.join(__dirname, '../certs/key.pem')),
|
|
25
|
+
cert: fs.readFileSync(path.join(__dirname, '../certs/cert.pem'))
|
|
26
|
+
};
|
|
27
|
+
|
|
28
|
+
const httpServer = http.createServer(app);
|
|
29
|
+
const httpsServer = https.createServer(options, app);
|
|
30
|
+
|
|
31
|
+
/** Listen on provided port, on all network interfaces. */
|
|
32
|
+
httpServer.listen(httpPort);
|
|
33
|
+
httpServer.on('error', formErrorHandler(httpPort));
|
|
34
|
+
httpServer.on('listening', formListeningHandler(httpServer));
|
|
35
|
+
|
|
36
|
+
httpsServer.listen(httpsPort);
|
|
37
|
+
httpsServer.on('error', formErrorHandler(httpsPort));
|
|
38
|
+
httpsServer.on('listening', formListeningHandler(httpsServer));
|
|
@@ -1,13 +1,18 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
import path from 'path';
|
|
2
|
+
import fs from 'fs';
|
|
3
3
|
|
|
4
4
|
const {promises} = fs;
|
|
5
5
|
|
|
6
|
-
const I3S_LAYER_PATH = process.env.I3sLayerPath || '';
|
|
7
|
-
const FULL_LAYER_PATH = path.join(process.cwd(), I3S_LAYER_PATH); // eslint-disable-line no-undef
|
|
6
|
+
const I3S_LAYER_PATH = process.env.I3sLayerPath || '';
|
|
8
7
|
|
|
9
|
-
|
|
8
|
+
/**
|
|
9
|
+
* Get local file name by input HTTP URL
|
|
10
|
+
* @param url - I3S HTTP service url
|
|
11
|
+
* @returns - local file name
|
|
12
|
+
*/
|
|
13
|
+
export async function getFileNameByUrl(url: string): Promise<string | null> {
|
|
10
14
|
const extensions = ['json', 'bin', 'jpg', 'jpeg', 'png', 'bin.dds', 'ktx2'];
|
|
15
|
+
const FULL_LAYER_PATH = path.join(process.cwd(), I3S_LAYER_PATH);
|
|
11
16
|
for (const ext of extensions) {
|
|
12
17
|
const fileName = `${FULL_LAYER_PATH}${url}/index.${ext}`;
|
|
13
18
|
try {
|
|
@@ -19,7 +24,3 @@ async function getFileNameByUrl(url) {
|
|
|
19
24
|
}
|
|
20
25
|
return null;
|
|
21
26
|
}
|
|
22
|
-
|
|
23
|
-
module.exports = {
|
|
24
|
-
getFileNameByUrl
|
|
25
|
-
};
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import '@loaders.gl/polyfills';
|
|
2
|
+
import {parseSLPK} from '@loaders.gl/i3s';
|
|
3
|
+
import {FileHandleProvider} from '@loaders.gl/tile-converter';
|
|
4
|
+
|
|
5
|
+
let slpkArchive;
|
|
6
|
+
|
|
7
|
+
/**
|
|
8
|
+
* Open SLPK file for reading and load HASH file
|
|
9
|
+
* @param fullLayerPath - full path to SLPK file
|
|
10
|
+
*/
|
|
11
|
+
export const loadArchive = async (fullLayerPath: string): Promise<void> => {
|
|
12
|
+
slpkArchive = await parseSLPK(await FileHandleProvider.from(fullLayerPath), (msg) =>
|
|
13
|
+
console.log(msg)
|
|
14
|
+
);
|
|
15
|
+
console.log('The server is ready to use');
|
|
16
|
+
};
|
|
17
|
+
|
|
18
|
+
/**
|
|
19
|
+
* Get a file from SLPK
|
|
20
|
+
* @param url - I3S HTTP URL
|
|
21
|
+
* @returns - file content
|
|
22
|
+
*/
|
|
23
|
+
export async function getFileByUrl(url: string) {
|
|
24
|
+
const trimmedPath = /^\/?(.*)\/?$/.exec(url);
|
|
25
|
+
let uncompressedFile: Buffer | null = null;
|
|
26
|
+
if (trimmedPath) {
|
|
27
|
+
try {
|
|
28
|
+
uncompressedFile = Buffer.from(await slpkArchive.getFile(trimmedPath[1], 'http'));
|
|
29
|
+
} catch (e) {}
|
|
30
|
+
}
|
|
31
|
+
return uncompressedFile;
|
|
32
|
+
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
import express from 'express';
|
|
2
|
+
import {getFileByUrl} from '../controllers/slpk-controller';
|
|
3
|
+
import {createSceneServer} from '../utils/create-scene-server';
|
|
4
4
|
|
|
5
|
-
const sceneServerRouter = express.Router();
|
|
5
|
+
export const sceneServerRouter = express.Router();
|
|
6
6
|
sceneServerRouter.get('*', async function (req, res, next) {
|
|
7
7
|
const file = await getFileByUrl('/');
|
|
8
8
|
if (file) {
|
|
@@ -15,7 +15,7 @@ sceneServerRouter.get('*', async function (req, res, next) {
|
|
|
15
15
|
}
|
|
16
16
|
});
|
|
17
17
|
|
|
18
|
-
const router = express.Router();
|
|
18
|
+
export const router = express.Router();
|
|
19
19
|
router.get('*', async function (req, res, next) {
|
|
20
20
|
console.log(req.path);
|
|
21
21
|
const file = await getFileByUrl(req.path);
|
|
@@ -26,8 +26,3 @@ router.get('*', async function (req, res, next) {
|
|
|
26
26
|
res.send('File not found');
|
|
27
27
|
}
|
|
28
28
|
});
|
|
29
|
-
|
|
30
|
-
module.exports = {
|
|
31
|
-
sceneServerRouter,
|
|
32
|
-
router
|
|
33
|
-
};
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import {SceneLayer3D} from '@loaders.gl/i3s';
|
|
2
|
+
import {v4 as uuidv4} from 'uuid';
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* Create `/SceneServer` response
|
|
6
|
+
* @param name - service name, custom user-friendly name of the service
|
|
7
|
+
* @param layer - I3S layer JSON
|
|
8
|
+
* @returns reponse JSON for `/SceneServer` route
|
|
9
|
+
*/
|
|
10
|
+
export const createSceneServer = (name: string, layer: SceneLayer3D) => {
|
|
11
|
+
return {
|
|
12
|
+
serviceItemId: uuidv4().replace(/-/gi, ''),
|
|
13
|
+
serviceName: name,
|
|
14
|
+
name,
|
|
15
|
+
currentVersion: '10.7',
|
|
16
|
+
serviceVersion: '1.8',
|
|
17
|
+
supportedBindings: ['REST'],
|
|
18
|
+
layers: [layer]
|
|
19
|
+
};
|
|
20
|
+
};
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
import type {Server as HttpsServer} from 'https';
|
|
2
|
+
import type {Server as HttpServer} from 'http';
|
|
3
|
+
|
|
4
|
+
import debugFactory from 'debug';
|
|
5
|
+
const debug = debugFactory('i3s-server:server');
|
|
6
|
+
|
|
7
|
+
/**
|
|
8
|
+
* Normalize a port into a number, string, or false.
|
|
9
|
+
* @param val - port value from env variables
|
|
10
|
+
* @returns - `number` for port, `string` for a named pipe, or `false` if the port number is not correct
|
|
11
|
+
*/
|
|
12
|
+
export function normalizePort(val: string): number | string | false {
|
|
13
|
+
const chkPort = parseInt(val, 10);
|
|
14
|
+
|
|
15
|
+
if (Number.isNaN(chkPort)) {
|
|
16
|
+
// named pipe
|
|
17
|
+
return val;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
if (chkPort >= 0) {
|
|
21
|
+
// port number
|
|
22
|
+
return chkPort;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
return false;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
/**
|
|
29
|
+
* Event listener creator for HTTP/HTTPS server "error" event.
|
|
30
|
+
* @param optionalPort - the port/named pipe the server is started on
|
|
31
|
+
* @return callback to handle server errors
|
|
32
|
+
*/
|
|
33
|
+
export function formErrorHandler(
|
|
34
|
+
optionalPort: string | number
|
|
35
|
+
): (error: NodeJS.ErrnoException) => void {
|
|
36
|
+
return function onError(error: NodeJS.ErrnoException) {
|
|
37
|
+
if (error.syscall !== 'listen') {
|
|
38
|
+
throw error;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
const bind = typeof optionalPort === 'string' ? `Pipe ${optionalPort}` : `Port ${optionalPort}`;
|
|
42
|
+
|
|
43
|
+
// handle specific listen errors with friendly messages
|
|
44
|
+
switch (error.code) {
|
|
45
|
+
case 'EACCES':
|
|
46
|
+
console.error(`${bind} requires elevated privileges`); // eslint-disable-line no-console, no-undef
|
|
47
|
+
process.exit(1); // eslint-disable-line no-process-exit, no-undef
|
|
48
|
+
break;
|
|
49
|
+
case 'EADDRINUSE':
|
|
50
|
+
console.error(`${bind} is already in use`); // eslint-disable-line no-console, no-undef
|
|
51
|
+
process.exit(1); // eslint-disable-line no-process-exit, no-undef
|
|
52
|
+
break;
|
|
53
|
+
default:
|
|
54
|
+
throw error;
|
|
55
|
+
}
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
/**
|
|
60
|
+
* Event listener for HTTP/HTTPS server "listening" event.
|
|
61
|
+
* @param optionalServer - http or https NodeJS server
|
|
62
|
+
* @return callback that is triggered when the server has started
|
|
63
|
+
*/
|
|
64
|
+
export function formListeningHandler(optionalServer: HttpsServer | HttpServer): () => void {
|
|
65
|
+
return function onListening() {
|
|
66
|
+
const addr = optionalServer.address();
|
|
67
|
+
const bind = typeof addr === 'string' ? `pipe ${addr}` : `port ${addr?.port}`;
|
|
68
|
+
debug(`Listening on ${bind}`);
|
|
69
|
+
};
|
|
70
|
+
}
|
package/src/index.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import {FileProvider} from '@loaders.gl/i3s';
|
|
2
|
-
import {
|
|
2
|
+
import {FileHandle} from './fs-promises';
|
|
3
3
|
|
|
4
4
|
/**
|
|
5
5
|
* Provides file data using node fs library
|
|
@@ -9,31 +9,31 @@ export class FileHandleProvider implements FileProvider {
|
|
|
9
9
|
* Returns a new copy of FileHandleProvider
|
|
10
10
|
* @param path The path to the file in file system
|
|
11
11
|
*/
|
|
12
|
-
static async from(path:
|
|
13
|
-
const fileDescriptor = await
|
|
14
|
-
return new FileHandleProvider(fileDescriptor,
|
|
12
|
+
static async from(path: string): Promise<FileHandleProvider> {
|
|
13
|
+
const fileDescriptor = await FileHandle.open(path);
|
|
14
|
+
return new FileHandleProvider(fileDescriptor, fileDescriptor.stat.size);
|
|
15
15
|
}
|
|
16
16
|
|
|
17
17
|
/**
|
|
18
18
|
* The FileHandle from which data is provided
|
|
19
19
|
*/
|
|
20
|
-
private fileDescriptor:
|
|
20
|
+
private fileDescriptor: FileHandle;
|
|
21
21
|
|
|
22
22
|
/**
|
|
23
23
|
* The file length in bytes
|
|
24
24
|
*/
|
|
25
|
-
private size:
|
|
25
|
+
private size: bigint;
|
|
26
26
|
|
|
27
|
-
private constructor(fileDescriptor:
|
|
27
|
+
private constructor(fileDescriptor: FileHandle, size: bigint) {
|
|
28
28
|
this.fileDescriptor = fileDescriptor;
|
|
29
29
|
this.size = size;
|
|
30
30
|
}
|
|
31
31
|
|
|
32
32
|
/**
|
|
33
|
-
* Gets an unsigned 8-bit integer
|
|
33
|
+
* Gets an unsigned 8-bit integer at the specified byte offset from the start of the file.
|
|
34
34
|
* @param offset The offset, in bytes, from the start of the file where to read the data.
|
|
35
35
|
*/
|
|
36
|
-
async getUint8(offset:
|
|
36
|
+
async getUint8(offset: bigint): Promise<number> {
|
|
37
37
|
const val = new Uint8Array(
|
|
38
38
|
(await this.fileDescriptor.read(Buffer.alloc(1), 0, 1, offset)).buffer.buffer
|
|
39
39
|
).at(0);
|
|
@@ -44,10 +44,10 @@ export class FileHandleProvider implements FileProvider {
|
|
|
44
44
|
}
|
|
45
45
|
|
|
46
46
|
/**
|
|
47
|
-
* Gets an unsigned 16-bit integer
|
|
47
|
+
* Gets an unsigned 16-bit integer at the specified byte offset from the start of the file.
|
|
48
48
|
* @param offset The offset, in bytes, from the start of the file where to read the data.
|
|
49
49
|
*/
|
|
50
|
-
async getUint16(offset:
|
|
50
|
+
async getUint16(offset: bigint): Promise<number> {
|
|
51
51
|
const val = new Uint16Array(
|
|
52
52
|
(await this.fileDescriptor.read(Buffer.alloc(2), 0, 2, offset)).buffer.buffer
|
|
53
53
|
).at(0);
|
|
@@ -58,10 +58,10 @@ export class FileHandleProvider implements FileProvider {
|
|
|
58
58
|
}
|
|
59
59
|
|
|
60
60
|
/**
|
|
61
|
-
* Gets an unsigned 32-bit integer
|
|
61
|
+
* Gets an unsigned 32-bit integer at the specified byte offset from the start of the file.
|
|
62
62
|
* @param offset The offset, in bytes, from the start of the file where to read the data.
|
|
63
63
|
*/
|
|
64
|
-
async getUint32(offset:
|
|
64
|
+
async getUint32(offset: bigint): Promise<number> {
|
|
65
65
|
const val = new Uint32Array(
|
|
66
66
|
(await this.fileDescriptor.read(Buffer.alloc(4), 0, 4, offset)).buffer.buffer
|
|
67
67
|
).at(0);
|
|
@@ -71,21 +71,39 @@ export class FileHandleProvider implements FileProvider {
|
|
|
71
71
|
return val;
|
|
72
72
|
}
|
|
73
73
|
|
|
74
|
+
/**
|
|
75
|
+
* Gets an unsigned 32-bit integer at the specified byte offset from the start of the file.
|
|
76
|
+
* @param offset The offset, in bytes, from the start of the file where to read the data.
|
|
77
|
+
*/
|
|
78
|
+
async getBigUint64(offset: bigint): Promise<bigint> {
|
|
79
|
+
const val = new BigInt64Array(
|
|
80
|
+
(await this.fileDescriptor.read(Buffer.alloc(8), 0, 8, offset)).buffer.buffer
|
|
81
|
+
).at(0);
|
|
82
|
+
if (val === undefined) {
|
|
83
|
+
throw new Error('something went wrong');
|
|
84
|
+
}
|
|
85
|
+
return val;
|
|
86
|
+
}
|
|
87
|
+
|
|
74
88
|
/**
|
|
75
89
|
* returns an ArrayBuffer whose contents are a copy of this file bytes from startOffset, inclusive, up to endOffset, exclusive.
|
|
76
|
-
* @param
|
|
90
|
+
* @param startOffsset The offset, in byte, from the start of the file where to start reading the data.
|
|
77
91
|
* @param endOffset The offset, in bytes, from the start of the file where to end reading the data.
|
|
78
92
|
*/
|
|
79
|
-
async slice(
|
|
80
|
-
const
|
|
81
|
-
|
|
93
|
+
async slice(startOffsset: bigint, endOffset: bigint): Promise<ArrayBuffer> {
|
|
94
|
+
const bigLength = endOffset - startOffsset;
|
|
95
|
+
if (bigLength > Number.MAX_SAFE_INTEGER) {
|
|
96
|
+
throw new Error('too big slice');
|
|
97
|
+
}
|
|
98
|
+
const length = Number(bigLength);
|
|
99
|
+
return (await this.fileDescriptor.read(Buffer.alloc(length), 0, length, startOffsset)).buffer
|
|
82
100
|
.buffer;
|
|
83
101
|
}
|
|
84
102
|
|
|
85
103
|
/**
|
|
86
104
|
* the length (in bytes) of the data.
|
|
87
105
|
*/
|
|
88
|
-
get length():
|
|
106
|
+
get length(): bigint {
|
|
89
107
|
return this.size;
|
|
90
108
|
}
|
|
91
109
|
}
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
import {read, open, stat, BigIntStats} from 'fs';
|
|
2
|
+
|
|
3
|
+
/** file reading result */
|
|
4
|
+
export type FileReadResult = {
|
|
5
|
+
/** amount of the bytes read */
|
|
6
|
+
bytesRead: number;
|
|
7
|
+
/** the buffer filled with data from file*/
|
|
8
|
+
buffer: Buffer;
|
|
9
|
+
};
|
|
10
|
+
|
|
11
|
+
/** Object handling file info */
|
|
12
|
+
export class FileHandle {
|
|
13
|
+
private fileDescriptor: number;
|
|
14
|
+
private stats: BigIntStats;
|
|
15
|
+
private constructor(fileDescriptor: number, stats: BigIntStats) {
|
|
16
|
+
this.fileDescriptor = fileDescriptor;
|
|
17
|
+
this.stats = stats;
|
|
18
|
+
}
|
|
19
|
+
/**
|
|
20
|
+
* Opens a `FileHandle`.
|
|
21
|
+
*
|
|
22
|
+
* @param path path to the file
|
|
23
|
+
* @return Fulfills with a {FileHandle} object.
|
|
24
|
+
*/
|
|
25
|
+
|
|
26
|
+
static open = async (path: string): Promise<FileHandle> => {
|
|
27
|
+
const [fd, stats] = await Promise.all([
|
|
28
|
+
new Promise<number>((s) => {
|
|
29
|
+
open(path, undefined, undefined, (_err, fd) => s(fd));
|
|
30
|
+
}),
|
|
31
|
+
new Promise<BigIntStats>((s) => {
|
|
32
|
+
stat(path, {bigint: true}, (_err, stats) => s(stats));
|
|
33
|
+
})
|
|
34
|
+
]);
|
|
35
|
+
return new FileHandle(fd, stats);
|
|
36
|
+
};
|
|
37
|
+
|
|
38
|
+
/**
|
|
39
|
+
* Reads data from the file and stores that in the given buffer.
|
|
40
|
+
*
|
|
41
|
+
* If the file is not modified concurrently, the end-of-file is reached when the
|
|
42
|
+
* number of bytes read is zero.
|
|
43
|
+
* @param buffer A buffer that will be filled with the file data read.
|
|
44
|
+
* @param offset The location in the buffer at which to start filling.
|
|
45
|
+
* @param length The number of bytes to read.
|
|
46
|
+
* @param position The location where to begin reading data from the file. If `null`, data will be read from the current file position, and the position will be updated. If `position` is an
|
|
47
|
+
* integer, the current file position will remain unchanged.
|
|
48
|
+
* @return Fulfills upon success with a FileReadResult object
|
|
49
|
+
*/
|
|
50
|
+
read = (
|
|
51
|
+
buffer: Buffer,
|
|
52
|
+
offset: number,
|
|
53
|
+
length: number,
|
|
54
|
+
position: number | bigint
|
|
55
|
+
): Promise<FileReadResult> => {
|
|
56
|
+
return new Promise((s) => {
|
|
57
|
+
read(this.fileDescriptor, buffer, offset, length, position, (_err, bytesRead, buffer) =>
|
|
58
|
+
s({bytesRead, buffer})
|
|
59
|
+
);
|
|
60
|
+
});
|
|
61
|
+
};
|
|
62
|
+
|
|
63
|
+
get stat(): BigIntStats {
|
|
64
|
+
return this.stats;
|
|
65
|
+
}
|
|
66
|
+
}
|