Skip to content

Commit

Permalink
Add server support
Browse files Browse the repository at this point in the history
  • Loading branch information
pavel-kuznetsov-hypertrack committed Jan 3, 2024
1 parent 9ee0551 commit f986242
Show file tree
Hide file tree
Showing 10 changed files with 278 additions and 19 deletions.
13 changes: 13 additions & 0 deletions android/demo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ android {
namespace 'com.hypertrack.sdk.webview.android.demo'
compileSdk 34

buildFeatures {
buildConfig = true
}
defaultConfig {
applicationId "com.hypertrack.sdk.webview.android.demo"
minSdk 23
Expand All @@ -18,6 +21,16 @@ android {
vectorDrawables {
useSupportLibrary true
}

// get local properties
Properties properties = new Properties()
properties.load(project.rootProject.file('local.properties').newDataInputStream())

def server_url = properties.getProperty('server_url')
if (server_url == null) {
server_url = "http://10.0.2.2:3000"
}
buildConfigField("String", "SERVER_URL", "\"${server_url}\"")
}

buildTypes {
Expand Down
1 change: 1 addition & 0 deletions android/demo/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme"
android:usesCleartextTraffic="true"
tools:targetApi="31">
<activity
android:name=".MainActivity"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import android.webkit.WebView
import androidx.appcompat.app.AppCompatActivity
import androidx.webkit.WebViewAssetLoader
import androidx.webkit.WebViewClientCompat
import com.hypertrack.sdk.webview.android.demo.BuildConfig
import com.hypertrack.sdk.webview.android.HyperTrackWebViewJsApi

class MainActivity : AppCompatActivity() {
Expand All @@ -37,20 +38,20 @@ class MainActivity : AppCompatActivity() {
settings.allowContentAccess = false

webViewClient = object : WebViewClientCompat() {
override fun shouldInterceptRequest(
view: WebView?,
request: WebResourceRequest
): WebResourceResponse? {
return assetLoader.shouldInterceptRequest(request.url)
}

@Suppress("OVERRIDE_DEPRECATION")
override fun shouldInterceptRequest(
view: WebView?,
url: String?
): WebResourceResponse? {
return assetLoader.shouldInterceptRequest(Uri.parse(url))
}
// override fun shouldInterceptRequest(
// view: WebView?,
// request: WebResourceRequest
// ): WebResourceResponse? {
// return assetLoader.shouldInterceptRequest(request.url)
// }
//
// @Suppress("OVERRIDE_DEPRECATION")
// override fun shouldInterceptRequest(
// view: WebView?,
// url: String?
// ): WebResourceResponse? {
// return assetLoader.shouldInterceptRequest(Uri.parse(url))
// }
}

webChromeClient = object : WebChromeClient() {
Expand All @@ -68,11 +69,16 @@ class MainActivity : AppCompatActivity() {
}

if (savedInstanceState == null) {
// Assets are hosted under http(s)://appassets.androidplatform.net/assets/... .
// If the application's assets are in the "main/assets" folder this will read the file
// from "main/assets/www/index.html" and load it as if it were hosted on:
// https://appassets.androidplatform.net/assets/www/index.html
webView?.loadUrl("https://appassets.androidplatform.net/assets/index.html")
val useServer = true
if (useServer) {
webView?.loadUrl("${BuildConfig.SERVER_URL}/")
} else {
// Assets are hosted under http(s)://appassets.androidplatform.net/assets/... .
// If the application's assets are in the "main/assets" folder this will read the file
// from "main/assets/www/index.html" and load it as if it were hosted on:
// https://appassets.androidplatform.net/assets/www/index.html
webView?.loadUrl("https://appassets.androidplatform.net/assets/index.html")
}
}
}

Expand Down
175 changes: 175 additions & 0 deletions demo-js-server/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
# Based on https://raw.githubusercontent.com/github/gitignore/main/Node.gitignore

# Logs

logs
_.log
npm-debug.log_
yarn-debug.log*
yarn-error.log*
lerna-debug.log*
.pnpm-debug.log*

# Caches

.cache

# Diagnostic reports (https://nodejs.org/api/report.html)

report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json

# Runtime data

pids
_.pid
_.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover

lib-cov

# Coverage directory used by tools like istanbul

coverage
*.lcov

# nyc test coverage

.nyc_output

# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)

.grunt

# Bower dependency directory (https://bower.io/)

bower_components

# node-waf configuration

.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)

build/Release

# Dependency directories

node_modules/
jspm_packages/

# Snowpack dependency directory (https://snowpack.dev/)

web_modules/

# TypeScript cache

*.tsbuildinfo

# Optional npm cache directory

.npm

# Optional eslint cache

.eslintcache

# Optional stylelint cache

.stylelintcache

# Microbundle cache

.rpt2_cache/
.rts2_cache_cjs/
.rts2_cache_es/
.rts2_cache_umd/

# Optional REPL history

.node_repl_history

# Output of 'npm pack'

*.tgz

# Yarn Integrity file

.yarn-integrity

# dotenv environment variable files

.env
.env.development.local
.env.test.local
.env.production.local
.env.local

# parcel-bundler cache (https://parceljs.org/)

.parcel-cache

# Next.js build output

.next
out

# Nuxt.js build / generate output

.nuxt
dist

# Gatsby files

# Comment in the public line in if your project uses Gatsby and not Next.js

# https://nextjs.org/blog/next-9-1#public-directory-support

# public

# vuepress build output

.vuepress/dist

# vuepress v2.x temp and cache directory

.temp

# Docusaurus cache and generated files

.docusaurus

# Serverless directories

.serverless/

# FuseBox cache

.fusebox/

# DynamoDB Local files

.dynamodb/

# TernJS port file

.tern-port

# Stores VSCode versions used for testing VSCode extensions

.vscode-test

# yarn v2

.yarn/cache
.yarn/unplugged
.yarn/build-state.yml
.yarn/install-state.gz
.pnp.*

# IntelliJ based IDEs
.idea

# Finder (MacOS) folder config
.DS_Store
15 changes: 15 additions & 0 deletions demo-js-server/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# demo-js-server

To install dependencies:

```bash
bun install
```

To run:

```bash
bun run src/index.ts
```

This project was created using `bun init` in bun v1.0.21. [Bun](https://bun.sh) is a fast all-in-one JavaScript runtime.
Binary file added demo-js-server/bun.lockb
Binary file not shown.
4 changes: 4 additions & 0 deletions demo-js-server/justfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
s := start-server

start-server:
bun run src/index.ts
14 changes: 14 additions & 0 deletions demo-js-server/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "demo-js-server",
"module": "src/index.ts",
"type": "module",
"devDependencies": {
"@types/bun": "latest"
},
"peerDependencies": {
"typescript": "^5.0.0"
},
"dependencies": {
"hypertrack-sdk-webview": "../js-library"
}
}
9 changes: 9 additions & 0 deletions demo-js-server/src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
const server = Bun.serve({
port: 3000,
hostname: "0.0.0.0",
fetch(request) {
return new Response("Welcome to Bun!");
},
});

console.log(`Listening on localhost: ${server.port}`);
22 changes: 22 additions & 0 deletions demo-js-server/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"compilerOptions": {
"lib": ["ESNext"],
"target": "ESNext",
"module": "ESNext",
"moduleDetection": "force",
"jsx": "react-jsx",
"allowJs": true,

/* Bundler mode */
"moduleResolution": "bundler",
"allowImportingTsExtensions": true,
"verbatimModuleSyntax": true,
"noEmit": true,

/* Linting */
"skipLibCheck": true,
"strict": true,
"noFallthroughCasesInSwitch": true,
"forceConsistentCasingInFileNames": true
}
}

0 comments on commit f986242

Please sign in to comment.