fixes and cleanup of refactor

Signed-off-by: karthik2804 <karthik.ganeshram@fermyon.com>

Makefile

@@ -4,9 +4,6 @@ target/release/spinjs: target/wasm32-wasi/release/spin-js-engine.wasm
 	cd crates/spin-js-cli && \
 	SPIN_JS_ENGINE_PATH=../../target/wasm32-wasi/release/spin_js_engine.wasm \
 	cargo build --release $(BUILD_TARGET)
-	echo "import \"./modules/overrides\"" >> crates/spin-js-engine/src/js_sdk/dist/sdk.d.ts
-	cp crates/spin-js-engine/src/js_sdk/dist/sdk.d.ts types/lib/index.d.ts
-	cp -r crates/spin-js-engine/src/js_sdk/dist/modules types/lib/
 
 target/wasm32-wasi/release/spin-js-engine.wasm: crates/spin-js-engine/sdk.ts crates/spin-js-engine/src/lib.rs
 	cd crates/spin-js-engine && \

crates/spin-js-engine/src/js_sdk/modules/spinSdk.ts

@@ -74,7 +74,7 @@ function encodeBody(body: ArrayBuffer | Uint8Array | string) {
 /** @internal */
 function fetch(uri: string | URL, options?: FetchOptions) {
     let encodedBodyData = (options && options.body) ? encodeBody(options.body) : new Uint8Array().buffer
-    const { status, headers, body } = spinSdk.http.send({
+    const { status, headers, body } = __internal__.spin_sdk.http.send({
         method: (options && options.method) || "GET",
         uri: (uri instanceof URL) ? uri.toString() : uri,
         headers: (options && options.headers) || {},
@@ -164,7 +164,9 @@ const spinInternal = {
 }
 
 declare global {
-    const spinSdk: SpinSDK
+    const __internal__: {
+        spin_sdk: SpinSDK
+}
 }
 
 /** @internal */

crates/spin-js-engine/src/lib.rs

@@ -702,12 +702,9 @@ fn do_init() -> Result<()> {
 
     let context = Context::default();
     context.eval_global("sdk.js", include_str!("../sdk.js"))?;
-
 
     let global = context.global_object()?;
 
-
-
     let console = context.object_value()?;
     console.set_property("log", context.wrap_callback(console_log)?)?;
 

examples/typescript/sdk-poc-ts/spin.toml

@@ -7,6 +7,7 @@ version = "1.0.0"
 [[component]]
 id = "hello"
 source = "target/spin-http-js.wasm"
+allowed_http_hosts = ["https://some-random-api.ml/"]
 [component.trigger]
 route = "/..."
 [component.config]

examples/typescript/sdk-poc-ts/src/index.ts

@@ -11,6 +11,9 @@ router.get("/home", () => console.log("got home"))
 export const handleRequest: HandleRequest = async function (request: HttpRequest): Promise<HttpResponse> {
     await router.handleRequest(request)
 
+    const dogFact = await fetch("https://some-random-api.ml/facts/dog")
+    console.log(await dogFact.text())
+
     console.log("The config is ", spinSdk.config.get("test"))
 
     return {

spin-sdk/lib/modules/handlerFunction.d.ts

@@ -26,4 +26,4 @@ declare class ResponseBuilder {
     status(status: number): this;
     body(data: ArrayBuffer | Uint8Array | string): this;
 }
-export { HandleRequest, Handler, HttpRequest, HttpResponse };
+export { ResponseBuilder, HandleRequest, Handler, HttpRequest, HttpResponse };

spin-sdk/lib/modules/handlerFunction.js

@@ -1 +1 @@
-export {};
+export { ResponseBuilder };

spin-sdk/package.json

@@ -1,9 +1,32 @@
 {
-  "name": "spin-sdk",
-  "version": "1.0.0",
+  "name": "@fermyon/spin-sdk",
+  "version": "0.5.0",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
+  "author": {
+    "name": "fermyon",
+    "email": "engineering@fermyon.com",
+    "url": "https://fermyon.com"
+  },
+  "license": "Apache-2.0",
+  "keywords": [
+    "fermyon",
+    "spin",
+    "sdk",
+    "spin-js-sdk",
+    "spin-ts-sdk"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/fermyon/spin-js-sdk.git"
+  },
+  "bugs": {
+    "url": "https://github.com/fermyon/spin-js-sdk/issues"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
   "scripts": {
     "prepare": "npm run build",
     "build": "tsc",
@@ -12,9 +35,6 @@
   "files": [
     "lib"
   ],
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
   "devDependencies": {
     "@types/typedarray-to-buffer": "^4.0.0",
     "typedoc": "^0.23.28",

spin-sdk/src/index.ts

@@ -1,5 +1,5 @@
 import { HandleRequest, Handler, HttpRequest, HttpResponse } from "./modules/handlerFunction";
-import { spinSdk, SpinSdK } from "./modules/spinSdk";
+import { spinSdk, SpinSdk } from "./modules/spinSdk";
 import "./modules/globalDefinitions"
 
-export {HandleRequest, Handler, HttpRequest, HttpResponse, spinSdk, SpinSdK}
+export { HandleRequest, Handler, HttpRequest, HttpResponse, spinSdk, SpinSdk }

spin-sdk/src/modules/spinSdk.ts

@@ -18,7 +18,7 @@ interface KvStore {
  * It has methods to access databases like redis, kv
  * It also provides utility functions and a router
  */
-interface SpinSdK {
+interface SpinSdk {
     utils: {
         toBuffer: (arg0: ArrayBufferView) => Buffer
     }
@@ -55,18 +55,18 @@ interface SpinSdK {
 
 declare global {
     const __internal__: {
-        spin_sdk: SpinSdK
+        spin_sdk: SpinSdk
     }
 }
 
 
 /**
  * Sdk module that provides access to spin features
  */
-const spinSdk: SpinSdK = __internal__.spin_sdk
+const spinSdk: SpinSdk = __internal__.spin_sdk
 spinSdk.utils = utils
 spinSdk.Router =  () => {
     return router()
 }
 
-export { spinSdk, SpinSdK }
+export { spinSdk, SpinSdk }

test/test-app/package.json

@@ -11,13 +11,13 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "spin-sdk": "file:../../types",
     "ts-loader": "^9.4.1",
     "typescript": "^4.8.4",
     "webpack": "^5.74.0",
     "webpack-cli": "^4.10.0"
   },
   "dependencies": {
+    "spin-sdk": "file:../../spin-sdk",
     "itty-router": "^3.0.11"
   }
 }

test/test-app/src/index.ts

@@ -1,9 +1,7 @@
-import { HandleRequest, HttpRequest, HttpResponse } from "spin-sdk"
+import { HandleRequest, HttpRequest, HttpResponse, spinSdk } from "spin-sdk"
 import { health, headersTest, outboundHttp, fileRead, dirRead, testFunctionality } from "./test"
 
-const encoder = new TextEncoder()
-const decoder = new TextDecoder()
-const router = utils.Router()
+const router = spinSdk.Router()
 
 // Add paths for router
 router.get("/", testFunctionality)