@loaders.gl/tile-converter 4.0.0-alpha.15 → 4.0.0-alpha.16

package/dist/i3s-server/bin/www.js

@@ -1,83 +1,37 @@
 #!/usr/bin/env node
 "use strict";
-/**
- * Module dependencies.
- */
-const app = require('../app');
-const debug = require('debug')('i3s-server:server');
-const https = require('https');
-const http = require('http');
-const fs = require('fs');
-const path = require('path');
-/**
- * Get port from environment and store in Express.
- */
-const httpPort = normalizePort(process.env.PORT || '80'); // eslint-disable-line no-process-env, no-undef
-const httpsPort = normalizePort(process.env.HTTPS_PORT || '443'); // eslint-disable-line no-process-env, no-undef
-/**
- * Create HTTP server.
- */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const app_1 = require("../app");
+const https_1 = __importDefault(require("https"));
+const http_1 = __importDefault(require("http"));
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const server_utils_1 = require("../utils/server-utils");
+/** Get port from environment and store in Express. */
+const httpPort = (0, server_utils_1.normalizePort)(process.env.PORT || '80');
+if (httpPort === false) {
+    console.error(`Incorrect HTTP port`);
+    process.exit(1);
+}
+const httpsPort = (0, server_utils_1.normalizePort)(process.env.HTTPS_PORT || '443');
+if (httpsPort === false) {
+    console.error(`Incorrect HTTPs port`);
+    process.exit(1);
+}
+/** Create HTTP server. */
 const options = {
-    key: fs.readFileSync(path.join(__dirname, '../certs/key.pem')),
-    cert: fs.readFileSync(path.join(__dirname, '../certs/cert.pem'))
+    key: fs_1.default.readFileSync(path_1.default.join(__dirname, '../certs/key.pem')),
+    cert: fs_1.default.readFileSync(path_1.default.join(__dirname, '../certs/cert.pem'))
 };
-const httpServer = http.createServer(app);
-const httpsServer = https.createServer(options, app);
-/**
- * Listen on provided port, on all network interfaces.
- */
+const httpServer = http_1.default.createServer(app_1.app);
+const httpsServer = https_1.default.createServer(options, app_1.app);
+/** Listen on provided port, on all network interfaces. */
 httpServer.listen(httpPort);
-httpServer.on('error', formErrorHandler(httpPort));
-httpServer.on('listening', formListeningHandler(httpServer));
+httpServer.on('error', (0, server_utils_1.formErrorHandler)(httpPort));
+httpServer.on('listening', (0, server_utils_1.formListeningHandler)(httpServer));
 httpsServer.listen(httpsPort);
-httpsServer.on('error', formErrorHandler(httpsPort));
-httpsServer.on('listening', formListeningHandler(httpsServer));
-/**
- * Normalize a port into a number, string, or false.
- */
-function normalizePort(val) {
-    const chkPort = parseInt(val, 10);
-    if (isNaN(chkPort)) {
-        // named pipe
-        return val;
-    }
-    if (chkPort >= 0) {
-        // port number
-        return chkPort;
-    }
-    return false;
-}
-/**
- * Event listener for HTTP/HTTPS server "error" event.
- */
-function formErrorHandler(optionalPort) {
-    return function onError(error) {
-        if (error.syscall !== 'listen') {
-            throw error;
-        }
-        const bind = typeof global.port === 'string' ? `Pipe ${optionalPort}` : `Port ${optionalPort}`;
-        // handle specific listen errors with friendly messages
-        switch (error.code) {
-            case 'EACCES':
-                console.error(`${bind} requires elevated privileges`); // eslint-disable-line no-console, no-undef
-                process.exit(1); // eslint-disable-line no-process-exit, no-undef
-                break;
-            case 'EADDRINUSE':
-                console.error(`${bind} is already in use`); // eslint-disable-line no-console, no-undef
-                process.exit(1); // eslint-disable-line no-process-exit, no-undef
-                break;
-            default:
-                throw error;
-        }
-    };
-}
-/**
- * Event listener for HTTP/HTTPS server "listening" event.
- */
-function formListeningHandler(optionalServer) {
-    return function onListening() {
-        const addr = optionalServer.address();
-        const bind = typeof addr === 'string' ? `pipe ${addr}` : `port ${addr.port}`;
-        debug(`Listening on ${bind}`);
-    };
-}
+httpsServer.on('error', (0, server_utils_1.formErrorHandler)(httpsPort));
+httpsServer.on('listening', (0, server_utils_1.formListeningHandler)(httpsServer));

package/dist/i3s-server/controllers/index-controller.d.ts

@@ -1,2 +1,7 @@
-export function getFileNameByUrl(url: any): Promise<string | null>;
+/**
+ * Get local file name by input HTTP URL
+ * @param url - I3S HTTP service url
+ * @returns - local file name
+ */
+export declare function getFileNameByUrl(url: string): Promise<string | null>;
 //# sourceMappingURL=index-controller.d.ts.map

package/dist/i3s-server/controllers/index-controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index-controller.d.ts","sourceRoot":"","sources":["../../../src/i3s-server/controllers/index-controller.js"],"names":[],"mappings":"AAQA,mEAYC"}
+{"version":3,"file":"index-controller.d.ts","sourceRoot":"","sources":["../../../src/i3s-server/controllers/index-controller.ts"],"names":[],"mappings":"AAOA;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAa1E"}

package/dist/i3s-server/controllers/index-controller.js

@@ -1,11 +1,21 @@
 "use strict";
-const path = require('path');
-const fs = require('fs');
-const { promises } = fs;
-const I3S_LAYER_PATH = process.env.I3sLayerPath || ''; // eslint-disable-line no-process-env, no-undef
-const FULL_LAYER_PATH = path.join(process.cwd(), I3S_LAYER_PATH); // eslint-disable-line no-undef
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFileNameByUrl = void 0;
+const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
+const { promises } = fs_1.default;
+const I3S_LAYER_PATH = process.env.I3sLayerPath || '';
+/**
+ * Get local file name by input HTTP URL
+ * @param url - I3S HTTP service url
+ * @returns - local file name
+ */
 async function getFileNameByUrl(url) {
     const extensions = ['json', 'bin', 'jpg', 'jpeg', 'png', 'bin.dds', 'ktx2'];
+    const FULL_LAYER_PATH = path_1.default.join(process.cwd(), I3S_LAYER_PATH);
     for (const ext of extensions) {
         const fileName = `${FULL_LAYER_PATH}${url}/index.${ext}`;
         try {
@@ -18,6 +28,4 @@ async function getFileNameByUrl(url) {
     }
     return null;
 }
-module.exports = {
-    getFileNameByUrl
-};
+exports.getFileNameByUrl = getFileNameByUrl;

package/dist/i3s-server/controllers/slpk-controller.d.ts

@@ -1,3 +1,14 @@
-export function loadArchive(fullLayerPath: any): Promise<void>;
-export function getFileByUrl(url: any): Promise<Buffer | undefined>;
+/// <reference types="node" />
+import '@loaders.gl/polyfills';
+/**
+ * Open SLPK file for reading and load HASH file
+ * @param fullLayerPath - full path to SLPK file
+ */
+export declare const loadArchive: (fullLayerPath: string) => Promise<void>;
+/**
+ * Get a file from SLPK
+ * @param url - I3S HTTP URL
+ * @returns  - file content
+ */
+export declare function getFileByUrl(url: string): Promise<Buffer | null>;
 //# sourceMappingURL=slpk-controller.d.ts.map

package/dist/i3s-server/controllers/slpk-controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"slpk-controller.d.ts","sourceRoot":"","sources":["../../../src/i3s-server/controllers/slpk-controller.js"],"names":[],"mappings":"AAOA,+DAEC;AAOD,oEASC"}
+{"version":3,"file":"slpk-controller.d.ts","sourceRoot":"","sources":["../../../src/i3s-server/controllers/slpk-controller.ts"],"names":[],"mappings":";AAAA,OAAO,uBAAuB,CAAC;AAM/B;;;GAGG;AACH,eAAO,MAAM,WAAW,kBAAyB,MAAM,KAAG,QAAQ,IAAI,CAKrE,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,GAAG,EAAE,MAAM,0BAS7C"}

package/dist/i3s-server/controllers/slpk-controller.js

@@ -1,18 +1,27 @@
 "use strict";
-require('@loaders.gl/polyfills');
-const { parseSLPK } = require('@loaders.gl/i3s');
-const path = require('path');
-const { FileHandleProvider } = require('@loaders.gl/tile-converter');
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFileByUrl = exports.loadArchive = void 0;
+require("@loaders.gl/polyfills");
+const i3s_1 = require("@loaders.gl/i3s");
+const tile_converter_1 = require("@loaders.gl/tile-converter");
 let slpkArchive;
+/**
+ * Open SLPK file for reading and load HASH file
+ * @param fullLayerPath - full path to SLPK file
+ */
 const loadArchive = async (fullLayerPath) => {
-    slpkArchive = await parseSLPK(await FileHandleProvider.from(fullLayerPath));
+    slpkArchive = await (0, i3s_1.parseSLPK)(await tile_converter_1.FileHandleProvider.from(fullLayerPath), (msg) => console.log(msg));
+    console.log('The server is ready to use');
 };
-const I3S_LAYER_PATH = process.env.I3sLayerPath || ''; // eslint-disable-line no-process-env, no-undef
-const FULL_LAYER_PATH = path.join(process.cwd(), I3S_LAYER_PATH); // eslint-disable-line no-undef
-loadArchive(FULL_LAYER_PATH);
+exports.loadArchive = loadArchive;
+/**
+ * Get a file from SLPK
+ * @param url - I3S HTTP URL
+ * @returns  - file content
+ */
 async function getFileByUrl(url) {
     const trimmedPath = /^\/?(.*)\/?$/.exec(url);
-    let uncompressedFile;
+    let uncompressedFile = null;
     if (trimmedPath) {
         try {
             uncompressedFile = Buffer.from(await slpkArchive.getFile(trimmedPath[1], 'http'));
@@ -21,7 +30,4 @@ async function getFileByUrl(url) {
     }
     return uncompressedFile;
 }
-module.exports = {
-    loadArchive,
-    getFileByUrl
-};
+exports.getFileByUrl = getFileByUrl;

package/dist/i3s-server/routes/index.d.ts

@@ -1,3 +1,2 @@
-export = router;
-declare const router: any;
+export {};
 //# sourceMappingURL=index.d.ts.map

package/dist/i3s-server/routes/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/i3s-server/routes/index.js"],"names":[],"mappings":";AACA,0BAAgC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/i3s-server/routes/index.ts"],"names":[],"mappings":""}

package/dist/i3s-server/routes/index.js

@@ -1,6 +1,10 @@
 "use strict";
-const express = require('express');
-const router = express.Router();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = __importDefault(require("express"));
+const router = express_1.default.Router();
 const { getFileNameByUrl } = require('../controllers/index-controller');
 /* GET home page. */
 router.get('*', async function (req, res, next) {

package/dist/i3s-server/routes/slpk-router.d.ts

@@ -1,3 +1,3 @@
-export const sceneServerRouter: any;
-export const router: any;
+export declare const sceneServerRouter: import("express-serve-static-core").Router;
+export declare const router: import("express-serve-static-core").Router;
 //# sourceMappingURL=slpk-router.d.ts.map

package/dist/i3s-server/routes/slpk-router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"slpk-router.d.ts","sourceRoot":"","sources":["../../../src/i3s-server/routes/slpk-router.js"],"names":[],"mappings":"AAIA,oCAA2C;AAa3C,yBAAgC"}
+{"version":3,"file":"slpk-router.d.ts","sourceRoot":"","sources":["../../../src/i3s-server/routes/slpk-router.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,iBAAiB,4CAAmB,CAAC;AAalD,eAAO,MAAM,MAAM,4CAAmB,CAAC"}

package/dist/i3s-server/routes/slpk-router.js

@@ -1,13 +1,18 @@
 "use strict";
-const express = require('express');
-const { getFileByUrl } = require('../controllers/slpk-controller');
-const createSceneServer = require('../utils/create-scene-server');
-const sceneServerRouter = express.Router();
-sceneServerRouter.get('*', async function (req, res, next) {
-    const file = await getFileByUrl('/');
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.router = exports.sceneServerRouter = void 0;
+const express_1 = __importDefault(require("express"));
+const slpk_controller_1 = require("../controllers/slpk-controller");
+const create_scene_server_1 = require("../utils/create-scene-server");
+exports.sceneServerRouter = express_1.default.Router();
+exports.sceneServerRouter.get('*', async function (req, res, next) {
+    const file = await (0, slpk_controller_1.getFileByUrl)('/');
     if (file) {
         const layer = JSON.parse(file.toString());
-        const sceneServerResponse = createSceneServer(layer.name, layer);
+        const sceneServerResponse = (0, create_scene_server_1.createSceneServer)(layer.name, layer);
         res.send(sceneServerResponse);
     }
     else {
@@ -15,10 +20,10 @@ sceneServerRouter.get('*', async function (req, res, next) {
         res.send('File not found');
     }
 });
-const router = express.Router();
-router.get('*', async function (req, res, next) {
+exports.router = express_1.default.Router();
+exports.router.get('*', async function (req, res, next) {
     console.log(req.path);
-    const file = await getFileByUrl(req.path);
+    const file = await (0, slpk_controller_1.getFileByUrl)(req.path);
     if (file) {
         res.send(file);
     }
@@ -27,7 +32,3 @@ router.get('*', async function (req, res, next) {
         res.send('File not found');
     }
 });
-module.exports = {
-    sceneServerRouter,
-    router
-};

package/dist/i3s-server/utils/create-scene-server.d.ts

@@ -1,11 +1,17 @@
-export = createSceneServer;
-declare function createSceneServer(name: any, layer: any): {
+import { SceneLayer3D } from '@loaders.gl/i3s';
+/**
+ * Create `/SceneServer` response
+ * @param name - service name, custom user-friendly name of the service
+ * @param layer - I3S layer JSON
+ * @returns reponse JSON for `/SceneServer` route
+ */
+export declare const createSceneServer: (name: string, layer: SceneLayer3D) => {
     serviceItemId: any;
-    serviceName: any;
-    name: any;
+    serviceName: string;
+    name: string;
     currentVersion: string;
     serviceVersion: string;
     supportedBindings: string[];
-    layers: any[];
+    layers: SceneLayer3D[];
 };
 //# sourceMappingURL=create-scene-server.d.ts.map

package/dist/i3s-server/utils/create-scene-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-scene-server.d.ts","sourceRoot":"","sources":["../../../src/i3s-server/utils/create-scene-server.js"],"names":[],"mappings":";AAEA;;;;;;;;EAUC"}
+{"version":3,"file":"create-scene-server.d.ts","sourceRoot":"","sources":["../../../src/i3s-server/utils/create-scene-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAG7C;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,SAAU,MAAM,SAAS,YAAY;;;;;;;;CAUlE,CAAC"}

package/dist/i3s-server/utils/create-scene-server.js

@@ -1,8 +1,16 @@
 "use strict";
-const { v4: uuidv4 } = require('uuid');
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createSceneServer = void 0;
+const uuid_1 = require("uuid");
+/**
+ * Create `/SceneServer` response
+ * @param name - service name, custom user-friendly name of the service
+ * @param layer - I3S layer JSON
+ * @returns reponse JSON for `/SceneServer` route
+ */
 const createSceneServer = (name, layer) => {
     return {
-        serviceItemId: uuidv4().replace(/-/gi, ''),
+        serviceItemId: (0, uuid_1.v4)().replace(/-/gi, ''),
         serviceName: name,
         name,
         currentVersion: '10.7',
@@ -11,4 +19,4 @@ const createSceneServer = (name, layer) => {
         layers: [layer]
     };
 };
-module.exports = createSceneServer;
+exports.createSceneServer = createSceneServer;

package/dist/i3s-server/utils/server-utils.d.ts

@@ -0,0 +1,24 @@
+/// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
+import type { Server as HttpsServer } from 'https';
+import type { Server as HttpServer } from 'http';
+/**
+ * Normalize a port into a number, string, or false.
+ * @param val - port value from env variables
+ * @returns - `number` for port, `string` for a named pipe, or `false` if the port number is not correct
+ */
+export declare function normalizePort(val: string): number | string | false;
+/**
+ * Event listener creator for HTTP/HTTPS server "error" event.
+ * @param optionalPort - the port/named pipe the server is started on
+ * @return callback to handle server errors
+ */
+export declare function formErrorHandler(optionalPort: string | number): (error: NodeJS.ErrnoException) => void;
+/**
+ * Event listener for HTTP/HTTPS server "listening" event.
+ * @param optionalServer - http or https NodeJS server
+ * @return callback that is triggered when the server has started
+ */
+export declare function formListeningHandler(optionalServer: HttpsServer | HttpServer): () => void;
+//# sourceMappingURL=server-utils.d.ts.map

package/dist/i3s-server/utils/server-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"server-utils.d.ts","sourceRoot":"","sources":["../../../src/i3s-server/utils/server-utils.ts"],"names":[],"mappings":";;;AAAA,OAAO,KAAK,EAAC,MAAM,IAAI,WAAW,EAAC,MAAM,OAAO,CAAC;AACjD,OAAO,KAAK,EAAC,MAAM,IAAI,UAAU,EAAC,MAAM,MAAM,CAAC;AAK/C;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK,CAclE;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,YAAY,EAAE,MAAM,GAAG,MAAM,GAC5B,CAAC,KAAK,EAAE,MAAM,CAAC,cAAc,KAAK,IAAI,CAsBxC;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,cAAc,EAAE,WAAW,GAAG,UAAU,GAAG,MAAM,IAAI,CAMzF"}

package/dist/i3s-server/utils/server-utils.js

@@ -0,0 +1,66 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formListeningHandler = exports.formErrorHandler = exports.normalizePort = void 0;
+const debug_1 = __importDefault(require("debug"));
+const debug = (0, debug_1.default)('i3s-server:server');
+/**
+ * Normalize a port into a number, string, or false.
+ * @param val - port value from env variables
+ * @returns - `number` for port, `string` for a named pipe, or `false` if the port number is not correct
+ */
+function normalizePort(val) {
+    const chkPort = parseInt(val, 10);
+    if (Number.isNaN(chkPort)) {
+        // named pipe
+        return val;
+    }
+    if (chkPort >= 0) {
+        // port number
+        return chkPort;
+    }
+    return false;
+}
+exports.normalizePort = normalizePort;
+/**
+ * Event listener creator for HTTP/HTTPS server "error" event.
+ * @param optionalPort - the port/named pipe the server is started on
+ * @return callback to handle server errors
+ */
+function formErrorHandler(optionalPort) {
+    return function onError(error) {
+        if (error.syscall !== 'listen') {
+            throw error;
+        }
+        const bind = typeof optionalPort === 'string' ? `Pipe ${optionalPort}` : `Port ${optionalPort}`;
+        // handle specific listen errors with friendly messages
+        switch (error.code) {
+            case 'EACCES':
+                console.error(`${bind} requires elevated privileges`); // eslint-disable-line no-console, no-undef
+                process.exit(1); // eslint-disable-line no-process-exit, no-undef
+                break;
+            case 'EADDRINUSE':
+                console.error(`${bind} is already in use`); // eslint-disable-line no-console, no-undef
+                process.exit(1); // eslint-disable-line no-process-exit, no-undef
+                break;
+            default:
+                throw error;
+        }
+    };
+}
+exports.formErrorHandler = formErrorHandler;
+/**
+ * Event listener for HTTP/HTTPS server "listening" event.
+ * @param optionalServer - http or https NodeJS server
+ * @return callback that is triggered when the server has started
+ */
+function formListeningHandler(optionalServer) {
+    return function onListening() {
+        const addr = optionalServer.address();
+        const bind = typeof addr === 'string' ? `pipe ${addr}` : `port ${addr?.port}`;
+        debug(`Listening on ${bind}`);
+    };
+}
+exports.formListeningHandler = formListeningHandler;

package/dist/slpk-extractor/helpers/file-handle-provider.js

@@ -56,7 +56,7 @@ class FileHandleProvider {
      * @param offset The offset, in bytes, from the start of the file where to read the data.
      */
     async getBigUint64(offset) {
-        const val = new BigInt64Array((await this.fileDescriptor.read(Buffer.alloc(8), 0, 4, offset)).buffer.buffer).at(0);
+        const val = new BigInt64Array((await this.fileDescriptor.read(Buffer.alloc(8), 0, 8, offset)).buffer.buffer).at(0);
         if (val === undefined) {
             throw new Error('something went wrong');
         }

package/dist/slpk-extractor/slpk-extractor.js

@@ -35,7 +35,7 @@ class SLPKConverter {
                 name: this.correctIndexNames(localHeader.fileName),
                 data: await provider.slice(localHeader.fileDataOffset, localHeader.fileDataOffset + localHeader.compressedSize)
             }), options.outputPath);
-            localHeader = await (0, i3s_1.parseZipLocalFileHeader)(localHeader?.fileDataOffset + localHeader?.compressedSize, provider);
+            localHeader = await (0, i3s_1.parseZipLocalFileHeader)(localHeader.fileDataOffset + localHeader?.compressedSize, provider);
         }
         return 'success';
     }