fix: clean up wasm and built ts

Author: HideBa

src/rust/fcb_core/src/http_reader/mock_http_range_client.rs

@@ -17,8 +17,6 @@ impl HttpFcbReader<MockHttpRangeClient> {
         HttpFcbReader<MockHttpRangeClient>,
         Arc<RwLock<RequestStats>>,
     )> {
-        trace!("starting: opening http reader, reading header");
-
         let stats = Arc::new(RwLock::new(RequestStats::new()));
         let http_client = MockHttpRangeClient::new(path, stats.clone());
         let client = http_range_client::AsyncBufferedHttpRangeClient::with(http_client, path);

src/rust/fcb_core/src/http_reader/mod.rs

@@ -62,7 +62,6 @@ pub struct AsyncFeatureIter<T: AsyncHttpRangeClient + Send + Sync> {
 
 impl HttpFcbReader<reqwest::Client> {
     pub async fn open(url: &str) -> Result<HttpFcbReader<reqwest::Client>> {
-        trace!("starting: opening http reader, reading header");
         let client = BufferedHttpRangeClient::new(url);
         Self::_open(client).await
     }
@@ -121,7 +120,6 @@ impl<T: AsyncHttpRangeClient + Send + Sync> HttpFcbReader<T> {
         // verify flatbuffer
         let _header = size_prefixed_root_as_header(&header_buf)?;
 
-        trace!("completed: opening http reader");
         Ok(HttpFcbReader {
             client,
             fbs: FcbBuffer {
@@ -191,7 +189,6 @@ impl<T: AsyncHttpRangeClient + Send + Sync> HttpFcbReader<T> {
     }
     /// Select features within a bounding box.
     pub async fn select_query(mut self, query: Query) -> Result<AsyncFeatureIter<T>> {
-        trace!("starting: select_bbox, traversing index");
         // Read R-Tree index and build filter for features within bbox
         let header = self.fbs.header();
         if header.index_node_size() == 0 || header.features_count() == 0 {
@@ -222,7 +219,6 @@ impl<T: AsyncHttpRangeClient + Send + Sync> HttpFcbReader<T> {
         let count = list.len();
         let feature_batches = FeatureBatch::make_batches(list, combine_request_threshold).await?;
         let selection = FeatureSelection::SelectBbox(SelectBbox { feature_batches });
-        trace!("completed: select_bbox");
         Ok(AsyncFeatureIter {
             client: self.client,
             fbs: self.fbs,
@@ -234,7 +230,6 @@ impl<T: AsyncHttpRangeClient + Send + Sync> HttpFcbReader<T> {
     /// This method uses the attribute index section to find matching feature offsets.
     /// It then groups (batches) the remote feature ranges in order to reduce IO overhead.
     pub async fn select_attr_query(mut self, query: &AttrQuery) -> Result<AsyncFeatureIter<T>> {
-        trace!("starting: select_attr_query via http reader");
         let header = self.fbs.header();
         let header_len = self.header_len();
         // Assume the header provides rtree and attribute index sizes.
@@ -291,11 +286,6 @@ impl<T: AsyncHttpRangeClient + Send + Sync> HttpFcbReader<T> {
             })
             .collect();
 
-        trace!(
-            "completed: select_attr_query via http reader, matched features: {}",
-            count
-        );
-
         println!("http_ranges: {:?}", http_ranges);
         Ok(AsyncFeatureIter {
             client: self.client,

src/rust/wasm/src/lib.rs

@@ -9,8 +9,8 @@ mod wasm {
 
     use fcb_core::{size_prefixed_root_as_header, Header, Operator};
     use js_sys::Array;
+
     use log::Level;
-    use log::trace;
     use serde_wasm_bindgen::to_value;
     use wasm_bindgen::prelude::*;
 
@@ -74,13 +74,12 @@ mod wasm {
         pub async fn new(url: String) -> Result<HttpFcbReader, JsValue> {
             // Only initialize the logger once
             if !LOGGER_INITIALIZED.load(Ordering::SeqCst)
-                && console_log::init_with_level(Level::Trace).is_ok()
+                && console_log::init_with_level(Level::Info).is_ok()
             {
                 LOGGER_INITIALIZED.store(true, Ordering::SeqCst);
                 log::info!("Logger initialized successfully.");
             }
 
-            trace!("starting: opening http reader, reading header");
             let client = WasmHttpClient::new(&url);
 
             Self::_open(client).await
@@ -240,7 +239,6 @@ mod wasm {
             mut self,
             query: &WasmSpatialQuery,
         ) -> Result<AsyncFeatureIter, JsValue> {
-            trace!("starting: select_spatial, traversing index");
             // Read R-Tree index and build filter for features within bbox
             let header = self.fbs.header();
             if header.index_node_size() == 0 || header.features_count() == 0 {
@@ -278,7 +276,6 @@ mod wasm {
                 .await
                 .map_err(|e| JsValue::from_str(&e.to_string()))?;
             let selection = FeatureSelection::SelectSpatial(SelectSpatial { feature_batches });
-            trace!("completed: select_spatial");
             Ok(AsyncFeatureIter {
                 client: self.client,
                 fbs: self.fbs,
@@ -292,7 +289,6 @@ mod wasm {
             mut self,
             query: &WasmAttrQuery,
         ) -> Result<AsyncFeatureIter, JsValue> {
-            trace!("starting: select_attr_query via http reader");
             let header = self.fbs.header();
             let header_len = self.header_len();
             // Assume the header provides rtree and attribute index sizes.
@@ -354,10 +350,6 @@ mod wasm {
                 })
                 .collect();
 
-            trace!(
-                "completed: select_attr_query via http reader, matched features: {}",
-                count
-            );
             Ok(AsyncFeatureIter {
                 client: self.client,
                 fbs: self.fbs,
@@ -693,16 +685,8 @@ mod wasm {
 
                 let wasted_bytes = search_result_item.range.start() - prev_end;
                 if wasted_bytes < combine_request_threshold {
-                    if wasted_bytes == 0 {
-                        trace!("adjacent feature");
-                    } else {
-                        trace!("wasting {wasted_bytes} to avoid an extra request");
-                    }
                     latest_batch.push_back(search_result_item.range)
                 } else {
-                    trace!(
-                        "creating a new request for batch rather than wasting {wasted_bytes} bytes"
-                    );
                     let mut new_batch = VecDeque::new();
                     new_batch.push_back(search_result_item.range);
                     batched_ranges.push(new_batch);

src/ts/fcb_wasm.js

@@ -960,7 +960,7 @@ function __wbg_get_imports() {
         const ret = false;
         return ret;
     };
-    imports.wbg.__wbindgen_closure_wrapper1230 = function(arg0, arg1, arg2) {
+    imports.wbg.__wbindgen_closure_wrapper1228 = function(arg0, arg1, arg2) {
         const ret = makeMutClosure(arg0, arg1, 328, __wbg_adapter_52);
         return ret;
     };

src/ts/fcb_wasm_bg.wasm

@@ -1,7 +1,7 @@
 {
   "name": "@cityjson/flatcitybuf",
   "type": "module",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "FlatCityBuf is a library for reading and writing CityJSON with FlatBuffers.",
   "author": {
     "name": "Hidemichi Baba",