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

package/src/slpk-extractor/slpk-extractor.ts

@@ -7,9 +7,6 @@ import {path} from '@loaders.gl/loader-utils';
 import {GZipCompression} from '@loaders.gl/compression';
 import {writeFile} from '../lib/utils/file-utils';
 
-/**
- * names of files that should be changed to index
- */
 const indexNames = [
   '3dSceneLayer.json.gz',
   '3dNodeIndexDocument.json.gz',
@@ -27,9 +24,9 @@ type File = {
 /**
  * Converter from slpk to i3s
  */
-export default class SLPKExtractor {
+export default class SLPKConverter {
   /**
-   * extract slpk to i3s
+   * Extract slpk to i3s
    * @param options
    * @param options.inputUrl the url to read SLPK file
    * @param options.outputPath the output filename
@@ -43,7 +40,7 @@ export default class SLPKExtractor {
 
     const provider = await FileHandleProvider.from(inputUrl);
 
-    let localHeader = await parseZipLocalFileHeader(0, provider);
+    let localHeader = await parseZipLocalFileHeader(0n, provider);
     while (localHeader) {
       await this.writeFile(
         await this.unGzip({
@@ -56,7 +53,7 @@ export default class SLPKExtractor {
         options.outputPath
       );
       localHeader = await parseZipLocalFileHeader(
-        localHeader?.fileDataOffset + localHeader?.compressedSize,
+        localHeader.fileDataOffset + localHeader?.compressedSize,
         provider
       );
     }
@@ -68,6 +65,7 @@ export default class SLPKExtractor {
    * Defines file name and path for i3s format
    * @param fileName initial file name and path
    */
+
   private correctIndexNames(fileName: string): string | null {
     if (indexNames.includes(path.filename(path.join('/', fileName)))) {
       return path.join(path.dirname(fileName), 'index.json.gz');
@@ -85,6 +83,7 @@ export default class SLPKExtractor {
       const compression = new GZipCompression();
 
       const decompressedData = await compression.decompress(file.data);
+
       return {data: decompressedData, name: (file.name ?? '').slice(0, -3)};
     }
     return Promise.resolve(file);

package/dist/es5/i3s-server/bin/www

@@ -1,102 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * 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.
- */
-
-const options = {
-  key: fs.readFileSync(path.join(__dirname, '../certs/key.pem')),
-  cert: fs.readFileSync(path.join(__dirname, '../certs/cert.pem'))
-};
-
-const httpServer = http.createServer(app);
-const httpsServer = https.createServer(options, app);
-
-/**
- * Listen on provided port, on all network interfaces.
- */
-
-httpServer.listen(httpPort);
-httpServer.on('error', formErrorHandler(httpPort));
-httpServer.on('listening', 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 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}`);
-  }
-}

package/dist/esm/i3s-server/bin/www

@@ -1,102 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * 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.
- */
-
-const options = {
-  key: fs.readFileSync(path.join(__dirname, '../certs/key.pem')),
-  cert: fs.readFileSync(path.join(__dirname, '../certs/cert.pem'))
-};
-
-const httpServer = http.createServer(app);
-const httpsServer = https.createServer(options, app);
-
-/**
- * Listen on provided port, on all network interfaces.
- */
-
-httpServer.listen(httpPort);
-httpServer.on('error', formErrorHandler(httpPort));
-httpServer.on('listening', 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 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}`);
-  }
-}

package/src/i3s-server/bin/www

@@ -1,102 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * 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.
- */
-
-const options = {
-  key: fs.readFileSync(path.join(__dirname, '../certs/key.pem')),
-  cert: fs.readFileSync(path.join(__dirname, '../certs/cert.pem'))
-};
-
-const httpServer = http.createServer(app);
-const httpsServer = https.createServer(options, app);
-
-/**
- * Listen on provided port, on all network interfaces.
- */
-
-httpServer.listen(httpPort);
-httpServer.on('error', formErrorHandler(httpPort));
-httpServer.on('listening', 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 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}`);
-  }
-}

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

@@ -1,38 +0,0 @@
-require('@loaders.gl/polyfills');
-const {fetchFile, parse} = require('@loaders.gl/core');
-const {SLPKLoader} = require('@loaders.gl/i3s');
-const path = require('path');
-
-let slpkArchive;
-
-const loadArchive = async (fullLayerPath) => {
-  slpkArchive = await (await fetchFile(fullLayerPath)).arrayBuffer();
-};
-
-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);
-
-async function getFileByUrl(url) {
-  const trimmedPath = /^\/?(.*)\/?$/.exec(url);
-  let uncompressedFile;
-  if (trimmedPath) {
-    try {
-      uncompressedFile = Buffer.from(
-        await parse(slpkArchive, SLPKLoader, {
-          slpk: {
-            path: trimmedPath[1],
-            pathMode: 'http'
-          }
-        })
-      );
-    } catch (e) {}
-  }
-  return uncompressedFile;
-}
-
-module.exports = {
-  loadArchive,
-  getFileByUrl
-};

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

@@ -1,15 +0,0 @@
-const {v4: uuidv4} = require('uuid');
-
-const createSceneServer = (name, layer) => {
-  return {
-    serviceItemId: uuidv4().replace(/-/gi, ''),
-    serviceName: name,
-    name,
-    currentVersion: '10.7',
-    serviceVersion: '1.8',
-    supportedBindings: ['REST'],
-    layers: [layer]
-  };
-};
-
-module.exports = createSceneServer;