feat: support deno 2

- change denosandboxcode for Deno 2 compatibility - use twine@0.2.0 in sandbox code - use dropserver_lib_support 0.2.1 in sandbox code - change ackend test fixture code for Deno 2 compatibility
teleclimber · Sep 30, 2024 · e54bfca · e54bfca
1 parent 745d160
commit e54bfca
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 19 deletions.
diff --git a/cmd/ds-host/sandbox/testfixtures/apps/app-as/app/app.ts b/cmd/ds-host/sandbox/testfixtures/apps/app-as/app/app.ts
@@ -1,5 +1,5 @@
 //@ts-ignore
-window.DROPSERVER.appRoutes.setCallback();
+globalThis.DROPSERVER.appRoutes.setCallback();
 
 console.log(await Deno.readTextFile('data.txt'));
 

diff --git a/cmd/ds-host/sandbox/testfixtures/apps/app-only/app/app.ts b/cmd/ds-host/sandbox/testfixtures/apps/app-only/app/app.ts
@@ -1,3 +1,3 @@
 //@ts-ignore
-window.DROPSERVER.appRoutes.setCallback();
+globalThis.DROPSERVER.appRoutes.setCallback();
 console.log('hw');
diff --git a/denosandboxcode/approutes.ts b/denosandboxcode/approutes.ts
@@ -1,8 +1,8 @@
 import {match} from "https://deno.land/x/path_to_regexp@v6.2.1/index.ts";
 import type {MatchFunction} from "https://deno.land/x/path_to_regexp@v6.2.1/index.ts";
 
-import {RouteType, GetAppRoutesCallback} from 'https://deno.land/x/dropserver_lib_support@v0.2.0/mod.ts';
-import type {Handler, Path, Auth} from 'https://deno.land/x/dropserver_lib_support@v0.2.0/mod.ts';
+import {RouteType, GetAppRoutesCallback} from 'https://deno.land/x/dropserver_lib_support@v0.2.1/mod.ts';
+import type {Handler, Path, Auth} from 'https://deno.land/x/dropserver_lib_support@v0.2.1/mod.ts';
 
 import DsServices from './services/services.ts';
 

diff --git a/denosandboxcode/index.ts b/denosandboxcode/index.ts
@@ -1,4 +1,4 @@
-import libSupportIface from 'https://deno.land/x/dropserver_lib_support@v0.2.0/mod.ts';
+import libSupportIface from 'https://deno.land/x/dropserver_lib_support@v0.2.1/mod.ts';
 
 import Metadata from './metadata.ts';
 import DsServices from './services/services.ts';
@@ -12,7 +12,7 @@ import LibSupport from './libsupport.ts';
 const metadata = new Metadata;
 const services = new DsServices;
 
-const w = <{["DROPSERVER"]?:libSupportIface}>window;
+const w = <{["DROPSERVER"]?:libSupportIface}>globalThis;
 const libSupport = new LibSupport(metadata, services);
 w["DROPSERVER"] = libSupport;
 

diff --git a/denosandboxcode/migrations.ts b/denosandboxcode/migrations.ts
@@ -1,4 +1,4 @@
-import {migrationFunction, GetMigrationsCallback} from 'https://deno.land/x/dropserver_lib_support@v0.2.0/mod.ts';
+import {migrationFunction, GetMigrationsCallback} from 'https://deno.land/x/dropserver_lib_support@v0.2.1/mod.ts';
 
 // MigrationMeta is what is sent to the host to identify and make use of migration
 // Basically should include everything except the actual function

diff --git a/denosandboxcode/services/appservice.ts b/denosandboxcode/services/appservice.ts
@@ -27,7 +27,7 @@ export default class DsAppService {
 		}
 		catch(e) {
 			console.error('Error getting routes: '+e);
-			await message.sendError(e.toString());
+			if (e instanceof Error) await message.sendError(e.toString());
 			return;
 		}
 

diff --git a/denosandboxcode/services/execservice.ts b/denosandboxcode/services/execservice.ts
@@ -33,7 +33,7 @@ async function execFnHandler(message: ReceivedMessageI) {
 		mod = await import(data.file);
 	}
 	catch(e) {
-		await message.sendError(e.toString());
+		if (e instanceof Error) await message.sendError(e.toString());
 		return;
 	}
 	// we need more ways of saying what we want to execute

diff --git a/denosandboxcode/services/migrateservice.ts b/denosandboxcode/services/migrateservice.ts
@@ -78,7 +78,7 @@ export default class MigrationService {
 				}
 				catch(e) {
 					console.error(e);
-					await message.sendError("Error running migration step: "+i+', '+e.toString());
+					if (e instanceof Error) await message.sendError("Error running migration step: "+i+', '+e.toString());
 					return;
 				}
 			}
@@ -91,7 +91,7 @@ export default class MigrationService {
 				}
 				catch(e) {
 					console.error(e);
-					await message.sendError("Error running migration step: "+i+', '+e.toString());
+					if (e instanceof Error) await message.sendError("Error running migration step: "+i+', '+e.toString());
 					return;
 				}
 			}

diff --git a/denosandboxcode/services/migrateservice_test.ts b/denosandboxcode/services/migrateservice_test.ts
@@ -27,7 +27,7 @@ Deno.test({
 			await service.runStep(2, true);
 		}
 		catch(e) {
-			err = e;
+			if (e instanceof Error) err = e;
 		}
 
 		if(!err) {

diff --git a/denosandboxcode/services/routeserver.ts b/denosandboxcode/services/routeserver.ts
@@ -109,7 +109,7 @@ export default class DsRouteServer {
 			await route.handler(ctx);
 		}
 		catch(e) {
-			this.replyError(reqEvent, e);
+			if (e instanceof Error) this.replyError(reqEvent, e.toString());
 			// this error comes from app code, but it may also be from dropserver_app lib
 			// But that's technically app code. Maybe dropserver_lib_suport can define an error
 			// That then gets used to indicate a problem at the library level?

diff --git a/denosandboxcode/services/routeserver_test.ts b/denosandboxcode/services/routeserver_test.ts
@@ -84,7 +84,7 @@ Deno.test({
 						await routeServer.stopServer();
 					}
 					catch(e) {
-						m.sendError(e);
+						if (e instanceof Error) m.sendError(e.toString());
 					}
 					m.sendOK();
 				}

diff --git a/denosandboxcode/services/services.ts b/denosandboxcode/services/services.ts
@@ -76,7 +76,7 @@ export default class DsServices {
 				}
 				catch(e) {
 					console.error(e);
-					m.sendError(e);
+					if (e instanceof Error) m.sendError(e.toString());
 				}
 				m.sendOK();
 				break;

diff --git a/denosandboxcode/services/twine.ts b/denosandboxcode/services/twine.ts
@@ -1,10 +1,10 @@
-import Twine from 'https://deno.land/x/twine@0.1.0/twine.ts';
+import Twine from 'https://deno.land/x/twine@0.2.0/twine.ts';
 export default Twine;
 
 export {
 	Message, 
-} from 'https://deno.land/x/twine@0.1.0/twine.ts';
+} from 'https://deno.land/x/twine@0.2.0/twine.ts';
 
 export type {
 	ReceivedMessageI
-} from 'https://deno.land/x/twine@0.1.0/twine.ts';
+} from 'https://deno.land/x/twine@0.2.0/twine.ts';
diff --git a/denosandboxcode/users.ts b/denosandboxcode/users.ts
@@ -1,4 +1,4 @@
-import type {User} from 'https://deno.land/x/dropserver_lib_support@v0.2.0/mod.ts';
+import type {User} from 'https://deno.land/x/dropserver_lib_support@v0.2.1/mod.ts';
 import DsServices from './services/services.ts';
 
 const service = 16;